Merge "Revert "allow locking UI mode and block launching car dock for automotive""
diff --git a/Android.mk b/Android.mk
index 71bba0f..d22273c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -261,6 +261,7 @@
core/java/android/view/IApplicationToken.aidl \
core/java/android/view/IAppTransitionAnimationSpecsFuture.aidl \
core/java/android/view/IAssetAtlas.aidl \
+ core/java/android/view/IDockDividerVisibilityListener.aidl \
core/java/android/view/IGraphicsStats.aidl \
core/java/android/view/IInputFilter.aidl \
core/java/android/view/IInputFilterHost.aidl \
@@ -281,6 +282,7 @@
core/java/com/android/internal/app/IAppOpsService.aidl \
core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl \
core/java/com/android/internal/app/IBatteryStats.aidl \
+ core/java/com/android/internal/app/IEphemeralResolver.aidl \
core/java/com/android/internal/app/IProcessStats.aidl \
core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \
core/java/com/android/internal/app/IVoiceInteractionSessionShowCallback.aidl \
@@ -343,8 +345,6 @@
media/java/android/media/IMediaRouterService.aidl \
media/java/android/media/IMediaScannerListener.aidl \
media/java/android/media/IMediaScannerService.aidl \
- media/java/android/media/IRemoteControlClient.aidl \
- media/java/android/media/IRemoteControlDisplay.aidl \
media/java/android/media/IRemoteDisplayCallback.aidl \
media/java/android/media/IRemoteDisplayProvider.aidl \
media/java/android/media/IRemoteVolumeController.aidl \
@@ -417,6 +417,8 @@
packages/services/PacProcessor/com/android/net/IProxyService.aidl \
packages/services/Proxy/com/android/net/IProxyCallback.aidl \
packages/services/Proxy/com/android/net/IProxyPortListener.aidl \
+ core/java/android/service/quicksettings/IQSService.aidl \
+ core/java/android/service/quicksettings/IQSTileService.aidl \
# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
@@ -427,7 +429,7 @@
$(framework_res_source_path)/com/android/internal/R.java
LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext
LOCAL_MODULE := framework
@@ -625,6 +627,7 @@
frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \
frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \
frameworks/base/core/java/android/database/CursorWindow.aidl \
+ frameworks/base/core/java/android/service/quicksettings/Tile.aidl \
gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
$(gen): PRIVATE_SRC_FILES := $(aidl_files)
@@ -715,6 +718,7 @@
$(framework_res_source_path)/com/android/internal/R.java
framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
+ core-oj \
core-libart \
conscrypt \
bouncycastle \
@@ -738,6 +742,7 @@
# not be referenced in the documentation.
framework_docs_LOCAL_DROIDDOC_OPTIONS := \
-knowntags ./frameworks/base/docs/knowntags.txt \
+ -knowntags ./libcore/known_oj_tags.txt \
-hidePackage com.android.org.conscrypt \
-since $(SRC_API_DIR)/1.xml 1 \
-since $(SRC_API_DIR)/2.xml 2 \
@@ -876,6 +881,41 @@
$(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target)
$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))
+# ==== the test api stubs ===================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
+LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)
+LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
+LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
+LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := test-api-stubs
+
+LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src
+
+LOCAL_DROIDDOC_OPTIONS:=\
+ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_test_stubs_current_intermediates/src \
+ -showAnnotation android.annotation.TestApi \
+ -api $(INTERNAL_PLATFORM_TEST_API_FILE) \
+ -removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \
+ -nodocs
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_DROIDDOC)
+
+# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
+$(full_target): $(framework_built) $(gen)
+$(INTERNAL_PLATFORM_TEST_API_FILE): $(full_target)
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))
+
# ==== check javadoc comments but don't generate docs ========
include $(CLEAR_VARS)
@@ -1100,7 +1140,7 @@
LOCAL_SRC_FILES := $(ext_src_files)
LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := ext
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6e44d77..40908f1 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -236,6 +236,8 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/DocumentsUI_intermediates)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java/android/media/IRemoteControlClient.*)
+$(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java/android/media/IRemoteControlDisplay.*)
# ******************************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
diff --git a/api/current.txt b/api/current.txt
index 96ecad6..d54b7fd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30,6 +30,7 @@
field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
+ field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";
field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
@@ -332,6 +333,7 @@
field public static final int calendarTextColor = 16843931; // 0x101049b
field public static final int calendarViewShown = 16843596; // 0x101034c
field public static final int calendarViewStyle = 16843613; // 0x101035d
+ field public static final int canControlMagnification = 16844040; // 0x1010508
field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8
field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9
field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -2619,6 +2621,7 @@
public abstract class AccessibilityService extends android.app.Service {
ctor public AccessibilityService();
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+ method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
@@ -2656,6 +2659,23 @@
field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
}
+ public static final class AccessibilityService.MagnificationController {
+ method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
+ method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener, android.os.Handler);
+ method public float getCenterX();
+ method public float getCenterY();
+ method public android.graphics.Region getMagnifiedRegion();
+ method public float getScale();
+ method public boolean removeListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
+ method public boolean reset(boolean);
+ method public boolean setCenter(float, float, boolean);
+ method public boolean setScale(float, boolean);
+ }
+
+ public static abstract interface AccessibilityService.MagnificationController.OnMagnificationChangedListener {
+ method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);
+ }
+
public class AccessibilityServiceInfo implements android.os.Parcelable {
ctor public AccessibilityServiceInfo();
method public static java.lang.String capabilityToString(int);
@@ -2670,6 +2690,7 @@
method public java.lang.String getSettingsActivityName();
method public java.lang.String loadDescription(android.content.pm.PackageManager);
method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10
field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4
field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8
field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2
@@ -2712,6 +2733,8 @@
method public abstract java.lang.String getAuthTokenLabel(java.lang.String);
method public final android.os.IBinder getIBinder();
method public abstract android.os.Bundle hasFeatures(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String[]) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startAddAccountSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startUpdateCredentialsSession(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle updateCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
field public static final java.lang.String KEY_CUSTOM_TOKEN_EXPIRY = "android.accounts.expiry";
}
@@ -2776,6 +2799,8 @@
method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);
method public void setPassword(android.accounts.Account, java.lang.String);
method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startAddAccountSession(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startUpdateCredentialsSession(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
field public static final java.lang.String ACTION_AUTHENTICATOR_INTENT = "android.accounts.AccountAuthenticator";
field public static final java.lang.String AUTHENTICATOR_ATTRIBUTES_NAME = "account-authenticator";
@@ -2792,6 +2817,8 @@
field public static final java.lang.String KEY_ACCOUNT_AUTHENTICATOR_RESPONSE = "accountAuthenticatorResponse";
field public static final java.lang.String KEY_ACCOUNT_MANAGER_RESPONSE = "accountManagerResponse";
field public static final java.lang.String KEY_ACCOUNT_NAME = "authAccount";
+ field public static final java.lang.String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
+ field public static final java.lang.String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
field public static final java.lang.String KEY_ACCOUNT_TYPE = "accountType";
field public static final java.lang.String KEY_ANDROID_PACKAGE_NAME = "androidPackageName";
field public static final java.lang.String KEY_AUTHENTICATOR_TYPES = "authenticator_types";
@@ -3475,6 +3502,7 @@
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);
method public void openContextMenu(android.view.View);
method public void openOptionsMenu();
+ method public void overlayWithDecorCaption(boolean);
method public void overridePendingTransition(int, int);
method public void postponeEnterTransition();
method public void recreate();
@@ -3753,6 +3781,8 @@
}
public class ActivityOptions {
+ method public android.graphics.Rect getLaunchBounds();
+ method public boolean hasLaunchBounds();
method public static android.app.ActivityOptions makeBasic();
method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
@@ -3762,6 +3792,7 @@
method public static android.app.ActivityOptions makeTaskLaunchBehind();
method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);
method public void requestUsageTimeReport(android.app.PendingIntent);
+ method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);
method public android.os.Bundle toBundle();
method public void update(android.app.ActivityOptions);
field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";
@@ -4775,7 +4806,7 @@
method public android.graphics.drawable.Icon getLargeIcon();
method public android.graphics.drawable.Icon getSmallIcon();
method public java.lang.String getSortKey();
- method public android.app.Notification.Topic[] getTopics();
+ method public android.app.Notification.Topic getTopic();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
field public static final java.lang.String CATEGORY_ALARM = "alarm";
@@ -4838,6 +4869,7 @@
field public static final int PRIORITY_MAX = 2; // 0x2
field public static final int PRIORITY_MIN = -2; // 0xfffffffe
field public static final deprecated int STREAM_DEFAULT = -1; // 0xffffffff
+ field public static final java.lang.String TOPIC_DEFAULT = "system_default_topic";
field public static final int VISIBILITY_PRIVATE = 0; // 0x0
field public static final int VISIBILITY_PUBLIC = 1; // 0x1
field public static final int VISIBILITY_SECRET = -1; // 0xffffffff
@@ -4940,7 +4972,6 @@
method public android.app.Notification.Builder addAction(android.app.Notification.Action);
method public android.app.Notification.Builder addExtras(android.os.Bundle);
method public android.app.Notification.Builder addPerson(java.lang.String);
- method public android.app.Notification.Builder addTopic(android.app.Notification.Topic);
method public android.app.Notification build();
method public android.app.Notification.Builder extend(android.app.Notification.Extender);
method public android.os.Bundle getExtras();
@@ -4989,6 +5020,7 @@
method public android.app.Notification.Builder setSubText(java.lang.CharSequence);
method public android.app.Notification.Builder setTicker(java.lang.CharSequence);
method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews);
+ method public android.app.Notification.Builder setTopic(android.app.Notification.Topic);
method public android.app.Notification.Builder setUsesChronometer(boolean);
method public android.app.Notification.Builder setVibrate(long[]);
method public android.app.Notification.Builder setVisibility(int);
@@ -5146,10 +5178,12 @@
}
public static class NotificationManager.Policy implements android.os.Parcelable {
- ctor public NotificationManager.Policy(int, int, int);
+ ctor public deprecated NotificationManager.Policy(int, int, int);
+ ctor public NotificationManager.Policy(int, int, int, int);
method public int describeContents();
method public static java.lang.String priorityCategoriesToString(int);
method public static java.lang.String prioritySendersToString(int);
+ method public static java.lang.String suppressedEffectsToString(int);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.app.NotificationManager.Policy> CREATOR;
field public static final int PRIORITY_CATEGORY_CALLS = 8; // 0x8
@@ -5160,9 +5194,13 @@
field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
+ field public static final int SUPPRESSED_EFFECTS_UNSET = -1; // 0xffffffff
+ field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
+ field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
field public final int priorityCallSenders;
field public final int priorityCategories;
field public final int priorityMessageSenders;
+ field public final int suppressedVisualEffects;
}
public final class PendingIntent implements android.os.Parcelable {
@@ -5738,6 +5776,7 @@
method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);
method public android.os.Bundle getUserRestrictions(android.content.ComponentName);
+ method public java.lang.String getWifiMacAddress();
method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
method public boolean hasGrantedPolicy(android.content.ComponentName, int);
method public boolean installCaCert(android.content.ComponentName, byte[]);
@@ -5830,6 +5869,8 @@
field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";
field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";
field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";
+ field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
+ field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";
field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";
field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";
@@ -7400,12 +7441,16 @@
method public static boolean compareMimeTypes(java.lang.String, java.lang.String);
method public int describeContents();
method public java.lang.String[] filterMimeTypes(java.lang.String);
+ method public android.os.PersistableBundle getExtras();
method public java.lang.CharSequence getLabel();
method public java.lang.String getMimeType(int);
method public int getMimeTypeCount();
method public boolean hasMimeType(java.lang.String);
+ method public void setExtras(android.os.PersistableBundle);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;
+ field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";
+ field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";
field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";
field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";
@@ -7768,6 +7813,7 @@
method public abstract java.lang.String getPackageResourcePath();
method public abstract android.content.res.Resources getResources();
method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
method public final java.lang.String getString(int);
method public final java.lang.String getString(int, java.lang.Object...);
method public abstract java.lang.Object getSystemService(java.lang.String);
@@ -7866,6 +7912,7 @@
field public static final int MODE_APPEND = 32768; // 0x8000
field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
field public static final deprecated int MODE_MULTI_PROCESS = 4; // 0x4
+ field public static final int MODE_NO_LOCALIZED_COLLATORS = 16; // 0x10
field public static final int MODE_PRIVATE = 0; // 0x0
field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2
@@ -7950,6 +7997,7 @@
method public java.lang.String getPackageResourcePath();
method public android.content.res.Resources getResources();
method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
method public java.lang.Object getSystemService(java.lang.String);
method public java.lang.String getSystemServiceName(java.lang.Class<?>);
method public android.content.res.Resources.Theme getTheme();
@@ -8303,6 +8351,7 @@
field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";
field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";
field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";
+ field public static final java.lang.String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED";
field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW";
field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";
field public static final deprecated java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";
@@ -9920,6 +9969,7 @@
public static class Resources.NotFoundException extends java.lang.RuntimeException {
ctor public Resources.NotFoundException();
ctor public Resources.NotFoundException(java.lang.String);
+ ctor public Resources.NotFoundException(java.lang.String, java.lang.Exception);
}
public final class Resources.Theme {
@@ -13425,6 +13475,7 @@
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_TIMESTAMP_SOURCE;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_WHITE_LEVEL;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_MAX_ANALOG_SENSITIVITY;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect[]> SENSOR_OPTICAL_BLACK_REGIONS;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_ORIENTATION;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_REFERENCE_ILLUMINANT1;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> SENSOR_REFERENCE_ILLUMINANT2;
@@ -13837,6 +13888,8 @@
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> REQUEST_PIPELINE_DEPTH;
field public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> SCALER_CROP_REGION;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> SENSOR_DYNAMIC_BLACK_LEVEL;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SENSOR_DYNAMIC_WHITE_LEVEL;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_EXPOSURE_TIME;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_FRAME_DURATION;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> SENSOR_GREEN_SPLIT;
@@ -14265,6 +14318,4147 @@
}
+package android.icu.lang {
+
+ public final class UCharacter implements android.icu.lang.UCharacterEnums.ECharacterCategory android.icu.lang.UCharacterEnums.ECharacterDirection {
+ method public static int charCount(int);
+ method public static final int codePointAt(java.lang.CharSequence, int);
+ method public static final int codePointAt(char[], int);
+ method public static final int codePointAt(char[], int, int);
+ method public static final int codePointBefore(java.lang.CharSequence, int);
+ method public static final int codePointBefore(char[], int);
+ method public static final int codePointBefore(char[], int, int);
+ method public static int codePointCount(java.lang.CharSequence, int, int);
+ method public static int codePointCount(char[], int, int);
+ method public static int digit(int, int);
+ method public static int digit(int);
+ method public static int foldCase(int, boolean);
+ method public static java.lang.String foldCase(java.lang.String, boolean);
+ method public static int foldCase(int, int);
+ method public static final java.lang.String foldCase(java.lang.String, int);
+ method public static char forDigit(int, int);
+ method public static android.icu.util.VersionInfo getAge(int);
+ method public static int getBidiPairedBracket(int);
+ method public static int getCharFromExtendedName(java.lang.String);
+ method public static int getCharFromName(java.lang.String);
+ method public static int getCharFromNameAlias(java.lang.String);
+ method public static int getCodePoint(char, char);
+ method public static int getCodePoint(char);
+ method public static int getCombiningClass(int);
+ method public static int getDirection(int);
+ method public static byte getDirectionality(int);
+ method public static java.lang.String getExtendedName(int);
+ method public static android.icu.util.ValueIterator getExtendedNameIterator();
+ method public static int getHanNumericValue(int);
+ method public static int getIntPropertyMaxValue(int);
+ method public static int getIntPropertyMinValue(int);
+ method public static int getIntPropertyValue(int, int);
+ method public static int getMirror(int);
+ method public static java.lang.String getName(int);
+ method public static java.lang.String getName(java.lang.String, java.lang.String);
+ method public static java.lang.String getNameAlias(int);
+ method public static android.icu.util.ValueIterator getNameIterator();
+ method public static int getNumericValue(int);
+ method public static int getPropertyEnum(java.lang.CharSequence);
+ method public static java.lang.String getPropertyName(int, int);
+ method public static int getPropertyValueEnum(int, java.lang.CharSequence);
+ method public static java.lang.String getPropertyValueName(int, int, int);
+ method public static int getType(int);
+ method public static android.icu.util.RangeValueIterator getTypeIterator();
+ method public static double getUnicodeNumericValue(int);
+ method public static android.icu.util.VersionInfo getUnicodeVersion();
+ method public static boolean hasBinaryProperty(int, int);
+ method public static boolean isBMP(int);
+ method public static boolean isBaseForm(int);
+ method public static boolean isDefined(int);
+ method public static boolean isDigit(int);
+ method public static boolean isHighSurrogate(char);
+ method public static boolean isISOControl(int);
+ method public static boolean isIdentifierIgnorable(int);
+ method public static boolean isJavaIdentifierPart(int);
+ method public static boolean isJavaIdentifierStart(int);
+ method public static boolean isLegal(int);
+ method public static boolean isLegal(java.lang.String);
+ method public static boolean isLetter(int);
+ method public static boolean isLetterOrDigit(int);
+ method public static boolean isLowSurrogate(char);
+ method public static boolean isLowerCase(int);
+ method public static boolean isMirrored(int);
+ method public static boolean isPrintable(int);
+ method public static boolean isSpaceChar(int);
+ method public static boolean isSupplementary(int);
+ method public static final boolean isSupplementaryCodePoint(int);
+ method public static final boolean isSurrogatePair(char, char);
+ method public static boolean isTitleCase(int);
+ method public static boolean isUAlphabetic(int);
+ method public static boolean isULowercase(int);
+ method public static boolean isUUppercase(int);
+ method public static boolean isUWhiteSpace(int);
+ method public static boolean isUnicodeIdentifierPart(int);
+ method public static boolean isUnicodeIdentifierStart(int);
+ method public static boolean isUpperCase(int);
+ method public static final boolean isValidCodePoint(int);
+ method public static boolean isWhitespace(int);
+ method public static int offsetByCodePoints(java.lang.CharSequence, int, int);
+ method public static int offsetByCodePoints(char[], int, int, int, int);
+ method public static final int toChars(int, char[], int);
+ method public static final char[] toChars(int);
+ method public static final int toCodePoint(char, char);
+ method public static int toLowerCase(int);
+ method public static java.lang.String toLowerCase(java.lang.String);
+ method public static java.lang.String toLowerCase(java.util.Locale, java.lang.String);
+ method public static java.lang.String toLowerCase(android.icu.util.ULocale, java.lang.String);
+ method public static java.lang.String toString(int);
+ method public static int toTitleCase(int);
+ method public static java.lang.String toTitleCase(java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(java.util.Locale, java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(android.icu.util.ULocale, java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(android.icu.util.ULocale, java.lang.String, android.icu.text.BreakIterator, int);
+ method public static java.lang.String toTitleCase(java.util.Locale, java.lang.String, android.icu.text.BreakIterator, int);
+ method public static int toUpperCase(int);
+ method public static java.lang.String toUpperCase(java.lang.String);
+ method public static java.lang.String toUpperCase(java.util.Locale, java.lang.String);
+ method public static java.lang.String toUpperCase(android.icu.util.ULocale, java.lang.String);
+ field public static final int FOLD_CASE_DEFAULT = 0; // 0x0
+ field public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1; // 0x1
+ field public static final int MAX_CODE_POINT = 1114111; // 0x10ffff
+ field public static final char MAX_HIGH_SURROGATE = 56319; // 0xdbff '\udbff'
+ field public static final char MAX_LOW_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_RADIX = 36; // 0x24
+ field public static final char MAX_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_VALUE = 1114111; // 0x10ffff
+ field public static final int MIN_CODE_POINT = 0; // 0x0
+ field public static final char MIN_HIGH_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final char MIN_LOW_SURROGATE = 56320; // 0xdc00 '\udc00'
+ field public static final int MIN_RADIX = 2; // 0x2
+ field public static final int MIN_SUPPLEMENTARY_CODE_POINT = 65536; // 0x10000
+ field public static final char MIN_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final int MIN_VALUE = 0; // 0x0
+ field public static final double NO_NUMERIC_VALUE = -1.23456789E8;
+ field public static final int REPLACEMENT_CHAR = 65533; // 0xfffd
+ field public static final int SUPPLEMENTARY_MIN_VALUE = 65536; // 0x10000
+ field public static final int TITLECASE_NO_BREAK_ADJUSTMENT = 512; // 0x200
+ field public static final int TITLECASE_NO_LOWERCASE = 256; // 0x100
+ }
+
+ public static abstract interface UCharacter.BidiPairedBracketType {
+ field public static final int CLOSE = 2; // 0x2
+ field public static final int COUNT = 3; // 0x3
+ field public static final int NONE = 0; // 0x0
+ field public static final int OPEN = 1; // 0x1
+ }
+
+ public static abstract interface UCharacter.DecompositionType {
+ field public static final int CANONICAL = 1; // 0x1
+ field public static final int CIRCLE = 3; // 0x3
+ field public static final int COMPAT = 2; // 0x2
+ field public static final int COUNT = 18; // 0x12
+ field public static final int FINAL = 4; // 0x4
+ field public static final int FONT = 5; // 0x5
+ field public static final int FRACTION = 6; // 0x6
+ field public static final int INITIAL = 7; // 0x7
+ field public static final int ISOLATED = 8; // 0x8
+ field public static final int MEDIAL = 9; // 0x9
+ field public static final int NARROW = 10; // 0xa
+ field public static final int NOBREAK = 11; // 0xb
+ field public static final int NONE = 0; // 0x0
+ field public static final int SMALL = 12; // 0xc
+ field public static final int SQUARE = 13; // 0xd
+ field public static final int SUB = 14; // 0xe
+ field public static final int SUPER = 15; // 0xf
+ field public static final int VERTICAL = 16; // 0x10
+ field public static final int WIDE = 17; // 0x11
+ }
+
+ public static abstract interface UCharacter.EastAsianWidth {
+ field public static final int AMBIGUOUS = 1; // 0x1
+ field public static final int COUNT = 6; // 0x6
+ field public static final int FULLWIDTH = 3; // 0x3
+ field public static final int HALFWIDTH = 2; // 0x2
+ field public static final int NARROW = 4; // 0x4
+ field public static final int NEUTRAL = 0; // 0x0
+ field public static final int WIDE = 5; // 0x5
+ }
+
+ public static abstract interface UCharacter.GraphemeClusterBreak {
+ field public static final int CONTROL = 1; // 0x1
+ field public static final int COUNT = 13; // 0xd
+ field public static final int CR = 2; // 0x2
+ field public static final int EXTEND = 3; // 0x3
+ field public static final int L = 4; // 0x4
+ field public static final int LF = 5; // 0x5
+ field public static final int LV = 6; // 0x6
+ field public static final int LVT = 7; // 0x7
+ field public static final int OTHER = 0; // 0x0
+ field public static final int PREPEND = 11; // 0xb
+ field public static final int REGIONAL_INDICATOR = 12; // 0xc
+ field public static final int SPACING_MARK = 10; // 0xa
+ field public static final int T = 8; // 0x8
+ field public static final int V = 9; // 0x9
+ }
+
+ public static abstract interface UCharacter.HangulSyllableType {
+ field public static final int COUNT = 6; // 0x6
+ field public static final int LEADING_JAMO = 1; // 0x1
+ field public static final int LVT_SYLLABLE = 5; // 0x5
+ field public static final int LV_SYLLABLE = 4; // 0x4
+ field public static final int NOT_APPLICABLE = 0; // 0x0
+ field public static final int TRAILING_JAMO = 3; // 0x3
+ field public static final int VOWEL_JAMO = 2; // 0x2
+ }
+
+ public static abstract interface UCharacter.JoiningGroup {
+ field public static final int AIN = 1; // 0x1
+ field public static final int ALAPH = 2; // 0x2
+ field public static final int ALEF = 3; // 0x3
+ field public static final int BEH = 4; // 0x4
+ field public static final int BETH = 5; // 0x5
+ field public static final int BURUSHASKI_YEH_BARREE = 54; // 0x36
+ field public static final int COUNT = 86; // 0x56
+ field public static final int DAL = 6; // 0x6
+ field public static final int DALATH_RISH = 7; // 0x7
+ field public static final int E = 8; // 0x8
+ field public static final int FARSI_YEH = 55; // 0x37
+ field public static final int FE = 51; // 0x33
+ field public static final int FEH = 9; // 0x9
+ field public static final int FINAL_SEMKATH = 10; // 0xa
+ field public static final int GAF = 11; // 0xb
+ field public static final int GAMAL = 12; // 0xc
+ field public static final int HAH = 13; // 0xd
+ field public static final int HAMZA_ON_HEH_GOAL = 14; // 0xe
+ field public static final int HE = 15; // 0xf
+ field public static final int HEH = 16; // 0x10
+ field public static final int HEH_GOAL = 17; // 0x11
+ field public static final int HETH = 18; // 0x12
+ field public static final int KAF = 19; // 0x13
+ field public static final int KAPH = 20; // 0x14
+ field public static final int KHAPH = 52; // 0x34
+ field public static final int KNOTTED_HEH = 21; // 0x15
+ field public static final int LAM = 22; // 0x16
+ field public static final int LAMADH = 23; // 0x17
+ field public static final int MANICHAEAN_ALEPH = 58; // 0x3a
+ field public static final int MANICHAEAN_AYIN = 59; // 0x3b
+ field public static final int MANICHAEAN_BETH = 60; // 0x3c
+ field public static final int MANICHAEAN_DALETH = 61; // 0x3d
+ field public static final int MANICHAEAN_DHAMEDH = 62; // 0x3e
+ field public static final int MANICHAEAN_FIVE = 63; // 0x3f
+ field public static final int MANICHAEAN_GIMEL = 64; // 0x40
+ field public static final int MANICHAEAN_HETH = 65; // 0x41
+ field public static final int MANICHAEAN_HUNDRED = 66; // 0x42
+ field public static final int MANICHAEAN_KAPH = 67; // 0x43
+ field public static final int MANICHAEAN_LAMEDH = 68; // 0x44
+ field public static final int MANICHAEAN_MEM = 69; // 0x45
+ field public static final int MANICHAEAN_NUN = 70; // 0x46
+ field public static final int MANICHAEAN_ONE = 71; // 0x47
+ field public static final int MANICHAEAN_PE = 72; // 0x48
+ field public static final int MANICHAEAN_QOPH = 73; // 0x49
+ field public static final int MANICHAEAN_RESH = 74; // 0x4a
+ field public static final int MANICHAEAN_SADHE = 75; // 0x4b
+ field public static final int MANICHAEAN_SAMEKH = 76; // 0x4c
+ field public static final int MANICHAEAN_TAW = 77; // 0x4d
+ field public static final int MANICHAEAN_TEN = 78; // 0x4e
+ field public static final int MANICHAEAN_TETH = 79; // 0x4f
+ field public static final int MANICHAEAN_THAMEDH = 80; // 0x50
+ field public static final int MANICHAEAN_TWENTY = 81; // 0x51
+ field public static final int MANICHAEAN_WAW = 82; // 0x52
+ field public static final int MANICHAEAN_YODH = 83; // 0x53
+ field public static final int MANICHAEAN_ZAYIN = 84; // 0x54
+ field public static final int MEEM = 24; // 0x18
+ field public static final int MIM = 25; // 0x19
+ field public static final int NOON = 26; // 0x1a
+ field public static final int NO_JOINING_GROUP = 0; // 0x0
+ field public static final int NUN = 27; // 0x1b
+ field public static final int NYA = 56; // 0x38
+ field public static final int PE = 28; // 0x1c
+ field public static final int QAF = 29; // 0x1d
+ field public static final int QAPH = 30; // 0x1e
+ field public static final int REH = 31; // 0x1f
+ field public static final int REVERSED_PE = 32; // 0x20
+ field public static final int ROHINGYA_YEH = 57; // 0x39
+ field public static final int SAD = 33; // 0x21
+ field public static final int SADHE = 34; // 0x22
+ field public static final int SEEN = 35; // 0x23
+ field public static final int SEMKATH = 36; // 0x24
+ field public static final int SHIN = 37; // 0x25
+ field public static final int STRAIGHT_WAW = 85; // 0x55
+ field public static final int SWASH_KAF = 38; // 0x26
+ field public static final int SYRIAC_WAW = 39; // 0x27
+ field public static final int TAH = 40; // 0x28
+ field public static final int TAW = 41; // 0x29
+ field public static final int TEH_MARBUTA = 42; // 0x2a
+ field public static final int TEH_MARBUTA_GOAL = 14; // 0xe
+ field public static final int TETH = 43; // 0x2b
+ field public static final int WAW = 44; // 0x2c
+ field public static final int YEH = 45; // 0x2d
+ field public static final int YEH_BARREE = 46; // 0x2e
+ field public static final int YEH_WITH_TAIL = 47; // 0x2f
+ field public static final int YUDH = 48; // 0x30
+ field public static final int YUDH_HE = 49; // 0x31
+ field public static final int ZAIN = 50; // 0x32
+ field public static final int ZHAIN = 53; // 0x35
+ }
+
+ public static abstract interface UCharacter.JoiningType {
+ field public static final int COUNT = 6; // 0x6
+ field public static final int DUAL_JOINING = 2; // 0x2
+ field public static final int JOIN_CAUSING = 1; // 0x1
+ field public static final int LEFT_JOINING = 3; // 0x3
+ field public static final int NON_JOINING = 0; // 0x0
+ field public static final int RIGHT_JOINING = 4; // 0x4
+ field public static final int TRANSPARENT = 5; // 0x5
+ }
+
+ public static abstract interface UCharacter.LineBreak {
+ field public static final int ALPHABETIC = 2; // 0x2
+ field public static final int AMBIGUOUS = 1; // 0x1
+ field public static final int BREAK_AFTER = 4; // 0x4
+ field public static final int BREAK_BEFORE = 5; // 0x5
+ field public static final int BREAK_BOTH = 3; // 0x3
+ field public static final int BREAK_SYMBOLS = 27; // 0x1b
+ field public static final int CARRIAGE_RETURN = 10; // 0xa
+ field public static final int CLOSE_PARENTHESIS = 36; // 0x24
+ field public static final int CLOSE_PUNCTUATION = 8; // 0x8
+ field public static final int COMBINING_MARK = 9; // 0x9
+ field public static final int COMPLEX_CONTEXT = 24; // 0x18
+ field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
+ field public static final int CONTINGENT_BREAK = 7; // 0x7
+ field public static final int COUNT = 40; // 0x28
+ field public static final int EXCLAMATION = 11; // 0xb
+ field public static final int GLUE = 12; // 0xc
+ field public static final int H2 = 31; // 0x1f
+ field public static final int H3 = 32; // 0x20
+ field public static final int HEBREW_LETTER = 38; // 0x26
+ field public static final int HYPHEN = 13; // 0xd
+ field public static final int IDEOGRAPHIC = 14; // 0xe
+ field public static final int INFIX_NUMERIC = 16; // 0x10
+ field public static final int INSEPARABLE = 15; // 0xf
+ field public static final int INSEPERABLE = 15; // 0xf
+ field public static final int JL = 33; // 0x21
+ field public static final int JT = 34; // 0x22
+ field public static final int JV = 35; // 0x23
+ field public static final int LINE_FEED = 17; // 0x11
+ field public static final int MANDATORY_BREAK = 6; // 0x6
+ field public static final int NEXT_LINE = 29; // 0x1d
+ field public static final int NONSTARTER = 18; // 0x12
+ field public static final int NUMERIC = 19; // 0x13
+ field public static final int OPEN_PUNCTUATION = 20; // 0x14
+ field public static final int POSTFIX_NUMERIC = 21; // 0x15
+ field public static final int PREFIX_NUMERIC = 22; // 0x16
+ field public static final int QUOTATION = 23; // 0x17
+ field public static final int REGIONAL_INDICATOR = 39; // 0x27
+ field public static final int SPACE = 26; // 0x1a
+ field public static final int SURROGATE = 25; // 0x19
+ field public static final int UNKNOWN = 0; // 0x0
+ field public static final int WORD_JOINER = 30; // 0x1e
+ field public static final int ZWSPACE = 28; // 0x1c
+ }
+
+ public static abstract interface UCharacter.NumericType {
+ field public static final int COUNT = 4; // 0x4
+ field public static final int DECIMAL = 1; // 0x1
+ field public static final int DIGIT = 2; // 0x2
+ field public static final int NONE = 0; // 0x0
+ field public static final int NUMERIC = 3; // 0x3
+ }
+
+ public static abstract interface UCharacter.SentenceBreak {
+ field public static final int ATERM = 1; // 0x1
+ field public static final int CLOSE = 2; // 0x2
+ field public static final int COUNT = 15; // 0xf
+ field public static final int CR = 11; // 0xb
+ field public static final int EXTEND = 12; // 0xc
+ field public static final int FORMAT = 3; // 0x3
+ field public static final int LF = 13; // 0xd
+ field public static final int LOWER = 4; // 0x4
+ field public static final int NUMERIC = 5; // 0x5
+ field public static final int OLETTER = 6; // 0x6
+ field public static final int OTHER = 0; // 0x0
+ field public static final int SCONTINUE = 14; // 0xe
+ field public static final int SEP = 7; // 0x7
+ field public static final int SP = 8; // 0x8
+ field public static final int STERM = 9; // 0x9
+ field public static final int UPPER = 10; // 0xa
+ }
+
+ public static final class UCharacter.UnicodeBlock extends java.lang.Character.Subset {
+ method public static final android.icu.lang.UCharacter.UnicodeBlock forName(java.lang.String);
+ method public int getID();
+ method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
+ method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
+ field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
+ field public static final int AHOM_ID = 253; // 0xfd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ALCHEMICAL_SYMBOLS;
+ field public static final int ALCHEMICAL_SYMBOLS_ID = 208; // 0xd0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ALPHABETIC_PRESENTATION_FORMS;
+ field public static final int ALPHABETIC_PRESENTATION_FORMS_ID = 80; // 0x50
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANATOLIAN_HIEROGLYPHS;
+ field public static final int ANATOLIAN_HIEROGLYPHS_ID = 254; // 0xfe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION;
+ field public static final int ANCIENT_GREEK_MUSICAL_NOTATION_ID = 126; // 0x7e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_GREEK_NUMBERS;
+ field public static final int ANCIENT_GREEK_NUMBERS_ID = 127; // 0x7f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_SYMBOLS;
+ field public static final int ANCIENT_SYMBOLS_ID = 165; // 0xa5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_EXTENDED_A;
+ field public static final int ARABIC_EXTENDED_A_ID = 210; // 0xd2
+ field public static final int ARABIC_ID = 12; // 0xc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS;
+ field public static final int ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS_ID = 211; // 0xd3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_PRESENTATION_FORMS_A;
+ field public static final int ARABIC_PRESENTATION_FORMS_A_ID = 81; // 0x51
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_PRESENTATION_FORMS_B;
+ field public static final int ARABIC_PRESENTATION_FORMS_B_ID = 85; // 0x55
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_SUPPLEMENT;
+ field public static final int ARABIC_SUPPLEMENT_ID = 128; // 0x80
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARMENIAN;
+ field public static final int ARMENIAN_ID = 10; // 0xa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARROWS;
+ field public static final int ARROWS_ID = 46; // 0x2e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AVESTAN;
+ field public static final int AVESTAN_ID = 188; // 0xbc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BALINESE;
+ field public static final int BALINESE_ID = 147; // 0x93
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BAMUM;
+ field public static final int BAMUM_ID = 177; // 0xb1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BAMUM_SUPPLEMENT;
+ field public static final int BAMUM_SUPPLEMENT_ID = 202; // 0xca
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BASIC_LATIN;
+ field public static final int BASIC_LATIN_ID = 1; // 0x1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BASSA_VAH;
+ field public static final int BASSA_VAH_ID = 221; // 0xdd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BATAK;
+ field public static final int BATAK_ID = 199; // 0xc7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
+ field public static final int BENGALI_ID = 16; // 0x10
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
+ field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO_EXTENDED;
+ field public static final int BOPOMOFO_EXTENDED_ID = 67; // 0x43
+ field public static final int BOPOMOFO_ID = 64; // 0x40
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOX_DRAWING;
+ field public static final int BOX_DRAWING_ID = 52; // 0x34
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BRAHMI;
+ field public static final int BRAHMI_ID = 201; // 0xc9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BRAILLE_PATTERNS;
+ field public static final int BRAILLE_PATTERNS_ID = 57; // 0x39
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BUGINESE;
+ field public static final int BUGINESE_ID = 129; // 0x81
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BUHID;
+ field public static final int BUHID_ID = 100; // 0x64
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS;
+ field public static final int BYZANTINE_MUSICAL_SYMBOLS_ID = 91; // 0x5b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CARIAN;
+ field public static final int CARIAN_ID = 168; // 0xa8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CAUCASIAN_ALBANIAN;
+ field public static final int CAUCASIAN_ALBANIAN_ID = 222; // 0xde
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHAKMA;
+ field public static final int CHAKMA_ID = 212; // 0xd4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHAM;
+ field public static final int CHAM_ID = 164; // 0xa4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE;
+ field public static final int CHEROKEE_ID = 32; // 0x20
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE_SUPPLEMENT;
+ field public static final int CHEROKEE_SUPPLEMENT_ID = 255; // 0xff
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_FORMS;
+ field public static final int CJK_COMPATIBILITY_FORMS_ID = 83; // 0x53
+ field public static final int CJK_COMPATIBILITY_ID = 69; // 0x45
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS;
+ field public static final int CJK_COMPATIBILITY_IDEOGRAPHS_ID = 79; // 0x4f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT;
+ field public static final int CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT_ID = 95; // 0x5f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_RADICALS_SUPPLEMENT;
+ field public static final int CJK_RADICALS_SUPPLEMENT_ID = 58; // 0x3a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_STROKES;
+ field public static final int CJK_STROKES_ID = 130; // 0x82
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION;
+ field public static final int CJK_SYMBOLS_AND_PUNCTUATION_ID = 61; // 0x3d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A_ID = 70; // 0x46
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B_ID = 94; // 0x5e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C_ID = 197; // 0xc5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D_ID = 209; // 0xd1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E_ID = 256; // 0x100
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_ID = 71; // 0x47
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_EXTENDED;
+ field public static final int COMBINING_DIACRITICAL_MARKS_EXTENDED_ID = 224; // 0xe0
+ field public static final int COMBINING_DIACRITICAL_MARKS_ID = 7; // 0x7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT;
+ field public static final int COMBINING_DIACRITICAL_MARKS_SUPPLEMENT_ID = 131; // 0x83
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_HALF_MARKS;
+ field public static final int COMBINING_HALF_MARKS_ID = 82; // 0x52
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS;
+ field public static final int COMBINING_MARKS_FOR_SYMBOLS_ID = 43; // 0x2b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMMON_INDIC_NUMBER_FORMS;
+ field public static final int COMMON_INDIC_NUMBER_FORMS_ID = 178; // 0xb2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CONTROL_PICTURES;
+ field public static final int CONTROL_PICTURES_ID = 49; // 0x31
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COPTIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COPTIC_EPACT_NUMBERS;
+ field public static final int COPTIC_EPACT_NUMBERS_ID = 223; // 0xdf
+ field public static final int COPTIC_ID = 132; // 0x84
+ field public static final int COUNT = 263; // 0x107
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COUNTING_ROD_NUMERALS;
+ field public static final int COUNTING_ROD_NUMERALS_ID = 154; // 0x9a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CUNEIFORM;
+ field public static final int CUNEIFORM_ID = 152; // 0x98
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION;
+ field public static final int CUNEIFORM_NUMBERS_AND_PUNCTUATION_ID = 153; // 0x99
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CURRENCY_SYMBOLS;
+ field public static final int CURRENCY_SYMBOLS_ID = 42; // 0x2a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYPRIOT_SYLLABARY;
+ field public static final int CYPRIOT_SYLLABARY_ID = 123; // 0x7b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_A;
+ field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
+ field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
+ field public static final int CYRILLIC_ID = 9; // 0x9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
+ field public static final int CYRILLIC_SUPPLEMENTARY_ID = 97; // 0x61
+ field public static final int CYRILLIC_SUPPLEMENT_ID = 97; // 0x61
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DESERET;
+ field public static final int DESERET_ID = 90; // 0x5a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DEVANAGARI;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DEVANAGARI_EXTENDED;
+ field public static final int DEVANAGARI_EXTENDED_ID = 179; // 0xb3
+ field public static final int DEVANAGARI_ID = 15; // 0xf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DINGBATS;
+ field public static final int DINGBATS_ID = 56; // 0x38
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DOMINO_TILES;
+ field public static final int DOMINO_TILES_ID = 171; // 0xab
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DUPLOYAN;
+ field public static final int DUPLOYAN_ID = 225; // 0xe1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EARLY_DYNASTIC_CUNEIFORM;
+ field public static final int EARLY_DYNASTIC_CUNEIFORM_ID = 257; // 0x101
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EGYPTIAN_HIEROGLYPHS;
+ field public static final int EGYPTIAN_HIEROGLYPHS_ID = 194; // 0xc2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ELBASAN;
+ field public static final int ELBASAN_ID = 226; // 0xe2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EMOTICONS;
+ field public static final int EMOTICONS_ID = 206; // 0xce
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_ALPHANUMERICS;
+ field public static final int ENCLOSED_ALPHANUMERICS_ID = 51; // 0x33
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT;
+ field public static final int ENCLOSED_ALPHANUMERIC_SUPPLEMENT_ID = 195; // 0xc3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS;
+ field public static final int ENCLOSED_CJK_LETTERS_AND_MONTHS_ID = 68; // 0x44
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT;
+ field public static final int ENCLOSED_IDEOGRAPHIC_SUPPLEMENT_ID = 196; // 0xc4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_EXTENDED;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_EXTENDED_A;
+ field public static final int ETHIOPIC_EXTENDED_A_ID = 200; // 0xc8
+ field public static final int ETHIOPIC_EXTENDED_ID = 133; // 0x85
+ field public static final int ETHIOPIC_ID = 31; // 0x1f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_SUPPLEMENT;
+ field public static final int ETHIOPIC_SUPPLEMENT_ID = 134; // 0x86
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GENERAL_PUNCTUATION;
+ field public static final int GENERAL_PUNCTUATION_ID = 40; // 0x28
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEOMETRIC_SHAPES;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEOMETRIC_SHAPES_EXTENDED;
+ field public static final int GEOMETRIC_SHAPES_EXTENDED_ID = 227; // 0xe3
+ field public static final int GEOMETRIC_SHAPES_ID = 54; // 0x36
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN;
+ field public static final int GEORGIAN_ID = 29; // 0x1d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN_SUPPLEMENT;
+ field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
+ field public static final int GLAGOLITIC_ID = 136; // 0x88
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
+ field public static final int GOTHIC_ID = 89; // 0x59
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
+ field public static final int GRANTHA_ID = 228; // 0xe4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GREEK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GREEK_EXTENDED;
+ field public static final int GREEK_EXTENDED_ID = 39; // 0x27
+ field public static final int GREEK_ID = 8; // 0x8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GUJARATI;
+ field public static final int GUJARATI_ID = 18; // 0x12
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GURMUKHI;
+ field public static final int GURMUKHI_ID = 17; // 0x11
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS;
+ field public static final int HALFWIDTH_AND_FULLWIDTH_FORMS_ID = 87; // 0x57
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_COMPATIBILITY_JAMO;
+ field public static final int HANGUL_COMPATIBILITY_JAMO_ID = 65; // 0x41
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO_EXTENDED_A;
+ field public static final int HANGUL_JAMO_EXTENDED_A_ID = 180; // 0xb4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO_EXTENDED_B;
+ field public static final int HANGUL_JAMO_EXTENDED_B_ID = 185; // 0xb9
+ field public static final int HANGUL_JAMO_ID = 30; // 0x1e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_SYLLABLES;
+ field public static final int HANGUL_SYLLABLES_ID = 74; // 0x4a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANUNOO;
+ field public static final int HANUNOO_ID = 99; // 0x63
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HATRAN;
+ field public static final int HATRAN_ID = 258; // 0x102
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HEBREW;
+ field public static final int HEBREW_ID = 11; // 0xb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIGH_PRIVATE_USE_SURROGATES;
+ field public static final int HIGH_PRIVATE_USE_SURROGATES_ID = 76; // 0x4c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIGH_SURROGATES;
+ field public static final int HIGH_SURROGATES_ID = 75; // 0x4b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIRAGANA;
+ field public static final int HIRAGANA_ID = 62; // 0x3e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
+ field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
+ field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
+ field public static final int INSCRIPTIONAL_PAHLAVI_ID = 190; // 0xbe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PARTHIAN;
+ field public static final int INSCRIPTIONAL_PARTHIAN_ID = 189; // 0xbd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INVALID_CODE;
+ field public static final int INVALID_CODE_ID = -1; // 0xffffffff
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IPA_EXTENSIONS;
+ field public static final int IPA_EXTENSIONS_ID = 5; // 0x5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock JAVANESE;
+ field public static final int JAVANESE_ID = 181; // 0xb5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KAITHI;
+ field public static final int KAITHI_ID = 193; // 0xc1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANA_SUPPLEMENT;
+ field public static final int KANA_SUPPLEMENT_ID = 203; // 0xcb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANBUN;
+ field public static final int KANBUN_ID = 66; // 0x42
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANGXI_RADICALS;
+ field public static final int KANGXI_RADICALS_ID = 59; // 0x3b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANNADA;
+ field public static final int KANNADA_ID = 22; // 0x16
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KATAKANA;
+ field public static final int KATAKANA_ID = 63; // 0x3f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS;
+ field public static final int KATAKANA_PHONETIC_EXTENSIONS_ID = 107; // 0x6b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KAYAH_LI;
+ field public static final int KAYAH_LI_ID = 162; // 0xa2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHAROSHTHI;
+ field public static final int KHAROSHTHI_ID = 137; // 0x89
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHMER;
+ field public static final int KHMER_ID = 36; // 0x24
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHMER_SYMBOLS;
+ field public static final int KHMER_SYMBOLS_ID = 113; // 0x71
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHOJKI;
+ field public static final int KHOJKI_ID = 229; // 0xe5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHUDAWADI;
+ field public static final int KHUDAWADI_ID = 230; // 0xe6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LAO;
+ field public static final int LAO_ID = 26; // 0x1a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_1_SUPPLEMENT;
+ field public static final int LATIN_1_SUPPLEMENT_ID = 2; // 0x2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_A;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_ADDITIONAL;
+ field public static final int LATIN_EXTENDED_ADDITIONAL_ID = 38; // 0x26
+ field public static final int LATIN_EXTENDED_A_ID = 3; // 0x3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_B;
+ field public static final int LATIN_EXTENDED_B_ID = 4; // 0x4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_C;
+ field public static final int LATIN_EXTENDED_C_ID = 148; // 0x94
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_D;
+ field public static final int LATIN_EXTENDED_D_ID = 149; // 0x95
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_E;
+ field public static final int LATIN_EXTENDED_E_ID = 231; // 0xe7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LEPCHA;
+ field public static final int LEPCHA_ID = 156; // 0x9c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LETTERLIKE_SYMBOLS;
+ field public static final int LETTERLIKE_SYMBOLS_ID = 44; // 0x2c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LIMBU;
+ field public static final int LIMBU_ID = 111; // 0x6f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_A;
+ field public static final int LINEAR_A_ID = 232; // 0xe8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_B_IDEOGRAMS;
+ field public static final int LINEAR_B_IDEOGRAMS_ID = 118; // 0x76
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_B_SYLLABARY;
+ field public static final int LINEAR_B_SYLLABARY_ID = 117; // 0x75
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LISU;
+ field public static final int LISU_ID = 176; // 0xb0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LOW_SURROGATES;
+ field public static final int LOW_SURROGATES_ID = 77; // 0x4d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LYCIAN;
+ field public static final int LYCIAN_ID = 167; // 0xa7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LYDIAN;
+ field public static final int LYDIAN_ID = 169; // 0xa9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MAHAJANI;
+ field public static final int MAHAJANI_ID = 233; // 0xe9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MAHJONG_TILES;
+ field public static final int MAHJONG_TILES_ID = 170; // 0xaa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MALAYALAM;
+ field public static final int MALAYALAM_ID = 23; // 0x17
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MANDAIC;
+ field public static final int MANDAIC_ID = 198; // 0xc6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
+ field public static final int MANICHAEAN_ID = 234; // 0xea
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS;
+ field public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93; // 0x5d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_OPERATORS;
+ field public static final int MATHEMATICAL_OPERATORS_ID = 47; // 0x2f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK_EXTENSIONS;
+ field public static final int MEETEI_MAYEK_EXTENSIONS_ID = 213; // 0xd5
+ field public static final int MEETEI_MAYEK_ID = 184; // 0xb8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MENDE_KIKAKUI;
+ field public static final int MENDE_KIKAKUI_ID = 235; // 0xeb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEROITIC_CURSIVE;
+ field public static final int MEROITIC_CURSIVE_ID = 214; // 0xd6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEROITIC_HIEROGLYPHS;
+ field public static final int MEROITIC_HIEROGLYPHS_ID = 215; // 0xd7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MIAO;
+ field public static final int MIAO_ID = 216; // 0xd8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A;
+ field public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A_ID = 102; // 0x66
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B;
+ field public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B_ID = 105; // 0x69
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS;
+ field public static final int MISCELLANEOUS_SYMBOLS_AND_ARROWS_ID = 115; // 0x73
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final int MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS_ID = 205; // 0xcd
+ field public static final int MISCELLANEOUS_SYMBOLS_ID = 55; // 0x37
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_TECHNICAL;
+ field public static final int MISCELLANEOUS_TECHNICAL_ID = 48; // 0x30
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MODI;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MODIFIER_TONE_LETTERS;
+ field public static final int MODIFIER_TONE_LETTERS_ID = 138; // 0x8a
+ field public static final int MODI_ID = 236; // 0xec
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
+ field public static final int MONGOLIAN_ID = 37; // 0x25
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
+ field public static final int MRO_ID = 237; // 0xed
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
+ field public static final int MULTANI_ID = 259; // 0x103
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MUSICAL_SYMBOLS;
+ field public static final int MUSICAL_SYMBOLS_ID = 92; // 0x5c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR_EXTENDED_A;
+ field public static final int MYANMAR_EXTENDED_A_ID = 182; // 0xb6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR_EXTENDED_B;
+ field public static final int MYANMAR_EXTENDED_B_ID = 238; // 0xee
+ field public static final int MYANMAR_ID = 28; // 0x1c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
+ field public static final int NABATAEAN_ID = 239; // 0xef
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
+ field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
+ field public static final int NKO_ID = 146; // 0x92
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NO_BLOCK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NUMBER_FORMS;
+ field public static final int NUMBER_FORMS_ID = 45; // 0x2d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OGHAM;
+ field public static final int OGHAM_ID = 34; // 0x22
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_HUNGARIAN;
+ field public static final int OLD_HUNGARIAN_ID = 260; // 0x104
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_ITALIC;
+ field public static final int OLD_ITALIC_ID = 88; // 0x58
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_NORTH_ARABIAN;
+ field public static final int OLD_NORTH_ARABIAN_ID = 240; // 0xf0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERMIC;
+ field public static final int OLD_PERMIC_ID = 241; // 0xf1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERSIAN;
+ field public static final int OLD_PERSIAN_ID = 140; // 0x8c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_SOUTH_ARABIAN;
+ field public static final int OLD_SOUTH_ARABIAN_ID = 187; // 0xbb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_TURKIC;
+ field public static final int OLD_TURKIC_ID = 191; // 0xbf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OL_CHIKI;
+ field public static final int OL_CHIKI_ID = 157; // 0x9d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OPTICAL_CHARACTER_RECOGNITION;
+ field public static final int OPTICAL_CHARACTER_RECOGNITION_ID = 50; // 0x32
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ORIYA;
+ field public static final int ORIYA_ID = 19; // 0x13
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
+ field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
+ field public static final int OSMANYA_ID = 122; // 0x7a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
+ field public static final int PAHAWH_HMONG_ID = 243; // 0xf3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PALMYRENE;
+ field public static final int PALMYRENE_ID = 244; // 0xf4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PAU_CIN_HAU;
+ field public static final int PAU_CIN_HAU_ID = 245; // 0xf5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHAGS_PA;
+ field public static final int PHAGS_PA_ID = 150; // 0x96
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHAISTOS_DISC;
+ field public static final int PHAISTOS_DISC_ID = 166; // 0xa6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHOENICIAN;
+ field public static final int PHOENICIAN_ID = 151; // 0x97
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHONETIC_EXTENSIONS;
+ field public static final int PHONETIC_EXTENSIONS_ID = 114; // 0x72
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT;
+ field public static final int PHONETIC_EXTENSIONS_SUPPLEMENT_ID = 141; // 0x8d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PLAYING_CARDS;
+ field public static final int PLAYING_CARDS_ID = 204; // 0xcc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PRIVATE_USE;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PRIVATE_USE_AREA;
+ field public static final int PRIVATE_USE_AREA_ID = 78; // 0x4e
+ field public static final int PRIVATE_USE_ID = 78; // 0x4e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PSALTER_PAHLAVI;
+ field public static final int PSALTER_PAHLAVI_ID = 246; // 0xf6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock REJANG;
+ field public static final int REJANG_ID = 163; // 0xa3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock RUMI_NUMERAL_SYMBOLS;
+ field public static final int RUMI_NUMERAL_SYMBOLS_ID = 192; // 0xc0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock RUNIC;
+ field public static final int RUNIC_ID = 35; // 0x23
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SAMARITAN;
+ field public static final int SAMARITAN_ID = 172; // 0xac
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SAURASHTRA;
+ field public static final int SAURASHTRA_ID = 161; // 0xa1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHARADA;
+ field public static final int SHARADA_ID = 217; // 0xd9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHAVIAN;
+ field public static final int SHAVIAN_ID = 121; // 0x79
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHORTHAND_FORMAT_CONTROLS;
+ field public static final int SHORTHAND_FORMAT_CONTROLS_ID = 247; // 0xf7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SIDDHAM;
+ field public static final int SIDDHAM_ID = 248; // 0xf8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SINHALA;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SINHALA_ARCHAIC_NUMBERS;
+ field public static final int SINHALA_ARCHAIC_NUMBERS_ID = 249; // 0xf9
+ field public static final int SINHALA_ID = 24; // 0x18
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SMALL_FORM_VARIANTS;
+ field public static final int SMALL_FORM_VARIANTS_ID = 84; // 0x54
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SORA_SOMPENG;
+ field public static final int SORA_SOMPENG_ID = 218; // 0xda
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SPACING_MODIFIER_LETTERS;
+ field public static final int SPACING_MODIFIER_LETTERS_ID = 6; // 0x6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SPECIALS;
+ field public static final int SPECIALS_ID = 86; // 0x56
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUNDANESE;
+ field public static final int SUNDANESE_ID = 155; // 0x9b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUNDANESE_SUPPLEMENT;
+ field public static final int SUNDANESE_SUPPLEMENT_ID = 219; // 0xdb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS;
+ field public static final int SUPERSCRIPTS_AND_SUBSCRIPTS_ID = 41; // 0x29
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_A;
+ field public static final int SUPPLEMENTAL_ARROWS_A_ID = 103; // 0x67
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_B;
+ field public static final int SUPPLEMENTAL_ARROWS_B_ID = 104; // 0x68
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_C;
+ field public static final int SUPPLEMENTAL_ARROWS_C_ID = 250; // 0xfa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS;
+ field public static final int SUPPLEMENTAL_MATHEMATICAL_OPERATORS_ID = 106; // 0x6a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_PUNCTUATION;
+ field public static final int SUPPLEMENTAL_PUNCTUATION_ID = 142; // 0x8e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final int SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS_ID = 261; // 0x105
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A;
+ field public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_A_ID = 109; // 0x6d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B;
+ field public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_B_ID = 110; // 0x6e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUTTON_SIGNWRITING;
+ field public static final int SUTTON_SIGNWRITING_ID = 262; // 0x106
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SYLOTI_NAGRI;
+ field public static final int SYLOTI_NAGRI_ID = 143; // 0x8f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SYRIAC;
+ field public static final int SYRIAC_ID = 13; // 0xd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGALOG;
+ field public static final int TAGALOG_ID = 98; // 0x62
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGBANWA;
+ field public static final int TAGBANWA_ID = 101; // 0x65
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGS;
+ field public static final int TAGS_ID = 96; // 0x60
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_LE;
+ field public static final int TAI_LE_ID = 112; // 0x70
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_THAM;
+ field public static final int TAI_THAM_ID = 174; // 0xae
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_VIET;
+ field public static final int TAI_VIET_ID = 183; // 0xb7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_XUAN_JING_SYMBOLS;
+ field public static final int TAI_XUAN_JING_SYMBOLS_ID = 124; // 0x7c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAKRI;
+ field public static final int TAKRI_ID = 220; // 0xdc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
+ field public static final int TAMIL_ID = 20; // 0x14
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
+ field public static final int TELUGU_ID = 21; // 0x15
+ field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
+ field public static final int THAANA_ID = 14; // 0xe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock THAI;
+ field public static final int THAI_ID = 25; // 0x19
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIBETAN;
+ field public static final int TIBETAN_ID = 27; // 0x1b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIFINAGH;
+ field public static final int TIFINAGH_ID = 144; // 0x90
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIRHUTA;
+ field public static final int TIRHUTA_ID = 251; // 0xfb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS;
+ field public static final int TRANSPORT_AND_MAP_SYMBOLS_ID = 207; // 0xcf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UGARITIC;
+ field public static final int UGARITIC_ID = 120; // 0x78
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED;
+ field public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_ID = 173; // 0xad
+ field public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_ID = 33; // 0x21
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VAI;
+ field public static final int VAI_ID = 159; // 0x9f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VARIATION_SELECTORS;
+ field public static final int VARIATION_SELECTORS_ID = 108; // 0x6c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT;
+ field public static final int VARIATION_SELECTORS_SUPPLEMENT_ID = 125; // 0x7d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VEDIC_EXTENSIONS;
+ field public static final int VEDIC_EXTENSIONS_ID = 175; // 0xaf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VERTICAL_FORMS;
+ field public static final int VERTICAL_FORMS_ID = 145; // 0x91
+ field public static final android.icu.lang.UCharacter.UnicodeBlock WARANG_CITI;
+ field public static final int WARANG_CITI_ID = 252; // 0xfc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YIJING_HEXAGRAM_SYMBOLS;
+ field public static final int YIJING_HEXAGRAM_SYMBOLS_ID = 116; // 0x74
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YI_RADICALS;
+ field public static final int YI_RADICALS_ID = 73; // 0x49
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YI_SYLLABLES;
+ field public static final int YI_SYLLABLES_ID = 72; // 0x48
+ }
+
+ public static abstract interface UCharacter.WordBreak {
+ field public static final int ALETTER = 1; // 0x1
+ field public static final int COUNT = 17; // 0x11
+ field public static final int CR = 8; // 0x8
+ field public static final int DOUBLE_QUOTE = 16; // 0x10
+ field public static final int EXTEND = 9; // 0x9
+ field public static final int EXTENDNUMLET = 7; // 0x7
+ field public static final int FORMAT = 2; // 0x2
+ field public static final int HEBREW_LETTER = 14; // 0xe
+ field public static final int KATAKANA = 3; // 0x3
+ field public static final int LF = 10; // 0xa
+ field public static final int MIDLETTER = 4; // 0x4
+ field public static final int MIDNUM = 5; // 0x5
+ field public static final int MIDNUMLET = 11; // 0xb
+ field public static final int NEWLINE = 12; // 0xc
+ field public static final int NUMERIC = 6; // 0x6
+ field public static final int OTHER = 0; // 0x0
+ field public static final int REGIONAL_INDICATOR = 13; // 0xd
+ field public static final int SINGLE_QUOTE = 15; // 0xf
+ }
+
+ public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
+ method public static java.lang.String toString(int);
+ }
+
+ public final class UCharacterDirection implements android.icu.lang.UCharacterEnums.ECharacterDirection {
+ method public static java.lang.String toString(int);
+ }
+
+ public class UCharacterEnums {
+ }
+
+ public static abstract interface UCharacterEnums.ECharacterCategory {
+ field public static final byte CHAR_CATEGORY_COUNT = 30; // 0x1e
+ field public static final byte COMBINING_SPACING_MARK = 8; // 0x8
+ field public static final byte CONNECTOR_PUNCTUATION = 22; // 0x16
+ field public static final byte CONTROL = 15; // 0xf
+ field public static final byte CURRENCY_SYMBOL = 25; // 0x19
+ field public static final byte DASH_PUNCTUATION = 19; // 0x13
+ field public static final byte DECIMAL_DIGIT_NUMBER = 9; // 0x9
+ field public static final byte ENCLOSING_MARK = 7; // 0x7
+ field public static final byte END_PUNCTUATION = 21; // 0x15
+ field public static final byte FINAL_PUNCTUATION = 29; // 0x1d
+ field public static final byte FINAL_QUOTE_PUNCTUATION = 29; // 0x1d
+ field public static final byte FORMAT = 16; // 0x10
+ field public static final byte GENERAL_OTHER_TYPES = 0; // 0x0
+ field public static final byte INITIAL_PUNCTUATION = 28; // 0x1c
+ field public static final byte INITIAL_QUOTE_PUNCTUATION = 28; // 0x1c
+ field public static final byte LETTER_NUMBER = 10; // 0xa
+ field public static final byte LINE_SEPARATOR = 13; // 0xd
+ field public static final byte LOWERCASE_LETTER = 2; // 0x2
+ field public static final byte MATH_SYMBOL = 24; // 0x18
+ field public static final byte MODIFIER_LETTER = 4; // 0x4
+ field public static final byte MODIFIER_SYMBOL = 26; // 0x1a
+ field public static final byte NON_SPACING_MARK = 6; // 0x6
+ field public static final byte OTHER_LETTER = 5; // 0x5
+ field public static final byte OTHER_NUMBER = 11; // 0xb
+ field public static final byte OTHER_PUNCTUATION = 23; // 0x17
+ field public static final byte OTHER_SYMBOL = 27; // 0x1b
+ field public static final byte PARAGRAPH_SEPARATOR = 14; // 0xe
+ field public static final byte PRIVATE_USE = 17; // 0x11
+ field public static final byte SPACE_SEPARATOR = 12; // 0xc
+ field public static final byte START_PUNCTUATION = 20; // 0x14
+ field public static final byte SURROGATE = 18; // 0x12
+ field public static final byte TITLECASE_LETTER = 3; // 0x3
+ field public static final byte UNASSIGNED = 0; // 0x0
+ field public static final byte UPPERCASE_LETTER = 1; // 0x1
+ }
+
+ public static abstract interface UCharacterEnums.ECharacterDirection {
+ field public static final int ARABIC_NUMBER = 5; // 0x5
+ field public static final int BLOCK_SEPARATOR = 7; // 0x7
+ field public static final int BOUNDARY_NEUTRAL = 18; // 0x12
+ field public static final int CHAR_DIRECTION_COUNT = 23; // 0x17
+ field public static final int COMMON_NUMBER_SEPARATOR = 6; // 0x6
+ field public static final byte DIRECTIONALITY_ARABIC_NUMBER = 5; // 0x5
+ field public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 18; // 0x12
+ field public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 6; // 0x6
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 2; // 0x2
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 3; // 0x3
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 4; // 0x4
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0; // 0x0
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 11; // 0xb
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 12; // 0xc
+ field public static final byte DIRECTIONALITY_NONSPACING_MARK = 17; // 0x11
+ field public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 10; // 0xa
+ field public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 7; // 0x7
+ field public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 16; // 0x10
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1; // 0x1
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 13; // 0xd
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 14; // 0xe
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 15; // 0xf
+ field public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 8; // 0x8
+ field public static final byte DIRECTIONALITY_UNDEFINED = -1; // 0xffffffff
+ field public static final byte DIRECTIONALITY_WHITESPACE = 9; // 0x9
+ field public static final int DIR_NON_SPACING_MARK = 17; // 0x11
+ field public static final int EUROPEAN_NUMBER = 2; // 0x2
+ field public static final int EUROPEAN_NUMBER_SEPARATOR = 3; // 0x3
+ field public static final int EUROPEAN_NUMBER_TERMINATOR = 4; // 0x4
+ field public static final byte FIRST_STRONG_ISOLATE = 19; // 0x13
+ field public static final int LEFT_TO_RIGHT = 0; // 0x0
+ field public static final int LEFT_TO_RIGHT_EMBEDDING = 11; // 0xb
+ field public static final byte LEFT_TO_RIGHT_ISOLATE = 20; // 0x14
+ field public static final int LEFT_TO_RIGHT_OVERRIDE = 12; // 0xc
+ field public static final int OTHER_NEUTRAL = 10; // 0xa
+ field public static final int POP_DIRECTIONAL_FORMAT = 16; // 0x10
+ field public static final byte POP_DIRECTIONAL_ISOLATE = 22; // 0x16
+ field public static final int RIGHT_TO_LEFT = 1; // 0x1
+ field public static final int RIGHT_TO_LEFT_ARABIC = 13; // 0xd
+ field public static final int RIGHT_TO_LEFT_EMBEDDING = 14; // 0xe
+ field public static final byte RIGHT_TO_LEFT_ISOLATE = 21; // 0x15
+ field public static final int RIGHT_TO_LEFT_OVERRIDE = 15; // 0xf
+ field public static final int SEGMENT_SEPARATOR = 8; // 0x8
+ field public static final int WHITE_SPACE_NEUTRAL = 9; // 0x9
+ }
+
+ public abstract interface UProperty {
+ field public static final int AGE = 16384; // 0x4000
+ field public static final int ALPHABETIC = 0; // 0x0
+ field public static final int ASCII_HEX_DIGIT = 1; // 0x1
+ field public static final int BIDI_CLASS = 4096; // 0x1000
+ field public static final int BIDI_CONTROL = 2; // 0x2
+ field public static final int BIDI_MIRRORED = 3; // 0x3
+ field public static final int BIDI_MIRRORING_GLYPH = 16385; // 0x4001
+ field public static final int BIDI_PAIRED_BRACKET = 16397; // 0x400d
+ field public static final int BIDI_PAIRED_BRACKET_TYPE = 4117; // 0x1015
+ field public static final int BINARY_LIMIT = 57; // 0x39
+ field public static final int BINARY_START = 0; // 0x0
+ field public static final int BLOCK = 4097; // 0x1001
+ field public static final int CANONICAL_COMBINING_CLASS = 4098; // 0x1002
+ field public static final int CASED = 49; // 0x31
+ field public static final int CASE_FOLDING = 16386; // 0x4002
+ field public static final int CASE_IGNORABLE = 50; // 0x32
+ field public static final int CASE_SENSITIVE = 34; // 0x22
+ field public static final int CHANGES_WHEN_CASEFOLDED = 54; // 0x36
+ field public static final int CHANGES_WHEN_CASEMAPPED = 55; // 0x37
+ field public static final int CHANGES_WHEN_LOWERCASED = 51; // 0x33
+ field public static final int CHANGES_WHEN_NFKC_CASEFOLDED = 56; // 0x38
+ field public static final int CHANGES_WHEN_TITLECASED = 53; // 0x35
+ field public static final int CHANGES_WHEN_UPPERCASED = 52; // 0x34
+ field public static final int DASH = 4; // 0x4
+ field public static final int DECOMPOSITION_TYPE = 4099; // 0x1003
+ field public static final int DEFAULT_IGNORABLE_CODE_POINT = 5; // 0x5
+ field public static final int DEPRECATED = 6; // 0x6
+ field public static final int DIACRITIC = 7; // 0x7
+ field public static final int DOUBLE_LIMIT = 12289; // 0x3001
+ field public static final int DOUBLE_START = 12288; // 0x3000
+ field public static final int EAST_ASIAN_WIDTH = 4100; // 0x1004
+ field public static final int EXTENDER = 8; // 0x8
+ field public static final int FULL_COMPOSITION_EXCLUSION = 9; // 0x9
+ field public static final int GENERAL_CATEGORY = 4101; // 0x1005
+ field public static final int GENERAL_CATEGORY_MASK = 8192; // 0x2000
+ field public static final int GRAPHEME_BASE = 10; // 0xa
+ field public static final int GRAPHEME_CLUSTER_BREAK = 4114; // 0x1012
+ field public static final int GRAPHEME_EXTEND = 11; // 0xb
+ field public static final int GRAPHEME_LINK = 12; // 0xc
+ field public static final int HANGUL_SYLLABLE_TYPE = 4107; // 0x100b
+ field public static final int HEX_DIGIT = 13; // 0xd
+ field public static final int HYPHEN = 14; // 0xe
+ field public static final int IDEOGRAPHIC = 17; // 0x11
+ field public static final int IDS_BINARY_OPERATOR = 18; // 0x12
+ field public static final int IDS_TRINARY_OPERATOR = 19; // 0x13
+ field public static final int ID_CONTINUE = 15; // 0xf
+ field public static final int ID_START = 16; // 0x10
+ field public static final int INT_LIMIT = 4118; // 0x1016
+ field public static final int INT_START = 4096; // 0x1000
+ field public static final int JOINING_GROUP = 4102; // 0x1006
+ field public static final int JOINING_TYPE = 4103; // 0x1007
+ field public static final int JOIN_CONTROL = 20; // 0x14
+ field public static final int LEAD_CANONICAL_COMBINING_CLASS = 4112; // 0x1010
+ field public static final int LINE_BREAK = 4104; // 0x1008
+ field public static final int LOGICAL_ORDER_EXCEPTION = 21; // 0x15
+ field public static final int LOWERCASE = 22; // 0x16
+ field public static final int LOWERCASE_MAPPING = 16388; // 0x4004
+ field public static final int MASK_LIMIT = 8193; // 0x2001
+ field public static final int MASK_START = 8192; // 0x2000
+ field public static final int MATH = 23; // 0x17
+ field public static final int NAME = 16389; // 0x4005
+ field public static final int NFC_INERT = 39; // 0x27
+ field public static final int NFC_QUICK_CHECK = 4110; // 0x100e
+ field public static final int NFD_INERT = 37; // 0x25
+ field public static final int NFD_QUICK_CHECK = 4108; // 0x100c
+ field public static final int NFKC_INERT = 40; // 0x28
+ field public static final int NFKC_QUICK_CHECK = 4111; // 0x100f
+ field public static final int NFKD_INERT = 38; // 0x26
+ field public static final int NFKD_QUICK_CHECK = 4109; // 0x100d
+ field public static final int NONCHARACTER_CODE_POINT = 24; // 0x18
+ field public static final int NUMERIC_TYPE = 4105; // 0x1009
+ field public static final int NUMERIC_VALUE = 12288; // 0x3000
+ field public static final int OTHER_PROPERTY_LIMIT = 28673; // 0x7001
+ field public static final int OTHER_PROPERTY_START = 28672; // 0x7000
+ field public static final int PATTERN_SYNTAX = 42; // 0x2a
+ field public static final int PATTERN_WHITE_SPACE = 43; // 0x2b
+ field public static final int POSIX_ALNUM = 44; // 0x2c
+ field public static final int POSIX_BLANK = 45; // 0x2d
+ field public static final int POSIX_GRAPH = 46; // 0x2e
+ field public static final int POSIX_PRINT = 47; // 0x2f
+ field public static final int POSIX_XDIGIT = 48; // 0x30
+ field public static final int QUOTATION_MARK = 25; // 0x19
+ field public static final int RADICAL = 26; // 0x1a
+ field public static final int SCRIPT = 4106; // 0x100a
+ field public static final int SCRIPT_EXTENSIONS = 28672; // 0x7000
+ field public static final int SEGMENT_STARTER = 41; // 0x29
+ field public static final int SENTENCE_BREAK = 4115; // 0x1013
+ field public static final int SIMPLE_CASE_FOLDING = 16390; // 0x4006
+ field public static final int SIMPLE_LOWERCASE_MAPPING = 16391; // 0x4007
+ field public static final int SIMPLE_TITLECASE_MAPPING = 16392; // 0x4008
+ field public static final int SIMPLE_UPPERCASE_MAPPING = 16393; // 0x4009
+ field public static final int SOFT_DOTTED = 27; // 0x1b
+ field public static final int STRING_LIMIT = 16398; // 0x400e
+ field public static final int STRING_START = 16384; // 0x4000
+ field public static final int S_TERM = 35; // 0x23
+ field public static final int TERMINAL_PUNCTUATION = 28; // 0x1c
+ field public static final int TITLECASE_MAPPING = 16394; // 0x400a
+ field public static final int TRAIL_CANONICAL_COMBINING_CLASS = 4113; // 0x1011
+ field public static final int UNIFIED_IDEOGRAPH = 29; // 0x1d
+ field public static final int UPPERCASE = 30; // 0x1e
+ field public static final int UPPERCASE_MAPPING = 16396; // 0x400c
+ field public static final int VARIATION_SELECTOR = 36; // 0x24
+ field public static final int WHITE_SPACE = 31; // 0x1f
+ field public static final int WORD_BREAK = 4116; // 0x1014
+ field public static final int XID_CONTINUE = 32; // 0x20
+ field public static final int XID_START = 33; // 0x21
+ }
+
+ public static abstract interface UProperty.NameChoice {
+ field public static final int COUNT = 2; // 0x2
+ field public static final int LONG = 1; // 0x1
+ field public static final int SHORT = 0; // 0x0
+ }
+
+ public final class UScript {
+ method public static final boolean breaksBetweenLetters(int);
+ method public static final int[] getCode(java.util.Locale);
+ method public static final int[] getCode(android.icu.util.ULocale);
+ method public static final int[] getCode(java.lang.String);
+ method public static final int getCodeFromName(java.lang.String);
+ method public static final java.lang.String getName(int);
+ method public static final java.lang.String getSampleString(int);
+ method public static final int getScript(int);
+ method public static final int getScriptExtensions(int, java.util.BitSet);
+ method public static final java.lang.String getShortName(int);
+ method public static final android.icu.lang.UScript.ScriptUsage getUsage(int);
+ method public static final boolean hasScript(int, int);
+ method public static final boolean isCased(int);
+ method public static final boolean isRightToLeft(int);
+ field public static final int AFAKA = 147; // 0x93
+ field public static final int AHOM = 161; // 0xa1
+ field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
+ field public static final int ARABIC = 2; // 0x2
+ field public static final int ARMENIAN = 3; // 0x3
+ field public static final int AVESTAN = 117; // 0x75
+ field public static final int BALINESE = 62; // 0x3e
+ field public static final int BAMUM = 130; // 0x82
+ field public static final int BASSA_VAH = 134; // 0x86
+ field public static final int BATAK = 63; // 0x3f
+ field public static final int BENGALI = 4; // 0x4
+ field public static final int BLISSYMBOLS = 64; // 0x40
+ field public static final int BOOK_PAHLAVI = 124; // 0x7c
+ field public static final int BOPOMOFO = 5; // 0x5
+ field public static final int BRAHMI = 65; // 0x41
+ field public static final int BRAILLE = 46; // 0x2e
+ field public static final int BUGINESE = 55; // 0x37
+ field public static final int BUHID = 44; // 0x2c
+ field public static final int CANADIAN_ABORIGINAL = 40; // 0x28
+ field public static final int CARIAN = 104; // 0x68
+ field public static final int CAUCASIAN_ALBANIAN = 159; // 0x9f
+ field public static final int CHAKMA = 118; // 0x76
+ field public static final int CHAM = 66; // 0x42
+ field public static final int CHEROKEE = 6; // 0x6
+ field public static final int CIRTH = 67; // 0x43
+ field public static final int CODE_LIMIT = 167; // 0xa7
+ field public static final int COMMON = 0; // 0x0
+ field public static final int COPTIC = 7; // 0x7
+ field public static final int CUNEIFORM = 101; // 0x65
+ field public static final int CYPRIOT = 47; // 0x2f
+ field public static final int CYRILLIC = 8; // 0x8
+ field public static final int DEMOTIC_EGYPTIAN = 69; // 0x45
+ field public static final int DESERET = 9; // 0x9
+ field public static final int DEVANAGARI = 10; // 0xa
+ field public static final int DUPLOYAN = 135; // 0x87
+ field public static final int EASTERN_SYRIAC = 97; // 0x61
+ field public static final int EGYPTIAN_HIEROGLYPHS = 71; // 0x47
+ field public static final int ELBASAN = 136; // 0x88
+ field public static final int ESTRANGELO_SYRIAC = 95; // 0x5f
+ field public static final int ETHIOPIC = 11; // 0xb
+ field public static final int GEORGIAN = 12; // 0xc
+ field public static final int GLAGOLITIC = 56; // 0x38
+ field public static final int GOTHIC = 13; // 0xd
+ field public static final int GRANTHA = 137; // 0x89
+ field public static final int GREEK = 14; // 0xe
+ field public static final int GUJARATI = 15; // 0xf
+ field public static final int GURMUKHI = 16; // 0x10
+ field public static final int HAN = 17; // 0x11
+ field public static final int HANGUL = 18; // 0x12
+ field public static final int HANUNOO = 43; // 0x2b
+ field public static final int HARAPPAN_INDUS = 77; // 0x4d
+ field public static final int HATRAN = 162; // 0xa2
+ field public static final int HEBREW = 19; // 0x13
+ field public static final int HIERATIC_EGYPTIAN = 70; // 0x46
+ field public static final int HIRAGANA = 20; // 0x14
+ field public static final int IMPERIAL_ARAMAIC = 116; // 0x74
+ field public static final int INHERITED = 1; // 0x1
+ field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
+ field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
+ field public static final int INVALID_CODE = -1; // 0xffffffff
+ field public static final int JAPANESE = 105; // 0x69
+ field public static final int JAVANESE = 78; // 0x4e
+ field public static final int JURCHEN = 148; // 0x94
+ field public static final int KAITHI = 120; // 0x78
+ field public static final int KANNADA = 21; // 0x15
+ field public static final int KATAKANA = 22; // 0x16
+ field public static final int KATAKANA_OR_HIRAGANA = 54; // 0x36
+ field public static final int KAYAH_LI = 79; // 0x4f
+ field public static final int KHAROSHTHI = 57; // 0x39
+ field public static final int KHMER = 23; // 0x17
+ field public static final int KHOJKI = 157; // 0x9d
+ field public static final int KHUDAWADI = 145; // 0x91
+ field public static final int KHUTSURI = 72; // 0x48
+ field public static final int KOREAN = 119; // 0x77
+ field public static final int KPELLE = 138; // 0x8a
+ field public static final int LANNA = 106; // 0x6a
+ field public static final int LAO = 24; // 0x18
+ field public static final int LATIN = 25; // 0x19
+ field public static final int LATIN_FRAKTUR = 80; // 0x50
+ field public static final int LATIN_GAELIC = 81; // 0x51
+ field public static final int LEPCHA = 82; // 0x52
+ field public static final int LIMBU = 48; // 0x30
+ field public static final int LINEAR_A = 83; // 0x53
+ field public static final int LINEAR_B = 49; // 0x31
+ field public static final int LISU = 131; // 0x83
+ field public static final int LOMA = 139; // 0x8b
+ field public static final int LYCIAN = 107; // 0x6b
+ field public static final int LYDIAN = 108; // 0x6c
+ field public static final int MAHAJANI = 160; // 0xa0
+ field public static final int MALAYALAM = 26; // 0x1a
+ field public static final int MANDAEAN = 84; // 0x54
+ field public static final int MANDAIC = 84; // 0x54
+ field public static final int MANICHAEAN = 121; // 0x79
+ field public static final int MATHEMATICAL_NOTATION = 128; // 0x80
+ field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
+ field public static final int MEITEI_MAYEK = 115; // 0x73
+ field public static final int MENDE = 140; // 0x8c
+ field public static final int MEROITIC = 86; // 0x56
+ field public static final int MEROITIC_CURSIVE = 141; // 0x8d
+ field public static final int MEROITIC_HIEROGLYPHS = 86; // 0x56
+ field public static final int MIAO = 92; // 0x5c
+ field public static final int MODI = 163; // 0xa3
+ field public static final int MONGOLIAN = 27; // 0x1b
+ field public static final int MOON = 114; // 0x72
+ field public static final int MRO = 149; // 0x95
+ field public static final int MULTANI = 164; // 0xa4
+ field public static final int MYANMAR = 28; // 0x1c
+ field public static final int NABATAEAN = 143; // 0x8f
+ field public static final int NAKHI_GEBA = 132; // 0x84
+ field public static final int NEW_TAI_LUE = 59; // 0x3b
+ field public static final int NKO = 87; // 0x57
+ field public static final int NUSHU = 150; // 0x96
+ field public static final int OGHAM = 29; // 0x1d
+ field public static final int OLD_CHURCH_SLAVONIC_CYRILLIC = 68; // 0x44
+ field public static final int OLD_HUNGARIAN = 76; // 0x4c
+ field public static final int OLD_ITALIC = 30; // 0x1e
+ field public static final int OLD_NORTH_ARABIAN = 142; // 0x8e
+ field public static final int OLD_PERMIC = 89; // 0x59
+ field public static final int OLD_PERSIAN = 61; // 0x3d
+ field public static final int OLD_SOUTH_ARABIAN = 133; // 0x85
+ field public static final int OL_CHIKI = 109; // 0x6d
+ field public static final int ORIYA = 31; // 0x1f
+ field public static final int ORKHON = 88; // 0x58
+ field public static final int OSMANYA = 50; // 0x32
+ field public static final int PAHAWH_HMONG = 75; // 0x4b
+ field public static final int PALMYRENE = 144; // 0x90
+ field public static final int PAU_CIN_HAU = 165; // 0xa5
+ field public static final int PHAGS_PA = 90; // 0x5a
+ field public static final int PHOENICIAN = 91; // 0x5b
+ field public static final int PHONETIC_POLLARD = 92; // 0x5c
+ field public static final int PSALTER_PAHLAVI = 123; // 0x7b
+ field public static final int REJANG = 110; // 0x6e
+ field public static final int RONGORONGO = 93; // 0x5d
+ field public static final int RUNIC = 32; // 0x20
+ field public static final int SAMARITAN = 126; // 0x7e
+ field public static final int SARATI = 94; // 0x5e
+ field public static final int SAURASHTRA = 111; // 0x6f
+ field public static final int SHARADA = 151; // 0x97
+ field public static final int SHAVIAN = 51; // 0x33
+ field public static final int SIDDHAM = 166; // 0xa6
+ field public static final int SIGN_WRITING = 112; // 0x70
+ field public static final int SIMPLIFIED_HAN = 73; // 0x49
+ field public static final int SINDHI = 145; // 0x91
+ field public static final int SINHALA = 33; // 0x21
+ field public static final int SORA_SOMPENG = 152; // 0x98
+ field public static final int SUNDANESE = 113; // 0x71
+ field public static final int SYLOTI_NAGRI = 58; // 0x3a
+ field public static final int SYMBOLS = 129; // 0x81
+ field public static final int SYRIAC = 34; // 0x22
+ field public static final int TAGALOG = 42; // 0x2a
+ field public static final int TAGBANWA = 45; // 0x2d
+ field public static final int TAI_LE = 52; // 0x34
+ field public static final int TAI_VIET = 127; // 0x7f
+ field public static final int TAKRI = 153; // 0x99
+ field public static final int TAMIL = 35; // 0x23
+ field public static final int TANGUT = 154; // 0x9a
+ field public static final int TELUGU = 36; // 0x24
+ field public static final int TENGWAR = 98; // 0x62
+ field public static final int THAANA = 37; // 0x25
+ field public static final int THAI = 38; // 0x26
+ field public static final int TIBETAN = 39; // 0x27
+ field public static final int TIFINAGH = 60; // 0x3c
+ field public static final int TIRHUTA = 158; // 0x9e
+ field public static final int TRADITIONAL_HAN = 74; // 0x4a
+ field public static final int UCAS = 40; // 0x28
+ field public static final int UGARITIC = 53; // 0x35
+ field public static final int UNKNOWN = 103; // 0x67
+ field public static final int UNWRITTEN_LANGUAGES = 102; // 0x66
+ field public static final int VAI = 99; // 0x63
+ field public static final int VISIBLE_SPEECH = 100; // 0x64
+ field public static final int WARANG_CITI = 146; // 0x92
+ field public static final int WESTERN_SYRIAC = 96; // 0x60
+ field public static final int WOLEAI = 155; // 0x9b
+ field public static final int YI = 41; // 0x29
+ }
+
+ public static final class UScript.ScriptUsage extends java.lang.Enum {
+ method public static android.icu.lang.UScript.ScriptUsage valueOf(java.lang.String);
+ method public static final android.icu.lang.UScript.ScriptUsage[] values();
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage ASPIRATIONAL;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage EXCLUDED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage LIMITED_USE;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage NOT_ENCODED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage RECOMMENDED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage UNKNOWN;
+ }
+
+}
+
+package android.icu.math {
+
+ public class BigDecimal extends java.lang.Number implements java.lang.Comparable java.io.Serializable {
+ ctor public BigDecimal(java.math.BigDecimal);
+ ctor public BigDecimal(java.math.BigInteger);
+ ctor public BigDecimal(java.math.BigInteger, int);
+ ctor public BigDecimal(char[]);
+ ctor public BigDecimal(char[], int, int);
+ ctor public BigDecimal(double);
+ ctor public BigDecimal(int);
+ ctor public BigDecimal(long);
+ ctor public BigDecimal(java.lang.String);
+ method public android.icu.math.BigDecimal abs();
+ method public android.icu.math.BigDecimal abs(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal add(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal add(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public byte byteValueExact();
+ method public int compareTo(android.icu.math.BigDecimal);
+ method public int compareTo(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, int);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, int, int);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal divideInteger(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal divideInteger(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public double doubleValue();
+ method public float floatValue();
+ method public java.lang.String format(int, int);
+ method public java.lang.String format(int, int, int, int, int, int);
+ method public int intValue();
+ method public int intValueExact();
+ method public long longValue();
+ method public long longValueExact();
+ method public android.icu.math.BigDecimal max(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal max(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal min(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal min(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal movePointLeft(int);
+ method public android.icu.math.BigDecimal movePointRight(int);
+ method public android.icu.math.BigDecimal multiply(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal multiply(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal negate();
+ method public android.icu.math.BigDecimal negate(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal plus();
+ method public android.icu.math.BigDecimal plus(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal pow(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal pow(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal remainder(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal remainder(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public int scale();
+ method public android.icu.math.BigDecimal setScale(int);
+ method public android.icu.math.BigDecimal setScale(int, int);
+ method public short shortValueExact();
+ method public int signum();
+ method public android.icu.math.BigDecimal subtract(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal subtract(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public java.math.BigDecimal toBigDecimal();
+ method public java.math.BigInteger toBigInteger();
+ method public java.math.BigInteger toBigIntegerExact();
+ method public char[] toCharArray();
+ method public java.math.BigInteger unscaledValue();
+ method public static android.icu.math.BigDecimal valueOf(double);
+ method public static android.icu.math.BigDecimal valueOf(long);
+ method public static android.icu.math.BigDecimal valueOf(long, int);
+ field public static final android.icu.math.BigDecimal ONE;
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final android.icu.math.BigDecimal TEN;
+ field public static final android.icu.math.BigDecimal ZERO;
+ }
+
+ public final class MathContext implements java.io.Serializable {
+ ctor public MathContext(int);
+ ctor public MathContext(int, int);
+ ctor public MathContext(int, int, boolean);
+ ctor public MathContext(int, int, boolean, int);
+ method public int getDigits();
+ method public int getForm();
+ method public boolean getLostDigits();
+ method public int getRoundingMode();
+ field public static final android.icu.math.MathContext DEFAULT;
+ field public static final int ENGINEERING = 2; // 0x2
+ field public static final int PLAIN = 0; // 0x0
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final int SCIENTIFIC = 1; // 0x1
+ }
+
+}
+
+package android.icu.text {
+
+ public final class AlphabeticIndex implements java.lang.Iterable {
+ ctor public AlphabeticIndex(android.icu.util.ULocale);
+ ctor public AlphabeticIndex(java.util.Locale);
+ ctor public AlphabeticIndex(android.icu.text.RuleBasedCollator);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(android.icu.text.UnicodeSet);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(android.icu.util.ULocale...);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(java.util.Locale...);
+ method public android.icu.text.AlphabeticIndex<V> addRecord(java.lang.CharSequence, V);
+ method public android.icu.text.AlphabeticIndex.ImmutableIndex<V> buildImmutableIndex();
+ method public android.icu.text.AlphabeticIndex<V> clearRecords();
+ method public int getBucketCount();
+ method public int getBucketIndex(java.lang.CharSequence);
+ method public java.util.List<java.lang.String> getBucketLabels();
+ method public android.icu.text.RuleBasedCollator getCollator();
+ method public java.lang.String getInflowLabel();
+ method public int getMaxLabelCount();
+ method public java.lang.String getOverflowLabel();
+ method public int getRecordCount();
+ method public java.lang.String getUnderflowLabel();
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Bucket<V>> iterator();
+ method public android.icu.text.AlphabeticIndex<V> setInflowLabel(java.lang.String);
+ method public android.icu.text.AlphabeticIndex<V> setMaxLabelCount(int);
+ method public android.icu.text.AlphabeticIndex<V> setOverflowLabel(java.lang.String);
+ method public android.icu.text.AlphabeticIndex<V> setUnderflowLabel(java.lang.String);
+ }
+
+ public static class AlphabeticIndex.Bucket implements java.lang.Iterable {
+ method public java.lang.String getLabel();
+ method public android.icu.text.AlphabeticIndex.Bucket.LabelType getLabelType();
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Record<V>> iterator();
+ method public int size();
+ }
+
+ public static final class AlphabeticIndex.Bucket.LabelType extends java.lang.Enum {
+ method public static android.icu.text.AlphabeticIndex.Bucket.LabelType valueOf(java.lang.String);
+ method public static final android.icu.text.AlphabeticIndex.Bucket.LabelType[] values();
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType INFLOW;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType NORMAL;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType OVERFLOW;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType UNDERFLOW;
+ }
+
+ public static final class AlphabeticIndex.ImmutableIndex implements java.lang.Iterable {
+ method public android.icu.text.AlphabeticIndex.Bucket<V> getBucket(int);
+ method public int getBucketCount();
+ method public int getBucketIndex(java.lang.CharSequence);
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Bucket<V>> iterator();
+ }
+
+ public static class AlphabeticIndex.Record {
+ method public V getData();
+ method public java.lang.CharSequence getName();
+ }
+
+ public abstract class BreakIterator implements java.lang.Cloneable {
+ ctor protected BreakIterator();
+ method public java.lang.Object clone();
+ method public abstract int current();
+ method public abstract int first();
+ method public abstract int following(int);
+ method public static synchronized java.util.Locale[] getAvailableLocales();
+ method public static android.icu.text.BreakIterator getCharacterInstance();
+ method public static android.icu.text.BreakIterator getCharacterInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getCharacterInstance(android.icu.util.ULocale);
+ method public static android.icu.text.BreakIterator getLineInstance();
+ method public static android.icu.text.BreakIterator getLineInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getLineInstance(android.icu.util.ULocale);
+ method public int getRuleStatus();
+ method public int getRuleStatusVec(int[]);
+ method public static android.icu.text.BreakIterator getSentenceInstance();
+ method public static android.icu.text.BreakIterator getSentenceInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getSentenceInstance(android.icu.util.ULocale);
+ method public abstract java.text.CharacterIterator getText();
+ method public static android.icu.text.BreakIterator getTitleInstance();
+ method public static android.icu.text.BreakIterator getTitleInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getTitleInstance(android.icu.util.ULocale);
+ method public static android.icu.text.BreakIterator getWordInstance();
+ method public static android.icu.text.BreakIterator getWordInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getWordInstance(android.icu.util.ULocale);
+ method public boolean isBoundary(int);
+ method public abstract int last();
+ method public abstract int next(int);
+ method public abstract int next();
+ method public int preceding(int);
+ method public abstract int previous();
+ method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, java.util.Locale, int);
+ method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, android.icu.util.ULocale, int);
+ method public void setText(java.lang.String);
+ method public abstract void setText(java.text.CharacterIterator);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int DONE = -1; // 0xffffffff
+ field public static final int KIND_CHARACTER = 0; // 0x0
+ field public static final int KIND_LINE = 2; // 0x2
+ field public static final int KIND_SENTENCE = 3; // 0x3
+ field public static final int KIND_TITLE = 4; // 0x4
+ field public static final int KIND_WORD = 1; // 0x1
+ field public static final int WORD_IDEO = 400; // 0x190
+ field public static final int WORD_IDEO_LIMIT = 500; // 0x1f4
+ field public static final int WORD_KANA = 300; // 0x12c
+ field public static final int WORD_KANA_LIMIT = 400; // 0x190
+ field public static final int WORD_LETTER = 200; // 0xc8
+ field public static final int WORD_LETTER_LIMIT = 300; // 0x12c
+ field public static final int WORD_NONE = 0; // 0x0
+ field public static final int WORD_NONE_LIMIT = 100; // 0x64
+ field public static final int WORD_NUMBER = 100; // 0x64
+ field public static final int WORD_NUMBER_LIMIT = 200; // 0xc8
+ }
+
+ public final class CollationElementIterator {
+ method public int getMaxExpansion(int);
+ method public int getOffset();
+ method public int next();
+ method public int previous();
+ method public static final int primaryOrder(int);
+ method public void reset();
+ method public static final int secondaryOrder(int);
+ method public void setOffset(int);
+ method public void setText(java.lang.String);
+ method public void setText(android.icu.text.UCharacterIterator);
+ method public void setText(java.text.CharacterIterator);
+ method public static final int tertiaryOrder(int);
+ field public static final int IGNORABLE = 0; // 0x0
+ field public static final int NULLORDER = -1; // 0xffffffff
+ }
+
+ public final class CollationKey implements java.lang.Comparable {
+ ctor public CollationKey(java.lang.String, byte[]);
+ ctor public CollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public int compareTo(android.icu.text.CollationKey);
+ method public boolean equals(android.icu.text.CollationKey);
+ method public android.icu.text.CollationKey getBound(int, int);
+ method public java.lang.String getSourceString();
+ method public android.icu.text.CollationKey merge(android.icu.text.CollationKey);
+ method public byte[] toByteArray();
+ }
+
+ public static final class CollationKey.BoundMode {
+ field public static final int COUNT = 3; // 0x3
+ field public static final int LOWER = 0; // 0x0
+ field public static final int UPPER = 1; // 0x1
+ field public static final int UPPER_LONG = 2; // 0x2
+ }
+
+ public abstract class Collator implements java.lang.Cloneable java.util.Comparator android.icu.util.Freezable {
+ ctor protected Collator();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public android.icu.text.Collator cloneAsThawed();
+ method public abstract int compare(java.lang.String, java.lang.String);
+ method public int compare(java.lang.Object, java.lang.Object);
+ method public boolean equals(java.lang.String, java.lang.String);
+ method public android.icu.text.Collator freeze();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public static final android.icu.util.ULocale[] getAvailableULocales();
+ method public abstract android.icu.text.CollationKey getCollationKey(java.lang.String);
+ method public int getDecomposition();
+ method public static java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
+ method public static java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayName(java.util.Locale);
+ method public static java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public static int[] getEquivalentReorderCodes(int);
+ method public static final android.icu.util.ULocale getFunctionalEquivalent(java.lang.String, android.icu.util.ULocale, boolean[]);
+ method public static final android.icu.util.ULocale getFunctionalEquivalent(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.Collator getInstance();
+ method public static final android.icu.text.Collator getInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.Collator getInstance(java.util.Locale);
+ method public static final java.lang.String[] getKeywordValues(java.lang.String);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public static final java.lang.String[] getKeywords();
+ method public int getMaxVariable();
+ method public abstract android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public int[] getReorderCodes();
+ method public int getStrength();
+ method public android.icu.text.UnicodeSet getTailoredSet();
+ method public abstract android.icu.util.VersionInfo getUCAVersion();
+ method public abstract int getVariableTop();
+ method public abstract android.icu.util.VersionInfo getVersion();
+ method public boolean isFrozen();
+ method public static final java.lang.Object registerFactory(android.icu.text.Collator.CollatorFactory);
+ method public static final java.lang.Object registerInstance(android.icu.text.Collator, android.icu.util.ULocale);
+ method public void setDecomposition(int);
+ method public android.icu.text.Collator setMaxVariable(int);
+ method public void setReorderCodes(int...);
+ method public void setStrength(int);
+ method public static final boolean unregister(java.lang.Object);
+ field public static final int CANONICAL_DECOMPOSITION = 17; // 0x11
+ field public static final int FULL_DECOMPOSITION = 15; // 0xf
+ field public static final int IDENTICAL = 15; // 0xf
+ field public static final int NO_DECOMPOSITION = 16; // 0x10
+ field public static final int PRIMARY = 0; // 0x0
+ field public static final int QUATERNARY = 3; // 0x3
+ field public static final int SECONDARY = 1; // 0x1
+ field public static final int TERTIARY = 2; // 0x2
+ }
+
+ public static abstract class Collator.CollatorFactory {
+ ctor protected Collator.CollatorFactory();
+ method public android.icu.text.Collator createCollator(android.icu.util.ULocale);
+ method public android.icu.text.Collator createCollator(java.util.Locale);
+ method public java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
+ method public java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
+ method public abstract java.util.Set<java.lang.String> getSupportedLocaleIDs();
+ method public boolean visible();
+ }
+
+ public static abstract interface Collator.ReorderCodes {
+ field public static final int CURRENCY = 4099; // 0x1003
+ field public static final int DEFAULT = -1; // 0xffffffff
+ field public static final int DIGIT = 4100; // 0x1004
+ field public static final int FIRST = 4096; // 0x1000
+ field public static final int LIMIT = 4101; // 0x1005
+ field public static final int NONE = 103; // 0x67
+ field public static final int OTHERS = 103; // 0x67
+ field public static final int PUNCTUATION = 4097; // 0x1001
+ field public static final int SPACE = 4096; // 0x1000
+ field public static final int SYMBOL = 4098; // 0x1002
+ }
+
+ public class CompactDecimalFormat extends android.icu.text.DecimalFormat {
+ method public static android.icu.text.CompactDecimalFormat getInstance(android.icu.util.ULocale, android.icu.text.CompactDecimalFormat.CompactStyle);
+ method public static android.icu.text.CompactDecimalFormat getInstance(java.util.Locale, android.icu.text.CompactDecimalFormat.CompactStyle);
+ }
+
+ public static final class CompactDecimalFormat.CompactStyle extends java.lang.Enum {
+ method public static android.icu.text.CompactDecimalFormat.CompactStyle valueOf(java.lang.String);
+ method public static final android.icu.text.CompactDecimalFormat.CompactStyle[] values();
+ enum_constant public static final android.icu.text.CompactDecimalFormat.CompactStyle LONG;
+ enum_constant public static final android.icu.text.CompactDecimalFormat.CompactStyle SHORT;
+ }
+
+ public class CurrencyPluralInfo implements java.lang.Cloneable java.io.Serializable {
+ ctor public CurrencyPluralInfo();
+ ctor public CurrencyPluralInfo(java.util.Locale);
+ ctor public CurrencyPluralInfo(android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public java.lang.String getCurrencyPluralPattern(java.lang.String);
+ method public static android.icu.text.CurrencyPluralInfo getInstance();
+ method public static android.icu.text.CurrencyPluralInfo getInstance(java.util.Locale);
+ method public static android.icu.text.CurrencyPluralInfo getInstance(android.icu.util.ULocale);
+ method public android.icu.util.ULocale getLocale();
+ method public android.icu.text.PluralRules getPluralRules();
+ method public void setCurrencyPluralPattern(java.lang.String, java.lang.String);
+ method public void setLocale(android.icu.util.ULocale);
+ method public void setPluralRules(java.lang.String);
+ }
+
+ public abstract class DateFormat extends android.icu.text.UFormat {
+ ctor protected DateFormat();
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public boolean getBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute);
+ method public android.icu.util.Calendar getCalendar();
+ method public android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public static final android.icu.text.DateFormat getDateInstance();
+ method public static final android.icu.text.DateFormat getDateInstance(int);
+ method public static final android.icu.text.DateFormat getDateInstance(int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateInstance(int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int);
+ method public static final android.icu.text.DateFormat getDateTimeInstance();
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int);
+ method public static final android.icu.text.DateFormat getInstance();
+ method public static final android.icu.text.DateFormat getInstance(android.icu.util.Calendar, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstance(android.icu.util.Calendar);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(android.icu.util.Calendar, java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(android.icu.util.Calendar, java.lang.String, android.icu.util.ULocale);
+ method public android.icu.text.NumberFormat getNumberFormat();
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String);
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getPatternInstance(android.icu.util.Calendar, java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getPatternInstance(android.icu.util.Calendar, java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance();
+ method public static final android.icu.text.DateFormat getTimeInstance(int);
+ method public static final android.icu.text.DateFormat getTimeInstance(int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getTimeInstance(int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int);
+ method public android.icu.util.TimeZone getTimeZone();
+ method public boolean isCalendarLenient();
+ method public boolean isLenient();
+ method public java.util.Date parse(java.lang.String) throws java.text.ParseException;
+ method public abstract void parse(java.lang.String, android.icu.util.Calendar, java.text.ParsePosition);
+ method public java.util.Date parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public android.icu.text.DateFormat setBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute, boolean);
+ method public void setCalendar(android.icu.util.Calendar);
+ method public void setCalendarLenient(boolean);
+ method public void setContext(android.icu.text.DisplayContext);
+ method public void setLenient(boolean);
+ method public void setNumberFormat(android.icu.text.NumberFormat);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ field public static final java.lang.String ABBR_GENERIC_TZ = "v";
+ field public static final java.lang.String ABBR_MONTH = "MMM";
+ field public static final java.lang.String ABBR_MONTH_DAY = "MMMd";
+ field public static final java.lang.String ABBR_MONTH_WEEKDAY_DAY = "MMMEd";
+ field public static final java.lang.String ABBR_QUARTER = "QQQ";
+ field public static final java.lang.String ABBR_SPECIFIC_TZ = "z";
+ field public static final java.lang.String ABBR_UTC_TZ = "ZZZZ";
+ field public static final java.lang.String ABBR_WEEKDAY = "E";
+ field public static final int AM_PM_FIELD = 14; // 0xe
+ field public static final int DATE_FIELD = 3; // 0x3
+ field public static final java.lang.String DAY = "d";
+ field public static final int DAY_OF_WEEK_FIELD = 9; // 0x9
+ field public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11; // 0xb
+ field public static final int DAY_OF_YEAR_FIELD = 10; // 0xa
+ field public static final int DEFAULT = 2; // 0x2
+ field public static final int DOW_LOCAL_FIELD = 19; // 0x13
+ field public static final int ERA_FIELD = 0; // 0x0
+ field public static final int EXTENDED_YEAR_FIELD = 20; // 0x14
+ field public static final int FIELD_COUNT = 36; // 0x24
+ field public static final int FRACTIONAL_SECOND_FIELD = 8; // 0x8
+ field public static final int FULL = 0; // 0x0
+ field public static final java.lang.String GENERIC_TZ = "vvvv";
+ field public static final java.lang.String HOUR = "j";
+ field public static final int HOUR0_FIELD = 16; // 0x10
+ field public static final int HOUR1_FIELD = 15; // 0xf
+ field public static final java.lang.String HOUR24 = "H";
+ field public static final java.lang.String HOUR24_MINUTE = "Hm";
+ field public static final java.lang.String HOUR24_MINUTE_SECOND = "Hms";
+ field public static final java.lang.String HOUR_MINUTE = "jm";
+ field public static final java.lang.String HOUR_MINUTE_SECOND = "jms";
+ field public static final int HOUR_OF_DAY0_FIELD = 5; // 0x5
+ field public static final int HOUR_OF_DAY1_FIELD = 4; // 0x4
+ field public static final int JULIAN_DAY_FIELD = 21; // 0x15
+ field public static final java.lang.String LOCATION_TZ = "VVVV";
+ field public static final int LONG = 1; // 0x1
+ field public static final int MEDIUM = 2; // 0x2
+ field public static final int MILLISECONDS_IN_DAY_FIELD = 22; // 0x16
+ field public static final int MILLISECOND_FIELD = 8; // 0x8
+ field public static final java.lang.String MINUTE = "m";
+ field public static final int MINUTE_FIELD = 6; // 0x6
+ field public static final java.lang.String MINUTE_SECOND = "ms";
+ field public static final java.lang.String MONTH = "MMMM";
+ field public static final java.lang.String MONTH_DAY = "MMMMd";
+ field public static final int MONTH_FIELD = 2; // 0x2
+ field public static final java.lang.String MONTH_WEEKDAY_DAY = "MMMMEEEEd";
+ field public static final int NONE = -1; // 0xffffffff
+ field public static final java.lang.String NUM_MONTH = "M";
+ field public static final java.lang.String NUM_MONTH_DAY = "Md";
+ field public static final java.lang.String NUM_MONTH_WEEKDAY_DAY = "MEd";
+ field public static final java.lang.String QUARTER = "QQQQ";
+ field public static final int QUARTER_FIELD = 27; // 0x1b
+ field public static final int RELATIVE = 128; // 0x80
+ field public static final int RELATIVE_DEFAULT = 130; // 0x82
+ field public static final int RELATIVE_FULL = 128; // 0x80
+ field public static final int RELATIVE_LONG = 129; // 0x81
+ field public static final int RELATIVE_MEDIUM = 130; // 0x82
+ field public static final int RELATIVE_SHORT = 131; // 0x83
+ field public static final java.lang.String SECOND = "s";
+ field public static final int SECOND_FIELD = 7; // 0x7
+ field public static final int SHORT = 3; // 0x3
+ field public static final java.lang.String SPECIFIC_TZ = "zzzz";
+ field public static final int STANDALONE_DAY_FIELD = 25; // 0x19
+ field public static final int STANDALONE_MONTH_FIELD = 26; // 0x1a
+ field public static final int STANDALONE_QUARTER_FIELD = 28; // 0x1c
+ field public static final int TIMEZONE_FIELD = 17; // 0x11
+ field public static final int TIMEZONE_GENERIC_FIELD = 24; // 0x18
+ field public static final int TIMEZONE_ISO_FIELD = 32; // 0x20
+ field public static final int TIMEZONE_ISO_LOCAL_FIELD = 33; // 0x21
+ field public static final int TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31; // 0x1f
+ field public static final int TIMEZONE_RFC_FIELD = 23; // 0x17
+ field public static final int TIMEZONE_SPECIAL_FIELD = 29; // 0x1d
+ field public static final java.lang.String WEEKDAY = "EEEE";
+ field public static final int WEEK_OF_MONTH_FIELD = 13; // 0xd
+ field public static final int WEEK_OF_YEAR_FIELD = 12; // 0xc
+ field public static final java.lang.String YEAR = "y";
+ field public static final java.lang.String YEAR_ABBR_MONTH = "yMMM";
+ field public static final java.lang.String YEAR_ABBR_MONTH_DAY = "yMMMd";
+ field public static final java.lang.String YEAR_ABBR_MONTH_WEEKDAY_DAY = "yMMMEd";
+ field public static final java.lang.String YEAR_ABBR_QUARTER = "yQQQ";
+ field public static final int YEAR_FIELD = 1; // 0x1
+ field public static final java.lang.String YEAR_MONTH = "yMMMM";
+ field public static final java.lang.String YEAR_MONTH_DAY = "yMMMMd";
+ field public static final java.lang.String YEAR_MONTH_WEEKDAY_DAY = "yMMMMEEEEd";
+ field public static final int YEAR_NAME_FIELD = 30; // 0x1e
+ field public static final java.lang.String YEAR_NUM_MONTH = "yM";
+ field public static final java.lang.String YEAR_NUM_MONTH_DAY = "yMd";
+ field public static final java.lang.String YEAR_NUM_MONTH_WEEKDAY_DAY = "yMEd";
+ field public static final java.lang.String YEAR_QUARTER = "yQQQQ";
+ field public static final int YEAR_WOY_FIELD = 18; // 0x12
+ field protected android.icu.util.Calendar calendar;
+ field protected android.icu.text.NumberFormat numberFormat;
+ }
+
+ public static final class DateFormat.BooleanAttribute extends java.lang.Enum {
+ method public static android.icu.text.DateFormat.BooleanAttribute valueOf(java.lang.String);
+ method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
+ }
+
+ public static class DateFormat.Field extends java.text.Format.Field {
+ ctor protected DateFormat.Field(java.lang.String, int);
+ method public int getCalendarField();
+ method public static android.icu.text.DateFormat.Field ofCalendarField(int);
+ field public static final android.icu.text.DateFormat.Field AM_PM;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_MONTH;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_WEEK;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_WEEK_IN_MONTH;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_YEAR;
+ field public static final android.icu.text.DateFormat.Field DOW_LOCAL;
+ field public static final android.icu.text.DateFormat.Field ERA;
+ field public static final android.icu.text.DateFormat.Field EXTENDED_YEAR;
+ field public static final android.icu.text.DateFormat.Field HOUR0;
+ field public static final android.icu.text.DateFormat.Field HOUR1;
+ field public static final android.icu.text.DateFormat.Field HOUR_OF_DAY0;
+ field public static final android.icu.text.DateFormat.Field HOUR_OF_DAY1;
+ field public static final android.icu.text.DateFormat.Field JULIAN_DAY;
+ field public static final android.icu.text.DateFormat.Field MILLISECOND;
+ field public static final android.icu.text.DateFormat.Field MILLISECONDS_IN_DAY;
+ field public static final android.icu.text.DateFormat.Field MINUTE;
+ field public static final android.icu.text.DateFormat.Field MONTH;
+ field public static final android.icu.text.DateFormat.Field QUARTER;
+ field public static final android.icu.text.DateFormat.Field SECOND;
+ field public static final android.icu.text.DateFormat.Field TIME_ZONE;
+ field public static final android.icu.text.DateFormat.Field WEEK_OF_MONTH;
+ field public static final android.icu.text.DateFormat.Field WEEK_OF_YEAR;
+ field public static final android.icu.text.DateFormat.Field YEAR;
+ field public static final android.icu.text.DateFormat.Field YEAR_WOY;
+ }
+
+ public class DateFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateFormatSymbols();
+ ctor public DateFormatSymbols(java.util.Locale);
+ ctor public DateFormatSymbols(android.icu.util.ULocale);
+ ctor public DateFormatSymbols(android.icu.util.Calendar, java.util.Locale);
+ ctor public DateFormatSymbols(android.icu.util.Calendar, android.icu.util.ULocale);
+ ctor public DateFormatSymbols(java.lang.Class<? extends android.icu.util.Calendar>, java.util.Locale);
+ ctor public DateFormatSymbols(java.lang.Class<? extends android.icu.util.Calendar>, android.icu.util.ULocale);
+ ctor public DateFormatSymbols(java.util.ResourceBundle, java.util.Locale);
+ ctor public DateFormatSymbols(java.util.ResourceBundle, android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public java.lang.String[] getAmPmStrings();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.lang.String[] getEraNames();
+ method public java.lang.String[] getEras();
+ method public static android.icu.text.DateFormatSymbols getInstance();
+ method public static android.icu.text.DateFormatSymbols getInstance(java.util.Locale);
+ method public static android.icu.text.DateFormatSymbols getInstance(android.icu.util.ULocale);
+ method public java.lang.String getLocalPatternChars();
+ method public java.lang.String[] getMonths();
+ method public java.lang.String[] getMonths(int, int);
+ method public java.lang.String[] getQuarters(int, int);
+ method public java.lang.String[] getShortMonths();
+ method public java.lang.String[] getShortWeekdays();
+ method public java.lang.String[] getWeekdays();
+ method public java.lang.String[] getWeekdays(int, int);
+ method public java.lang.String[] getYearNames(int, int);
+ method public java.lang.String[] getZodiacNames(int, int);
+ method public java.lang.String[][] getZoneStrings();
+ method protected void initializeData(android.icu.util.ULocale, java.lang.String);
+ method public void setAmPmStrings(java.lang.String[]);
+ method public void setEraNames(java.lang.String[]);
+ method public void setEras(java.lang.String[]);
+ method public void setLocalPatternChars(java.lang.String);
+ method public void setMonths(java.lang.String[]);
+ method public void setMonths(java.lang.String[], int, int);
+ method public void setQuarters(java.lang.String[], int, int);
+ method public void setShortMonths(java.lang.String[]);
+ method public void setShortWeekdays(java.lang.String[]);
+ method public void setWeekdays(java.lang.String[], int, int);
+ method public void setWeekdays(java.lang.String[]);
+ method public void setYearNames(java.lang.String[], int, int);
+ method public void setZodiacNames(java.lang.String[], int, int);
+ method public void setZoneStrings(java.lang.String[][]);
+ field public static final int ABBREVIATED = 0; // 0x0
+ field public static final int FORMAT = 0; // 0x0
+ field public static final int NARROW = 2; // 0x2
+ field public static final int SHORT = 3; // 0x3
+ field public static final int STANDALONE = 1; // 0x1
+ field public static final int WIDE = 1; // 0x1
+ }
+
+ public class DateIntervalFormat extends android.icu.text.UFormat {
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(android.icu.util.DateInterval, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(android.icu.util.Calendar, android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.DateFormat getDateFormat();
+ method public android.icu.text.DateIntervalInfo getDateIntervalInfo();
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.text.DateIntervalInfo);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, java.util.Locale, android.icu.text.DateIntervalInfo);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.util.ULocale, android.icu.text.DateIntervalInfo);
+ method public android.icu.util.TimeZone getTimeZone();
+ method public deprecated java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setDateIntervalInfo(android.icu.text.DateIntervalInfo);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ }
+
+ public class DateIntervalInfo implements java.lang.Cloneable android.icu.util.Freezable java.io.Serializable {
+ ctor public DateIntervalInfo(android.icu.util.ULocale);
+ ctor public DateIntervalInfo(java.util.Locale);
+ method public java.lang.Object clone();
+ method public android.icu.text.DateIntervalInfo cloneAsThawed();
+ method public android.icu.text.DateIntervalInfo freeze();
+ method public boolean getDefaultOrder();
+ method public java.lang.String getFallbackIntervalPattern();
+ method public android.icu.text.DateIntervalInfo.PatternInfo getIntervalPattern(java.lang.String, int);
+ method public boolean isFrozen();
+ method public void setFallbackIntervalPattern(java.lang.String);
+ method public void setIntervalPattern(java.lang.String, int, java.lang.String);
+ }
+
+ public static final class DateIntervalInfo.PatternInfo implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateIntervalInfo.PatternInfo(java.lang.String, java.lang.String, boolean);
+ method public boolean firstDateInPtnIsLaterDate();
+ method public java.lang.String getFirstPart();
+ method public java.lang.String getSecondPart();
+ }
+
+ public class DateTimePatternGenerator implements java.lang.Cloneable android.icu.util.Freezable {
+ ctor protected DateTimePatternGenerator();
+ method public android.icu.text.DateTimePatternGenerator addPattern(java.lang.String, boolean, android.icu.text.DateTimePatternGenerator.PatternInfo);
+ method public java.lang.Object clone();
+ method public android.icu.text.DateTimePatternGenerator cloneAsThawed();
+ method public android.icu.text.DateTimePatternGenerator freeze();
+ method public java.lang.String getAppendItemFormat(int);
+ method public java.lang.String getAppendItemName(int);
+ method public java.lang.String getBaseSkeleton(java.lang.String);
+ method public java.util.Set<java.lang.String> getBaseSkeletons(java.util.Set<java.lang.String>);
+ method public java.lang.String getBestPattern(java.lang.String);
+ method public java.lang.String getBestPattern(java.lang.String, int);
+ method public java.lang.String getDateTimeFormat();
+ method public java.lang.String getDecimal();
+ method public static android.icu.text.DateTimePatternGenerator getEmptyInstance();
+ method public static android.icu.text.DateTimePatternGenerator getInstance();
+ method public static android.icu.text.DateTimePatternGenerator getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.DateTimePatternGenerator getInstance(java.util.Locale);
+ method public java.lang.String getSkeleton(java.lang.String);
+ method public java.util.Map<java.lang.String, java.lang.String> getSkeletons(java.util.Map<java.lang.String, java.lang.String>);
+ method public boolean isFrozen();
+ method public java.lang.String replaceFieldTypes(java.lang.String, java.lang.String);
+ method public java.lang.String replaceFieldTypes(java.lang.String, java.lang.String, int);
+ method public void setAppendItemFormat(int, java.lang.String);
+ method public void setAppendItemName(int, java.lang.String);
+ method public void setDateTimeFormat(java.lang.String);
+ method public void setDecimal(java.lang.String);
+ field public static final int DAY = 7; // 0x7
+ field public static final int DAYPERIOD = 10; // 0xa
+ field public static final int DAY_OF_WEEK_IN_MONTH = 9; // 0x9
+ field public static final int DAY_OF_YEAR = 8; // 0x8
+ field public static final int ERA = 0; // 0x0
+ field public static final int FRACTIONAL_SECOND = 14; // 0xe
+ field public static final int HOUR = 11; // 0xb
+ field public static final int MATCH_ALL_FIELDS_LENGTH = 65535; // 0xffff
+ field public static final int MATCH_HOUR_FIELD_LENGTH = 2048; // 0x800
+ field public static final int MATCH_NO_OPTIONS = 0; // 0x0
+ field public static final int MINUTE = 12; // 0xc
+ field public static final int MONTH = 3; // 0x3
+ field public static final int QUARTER = 2; // 0x2
+ field public static final int SECOND = 13; // 0xd
+ field public static final int TYPE_LIMIT = 16; // 0x10
+ field public static final int WEEKDAY = 6; // 0x6
+ field public static final int WEEK_OF_MONTH = 5; // 0x5
+ field public static final int WEEK_OF_YEAR = 4; // 0x4
+ field public static final int YEAR = 1; // 0x1
+ field public static final int ZONE = 15; // 0xf
+ }
+
+ public static final class DateTimePatternGenerator.PatternInfo {
+ ctor public DateTimePatternGenerator.PatternInfo();
+ field public static final int BASE_CONFLICT = 1; // 0x1
+ field public static final int CONFLICT = 2; // 0x2
+ field public static final int OK = 0; // 0x0
+ field public java.lang.String conflictingPattern;
+ field public int status;
+ }
+
+ public class DecimalFormat extends android.icu.text.NumberFormat {
+ ctor public DecimalFormat();
+ ctor public DecimalFormat(java.lang.String);
+ ctor public DecimalFormat(java.lang.String, android.icu.text.DecimalFormatSymbols);
+ ctor public DecimalFormat(java.lang.String, android.icu.text.DecimalFormatSymbols, android.icu.text.CurrencyPluralInfo, int);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public boolean areSignificantDigitsUsed();
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.CurrencyPluralInfo getCurrencyPluralInfo();
+ method public android.icu.util.Currency.CurrencyUsage getCurrencyUsage();
+ method public android.icu.text.DecimalFormatSymbols getDecimalFormatSymbols();
+ method public int getFormatWidth();
+ method public int getGroupingSize();
+ method public java.math.MathContext getMathContext();
+ method public android.icu.math.MathContext getMathContextICU();
+ method public int getMaximumSignificantDigits();
+ method public byte getMinimumExponentDigits();
+ method public int getMinimumSignificantDigits();
+ method public int getMultiplier();
+ method public java.lang.String getNegativePrefix();
+ method public java.lang.String getNegativeSuffix();
+ method public char getPadCharacter();
+ method public int getPadPosition();
+ method public int getParseMaxDigits();
+ method public java.lang.String getPositivePrefix();
+ method public java.lang.String getPositiveSuffix();
+ method public java.math.BigDecimal getRoundingIncrement();
+ method public int getSecondaryGroupingSize();
+ method public boolean isDecimalPatternMatchRequired();
+ method public boolean isDecimalSeparatorAlwaysShown();
+ method public boolean isExponentSignAlwaysShown();
+ method public boolean isParseBigDecimal();
+ method public boolean isScientificNotation();
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public void setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo);
+ method public void setCurrencyUsage(android.icu.util.Currency.CurrencyUsage);
+ method public void setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols);
+ method public void setDecimalPatternMatchRequired(boolean);
+ method public void setDecimalSeparatorAlwaysShown(boolean);
+ method public void setExponentSignAlwaysShown(boolean);
+ method public void setFormatWidth(int);
+ method public void setGroupingSize(int);
+ method public void setMathContext(java.math.MathContext);
+ method public void setMathContextICU(android.icu.math.MathContext);
+ method public void setMaximumSignificantDigits(int);
+ method public void setMinimumExponentDigits(byte);
+ method public void setMinimumSignificantDigits(int);
+ method public void setMultiplier(int);
+ method public void setNegativePrefix(java.lang.String);
+ method public void setNegativeSuffix(java.lang.String);
+ method public void setPadCharacter(char);
+ method public void setPadPosition(int);
+ method public void setParseBigDecimal(boolean);
+ method public void setParseMaxDigits(int);
+ method public void setPositivePrefix(java.lang.String);
+ method public void setPositiveSuffix(java.lang.String);
+ method public void setRoundingIncrement(java.math.BigDecimal);
+ method public void setRoundingIncrement(android.icu.math.BigDecimal);
+ method public void setRoundingIncrement(double);
+ method public void setScientificNotation(boolean);
+ method public void setSecondaryGroupingSize(int);
+ method public void setSignificantDigitsUsed(boolean);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ field public static final int PAD_AFTER_PREFIX = 1; // 0x1
+ field public static final int PAD_AFTER_SUFFIX = 3; // 0x3
+ field public static final int PAD_BEFORE_PREFIX = 0; // 0x0
+ field public static final int PAD_BEFORE_SUFFIX = 2; // 0x2
+ }
+
+ public class DecimalFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DecimalFormatSymbols();
+ ctor public DecimalFormatSymbols(java.util.Locale);
+ ctor public DecimalFormatSymbols(android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.util.Currency getCurrency();
+ method public java.lang.String getCurrencySymbol();
+ method public char getDecimalSeparator();
+ method public char getDigit();
+ method public char[] getDigits();
+ method public java.lang.String getExponentMultiplicationSign();
+ method public java.lang.String getExponentSeparator();
+ method public char getGroupingSeparator();
+ method public java.lang.String getInfinity();
+ method public static android.icu.text.DecimalFormatSymbols getInstance();
+ method public static android.icu.text.DecimalFormatSymbols getInstance(java.util.Locale);
+ method public static android.icu.text.DecimalFormatSymbols getInstance(android.icu.util.ULocale);
+ method public java.lang.String getInternationalCurrencySymbol();
+ method public java.util.Locale getLocale();
+ method public char getMinusSign();
+ method public char getMonetaryDecimalSeparator();
+ method public char getMonetaryGroupingSeparator();
+ method public java.lang.String getNaN();
+ method public char getPadEscape();
+ method public java.lang.String getPatternForCurrencySpacing(int, boolean);
+ method public char getPatternSeparator();
+ method public char getPerMill();
+ method public char getPercent();
+ method public char getPlusSign();
+ method public char getSignificantDigit();
+ method public android.icu.util.ULocale getULocale();
+ method public char getZeroDigit();
+ method public void setCurrency(android.icu.util.Currency);
+ method public void setCurrencySymbol(java.lang.String);
+ method public void setDecimalSeparator(char);
+ method public void setDigit(char);
+ method public void setExponentMultiplicationSign(java.lang.String);
+ method public void setExponentSeparator(java.lang.String);
+ method public void setGroupingSeparator(char);
+ method public void setInfinity(java.lang.String);
+ method public void setInternationalCurrencySymbol(java.lang.String);
+ method public void setMinusSign(char);
+ method public void setMonetaryDecimalSeparator(char);
+ method public void setMonetaryGroupingSeparator(char);
+ method public void setNaN(java.lang.String);
+ method public void setPadEscape(char);
+ method public void setPatternForCurrencySpacing(int, boolean, java.lang.String);
+ method public void setPatternSeparator(char);
+ method public void setPerMill(char);
+ method public void setPercent(char);
+ method public void setPlusSign(char);
+ method public void setSignificantDigit(char);
+ method public void setZeroDigit(char);
+ field public static final int CURRENCY_SPC_CURRENCY_MATCH = 0; // 0x0
+ field public static final int CURRENCY_SPC_INSERT = 2; // 0x2
+ field public static final int CURRENCY_SPC_SURROUNDING_MATCH = 1; // 0x1
+ }
+
+ public final class DisplayContext extends java.lang.Enum {
+ method public android.icu.text.DisplayContext.Type type();
+ method public int value();
+ method public static android.icu.text.DisplayContext valueOf(java.lang.String);
+ method public static final android.icu.text.DisplayContext[] values();
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_STANDALONE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_UI_LIST_OR_MENU;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_NONE;
+ enum_constant public static final android.icu.text.DisplayContext DIALECT_NAMES;
+ enum_constant public static final android.icu.text.DisplayContext LENGTH_FULL;
+ enum_constant public static final android.icu.text.DisplayContext LENGTH_SHORT;
+ enum_constant public static final android.icu.text.DisplayContext STANDARD_NAMES;
+ }
+
+ public static final class DisplayContext.Type extends java.lang.Enum {
+ method public static android.icu.text.DisplayContext.Type valueOf(java.lang.String);
+ method public static final android.icu.text.DisplayContext.Type[] values();
+ enum_constant public static final android.icu.text.DisplayContext.Type CAPITALIZATION;
+ enum_constant public static final android.icu.text.DisplayContext.Type DIALECT_HANDLING;
+ enum_constant public static final android.icu.text.DisplayContext.Type DISPLAY_LENGTH;
+ }
+
+ public abstract class IDNA {
+ method public static android.icu.text.IDNA getUTS46Instance(int);
+ method public abstract java.lang.StringBuilder labelToASCII(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder labelToUnicode(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder nameToASCII(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder nameToUnicode(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ field public static final int CHECK_BIDI = 4; // 0x4
+ field public static final int CHECK_CONTEXTJ = 8; // 0x8
+ field public static final int CHECK_CONTEXTO = 64; // 0x40
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int NONTRANSITIONAL_TO_ASCII = 16; // 0x10
+ field public static final int NONTRANSITIONAL_TO_UNICODE = 32; // 0x20
+ field public static final int USE_STD3_RULES = 2; // 0x2
+ }
+
+ public static final class IDNA.Error extends java.lang.Enum {
+ method public static android.icu.text.IDNA.Error valueOf(java.lang.String);
+ method public static final android.icu.text.IDNA.Error[] values();
+ enum_constant public static final android.icu.text.IDNA.Error BIDI;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTJ;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTO_DIGITS;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTO_PUNCTUATION;
+ enum_constant public static final android.icu.text.IDNA.Error DISALLOWED;
+ enum_constant public static final android.icu.text.IDNA.Error DOMAIN_NAME_TOO_LONG;
+ enum_constant public static final android.icu.text.IDNA.Error EMPTY_LABEL;
+ enum_constant public static final android.icu.text.IDNA.Error HYPHEN_3_4;
+ enum_constant public static final android.icu.text.IDNA.Error INVALID_ACE_LABEL;
+ enum_constant public static final android.icu.text.IDNA.Error LABEL_HAS_DOT;
+ enum_constant public static final android.icu.text.IDNA.Error LABEL_TOO_LONG;
+ enum_constant public static final android.icu.text.IDNA.Error LEADING_COMBINING_MARK;
+ enum_constant public static final android.icu.text.IDNA.Error LEADING_HYPHEN;
+ enum_constant public static final android.icu.text.IDNA.Error PUNYCODE;
+ enum_constant public static final android.icu.text.IDNA.Error TRAILING_HYPHEN;
+ }
+
+ public static final class IDNA.Info {
+ ctor public IDNA.Info();
+ method public java.util.Set<android.icu.text.IDNA.Error> getErrors();
+ method public boolean hasErrors();
+ method public boolean isTransitionalDifferent();
+ }
+
+ public abstract class LocaleDisplayNames {
+ method public abstract android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public abstract android.icu.text.LocaleDisplayNames.DialectHandling getDialectHandling();
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale);
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.LocaleDisplayNames.DialectHandling);
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.DisplayContext...);
+ method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale, android.icu.text.DisplayContext...);
+ method public abstract android.icu.util.ULocale getLocale();
+ method public abstract java.lang.String keyDisplayName(java.lang.String);
+ method public abstract java.lang.String keyValueDisplayName(java.lang.String, java.lang.String);
+ method public abstract java.lang.String languageDisplayName(java.lang.String);
+ method public abstract java.lang.String localeDisplayName(android.icu.util.ULocale);
+ method public abstract java.lang.String localeDisplayName(java.util.Locale);
+ method public abstract java.lang.String localeDisplayName(java.lang.String);
+ method public abstract java.lang.String regionDisplayName(java.lang.String);
+ method public abstract java.lang.String scriptDisplayName(java.lang.String);
+ method public abstract java.lang.String scriptDisplayName(int);
+ method public abstract java.lang.String variantDisplayName(java.lang.String);
+ }
+
+ public static final class LocaleDisplayNames.DialectHandling extends java.lang.Enum {
+ method public static android.icu.text.LocaleDisplayNames.DialectHandling valueOf(java.lang.String);
+ method public static final android.icu.text.LocaleDisplayNames.DialectHandling[] values();
+ enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling DIALECT_NAMES;
+ enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling STANDARD_NAMES;
+ }
+
+ public class MeasureFormat extends android.icu.text.UFormat {
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String formatMeasures(android.icu.util.Measure...);
+ method public java.lang.StringBuilder formatMeasures(java.lang.StringBuilder, java.text.FieldPosition, android.icu.util.Measure...);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat(android.icu.util.ULocale);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat(java.util.Locale);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat();
+ method public static android.icu.text.MeasureFormat getInstance(android.icu.util.ULocale, android.icu.text.MeasureFormat.FormatWidth);
+ method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth);
+ method public static android.icu.text.MeasureFormat getInstance(android.icu.util.ULocale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);
+ method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);
+ method public final android.icu.util.ULocale getLocale();
+ method public android.icu.text.NumberFormat getNumberFormat();
+ method public android.icu.text.MeasureFormat.FormatWidth getWidth();
+ method public final int hashCode();
+ method public android.icu.util.Measure parseObject(java.lang.String, java.text.ParsePosition);
+ }
+
+ public static final class MeasureFormat.FormatWidth extends java.lang.Enum {
+ method public static android.icu.text.MeasureFormat.FormatWidth valueOf(java.lang.String);
+ method public static final android.icu.text.MeasureFormat.FormatWidth[] values();
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth NARROW;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth NUMERIC;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth SHORT;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth WIDE;
+ }
+
+ public class MessageFormat extends android.icu.text.UFormat {
+ ctor public MessageFormat(java.lang.String);
+ ctor public MessageFormat(java.lang.String, java.util.Locale);
+ ctor public MessageFormat(java.lang.String, android.icu.util.ULocale);
+ method public void applyPattern(java.lang.String);
+ method public void applyPattern(java.lang.String, android.icu.text.MessagePattern.ApostropheMode);
+ method public static java.lang.String autoQuoteApostrophe(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(java.util.Map<java.lang.String, java.lang.Object>, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public static java.lang.String format(java.lang.String, java.util.Map<java.lang.String, java.lang.Object>);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.MessagePattern.ApostropheMode getApostropheMode();
+ method public java.util.Set<java.lang.String> getArgumentNames();
+ method public java.text.Format getFormatByArgumentName(java.lang.String);
+ method public java.text.Format[] getFormats();
+ method public java.text.Format[] getFormatsByArgumentIndex();
+ method public java.util.Locale getLocale();
+ method public android.icu.util.ULocale getULocale();
+ method public java.lang.Object[] parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.util.Map<java.lang.String, java.lang.Object> parseToMap(java.lang.String, java.text.ParsePosition);
+ method public java.util.Map<java.lang.String, java.lang.Object> parseToMap(java.lang.String) throws java.text.ParseException;
+ method public void setFormat(int, java.text.Format);
+ method public void setFormatByArgumentIndex(int, java.text.Format);
+ method public void setFormatByArgumentName(java.lang.String, java.text.Format);
+ method public void setFormats(java.text.Format[]);
+ method public void setFormatsByArgumentIndex(java.text.Format[]);
+ method public void setFormatsByArgumentName(java.util.Map<java.lang.String, java.text.Format>);
+ method public void setLocale(java.util.Locale);
+ method public void setLocale(android.icu.util.ULocale);
+ method public java.lang.String toPattern();
+ method public boolean usesNamedArguments();
+ }
+
+ public static class MessageFormat.Field extends java.text.Format.Field {
+ ctor protected MessageFormat.Field(java.lang.String);
+ field public static final android.icu.text.MessageFormat.Field ARGUMENT;
+ }
+
+ public final class MessagePattern implements java.lang.Cloneable android.icu.util.Freezable {
+ ctor public MessagePattern();
+ ctor public MessagePattern(android.icu.text.MessagePattern.ApostropheMode);
+ ctor public MessagePattern(java.lang.String);
+ method public java.lang.String autoQuoteApostropheDeep();
+ method public void clear();
+ method public void clearPatternAndSetApostropheMode(android.icu.text.MessagePattern.ApostropheMode);
+ method public java.lang.Object clone();
+ method public android.icu.text.MessagePattern cloneAsThawed();
+ method public int countParts();
+ method public android.icu.text.MessagePattern freeze();
+ method public android.icu.text.MessagePattern.ApostropheMode getApostropheMode();
+ method public int getLimitPartIndex(int);
+ method public double getNumericValue(android.icu.text.MessagePattern.Part);
+ method public android.icu.text.MessagePattern.Part getPart(int);
+ method public android.icu.text.MessagePattern.Part.Type getPartType(int);
+ method public int getPatternIndex(int);
+ method public java.lang.String getPatternString();
+ method public double getPluralOffset(int);
+ method public java.lang.String getSubstring(android.icu.text.MessagePattern.Part);
+ method public boolean hasNamedArguments();
+ method public boolean hasNumberedArguments();
+ method public boolean isFrozen();
+ method public android.icu.text.MessagePattern parse(java.lang.String);
+ method public android.icu.text.MessagePattern parseChoiceStyle(java.lang.String);
+ method public android.icu.text.MessagePattern parsePluralStyle(java.lang.String);
+ method public android.icu.text.MessagePattern parseSelectStyle(java.lang.String);
+ method public boolean partSubstringMatches(android.icu.text.MessagePattern.Part, java.lang.String);
+ method public static int validateArgumentName(java.lang.String);
+ field public static final int ARG_NAME_NOT_NUMBER = -1; // 0xffffffff
+ field public static final int ARG_NAME_NOT_VALID = -2; // 0xfffffffe
+ field public static final double NO_NUMERIC_VALUE = -1.23456789E8;
+ }
+
+ public static final class MessagePattern.ApostropheMode extends java.lang.Enum {
+ method public static android.icu.text.MessagePattern.ApostropheMode valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.ApostropheMode[] values();
+ enum_constant public static final android.icu.text.MessagePattern.ApostropheMode DOUBLE_OPTIONAL;
+ enum_constant public static final android.icu.text.MessagePattern.ApostropheMode DOUBLE_REQUIRED;
+ }
+
+ public static final class MessagePattern.ArgType extends java.lang.Enum {
+ method public boolean hasPluralStyle();
+ method public static android.icu.text.MessagePattern.ArgType valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.ArgType[] values();
+ enum_constant public static final android.icu.text.MessagePattern.ArgType CHOICE;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType NONE;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType PLURAL;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SELECT;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SELECTORDINAL;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SIMPLE;
+ }
+
+ public static final class MessagePattern.Part {
+ method public android.icu.text.MessagePattern.ArgType getArgType();
+ method public int getIndex();
+ method public int getLength();
+ method public int getLimit();
+ method public android.icu.text.MessagePattern.Part.Type getType();
+ method public int getValue();
+ }
+
+ public static final class MessagePattern.Part.Type extends java.lang.Enum {
+ method public boolean hasNumericValue();
+ method public static android.icu.text.MessagePattern.Part.Type valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.Part.Type[] values();
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_DOUBLE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_INT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_LIMIT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_NAME;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_NUMBER;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_SELECTOR;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_START;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_STYLE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_TYPE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type INSERT_CHAR;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type MSG_LIMIT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type MSG_START;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type REPLACE_NUMBER;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type SKIP_SYNTAX;
+ }
+
+ public final class Normalizer implements java.lang.Cloneable {
+ method public static int compare(char[], int, int, char[], int, int, int);
+ method public static int compare(java.lang.String, java.lang.String, int);
+ method public static int compare(char[], char[], int);
+ method public static int compare(int, int, int);
+ method public static int compare(int, java.lang.String, int);
+ field public static final int COMPARE_CODE_POINT_ORDER = 32768; // 0x8000
+ field public static final int COMPARE_IGNORE_CASE = 65536; // 0x10000
+ field public static final int FOLD_CASE_DEFAULT = 0; // 0x0
+ field public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1; // 0x1
+ field public static final int INPUT_IS_FCD = 131072; // 0x20000
+ field public static final android.icu.text.Normalizer.QuickCheckResult MAYBE;
+ field public static final android.icu.text.Normalizer.QuickCheckResult NO;
+ field public static final android.icu.text.Normalizer.QuickCheckResult YES;
+ }
+
+ public static final class Normalizer.QuickCheckResult {
+ }
+
+ public abstract class Normalizer2 {
+ method public abstract java.lang.StringBuilder append(java.lang.StringBuilder, java.lang.CharSequence);
+ method public int composePair(int, int);
+ method public int getCombiningClass(int);
+ method public abstract java.lang.String getDecomposition(int);
+ method public static android.icu.text.Normalizer2 getInstance(java.io.InputStream, java.lang.String, android.icu.text.Normalizer2.Mode);
+ method public static android.icu.text.Normalizer2 getNFCInstance();
+ method public static android.icu.text.Normalizer2 getNFDInstance();
+ method public static android.icu.text.Normalizer2 getNFKCCasefoldInstance();
+ method public static android.icu.text.Normalizer2 getNFKCInstance();
+ method public static android.icu.text.Normalizer2 getNFKDInstance();
+ method public java.lang.String getRawDecomposition(int);
+ method public abstract boolean hasBoundaryAfter(int);
+ method public abstract boolean hasBoundaryBefore(int);
+ method public abstract boolean isInert(int);
+ method public abstract boolean isNormalized(java.lang.CharSequence);
+ method public java.lang.String normalize(java.lang.CharSequence);
+ method public abstract java.lang.StringBuilder normalize(java.lang.CharSequence, java.lang.StringBuilder);
+ method public abstract java.lang.Appendable normalize(java.lang.CharSequence, java.lang.Appendable);
+ method public abstract java.lang.StringBuilder normalizeSecondAndAppend(java.lang.StringBuilder, java.lang.CharSequence);
+ method public abstract android.icu.text.Normalizer.QuickCheckResult quickCheck(java.lang.CharSequence);
+ method public abstract int spanQuickCheckYes(java.lang.CharSequence);
+ }
+
+ public static final class Normalizer2.Mode extends java.lang.Enum {
+ method public static android.icu.text.Normalizer2.Mode valueOf(java.lang.String);
+ method public static final android.icu.text.Normalizer2.Mode[] values();
+ enum_constant public static final android.icu.text.Normalizer2.Mode COMPOSE;
+ enum_constant public static final android.icu.text.Normalizer2.Mode COMPOSE_CONTIGUOUS;
+ enum_constant public static final android.icu.text.Normalizer2.Mode DECOMPOSE;
+ enum_constant public static final android.icu.text.Normalizer2.Mode FCD;
+ }
+
+ public abstract class NumberFormat extends android.icu.text.UFormat {
+ ctor public NumberFormat();
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(double);
+ method public final java.lang.String format(long);
+ method public final java.lang.String format(java.math.BigInteger);
+ method public final java.lang.String format(java.math.BigDecimal);
+ method public final java.lang.String format(android.icu.math.BigDecimal);
+ method public final java.lang.String format(android.icu.util.CurrencyAmount);
+ method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(android.icu.util.CurrencyAmount, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public android.icu.util.Currency getCurrency();
+ method public static final android.icu.text.NumberFormat getCurrencyInstance();
+ method public static android.icu.text.NumberFormat getCurrencyInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getCurrencyInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.NumberFormat getInstance();
+ method public static android.icu.text.NumberFormat getInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.NumberFormat getInstance(int);
+ method public static android.icu.text.NumberFormat getInstance(java.util.Locale, int);
+ method public static android.icu.text.NumberFormat getInstance(android.icu.util.ULocale, int);
+ method public static final android.icu.text.NumberFormat getIntegerInstance();
+ method public static android.icu.text.NumberFormat getIntegerInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getIntegerInstance(android.icu.util.ULocale);
+ method public int getMaximumFractionDigits();
+ method public int getMaximumIntegerDigits();
+ method public int getMinimumFractionDigits();
+ method public int getMinimumIntegerDigits();
+ method public static final android.icu.text.NumberFormat getNumberInstance();
+ method public static android.icu.text.NumberFormat getNumberInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getNumberInstance(android.icu.util.ULocale);
+ method protected static java.lang.String getPattern(android.icu.util.ULocale, int);
+ method public static final android.icu.text.NumberFormat getPercentInstance();
+ method public static android.icu.text.NumberFormat getPercentInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getPercentInstance(android.icu.util.ULocale);
+ method public int getRoundingMode();
+ method public static final android.icu.text.NumberFormat getScientificInstance();
+ method public static android.icu.text.NumberFormat getScientificInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getScientificInstance(android.icu.util.ULocale);
+ method public boolean isGroupingUsed();
+ method public boolean isParseIntegerOnly();
+ method public boolean isParseStrict();
+ method public abstract java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
+ method public android.icu.util.CurrencyAmount parseCurrency(java.lang.CharSequence, java.text.ParsePosition);
+ method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public static java.lang.Object registerFactory(android.icu.text.NumberFormat.NumberFormatFactory);
+ method public void setContext(android.icu.text.DisplayContext);
+ method public void setCurrency(android.icu.util.Currency);
+ method public void setGroupingUsed(boolean);
+ method public void setMaximumFractionDigits(int);
+ method public void setMaximumIntegerDigits(int);
+ method public void setMinimumFractionDigits(int);
+ method public void setMinimumIntegerDigits(int);
+ method public void setParseIntegerOnly(boolean);
+ method public void setParseStrict(boolean);
+ method public void setRoundingMode(int);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int ACCOUNTINGCURRENCYSTYLE = 7; // 0x7
+ field public static final int CASHCURRENCYSTYLE = 8; // 0x8
+ field public static final int CURRENCYSTYLE = 1; // 0x1
+ field public static final int FRACTION_FIELD = 1; // 0x1
+ field public static final int INTEGERSTYLE = 4; // 0x4
+ field public static final int INTEGER_FIELD = 0; // 0x0
+ field public static final int ISOCURRENCYSTYLE = 5; // 0x5
+ field public static final int NUMBERSTYLE = 0; // 0x0
+ field public static final int PERCENTSTYLE = 2; // 0x2
+ field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
+ field public static final int SCIENTIFICSTYLE = 3; // 0x3
+ }
+
+ public static class NumberFormat.Field extends java.text.Format.Field {
+ ctor protected NumberFormat.Field(java.lang.String);
+ field public static final android.icu.text.NumberFormat.Field CURRENCY;
+ field public static final android.icu.text.NumberFormat.Field DECIMAL_SEPARATOR;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT_SIGN;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT_SYMBOL;
+ field public static final android.icu.text.NumberFormat.Field FRACTION;
+ field public static final android.icu.text.NumberFormat.Field GROUPING_SEPARATOR;
+ field public static final android.icu.text.NumberFormat.Field INTEGER;
+ field public static final android.icu.text.NumberFormat.Field PERCENT;
+ field public static final android.icu.text.NumberFormat.Field PERMILLE;
+ field public static final android.icu.text.NumberFormat.Field SIGN;
+ }
+
+ public static abstract class NumberFormat.NumberFormatFactory {
+ ctor protected NumberFormat.NumberFormatFactory();
+ method public android.icu.text.NumberFormat createFormat(android.icu.util.ULocale, int);
+ method public android.icu.text.NumberFormat createFormat(java.util.Locale, int);
+ method public abstract java.util.Set<java.lang.String> getSupportedLocaleNames();
+ method public boolean visible();
+ field public static final int FORMAT_CURRENCY = 1; // 0x1
+ field public static final int FORMAT_INTEGER = 4; // 0x4
+ field public static final int FORMAT_NUMBER = 0; // 0x0
+ field public static final int FORMAT_PERCENT = 2; // 0x2
+ field public static final int FORMAT_SCIENTIFIC = 3; // 0x3
+ }
+
+ public static abstract class NumberFormat.SimpleNumberFormatFactory extends android.icu.text.NumberFormat.NumberFormatFactory {
+ ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale);
+ ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale, boolean);
+ ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale);
+ ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale, boolean);
+ method public final java.util.Set<java.lang.String> getSupportedLocaleNames();
+ method public final boolean visible();
+ }
+
+ public class NumberingSystem {
+ ctor public NumberingSystem();
+ method public static java.lang.String[] getAvailableNames();
+ method public java.lang.String getDescription();
+ method public static android.icu.text.NumberingSystem getInstance(int, boolean, java.lang.String);
+ method public static android.icu.text.NumberingSystem getInstance(java.util.Locale);
+ method public static android.icu.text.NumberingSystem getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.NumberingSystem getInstance();
+ method public static android.icu.text.NumberingSystem getInstanceByName(java.lang.String);
+ method public java.lang.String getName();
+ method public int getRadix();
+ method public boolean isAlgorithmic();
+ method public static boolean isValidDigitString(java.lang.String);
+ }
+
+ public class PluralFormat extends android.icu.text.UFormat {
+ ctor public PluralFormat();
+ ctor public PluralFormat(android.icu.util.ULocale);
+ ctor public PluralFormat(java.util.Locale);
+ ctor public PluralFormat(android.icu.text.PluralRules);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules);
+ ctor public PluralFormat(java.util.Locale, android.icu.text.PluralRules);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType);
+ ctor public PluralFormat(java.util.Locale, android.icu.text.PluralRules.PluralType);
+ ctor public PluralFormat(java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, java.lang.String);
+ ctor public PluralFormat(android.icu.text.PluralRules, java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules, java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType, java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public boolean equals(android.icu.text.PluralFormat);
+ method public final java.lang.String format(double);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setNumberFormat(android.icu.text.NumberFormat);
+ method public java.lang.String toPattern();
+ }
+
+ public class PluralRules implements java.io.Serializable {
+ method public static android.icu.text.PluralRules createRules(java.lang.String);
+ method public boolean equals(android.icu.text.PluralRules);
+ method public static android.icu.text.PluralRules forLocale(android.icu.util.ULocale);
+ method public static android.icu.text.PluralRules forLocale(java.util.Locale);
+ method public static android.icu.text.PluralRules forLocale(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType);
+ method public static android.icu.text.PluralRules forLocale(java.util.Locale, android.icu.text.PluralRules.PluralType);
+ method public java.util.Collection<java.lang.Double> getAllKeywordValues(java.lang.String);
+ method public java.util.Set<java.lang.String> getKeywords();
+ method public java.util.Collection<java.lang.Double> getSamples(java.lang.String);
+ method public double getUniqueKeywordValue(java.lang.String);
+ method public static android.icu.text.PluralRules parseDescription(java.lang.String) throws java.text.ParseException;
+ method public java.lang.String select(double);
+ field public static final android.icu.text.PluralRules DEFAULT;
+ field public static final java.lang.String KEYWORD_FEW = "few";
+ field public static final java.lang.String KEYWORD_MANY = "many";
+ field public static final java.lang.String KEYWORD_ONE = "one";
+ field public static final java.lang.String KEYWORD_OTHER = "other";
+ field public static final java.lang.String KEYWORD_TWO = "two";
+ field public static final java.lang.String KEYWORD_ZERO = "zero";
+ field public static final double NO_UNIQUE_VALUE = -0.00123456777;
+ }
+
+ public static final class PluralRules.PluralType extends java.lang.Enum {
+ method public static android.icu.text.PluralRules.PluralType valueOf(java.lang.String);
+ method public static final android.icu.text.PluralRules.PluralType[] values();
+ enum_constant public static final android.icu.text.PluralRules.PluralType CARDINAL;
+ enum_constant public static final android.icu.text.PluralRules.PluralType ORDINAL;
+ }
+
+ public final class RawCollationKey extends android.icu.util.ByteArrayWrapper {
+ ctor public RawCollationKey();
+ ctor public RawCollationKey(int);
+ ctor public RawCollationKey(byte[]);
+ ctor public RawCollationKey(byte[], int);
+ method public int compareTo(android.icu.text.RawCollationKey);
+ }
+
+ public final class RelativeDateTimeFormatter {
+ method public java.lang.String combineDateAndTime(java.lang.String, java.lang.String);
+ method public java.lang.String format(double, android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.RelativeUnit);
+ method public java.lang.String format(android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit);
+ method public android.icu.text.DisplayContext getCapitalizationContext();
+ method public android.icu.text.RelativeDateTimeFormatter.Style getFormatStyle();
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance();
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(java.util.Locale);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale, android.icu.text.NumberFormat);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale, android.icu.text.NumberFormat, android.icu.text.RelativeDateTimeFormatter.Style, android.icu.text.DisplayContext);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(java.util.Locale, android.icu.text.NumberFormat);
+ method public android.icu.text.NumberFormat getNumberFormat();
+ }
+
+ public static final class RelativeDateTimeFormatter.AbsoluteUnit extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit DAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit FRIDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit MONDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit MONTH;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit NOW;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit SATURDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit SUNDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit THURSDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit TUESDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit WEDNESDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit WEEK;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit YEAR;
+ }
+
+ public static final class RelativeDateTimeFormatter.Direction extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.Direction valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.Direction[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction LAST;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction LAST_2;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction NEXT;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction NEXT_2;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction PLAIN;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction THIS;
+ }
+
+ public static final class RelativeDateTimeFormatter.RelativeUnit extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.RelativeUnit valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit DAYS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit HOURS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit MINUTES;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit MONTHS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit SECONDS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit WEEKS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit YEARS;
+ }
+
+ public static final class RelativeDateTimeFormatter.Style extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.Style valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.Style[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style LONG;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style NARROW;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style SHORT;
+ }
+
+ public abstract interface Replaceable {
+ method public abstract int char32At(int);
+ method public abstract char charAt(int);
+ method public abstract void copy(int, int, int);
+ method public abstract void getChars(int, int, char[], int);
+ method public abstract boolean hasMetaData();
+ method public abstract int length();
+ method public abstract void replace(int, int, java.lang.String);
+ method public abstract void replace(int, int, char[], int, int);
+ }
+
+ public final class RuleBasedCollator extends android.icu.text.Collator {
+ ctor public RuleBasedCollator(java.lang.String) throws java.lang.Exception;
+ method public int compare(java.lang.String, java.lang.String);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(java.lang.String);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(android.icu.text.UCharacterIterator);
+ method public android.icu.text.CollationKey getCollationKey(java.lang.String);
+ method public void getContractionsAndExpansions(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet, boolean) throws java.lang.Exception;
+ method public boolean getNumericCollation();
+ method public android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public java.lang.String getRules();
+ method public java.lang.String getRules(boolean);
+ method public android.icu.util.VersionInfo getUCAVersion();
+ method public int getVariableTop();
+ method public android.icu.util.VersionInfo getVersion();
+ method public boolean isAlternateHandlingShifted();
+ method public boolean isCaseLevel();
+ method public boolean isFrenchCollation();
+ method public boolean isLowerCaseFirst();
+ method public boolean isUpperCaseFirst();
+ method public void setAlternateHandlingDefault();
+ method public void setAlternateHandlingShifted(boolean);
+ method public final void setCaseFirstDefault();
+ method public void setCaseLevel(boolean);
+ method public void setCaseLevelDefault();
+ method public void setDecompositionDefault();
+ method public void setFrenchCollation(boolean);
+ method public void setFrenchCollationDefault();
+ method public void setLowerCaseFirst(boolean);
+ method public void setNumericCollation(boolean);
+ method public void setNumericCollationDefault();
+ method public void setStrengthDefault();
+ method public void setUpperCaseFirst(boolean);
+ }
+
+ public abstract class SearchIterator {
+ ctor protected SearchIterator(java.text.CharacterIterator, android.icu.text.BreakIterator);
+ method public final int first();
+ method public final int following(int);
+ method public android.icu.text.BreakIterator getBreakIterator();
+ method public android.icu.text.SearchIterator.ElementComparisonType getElementComparisonType();
+ method public abstract int getIndex();
+ method public int getMatchLength();
+ method public int getMatchStart();
+ method public java.lang.String getMatchedText();
+ method public java.text.CharacterIterator getTarget();
+ method protected abstract int handleNext(int);
+ method protected abstract int handlePrevious(int);
+ method public boolean isOverlapping();
+ method public final int last();
+ method public int next();
+ method public final int preceding(int);
+ method public int previous();
+ method public void reset();
+ method public void setBreakIterator(android.icu.text.BreakIterator);
+ method public void setElementComparisonType(android.icu.text.SearchIterator.ElementComparisonType);
+ method public void setIndex(int);
+ method protected void setMatchLength(int);
+ method public void setOverlapping(boolean);
+ method public void setTarget(java.text.CharacterIterator);
+ field public static final int DONE = -1; // 0xffffffff
+ field protected android.icu.text.BreakIterator breakIterator;
+ field protected int matchLength;
+ field protected java.text.CharacterIterator targetText;
+ }
+
+ public static final class SearchIterator.ElementComparisonType extends java.lang.Enum {
+ method public static android.icu.text.SearchIterator.ElementComparisonType valueOf(java.lang.String);
+ method public static final android.icu.text.SearchIterator.ElementComparisonType[] values();
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType ANY_BASE_WEIGHT_IS_WILDCARD;
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType PATTERN_BASE_WEIGHT_IS_WILDCARD;
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType STANDARD_ELEMENT_COMPARISON;
+ }
+
+ public class SelectFormat extends java.text.Format {
+ ctor public SelectFormat(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public final java.lang.String format(java.lang.String);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.lang.String toPattern();
+ }
+
+ public class SimpleDateFormat extends android.icu.text.DateFormat {
+ ctor public SimpleDateFormat();
+ ctor public SimpleDateFormat(java.lang.String);
+ ctor public SimpleDateFormat(java.lang.String, java.util.Locale);
+ ctor public SimpleDateFormat(java.lang.String, android.icu.util.ULocale);
+ ctor public SimpleDateFormat(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ ctor public SimpleDateFormat(java.lang.String, android.icu.text.DateFormatSymbols);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public java.lang.StringBuffer format(android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.util.Date get2DigitYearStart();
+ method public android.icu.text.DateFormatSymbols getDateFormatSymbols();
+ method public android.icu.text.NumberFormat getNumberFormat(char);
+ method protected android.icu.text.DateFormatSymbols getSymbols();
+ method public android.icu.text.TimeZoneFormat getTimeZoneFormat();
+ method protected int matchQuarterString(java.lang.String, int, int, java.lang.String[], android.icu.util.Calendar);
+ method protected int matchString(java.lang.String, int, int, java.lang.String[], android.icu.util.Calendar);
+ method public void parse(java.lang.String, android.icu.util.Calendar, java.text.ParsePosition);
+ method protected android.icu.text.DateFormat.Field patternCharToDateFormatField(char);
+ method public void set2DigitYearStart(java.util.Date);
+ method public void setDateFormatSymbols(android.icu.text.DateFormatSymbols);
+ method public void setNumberFormat(java.lang.String, android.icu.text.NumberFormat);
+ method public void setTimeZoneFormat(android.icu.text.TimeZoneFormat);
+ method protected java.lang.String subFormat(char, int, int, java.text.FieldPosition, android.icu.text.DateFormatSymbols, android.icu.util.Calendar) throws java.lang.IllegalArgumentException;
+ method protected int subParse(java.lang.String, int, char, int, boolean, boolean, boolean[], android.icu.util.Calendar);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ method protected java.lang.String zeroPaddingNumber(long, int, int);
+ }
+
+ public class StringPrepParseException extends java.text.ParseException {
+ ctor public StringPrepParseException(java.lang.String, int);
+ ctor public StringPrepParseException(java.lang.String, int, java.lang.String, int);
+ ctor public StringPrepParseException(java.lang.String, int, java.lang.String, int, int);
+ method public int getError();
+ field public static final int ACE_PREFIX_ERROR = 6; // 0x6
+ field public static final int BUFFER_OVERFLOW_ERROR = 9; // 0x9
+ field public static final int CHECK_BIDI_ERROR = 4; // 0x4
+ field public static final int DOMAIN_NAME_TOO_LONG_ERROR = 11; // 0xb
+ field public static final int ILLEGAL_CHAR_FOUND = 1; // 0x1
+ field public static final int INVALID_CHAR_FOUND = 0; // 0x0
+ field public static final int LABEL_TOO_LONG_ERROR = 8; // 0x8
+ field public static final int PROHIBITED_ERROR = 2; // 0x2
+ field public static final int STD3_ASCII_RULES_ERROR = 5; // 0x5
+ field public static final int UNASSIGNED_ERROR = 3; // 0x3
+ field public static final int VERIFICATION_ERROR = 7; // 0x7
+ field public static final int ZERO_LENGTH_LABEL = 10; // 0xa
+ }
+
+ public final class StringSearch extends android.icu.text.SearchIterator {
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.text.RuleBasedCollator, android.icu.text.BreakIterator);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.text.RuleBasedCollator);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, java.util.Locale);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.util.ULocale);
+ ctor public StringSearch(java.lang.String, java.lang.String);
+ method public android.icu.text.RuleBasedCollator getCollator();
+ method public int getIndex();
+ method public java.lang.String getPattern();
+ method protected int handleNext(int);
+ method protected int handlePrevious(int);
+ method public boolean isCanonical();
+ method public void setCanonical(boolean);
+ method public void setCollator(android.icu.text.RuleBasedCollator);
+ method public void setPattern(java.lang.String);
+ }
+
+ public abstract interface SymbolTable {
+ method public abstract char[] lookup(java.lang.String);
+ method public abstract android.icu.text.UnicodeMatcher lookupMatcher(int);
+ method public abstract java.lang.String parseReference(java.lang.String, java.text.ParsePosition, int);
+ field public static final char SYMBOL_REF = 36; // 0x0024 '$'
+ }
+
+ public class TimeZoneFormat extends android.icu.text.UFormat implements android.icu.util.Freezable java.io.Serializable {
+ ctor protected TimeZoneFormat(android.icu.util.ULocale);
+ method public android.icu.text.TimeZoneFormat cloneAsThawed();
+ method public final java.lang.String format(android.icu.text.TimeZoneFormat.Style, android.icu.util.TimeZone, long);
+ method public java.lang.String format(android.icu.text.TimeZoneFormat.Style, android.icu.util.TimeZone, long, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String formatOffsetISO8601Basic(int, boolean, boolean, boolean);
+ method public final java.lang.String formatOffsetISO8601Extended(int, boolean, boolean, boolean);
+ method public java.lang.String formatOffsetLocalizedGMT(int);
+ method public java.lang.String formatOffsetShortLocalizedGMT(int);
+ method public android.icu.text.TimeZoneFormat freeze();
+ method public java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption> getDefaultParseOptions();
+ method public java.lang.String getGMTOffsetDigits();
+ method public java.lang.String getGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType);
+ method public java.lang.String getGMTPattern();
+ method public java.lang.String getGMTZeroFormat();
+ method public static android.icu.text.TimeZoneFormat getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.TimeZoneFormat getInstance(java.util.Locale);
+ method public android.icu.text.TimeZoneNames getTimeZoneNames();
+ method public boolean isFrozen();
+ method public android.icu.util.TimeZone parse(android.icu.text.TimeZoneFormat.Style, java.lang.String, java.text.ParsePosition, java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption>, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public android.icu.util.TimeZone parse(android.icu.text.TimeZoneFormat.Style, java.lang.String, java.text.ParsePosition, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public final android.icu.util.TimeZone parse(java.lang.String, java.text.ParsePosition);
+ method public final android.icu.util.TimeZone parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public final int parseOffsetISO8601(java.lang.String, java.text.ParsePosition);
+ method public int parseOffsetLocalizedGMT(java.lang.String, java.text.ParsePosition);
+ method public int parseOffsetShortLocalizedGMT(java.lang.String, java.text.ParsePosition);
+ method public android.icu.text.TimeZoneFormat setDefaultParseOptions(java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption>);
+ method public android.icu.text.TimeZoneFormat setGMTOffsetDigits(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType, java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTPattern(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTZeroFormat(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setTimeZoneNames(android.icu.text.TimeZoneNames);
+ }
+
+ public static final class TimeZoneFormat.GMTOffsetPatternType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.GMTOffsetPatternType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_H;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_HM;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_HMS;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_H;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_HM;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_HMS;
+ }
+
+ public static final class TimeZoneFormat.ParseOption extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.ParseOption valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.ParseOption[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.ParseOption ALL_STYLES;
+ enum_constant public static final android.icu.text.TimeZoneFormat.ParseOption TZ_DATABASE_ABBREVIATIONS;
+ }
+
+ public static final class TimeZoneFormat.Style extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.Style valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.Style[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style EXEMPLAR_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_LONG;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_LOCAL_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_LOCAL_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style LOCALIZED_GMT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style LOCALIZED_GMT_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style SPECIFIC_LONG;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style SPECIFIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ZONE_ID;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ZONE_ID_SHORT;
+ }
+
+ public static final class TimeZoneFormat.TimeType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.TimeType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.TimeType[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType STANDARD;
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType UNKNOWN;
+ }
+
+ public abstract class TimeZoneNames implements java.io.Serializable {
+ method public abstract java.util.Set<java.lang.String> getAvailableMetaZoneIDs();
+ method public abstract java.util.Set<java.lang.String> getAvailableMetaZoneIDs(java.lang.String);
+ method public final java.lang.String getDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType, long);
+ method public java.lang.String getExemplarLocationName(java.lang.String);
+ method public static android.icu.text.TimeZoneNames getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.TimeZoneNames getInstance(java.util.Locale);
+ method public abstract java.lang.String getMetaZoneDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType);
+ method public abstract java.lang.String getMetaZoneID(java.lang.String, long);
+ method public abstract java.lang.String getReferenceZoneID(java.lang.String, java.lang.String);
+ method public static android.icu.text.TimeZoneNames getTZDBInstance(android.icu.util.ULocale);
+ method public abstract java.lang.String getTimeZoneDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType);
+ }
+
+ public static final class TimeZoneNames.NameType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneNames.NameType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneNames.NameType[] values();
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType EXEMPLAR_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_GENERIC;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_STANDARD;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_GENERIC;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_STANDARD;
+ }
+
+ public abstract class UCharacterIterator implements java.lang.Cloneable {
+ ctor protected UCharacterIterator();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public abstract int current();
+ method public int currentCodePoint();
+ method public java.text.CharacterIterator getCharacterIterator();
+ method public abstract int getIndex();
+ method public static final android.icu.text.UCharacterIterator getInstance(android.icu.text.Replaceable);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.lang.String);
+ method public static final android.icu.text.UCharacterIterator getInstance(char[]);
+ method public static final android.icu.text.UCharacterIterator getInstance(char[], int, int);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.lang.StringBuffer);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.text.CharacterIterator);
+ method public abstract int getLength();
+ method public abstract int getText(char[], int);
+ method public final int getText(char[]);
+ method public java.lang.String getText();
+ method public int moveCodePointIndex(int);
+ method public int moveIndex(int);
+ method public abstract int next();
+ method public int nextCodePoint();
+ method public abstract int previous();
+ method public int previousCodePoint();
+ method public abstract void setIndex(int);
+ method public void setToLimit();
+ method public void setToStart();
+ field public static final int DONE = -1; // 0xffffffff
+ }
+
+ public abstract class UFormat extends java.text.Format {
+ ctor public UFormat();
+ }
+
+ public abstract class UnicodeFilter implements android.icu.text.UnicodeMatcher {
+ method public abstract boolean contains(int);
+ method public int matches(android.icu.text.Replaceable, int[], int, boolean);
+ }
+
+ public abstract interface UnicodeMatcher {
+ method public abstract void addMatchSetTo(android.icu.text.UnicodeSet);
+ method public abstract int matches(android.icu.text.Replaceable, int[], int, boolean);
+ method public abstract boolean matchesIndexValue(int);
+ method public abstract java.lang.String toPattern(boolean);
+ field public static final char ETHER = 65535; // 0xffff '\uffff'
+ field public static final int U_MATCH = 2; // 0x2
+ field public static final int U_MISMATCH = 0; // 0x0
+ field public static final int U_PARTIAL_MATCH = 1; // 0x1
+ }
+
+ public class UnicodeSet extends android.icu.text.UnicodeFilter implements java.lang.Comparable android.icu.util.Freezable java.lang.Iterable {
+ ctor public UnicodeSet();
+ ctor public UnicodeSet(android.icu.text.UnicodeSet);
+ ctor public UnicodeSet(int, int);
+ ctor public UnicodeSet(int...);
+ ctor public UnicodeSet(java.lang.String);
+ ctor public UnicodeSet(java.lang.String, boolean);
+ ctor public UnicodeSet(java.lang.String, int);
+ ctor public UnicodeSet(java.lang.String, java.text.ParsePosition, android.icu.text.SymbolTable);
+ ctor public UnicodeSet(java.lang.String, java.text.ParsePosition, android.icu.text.SymbolTable, int);
+ method public java.lang.StringBuffer _generatePattern(java.lang.StringBuffer, boolean);
+ method public java.lang.StringBuffer _generatePattern(java.lang.StringBuffer, boolean, boolean);
+ method public android.icu.text.UnicodeSet add(int, int);
+ method public final android.icu.text.UnicodeSet add(int);
+ method public final android.icu.text.UnicodeSet add(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet add(java.lang.Iterable<?>);
+ method public android.icu.text.UnicodeSet addAll(int, int);
+ method public final android.icu.text.UnicodeSet addAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet addAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet addAll(java.lang.Iterable<?>);
+ method public android.icu.text.UnicodeSet addAll(T...);
+ method public T addAllTo(T);
+ method public java.lang.String[] addAllTo(java.lang.String[]);
+ method public static U addAllTo(java.lang.Iterable<T>, U);
+ method public static T[] addAllTo(java.lang.Iterable<T>, T[]);
+ method public void addMatchSetTo(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int);
+ method public final android.icu.text.UnicodeSet applyPattern(java.lang.String);
+ method public android.icu.text.UnicodeSet applyPattern(java.lang.String, boolean);
+ method public android.icu.text.UnicodeSet applyPattern(java.lang.String, int);
+ method public android.icu.text.UnicodeSet applyPropertyAlias(java.lang.String, java.lang.String);
+ method public android.icu.text.UnicodeSet applyPropertyAlias(java.lang.String, java.lang.String, android.icu.text.SymbolTable);
+ method public int charAt(int);
+ method public android.icu.text.UnicodeSet clear();
+ method public java.lang.Object clone();
+ method public android.icu.text.UnicodeSet cloneAsThawed();
+ method public android.icu.text.UnicodeSet closeOver(int);
+ method public android.icu.text.UnicodeSet compact();
+ method public static int compare(java.lang.CharSequence, int);
+ method public static int compare(int, java.lang.CharSequence);
+ method public static int compare(java.lang.Iterable<T>, java.lang.Iterable<T>);
+ method public static int compare(java.util.Collection<T>, java.util.Collection<T>, android.icu.text.UnicodeSet.ComparisonStyle);
+ method public int compareTo(android.icu.text.UnicodeSet);
+ method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle);
+ method public int compareTo(java.lang.Iterable<java.lang.String>);
+ method public android.icu.text.UnicodeSet complement(int, int);
+ method public final android.icu.text.UnicodeSet complement(int);
+ method public android.icu.text.UnicodeSet complement();
+ method public final android.icu.text.UnicodeSet complement(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet complementAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet complementAll(android.icu.text.UnicodeSet);
+ method public boolean contains(int);
+ method public boolean contains(int, int);
+ method public final boolean contains(java.lang.CharSequence);
+ method public boolean containsAll(android.icu.text.UnicodeSet);
+ method public boolean containsAll(java.lang.String);
+ method public boolean containsAll(java.lang.Iterable<T>);
+ method public boolean containsNone(int, int);
+ method public boolean containsNone(android.icu.text.UnicodeSet);
+ method public boolean containsNone(java.lang.CharSequence);
+ method public boolean containsNone(java.lang.Iterable<T>);
+ method public final boolean containsSome(int, int);
+ method public final boolean containsSome(android.icu.text.UnicodeSet);
+ method public final boolean containsSome(java.lang.CharSequence);
+ method public final boolean containsSome(java.lang.Iterable<T>);
+ method public android.icu.text.UnicodeSet freeze();
+ method public static android.icu.text.UnicodeSet from(java.lang.CharSequence);
+ method public static android.icu.text.UnicodeSet fromAll(java.lang.CharSequence);
+ method public int getRangeCount();
+ method public int getRangeEnd(int);
+ method public int getRangeStart(int);
+ method public int indexOf(int);
+ method public boolean isEmpty();
+ method public boolean isFrozen();
+ method public java.util.Iterator<java.lang.String> iterator();
+ method public boolean matchesIndexValue(int);
+ method public java.lang.Iterable<android.icu.text.UnicodeSet.EntryRange> ranges();
+ method public android.icu.text.UnicodeSet remove(int, int);
+ method public final android.icu.text.UnicodeSet remove(int);
+ method public final android.icu.text.UnicodeSet remove(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet removeAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable<T>);
+ method public final android.icu.text.UnicodeSet removeAllStrings();
+ method public static boolean resemblesPattern(java.lang.String, int);
+ method public android.icu.text.UnicodeSet retain(int, int);
+ method public final android.icu.text.UnicodeSet retain(int);
+ method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet retainAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet retainAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet retainAll(java.lang.Iterable<T>);
+ method public android.icu.text.UnicodeSet set(int, int);
+ method public android.icu.text.UnicodeSet set(android.icu.text.UnicodeSet);
+ method public int size();
+ method public int span(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public int span(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition);
+ method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.util.Collection<java.lang.String> strings();
+ method public static java.lang.String[] toArray(android.icu.text.UnicodeSet);
+ method public java.lang.String toPattern(boolean);
+ field public static final int ADD_CASE_MAPPINGS = 4; // 0x4
+ field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS;
+ field public static final int CASE = 2; // 0x2
+ field public static final int CASE_INSENSITIVE = 2; // 0x2
+ field public static final android.icu.text.UnicodeSet EMPTY;
+ field public static final int IGNORE_SPACE = 1; // 0x1
+ field public static final int MAX_VALUE = 1114111; // 0x10ffff
+ field public static final int MIN_VALUE = 0; // 0x0
+ }
+
+ public static final class UnicodeSet.ComparisonStyle extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSet.ComparisonStyle valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSet.ComparisonStyle[] values();
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle LEXICOGRAPHIC;
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle LONGER_FIRST;
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle SHORTER_FIRST;
+ }
+
+ public static class UnicodeSet.EntryRange {
+ field public int codepoint;
+ field public int codepointEnd;
+ }
+
+ public static final class UnicodeSet.SpanCondition extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSet.SpanCondition valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSet.SpanCondition[] values();
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition CONDITION_COUNT;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition CONTAINED;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition NOT_CONTAINED;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition SIMPLE;
+ }
+
+ public class UnicodeSetIterator {
+ ctor public UnicodeSetIterator(android.icu.text.UnicodeSet);
+ ctor public UnicodeSetIterator();
+ method public java.lang.String getString();
+ method public boolean next();
+ method public boolean nextRange();
+ method public void reset(android.icu.text.UnicodeSet);
+ method public void reset();
+ field public static int IS_STRING;
+ field public int codepoint;
+ field public int codepointEnd;
+ field public java.lang.String string;
+ }
+
+ public class UnicodeSetSpanner {
+ ctor public UnicodeSetSpanner(android.icu.text.UnicodeSet);
+ method public int countIn(java.lang.CharSequence);
+ method public int countIn(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod);
+ method public int countIn(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.lang.String deleteFrom(java.lang.CharSequence);
+ method public java.lang.String deleteFrom(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public android.icu.text.UnicodeSet getUnicodeSet();
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence);
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod);
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.lang.CharSequence trim(java.lang.CharSequence);
+ method public java.lang.CharSequence trim(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.TrimOption);
+ method public java.lang.CharSequence trim(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.TrimOption, android.icu.text.UnicodeSet.SpanCondition);
+ }
+
+ public static final class UnicodeSetSpanner.CountMethod extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSetSpanner.CountMethod valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSetSpanner.CountMethod[] values();
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.CountMethod MIN_ELEMENTS;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.CountMethod WHOLE_SPAN;
+ }
+
+ public static final class UnicodeSetSpanner.TrimOption extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSetSpanner.TrimOption valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSetSpanner.TrimOption[] values();
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption BOTH;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption LEADING;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption TRAILING;
+ }
+
+}
+
+package android.icu.util {
+
+ public class BuddhistCalendar extends android.icu.util.GregorianCalendar {
+ ctor public BuddhistCalendar();
+ ctor public BuddhistCalendar(android.icu.util.TimeZone);
+ ctor public BuddhistCalendar(java.util.Locale);
+ ctor public BuddhistCalendar(android.icu.util.ULocale);
+ ctor public BuddhistCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public BuddhistCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public BuddhistCalendar(java.util.Date);
+ ctor public BuddhistCalendar(int, int, int);
+ ctor public BuddhistCalendar(int, int, int, int, int, int);
+ field public static final int BE = 0; // 0x0
+ }
+
+ public class ByteArrayWrapper implements java.lang.Comparable {
+ ctor public ByteArrayWrapper();
+ ctor public ByteArrayWrapper(byte[], int);
+ ctor public ByteArrayWrapper(java.nio.ByteBuffer);
+ method public final android.icu.util.ByteArrayWrapper append(byte[], int, int);
+ method public int compareTo(android.icu.util.ByteArrayWrapper);
+ method public android.icu.util.ByteArrayWrapper ensureCapacity(int);
+ method public final byte[] releaseBytes();
+ method public final android.icu.util.ByteArrayWrapper set(byte[], int, int);
+ field public byte[] bytes;
+ field public int size;
+ }
+
+ abstract class CECalendar extends android.icu.util.Calendar {
+ ctor protected CECalendar();
+ ctor protected CECalendar(android.icu.util.TimeZone);
+ ctor protected CECalendar(java.util.Locale);
+ ctor protected CECalendar(android.icu.util.ULocale);
+ ctor protected CECalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor protected CECalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor protected CECalendar(int, int, int);
+ ctor protected CECalendar(java.util.Date);
+ ctor protected CECalendar(int, int, int, int, int, int);
+ method public static int ceToJD(long, int, int, int);
+ method protected abstract int getJDEpochOffset();
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetLimit(int, int);
+ method public static void jdToCE(int, int, int[]);
+ }
+
+ public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
+ ctor protected Calendar();
+ ctor protected Calendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor protected Calendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method public void add(int, int);
+ method public boolean after(java.lang.Object);
+ method public boolean before(java.lang.Object);
+ method public final void clear();
+ method public final void clear(int);
+ method public java.lang.Object clone();
+ method public int compareTo(android.icu.util.Calendar);
+ method protected void complete();
+ method protected void computeFields();
+ method protected final void computeGregorianFields(int);
+ method protected int computeGregorianMonthStart(int, int);
+ method protected int computeJulianDay();
+ method protected int computeMillisInDay();
+ method protected void computeTime();
+ method protected int computeZoneOffset(long, int);
+ method public int fieldDifference(java.util.Date, int);
+ method protected java.lang.String fieldName(int);
+ method protected static final long floorDivide(long, long);
+ method protected static final int floorDivide(int, int);
+ method protected static final int floorDivide(int, int, int[]);
+ method protected static final int floorDivide(long, int, int[]);
+ method public final int get(int);
+ method public int getActualMaximum(int);
+ method public int getActualMinimum(int);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.text.DateFormat getDateTimeFormat(int, int, java.util.Locale);
+ method public android.icu.text.DateFormat getDateTimeFormat(int, int, android.icu.util.ULocale);
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public final int getFieldCount();
+ method protected int[][][] getFieldResolutionTable();
+ method public int getFirstDayOfWeek();
+ method public final int getGreatestMinimum(int);
+ method protected final int getGregorianDayOfMonth();
+ method protected final int getGregorianDayOfYear();
+ method protected final int getGregorianMonth();
+ method protected final int getGregorianYear();
+ method public static android.icu.util.Calendar getInstance();
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone);
+ method public static android.icu.util.Calendar getInstance(java.util.Locale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone, java.util.Locale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public final int getLeastMaximum(int);
+ method protected int getLimit(int, int);
+ method public final int getMaximum(int);
+ method public int getMinimalDaysInFirstWeek();
+ method public final int getMinimum(int);
+ method public int getRepeatedWallTimeOption();
+ method public int getSkippedWallTimeOption();
+ method protected final int getStamp(int);
+ method public final java.util.Date getTime();
+ method public long getTimeInMillis();
+ method public android.icu.util.TimeZone getTimeZone();
+ method public java.lang.String getType();
+ method public android.icu.util.Calendar.WeekData getWeekData();
+ method public static android.icu.util.Calendar.WeekData getWeekDataForRegion(java.lang.String);
+ method protected static final int gregorianMonthLength(int, int);
+ method protected static final int gregorianPreviousMonthLength(int, int);
+ method protected void handleComputeFields(int);
+ method protected int handleComputeJulianDay(int);
+ method protected abstract int handleComputeMonthStart(int, int, boolean);
+ method protected int[] handleCreateFields();
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.util.Locale);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.lang.String, java.util.Locale);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, android.icu.util.ULocale);
+ method protected abstract int handleGetExtendedYear();
+ method protected abstract int handleGetLimit(int, int);
+ method protected int handleGetMonthLength(int, int);
+ method protected int handleGetYearLength(int);
+ method protected final int internalGet(int);
+ method protected final int internalGet(int, int);
+ method protected final long internalGetTimeInMillis();
+ method protected final void internalSet(int, int);
+ method public boolean isEquivalentTo(android.icu.util.Calendar);
+ method protected static final boolean isGregorianLeapYear(int);
+ method public boolean isLenient();
+ method public final boolean isSet(int);
+ method public boolean isWeekend(java.util.Date);
+ method public boolean isWeekend();
+ method protected static final int julianDayToDayOfWeek(int);
+ method protected static final long julianDayToMillis(int);
+ method protected static final int millisToJulianDay(long);
+ method protected int newerField(int, int);
+ method protected int newestStamp(int, int, int);
+ method protected void pinField(int);
+ method protected void prepareGetActual(int, boolean);
+ method protected int resolveFields(int[][][]);
+ method public final void roll(int, boolean);
+ method public void roll(int, int);
+ method public final void set(int, int);
+ method public final void set(int, int, int);
+ method public final void set(int, int, int, int, int);
+ method public final void set(int, int, int, int, int, int);
+ method public void setFirstDayOfWeek(int);
+ method public void setLenient(boolean);
+ method public void setMinimalDaysInFirstWeek(int);
+ method public void setRepeatedWallTimeOption(int);
+ method public void setSkippedWallTimeOption(int);
+ method public final void setTime(java.util.Date);
+ method public void setTimeInMillis(long);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ method public android.icu.util.Calendar setWeekData(android.icu.util.Calendar.WeekData);
+ method protected void validateField(int);
+ method protected final void validateField(int, int, int);
+ method protected void validateFields();
+ method protected int weekNumber(int, int, int);
+ method protected final int weekNumber(int, int);
+ field public static final int AM = 0; // 0x0
+ field public static final int AM_PM = 9; // 0x9
+ field public static final int APRIL = 3; // 0x3
+ field public static final int AUGUST = 7; // 0x7
+ field protected static final int BASE_FIELD_COUNT = 23; // 0x17
+ field public static final int DATE = 5; // 0x5
+ field public static final int DAY_OF_MONTH = 5; // 0x5
+ field public static final int DAY_OF_WEEK = 7; // 0x7
+ field public static final int DAY_OF_WEEK_IN_MONTH = 8; // 0x8
+ field public static final int DAY_OF_YEAR = 6; // 0x6
+ field public static final int DECEMBER = 11; // 0xb
+ field public static final int DOW_LOCAL = 18; // 0x12
+ field public static final int DST_OFFSET = 16; // 0x10
+ field protected static final int EPOCH_JULIAN_DAY = 2440588; // 0x253d8c
+ field public static final int ERA = 0; // 0x0
+ field public static final int EXTENDED_YEAR = 19; // 0x13
+ field public static final int FEBRUARY = 1; // 0x1
+ field public static final int FRIDAY = 6; // 0x6
+ field protected static final int GREATEST_MINIMUM = 1; // 0x1
+ field public static final int HOUR = 10; // 0xa
+ field public static final int HOUR_OF_DAY = 11; // 0xb
+ field protected static final int INTERNALLY_SET = 1; // 0x1
+ field public static final int IS_LEAP_MONTH = 22; // 0x16
+ field public static final int JANUARY = 0; // 0x0
+ field protected static final int JAN_1_1_JULIAN_DAY = 1721426; // 0x1a4452
+ field public static final int JULIAN_DAY = 20; // 0x14
+ field public static final int JULY = 6; // 0x6
+ field public static final int JUNE = 5; // 0x5
+ field protected static final int LEAST_MAXIMUM = 2; // 0x2
+ field public static final int MARCH = 2; // 0x2
+ field protected static final int MAXIMUM = 3; // 0x3
+ field protected static final java.util.Date MAX_DATE;
+ field protected static final int MAX_FIELD_COUNT = 32; // 0x20
+ field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
+ field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
+ field public static final int MAY = 4; // 0x4
+ field public static final int MILLISECOND = 14; // 0xe
+ field public static final int MILLISECONDS_IN_DAY = 21; // 0x15
+ field protected static final int MINIMUM = 0; // 0x0
+ field protected static final int MINIMUM_USER_STAMP = 2; // 0x2
+ field public static final int MINUTE = 12; // 0xc
+ field protected static final java.util.Date MIN_DATE;
+ field protected static final int MIN_JULIAN = -2130706432; // 0x81000000
+ field protected static final long MIN_MILLIS = -184303902528000000L; // 0xfd713893bf19b000L
+ field public static final int MONDAY = 2; // 0x2
+ field public static final int MONTH = 2; // 0x2
+ field public static final int NOVEMBER = 10; // 0xa
+ field public static final int OCTOBER = 9; // 0x9
+ field protected static final long ONE_DAY = 86400000L; // 0x5265c00L
+ field protected static final int ONE_HOUR = 3600000; // 0x36ee80
+ field protected static final int ONE_MINUTE = 60000; // 0xea60
+ field protected static final int ONE_SECOND = 1000; // 0x3e8
+ field protected static final long ONE_WEEK = 604800000L; // 0x240c8400L
+ field public static final int PM = 1; // 0x1
+ field protected static final int RESOLVE_REMAP = 32; // 0x20
+ field public static final int SATURDAY = 7; // 0x7
+ field public static final int SECOND = 13; // 0xd
+ field public static final int SEPTEMBER = 8; // 0x8
+ field public static final int SUNDAY = 1; // 0x1
+ field public static final int THURSDAY = 5; // 0x5
+ field public static final int TUESDAY = 3; // 0x3
+ field public static final int UNDECIMBER = 12; // 0xc
+ field protected static final int UNSET = 0; // 0x0
+ field public static final int WALLTIME_FIRST = 1; // 0x1
+ field public static final int WALLTIME_LAST = 0; // 0x0
+ field public static final int WALLTIME_NEXT_VALID = 2; // 0x2
+ field public static final int WEDNESDAY = 4; // 0x4
+ field public static final int WEEK_OF_MONTH = 4; // 0x4
+ field public static final int WEEK_OF_YEAR = 3; // 0x3
+ field public static final int YEAR = 1; // 0x1
+ field public static final int YEAR_WOY = 17; // 0x11
+ field public static final int ZONE_OFFSET = 15; // 0xf
+ }
+
+ public static final class Calendar.WeekData {
+ ctor public Calendar.WeekData(int, int, int, int, int, int);
+ field public final int firstDayOfWeek;
+ field public final int minimalDaysInFirstWeek;
+ field public final int weekendCease;
+ field public final int weekendCeaseMillis;
+ field public final int weekendOnset;
+ field public final int weekendOnsetMillis;
+ }
+
+ public class ChineseCalendar extends android.icu.util.Calendar {
+ ctor public ChineseCalendar();
+ ctor public ChineseCalendar(java.util.Date);
+ ctor public ChineseCalendar(int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int, int, int, int);
+ ctor public ChineseCalendar(java.util.Locale);
+ ctor public ChineseCalendar(android.icu.util.TimeZone);
+ ctor public ChineseCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public ChineseCalendar(android.icu.util.ULocale);
+ ctor public ChineseCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ }
+
+ public final class CopticCalendar extends android.icu.util.CECalendar {
+ ctor public CopticCalendar();
+ ctor public CopticCalendar(android.icu.util.TimeZone);
+ ctor public CopticCalendar(java.util.Locale);
+ ctor public CopticCalendar(android.icu.util.ULocale);
+ ctor public CopticCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public CopticCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public CopticCalendar(int, int, int);
+ ctor public CopticCalendar(java.util.Date);
+ ctor public CopticCalendar(int, int, int, int, int, int);
+ method protected deprecated int getJDEpochOffset();
+ method protected deprecated int handleGetExtendedYear();
+ field public static final int AMSHIR = 5; // 0x5
+ field public static final int BABA = 1; // 0x1
+ field public static final int BARAMHAT = 6; // 0x6
+ field public static final int BARAMOUDA = 7; // 0x7
+ field public static final int BASHANS = 8; // 0x8
+ field public static final int EPEP = 10; // 0xa
+ field public static final int HATOR = 2; // 0x2
+ field public static final int KIAHK = 3; // 0x3
+ field public static final int MESRA = 11; // 0xb
+ field public static final int NASIE = 12; // 0xc
+ field public static final int PAONA = 9; // 0x9
+ field public static final int TOBA = 4; // 0x4
+ field public static final int TOUT = 0; // 0x0
+ }
+
+ public class Currency extends android.icu.util.MeasureUnit {
+ ctor protected Currency(java.lang.String);
+ method public static java.util.Set<android.icu.util.Currency> getAvailableCurrencies();
+ method public static java.lang.String[] getAvailableCurrencyCodes(android.icu.util.ULocale, java.util.Date);
+ method public static java.lang.String[] getAvailableCurrencyCodes(java.util.Locale, java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public static android.icu.util.ULocale[] getAvailableULocales();
+ method public java.lang.String getCurrencyCode();
+ method public int getDefaultFractionDigits();
+ method public int getDefaultFractionDigits(android.icu.util.Currency.CurrencyUsage);
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public static android.icu.util.Currency getInstance(java.util.Locale);
+ method public static android.icu.util.Currency getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.Currency getInstance(java.lang.String);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public java.lang.String getName(java.util.Locale, int, boolean[]);
+ method public java.lang.String getName(android.icu.util.ULocale, int, boolean[]);
+ method public java.lang.String getName(java.util.Locale, int, java.lang.String, boolean[]);
+ method public java.lang.String getName(android.icu.util.ULocale, int, java.lang.String, boolean[]);
+ method public int getNumericCode();
+ method public double getRoundingIncrement();
+ method public double getRoundingIncrement(android.icu.util.Currency.CurrencyUsage);
+ method public java.lang.String getSymbol();
+ method public java.lang.String getSymbol(java.util.Locale);
+ method public java.lang.String getSymbol(android.icu.util.ULocale);
+ method public static boolean isAvailable(java.lang.String, java.util.Date, java.util.Date);
+ method public static java.lang.Object registerInstance(android.icu.util.Currency, android.icu.util.ULocale);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int LONG_NAME = 1; // 0x1
+ field public static final int PLURAL_LONG_NAME = 2; // 0x2
+ field public static final int SYMBOL_NAME = 0; // 0x0
+ }
+
+ public static final class Currency.CurrencyUsage extends java.lang.Enum {
+ method public static android.icu.util.Currency.CurrencyUsage valueOf(java.lang.String);
+ method public static final android.icu.util.Currency.CurrencyUsage[] values();
+ enum_constant public static final android.icu.util.Currency.CurrencyUsage CASH;
+ enum_constant public static final android.icu.util.Currency.CurrencyUsage STANDARD;
+ }
+
+ public class CurrencyAmount extends android.icu.util.Measure {
+ ctor public CurrencyAmount(java.lang.Number, android.icu.util.Currency);
+ ctor public CurrencyAmount(double, android.icu.util.Currency);
+ method public android.icu.util.Currency getCurrency();
+ }
+
+ public final class DateInterval implements java.io.Serializable {
+ ctor public DateInterval(long, long);
+ method public long getFromDate();
+ method public long getToDate();
+ }
+
+ public abstract interface Freezable implements java.lang.Cloneable {
+ method public abstract T cloneAsThawed();
+ method public abstract T freeze();
+ method public abstract boolean isFrozen();
+ }
+
+ public class GregorianCalendar extends android.icu.util.Calendar {
+ ctor public GregorianCalendar();
+ ctor public GregorianCalendar(android.icu.util.TimeZone);
+ ctor public GregorianCalendar(java.util.Locale);
+ ctor public GregorianCalendar(android.icu.util.ULocale);
+ ctor public GregorianCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public GregorianCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public GregorianCalendar(int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int, int);
+ method public final java.util.Date getGregorianChange();
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ method public boolean isLeapYear(int);
+ method public void setGregorianChange(java.util.Date);
+ field public static final int AD = 1; // 0x1
+ field public static final int BC = 0; // 0x0
+ field protected transient boolean invertGregorian;
+ field protected transient boolean isGregorian;
+ }
+
+ public class HebrewCalendar extends android.icu.util.Calendar {
+ ctor public HebrewCalendar();
+ ctor public HebrewCalendar(android.icu.util.TimeZone);
+ ctor public HebrewCalendar(java.util.Locale);
+ ctor public HebrewCalendar(android.icu.util.ULocale);
+ ctor public HebrewCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public HebrewCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public HebrewCalendar(int, int, int);
+ ctor public HebrewCalendar(java.util.Date);
+ ctor public HebrewCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ field public static final int ADAR = 6; // 0x6
+ field public static final int ADAR_1 = 5; // 0x5
+ field public static final int AV = 11; // 0xb
+ field public static final int ELUL = 12; // 0xc
+ field public static final int HESHVAN = 1; // 0x1
+ field public static final int IYAR = 8; // 0x8
+ field public static final int KISLEV = 2; // 0x2
+ field public static final int NISAN = 7; // 0x7
+ field public static final int SHEVAT = 4; // 0x4
+ field public static final int SIVAN = 9; // 0x9
+ field public static final int TAMUZ = 10; // 0xa
+ field public static final int TEVET = 3; // 0x3
+ field public static final int TISHRI = 0; // 0x0
+ }
+
+ public class ICUUncheckedIOException extends java.lang.RuntimeException {
+ ctor public ICUUncheckedIOException();
+ ctor public ICUUncheckedIOException(java.lang.String);
+ ctor public ICUUncheckedIOException(java.lang.Throwable);
+ ctor public ICUUncheckedIOException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class IndianCalendar extends android.icu.util.Calendar {
+ ctor public IndianCalendar();
+ ctor public IndianCalendar(android.icu.util.TimeZone);
+ ctor public IndianCalendar(java.util.Locale);
+ ctor public IndianCalendar(android.icu.util.ULocale);
+ ctor public IndianCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public IndianCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public IndianCalendar(java.util.Date);
+ ctor public IndianCalendar(int, int, int);
+ ctor public IndianCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ field public static final int AGRAHAYANA = 8; // 0x8
+ field public static final int ASADHA = 3; // 0x3
+ field public static final int ASVINA = 6; // 0x6
+ field public static final int BHADRA = 5; // 0x5
+ field public static final int CHAITRA = 0; // 0x0
+ field public static final int IE = 0; // 0x0
+ field public static final int JYAISTHA = 2; // 0x2
+ field public static final int KARTIKA = 7; // 0x7
+ field public static final int MAGHA = 10; // 0xa
+ field public static final int PAUSA = 9; // 0x9
+ field public static final int PHALGUNA = 11; // 0xb
+ field public static final int SRAVANA = 4; // 0x4
+ field public static final int VAISAKHA = 1; // 0x1
+ }
+
+ public class IslamicCalendar extends android.icu.util.Calendar {
+ ctor public IslamicCalendar();
+ ctor public IslamicCalendar(android.icu.util.TimeZone);
+ ctor public IslamicCalendar(java.util.Locale);
+ ctor public IslamicCalendar(android.icu.util.ULocale);
+ ctor public IslamicCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public IslamicCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public IslamicCalendar(java.util.Date);
+ ctor public IslamicCalendar(int, int, int);
+ ctor public IslamicCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ method public boolean isCivil();
+ method public void setCivil(boolean);
+ field public static final int DHU_AL_HIJJAH = 11; // 0xb
+ field public static final int DHU_AL_QIDAH = 10; // 0xa
+ field public static final int JUMADA_1 = 4; // 0x4
+ field public static final int JUMADA_2 = 5; // 0x5
+ field public static final int MUHARRAM = 0; // 0x0
+ field public static final int RABI_1 = 2; // 0x2
+ field public static final int RABI_2 = 3; // 0x3
+ field public static final int RAJAB = 6; // 0x6
+ field public static final int RAMADAN = 8; // 0x8
+ field public static final int SAFAR = 1; // 0x1
+ field public static final int SHABAN = 7; // 0x7
+ field public static final int SHAWWAL = 9; // 0x9
+ }
+
+ public static final class IslamicCalendar.CalculationType extends java.lang.Enum {
+ method public static android.icu.util.IslamicCalendar.CalculationType valueOf(java.lang.String);
+ method public static final android.icu.util.IslamicCalendar.CalculationType[] values();
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_CIVIL;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_TBLA;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_UMALQURA;
+ }
+
+ public class JapaneseCalendar extends android.icu.util.GregorianCalendar {
+ ctor public JapaneseCalendar();
+ ctor public JapaneseCalendar(android.icu.util.TimeZone);
+ ctor public JapaneseCalendar(java.util.Locale);
+ ctor public JapaneseCalendar(android.icu.util.ULocale);
+ ctor public JapaneseCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public JapaneseCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public JapaneseCalendar(java.util.Date);
+ ctor public JapaneseCalendar(int, int, int, int);
+ ctor public JapaneseCalendar(int, int, int);
+ ctor public JapaneseCalendar(int, int, int, int, int, int);
+ field public static final int CURRENT_ERA;
+ field public static final int HEISEI;
+ field public static final int MEIJI;
+ field public static final int SHOWA;
+ field public static final int TAISHO;
+ }
+
+ public class Measure {
+ ctor public Measure(java.lang.Number, android.icu.util.MeasureUnit);
+ method public java.lang.Number getNumber();
+ method public android.icu.util.MeasureUnit getUnit();
+ }
+
+ public class MeasureUnit implements java.io.Serializable {
+ method public static synchronized java.util.Set<android.icu.util.MeasureUnit> getAvailable(java.lang.String);
+ method public static synchronized java.util.Set<android.icu.util.MeasureUnit> getAvailable();
+ method public static synchronized java.util.Set<java.lang.String> getAvailableTypes();
+ method public java.lang.String getSubtype();
+ method public java.lang.String getType();
+ field public static final android.icu.util.MeasureUnit ACRE;
+ field public static final android.icu.util.MeasureUnit ACRE_FOOT;
+ field public static final android.icu.util.MeasureUnit AMPERE;
+ field public static final android.icu.util.MeasureUnit ARC_MINUTE;
+ field public static final android.icu.util.MeasureUnit ARC_SECOND;
+ field public static final android.icu.util.MeasureUnit ASTRONOMICAL_UNIT;
+ field public static final android.icu.util.MeasureUnit BIT;
+ field public static final android.icu.util.MeasureUnit BUSHEL;
+ field public static final android.icu.util.MeasureUnit BYTE;
+ field public static final android.icu.util.MeasureUnit CALORIE;
+ field public static final android.icu.util.MeasureUnit CARAT;
+ field public static final android.icu.util.MeasureUnit CELSIUS;
+ field public static final android.icu.util.MeasureUnit CENTILITER;
+ field public static final android.icu.util.MeasureUnit CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
+ field public static final android.icu.util.MeasureUnit CUBIC_INCH;
+ field public static final android.icu.util.MeasureUnit CUBIC_KILOMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_METER;
+ field public static final android.icu.util.MeasureUnit CUBIC_MILE;
+ field public static final android.icu.util.MeasureUnit CUBIC_YARD;
+ field public static final android.icu.util.MeasureUnit CUP;
+ field public static final android.icu.util.TimeUnit DAY;
+ field public static final android.icu.util.MeasureUnit DECILITER;
+ field public static final android.icu.util.MeasureUnit DECIMETER;
+ field public static final android.icu.util.MeasureUnit DEGREE;
+ field public static final android.icu.util.MeasureUnit FAHRENHEIT;
+ field public static final android.icu.util.MeasureUnit FATHOM;
+ field public static final android.icu.util.MeasureUnit FLUID_OUNCE;
+ field public static final android.icu.util.MeasureUnit FOODCALORIE;
+ field public static final android.icu.util.MeasureUnit FOOT;
+ field public static final android.icu.util.MeasureUnit FURLONG;
+ field public static final android.icu.util.MeasureUnit GALLON;
+ field public static final android.icu.util.MeasureUnit GIGABIT;
+ field public static final android.icu.util.MeasureUnit GIGABYTE;
+ field public static final android.icu.util.MeasureUnit GIGAHERTZ;
+ field public static final android.icu.util.MeasureUnit GIGAWATT;
+ field public static final android.icu.util.MeasureUnit GRAM;
+ field public static final android.icu.util.MeasureUnit G_FORCE;
+ field public static final android.icu.util.MeasureUnit HECTARE;
+ field public static final android.icu.util.MeasureUnit HECTOLITER;
+ field public static final android.icu.util.MeasureUnit HECTOPASCAL;
+ field public static final android.icu.util.MeasureUnit HERTZ;
+ field public static final android.icu.util.MeasureUnit HORSEPOWER;
+ field public static final android.icu.util.TimeUnit HOUR;
+ field public static final android.icu.util.MeasureUnit INCH;
+ field public static final android.icu.util.MeasureUnit INCH_HG;
+ field public static final android.icu.util.MeasureUnit JOULE;
+ field public static final android.icu.util.MeasureUnit KARAT;
+ field public static final android.icu.util.MeasureUnit KELVIN;
+ field public static final android.icu.util.MeasureUnit KILOBIT;
+ field public static final android.icu.util.MeasureUnit KILOBYTE;
+ field public static final android.icu.util.MeasureUnit KILOCALORIE;
+ field public static final android.icu.util.MeasureUnit KILOGRAM;
+ field public static final android.icu.util.MeasureUnit KILOHERTZ;
+ field public static final android.icu.util.MeasureUnit KILOJOULE;
+ field public static final android.icu.util.MeasureUnit KILOMETER;
+ field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit KILOWATT;
+ field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
+ field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
+ field public static final android.icu.util.MeasureUnit LITER;
+ field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
+ field public static final android.icu.util.MeasureUnit LUX;
+ field public static final android.icu.util.MeasureUnit MEGABIT;
+ field public static final android.icu.util.MeasureUnit MEGABYTE;
+ field public static final android.icu.util.MeasureUnit MEGAHERTZ;
+ field public static final android.icu.util.MeasureUnit MEGALITER;
+ field public static final android.icu.util.MeasureUnit MEGAWATT;
+ field public static final android.icu.util.MeasureUnit METER;
+ field public static final android.icu.util.MeasureUnit METER_PER_SECOND;
+ field public static final android.icu.util.MeasureUnit METER_PER_SECOND_SQUARED;
+ field public static final android.icu.util.MeasureUnit METRIC_TON;
+ field public static final android.icu.util.MeasureUnit MICROGRAM;
+ field public static final android.icu.util.MeasureUnit MICROMETER;
+ field public static final android.icu.util.MeasureUnit MICROSECOND;
+ field public static final android.icu.util.MeasureUnit MILE;
+ field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
+ field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit MILLIAMPERE;
+ field public static final android.icu.util.MeasureUnit MILLIBAR;
+ field public static final android.icu.util.MeasureUnit MILLIGRAM;
+ field public static final android.icu.util.MeasureUnit MILLILITER;
+ field public static final android.icu.util.MeasureUnit MILLIMETER;
+ field public static final android.icu.util.MeasureUnit MILLIMETER_OF_MERCURY;
+ field public static final android.icu.util.MeasureUnit MILLISECOND;
+ field public static final android.icu.util.MeasureUnit MILLIWATT;
+ field public static final android.icu.util.TimeUnit MINUTE;
+ field public static final android.icu.util.TimeUnit MONTH;
+ field public static final android.icu.util.MeasureUnit NANOMETER;
+ field public static final android.icu.util.MeasureUnit NANOSECOND;
+ field public static final android.icu.util.MeasureUnit NAUTICAL_MILE;
+ field public static final android.icu.util.MeasureUnit OHM;
+ field public static final android.icu.util.MeasureUnit OUNCE;
+ field public static final android.icu.util.MeasureUnit OUNCE_TROY;
+ field public static final android.icu.util.MeasureUnit PARSEC;
+ field public static final android.icu.util.MeasureUnit PICOMETER;
+ field public static final android.icu.util.MeasureUnit PINT;
+ field public static final android.icu.util.MeasureUnit POUND;
+ field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
+ field public static final android.icu.util.MeasureUnit QUART;
+ field public static final android.icu.util.MeasureUnit RADIAN;
+ field public static final android.icu.util.TimeUnit SECOND;
+ field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
+ field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
+ field public static final android.icu.util.MeasureUnit SQUARE_INCH;
+ field public static final android.icu.util.MeasureUnit SQUARE_KILOMETER;
+ field public static final android.icu.util.MeasureUnit SQUARE_METER;
+ field public static final android.icu.util.MeasureUnit SQUARE_MILE;
+ field public static final android.icu.util.MeasureUnit SQUARE_YARD;
+ field public static final android.icu.util.MeasureUnit STONE;
+ field public static final android.icu.util.MeasureUnit TABLESPOON;
+ field public static final android.icu.util.MeasureUnit TEASPOON;
+ field public static final android.icu.util.MeasureUnit TERABIT;
+ field public static final android.icu.util.MeasureUnit TERABYTE;
+ field public static final android.icu.util.MeasureUnit TON;
+ field public static final android.icu.util.MeasureUnit VOLT;
+ field public static final android.icu.util.MeasureUnit WATT;
+ field public static final android.icu.util.TimeUnit WEEK;
+ field public static final android.icu.util.MeasureUnit YARD;
+ field public static final android.icu.util.TimeUnit YEAR;
+ }
+
+ public class Output {
+ ctor public Output();
+ ctor public Output(T);
+ field public T value;
+ }
+
+ public abstract interface RangeValueIterator {
+ method public abstract boolean next(android.icu.util.RangeValueIterator.Element);
+ method public abstract void reset();
+ }
+
+ public static class RangeValueIterator.Element {
+ ctor public RangeValueIterator.Element();
+ field public int limit;
+ field public int start;
+ field public int value;
+ }
+
+ public class TaiwanCalendar extends android.icu.util.GregorianCalendar {
+ ctor public TaiwanCalendar();
+ ctor public TaiwanCalendar(android.icu.util.TimeZone);
+ ctor public TaiwanCalendar(java.util.Locale);
+ ctor public TaiwanCalendar(android.icu.util.ULocale);
+ ctor public TaiwanCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public TaiwanCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public TaiwanCalendar(java.util.Date);
+ ctor public TaiwanCalendar(int, int, int);
+ ctor public TaiwanCalendar(int, int, int, int, int, int);
+ field public static final int BEFORE_MINGUO = 0; // 0x0
+ field public static final int MINGUO = 1; // 0x1
+ }
+
+ public class TimeUnit extends android.icu.util.MeasureUnit {
+ method public static android.icu.util.TimeUnit[] values();
+ }
+
+ public abstract class TimeZone implements java.lang.Cloneable android.icu.util.Freezable java.io.Serializable {
+ ctor public TimeZone();
+ method public java.lang.Object clone();
+ method public android.icu.util.TimeZone cloneAsThawed();
+ method public static int countEquivalentIDs(java.lang.String);
+ method public android.icu.util.TimeZone freeze();
+ method public static java.util.Set<java.lang.String> getAvailableIDs(android.icu.util.TimeZone.SystemTimeZoneType, java.lang.String, java.lang.Integer);
+ method public static java.lang.String[] getAvailableIDs(int);
+ method public static java.lang.String[] getAvailableIDs(java.lang.String);
+ method public static java.lang.String[] getAvailableIDs();
+ method public static java.lang.String getCanonicalID(java.lang.String);
+ method public static java.lang.String getCanonicalID(java.lang.String, boolean[]);
+ method public int getDSTSavings();
+ method public static android.icu.util.TimeZone getDefault();
+ method public static int getDefaultTimeZoneType();
+ method public final java.lang.String getDisplayName();
+ method public final java.lang.String getDisplayName(java.util.Locale);
+ method public final java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public final java.lang.String getDisplayName(boolean, int);
+ method public java.lang.String getDisplayName(boolean, int, java.util.Locale);
+ method public java.lang.String getDisplayName(boolean, int, android.icu.util.ULocale);
+ method public static java.lang.String getEquivalentID(java.lang.String, int);
+ method public static android.icu.util.TimeZone getFrozenTimeZone(java.lang.String);
+ method public java.lang.String getID();
+ method public static java.lang.String getIDForWindowsID(java.lang.String, java.lang.String);
+ method public abstract int getOffset(int, int, int, int, int, int);
+ method public int getOffset(long);
+ method public void getOffset(long, boolean, int[]);
+ method public abstract int getRawOffset();
+ method public static java.lang.String getRegion(java.lang.String);
+ method public static java.lang.String getTZDataVersion();
+ method public static android.icu.util.TimeZone getTimeZone(java.lang.String);
+ method public static android.icu.util.TimeZone getTimeZone(java.lang.String, int);
+ method public static java.lang.String getWindowsID(java.lang.String);
+ method public boolean hasSameRules(android.icu.util.TimeZone);
+ method public abstract boolean inDaylightTime(java.util.Date);
+ method public boolean isFrozen();
+ method public boolean observesDaylightTime();
+ method public static synchronized void setDefault(android.icu.util.TimeZone);
+ method public static synchronized void setDefaultTimeZoneType(int);
+ method public void setID(java.lang.String);
+ method public abstract void setRawOffset(int);
+ method public abstract boolean useDaylightTime();
+ field public static final int GENERIC_LOCATION = 7; // 0x7
+ field public static final android.icu.util.TimeZone GMT_ZONE;
+ field public static final int LONG = 1; // 0x1
+ field public static final int LONG_GENERIC = 3; // 0x3
+ field public static final int LONG_GMT = 5; // 0x5
+ field public static final int SHORT = 0; // 0x0
+ field public static final int SHORT_COMMONLY_USED = 6; // 0x6
+ field public static final int SHORT_GENERIC = 2; // 0x2
+ field public static final int SHORT_GMT = 4; // 0x4
+ field public static final int TIMEZONE_ICU = 0; // 0x0
+ field public static final int TIMEZONE_JDK = 1; // 0x1
+ field public static final android.icu.util.TimeZone UNKNOWN_ZONE;
+ field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";
+ }
+
+ public static final class TimeZone.SystemTimeZoneType extends java.lang.Enum {
+ method public static android.icu.util.TimeZone.SystemTimeZoneType valueOf(java.lang.String);
+ method public static final android.icu.util.TimeZone.SystemTimeZoneType[] values();
+ }
+
+ public final class ULocale implements java.lang.Comparable java.io.Serializable {
+ ctor public ULocale(java.lang.String);
+ ctor public ULocale(java.lang.String, java.lang.String);
+ ctor public ULocale(java.lang.String, java.lang.String, java.lang.String);
+ method public static android.icu.util.ULocale acceptLanguage(java.lang.String, android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(android.icu.util.ULocale[], android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(java.lang.String, boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale addLikelySubtags(android.icu.util.ULocale);
+ method public static java.lang.String canonicalize(java.lang.String);
+ method public java.lang.Object clone();
+ method public int compareTo(android.icu.util.ULocale);
+ method public static android.icu.util.ULocale createCanonical(java.lang.String);
+ method public static android.icu.util.ULocale forLanguageTag(java.lang.String);
+ method public static android.icu.util.ULocale forLocale(java.util.Locale);
+ method public static android.icu.util.ULocale[] getAvailableLocales();
+ method public java.lang.String getBaseName();
+ method public static java.lang.String getBaseName(java.lang.String);
+ method public java.lang.String getCharacterOrientation();
+ method public java.lang.String getCountry();
+ method public static java.lang.String getCountry(java.lang.String);
+ method public static android.icu.util.ULocale getDefault();
+ method public static android.icu.util.ULocale getDefault(android.icu.util.ULocale.Category);
+ method public java.lang.String getDisplayCountry();
+ method public java.lang.String getDisplayCountry(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayCountry(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayCountry(java.lang.String, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayKeyword(java.lang.String);
+ method public static java.lang.String getDisplayKeyword(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayKeyword(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayKeywordValue(java.lang.String);
+ method public java.lang.String getDisplayKeywordValue(java.lang.String, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayKeywordValue(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayKeywordValue(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayLanguage();
+ method public java.lang.String getDisplayLanguage(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayLanguage(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayLanguage(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayLanguageWithDialect();
+ method public java.lang.String getDisplayLanguageWithDialect(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayLanguageWithDialect(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayLanguageWithDialect(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayName(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayName(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayNameWithDialect();
+ method public java.lang.String getDisplayNameWithDialect(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayNameWithDialect(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayNameWithDialect(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayScript();
+ method public java.lang.String getDisplayScript(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayScript(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayScript(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayVariant();
+ method public java.lang.String getDisplayVariant(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayVariant(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayVariant(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getExtension(char);
+ method public java.util.Set<java.lang.Character> getExtensionKeys();
+ method public static java.lang.String getFallback(java.lang.String);
+ method public android.icu.util.ULocale getFallback();
+ method public java.lang.String getISO3Country();
+ method public static java.lang.String getISO3Country(java.lang.String);
+ method public java.lang.String getISO3Language();
+ method public static java.lang.String getISO3Language(java.lang.String);
+ method public static java.lang.String[] getISOCountries();
+ method public static java.lang.String[] getISOLanguages();
+ method public java.lang.String getKeywordValue(java.lang.String);
+ method public static java.lang.String getKeywordValue(java.lang.String, java.lang.String);
+ method public java.util.Iterator<java.lang.String> getKeywords();
+ method public static java.util.Iterator<java.lang.String> getKeywords(java.lang.String);
+ method public java.lang.String getLanguage();
+ method public static java.lang.String getLanguage(java.lang.String);
+ method public java.lang.String getLineOrientation();
+ method public java.lang.String getName();
+ method public static java.lang.String getName(java.lang.String);
+ method public java.lang.String getScript();
+ method public static java.lang.String getScript(java.lang.String);
+ method public java.util.Set<java.lang.String> getUnicodeLocaleAttributes();
+ method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
+ method public java.lang.String getUnicodeLocaleType(java.lang.String);
+ method public java.lang.String getVariant();
+ method public static java.lang.String getVariant(java.lang.String);
+ method public boolean isRightToLeft();
+ method public static android.icu.util.ULocale minimizeSubtags(android.icu.util.ULocale);
+ method public static synchronized void setDefault(android.icu.util.ULocale);
+ method public static synchronized void setDefault(android.icu.util.ULocale.Category, android.icu.util.ULocale);
+ method public android.icu.util.ULocale setKeywordValue(java.lang.String, java.lang.String);
+ method public static java.lang.String setKeywordValue(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String toLanguageTag();
+ method public static java.lang.String toLegacyKey(java.lang.String);
+ method public static java.lang.String toLegacyType(java.lang.String, java.lang.String);
+ method public java.util.Locale toLocale();
+ method public static java.lang.String toUnicodeLocaleKey(java.lang.String);
+ method public static java.lang.String toUnicodeLocaleType(java.lang.String, java.lang.String);
+ field public static final android.icu.util.ULocale CANADA;
+ field public static final android.icu.util.ULocale CANADA_FRENCH;
+ field public static final android.icu.util.ULocale CHINA;
+ field public static final android.icu.util.ULocale CHINESE;
+ field public static final android.icu.util.ULocale ENGLISH;
+ field public static final android.icu.util.ULocale FRANCE;
+ field public static final android.icu.util.ULocale FRENCH;
+ field public static final android.icu.util.ULocale GERMAN;
+ field public static final android.icu.util.ULocale GERMANY;
+ field public static final android.icu.util.ULocale ITALIAN;
+ field public static final android.icu.util.ULocale ITALY;
+ field public static final android.icu.util.ULocale JAPAN;
+ field public static final android.icu.util.ULocale JAPANESE;
+ field public static final android.icu.util.ULocale KOREA;
+ field public static final android.icu.util.ULocale KOREAN;
+ field public static final android.icu.util.ULocale PRC;
+ field public static final char PRIVATE_USE_EXTENSION = 120; // 0x0078 'x'
+ field public static final android.icu.util.ULocale ROOT;
+ field public static final android.icu.util.ULocale SIMPLIFIED_CHINESE;
+ field public static final android.icu.util.ULocale TAIWAN;
+ field public static final android.icu.util.ULocale TRADITIONAL_CHINESE;
+ field public static final android.icu.util.ULocale UK;
+ field public static final char UNICODE_LOCALE_EXTENSION = 117; // 0x0075 'u'
+ field public static final android.icu.util.ULocale US;
+ }
+
+ public static final class ULocale.Builder {
+ ctor public ULocale.Builder();
+ method public android.icu.util.ULocale.Builder addUnicodeLocaleAttribute(java.lang.String);
+ method public android.icu.util.ULocale build();
+ method public android.icu.util.ULocale.Builder clear();
+ method public android.icu.util.ULocale.Builder clearExtensions();
+ method public android.icu.util.ULocale.Builder removeUnicodeLocaleAttribute(java.lang.String);
+ method public android.icu.util.ULocale.Builder setExtension(char, java.lang.String);
+ method public android.icu.util.ULocale.Builder setLanguage(java.lang.String);
+ method public android.icu.util.ULocale.Builder setLanguageTag(java.lang.String);
+ method public android.icu.util.ULocale.Builder setLocale(android.icu.util.ULocale);
+ method public android.icu.util.ULocale.Builder setRegion(java.lang.String);
+ method public android.icu.util.ULocale.Builder setScript(java.lang.String);
+ method public android.icu.util.ULocale.Builder setUnicodeLocaleKeyword(java.lang.String, java.lang.String);
+ method public android.icu.util.ULocale.Builder setVariant(java.lang.String);
+ }
+
+ public static final class ULocale.Category extends java.lang.Enum {
+ method public static android.icu.util.ULocale.Category valueOf(java.lang.String);
+ method public static final android.icu.util.ULocale.Category[] values();
+ enum_constant public static final android.icu.util.ULocale.Category DISPLAY;
+ enum_constant public static final android.icu.util.ULocale.Category FORMAT;
+ }
+
+ public abstract interface ValueIterator {
+ method public abstract boolean next(android.icu.util.ValueIterator.Element);
+ method public abstract void reset();
+ method public abstract void setRange(int, int);
+ }
+
+ public static final class ValueIterator.Element {
+ ctor public ValueIterator.Element();
+ field public int integer;
+ field public java.lang.Object value;
+ }
+
+ public final class VersionInfo implements java.lang.Comparable {
+ method public int compareTo(android.icu.util.VersionInfo);
+ method public static android.icu.util.VersionInfo getInstance(java.lang.String);
+ method public static android.icu.util.VersionInfo getInstance(int, int, int, int);
+ method public static android.icu.util.VersionInfo getInstance(int, int, int);
+ method public static android.icu.util.VersionInfo getInstance(int, int);
+ method public static android.icu.util.VersionInfo getInstance(int);
+ method public int getMajor();
+ method public int getMicro();
+ method public int getMilli();
+ method public int getMinor();
+ method public static void main(java.lang.String[]);
+ field public static final android.icu.util.VersionInfo ICU_VERSION;
+ field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION;
+ field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION;
+ field public static final android.icu.util.VersionInfo UNICODE_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_1_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_1_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_1_1_5;
+ field public static final android.icu.util.VersionInfo UNICODE_2_0;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_2;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_5;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_8;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_9;
+ field public static final android.icu.util.VersionInfo UNICODE_3_0;
+ field public static final android.icu.util.VersionInfo UNICODE_3_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_3_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_3_1_1;
+ field public static final android.icu.util.VersionInfo UNICODE_3_2;
+ field public static final android.icu.util.VersionInfo UNICODE_4_0;
+ field public static final android.icu.util.VersionInfo UNICODE_4_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_4_1;
+ field public static final android.icu.util.VersionInfo UNICODE_5_0;
+ field public static final android.icu.util.VersionInfo UNICODE_5_1;
+ field public static final android.icu.util.VersionInfo UNICODE_5_2;
+ field public static final android.icu.util.VersionInfo UNICODE_6_0;
+ field public static final android.icu.util.VersionInfo UNICODE_6_1;
+ field public static final android.icu.util.VersionInfo UNICODE_6_2;
+ field public static final android.icu.util.VersionInfo UNICODE_6_3;
+ field public static final android.icu.util.VersionInfo UNICODE_7_0;
+ field public static final android.icu.util.VersionInfo UNICODE_8_0;
+ }
+
+}
+
package android.inputmethodservice {
public abstract class AbstractInputMethodService extends android.app.Service implements android.view.KeyEvent.Callback {
@@ -17776,6 +21970,7 @@
package android.media.tv {
public final class TvContentRating {
+ method public final boolean contains(android.media.tv.TvContentRating);
method public static android.media.tv.TvContentRating createRating(java.lang.String, java.lang.String, java.lang.String, java.lang.String...);
method public java.lang.String flattenToString();
method public java.lang.String getDomain();
@@ -23870,6 +28065,7 @@
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
+ method public boolean isUserRunningUnlocked(android.os.UserHandle);
method public deprecated boolean setRestrictionsChallenge(java.lang.String);
method public deprecated void setUserRestriction(java.lang.String, boolean);
method public deprecated void setUserRestrictions(android.os.Bundle);
@@ -24674,6 +28870,8 @@
method public boolean isFailed();
method public boolean isQueued();
method public boolean isStarted();
+ method public void setProgress(float);
+ method public void setStatus(java.lang.CharSequence);
method public boolean setTag(java.lang.String);
method public boolean start();
}
@@ -25758,6 +29956,7 @@
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";
field public static final android.net.Uri CONTENT_VCARD_URI;
+ field public static final android.net.Uri CORP_CONTENT_FILTER_URI;
field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
@@ -25878,12 +30077,15 @@
}
public static final class ContactsContract.Directory implements android.provider.BaseColumns {
+ method public static boolean isEnterpriseDirectoryId(long);
+ method public static boolean isRemoteDirectory(long);
method public static void notifyDirectoryChange(android.content.ContentResolver);
field public static final java.lang.String ACCOUNT_NAME = "accountName";
field public static final java.lang.String ACCOUNT_TYPE = "accountType";
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_directory";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_directories";
field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri CORP_CONTENT_URI;
field public static final long DEFAULT = 0L; // 0x0L
field public static final java.lang.String DIRECTORY_AUTHORITY = "authority";
field public static final java.lang.String DISPLAY_NAME = "displayName";
@@ -26243,6 +30445,7 @@
field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
field public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 512; // 0x200
field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
+ field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
}
@@ -27211,7 +31414,10 @@
public static final class Telephony.Sms.Intents {
method public static android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent);
field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.provider.Telephony.ACTION_CHANGE_DEFAULT";
+ field public static final java.lang.String ACTION_DEFAULT_SMS_PACKAGE_CHANGED = "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED";
+ field public static final java.lang.String ACTION_EXTERNAL_PROVIDER_CHANGE = "android.provider.action.EXTERNAL_PROVIDER_CHANGE";
field public static final java.lang.String DATA_SMS_RECEIVED_ACTION = "android.intent.action.DATA_SMS_RECEIVED";
+ field public static final java.lang.String EXTRA_IS_DEFAULT_SMS_APP = "android.provider.extra.IS_DEFAULT_SMS_APP";
field public static final java.lang.String EXTRA_PACKAGE_NAME = "package";
field public static final int RESULT_SMS_DUPLICATED = 5; // 0x5
field public static final int RESULT_SMS_GENERIC_ERROR = 2; // 0x2
@@ -28972,12 +33178,15 @@
field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
+ field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
+ field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
}
public static class NotificationListenerService.Ranking {
ctor public NotificationListenerService.Ranking();
method public java.lang.String getKey();
method public int getRank();
+ method public int getSuppressedVisualEffects();
method public boolean isAmbient();
method public boolean matchesInterruptionFilter();
}
@@ -29012,6 +33221,35 @@
}
+package android.service.quicksettings {
+
+ public final class Tile implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.CharSequence getContentDescription();
+ method public android.graphics.drawable.Icon getIcon();
+ method public java.lang.CharSequence getLabel();
+ method public void setContentDescription(java.lang.CharSequence);
+ method public void setIcon(android.graphics.drawable.Icon);
+ method public void setLabel(java.lang.CharSequence);
+ method public void updateTile();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
+ }
+
+ public class TileService extends android.app.Service {
+ ctor public TileService();
+ method public final android.service.quicksettings.Tile getQsTile();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onClick();
+ method public void onStartListening();
+ method public void onStopListening();
+ method public void onTileAdded();
+ method public void onTileRemoved();
+ field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
+ }
+
+}
+
package android.service.restrictions {
public abstract class RestrictionsReceiver extends android.content.BroadcastReceiver {
@@ -31973,6 +36211,7 @@
method public java.lang.String getPackageResourcePath();
method public android.content.res.Resources getResources();
method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
method public java.lang.Object getSystemService(java.lang.String);
method public java.lang.String getSystemServiceName(java.lang.Class<?>);
method public android.content.res.Resources.Theme getTheme();
@@ -34376,6 +38615,7 @@
ctor public LocaleList(java.util.Locale[]);
method public static android.util.LocaleList forLanguageTags(java.lang.String);
method public java.util.Locale get(int);
+ method public java.util.Locale getBestMatch(java.lang.String[]);
method public static android.util.LocaleList getDefault();
method public static android.util.LocaleList getEmptyLocaleList();
method public java.util.Locale getPrimary();
@@ -36207,6 +40447,7 @@
method public boolean canResolveTextDirection();
method public boolean canScrollHorizontally(int);
method public boolean canScrollVertically(int);
+ method public final void cancelDragAndDrop();
method public void cancelLongPress();
method public final void cancelPendingInputEvents();
method public boolean checkInputConnectionProxy(android.view.View);
@@ -36224,6 +40465,7 @@
method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo();
method public void createContextMenu(android.view.ContextMenu);
method public void destroyDrawingCache();
+ method public final boolean didLayoutParamsChange();
method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets);
method public void dispatchConfigurationChanged(android.content.res.Configuration);
method public void dispatchDisplayHint(int);
@@ -36449,6 +40691,7 @@
method public boolean isOpaque();
method protected boolean isPaddingOffsetRequired();
method public boolean isPaddingRelative();
+ method public final boolean isPartialLayoutRequested();
method public boolean isPressed();
method public boolean isSaveEnabled();
method public boolean isSaveFromParentEnabled();
@@ -36685,11 +40928,13 @@
method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);
method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);
method public void startAnimation(android.view.animation.Animation);
- method public final boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
+ method public final deprecated boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
+ method public final boolean startDragAndDrop(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
method public boolean startNestedScroll(int);
method public void stopNestedScroll();
method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
method public void unscheduleDrawable(android.graphics.drawable.Drawable);
+ method public final void updateDragShadow(android.view.View.DragShadowBuilder);
method protected boolean verifyDrawable(android.graphics.drawable.Drawable);
method public boolean willNotCacheDrawing();
method public boolean willNotDraw();
@@ -37058,6 +41303,7 @@
method protected void dispatchThawSelfOnly(android.util.SparseArray<android.os.Parcelable>);
method protected boolean drawChild(android.graphics.Canvas, android.view.View, long);
method public void endViewTransition(android.view.View);
+ method public int findDependentLayoutAxes(android.view.View, int);
method public android.view.View focusSearch(android.view.View, int);
method public void focusableViewAvailable(android.view.View);
method public boolean gatherTransparentRegion(android.graphics.Region);
@@ -37124,6 +41370,8 @@
method public void requestChildFocus(android.view.View, android.view.View);
method public boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean);
method public void requestDisallowInterceptTouchEvent(boolean);
+ method public void requestLayoutForChild(android.view.View);
+ method public void requestPartialLayoutForChild(android.view.View);
method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
method public void requestTransparentRegion(android.view.View);
method public void scheduleLayoutAnimation();
@@ -37238,6 +41486,7 @@
method public abstract void childHasTransientStateChanged(android.view.View, boolean);
method public abstract void clearChildFocus(android.view.View);
method public abstract void createContextMenu(android.view.ContextMenu);
+ method public abstract int findDependentLayoutAxes(android.view.View, int);
method public abstract android.view.View focusSearch(android.view.View, int);
method public abstract void focusableViewAvailable(android.view.View);
method public abstract boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point);
@@ -37267,12 +41516,16 @@
method public abstract void requestDisallowInterceptTouchEvent(boolean);
method public abstract void requestFitSystemWindows();
method public abstract void requestLayout();
+ method public abstract void requestLayoutForChild(android.view.View);
method public abstract boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
method public abstract void requestTransparentRegion(android.view.View);
method public abstract boolean showContextMenuForChild(android.view.View);
method public abstract boolean showContextMenuForChild(android.view.View, float, float);
method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);
method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);
+ field public static final int FLAG_LAYOUT_AXIS_ANY = 3; // 0x3
+ field public static final int FLAG_LAYOUT_AXIS_HORIZONTAL = 1; // 0x1
+ field public static final int FLAG_LAYOUT_AXIS_VERTICAL = 2; // 0x2
}
public class ViewPropertyAnimator {
@@ -42664,13 +46917,18 @@
package java.awt.font {
public final class NumericShaper implements java.io.Serializable {
- method public static java.awt.font.NumericShaper getContextualShaper(int, int);
method public static java.awt.font.NumericShaper getContextualShaper(int);
+ method public static java.awt.font.NumericShaper getContextualShaper(java.util.Set<java.awt.font.NumericShaper.Range>);
+ method public static java.awt.font.NumericShaper getContextualShaper(int, int);
+ method public static java.awt.font.NumericShaper getContextualShaper(java.util.Set<java.awt.font.NumericShaper.Range>, java.awt.font.NumericShaper.Range);
+ method public java.util.Set<java.awt.font.NumericShaper.Range> getRangeSet();
method public int getRanges();
method public static java.awt.font.NumericShaper getShaper(int);
+ method public static java.awt.font.NumericShaper getShaper(java.awt.font.NumericShaper.Range);
method public boolean isContextual();
- method public void shape(char[], int, int, int);
method public void shape(char[], int, int);
+ method public void shape(char[], int, int, int);
+ method public void shape(char[], int, int, java.awt.font.NumericShaper.Range);
field public static final int ALL_RANGES = 524287; // 0x7ffff
field public static final int ARABIC = 2; // 0x2
field public static final int BENGALI = 16; // 0x10
@@ -42693,6 +46951,46 @@
field public static final int TIBETAN = 16384; // 0x4000
}
+ public static class NumericShaper.Range extends java.lang.Enum {
+ method public static java.awt.font.NumericShaper.Range valueOf(java.lang.String);
+ method public static final java.awt.font.NumericShaper.Range[] values();
+ enum_constant public static final java.awt.font.NumericShaper.Range ARABIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range BALINESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range BENGALI;
+ enum_constant public static final java.awt.font.NumericShaper.Range CHAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range DEVANAGARI;
+ enum_constant public static final java.awt.font.NumericShaper.Range EASTERN_ARABIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range ETHIOPIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range EUROPEAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range GUJARATI;
+ enum_constant public static final java.awt.font.NumericShaper.Range GURMUKHI;
+ enum_constant public static final java.awt.font.NumericShaper.Range JAVANESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range KANNADA;
+ enum_constant public static final java.awt.font.NumericShaper.Range KAYAH_LI;
+ enum_constant public static final java.awt.font.NumericShaper.Range KHMER;
+ enum_constant public static final java.awt.font.NumericShaper.Range LAO;
+ enum_constant public static final java.awt.font.NumericShaper.Range LEPCHA;
+ enum_constant public static final java.awt.font.NumericShaper.Range LIMBU;
+ enum_constant public static final java.awt.font.NumericShaper.Range MALAYALAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range MEETEI_MAYEK;
+ enum_constant public static final java.awt.font.NumericShaper.Range MONGOLIAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range MYANMAR;
+ enum_constant public static final java.awt.font.NumericShaper.Range MYANMAR_SHAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range NEW_TAI_LUE;
+ enum_constant public static final java.awt.font.NumericShaper.Range NKO;
+ enum_constant public static final java.awt.font.NumericShaper.Range OL_CHIKI;
+ enum_constant public static final java.awt.font.NumericShaper.Range ORIYA;
+ enum_constant public static final java.awt.font.NumericShaper.Range SAURASHTRA;
+ enum_constant public static final java.awt.font.NumericShaper.Range SUNDANESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAI_THAM_HORA;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAI_THAM_THAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAMIL;
+ enum_constant public static final java.awt.font.NumericShaper.Range TELUGU;
+ enum_constant public static final java.awt.font.NumericShaper.Range THAI;
+ enum_constant public static final java.awt.font.NumericShaper.Range TIBETAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range VAI;
+ }
+
public final class TextAttribute extends java.text.AttributedCharacterIterator.Attribute {
ctor protected TextAttribute(java.lang.String);
field public static final java.awt.font.TextAttribute BACKGROUND;
@@ -42786,20 +47084,20 @@
public class PropertyChangeSupport implements java.io.Serializable {
ctor public PropertyChangeSupport(java.lang.Object);
- method public void addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
method public void addPropertyChangeListener(java.beans.PropertyChangeListener);
+ method public void addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
method public void fireIndexedPropertyChange(java.lang.String, int, java.lang.Object, java.lang.Object);
- method public void fireIndexedPropertyChange(java.lang.String, int, boolean, boolean);
method public void fireIndexedPropertyChange(java.lang.String, int, int, int);
+ method public void fireIndexedPropertyChange(java.lang.String, int, boolean, boolean);
method public void firePropertyChange(java.lang.String, java.lang.Object, java.lang.Object);
- method public void firePropertyChange(java.lang.String, boolean, boolean);
method public void firePropertyChange(java.lang.String, int, int);
+ method public void firePropertyChange(java.lang.String, boolean, boolean);
method public void firePropertyChange(java.beans.PropertyChangeEvent);
- method public java.beans.PropertyChangeListener[] getPropertyChangeListeners(java.lang.String);
method public java.beans.PropertyChangeListener[] getPropertyChangeListeners();
+ method public java.beans.PropertyChangeListener[] getPropertyChangeListeners(java.lang.String);
method public boolean hasListeners(java.lang.String);
- method public void removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
method public void removePropertyChangeListener(java.beans.PropertyChangeListener);
+ method public void removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
}
}
@@ -42824,8 +47122,8 @@
}
public class BufferedReader extends java.io.Reader {
- ctor public BufferedReader(java.io.Reader);
ctor public BufferedReader(java.io.Reader, int);
+ ctor public BufferedReader(java.io.Reader);
method public void close() throws java.io.IOException;
method public int read(char[], int, int) throws java.io.IOException;
method public java.lang.String readLine() throws java.io.IOException;
@@ -42854,10 +47152,10 @@
ctor public ByteArrayOutputStream();
ctor public ByteArrayOutputStream(int);
method public synchronized void reset();
- method public int size();
+ method public synchronized int size();
method public synchronized byte[] toByteArray();
- method public deprecated java.lang.String toString(int);
- method public java.lang.String toString(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public synchronized java.lang.String toString(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public deprecated synchronized java.lang.String toString(int);
method public synchronized void write(int);
method public synchronized void writeTo(java.io.OutputStream) throws java.io.IOException;
field protected byte[] buf;
@@ -42899,13 +47197,15 @@
}
public final class Console implements java.io.Flushable {
+ method public static java.io.Console console();
method public void flush();
method public java.io.Console format(java.lang.String, java.lang.Object...);
+ method public static synchronized java.io.Console getConsole();
method public java.io.Console printf(java.lang.String, java.lang.Object...);
- method public java.lang.String readLine();
method public java.lang.String readLine(java.lang.String, java.lang.Object...);
- method public char[] readPassword();
+ method public java.lang.String readLine();
method public char[] readPassword(java.lang.String, java.lang.Object...);
+ method public char[] readPassword();
method public java.io.Reader reader();
method public java.io.PrintWriter writer();
}
@@ -42951,9 +47251,9 @@
}
public abstract interface DataOutput {
+ method public abstract void write(int) throws java.io.IOException;
method public abstract void write(byte[]) throws java.io.IOException;
method public abstract void write(byte[], int, int) throws java.io.IOException;
- method public abstract void write(int) throws java.io.IOException;
method public abstract void writeBoolean(boolean) throws java.io.IOException;
method public abstract void writeByte(int) throws java.io.IOException;
method public abstract void writeBytes(java.lang.String) throws java.io.IOException;
@@ -42995,17 +47295,17 @@
}
public class File implements java.lang.Comparable java.io.Serializable {
- ctor public File(java.io.File, java.lang.String);
ctor public File(java.lang.String);
ctor public File(java.lang.String, java.lang.String);
+ ctor public File(java.io.File, java.lang.String);
ctor public File(java.net.URI);
method public boolean canExecute();
method public boolean canRead();
method public boolean canWrite();
method public int compareTo(java.io.File);
method public boolean createNewFile() throws java.io.IOException;
- method public static java.io.File createTempFile(java.lang.String, java.lang.String) throws java.io.IOException;
method public static java.io.File createTempFile(java.lang.String, java.lang.String, java.io.File) throws java.io.IOException;
+ method public static java.io.File createTempFile(java.lang.String, java.lang.String) throws java.io.IOException;
method public boolean delete();
method public void deleteOnExit();
method public boolean exists();
@@ -43043,6 +47343,7 @@
method public boolean setReadable(boolean);
method public boolean setWritable(boolean, boolean);
method public boolean setWritable(boolean);
+ method public java.nio.file.Path toPath();
method public java.net.URI toURI();
method public deprecated java.net.URL toURL() throws java.net.MalformedURLException;
field public static final java.lang.String pathSeparator;
@@ -43065,9 +47366,9 @@
}
public class FileInputStream extends java.io.InputStream {
+ ctor public FileInputStream(java.lang.String) throws java.io.FileNotFoundException;
ctor public FileInputStream(java.io.File) throws java.io.FileNotFoundException;
ctor public FileInputStream(java.io.FileDescriptor);
- ctor public FileInputStream(java.lang.String) throws java.io.FileNotFoundException;
method public java.nio.channels.FileChannel getChannel();
method public final java.io.FileDescriptor getFD() throws java.io.IOException;
method public int read() throws java.io.IOException;
@@ -43079,11 +47380,11 @@
}
public class FileOutputStream extends java.io.OutputStream {
+ ctor public FileOutputStream(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public FileOutputStream(java.lang.String, boolean) throws java.io.FileNotFoundException;
ctor public FileOutputStream(java.io.File) throws java.io.FileNotFoundException;
ctor public FileOutputStream(java.io.File, boolean) throws java.io.FileNotFoundException;
ctor public FileOutputStream(java.io.FileDescriptor);
- ctor public FileOutputStream(java.lang.String) throws java.io.FileNotFoundException;
- ctor public FileOutputStream(java.lang.String, boolean) throws java.io.FileNotFoundException;
method public java.nio.channels.FileChannel getChannel();
method public final java.io.FileDescriptor getFD() throws java.io.IOException;
method public void write(int) throws java.io.IOException;
@@ -43091,22 +47392,24 @@
public final class FilePermission extends java.security.Permission implements java.io.Serializable {
ctor public FilePermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
public class FileReader extends java.io.InputStreamReader {
+ ctor public FileReader(java.lang.String) throws java.io.FileNotFoundException;
ctor public FileReader(java.io.File) throws java.io.FileNotFoundException;
ctor public FileReader(java.io.FileDescriptor);
- ctor public FileReader(java.lang.String) throws java.io.FileNotFoundException;
}
public class FileWriter extends java.io.OutputStreamWriter {
+ ctor public FileWriter(java.lang.String) throws java.io.IOException;
+ ctor public FileWriter(java.lang.String, boolean) throws java.io.IOException;
ctor public FileWriter(java.io.File) throws java.io.IOException;
ctor public FileWriter(java.io.File, boolean) throws java.io.IOException;
ctor public FileWriter(java.io.FileDescriptor);
- ctor public FileWriter(java.lang.String) throws java.io.IOException;
- ctor public FileWriter(java.lang.String, boolean) throws java.io.IOException;
}
public abstract interface FilenameFilter {
@@ -43159,7 +47462,7 @@
ctor public InputStream();
method public int available() throws java.io.IOException;
method public void close() throws java.io.IOException;
- method public void mark(int);
+ method public synchronized void mark(int);
method public boolean markSupported();
method public abstract int read() throws java.io.IOException;
method public int read(byte[]) throws java.io.IOException;
@@ -43171,8 +47474,8 @@
public class InputStreamReader extends java.io.Reader {
ctor public InputStreamReader(java.io.InputStream);
ctor public InputStreamReader(java.io.InputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public InputStreamReader(java.io.InputStream, java.nio.charset.CharsetDecoder);
ctor public InputStreamReader(java.io.InputStream, java.nio.charset.Charset);
+ ctor public InputStreamReader(java.io.InputStream, java.nio.charset.CharsetDecoder);
method public void close() throws java.io.IOException;
method public java.lang.String getEncoding();
method public int read(char[], int, int) throws java.io.IOException;
@@ -43181,6 +47484,7 @@
public class InterruptedIOException extends java.io.IOException {
ctor public InterruptedIOException();
ctor public InterruptedIOException(java.lang.String);
+ ctor public InterruptedIOException(java.lang.Throwable);
field public int bytesTransferred;
}
@@ -43208,13 +47512,13 @@
}
public class NotActiveException extends java.io.ObjectStreamException {
- ctor public NotActiveException();
ctor public NotActiveException(java.lang.String);
+ ctor public NotActiveException();
}
public class NotSerializableException extends java.io.ObjectStreamException {
- ctor public NotSerializableException();
ctor public NotSerializableException(java.lang.String);
+ ctor public NotSerializableException();
}
public abstract interface ObjectInput implements java.lang.AutoCloseable java.io.DataInput {
@@ -43228,32 +47532,32 @@
}
public class ObjectInputStream extends java.io.InputStream implements java.io.ObjectInput java.io.ObjectStreamConstants {
- ctor protected ObjectInputStream() throws java.io.IOException;
- ctor public ObjectInputStream(java.io.InputStream) throws java.io.IOException, java.io.StreamCorruptedException;
- method public void defaultReadObject() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.NotActiveException;
- method protected boolean enableResolveObject(boolean);
+ ctor public ObjectInputStream(java.io.InputStream) throws java.io.IOException;
+ ctor protected ObjectInputStream() throws java.io.IOException, java.lang.SecurityException;
+ method public void defaultReadObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected boolean enableResolveObject(boolean) throws java.lang.SecurityException;
method public int read() throws java.io.IOException;
method public boolean readBoolean() throws java.io.IOException;
method public byte readByte() throws java.io.IOException;
method public char readChar() throws java.io.IOException;
method protected java.io.ObjectStreamClass readClassDescriptor() throws java.lang.ClassNotFoundException, java.io.IOException;
method public double readDouble() throws java.io.IOException;
- method public java.io.ObjectInputStream.GetField readFields() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.NotActiveException;
+ method public java.io.ObjectInputStream.GetField readFields() throws java.lang.ClassNotFoundException, java.io.IOException;
method public float readFloat() throws java.io.IOException;
method public void readFully(byte[]) throws java.io.IOException;
method public void readFully(byte[], int, int) throws java.io.IOException;
method public int readInt() throws java.io.IOException;
method public deprecated java.lang.String readLine() throws java.io.IOException;
method public long readLong() throws java.io.IOException;
- method public final java.lang.Object readObject() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.OptionalDataException;
- method protected java.lang.Object readObjectOverride() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.OptionalDataException;
+ method public final java.lang.Object readObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected java.lang.Object readObjectOverride() throws java.lang.ClassNotFoundException, java.io.IOException;
method public short readShort() throws java.io.IOException;
method protected void readStreamHeader() throws java.io.IOException, java.io.StreamCorruptedException;
method public java.lang.String readUTF() throws java.io.IOException;
method public java.lang.Object readUnshared() throws java.lang.ClassNotFoundException, java.io.IOException;
method public int readUnsignedByte() throws java.io.IOException;
method public int readUnsignedShort() throws java.io.IOException;
- method public synchronized void registerValidation(java.io.ObjectInputValidation, int) throws java.io.InvalidObjectException, java.io.NotActiveException;
+ method public void registerValidation(java.io.ObjectInputValidation, int) throws java.io.InvalidObjectException, java.io.NotActiveException;
method protected java.lang.Class<?> resolveClass(java.io.ObjectStreamClass) throws java.lang.ClassNotFoundException, java.io.IOException;
method protected java.lang.Object resolveObject(java.lang.Object) throws java.io.IOException;
method protected java.lang.Class<?> resolveProxyClass(java.lang.String[]) throws java.lang.ClassNotFoundException, java.io.IOException;
@@ -43262,16 +47566,16 @@
public static abstract class ObjectInputStream.GetField {
ctor public ObjectInputStream.GetField();
- method public abstract boolean defaulted(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract boolean get(java.lang.String, boolean) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract char get(java.lang.String, char) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract byte get(java.lang.String, byte) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract short get(java.lang.String, short) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract int get(java.lang.String, int) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract long get(java.lang.String, long) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract float get(java.lang.String, float) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract double get(java.lang.String, double) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract java.lang.Object get(java.lang.String, java.lang.Object) throws java.io.IOException, java.lang.IllegalArgumentException;
+ method public abstract boolean defaulted(java.lang.String) throws java.io.IOException;
+ method public abstract boolean get(java.lang.String, boolean) throws java.io.IOException;
+ method public abstract byte get(java.lang.String, byte) throws java.io.IOException;
+ method public abstract char get(java.lang.String, char) throws java.io.IOException;
+ method public abstract short get(java.lang.String, short) throws java.io.IOException;
+ method public abstract int get(java.lang.String, int) throws java.io.IOException;
+ method public abstract long get(java.lang.String, long) throws java.io.IOException;
+ method public abstract float get(java.lang.String, float) throws java.io.IOException;
+ method public abstract double get(java.lang.String, double) throws java.io.IOException;
+ method public abstract java.lang.Object get(java.lang.String, java.lang.Object) throws java.io.IOException;
method public abstract java.io.ObjectStreamClass getObjectStreamClass();
}
@@ -43282,20 +47586,20 @@
public abstract interface ObjectOutput implements java.lang.AutoCloseable java.io.DataOutput {
method public abstract void close() throws java.io.IOException;
method public abstract void flush() throws java.io.IOException;
+ method public abstract void write(int) throws java.io.IOException;
method public abstract void write(byte[]) throws java.io.IOException;
method public abstract void write(byte[], int, int) throws java.io.IOException;
- method public abstract void write(int) throws java.io.IOException;
method public abstract void writeObject(java.lang.Object) throws java.io.IOException;
}
public class ObjectOutputStream extends java.io.OutputStream implements java.io.ObjectOutput java.io.ObjectStreamConstants {
- ctor protected ObjectOutputStream() throws java.io.IOException;
ctor public ObjectOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor protected ObjectOutputStream() throws java.io.IOException, java.lang.SecurityException;
method protected void annotateClass(java.lang.Class<?>) throws java.io.IOException;
method protected void annotateProxyClass(java.lang.Class<?>) throws java.io.IOException;
method public void defaultWriteObject() throws java.io.IOException;
method protected void drain() throws java.io.IOException;
- method protected boolean enableReplaceObject(boolean);
+ method protected boolean enableReplaceObject(boolean) throws java.lang.SecurityException;
method public java.io.ObjectOutputStream.PutField putFields() throws java.io.IOException;
method protected java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException;
method public void reset() throws java.io.IOException;
@@ -43323,8 +47627,8 @@
public static abstract class ObjectOutputStream.PutField {
ctor public ObjectOutputStream.PutField();
method public abstract void put(java.lang.String, boolean);
- method public abstract void put(java.lang.String, char);
method public abstract void put(java.lang.String, byte);
+ method public abstract void put(java.lang.String, char);
method public abstract void put(java.lang.String, short);
method public abstract void put(java.lang.String, int);
method public abstract void put(java.lang.String, long);
@@ -43378,8 +47682,8 @@
}
public abstract class ObjectStreamException extends java.io.IOException {
- ctor protected ObjectStreamException();
ctor protected ObjectStreamException(java.lang.String);
+ ctor protected ObjectStreamException();
}
public class ObjectStreamField implements java.lang.Comparable {
@@ -43405,14 +47709,14 @@
ctor public OutputStream();
method public void close() throws java.io.IOException;
method public void flush() throws java.io.IOException;
+ method public abstract void write(int) throws java.io.IOException;
method public void write(byte[]) throws java.io.IOException;
method public void write(byte[], int, int) throws java.io.IOException;
- method public abstract void write(int) throws java.io.IOException;
}
public class OutputStreamWriter extends java.io.Writer {
- ctor public OutputStreamWriter(java.io.OutputStream);
ctor public OutputStreamWriter(java.io.OutputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public OutputStreamWriter(java.io.OutputStream);
ctor public OutputStreamWriter(java.io.OutputStream, java.nio.charset.Charset);
ctor public OutputStreamWriter(java.io.OutputStream, java.nio.charset.CharsetEncoder);
method public void close() throws java.io.IOException;
@@ -43422,10 +47726,10 @@
}
public class PipedInputStream extends java.io.InputStream {
- ctor public PipedInputStream();
ctor public PipedInputStream(java.io.PipedOutputStream) throws java.io.IOException;
- ctor public PipedInputStream(int);
ctor public PipedInputStream(java.io.PipedOutputStream, int) throws java.io.IOException;
+ ctor public PipedInputStream();
+ ctor public PipedInputStream(int);
method public void connect(java.io.PipedOutputStream) throws java.io.IOException;
method public synchronized int read() throws java.io.IOException;
method protected synchronized void receive(int) throws java.io.IOException;
@@ -43436,28 +47740,28 @@
}
public class PipedOutputStream extends java.io.OutputStream {
- ctor public PipedOutputStream();
ctor public PipedOutputStream(java.io.PipedInputStream) throws java.io.IOException;
- method public void connect(java.io.PipedInputStream) throws java.io.IOException;
+ ctor public PipedOutputStream();
+ method public synchronized void connect(java.io.PipedInputStream) throws java.io.IOException;
method public void write(int) throws java.io.IOException;
}
public class PipedReader extends java.io.Reader {
- ctor public PipedReader();
ctor public PipedReader(java.io.PipedWriter) throws java.io.IOException;
- ctor public PipedReader(int);
ctor public PipedReader(java.io.PipedWriter, int) throws java.io.IOException;
- method public synchronized void close() throws java.io.IOException;
+ ctor public PipedReader();
+ ctor public PipedReader(int);
+ method public void close() throws java.io.IOException;
method public void connect(java.io.PipedWriter) throws java.io.IOException;
method public synchronized int read(char[], int, int) throws java.io.IOException;
}
public class PipedWriter extends java.io.Writer {
- ctor public PipedWriter();
ctor public PipedWriter(java.io.PipedReader) throws java.io.IOException;
+ ctor public PipedWriter();
method public void close() throws java.io.IOException;
- method public void connect(java.io.PipedReader) throws java.io.IOException;
- method public void flush() throws java.io.IOException;
+ method public synchronized void connect(java.io.PipedReader) throws java.io.IOException;
+ method public synchronized void flush() throws java.io.IOException;
method public void write(char[], int, int) throws java.io.IOException;
}
@@ -43465,111 +47769,111 @@
ctor public PrintStream(java.io.OutputStream);
ctor public PrintStream(java.io.OutputStream, boolean);
ctor public PrintStream(java.io.OutputStream, boolean, java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public PrintStream(java.io.File) throws java.io.FileNotFoundException;
- ctor public PrintStream(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
ctor public PrintStream(java.lang.String) throws java.io.FileNotFoundException;
ctor public PrintStream(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
- method public java.io.PrintStream append(char);
+ ctor public PrintStream(java.io.File) throws java.io.FileNotFoundException;
+ ctor public PrintStream(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
method public java.io.PrintStream append(java.lang.CharSequence);
method public java.io.PrintStream append(java.lang.CharSequence, int, int);
+ method public java.io.PrintStream append(char);
method public boolean checkError();
method protected void clearError();
method public java.io.PrintStream format(java.lang.String, java.lang.Object...);
method public java.io.PrintStream format(java.util.Locale, java.lang.String, java.lang.Object...);
- method public void print(char[]);
+ method public void print(boolean);
method public void print(char);
- method public void print(double);
- method public void print(float);
method public void print(int);
method public void print(long);
+ method public void print(float);
+ method public void print(double);
+ method public void print(char[]);
+ method public void print(java.lang.String);
method public void print(java.lang.Object);
- method public synchronized void print(java.lang.String);
- method public void print(boolean);
method public java.io.PrintStream printf(java.lang.String, java.lang.Object...);
method public java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...);
method public void println();
- method public void println(char[]);
+ method public void println(boolean);
method public void println(char);
- method public void println(double);
- method public void println(float);
method public void println(int);
method public void println(long);
+ method public void println(float);
+ method public void println(double);
+ method public void println(char[]);
+ method public void println(java.lang.String);
method public void println(java.lang.Object);
- method public synchronized void println(java.lang.String);
- method public void println(boolean);
method protected void setError();
}
public class PrintWriter extends java.io.Writer {
- ctor public PrintWriter(java.io.OutputStream);
- ctor public PrintWriter(java.io.OutputStream, boolean);
ctor public PrintWriter(java.io.Writer);
ctor public PrintWriter(java.io.Writer, boolean);
- ctor public PrintWriter(java.io.File) throws java.io.FileNotFoundException;
- ctor public PrintWriter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public PrintWriter(java.io.OutputStream);
+ ctor public PrintWriter(java.io.OutputStream, boolean);
ctor public PrintWriter(java.lang.String) throws java.io.FileNotFoundException;
ctor public PrintWriter(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public PrintWriter(java.io.File) throws java.io.FileNotFoundException;
+ ctor public PrintWriter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
method public boolean checkError();
method protected void clearError();
method public void close();
method public void flush();
method public java.io.PrintWriter format(java.lang.String, java.lang.Object...);
method public java.io.PrintWriter format(java.util.Locale, java.lang.String, java.lang.Object...);
- method public void print(char[]);
+ method public void print(boolean);
method public void print(char);
- method public void print(double);
- method public void print(float);
method public void print(int);
method public void print(long);
- method public void print(java.lang.Object);
+ method public void print(float);
+ method public void print(double);
+ method public void print(char[]);
method public void print(java.lang.String);
- method public void print(boolean);
+ method public void print(java.lang.Object);
method public java.io.PrintWriter printf(java.lang.String, java.lang.Object...);
method public java.io.PrintWriter printf(java.util.Locale, java.lang.String, java.lang.Object...);
method public void println();
- method public void println(char[]);
+ method public void println(boolean);
method public void println(char);
- method public void println(double);
- method public void println(float);
method public void println(int);
method public void println(long);
- method public void println(java.lang.Object);
+ method public void println(float);
+ method public void println(double);
+ method public void println(char[]);
method public void println(java.lang.String);
- method public void println(boolean);
+ method public void println(java.lang.Object);
method protected void setError();
method public void write(char[], int, int);
field protected java.io.Writer out;
}
public class PushbackInputStream extends java.io.FilterInputStream {
- ctor public PushbackInputStream(java.io.InputStream);
ctor public PushbackInputStream(java.io.InputStream, int);
- method public void unread(byte[]) throws java.io.IOException;
- method public void unread(byte[], int, int) throws java.io.IOException;
+ ctor public PushbackInputStream(java.io.InputStream);
method public void unread(int) throws java.io.IOException;
+ method public void unread(byte[], int, int) throws java.io.IOException;
+ method public void unread(byte[]) throws java.io.IOException;
field protected byte[] buf;
field protected int pos;
}
public class PushbackReader extends java.io.FilterReader {
- ctor public PushbackReader(java.io.Reader);
ctor public PushbackReader(java.io.Reader, int);
- method public void unread(char[]) throws java.io.IOException;
- method public void unread(char[], int, int) throws java.io.IOException;
+ ctor public PushbackReader(java.io.Reader);
method public void unread(int) throws java.io.IOException;
+ method public void unread(char[], int, int) throws java.io.IOException;
+ method public void unread(char[]) throws java.io.IOException;
}
public class RandomAccessFile implements java.io.Closeable java.io.DataInput java.io.DataOutput {
- ctor public RandomAccessFile(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
ctor public RandomAccessFile(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+ ctor public RandomAccessFile(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
method public void close() throws java.io.IOException;
- method public final synchronized java.nio.channels.FileChannel getChannel();
+ method public final java.nio.channels.FileChannel getChannel();
method public final java.io.FileDescriptor getFD() throws java.io.IOException;
method public long getFilePointer() throws java.io.IOException;
method public long length() throws java.io.IOException;
method public int read() throws java.io.IOException;
- method public int read(byte[]) throws java.io.IOException;
method public int read(byte[], int, int) throws java.io.IOException;
+ method public int read(byte[]) throws java.io.IOException;
method public final boolean readBoolean() throws java.io.IOException;
method public final byte readByte() throws java.io.IOException;
method public final char readChar() throws java.io.IOException;
@@ -43587,9 +47891,9 @@
method public void seek(long) throws java.io.IOException;
method public void setLength(long) throws java.io.IOException;
method public int skipBytes(int) throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
method public void write(byte[]) throws java.io.IOException;
method public void write(byte[], int, int) throws java.io.IOException;
- method public void write(int) throws java.io.IOException;
method public final void writeBoolean(boolean) throws java.io.IOException;
method public final void writeByte(int) throws java.io.IOException;
method public final void writeBytes(java.lang.String) throws java.io.IOException;
@@ -43609,10 +47913,10 @@
method public abstract void close() throws java.io.IOException;
method public void mark(int) throws java.io.IOException;
method public boolean markSupported();
+ method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public int read() throws java.io.IOException;
method public int read(char[]) throws java.io.IOException;
method public abstract int read(char[], int, int) throws java.io.IOException;
- method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public boolean ready() throws java.io.IOException;
method public void reset() throws java.io.IOException;
method public long skip(long) throws java.io.IOException;
@@ -43620,8 +47924,8 @@
}
public class SequenceInputStream extends java.io.InputStream {
- ctor public SequenceInputStream(java.io.InputStream, java.io.InputStream);
ctor public SequenceInputStream(java.util.Enumeration<? extends java.io.InputStream>);
+ ctor public SequenceInputStream(java.io.InputStream, java.io.InputStream);
method public int read() throws java.io.IOException;
}
@@ -43634,8 +47938,8 @@
}
public class StreamCorruptedException extends java.io.ObjectStreamException {
- ctor public StreamCorruptedException();
ctor public StreamCorruptedException(java.lang.String);
+ ctor public StreamCorruptedException();
}
public class StreamTokenizer {
@@ -43710,14 +48014,14 @@
public abstract class Writer implements java.lang.Appendable java.io.Closeable java.io.Flushable {
ctor protected Writer();
ctor protected Writer(java.lang.Object);
- method public java.io.Writer append(char) throws java.io.IOException;
method public java.io.Writer append(java.lang.CharSequence) throws java.io.IOException;
method public java.io.Writer append(java.lang.CharSequence, int, int) throws java.io.IOException;
+ method public java.io.Writer append(char) throws java.io.IOException;
method public abstract void close() throws java.io.IOException;
method public abstract void flush() throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
method public void write(char[]) throws java.io.IOException;
method public abstract void write(char[], int, int) throws java.io.IOException;
- method public void write(int) throws java.io.IOException;
method public void write(java.lang.String) throws java.io.IOException;
method public void write(java.lang.String, int, int) throws java.io.IOException;
field protected java.lang.Object lock;
@@ -43732,32 +48036,63 @@
ctor public AbstractMethodError(java.lang.String);
}
- abstract class AbstractStringBuilder {
+ abstract class AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence {
+ method public java.lang.AbstractStringBuilder append(java.lang.Object);
+ method public java.lang.AbstractStringBuilder append(java.lang.String);
+ method public java.lang.AbstractStringBuilder append(java.lang.StringBuffer);
+ method public java.lang.AbstractStringBuilder append(java.lang.CharSequence);
+ method public java.lang.AbstractStringBuilder append(java.lang.CharSequence, int, int);
+ method public java.lang.AbstractStringBuilder append(char[]);
+ method public java.lang.AbstractStringBuilder append(char[], int, int);
+ method public java.lang.AbstractStringBuilder append(boolean);
+ method public java.lang.AbstractStringBuilder append(char);
+ method public java.lang.AbstractStringBuilder append(int);
+ method public java.lang.AbstractStringBuilder append(long);
+ method public java.lang.AbstractStringBuilder append(float);
+ method public java.lang.AbstractStringBuilder append(double);
+ method public java.lang.AbstractStringBuilder appendCodePoint(int);
method public int capacity();
method public char charAt(int);
method public int codePointAt(int);
method public int codePointBefore(int);
method public int codePointCount(int, int);
+ method public java.lang.AbstractStringBuilder delete(int, int);
+ method public java.lang.AbstractStringBuilder deleteCharAt(int);
method public void ensureCapacity(int);
method public void getChars(int, int, char[], int);
method public int indexOf(java.lang.String);
method public int indexOf(java.lang.String, int);
+ method public java.lang.AbstractStringBuilder insert(int, char[], int, int);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.Object);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.String);
+ method public java.lang.AbstractStringBuilder insert(int, char[]);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.CharSequence);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.CharSequence, int, int);
+ method public java.lang.AbstractStringBuilder insert(int, boolean);
+ method public java.lang.AbstractStringBuilder insert(int, char);
+ method public java.lang.AbstractStringBuilder insert(int, int);
+ method public java.lang.AbstractStringBuilder insert(int, long);
+ method public java.lang.AbstractStringBuilder insert(int, float);
+ method public java.lang.AbstractStringBuilder insert(int, double);
method public int lastIndexOf(java.lang.String);
method public int lastIndexOf(java.lang.String, int);
method public int length();
method public int offsetByCodePoints(int, int);
+ method public java.lang.AbstractStringBuilder replace(int, int, java.lang.String);
+ method public java.lang.AbstractStringBuilder reverse();
method public void setCharAt(int, char);
method public void setLength(int);
method public java.lang.CharSequence subSequence(int, int);
method public java.lang.String substring(int);
method public java.lang.String substring(int, int);
+ method public abstract java.lang.String toString();
method public void trimToSize();
}
public abstract interface Appendable {
- method public abstract java.lang.Appendable append(char) throws java.io.IOException;
method public abstract java.lang.Appendable append(java.lang.CharSequence) throws java.io.IOException;
method public abstract java.lang.Appendable append(java.lang.CharSequence, int, int) throws java.io.IOException;
+ method public abstract java.lang.Appendable append(char) throws java.io.IOException;
}
public class ArithmeticException extends java.lang.RuntimeException {
@@ -43778,7 +48113,6 @@
public class AssertionError extends java.lang.Error {
ctor public AssertionError();
- ctor public AssertionError(java.lang.String, java.lang.Throwable);
ctor public AssertionError(java.lang.Object);
ctor public AssertionError(boolean);
ctor public AssertionError(char);
@@ -43786,6 +48120,7 @@
ctor public AssertionError(long);
ctor public AssertionError(float);
ctor public AssertionError(double);
+ ctor public AssertionError(java.lang.String, java.lang.Throwable);
}
public abstract interface AutoCloseable {
@@ -43793,16 +48128,16 @@
}
public final class Boolean implements java.lang.Comparable java.io.Serializable {
- ctor public Boolean(java.lang.String);
ctor public Boolean(boolean);
+ ctor public Boolean(java.lang.String);
method public boolean booleanValue();
method public static int compare(boolean, boolean);
method public int compareTo(java.lang.Boolean);
method public static boolean getBoolean(java.lang.String);
method public static boolean parseBoolean(java.lang.String);
method public static java.lang.String toString(boolean);
- method public static java.lang.Boolean valueOf(java.lang.String);
method public static java.lang.Boolean valueOf(boolean);
+ method public static java.lang.Boolean valueOf(java.lang.String);
field public static final java.lang.Boolean FALSE;
field public static final java.lang.Boolean TRUE;
field public static final java.lang.Class<java.lang.Boolean> TYPE;
@@ -43818,12 +48153,13 @@
method public float floatValue();
method public int intValue();
method public long longValue();
- method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
method public static byte parseByte(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toHexString(byte, boolean);
method public static java.lang.String toString(byte);
- method public static java.lang.Byte valueOf(java.lang.String) throws java.lang.NumberFormatException;
- method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
method public static java.lang.Byte valueOf(byte);
+ method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Byte valueOf(java.lang.String) throws java.lang.NumberFormatException;
field public static final byte MAX_VALUE = 127; // 0x7f
field public static final byte MIN_VALUE = -128; // 0xffffff80
field public static final int SIZE = 8; // 0x8
@@ -43996,7 +48332,7 @@
}
public static final class Character.UnicodeBlock extends java.lang.Character.Subset {
- method public static java.lang.Character.UnicodeBlock forName(java.lang.String);
+ method public static final java.lang.Character.UnicodeBlock forName(java.lang.String);
method public static java.lang.Character.UnicodeBlock of(char);
method public static java.lang.Character.UnicodeBlock of(int);
field public static final java.lang.Character.UnicodeBlock AEGEAN_NUMBERS;
@@ -44211,6 +48547,109 @@
field public static final java.lang.Character.UnicodeBlock YI_SYLLABLES;
}
+ public static final class Character.UnicodeScript extends java.lang.Enum {
+ method public static final java.lang.Character.UnicodeScript forName(java.lang.String);
+ method public static java.lang.Character.UnicodeScript of(int);
+ method public static java.lang.Character.UnicodeScript valueOf(java.lang.String);
+ method public static final java.lang.Character.UnicodeScript[] values();
+ enum_constant public static final java.lang.Character.UnicodeScript ARABIC;
+ enum_constant public static final java.lang.Character.UnicodeScript ARMENIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript AVESTAN;
+ enum_constant public static final java.lang.Character.UnicodeScript BALINESE;
+ enum_constant public static final java.lang.Character.UnicodeScript BAMUM;
+ enum_constant public static final java.lang.Character.UnicodeScript BATAK;
+ enum_constant public static final java.lang.Character.UnicodeScript BENGALI;
+ enum_constant public static final java.lang.Character.UnicodeScript BOPOMOFO;
+ enum_constant public static final java.lang.Character.UnicodeScript BRAHMI;
+ enum_constant public static final java.lang.Character.UnicodeScript BRAILLE;
+ enum_constant public static final java.lang.Character.UnicodeScript BUGINESE;
+ enum_constant public static final java.lang.Character.UnicodeScript BUHID;
+ enum_constant public static final java.lang.Character.UnicodeScript CANADIAN_ABORIGINAL;
+ enum_constant public static final java.lang.Character.UnicodeScript CARIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript CHAM;
+ enum_constant public static final java.lang.Character.UnicodeScript CHEROKEE;
+ enum_constant public static final java.lang.Character.UnicodeScript COMMON;
+ enum_constant public static final java.lang.Character.UnicodeScript COPTIC;
+ enum_constant public static final java.lang.Character.UnicodeScript CUNEIFORM;
+ enum_constant public static final java.lang.Character.UnicodeScript CYPRIOT;
+ enum_constant public static final java.lang.Character.UnicodeScript CYRILLIC;
+ enum_constant public static final java.lang.Character.UnicodeScript DESERET;
+ enum_constant public static final java.lang.Character.UnicodeScript DEVANAGARI;
+ enum_constant public static final java.lang.Character.UnicodeScript EGYPTIAN_HIEROGLYPHS;
+ enum_constant public static final java.lang.Character.UnicodeScript ETHIOPIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GEORGIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript GLAGOLITIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GOTHIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GREEK;
+ enum_constant public static final java.lang.Character.UnicodeScript GUJARATI;
+ enum_constant public static final java.lang.Character.UnicodeScript GURMUKHI;
+ enum_constant public static final java.lang.Character.UnicodeScript HAN;
+ enum_constant public static final java.lang.Character.UnicodeScript HANGUL;
+ enum_constant public static final java.lang.Character.UnicodeScript HANUNOO;
+ enum_constant public static final java.lang.Character.UnicodeScript HEBREW;
+ enum_constant public static final java.lang.Character.UnicodeScript HIRAGANA;
+ enum_constant public static final java.lang.Character.UnicodeScript IMPERIAL_ARAMAIC;
+ enum_constant public static final java.lang.Character.UnicodeScript INHERITED;
+ enum_constant public static final java.lang.Character.UnicodeScript INSCRIPTIONAL_PAHLAVI;
+ enum_constant public static final java.lang.Character.UnicodeScript INSCRIPTIONAL_PARTHIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript JAVANESE;
+ enum_constant public static final java.lang.Character.UnicodeScript KAITHI;
+ enum_constant public static final java.lang.Character.UnicodeScript KANNADA;
+ enum_constant public static final java.lang.Character.UnicodeScript KATAKANA;
+ enum_constant public static final java.lang.Character.UnicodeScript KAYAH_LI;
+ enum_constant public static final java.lang.Character.UnicodeScript KHAROSHTHI;
+ enum_constant public static final java.lang.Character.UnicodeScript KHMER;
+ enum_constant public static final java.lang.Character.UnicodeScript LAO;
+ enum_constant public static final java.lang.Character.UnicodeScript LATIN;
+ enum_constant public static final java.lang.Character.UnicodeScript LEPCHA;
+ enum_constant public static final java.lang.Character.UnicodeScript LIMBU;
+ enum_constant public static final java.lang.Character.UnicodeScript LINEAR_B;
+ enum_constant public static final java.lang.Character.UnicodeScript LISU;
+ enum_constant public static final java.lang.Character.UnicodeScript LYCIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript LYDIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript MALAYALAM;
+ enum_constant public static final java.lang.Character.UnicodeScript MANDAIC;
+ enum_constant public static final java.lang.Character.UnicodeScript MEETEI_MAYEK;
+ enum_constant public static final java.lang.Character.UnicodeScript MONGOLIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript MYANMAR;
+ enum_constant public static final java.lang.Character.UnicodeScript NEW_TAI_LUE;
+ enum_constant public static final java.lang.Character.UnicodeScript NKO;
+ enum_constant public static final java.lang.Character.UnicodeScript OGHAM;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_ITALIC;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_PERSIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_SOUTH_ARABIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_TURKIC;
+ enum_constant public static final java.lang.Character.UnicodeScript OL_CHIKI;
+ enum_constant public static final java.lang.Character.UnicodeScript ORIYA;
+ enum_constant public static final java.lang.Character.UnicodeScript OSMANYA;
+ enum_constant public static final java.lang.Character.UnicodeScript PHAGS_PA;
+ enum_constant public static final java.lang.Character.UnicodeScript PHOENICIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript REJANG;
+ enum_constant public static final java.lang.Character.UnicodeScript RUNIC;
+ enum_constant public static final java.lang.Character.UnicodeScript SAMARITAN;
+ enum_constant public static final java.lang.Character.UnicodeScript SAURASHTRA;
+ enum_constant public static final java.lang.Character.UnicodeScript SHAVIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript SINHALA;
+ enum_constant public static final java.lang.Character.UnicodeScript SUNDANESE;
+ enum_constant public static final java.lang.Character.UnicodeScript SYLOTI_NAGRI;
+ enum_constant public static final java.lang.Character.UnicodeScript SYRIAC;
+ enum_constant public static final java.lang.Character.UnicodeScript TAGALOG;
+ enum_constant public static final java.lang.Character.UnicodeScript TAGBANWA;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_LE;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_THAM;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_VIET;
+ enum_constant public static final java.lang.Character.UnicodeScript TAMIL;
+ enum_constant public static final java.lang.Character.UnicodeScript TELUGU;
+ enum_constant public static final java.lang.Character.UnicodeScript THAANA;
+ enum_constant public static final java.lang.Character.UnicodeScript THAI;
+ enum_constant public static final java.lang.Character.UnicodeScript TIBETAN;
+ enum_constant public static final java.lang.Character.UnicodeScript TIFINAGH;
+ enum_constant public static final java.lang.Character.UnicodeScript UGARITIC;
+ enum_constant public static final java.lang.Character.UnicodeScript UNKNOWN;
+ enum_constant public static final java.lang.Character.UnicodeScript VAI;
+ enum_constant public static final java.lang.Character.UnicodeScript YI;
+ }
+
public final class Class implements java.lang.reflect.AnnotatedElement java.lang.reflect.GenericDeclaration java.io.Serializable java.lang.reflect.Type {
method public java.lang.Class<? extends U> asSubclass(java.lang.Class<U>);
method public T cast(java.lang.Object);
@@ -44223,28 +48662,28 @@
method public java.lang.ClassLoader getClassLoader();
method public java.lang.Class<?>[] getClasses();
method public java.lang.Class<?> getComponentType();
- method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Constructor<?>[] getConstructors();
+ method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?>[] getDeclaredClasses();
- method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors();
+ method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
method public java.lang.reflect.Field getDeclaredField(java.lang.String) throws java.lang.NoSuchFieldException;
method public java.lang.reflect.Field[] getDeclaredFields();
- method public java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Method[] getDeclaredMethods();
+ method public java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Method[] getDeclaredMethods() throws java.lang.SecurityException;
method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Class<?> getEnclosingClass();
method public java.lang.reflect.Constructor<?> getEnclosingConstructor();
method public java.lang.reflect.Method getEnclosingMethod();
method public T[] getEnumConstants();
method public java.lang.reflect.Field getField(java.lang.String) throws java.lang.NoSuchFieldException;
- method public java.lang.reflect.Field[] getFields();
+ method public java.lang.reflect.Field[] getFields() throws java.lang.SecurityException;
method public java.lang.reflect.Type[] getGenericInterfaces();
method public java.lang.reflect.Type getGenericSuperclass();
method public java.lang.Class<?>[] getInterfaces();
- method public java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Method[] getMethods();
+ method public java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Method[] getMethods() throws java.lang.SecurityException;
method public int getModifiers();
method public java.lang.String getName();
method public java.lang.Package getPackage();
@@ -44286,8 +48725,8 @@
}
public abstract class ClassLoader {
- ctor protected ClassLoader();
ctor protected ClassLoader(java.lang.ClassLoader);
+ ctor protected ClassLoader();
method public void clearAssertionStatus();
method protected final deprecated java.lang.Class<?> defineClass(byte[], int, int) throws java.lang.ClassFormatError;
method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int) throws java.lang.ClassFormatError;
@@ -44312,6 +48751,7 @@
method public static java.util.Enumeration<java.net.URL> getSystemResources(java.lang.String) throws java.io.IOException;
method public java.lang.Class<?> loadClass(java.lang.String) throws java.lang.ClassNotFoundException;
method protected java.lang.Class<?> loadClass(java.lang.String, boolean) throws java.lang.ClassNotFoundException;
+ method protected static boolean registerAsParallelCapable();
method protected final void resolveClass(java.lang.Class<?>);
method public void setClassAssertionStatus(java.lang.String, boolean);
method public void setDefaultAssertionStatus(boolean);
@@ -44359,10 +48799,10 @@
method public double doubleValue();
method public float floatValue();
method public int intValue();
- method public boolean isInfinite();
method public static boolean isInfinite(double);
- method public boolean isNaN();
+ method public boolean isInfinite();
method public static boolean isNaN(double);
+ method public boolean isNaN();
method public static double longBitsToDouble(long);
method public long longValue();
method public static double parseDouble(java.lang.String) throws java.lang.NumberFormatException;
@@ -44406,6 +48846,7 @@
ctor public Error(java.lang.String);
ctor public Error(java.lang.String, java.lang.Throwable);
ctor public Error(java.lang.Throwable);
+ ctor protected Error(java.lang.String, java.lang.Throwable, boolean, boolean);
}
public class Exception extends java.lang.Throwable {
@@ -44413,12 +48854,13 @@
ctor public Exception(java.lang.String);
ctor public Exception(java.lang.String, java.lang.Throwable);
ctor public Exception(java.lang.Throwable);
+ ctor protected Exception(java.lang.String, java.lang.Throwable, boolean, boolean);
}
public class ExceptionInInitializerError extends java.lang.LinkageError {
ctor public ExceptionInInitializerError();
- ctor public ExceptionInInitializerError(java.lang.String);
ctor public ExceptionInInitializerError(java.lang.Throwable);
+ ctor public ExceptionInInitializerError(java.lang.String);
method public java.lang.Throwable getException();
}
@@ -44434,10 +48876,10 @@
method public float floatValue();
method public static float intBitsToFloat(int);
method public int intValue();
- method public boolean isInfinite();
method public static boolean isInfinite(float);
- method public boolean isNaN();
+ method public boolean isInfinite();
method public static boolean isNaN(float);
+ method public boolean isNaN();
method public long longValue();
method public static float parseFloat(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.String toHexString(float);
@@ -44533,8 +48975,8 @@
method public static int lowestOneBit(int);
method public static int numberOfLeadingZeros(int);
method public static int numberOfTrailingZeros(int);
- method public static int parseInt(java.lang.String) throws java.lang.NumberFormatException;
method public static int parseInt(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static int parseInt(java.lang.String) throws java.lang.NumberFormatException;
method public static int reverse(int);
method public static int reverseBytes(int);
method public static int rotateLeft(int, int);
@@ -44543,10 +48985,10 @@
method public static java.lang.String toBinaryString(int);
method public static java.lang.String toHexString(int);
method public static java.lang.String toOctalString(int);
- method public static java.lang.String toString(int);
method public static java.lang.String toString(int, int);
- method public static java.lang.Integer valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toString(int);
method public static java.lang.Integer valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Integer valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Integer valueOf(int);
field public static final int MAX_VALUE = 2147483647; // 0x7fffffff
field public static final int MIN_VALUE = -2147483648; // 0x80000000
@@ -44592,8 +49034,8 @@
method public static long lowestOneBit(long);
method public static int numberOfLeadingZeros(long);
method public static int numberOfTrailingZeros(long);
- method public static long parseLong(java.lang.String) throws java.lang.NumberFormatException;
method public static long parseLong(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static long parseLong(java.lang.String) throws java.lang.NumberFormatException;
method public static long reverse(long);
method public static long reverseBytes(long);
method public static long rotateLeft(long, int);
@@ -44602,10 +49044,10 @@
method public static java.lang.String toBinaryString(long);
method public static java.lang.String toHexString(long);
method public static java.lang.String toOctalString(long);
- method public static java.lang.String toString(long);
method public static java.lang.String toString(long, int);
- method public static java.lang.Long valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toString(long);
method public static java.lang.Long valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Long valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Long valueOf(long);
field public static final long MAX_VALUE = 9223372036854775807L; // 0x7fffffffffffffffL
field public static final long MIN_VALUE = -9223372036854775808L; // 0x8000000000000000L
@@ -44615,10 +49057,10 @@
public final class Math {
method public static double IEEEremainder(double, double);
- method public static double abs(double);
- method public static float abs(float);
method public static int abs(int);
method public static long abs(long);
+ method public static float abs(float);
+ method public static double abs(double);
method public static double acos(double);
method public static double asin(double);
method public static double atan(double);
@@ -44638,14 +49080,14 @@
method public static double log(double);
method public static double log10(double);
method public static double log1p(double);
- method public static double max(double, double);
- method public static float max(float, float);
method public static int max(int, int);
method public static long max(long, long);
- method public static double min(double, double);
- method public static float min(float, float);
+ method public static float max(float, float);
+ method public static double max(double, double);
method public static int min(int, int);
method public static long min(long, long);
+ method public static float min(float, float);
+ method public static double min(double, double);
method public static double nextAfter(double, double);
method public static float nextAfter(float, double);
method public static double nextUp(double);
@@ -44653,8 +49095,8 @@
method public static double pow(double, double);
method public static double random();
method public static double rint(double);
- method public static long round(double);
method public static int round(float);
+ method public static long round(double);
method public static double scalb(double, int);
method public static float scalb(float, int);
method public static double signum(double);
@@ -44732,9 +49174,9 @@
method public final void notify();
method public final void notifyAll();
method public java.lang.String toString();
- method public final void wait() throws java.lang.InterruptedException;
method public final void wait(long) throws java.lang.InterruptedException;
method public final void wait(long, int) throws java.lang.InterruptedException;
+ method public final void wait() throws java.lang.InterruptedException;
}
public class OutOfMemoryError extends java.lang.VirtualMachineError {
@@ -44775,19 +49217,49 @@
}
public final class ProcessBuilder {
- ctor public ProcessBuilder(java.lang.String...);
ctor public ProcessBuilder(java.util.List<java.lang.String>);
- method public java.util.List<java.lang.String> command();
- method public java.lang.ProcessBuilder command(java.lang.String...);
+ ctor public ProcessBuilder(java.lang.String...);
method public java.lang.ProcessBuilder command(java.util.List<java.lang.String>);
+ method public java.lang.ProcessBuilder command(java.lang.String...);
+ method public java.util.List<java.lang.String> command();
method public java.io.File directory();
method public java.lang.ProcessBuilder directory(java.io.File);
method public java.util.Map<java.lang.String, java.lang.String> environment();
+ method public java.lang.ProcessBuilder inheritIO();
+ method public java.lang.ProcessBuilder redirectError(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectError(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectError();
method public boolean redirectErrorStream();
method public java.lang.ProcessBuilder redirectErrorStream(boolean);
+ method public java.lang.ProcessBuilder redirectInput(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectInput(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectInput();
+ method public java.lang.ProcessBuilder redirectOutput(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectOutput(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectOutput();
method public java.lang.Process start() throws java.io.IOException;
}
+ public static abstract class ProcessBuilder.Redirect {
+ method public static java.lang.ProcessBuilder.Redirect appendTo(java.io.File);
+ method public java.io.File file();
+ method public static java.lang.ProcessBuilder.Redirect from(java.io.File);
+ method public static java.lang.ProcessBuilder.Redirect to(java.io.File);
+ method public abstract java.lang.ProcessBuilder.Redirect.Type type();
+ field public static final java.lang.ProcessBuilder.Redirect INHERIT;
+ field public static final java.lang.ProcessBuilder.Redirect PIPE;
+ }
+
+ public static final class ProcessBuilder.Redirect.Type extends java.lang.Enum {
+ method public static java.lang.ProcessBuilder.Redirect.Type valueOf(java.lang.String);
+ method public static final java.lang.ProcessBuilder.Redirect.Type[] values();
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type APPEND;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type INHERIT;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type PIPE;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type READ;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type WRITE;
+ }
+
public abstract interface Readable {
method public abstract int read(java.nio.CharBuffer) throws java.io.IOException;
}
@@ -44795,8 +49267,8 @@
public class ReflectiveOperationException extends java.lang.Exception {
ctor public ReflectiveOperationException();
ctor public ReflectiveOperationException(java.lang.String);
- ctor public ReflectiveOperationException(java.lang.Throwable);
ctor public ReflectiveOperationException(java.lang.String, java.lang.Throwable);
+ ctor public ReflectiveOperationException(java.lang.Throwable);
}
public abstract interface Runnable {
@@ -44806,12 +49278,12 @@
public class Runtime {
method public void addShutdownHook(java.lang.Thread);
method public int availableProcessors();
- method public java.lang.Process exec(java.lang.String[]) throws java.io.IOException;
- method public java.lang.Process exec(java.lang.String[], java.lang.String[]) throws java.io.IOException;
- method public java.lang.Process exec(java.lang.String[], java.lang.String[], java.io.File) throws java.io.IOException;
method public java.lang.Process exec(java.lang.String) throws java.io.IOException;
method public java.lang.Process exec(java.lang.String, java.lang.String[]) throws java.io.IOException;
method public java.lang.Process exec(java.lang.String, java.lang.String[], java.io.File) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[], java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[], java.lang.String[], java.io.File) throws java.io.IOException;
method public void exit(int);
method public long freeMemory();
method public void gc();
@@ -44835,6 +49307,7 @@
ctor public RuntimeException(java.lang.String);
ctor public RuntimeException(java.lang.String, java.lang.Throwable);
ctor public RuntimeException(java.lang.Throwable);
+ ctor protected RuntimeException(java.lang.String, java.lang.Throwable, boolean, boolean);
}
public final class RuntimePermission extends java.security.BasicPermission {
@@ -44899,8 +49372,8 @@
}
public final class Short extends java.lang.Number implements java.lang.Comparable {
- ctor public Short(java.lang.String) throws java.lang.NumberFormatException;
ctor public Short(short);
+ ctor public Short(java.lang.String) throws java.lang.NumberFormatException;
method public static int compare(short, short);
method public int compareTo(java.lang.Short);
method public static java.lang.Short decode(java.lang.String) throws java.lang.NumberFormatException;
@@ -44908,12 +49381,12 @@
method public float floatValue();
method public int intValue();
method public long longValue();
- method public static short parseShort(java.lang.String) throws java.lang.NumberFormatException;
method public static short parseShort(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static short parseShort(java.lang.String) throws java.lang.NumberFormatException;
method public static short reverseBytes(short);
method public static java.lang.String toString(short);
- method public static java.lang.Short valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Short valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Short valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Short valueOf(short);
field public static final short MAX_VALUE = 32767; // 0x7fff
field public static final short MIN_VALUE = -32768; // 0xffff8000
@@ -44937,10 +49410,10 @@
public final class StrictMath {
method public static double IEEEremainder(double, double);
- method public static double abs(double);
- method public static float abs(float);
method public static int abs(int);
method public static long abs(long);
+ method public static float abs(float);
+ method public static double abs(double);
method public static double acos(double);
method public static double asin(double);
method public static double atan(double);
@@ -44960,14 +49433,14 @@
method public static double log(double);
method public static double log10(double);
method public static double log1p(double);
- method public static double max(double, double);
- method public static float max(float, float);
method public static int max(int, int);
method public static long max(long, long);
- method public static double min(double, double);
- method public static float min(float, float);
+ method public static float max(float, float);
+ method public static double max(double, double);
method public static int min(int, int);
method public static long min(long, long);
+ method public static float min(float, float);
+ method public static double min(double, double);
method public static double nextAfter(double, double);
method public static float nextAfter(float, double);
method public static double nextUp(double);
@@ -44975,8 +49448,8 @@
method public static double pow(double, double);
method public static double random();
method public static double rint(double);
- method public static long round(double);
method public static int round(float);
+ method public static long round(double);
method public static double scalb(double, int);
method public static float scalb(float, int);
method public static double signum(double);
@@ -44996,19 +49469,19 @@
public final class String implements java.lang.CharSequence java.lang.Comparable java.io.Serializable {
ctor public String();
- ctor public String(byte[]);
- ctor public deprecated String(byte[], int);
- ctor public String(byte[], int, int);
- ctor public deprecated String(byte[], int, int, int);
- ctor public String(byte[], int, int, java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public String(byte[], java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public String(byte[], int, int, java.nio.charset.Charset);
- ctor public String(byte[], java.nio.charset.Charset);
+ ctor public String(java.lang.String);
ctor public String(char[]);
ctor public String(char[], int, int);
- ctor public String(java.lang.String);
- ctor public String(java.lang.StringBuffer);
ctor public String(int[], int, int);
+ ctor public deprecated String(byte[], int, int, int);
+ ctor public deprecated String(byte[], int);
+ ctor public String(byte[], int, int, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public String(byte[], int, int, java.nio.charset.Charset);
+ ctor public String(byte[], java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public String(byte[], java.nio.charset.Charset);
+ ctor public String(byte[], int, int);
+ ctor public String(byte[]);
+ ctor public String(java.lang.StringBuffer);
ctor public String(java.lang.StringBuilder);
method public char charAt(int);
method public int codePointAt(int);
@@ -45020,16 +49493,16 @@
method public boolean contains(java.lang.CharSequence);
method public boolean contentEquals(java.lang.StringBuffer);
method public boolean contentEquals(java.lang.CharSequence);
- method public static java.lang.String copyValueOf(char[]);
method public static java.lang.String copyValueOf(char[], int, int);
+ method public static java.lang.String copyValueOf(char[]);
method public boolean endsWith(java.lang.String);
method public boolean equalsIgnoreCase(java.lang.String);
method public static java.lang.String format(java.lang.String, java.lang.Object...);
method public static java.lang.String format(java.util.Locale, java.lang.String, java.lang.Object...);
method public deprecated void getBytes(int, int, byte[], int);
- method public byte[] getBytes();
method public byte[] getBytes(java.lang.String) throws java.io.UnsupportedEncodingException;
method public byte[] getBytes(java.nio.charset.Charset);
+ method public byte[] getBytes();
method public void getChars(int, int, char[], int);
method public int indexOf(int);
method public int indexOf(int, int);
@@ -45050,109 +49523,51 @@
method public java.lang.String replace(java.lang.CharSequence, java.lang.CharSequence);
method public java.lang.String replaceAll(java.lang.String, java.lang.String);
method public java.lang.String replaceFirst(java.lang.String, java.lang.String);
- method public java.lang.String[] split(java.lang.String);
method public java.lang.String[] split(java.lang.String, int);
- method public boolean startsWith(java.lang.String);
+ method public java.lang.String[] split(java.lang.String);
method public boolean startsWith(java.lang.String, int);
+ method public boolean startsWith(java.lang.String);
method public java.lang.CharSequence subSequence(int, int);
method public java.lang.String substring(int);
method public java.lang.String substring(int, int);
method public char[] toCharArray();
- method public java.lang.String toLowerCase();
method public java.lang.String toLowerCase(java.util.Locale);
- method public java.lang.String toUpperCase();
+ method public java.lang.String toLowerCase();
method public java.lang.String toUpperCase(java.util.Locale);
+ method public java.lang.String toUpperCase();
method public java.lang.String trim();
+ method public static java.lang.String valueOf(java.lang.Object);
method public static java.lang.String valueOf(char[]);
method public static java.lang.String valueOf(char[], int, int);
+ method public static java.lang.String valueOf(boolean);
method public static java.lang.String valueOf(char);
- method public static java.lang.String valueOf(double);
- method public static java.lang.String valueOf(float);
method public static java.lang.String valueOf(int);
method public static java.lang.String valueOf(long);
- method public static java.lang.String valueOf(java.lang.Object);
- method public static java.lang.String valueOf(boolean);
+ method public static java.lang.String valueOf(float);
+ method public static java.lang.String valueOf(double);
field public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;
}
- public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
+ public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuffer();
ctor public StringBuffer(int);
ctor public StringBuffer(java.lang.String);
ctor public StringBuffer(java.lang.CharSequence);
- method public java.lang.StringBuffer append(boolean);
- method public synchronized java.lang.StringBuffer append(char);
- method public java.lang.StringBuffer append(double);
- method public java.lang.StringBuffer append(float);
- method public java.lang.StringBuffer append(int);
- method public java.lang.StringBuffer append(long);
- method public synchronized java.lang.StringBuffer append(java.lang.Object);
- method public synchronized java.lang.StringBuffer append(java.lang.String);
- method public synchronized java.lang.StringBuffer append(java.lang.StringBuffer);
- method public synchronized java.lang.StringBuffer append(char[]);
- method public synchronized java.lang.StringBuffer append(char[], int, int);
- method public synchronized java.lang.StringBuffer append(java.lang.CharSequence);
- method public synchronized java.lang.StringBuffer append(java.lang.CharSequence, int, int);
- method public java.lang.StringBuffer appendCodePoint(int);
- method public synchronized java.lang.StringBuffer delete(int, int);
- method public synchronized java.lang.StringBuffer deleteCharAt(int);
- method public synchronized java.lang.StringBuffer insert(int, char);
- method public java.lang.StringBuffer insert(int, boolean);
- method public java.lang.StringBuffer insert(int, int);
- method public java.lang.StringBuffer insert(int, long);
- method public java.lang.StringBuffer insert(int, double);
- method public java.lang.StringBuffer insert(int, float);
- method public java.lang.StringBuffer insert(int, java.lang.Object);
- method public synchronized java.lang.StringBuffer insert(int, java.lang.String);
- method public synchronized java.lang.StringBuffer insert(int, char[]);
- method public synchronized java.lang.StringBuffer insert(int, char[], int, int);
- method public synchronized java.lang.StringBuffer insert(int, java.lang.CharSequence);
- method public synchronized java.lang.StringBuffer insert(int, java.lang.CharSequence, int, int);
- method public synchronized java.lang.StringBuffer replace(int, int, java.lang.String);
- method public synchronized java.lang.StringBuffer reverse();
+ method public synchronized java.lang.String toString();
}
- public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
+ public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuilder();
ctor public StringBuilder(int);
- ctor public StringBuilder(java.lang.CharSequence);
ctor public StringBuilder(java.lang.String);
- method public java.lang.StringBuilder append(boolean);
- method public java.lang.StringBuilder append(char);
- method public java.lang.StringBuilder append(int);
- method public java.lang.StringBuilder append(long);
- method public java.lang.StringBuilder append(float);
- method public java.lang.StringBuilder append(double);
- method public java.lang.StringBuilder append(java.lang.Object);
- method public java.lang.StringBuilder append(java.lang.String);
- method public java.lang.StringBuilder append(java.lang.StringBuffer);
- method public java.lang.StringBuilder append(char[]);
- method public java.lang.StringBuilder append(char[], int, int);
- method public java.lang.StringBuilder append(java.lang.CharSequence);
- method public java.lang.StringBuilder append(java.lang.CharSequence, int, int);
- method public java.lang.StringBuilder appendCodePoint(int);
- method public java.lang.StringBuilder delete(int, int);
- method public java.lang.StringBuilder deleteCharAt(int);
- method public java.lang.StringBuilder insert(int, boolean);
- method public java.lang.StringBuilder insert(int, char);
- method public java.lang.StringBuilder insert(int, int);
- method public java.lang.StringBuilder insert(int, long);
- method public java.lang.StringBuilder insert(int, float);
- method public java.lang.StringBuilder insert(int, double);
- method public java.lang.StringBuilder insert(int, java.lang.Object);
- method public java.lang.StringBuilder insert(int, java.lang.String);
- method public java.lang.StringBuilder insert(int, char[]);
- method public java.lang.StringBuilder insert(int, char[], int, int);
- method public java.lang.StringBuilder insert(int, java.lang.CharSequence);
- method public java.lang.StringBuilder insert(int, java.lang.CharSequence, int, int);
- method public java.lang.StringBuilder replace(int, int, java.lang.String);
- method public java.lang.StringBuilder reverse();
+ ctor public StringBuilder(java.lang.CharSequence);
+ method public java.lang.String toString();
}
public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
ctor public StringIndexOutOfBoundsException();
- ctor public StringIndexOutOfBoundsException(int);
ctor public StringIndexOutOfBoundsException(java.lang.String);
+ ctor public StringIndexOutOfBoundsException(int);
}
public abstract class SuppressWarnings implements java.lang.annotation.Annotation {
@@ -45194,11 +49609,11 @@
public class Thread implements java.lang.Runnable {
ctor public Thread();
ctor public Thread(java.lang.Runnable);
- ctor public Thread(java.lang.Runnable, java.lang.String);
- ctor public Thread(java.lang.String);
ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable);
- ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String);
+ ctor public Thread(java.lang.String);
ctor public Thread(java.lang.ThreadGroup, java.lang.String);
+ ctor public Thread(java.lang.Runnable, java.lang.String);
+ ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String);
ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String, long);
method public static int activeCount();
method public final void checkAccess();
@@ -45223,9 +49638,9 @@
method public final boolean isAlive();
method public final boolean isDaemon();
method public boolean isInterrupted();
- method public final void join() throws java.lang.InterruptedException;
method public final void join(long) throws java.lang.InterruptedException;
method public final void join(long, int) throws java.lang.InterruptedException;
+ method public final void join() throws java.lang.InterruptedException;
method public final deprecated void resume();
method public void run();
method public void setContextClassLoader(java.lang.ClassLoader);
@@ -45238,7 +49653,7 @@
method public static void sleep(long, int) throws java.lang.InterruptedException;
method public synchronized void start();
method public final deprecated void stop();
- method public final deprecated synchronized void stop(java.lang.Throwable);
+ method public final deprecated void stop(java.lang.Throwable);
method public final deprecated void suspend();
method public static void yield();
field public static final int MAX_PRIORITY = 10; // 0xa
@@ -45307,14 +49722,14 @@
ctor public Throwable(java.lang.String, java.lang.Throwable);
ctor public Throwable(java.lang.Throwable);
ctor protected Throwable(java.lang.String, java.lang.Throwable, boolean, boolean);
- method public final void addSuppressed(java.lang.Throwable);
- method public java.lang.Throwable fillInStackTrace();
- method public java.lang.Throwable getCause();
+ method public final synchronized void addSuppressed(java.lang.Throwable);
+ method public synchronized java.lang.Throwable fillInStackTrace();
+ method public synchronized java.lang.Throwable getCause();
method public java.lang.String getLocalizedMessage();
method public java.lang.String getMessage();
method public java.lang.StackTraceElement[] getStackTrace();
- method public final java.lang.Throwable[] getSuppressed();
- method public java.lang.Throwable initCause(java.lang.Throwable);
+ method public final synchronized java.lang.Throwable[] getSuppressed();
+ method public synchronized java.lang.Throwable initCause(java.lang.Throwable);
method public void printStackTrace();
method public void printStackTrace(java.io.PrintStream);
method public void printStackTrace(java.io.PrintWriter);
@@ -45435,15 +49850,16 @@
public abstract class Reference {
method public void clear();
method public boolean enqueue();
+ method public final synchronized boolean enqueueInternal();
method public T get();
method public boolean isEnqueued();
}
public class ReferenceQueue {
ctor public ReferenceQueue();
- method public synchronized java.lang.ref.Reference<? extends T> poll();
+ method public java.lang.ref.Reference<? extends T> poll();
+ method public java.lang.ref.Reference<? extends T> remove(long) throws java.lang.IllegalArgumentException, java.lang.InterruptedException;
method public java.lang.ref.Reference<? extends T> remove() throws java.lang.InterruptedException;
- method public synchronized java.lang.ref.Reference<? extends T> remove(long) throws java.lang.InterruptedException;
}
public class SoftReference extends java.lang.ref.Reference {
@@ -45467,8 +49883,8 @@
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public boolean isAccessible();
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
- method public void setAccessible(boolean);
- method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean);
+ method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException;
+ method public void setAccessible(boolean) throws java.lang.SecurityException;
}
public abstract interface AnnotatedElement {
@@ -45489,8 +49905,9 @@
method public static int getLength(java.lang.Object);
method public static long getLong(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
method public static short getShort(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
- method public static java.lang.Object newInstance(java.lang.Class<?>, int...) throws java.lang.IllegalArgumentException, java.lang.NegativeArraySizeException;
+ method public static java.lang.Object newArray(java.lang.Class<?>, int) throws java.lang.NegativeArraySizeException;
method public static java.lang.Object newInstance(java.lang.Class<?>, int) throws java.lang.NegativeArraySizeException;
+ method public static java.lang.Object newInstance(java.lang.Class<?>, int...) throws java.lang.IllegalArgumentException, java.lang.NegativeArraySizeException;
method public static void set(java.lang.Object, int, java.lang.Object) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
method public static void setBoolean(java.lang.Object, int, boolean);
method public static void setByte(java.lang.Object, int, byte) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
@@ -45505,7 +49922,6 @@
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
method public boolean equals(java.lang.Object);
method public A getAnnotation(java.lang.Class<A>);
- method public java.lang.annotation.Annotation[] getAnnotations();
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<T> getDeclaringClass();
method public java.lang.Class<?>[] getExceptionTypes();
@@ -45592,7 +50008,6 @@
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
method public boolean equals(java.lang.Object);
method public A getAnnotation(java.lang.Class<A>);
- method public java.lang.annotation.Annotation[] getAnnotations();
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Object getDefaultValue();
@@ -45873,10 +50288,10 @@
method protected final java.net.InetAddress getRequestingSite();
method protected java.net.URL getRequestingURL();
method protected java.net.Authenticator.RequestorType getRequestorType();
- method public static synchronized java.net.PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
- method public static synchronized java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String, java.net.URL, java.net.Authenticator.RequestorType);
- method public static void setDefault(java.net.Authenticator);
+ method public static synchronized void setDefault(java.net.Authenticator);
}
public static final class Authenticator.RequestorType extends java.lang.Enum {
@@ -45887,8 +50302,9 @@
}
public class BindException extends java.net.SocketException {
- ctor public BindException();
ctor public BindException(java.lang.String);
+ ctor public BindException();
+ ctor public BindException(java.lang.String, java.lang.Throwable);
}
public abstract class CacheRequest {
@@ -45904,8 +50320,9 @@
}
public class ConnectException extends java.net.SocketException {
- ctor public ConnectException();
ctor public ConnectException(java.lang.String);
+ ctor public ConnectException();
+ ctor public ConnectException(java.lang.String, java.lang.Throwable);
}
public abstract class ContentHandler {
@@ -45921,9 +50338,9 @@
public abstract class CookieHandler {
ctor public CookieHandler();
method public abstract java.util.Map<java.lang.String, java.util.List<java.lang.String>> get(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public static java.net.CookieHandler getDefault();
+ method public static synchronized java.net.CookieHandler getDefault();
method public abstract void put(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public static void setDefault(java.net.CookieHandler);
+ method public static synchronized void setDefault(java.net.CookieHandler);
}
public class CookieManager extends java.net.CookieHandler {
@@ -45952,12 +50369,12 @@
}
public final class DatagramPacket {
- ctor public DatagramPacket(byte[], int);
ctor public DatagramPacket(byte[], int, int);
+ ctor public DatagramPacket(byte[], int);
ctor public DatagramPacket(byte[], int, int, java.net.InetAddress, int);
+ ctor public DatagramPacket(byte[], int, int, java.net.SocketAddress) throws java.net.SocketException;
ctor public DatagramPacket(byte[], int, java.net.InetAddress, int);
ctor public DatagramPacket(byte[], int, java.net.SocketAddress) throws java.net.SocketException;
- ctor public DatagramPacket(byte[], int, int, java.net.SocketAddress) throws java.net.SocketException;
method public synchronized java.net.InetAddress getAddress();
method public synchronized byte[] getData();
method public synchronized int getLength();
@@ -45974,17 +50391,18 @@
public class DatagramSocket implements java.io.Closeable {
ctor public DatagramSocket() throws java.net.SocketException;
- ctor public DatagramSocket(int) throws java.net.SocketException;
- ctor public DatagramSocket(int, java.net.InetAddress) throws java.net.SocketException;
ctor protected DatagramSocket(java.net.DatagramSocketImpl);
ctor public DatagramSocket(java.net.SocketAddress) throws java.net.SocketException;
- method public void bind(java.net.SocketAddress) throws java.net.SocketException;
+ ctor public DatagramSocket(int) throws java.net.SocketException;
+ ctor public DatagramSocket(int, java.net.InetAddress) throws java.net.SocketException;
+ method public synchronized void bind(java.net.SocketAddress) throws java.net.SocketException;
method public void close();
- method public void connect(java.net.SocketAddress) throws java.net.SocketException;
method public void connect(java.net.InetAddress, int);
+ method public void connect(java.net.SocketAddress) throws java.net.SocketException;
method public void disconnect();
- method public boolean getBroadcast() throws java.net.SocketException;
+ method public synchronized boolean getBroadcast() throws java.net.SocketException;
method public java.nio.channels.DatagramChannel getChannel();
+ method public final java.io.FileDescriptor getFileDescriptor$();
method public java.net.InetAddress getInetAddress();
method public java.net.InetAddress getLocalAddress();
method public int getLocalPort();
@@ -45992,22 +50410,22 @@
method public int getPort();
method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
method public java.net.SocketAddress getRemoteSocketAddress();
- method public boolean getReuseAddress() throws java.net.SocketException;
+ method public synchronized boolean getReuseAddress() throws java.net.SocketException;
method public synchronized int getSendBufferSize() throws java.net.SocketException;
method public synchronized int getSoTimeout() throws java.net.SocketException;
- method public int getTrafficClass() throws java.net.SocketException;
+ method public synchronized int getTrafficClass() throws java.net.SocketException;
method public boolean isBound();
method public boolean isClosed();
method public boolean isConnected();
method public synchronized void receive(java.net.DatagramPacket) throws java.io.IOException;
method public void send(java.net.DatagramPacket) throws java.io.IOException;
- method public void setBroadcast(boolean) throws java.net.SocketException;
+ method public synchronized void setBroadcast(boolean) throws java.net.SocketException;
method public static synchronized void setDatagramSocketImplFactory(java.net.DatagramSocketImplFactory) throws java.io.IOException;
method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
- method public void setReuseAddress(boolean) throws java.net.SocketException;
+ method public synchronized void setReuseAddress(boolean) throws java.net.SocketException;
method public synchronized void setSendBufferSize(int) throws java.net.SocketException;
method public synchronized void setSoTimeout(int) throws java.net.SocketException;
- method public void setTrafficClass(int) throws java.net.SocketException;
+ method public synchronized void setTrafficClass(int) throws java.net.SocketException;
}
public abstract class DatagramSocketImpl implements java.net.SocketOptions {
@@ -46059,11 +50477,14 @@
method public java.lang.String getValue();
method public int getVersion();
method public boolean hasExpired();
+ method public boolean isHttpOnly();
method public static java.util.List<java.net.HttpCookie> parse(java.lang.String);
+ method public static java.util.List<java.net.HttpCookie> parse(java.lang.String, boolean);
method public void setComment(java.lang.String);
method public void setCommentURL(java.lang.String);
method public void setDiscard(boolean);
method public void setDomain(java.lang.String);
+ method public void setHttpOnly(boolean);
method public void setMaxAge(long);
method public void setPath(java.lang.String);
method public void setPortlist(java.lang.String);
@@ -46090,8 +50511,8 @@
method public int getResponseCode() throws java.io.IOException;
method public java.lang.String getResponseMessage() throws java.io.IOException;
method public void setChunkedStreamingMode(int);
- method public void setFixedLengthStreamingMode(long);
method public void setFixedLengthStreamingMode(int);
+ method public void setFixedLengthStreamingMode(long);
method public static void setFollowRedirects(boolean);
method public void setInstanceFollowRedirects(boolean);
method public void setRequestMethod(java.lang.String) throws java.net.ProtocolException;
@@ -46151,21 +50572,27 @@
}
public final class Inet4Address extends java.net.InetAddress {
+ field public static final java.net.InetAddress ALL;
+ field public static final java.net.InetAddress ANY;
+ field public static final java.net.InetAddress LOOPBACK;
}
public final class Inet6Address extends java.net.InetAddress {
- method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], int) throws java.net.UnknownHostException;
method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], java.net.NetworkInterface) throws java.net.UnknownHostException;
+ method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], int) throws java.net.UnknownHostException;
method public int getScopeId();
method public java.net.NetworkInterface getScopedInterface();
method public boolean isIPv4CompatibleAddress();
+ field public static final java.net.InetAddress ANY;
+ field public static final java.net.InetAddress LOOPBACK;
}
public class InetAddress implements java.io.Serializable {
method public byte[] getAddress();
+ method public byte[] getAddressInternal();
method public static java.net.InetAddress[] getAllByName(java.lang.String) throws java.net.UnknownHostException;
- method public static java.net.InetAddress getByAddress(byte[]) throws java.net.UnknownHostException;
method public static java.net.InetAddress getByAddress(java.lang.String, byte[]) throws java.net.UnknownHostException;
+ method public static java.net.InetAddress getByAddress(byte[]) throws java.net.UnknownHostException;
method public static java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException;
method public java.lang.String getCanonicalHostName();
method public java.lang.String getHostAddress();
@@ -46272,8 +50699,8 @@
}
public class NoRouteToHostException extends java.net.SocketException {
- ctor public NoRouteToHostException();
ctor public NoRouteToHostException(java.lang.String);
+ ctor public NoRouteToHostException();
}
public final class PasswordAuthentication {
@@ -46283,13 +50710,19 @@
}
public class PortUnreachableException extends java.net.SocketException {
- ctor public PortUnreachableException();
ctor public PortUnreachableException(java.lang.String);
+ ctor public PortUnreachableException();
+ ctor public PortUnreachableException(java.lang.String, java.lang.Throwable);
}
public class ProtocolException extends java.io.IOException {
- ctor public ProtocolException();
ctor public ProtocolException(java.lang.String);
+ ctor public ProtocolException();
+ ctor public ProtocolException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract interface ProtocolFamily {
+ method public abstract java.lang.String name();
}
public class Proxy {
@@ -46320,9 +50753,9 @@
public abstract class ResponseCache {
ctor public ResponseCache();
method public abstract java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public static java.net.ResponseCache getDefault();
+ method public static synchronized java.net.ResponseCache getDefault();
method public abstract java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
- method public static void setDefault(java.net.ResponseCache);
+ method public static synchronized void setDefault(java.net.ResponseCache);
}
public abstract class SecureCacheResponse extends java.net.CacheResponse {
@@ -46347,14 +50780,14 @@
method public java.net.InetAddress getInetAddress();
method public int getLocalPort();
method public java.net.SocketAddress getLocalSocketAddress();
- method public int getReceiveBufferSize() throws java.net.SocketException;
+ method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
method public boolean getReuseAddress() throws java.net.SocketException;
method public synchronized int getSoTimeout() throws java.io.IOException;
method protected final void implAccept(java.net.Socket) throws java.io.IOException;
method public boolean isBound();
method public boolean isClosed();
method public void setPerformancePreferences(int, int, int);
- method public void setReceiveBufferSize(int) throws java.net.SocketException;
+ method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
method public void setReuseAddress(boolean) throws java.net.SocketException;
method public synchronized void setSoTimeout(int) throws java.net.SocketException;
method public static synchronized void setSocketFactory(java.net.SocketImplFactory) throws java.io.IOException;
@@ -46363,13 +50796,13 @@
public class Socket implements java.io.Closeable {
ctor public Socket();
ctor public Socket(java.net.Proxy);
- ctor public Socket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
- ctor public Socket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException;
- ctor public deprecated Socket(java.lang.String, int, boolean) throws java.io.IOException;
- ctor public Socket(java.net.InetAddress, int) throws java.io.IOException;
- ctor public Socket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
- ctor public deprecated Socket(java.net.InetAddress, int, boolean) throws java.io.IOException;
ctor protected Socket(java.net.SocketImpl) throws java.net.SocketException;
+ ctor public Socket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
+ ctor public Socket(java.net.InetAddress, int) throws java.io.IOException;
+ ctor public Socket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException;
+ ctor public Socket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
+ ctor public deprecated Socket(java.lang.String, int, boolean) throws java.io.IOException;
+ ctor public deprecated Socket(java.net.InetAddress, int, boolean) throws java.io.IOException;
method public void bind(java.net.SocketAddress) throws java.io.IOException;
method public synchronized void close() throws java.io.IOException;
method public void connect(java.net.SocketAddress) throws java.io.IOException;
@@ -46418,8 +50851,10 @@
}
public class SocketException extends java.io.IOException {
- ctor public SocketException();
ctor public SocketException(java.lang.String);
+ ctor public SocketException();
+ ctor public SocketException(java.lang.Throwable);
+ ctor public SocketException(java.lang.String, java.lang.Throwable);
}
public abstract class SocketImpl implements java.net.SocketOptions {
@@ -46432,7 +50867,7 @@
method protected abstract void connect(java.net.InetAddress, int) throws java.io.IOException;
method protected abstract void connect(java.net.SocketAddress, int) throws java.io.IOException;
method protected abstract void create(boolean) throws java.io.IOException;
- method protected java.io.FileDescriptor getFileDescriptor();
+ method public java.io.FileDescriptor getFileDescriptor();
method protected java.net.InetAddress getInetAddress();
method protected abstract java.io.InputStream getInputStream() throws java.io.IOException;
method protected int getLocalPort();
@@ -46454,6 +50889,11 @@
method public abstract java.net.SocketImpl createSocketImpl();
}
+ public abstract interface SocketOption {
+ method public abstract java.lang.String name();
+ method public abstract java.lang.Class<T> type();
+ }
+
public abstract interface SocketOptions {
method public abstract java.lang.Object getOption(int) throws java.net.SocketException;
method public abstract void setOption(int, java.lang.Object) throws java.net.SocketException;
@@ -46475,21 +50915,46 @@
public final class SocketPermission extends java.security.Permission implements java.io.Serializable {
ctor public SocketPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
public class SocketTimeoutException extends java.io.InterruptedIOException {
- ctor public SocketTimeoutException();
ctor public SocketTimeoutException(java.lang.String);
+ ctor public SocketTimeoutException();
+ ctor public SocketTimeoutException(java.lang.Throwable);
+ ctor public SocketTimeoutException(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class StandardProtocolFamily extends java.lang.Enum implements java.net.ProtocolFamily {
+ method public static java.net.StandardProtocolFamily valueOf(java.lang.String);
+ method public static final java.net.StandardProtocolFamily[] values();
+ enum_constant public static final java.net.StandardProtocolFamily INET;
+ enum_constant public static final java.net.StandardProtocolFamily INET6;
+ }
+
+ public final class StandardSocketOptions {
+ field public static final java.net.SocketOption<java.net.NetworkInterface> IP_MULTICAST_IF;
+ field public static final java.net.SocketOption<java.lang.Boolean> IP_MULTICAST_LOOP;
+ field public static final java.net.SocketOption<java.lang.Integer> IP_MULTICAST_TTL;
+ field public static final java.net.SocketOption<java.lang.Integer> IP_TOS;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_BROADCAST;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_KEEPALIVE;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_LINGER;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_RCVBUF;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_REUSEADDR;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_SNDBUF;
+ field public static final java.net.SocketOption<java.lang.Boolean> TCP_NODELAY;
}
public final class URI implements java.lang.Comparable java.io.Serializable {
ctor public URI(java.lang.String) throws java.net.URISyntaxException;
- ctor public URI(java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
ctor public URI(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
- ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
method public int compareTo(java.net.URI);
method public static java.net.URI create(java.lang.String);
method public java.lang.String getAuthority();
@@ -46527,12 +50992,12 @@
}
public final class URL implements java.io.Serializable {
+ ctor public URL(java.lang.String, java.lang.String, int, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String, java.lang.String, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
ctor public URL(java.lang.String) throws java.net.MalformedURLException;
ctor public URL(java.net.URL, java.lang.String) throws java.net.MalformedURLException;
ctor public URL(java.net.URL, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
- ctor public URL(java.lang.String, java.lang.String, java.lang.String) throws java.net.MalformedURLException;
- ctor public URL(java.lang.String, java.lang.String, int, java.lang.String) throws java.net.MalformedURLException;
- ctor public URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
method public java.lang.String getAuthority();
method public final java.lang.Object getContent() throws java.io.IOException;
method public final java.lang.Object getContent(java.lang.Class[]) throws java.io.IOException;
@@ -46551,22 +51016,24 @@
method public boolean sameFile(java.net.URL);
method protected void set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
method protected void set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
- method public static synchronized void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory);
+ method public static void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory);
method public java.lang.String toExternalForm();
method public java.net.URI toURI() throws java.net.URISyntaxException;
+ method public java.net.URI toURILenient() throws java.net.URISyntaxException;
}
- public class URLClassLoader extends java.security.SecureClassLoader {
- ctor public URLClassLoader(java.net.URL[]);
+ public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable {
ctor public URLClassLoader(java.net.URL[], java.lang.ClassLoader);
+ ctor public URLClassLoader(java.net.URL[]);
ctor public URLClassLoader(java.net.URL[], java.lang.ClassLoader, java.net.URLStreamHandlerFactory);
method protected void addURL(java.net.URL);
+ method public void close() throws java.io.IOException;
method protected java.lang.Package definePackage(java.lang.String, java.util.jar.Manifest, java.net.URL) throws java.lang.IllegalArgumentException;
method public java.net.URL findResource(java.lang.String);
method public java.util.Enumeration<java.net.URL> findResources(java.lang.String) throws java.io.IOException;
method public java.net.URL[] getURLs();
- method public static java.net.URLClassLoader newInstance(java.net.URL[]);
method public static java.net.URLClassLoader newInstance(java.net.URL[], java.lang.ClassLoader);
+ method public static java.net.URLClassLoader newInstance(java.net.URL[]);
}
public abstract class URLConnection {
@@ -46579,6 +51046,7 @@
method public java.lang.Object getContent(java.lang.Class[]) throws java.io.IOException;
method public java.lang.String getContentEncoding();
method public int getContentLength();
+ method public long getContentLengthLong();
method public java.lang.String getContentType();
method public long getDate();
method public static boolean getDefaultAllowUserInteraction();
@@ -46587,12 +51055,13 @@
method public boolean getDoInput();
method public boolean getDoOutput();
method public long getExpiration();
- method public static java.net.FileNameMap getFileNameMap();
- method public java.lang.String getHeaderField(int);
+ method public static synchronized java.net.FileNameMap getFileNameMap();
method public java.lang.String getHeaderField(java.lang.String);
+ method public java.lang.String getHeaderField(int);
method public long getHeaderFieldDate(java.lang.String, long);
method public int getHeaderFieldInt(java.lang.String, int);
method public java.lang.String getHeaderFieldKey(int);
+ method public long getHeaderFieldLong(java.lang.String, long);
method public java.util.Map<java.lang.String, java.util.List<java.lang.String>> getHeaderFields();
method public long getIfModifiedSince();
method public java.io.InputStream getInputStream() throws java.io.IOException;
@@ -46643,15 +51112,15 @@
ctor public URLStreamHandler();
method protected boolean equals(java.net.URL, java.net.URL);
method protected int getDefaultPort();
- method protected java.net.InetAddress getHostAddress(java.net.URL);
+ method protected synchronized java.net.InetAddress getHostAddress(java.net.URL);
method protected int hashCode(java.net.URL);
method protected boolean hostsEqual(java.net.URL, java.net.URL);
method protected abstract java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException;
method protected java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException;
method protected void parseURL(java.net.URL, java.lang.String, int, int);
method protected boolean sameFile(java.net.URL, java.net.URL);
- method protected deprecated void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
method protected void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method protected deprecated void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
method protected java.lang.String toExternalForm(java.net.URL);
}
@@ -46660,8 +51129,8 @@
}
public class UnknownHostException extends java.io.IOException {
- ctor public UnknownHostException();
ctor public UnknownHostException(java.lang.String);
+ ctor public UnknownHostException();
}
public class UnknownServiceException extends java.io.IOException {
@@ -46717,9 +51186,9 @@
method public int compareTo(java.nio.ByteBuffer);
method public abstract java.nio.ByteBuffer duplicate();
method public abstract byte get();
- method public java.nio.ByteBuffer get(byte[]);
- method public java.nio.ByteBuffer get(byte[], int, int);
method public abstract byte get(int);
+ method public java.nio.ByteBuffer get(byte[], int, int);
+ method public java.nio.ByteBuffer get(byte[]);
method public abstract char getChar();
method public abstract char getChar(int);
method public abstract double getDouble();
@@ -46737,10 +51206,10 @@
method public final java.nio.ByteOrder order();
method public final java.nio.ByteBuffer order(java.nio.ByteOrder);
method public abstract java.nio.ByteBuffer put(byte);
- method public final java.nio.ByteBuffer put(byte[]);
- method public java.nio.ByteBuffer put(byte[], int, int);
- method public java.nio.ByteBuffer put(java.nio.ByteBuffer);
method public abstract java.nio.ByteBuffer put(int, byte);
+ method public java.nio.ByteBuffer put(java.nio.ByteBuffer);
+ method public java.nio.ByteBuffer put(byte[], int, int);
+ method public final java.nio.ByteBuffer put(byte[]);
method public abstract java.nio.ByteBuffer putChar(char);
method public abstract java.nio.ByteBuffer putChar(int, char);
method public abstract java.nio.ByteBuffer putDouble(double);
@@ -46754,8 +51223,8 @@
method public abstract java.nio.ByteBuffer putShort(short);
method public abstract java.nio.ByteBuffer putShort(int, short);
method public abstract java.nio.ByteBuffer slice();
- method public static java.nio.ByteBuffer wrap(byte[]);
method public static java.nio.ByteBuffer wrap(byte[], int, int);
+ method public static java.nio.ByteBuffer wrap(byte[]);
}
public final class ByteOrder {
@@ -46766,9 +51235,9 @@
public abstract class CharBuffer extends java.nio.Buffer implements java.lang.Appendable java.lang.CharSequence java.lang.Comparable java.lang.Readable {
method public static java.nio.CharBuffer allocate(int);
- method public java.nio.CharBuffer append(char);
method public java.nio.CharBuffer append(java.lang.CharSequence);
method public java.nio.CharBuffer append(java.lang.CharSequence, int, int);
+ method public java.nio.CharBuffer append(char);
method public final char[] array();
method public final int arrayOffset();
method public abstract java.nio.CharBuffer asReadOnlyBuffer();
@@ -46777,27 +51246,27 @@
method public int compareTo(java.nio.CharBuffer);
method public abstract java.nio.CharBuffer duplicate();
method public abstract char get();
- method public java.nio.CharBuffer get(char[]);
- method public java.nio.CharBuffer get(char[], int, int);
method public abstract char get(int);
+ method public java.nio.CharBuffer get(char[], int, int);
+ method public java.nio.CharBuffer get(char[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public final int length();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.CharBuffer put(char);
- method public final java.nio.CharBuffer put(char[]);
- method public java.nio.CharBuffer put(char[], int, int);
- method public java.nio.CharBuffer put(java.nio.CharBuffer);
method public abstract java.nio.CharBuffer put(int, char);
- method public final java.nio.CharBuffer put(java.lang.String);
+ method public java.nio.CharBuffer put(java.nio.CharBuffer);
+ method public java.nio.CharBuffer put(char[], int, int);
+ method public final java.nio.CharBuffer put(char[]);
method public java.nio.CharBuffer put(java.lang.String, int, int);
+ method public final java.nio.CharBuffer put(java.lang.String);
method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public abstract java.nio.CharBuffer slice();
method public abstract java.nio.CharBuffer subSequence(int, int);
- method public static java.nio.CharBuffer wrap(char[]);
method public static java.nio.CharBuffer wrap(char[], int, int);
- method public static java.nio.CharBuffer wrap(java.lang.CharSequence);
+ method public static java.nio.CharBuffer wrap(char[]);
method public static java.nio.CharBuffer wrap(java.lang.CharSequence, int, int);
+ method public static java.nio.CharBuffer wrap(java.lang.CharSequence);
}
public abstract class DoubleBuffer extends java.nio.Buffer implements java.lang.Comparable {
@@ -46809,20 +51278,20 @@
method public int compareTo(java.nio.DoubleBuffer);
method public abstract java.nio.DoubleBuffer duplicate();
method public abstract double get();
- method public java.nio.DoubleBuffer get(double[]);
- method public java.nio.DoubleBuffer get(double[], int, int);
method public abstract double get(int);
+ method public java.nio.DoubleBuffer get(double[], int, int);
+ method public java.nio.DoubleBuffer get(double[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.DoubleBuffer put(double);
- method public final java.nio.DoubleBuffer put(double[]);
- method public java.nio.DoubleBuffer put(double[], int, int);
- method public java.nio.DoubleBuffer put(java.nio.DoubleBuffer);
method public abstract java.nio.DoubleBuffer put(int, double);
+ method public java.nio.DoubleBuffer put(java.nio.DoubleBuffer);
+ method public java.nio.DoubleBuffer put(double[], int, int);
+ method public final java.nio.DoubleBuffer put(double[]);
method public abstract java.nio.DoubleBuffer slice();
- method public static java.nio.DoubleBuffer wrap(double[]);
method public static java.nio.DoubleBuffer wrap(double[], int, int);
+ method public static java.nio.DoubleBuffer wrap(double[]);
}
public abstract class FloatBuffer extends java.nio.Buffer implements java.lang.Comparable {
@@ -46834,20 +51303,20 @@
method public int compareTo(java.nio.FloatBuffer);
method public abstract java.nio.FloatBuffer duplicate();
method public abstract float get();
- method public java.nio.FloatBuffer get(float[]);
- method public java.nio.FloatBuffer get(float[], int, int);
method public abstract float get(int);
+ method public java.nio.FloatBuffer get(float[], int, int);
+ method public java.nio.FloatBuffer get(float[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.FloatBuffer put(float);
- method public final java.nio.FloatBuffer put(float[]);
- method public java.nio.FloatBuffer put(float[], int, int);
- method public java.nio.FloatBuffer put(java.nio.FloatBuffer);
method public abstract java.nio.FloatBuffer put(int, float);
+ method public java.nio.FloatBuffer put(java.nio.FloatBuffer);
+ method public java.nio.FloatBuffer put(float[], int, int);
+ method public final java.nio.FloatBuffer put(float[]);
method public abstract java.nio.FloatBuffer slice();
- method public static java.nio.FloatBuffer wrap(float[]);
method public static java.nio.FloatBuffer wrap(float[], int, int);
+ method public static java.nio.FloatBuffer wrap(float[]);
}
public abstract class IntBuffer extends java.nio.Buffer implements java.lang.Comparable {
@@ -46859,20 +51328,20 @@
method public int compareTo(java.nio.IntBuffer);
method public abstract java.nio.IntBuffer duplicate();
method public abstract int get();
- method public java.nio.IntBuffer get(int[]);
- method public java.nio.IntBuffer get(int[], int, int);
method public abstract int get(int);
+ method public java.nio.IntBuffer get(int[], int, int);
+ method public java.nio.IntBuffer get(int[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.IntBuffer put(int);
- method public final java.nio.IntBuffer put(int[]);
- method public java.nio.IntBuffer put(int[], int, int);
- method public java.nio.IntBuffer put(java.nio.IntBuffer);
method public abstract java.nio.IntBuffer put(int, int);
+ method public java.nio.IntBuffer put(java.nio.IntBuffer);
+ method public java.nio.IntBuffer put(int[], int, int);
+ method public final java.nio.IntBuffer put(int[]);
method public abstract java.nio.IntBuffer slice();
- method public static java.nio.IntBuffer wrap(int[]);
method public static java.nio.IntBuffer wrap(int[], int, int);
+ method public static java.nio.IntBuffer wrap(int[]);
}
public class InvalidMarkException extends java.lang.IllegalStateException {
@@ -46888,20 +51357,20 @@
method public int compareTo(java.nio.LongBuffer);
method public abstract java.nio.LongBuffer duplicate();
method public abstract long get();
- method public java.nio.LongBuffer get(long[]);
- method public java.nio.LongBuffer get(long[], int, int);
method public abstract long get(int);
+ method public java.nio.LongBuffer get(long[], int, int);
+ method public java.nio.LongBuffer get(long[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.LongBuffer put(long);
- method public final java.nio.LongBuffer put(long[]);
- method public java.nio.LongBuffer put(long[], int, int);
- method public java.nio.LongBuffer put(java.nio.LongBuffer);
method public abstract java.nio.LongBuffer put(int, long);
+ method public java.nio.LongBuffer put(java.nio.LongBuffer);
+ method public java.nio.LongBuffer put(long[], int, int);
+ method public final java.nio.LongBuffer put(long[]);
method public abstract java.nio.LongBuffer slice();
- method public static java.nio.LongBuffer wrap(long[]);
method public static java.nio.LongBuffer wrap(long[], int, int);
+ method public static java.nio.LongBuffer wrap(long[]);
}
public abstract class MappedByteBuffer extends java.nio.ByteBuffer {
@@ -46923,34 +51392,119 @@
method public int compareTo(java.nio.ShortBuffer);
method public abstract java.nio.ShortBuffer duplicate();
method public abstract short get();
- method public java.nio.ShortBuffer get(short[]);
- method public java.nio.ShortBuffer get(short[], int, int);
method public abstract short get(int);
+ method public java.nio.ShortBuffer get(short[], int, int);
+ method public java.nio.ShortBuffer get(short[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.ShortBuffer put(short);
- method public final java.nio.ShortBuffer put(short[]);
- method public java.nio.ShortBuffer put(short[], int, int);
- method public java.nio.ShortBuffer put(java.nio.ShortBuffer);
method public abstract java.nio.ShortBuffer put(int, short);
+ method public java.nio.ShortBuffer put(java.nio.ShortBuffer);
+ method public java.nio.ShortBuffer put(short[], int, int);
+ method public final java.nio.ShortBuffer put(short[]);
method public abstract java.nio.ShortBuffer slice();
- method public static java.nio.ShortBuffer wrap(short[]);
method public static java.nio.ShortBuffer wrap(short[], int, int);
+ method public static java.nio.ShortBuffer wrap(short[]);
}
}
package java.nio.channels {
+ public class AcceptPendingException extends java.lang.IllegalStateException {
+ ctor public AcceptPendingException();
+ }
+
+ public class AlreadyBoundException extends java.lang.IllegalStateException {
+ ctor public AlreadyBoundException();
+ }
+
public class AlreadyConnectedException extends java.lang.IllegalStateException {
ctor public AlreadyConnectedException();
}
+ public abstract interface AsynchronousByteChannel implements java.nio.channels.AsynchronousChannel {
+ method public abstract void read(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer);
+ method public abstract void write(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer);
+ }
+
+ public abstract interface AsynchronousChannel implements java.nio.channels.Channel {
+ method public abstract void close() throws java.io.IOException;
+ }
+
+ public abstract class AsynchronousChannelGroup {
+ ctor protected AsynchronousChannelGroup(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract boolean awaitTermination(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract boolean isShutdown();
+ method public abstract boolean isTerminated();
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract void shutdown();
+ method public abstract void shutdownNow() throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withCachedThreadPool(java.util.concurrent.ExecutorService, int) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withFixedThreadPool(int, java.util.concurrent.ThreadFactory) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withThreadPool(java.util.concurrent.ExecutorService) throws java.io.IOException;
+ }
+
public class AsynchronousCloseException extends java.nio.channels.ClosedChannelException {
ctor public AsynchronousCloseException();
}
+ public abstract class AsynchronousFileChannel implements java.nio.channels.AsynchronousChannel {
+ ctor protected AsynchronousFileChannel();
+ method public abstract void force(boolean) throws java.io.IOException;
+ method public abstract void lock(long, long, boolean, A, java.nio.channels.CompletionHandler<java.nio.channels.FileLock, ? super A>);
+ method public final void lock(A, java.nio.channels.CompletionHandler<java.nio.channels.FileLock, ? super A>);
+ method public abstract java.util.concurrent.Future<java.nio.channels.FileLock> lock(long, long, boolean);
+ method public final java.util.concurrent.Future<java.nio.channels.FileLock> lock();
+ method public static java.nio.channels.AsynchronousFileChannel open(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.util.concurrent.ExecutorService, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousFileChannel open(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract void read(java.nio.ByteBuffer, long, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer, long);
+ method public abstract long size() throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousFileChannel truncate(long) throws java.io.IOException;
+ method public abstract java.nio.channels.FileLock tryLock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
+ method public abstract void write(java.nio.ByteBuffer, long, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer, long);
+ }
+
+ public abstract class AsynchronousServerSocketChannel implements java.nio.channels.AsynchronousChannel java.nio.channels.NetworkChannel {
+ ctor protected AsynchronousServerSocketChannel(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract void accept(A, java.nio.channels.CompletionHandler<java.nio.channels.AsynchronousSocketChannel, ? super A>);
+ method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();
+ method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ }
+
+ public abstract class AsynchronousSocketChannel implements java.nio.channels.AsynchronousByteChannel java.nio.channels.NetworkChannel {
+ ctor protected AsynchronousSocketChannel(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract void read(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public final void read(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer);
+ method public abstract void read(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Long, ? super A>);
+ method public abstract java.nio.channels.AsynchronousSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel shutdownInput() throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel shutdownOutput() throws java.io.IOException;
+ method public abstract void write(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public final void write(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer);
+ method public abstract void write(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Long, ? super A>);
+ }
+
public abstract interface ByteChannel implements java.nio.channels.ReadableByteChannel java.nio.channels.WritableByteChannel {
}
@@ -46967,7 +51521,9 @@
method public static java.nio.channels.ReadableByteChannel newChannel(java.io.InputStream);
method public static java.nio.channels.WritableByteChannel newChannel(java.io.OutputStream);
method public static java.io.InputStream newInputStream(java.nio.channels.ReadableByteChannel);
+ method public static java.io.InputStream newInputStream(java.nio.channels.AsynchronousByteChannel);
method public static java.io.OutputStream newOutputStream(java.nio.channels.WritableByteChannel);
+ method public static java.io.OutputStream newOutputStream(java.nio.channels.AsynchronousByteChannel);
method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.nio.charset.CharsetDecoder, int);
method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.lang.String);
method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, java.nio.charset.CharsetEncoder, int);
@@ -46986,50 +51542,61 @@
ctor public ClosedSelectorException();
}
+ public abstract interface CompletionHandler {
+ method public abstract void completed(V, A);
+ method public abstract void failed(java.lang.Throwable, A);
+ }
+
public class ConnectionPendingException extends java.lang.IllegalStateException {
ctor public ConnectionPendingException();
}
- public abstract class DatagramChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel {
+ public abstract class DatagramChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.MulticastChannel java.nio.channels.ScatteringByteChannel {
ctor protected DatagramChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
+ method public static java.nio.channels.DatagramChannel open(java.net.ProtocolFamily) throws java.io.IOException;
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract java.net.SocketAddress receive(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract int send(java.nio.ByteBuffer, java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.DatagramSocket socket();
method public final int validOps();
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
}
- public abstract class FileChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel {
+ public abstract class FileChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel java.nio.channels.SeekableByteChannel {
ctor protected FileChannel();
method public abstract void force(boolean) throws java.io.IOException;
- method public final java.nio.channels.FileLock lock() throws java.io.IOException;
method public abstract java.nio.channels.FileLock lock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock lock() throws java.io.IOException;
method public abstract java.nio.MappedByteBuffer map(java.nio.channels.FileChannel.MapMode, long, long) throws java.io.IOException;
+ method public static java.nio.channels.FileChannel open(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.FileChannel open(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
method public abstract long position() throws java.io.IOException;
method public abstract java.nio.channels.FileChannel position(long) throws java.io.IOException;
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
- method public abstract int read(java.nio.ByteBuffer, long) throws java.io.IOException;
- method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer, long) throws java.io.IOException;
method public abstract long size() throws java.io.IOException;
method public abstract long transferFrom(java.nio.channels.ReadableByteChannel, long, long) throws java.io.IOException;
method public abstract long transferTo(long, long, java.nio.channels.WritableByteChannel) throws java.io.IOException;
method public abstract java.nio.channels.FileChannel truncate(long) throws java.io.IOException;
- method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
method public abstract java.nio.channels.FileLock tryLock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
- method public abstract int write(java.nio.ByteBuffer, long) throws java.io.IOException;
- method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer, long) throws java.io.IOException;
}
public static class FileChannel.MapMode {
@@ -47040,6 +51607,8 @@
public abstract class FileLock implements java.lang.AutoCloseable {
ctor protected FileLock(java.nio.channels.FileChannel, long, long, boolean);
+ ctor protected FileLock(java.nio.channels.AsynchronousFileChannel, long, long, boolean);
+ method public java.nio.channels.Channel acquiredBy();
method public final java.nio.channels.FileChannel channel();
method public final void close() throws java.io.IOException;
method public final boolean isShared();
@@ -47056,22 +51625,56 @@
}
public abstract interface GatheringByteChannel implements java.nio.channels.WritableByteChannel {
- method public abstract long write(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public abstract long write(java.nio.ByteBuffer[]) throws java.io.IOException;
}
public class IllegalBlockingModeException extends java.lang.IllegalStateException {
ctor public IllegalBlockingModeException();
}
+ public class IllegalChannelGroupException extends java.lang.IllegalArgumentException {
+ ctor public IllegalChannelGroupException();
+ }
+
public class IllegalSelectorException extends java.lang.IllegalArgumentException {
ctor public IllegalSelectorException();
}
+ public class InterruptedByTimeoutException extends java.io.IOException {
+ ctor public InterruptedByTimeoutException();
+ }
+
public abstract interface InterruptibleChannel implements java.nio.channels.Channel {
method public abstract void close() throws java.io.IOException;
}
+ public abstract class MembershipKey {
+ ctor protected MembershipKey();
+ method public abstract java.nio.channels.MembershipKey block(java.net.InetAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.MulticastChannel channel();
+ method public abstract void drop();
+ method public abstract java.net.InetAddress group();
+ method public abstract boolean isValid();
+ method public abstract java.net.NetworkInterface networkInterface();
+ method public abstract java.net.InetAddress sourceAddress();
+ method public abstract java.nio.channels.MembershipKey unblock(java.net.InetAddress);
+ }
+
+ public abstract interface MulticastChannel implements java.nio.channels.NetworkChannel {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.nio.channels.MembershipKey join(java.net.InetAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method public abstract java.nio.channels.MembershipKey join(java.net.InetAddress, java.net.NetworkInterface, java.net.InetAddress) throws java.io.IOException;
+ }
+
+ public abstract interface NetworkChannel implements java.nio.channels.Channel {
+ method public abstract java.nio.channels.NetworkChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
+ method public abstract T getOption(java.net.SocketOption<T>) throws java.io.IOException;
+ method public abstract java.nio.channels.NetworkChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.util.Set<java.net.SocketOption<?>> supportedOptions();
+ }
+
public class NoConnectionPendingException extends java.lang.IllegalStateException {
ctor public NoConnectionPendingException();
}
@@ -47113,13 +51716,26 @@
method public final int validOps();
}
+ public class ReadPendingException extends java.lang.IllegalStateException {
+ ctor public ReadPendingException();
+ }
+
public abstract interface ReadableByteChannel implements java.nio.channels.Channel {
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
}
public abstract interface ScatteringByteChannel implements java.nio.channels.ReadableByteChannel {
- method public abstract long read(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public abstract long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ }
+
+ public abstract interface SeekableByteChannel implements java.nio.channels.ByteChannel {
+ method public abstract long position() throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel position(long) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long size() throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel truncate(long) throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
}
public abstract class SelectableChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.Channel {
@@ -47130,8 +51746,8 @@
method public abstract boolean isRegistered();
method public abstract java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
method public abstract java.nio.channels.spi.SelectorProvider provider();
- method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int) throws java.nio.channels.ClosedChannelException;
method public abstract java.nio.channels.SelectionKey register(java.nio.channels.Selector, int, java.lang.Object) throws java.nio.channels.ClosedChannelException;
+ method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int) throws java.nio.channels.ClosedChannelException;
method public abstract int validOps();
}
@@ -47163,37 +51779,49 @@
method public abstract java.util.Set<java.nio.channels.SelectionKey> keys();
method public static java.nio.channels.Selector open() throws java.io.IOException;
method public abstract java.nio.channels.spi.SelectorProvider provider();
- method public abstract int select() throws java.io.IOException;
method public abstract int select(long) throws java.io.IOException;
+ method public abstract int select() throws java.io.IOException;
method public abstract int selectNow() throws java.io.IOException;
method public abstract java.util.Set<java.nio.channels.SelectionKey> selectedKeys();
method public abstract java.nio.channels.Selector wakeup();
}
- public abstract class ServerSocketChannel extends java.nio.channels.spi.AbstractSelectableChannel {
+ public abstract class ServerSocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.NetworkChannel {
ctor protected ServerSocketChannel(java.nio.channels.spi.SelectorProvider);
method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;
+ method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.ServerSocket socket();
method public final int validOps();
}
- public abstract class SocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel {
+ public class ShutdownChannelGroupException extends java.lang.IllegalStateException {
+ ctor public ShutdownChannelGroupException();
+ }
+
+ public abstract class SocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.NetworkChannel java.nio.channels.ScatteringByteChannel {
ctor protected SocketChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean finishConnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public abstract boolean isConnectionPending();
method public static java.nio.channels.SocketChannel open() throws java.io.IOException;
method public static java.nio.channels.SocketChannel open(java.net.SocketAddress) throws java.io.IOException;
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel shutdownInput() throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel shutdownOutput() throws java.io.IOException;
method public abstract java.net.Socket socket();
method public final int validOps();
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
}
public class UnresolvedAddressException extends java.lang.IllegalArgumentException {
@@ -47208,6 +51836,10 @@
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
}
+ public class WritePendingException extends java.lang.IllegalStateException {
+ ctor public WritePendingException();
+ }
+
}
package java.nio.channels.spi {
@@ -47218,19 +51850,19 @@
method public final void close() throws java.io.IOException;
method protected final void end(boolean) throws java.nio.channels.AsynchronousCloseException;
method protected abstract void implCloseChannel() throws java.io.IOException;
- method public final synchronized boolean isOpen();
+ method public final boolean isOpen();
}
public abstract class AbstractSelectableChannel extends java.nio.channels.SelectableChannel {
ctor protected AbstractSelectableChannel(java.nio.channels.spi.SelectorProvider);
method public final java.lang.Object blockingLock();
method public final java.nio.channels.SelectableChannel configureBlocking(boolean) throws java.io.IOException;
- method protected final synchronized void implCloseChannel() throws java.io.IOException;
+ method protected final void implCloseChannel() throws java.io.IOException;
method protected abstract void implCloseSelectableChannel() throws java.io.IOException;
method protected abstract void implConfigureBlocking(boolean) throws java.io.IOException;
method public final boolean isBlocking();
- method public final synchronized boolean isRegistered();
- method public final synchronized java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
+ method public final boolean isRegistered();
+ method public final java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
method public final java.nio.channels.spi.SelectorProvider provider();
method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int, java.lang.Object) throws java.nio.channels.ClosedChannelException;
}
@@ -47254,15 +51886,25 @@
method protected abstract java.nio.channels.SelectionKey register(java.nio.channels.spi.AbstractSelectableChannel, int, java.lang.Object);
}
+ public abstract class AsynchronousChannelProvider {
+ ctor protected AsynchronousChannelProvider();
+ method public abstract java.nio.channels.AsynchronousChannelGroup openAsynchronousChannelGroup(int, java.util.concurrent.ThreadFactory) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousChannelGroup openAsynchronousChannelGroup(java.util.concurrent.ExecutorService, int) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel openAsynchronousServerSocketChannel(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel openAsynchronousSocketChannel(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.spi.AsynchronousChannelProvider provider();
+ }
+
public abstract class SelectorProvider {
ctor protected SelectorProvider();
method public java.nio.channels.Channel inheritedChannel() throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel openDatagramChannel() throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel openDatagramChannel(java.net.ProtocolFamily) throws java.io.IOException;
method public abstract java.nio.channels.Pipe openPipe() throws java.io.IOException;
method public abstract java.nio.channels.spi.AbstractSelector openSelector() throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel openServerSocketChannel() throws java.io.IOException;
method public abstract java.nio.channels.SocketChannel openSocketChannel() throws java.io.IOException;
- method public static synchronized java.nio.channels.spi.SelectorProvider provider();
+ method public static java.nio.channels.spi.SelectorProvider provider();
}
}
@@ -47301,8 +51943,8 @@
ctor protected CharsetDecoder(java.nio.charset.Charset, float, float);
method public final float averageCharsPerByte();
method public final java.nio.charset.Charset charset();
- method public final java.nio.CharBuffer decode(java.nio.ByteBuffer) throws java.nio.charset.CharacterCodingException;
method public final java.nio.charset.CoderResult decode(java.nio.ByteBuffer, java.nio.CharBuffer, boolean);
+ method public final java.nio.CharBuffer decode(java.nio.ByteBuffer) throws java.nio.charset.CharacterCodingException;
method protected abstract java.nio.charset.CoderResult decodeLoop(java.nio.ByteBuffer, java.nio.CharBuffer);
method public java.nio.charset.Charset detectedCharset();
method public final java.nio.charset.CoderResult flush(java.nio.CharBuffer);
@@ -47324,14 +51966,14 @@
}
public abstract class CharsetEncoder {
- ctor protected CharsetEncoder(java.nio.charset.Charset, float, float);
ctor protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[]);
+ ctor protected CharsetEncoder(java.nio.charset.Charset, float, float);
method public final float averageBytesPerChar();
method public boolean canEncode(char);
method public boolean canEncode(java.lang.CharSequence);
method public final java.nio.charset.Charset charset();
- method public final java.nio.ByteBuffer encode(java.nio.CharBuffer) throws java.nio.charset.CharacterCodingException;
method public final java.nio.charset.CoderResult encode(java.nio.CharBuffer, java.nio.ByteBuffer, boolean);
+ method public final java.nio.ByteBuffer encode(java.nio.CharBuffer) throws java.nio.charset.CharacterCodingException;
method protected abstract java.nio.charset.CoderResult encodeLoop(java.nio.CharBuffer, java.nio.ByteBuffer);
method public final java.nio.charset.CoderResult flush(java.nio.ByteBuffer);
method protected java.nio.charset.CoderResult implFlush(java.nio.ByteBuffer);
@@ -47360,10 +52002,10 @@
method public boolean isOverflow();
method public boolean isUnderflow();
method public boolean isUnmappable();
- method public int length() throws java.lang.UnsupportedOperationException;
- method public static synchronized java.nio.charset.CoderResult malformedForLength(int) throws java.lang.IllegalArgumentException;
- method public void throwException() throws java.nio.BufferOverflowException, java.nio.BufferUnderflowException, java.nio.charset.CharacterCodingException, java.nio.charset.MalformedInputException, java.nio.charset.UnmappableCharacterException;
- method public static synchronized java.nio.charset.CoderResult unmappableForLength(int) throws java.lang.IllegalArgumentException;
+ method public int length();
+ method public static java.nio.charset.CoderResult malformedForLength(int);
+ method public void throwException() throws java.nio.charset.CharacterCodingException;
+ method public static java.nio.charset.CoderResult unmappableForLength(int);
field public static final java.nio.charset.CoderResult OVERFLOW;
field public static final java.nio.charset.CoderResult UNDERFLOW;
}
@@ -47415,11 +52057,597 @@
}
+package java.nio.file {
+
+ public class AccessDeniedException extends java.nio.file.FileSystemException {
+ ctor public AccessDeniedException(java.lang.String);
+ ctor public AccessDeniedException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public final class AccessMode extends java.lang.Enum {
+ method public static java.nio.file.AccessMode valueOf(java.lang.String);
+ method public static final java.nio.file.AccessMode[] values();
+ enum_constant public static final java.nio.file.AccessMode EXECUTE;
+ enum_constant public static final java.nio.file.AccessMode READ;
+ enum_constant public static final java.nio.file.AccessMode WRITE;
+ }
+
+ public class AtomicMoveNotSupportedException extends java.nio.file.FileSystemException {
+ ctor public AtomicMoveNotSupportedException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public class ClosedDirectoryStreamException extends java.lang.IllegalStateException {
+ ctor public ClosedDirectoryStreamException();
+ }
+
+ public class ClosedFileSystemException extends java.lang.IllegalStateException {
+ ctor public ClosedFileSystemException();
+ }
+
+ public class ClosedWatchServiceException extends java.lang.IllegalStateException {
+ ctor public ClosedWatchServiceException();
+ }
+
+ public abstract interface CopyOption {
+ }
+
+ public final class DirectoryIteratorException extends java.util.ConcurrentModificationException {
+ ctor public DirectoryIteratorException(java.io.IOException);
+ }
+
+ public class DirectoryNotEmptyException extends java.nio.file.FileSystemException {
+ ctor public DirectoryNotEmptyException(java.lang.String);
+ }
+
+ public abstract interface DirectoryStream implements java.io.Closeable java.lang.Iterable {
+ method public abstract java.util.Iterator<T> iterator();
+ }
+
+ public static abstract interface DirectoryStream.Filter {
+ method public abstract boolean accept(T) throws java.io.IOException;
+ }
+
+ public class FileAlreadyExistsException extends java.nio.file.FileSystemException {
+ ctor public FileAlreadyExistsException(java.lang.String);
+ ctor public FileAlreadyExistsException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract class FileStore {
+ ctor protected FileStore();
+ method public abstract java.lang.Object getAttribute(java.lang.String) throws java.io.IOException;
+ method public abstract V getFileStoreAttributeView(java.lang.Class<V>);
+ method public abstract long getTotalSpace() throws java.io.IOException;
+ method public abstract long getUnallocatedSpace() throws java.io.IOException;
+ method public abstract long getUsableSpace() throws java.io.IOException;
+ method public abstract boolean isReadOnly();
+ method public abstract java.lang.String name();
+ method public abstract boolean supportsFileAttributeView(java.lang.Class<? extends java.nio.file.attribute.FileAttributeView>);
+ method public abstract boolean supportsFileAttributeView(java.lang.String);
+ method public abstract java.lang.String type();
+ }
+
+ public abstract class FileSystem implements java.io.Closeable {
+ ctor protected FileSystem();
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.lang.Iterable<java.nio.file.FileStore> getFileStores();
+ method public abstract java.nio.file.Path getPath(java.lang.String, java.lang.String...);
+ method public abstract java.nio.file.PathMatcher getPathMatcher(java.lang.String);
+ method public abstract java.lang.Iterable<java.nio.file.Path> getRootDirectories();
+ method public abstract java.lang.String getSeparator();
+ method public abstract java.nio.file.attribute.UserPrincipalLookupService getUserPrincipalLookupService();
+ method public abstract boolean isOpen();
+ method public abstract boolean isReadOnly();
+ method public abstract java.nio.file.WatchService newWatchService() throws java.io.IOException;
+ method public abstract java.nio.file.spi.FileSystemProvider provider();
+ method public abstract java.util.Set<java.lang.String> supportedFileAttributeViews();
+ }
+
+ public class FileSystemAlreadyExistsException extends java.lang.RuntimeException {
+ ctor public FileSystemAlreadyExistsException();
+ ctor public FileSystemAlreadyExistsException(java.lang.String);
+ }
+
+ public class FileSystemException extends java.io.IOException {
+ ctor public FileSystemException(java.lang.String);
+ ctor public FileSystemException(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String getFile();
+ method public java.lang.String getOtherFile();
+ method public java.lang.String getReason();
+ }
+
+ public class FileSystemLoopException extends java.nio.file.FileSystemException {
+ ctor public FileSystemLoopException(java.lang.String);
+ }
+
+ public class FileSystemNotFoundException extends java.lang.RuntimeException {
+ ctor public FileSystemNotFoundException();
+ ctor public FileSystemNotFoundException(java.lang.String);
+ }
+
+ public final class FileSystems {
+ method public static java.nio.file.FileSystem getDefault();
+ method public static java.nio.file.FileSystem getFileSystem(java.net.URI);
+ method public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>, java.lang.ClassLoader) throws java.io.IOException;
+ method public static java.nio.file.FileSystem newFileSystem(java.nio.file.Path, java.lang.ClassLoader) throws java.io.IOException;
+ }
+
+ public final class FileVisitOption extends java.lang.Enum {
+ method public static java.nio.file.FileVisitOption valueOf(java.lang.String);
+ method public static final java.nio.file.FileVisitOption[] values();
+ enum_constant public static final java.nio.file.FileVisitOption FOLLOW_LINKS;
+ }
+
+ public final class FileVisitResult extends java.lang.Enum {
+ method public static java.nio.file.FileVisitResult valueOf(java.lang.String);
+ method public static final java.nio.file.FileVisitResult[] values();
+ enum_constant public static final java.nio.file.FileVisitResult CONTINUE;
+ enum_constant public static final java.nio.file.FileVisitResult SKIP_SIBLINGS;
+ enum_constant public static final java.nio.file.FileVisitResult SKIP_SUBTREE;
+ enum_constant public static final java.nio.file.FileVisitResult TERMINATE;
+ }
+
+ public abstract interface FileVisitor {
+ method public abstract java.nio.file.FileVisitResult postVisitDirectory(T, java.io.IOException) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult preVisitDirectory(T, java.nio.file.attribute.BasicFileAttributes) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult visitFile(T, java.nio.file.attribute.BasicFileAttributes) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult visitFileFailed(T, java.io.IOException) throws java.io.IOException;
+ }
+
+ public final class Files {
+ method public static java.nio.file.Path copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static long copy(java.io.InputStream, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static long copy(java.nio.file.Path, java.io.OutputStream) throws java.io.IOException;
+ method public static java.nio.file.Path createDirectories(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createDirectory(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createFile(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createLink(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path createSymbolicLink(java.nio.file.Path, java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempDirectory(java.nio.file.Path, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempDirectory(java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempFile(java.nio.file.Path, java.lang.String, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempFile(java.lang.String, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static void delete(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean deleteIfExists(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean exists(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static java.lang.Object getAttribute(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static V getFileAttributeView(java.nio.file.Path, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public static java.nio.file.FileStore getFileStore(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.attribute.FileTime getLastModifiedTime(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.attribute.UserPrincipal getOwner(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.util.Set<java.nio.file.attribute.PosixFilePermission> getPosixFilePermissions(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static boolean isDirectory(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static boolean isExecutable(java.nio.file.Path);
+ method public static boolean isHidden(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean isReadable(java.nio.file.Path);
+ method public static boolean isRegularFile(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static boolean isSameFile(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public static boolean isSymbolicLink(java.nio.file.Path);
+ method public static boolean isWritable(java.nio.file.Path);
+ method public static java.nio.file.Path move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static java.io.BufferedReader newBufferedReader(java.nio.file.Path, java.nio.charset.Charset) throws java.io.IOException;
+ method public static java.io.BufferedWriter newBufferedWriter(java.nio.file.Path, java.nio.charset.Charset, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.lang.String) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.nio.file.DirectoryStream.Filter<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.io.InputStream newInputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.io.OutputStream newOutputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static boolean notExists(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static java.lang.String probeContentType(java.nio.file.Path) throws java.io.IOException;
+ method public static byte[] readAllBytes(java.nio.file.Path) throws java.io.IOException;
+ method public static java.util.List<java.lang.String> readAllLines(java.nio.file.Path, java.nio.charset.Charset) throws java.io.IOException;
+ method public static A readAttributes(java.nio.file.Path, java.lang.Class<A>, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.util.Map<java.lang.String, java.lang.Object> readAttributes(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.Path readSymbolicLink(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path setAttribute(java.nio.file.Path, java.lang.String, java.lang.Object, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.Path setLastModifiedTime(java.nio.file.Path, java.nio.file.attribute.FileTime) throws java.io.IOException;
+ method public static java.nio.file.Path setOwner(java.nio.file.Path, java.nio.file.attribute.UserPrincipal) throws java.io.IOException;
+ method public static java.nio.file.Path setPosixFilePermissions(java.nio.file.Path, java.util.Set<java.nio.file.attribute.PosixFilePermission>) throws java.io.IOException;
+ method public static long size(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path walkFileTree(java.nio.file.Path, java.util.Set<java.nio.file.FileVisitOption>, int, java.nio.file.FileVisitor<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.nio.file.Path walkFileTree(java.nio.file.Path, java.nio.file.FileVisitor<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.nio.file.Path write(java.nio.file.Path, byte[], java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.file.Path write(java.nio.file.Path, java.lang.Iterable<? extends java.lang.CharSequence>, java.nio.charset.Charset, java.nio.file.OpenOption...) throws java.io.IOException;
+ }
+
+ public class InvalidPathException extends java.lang.IllegalArgumentException {
+ ctor public InvalidPathException(java.lang.String, java.lang.String, int);
+ ctor public InvalidPathException(java.lang.String, java.lang.String);
+ method public int getIndex();
+ method public java.lang.String getInput();
+ method public java.lang.String getReason();
+ }
+
+ public final class LinkOption extends java.lang.Enum implements java.nio.file.CopyOption java.nio.file.OpenOption {
+ method public static java.nio.file.LinkOption valueOf(java.lang.String);
+ method public static final java.nio.file.LinkOption[] values();
+ enum_constant public static final java.nio.file.LinkOption NOFOLLOW_LINKS;
+ }
+
+ public final class LinkPermission extends java.security.BasicPermission {
+ ctor public LinkPermission(java.lang.String);
+ ctor public LinkPermission(java.lang.String, java.lang.String);
+ }
+
+ public class NoSuchFileException extends java.nio.file.FileSystemException {
+ ctor public NoSuchFileException(java.lang.String);
+ ctor public NoSuchFileException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public class NotDirectoryException extends java.nio.file.FileSystemException {
+ ctor public NotDirectoryException(java.lang.String);
+ }
+
+ public class NotLinkException extends java.nio.file.FileSystemException {
+ ctor public NotLinkException(java.lang.String);
+ ctor public NotLinkException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract interface OpenOption {
+ }
+
+ public abstract interface Path implements java.lang.Comparable java.lang.Iterable java.nio.file.Watchable {
+ method public abstract int compareTo(java.nio.file.Path);
+ method public abstract boolean endsWith(java.nio.file.Path);
+ method public abstract boolean endsWith(java.lang.String);
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract java.nio.file.Path getFileName();
+ method public abstract java.nio.file.FileSystem getFileSystem();
+ method public abstract java.nio.file.Path getName(int);
+ method public abstract int getNameCount();
+ method public abstract java.nio.file.Path getParent();
+ method public abstract java.nio.file.Path getRoot();
+ method public abstract int hashCode();
+ method public abstract boolean isAbsolute();
+ method public abstract java.util.Iterator<java.nio.file.Path> iterator();
+ method public abstract java.nio.file.Path normalize();
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>[], java.nio.file.WatchEvent.Modifier...) throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.Path relativize(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolve(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolve(java.lang.String);
+ method public abstract java.nio.file.Path resolveSibling(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolveSibling(java.lang.String);
+ method public abstract boolean startsWith(java.nio.file.Path);
+ method public abstract boolean startsWith(java.lang.String);
+ method public abstract java.nio.file.Path subpath(int, int);
+ method public abstract java.nio.file.Path toAbsolutePath();
+ method public abstract java.io.File toFile();
+ method public abstract java.nio.file.Path toRealPath(java.nio.file.LinkOption...) throws java.io.IOException;
+ method public abstract java.lang.String toString();
+ method public abstract java.net.URI toUri();
+ }
+
+ public abstract interface PathMatcher {
+ method public abstract boolean matches(java.nio.file.Path);
+ }
+
+ public final class Paths {
+ method public static java.nio.file.Path get(java.lang.String, java.lang.String...);
+ method public static java.nio.file.Path get(java.net.URI);
+ }
+
+ public class ProviderMismatchException extends java.lang.IllegalArgumentException {
+ ctor public ProviderMismatchException();
+ ctor public ProviderMismatchException(java.lang.String);
+ }
+
+ public class ProviderNotFoundException extends java.lang.RuntimeException {
+ ctor public ProviderNotFoundException();
+ ctor public ProviderNotFoundException(java.lang.String);
+ }
+
+ public class ReadOnlyFileSystemException extends java.lang.UnsupportedOperationException {
+ ctor public ReadOnlyFileSystemException();
+ }
+
+ public abstract interface SecureDirectoryStream implements java.nio.file.DirectoryStream {
+ method public abstract void deleteDirectory(T) throws java.io.IOException;
+ method public abstract void deleteFile(T) throws java.io.IOException;
+ method public abstract V getFileAttributeView(java.lang.Class<V>);
+ method public abstract V getFileAttributeView(T, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public abstract void move(T, java.nio.file.SecureDirectoryStream<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel newByteChannel(T, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.SecureDirectoryStream<T> newDirectoryStream(T, java.nio.file.LinkOption...) throws java.io.IOException;
+ }
+
+ public final class StandardCopyOption extends java.lang.Enum implements java.nio.file.CopyOption {
+ method public static java.nio.file.StandardCopyOption valueOf(java.lang.String);
+ method public static final java.nio.file.StandardCopyOption[] values();
+ enum_constant public static final java.nio.file.StandardCopyOption ATOMIC_MOVE;
+ enum_constant public static final java.nio.file.StandardCopyOption COPY_ATTRIBUTES;
+ enum_constant public static final java.nio.file.StandardCopyOption REPLACE_EXISTING;
+ }
+
+ public final class StandardOpenOption extends java.lang.Enum implements java.nio.file.OpenOption {
+ method public static java.nio.file.StandardOpenOption valueOf(java.lang.String);
+ method public static final java.nio.file.StandardOpenOption[] values();
+ enum_constant public static final java.nio.file.StandardOpenOption APPEND;
+ enum_constant public static final java.nio.file.StandardOpenOption CREATE;
+ enum_constant public static final java.nio.file.StandardOpenOption CREATE_NEW;
+ enum_constant public static final java.nio.file.StandardOpenOption DELETE_ON_CLOSE;
+ enum_constant public static final java.nio.file.StandardOpenOption DSYNC;
+ enum_constant public static final java.nio.file.StandardOpenOption READ;
+ enum_constant public static final java.nio.file.StandardOpenOption SPARSE;
+ enum_constant public static final java.nio.file.StandardOpenOption SYNC;
+ enum_constant public static final java.nio.file.StandardOpenOption TRUNCATE_EXISTING;
+ enum_constant public static final java.nio.file.StandardOpenOption WRITE;
+ }
+
+ public final class StandardWatchEventKinds {
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_CREATE;
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_DELETE;
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_MODIFY;
+ field public static final java.nio.file.WatchEvent.Kind<java.lang.Object> OVERFLOW;
+ }
+
+ public abstract interface WatchEvent {
+ method public abstract T context();
+ method public abstract int count();
+ method public abstract java.nio.file.WatchEvent.Kind<T> kind();
+ }
+
+ public static abstract interface WatchEvent.Kind {
+ method public abstract java.lang.String name();
+ method public abstract java.lang.Class<T> type();
+ }
+
+ public static abstract interface WatchEvent.Modifier {
+ method public abstract java.lang.String name();
+ }
+
+ public abstract interface WatchKey {
+ method public abstract void cancel();
+ method public abstract boolean isValid();
+ method public abstract java.util.List<java.nio.file.WatchEvent<?>> pollEvents();
+ method public abstract boolean reset();
+ method public abstract java.nio.file.Watchable watchable();
+ }
+
+ public abstract interface WatchService implements java.io.Closeable {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey poll();
+ method public abstract java.nio.file.WatchKey poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract java.nio.file.WatchKey take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface Watchable {
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>[], java.nio.file.WatchEvent.Modifier...) throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>...) throws java.io.IOException;
+ }
+
+}
+
+package java.nio.file.attribute {
+
+ public final class AclEntry {
+ method public java.util.Set<java.nio.file.attribute.AclEntryFlag> flags();
+ method public static java.nio.file.attribute.AclEntry.Builder newBuilder();
+ method public static java.nio.file.attribute.AclEntry.Builder newBuilder(java.nio.file.attribute.AclEntry);
+ method public java.util.Set<java.nio.file.attribute.AclEntryPermission> permissions();
+ method public java.nio.file.attribute.UserPrincipal principal();
+ method public java.nio.file.attribute.AclEntryType type();
+ }
+
+ public static final class AclEntry.Builder {
+ method public java.nio.file.attribute.AclEntry build();
+ method public java.nio.file.attribute.AclEntry.Builder setFlags(java.util.Set<java.nio.file.attribute.AclEntryFlag>);
+ method public java.nio.file.attribute.AclEntry.Builder setFlags(java.nio.file.attribute.AclEntryFlag...);
+ method public java.nio.file.attribute.AclEntry.Builder setPermissions(java.util.Set<java.nio.file.attribute.AclEntryPermission>);
+ method public java.nio.file.attribute.AclEntry.Builder setPermissions(java.nio.file.attribute.AclEntryPermission...);
+ method public java.nio.file.attribute.AclEntry.Builder setPrincipal(java.nio.file.attribute.UserPrincipal);
+ method public java.nio.file.attribute.AclEntry.Builder setType(java.nio.file.attribute.AclEntryType);
+ }
+
+ public final class AclEntryFlag extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryFlag valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryFlag[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag DIRECTORY_INHERIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag FILE_INHERIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag INHERIT_ONLY;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag NO_PROPAGATE_INHERIT;
+ }
+
+ public final class AclEntryPermission extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryPermission valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryPermission[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission APPEND_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission DELETE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission DELETE_CHILD;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission EXECUTE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_ACL;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_ATTRIBUTES;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_NAMED_ATTRS;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission SYNCHRONIZE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_ACL;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_ATTRIBUTES;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_NAMED_ATTRS;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_OWNER;
+ field public static final java.nio.file.attribute.AclEntryPermission ADD_FILE;
+ field public static final java.nio.file.attribute.AclEntryPermission ADD_SUBDIRECTORY;
+ field public static final java.nio.file.attribute.AclEntryPermission LIST_DIRECTORY;
+ }
+
+ public final class AclEntryType extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryType valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryType[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryType ALARM;
+ enum_constant public static final java.nio.file.attribute.AclEntryType ALLOW;
+ enum_constant public static final java.nio.file.attribute.AclEntryType AUDIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryType DENY;
+ }
+
+ public abstract interface AclFileAttributeView implements java.nio.file.attribute.FileOwnerAttributeView {
+ method public abstract java.util.List<java.nio.file.attribute.AclEntry> getAcl() throws java.io.IOException;
+ method public abstract java.lang.String name();
+ method public abstract void setAcl(java.util.List<java.nio.file.attribute.AclEntry>) throws java.io.IOException;
+ }
+
+ public abstract interface AttributeView {
+ method public abstract java.lang.String name();
+ }
+
+ public abstract interface BasicFileAttributeView implements java.nio.file.attribute.FileAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.BasicFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setTimes(java.nio.file.attribute.FileTime, java.nio.file.attribute.FileTime, java.nio.file.attribute.FileTime) throws java.io.IOException;
+ }
+
+ public abstract interface BasicFileAttributes {
+ method public abstract java.nio.file.attribute.FileTime creationTime();
+ method public abstract java.lang.Object fileKey();
+ method public abstract boolean isDirectory();
+ method public abstract boolean isOther();
+ method public abstract boolean isRegularFile();
+ method public abstract boolean isSymbolicLink();
+ method public abstract java.nio.file.attribute.FileTime lastAccessTime();
+ method public abstract java.nio.file.attribute.FileTime lastModifiedTime();
+ method public abstract long size();
+ }
+
+ public abstract interface DosFileAttributeView implements java.nio.file.attribute.BasicFileAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.DosFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setArchive(boolean) throws java.io.IOException;
+ method public abstract void setHidden(boolean) throws java.io.IOException;
+ method public abstract void setReadOnly(boolean) throws java.io.IOException;
+ method public abstract void setSystem(boolean) throws java.io.IOException;
+ }
+
+ public abstract interface DosFileAttributes implements java.nio.file.attribute.BasicFileAttributes {
+ method public abstract boolean isArchive();
+ method public abstract boolean isHidden();
+ method public abstract boolean isReadOnly();
+ method public abstract boolean isSystem();
+ }
+
+ public abstract interface FileAttribute {
+ method public abstract java.lang.String name();
+ method public abstract T value();
+ }
+
+ public abstract interface FileAttributeView implements java.nio.file.attribute.AttributeView {
+ }
+
+ public abstract interface FileOwnerAttributeView implements java.nio.file.attribute.FileAttributeView {
+ method public abstract java.nio.file.attribute.UserPrincipal getOwner() throws java.io.IOException;
+ method public abstract java.lang.String name();
+ method public abstract void setOwner(java.nio.file.attribute.UserPrincipal) throws java.io.IOException;
+ }
+
+ public abstract interface FileStoreAttributeView implements java.nio.file.attribute.AttributeView {
+ }
+
+ public final class FileTime implements java.lang.Comparable {
+ method public int compareTo(java.nio.file.attribute.FileTime);
+ method public static java.nio.file.attribute.FileTime from(long, java.util.concurrent.TimeUnit);
+ method public static java.nio.file.attribute.FileTime fromMillis(long);
+ method public long to(java.util.concurrent.TimeUnit);
+ method public long toMillis();
+ }
+
+ public abstract interface GroupPrincipal implements java.nio.file.attribute.UserPrincipal {
+ }
+
+ public abstract interface PosixFileAttributeView implements java.nio.file.attribute.BasicFileAttributeView java.nio.file.attribute.FileOwnerAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.PosixFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setGroup(java.nio.file.attribute.GroupPrincipal) throws java.io.IOException;
+ method public abstract void setPermissions(java.util.Set<java.nio.file.attribute.PosixFilePermission>) throws java.io.IOException;
+ }
+
+ public abstract interface PosixFileAttributes implements java.nio.file.attribute.BasicFileAttributes {
+ method public abstract java.nio.file.attribute.GroupPrincipal group();
+ method public abstract java.nio.file.attribute.UserPrincipal owner();
+ method public abstract java.util.Set<java.nio.file.attribute.PosixFilePermission> permissions();
+ }
+
+ public final class PosixFilePermission extends java.lang.Enum {
+ method public static java.nio.file.attribute.PosixFilePermission valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.PosixFilePermission[] values();
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_WRITE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_WRITE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_WRITE;
+ }
+
+ public final class PosixFilePermissions {
+ method public static java.nio.file.attribute.FileAttribute<java.util.Set<java.nio.file.attribute.PosixFilePermission>> asFileAttribute(java.util.Set<java.nio.file.attribute.PosixFilePermission>);
+ method public static java.util.Set<java.nio.file.attribute.PosixFilePermission> fromString(java.lang.String);
+ method public static java.lang.String toString(java.util.Set<java.nio.file.attribute.PosixFilePermission>);
+ }
+
+ public abstract interface UserPrincipal implements java.security.Principal {
+ }
+
+ public abstract class UserPrincipalLookupService {
+ ctor protected UserPrincipalLookupService();
+ method public abstract java.nio.file.attribute.GroupPrincipal lookupPrincipalByGroupName(java.lang.String) throws java.io.IOException;
+ method public abstract java.nio.file.attribute.UserPrincipal lookupPrincipalByName(java.lang.String) throws java.io.IOException;
+ }
+
+ public class UserPrincipalNotFoundException extends java.io.IOException {
+ ctor public UserPrincipalNotFoundException(java.lang.String);
+ method public java.lang.String getName();
+ }
+
+}
+
+package java.nio.file.spi {
+
+ public abstract class FileSystemProvider {
+ ctor protected FileSystemProvider();
+ method public abstract void checkAccess(java.nio.file.Path, java.nio.file.AccessMode...) throws java.io.IOException;
+ method public abstract void copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public abstract void createDirectory(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public void createLink(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public void createSymbolicLink(java.nio.file.Path, java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract void delete(java.nio.file.Path) throws java.io.IOException;
+ method public boolean deleteIfExists(java.nio.file.Path) throws java.io.IOException;
+ method public abstract V getFileAttributeView(java.nio.file.Path, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public abstract java.nio.file.FileStore getFileStore(java.nio.file.Path) throws java.io.IOException;
+ method public abstract java.nio.file.FileSystem getFileSystem(java.net.URI);
+ method public abstract java.nio.file.Path getPath(java.net.URI);
+ method public abstract java.lang.String getScheme();
+ method public static java.util.List<java.nio.file.spi.FileSystemProvider> installedProviders();
+ method public abstract boolean isHidden(java.nio.file.Path) throws java.io.IOException;
+ method public abstract boolean isSameFile(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public abstract void move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public java.nio.channels.AsynchronousFileChannel newAsynchronousFileChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.util.concurrent.ExecutorService, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.nio.file.DirectoryStream.Filter<? super java.nio.file.Path>) throws java.io.IOException;
+ method public java.nio.channels.FileChannel newFileChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public java.nio.file.FileSystem newFileSystem(java.nio.file.Path, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public java.io.InputStream newInputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public java.io.OutputStream newOutputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract A readAttributes(java.nio.file.Path, java.lang.Class<A>, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public abstract java.util.Map<java.lang.String, java.lang.Object> readAttributes(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public java.nio.file.Path readSymbolicLink(java.nio.file.Path) throws java.io.IOException;
+ method public abstract void setAttribute(java.nio.file.Path, java.lang.String, java.lang.Object, java.nio.file.LinkOption...) throws java.io.IOException;
+ }
+
+ public abstract class FileTypeDetector {
+ ctor protected FileTypeDetector();
+ method public abstract java.lang.String probeContentType(java.nio.file.Path) throws java.io.IOException;
+ }
+
+}
+
package java.security {
public final class AccessControlContext {
- ctor public AccessControlContext(java.security.AccessControlContext, java.security.DomainCombiner);
ctor public AccessControlContext(java.security.ProtectionDomain[]);
+ ctor public AccessControlContext(java.security.AccessControlContext, java.security.DomainCombiner);
method public void checkPermission(java.security.Permission) throws java.security.AccessControlException;
method public java.security.DomainCombiner getDomainCombiner();
}
@@ -47441,6 +52669,12 @@
method public static java.security.AccessControlContext getContext();
}
+ public abstract interface AlgorithmConstraints {
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.lang.String, java.security.AlgorithmParameters);
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.security.Key);
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.lang.String, java.security.Key, java.security.AlgorithmParameters);
+ }
+
public class AlgorithmParameterGenerator {
ctor protected AlgorithmParameterGenerator(java.security.AlgorithmParameterGeneratorSpi, java.security.Provider, java.lang.String);
method public final java.security.AlgorithmParameters generateParameters();
@@ -47490,9 +52724,11 @@
}
public final class AllPermission extends java.security.Permission {
- ctor public AllPermission(java.lang.String, java.lang.String);
ctor public AllPermission();
+ ctor public AllPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -47506,7 +52742,9 @@
public abstract class BasicPermission extends java.security.Permission implements java.io.Serializable {
ctor public BasicPermission(java.lang.String);
ctor public BasicPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -47535,9 +52773,24 @@
method public boolean implies(java.security.CodeSource);
}
+ public final class CryptoPrimitive extends java.lang.Enum {
+ method public static java.security.CryptoPrimitive valueOf(java.lang.String);
+ method public static final java.security.CryptoPrimitive[] values();
+ enum_constant public static final java.security.CryptoPrimitive BLOCK_CIPHER;
+ enum_constant public static final java.security.CryptoPrimitive KEY_AGREEMENT;
+ enum_constant public static final java.security.CryptoPrimitive KEY_ENCAPSULATION;
+ enum_constant public static final java.security.CryptoPrimitive KEY_WRAP;
+ enum_constant public static final java.security.CryptoPrimitive MAC;
+ enum_constant public static final java.security.CryptoPrimitive MESSAGE_DIGEST;
+ enum_constant public static final java.security.CryptoPrimitive PUBLIC_KEY_ENCRYPTION;
+ enum_constant public static final java.security.CryptoPrimitive SECURE_RANDOM;
+ enum_constant public static final java.security.CryptoPrimitive SIGNATURE;
+ enum_constant public static final java.security.CryptoPrimitive STREAM_CIPHER;
+ }
+
public class DigestException extends java.security.GeneralSecurityException {
- ctor public DigestException(java.lang.String);
ctor public DigestException();
+ ctor public DigestException(java.lang.String);
ctor public DigestException(java.lang.String, java.lang.Throwable);
ctor public DigestException(java.lang.Throwable);
}
@@ -47563,8 +52816,8 @@
}
public class GeneralSecurityException extends java.lang.Exception {
- ctor public GeneralSecurityException(java.lang.String);
ctor public GeneralSecurityException();
+ ctor public GeneralSecurityException(java.lang.String);
ctor public GeneralSecurityException(java.lang.String, java.lang.Throwable);
ctor public GeneralSecurityException(java.lang.Throwable);
}
@@ -47580,8 +52833,8 @@
public abstract deprecated class Identity implements java.security.Principal java.io.Serializable {
ctor protected Identity();
- ctor public Identity(java.lang.String);
ctor public Identity(java.lang.String, java.security.IdentityScope) throws java.security.KeyManagementException;
+ ctor public Identity(java.lang.String);
method public void addCertificate(java.security.Certificate) throws java.security.KeyManagementException;
method public java.security.Certificate[] certificates();
method public final boolean equals(java.lang.Object);
@@ -47612,22 +52865,22 @@
}
public class InvalidAlgorithmParameterException extends java.security.GeneralSecurityException {
- ctor public InvalidAlgorithmParameterException(java.lang.String);
ctor public InvalidAlgorithmParameterException();
+ ctor public InvalidAlgorithmParameterException(java.lang.String);
ctor public InvalidAlgorithmParameterException(java.lang.String, java.lang.Throwable);
ctor public InvalidAlgorithmParameterException(java.lang.Throwable);
}
public class InvalidKeyException extends java.security.KeyException {
- ctor public InvalidKeyException(java.lang.String);
ctor public InvalidKeyException();
+ ctor public InvalidKeyException(java.lang.String);
ctor public InvalidKeyException(java.lang.String, java.lang.Throwable);
ctor public InvalidKeyException(java.lang.Throwable);
}
public class InvalidParameterException extends java.lang.IllegalArgumentException {
- ctor public InvalidParameterException(java.lang.String);
ctor public InvalidParameterException();
+ ctor public InvalidParameterException(java.lang.String);
}
public abstract interface Key implements java.io.Serializable {
@@ -47638,8 +52891,8 @@
}
public class KeyException extends java.security.GeneralSecurityException {
- ctor public KeyException(java.lang.String);
ctor public KeyException();
+ ctor public KeyException(java.lang.String);
ctor public KeyException(java.lang.String, java.lang.Throwable);
ctor public KeyException(java.lang.Throwable);
}
@@ -47666,8 +52919,8 @@
}
public class KeyManagementException extends java.security.KeyException {
- ctor public KeyManagementException(java.lang.String);
ctor public KeyManagementException();
+ ctor public KeyManagementException(java.lang.String);
ctor public KeyManagementException(java.lang.String, java.lang.Throwable);
ctor public KeyManagementException(java.lang.Throwable);
}
@@ -47688,8 +52941,8 @@
method public static java.security.KeyPairGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
method public void initialize(int);
- method public void initialize(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
method public void initialize(int, java.security.SecureRandom);
+ method public void initialize(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
}
public abstract class KeyPairGeneratorSpi {
@@ -47792,8 +53045,8 @@
}
public class KeyStoreException extends java.security.GeneralSecurityException {
- ctor public KeyStoreException(java.lang.String);
ctor public KeyStoreException();
+ ctor public KeyStoreException(java.lang.String);
ctor public KeyStoreException(java.lang.String, java.lang.Throwable);
ctor public KeyStoreException(java.lang.Throwable);
}
@@ -47855,22 +53108,24 @@
}
public class NoSuchAlgorithmException extends java.security.GeneralSecurityException {
- ctor public NoSuchAlgorithmException(java.lang.String);
ctor public NoSuchAlgorithmException();
+ ctor public NoSuchAlgorithmException(java.lang.String);
ctor public NoSuchAlgorithmException(java.lang.String, java.lang.Throwable);
ctor public NoSuchAlgorithmException(java.lang.Throwable);
}
public class NoSuchProviderException extends java.security.GeneralSecurityException {
- ctor public NoSuchProviderException(java.lang.String);
ctor public NoSuchProviderException();
+ ctor public NoSuchProviderException(java.lang.String);
}
public abstract class Permission implements java.security.Guard java.io.Serializable {
ctor public Permission(java.lang.String);
method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;
+ method public abstract boolean equals(java.lang.Object);
method public abstract java.lang.String getActions();
method public final java.lang.String getName();
+ method public abstract int hashCode();
method public abstract boolean implies(java.security.Permission);
method public java.security.PermissionCollection newPermissionCollection();
}
@@ -47978,8 +53233,8 @@
}
public class ProviderException extends java.lang.RuntimeException {
- ctor public ProviderException(java.lang.String);
ctor public ProviderException();
+ ctor public ProviderException(java.lang.String);
ctor public ProviderException(java.lang.String, java.lang.Throwable);
ctor public ProviderException(java.lang.Throwable);
}
@@ -47989,8 +53244,8 @@
}
public class SecureClassLoader extends java.lang.ClassLoader {
- ctor protected SecureClassLoader();
ctor protected SecureClassLoader(java.lang.ClassLoader);
+ ctor protected SecureClassLoader();
method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int, java.security.CodeSource);
method protected final java.lang.Class<?> defineClass(java.lang.String, java.nio.ByteBuffer, java.security.CodeSource);
method protected java.security.PermissionCollection getPermissions(java.security.CodeSource);
@@ -48023,10 +53278,10 @@
method public static deprecated java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String);
method public static java.util.Set<java.lang.String> getAlgorithms(java.lang.String);
method public static java.lang.String getProperty(java.lang.String);
- method public static synchronized java.security.Provider getProvider(java.lang.String);
- method public static synchronized java.security.Provider[] getProviders();
+ method public static java.security.Provider getProvider(java.lang.String);
+ method public static java.security.Provider[] getProviders();
method public static java.security.Provider[] getProviders(java.lang.String);
- method public static synchronized java.security.Provider[] getProviders(java.util.Map<java.lang.String, java.lang.String>);
+ method public static java.security.Provider[] getProviders(java.util.Map<java.lang.String, java.lang.String>);
method public static synchronized int insertProviderAt(java.security.Provider, int);
method public static synchronized void removeProvider(java.lang.String);
method public static void setProperty(java.lang.String, java.lang.String);
@@ -48040,6 +53295,7 @@
public abstract class Signature extends java.security.SignatureSpi {
ctor protected Signature(java.lang.String);
method public final java.lang.String getAlgorithm();
+ method public java.security.SignatureSpi getCurrentSpi();
method public static java.security.Signature getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static java.security.Signature getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static java.security.Signature getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
@@ -48067,8 +53323,8 @@
}
public class SignatureException extends java.security.GeneralSecurityException {
- ctor public SignatureException(java.lang.String);
ctor public SignatureException();
+ ctor public SignatureException(java.lang.String);
ctor public SignatureException(java.lang.String, java.lang.Throwable);
ctor public SignatureException(java.lang.Throwable);
}
@@ -48121,17 +53377,19 @@
}
public class UnrecoverableKeyException extends java.security.UnrecoverableEntryException {
- ctor public UnrecoverableKeyException(java.lang.String);
ctor public UnrecoverableKeyException();
+ ctor public UnrecoverableKeyException(java.lang.String);
}
public final class UnresolvedPermission extends java.security.Permission implements java.io.Serializable {
ctor public UnresolvedPermission(java.lang.String, java.lang.String, java.lang.String, java.security.cert.Certificate[]);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
method public java.lang.String getUnresolvedActions();
method public java.security.cert.Certificate[] getUnresolvedCerts();
method public java.lang.String getUnresolvedName();
method public java.lang.String getUnresolvedType();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -48205,12 +53463,28 @@
}
public class CRLException extends java.security.GeneralSecurityException {
- ctor public CRLException(java.lang.String);
ctor public CRLException();
+ ctor public CRLException(java.lang.String);
ctor public CRLException(java.lang.String, java.lang.Throwable);
ctor public CRLException(java.lang.Throwable);
}
+ public final class CRLReason extends java.lang.Enum {
+ method public static java.security.cert.CRLReason valueOf(java.lang.String);
+ method public static final java.security.cert.CRLReason[] values();
+ enum_constant public static final java.security.cert.CRLReason AA_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason AFFILIATION_CHANGED;
+ enum_constant public static final java.security.cert.CRLReason CA_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason CERTIFICATE_HOLD;
+ enum_constant public static final java.security.cert.CRLReason CESSATION_OF_OPERATION;
+ enum_constant public static final java.security.cert.CRLReason KEY_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason PRIVILEGE_WITHDRAWN;
+ enum_constant public static final java.security.cert.CRLReason REMOVE_FROM_CRL;
+ enum_constant public static final java.security.cert.CRLReason SUPERSEDED;
+ enum_constant public static final java.security.cert.CRLReason UNSPECIFIED;
+ enum_constant public static final java.security.cert.CRLReason UNUSED;
+ }
+
public abstract interface CRLSelector implements java.lang.Cloneable {
method public abstract java.lang.Object clone();
method public abstract boolean match(java.security.cert.CRL);
@@ -48243,10 +53517,10 @@
}
public class CertPathBuilderException extends java.security.GeneralSecurityException {
- ctor public CertPathBuilderException(java.lang.String, java.lang.Throwable);
- ctor public CertPathBuilderException(java.lang.Throwable);
- ctor public CertPathBuilderException(java.lang.String);
ctor public CertPathBuilderException();
+ ctor public CertPathBuilderException(java.lang.String);
+ ctor public CertPathBuilderException(java.lang.Throwable);
+ ctor public CertPathBuilderException(java.lang.String, java.lang.Throwable);
}
public abstract interface CertPathBuilderResult implements java.lang.Cloneable {
@@ -48275,13 +53549,30 @@
}
public class CertPathValidatorException extends java.security.GeneralSecurityException {
- ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int);
- ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable);
- ctor public CertPathValidatorException(java.lang.Throwable);
- ctor public CertPathValidatorException(java.lang.String);
ctor public CertPathValidatorException();
+ ctor public CertPathValidatorException(java.lang.String);
+ ctor public CertPathValidatorException(java.lang.Throwable);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int, java.security.cert.CertPathValidatorException.Reason);
method public java.security.cert.CertPath getCertPath();
method public int getIndex();
+ method public java.security.cert.CertPathValidatorException.Reason getReason();
+ }
+
+ public static final class CertPathValidatorException.BasicReason extends java.lang.Enum implements java.security.cert.CertPathValidatorException.Reason {
+ method public static java.security.cert.CertPathValidatorException.BasicReason valueOf(java.lang.String);
+ method public static final java.security.cert.CertPathValidatorException.BasicReason[] values();
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason ALGORITHM_CONSTRAINED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason EXPIRED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason INVALID_SIGNATURE;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason NOT_YET_VALID;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason REVOKED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason UNDETERMINED_REVOCATION_STATUS;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason UNSPECIFIED;
+ }
+
+ public static abstract interface CertPathValidatorException.Reason implements java.io.Serializable {
}
public abstract interface CertPathValidatorResult implements java.lang.Cloneable {
@@ -48312,10 +53603,10 @@
}
public class CertStoreException extends java.security.GeneralSecurityException {
- ctor public CertStoreException(java.lang.String, java.lang.Throwable);
- ctor public CertStoreException(java.lang.Throwable);
- ctor public CertStoreException(java.lang.String);
ctor public CertStoreException();
+ ctor public CertStoreException(java.lang.String);
+ ctor public CertStoreException(java.lang.Throwable);
+ ctor public CertStoreException(java.lang.String, java.lang.Throwable);
}
public abstract interface CertStoreParameters implements java.lang.Cloneable {
@@ -48345,22 +53636,22 @@
}
public class CertificateEncodingException extends java.security.cert.CertificateException {
- ctor public CertificateEncodingException(java.lang.String);
ctor public CertificateEncodingException();
+ ctor public CertificateEncodingException(java.lang.String);
ctor public CertificateEncodingException(java.lang.String, java.lang.Throwable);
ctor public CertificateEncodingException(java.lang.Throwable);
}
public class CertificateException extends java.security.GeneralSecurityException {
- ctor public CertificateException(java.lang.String);
ctor public CertificateException();
+ ctor public CertificateException(java.lang.String);
ctor public CertificateException(java.lang.String, java.lang.Throwable);
ctor public CertificateException(java.lang.Throwable);
}
public class CertificateExpiredException extends java.security.cert.CertificateException {
- ctor public CertificateExpiredException(java.lang.String);
ctor public CertificateExpiredException();
+ ctor public CertificateExpiredException(java.lang.String);
}
public class CertificateFactory {
@@ -48393,28 +53684,44 @@
}
public class CertificateNotYetValidException extends java.security.cert.CertificateException {
- ctor public CertificateNotYetValidException(java.lang.String);
ctor public CertificateNotYetValidException();
+ ctor public CertificateNotYetValidException(java.lang.String);
}
public class CertificateParsingException extends java.security.cert.CertificateException {
- ctor public CertificateParsingException(java.lang.String);
ctor public CertificateParsingException();
+ ctor public CertificateParsingException(java.lang.String);
ctor public CertificateParsingException(java.lang.String, java.lang.Throwable);
ctor public CertificateParsingException(java.lang.Throwable);
}
+ public class CertificateRevokedException extends java.security.cert.CertificateException {
+ ctor public CertificateRevokedException(java.util.Date, java.security.cert.CRLReason, javax.security.auth.x500.X500Principal, java.util.Map<java.lang.String, java.security.cert.Extension>);
+ method public javax.security.auth.x500.X500Principal getAuthorityName();
+ method public java.util.Map<java.lang.String, java.security.cert.Extension> getExtensions();
+ method public java.util.Date getInvalidityDate();
+ method public java.util.Date getRevocationDate();
+ method public java.security.cert.CRLReason getRevocationReason();
+ }
+
public class CollectionCertStoreParameters implements java.security.cert.CertStoreParameters {
- ctor public CollectionCertStoreParameters();
ctor public CollectionCertStoreParameters(java.util.Collection<?>);
+ ctor public CollectionCertStoreParameters();
method public java.lang.Object clone();
method public java.util.Collection<?> getCollection();
}
+ public abstract interface Extension {
+ method public abstract void encode(java.io.OutputStream) throws java.io.IOException;
+ method public abstract java.lang.String getId();
+ method public abstract byte[] getValue();
+ method public abstract boolean isCritical();
+ }
+
public class LDAPCertStoreParameters implements java.security.cert.CertStoreParameters {
ctor public LDAPCertStoreParameters(java.lang.String, int);
- ctor public LDAPCertStoreParameters();
ctor public LDAPCertStoreParameters(java.lang.String);
+ ctor public LDAPCertStoreParameters();
method public java.lang.Object clone();
method public int getPort();
method public java.lang.String getServerName();
@@ -48481,6 +53788,19 @@
method public void setTrustAnchors(java.util.Set<java.security.cert.TrustAnchor>) throws java.security.InvalidAlgorithmParameterException;
}
+ public final class PKIXReason extends java.lang.Enum implements java.security.cert.CertPathValidatorException.Reason {
+ method public static java.security.cert.PKIXReason valueOf(java.lang.String);
+ method public static final java.security.cert.PKIXReason[] values();
+ enum_constant public static final java.security.cert.PKIXReason INVALID_KEY_USAGE;
+ enum_constant public static final java.security.cert.PKIXReason INVALID_NAME;
+ enum_constant public static final java.security.cert.PKIXReason INVALID_POLICY;
+ enum_constant public static final java.security.cert.PKIXReason NAME_CHAINING;
+ enum_constant public static final java.security.cert.PKIXReason NOT_CA_CERT;
+ enum_constant public static final java.security.cert.PKIXReason NO_TRUST_ANCHOR;
+ enum_constant public static final java.security.cert.PKIXReason PATH_TOO_LONG;
+ enum_constant public static final java.security.cert.PKIXReason UNRECOGNIZED_CRIT_EXT;
+ }
+
public abstract interface PolicyNode {
method public abstract java.util.Iterator<? extends java.security.cert.PolicyNode> getChildren();
method public abstract int getDepth();
@@ -48500,8 +53820,8 @@
public class TrustAnchor {
ctor public TrustAnchor(java.security.cert.X509Certificate, byte[]);
- ctor public TrustAnchor(java.lang.String, java.security.PublicKey, byte[]);
ctor public TrustAnchor(javax.security.auth.x500.X500Principal, java.security.PublicKey, byte[]);
+ ctor public TrustAnchor(java.lang.String, java.security.PublicKey, byte[]);
method public final javax.security.auth.x500.X500Principal getCA();
method public final java.lang.String getCAName();
method public final java.security.PublicKey getCAPublicKey();
@@ -48534,6 +53854,7 @@
method public javax.security.auth.x500.X500Principal getCertificateIssuer();
method public abstract byte[] getEncoded() throws java.security.cert.CRLException;
method public abstract java.util.Date getRevocationDate();
+ method public java.security.cert.CRLReason getRevocationReason();
method public abstract java.math.BigInteger getSerialNumber();
method public abstract boolean hasExtensions();
method public abstract java.lang.String toString();
@@ -48809,8 +54130,8 @@
}
public class EllipticCurve {
- ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger, byte[]);
ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger);
+ ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger, byte[]);
method public java.math.BigInteger getA();
method public java.math.BigInteger getB();
method public java.security.spec.ECField getField();
@@ -48824,15 +54145,15 @@
}
public class InvalidKeySpecException extends java.security.GeneralSecurityException {
- ctor public InvalidKeySpecException(java.lang.String);
ctor public InvalidKeySpecException();
+ ctor public InvalidKeySpecException(java.lang.String);
ctor public InvalidKeySpecException(java.lang.String, java.lang.Throwable);
ctor public InvalidKeySpecException(java.lang.Throwable);
}
public class InvalidParameterSpecException extends java.security.GeneralSecurityException {
- ctor public InvalidParameterSpecException(java.lang.String);
ctor public InvalidParameterSpecException();
+ ctor public InvalidParameterSpecException(java.lang.String);
}
public abstract interface KeySpec {
@@ -48853,8 +54174,8 @@
}
public class PSSParameterSpec implements java.security.spec.AlgorithmParameterSpec {
- ctor public PSSParameterSpec(int);
ctor public PSSParameterSpec(java.lang.String, java.lang.String, java.security.spec.AlgorithmParameterSpec, int, int);
+ ctor public PSSParameterSpec(int);
method public java.lang.String getDigestAlgorithm();
method public java.lang.String getMGFAlgorithm();
method public java.security.spec.AlgorithmParameterSpec getMGFParameters();
@@ -48923,28 +54244,28 @@
public abstract interface Array {
method public abstract void free() throws java.sql.SQLException;
method public abstract java.lang.Object getArray() throws java.sql.SQLException;
+ method public abstract java.lang.Object getArray(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.lang.Object getArray(long, int) throws java.sql.SQLException;
method public abstract java.lang.Object getArray(long, int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
- method public abstract java.lang.Object getArray(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract int getBaseType() throws java.sql.SQLException;
method public abstract java.lang.String getBaseTypeName() throws java.sql.SQLException;
method public abstract java.sql.ResultSet getResultSet() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.sql.ResultSet getResultSet(long, int) throws java.sql.SQLException;
method public abstract java.sql.ResultSet getResultSet(long, int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
- method public abstract java.sql.ResultSet getResultSet(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
}
- public class BatchUpdateException extends java.sql.SQLException implements java.io.Serializable {
+ public class BatchUpdateException extends java.sql.SQLException {
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[]);
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int[]);
+ ctor public BatchUpdateException(java.lang.String, int[]);
+ ctor public BatchUpdateException(int[]);
ctor public BatchUpdateException();
ctor public BatchUpdateException(java.lang.Throwable);
ctor public BatchUpdateException(int[], java.lang.Throwable);
ctor public BatchUpdateException(java.lang.String, int[], java.lang.Throwable);
ctor public BatchUpdateException(java.lang.String, java.lang.String, int[], java.lang.Throwable);
ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[], java.lang.Throwable);
- ctor public BatchUpdateException(int[]);
- ctor public BatchUpdateException(java.lang.String, int[]);
- ctor public BatchUpdateException(java.lang.String, java.lang.String, int[]);
- ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[]);
method public int[] getUpdateCounts();
}
@@ -48954,8 +54275,8 @@
method public abstract java.io.InputStream getBinaryStream(long, long) throws java.sql.SQLException;
method public abstract byte[] getBytes(long, int) throws java.sql.SQLException;
method public abstract long length() throws java.sql.SQLException;
- method public abstract long position(java.sql.Blob, long) throws java.sql.SQLException;
method public abstract long position(byte[], long) throws java.sql.SQLException;
+ method public abstract long position(java.sql.Blob, long) throws java.sql.SQLException;
method public abstract java.io.OutputStream setBinaryStream(long) throws java.sql.SQLException;
method public abstract int setBytes(long, byte[]) throws java.sql.SQLException;
method public abstract int setBytes(long, byte[], int, int) throws java.sql.SQLException;
@@ -48965,8 +54286,8 @@
public abstract interface CallableStatement implements java.sql.PreparedStatement {
method public abstract java.sql.Array getArray(int) throws java.sql.SQLException;
method public abstract java.sql.Array getArray(java.lang.String) throws java.sql.SQLException;
- method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
method public abstract deprecated java.math.BigDecimal getBigDecimal(int, int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
method public abstract java.sql.Blob getBlob(int) throws java.sql.SQLException;
method public abstract java.sql.Blob getBlob(java.lang.String) throws java.sql.SQLException;
@@ -49061,9 +54382,9 @@
method public abstract void setNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
method public abstract void setObject(java.lang.String, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
method public abstract void setRowId(java.lang.String, java.sql.RowId) throws java.sql.SQLException;
method public abstract void setSQLXML(java.lang.String, java.sql.SQLXML) throws java.sql.SQLException;
method public abstract void setShort(java.lang.String, short) throws java.sql.SQLException;
@@ -49092,8 +54413,8 @@
method public abstract java.io.Reader getCharacterStream(long, long) throws java.sql.SQLException;
method public abstract java.lang.String getSubString(long, int) throws java.sql.SQLException;
method public abstract long length() throws java.sql.SQLException;
- method public abstract long position(java.sql.Clob, long) throws java.sql.SQLException;
method public abstract long position(java.lang.String, long) throws java.sql.SQLException;
+ method public abstract long position(java.sql.Clob, long) throws java.sql.SQLException;
method public abstract java.io.OutputStream setAsciiStream(long) throws java.sql.SQLException;
method public abstract java.io.Writer setCharacterStream(long) throws java.sql.SQLException;
method public abstract int setString(long, java.lang.String) throws java.sql.SQLException;
@@ -49131,10 +54452,10 @@
method public abstract java.sql.CallableStatement prepareCall(java.lang.String, int, int) throws java.sql.SQLException;
method public abstract java.sql.CallableStatement prepareCall(java.lang.String, int, int, int) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String) throws java.sql.SQLException;
- method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int) throws java.sql.SQLException;
- method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int[]) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int, int) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int[]) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, java.lang.String[]) throws java.sql.SQLException;
method public abstract void releaseSavepoint(java.sql.Savepoint) throws java.sql.SQLException;
method public abstract void rollback() throws java.sql.SQLException;
@@ -49156,7 +54477,7 @@
field public static final int TRANSACTION_SERIALIZABLE = 8; // 0x8
}
- public class DataTruncation extends java.sql.SQLWarning implements java.io.Serializable {
+ public class DataTruncation extends java.sql.SQLWarning {
ctor public DataTruncation(int, boolean, boolean, int, int);
ctor public DataTruncation(int, boolean, boolean, int, int, java.lang.Throwable);
method public int getDataSize();
@@ -49418,17 +54739,17 @@
}
public class DriverManager {
- method public static void deregisterDriver(java.sql.Driver) throws java.sql.SQLException;
- method public static java.sql.Connection getConnection(java.lang.String) throws java.sql.SQLException;
+ method public static synchronized void deregisterDriver(java.sql.Driver) throws java.sql.SQLException;
method public static java.sql.Connection getConnection(java.lang.String, java.util.Properties) throws java.sql.SQLException;
method public static java.sql.Connection getConnection(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public static java.sql.Connection getConnection(java.lang.String) throws java.sql.SQLException;
method public static java.sql.Driver getDriver(java.lang.String) throws java.sql.SQLException;
method public static java.util.Enumeration<java.sql.Driver> getDrivers();
method public static deprecated java.io.PrintStream getLogStream();
method public static java.io.PrintWriter getLogWriter();
method public static int getLoginTimeout();
method public static void println(java.lang.String);
- method public static void registerDriver(java.sql.Driver) throws java.sql.SQLException;
+ method public static synchronized void registerDriver(java.sql.Driver) throws java.sql.SQLException;
method public static deprecated void setLogStream(java.io.PrintStream);
method public static void setLogWriter(java.io.PrintWriter);
method public static void setLoginTimeout(int);
@@ -49507,8 +54828,8 @@
method public abstract void setNString(int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(int, int) throws java.sql.SQLException;
method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
- method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void setObject(int, java.lang.Object, int, int) throws java.sql.SQLException;
method public abstract void setRef(int, java.sql.Ref) throws java.sql.SQLException;
method public abstract void setRowId(int, java.sql.RowId) throws java.sql.SQLException;
@@ -49525,8 +54846,8 @@
public abstract interface Ref {
method public abstract java.lang.String getBaseTypeName() throws java.sql.SQLException;
- method public abstract java.lang.Object getObject() throws java.sql.SQLException;
method public abstract java.lang.Object getObject(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject() throws java.sql.SQLException;
method public abstract void setObject(java.lang.Object) throws java.sql.SQLException;
}
@@ -49544,10 +54865,10 @@
method public abstract java.sql.Array getArray(java.lang.String) throws java.sql.SQLException;
method public abstract java.io.InputStream getAsciiStream(int) throws java.sql.SQLException;
method public abstract java.io.InputStream getAsciiStream(java.lang.String) throws java.sql.SQLException;
- method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
method public abstract deprecated java.math.BigDecimal getBigDecimal(int, int) throws java.sql.SQLException;
- method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
method public abstract deprecated java.math.BigDecimal getBigDecimal(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
method public abstract java.io.InputStream getBinaryStream(int) throws java.sql.SQLException;
method public abstract java.io.InputStream getBinaryStream(java.lang.String) throws java.sql.SQLException;
method public abstract java.sql.Blob getBlob(int) throws java.sql.SQLException;
@@ -49565,8 +54886,8 @@
method public abstract int getConcurrency() throws java.sql.SQLException;
method public abstract java.lang.String getCursorName() throws java.sql.SQLException;
method public abstract java.sql.Date getDate(int) throws java.sql.SQLException;
- method public abstract java.sql.Date getDate(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Date getDate(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Date getDate(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
method public abstract double getDouble(int) throws java.sql.SQLException;
method public abstract double getDouble(java.lang.String) throws java.sql.SQLException;
@@ -49587,8 +54908,8 @@
method public abstract java.lang.String getNString(int) throws java.sql.SQLException;
method public abstract java.lang.String getNString(java.lang.String) throws java.sql.SQLException;
method public abstract java.lang.Object getObject(int) throws java.sql.SQLException;
- method public abstract java.lang.Object getObject(int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.lang.Object getObject(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.lang.Object getObject(java.lang.String, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.sql.Ref getRef(int) throws java.sql.SQLException;
method public abstract java.sql.Ref getRef(java.lang.String) throws java.sql.SQLException;
@@ -49603,12 +54924,12 @@
method public abstract java.lang.String getString(int) throws java.sql.SQLException;
method public abstract java.lang.String getString(java.lang.String) throws java.sql.SQLException;
method public abstract java.sql.Time getTime(int) throws java.sql.SQLException;
- method public abstract java.sql.Time getTime(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Time getTime(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Time getTime(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Timestamp getTimestamp(int) throws java.sql.SQLException;
- method public abstract java.sql.Timestamp getTimestamp(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Timestamp getTimestamp(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Timestamp getTimestamp(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
method public abstract int getType() throws java.sql.SQLException;
method public abstract java.net.URL getURL(int) throws java.sql.SQLException;
@@ -49698,10 +55019,10 @@
method public abstract void updateNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
method public abstract void updateNull(int) throws java.sql.SQLException;
method public abstract void updateNull(java.lang.String) throws java.sql.SQLException;
- method public abstract void updateObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void updateObject(int, java.lang.Object, int) throws java.sql.SQLException;
- method public abstract void updateObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void updateObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void updateObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void updateObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
method public abstract void updateRef(int, java.sql.Ref) throws java.sql.SQLException;
method public abstract void updateRef(java.lang.String, java.sql.Ref) throws java.sql.SQLException;
method public abstract void updateRow() throws java.sql.SQLException;
@@ -49780,10 +55101,10 @@
ctor public SQLClientInfoException(java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
ctor public SQLClientInfoException(java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
ctor public SQLClientInfoException(java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
- ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
- ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
ctor public SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
ctor public SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
method public java.util.Map<java.lang.String, java.sql.ClientInfoStatus> getFailedProperties();
}
@@ -49804,11 +55125,11 @@
ctor public SQLDataException(java.lang.String, java.lang.String, int, java.lang.Throwable);
}
- public class SQLException extends java.lang.Exception implements java.lang.Iterable java.io.Serializable {
- ctor public SQLException();
- ctor public SQLException(java.lang.String);
- ctor public SQLException(java.lang.String, java.lang.String);
+ public class SQLException extends java.lang.Exception implements java.lang.Iterable {
ctor public SQLException(java.lang.String, java.lang.String, int);
+ ctor public SQLException(java.lang.String, java.lang.String);
+ ctor public SQLException(java.lang.String);
+ ctor public SQLException();
ctor public SQLException(java.lang.Throwable);
ctor public SQLException(java.lang.String, java.lang.Throwable);
ctor public SQLException(java.lang.String, java.lang.String, java.lang.Throwable);
@@ -49935,7 +55256,7 @@
method public abstract void writeURL(java.net.URL) throws java.sql.SQLException;
}
- public final class SQLPermission extends java.security.BasicPermission implements java.security.Guard java.io.Serializable {
+ public final class SQLPermission extends java.security.BasicPermission {
ctor public SQLPermission(java.lang.String);
ctor public SQLPermission(java.lang.String, java.lang.String);
}
@@ -50006,11 +55327,11 @@
ctor public SQLTransientException(java.lang.String, java.lang.String, int, java.lang.Throwable);
}
- public class SQLWarning extends java.sql.SQLException implements java.io.Serializable {
- ctor public SQLWarning();
- ctor public SQLWarning(java.lang.String);
- ctor public SQLWarning(java.lang.String, java.lang.String);
+ public class SQLWarning extends java.sql.SQLException {
ctor public SQLWarning(java.lang.String, java.lang.String, int);
+ ctor public SQLWarning(java.lang.String, java.lang.String);
+ ctor public SQLWarning(java.lang.String);
+ ctor public SQLWarning();
ctor public SQLWarning(java.lang.Throwable);
ctor public SQLWarning(java.lang.String, java.lang.Throwable);
ctor public SQLWarning(java.lang.String, java.lang.String, java.lang.Throwable);
@@ -50099,15 +55420,15 @@
}
public class Timestamp extends java.util.Date {
- ctor public deprecated Timestamp(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
+ ctor public deprecated Timestamp(int, int, int, int, int, int, int);
ctor public Timestamp(long);
method public boolean after(java.sql.Timestamp);
method public boolean before(java.sql.Timestamp);
method public int compareTo(java.sql.Timestamp);
method public boolean equals(java.sql.Timestamp);
method public int getNanos();
- method public void setNanos(int) throws java.lang.IllegalArgumentException;
- method public static java.sql.Timestamp valueOf(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public void setNanos(int);
+ method public static java.sql.Timestamp valueOf(java.lang.String);
}
public class Types {
@@ -50187,11 +55508,11 @@
}
public class AttributedString {
+ ctor public AttributedString(java.lang.String);
+ ctor public AttributedString(java.lang.String, java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>);
ctor public AttributedString(java.text.AttributedCharacterIterator);
ctor public AttributedString(java.text.AttributedCharacterIterator, int, int);
ctor public AttributedString(java.text.AttributedCharacterIterator, int, int, java.text.AttributedCharacterIterator.Attribute[]);
- ctor public AttributedString(java.lang.String);
- ctor public AttributedString(java.lang.String, java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>);
method public void addAttribute(java.text.AttributedCharacterIterator.Attribute, java.lang.Object);
method public void addAttribute(java.text.AttributedCharacterIterator.Attribute, java.lang.Object, int, int);
method public void addAttributes(java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>, int, int);
@@ -50201,9 +55522,9 @@
}
public final class Bidi {
+ ctor public Bidi(java.lang.String, int);
ctor public Bidi(java.text.AttributedCharacterIterator);
ctor public Bidi(char[], int, byte[], int, int, int);
- ctor public Bidi(java.lang.String, int);
method public boolean baseIsLeftToRight();
method public java.text.Bidi createLineBidi(int, int);
method public int getBaseLevel();
@@ -50230,7 +55551,7 @@
method public abstract int current();
method public abstract int first();
method public abstract int following(int);
- method public static java.util.Locale[] getAvailableLocales();
+ method public static synchronized java.util.Locale[] getAvailableLocales();
method public static java.text.BreakIterator getCharacterInstance();
method public static java.text.BreakIterator getCharacterInstance(java.util.Locale);
method public static java.text.BreakIterator getLineInstance();
@@ -50242,8 +55563,8 @@
method public static java.text.BreakIterator getWordInstance(java.util.Locale);
method public boolean isBoundary(int);
method public abstract int last();
- method public abstract int next();
method public abstract int next(int);
+ method public abstract int next();
method public int preceding(int);
method public abstract int previous();
method public void setText(java.lang.String);
@@ -50266,11 +55587,11 @@
}
public class ChoiceFormat extends java.text.NumberFormat {
- ctor public ChoiceFormat(double[], java.lang.String[]);
ctor public ChoiceFormat(java.lang.String);
+ ctor public ChoiceFormat(double[], java.lang.String[]);
method public void applyPattern(java.lang.String);
- method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.Object[] getFormats();
method public double[] getLimits();
method public static final double nextDouble(double);
@@ -50290,8 +55611,8 @@
method public void reset();
method public static final short secondaryOrder(int);
method public void setOffset(int);
- method public void setText(java.text.CharacterIterator);
method public void setText(java.lang.String);
+ method public void setText(java.text.CharacterIterator);
method public static final short tertiaryOrder(int);
field public static final int NULLORDER = -1; // 0xffffffff
}
@@ -50306,18 +55627,18 @@
public abstract class Collator implements java.lang.Cloneable java.util.Comparator {
ctor protected Collator();
method public java.lang.Object clone();
- method public int compare(java.lang.Object, java.lang.Object);
method public abstract int compare(java.lang.String, java.lang.String);
+ method public int compare(java.lang.Object, java.lang.Object);
method public boolean equals(java.lang.String, java.lang.String);
- method public static java.util.Locale[] getAvailableLocales();
+ method public static synchronized java.util.Locale[] getAvailableLocales();
method public abstract java.text.CollationKey getCollationKey(java.lang.String);
- method public int getDecomposition();
- method public static java.text.Collator getInstance();
- method public static java.text.Collator getInstance(java.util.Locale);
- method public int getStrength();
+ method public synchronized int getDecomposition();
+ method public static synchronized java.text.Collator getInstance();
+ method public static synchronized java.text.Collator getInstance(java.util.Locale);
+ method public synchronized int getStrength();
method public abstract int hashCode();
- method public void setDecomposition(int);
- method public void setStrength(int);
+ method public synchronized void setDecomposition(int);
+ method public synchronized void setStrength(int);
field public static final int CANONICAL_DECOMPOSITION = 1; // 0x1
field public static final int FULL_DECOMPOSITION = 2; // 0x2
field public static final int IDENTICAL = 3; // 0x3
@@ -50330,8 +55651,8 @@
public abstract class DateFormat extends java.text.Format {
ctor protected DateFormat();
method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.String format(java.util.Date);
method public abstract java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(java.util.Date);
method public static java.util.Locale[] getAvailableLocales();
method public java.util.Calendar getCalendar();
method public static final java.text.DateFormat getDateInstance();
@@ -50436,9 +55757,9 @@
ctor public DecimalFormat(java.lang.String, java.text.DecimalFormatSymbols);
method public void applyLocalizedPattern(java.lang.String);
method public void applyPattern(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.text.DecimalFormatSymbols getDecimalFormatSymbols();
method public int getGroupingSize();
method public int getMultiplier();
@@ -50474,15 +55795,17 @@
method public java.lang.String getExponentSeparator();
method public char getGroupingSeparator();
method public java.lang.String getInfinity();
- method public static java.text.DecimalFormatSymbols getInstance();
- method public static java.text.DecimalFormatSymbols getInstance(java.util.Locale);
+ method public static final java.text.DecimalFormatSymbols getInstance();
+ method public static final java.text.DecimalFormatSymbols getInstance(java.util.Locale);
method public java.lang.String getInternationalCurrencySymbol();
method public char getMinusSign();
+ method public java.lang.String getMinusSignString();
method public char getMonetaryDecimalSeparator();
method public java.lang.String getNaN();
method public char getPatternSeparator();
method public char getPerMill();
method public char getPercent();
+ method public java.lang.String getPercentString();
method public char getZeroDigit();
method public void setCurrency(java.util.Currency);
method public void setCurrencySymbol(java.lang.String);
@@ -50519,8 +55842,8 @@
method public final java.lang.String format(java.lang.Object);
method public abstract java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object);
- method public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException;
method public abstract java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException;
}
public static class Format.Field extends java.text.AttributedCharacterIterator.Attribute {
@@ -50528,17 +55851,17 @@
}
public class MessageFormat extends java.text.Format {
- ctor public MessageFormat(java.lang.String, java.util.Locale);
ctor public MessageFormat(java.lang.String);
+ ctor public MessageFormat(java.lang.String, java.util.Locale);
method public void applyPattern(java.lang.String);
method public final java.lang.StringBuffer format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.text.Format[] getFormats();
method public java.text.Format[] getFormatsByArgumentIndex();
method public java.util.Locale getLocale();
- method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
method public java.lang.Object[] parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
method public void setFormat(int, java.text.Format);
method public void setFormatByArgumentIndex(int, java.text.Format);
@@ -50569,11 +55892,11 @@
public abstract class NumberFormat extends java.text.Format {
ctor protected NumberFormat();
- method public final java.lang.String format(double);
- method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.String format(long);
- method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(double);
+ method public final java.lang.String format(long);
+ method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
method public static java.util.Locale[] getAvailableLocales();
method public java.util.Currency getCurrency();
method public static final java.text.NumberFormat getCurrencyInstance();
@@ -50593,8 +55916,8 @@
method public java.math.RoundingMode getRoundingMode();
method public boolean isGroupingUsed();
method public boolean isParseIntegerOnly();
- method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
method public abstract java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
method public void setCurrency(java.util.Currency);
method public void setGroupingUsed(boolean);
@@ -50638,10 +55961,10 @@
public class RuleBasedCollator extends java.text.Collator {
ctor public RuleBasedCollator(java.lang.String) throws java.text.ParseException;
- method public int compare(java.lang.String, java.lang.String);
- method public java.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public synchronized int compare(java.lang.String, java.lang.String);
method public java.text.CollationElementIterator getCollationElementIterator(java.lang.String);
- method public java.text.CollationKey getCollationKey(java.lang.String);
+ method public java.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public synchronized java.text.CollationKey getCollationKey(java.lang.String);
method public java.lang.String getRules();
method public int hashCode();
}
@@ -50649,8 +55972,8 @@
public class SimpleDateFormat extends java.text.DateFormat {
ctor public SimpleDateFormat();
ctor public SimpleDateFormat(java.lang.String);
- ctor public SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols);
ctor public SimpleDateFormat(java.lang.String, java.util.Locale);
+ ctor public SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols);
method public void applyLocalizedPattern(java.lang.String);
method public void applyPattern(java.lang.String);
method public java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
@@ -50797,7 +56120,7 @@
method public int size();
}
- public class ArrayList extends java.util.AbstractList implements java.lang.Cloneable java.util.RandomAccess java.io.Serializable {
+ public class ArrayList extends java.util.AbstractList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
ctor public ArrayList(int);
ctor public ArrayList();
ctor public ArrayList(java.util.Collection<? extends E>);
@@ -50810,109 +56133,109 @@
public class Arrays {
method public static java.util.List<T> asList(T...);
- method public static int binarySearch(byte[], byte);
- method public static int binarySearch(byte[], int, int, byte);
+ method public static int binarySearch(long[], long);
+ method public static int binarySearch(long[], int, int, long);
+ method public static int binarySearch(int[], int);
+ method public static int binarySearch(int[], int, int, int);
+ method public static int binarySearch(short[], short);
+ method public static int binarySearch(short[], int, int, short);
method public static int binarySearch(char[], char);
method public static int binarySearch(char[], int, int, char);
+ method public static int binarySearch(byte[], byte);
+ method public static int binarySearch(byte[], int, int, byte);
method public static int binarySearch(double[], double);
method public static int binarySearch(double[], int, int, double);
method public static int binarySearch(float[], float);
method public static int binarySearch(float[], int, int, float);
- method public static int binarySearch(int[], int);
- method public static int binarySearch(int[], int, int, int);
- method public static int binarySearch(long[], long);
- method public static int binarySearch(long[], int, int, long);
method public static int binarySearch(java.lang.Object[], java.lang.Object);
method public static int binarySearch(java.lang.Object[], int, int, java.lang.Object);
method public static int binarySearch(T[], T, java.util.Comparator<? super T>);
method public static int binarySearch(T[], int, int, T, java.util.Comparator<? super T>);
- method public static int binarySearch(short[], short);
- method public static int binarySearch(short[], int, int, short);
- method public static boolean[] copyOf(boolean[], int);
- method public static byte[] copyOf(byte[], int);
- method public static char[] copyOf(char[], int);
- method public static double[] copyOf(double[], int);
- method public static float[] copyOf(float[], int);
- method public static int[] copyOf(int[], int);
- method public static long[] copyOf(long[], int);
- method public static short[] copyOf(short[], int);
method public static T[] copyOf(T[], int);
method public static T[] copyOf(U[], int, java.lang.Class<? extends T[]>);
- method public static boolean[] copyOfRange(boolean[], int, int);
- method public static byte[] copyOfRange(byte[], int, int);
- method public static char[] copyOfRange(char[], int, int);
- method public static double[] copyOfRange(double[], int, int);
- method public static float[] copyOfRange(float[], int, int);
- method public static int[] copyOfRange(int[], int, int);
- method public static long[] copyOfRange(long[], int, int);
- method public static short[] copyOfRange(short[], int, int);
+ method public static byte[] copyOf(byte[], int);
+ method public static short[] copyOf(short[], int);
+ method public static int[] copyOf(int[], int);
+ method public static long[] copyOf(long[], int);
+ method public static char[] copyOf(char[], int);
+ method public static float[] copyOf(float[], int);
+ method public static double[] copyOf(double[], int);
+ method public static boolean[] copyOf(boolean[], int);
method public static T[] copyOfRange(T[], int, int);
method public static T[] copyOfRange(U[], int, int, java.lang.Class<? extends T[]>);
+ method public static byte[] copyOfRange(byte[], int, int);
+ method public static short[] copyOfRange(short[], int, int);
+ method public static int[] copyOfRange(int[], int, int);
+ method public static long[] copyOfRange(long[], int, int);
+ method public static char[] copyOfRange(char[], int, int);
+ method public static float[] copyOfRange(float[], int, int);
+ method public static double[] copyOfRange(double[], int, int);
+ method public static boolean[] copyOfRange(boolean[], int, int);
method public static boolean deepEquals(java.lang.Object[], java.lang.Object[]);
method public static int deepHashCode(java.lang.Object[]);
method public static java.lang.String deepToString(java.lang.Object[]);
- method public static boolean equals(byte[], byte[]);
+ method public static boolean equals(long[], long[]);
+ method public static boolean equals(int[], int[]);
method public static boolean equals(short[], short[]);
method public static boolean equals(char[], char[]);
- method public static boolean equals(int[], int[]);
- method public static boolean equals(long[], long[]);
- method public static boolean equals(float[], float[]);
- method public static boolean equals(double[], double[]);
+ method public static boolean equals(byte[], byte[]);
method public static boolean equals(boolean[], boolean[]);
+ method public static boolean equals(double[], double[]);
+ method public static boolean equals(float[], float[]);
method public static boolean equals(java.lang.Object[], java.lang.Object[]);
- method public static void fill(byte[], byte);
- method public static void fill(byte[], int, int, byte);
+ method public static void fill(long[], long);
+ method public static void fill(long[], int, int, long);
+ method public static void fill(int[], int);
+ method public static void fill(int[], int, int, int);
method public static void fill(short[], short);
method public static void fill(short[], int, int, short);
method public static void fill(char[], char);
method public static void fill(char[], int, int, char);
- method public static void fill(int[], int);
- method public static void fill(int[], int, int, int);
- method public static void fill(long[], long);
- method public static void fill(long[], int, int, long);
- method public static void fill(float[], float);
- method public static void fill(float[], int, int, float);
- method public static void fill(double[], double);
- method public static void fill(double[], int, int, double);
+ method public static void fill(byte[], byte);
+ method public static void fill(byte[], int, int, byte);
method public static void fill(boolean[], boolean);
method public static void fill(boolean[], int, int, boolean);
+ method public static void fill(double[], double);
+ method public static void fill(double[], int, int, double);
+ method public static void fill(float[], float);
+ method public static void fill(float[], int, int, float);
method public static void fill(java.lang.Object[], java.lang.Object);
method public static void fill(java.lang.Object[], int, int, java.lang.Object);
- method public static int hashCode(boolean[]);
+ method public static int hashCode(long[]);
method public static int hashCode(int[]);
method public static int hashCode(short[]);
method public static int hashCode(char[]);
method public static int hashCode(byte[]);
- method public static int hashCode(long[]);
+ method public static int hashCode(boolean[]);
method public static int hashCode(float[]);
method public static int hashCode(double[]);
method public static int hashCode(java.lang.Object[]);
- method public static void sort(byte[]);
- method public static void sort(byte[], int, int);
- method public static void sort(char[]);
- method public static void sort(char[], int, int);
- method public static void sort(double[]);
- method public static void sort(double[], int, int);
- method public static void sort(float[]);
- method public static void sort(float[], int, int);
method public static void sort(int[]);
method public static void sort(int[], int, int);
method public static void sort(long[]);
method public static void sort(long[], int, int);
method public static void sort(short[]);
method public static void sort(short[], int, int);
+ method public static void sort(char[]);
+ method public static void sort(char[], int, int);
+ method public static void sort(byte[]);
+ method public static void sort(byte[], int, int);
+ method public static void sort(float[]);
+ method public static void sort(float[], int, int);
+ method public static void sort(double[]);
+ method public static void sort(double[], int, int);
method public static void sort(java.lang.Object[]);
method public static void sort(java.lang.Object[], int, int);
- method public static void sort(T[], int, int, java.util.Comparator<? super T>);
method public static void sort(T[], java.util.Comparator<? super T>);
- method public static java.lang.String toString(boolean[]);
- method public static java.lang.String toString(byte[]);
- method public static java.lang.String toString(char[]);
- method public static java.lang.String toString(double[]);
- method public static java.lang.String toString(float[]);
- method public static java.lang.String toString(int[]);
+ method public static void sort(T[], int, int, java.util.Comparator<? super T>);
method public static java.lang.String toString(long[]);
+ method public static java.lang.String toString(int[]);
method public static java.lang.String toString(short[]);
+ method public static java.lang.String toString(char[]);
+ method public static java.lang.String toString(byte[]);
+ method public static java.lang.String toString(boolean[]);
+ method public static java.lang.String toString(float[]);
+ method public static java.lang.String toString(double[]);
method public static java.lang.String toString(java.lang.Object[]);
}
@@ -50923,8 +56246,8 @@
method public void andNot(java.util.BitSet);
method public int cardinality();
method public void clear(int);
- method public void clear();
method public void clear(int, int);
+ method public void clear();
method public java.lang.Object clone();
method public void flip(int);
method public void flip(int, int);
@@ -50940,8 +56263,8 @@
method public int previousSetBit(int);
method public void set(int);
method public void set(int, boolean);
- method public void set(int, int, boolean);
method public void set(int, int);
+ method public void set(int, int, boolean);
method public int size();
method public byte[] toByteArray();
method public long[] toLongArray();
@@ -50973,10 +56296,10 @@
method public java.util.Map<java.lang.String, java.lang.Integer> getDisplayNames(int, int, java.util.Locale);
method public int getFirstDayOfWeek();
method public abstract int getGreatestMinimum(int);
- method public static synchronized java.util.Calendar getInstance();
- method public static synchronized java.util.Calendar getInstance(java.util.Locale);
- method public static synchronized java.util.Calendar getInstance(java.util.TimeZone);
- method public static synchronized java.util.Calendar getInstance(java.util.TimeZone, java.util.Locale);
+ method public static java.util.Calendar getInstance();
+ method public static java.util.Calendar getInstance(java.util.TimeZone);
+ method public static java.util.Calendar getInstance(java.util.Locale);
+ method public static java.util.Calendar getInstance(java.util.TimeZone, java.util.Locale);
method public abstract int getLeastMaximum(int);
method public abstract int getMaximum(int);
method public int getMinimalDaysInFirstWeek();
@@ -50984,11 +56307,14 @@
method public final java.util.Date getTime();
method public long getTimeInMillis();
method public java.util.TimeZone getTimeZone();
+ method public int getWeekYear();
+ method public int getWeeksInWeekYear();
method protected final int internalGet(int);
method public boolean isLenient();
method public final boolean isSet(int);
- method public void roll(int, int);
+ method public boolean isWeekDateSupported();
method public abstract void roll(int, boolean);
+ method public void roll(int, int);
method public void set(int, int);
method public final void set(int, int, int);
method public final void set(int, int, int, int, int);
@@ -50999,6 +56325,7 @@
method public final void setTime(java.util.Date);
method public void setTimeInMillis(long);
method public void setTimeZone(java.util.TimeZone);
+ method public void setWeekDate(int, int, int);
field public static final int ALL_STYLES = 0; // 0x0
field public static final int AM = 0; // 0x0
field public static final int AM_PM = 9; // 0x9
@@ -51115,15 +56442,15 @@
method public static java.util.Collection<T> synchronizedCollection(java.util.Collection<T>);
method public static java.util.List<T> synchronizedList(java.util.List<T>);
method public static java.util.Map<K, V> synchronizedMap(java.util.Map<K, V>);
- method public static java.util.Set<E> synchronizedSet(java.util.Set<E>);
+ method public static java.util.Set<T> synchronizedSet(java.util.Set<T>);
method public static java.util.SortedMap<K, V> synchronizedSortedMap(java.util.SortedMap<K, V>);
- method public static java.util.SortedSet<E> synchronizedSortedSet(java.util.SortedSet<E>);
- method public static java.util.Collection<E> unmodifiableCollection(java.util.Collection<? extends E>);
- method public static java.util.List<E> unmodifiableList(java.util.List<? extends E>);
+ method public static java.util.SortedSet<T> synchronizedSortedSet(java.util.SortedSet<T>);
+ method public static java.util.Collection<T> unmodifiableCollection(java.util.Collection<? extends T>);
+ method public static java.util.List<T> unmodifiableList(java.util.List<? extends T>);
method public static java.util.Map<K, V> unmodifiableMap(java.util.Map<? extends K, ? extends V>);
- method public static java.util.Set<E> unmodifiableSet(java.util.Set<? extends E>);
+ method public static java.util.Set<T> unmodifiableSet(java.util.Set<? extends T>);
method public static java.util.SortedMap<K, V> unmodifiableSortedMap(java.util.SortedMap<K, ? extends V>);
- method public static java.util.SortedSet<E> unmodifiableSortedSet(java.util.SortedSet<E>);
+ method public static java.util.SortedSet<T> unmodifiableSortedSet(java.util.SortedSet<T>);
field public static final java.util.List EMPTY_LIST;
field public static final java.util.Map EMPTY_MAP;
field public static final java.util.Set EMPTY_SET;
@@ -51137,8 +56464,8 @@
public class ConcurrentModificationException extends java.lang.RuntimeException {
ctor public ConcurrentModificationException();
ctor public ConcurrentModificationException(java.lang.String);
- ctor public ConcurrentModificationException(java.lang.String, java.lang.Throwable);
ctor public ConcurrentModificationException(java.lang.Throwable);
+ ctor public ConcurrentModificationException(java.lang.String, java.lang.Throwable);
}
public final class Currency implements java.io.Serializable {
@@ -51149,16 +56476,17 @@
method public java.lang.String getDisplayName(java.util.Locale);
method public static java.util.Currency getInstance(java.lang.String);
method public static java.util.Currency getInstance(java.util.Locale);
+ method public int getNumericCode();
method public java.lang.String getSymbol();
method public java.lang.String getSymbol(java.util.Locale);
}
public class Date implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
ctor public Date();
+ ctor public Date(long);
ctor public deprecated Date(int, int, int);
ctor public deprecated Date(int, int, int, int, int);
ctor public deprecated Date(int, int, int, int, int, int);
- ctor public Date(long);
ctor public deprecated Date(java.lang.String);
method public static deprecated long UTC(int, int, int, int, int, int);
method public boolean after(java.util.Date);
@@ -51236,7 +56564,7 @@
ctor public EmptyStackException();
}
- public class EnumMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
+ public class EnumMap extends java.util.AbstractMap implements java.lang.Cloneable java.io.Serializable {
ctor public EnumMap(java.lang.Class<K>);
ctor public EnumMap(java.util.EnumMap<K, ? extends V>);
ctor public EnumMap(java.util.Map<K, ? extends V>);
@@ -51269,8 +56597,8 @@
}
public abstract class EventListenerProxy implements java.util.EventListener {
- ctor public EventListenerProxy(java.util.EventListener);
- method public java.util.EventListener getListener();
+ ctor public EventListenerProxy(T);
+ method public T getListener();
}
public class EventObject implements java.io.Serializable {
@@ -51279,14 +56607,14 @@
field protected transient java.lang.Object source;
}
- public class FormatFlagsConversionMismatchException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class FormatFlagsConversionMismatchException extends java.util.IllegalFormatException {
ctor public FormatFlagsConversionMismatchException(java.lang.String, char);
method public char getConversion();
method public java.lang.String getFlags();
}
public abstract interface Formattable {
- method public abstract void formatTo(java.util.Formatter, int, int, int) throws java.util.IllegalFormatException;
+ method public abstract void formatTo(java.util.Formatter, int, int, int);
}
public class FormattableFlags {
@@ -51306,10 +56634,10 @@
ctor public Formatter(java.io.File) throws java.io.FileNotFoundException;
ctor public Formatter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
ctor public Formatter(java.io.File, java.lang.String, java.util.Locale) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.io.PrintStream);
ctor public Formatter(java.io.OutputStream);
ctor public Formatter(java.io.OutputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
ctor public Formatter(java.io.OutputStream, java.lang.String, java.util.Locale) throws java.io.UnsupportedEncodingException;
- ctor public Formatter(java.io.PrintStream);
method public void close();
method public void flush();
method public java.util.Formatter format(java.lang.String, java.lang.Object...);
@@ -51326,18 +56654,18 @@
enum_constant public static final java.util.Formatter.BigDecimalLayoutForm SCIENTIFIC;
}
- public class FormatterClosedException extends java.lang.IllegalStateException implements java.io.Serializable {
+ public class FormatterClosedException extends java.lang.IllegalStateException {
ctor public FormatterClosedException();
}
public class GregorianCalendar extends java.util.Calendar {
ctor public GregorianCalendar();
+ ctor public GregorianCalendar(java.util.TimeZone);
+ ctor public GregorianCalendar(java.util.Locale);
+ ctor public GregorianCalendar(java.util.TimeZone, java.util.Locale);
ctor public GregorianCalendar(int, int, int);
ctor public GregorianCalendar(int, int, int, int, int);
ctor public GregorianCalendar(int, int, int, int, int, int);
- ctor public GregorianCalendar(java.util.Locale);
- ctor public GregorianCalendar(java.util.TimeZone);
- ctor public GregorianCalendar(java.util.TimeZone, java.util.Locale);
method public void add(int, int);
method protected void computeFields();
method protected void computeTime();
@@ -51347,16 +56675,17 @@
method public int getMaximum(int);
method public int getMinimum(int);
method public boolean isLeapYear(int);
+ method public final boolean isWeekDateSupported();
method public void roll(int, boolean);
method public void setGregorianChange(java.util.Date);
field public static final int AD = 1; // 0x1
field public static final int BC = 0; // 0x0
}
- public class HashMap extends java.util.AbstractMap implements java.lang.Cloneable java.io.Serializable {
- ctor public HashMap();
- ctor public HashMap(int);
+ public class HashMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
ctor public HashMap(int, float);
+ ctor public HashMap(int);
+ ctor public HashMap();
ctor public HashMap(java.util.Map<? extends K, ? extends V>);
method public java.lang.Object clone();
method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
@@ -51364,36 +56693,36 @@
public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {
ctor public HashSet();
- ctor public HashSet(int);
- ctor public HashSet(int, float);
ctor public HashSet(java.util.Collection<? extends E>);
+ ctor public HashSet(int, float);
+ ctor public HashSet(int);
method public java.lang.Object clone();
method public java.util.Iterator<E> iterator();
method public int size();
}
public class Hashtable extends java.util.Dictionary implements java.lang.Cloneable java.util.Map java.io.Serializable {
- ctor public Hashtable();
- ctor public Hashtable(int);
ctor public Hashtable(int, float);
+ ctor public Hashtable(int);
+ ctor public Hashtable();
ctor public Hashtable(java.util.Map<? extends K, ? extends V>);
method public synchronized void clear();
method public synchronized java.lang.Object clone();
- method public boolean contains(java.lang.Object);
+ method public synchronized boolean contains(java.lang.Object);
method public synchronized boolean containsKey(java.lang.Object);
- method public synchronized boolean containsValue(java.lang.Object);
+ method public boolean containsValue(java.lang.Object);
method public synchronized java.util.Enumeration<V> elements();
- method public synchronized java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
method public synchronized V get(java.lang.Object);
method public synchronized boolean isEmpty();
- method public synchronized java.util.Set<K> keySet();
+ method public java.util.Set<K> keySet();
method public synchronized java.util.Enumeration<K> keys();
method public synchronized V put(K, V);
method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);
method protected void rehash();
method public synchronized V remove(java.lang.Object);
method public synchronized int size();
- method public synchronized java.util.Collection<V> values();
+ method public java.util.Collection<V> values();
}
public class IdentityHashMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
@@ -51404,21 +56733,21 @@
method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
}
- public class IllegalFormatCodePointException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class IllegalFormatCodePointException extends java.util.IllegalFormatException {
ctor public IllegalFormatCodePointException(int);
method public int getCodePoint();
}
- public class IllegalFormatConversionException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class IllegalFormatConversionException extends java.util.IllegalFormatException {
ctor public IllegalFormatConversionException(char, java.lang.Class<?>);
method public java.lang.Class<?> getArgumentClass();
method public char getConversion();
}
- public class IllegalFormatException extends java.lang.IllegalArgumentException implements java.io.Serializable {
+ public class IllegalFormatException extends java.lang.IllegalArgumentException {
}
- public class IllegalFormatFlagsException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class IllegalFormatFlagsException extends java.util.IllegalFormatException {
ctor public IllegalFormatFlagsException(java.lang.String);
method public java.lang.String getFlags();
}
@@ -51440,14 +56769,14 @@
method public int getErrorIndex();
}
- public class InputMismatchException extends java.util.NoSuchElementException implements java.io.Serializable {
+ public class InputMismatchException extends java.util.NoSuchElementException {
ctor public InputMismatchException();
ctor public InputMismatchException(java.lang.String);
}
public class InvalidPropertiesFormatException extends java.io.IOException {
- ctor public InvalidPropertiesFormatException(java.lang.String);
ctor public InvalidPropertiesFormatException(java.lang.Throwable);
+ ctor public InvalidPropertiesFormatException(java.lang.String);
}
public abstract interface Iterator {
@@ -51456,23 +56785,23 @@
method public abstract void remove();
}
- public class LinkedHashMap extends java.util.HashMap {
- ctor public LinkedHashMap();
- ctor public LinkedHashMap(int);
+ public class LinkedHashMap extends java.util.HashMap implements java.util.Map {
ctor public LinkedHashMap(int, float);
- ctor public LinkedHashMap(int, float, boolean);
+ ctor public LinkedHashMap(int);
+ ctor public LinkedHashMap();
ctor public LinkedHashMap(java.util.Map<? extends K, ? extends V>);
+ ctor public LinkedHashMap(int, float, boolean);
method protected boolean removeEldestEntry(java.util.Map.Entry<K, V>);
}
public class LinkedHashSet extends java.util.HashSet implements java.lang.Cloneable java.io.Serializable java.util.Set {
- ctor public LinkedHashSet();
- ctor public LinkedHashSet(int);
ctor public LinkedHashSet(int, float);
+ ctor public LinkedHashSet(int);
+ ctor public LinkedHashSet();
ctor public LinkedHashSet(java.util.Collection<? extends E>);
}
- public class LinkedList extends java.util.AbstractSequentialList implements java.lang.Cloneable java.util.Deque java.util.List java.util.Queue java.io.Serializable {
+ public class LinkedList extends java.util.AbstractSequentialList implements java.lang.Cloneable java.util.Deque java.util.List java.io.Serializable {
ctor public LinkedList();
ctor public LinkedList(java.util.Collection<? extends E>);
method public void addFirst(E);
@@ -51503,10 +56832,10 @@
}
public abstract interface List implements java.util.Collection {
- method public abstract void add(int, E);
method public abstract boolean add(E);
- method public abstract boolean addAll(int, java.util.Collection<? extends E>);
+ method public abstract void add(int, E);
method public abstract boolean addAll(java.util.Collection<? extends E>);
+ method public abstract boolean addAll(int, java.util.Collection<? extends E>);
method public abstract void clear();
method public abstract boolean contains(java.lang.Object);
method public abstract boolean containsAll(java.util.Collection<?>);
@@ -51519,8 +56848,8 @@
method public abstract int lastIndexOf(java.lang.Object);
method public abstract java.util.ListIterator<E> listIterator();
method public abstract java.util.ListIterator<E> listIterator(int);
- method public abstract E remove(int);
method public abstract boolean remove(java.lang.Object);
+ method public abstract E remove(int);
method public abstract boolean removeAll(java.util.Collection<?>);
method public abstract boolean retainAll(java.util.Collection<?>);
method public abstract E set(int, E);
@@ -51550,14 +56879,15 @@
}
public final class Locale implements java.lang.Cloneable java.io.Serializable {
- ctor public Locale(java.lang.String);
- ctor public Locale(java.lang.String, java.lang.String);
ctor public Locale(java.lang.String, java.lang.String, java.lang.String);
+ ctor public Locale(java.lang.String, java.lang.String);
+ ctor public Locale(java.lang.String);
method public java.lang.Object clone();
method public static java.util.Locale forLanguageTag(java.lang.String);
method public static java.util.Locale[] getAvailableLocales();
method public java.lang.String getCountry();
method public static java.util.Locale getDefault();
+ method public static java.util.Locale getDefault(java.util.Locale.Category);
method public final java.lang.String getDisplayCountry();
method public java.lang.String getDisplayCountry(java.util.Locale);
method public final java.lang.String getDisplayLanguage();
@@ -51570,8 +56900,8 @@
method public java.lang.String getDisplayVariant(java.util.Locale);
method public java.lang.String getExtension(char);
method public java.util.Set<java.lang.Character> getExtensionKeys();
- method public java.lang.String getISO3Country();
- method public java.lang.String getISO3Language();
+ method public java.lang.String getISO3Country() throws java.util.MissingResourceException;
+ method public java.lang.String getISO3Language() throws java.util.MissingResourceException;
method public static java.lang.String[] getISOCountries();
method public static java.lang.String[] getISOLanguages();
method public java.lang.String getLanguage();
@@ -51581,6 +56911,7 @@
method public java.lang.String getUnicodeLocaleType(java.lang.String);
method public java.lang.String getVariant();
method public static synchronized void setDefault(java.util.Locale);
+ method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
method public java.lang.String toLanguageTag();
method public final java.lang.String toString();
field public static final java.util.Locale CANADA;
@@ -51626,6 +56957,13 @@
method public java.util.Locale.Builder setVariant(java.lang.String);
}
+ public static final class Locale.Category extends java.lang.Enum {
+ method public static java.util.Locale.Category valueOf(java.lang.String);
+ method public static final java.util.Locale.Category[] values();
+ enum_constant public static final java.util.Locale.Category DISPLAY;
+ enum_constant public static final java.util.Locale.Category FORMAT;
+ }
+
public abstract interface Map {
method public abstract void clear();
method public abstract boolean containsKey(java.lang.Object);
@@ -51728,15 +57066,15 @@
public class Observable {
ctor public Observable();
- method public void addObserver(java.util.Observer);
- method protected void clearChanged();
- method public int countObservers();
+ method public synchronized void addObserver(java.util.Observer);
+ method protected synchronized void clearChanged();
+ method public synchronized int countObservers();
method public synchronized void deleteObserver(java.util.Observer);
method public synchronized void deleteObservers();
- method public boolean hasChanged();
+ method public synchronized boolean hasChanged();
method public void notifyObservers();
method public void notifyObservers(java.lang.Object);
- method protected void setChanged();
+ method protected synchronized void setChanged();
}
public abstract interface Observer {
@@ -51765,16 +57103,16 @@
method public java.lang.String getProperty(java.lang.String, java.lang.String);
method public void list(java.io.PrintStream);
method public void list(java.io.PrintWriter);
- method public synchronized void load(java.io.InputStream) throws java.io.IOException;
method public synchronized void load(java.io.Reader) throws java.io.IOException;
+ method public synchronized void load(java.io.InputStream) throws java.io.IOException;
method public synchronized void loadFromXML(java.io.InputStream) throws java.io.IOException, java.util.InvalidPropertiesFormatException;
method public java.util.Enumeration<?> propertyNames();
method public deprecated void save(java.io.OutputStream, java.lang.String);
- method public java.lang.Object setProperty(java.lang.String, java.lang.String);
- method public synchronized void store(java.io.OutputStream, java.lang.String) throws java.io.IOException;
- method public synchronized void store(java.io.Writer, java.lang.String) throws java.io.IOException;
+ method public synchronized java.lang.Object setProperty(java.lang.String, java.lang.String);
+ method public void store(java.io.Writer, java.lang.String) throws java.io.IOException;
+ method public void store(java.io.OutputStream, java.lang.String) throws java.io.IOException;
method public void storeToXML(java.io.OutputStream, java.lang.String) throws java.io.IOException;
- method public synchronized void storeToXML(java.io.OutputStream, java.lang.String, java.lang.String) throws java.io.IOException;
+ method public void storeToXML(java.io.OutputStream, java.lang.String, java.lang.String) throws java.io.IOException;
method public java.util.Set<java.lang.String> stringPropertyNames();
field protected java.util.Properties defaults;
}
@@ -51802,7 +57140,7 @@
public class Random implements java.io.Serializable {
ctor public Random();
ctor public Random(long);
- method protected synchronized int next(int);
+ method protected int next(int);
method public boolean nextBoolean();
method public void nextBytes(byte[]);
method public double nextDouble();
@@ -51819,14 +57157,14 @@
public abstract class ResourceBundle {
ctor public ResourceBundle();
- method public static void clearCache();
- method public static void clearCache(java.lang.ClassLoader);
+ method public static final void clearCache();
+ method public static final void clearCache(java.lang.ClassLoader);
method public boolean containsKey(java.lang.String);
- method public static java.util.ResourceBundle getBundle(java.lang.String) throws java.util.MissingResourceException;
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale);
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) throws java.util.MissingResourceException;
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control);
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control);
+ method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader);
method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control);
method public abstract java.util.Enumeration<java.lang.String> getKeys();
method public java.util.Locale getLocale();
@@ -51843,10 +57181,10 @@
public static class ResourceBundle.Control {
ctor protected ResourceBundle.Control();
method public java.util.List<java.util.Locale> getCandidateLocales(java.lang.String, java.util.Locale);
- method public static java.util.ResourceBundle.Control getControl(java.util.List<java.lang.String>);
+ method public static final java.util.ResourceBundle.Control getControl(java.util.List<java.lang.String>);
method public java.util.Locale getFallbackLocale(java.lang.String, java.util.Locale);
method public java.util.List<java.lang.String> getFormats(java.lang.String);
- method public static java.util.ResourceBundle.Control getNoFallbackControl(java.util.List<java.lang.String>);
+ method public static final java.util.ResourceBundle.Control getNoFallbackControl(java.util.List<java.lang.String>);
method public long getTimeToLive(java.lang.String, java.util.Locale);
method public boolean needsReload(java.lang.String, java.util.Locale, java.lang.String, java.lang.ClassLoader, java.util.ResourceBundle, long);
method public java.util.ResourceBundle newBundle(java.lang.String, java.util.Locale, java.lang.String, java.lang.ClassLoader, boolean) throws java.io.IOException, java.lang.IllegalAccessException, java.lang.InstantiationException;
@@ -51860,23 +57198,25 @@
}
public final class Scanner implements java.io.Closeable java.util.Iterator {
- ctor public Scanner(java.io.File) throws java.io.FileNotFoundException;
- ctor public Scanner(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
- ctor public Scanner(java.lang.String);
+ ctor public Scanner(java.lang.Readable);
ctor public Scanner(java.io.InputStream);
ctor public Scanner(java.io.InputStream, java.lang.String);
- ctor public Scanner(java.lang.Readable);
+ ctor public Scanner(java.io.File) throws java.io.FileNotFoundException;
+ ctor public Scanner(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
+ ctor public Scanner(java.nio.file.Path) throws java.io.IOException;
+ ctor public Scanner(java.nio.file.Path, java.lang.String) throws java.io.IOException;
+ ctor public Scanner(java.lang.String);
ctor public Scanner(java.nio.channels.ReadableByteChannel);
ctor public Scanner(java.nio.channels.ReadableByteChannel, java.lang.String);
method public void close();
method public java.util.regex.Pattern delimiter();
- method public java.lang.String findInLine(java.util.regex.Pattern);
method public java.lang.String findInLine(java.lang.String);
- method public java.lang.String findWithinHorizon(java.util.regex.Pattern, int);
+ method public java.lang.String findInLine(java.util.regex.Pattern);
method public java.lang.String findWithinHorizon(java.lang.String, int);
+ method public java.lang.String findWithinHorizon(java.util.regex.Pattern, int);
method public boolean hasNext();
- method public boolean hasNext(java.util.regex.Pattern);
method public boolean hasNext(java.lang.String);
+ method public boolean hasNext(java.util.regex.Pattern);
method public boolean hasNextBigDecimal();
method public boolean hasNextBigInteger();
method public boolean hasNextBigInteger(int);
@@ -51896,8 +57236,8 @@
method public java.util.Locale locale();
method public java.util.regex.MatchResult match();
method public java.lang.String next();
- method public java.lang.String next(java.util.regex.Pattern);
method public java.lang.String next(java.lang.String);
+ method public java.lang.String next(java.util.regex.Pattern);
method public java.math.BigDecimal nextBigDecimal();
method public java.math.BigInteger nextBigInteger();
method public java.math.BigInteger nextBigInteger(int);
@@ -51964,12 +57304,12 @@
method public int getRawOffset();
method public boolean inDaylightTime(java.util.Date);
method public void setDSTSavings(int);
- method public void setEndRule(int, int, int);
method public void setEndRule(int, int, int, int);
+ method public void setEndRule(int, int, int);
method public void setEndRule(int, int, int, int, boolean);
method public void setRawOffset(int);
- method public void setStartRule(int, int, int);
method public void setStartRule(int, int, int, int);
+ method public void setStartRule(int, int, int);
method public void setStartRule(int, int, int, int, boolean);
method public void setStartYear(int);
method public boolean useDaylightTime();
@@ -51980,11 +57320,14 @@
public abstract interface SortedMap implements java.util.Map {
method public abstract java.util.Comparator<? super K> comparator();
+ method public abstract java.util.Set<java.util.Map.Entry<K, V>> entrySet();
method public abstract K firstKey();
method public abstract java.util.SortedMap<K, V> headMap(K);
+ method public abstract java.util.Set<K> keySet();
method public abstract K lastKey();
method public abstract java.util.SortedMap<K, V> subMap(K, K);
method public abstract java.util.SortedMap<K, V> tailMap(K);
+ method public abstract java.util.Collection<V> values();
}
public abstract interface SortedSet implements java.util.Set {
@@ -52006,9 +57349,9 @@
}
public class StringTokenizer implements java.util.Enumeration {
- ctor public StringTokenizer(java.lang.String);
- ctor public StringTokenizer(java.lang.String, java.lang.String);
ctor public StringTokenizer(java.lang.String, java.lang.String, boolean);
+ ctor public StringTokenizer(java.lang.String, java.lang.String);
+ ctor public StringTokenizer(java.lang.String);
method public int countTokens();
method public boolean hasMoreElements();
method public boolean hasMoreTokens();
@@ -52020,21 +57363,22 @@
public abstract class TimeZone implements java.lang.Cloneable java.io.Serializable {
ctor public TimeZone();
method public java.lang.Object clone();
- method public static synchronized java.lang.String[] getAvailableIDs();
method public static synchronized java.lang.String[] getAvailableIDs(int);
+ method public static synchronized java.lang.String[] getAvailableIDs();
method public int getDSTSavings();
- method public static synchronized java.util.TimeZone getDefault();
+ method public static java.util.TimeZone getDefault();
method public final java.lang.String getDisplayName();
method public final java.lang.String getDisplayName(java.util.Locale);
method public final java.lang.String getDisplayName(boolean, int);
method public java.lang.String getDisplayName(boolean, int, java.util.Locale);
method public java.lang.String getID();
- method public int getOffset(long);
method public abstract int getOffset(int, int, int, int, int, int);
+ method public int getOffset(long);
method public abstract int getRawOffset();
method public static synchronized java.util.TimeZone getTimeZone(java.lang.String);
method public boolean hasSameRules(java.util.TimeZone);
method public abstract boolean inDaylightTime(java.util.Date);
+ method public boolean observesDaylightTime();
method public static synchronized void setDefault(java.util.TimeZone);
method public void setID(java.lang.String);
method public abstract void setRawOffset(int);
@@ -52044,14 +57388,14 @@
}
public class Timer {
- ctor public Timer(java.lang.String, boolean);
- ctor public Timer(java.lang.String);
- ctor public Timer(boolean);
ctor public Timer();
+ ctor public Timer(boolean);
+ ctor public Timer(java.lang.String);
+ ctor public Timer(java.lang.String, boolean);
method public void cancel();
method public int purge();
- method public void schedule(java.util.TimerTask, java.util.Date);
method public void schedule(java.util.TimerTask, long);
+ method public void schedule(java.util.TimerTask, java.util.Date);
method public void schedule(java.util.TimerTask, long, long);
method public void schedule(java.util.TimerTask, java.util.Date, long);
method public void scheduleAtFixedRate(java.util.TimerTask, long, long);
@@ -52070,10 +57414,10 @@
ctor public TooManyListenersException(java.lang.String);
}
- public class TreeMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.NavigableMap java.io.Serializable java.util.SortedMap {
+ public class TreeMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.NavigableMap java.io.Serializable {
ctor public TreeMap();
- ctor public TreeMap(java.util.Map<? extends K, ? extends V>);
ctor public TreeMap(java.util.Comparator<? super K>);
+ ctor public TreeMap(java.util.Map<? extends K, ? extends V>);
ctor public TreeMap(java.util.SortedMap<K, ? extends V>);
method public java.util.Map.Entry<K, V> ceilingEntry(K);
method public K ceilingKey(K);
@@ -52105,8 +57449,8 @@
public class TreeSet extends java.util.AbstractSet implements java.lang.Cloneable java.util.NavigableSet java.io.Serializable {
ctor public TreeSet();
- ctor public TreeSet(java.util.Collection<? extends E>);
ctor public TreeSet(java.util.Comparator<? super E>);
+ ctor public TreeSet(java.util.Collection<? extends E>);
ctor public TreeSet(java.util.SortedSet<E>);
method public E ceiling(E);
method public java.lang.Object clone();
@@ -52156,9 +57500,9 @@
}
public class Vector extends java.util.AbstractList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
- ctor public Vector();
- ctor public Vector(int);
ctor public Vector(int, int);
+ ctor public Vector(int);
+ ctor public Vector();
ctor public Vector(java.util.Collection<? extends E>);
method public synchronized void addElement(E);
method public synchronized int capacity();
@@ -52168,7 +57512,7 @@
method public java.util.Enumeration<E> elements();
method public synchronized void ensureCapacity(int);
method public synchronized E firstElement();
- method public E get(int);
+ method public synchronized E get(int);
method public synchronized int indexOf(java.lang.Object, int);
method public synchronized void insertElementAt(E, int);
method public synchronized E lastElement();
@@ -52186,9 +57530,9 @@
}
public class WeakHashMap extends java.util.AbstractMap implements java.util.Map {
- ctor public WeakHashMap();
- ctor public WeakHashMap(int);
ctor public WeakHashMap(int, float);
+ ctor public WeakHashMap(int);
+ ctor public WeakHashMap();
ctor public WeakHashMap(java.util.Map<? extends K, ? extends V>);
method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
}
@@ -53426,16 +58770,16 @@
public class Attributes implements java.lang.Cloneable java.util.Map {
ctor public Attributes();
- ctor public Attributes(java.util.jar.Attributes);
ctor public Attributes(int);
+ ctor public Attributes(java.util.jar.Attributes);
method public void clear();
method public java.lang.Object clone();
method public boolean containsKey(java.lang.Object);
method public boolean containsValue(java.lang.Object);
method public java.util.Set<java.util.Map.Entry<java.lang.Object, java.lang.Object>> entrySet();
method public java.lang.Object get(java.lang.Object);
- method public java.lang.String getValue(java.util.jar.Attributes.Name);
method public java.lang.String getValue(java.lang.String);
+ method public java.lang.String getValue(java.util.jar.Attributes.Name);
method public boolean isEmpty();
method public java.util.Set<java.lang.Object> keySet();
method public java.lang.Object put(java.lang.Object, java.lang.Object);
@@ -53483,19 +58827,20 @@
}
public class JarFile extends java.util.zip.ZipFile {
+ ctor public JarFile(java.lang.String) throws java.io.IOException;
+ ctor public JarFile(java.lang.String, boolean) throws java.io.IOException;
ctor public JarFile(java.io.File) throws java.io.IOException;
ctor public JarFile(java.io.File, boolean) throws java.io.IOException;
ctor public JarFile(java.io.File, boolean, int) throws java.io.IOException;
- ctor public JarFile(java.lang.String) throws java.io.IOException;
- ctor public JarFile(java.lang.String, boolean) throws java.io.IOException;
method public java.util.jar.JarEntry getJarEntry(java.lang.String);
method public java.util.jar.Manifest getManifest() throws java.io.IOException;
+ method public boolean hasClassPathAttribute() throws java.io.IOException;
field public static final java.lang.String MANIFEST_NAME = "META-INF/MANIFEST.MF";
}
public class JarInputStream extends java.util.zip.ZipInputStream {
- ctor public JarInputStream(java.io.InputStream, boolean) throws java.io.IOException;
ctor public JarInputStream(java.io.InputStream) throws java.io.IOException;
+ ctor public JarInputStream(java.io.InputStream, boolean) throws java.io.IOException;
method public java.util.jar.Manifest getManifest();
method public java.util.jar.JarEntry getNextJarEntry() throws java.io.IOException;
}
@@ -53519,7 +58864,7 @@
}
public abstract class Pack200 {
- method public static java.util.jar.Pack200.Packer newPacker();
+ method public static synchronized java.util.jar.Pack200.Packer newPacker();
method public static java.util.jar.Pack200.Unpacker newUnpacker();
}
@@ -53573,7 +58918,7 @@
public class ErrorManager {
ctor public ErrorManager();
- method public void error(java.lang.String, java.lang.Exception, int);
+ method public synchronized void error(java.lang.String, java.lang.Exception, int);
field public static final int CLOSE_FAILURE = 3; // 0x3
field public static final int FLUSH_FAILURE = 2; // 0x2
field public static final int FORMAT_FAILURE = 5; // 0x5
@@ -53583,11 +58928,11 @@
}
public class FileHandler extends java.util.logging.StreamHandler {
- ctor public FileHandler() throws java.io.IOException;
- ctor public FileHandler(java.lang.String) throws java.io.IOException;
- ctor public FileHandler(java.lang.String, boolean) throws java.io.IOException;
- ctor public FileHandler(java.lang.String, int, int) throws java.io.IOException;
- ctor public FileHandler(java.lang.String, int, int, boolean) throws java.io.IOException;
+ ctor public FileHandler() throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, boolean) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, int, int) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, int, int, boolean) throws java.io.IOException, java.lang.SecurityException;
}
public abstract interface Filter {
@@ -53597,28 +58942,28 @@
public abstract class Formatter {
ctor protected Formatter();
method public abstract java.lang.String format(java.util.logging.LogRecord);
- method public java.lang.String formatMessage(java.util.logging.LogRecord);
+ method public synchronized java.lang.String formatMessage(java.util.logging.LogRecord);
method public java.lang.String getHead(java.util.logging.Handler);
method public java.lang.String getTail(java.util.logging.Handler);
}
public abstract class Handler {
ctor protected Handler();
- method public abstract void close();
+ method public abstract void close() throws java.lang.SecurityException;
method public abstract void flush();
method public java.lang.String getEncoding();
method public java.util.logging.ErrorManager getErrorManager();
method public java.util.logging.Filter getFilter();
method public java.util.logging.Formatter getFormatter();
- method public java.util.logging.Level getLevel();
+ method public synchronized java.util.logging.Level getLevel();
method public boolean isLoggable(java.util.logging.LogRecord);
method public abstract void publish(java.util.logging.LogRecord);
method protected void reportError(java.lang.String, java.lang.Exception, int);
- method public void setEncoding(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public void setEncoding(java.lang.String) throws java.lang.SecurityException, java.io.UnsupportedEncodingException;
method public void setErrorManager(java.util.logging.ErrorManager);
- method public void setFilter(java.util.logging.Filter);
- method public void setFormatter(java.util.logging.Formatter);
- method public void setLevel(java.util.logging.Level);
+ method public void setFilter(java.util.logging.Filter) throws java.lang.SecurityException;
+ method public void setFormatter(java.util.logging.Formatter) throws java.lang.SecurityException;
+ method public synchronized void setLevel(java.util.logging.Level) throws java.lang.SecurityException;
}
public class Level implements java.io.Serializable {
@@ -53628,7 +58973,7 @@
method public java.lang.String getName();
method public java.lang.String getResourceBundleName();
method public final int intValue();
- method public static java.util.logging.Level parse(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public static synchronized java.util.logging.Level parse(java.lang.String) throws java.lang.IllegalArgumentException;
method public final java.lang.String toString();
field public static final java.util.logging.Level ALL;
field public static final java.util.logging.Level CONFIG;
@@ -53643,18 +58988,18 @@
public class LogManager {
ctor protected LogManager();
- method public synchronized boolean addLogger(java.util.logging.Logger);
- method public void addPropertyChangeListener(java.beans.PropertyChangeListener);
- method public void checkAccess();
+ method public boolean addLogger(java.util.logging.Logger);
+ method public void addPropertyChangeListener(java.beans.PropertyChangeListener) throws java.lang.SecurityException;
+ method public void checkAccess() throws java.lang.SecurityException;
method public static java.util.logging.LogManager getLogManager();
- method public synchronized java.util.logging.Logger getLogger(java.lang.String);
- method public synchronized java.util.Enumeration<java.lang.String> getLoggerNames();
- method public static java.util.logging.LoggingMXBean getLoggingMXBean();
+ method public java.util.logging.Logger getLogger(java.lang.String);
+ method public java.util.Enumeration<java.lang.String> getLoggerNames();
+ method public static synchronized java.util.logging.LoggingMXBean getLoggingMXBean();
method public java.lang.String getProperty(java.lang.String);
- method public void readConfiguration() throws java.io.IOException;
- method public void readConfiguration(java.io.InputStream) throws java.io.IOException;
- method public void removePropertyChangeListener(java.beans.PropertyChangeListener);
- method public synchronized void reset();
+ method public void readConfiguration() throws java.io.IOException, java.lang.SecurityException;
+ method public void readConfiguration(java.io.InputStream) throws java.io.IOException, java.lang.SecurityException;
+ method public void removePropertyChangeListener(java.beans.PropertyChangeListener) throws java.lang.SecurityException;
+ method public void reset() throws java.lang.SecurityException;
field public static final java.lang.String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging";
}
@@ -53688,7 +59033,7 @@
public class Logger {
ctor protected Logger(java.lang.String, java.lang.String);
- method public void addHandler(java.util.logging.Handler);
+ method public void addHandler(java.util.logging.Handler) throws java.lang.SecurityException;
method public void config(java.lang.String);
method public void entering(java.lang.String, java.lang.String);
method public void entering(java.lang.String, java.lang.String, java.lang.Object);
@@ -53701,7 +59046,7 @@
method public static java.util.logging.Logger getAnonymousLogger();
method public static java.util.logging.Logger getAnonymousLogger(java.lang.String);
method public java.util.logging.Filter getFilter();
- method public static java.util.logging.Logger getGlobal();
+ method public static final java.util.logging.Logger getGlobal();
method public java.util.logging.Handler[] getHandlers();
method public java.util.logging.Level getLevel();
method public static java.util.logging.Logger getLogger(java.lang.String);
@@ -53713,11 +59058,11 @@
method public boolean getUseParentHandlers();
method public void info(java.lang.String);
method public boolean isLoggable(java.util.logging.Level);
+ method public void log(java.util.logging.LogRecord);
method public void log(java.util.logging.Level, java.lang.String);
method public void log(java.util.logging.Level, java.lang.String, java.lang.Object);
method public void log(java.util.logging.Level, java.lang.String, java.lang.Object[]);
method public void log(java.util.logging.Level, java.lang.String, java.lang.Throwable);
- method public void log(java.util.logging.LogRecord);
method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String);
method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object);
method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[]);
@@ -53726,9 +59071,9 @@
method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object);
method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[]);
method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable);
- method public void removeHandler(java.util.logging.Handler);
- method public void setFilter(java.util.logging.Filter);
- method public void setLevel(java.util.logging.Level);
+ method public void removeHandler(java.util.logging.Handler) throws java.lang.SecurityException;
+ method public void setFilter(java.util.logging.Filter) throws java.lang.SecurityException;
+ method public void setLevel(java.util.logging.Level) throws java.lang.SecurityException;
method public void setParent(java.util.logging.Logger);
method public void setUseParentHandlers(boolean);
method public void severe(java.lang.String);
@@ -53745,24 +59090,24 @@
method public abstract void setLoggerLevel(java.lang.String, java.lang.String);
}
- public final class LoggingPermission extends java.security.BasicPermission implements java.security.Guard java.io.Serializable {
- ctor public LoggingPermission(java.lang.String, java.lang.String);
+ public final class LoggingPermission extends java.security.BasicPermission {
+ ctor public LoggingPermission(java.lang.String, java.lang.String) throws java.lang.IllegalArgumentException;
}
public class MemoryHandler extends java.util.logging.Handler {
ctor public MemoryHandler();
ctor public MemoryHandler(java.util.logging.Handler, int, java.util.logging.Level);
- method public void close();
+ method public void close() throws java.lang.SecurityException;
method public void flush();
- method public java.util.logging.Level getPushLevel();
+ method public synchronized java.util.logging.Level getPushLevel();
method public synchronized void publish(java.util.logging.LogRecord);
- method public void push();
- method public void setPushLevel(java.util.logging.Level);
+ method public synchronized void push();
+ method public void setPushLevel(java.util.logging.Level) throws java.lang.SecurityException;
}
public class SimpleFormatter extends java.util.logging.Formatter {
ctor public SimpleFormatter();
- method public java.lang.String format(java.util.logging.LogRecord);
+ method public synchronized java.lang.String format(java.util.logging.LogRecord);
}
public class SocketHandler extends java.util.logging.StreamHandler {
@@ -53773,10 +59118,10 @@
public class StreamHandler extends java.util.logging.Handler {
ctor public StreamHandler();
ctor public StreamHandler(java.io.OutputStream, java.util.logging.Formatter);
- method public void close();
- method public void flush();
+ method public synchronized void close() throws java.lang.SecurityException;
+ method public synchronized void flush();
method public synchronized void publish(java.util.logging.LogRecord);
- method protected void setOutputStream(java.io.OutputStream);
+ method protected synchronized void setOutputStream(java.io.OutputStream) throws java.lang.SecurityException;
}
public class XMLFormatter extends java.util.logging.Formatter {
@@ -53846,12 +59191,12 @@
}
public class InvalidPreferencesFormatException extends java.lang.Exception {
+ ctor public InvalidPreferencesFormatException(java.lang.Throwable);
ctor public InvalidPreferencesFormatException(java.lang.String);
ctor public InvalidPreferencesFormatException(java.lang.String, java.lang.Throwable);
- ctor public InvalidPreferencesFormatException(java.lang.Throwable);
}
- public class NodeChangeEvent extends java.util.EventObject implements java.io.Serializable {
+ public class NodeChangeEvent extends java.util.EventObject {
ctor public NodeChangeEvent(java.util.prefs.Preferences, java.util.prefs.Preferences);
method public java.util.prefs.Preferences getChild();
method public java.util.prefs.Preferences getParent();
@@ -53862,7 +59207,7 @@
method public abstract void childRemoved(java.util.prefs.NodeChangeEvent);
}
- public class PreferenceChangeEvent extends java.util.EventObject implements java.io.Serializable {
+ public class PreferenceChangeEvent extends java.util.EventObject {
ctor public PreferenceChangeEvent(java.util.prefs.Preferences, java.lang.String, java.lang.String);
method public java.lang.String getKey();
method public java.lang.String getNewValue();
@@ -54007,8 +59352,8 @@
method public long getValue();
method public void reset();
method public void update(int);
- method public void update(byte[]);
method public void update(byte[], int, int);
+ method public void update(byte[]);
}
public class CRC32 implements java.util.zip.Checksum {
@@ -54016,8 +59361,8 @@
method public long getValue();
method public void reset();
method public void update(int);
- method public void update(byte[]);
method public void update(byte[], int, int);
+ method public void update(byte[]);
}
public class CheckedInputStream extends java.io.FilterInputStream {
@@ -54033,8 +59378,8 @@
public abstract interface Checksum {
method public abstract long getValue();
method public abstract void reset();
- method public abstract void update(byte[], int, int);
method public abstract void update(int);
+ method public abstract void update(byte[], int, int);
}
public class DataFormatException extends java.lang.Exception {
@@ -54043,28 +59388,28 @@
}
public class Deflater {
- ctor public Deflater();
- ctor public Deflater(int);
ctor public Deflater(int, boolean);
+ ctor public Deflater(int);
+ ctor public Deflater();
+ method public int deflate(byte[], int, int);
method public int deflate(byte[]);
- method public synchronized int deflate(byte[], int, int);
- method public synchronized int deflate(byte[], int, int, int);
- method public synchronized void end();
- method public synchronized void finish();
- method public synchronized boolean finished();
- method public synchronized int getAdler();
- method public synchronized long getBytesRead();
- method public synchronized long getBytesWritten();
- method public synchronized int getTotalIn();
- method public synchronized int getTotalOut();
- method public synchronized boolean needsInput();
- method public synchronized void reset();
+ method public int deflate(byte[], int, int, int);
+ method public void end();
+ method public void finish();
+ method public boolean finished();
+ method public int getAdler();
+ method public long getBytesRead();
+ method public long getBytesWritten();
+ method public int getTotalIn();
+ method public int getTotalOut();
+ method public boolean needsInput();
+ method public void reset();
+ method public void setDictionary(byte[], int, int);
method public void setDictionary(byte[]);
- method public synchronized void setDictionary(byte[], int, int);
+ method public void setInput(byte[], int, int);
method public void setInput(byte[]);
- method public synchronized void setInput(byte[], int, int);
- method public synchronized void setLevel(int);
- method public synchronized void setStrategy(int);
+ method public void setLevel(int);
+ method public void setStrategy(int);
field public static final int BEST_COMPRESSION = 9; // 0x9
field public static final int BEST_SPEED = 1; // 0x1
field public static final int DEFAULT_COMPRESSION = -1; // 0xffffffff
@@ -54087,12 +59432,12 @@
}
public class DeflaterOutputStream extends java.io.FilterOutputStream {
- ctor public DeflaterOutputStream(java.io.OutputStream);
- ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater);
- ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int);
- ctor public DeflaterOutputStream(java.io.OutputStream, boolean);
- ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, boolean);
ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater);
+ ctor public DeflaterOutputStream(java.io.OutputStream, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream);
method protected void deflate() throws java.io.IOException;
method public void finish() throws java.io.IOException;
field protected byte[] buf;
@@ -54100,49 +59445,50 @@
}
public class GZIPInputStream extends java.util.zip.InflaterInputStream {
- ctor public GZIPInputStream(java.io.InputStream) throws java.io.IOException;
ctor public GZIPInputStream(java.io.InputStream, int) throws java.io.IOException;
+ ctor public GZIPInputStream(java.io.InputStream) throws java.io.IOException;
field public static final int GZIP_MAGIC = 35615; // 0x8b1f
field protected java.util.zip.CRC32 crc;
field protected boolean eos;
}
public class GZIPOutputStream extends java.util.zip.DeflaterOutputStream {
- ctor public GZIPOutputStream(java.io.OutputStream) throws java.io.IOException;
- ctor public GZIPOutputStream(java.io.OutputStream, boolean) throws java.io.IOException;
ctor public GZIPOutputStream(java.io.OutputStream, int) throws java.io.IOException;
ctor public GZIPOutputStream(java.io.OutputStream, int, boolean) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream, boolean) throws java.io.IOException;
field protected java.util.zip.CRC32 crc;
}
public class Inflater {
- ctor public Inflater();
ctor public Inflater(boolean);
- method public synchronized void end();
- method public synchronized boolean finished();
- method public synchronized int getAdler();
- method public synchronized long getBytesRead();
- method public synchronized long getBytesWritten();
- method public synchronized int getRemaining();
- method public synchronized int getTotalIn();
- method public synchronized int getTotalOut();
+ ctor public Inflater();
+ method public void end();
+ method public boolean finished();
+ method public int getAdler();
+ method public long getBytesRead();
+ method public long getBytesWritten();
+ method public int getRemaining();
+ method public int getTotalIn();
+ method public int getTotalOut();
+ method public int inflate(byte[], int, int) throws java.util.zip.DataFormatException;
method public int inflate(byte[]) throws java.util.zip.DataFormatException;
- method public synchronized int inflate(byte[], int, int) throws java.util.zip.DataFormatException;
- method public synchronized boolean needsDictionary();
- method public synchronized boolean needsInput();
- method public synchronized void reset();
- method public synchronized void setDictionary(byte[]);
- method public synchronized void setDictionary(byte[], int, int);
- method public synchronized void setInput(byte[]);
- method public synchronized void setInput(byte[], int, int);
+ method public boolean needsDictionary();
+ method public boolean needsInput();
+ method public void reset();
+ method public void setDictionary(byte[], int, int);
+ method public void setDictionary(byte[]);
+ method public void setInput(byte[], int, int);
+ method public void setInput(byte[]);
}
public class InflaterInputStream extends java.io.FilterInputStream {
- ctor public InflaterInputStream(java.io.InputStream);
- ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater);
ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater, int);
+ ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater);
+ ctor public InflaterInputStream(java.io.InputStream);
method protected void fill() throws java.io.IOException;
field protected byte[] buf;
+ field protected boolean closed;
field protected java.util.zip.Inflater inf;
field protected int len;
}
@@ -54230,9 +59576,12 @@
}
public class ZipFile implements java.io.Closeable {
- ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
ctor public ZipFile(java.lang.String) throws java.io.IOException;
ctor public ZipFile(java.io.File, int) throws java.io.IOException;
+ ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
+ ctor public ZipFile(java.io.File, int, java.nio.charset.Charset) throws java.io.IOException;
+ ctor public ZipFile(java.lang.String, java.nio.charset.Charset) throws java.io.IOException;
+ ctor public ZipFile(java.io.File, java.nio.charset.Charset) throws java.io.IOException;
method public void close() throws java.io.IOException;
method public java.util.Enumeration<? extends java.util.zip.ZipEntry> entries();
method public java.lang.String getComment();
@@ -54286,6 +59635,7 @@
public class ZipInputStream extends java.util.zip.InflaterInputStream {
ctor public ZipInputStream(java.io.InputStream);
+ ctor public ZipInputStream(java.io.InputStream, java.nio.charset.Charset);
method public void closeEntry() throws java.io.IOException;
method protected java.util.zip.ZipEntry createZipEntry(java.lang.String);
method public java.util.zip.ZipEntry getNextEntry() throws java.io.IOException;
@@ -54333,6 +59683,7 @@
public class ZipOutputStream extends java.util.zip.DeflaterOutputStream {
ctor public ZipOutputStream(java.io.OutputStream);
+ ctor public ZipOutputStream(java.io.OutputStream, java.nio.charset.Charset);
method public void closeEntry() throws java.io.IOException;
method public void putNextEntry(java.util.zip.ZipEntry) throws java.io.IOException;
method public void setComment(java.lang.String);
@@ -54392,8 +59743,8 @@
}
public class BadPaddingException extends java.security.GeneralSecurityException {
- ctor public BadPaddingException(java.lang.String);
ctor public BadPaddingException();
+ ctor public BadPaddingException(java.lang.String);
}
public class Cipher {
@@ -54504,14 +59855,14 @@
method public final int getOutputSize(int) throws java.lang.IllegalStateException;
method public final java.security.Provider getProvider();
method public final void init(java.security.Key) throws javax.crypto.ExemptionMechanismException, java.security.InvalidKeyException;
- method public final void init(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final boolean isCryptoAllowed(java.security.Key) throws javax.crypto.ExemptionMechanismException;
}
public class ExemptionMechanismException extends java.security.GeneralSecurityException {
- ctor public ExemptionMechanismException(java.lang.String);
ctor public ExemptionMechanismException();
+ ctor public ExemptionMechanismException(java.lang.String);
}
public abstract class ExemptionMechanismSpi {
@@ -54520,13 +59871,13 @@
method protected abstract int engineGenExemptionBlob(byte[], int) throws javax.crypto.ExemptionMechanismException, javax.crypto.ShortBufferException;
method protected abstract int engineGetOutputSize(int);
method protected abstract void engineInit(java.security.Key) throws javax.crypto.ExemptionMechanismException, java.security.InvalidKeyException;
- method protected abstract void engineInit(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method protected abstract void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method protected abstract void engineInit(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
}
public class IllegalBlockSizeException extends java.security.GeneralSecurityException {
- ctor public IllegalBlockSizeException(java.lang.String);
ctor public IllegalBlockSizeException();
+ ctor public IllegalBlockSizeException(java.lang.String);
}
public class KeyAgreement {
@@ -54564,19 +59915,19 @@
method public static final javax.crypto.KeyGenerator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static final javax.crypto.KeyGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
+ method public final void init(java.security.SecureRandom);
method public final void init(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
method public final void init(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
method public final void init(int);
method public final void init(int, java.security.SecureRandom);
- method public final void init(java.security.SecureRandom);
}
public abstract class KeyGeneratorSpi {
ctor public KeyGeneratorSpi();
method protected abstract javax.crypto.SecretKey engineGenerateKey();
+ method protected abstract void engineInit(java.security.SecureRandom);
method protected abstract void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
method protected abstract void engineInit(int, java.security.SecureRandom);
- method protected abstract void engineInit(java.security.SecureRandom);
}
public class Mac implements java.lang.Cloneable {
@@ -54591,12 +59942,12 @@
method public static final javax.crypto.Mac getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
method public final int getMacLength();
method public final java.security.Provider getProvider();
- method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final void init(java.security.Key) throws java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final void reset();
method public final void update(byte) throws java.lang.IllegalStateException;
- method public final void update(byte[], int, int) throws java.lang.IllegalStateException;
method public final void update(byte[]) throws java.lang.IllegalStateException;
+ method public final void update(byte[], int, int) throws java.lang.IllegalStateException;
method public final void update(java.nio.ByteBuffer);
}
@@ -54613,8 +59964,8 @@
}
public class NoSuchPaddingException extends java.security.GeneralSecurityException {
- ctor public NoSuchPaddingException(java.lang.String);
ctor public NoSuchPaddingException();
+ ctor public NoSuchPaddingException(java.lang.String);
}
public class NullCipher extends javax.crypto.Cipher {
@@ -54655,8 +60006,8 @@
}
public class ShortBufferException extends java.security.GeneralSecurityException {
- ctor public ShortBufferException(java.lang.String);
ctor public ShortBufferException();
+ ctor public ShortBufferException(java.lang.String);
}
}
@@ -54801,7 +60152,7 @@
method public int getWordSize();
}
- public class SecretKeySpec implements java.security.spec.KeySpec javax.crypto.SecretKey java.io.Serializable {
+ public class SecretKeySpec implements java.security.spec.KeySpec javax.crypto.SecretKey {
ctor public SecretKeySpec(byte[], java.lang.String);
ctor public SecretKeySpec(byte[], int, int, java.lang.String);
method public java.lang.String getAlgorithm();
@@ -55696,7 +61047,7 @@
method public abstract java.net.ServerSocket createServerSocket(int) throws java.io.IOException;
method public abstract java.net.ServerSocket createServerSocket(int, int) throws java.io.IOException;
method public abstract java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress) throws java.io.IOException;
- method public static synchronized javax.net.ServerSocketFactory getDefault();
+ method public static javax.net.ServerSocketFactory getDefault();
}
public abstract class SocketFactory {
@@ -55706,7 +61057,7 @@
method public abstract java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException, java.net.UnknownHostException;
method public abstract java.net.Socket createSocket(java.net.InetAddress, int) throws java.io.IOException;
method public abstract java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
- method public static synchronized javax.net.SocketFactory getDefault();
+ method public static javax.net.SocketFactory getDefault();
}
}
@@ -55718,6 +61069,12 @@
method public java.security.cert.CertPathParameters getParameters();
}
+ public abstract class ExtendedSSLSession implements javax.net.ssl.SSLSession {
+ ctor public ExtendedSSLSession();
+ method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms();
+ method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms();
+ }
+
public class HandshakeCompletedEvent extends java.util.EventObject {
ctor public HandshakeCompletedEvent(javax.net.ssl.SSLSocket, javax.net.ssl.SSLSession);
method public java.lang.String getCipherSuite();
@@ -55793,7 +61150,7 @@
method public final javax.net.ssl.SSLEngine createSSLEngine();
method public final javax.net.ssl.SSLEngine createSSLEngine(java.lang.String, int);
method public final javax.net.ssl.SSLSessionContext getClientSessionContext();
- method public static javax.net.ssl.SSLContext getDefault() throws java.security.NoSuchAlgorithmException;
+ method public static synchronized javax.net.ssl.SSLContext getDefault() throws java.security.NoSuchAlgorithmException;
method public final javax.net.ssl.SSLParameters getDefaultSSLParameters();
method public static javax.net.ssl.SSLContext getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static javax.net.ssl.SSLContext getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
@@ -55805,13 +61162,13 @@
method public final javax.net.ssl.SSLSocketFactory getSocketFactory();
method public final javax.net.ssl.SSLParameters getSupportedSSLParameters();
method public final void init(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[], java.security.SecureRandom) throws java.security.KeyManagementException;
- method public static void setDefault(javax.net.ssl.SSLContext);
+ method public static synchronized void setDefault(javax.net.ssl.SSLContext);
}
public abstract class SSLContextSpi {
ctor public SSLContextSpi();
- method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int);
method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine();
+ method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int);
method protected abstract javax.net.ssl.SSLSessionContext engineGetClientSessionContext();
method protected javax.net.ssl.SSLParameters engineGetDefaultSSLParameters();
method protected abstract javax.net.ssl.SSLSessionContext engineGetServerSessionContext();
@@ -55831,6 +61188,7 @@
method public abstract boolean getEnableSessionCreation();
method public abstract java.lang.String[] getEnabledCipherSuites();
method public abstract java.lang.String[] getEnabledProtocols();
+ method public javax.net.ssl.SSLSession getHandshakeSession();
method public abstract javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus();
method public abstract boolean getNeedClientAuth();
method public java.lang.String getPeerHost();
@@ -55850,12 +61208,12 @@
method public void setSSLParameters(javax.net.ssl.SSLParameters);
method public abstract void setUseClientMode(boolean);
method public abstract void setWantClientAuth(boolean);
- method public abstract javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int) throws javax.net.ssl.SSLException;
method public javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
method public javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[]) throws javax.net.ssl.SSLException;
- method public abstract javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
- method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public abstract javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int) throws javax.net.ssl.SSLException;
method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public abstract javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
}
public class SSLEngineResult {
@@ -55903,11 +61261,15 @@
ctor public SSLParameters();
ctor public SSLParameters(java.lang.String[]);
ctor public SSLParameters(java.lang.String[], java.lang.String[]);
+ method public java.security.AlgorithmConstraints getAlgorithmConstraints();
method public java.lang.String[] getCipherSuites();
+ method public java.lang.String getEndpointIdentificationAlgorithm();
method public boolean getNeedClientAuth();
method public java.lang.String[] getProtocols();
method public boolean getWantClientAuth();
+ method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
method public void setCipherSuites(java.lang.String[]);
+ method public void setEndpointIdentificationAlgorithm(java.lang.String);
method public void setNeedClientAuth(boolean);
method public void setProtocols(java.lang.String[]);
method public void setWantClientAuth(boolean);
@@ -55935,6 +61297,7 @@
method public abstract java.lang.String[] getEnabledCipherSuites();
method public abstract java.lang.String[] getEnabledProtocols();
method public abstract boolean getNeedClientAuth();
+ method public javax.net.ssl.SSLParameters getSSLParameters();
method public abstract java.lang.String[] getSupportedCipherSuites();
method public abstract java.lang.String[] getSupportedProtocols();
method public abstract boolean getUseClientMode();
@@ -55943,6 +61306,7 @@
method public abstract void setEnabledCipherSuites(java.lang.String[]);
method public abstract void setEnabledProtocols(java.lang.String[]);
method public abstract void setNeedClientAuth(boolean);
+ method public void setSSLParameters(javax.net.ssl.SSLParameters);
method public abstract void setUseClientMode(boolean);
method public abstract void setWantClientAuth(boolean);
}
@@ -56008,6 +61372,7 @@
method public abstract boolean getEnableSessionCreation();
method public abstract java.lang.String[] getEnabledCipherSuites();
method public abstract java.lang.String[] getEnabledProtocols();
+ method public javax.net.ssl.SSLSession getHandshakeSession();
method public abstract boolean getNeedClientAuth();
method public javax.net.ssl.SSLParameters getSSLParameters();
method public abstract javax.net.ssl.SSLSession getSession();
@@ -56063,6 +61428,14 @@
method public java.lang.String chooseEngineServerAlias(java.lang.String, java.security.Principal[], javax.net.ssl.SSLEngine);
}
+ public abstract class X509ExtendedTrustManager implements javax.net.ssl.X509TrustManager {
+ ctor public X509ExtendedTrustManager();
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException;
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+ }
+
public abstract interface X509KeyManager implements javax.net.ssl.KeyManager {
method public abstract java.lang.String chooseClientAlias(java.lang.String[], java.security.Principal[], java.net.Socket);
method public abstract java.lang.String chooseServerAlias(java.lang.String, java.security.Principal[], java.net.Socket);
@@ -56097,11 +61470,21 @@
method public abstract boolean isDestroyed();
}
+ public abstract deprecated class Policy {
+ ctor protected Policy();
+ method public abstract java.security.PermissionCollection getPermissions(javax.security.auth.Subject, java.security.CodeSource);
+ method public static javax.security.auth.Policy getPolicy();
+ method public abstract void refresh();
+ method public static void setPolicy(javax.security.auth.Policy);
+ }
+
public final class PrivateCredentialPermission extends java.security.Permission {
ctor public PrivateCredentialPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
method public java.lang.String getCredentialClass();
method public java.lang.String[][] getPrincipals();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -56159,6 +61542,43 @@
package javax.security.auth.login {
+ public class AppConfigurationEntry {
+ ctor public AppConfigurationEntry(java.lang.String, javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag, java.util.Map<java.lang.String, ?>);
+ method public javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag getControlFlag();
+ method public java.lang.String getLoginModuleName();
+ method public java.util.Map<java.lang.String, ?> getOptions();
+ }
+
+ public static class AppConfigurationEntry.LoginModuleControlFlag {
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag OPTIONAL;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag REQUIRED;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag REQUISITE;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag SUFFICIENT;
+ }
+
+ public abstract class Configuration {
+ ctor protected Configuration();
+ method public abstract javax.security.auth.login.AppConfigurationEntry[] getAppConfigurationEntry(java.lang.String);
+ method public static javax.security.auth.login.Configuration getConfiguration();
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters) throws java.security.NoSuchAlgorithmException;
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public javax.security.auth.login.Configuration.Parameters getParameters();
+ method public java.security.Provider getProvider();
+ method public java.lang.String getType();
+ method public void refresh();
+ method public static void setConfiguration(javax.security.auth.login.Configuration);
+ }
+
+ public static abstract interface Configuration.Parameters {
+ }
+
+ public abstract class ConfigurationSpi {
+ ctor public ConfigurationSpi();
+ method protected abstract javax.security.auth.login.AppConfigurationEntry[] engineGetAppConfigurationEntry(java.lang.String);
+ method protected void engineRefresh();
+ }
+
public class LoginException extends java.security.GeneralSecurityException {
ctor public LoginException();
ctor public LoginException(java.lang.String);
@@ -56169,10 +61589,10 @@
package javax.security.auth.x500 {
public final class X500Principal implements java.security.Principal java.io.Serializable {
- ctor public X500Principal(byte[]);
- ctor public X500Principal(java.io.InputStream);
ctor public X500Principal(java.lang.String);
ctor public X500Principal(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
+ ctor public X500Principal(byte[]);
+ ctor public X500Principal(java.io.InputStream);
method public byte[] getEncoded();
method public java.lang.String getName();
method public java.lang.String getName(java.lang.String);
@@ -56196,28 +61616,28 @@
}
public class CertificateEncodingException extends javax.security.cert.CertificateException {
- ctor public CertificateEncodingException(java.lang.String);
ctor public CertificateEncodingException();
+ ctor public CertificateEncodingException(java.lang.String);
}
public class CertificateException extends java.lang.Exception {
- ctor public CertificateException(java.lang.String);
ctor public CertificateException();
+ ctor public CertificateException(java.lang.String);
}
public class CertificateExpiredException extends javax.security.cert.CertificateException {
- ctor public CertificateExpiredException(java.lang.String);
ctor public CertificateExpiredException();
+ ctor public CertificateExpiredException(java.lang.String);
}
public class CertificateNotYetValidException extends javax.security.cert.CertificateException {
- ctor public CertificateNotYetValidException(java.lang.String);
ctor public CertificateNotYetValidException();
+ ctor public CertificateNotYetValidException(java.lang.String);
}
public class CertificateParsingException extends javax.security.cert.CertificateException {
- ctor public CertificateParsingException(java.lang.String);
ctor public CertificateParsingException();
+ ctor public CertificateParsingException(java.lang.String);
}
public abstract class X509Certificate extends javax.security.cert.Certificate {
@@ -56244,11 +61664,12 @@
public abstract interface CommonDataSource {
method public abstract java.io.PrintWriter getLogWriter() throws java.sql.SQLException;
method public abstract int getLoginTimeout() throws java.sql.SQLException;
+ method public abstract java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException;
method public abstract void setLogWriter(java.io.PrintWriter) throws java.sql.SQLException;
method public abstract void setLoginTimeout(int) throws java.sql.SQLException;
}
- public class ConnectionEvent extends java.util.EventObject implements java.io.Serializable {
+ public class ConnectionEvent extends java.util.EventObject {
ctor public ConnectionEvent(javax.sql.PooledConnection);
ctor public ConnectionEvent(javax.sql.PooledConnection, java.sql.SQLException);
method public java.sql.SQLException getSQLException();
@@ -56297,21 +61718,21 @@
method public abstract void removeRowSetListener(javax.sql.RowSetListener);
method public abstract void setArray(int, java.sql.Array) throws java.sql.SQLException;
method public abstract void setAsciiStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setAsciiStream(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setAsciiStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
- method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setBigDecimal(int, java.math.BigDecimal) throws java.sql.SQLException;
method public abstract void setBigDecimal(java.lang.String, java.math.BigDecimal) throws java.sql.SQLException;
method public abstract void setBinaryStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setBinaryStream(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBinaryStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
- method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setBlob(int, java.sql.Blob) throws java.sql.SQLException;
- method public abstract void setBlob(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBlob(int, java.io.InputStream, long) throws java.sql.SQLException;
- method public abstract void setBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBlob(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
method public abstract void setBlob(java.lang.String, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBoolean(int, boolean) throws java.sql.SQLException;
method public abstract void setBoolean(java.lang.String, boolean) throws java.sql.SQLException;
method public abstract void setByte(int, byte) throws java.sql.SQLException;
@@ -56319,15 +61740,15 @@
method public abstract void setBytes(int, byte[]) throws java.sql.SQLException;
method public abstract void setBytes(java.lang.String, byte[]) throws java.sql.SQLException;
method public abstract void setCharacterStream(int, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
method public abstract void setCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
method public abstract void setCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
method public abstract void setClob(int, java.sql.Clob) throws java.sql.SQLException;
- method public abstract void setClob(int, java.io.Reader) throws java.sql.SQLException;
method public abstract void setClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setClob(java.lang.String, java.sql.Clob) throws java.sql.SQLException;
method public abstract void setClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setCommand(java.lang.String) throws java.sql.SQLException;
method public abstract void setConcurrency(int) throws java.sql.SQLException;
method public abstract void setDataSourceName(java.lang.String) throws java.sql.SQLException;
@@ -56348,26 +61769,26 @@
method public abstract void setMaxRows(int) throws java.sql.SQLException;
method public abstract void setNCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
method public abstract void setNCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
- method public abstract void setNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
method public abstract void setNCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setNClob(int, java.sql.NClob) throws java.sql.SQLException;
method public abstract void setNClob(int, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setNClob(int, java.io.Reader, long) throws java.sql.SQLException;
- method public abstract void setNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
- method public abstract void setNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setNString(int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(int, int) throws java.sql.SQLException;
- method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
- method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
- method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
method public abstract void setObject(int, java.lang.Object, int, int) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
method public abstract void setObject(java.lang.String, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void setPassword(java.lang.String) throws java.sql.SQLException;
method public abstract void setQueryTimeout(int) throws java.sql.SQLException;
method public abstract void setReadOnly(boolean) throws java.sql.SQLException;
@@ -56385,8 +61806,8 @@
method public abstract void setTime(java.lang.String, java.sql.Time) throws java.sql.SQLException;
method public abstract void setTime(java.lang.String, java.sql.Time, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTimestamp(int, java.sql.Timestamp) throws java.sql.SQLException;
- method public abstract void setTimestamp(int, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void setTimestamp(int, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTransactionIsolation(int) throws java.sql.SQLException;
method public abstract void setType(int) throws java.sql.SQLException;
@@ -56396,7 +61817,7 @@
method public abstract void setUsername(java.lang.String) throws java.sql.SQLException;
}
- public class RowSetEvent extends java.util.EventObject implements java.io.Serializable {
+ public class RowSetEvent extends java.util.EventObject {
ctor public RowSetEvent(javax.sql.RowSet);
}
@@ -56443,8 +61864,8 @@
}
public class StatementEvent extends java.util.EventObject {
- ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement, java.sql.SQLException);
ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement);
+ ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement, java.sql.SQLException);
method public java.sql.SQLException getSQLException();
method public java.sql.PreparedStatement getStatement();
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 0605851..2ea5ebb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -43,6 +43,7 @@
field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
+ field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";
field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
@@ -99,6 +100,7 @@
field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";
field public static final java.lang.String GET_PACKAGE_IMPORTANCE = "android.permission.GET_PACKAGE_IMPORTANCE";
field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
+ field public static final java.lang.String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE";
field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";
field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO";
field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";
@@ -424,6 +426,7 @@
field public static final int calendarTextColor = 16843931; // 0x101049b
field public static final int calendarViewShown = 16843596; // 0x101034c
field public static final int calendarViewStyle = 16843613; // 0x101035d
+ field public static final int canControlMagnification = 16844040; // 0x1010508
field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8
field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9
field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -2718,6 +2721,7 @@
public abstract class AccessibilityService extends android.app.Service {
ctor public AccessibilityService();
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+ method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
@@ -2755,6 +2759,23 @@
field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
}
+ public static final class AccessibilityService.MagnificationController {
+ method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
+ method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener, android.os.Handler);
+ method public float getCenterX();
+ method public float getCenterY();
+ method public android.graphics.Region getMagnifiedRegion();
+ method public float getScale();
+ method public boolean removeListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
+ method public boolean reset(boolean);
+ method public boolean setCenter(float, float, boolean);
+ method public boolean setScale(float, boolean);
+ }
+
+ public static abstract interface AccessibilityService.MagnificationController.OnMagnificationChangedListener {
+ method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);
+ }
+
public class AccessibilityServiceInfo implements android.os.Parcelable {
ctor public AccessibilityServiceInfo();
method public static java.lang.String capabilityToString(int);
@@ -2769,6 +2790,7 @@
method public java.lang.String getSettingsActivityName();
method public java.lang.String loadDescription(android.content.pm.PackageManager);
method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10
field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4
field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8
field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2
@@ -2811,6 +2833,8 @@
method public abstract java.lang.String getAuthTokenLabel(java.lang.String);
method public final android.os.IBinder getIBinder();
method public abstract android.os.Bundle hasFeatures(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String[]) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startAddAccountSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startUpdateCredentialsSession(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
method public abstract android.os.Bundle updateCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
field public static final java.lang.String KEY_CUSTOM_TOKEN_EXPIRY = "android.accounts.expiry";
}
@@ -2875,6 +2899,8 @@
method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);
method public void setPassword(android.accounts.Account, java.lang.String);
method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startAddAccountSession(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startUpdateCredentialsSession(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
method public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
field public static final java.lang.String ACTION_AUTHENTICATOR_INTENT = "android.accounts.AccountAuthenticator";
field public static final java.lang.String AUTHENTICATOR_ATTRIBUTES_NAME = "account-authenticator";
@@ -2891,6 +2917,8 @@
field public static final java.lang.String KEY_ACCOUNT_AUTHENTICATOR_RESPONSE = "accountAuthenticatorResponse";
field public static final java.lang.String KEY_ACCOUNT_MANAGER_RESPONSE = "accountManagerResponse";
field public static final java.lang.String KEY_ACCOUNT_NAME = "authAccount";
+ field public static final java.lang.String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
+ field public static final java.lang.String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
field public static final java.lang.String KEY_ACCOUNT_TYPE = "accountType";
field public static final java.lang.String KEY_ANDROID_PACKAGE_NAME = "androidPackageName";
field public static final java.lang.String KEY_AUTHENTICATOR_TYPES = "authenticator_types";
@@ -3578,6 +3606,7 @@
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);
method public void openContextMenu(android.view.View);
method public void openOptionsMenu();
+ method public void overlayWithDecorCaption(boolean);
method public void overridePendingTransition(int, int);
method public void postponeEnterTransition();
method public void recreate();
@@ -3862,6 +3891,8 @@
}
public class ActivityOptions {
+ method public android.graphics.Rect getLaunchBounds();
+ method public boolean hasLaunchBounds();
method public static android.app.ActivityOptions makeBasic();
method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
@@ -3871,6 +3902,7 @@
method public static android.app.ActivityOptions makeTaskLaunchBehind();
method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);
method public void requestUsageTimeReport(android.app.PendingIntent);
+ method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);
method public android.os.Bundle toBundle();
method public void update(android.app.ActivityOptions);
field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";
@@ -4893,7 +4925,7 @@
method public android.graphics.drawable.Icon getLargeIcon();
method public android.graphics.drawable.Icon getSmallIcon();
method public java.lang.String getSortKey();
- method public android.app.Notification.Topic[] getTopics();
+ method public android.app.Notification.Topic getTopic();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
field public static final java.lang.String CATEGORY_ALARM = "alarm";
@@ -4956,6 +4988,7 @@
field public static final int PRIORITY_MAX = 2; // 0x2
field public static final int PRIORITY_MIN = -2; // 0xfffffffe
field public static final deprecated int STREAM_DEFAULT = -1; // 0xffffffff
+ field public static final java.lang.String TOPIC_DEFAULT = "system_default_topic";
field public static final int VISIBILITY_PRIVATE = 0; // 0x0
field public static final int VISIBILITY_PUBLIC = 1; // 0x1
field public static final int VISIBILITY_SECRET = -1; // 0xffffffff
@@ -5058,7 +5091,6 @@
method public android.app.Notification.Builder addAction(android.app.Notification.Action);
method public android.app.Notification.Builder addExtras(android.os.Bundle);
method public android.app.Notification.Builder addPerson(java.lang.String);
- method public android.app.Notification.Builder addTopic(android.app.Notification.Topic);
method public android.app.Notification build();
method public android.app.Notification.Builder extend(android.app.Notification.Extender);
method public android.os.Bundle getExtras();
@@ -5107,6 +5139,7 @@
method public android.app.Notification.Builder setSubText(java.lang.CharSequence);
method public android.app.Notification.Builder setTicker(java.lang.CharSequence);
method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews);
+ method public android.app.Notification.Builder setTopic(android.app.Notification.Topic);
method public android.app.Notification.Builder setUsesChronometer(boolean);
method public android.app.Notification.Builder setVibrate(long[]);
method public android.app.Notification.Builder setVisibility(int);
@@ -5264,10 +5297,12 @@
}
public static class NotificationManager.Policy implements android.os.Parcelable {
- ctor public NotificationManager.Policy(int, int, int);
+ ctor public deprecated NotificationManager.Policy(int, int, int);
+ ctor public NotificationManager.Policy(int, int, int, int);
method public int describeContents();
method public static java.lang.String priorityCategoriesToString(int);
method public static java.lang.String prioritySendersToString(int);
+ method public static java.lang.String suppressedEffectsToString(int);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.app.NotificationManager.Policy> CREATOR;
field public static final int PRIORITY_CATEGORY_CALLS = 8; // 0x8
@@ -5278,9 +5313,13 @@
field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
+ field public static final int SUPPRESSED_EFFECTS_UNSET = -1; // 0xffffffff
+ field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
+ field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
field public final int priorityCallSenders;
field public final int priorityCategories;
field public final int priorityMessageSenders;
+ field public final int suppressedVisualEffects;
}
public final class PendingIntent implements android.os.Parcelable {
@@ -5868,6 +5907,7 @@
method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);
method public android.os.Bundle getUserRestrictions(android.content.ComponentName);
+ method public java.lang.String getWifiMacAddress();
method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
method public boolean hasGrantedPolicy(android.content.ComponentName, int);
method public boolean installCaCert(android.content.ComponentName, byte[]);
@@ -5964,6 +6004,8 @@
field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";
field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";
field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";
+ field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
+ field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";
field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";
field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";
@@ -7641,12 +7683,16 @@
method public static boolean compareMimeTypes(java.lang.String, java.lang.String);
method public int describeContents();
method public java.lang.String[] filterMimeTypes(java.lang.String);
+ method public android.os.PersistableBundle getExtras();
method public java.lang.CharSequence getLabel();
method public java.lang.String getMimeType(int);
method public int getMimeTypeCount();
method public boolean hasMimeType(java.lang.String);
+ method public void setExtras(android.os.PersistableBundle);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;
+ field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";
+ field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";
field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";
field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";
@@ -8011,6 +8057,7 @@
method public abstract java.lang.String getPackageResourcePath();
method public abstract android.content.res.Resources getResources();
method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
method public final java.lang.String getString(int);
method public final java.lang.String getString(int, java.lang.Object...);
method public abstract java.lang.Object getSystemService(java.lang.String);
@@ -8113,6 +8160,7 @@
field public static final int MODE_APPEND = 32768; // 0x8000
field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
field public static final deprecated int MODE_MULTI_PROCESS = 4; // 0x4
+ field public static final int MODE_NO_LOCALIZED_COLLATORS = 16; // 0x10
field public static final int MODE_PRIVATE = 0; // 0x0
field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2
@@ -8202,6 +8250,7 @@
method public java.lang.String getPackageResourcePath();
method public android.content.res.Resources getResources();
method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
method public java.lang.Object getSystemService(java.lang.String);
method public java.lang.String getSystemServiceName(java.lang.Class<?>);
method public android.content.res.Resources.Theme getTheme();
@@ -8489,6 +8538,7 @@
field public static final java.lang.String ACTION_INPUT_METHOD_CHANGED = "android.intent.action.INPUT_METHOD_CHANGED";
field public static final java.lang.String ACTION_INSERT = "android.intent.action.INSERT";
field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";
+ field public static final java.lang.String ACTION_INSTALL_EPHEMERAL_PACKAGE = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE";
field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
field public static final java.lang.String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";
field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
@@ -8536,6 +8586,7 @@
field public static final java.lang.String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART";
field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
+ field public static final java.lang.String ACTION_RESOLVE_EPHEMERAL_PACKAGE = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE";
field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";
field public static final java.lang.String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";
@@ -8559,6 +8610,7 @@
field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";
field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";
field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";
+ field public static final java.lang.String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED";
field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW";
field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";
field public static final deprecated java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";
@@ -10261,6 +10313,7 @@
public static class Resources.NotFoundException extends java.lang.RuntimeException {
ctor public Resources.NotFoundException();
ctor public Resources.NotFoundException(java.lang.String);
+ ctor public Resources.NotFoundException(java.lang.String, java.lang.Exception);
}
public final class Resources.Theme {
@@ -13771,6 +13824,7 @@
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_TIMESTAMP_SOURCE;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_WHITE_LEVEL;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_MAX_ANALOG_SENSITIVITY;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect[]> SENSOR_OPTICAL_BLACK_REGIONS;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_ORIENTATION;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_REFERENCE_ILLUMINANT1;
field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> SENSOR_REFERENCE_ILLUMINANT2;
@@ -14183,6 +14237,8 @@
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> REQUEST_PIPELINE_DEPTH;
field public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> SCALER_CROP_REGION;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> SENSOR_DYNAMIC_BLACK_LEVEL;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SENSOR_DYNAMIC_WHITE_LEVEL;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_EXPOSURE_TIME;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_FRAME_DURATION;
field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> SENSOR_GREEN_SPLIT;
@@ -15233,6 +15289,4147 @@
}
+package android.icu.lang {
+
+ public final class UCharacter implements android.icu.lang.UCharacterEnums.ECharacterCategory android.icu.lang.UCharacterEnums.ECharacterDirection {
+ method public static int charCount(int);
+ method public static final int codePointAt(java.lang.CharSequence, int);
+ method public static final int codePointAt(char[], int);
+ method public static final int codePointAt(char[], int, int);
+ method public static final int codePointBefore(java.lang.CharSequence, int);
+ method public static final int codePointBefore(char[], int);
+ method public static final int codePointBefore(char[], int, int);
+ method public static int codePointCount(java.lang.CharSequence, int, int);
+ method public static int codePointCount(char[], int, int);
+ method public static int digit(int, int);
+ method public static int digit(int);
+ method public static int foldCase(int, boolean);
+ method public static java.lang.String foldCase(java.lang.String, boolean);
+ method public static int foldCase(int, int);
+ method public static final java.lang.String foldCase(java.lang.String, int);
+ method public static char forDigit(int, int);
+ method public static android.icu.util.VersionInfo getAge(int);
+ method public static int getBidiPairedBracket(int);
+ method public static int getCharFromExtendedName(java.lang.String);
+ method public static int getCharFromName(java.lang.String);
+ method public static int getCharFromNameAlias(java.lang.String);
+ method public static int getCodePoint(char, char);
+ method public static int getCodePoint(char);
+ method public static int getCombiningClass(int);
+ method public static int getDirection(int);
+ method public static byte getDirectionality(int);
+ method public static java.lang.String getExtendedName(int);
+ method public static android.icu.util.ValueIterator getExtendedNameIterator();
+ method public static int getHanNumericValue(int);
+ method public static int getIntPropertyMaxValue(int);
+ method public static int getIntPropertyMinValue(int);
+ method public static int getIntPropertyValue(int, int);
+ method public static int getMirror(int);
+ method public static java.lang.String getName(int);
+ method public static java.lang.String getName(java.lang.String, java.lang.String);
+ method public static java.lang.String getNameAlias(int);
+ method public static android.icu.util.ValueIterator getNameIterator();
+ method public static int getNumericValue(int);
+ method public static int getPropertyEnum(java.lang.CharSequence);
+ method public static java.lang.String getPropertyName(int, int);
+ method public static int getPropertyValueEnum(int, java.lang.CharSequence);
+ method public static java.lang.String getPropertyValueName(int, int, int);
+ method public static int getType(int);
+ method public static android.icu.util.RangeValueIterator getTypeIterator();
+ method public static double getUnicodeNumericValue(int);
+ method public static android.icu.util.VersionInfo getUnicodeVersion();
+ method public static boolean hasBinaryProperty(int, int);
+ method public static boolean isBMP(int);
+ method public static boolean isBaseForm(int);
+ method public static boolean isDefined(int);
+ method public static boolean isDigit(int);
+ method public static boolean isHighSurrogate(char);
+ method public static boolean isISOControl(int);
+ method public static boolean isIdentifierIgnorable(int);
+ method public static boolean isJavaIdentifierPart(int);
+ method public static boolean isJavaIdentifierStart(int);
+ method public static boolean isLegal(int);
+ method public static boolean isLegal(java.lang.String);
+ method public static boolean isLetter(int);
+ method public static boolean isLetterOrDigit(int);
+ method public static boolean isLowSurrogate(char);
+ method public static boolean isLowerCase(int);
+ method public static boolean isMirrored(int);
+ method public static boolean isPrintable(int);
+ method public static boolean isSpaceChar(int);
+ method public static boolean isSupplementary(int);
+ method public static final boolean isSupplementaryCodePoint(int);
+ method public static final boolean isSurrogatePair(char, char);
+ method public static boolean isTitleCase(int);
+ method public static boolean isUAlphabetic(int);
+ method public static boolean isULowercase(int);
+ method public static boolean isUUppercase(int);
+ method public static boolean isUWhiteSpace(int);
+ method public static boolean isUnicodeIdentifierPart(int);
+ method public static boolean isUnicodeIdentifierStart(int);
+ method public static boolean isUpperCase(int);
+ method public static final boolean isValidCodePoint(int);
+ method public static boolean isWhitespace(int);
+ method public static int offsetByCodePoints(java.lang.CharSequence, int, int);
+ method public static int offsetByCodePoints(char[], int, int, int, int);
+ method public static final int toChars(int, char[], int);
+ method public static final char[] toChars(int);
+ method public static final int toCodePoint(char, char);
+ method public static int toLowerCase(int);
+ method public static java.lang.String toLowerCase(java.lang.String);
+ method public static java.lang.String toLowerCase(java.util.Locale, java.lang.String);
+ method public static java.lang.String toLowerCase(android.icu.util.ULocale, java.lang.String);
+ method public static java.lang.String toString(int);
+ method public static int toTitleCase(int);
+ method public static java.lang.String toTitleCase(java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(java.util.Locale, java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(android.icu.util.ULocale, java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(android.icu.util.ULocale, java.lang.String, android.icu.text.BreakIterator, int);
+ method public static java.lang.String toTitleCase(java.util.Locale, java.lang.String, android.icu.text.BreakIterator, int);
+ method public static int toUpperCase(int);
+ method public static java.lang.String toUpperCase(java.lang.String);
+ method public static java.lang.String toUpperCase(java.util.Locale, java.lang.String);
+ method public static java.lang.String toUpperCase(android.icu.util.ULocale, java.lang.String);
+ field public static final int FOLD_CASE_DEFAULT = 0; // 0x0
+ field public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1; // 0x1
+ field public static final int MAX_CODE_POINT = 1114111; // 0x10ffff
+ field public static final char MAX_HIGH_SURROGATE = 56319; // 0xdbff '\udbff'
+ field public static final char MAX_LOW_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_RADIX = 36; // 0x24
+ field public static final char MAX_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_VALUE = 1114111; // 0x10ffff
+ field public static final int MIN_CODE_POINT = 0; // 0x0
+ field public static final char MIN_HIGH_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final char MIN_LOW_SURROGATE = 56320; // 0xdc00 '\udc00'
+ field public static final int MIN_RADIX = 2; // 0x2
+ field public static final int MIN_SUPPLEMENTARY_CODE_POINT = 65536; // 0x10000
+ field public static final char MIN_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final int MIN_VALUE = 0; // 0x0
+ field public static final double NO_NUMERIC_VALUE = -1.23456789E8;
+ field public static final int REPLACEMENT_CHAR = 65533; // 0xfffd
+ field public static final int SUPPLEMENTARY_MIN_VALUE = 65536; // 0x10000
+ field public static final int TITLECASE_NO_BREAK_ADJUSTMENT = 512; // 0x200
+ field public static final int TITLECASE_NO_LOWERCASE = 256; // 0x100
+ }
+
+ public static abstract interface UCharacter.BidiPairedBracketType {
+ field public static final int CLOSE = 2; // 0x2
+ field public static final int COUNT = 3; // 0x3
+ field public static final int NONE = 0; // 0x0
+ field public static final int OPEN = 1; // 0x1
+ }
+
+ public static abstract interface UCharacter.DecompositionType {
+ field public static final int CANONICAL = 1; // 0x1
+ field public static final int CIRCLE = 3; // 0x3
+ field public static final int COMPAT = 2; // 0x2
+ field public static final int COUNT = 18; // 0x12
+ field public static final int FINAL = 4; // 0x4
+ field public static final int FONT = 5; // 0x5
+ field public static final int FRACTION = 6; // 0x6
+ field public static final int INITIAL = 7; // 0x7
+ field public static final int ISOLATED = 8; // 0x8
+ field public static final int MEDIAL = 9; // 0x9
+ field public static final int NARROW = 10; // 0xa
+ field public static final int NOBREAK = 11; // 0xb
+ field public static final int NONE = 0; // 0x0
+ field public static final int SMALL = 12; // 0xc
+ field public static final int SQUARE = 13; // 0xd
+ field public static final int SUB = 14; // 0xe
+ field public static final int SUPER = 15; // 0xf
+ field public static final int VERTICAL = 16; // 0x10
+ field public static final int WIDE = 17; // 0x11
+ }
+
+ public static abstract interface UCharacter.EastAsianWidth {
+ field public static final int AMBIGUOUS = 1; // 0x1
+ field public static final int COUNT = 6; // 0x6
+ field public static final int FULLWIDTH = 3; // 0x3
+ field public static final int HALFWIDTH = 2; // 0x2
+ field public static final int NARROW = 4; // 0x4
+ field public static final int NEUTRAL = 0; // 0x0
+ field public static final int WIDE = 5; // 0x5
+ }
+
+ public static abstract interface UCharacter.GraphemeClusterBreak {
+ field public static final int CONTROL = 1; // 0x1
+ field public static final int COUNT = 13; // 0xd
+ field public static final int CR = 2; // 0x2
+ field public static final int EXTEND = 3; // 0x3
+ field public static final int L = 4; // 0x4
+ field public static final int LF = 5; // 0x5
+ field public static final int LV = 6; // 0x6
+ field public static final int LVT = 7; // 0x7
+ field public static final int OTHER = 0; // 0x0
+ field public static final int PREPEND = 11; // 0xb
+ field public static final int REGIONAL_INDICATOR = 12; // 0xc
+ field public static final int SPACING_MARK = 10; // 0xa
+ field public static final int T = 8; // 0x8
+ field public static final int V = 9; // 0x9
+ }
+
+ public static abstract interface UCharacter.HangulSyllableType {
+ field public static final int COUNT = 6; // 0x6
+ field public static final int LEADING_JAMO = 1; // 0x1
+ field public static final int LVT_SYLLABLE = 5; // 0x5
+ field public static final int LV_SYLLABLE = 4; // 0x4
+ field public static final int NOT_APPLICABLE = 0; // 0x0
+ field public static final int TRAILING_JAMO = 3; // 0x3
+ field public static final int VOWEL_JAMO = 2; // 0x2
+ }
+
+ public static abstract interface UCharacter.JoiningGroup {
+ field public static final int AIN = 1; // 0x1
+ field public static final int ALAPH = 2; // 0x2
+ field public static final int ALEF = 3; // 0x3
+ field public static final int BEH = 4; // 0x4
+ field public static final int BETH = 5; // 0x5
+ field public static final int BURUSHASKI_YEH_BARREE = 54; // 0x36
+ field public static final int COUNT = 86; // 0x56
+ field public static final int DAL = 6; // 0x6
+ field public static final int DALATH_RISH = 7; // 0x7
+ field public static final int E = 8; // 0x8
+ field public static final int FARSI_YEH = 55; // 0x37
+ field public static final int FE = 51; // 0x33
+ field public static final int FEH = 9; // 0x9
+ field public static final int FINAL_SEMKATH = 10; // 0xa
+ field public static final int GAF = 11; // 0xb
+ field public static final int GAMAL = 12; // 0xc
+ field public static final int HAH = 13; // 0xd
+ field public static final int HAMZA_ON_HEH_GOAL = 14; // 0xe
+ field public static final int HE = 15; // 0xf
+ field public static final int HEH = 16; // 0x10
+ field public static final int HEH_GOAL = 17; // 0x11
+ field public static final int HETH = 18; // 0x12
+ field public static final int KAF = 19; // 0x13
+ field public static final int KAPH = 20; // 0x14
+ field public static final int KHAPH = 52; // 0x34
+ field public static final int KNOTTED_HEH = 21; // 0x15
+ field public static final int LAM = 22; // 0x16
+ field public static final int LAMADH = 23; // 0x17
+ field public static final int MANICHAEAN_ALEPH = 58; // 0x3a
+ field public static final int MANICHAEAN_AYIN = 59; // 0x3b
+ field public static final int MANICHAEAN_BETH = 60; // 0x3c
+ field public static final int MANICHAEAN_DALETH = 61; // 0x3d
+ field public static final int MANICHAEAN_DHAMEDH = 62; // 0x3e
+ field public static final int MANICHAEAN_FIVE = 63; // 0x3f
+ field public static final int MANICHAEAN_GIMEL = 64; // 0x40
+ field public static final int MANICHAEAN_HETH = 65; // 0x41
+ field public static final int MANICHAEAN_HUNDRED = 66; // 0x42
+ field public static final int MANICHAEAN_KAPH = 67; // 0x43
+ field public static final int MANICHAEAN_LAMEDH = 68; // 0x44
+ field public static final int MANICHAEAN_MEM = 69; // 0x45
+ field public static final int MANICHAEAN_NUN = 70; // 0x46
+ field public static final int MANICHAEAN_ONE = 71; // 0x47
+ field public static final int MANICHAEAN_PE = 72; // 0x48
+ field public static final int MANICHAEAN_QOPH = 73; // 0x49
+ field public static final int MANICHAEAN_RESH = 74; // 0x4a
+ field public static final int MANICHAEAN_SADHE = 75; // 0x4b
+ field public static final int MANICHAEAN_SAMEKH = 76; // 0x4c
+ field public static final int MANICHAEAN_TAW = 77; // 0x4d
+ field public static final int MANICHAEAN_TEN = 78; // 0x4e
+ field public static final int MANICHAEAN_TETH = 79; // 0x4f
+ field public static final int MANICHAEAN_THAMEDH = 80; // 0x50
+ field public static final int MANICHAEAN_TWENTY = 81; // 0x51
+ field public static final int MANICHAEAN_WAW = 82; // 0x52
+ field public static final int MANICHAEAN_YODH = 83; // 0x53
+ field public static final int MANICHAEAN_ZAYIN = 84; // 0x54
+ field public static final int MEEM = 24; // 0x18
+ field public static final int MIM = 25; // 0x19
+ field public static final int NOON = 26; // 0x1a
+ field public static final int NO_JOINING_GROUP = 0; // 0x0
+ field public static final int NUN = 27; // 0x1b
+ field public static final int NYA = 56; // 0x38
+ field public static final int PE = 28; // 0x1c
+ field public static final int QAF = 29; // 0x1d
+ field public static final int QAPH = 30; // 0x1e
+ field public static final int REH = 31; // 0x1f
+ field public static final int REVERSED_PE = 32; // 0x20
+ field public static final int ROHINGYA_YEH = 57; // 0x39
+ field public static final int SAD = 33; // 0x21
+ field public static final int SADHE = 34; // 0x22
+ field public static final int SEEN = 35; // 0x23
+ field public static final int SEMKATH = 36; // 0x24
+ field public static final int SHIN = 37; // 0x25
+ field public static final int STRAIGHT_WAW = 85; // 0x55
+ field public static final int SWASH_KAF = 38; // 0x26
+ field public static final int SYRIAC_WAW = 39; // 0x27
+ field public static final int TAH = 40; // 0x28
+ field public static final int TAW = 41; // 0x29
+ field public static final int TEH_MARBUTA = 42; // 0x2a
+ field public static final int TEH_MARBUTA_GOAL = 14; // 0xe
+ field public static final int TETH = 43; // 0x2b
+ field public static final int WAW = 44; // 0x2c
+ field public static final int YEH = 45; // 0x2d
+ field public static final int YEH_BARREE = 46; // 0x2e
+ field public static final int YEH_WITH_TAIL = 47; // 0x2f
+ field public static final int YUDH = 48; // 0x30
+ field public static final int YUDH_HE = 49; // 0x31
+ field public static final int ZAIN = 50; // 0x32
+ field public static final int ZHAIN = 53; // 0x35
+ }
+
+ public static abstract interface UCharacter.JoiningType {
+ field public static final int COUNT = 6; // 0x6
+ field public static final int DUAL_JOINING = 2; // 0x2
+ field public static final int JOIN_CAUSING = 1; // 0x1
+ field public static final int LEFT_JOINING = 3; // 0x3
+ field public static final int NON_JOINING = 0; // 0x0
+ field public static final int RIGHT_JOINING = 4; // 0x4
+ field public static final int TRANSPARENT = 5; // 0x5
+ }
+
+ public static abstract interface UCharacter.LineBreak {
+ field public static final int ALPHABETIC = 2; // 0x2
+ field public static final int AMBIGUOUS = 1; // 0x1
+ field public static final int BREAK_AFTER = 4; // 0x4
+ field public static final int BREAK_BEFORE = 5; // 0x5
+ field public static final int BREAK_BOTH = 3; // 0x3
+ field public static final int BREAK_SYMBOLS = 27; // 0x1b
+ field public static final int CARRIAGE_RETURN = 10; // 0xa
+ field public static final int CLOSE_PARENTHESIS = 36; // 0x24
+ field public static final int CLOSE_PUNCTUATION = 8; // 0x8
+ field public static final int COMBINING_MARK = 9; // 0x9
+ field public static final int COMPLEX_CONTEXT = 24; // 0x18
+ field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
+ field public static final int CONTINGENT_BREAK = 7; // 0x7
+ field public static final int COUNT = 40; // 0x28
+ field public static final int EXCLAMATION = 11; // 0xb
+ field public static final int GLUE = 12; // 0xc
+ field public static final int H2 = 31; // 0x1f
+ field public static final int H3 = 32; // 0x20
+ field public static final int HEBREW_LETTER = 38; // 0x26
+ field public static final int HYPHEN = 13; // 0xd
+ field public static final int IDEOGRAPHIC = 14; // 0xe
+ field public static final int INFIX_NUMERIC = 16; // 0x10
+ field public static final int INSEPARABLE = 15; // 0xf
+ field public static final int INSEPERABLE = 15; // 0xf
+ field public static final int JL = 33; // 0x21
+ field public static final int JT = 34; // 0x22
+ field public static final int JV = 35; // 0x23
+ field public static final int LINE_FEED = 17; // 0x11
+ field public static final int MANDATORY_BREAK = 6; // 0x6
+ field public static final int NEXT_LINE = 29; // 0x1d
+ field public static final int NONSTARTER = 18; // 0x12
+ field public static final int NUMERIC = 19; // 0x13
+ field public static final int OPEN_PUNCTUATION = 20; // 0x14
+ field public static final int POSTFIX_NUMERIC = 21; // 0x15
+ field public static final int PREFIX_NUMERIC = 22; // 0x16
+ field public static final int QUOTATION = 23; // 0x17
+ field public static final int REGIONAL_INDICATOR = 39; // 0x27
+ field public static final int SPACE = 26; // 0x1a
+ field public static final int SURROGATE = 25; // 0x19
+ field public static final int UNKNOWN = 0; // 0x0
+ field public static final int WORD_JOINER = 30; // 0x1e
+ field public static final int ZWSPACE = 28; // 0x1c
+ }
+
+ public static abstract interface UCharacter.NumericType {
+ field public static final int COUNT = 4; // 0x4
+ field public static final int DECIMAL = 1; // 0x1
+ field public static final int DIGIT = 2; // 0x2
+ field public static final int NONE = 0; // 0x0
+ field public static final int NUMERIC = 3; // 0x3
+ }
+
+ public static abstract interface UCharacter.SentenceBreak {
+ field public static final int ATERM = 1; // 0x1
+ field public static final int CLOSE = 2; // 0x2
+ field public static final int COUNT = 15; // 0xf
+ field public static final int CR = 11; // 0xb
+ field public static final int EXTEND = 12; // 0xc
+ field public static final int FORMAT = 3; // 0x3
+ field public static final int LF = 13; // 0xd
+ field public static final int LOWER = 4; // 0x4
+ field public static final int NUMERIC = 5; // 0x5
+ field public static final int OLETTER = 6; // 0x6
+ field public static final int OTHER = 0; // 0x0
+ field public static final int SCONTINUE = 14; // 0xe
+ field public static final int SEP = 7; // 0x7
+ field public static final int SP = 8; // 0x8
+ field public static final int STERM = 9; // 0x9
+ field public static final int UPPER = 10; // 0xa
+ }
+
+ public static final class UCharacter.UnicodeBlock extends java.lang.Character.Subset {
+ method public static final android.icu.lang.UCharacter.UnicodeBlock forName(java.lang.String);
+ method public int getID();
+ method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
+ method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
+ field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
+ field public static final int AHOM_ID = 253; // 0xfd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ALCHEMICAL_SYMBOLS;
+ field public static final int ALCHEMICAL_SYMBOLS_ID = 208; // 0xd0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ALPHABETIC_PRESENTATION_FORMS;
+ field public static final int ALPHABETIC_PRESENTATION_FORMS_ID = 80; // 0x50
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANATOLIAN_HIEROGLYPHS;
+ field public static final int ANATOLIAN_HIEROGLYPHS_ID = 254; // 0xfe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION;
+ field public static final int ANCIENT_GREEK_MUSICAL_NOTATION_ID = 126; // 0x7e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_GREEK_NUMBERS;
+ field public static final int ANCIENT_GREEK_NUMBERS_ID = 127; // 0x7f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_SYMBOLS;
+ field public static final int ANCIENT_SYMBOLS_ID = 165; // 0xa5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_EXTENDED_A;
+ field public static final int ARABIC_EXTENDED_A_ID = 210; // 0xd2
+ field public static final int ARABIC_ID = 12; // 0xc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS;
+ field public static final int ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS_ID = 211; // 0xd3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_PRESENTATION_FORMS_A;
+ field public static final int ARABIC_PRESENTATION_FORMS_A_ID = 81; // 0x51
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_PRESENTATION_FORMS_B;
+ field public static final int ARABIC_PRESENTATION_FORMS_B_ID = 85; // 0x55
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_SUPPLEMENT;
+ field public static final int ARABIC_SUPPLEMENT_ID = 128; // 0x80
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARMENIAN;
+ field public static final int ARMENIAN_ID = 10; // 0xa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARROWS;
+ field public static final int ARROWS_ID = 46; // 0x2e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AVESTAN;
+ field public static final int AVESTAN_ID = 188; // 0xbc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BALINESE;
+ field public static final int BALINESE_ID = 147; // 0x93
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BAMUM;
+ field public static final int BAMUM_ID = 177; // 0xb1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BAMUM_SUPPLEMENT;
+ field public static final int BAMUM_SUPPLEMENT_ID = 202; // 0xca
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BASIC_LATIN;
+ field public static final int BASIC_LATIN_ID = 1; // 0x1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BASSA_VAH;
+ field public static final int BASSA_VAH_ID = 221; // 0xdd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BATAK;
+ field public static final int BATAK_ID = 199; // 0xc7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
+ field public static final int BENGALI_ID = 16; // 0x10
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
+ field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO_EXTENDED;
+ field public static final int BOPOMOFO_EXTENDED_ID = 67; // 0x43
+ field public static final int BOPOMOFO_ID = 64; // 0x40
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOX_DRAWING;
+ field public static final int BOX_DRAWING_ID = 52; // 0x34
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BRAHMI;
+ field public static final int BRAHMI_ID = 201; // 0xc9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BRAILLE_PATTERNS;
+ field public static final int BRAILLE_PATTERNS_ID = 57; // 0x39
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BUGINESE;
+ field public static final int BUGINESE_ID = 129; // 0x81
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BUHID;
+ field public static final int BUHID_ID = 100; // 0x64
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS;
+ field public static final int BYZANTINE_MUSICAL_SYMBOLS_ID = 91; // 0x5b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CARIAN;
+ field public static final int CARIAN_ID = 168; // 0xa8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CAUCASIAN_ALBANIAN;
+ field public static final int CAUCASIAN_ALBANIAN_ID = 222; // 0xde
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHAKMA;
+ field public static final int CHAKMA_ID = 212; // 0xd4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHAM;
+ field public static final int CHAM_ID = 164; // 0xa4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE;
+ field public static final int CHEROKEE_ID = 32; // 0x20
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE_SUPPLEMENT;
+ field public static final int CHEROKEE_SUPPLEMENT_ID = 255; // 0xff
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_FORMS;
+ field public static final int CJK_COMPATIBILITY_FORMS_ID = 83; // 0x53
+ field public static final int CJK_COMPATIBILITY_ID = 69; // 0x45
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS;
+ field public static final int CJK_COMPATIBILITY_IDEOGRAPHS_ID = 79; // 0x4f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT;
+ field public static final int CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT_ID = 95; // 0x5f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_RADICALS_SUPPLEMENT;
+ field public static final int CJK_RADICALS_SUPPLEMENT_ID = 58; // 0x3a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_STROKES;
+ field public static final int CJK_STROKES_ID = 130; // 0x82
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION;
+ field public static final int CJK_SYMBOLS_AND_PUNCTUATION_ID = 61; // 0x3d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A_ID = 70; // 0x46
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B_ID = 94; // 0x5e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C_ID = 197; // 0xc5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D_ID = 209; // 0xd1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E_ID = 256; // 0x100
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_ID = 71; // 0x47
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_EXTENDED;
+ field public static final int COMBINING_DIACRITICAL_MARKS_EXTENDED_ID = 224; // 0xe0
+ field public static final int COMBINING_DIACRITICAL_MARKS_ID = 7; // 0x7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT;
+ field public static final int COMBINING_DIACRITICAL_MARKS_SUPPLEMENT_ID = 131; // 0x83
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_HALF_MARKS;
+ field public static final int COMBINING_HALF_MARKS_ID = 82; // 0x52
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS;
+ field public static final int COMBINING_MARKS_FOR_SYMBOLS_ID = 43; // 0x2b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMMON_INDIC_NUMBER_FORMS;
+ field public static final int COMMON_INDIC_NUMBER_FORMS_ID = 178; // 0xb2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CONTROL_PICTURES;
+ field public static final int CONTROL_PICTURES_ID = 49; // 0x31
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COPTIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COPTIC_EPACT_NUMBERS;
+ field public static final int COPTIC_EPACT_NUMBERS_ID = 223; // 0xdf
+ field public static final int COPTIC_ID = 132; // 0x84
+ field public static final int COUNT = 263; // 0x107
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COUNTING_ROD_NUMERALS;
+ field public static final int COUNTING_ROD_NUMERALS_ID = 154; // 0x9a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CUNEIFORM;
+ field public static final int CUNEIFORM_ID = 152; // 0x98
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION;
+ field public static final int CUNEIFORM_NUMBERS_AND_PUNCTUATION_ID = 153; // 0x99
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CURRENCY_SYMBOLS;
+ field public static final int CURRENCY_SYMBOLS_ID = 42; // 0x2a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYPRIOT_SYLLABARY;
+ field public static final int CYPRIOT_SYLLABARY_ID = 123; // 0x7b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_A;
+ field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
+ field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
+ field public static final int CYRILLIC_ID = 9; // 0x9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
+ field public static final int CYRILLIC_SUPPLEMENTARY_ID = 97; // 0x61
+ field public static final int CYRILLIC_SUPPLEMENT_ID = 97; // 0x61
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DESERET;
+ field public static final int DESERET_ID = 90; // 0x5a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DEVANAGARI;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DEVANAGARI_EXTENDED;
+ field public static final int DEVANAGARI_EXTENDED_ID = 179; // 0xb3
+ field public static final int DEVANAGARI_ID = 15; // 0xf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DINGBATS;
+ field public static final int DINGBATS_ID = 56; // 0x38
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DOMINO_TILES;
+ field public static final int DOMINO_TILES_ID = 171; // 0xab
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DUPLOYAN;
+ field public static final int DUPLOYAN_ID = 225; // 0xe1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EARLY_DYNASTIC_CUNEIFORM;
+ field public static final int EARLY_DYNASTIC_CUNEIFORM_ID = 257; // 0x101
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EGYPTIAN_HIEROGLYPHS;
+ field public static final int EGYPTIAN_HIEROGLYPHS_ID = 194; // 0xc2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ELBASAN;
+ field public static final int ELBASAN_ID = 226; // 0xe2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EMOTICONS;
+ field public static final int EMOTICONS_ID = 206; // 0xce
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_ALPHANUMERICS;
+ field public static final int ENCLOSED_ALPHANUMERICS_ID = 51; // 0x33
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT;
+ field public static final int ENCLOSED_ALPHANUMERIC_SUPPLEMENT_ID = 195; // 0xc3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS;
+ field public static final int ENCLOSED_CJK_LETTERS_AND_MONTHS_ID = 68; // 0x44
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT;
+ field public static final int ENCLOSED_IDEOGRAPHIC_SUPPLEMENT_ID = 196; // 0xc4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_EXTENDED;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_EXTENDED_A;
+ field public static final int ETHIOPIC_EXTENDED_A_ID = 200; // 0xc8
+ field public static final int ETHIOPIC_EXTENDED_ID = 133; // 0x85
+ field public static final int ETHIOPIC_ID = 31; // 0x1f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_SUPPLEMENT;
+ field public static final int ETHIOPIC_SUPPLEMENT_ID = 134; // 0x86
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GENERAL_PUNCTUATION;
+ field public static final int GENERAL_PUNCTUATION_ID = 40; // 0x28
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEOMETRIC_SHAPES;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEOMETRIC_SHAPES_EXTENDED;
+ field public static final int GEOMETRIC_SHAPES_EXTENDED_ID = 227; // 0xe3
+ field public static final int GEOMETRIC_SHAPES_ID = 54; // 0x36
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN;
+ field public static final int GEORGIAN_ID = 29; // 0x1d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN_SUPPLEMENT;
+ field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
+ field public static final int GLAGOLITIC_ID = 136; // 0x88
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
+ field public static final int GOTHIC_ID = 89; // 0x59
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
+ field public static final int GRANTHA_ID = 228; // 0xe4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GREEK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GREEK_EXTENDED;
+ field public static final int GREEK_EXTENDED_ID = 39; // 0x27
+ field public static final int GREEK_ID = 8; // 0x8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GUJARATI;
+ field public static final int GUJARATI_ID = 18; // 0x12
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GURMUKHI;
+ field public static final int GURMUKHI_ID = 17; // 0x11
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS;
+ field public static final int HALFWIDTH_AND_FULLWIDTH_FORMS_ID = 87; // 0x57
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_COMPATIBILITY_JAMO;
+ field public static final int HANGUL_COMPATIBILITY_JAMO_ID = 65; // 0x41
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO_EXTENDED_A;
+ field public static final int HANGUL_JAMO_EXTENDED_A_ID = 180; // 0xb4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO_EXTENDED_B;
+ field public static final int HANGUL_JAMO_EXTENDED_B_ID = 185; // 0xb9
+ field public static final int HANGUL_JAMO_ID = 30; // 0x1e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_SYLLABLES;
+ field public static final int HANGUL_SYLLABLES_ID = 74; // 0x4a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANUNOO;
+ field public static final int HANUNOO_ID = 99; // 0x63
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HATRAN;
+ field public static final int HATRAN_ID = 258; // 0x102
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HEBREW;
+ field public static final int HEBREW_ID = 11; // 0xb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIGH_PRIVATE_USE_SURROGATES;
+ field public static final int HIGH_PRIVATE_USE_SURROGATES_ID = 76; // 0x4c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIGH_SURROGATES;
+ field public static final int HIGH_SURROGATES_ID = 75; // 0x4b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIRAGANA;
+ field public static final int HIRAGANA_ID = 62; // 0x3e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
+ field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
+ field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
+ field public static final int INSCRIPTIONAL_PAHLAVI_ID = 190; // 0xbe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PARTHIAN;
+ field public static final int INSCRIPTIONAL_PARTHIAN_ID = 189; // 0xbd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INVALID_CODE;
+ field public static final int INVALID_CODE_ID = -1; // 0xffffffff
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IPA_EXTENSIONS;
+ field public static final int IPA_EXTENSIONS_ID = 5; // 0x5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock JAVANESE;
+ field public static final int JAVANESE_ID = 181; // 0xb5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KAITHI;
+ field public static final int KAITHI_ID = 193; // 0xc1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANA_SUPPLEMENT;
+ field public static final int KANA_SUPPLEMENT_ID = 203; // 0xcb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANBUN;
+ field public static final int KANBUN_ID = 66; // 0x42
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANGXI_RADICALS;
+ field public static final int KANGXI_RADICALS_ID = 59; // 0x3b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANNADA;
+ field public static final int KANNADA_ID = 22; // 0x16
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KATAKANA;
+ field public static final int KATAKANA_ID = 63; // 0x3f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS;
+ field public static final int KATAKANA_PHONETIC_EXTENSIONS_ID = 107; // 0x6b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KAYAH_LI;
+ field public static final int KAYAH_LI_ID = 162; // 0xa2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHAROSHTHI;
+ field public static final int KHAROSHTHI_ID = 137; // 0x89
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHMER;
+ field public static final int KHMER_ID = 36; // 0x24
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHMER_SYMBOLS;
+ field public static final int KHMER_SYMBOLS_ID = 113; // 0x71
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHOJKI;
+ field public static final int KHOJKI_ID = 229; // 0xe5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHUDAWADI;
+ field public static final int KHUDAWADI_ID = 230; // 0xe6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LAO;
+ field public static final int LAO_ID = 26; // 0x1a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_1_SUPPLEMENT;
+ field public static final int LATIN_1_SUPPLEMENT_ID = 2; // 0x2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_A;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_ADDITIONAL;
+ field public static final int LATIN_EXTENDED_ADDITIONAL_ID = 38; // 0x26
+ field public static final int LATIN_EXTENDED_A_ID = 3; // 0x3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_B;
+ field public static final int LATIN_EXTENDED_B_ID = 4; // 0x4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_C;
+ field public static final int LATIN_EXTENDED_C_ID = 148; // 0x94
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_D;
+ field public static final int LATIN_EXTENDED_D_ID = 149; // 0x95
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_E;
+ field public static final int LATIN_EXTENDED_E_ID = 231; // 0xe7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LEPCHA;
+ field public static final int LEPCHA_ID = 156; // 0x9c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LETTERLIKE_SYMBOLS;
+ field public static final int LETTERLIKE_SYMBOLS_ID = 44; // 0x2c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LIMBU;
+ field public static final int LIMBU_ID = 111; // 0x6f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_A;
+ field public static final int LINEAR_A_ID = 232; // 0xe8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_B_IDEOGRAMS;
+ field public static final int LINEAR_B_IDEOGRAMS_ID = 118; // 0x76
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_B_SYLLABARY;
+ field public static final int LINEAR_B_SYLLABARY_ID = 117; // 0x75
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LISU;
+ field public static final int LISU_ID = 176; // 0xb0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LOW_SURROGATES;
+ field public static final int LOW_SURROGATES_ID = 77; // 0x4d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LYCIAN;
+ field public static final int LYCIAN_ID = 167; // 0xa7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LYDIAN;
+ field public static final int LYDIAN_ID = 169; // 0xa9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MAHAJANI;
+ field public static final int MAHAJANI_ID = 233; // 0xe9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MAHJONG_TILES;
+ field public static final int MAHJONG_TILES_ID = 170; // 0xaa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MALAYALAM;
+ field public static final int MALAYALAM_ID = 23; // 0x17
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MANDAIC;
+ field public static final int MANDAIC_ID = 198; // 0xc6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
+ field public static final int MANICHAEAN_ID = 234; // 0xea
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS;
+ field public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93; // 0x5d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_OPERATORS;
+ field public static final int MATHEMATICAL_OPERATORS_ID = 47; // 0x2f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK_EXTENSIONS;
+ field public static final int MEETEI_MAYEK_EXTENSIONS_ID = 213; // 0xd5
+ field public static final int MEETEI_MAYEK_ID = 184; // 0xb8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MENDE_KIKAKUI;
+ field public static final int MENDE_KIKAKUI_ID = 235; // 0xeb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEROITIC_CURSIVE;
+ field public static final int MEROITIC_CURSIVE_ID = 214; // 0xd6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEROITIC_HIEROGLYPHS;
+ field public static final int MEROITIC_HIEROGLYPHS_ID = 215; // 0xd7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MIAO;
+ field public static final int MIAO_ID = 216; // 0xd8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A;
+ field public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A_ID = 102; // 0x66
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B;
+ field public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B_ID = 105; // 0x69
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS;
+ field public static final int MISCELLANEOUS_SYMBOLS_AND_ARROWS_ID = 115; // 0x73
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final int MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS_ID = 205; // 0xcd
+ field public static final int MISCELLANEOUS_SYMBOLS_ID = 55; // 0x37
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_TECHNICAL;
+ field public static final int MISCELLANEOUS_TECHNICAL_ID = 48; // 0x30
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MODI;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MODIFIER_TONE_LETTERS;
+ field public static final int MODIFIER_TONE_LETTERS_ID = 138; // 0x8a
+ field public static final int MODI_ID = 236; // 0xec
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
+ field public static final int MONGOLIAN_ID = 37; // 0x25
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
+ field public static final int MRO_ID = 237; // 0xed
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
+ field public static final int MULTANI_ID = 259; // 0x103
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MUSICAL_SYMBOLS;
+ field public static final int MUSICAL_SYMBOLS_ID = 92; // 0x5c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR_EXTENDED_A;
+ field public static final int MYANMAR_EXTENDED_A_ID = 182; // 0xb6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR_EXTENDED_B;
+ field public static final int MYANMAR_EXTENDED_B_ID = 238; // 0xee
+ field public static final int MYANMAR_ID = 28; // 0x1c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
+ field public static final int NABATAEAN_ID = 239; // 0xef
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
+ field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
+ field public static final int NKO_ID = 146; // 0x92
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NO_BLOCK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NUMBER_FORMS;
+ field public static final int NUMBER_FORMS_ID = 45; // 0x2d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OGHAM;
+ field public static final int OGHAM_ID = 34; // 0x22
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_HUNGARIAN;
+ field public static final int OLD_HUNGARIAN_ID = 260; // 0x104
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_ITALIC;
+ field public static final int OLD_ITALIC_ID = 88; // 0x58
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_NORTH_ARABIAN;
+ field public static final int OLD_NORTH_ARABIAN_ID = 240; // 0xf0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERMIC;
+ field public static final int OLD_PERMIC_ID = 241; // 0xf1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERSIAN;
+ field public static final int OLD_PERSIAN_ID = 140; // 0x8c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_SOUTH_ARABIAN;
+ field public static final int OLD_SOUTH_ARABIAN_ID = 187; // 0xbb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_TURKIC;
+ field public static final int OLD_TURKIC_ID = 191; // 0xbf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OL_CHIKI;
+ field public static final int OL_CHIKI_ID = 157; // 0x9d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OPTICAL_CHARACTER_RECOGNITION;
+ field public static final int OPTICAL_CHARACTER_RECOGNITION_ID = 50; // 0x32
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ORIYA;
+ field public static final int ORIYA_ID = 19; // 0x13
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
+ field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
+ field public static final int OSMANYA_ID = 122; // 0x7a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
+ field public static final int PAHAWH_HMONG_ID = 243; // 0xf3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PALMYRENE;
+ field public static final int PALMYRENE_ID = 244; // 0xf4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PAU_CIN_HAU;
+ field public static final int PAU_CIN_HAU_ID = 245; // 0xf5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHAGS_PA;
+ field public static final int PHAGS_PA_ID = 150; // 0x96
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHAISTOS_DISC;
+ field public static final int PHAISTOS_DISC_ID = 166; // 0xa6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHOENICIAN;
+ field public static final int PHOENICIAN_ID = 151; // 0x97
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHONETIC_EXTENSIONS;
+ field public static final int PHONETIC_EXTENSIONS_ID = 114; // 0x72
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT;
+ field public static final int PHONETIC_EXTENSIONS_SUPPLEMENT_ID = 141; // 0x8d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PLAYING_CARDS;
+ field public static final int PLAYING_CARDS_ID = 204; // 0xcc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PRIVATE_USE;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PRIVATE_USE_AREA;
+ field public static final int PRIVATE_USE_AREA_ID = 78; // 0x4e
+ field public static final int PRIVATE_USE_ID = 78; // 0x4e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PSALTER_PAHLAVI;
+ field public static final int PSALTER_PAHLAVI_ID = 246; // 0xf6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock REJANG;
+ field public static final int REJANG_ID = 163; // 0xa3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock RUMI_NUMERAL_SYMBOLS;
+ field public static final int RUMI_NUMERAL_SYMBOLS_ID = 192; // 0xc0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock RUNIC;
+ field public static final int RUNIC_ID = 35; // 0x23
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SAMARITAN;
+ field public static final int SAMARITAN_ID = 172; // 0xac
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SAURASHTRA;
+ field public static final int SAURASHTRA_ID = 161; // 0xa1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHARADA;
+ field public static final int SHARADA_ID = 217; // 0xd9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHAVIAN;
+ field public static final int SHAVIAN_ID = 121; // 0x79
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHORTHAND_FORMAT_CONTROLS;
+ field public static final int SHORTHAND_FORMAT_CONTROLS_ID = 247; // 0xf7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SIDDHAM;
+ field public static final int SIDDHAM_ID = 248; // 0xf8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SINHALA;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SINHALA_ARCHAIC_NUMBERS;
+ field public static final int SINHALA_ARCHAIC_NUMBERS_ID = 249; // 0xf9
+ field public static final int SINHALA_ID = 24; // 0x18
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SMALL_FORM_VARIANTS;
+ field public static final int SMALL_FORM_VARIANTS_ID = 84; // 0x54
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SORA_SOMPENG;
+ field public static final int SORA_SOMPENG_ID = 218; // 0xda
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SPACING_MODIFIER_LETTERS;
+ field public static final int SPACING_MODIFIER_LETTERS_ID = 6; // 0x6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SPECIALS;
+ field public static final int SPECIALS_ID = 86; // 0x56
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUNDANESE;
+ field public static final int SUNDANESE_ID = 155; // 0x9b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUNDANESE_SUPPLEMENT;
+ field public static final int SUNDANESE_SUPPLEMENT_ID = 219; // 0xdb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS;
+ field public static final int SUPERSCRIPTS_AND_SUBSCRIPTS_ID = 41; // 0x29
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_A;
+ field public static final int SUPPLEMENTAL_ARROWS_A_ID = 103; // 0x67
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_B;
+ field public static final int SUPPLEMENTAL_ARROWS_B_ID = 104; // 0x68
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_C;
+ field public static final int SUPPLEMENTAL_ARROWS_C_ID = 250; // 0xfa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS;
+ field public static final int SUPPLEMENTAL_MATHEMATICAL_OPERATORS_ID = 106; // 0x6a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_PUNCTUATION;
+ field public static final int SUPPLEMENTAL_PUNCTUATION_ID = 142; // 0x8e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final int SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS_ID = 261; // 0x105
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A;
+ field public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_A_ID = 109; // 0x6d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B;
+ field public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_B_ID = 110; // 0x6e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUTTON_SIGNWRITING;
+ field public static final int SUTTON_SIGNWRITING_ID = 262; // 0x106
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SYLOTI_NAGRI;
+ field public static final int SYLOTI_NAGRI_ID = 143; // 0x8f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SYRIAC;
+ field public static final int SYRIAC_ID = 13; // 0xd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGALOG;
+ field public static final int TAGALOG_ID = 98; // 0x62
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGBANWA;
+ field public static final int TAGBANWA_ID = 101; // 0x65
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGS;
+ field public static final int TAGS_ID = 96; // 0x60
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_LE;
+ field public static final int TAI_LE_ID = 112; // 0x70
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_THAM;
+ field public static final int TAI_THAM_ID = 174; // 0xae
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_VIET;
+ field public static final int TAI_VIET_ID = 183; // 0xb7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_XUAN_JING_SYMBOLS;
+ field public static final int TAI_XUAN_JING_SYMBOLS_ID = 124; // 0x7c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAKRI;
+ field public static final int TAKRI_ID = 220; // 0xdc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
+ field public static final int TAMIL_ID = 20; // 0x14
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
+ field public static final int TELUGU_ID = 21; // 0x15
+ field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
+ field public static final int THAANA_ID = 14; // 0xe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock THAI;
+ field public static final int THAI_ID = 25; // 0x19
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIBETAN;
+ field public static final int TIBETAN_ID = 27; // 0x1b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIFINAGH;
+ field public static final int TIFINAGH_ID = 144; // 0x90
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIRHUTA;
+ field public static final int TIRHUTA_ID = 251; // 0xfb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS;
+ field public static final int TRANSPORT_AND_MAP_SYMBOLS_ID = 207; // 0xcf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UGARITIC;
+ field public static final int UGARITIC_ID = 120; // 0x78
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED;
+ field public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_ID = 173; // 0xad
+ field public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_ID = 33; // 0x21
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VAI;
+ field public static final int VAI_ID = 159; // 0x9f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VARIATION_SELECTORS;
+ field public static final int VARIATION_SELECTORS_ID = 108; // 0x6c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT;
+ field public static final int VARIATION_SELECTORS_SUPPLEMENT_ID = 125; // 0x7d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VEDIC_EXTENSIONS;
+ field public static final int VEDIC_EXTENSIONS_ID = 175; // 0xaf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VERTICAL_FORMS;
+ field public static final int VERTICAL_FORMS_ID = 145; // 0x91
+ field public static final android.icu.lang.UCharacter.UnicodeBlock WARANG_CITI;
+ field public static final int WARANG_CITI_ID = 252; // 0xfc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YIJING_HEXAGRAM_SYMBOLS;
+ field public static final int YIJING_HEXAGRAM_SYMBOLS_ID = 116; // 0x74
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YI_RADICALS;
+ field public static final int YI_RADICALS_ID = 73; // 0x49
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YI_SYLLABLES;
+ field public static final int YI_SYLLABLES_ID = 72; // 0x48
+ }
+
+ public static abstract interface UCharacter.WordBreak {
+ field public static final int ALETTER = 1; // 0x1
+ field public static final int COUNT = 17; // 0x11
+ field public static final int CR = 8; // 0x8
+ field public static final int DOUBLE_QUOTE = 16; // 0x10
+ field public static final int EXTEND = 9; // 0x9
+ field public static final int EXTENDNUMLET = 7; // 0x7
+ field public static final int FORMAT = 2; // 0x2
+ field public static final int HEBREW_LETTER = 14; // 0xe
+ field public static final int KATAKANA = 3; // 0x3
+ field public static final int LF = 10; // 0xa
+ field public static final int MIDLETTER = 4; // 0x4
+ field public static final int MIDNUM = 5; // 0x5
+ field public static final int MIDNUMLET = 11; // 0xb
+ field public static final int NEWLINE = 12; // 0xc
+ field public static final int NUMERIC = 6; // 0x6
+ field public static final int OTHER = 0; // 0x0
+ field public static final int REGIONAL_INDICATOR = 13; // 0xd
+ field public static final int SINGLE_QUOTE = 15; // 0xf
+ }
+
+ public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
+ method public static java.lang.String toString(int);
+ }
+
+ public final class UCharacterDirection implements android.icu.lang.UCharacterEnums.ECharacterDirection {
+ method public static java.lang.String toString(int);
+ }
+
+ public class UCharacterEnums {
+ }
+
+ public static abstract interface UCharacterEnums.ECharacterCategory {
+ field public static final byte CHAR_CATEGORY_COUNT = 30; // 0x1e
+ field public static final byte COMBINING_SPACING_MARK = 8; // 0x8
+ field public static final byte CONNECTOR_PUNCTUATION = 22; // 0x16
+ field public static final byte CONTROL = 15; // 0xf
+ field public static final byte CURRENCY_SYMBOL = 25; // 0x19
+ field public static final byte DASH_PUNCTUATION = 19; // 0x13
+ field public static final byte DECIMAL_DIGIT_NUMBER = 9; // 0x9
+ field public static final byte ENCLOSING_MARK = 7; // 0x7
+ field public static final byte END_PUNCTUATION = 21; // 0x15
+ field public static final byte FINAL_PUNCTUATION = 29; // 0x1d
+ field public static final byte FINAL_QUOTE_PUNCTUATION = 29; // 0x1d
+ field public static final byte FORMAT = 16; // 0x10
+ field public static final byte GENERAL_OTHER_TYPES = 0; // 0x0
+ field public static final byte INITIAL_PUNCTUATION = 28; // 0x1c
+ field public static final byte INITIAL_QUOTE_PUNCTUATION = 28; // 0x1c
+ field public static final byte LETTER_NUMBER = 10; // 0xa
+ field public static final byte LINE_SEPARATOR = 13; // 0xd
+ field public static final byte LOWERCASE_LETTER = 2; // 0x2
+ field public static final byte MATH_SYMBOL = 24; // 0x18
+ field public static final byte MODIFIER_LETTER = 4; // 0x4
+ field public static final byte MODIFIER_SYMBOL = 26; // 0x1a
+ field public static final byte NON_SPACING_MARK = 6; // 0x6
+ field public static final byte OTHER_LETTER = 5; // 0x5
+ field public static final byte OTHER_NUMBER = 11; // 0xb
+ field public static final byte OTHER_PUNCTUATION = 23; // 0x17
+ field public static final byte OTHER_SYMBOL = 27; // 0x1b
+ field public static final byte PARAGRAPH_SEPARATOR = 14; // 0xe
+ field public static final byte PRIVATE_USE = 17; // 0x11
+ field public static final byte SPACE_SEPARATOR = 12; // 0xc
+ field public static final byte START_PUNCTUATION = 20; // 0x14
+ field public static final byte SURROGATE = 18; // 0x12
+ field public static final byte TITLECASE_LETTER = 3; // 0x3
+ field public static final byte UNASSIGNED = 0; // 0x0
+ field public static final byte UPPERCASE_LETTER = 1; // 0x1
+ }
+
+ public static abstract interface UCharacterEnums.ECharacterDirection {
+ field public static final int ARABIC_NUMBER = 5; // 0x5
+ field public static final int BLOCK_SEPARATOR = 7; // 0x7
+ field public static final int BOUNDARY_NEUTRAL = 18; // 0x12
+ field public static final int CHAR_DIRECTION_COUNT = 23; // 0x17
+ field public static final int COMMON_NUMBER_SEPARATOR = 6; // 0x6
+ field public static final byte DIRECTIONALITY_ARABIC_NUMBER = 5; // 0x5
+ field public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 18; // 0x12
+ field public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 6; // 0x6
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 2; // 0x2
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 3; // 0x3
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 4; // 0x4
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0; // 0x0
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 11; // 0xb
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 12; // 0xc
+ field public static final byte DIRECTIONALITY_NONSPACING_MARK = 17; // 0x11
+ field public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 10; // 0xa
+ field public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 7; // 0x7
+ field public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 16; // 0x10
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1; // 0x1
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 13; // 0xd
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 14; // 0xe
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 15; // 0xf
+ field public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 8; // 0x8
+ field public static final byte DIRECTIONALITY_UNDEFINED = -1; // 0xffffffff
+ field public static final byte DIRECTIONALITY_WHITESPACE = 9; // 0x9
+ field public static final int DIR_NON_SPACING_MARK = 17; // 0x11
+ field public static final int EUROPEAN_NUMBER = 2; // 0x2
+ field public static final int EUROPEAN_NUMBER_SEPARATOR = 3; // 0x3
+ field public static final int EUROPEAN_NUMBER_TERMINATOR = 4; // 0x4
+ field public static final byte FIRST_STRONG_ISOLATE = 19; // 0x13
+ field public static final int LEFT_TO_RIGHT = 0; // 0x0
+ field public static final int LEFT_TO_RIGHT_EMBEDDING = 11; // 0xb
+ field public static final byte LEFT_TO_RIGHT_ISOLATE = 20; // 0x14
+ field public static final int LEFT_TO_RIGHT_OVERRIDE = 12; // 0xc
+ field public static final int OTHER_NEUTRAL = 10; // 0xa
+ field public static final int POP_DIRECTIONAL_FORMAT = 16; // 0x10
+ field public static final byte POP_DIRECTIONAL_ISOLATE = 22; // 0x16
+ field public static final int RIGHT_TO_LEFT = 1; // 0x1
+ field public static final int RIGHT_TO_LEFT_ARABIC = 13; // 0xd
+ field public static final int RIGHT_TO_LEFT_EMBEDDING = 14; // 0xe
+ field public static final byte RIGHT_TO_LEFT_ISOLATE = 21; // 0x15
+ field public static final int RIGHT_TO_LEFT_OVERRIDE = 15; // 0xf
+ field public static final int SEGMENT_SEPARATOR = 8; // 0x8
+ field public static final int WHITE_SPACE_NEUTRAL = 9; // 0x9
+ }
+
+ public abstract interface UProperty {
+ field public static final int AGE = 16384; // 0x4000
+ field public static final int ALPHABETIC = 0; // 0x0
+ field public static final int ASCII_HEX_DIGIT = 1; // 0x1
+ field public static final int BIDI_CLASS = 4096; // 0x1000
+ field public static final int BIDI_CONTROL = 2; // 0x2
+ field public static final int BIDI_MIRRORED = 3; // 0x3
+ field public static final int BIDI_MIRRORING_GLYPH = 16385; // 0x4001
+ field public static final int BIDI_PAIRED_BRACKET = 16397; // 0x400d
+ field public static final int BIDI_PAIRED_BRACKET_TYPE = 4117; // 0x1015
+ field public static final int BINARY_LIMIT = 57; // 0x39
+ field public static final int BINARY_START = 0; // 0x0
+ field public static final int BLOCK = 4097; // 0x1001
+ field public static final int CANONICAL_COMBINING_CLASS = 4098; // 0x1002
+ field public static final int CASED = 49; // 0x31
+ field public static final int CASE_FOLDING = 16386; // 0x4002
+ field public static final int CASE_IGNORABLE = 50; // 0x32
+ field public static final int CASE_SENSITIVE = 34; // 0x22
+ field public static final int CHANGES_WHEN_CASEFOLDED = 54; // 0x36
+ field public static final int CHANGES_WHEN_CASEMAPPED = 55; // 0x37
+ field public static final int CHANGES_WHEN_LOWERCASED = 51; // 0x33
+ field public static final int CHANGES_WHEN_NFKC_CASEFOLDED = 56; // 0x38
+ field public static final int CHANGES_WHEN_TITLECASED = 53; // 0x35
+ field public static final int CHANGES_WHEN_UPPERCASED = 52; // 0x34
+ field public static final int DASH = 4; // 0x4
+ field public static final int DECOMPOSITION_TYPE = 4099; // 0x1003
+ field public static final int DEFAULT_IGNORABLE_CODE_POINT = 5; // 0x5
+ field public static final int DEPRECATED = 6; // 0x6
+ field public static final int DIACRITIC = 7; // 0x7
+ field public static final int DOUBLE_LIMIT = 12289; // 0x3001
+ field public static final int DOUBLE_START = 12288; // 0x3000
+ field public static final int EAST_ASIAN_WIDTH = 4100; // 0x1004
+ field public static final int EXTENDER = 8; // 0x8
+ field public static final int FULL_COMPOSITION_EXCLUSION = 9; // 0x9
+ field public static final int GENERAL_CATEGORY = 4101; // 0x1005
+ field public static final int GENERAL_CATEGORY_MASK = 8192; // 0x2000
+ field public static final int GRAPHEME_BASE = 10; // 0xa
+ field public static final int GRAPHEME_CLUSTER_BREAK = 4114; // 0x1012
+ field public static final int GRAPHEME_EXTEND = 11; // 0xb
+ field public static final int GRAPHEME_LINK = 12; // 0xc
+ field public static final int HANGUL_SYLLABLE_TYPE = 4107; // 0x100b
+ field public static final int HEX_DIGIT = 13; // 0xd
+ field public static final int HYPHEN = 14; // 0xe
+ field public static final int IDEOGRAPHIC = 17; // 0x11
+ field public static final int IDS_BINARY_OPERATOR = 18; // 0x12
+ field public static final int IDS_TRINARY_OPERATOR = 19; // 0x13
+ field public static final int ID_CONTINUE = 15; // 0xf
+ field public static final int ID_START = 16; // 0x10
+ field public static final int INT_LIMIT = 4118; // 0x1016
+ field public static final int INT_START = 4096; // 0x1000
+ field public static final int JOINING_GROUP = 4102; // 0x1006
+ field public static final int JOINING_TYPE = 4103; // 0x1007
+ field public static final int JOIN_CONTROL = 20; // 0x14
+ field public static final int LEAD_CANONICAL_COMBINING_CLASS = 4112; // 0x1010
+ field public static final int LINE_BREAK = 4104; // 0x1008
+ field public static final int LOGICAL_ORDER_EXCEPTION = 21; // 0x15
+ field public static final int LOWERCASE = 22; // 0x16
+ field public static final int LOWERCASE_MAPPING = 16388; // 0x4004
+ field public static final int MASK_LIMIT = 8193; // 0x2001
+ field public static final int MASK_START = 8192; // 0x2000
+ field public static final int MATH = 23; // 0x17
+ field public static final int NAME = 16389; // 0x4005
+ field public static final int NFC_INERT = 39; // 0x27
+ field public static final int NFC_QUICK_CHECK = 4110; // 0x100e
+ field public static final int NFD_INERT = 37; // 0x25
+ field public static final int NFD_QUICK_CHECK = 4108; // 0x100c
+ field public static final int NFKC_INERT = 40; // 0x28
+ field public static final int NFKC_QUICK_CHECK = 4111; // 0x100f
+ field public static final int NFKD_INERT = 38; // 0x26
+ field public static final int NFKD_QUICK_CHECK = 4109; // 0x100d
+ field public static final int NONCHARACTER_CODE_POINT = 24; // 0x18
+ field public static final int NUMERIC_TYPE = 4105; // 0x1009
+ field public static final int NUMERIC_VALUE = 12288; // 0x3000
+ field public static final int OTHER_PROPERTY_LIMIT = 28673; // 0x7001
+ field public static final int OTHER_PROPERTY_START = 28672; // 0x7000
+ field public static final int PATTERN_SYNTAX = 42; // 0x2a
+ field public static final int PATTERN_WHITE_SPACE = 43; // 0x2b
+ field public static final int POSIX_ALNUM = 44; // 0x2c
+ field public static final int POSIX_BLANK = 45; // 0x2d
+ field public static final int POSIX_GRAPH = 46; // 0x2e
+ field public static final int POSIX_PRINT = 47; // 0x2f
+ field public static final int POSIX_XDIGIT = 48; // 0x30
+ field public static final int QUOTATION_MARK = 25; // 0x19
+ field public static final int RADICAL = 26; // 0x1a
+ field public static final int SCRIPT = 4106; // 0x100a
+ field public static final int SCRIPT_EXTENSIONS = 28672; // 0x7000
+ field public static final int SEGMENT_STARTER = 41; // 0x29
+ field public static final int SENTENCE_BREAK = 4115; // 0x1013
+ field public static final int SIMPLE_CASE_FOLDING = 16390; // 0x4006
+ field public static final int SIMPLE_LOWERCASE_MAPPING = 16391; // 0x4007
+ field public static final int SIMPLE_TITLECASE_MAPPING = 16392; // 0x4008
+ field public static final int SIMPLE_UPPERCASE_MAPPING = 16393; // 0x4009
+ field public static final int SOFT_DOTTED = 27; // 0x1b
+ field public static final int STRING_LIMIT = 16398; // 0x400e
+ field public static final int STRING_START = 16384; // 0x4000
+ field public static final int S_TERM = 35; // 0x23
+ field public static final int TERMINAL_PUNCTUATION = 28; // 0x1c
+ field public static final int TITLECASE_MAPPING = 16394; // 0x400a
+ field public static final int TRAIL_CANONICAL_COMBINING_CLASS = 4113; // 0x1011
+ field public static final int UNIFIED_IDEOGRAPH = 29; // 0x1d
+ field public static final int UPPERCASE = 30; // 0x1e
+ field public static final int UPPERCASE_MAPPING = 16396; // 0x400c
+ field public static final int VARIATION_SELECTOR = 36; // 0x24
+ field public static final int WHITE_SPACE = 31; // 0x1f
+ field public static final int WORD_BREAK = 4116; // 0x1014
+ field public static final int XID_CONTINUE = 32; // 0x20
+ field public static final int XID_START = 33; // 0x21
+ }
+
+ public static abstract interface UProperty.NameChoice {
+ field public static final int COUNT = 2; // 0x2
+ field public static final int LONG = 1; // 0x1
+ field public static final int SHORT = 0; // 0x0
+ }
+
+ public final class UScript {
+ method public static final boolean breaksBetweenLetters(int);
+ method public static final int[] getCode(java.util.Locale);
+ method public static final int[] getCode(android.icu.util.ULocale);
+ method public static final int[] getCode(java.lang.String);
+ method public static final int getCodeFromName(java.lang.String);
+ method public static final java.lang.String getName(int);
+ method public static final java.lang.String getSampleString(int);
+ method public static final int getScript(int);
+ method public static final int getScriptExtensions(int, java.util.BitSet);
+ method public static final java.lang.String getShortName(int);
+ method public static final android.icu.lang.UScript.ScriptUsage getUsage(int);
+ method public static final boolean hasScript(int, int);
+ method public static final boolean isCased(int);
+ method public static final boolean isRightToLeft(int);
+ field public static final int AFAKA = 147; // 0x93
+ field public static final int AHOM = 161; // 0xa1
+ field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
+ field public static final int ARABIC = 2; // 0x2
+ field public static final int ARMENIAN = 3; // 0x3
+ field public static final int AVESTAN = 117; // 0x75
+ field public static final int BALINESE = 62; // 0x3e
+ field public static final int BAMUM = 130; // 0x82
+ field public static final int BASSA_VAH = 134; // 0x86
+ field public static final int BATAK = 63; // 0x3f
+ field public static final int BENGALI = 4; // 0x4
+ field public static final int BLISSYMBOLS = 64; // 0x40
+ field public static final int BOOK_PAHLAVI = 124; // 0x7c
+ field public static final int BOPOMOFO = 5; // 0x5
+ field public static final int BRAHMI = 65; // 0x41
+ field public static final int BRAILLE = 46; // 0x2e
+ field public static final int BUGINESE = 55; // 0x37
+ field public static final int BUHID = 44; // 0x2c
+ field public static final int CANADIAN_ABORIGINAL = 40; // 0x28
+ field public static final int CARIAN = 104; // 0x68
+ field public static final int CAUCASIAN_ALBANIAN = 159; // 0x9f
+ field public static final int CHAKMA = 118; // 0x76
+ field public static final int CHAM = 66; // 0x42
+ field public static final int CHEROKEE = 6; // 0x6
+ field public static final int CIRTH = 67; // 0x43
+ field public static final int CODE_LIMIT = 167; // 0xa7
+ field public static final int COMMON = 0; // 0x0
+ field public static final int COPTIC = 7; // 0x7
+ field public static final int CUNEIFORM = 101; // 0x65
+ field public static final int CYPRIOT = 47; // 0x2f
+ field public static final int CYRILLIC = 8; // 0x8
+ field public static final int DEMOTIC_EGYPTIAN = 69; // 0x45
+ field public static final int DESERET = 9; // 0x9
+ field public static final int DEVANAGARI = 10; // 0xa
+ field public static final int DUPLOYAN = 135; // 0x87
+ field public static final int EASTERN_SYRIAC = 97; // 0x61
+ field public static final int EGYPTIAN_HIEROGLYPHS = 71; // 0x47
+ field public static final int ELBASAN = 136; // 0x88
+ field public static final int ESTRANGELO_SYRIAC = 95; // 0x5f
+ field public static final int ETHIOPIC = 11; // 0xb
+ field public static final int GEORGIAN = 12; // 0xc
+ field public static final int GLAGOLITIC = 56; // 0x38
+ field public static final int GOTHIC = 13; // 0xd
+ field public static final int GRANTHA = 137; // 0x89
+ field public static final int GREEK = 14; // 0xe
+ field public static final int GUJARATI = 15; // 0xf
+ field public static final int GURMUKHI = 16; // 0x10
+ field public static final int HAN = 17; // 0x11
+ field public static final int HANGUL = 18; // 0x12
+ field public static final int HANUNOO = 43; // 0x2b
+ field public static final int HARAPPAN_INDUS = 77; // 0x4d
+ field public static final int HATRAN = 162; // 0xa2
+ field public static final int HEBREW = 19; // 0x13
+ field public static final int HIERATIC_EGYPTIAN = 70; // 0x46
+ field public static final int HIRAGANA = 20; // 0x14
+ field public static final int IMPERIAL_ARAMAIC = 116; // 0x74
+ field public static final int INHERITED = 1; // 0x1
+ field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
+ field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
+ field public static final int INVALID_CODE = -1; // 0xffffffff
+ field public static final int JAPANESE = 105; // 0x69
+ field public static final int JAVANESE = 78; // 0x4e
+ field public static final int JURCHEN = 148; // 0x94
+ field public static final int KAITHI = 120; // 0x78
+ field public static final int KANNADA = 21; // 0x15
+ field public static final int KATAKANA = 22; // 0x16
+ field public static final int KATAKANA_OR_HIRAGANA = 54; // 0x36
+ field public static final int KAYAH_LI = 79; // 0x4f
+ field public static final int KHAROSHTHI = 57; // 0x39
+ field public static final int KHMER = 23; // 0x17
+ field public static final int KHOJKI = 157; // 0x9d
+ field public static final int KHUDAWADI = 145; // 0x91
+ field public static final int KHUTSURI = 72; // 0x48
+ field public static final int KOREAN = 119; // 0x77
+ field public static final int KPELLE = 138; // 0x8a
+ field public static final int LANNA = 106; // 0x6a
+ field public static final int LAO = 24; // 0x18
+ field public static final int LATIN = 25; // 0x19
+ field public static final int LATIN_FRAKTUR = 80; // 0x50
+ field public static final int LATIN_GAELIC = 81; // 0x51
+ field public static final int LEPCHA = 82; // 0x52
+ field public static final int LIMBU = 48; // 0x30
+ field public static final int LINEAR_A = 83; // 0x53
+ field public static final int LINEAR_B = 49; // 0x31
+ field public static final int LISU = 131; // 0x83
+ field public static final int LOMA = 139; // 0x8b
+ field public static final int LYCIAN = 107; // 0x6b
+ field public static final int LYDIAN = 108; // 0x6c
+ field public static final int MAHAJANI = 160; // 0xa0
+ field public static final int MALAYALAM = 26; // 0x1a
+ field public static final int MANDAEAN = 84; // 0x54
+ field public static final int MANDAIC = 84; // 0x54
+ field public static final int MANICHAEAN = 121; // 0x79
+ field public static final int MATHEMATICAL_NOTATION = 128; // 0x80
+ field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
+ field public static final int MEITEI_MAYEK = 115; // 0x73
+ field public static final int MENDE = 140; // 0x8c
+ field public static final int MEROITIC = 86; // 0x56
+ field public static final int MEROITIC_CURSIVE = 141; // 0x8d
+ field public static final int MEROITIC_HIEROGLYPHS = 86; // 0x56
+ field public static final int MIAO = 92; // 0x5c
+ field public static final int MODI = 163; // 0xa3
+ field public static final int MONGOLIAN = 27; // 0x1b
+ field public static final int MOON = 114; // 0x72
+ field public static final int MRO = 149; // 0x95
+ field public static final int MULTANI = 164; // 0xa4
+ field public static final int MYANMAR = 28; // 0x1c
+ field public static final int NABATAEAN = 143; // 0x8f
+ field public static final int NAKHI_GEBA = 132; // 0x84
+ field public static final int NEW_TAI_LUE = 59; // 0x3b
+ field public static final int NKO = 87; // 0x57
+ field public static final int NUSHU = 150; // 0x96
+ field public static final int OGHAM = 29; // 0x1d
+ field public static final int OLD_CHURCH_SLAVONIC_CYRILLIC = 68; // 0x44
+ field public static final int OLD_HUNGARIAN = 76; // 0x4c
+ field public static final int OLD_ITALIC = 30; // 0x1e
+ field public static final int OLD_NORTH_ARABIAN = 142; // 0x8e
+ field public static final int OLD_PERMIC = 89; // 0x59
+ field public static final int OLD_PERSIAN = 61; // 0x3d
+ field public static final int OLD_SOUTH_ARABIAN = 133; // 0x85
+ field public static final int OL_CHIKI = 109; // 0x6d
+ field public static final int ORIYA = 31; // 0x1f
+ field public static final int ORKHON = 88; // 0x58
+ field public static final int OSMANYA = 50; // 0x32
+ field public static final int PAHAWH_HMONG = 75; // 0x4b
+ field public static final int PALMYRENE = 144; // 0x90
+ field public static final int PAU_CIN_HAU = 165; // 0xa5
+ field public static final int PHAGS_PA = 90; // 0x5a
+ field public static final int PHOENICIAN = 91; // 0x5b
+ field public static final int PHONETIC_POLLARD = 92; // 0x5c
+ field public static final int PSALTER_PAHLAVI = 123; // 0x7b
+ field public static final int REJANG = 110; // 0x6e
+ field public static final int RONGORONGO = 93; // 0x5d
+ field public static final int RUNIC = 32; // 0x20
+ field public static final int SAMARITAN = 126; // 0x7e
+ field public static final int SARATI = 94; // 0x5e
+ field public static final int SAURASHTRA = 111; // 0x6f
+ field public static final int SHARADA = 151; // 0x97
+ field public static final int SHAVIAN = 51; // 0x33
+ field public static final int SIDDHAM = 166; // 0xa6
+ field public static final int SIGN_WRITING = 112; // 0x70
+ field public static final int SIMPLIFIED_HAN = 73; // 0x49
+ field public static final int SINDHI = 145; // 0x91
+ field public static final int SINHALA = 33; // 0x21
+ field public static final int SORA_SOMPENG = 152; // 0x98
+ field public static final int SUNDANESE = 113; // 0x71
+ field public static final int SYLOTI_NAGRI = 58; // 0x3a
+ field public static final int SYMBOLS = 129; // 0x81
+ field public static final int SYRIAC = 34; // 0x22
+ field public static final int TAGALOG = 42; // 0x2a
+ field public static final int TAGBANWA = 45; // 0x2d
+ field public static final int TAI_LE = 52; // 0x34
+ field public static final int TAI_VIET = 127; // 0x7f
+ field public static final int TAKRI = 153; // 0x99
+ field public static final int TAMIL = 35; // 0x23
+ field public static final int TANGUT = 154; // 0x9a
+ field public static final int TELUGU = 36; // 0x24
+ field public static final int TENGWAR = 98; // 0x62
+ field public static final int THAANA = 37; // 0x25
+ field public static final int THAI = 38; // 0x26
+ field public static final int TIBETAN = 39; // 0x27
+ field public static final int TIFINAGH = 60; // 0x3c
+ field public static final int TIRHUTA = 158; // 0x9e
+ field public static final int TRADITIONAL_HAN = 74; // 0x4a
+ field public static final int UCAS = 40; // 0x28
+ field public static final int UGARITIC = 53; // 0x35
+ field public static final int UNKNOWN = 103; // 0x67
+ field public static final int UNWRITTEN_LANGUAGES = 102; // 0x66
+ field public static final int VAI = 99; // 0x63
+ field public static final int VISIBLE_SPEECH = 100; // 0x64
+ field public static final int WARANG_CITI = 146; // 0x92
+ field public static final int WESTERN_SYRIAC = 96; // 0x60
+ field public static final int WOLEAI = 155; // 0x9b
+ field public static final int YI = 41; // 0x29
+ }
+
+ public static final class UScript.ScriptUsage extends java.lang.Enum {
+ method public static android.icu.lang.UScript.ScriptUsage valueOf(java.lang.String);
+ method public static final android.icu.lang.UScript.ScriptUsage[] values();
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage ASPIRATIONAL;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage EXCLUDED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage LIMITED_USE;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage NOT_ENCODED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage RECOMMENDED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage UNKNOWN;
+ }
+
+}
+
+package android.icu.math {
+
+ public class BigDecimal extends java.lang.Number implements java.lang.Comparable java.io.Serializable {
+ ctor public BigDecimal(java.math.BigDecimal);
+ ctor public BigDecimal(java.math.BigInteger);
+ ctor public BigDecimal(java.math.BigInteger, int);
+ ctor public BigDecimal(char[]);
+ ctor public BigDecimal(char[], int, int);
+ ctor public BigDecimal(double);
+ ctor public BigDecimal(int);
+ ctor public BigDecimal(long);
+ ctor public BigDecimal(java.lang.String);
+ method public android.icu.math.BigDecimal abs();
+ method public android.icu.math.BigDecimal abs(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal add(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal add(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public byte byteValueExact();
+ method public int compareTo(android.icu.math.BigDecimal);
+ method public int compareTo(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, int);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, int, int);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal divideInteger(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal divideInteger(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public double doubleValue();
+ method public float floatValue();
+ method public java.lang.String format(int, int);
+ method public java.lang.String format(int, int, int, int, int, int);
+ method public int intValue();
+ method public int intValueExact();
+ method public long longValue();
+ method public long longValueExact();
+ method public android.icu.math.BigDecimal max(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal max(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal min(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal min(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal movePointLeft(int);
+ method public android.icu.math.BigDecimal movePointRight(int);
+ method public android.icu.math.BigDecimal multiply(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal multiply(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal negate();
+ method public android.icu.math.BigDecimal negate(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal plus();
+ method public android.icu.math.BigDecimal plus(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal pow(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal pow(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal remainder(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal remainder(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public int scale();
+ method public android.icu.math.BigDecimal setScale(int);
+ method public android.icu.math.BigDecimal setScale(int, int);
+ method public short shortValueExact();
+ method public int signum();
+ method public android.icu.math.BigDecimal subtract(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal subtract(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public java.math.BigDecimal toBigDecimal();
+ method public java.math.BigInteger toBigInteger();
+ method public java.math.BigInteger toBigIntegerExact();
+ method public char[] toCharArray();
+ method public java.math.BigInteger unscaledValue();
+ method public static android.icu.math.BigDecimal valueOf(double);
+ method public static android.icu.math.BigDecimal valueOf(long);
+ method public static android.icu.math.BigDecimal valueOf(long, int);
+ field public static final android.icu.math.BigDecimal ONE;
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final android.icu.math.BigDecimal TEN;
+ field public static final android.icu.math.BigDecimal ZERO;
+ }
+
+ public final class MathContext implements java.io.Serializable {
+ ctor public MathContext(int);
+ ctor public MathContext(int, int);
+ ctor public MathContext(int, int, boolean);
+ ctor public MathContext(int, int, boolean, int);
+ method public int getDigits();
+ method public int getForm();
+ method public boolean getLostDigits();
+ method public int getRoundingMode();
+ field public static final android.icu.math.MathContext DEFAULT;
+ field public static final int ENGINEERING = 2; // 0x2
+ field public static final int PLAIN = 0; // 0x0
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final int SCIENTIFIC = 1; // 0x1
+ }
+
+}
+
+package android.icu.text {
+
+ public final class AlphabeticIndex implements java.lang.Iterable {
+ ctor public AlphabeticIndex(android.icu.util.ULocale);
+ ctor public AlphabeticIndex(java.util.Locale);
+ ctor public AlphabeticIndex(android.icu.text.RuleBasedCollator);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(android.icu.text.UnicodeSet);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(android.icu.util.ULocale...);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(java.util.Locale...);
+ method public android.icu.text.AlphabeticIndex<V> addRecord(java.lang.CharSequence, V);
+ method public android.icu.text.AlphabeticIndex.ImmutableIndex<V> buildImmutableIndex();
+ method public android.icu.text.AlphabeticIndex<V> clearRecords();
+ method public int getBucketCount();
+ method public int getBucketIndex(java.lang.CharSequence);
+ method public java.util.List<java.lang.String> getBucketLabels();
+ method public android.icu.text.RuleBasedCollator getCollator();
+ method public java.lang.String getInflowLabel();
+ method public int getMaxLabelCount();
+ method public java.lang.String getOverflowLabel();
+ method public int getRecordCount();
+ method public java.lang.String getUnderflowLabel();
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Bucket<V>> iterator();
+ method public android.icu.text.AlphabeticIndex<V> setInflowLabel(java.lang.String);
+ method public android.icu.text.AlphabeticIndex<V> setMaxLabelCount(int);
+ method public android.icu.text.AlphabeticIndex<V> setOverflowLabel(java.lang.String);
+ method public android.icu.text.AlphabeticIndex<V> setUnderflowLabel(java.lang.String);
+ }
+
+ public static class AlphabeticIndex.Bucket implements java.lang.Iterable {
+ method public java.lang.String getLabel();
+ method public android.icu.text.AlphabeticIndex.Bucket.LabelType getLabelType();
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Record<V>> iterator();
+ method public int size();
+ }
+
+ public static final class AlphabeticIndex.Bucket.LabelType extends java.lang.Enum {
+ method public static android.icu.text.AlphabeticIndex.Bucket.LabelType valueOf(java.lang.String);
+ method public static final android.icu.text.AlphabeticIndex.Bucket.LabelType[] values();
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType INFLOW;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType NORMAL;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType OVERFLOW;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType UNDERFLOW;
+ }
+
+ public static final class AlphabeticIndex.ImmutableIndex implements java.lang.Iterable {
+ method public android.icu.text.AlphabeticIndex.Bucket<V> getBucket(int);
+ method public int getBucketCount();
+ method public int getBucketIndex(java.lang.CharSequence);
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Bucket<V>> iterator();
+ }
+
+ public static class AlphabeticIndex.Record {
+ method public V getData();
+ method public java.lang.CharSequence getName();
+ }
+
+ public abstract class BreakIterator implements java.lang.Cloneable {
+ ctor protected BreakIterator();
+ method public java.lang.Object clone();
+ method public abstract int current();
+ method public abstract int first();
+ method public abstract int following(int);
+ method public static synchronized java.util.Locale[] getAvailableLocales();
+ method public static android.icu.text.BreakIterator getCharacterInstance();
+ method public static android.icu.text.BreakIterator getCharacterInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getCharacterInstance(android.icu.util.ULocale);
+ method public static android.icu.text.BreakIterator getLineInstance();
+ method public static android.icu.text.BreakIterator getLineInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getLineInstance(android.icu.util.ULocale);
+ method public int getRuleStatus();
+ method public int getRuleStatusVec(int[]);
+ method public static android.icu.text.BreakIterator getSentenceInstance();
+ method public static android.icu.text.BreakIterator getSentenceInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getSentenceInstance(android.icu.util.ULocale);
+ method public abstract java.text.CharacterIterator getText();
+ method public static android.icu.text.BreakIterator getTitleInstance();
+ method public static android.icu.text.BreakIterator getTitleInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getTitleInstance(android.icu.util.ULocale);
+ method public static android.icu.text.BreakIterator getWordInstance();
+ method public static android.icu.text.BreakIterator getWordInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getWordInstance(android.icu.util.ULocale);
+ method public boolean isBoundary(int);
+ method public abstract int last();
+ method public abstract int next(int);
+ method public abstract int next();
+ method public int preceding(int);
+ method public abstract int previous();
+ method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, java.util.Locale, int);
+ method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, android.icu.util.ULocale, int);
+ method public void setText(java.lang.String);
+ method public abstract void setText(java.text.CharacterIterator);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int DONE = -1; // 0xffffffff
+ field public static final int KIND_CHARACTER = 0; // 0x0
+ field public static final int KIND_LINE = 2; // 0x2
+ field public static final int KIND_SENTENCE = 3; // 0x3
+ field public static final int KIND_TITLE = 4; // 0x4
+ field public static final int KIND_WORD = 1; // 0x1
+ field public static final int WORD_IDEO = 400; // 0x190
+ field public static final int WORD_IDEO_LIMIT = 500; // 0x1f4
+ field public static final int WORD_KANA = 300; // 0x12c
+ field public static final int WORD_KANA_LIMIT = 400; // 0x190
+ field public static final int WORD_LETTER = 200; // 0xc8
+ field public static final int WORD_LETTER_LIMIT = 300; // 0x12c
+ field public static final int WORD_NONE = 0; // 0x0
+ field public static final int WORD_NONE_LIMIT = 100; // 0x64
+ field public static final int WORD_NUMBER = 100; // 0x64
+ field public static final int WORD_NUMBER_LIMIT = 200; // 0xc8
+ }
+
+ public final class CollationElementIterator {
+ method public int getMaxExpansion(int);
+ method public int getOffset();
+ method public int next();
+ method public int previous();
+ method public static final int primaryOrder(int);
+ method public void reset();
+ method public static final int secondaryOrder(int);
+ method public void setOffset(int);
+ method public void setText(java.lang.String);
+ method public void setText(android.icu.text.UCharacterIterator);
+ method public void setText(java.text.CharacterIterator);
+ method public static final int tertiaryOrder(int);
+ field public static final int IGNORABLE = 0; // 0x0
+ field public static final int NULLORDER = -1; // 0xffffffff
+ }
+
+ public final class CollationKey implements java.lang.Comparable {
+ ctor public CollationKey(java.lang.String, byte[]);
+ ctor public CollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public int compareTo(android.icu.text.CollationKey);
+ method public boolean equals(android.icu.text.CollationKey);
+ method public android.icu.text.CollationKey getBound(int, int);
+ method public java.lang.String getSourceString();
+ method public android.icu.text.CollationKey merge(android.icu.text.CollationKey);
+ method public byte[] toByteArray();
+ }
+
+ public static final class CollationKey.BoundMode {
+ field public static final int COUNT = 3; // 0x3
+ field public static final int LOWER = 0; // 0x0
+ field public static final int UPPER = 1; // 0x1
+ field public static final int UPPER_LONG = 2; // 0x2
+ }
+
+ public abstract class Collator implements java.lang.Cloneable java.util.Comparator android.icu.util.Freezable {
+ ctor protected Collator();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public android.icu.text.Collator cloneAsThawed();
+ method public abstract int compare(java.lang.String, java.lang.String);
+ method public int compare(java.lang.Object, java.lang.Object);
+ method public boolean equals(java.lang.String, java.lang.String);
+ method public android.icu.text.Collator freeze();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public static final android.icu.util.ULocale[] getAvailableULocales();
+ method public abstract android.icu.text.CollationKey getCollationKey(java.lang.String);
+ method public int getDecomposition();
+ method public static java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
+ method public static java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayName(java.util.Locale);
+ method public static java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public static int[] getEquivalentReorderCodes(int);
+ method public static final android.icu.util.ULocale getFunctionalEquivalent(java.lang.String, android.icu.util.ULocale, boolean[]);
+ method public static final android.icu.util.ULocale getFunctionalEquivalent(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.Collator getInstance();
+ method public static final android.icu.text.Collator getInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.Collator getInstance(java.util.Locale);
+ method public static final java.lang.String[] getKeywordValues(java.lang.String);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public static final java.lang.String[] getKeywords();
+ method public int getMaxVariable();
+ method public abstract android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public int[] getReorderCodes();
+ method public int getStrength();
+ method public android.icu.text.UnicodeSet getTailoredSet();
+ method public abstract android.icu.util.VersionInfo getUCAVersion();
+ method public abstract int getVariableTop();
+ method public abstract android.icu.util.VersionInfo getVersion();
+ method public boolean isFrozen();
+ method public static final java.lang.Object registerFactory(android.icu.text.Collator.CollatorFactory);
+ method public static final java.lang.Object registerInstance(android.icu.text.Collator, android.icu.util.ULocale);
+ method public void setDecomposition(int);
+ method public android.icu.text.Collator setMaxVariable(int);
+ method public void setReorderCodes(int...);
+ method public void setStrength(int);
+ method public static final boolean unregister(java.lang.Object);
+ field public static final int CANONICAL_DECOMPOSITION = 17; // 0x11
+ field public static final int FULL_DECOMPOSITION = 15; // 0xf
+ field public static final int IDENTICAL = 15; // 0xf
+ field public static final int NO_DECOMPOSITION = 16; // 0x10
+ field public static final int PRIMARY = 0; // 0x0
+ field public static final int QUATERNARY = 3; // 0x3
+ field public static final int SECONDARY = 1; // 0x1
+ field public static final int TERTIARY = 2; // 0x2
+ }
+
+ public static abstract class Collator.CollatorFactory {
+ ctor protected Collator.CollatorFactory();
+ method public android.icu.text.Collator createCollator(android.icu.util.ULocale);
+ method public android.icu.text.Collator createCollator(java.util.Locale);
+ method public java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
+ method public java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
+ method public abstract java.util.Set<java.lang.String> getSupportedLocaleIDs();
+ method public boolean visible();
+ }
+
+ public static abstract interface Collator.ReorderCodes {
+ field public static final int CURRENCY = 4099; // 0x1003
+ field public static final int DEFAULT = -1; // 0xffffffff
+ field public static final int DIGIT = 4100; // 0x1004
+ field public static final int FIRST = 4096; // 0x1000
+ field public static final int LIMIT = 4101; // 0x1005
+ field public static final int NONE = 103; // 0x67
+ field public static final int OTHERS = 103; // 0x67
+ field public static final int PUNCTUATION = 4097; // 0x1001
+ field public static final int SPACE = 4096; // 0x1000
+ field public static final int SYMBOL = 4098; // 0x1002
+ }
+
+ public class CompactDecimalFormat extends android.icu.text.DecimalFormat {
+ method public static android.icu.text.CompactDecimalFormat getInstance(android.icu.util.ULocale, android.icu.text.CompactDecimalFormat.CompactStyle);
+ method public static android.icu.text.CompactDecimalFormat getInstance(java.util.Locale, android.icu.text.CompactDecimalFormat.CompactStyle);
+ }
+
+ public static final class CompactDecimalFormat.CompactStyle extends java.lang.Enum {
+ method public static android.icu.text.CompactDecimalFormat.CompactStyle valueOf(java.lang.String);
+ method public static final android.icu.text.CompactDecimalFormat.CompactStyle[] values();
+ enum_constant public static final android.icu.text.CompactDecimalFormat.CompactStyle LONG;
+ enum_constant public static final android.icu.text.CompactDecimalFormat.CompactStyle SHORT;
+ }
+
+ public class CurrencyPluralInfo implements java.lang.Cloneable java.io.Serializable {
+ ctor public CurrencyPluralInfo();
+ ctor public CurrencyPluralInfo(java.util.Locale);
+ ctor public CurrencyPluralInfo(android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public java.lang.String getCurrencyPluralPattern(java.lang.String);
+ method public static android.icu.text.CurrencyPluralInfo getInstance();
+ method public static android.icu.text.CurrencyPluralInfo getInstance(java.util.Locale);
+ method public static android.icu.text.CurrencyPluralInfo getInstance(android.icu.util.ULocale);
+ method public android.icu.util.ULocale getLocale();
+ method public android.icu.text.PluralRules getPluralRules();
+ method public void setCurrencyPluralPattern(java.lang.String, java.lang.String);
+ method public void setLocale(android.icu.util.ULocale);
+ method public void setPluralRules(java.lang.String);
+ }
+
+ public abstract class DateFormat extends android.icu.text.UFormat {
+ ctor protected DateFormat();
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public boolean getBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute);
+ method public android.icu.util.Calendar getCalendar();
+ method public android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public static final android.icu.text.DateFormat getDateInstance();
+ method public static final android.icu.text.DateFormat getDateInstance(int);
+ method public static final android.icu.text.DateFormat getDateInstance(int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateInstance(int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int);
+ method public static final android.icu.text.DateFormat getDateTimeInstance();
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int);
+ method public static final android.icu.text.DateFormat getInstance();
+ method public static final android.icu.text.DateFormat getInstance(android.icu.util.Calendar, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstance(android.icu.util.Calendar);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(android.icu.util.Calendar, java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(android.icu.util.Calendar, java.lang.String, android.icu.util.ULocale);
+ method public android.icu.text.NumberFormat getNumberFormat();
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String);
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getPatternInstance(android.icu.util.Calendar, java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getPatternInstance(android.icu.util.Calendar, java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance();
+ method public static final android.icu.text.DateFormat getTimeInstance(int);
+ method public static final android.icu.text.DateFormat getTimeInstance(int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getTimeInstance(int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int);
+ method public android.icu.util.TimeZone getTimeZone();
+ method public boolean isCalendarLenient();
+ method public boolean isLenient();
+ method public java.util.Date parse(java.lang.String) throws java.text.ParseException;
+ method public abstract void parse(java.lang.String, android.icu.util.Calendar, java.text.ParsePosition);
+ method public java.util.Date parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public android.icu.text.DateFormat setBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute, boolean);
+ method public void setCalendar(android.icu.util.Calendar);
+ method public void setCalendarLenient(boolean);
+ method public void setContext(android.icu.text.DisplayContext);
+ method public void setLenient(boolean);
+ method public void setNumberFormat(android.icu.text.NumberFormat);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ field public static final java.lang.String ABBR_GENERIC_TZ = "v";
+ field public static final java.lang.String ABBR_MONTH = "MMM";
+ field public static final java.lang.String ABBR_MONTH_DAY = "MMMd";
+ field public static final java.lang.String ABBR_MONTH_WEEKDAY_DAY = "MMMEd";
+ field public static final java.lang.String ABBR_QUARTER = "QQQ";
+ field public static final java.lang.String ABBR_SPECIFIC_TZ = "z";
+ field public static final java.lang.String ABBR_UTC_TZ = "ZZZZ";
+ field public static final java.lang.String ABBR_WEEKDAY = "E";
+ field public static final int AM_PM_FIELD = 14; // 0xe
+ field public static final int DATE_FIELD = 3; // 0x3
+ field public static final java.lang.String DAY = "d";
+ field public static final int DAY_OF_WEEK_FIELD = 9; // 0x9
+ field public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11; // 0xb
+ field public static final int DAY_OF_YEAR_FIELD = 10; // 0xa
+ field public static final int DEFAULT = 2; // 0x2
+ field public static final int DOW_LOCAL_FIELD = 19; // 0x13
+ field public static final int ERA_FIELD = 0; // 0x0
+ field public static final int EXTENDED_YEAR_FIELD = 20; // 0x14
+ field public static final int FIELD_COUNT = 36; // 0x24
+ field public static final int FRACTIONAL_SECOND_FIELD = 8; // 0x8
+ field public static final int FULL = 0; // 0x0
+ field public static final java.lang.String GENERIC_TZ = "vvvv";
+ field public static final java.lang.String HOUR = "j";
+ field public static final int HOUR0_FIELD = 16; // 0x10
+ field public static final int HOUR1_FIELD = 15; // 0xf
+ field public static final java.lang.String HOUR24 = "H";
+ field public static final java.lang.String HOUR24_MINUTE = "Hm";
+ field public static final java.lang.String HOUR24_MINUTE_SECOND = "Hms";
+ field public static final java.lang.String HOUR_MINUTE = "jm";
+ field public static final java.lang.String HOUR_MINUTE_SECOND = "jms";
+ field public static final int HOUR_OF_DAY0_FIELD = 5; // 0x5
+ field public static final int HOUR_OF_DAY1_FIELD = 4; // 0x4
+ field public static final int JULIAN_DAY_FIELD = 21; // 0x15
+ field public static final java.lang.String LOCATION_TZ = "VVVV";
+ field public static final int LONG = 1; // 0x1
+ field public static final int MEDIUM = 2; // 0x2
+ field public static final int MILLISECONDS_IN_DAY_FIELD = 22; // 0x16
+ field public static final int MILLISECOND_FIELD = 8; // 0x8
+ field public static final java.lang.String MINUTE = "m";
+ field public static final int MINUTE_FIELD = 6; // 0x6
+ field public static final java.lang.String MINUTE_SECOND = "ms";
+ field public static final java.lang.String MONTH = "MMMM";
+ field public static final java.lang.String MONTH_DAY = "MMMMd";
+ field public static final int MONTH_FIELD = 2; // 0x2
+ field public static final java.lang.String MONTH_WEEKDAY_DAY = "MMMMEEEEd";
+ field public static final int NONE = -1; // 0xffffffff
+ field public static final java.lang.String NUM_MONTH = "M";
+ field public static final java.lang.String NUM_MONTH_DAY = "Md";
+ field public static final java.lang.String NUM_MONTH_WEEKDAY_DAY = "MEd";
+ field public static final java.lang.String QUARTER = "QQQQ";
+ field public static final int QUARTER_FIELD = 27; // 0x1b
+ field public static final int RELATIVE = 128; // 0x80
+ field public static final int RELATIVE_DEFAULT = 130; // 0x82
+ field public static final int RELATIVE_FULL = 128; // 0x80
+ field public static final int RELATIVE_LONG = 129; // 0x81
+ field public static final int RELATIVE_MEDIUM = 130; // 0x82
+ field public static final int RELATIVE_SHORT = 131; // 0x83
+ field public static final java.lang.String SECOND = "s";
+ field public static final int SECOND_FIELD = 7; // 0x7
+ field public static final int SHORT = 3; // 0x3
+ field public static final java.lang.String SPECIFIC_TZ = "zzzz";
+ field public static final int STANDALONE_DAY_FIELD = 25; // 0x19
+ field public static final int STANDALONE_MONTH_FIELD = 26; // 0x1a
+ field public static final int STANDALONE_QUARTER_FIELD = 28; // 0x1c
+ field public static final int TIMEZONE_FIELD = 17; // 0x11
+ field public static final int TIMEZONE_GENERIC_FIELD = 24; // 0x18
+ field public static final int TIMEZONE_ISO_FIELD = 32; // 0x20
+ field public static final int TIMEZONE_ISO_LOCAL_FIELD = 33; // 0x21
+ field public static final int TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31; // 0x1f
+ field public static final int TIMEZONE_RFC_FIELD = 23; // 0x17
+ field public static final int TIMEZONE_SPECIAL_FIELD = 29; // 0x1d
+ field public static final java.lang.String WEEKDAY = "EEEE";
+ field public static final int WEEK_OF_MONTH_FIELD = 13; // 0xd
+ field public static final int WEEK_OF_YEAR_FIELD = 12; // 0xc
+ field public static final java.lang.String YEAR = "y";
+ field public static final java.lang.String YEAR_ABBR_MONTH = "yMMM";
+ field public static final java.lang.String YEAR_ABBR_MONTH_DAY = "yMMMd";
+ field public static final java.lang.String YEAR_ABBR_MONTH_WEEKDAY_DAY = "yMMMEd";
+ field public static final java.lang.String YEAR_ABBR_QUARTER = "yQQQ";
+ field public static final int YEAR_FIELD = 1; // 0x1
+ field public static final java.lang.String YEAR_MONTH = "yMMMM";
+ field public static final java.lang.String YEAR_MONTH_DAY = "yMMMMd";
+ field public static final java.lang.String YEAR_MONTH_WEEKDAY_DAY = "yMMMMEEEEd";
+ field public static final int YEAR_NAME_FIELD = 30; // 0x1e
+ field public static final java.lang.String YEAR_NUM_MONTH = "yM";
+ field public static final java.lang.String YEAR_NUM_MONTH_DAY = "yMd";
+ field public static final java.lang.String YEAR_NUM_MONTH_WEEKDAY_DAY = "yMEd";
+ field public static final java.lang.String YEAR_QUARTER = "yQQQQ";
+ field public static final int YEAR_WOY_FIELD = 18; // 0x12
+ field protected android.icu.util.Calendar calendar;
+ field protected android.icu.text.NumberFormat numberFormat;
+ }
+
+ public static final class DateFormat.BooleanAttribute extends java.lang.Enum {
+ method public static android.icu.text.DateFormat.BooleanAttribute valueOf(java.lang.String);
+ method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
+ }
+
+ public static class DateFormat.Field extends java.text.Format.Field {
+ ctor protected DateFormat.Field(java.lang.String, int);
+ method public int getCalendarField();
+ method public static android.icu.text.DateFormat.Field ofCalendarField(int);
+ field public static final android.icu.text.DateFormat.Field AM_PM;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_MONTH;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_WEEK;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_WEEK_IN_MONTH;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_YEAR;
+ field public static final android.icu.text.DateFormat.Field DOW_LOCAL;
+ field public static final android.icu.text.DateFormat.Field ERA;
+ field public static final android.icu.text.DateFormat.Field EXTENDED_YEAR;
+ field public static final android.icu.text.DateFormat.Field HOUR0;
+ field public static final android.icu.text.DateFormat.Field HOUR1;
+ field public static final android.icu.text.DateFormat.Field HOUR_OF_DAY0;
+ field public static final android.icu.text.DateFormat.Field HOUR_OF_DAY1;
+ field public static final android.icu.text.DateFormat.Field JULIAN_DAY;
+ field public static final android.icu.text.DateFormat.Field MILLISECOND;
+ field public static final android.icu.text.DateFormat.Field MILLISECONDS_IN_DAY;
+ field public static final android.icu.text.DateFormat.Field MINUTE;
+ field public static final android.icu.text.DateFormat.Field MONTH;
+ field public static final android.icu.text.DateFormat.Field QUARTER;
+ field public static final android.icu.text.DateFormat.Field SECOND;
+ field public static final android.icu.text.DateFormat.Field TIME_ZONE;
+ field public static final android.icu.text.DateFormat.Field WEEK_OF_MONTH;
+ field public static final android.icu.text.DateFormat.Field WEEK_OF_YEAR;
+ field public static final android.icu.text.DateFormat.Field YEAR;
+ field public static final android.icu.text.DateFormat.Field YEAR_WOY;
+ }
+
+ public class DateFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateFormatSymbols();
+ ctor public DateFormatSymbols(java.util.Locale);
+ ctor public DateFormatSymbols(android.icu.util.ULocale);
+ ctor public DateFormatSymbols(android.icu.util.Calendar, java.util.Locale);
+ ctor public DateFormatSymbols(android.icu.util.Calendar, android.icu.util.ULocale);
+ ctor public DateFormatSymbols(java.lang.Class<? extends android.icu.util.Calendar>, java.util.Locale);
+ ctor public DateFormatSymbols(java.lang.Class<? extends android.icu.util.Calendar>, android.icu.util.ULocale);
+ ctor public DateFormatSymbols(java.util.ResourceBundle, java.util.Locale);
+ ctor public DateFormatSymbols(java.util.ResourceBundle, android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public java.lang.String[] getAmPmStrings();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.lang.String[] getEraNames();
+ method public java.lang.String[] getEras();
+ method public static android.icu.text.DateFormatSymbols getInstance();
+ method public static android.icu.text.DateFormatSymbols getInstance(java.util.Locale);
+ method public static android.icu.text.DateFormatSymbols getInstance(android.icu.util.ULocale);
+ method public java.lang.String getLocalPatternChars();
+ method public java.lang.String[] getMonths();
+ method public java.lang.String[] getMonths(int, int);
+ method public java.lang.String[] getQuarters(int, int);
+ method public java.lang.String[] getShortMonths();
+ method public java.lang.String[] getShortWeekdays();
+ method public java.lang.String[] getWeekdays();
+ method public java.lang.String[] getWeekdays(int, int);
+ method public java.lang.String[] getYearNames(int, int);
+ method public java.lang.String[] getZodiacNames(int, int);
+ method public java.lang.String[][] getZoneStrings();
+ method protected void initializeData(android.icu.util.ULocale, java.lang.String);
+ method public void setAmPmStrings(java.lang.String[]);
+ method public void setEraNames(java.lang.String[]);
+ method public void setEras(java.lang.String[]);
+ method public void setLocalPatternChars(java.lang.String);
+ method public void setMonths(java.lang.String[]);
+ method public void setMonths(java.lang.String[], int, int);
+ method public void setQuarters(java.lang.String[], int, int);
+ method public void setShortMonths(java.lang.String[]);
+ method public void setShortWeekdays(java.lang.String[]);
+ method public void setWeekdays(java.lang.String[], int, int);
+ method public void setWeekdays(java.lang.String[]);
+ method public void setYearNames(java.lang.String[], int, int);
+ method public void setZodiacNames(java.lang.String[], int, int);
+ method public void setZoneStrings(java.lang.String[][]);
+ field public static final int ABBREVIATED = 0; // 0x0
+ field public static final int FORMAT = 0; // 0x0
+ field public static final int NARROW = 2; // 0x2
+ field public static final int SHORT = 3; // 0x3
+ field public static final int STANDALONE = 1; // 0x1
+ field public static final int WIDE = 1; // 0x1
+ }
+
+ public class DateIntervalFormat extends android.icu.text.UFormat {
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(android.icu.util.DateInterval, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(android.icu.util.Calendar, android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.DateFormat getDateFormat();
+ method public android.icu.text.DateIntervalInfo getDateIntervalInfo();
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.text.DateIntervalInfo);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, java.util.Locale, android.icu.text.DateIntervalInfo);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.util.ULocale, android.icu.text.DateIntervalInfo);
+ method public android.icu.util.TimeZone getTimeZone();
+ method public deprecated java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setDateIntervalInfo(android.icu.text.DateIntervalInfo);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ }
+
+ public class DateIntervalInfo implements java.lang.Cloneable android.icu.util.Freezable java.io.Serializable {
+ ctor public DateIntervalInfo(android.icu.util.ULocale);
+ ctor public DateIntervalInfo(java.util.Locale);
+ method public java.lang.Object clone();
+ method public android.icu.text.DateIntervalInfo cloneAsThawed();
+ method public android.icu.text.DateIntervalInfo freeze();
+ method public boolean getDefaultOrder();
+ method public java.lang.String getFallbackIntervalPattern();
+ method public android.icu.text.DateIntervalInfo.PatternInfo getIntervalPattern(java.lang.String, int);
+ method public boolean isFrozen();
+ method public void setFallbackIntervalPattern(java.lang.String);
+ method public void setIntervalPattern(java.lang.String, int, java.lang.String);
+ }
+
+ public static final class DateIntervalInfo.PatternInfo implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateIntervalInfo.PatternInfo(java.lang.String, java.lang.String, boolean);
+ method public boolean firstDateInPtnIsLaterDate();
+ method public java.lang.String getFirstPart();
+ method public java.lang.String getSecondPart();
+ }
+
+ public class DateTimePatternGenerator implements java.lang.Cloneable android.icu.util.Freezable {
+ ctor protected DateTimePatternGenerator();
+ method public android.icu.text.DateTimePatternGenerator addPattern(java.lang.String, boolean, android.icu.text.DateTimePatternGenerator.PatternInfo);
+ method public java.lang.Object clone();
+ method public android.icu.text.DateTimePatternGenerator cloneAsThawed();
+ method public android.icu.text.DateTimePatternGenerator freeze();
+ method public java.lang.String getAppendItemFormat(int);
+ method public java.lang.String getAppendItemName(int);
+ method public java.lang.String getBaseSkeleton(java.lang.String);
+ method public java.util.Set<java.lang.String> getBaseSkeletons(java.util.Set<java.lang.String>);
+ method public java.lang.String getBestPattern(java.lang.String);
+ method public java.lang.String getBestPattern(java.lang.String, int);
+ method public java.lang.String getDateTimeFormat();
+ method public java.lang.String getDecimal();
+ method public static android.icu.text.DateTimePatternGenerator getEmptyInstance();
+ method public static android.icu.text.DateTimePatternGenerator getInstance();
+ method public static android.icu.text.DateTimePatternGenerator getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.DateTimePatternGenerator getInstance(java.util.Locale);
+ method public java.lang.String getSkeleton(java.lang.String);
+ method public java.util.Map<java.lang.String, java.lang.String> getSkeletons(java.util.Map<java.lang.String, java.lang.String>);
+ method public boolean isFrozen();
+ method public java.lang.String replaceFieldTypes(java.lang.String, java.lang.String);
+ method public java.lang.String replaceFieldTypes(java.lang.String, java.lang.String, int);
+ method public void setAppendItemFormat(int, java.lang.String);
+ method public void setAppendItemName(int, java.lang.String);
+ method public void setDateTimeFormat(java.lang.String);
+ method public void setDecimal(java.lang.String);
+ field public static final int DAY = 7; // 0x7
+ field public static final int DAYPERIOD = 10; // 0xa
+ field public static final int DAY_OF_WEEK_IN_MONTH = 9; // 0x9
+ field public static final int DAY_OF_YEAR = 8; // 0x8
+ field public static final int ERA = 0; // 0x0
+ field public static final int FRACTIONAL_SECOND = 14; // 0xe
+ field public static final int HOUR = 11; // 0xb
+ field public static final int MATCH_ALL_FIELDS_LENGTH = 65535; // 0xffff
+ field public static final int MATCH_HOUR_FIELD_LENGTH = 2048; // 0x800
+ field public static final int MATCH_NO_OPTIONS = 0; // 0x0
+ field public static final int MINUTE = 12; // 0xc
+ field public static final int MONTH = 3; // 0x3
+ field public static final int QUARTER = 2; // 0x2
+ field public static final int SECOND = 13; // 0xd
+ field public static final int TYPE_LIMIT = 16; // 0x10
+ field public static final int WEEKDAY = 6; // 0x6
+ field public static final int WEEK_OF_MONTH = 5; // 0x5
+ field public static final int WEEK_OF_YEAR = 4; // 0x4
+ field public static final int YEAR = 1; // 0x1
+ field public static final int ZONE = 15; // 0xf
+ }
+
+ public static final class DateTimePatternGenerator.PatternInfo {
+ ctor public DateTimePatternGenerator.PatternInfo();
+ field public static final int BASE_CONFLICT = 1; // 0x1
+ field public static final int CONFLICT = 2; // 0x2
+ field public static final int OK = 0; // 0x0
+ field public java.lang.String conflictingPattern;
+ field public int status;
+ }
+
+ public class DecimalFormat extends android.icu.text.NumberFormat {
+ ctor public DecimalFormat();
+ ctor public DecimalFormat(java.lang.String);
+ ctor public DecimalFormat(java.lang.String, android.icu.text.DecimalFormatSymbols);
+ ctor public DecimalFormat(java.lang.String, android.icu.text.DecimalFormatSymbols, android.icu.text.CurrencyPluralInfo, int);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public boolean areSignificantDigitsUsed();
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.CurrencyPluralInfo getCurrencyPluralInfo();
+ method public android.icu.util.Currency.CurrencyUsage getCurrencyUsage();
+ method public android.icu.text.DecimalFormatSymbols getDecimalFormatSymbols();
+ method public int getFormatWidth();
+ method public int getGroupingSize();
+ method public java.math.MathContext getMathContext();
+ method public android.icu.math.MathContext getMathContextICU();
+ method public int getMaximumSignificantDigits();
+ method public byte getMinimumExponentDigits();
+ method public int getMinimumSignificantDigits();
+ method public int getMultiplier();
+ method public java.lang.String getNegativePrefix();
+ method public java.lang.String getNegativeSuffix();
+ method public char getPadCharacter();
+ method public int getPadPosition();
+ method public int getParseMaxDigits();
+ method public java.lang.String getPositivePrefix();
+ method public java.lang.String getPositiveSuffix();
+ method public java.math.BigDecimal getRoundingIncrement();
+ method public int getSecondaryGroupingSize();
+ method public boolean isDecimalPatternMatchRequired();
+ method public boolean isDecimalSeparatorAlwaysShown();
+ method public boolean isExponentSignAlwaysShown();
+ method public boolean isParseBigDecimal();
+ method public boolean isScientificNotation();
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public void setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo);
+ method public void setCurrencyUsage(android.icu.util.Currency.CurrencyUsage);
+ method public void setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols);
+ method public void setDecimalPatternMatchRequired(boolean);
+ method public void setDecimalSeparatorAlwaysShown(boolean);
+ method public void setExponentSignAlwaysShown(boolean);
+ method public void setFormatWidth(int);
+ method public void setGroupingSize(int);
+ method public void setMathContext(java.math.MathContext);
+ method public void setMathContextICU(android.icu.math.MathContext);
+ method public void setMaximumSignificantDigits(int);
+ method public void setMinimumExponentDigits(byte);
+ method public void setMinimumSignificantDigits(int);
+ method public void setMultiplier(int);
+ method public void setNegativePrefix(java.lang.String);
+ method public void setNegativeSuffix(java.lang.String);
+ method public void setPadCharacter(char);
+ method public void setPadPosition(int);
+ method public void setParseBigDecimal(boolean);
+ method public void setParseMaxDigits(int);
+ method public void setPositivePrefix(java.lang.String);
+ method public void setPositiveSuffix(java.lang.String);
+ method public void setRoundingIncrement(java.math.BigDecimal);
+ method public void setRoundingIncrement(android.icu.math.BigDecimal);
+ method public void setRoundingIncrement(double);
+ method public void setScientificNotation(boolean);
+ method public void setSecondaryGroupingSize(int);
+ method public void setSignificantDigitsUsed(boolean);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ field public static final int PAD_AFTER_PREFIX = 1; // 0x1
+ field public static final int PAD_AFTER_SUFFIX = 3; // 0x3
+ field public static final int PAD_BEFORE_PREFIX = 0; // 0x0
+ field public static final int PAD_BEFORE_SUFFIX = 2; // 0x2
+ }
+
+ public class DecimalFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DecimalFormatSymbols();
+ ctor public DecimalFormatSymbols(java.util.Locale);
+ ctor public DecimalFormatSymbols(android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.util.Currency getCurrency();
+ method public java.lang.String getCurrencySymbol();
+ method public char getDecimalSeparator();
+ method public char getDigit();
+ method public char[] getDigits();
+ method public java.lang.String getExponentMultiplicationSign();
+ method public java.lang.String getExponentSeparator();
+ method public char getGroupingSeparator();
+ method public java.lang.String getInfinity();
+ method public static android.icu.text.DecimalFormatSymbols getInstance();
+ method public static android.icu.text.DecimalFormatSymbols getInstance(java.util.Locale);
+ method public static android.icu.text.DecimalFormatSymbols getInstance(android.icu.util.ULocale);
+ method public java.lang.String getInternationalCurrencySymbol();
+ method public java.util.Locale getLocale();
+ method public char getMinusSign();
+ method public char getMonetaryDecimalSeparator();
+ method public char getMonetaryGroupingSeparator();
+ method public java.lang.String getNaN();
+ method public char getPadEscape();
+ method public java.lang.String getPatternForCurrencySpacing(int, boolean);
+ method public char getPatternSeparator();
+ method public char getPerMill();
+ method public char getPercent();
+ method public char getPlusSign();
+ method public char getSignificantDigit();
+ method public android.icu.util.ULocale getULocale();
+ method public char getZeroDigit();
+ method public void setCurrency(android.icu.util.Currency);
+ method public void setCurrencySymbol(java.lang.String);
+ method public void setDecimalSeparator(char);
+ method public void setDigit(char);
+ method public void setExponentMultiplicationSign(java.lang.String);
+ method public void setExponentSeparator(java.lang.String);
+ method public void setGroupingSeparator(char);
+ method public void setInfinity(java.lang.String);
+ method public void setInternationalCurrencySymbol(java.lang.String);
+ method public void setMinusSign(char);
+ method public void setMonetaryDecimalSeparator(char);
+ method public void setMonetaryGroupingSeparator(char);
+ method public void setNaN(java.lang.String);
+ method public void setPadEscape(char);
+ method public void setPatternForCurrencySpacing(int, boolean, java.lang.String);
+ method public void setPatternSeparator(char);
+ method public void setPerMill(char);
+ method public void setPercent(char);
+ method public void setPlusSign(char);
+ method public void setSignificantDigit(char);
+ method public void setZeroDigit(char);
+ field public static final int CURRENCY_SPC_CURRENCY_MATCH = 0; // 0x0
+ field public static final int CURRENCY_SPC_INSERT = 2; // 0x2
+ field public static final int CURRENCY_SPC_SURROUNDING_MATCH = 1; // 0x1
+ }
+
+ public final class DisplayContext extends java.lang.Enum {
+ method public android.icu.text.DisplayContext.Type type();
+ method public int value();
+ method public static android.icu.text.DisplayContext valueOf(java.lang.String);
+ method public static final android.icu.text.DisplayContext[] values();
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_STANDALONE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_UI_LIST_OR_MENU;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_NONE;
+ enum_constant public static final android.icu.text.DisplayContext DIALECT_NAMES;
+ enum_constant public static final android.icu.text.DisplayContext LENGTH_FULL;
+ enum_constant public static final android.icu.text.DisplayContext LENGTH_SHORT;
+ enum_constant public static final android.icu.text.DisplayContext STANDARD_NAMES;
+ }
+
+ public static final class DisplayContext.Type extends java.lang.Enum {
+ method public static android.icu.text.DisplayContext.Type valueOf(java.lang.String);
+ method public static final android.icu.text.DisplayContext.Type[] values();
+ enum_constant public static final android.icu.text.DisplayContext.Type CAPITALIZATION;
+ enum_constant public static final android.icu.text.DisplayContext.Type DIALECT_HANDLING;
+ enum_constant public static final android.icu.text.DisplayContext.Type DISPLAY_LENGTH;
+ }
+
+ public abstract class IDNA {
+ method public static android.icu.text.IDNA getUTS46Instance(int);
+ method public abstract java.lang.StringBuilder labelToASCII(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder labelToUnicode(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder nameToASCII(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder nameToUnicode(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ field public static final int CHECK_BIDI = 4; // 0x4
+ field public static final int CHECK_CONTEXTJ = 8; // 0x8
+ field public static final int CHECK_CONTEXTO = 64; // 0x40
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int NONTRANSITIONAL_TO_ASCII = 16; // 0x10
+ field public static final int NONTRANSITIONAL_TO_UNICODE = 32; // 0x20
+ field public static final int USE_STD3_RULES = 2; // 0x2
+ }
+
+ public static final class IDNA.Error extends java.lang.Enum {
+ method public static android.icu.text.IDNA.Error valueOf(java.lang.String);
+ method public static final android.icu.text.IDNA.Error[] values();
+ enum_constant public static final android.icu.text.IDNA.Error BIDI;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTJ;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTO_DIGITS;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTO_PUNCTUATION;
+ enum_constant public static final android.icu.text.IDNA.Error DISALLOWED;
+ enum_constant public static final android.icu.text.IDNA.Error DOMAIN_NAME_TOO_LONG;
+ enum_constant public static final android.icu.text.IDNA.Error EMPTY_LABEL;
+ enum_constant public static final android.icu.text.IDNA.Error HYPHEN_3_4;
+ enum_constant public static final android.icu.text.IDNA.Error INVALID_ACE_LABEL;
+ enum_constant public static final android.icu.text.IDNA.Error LABEL_HAS_DOT;
+ enum_constant public static final android.icu.text.IDNA.Error LABEL_TOO_LONG;
+ enum_constant public static final android.icu.text.IDNA.Error LEADING_COMBINING_MARK;
+ enum_constant public static final android.icu.text.IDNA.Error LEADING_HYPHEN;
+ enum_constant public static final android.icu.text.IDNA.Error PUNYCODE;
+ enum_constant public static final android.icu.text.IDNA.Error TRAILING_HYPHEN;
+ }
+
+ public static final class IDNA.Info {
+ ctor public IDNA.Info();
+ method public java.util.Set<android.icu.text.IDNA.Error> getErrors();
+ method public boolean hasErrors();
+ method public boolean isTransitionalDifferent();
+ }
+
+ public abstract class LocaleDisplayNames {
+ method public abstract android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public abstract android.icu.text.LocaleDisplayNames.DialectHandling getDialectHandling();
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale);
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.LocaleDisplayNames.DialectHandling);
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.DisplayContext...);
+ method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale, android.icu.text.DisplayContext...);
+ method public abstract android.icu.util.ULocale getLocale();
+ method public abstract java.lang.String keyDisplayName(java.lang.String);
+ method public abstract java.lang.String keyValueDisplayName(java.lang.String, java.lang.String);
+ method public abstract java.lang.String languageDisplayName(java.lang.String);
+ method public abstract java.lang.String localeDisplayName(android.icu.util.ULocale);
+ method public abstract java.lang.String localeDisplayName(java.util.Locale);
+ method public abstract java.lang.String localeDisplayName(java.lang.String);
+ method public abstract java.lang.String regionDisplayName(java.lang.String);
+ method public abstract java.lang.String scriptDisplayName(java.lang.String);
+ method public abstract java.lang.String scriptDisplayName(int);
+ method public abstract java.lang.String variantDisplayName(java.lang.String);
+ }
+
+ public static final class LocaleDisplayNames.DialectHandling extends java.lang.Enum {
+ method public static android.icu.text.LocaleDisplayNames.DialectHandling valueOf(java.lang.String);
+ method public static final android.icu.text.LocaleDisplayNames.DialectHandling[] values();
+ enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling DIALECT_NAMES;
+ enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling STANDARD_NAMES;
+ }
+
+ public class MeasureFormat extends android.icu.text.UFormat {
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String formatMeasures(android.icu.util.Measure...);
+ method public java.lang.StringBuilder formatMeasures(java.lang.StringBuilder, java.text.FieldPosition, android.icu.util.Measure...);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat(android.icu.util.ULocale);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat(java.util.Locale);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat();
+ method public static android.icu.text.MeasureFormat getInstance(android.icu.util.ULocale, android.icu.text.MeasureFormat.FormatWidth);
+ method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth);
+ method public static android.icu.text.MeasureFormat getInstance(android.icu.util.ULocale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);
+ method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);
+ method public final android.icu.util.ULocale getLocale();
+ method public android.icu.text.NumberFormat getNumberFormat();
+ method public android.icu.text.MeasureFormat.FormatWidth getWidth();
+ method public final int hashCode();
+ method public android.icu.util.Measure parseObject(java.lang.String, java.text.ParsePosition);
+ }
+
+ public static final class MeasureFormat.FormatWidth extends java.lang.Enum {
+ method public static android.icu.text.MeasureFormat.FormatWidth valueOf(java.lang.String);
+ method public static final android.icu.text.MeasureFormat.FormatWidth[] values();
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth NARROW;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth NUMERIC;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth SHORT;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth WIDE;
+ }
+
+ public class MessageFormat extends android.icu.text.UFormat {
+ ctor public MessageFormat(java.lang.String);
+ ctor public MessageFormat(java.lang.String, java.util.Locale);
+ ctor public MessageFormat(java.lang.String, android.icu.util.ULocale);
+ method public void applyPattern(java.lang.String);
+ method public void applyPattern(java.lang.String, android.icu.text.MessagePattern.ApostropheMode);
+ method public static java.lang.String autoQuoteApostrophe(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(java.util.Map<java.lang.String, java.lang.Object>, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public static java.lang.String format(java.lang.String, java.util.Map<java.lang.String, java.lang.Object>);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.MessagePattern.ApostropheMode getApostropheMode();
+ method public java.util.Set<java.lang.String> getArgumentNames();
+ method public java.text.Format getFormatByArgumentName(java.lang.String);
+ method public java.text.Format[] getFormats();
+ method public java.text.Format[] getFormatsByArgumentIndex();
+ method public java.util.Locale getLocale();
+ method public android.icu.util.ULocale getULocale();
+ method public java.lang.Object[] parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.util.Map<java.lang.String, java.lang.Object> parseToMap(java.lang.String, java.text.ParsePosition);
+ method public java.util.Map<java.lang.String, java.lang.Object> parseToMap(java.lang.String) throws java.text.ParseException;
+ method public void setFormat(int, java.text.Format);
+ method public void setFormatByArgumentIndex(int, java.text.Format);
+ method public void setFormatByArgumentName(java.lang.String, java.text.Format);
+ method public void setFormats(java.text.Format[]);
+ method public void setFormatsByArgumentIndex(java.text.Format[]);
+ method public void setFormatsByArgumentName(java.util.Map<java.lang.String, java.text.Format>);
+ method public void setLocale(java.util.Locale);
+ method public void setLocale(android.icu.util.ULocale);
+ method public java.lang.String toPattern();
+ method public boolean usesNamedArguments();
+ }
+
+ public static class MessageFormat.Field extends java.text.Format.Field {
+ ctor protected MessageFormat.Field(java.lang.String);
+ field public static final android.icu.text.MessageFormat.Field ARGUMENT;
+ }
+
+ public final class MessagePattern implements java.lang.Cloneable android.icu.util.Freezable {
+ ctor public MessagePattern();
+ ctor public MessagePattern(android.icu.text.MessagePattern.ApostropheMode);
+ ctor public MessagePattern(java.lang.String);
+ method public java.lang.String autoQuoteApostropheDeep();
+ method public void clear();
+ method public void clearPatternAndSetApostropheMode(android.icu.text.MessagePattern.ApostropheMode);
+ method public java.lang.Object clone();
+ method public android.icu.text.MessagePattern cloneAsThawed();
+ method public int countParts();
+ method public android.icu.text.MessagePattern freeze();
+ method public android.icu.text.MessagePattern.ApostropheMode getApostropheMode();
+ method public int getLimitPartIndex(int);
+ method public double getNumericValue(android.icu.text.MessagePattern.Part);
+ method public android.icu.text.MessagePattern.Part getPart(int);
+ method public android.icu.text.MessagePattern.Part.Type getPartType(int);
+ method public int getPatternIndex(int);
+ method public java.lang.String getPatternString();
+ method public double getPluralOffset(int);
+ method public java.lang.String getSubstring(android.icu.text.MessagePattern.Part);
+ method public boolean hasNamedArguments();
+ method public boolean hasNumberedArguments();
+ method public boolean isFrozen();
+ method public android.icu.text.MessagePattern parse(java.lang.String);
+ method public android.icu.text.MessagePattern parseChoiceStyle(java.lang.String);
+ method public android.icu.text.MessagePattern parsePluralStyle(java.lang.String);
+ method public android.icu.text.MessagePattern parseSelectStyle(java.lang.String);
+ method public boolean partSubstringMatches(android.icu.text.MessagePattern.Part, java.lang.String);
+ method public static int validateArgumentName(java.lang.String);
+ field public static final int ARG_NAME_NOT_NUMBER = -1; // 0xffffffff
+ field public static final int ARG_NAME_NOT_VALID = -2; // 0xfffffffe
+ field public static final double NO_NUMERIC_VALUE = -1.23456789E8;
+ }
+
+ public static final class MessagePattern.ApostropheMode extends java.lang.Enum {
+ method public static android.icu.text.MessagePattern.ApostropheMode valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.ApostropheMode[] values();
+ enum_constant public static final android.icu.text.MessagePattern.ApostropheMode DOUBLE_OPTIONAL;
+ enum_constant public static final android.icu.text.MessagePattern.ApostropheMode DOUBLE_REQUIRED;
+ }
+
+ public static final class MessagePattern.ArgType extends java.lang.Enum {
+ method public boolean hasPluralStyle();
+ method public static android.icu.text.MessagePattern.ArgType valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.ArgType[] values();
+ enum_constant public static final android.icu.text.MessagePattern.ArgType CHOICE;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType NONE;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType PLURAL;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SELECT;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SELECTORDINAL;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SIMPLE;
+ }
+
+ public static final class MessagePattern.Part {
+ method public android.icu.text.MessagePattern.ArgType getArgType();
+ method public int getIndex();
+ method public int getLength();
+ method public int getLimit();
+ method public android.icu.text.MessagePattern.Part.Type getType();
+ method public int getValue();
+ }
+
+ public static final class MessagePattern.Part.Type extends java.lang.Enum {
+ method public boolean hasNumericValue();
+ method public static android.icu.text.MessagePattern.Part.Type valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.Part.Type[] values();
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_DOUBLE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_INT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_LIMIT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_NAME;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_NUMBER;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_SELECTOR;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_START;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_STYLE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_TYPE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type INSERT_CHAR;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type MSG_LIMIT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type MSG_START;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type REPLACE_NUMBER;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type SKIP_SYNTAX;
+ }
+
+ public final class Normalizer implements java.lang.Cloneable {
+ method public static int compare(char[], int, int, char[], int, int, int);
+ method public static int compare(java.lang.String, java.lang.String, int);
+ method public static int compare(char[], char[], int);
+ method public static int compare(int, int, int);
+ method public static int compare(int, java.lang.String, int);
+ field public static final int COMPARE_CODE_POINT_ORDER = 32768; // 0x8000
+ field public static final int COMPARE_IGNORE_CASE = 65536; // 0x10000
+ field public static final int FOLD_CASE_DEFAULT = 0; // 0x0
+ field public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1; // 0x1
+ field public static final int INPUT_IS_FCD = 131072; // 0x20000
+ field public static final android.icu.text.Normalizer.QuickCheckResult MAYBE;
+ field public static final android.icu.text.Normalizer.QuickCheckResult NO;
+ field public static final android.icu.text.Normalizer.QuickCheckResult YES;
+ }
+
+ public static final class Normalizer.QuickCheckResult {
+ }
+
+ public abstract class Normalizer2 {
+ method public abstract java.lang.StringBuilder append(java.lang.StringBuilder, java.lang.CharSequence);
+ method public int composePair(int, int);
+ method public int getCombiningClass(int);
+ method public abstract java.lang.String getDecomposition(int);
+ method public static android.icu.text.Normalizer2 getInstance(java.io.InputStream, java.lang.String, android.icu.text.Normalizer2.Mode);
+ method public static android.icu.text.Normalizer2 getNFCInstance();
+ method public static android.icu.text.Normalizer2 getNFDInstance();
+ method public static android.icu.text.Normalizer2 getNFKCCasefoldInstance();
+ method public static android.icu.text.Normalizer2 getNFKCInstance();
+ method public static android.icu.text.Normalizer2 getNFKDInstance();
+ method public java.lang.String getRawDecomposition(int);
+ method public abstract boolean hasBoundaryAfter(int);
+ method public abstract boolean hasBoundaryBefore(int);
+ method public abstract boolean isInert(int);
+ method public abstract boolean isNormalized(java.lang.CharSequence);
+ method public java.lang.String normalize(java.lang.CharSequence);
+ method public abstract java.lang.StringBuilder normalize(java.lang.CharSequence, java.lang.StringBuilder);
+ method public abstract java.lang.Appendable normalize(java.lang.CharSequence, java.lang.Appendable);
+ method public abstract java.lang.StringBuilder normalizeSecondAndAppend(java.lang.StringBuilder, java.lang.CharSequence);
+ method public abstract android.icu.text.Normalizer.QuickCheckResult quickCheck(java.lang.CharSequence);
+ method public abstract int spanQuickCheckYes(java.lang.CharSequence);
+ }
+
+ public static final class Normalizer2.Mode extends java.lang.Enum {
+ method public static android.icu.text.Normalizer2.Mode valueOf(java.lang.String);
+ method public static final android.icu.text.Normalizer2.Mode[] values();
+ enum_constant public static final android.icu.text.Normalizer2.Mode COMPOSE;
+ enum_constant public static final android.icu.text.Normalizer2.Mode COMPOSE_CONTIGUOUS;
+ enum_constant public static final android.icu.text.Normalizer2.Mode DECOMPOSE;
+ enum_constant public static final android.icu.text.Normalizer2.Mode FCD;
+ }
+
+ public abstract class NumberFormat extends android.icu.text.UFormat {
+ ctor public NumberFormat();
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(double);
+ method public final java.lang.String format(long);
+ method public final java.lang.String format(java.math.BigInteger);
+ method public final java.lang.String format(java.math.BigDecimal);
+ method public final java.lang.String format(android.icu.math.BigDecimal);
+ method public final java.lang.String format(android.icu.util.CurrencyAmount);
+ method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(android.icu.util.CurrencyAmount, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public android.icu.util.Currency getCurrency();
+ method public static final android.icu.text.NumberFormat getCurrencyInstance();
+ method public static android.icu.text.NumberFormat getCurrencyInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getCurrencyInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.NumberFormat getInstance();
+ method public static android.icu.text.NumberFormat getInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.NumberFormat getInstance(int);
+ method public static android.icu.text.NumberFormat getInstance(java.util.Locale, int);
+ method public static android.icu.text.NumberFormat getInstance(android.icu.util.ULocale, int);
+ method public static final android.icu.text.NumberFormat getIntegerInstance();
+ method public static android.icu.text.NumberFormat getIntegerInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getIntegerInstance(android.icu.util.ULocale);
+ method public int getMaximumFractionDigits();
+ method public int getMaximumIntegerDigits();
+ method public int getMinimumFractionDigits();
+ method public int getMinimumIntegerDigits();
+ method public static final android.icu.text.NumberFormat getNumberInstance();
+ method public static android.icu.text.NumberFormat getNumberInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getNumberInstance(android.icu.util.ULocale);
+ method protected static java.lang.String getPattern(android.icu.util.ULocale, int);
+ method public static final android.icu.text.NumberFormat getPercentInstance();
+ method public static android.icu.text.NumberFormat getPercentInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getPercentInstance(android.icu.util.ULocale);
+ method public int getRoundingMode();
+ method public static final android.icu.text.NumberFormat getScientificInstance();
+ method public static android.icu.text.NumberFormat getScientificInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getScientificInstance(android.icu.util.ULocale);
+ method public boolean isGroupingUsed();
+ method public boolean isParseIntegerOnly();
+ method public boolean isParseStrict();
+ method public abstract java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
+ method public android.icu.util.CurrencyAmount parseCurrency(java.lang.CharSequence, java.text.ParsePosition);
+ method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public static java.lang.Object registerFactory(android.icu.text.NumberFormat.NumberFormatFactory);
+ method public void setContext(android.icu.text.DisplayContext);
+ method public void setCurrency(android.icu.util.Currency);
+ method public void setGroupingUsed(boolean);
+ method public void setMaximumFractionDigits(int);
+ method public void setMaximumIntegerDigits(int);
+ method public void setMinimumFractionDigits(int);
+ method public void setMinimumIntegerDigits(int);
+ method public void setParseIntegerOnly(boolean);
+ method public void setParseStrict(boolean);
+ method public void setRoundingMode(int);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int ACCOUNTINGCURRENCYSTYLE = 7; // 0x7
+ field public static final int CASHCURRENCYSTYLE = 8; // 0x8
+ field public static final int CURRENCYSTYLE = 1; // 0x1
+ field public static final int FRACTION_FIELD = 1; // 0x1
+ field public static final int INTEGERSTYLE = 4; // 0x4
+ field public static final int INTEGER_FIELD = 0; // 0x0
+ field public static final int ISOCURRENCYSTYLE = 5; // 0x5
+ field public static final int NUMBERSTYLE = 0; // 0x0
+ field public static final int PERCENTSTYLE = 2; // 0x2
+ field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
+ field public static final int SCIENTIFICSTYLE = 3; // 0x3
+ }
+
+ public static class NumberFormat.Field extends java.text.Format.Field {
+ ctor protected NumberFormat.Field(java.lang.String);
+ field public static final android.icu.text.NumberFormat.Field CURRENCY;
+ field public static final android.icu.text.NumberFormat.Field DECIMAL_SEPARATOR;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT_SIGN;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT_SYMBOL;
+ field public static final android.icu.text.NumberFormat.Field FRACTION;
+ field public static final android.icu.text.NumberFormat.Field GROUPING_SEPARATOR;
+ field public static final android.icu.text.NumberFormat.Field INTEGER;
+ field public static final android.icu.text.NumberFormat.Field PERCENT;
+ field public static final android.icu.text.NumberFormat.Field PERMILLE;
+ field public static final android.icu.text.NumberFormat.Field SIGN;
+ }
+
+ public static abstract class NumberFormat.NumberFormatFactory {
+ ctor protected NumberFormat.NumberFormatFactory();
+ method public android.icu.text.NumberFormat createFormat(android.icu.util.ULocale, int);
+ method public android.icu.text.NumberFormat createFormat(java.util.Locale, int);
+ method public abstract java.util.Set<java.lang.String> getSupportedLocaleNames();
+ method public boolean visible();
+ field public static final int FORMAT_CURRENCY = 1; // 0x1
+ field public static final int FORMAT_INTEGER = 4; // 0x4
+ field public static final int FORMAT_NUMBER = 0; // 0x0
+ field public static final int FORMAT_PERCENT = 2; // 0x2
+ field public static final int FORMAT_SCIENTIFIC = 3; // 0x3
+ }
+
+ public static abstract class NumberFormat.SimpleNumberFormatFactory extends android.icu.text.NumberFormat.NumberFormatFactory {
+ ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale);
+ ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale, boolean);
+ ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale);
+ ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale, boolean);
+ method public final java.util.Set<java.lang.String> getSupportedLocaleNames();
+ method public final boolean visible();
+ }
+
+ public class NumberingSystem {
+ ctor public NumberingSystem();
+ method public static java.lang.String[] getAvailableNames();
+ method public java.lang.String getDescription();
+ method public static android.icu.text.NumberingSystem getInstance(int, boolean, java.lang.String);
+ method public static android.icu.text.NumberingSystem getInstance(java.util.Locale);
+ method public static android.icu.text.NumberingSystem getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.NumberingSystem getInstance();
+ method public static android.icu.text.NumberingSystem getInstanceByName(java.lang.String);
+ method public java.lang.String getName();
+ method public int getRadix();
+ method public boolean isAlgorithmic();
+ method public static boolean isValidDigitString(java.lang.String);
+ }
+
+ public class PluralFormat extends android.icu.text.UFormat {
+ ctor public PluralFormat();
+ ctor public PluralFormat(android.icu.util.ULocale);
+ ctor public PluralFormat(java.util.Locale);
+ ctor public PluralFormat(android.icu.text.PluralRules);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules);
+ ctor public PluralFormat(java.util.Locale, android.icu.text.PluralRules);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType);
+ ctor public PluralFormat(java.util.Locale, android.icu.text.PluralRules.PluralType);
+ ctor public PluralFormat(java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, java.lang.String);
+ ctor public PluralFormat(android.icu.text.PluralRules, java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules, java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType, java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public boolean equals(android.icu.text.PluralFormat);
+ method public final java.lang.String format(double);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setNumberFormat(android.icu.text.NumberFormat);
+ method public java.lang.String toPattern();
+ }
+
+ public class PluralRules implements java.io.Serializable {
+ method public static android.icu.text.PluralRules createRules(java.lang.String);
+ method public boolean equals(android.icu.text.PluralRules);
+ method public static android.icu.text.PluralRules forLocale(android.icu.util.ULocale);
+ method public static android.icu.text.PluralRules forLocale(java.util.Locale);
+ method public static android.icu.text.PluralRules forLocale(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType);
+ method public static android.icu.text.PluralRules forLocale(java.util.Locale, android.icu.text.PluralRules.PluralType);
+ method public java.util.Collection<java.lang.Double> getAllKeywordValues(java.lang.String);
+ method public java.util.Set<java.lang.String> getKeywords();
+ method public java.util.Collection<java.lang.Double> getSamples(java.lang.String);
+ method public double getUniqueKeywordValue(java.lang.String);
+ method public static android.icu.text.PluralRules parseDescription(java.lang.String) throws java.text.ParseException;
+ method public java.lang.String select(double);
+ field public static final android.icu.text.PluralRules DEFAULT;
+ field public static final java.lang.String KEYWORD_FEW = "few";
+ field public static final java.lang.String KEYWORD_MANY = "many";
+ field public static final java.lang.String KEYWORD_ONE = "one";
+ field public static final java.lang.String KEYWORD_OTHER = "other";
+ field public static final java.lang.String KEYWORD_TWO = "two";
+ field public static final java.lang.String KEYWORD_ZERO = "zero";
+ field public static final double NO_UNIQUE_VALUE = -0.00123456777;
+ }
+
+ public static final class PluralRules.PluralType extends java.lang.Enum {
+ method public static android.icu.text.PluralRules.PluralType valueOf(java.lang.String);
+ method public static final android.icu.text.PluralRules.PluralType[] values();
+ enum_constant public static final android.icu.text.PluralRules.PluralType CARDINAL;
+ enum_constant public static final android.icu.text.PluralRules.PluralType ORDINAL;
+ }
+
+ public final class RawCollationKey extends android.icu.util.ByteArrayWrapper {
+ ctor public RawCollationKey();
+ ctor public RawCollationKey(int);
+ ctor public RawCollationKey(byte[]);
+ ctor public RawCollationKey(byte[], int);
+ method public int compareTo(android.icu.text.RawCollationKey);
+ }
+
+ public final class RelativeDateTimeFormatter {
+ method public java.lang.String combineDateAndTime(java.lang.String, java.lang.String);
+ method public java.lang.String format(double, android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.RelativeUnit);
+ method public java.lang.String format(android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit);
+ method public android.icu.text.DisplayContext getCapitalizationContext();
+ method public android.icu.text.RelativeDateTimeFormatter.Style getFormatStyle();
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance();
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(java.util.Locale);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale, android.icu.text.NumberFormat);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale, android.icu.text.NumberFormat, android.icu.text.RelativeDateTimeFormatter.Style, android.icu.text.DisplayContext);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(java.util.Locale, android.icu.text.NumberFormat);
+ method public android.icu.text.NumberFormat getNumberFormat();
+ }
+
+ public static final class RelativeDateTimeFormatter.AbsoluteUnit extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit DAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit FRIDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit MONDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit MONTH;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit NOW;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit SATURDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit SUNDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit THURSDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit TUESDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit WEDNESDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit WEEK;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit YEAR;
+ }
+
+ public static final class RelativeDateTimeFormatter.Direction extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.Direction valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.Direction[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction LAST;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction LAST_2;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction NEXT;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction NEXT_2;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction PLAIN;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction THIS;
+ }
+
+ public static final class RelativeDateTimeFormatter.RelativeUnit extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.RelativeUnit valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit DAYS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit HOURS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit MINUTES;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit MONTHS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit SECONDS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit WEEKS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit YEARS;
+ }
+
+ public static final class RelativeDateTimeFormatter.Style extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.Style valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.Style[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style LONG;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style NARROW;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style SHORT;
+ }
+
+ public abstract interface Replaceable {
+ method public abstract int char32At(int);
+ method public abstract char charAt(int);
+ method public abstract void copy(int, int, int);
+ method public abstract void getChars(int, int, char[], int);
+ method public abstract boolean hasMetaData();
+ method public abstract int length();
+ method public abstract void replace(int, int, java.lang.String);
+ method public abstract void replace(int, int, char[], int, int);
+ }
+
+ public final class RuleBasedCollator extends android.icu.text.Collator {
+ ctor public RuleBasedCollator(java.lang.String) throws java.lang.Exception;
+ method public int compare(java.lang.String, java.lang.String);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(java.lang.String);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(android.icu.text.UCharacterIterator);
+ method public android.icu.text.CollationKey getCollationKey(java.lang.String);
+ method public void getContractionsAndExpansions(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet, boolean) throws java.lang.Exception;
+ method public boolean getNumericCollation();
+ method public android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public java.lang.String getRules();
+ method public java.lang.String getRules(boolean);
+ method public android.icu.util.VersionInfo getUCAVersion();
+ method public int getVariableTop();
+ method public android.icu.util.VersionInfo getVersion();
+ method public boolean isAlternateHandlingShifted();
+ method public boolean isCaseLevel();
+ method public boolean isFrenchCollation();
+ method public boolean isLowerCaseFirst();
+ method public boolean isUpperCaseFirst();
+ method public void setAlternateHandlingDefault();
+ method public void setAlternateHandlingShifted(boolean);
+ method public final void setCaseFirstDefault();
+ method public void setCaseLevel(boolean);
+ method public void setCaseLevelDefault();
+ method public void setDecompositionDefault();
+ method public void setFrenchCollation(boolean);
+ method public void setFrenchCollationDefault();
+ method public void setLowerCaseFirst(boolean);
+ method public void setNumericCollation(boolean);
+ method public void setNumericCollationDefault();
+ method public void setStrengthDefault();
+ method public void setUpperCaseFirst(boolean);
+ }
+
+ public abstract class SearchIterator {
+ ctor protected SearchIterator(java.text.CharacterIterator, android.icu.text.BreakIterator);
+ method public final int first();
+ method public final int following(int);
+ method public android.icu.text.BreakIterator getBreakIterator();
+ method public android.icu.text.SearchIterator.ElementComparisonType getElementComparisonType();
+ method public abstract int getIndex();
+ method public int getMatchLength();
+ method public int getMatchStart();
+ method public java.lang.String getMatchedText();
+ method public java.text.CharacterIterator getTarget();
+ method protected abstract int handleNext(int);
+ method protected abstract int handlePrevious(int);
+ method public boolean isOverlapping();
+ method public final int last();
+ method public int next();
+ method public final int preceding(int);
+ method public int previous();
+ method public void reset();
+ method public void setBreakIterator(android.icu.text.BreakIterator);
+ method public void setElementComparisonType(android.icu.text.SearchIterator.ElementComparisonType);
+ method public void setIndex(int);
+ method protected void setMatchLength(int);
+ method public void setOverlapping(boolean);
+ method public void setTarget(java.text.CharacterIterator);
+ field public static final int DONE = -1; // 0xffffffff
+ field protected android.icu.text.BreakIterator breakIterator;
+ field protected int matchLength;
+ field protected java.text.CharacterIterator targetText;
+ }
+
+ public static final class SearchIterator.ElementComparisonType extends java.lang.Enum {
+ method public static android.icu.text.SearchIterator.ElementComparisonType valueOf(java.lang.String);
+ method public static final android.icu.text.SearchIterator.ElementComparisonType[] values();
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType ANY_BASE_WEIGHT_IS_WILDCARD;
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType PATTERN_BASE_WEIGHT_IS_WILDCARD;
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType STANDARD_ELEMENT_COMPARISON;
+ }
+
+ public class SelectFormat extends java.text.Format {
+ ctor public SelectFormat(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public final java.lang.String format(java.lang.String);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.lang.String toPattern();
+ }
+
+ public class SimpleDateFormat extends android.icu.text.DateFormat {
+ ctor public SimpleDateFormat();
+ ctor public SimpleDateFormat(java.lang.String);
+ ctor public SimpleDateFormat(java.lang.String, java.util.Locale);
+ ctor public SimpleDateFormat(java.lang.String, android.icu.util.ULocale);
+ ctor public SimpleDateFormat(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ ctor public SimpleDateFormat(java.lang.String, android.icu.text.DateFormatSymbols);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public java.lang.StringBuffer format(android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.util.Date get2DigitYearStart();
+ method public android.icu.text.DateFormatSymbols getDateFormatSymbols();
+ method public android.icu.text.NumberFormat getNumberFormat(char);
+ method protected android.icu.text.DateFormatSymbols getSymbols();
+ method public android.icu.text.TimeZoneFormat getTimeZoneFormat();
+ method protected int matchQuarterString(java.lang.String, int, int, java.lang.String[], android.icu.util.Calendar);
+ method protected int matchString(java.lang.String, int, int, java.lang.String[], android.icu.util.Calendar);
+ method public void parse(java.lang.String, android.icu.util.Calendar, java.text.ParsePosition);
+ method protected android.icu.text.DateFormat.Field patternCharToDateFormatField(char);
+ method public void set2DigitYearStart(java.util.Date);
+ method public void setDateFormatSymbols(android.icu.text.DateFormatSymbols);
+ method public void setNumberFormat(java.lang.String, android.icu.text.NumberFormat);
+ method public void setTimeZoneFormat(android.icu.text.TimeZoneFormat);
+ method protected java.lang.String subFormat(char, int, int, java.text.FieldPosition, android.icu.text.DateFormatSymbols, android.icu.util.Calendar) throws java.lang.IllegalArgumentException;
+ method protected int subParse(java.lang.String, int, char, int, boolean, boolean, boolean[], android.icu.util.Calendar);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ method protected java.lang.String zeroPaddingNumber(long, int, int);
+ }
+
+ public class StringPrepParseException extends java.text.ParseException {
+ ctor public StringPrepParseException(java.lang.String, int);
+ ctor public StringPrepParseException(java.lang.String, int, java.lang.String, int);
+ ctor public StringPrepParseException(java.lang.String, int, java.lang.String, int, int);
+ method public int getError();
+ field public static final int ACE_PREFIX_ERROR = 6; // 0x6
+ field public static final int BUFFER_OVERFLOW_ERROR = 9; // 0x9
+ field public static final int CHECK_BIDI_ERROR = 4; // 0x4
+ field public static final int DOMAIN_NAME_TOO_LONG_ERROR = 11; // 0xb
+ field public static final int ILLEGAL_CHAR_FOUND = 1; // 0x1
+ field public static final int INVALID_CHAR_FOUND = 0; // 0x0
+ field public static final int LABEL_TOO_LONG_ERROR = 8; // 0x8
+ field public static final int PROHIBITED_ERROR = 2; // 0x2
+ field public static final int STD3_ASCII_RULES_ERROR = 5; // 0x5
+ field public static final int UNASSIGNED_ERROR = 3; // 0x3
+ field public static final int VERIFICATION_ERROR = 7; // 0x7
+ field public static final int ZERO_LENGTH_LABEL = 10; // 0xa
+ }
+
+ public final class StringSearch extends android.icu.text.SearchIterator {
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.text.RuleBasedCollator, android.icu.text.BreakIterator);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.text.RuleBasedCollator);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, java.util.Locale);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.util.ULocale);
+ ctor public StringSearch(java.lang.String, java.lang.String);
+ method public android.icu.text.RuleBasedCollator getCollator();
+ method public int getIndex();
+ method public java.lang.String getPattern();
+ method protected int handleNext(int);
+ method protected int handlePrevious(int);
+ method public boolean isCanonical();
+ method public void setCanonical(boolean);
+ method public void setCollator(android.icu.text.RuleBasedCollator);
+ method public void setPattern(java.lang.String);
+ }
+
+ public abstract interface SymbolTable {
+ method public abstract char[] lookup(java.lang.String);
+ method public abstract android.icu.text.UnicodeMatcher lookupMatcher(int);
+ method public abstract java.lang.String parseReference(java.lang.String, java.text.ParsePosition, int);
+ field public static final char SYMBOL_REF = 36; // 0x0024 '$'
+ }
+
+ public class TimeZoneFormat extends android.icu.text.UFormat implements android.icu.util.Freezable java.io.Serializable {
+ ctor protected TimeZoneFormat(android.icu.util.ULocale);
+ method public android.icu.text.TimeZoneFormat cloneAsThawed();
+ method public final java.lang.String format(android.icu.text.TimeZoneFormat.Style, android.icu.util.TimeZone, long);
+ method public java.lang.String format(android.icu.text.TimeZoneFormat.Style, android.icu.util.TimeZone, long, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String formatOffsetISO8601Basic(int, boolean, boolean, boolean);
+ method public final java.lang.String formatOffsetISO8601Extended(int, boolean, boolean, boolean);
+ method public java.lang.String formatOffsetLocalizedGMT(int);
+ method public java.lang.String formatOffsetShortLocalizedGMT(int);
+ method public android.icu.text.TimeZoneFormat freeze();
+ method public java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption> getDefaultParseOptions();
+ method public java.lang.String getGMTOffsetDigits();
+ method public java.lang.String getGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType);
+ method public java.lang.String getGMTPattern();
+ method public java.lang.String getGMTZeroFormat();
+ method public static android.icu.text.TimeZoneFormat getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.TimeZoneFormat getInstance(java.util.Locale);
+ method public android.icu.text.TimeZoneNames getTimeZoneNames();
+ method public boolean isFrozen();
+ method public android.icu.util.TimeZone parse(android.icu.text.TimeZoneFormat.Style, java.lang.String, java.text.ParsePosition, java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption>, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public android.icu.util.TimeZone parse(android.icu.text.TimeZoneFormat.Style, java.lang.String, java.text.ParsePosition, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public final android.icu.util.TimeZone parse(java.lang.String, java.text.ParsePosition);
+ method public final android.icu.util.TimeZone parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public final int parseOffsetISO8601(java.lang.String, java.text.ParsePosition);
+ method public int parseOffsetLocalizedGMT(java.lang.String, java.text.ParsePosition);
+ method public int parseOffsetShortLocalizedGMT(java.lang.String, java.text.ParsePosition);
+ method public android.icu.text.TimeZoneFormat setDefaultParseOptions(java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption>);
+ method public android.icu.text.TimeZoneFormat setGMTOffsetDigits(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType, java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTPattern(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTZeroFormat(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setTimeZoneNames(android.icu.text.TimeZoneNames);
+ }
+
+ public static final class TimeZoneFormat.GMTOffsetPatternType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.GMTOffsetPatternType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_H;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_HM;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_HMS;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_H;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_HM;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_HMS;
+ }
+
+ public static final class TimeZoneFormat.ParseOption extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.ParseOption valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.ParseOption[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.ParseOption ALL_STYLES;
+ enum_constant public static final android.icu.text.TimeZoneFormat.ParseOption TZ_DATABASE_ABBREVIATIONS;
+ }
+
+ public static final class TimeZoneFormat.Style extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.Style valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.Style[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style EXEMPLAR_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_LONG;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_LOCAL_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_LOCAL_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style LOCALIZED_GMT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style LOCALIZED_GMT_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style SPECIFIC_LONG;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style SPECIFIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ZONE_ID;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ZONE_ID_SHORT;
+ }
+
+ public static final class TimeZoneFormat.TimeType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.TimeType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.TimeType[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType STANDARD;
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType UNKNOWN;
+ }
+
+ public abstract class TimeZoneNames implements java.io.Serializable {
+ method public abstract java.util.Set<java.lang.String> getAvailableMetaZoneIDs();
+ method public abstract java.util.Set<java.lang.String> getAvailableMetaZoneIDs(java.lang.String);
+ method public final java.lang.String getDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType, long);
+ method public java.lang.String getExemplarLocationName(java.lang.String);
+ method public static android.icu.text.TimeZoneNames getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.TimeZoneNames getInstance(java.util.Locale);
+ method public abstract java.lang.String getMetaZoneDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType);
+ method public abstract java.lang.String getMetaZoneID(java.lang.String, long);
+ method public abstract java.lang.String getReferenceZoneID(java.lang.String, java.lang.String);
+ method public static android.icu.text.TimeZoneNames getTZDBInstance(android.icu.util.ULocale);
+ method public abstract java.lang.String getTimeZoneDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType);
+ }
+
+ public static final class TimeZoneNames.NameType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneNames.NameType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneNames.NameType[] values();
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType EXEMPLAR_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_GENERIC;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_STANDARD;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_GENERIC;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_STANDARD;
+ }
+
+ public abstract class UCharacterIterator implements java.lang.Cloneable {
+ ctor protected UCharacterIterator();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public abstract int current();
+ method public int currentCodePoint();
+ method public java.text.CharacterIterator getCharacterIterator();
+ method public abstract int getIndex();
+ method public static final android.icu.text.UCharacterIterator getInstance(android.icu.text.Replaceable);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.lang.String);
+ method public static final android.icu.text.UCharacterIterator getInstance(char[]);
+ method public static final android.icu.text.UCharacterIterator getInstance(char[], int, int);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.lang.StringBuffer);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.text.CharacterIterator);
+ method public abstract int getLength();
+ method public abstract int getText(char[], int);
+ method public final int getText(char[]);
+ method public java.lang.String getText();
+ method public int moveCodePointIndex(int);
+ method public int moveIndex(int);
+ method public abstract int next();
+ method public int nextCodePoint();
+ method public abstract int previous();
+ method public int previousCodePoint();
+ method public abstract void setIndex(int);
+ method public void setToLimit();
+ method public void setToStart();
+ field public static final int DONE = -1; // 0xffffffff
+ }
+
+ public abstract class UFormat extends java.text.Format {
+ ctor public UFormat();
+ }
+
+ public abstract class UnicodeFilter implements android.icu.text.UnicodeMatcher {
+ method public abstract boolean contains(int);
+ method public int matches(android.icu.text.Replaceable, int[], int, boolean);
+ }
+
+ public abstract interface UnicodeMatcher {
+ method public abstract void addMatchSetTo(android.icu.text.UnicodeSet);
+ method public abstract int matches(android.icu.text.Replaceable, int[], int, boolean);
+ method public abstract boolean matchesIndexValue(int);
+ method public abstract java.lang.String toPattern(boolean);
+ field public static final char ETHER = 65535; // 0xffff '\uffff'
+ field public static final int U_MATCH = 2; // 0x2
+ field public static final int U_MISMATCH = 0; // 0x0
+ field public static final int U_PARTIAL_MATCH = 1; // 0x1
+ }
+
+ public class UnicodeSet extends android.icu.text.UnicodeFilter implements java.lang.Comparable android.icu.util.Freezable java.lang.Iterable {
+ ctor public UnicodeSet();
+ ctor public UnicodeSet(android.icu.text.UnicodeSet);
+ ctor public UnicodeSet(int, int);
+ ctor public UnicodeSet(int...);
+ ctor public UnicodeSet(java.lang.String);
+ ctor public UnicodeSet(java.lang.String, boolean);
+ ctor public UnicodeSet(java.lang.String, int);
+ ctor public UnicodeSet(java.lang.String, java.text.ParsePosition, android.icu.text.SymbolTable);
+ ctor public UnicodeSet(java.lang.String, java.text.ParsePosition, android.icu.text.SymbolTable, int);
+ method public java.lang.StringBuffer _generatePattern(java.lang.StringBuffer, boolean);
+ method public java.lang.StringBuffer _generatePattern(java.lang.StringBuffer, boolean, boolean);
+ method public android.icu.text.UnicodeSet add(int, int);
+ method public final android.icu.text.UnicodeSet add(int);
+ method public final android.icu.text.UnicodeSet add(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet add(java.lang.Iterable<?>);
+ method public android.icu.text.UnicodeSet addAll(int, int);
+ method public final android.icu.text.UnicodeSet addAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet addAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet addAll(java.lang.Iterable<?>);
+ method public android.icu.text.UnicodeSet addAll(T...);
+ method public T addAllTo(T);
+ method public java.lang.String[] addAllTo(java.lang.String[]);
+ method public static U addAllTo(java.lang.Iterable<T>, U);
+ method public static T[] addAllTo(java.lang.Iterable<T>, T[]);
+ method public void addMatchSetTo(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int);
+ method public final android.icu.text.UnicodeSet applyPattern(java.lang.String);
+ method public android.icu.text.UnicodeSet applyPattern(java.lang.String, boolean);
+ method public android.icu.text.UnicodeSet applyPattern(java.lang.String, int);
+ method public android.icu.text.UnicodeSet applyPropertyAlias(java.lang.String, java.lang.String);
+ method public android.icu.text.UnicodeSet applyPropertyAlias(java.lang.String, java.lang.String, android.icu.text.SymbolTable);
+ method public int charAt(int);
+ method public android.icu.text.UnicodeSet clear();
+ method public java.lang.Object clone();
+ method public android.icu.text.UnicodeSet cloneAsThawed();
+ method public android.icu.text.UnicodeSet closeOver(int);
+ method public android.icu.text.UnicodeSet compact();
+ method public static int compare(java.lang.CharSequence, int);
+ method public static int compare(int, java.lang.CharSequence);
+ method public static int compare(java.lang.Iterable<T>, java.lang.Iterable<T>);
+ method public static int compare(java.util.Collection<T>, java.util.Collection<T>, android.icu.text.UnicodeSet.ComparisonStyle);
+ method public int compareTo(android.icu.text.UnicodeSet);
+ method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle);
+ method public int compareTo(java.lang.Iterable<java.lang.String>);
+ method public android.icu.text.UnicodeSet complement(int, int);
+ method public final android.icu.text.UnicodeSet complement(int);
+ method public android.icu.text.UnicodeSet complement();
+ method public final android.icu.text.UnicodeSet complement(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet complementAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet complementAll(android.icu.text.UnicodeSet);
+ method public boolean contains(int);
+ method public boolean contains(int, int);
+ method public final boolean contains(java.lang.CharSequence);
+ method public boolean containsAll(android.icu.text.UnicodeSet);
+ method public boolean containsAll(java.lang.String);
+ method public boolean containsAll(java.lang.Iterable<T>);
+ method public boolean containsNone(int, int);
+ method public boolean containsNone(android.icu.text.UnicodeSet);
+ method public boolean containsNone(java.lang.CharSequence);
+ method public boolean containsNone(java.lang.Iterable<T>);
+ method public final boolean containsSome(int, int);
+ method public final boolean containsSome(android.icu.text.UnicodeSet);
+ method public final boolean containsSome(java.lang.CharSequence);
+ method public final boolean containsSome(java.lang.Iterable<T>);
+ method public android.icu.text.UnicodeSet freeze();
+ method public static android.icu.text.UnicodeSet from(java.lang.CharSequence);
+ method public static android.icu.text.UnicodeSet fromAll(java.lang.CharSequence);
+ method public int getRangeCount();
+ method public int getRangeEnd(int);
+ method public int getRangeStart(int);
+ method public int indexOf(int);
+ method public boolean isEmpty();
+ method public boolean isFrozen();
+ method public java.util.Iterator<java.lang.String> iterator();
+ method public boolean matchesIndexValue(int);
+ method public java.lang.Iterable<android.icu.text.UnicodeSet.EntryRange> ranges();
+ method public android.icu.text.UnicodeSet remove(int, int);
+ method public final android.icu.text.UnicodeSet remove(int);
+ method public final android.icu.text.UnicodeSet remove(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet removeAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable<T>);
+ method public final android.icu.text.UnicodeSet removeAllStrings();
+ method public static boolean resemblesPattern(java.lang.String, int);
+ method public android.icu.text.UnicodeSet retain(int, int);
+ method public final android.icu.text.UnicodeSet retain(int);
+ method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet retainAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet retainAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet retainAll(java.lang.Iterable<T>);
+ method public android.icu.text.UnicodeSet set(int, int);
+ method public android.icu.text.UnicodeSet set(android.icu.text.UnicodeSet);
+ method public int size();
+ method public int span(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public int span(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition);
+ method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.util.Collection<java.lang.String> strings();
+ method public static java.lang.String[] toArray(android.icu.text.UnicodeSet);
+ method public java.lang.String toPattern(boolean);
+ field public static final int ADD_CASE_MAPPINGS = 4; // 0x4
+ field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS;
+ field public static final int CASE = 2; // 0x2
+ field public static final int CASE_INSENSITIVE = 2; // 0x2
+ field public static final android.icu.text.UnicodeSet EMPTY;
+ field public static final int IGNORE_SPACE = 1; // 0x1
+ field public static final int MAX_VALUE = 1114111; // 0x10ffff
+ field public static final int MIN_VALUE = 0; // 0x0
+ }
+
+ public static final class UnicodeSet.ComparisonStyle extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSet.ComparisonStyle valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSet.ComparisonStyle[] values();
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle LEXICOGRAPHIC;
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle LONGER_FIRST;
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle SHORTER_FIRST;
+ }
+
+ public static class UnicodeSet.EntryRange {
+ field public int codepoint;
+ field public int codepointEnd;
+ }
+
+ public static final class UnicodeSet.SpanCondition extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSet.SpanCondition valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSet.SpanCondition[] values();
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition CONDITION_COUNT;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition CONTAINED;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition NOT_CONTAINED;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition SIMPLE;
+ }
+
+ public class UnicodeSetIterator {
+ ctor public UnicodeSetIterator(android.icu.text.UnicodeSet);
+ ctor public UnicodeSetIterator();
+ method public java.lang.String getString();
+ method public boolean next();
+ method public boolean nextRange();
+ method public void reset(android.icu.text.UnicodeSet);
+ method public void reset();
+ field public static int IS_STRING;
+ field public int codepoint;
+ field public int codepointEnd;
+ field public java.lang.String string;
+ }
+
+ public class UnicodeSetSpanner {
+ ctor public UnicodeSetSpanner(android.icu.text.UnicodeSet);
+ method public int countIn(java.lang.CharSequence);
+ method public int countIn(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod);
+ method public int countIn(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.lang.String deleteFrom(java.lang.CharSequence);
+ method public java.lang.String deleteFrom(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public android.icu.text.UnicodeSet getUnicodeSet();
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence);
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod);
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.lang.CharSequence trim(java.lang.CharSequence);
+ method public java.lang.CharSequence trim(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.TrimOption);
+ method public java.lang.CharSequence trim(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.TrimOption, android.icu.text.UnicodeSet.SpanCondition);
+ }
+
+ public static final class UnicodeSetSpanner.CountMethod extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSetSpanner.CountMethod valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSetSpanner.CountMethod[] values();
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.CountMethod MIN_ELEMENTS;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.CountMethod WHOLE_SPAN;
+ }
+
+ public static final class UnicodeSetSpanner.TrimOption extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSetSpanner.TrimOption valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSetSpanner.TrimOption[] values();
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption BOTH;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption LEADING;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption TRAILING;
+ }
+
+}
+
+package android.icu.util {
+
+ public class BuddhistCalendar extends android.icu.util.GregorianCalendar {
+ ctor public BuddhistCalendar();
+ ctor public BuddhistCalendar(android.icu.util.TimeZone);
+ ctor public BuddhistCalendar(java.util.Locale);
+ ctor public BuddhistCalendar(android.icu.util.ULocale);
+ ctor public BuddhistCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public BuddhistCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public BuddhistCalendar(java.util.Date);
+ ctor public BuddhistCalendar(int, int, int);
+ ctor public BuddhistCalendar(int, int, int, int, int, int);
+ field public static final int BE = 0; // 0x0
+ }
+
+ public class ByteArrayWrapper implements java.lang.Comparable {
+ ctor public ByteArrayWrapper();
+ ctor public ByteArrayWrapper(byte[], int);
+ ctor public ByteArrayWrapper(java.nio.ByteBuffer);
+ method public final android.icu.util.ByteArrayWrapper append(byte[], int, int);
+ method public int compareTo(android.icu.util.ByteArrayWrapper);
+ method public android.icu.util.ByteArrayWrapper ensureCapacity(int);
+ method public final byte[] releaseBytes();
+ method public final android.icu.util.ByteArrayWrapper set(byte[], int, int);
+ field public byte[] bytes;
+ field public int size;
+ }
+
+ abstract class CECalendar extends android.icu.util.Calendar {
+ ctor protected CECalendar();
+ ctor protected CECalendar(android.icu.util.TimeZone);
+ ctor protected CECalendar(java.util.Locale);
+ ctor protected CECalendar(android.icu.util.ULocale);
+ ctor protected CECalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor protected CECalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor protected CECalendar(int, int, int);
+ ctor protected CECalendar(java.util.Date);
+ ctor protected CECalendar(int, int, int, int, int, int);
+ method public static int ceToJD(long, int, int, int);
+ method protected abstract int getJDEpochOffset();
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetLimit(int, int);
+ method public static void jdToCE(int, int, int[]);
+ }
+
+ public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
+ ctor protected Calendar();
+ ctor protected Calendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor protected Calendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method public void add(int, int);
+ method public boolean after(java.lang.Object);
+ method public boolean before(java.lang.Object);
+ method public final void clear();
+ method public final void clear(int);
+ method public java.lang.Object clone();
+ method public int compareTo(android.icu.util.Calendar);
+ method protected void complete();
+ method protected void computeFields();
+ method protected final void computeGregorianFields(int);
+ method protected int computeGregorianMonthStart(int, int);
+ method protected int computeJulianDay();
+ method protected int computeMillisInDay();
+ method protected void computeTime();
+ method protected int computeZoneOffset(long, int);
+ method public int fieldDifference(java.util.Date, int);
+ method protected java.lang.String fieldName(int);
+ method protected static final long floorDivide(long, long);
+ method protected static final int floorDivide(int, int);
+ method protected static final int floorDivide(int, int, int[]);
+ method protected static final int floorDivide(long, int, int[]);
+ method public final int get(int);
+ method public int getActualMaximum(int);
+ method public int getActualMinimum(int);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.text.DateFormat getDateTimeFormat(int, int, java.util.Locale);
+ method public android.icu.text.DateFormat getDateTimeFormat(int, int, android.icu.util.ULocale);
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public final int getFieldCount();
+ method protected int[][][] getFieldResolutionTable();
+ method public int getFirstDayOfWeek();
+ method public final int getGreatestMinimum(int);
+ method protected final int getGregorianDayOfMonth();
+ method protected final int getGregorianDayOfYear();
+ method protected final int getGregorianMonth();
+ method protected final int getGregorianYear();
+ method public static android.icu.util.Calendar getInstance();
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone);
+ method public static android.icu.util.Calendar getInstance(java.util.Locale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone, java.util.Locale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public final int getLeastMaximum(int);
+ method protected int getLimit(int, int);
+ method public final int getMaximum(int);
+ method public int getMinimalDaysInFirstWeek();
+ method public final int getMinimum(int);
+ method public int getRepeatedWallTimeOption();
+ method public int getSkippedWallTimeOption();
+ method protected final int getStamp(int);
+ method public final java.util.Date getTime();
+ method public long getTimeInMillis();
+ method public android.icu.util.TimeZone getTimeZone();
+ method public java.lang.String getType();
+ method public android.icu.util.Calendar.WeekData getWeekData();
+ method public static android.icu.util.Calendar.WeekData getWeekDataForRegion(java.lang.String);
+ method protected static final int gregorianMonthLength(int, int);
+ method protected static final int gregorianPreviousMonthLength(int, int);
+ method protected void handleComputeFields(int);
+ method protected int handleComputeJulianDay(int);
+ method protected abstract int handleComputeMonthStart(int, int, boolean);
+ method protected int[] handleCreateFields();
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.util.Locale);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.lang.String, java.util.Locale);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, android.icu.util.ULocale);
+ method protected abstract int handleGetExtendedYear();
+ method protected abstract int handleGetLimit(int, int);
+ method protected int handleGetMonthLength(int, int);
+ method protected int handleGetYearLength(int);
+ method protected final int internalGet(int);
+ method protected final int internalGet(int, int);
+ method protected final long internalGetTimeInMillis();
+ method protected final void internalSet(int, int);
+ method public boolean isEquivalentTo(android.icu.util.Calendar);
+ method protected static final boolean isGregorianLeapYear(int);
+ method public boolean isLenient();
+ method public final boolean isSet(int);
+ method public boolean isWeekend(java.util.Date);
+ method public boolean isWeekend();
+ method protected static final int julianDayToDayOfWeek(int);
+ method protected static final long julianDayToMillis(int);
+ method protected static final int millisToJulianDay(long);
+ method protected int newerField(int, int);
+ method protected int newestStamp(int, int, int);
+ method protected void pinField(int);
+ method protected void prepareGetActual(int, boolean);
+ method protected int resolveFields(int[][][]);
+ method public final void roll(int, boolean);
+ method public void roll(int, int);
+ method public final void set(int, int);
+ method public final void set(int, int, int);
+ method public final void set(int, int, int, int, int);
+ method public final void set(int, int, int, int, int, int);
+ method public void setFirstDayOfWeek(int);
+ method public void setLenient(boolean);
+ method public void setMinimalDaysInFirstWeek(int);
+ method public void setRepeatedWallTimeOption(int);
+ method public void setSkippedWallTimeOption(int);
+ method public final void setTime(java.util.Date);
+ method public void setTimeInMillis(long);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ method public android.icu.util.Calendar setWeekData(android.icu.util.Calendar.WeekData);
+ method protected void validateField(int);
+ method protected final void validateField(int, int, int);
+ method protected void validateFields();
+ method protected int weekNumber(int, int, int);
+ method protected final int weekNumber(int, int);
+ field public static final int AM = 0; // 0x0
+ field public static final int AM_PM = 9; // 0x9
+ field public static final int APRIL = 3; // 0x3
+ field public static final int AUGUST = 7; // 0x7
+ field protected static final int BASE_FIELD_COUNT = 23; // 0x17
+ field public static final int DATE = 5; // 0x5
+ field public static final int DAY_OF_MONTH = 5; // 0x5
+ field public static final int DAY_OF_WEEK = 7; // 0x7
+ field public static final int DAY_OF_WEEK_IN_MONTH = 8; // 0x8
+ field public static final int DAY_OF_YEAR = 6; // 0x6
+ field public static final int DECEMBER = 11; // 0xb
+ field public static final int DOW_LOCAL = 18; // 0x12
+ field public static final int DST_OFFSET = 16; // 0x10
+ field protected static final int EPOCH_JULIAN_DAY = 2440588; // 0x253d8c
+ field public static final int ERA = 0; // 0x0
+ field public static final int EXTENDED_YEAR = 19; // 0x13
+ field public static final int FEBRUARY = 1; // 0x1
+ field public static final int FRIDAY = 6; // 0x6
+ field protected static final int GREATEST_MINIMUM = 1; // 0x1
+ field public static final int HOUR = 10; // 0xa
+ field public static final int HOUR_OF_DAY = 11; // 0xb
+ field protected static final int INTERNALLY_SET = 1; // 0x1
+ field public static final int IS_LEAP_MONTH = 22; // 0x16
+ field public static final int JANUARY = 0; // 0x0
+ field protected static final int JAN_1_1_JULIAN_DAY = 1721426; // 0x1a4452
+ field public static final int JULIAN_DAY = 20; // 0x14
+ field public static final int JULY = 6; // 0x6
+ field public static final int JUNE = 5; // 0x5
+ field protected static final int LEAST_MAXIMUM = 2; // 0x2
+ field public static final int MARCH = 2; // 0x2
+ field protected static final int MAXIMUM = 3; // 0x3
+ field protected static final java.util.Date MAX_DATE;
+ field protected static final int MAX_FIELD_COUNT = 32; // 0x20
+ field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
+ field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
+ field public static final int MAY = 4; // 0x4
+ field public static final int MILLISECOND = 14; // 0xe
+ field public static final int MILLISECONDS_IN_DAY = 21; // 0x15
+ field protected static final int MINIMUM = 0; // 0x0
+ field protected static final int MINIMUM_USER_STAMP = 2; // 0x2
+ field public static final int MINUTE = 12; // 0xc
+ field protected static final java.util.Date MIN_DATE;
+ field protected static final int MIN_JULIAN = -2130706432; // 0x81000000
+ field protected static final long MIN_MILLIS = -184303902528000000L; // 0xfd713893bf19b000L
+ field public static final int MONDAY = 2; // 0x2
+ field public static final int MONTH = 2; // 0x2
+ field public static final int NOVEMBER = 10; // 0xa
+ field public static final int OCTOBER = 9; // 0x9
+ field protected static final long ONE_DAY = 86400000L; // 0x5265c00L
+ field protected static final int ONE_HOUR = 3600000; // 0x36ee80
+ field protected static final int ONE_MINUTE = 60000; // 0xea60
+ field protected static final int ONE_SECOND = 1000; // 0x3e8
+ field protected static final long ONE_WEEK = 604800000L; // 0x240c8400L
+ field public static final int PM = 1; // 0x1
+ field protected static final int RESOLVE_REMAP = 32; // 0x20
+ field public static final int SATURDAY = 7; // 0x7
+ field public static final int SECOND = 13; // 0xd
+ field public static final int SEPTEMBER = 8; // 0x8
+ field public static final int SUNDAY = 1; // 0x1
+ field public static final int THURSDAY = 5; // 0x5
+ field public static final int TUESDAY = 3; // 0x3
+ field public static final int UNDECIMBER = 12; // 0xc
+ field protected static final int UNSET = 0; // 0x0
+ field public static final int WALLTIME_FIRST = 1; // 0x1
+ field public static final int WALLTIME_LAST = 0; // 0x0
+ field public static final int WALLTIME_NEXT_VALID = 2; // 0x2
+ field public static final int WEDNESDAY = 4; // 0x4
+ field public static final int WEEK_OF_MONTH = 4; // 0x4
+ field public static final int WEEK_OF_YEAR = 3; // 0x3
+ field public static final int YEAR = 1; // 0x1
+ field public static final int YEAR_WOY = 17; // 0x11
+ field public static final int ZONE_OFFSET = 15; // 0xf
+ }
+
+ public static final class Calendar.WeekData {
+ ctor public Calendar.WeekData(int, int, int, int, int, int);
+ field public final int firstDayOfWeek;
+ field public final int minimalDaysInFirstWeek;
+ field public final int weekendCease;
+ field public final int weekendCeaseMillis;
+ field public final int weekendOnset;
+ field public final int weekendOnsetMillis;
+ }
+
+ public class ChineseCalendar extends android.icu.util.Calendar {
+ ctor public ChineseCalendar();
+ ctor public ChineseCalendar(java.util.Date);
+ ctor public ChineseCalendar(int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int, int, int, int);
+ ctor public ChineseCalendar(java.util.Locale);
+ ctor public ChineseCalendar(android.icu.util.TimeZone);
+ ctor public ChineseCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public ChineseCalendar(android.icu.util.ULocale);
+ ctor public ChineseCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ }
+
+ public final class CopticCalendar extends android.icu.util.CECalendar {
+ ctor public CopticCalendar();
+ ctor public CopticCalendar(android.icu.util.TimeZone);
+ ctor public CopticCalendar(java.util.Locale);
+ ctor public CopticCalendar(android.icu.util.ULocale);
+ ctor public CopticCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public CopticCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public CopticCalendar(int, int, int);
+ ctor public CopticCalendar(java.util.Date);
+ ctor public CopticCalendar(int, int, int, int, int, int);
+ method protected deprecated int getJDEpochOffset();
+ method protected deprecated int handleGetExtendedYear();
+ field public static final int AMSHIR = 5; // 0x5
+ field public static final int BABA = 1; // 0x1
+ field public static final int BARAMHAT = 6; // 0x6
+ field public static final int BARAMOUDA = 7; // 0x7
+ field public static final int BASHANS = 8; // 0x8
+ field public static final int EPEP = 10; // 0xa
+ field public static final int HATOR = 2; // 0x2
+ field public static final int KIAHK = 3; // 0x3
+ field public static final int MESRA = 11; // 0xb
+ field public static final int NASIE = 12; // 0xc
+ field public static final int PAONA = 9; // 0x9
+ field public static final int TOBA = 4; // 0x4
+ field public static final int TOUT = 0; // 0x0
+ }
+
+ public class Currency extends android.icu.util.MeasureUnit {
+ ctor protected Currency(java.lang.String);
+ method public static java.util.Set<android.icu.util.Currency> getAvailableCurrencies();
+ method public static java.lang.String[] getAvailableCurrencyCodes(android.icu.util.ULocale, java.util.Date);
+ method public static java.lang.String[] getAvailableCurrencyCodes(java.util.Locale, java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public static android.icu.util.ULocale[] getAvailableULocales();
+ method public java.lang.String getCurrencyCode();
+ method public int getDefaultFractionDigits();
+ method public int getDefaultFractionDigits(android.icu.util.Currency.CurrencyUsage);
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public static android.icu.util.Currency getInstance(java.util.Locale);
+ method public static android.icu.util.Currency getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.Currency getInstance(java.lang.String);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public java.lang.String getName(java.util.Locale, int, boolean[]);
+ method public java.lang.String getName(android.icu.util.ULocale, int, boolean[]);
+ method public java.lang.String getName(java.util.Locale, int, java.lang.String, boolean[]);
+ method public java.lang.String getName(android.icu.util.ULocale, int, java.lang.String, boolean[]);
+ method public int getNumericCode();
+ method public double getRoundingIncrement();
+ method public double getRoundingIncrement(android.icu.util.Currency.CurrencyUsage);
+ method public java.lang.String getSymbol();
+ method public java.lang.String getSymbol(java.util.Locale);
+ method public java.lang.String getSymbol(android.icu.util.ULocale);
+ method public static boolean isAvailable(java.lang.String, java.util.Date, java.util.Date);
+ method public static java.lang.Object registerInstance(android.icu.util.Currency, android.icu.util.ULocale);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int LONG_NAME = 1; // 0x1
+ field public static final int PLURAL_LONG_NAME = 2; // 0x2
+ field public static final int SYMBOL_NAME = 0; // 0x0
+ }
+
+ public static final class Currency.CurrencyUsage extends java.lang.Enum {
+ method public static android.icu.util.Currency.CurrencyUsage valueOf(java.lang.String);
+ method public static final android.icu.util.Currency.CurrencyUsage[] values();
+ enum_constant public static final android.icu.util.Currency.CurrencyUsage CASH;
+ enum_constant public static final android.icu.util.Currency.CurrencyUsage STANDARD;
+ }
+
+ public class CurrencyAmount extends android.icu.util.Measure {
+ ctor public CurrencyAmount(java.lang.Number, android.icu.util.Currency);
+ ctor public CurrencyAmount(double, android.icu.util.Currency);
+ method public android.icu.util.Currency getCurrency();
+ }
+
+ public final class DateInterval implements java.io.Serializable {
+ ctor public DateInterval(long, long);
+ method public long getFromDate();
+ method public long getToDate();
+ }
+
+ public abstract interface Freezable implements java.lang.Cloneable {
+ method public abstract T cloneAsThawed();
+ method public abstract T freeze();
+ method public abstract boolean isFrozen();
+ }
+
+ public class GregorianCalendar extends android.icu.util.Calendar {
+ ctor public GregorianCalendar();
+ ctor public GregorianCalendar(android.icu.util.TimeZone);
+ ctor public GregorianCalendar(java.util.Locale);
+ ctor public GregorianCalendar(android.icu.util.ULocale);
+ ctor public GregorianCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public GregorianCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public GregorianCalendar(int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int, int);
+ method public final java.util.Date getGregorianChange();
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ method public boolean isLeapYear(int);
+ method public void setGregorianChange(java.util.Date);
+ field public static final int AD = 1; // 0x1
+ field public static final int BC = 0; // 0x0
+ field protected transient boolean invertGregorian;
+ field protected transient boolean isGregorian;
+ }
+
+ public class HebrewCalendar extends android.icu.util.Calendar {
+ ctor public HebrewCalendar();
+ ctor public HebrewCalendar(android.icu.util.TimeZone);
+ ctor public HebrewCalendar(java.util.Locale);
+ ctor public HebrewCalendar(android.icu.util.ULocale);
+ ctor public HebrewCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public HebrewCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public HebrewCalendar(int, int, int);
+ ctor public HebrewCalendar(java.util.Date);
+ ctor public HebrewCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ field public static final int ADAR = 6; // 0x6
+ field public static final int ADAR_1 = 5; // 0x5
+ field public static final int AV = 11; // 0xb
+ field public static final int ELUL = 12; // 0xc
+ field public static final int HESHVAN = 1; // 0x1
+ field public static final int IYAR = 8; // 0x8
+ field public static final int KISLEV = 2; // 0x2
+ field public static final int NISAN = 7; // 0x7
+ field public static final int SHEVAT = 4; // 0x4
+ field public static final int SIVAN = 9; // 0x9
+ field public static final int TAMUZ = 10; // 0xa
+ field public static final int TEVET = 3; // 0x3
+ field public static final int TISHRI = 0; // 0x0
+ }
+
+ public class ICUUncheckedIOException extends java.lang.RuntimeException {
+ ctor public ICUUncheckedIOException();
+ ctor public ICUUncheckedIOException(java.lang.String);
+ ctor public ICUUncheckedIOException(java.lang.Throwable);
+ ctor public ICUUncheckedIOException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class IndianCalendar extends android.icu.util.Calendar {
+ ctor public IndianCalendar();
+ ctor public IndianCalendar(android.icu.util.TimeZone);
+ ctor public IndianCalendar(java.util.Locale);
+ ctor public IndianCalendar(android.icu.util.ULocale);
+ ctor public IndianCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public IndianCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public IndianCalendar(java.util.Date);
+ ctor public IndianCalendar(int, int, int);
+ ctor public IndianCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ field public static final int AGRAHAYANA = 8; // 0x8
+ field public static final int ASADHA = 3; // 0x3
+ field public static final int ASVINA = 6; // 0x6
+ field public static final int BHADRA = 5; // 0x5
+ field public static final int CHAITRA = 0; // 0x0
+ field public static final int IE = 0; // 0x0
+ field public static final int JYAISTHA = 2; // 0x2
+ field public static final int KARTIKA = 7; // 0x7
+ field public static final int MAGHA = 10; // 0xa
+ field public static final int PAUSA = 9; // 0x9
+ field public static final int PHALGUNA = 11; // 0xb
+ field public static final int SRAVANA = 4; // 0x4
+ field public static final int VAISAKHA = 1; // 0x1
+ }
+
+ public class IslamicCalendar extends android.icu.util.Calendar {
+ ctor public IslamicCalendar();
+ ctor public IslamicCalendar(android.icu.util.TimeZone);
+ ctor public IslamicCalendar(java.util.Locale);
+ ctor public IslamicCalendar(android.icu.util.ULocale);
+ ctor public IslamicCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public IslamicCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public IslamicCalendar(java.util.Date);
+ ctor public IslamicCalendar(int, int, int);
+ ctor public IslamicCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ method public boolean isCivil();
+ method public void setCivil(boolean);
+ field public static final int DHU_AL_HIJJAH = 11; // 0xb
+ field public static final int DHU_AL_QIDAH = 10; // 0xa
+ field public static final int JUMADA_1 = 4; // 0x4
+ field public static final int JUMADA_2 = 5; // 0x5
+ field public static final int MUHARRAM = 0; // 0x0
+ field public static final int RABI_1 = 2; // 0x2
+ field public static final int RABI_2 = 3; // 0x3
+ field public static final int RAJAB = 6; // 0x6
+ field public static final int RAMADAN = 8; // 0x8
+ field public static final int SAFAR = 1; // 0x1
+ field public static final int SHABAN = 7; // 0x7
+ field public static final int SHAWWAL = 9; // 0x9
+ }
+
+ public static final class IslamicCalendar.CalculationType extends java.lang.Enum {
+ method public static android.icu.util.IslamicCalendar.CalculationType valueOf(java.lang.String);
+ method public static final android.icu.util.IslamicCalendar.CalculationType[] values();
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_CIVIL;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_TBLA;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_UMALQURA;
+ }
+
+ public class JapaneseCalendar extends android.icu.util.GregorianCalendar {
+ ctor public JapaneseCalendar();
+ ctor public JapaneseCalendar(android.icu.util.TimeZone);
+ ctor public JapaneseCalendar(java.util.Locale);
+ ctor public JapaneseCalendar(android.icu.util.ULocale);
+ ctor public JapaneseCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public JapaneseCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public JapaneseCalendar(java.util.Date);
+ ctor public JapaneseCalendar(int, int, int, int);
+ ctor public JapaneseCalendar(int, int, int);
+ ctor public JapaneseCalendar(int, int, int, int, int, int);
+ field public static final int CURRENT_ERA;
+ field public static final int HEISEI;
+ field public static final int MEIJI;
+ field public static final int SHOWA;
+ field public static final int TAISHO;
+ }
+
+ public class Measure {
+ ctor public Measure(java.lang.Number, android.icu.util.MeasureUnit);
+ method public java.lang.Number getNumber();
+ method public android.icu.util.MeasureUnit getUnit();
+ }
+
+ public class MeasureUnit implements java.io.Serializable {
+ method public static synchronized java.util.Set<android.icu.util.MeasureUnit> getAvailable(java.lang.String);
+ method public static synchronized java.util.Set<android.icu.util.MeasureUnit> getAvailable();
+ method public static synchronized java.util.Set<java.lang.String> getAvailableTypes();
+ method public java.lang.String getSubtype();
+ method public java.lang.String getType();
+ field public static final android.icu.util.MeasureUnit ACRE;
+ field public static final android.icu.util.MeasureUnit ACRE_FOOT;
+ field public static final android.icu.util.MeasureUnit AMPERE;
+ field public static final android.icu.util.MeasureUnit ARC_MINUTE;
+ field public static final android.icu.util.MeasureUnit ARC_SECOND;
+ field public static final android.icu.util.MeasureUnit ASTRONOMICAL_UNIT;
+ field public static final android.icu.util.MeasureUnit BIT;
+ field public static final android.icu.util.MeasureUnit BUSHEL;
+ field public static final android.icu.util.MeasureUnit BYTE;
+ field public static final android.icu.util.MeasureUnit CALORIE;
+ field public static final android.icu.util.MeasureUnit CARAT;
+ field public static final android.icu.util.MeasureUnit CELSIUS;
+ field public static final android.icu.util.MeasureUnit CENTILITER;
+ field public static final android.icu.util.MeasureUnit CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
+ field public static final android.icu.util.MeasureUnit CUBIC_INCH;
+ field public static final android.icu.util.MeasureUnit CUBIC_KILOMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_METER;
+ field public static final android.icu.util.MeasureUnit CUBIC_MILE;
+ field public static final android.icu.util.MeasureUnit CUBIC_YARD;
+ field public static final android.icu.util.MeasureUnit CUP;
+ field public static final android.icu.util.TimeUnit DAY;
+ field public static final android.icu.util.MeasureUnit DECILITER;
+ field public static final android.icu.util.MeasureUnit DECIMETER;
+ field public static final android.icu.util.MeasureUnit DEGREE;
+ field public static final android.icu.util.MeasureUnit FAHRENHEIT;
+ field public static final android.icu.util.MeasureUnit FATHOM;
+ field public static final android.icu.util.MeasureUnit FLUID_OUNCE;
+ field public static final android.icu.util.MeasureUnit FOODCALORIE;
+ field public static final android.icu.util.MeasureUnit FOOT;
+ field public static final android.icu.util.MeasureUnit FURLONG;
+ field public static final android.icu.util.MeasureUnit GALLON;
+ field public static final android.icu.util.MeasureUnit GIGABIT;
+ field public static final android.icu.util.MeasureUnit GIGABYTE;
+ field public static final android.icu.util.MeasureUnit GIGAHERTZ;
+ field public static final android.icu.util.MeasureUnit GIGAWATT;
+ field public static final android.icu.util.MeasureUnit GRAM;
+ field public static final android.icu.util.MeasureUnit G_FORCE;
+ field public static final android.icu.util.MeasureUnit HECTARE;
+ field public static final android.icu.util.MeasureUnit HECTOLITER;
+ field public static final android.icu.util.MeasureUnit HECTOPASCAL;
+ field public static final android.icu.util.MeasureUnit HERTZ;
+ field public static final android.icu.util.MeasureUnit HORSEPOWER;
+ field public static final android.icu.util.TimeUnit HOUR;
+ field public static final android.icu.util.MeasureUnit INCH;
+ field public static final android.icu.util.MeasureUnit INCH_HG;
+ field public static final android.icu.util.MeasureUnit JOULE;
+ field public static final android.icu.util.MeasureUnit KARAT;
+ field public static final android.icu.util.MeasureUnit KELVIN;
+ field public static final android.icu.util.MeasureUnit KILOBIT;
+ field public static final android.icu.util.MeasureUnit KILOBYTE;
+ field public static final android.icu.util.MeasureUnit KILOCALORIE;
+ field public static final android.icu.util.MeasureUnit KILOGRAM;
+ field public static final android.icu.util.MeasureUnit KILOHERTZ;
+ field public static final android.icu.util.MeasureUnit KILOJOULE;
+ field public static final android.icu.util.MeasureUnit KILOMETER;
+ field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit KILOWATT;
+ field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
+ field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
+ field public static final android.icu.util.MeasureUnit LITER;
+ field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
+ field public static final android.icu.util.MeasureUnit LUX;
+ field public static final android.icu.util.MeasureUnit MEGABIT;
+ field public static final android.icu.util.MeasureUnit MEGABYTE;
+ field public static final android.icu.util.MeasureUnit MEGAHERTZ;
+ field public static final android.icu.util.MeasureUnit MEGALITER;
+ field public static final android.icu.util.MeasureUnit MEGAWATT;
+ field public static final android.icu.util.MeasureUnit METER;
+ field public static final android.icu.util.MeasureUnit METER_PER_SECOND;
+ field public static final android.icu.util.MeasureUnit METER_PER_SECOND_SQUARED;
+ field public static final android.icu.util.MeasureUnit METRIC_TON;
+ field public static final android.icu.util.MeasureUnit MICROGRAM;
+ field public static final android.icu.util.MeasureUnit MICROMETER;
+ field public static final android.icu.util.MeasureUnit MICROSECOND;
+ field public static final android.icu.util.MeasureUnit MILE;
+ field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
+ field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit MILLIAMPERE;
+ field public static final android.icu.util.MeasureUnit MILLIBAR;
+ field public static final android.icu.util.MeasureUnit MILLIGRAM;
+ field public static final android.icu.util.MeasureUnit MILLILITER;
+ field public static final android.icu.util.MeasureUnit MILLIMETER;
+ field public static final android.icu.util.MeasureUnit MILLIMETER_OF_MERCURY;
+ field public static final android.icu.util.MeasureUnit MILLISECOND;
+ field public static final android.icu.util.MeasureUnit MILLIWATT;
+ field public static final android.icu.util.TimeUnit MINUTE;
+ field public static final android.icu.util.TimeUnit MONTH;
+ field public static final android.icu.util.MeasureUnit NANOMETER;
+ field public static final android.icu.util.MeasureUnit NANOSECOND;
+ field public static final android.icu.util.MeasureUnit NAUTICAL_MILE;
+ field public static final android.icu.util.MeasureUnit OHM;
+ field public static final android.icu.util.MeasureUnit OUNCE;
+ field public static final android.icu.util.MeasureUnit OUNCE_TROY;
+ field public static final android.icu.util.MeasureUnit PARSEC;
+ field public static final android.icu.util.MeasureUnit PICOMETER;
+ field public static final android.icu.util.MeasureUnit PINT;
+ field public static final android.icu.util.MeasureUnit POUND;
+ field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
+ field public static final android.icu.util.MeasureUnit QUART;
+ field public static final android.icu.util.MeasureUnit RADIAN;
+ field public static final android.icu.util.TimeUnit SECOND;
+ field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
+ field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
+ field public static final android.icu.util.MeasureUnit SQUARE_INCH;
+ field public static final android.icu.util.MeasureUnit SQUARE_KILOMETER;
+ field public static final android.icu.util.MeasureUnit SQUARE_METER;
+ field public static final android.icu.util.MeasureUnit SQUARE_MILE;
+ field public static final android.icu.util.MeasureUnit SQUARE_YARD;
+ field public static final android.icu.util.MeasureUnit STONE;
+ field public static final android.icu.util.MeasureUnit TABLESPOON;
+ field public static final android.icu.util.MeasureUnit TEASPOON;
+ field public static final android.icu.util.MeasureUnit TERABIT;
+ field public static final android.icu.util.MeasureUnit TERABYTE;
+ field public static final android.icu.util.MeasureUnit TON;
+ field public static final android.icu.util.MeasureUnit VOLT;
+ field public static final android.icu.util.MeasureUnit WATT;
+ field public static final android.icu.util.TimeUnit WEEK;
+ field public static final android.icu.util.MeasureUnit YARD;
+ field public static final android.icu.util.TimeUnit YEAR;
+ }
+
+ public class Output {
+ ctor public Output();
+ ctor public Output(T);
+ field public T value;
+ }
+
+ public abstract interface RangeValueIterator {
+ method public abstract boolean next(android.icu.util.RangeValueIterator.Element);
+ method public abstract void reset();
+ }
+
+ public static class RangeValueIterator.Element {
+ ctor public RangeValueIterator.Element();
+ field public int limit;
+ field public int start;
+ field public int value;
+ }
+
+ public class TaiwanCalendar extends android.icu.util.GregorianCalendar {
+ ctor public TaiwanCalendar();
+ ctor public TaiwanCalendar(android.icu.util.TimeZone);
+ ctor public TaiwanCalendar(java.util.Locale);
+ ctor public TaiwanCalendar(android.icu.util.ULocale);
+ ctor public TaiwanCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public TaiwanCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public TaiwanCalendar(java.util.Date);
+ ctor public TaiwanCalendar(int, int, int);
+ ctor public TaiwanCalendar(int, int, int, int, int, int);
+ field public static final int BEFORE_MINGUO = 0; // 0x0
+ field public static final int MINGUO = 1; // 0x1
+ }
+
+ public class TimeUnit extends android.icu.util.MeasureUnit {
+ method public static android.icu.util.TimeUnit[] values();
+ }
+
+ public abstract class TimeZone implements java.lang.Cloneable android.icu.util.Freezable java.io.Serializable {
+ ctor public TimeZone();
+ method public java.lang.Object clone();
+ method public android.icu.util.TimeZone cloneAsThawed();
+ method public static int countEquivalentIDs(java.lang.String);
+ method public android.icu.util.TimeZone freeze();
+ method public static java.util.Set<java.lang.String> getAvailableIDs(android.icu.util.TimeZone.SystemTimeZoneType, java.lang.String, java.lang.Integer);
+ method public static java.lang.String[] getAvailableIDs(int);
+ method public static java.lang.String[] getAvailableIDs(java.lang.String);
+ method public static java.lang.String[] getAvailableIDs();
+ method public static java.lang.String getCanonicalID(java.lang.String);
+ method public static java.lang.String getCanonicalID(java.lang.String, boolean[]);
+ method public int getDSTSavings();
+ method public static android.icu.util.TimeZone getDefault();
+ method public static int getDefaultTimeZoneType();
+ method public final java.lang.String getDisplayName();
+ method public final java.lang.String getDisplayName(java.util.Locale);
+ method public final java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public final java.lang.String getDisplayName(boolean, int);
+ method public java.lang.String getDisplayName(boolean, int, java.util.Locale);
+ method public java.lang.String getDisplayName(boolean, int, android.icu.util.ULocale);
+ method public static java.lang.String getEquivalentID(java.lang.String, int);
+ method public static android.icu.util.TimeZone getFrozenTimeZone(java.lang.String);
+ method public java.lang.String getID();
+ method public static java.lang.String getIDForWindowsID(java.lang.String, java.lang.String);
+ method public abstract int getOffset(int, int, int, int, int, int);
+ method public int getOffset(long);
+ method public void getOffset(long, boolean, int[]);
+ method public abstract int getRawOffset();
+ method public static java.lang.String getRegion(java.lang.String);
+ method public static java.lang.String getTZDataVersion();
+ method public static android.icu.util.TimeZone getTimeZone(java.lang.String);
+ method public static android.icu.util.TimeZone getTimeZone(java.lang.String, int);
+ method public static java.lang.String getWindowsID(java.lang.String);
+ method public boolean hasSameRules(android.icu.util.TimeZone);
+ method public abstract boolean inDaylightTime(java.util.Date);
+ method public boolean isFrozen();
+ method public boolean observesDaylightTime();
+ method public static synchronized void setDefault(android.icu.util.TimeZone);
+ method public static synchronized void setDefaultTimeZoneType(int);
+ method public void setID(java.lang.String);
+ method public abstract void setRawOffset(int);
+ method public abstract boolean useDaylightTime();
+ field public static final int GENERIC_LOCATION = 7; // 0x7
+ field public static final android.icu.util.TimeZone GMT_ZONE;
+ field public static final int LONG = 1; // 0x1
+ field public static final int LONG_GENERIC = 3; // 0x3
+ field public static final int LONG_GMT = 5; // 0x5
+ field public static final int SHORT = 0; // 0x0
+ field public static final int SHORT_COMMONLY_USED = 6; // 0x6
+ field public static final int SHORT_GENERIC = 2; // 0x2
+ field public static final int SHORT_GMT = 4; // 0x4
+ field public static final int TIMEZONE_ICU = 0; // 0x0
+ field public static final int TIMEZONE_JDK = 1; // 0x1
+ field public static final android.icu.util.TimeZone UNKNOWN_ZONE;
+ field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";
+ }
+
+ public static final class TimeZone.SystemTimeZoneType extends java.lang.Enum {
+ method public static android.icu.util.TimeZone.SystemTimeZoneType valueOf(java.lang.String);
+ method public static final android.icu.util.TimeZone.SystemTimeZoneType[] values();
+ }
+
+ public final class ULocale implements java.lang.Comparable java.io.Serializable {
+ ctor public ULocale(java.lang.String);
+ ctor public ULocale(java.lang.String, java.lang.String);
+ ctor public ULocale(java.lang.String, java.lang.String, java.lang.String);
+ method public static android.icu.util.ULocale acceptLanguage(java.lang.String, android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(android.icu.util.ULocale[], android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(java.lang.String, boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale addLikelySubtags(android.icu.util.ULocale);
+ method public static java.lang.String canonicalize(java.lang.String);
+ method public java.lang.Object clone();
+ method public int compareTo(android.icu.util.ULocale);
+ method public static android.icu.util.ULocale createCanonical(java.lang.String);
+ method public static android.icu.util.ULocale forLanguageTag(java.lang.String);
+ method public static android.icu.util.ULocale forLocale(java.util.Locale);
+ method public static android.icu.util.ULocale[] getAvailableLocales();
+ method public java.lang.String getBaseName();
+ method public static java.lang.String getBaseName(java.lang.String);
+ method public java.lang.String getCharacterOrientation();
+ method public java.lang.String getCountry();
+ method public static java.lang.String getCountry(java.lang.String);
+ method public static android.icu.util.ULocale getDefault();
+ method public static android.icu.util.ULocale getDefault(android.icu.util.ULocale.Category);
+ method public java.lang.String getDisplayCountry();
+ method public java.lang.String getDisplayCountry(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayCountry(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayCountry(java.lang.String, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayKeyword(java.lang.String);
+ method public static java.lang.String getDisplayKeyword(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayKeyword(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayKeywordValue(java.lang.String);
+ method public java.lang.String getDisplayKeywordValue(java.lang.String, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayKeywordValue(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayKeywordValue(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayLanguage();
+ method public java.lang.String getDisplayLanguage(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayLanguage(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayLanguage(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayLanguageWithDialect();
+ method public java.lang.String getDisplayLanguageWithDialect(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayLanguageWithDialect(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayLanguageWithDialect(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayName(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayName(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayNameWithDialect();
+ method public java.lang.String getDisplayNameWithDialect(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayNameWithDialect(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayNameWithDialect(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayScript();
+ method public java.lang.String getDisplayScript(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayScript(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayScript(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayVariant();
+ method public java.lang.String getDisplayVariant(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayVariant(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayVariant(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getExtension(char);
+ method public java.util.Set<java.lang.Character> getExtensionKeys();
+ method public static java.lang.String getFallback(java.lang.String);
+ method public android.icu.util.ULocale getFallback();
+ method public java.lang.String getISO3Country();
+ method public static java.lang.String getISO3Country(java.lang.String);
+ method public java.lang.String getISO3Language();
+ method public static java.lang.String getISO3Language(java.lang.String);
+ method public static java.lang.String[] getISOCountries();
+ method public static java.lang.String[] getISOLanguages();
+ method public java.lang.String getKeywordValue(java.lang.String);
+ method public static java.lang.String getKeywordValue(java.lang.String, java.lang.String);
+ method public java.util.Iterator<java.lang.String> getKeywords();
+ method public static java.util.Iterator<java.lang.String> getKeywords(java.lang.String);
+ method public java.lang.String getLanguage();
+ method public static java.lang.String getLanguage(java.lang.String);
+ method public java.lang.String getLineOrientation();
+ method public java.lang.String getName();
+ method public static java.lang.String getName(java.lang.String);
+ method public java.lang.String getScript();
+ method public static java.lang.String getScript(java.lang.String);
+ method public java.util.Set<java.lang.String> getUnicodeLocaleAttributes();
+ method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
+ method public java.lang.String getUnicodeLocaleType(java.lang.String);
+ method public java.lang.String getVariant();
+ method public static java.lang.String getVariant(java.lang.String);
+ method public boolean isRightToLeft();
+ method public static android.icu.util.ULocale minimizeSubtags(android.icu.util.ULocale);
+ method public static synchronized void setDefault(android.icu.util.ULocale);
+ method public static synchronized void setDefault(android.icu.util.ULocale.Category, android.icu.util.ULocale);
+ method public android.icu.util.ULocale setKeywordValue(java.lang.String, java.lang.String);
+ method public static java.lang.String setKeywordValue(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String toLanguageTag();
+ method public static java.lang.String toLegacyKey(java.lang.String);
+ method public static java.lang.String toLegacyType(java.lang.String, java.lang.String);
+ method public java.util.Locale toLocale();
+ method public static java.lang.String toUnicodeLocaleKey(java.lang.String);
+ method public static java.lang.String toUnicodeLocaleType(java.lang.String, java.lang.String);
+ field public static final android.icu.util.ULocale CANADA;
+ field public static final android.icu.util.ULocale CANADA_FRENCH;
+ field public static final android.icu.util.ULocale CHINA;
+ field public static final android.icu.util.ULocale CHINESE;
+ field public static final android.icu.util.ULocale ENGLISH;
+ field public static final android.icu.util.ULocale FRANCE;
+ field public static final android.icu.util.ULocale FRENCH;
+ field public static final android.icu.util.ULocale GERMAN;
+ field public static final android.icu.util.ULocale GERMANY;
+ field public static final android.icu.util.ULocale ITALIAN;
+ field public static final android.icu.util.ULocale ITALY;
+ field public static final android.icu.util.ULocale JAPAN;
+ field public static final android.icu.util.ULocale JAPANESE;
+ field public static final android.icu.util.ULocale KOREA;
+ field public static final android.icu.util.ULocale KOREAN;
+ field public static final android.icu.util.ULocale PRC;
+ field public static final char PRIVATE_USE_EXTENSION = 120; // 0x0078 'x'
+ field public static final android.icu.util.ULocale ROOT;
+ field public static final android.icu.util.ULocale SIMPLIFIED_CHINESE;
+ field public static final android.icu.util.ULocale TAIWAN;
+ field public static final android.icu.util.ULocale TRADITIONAL_CHINESE;
+ field public static final android.icu.util.ULocale UK;
+ field public static final char UNICODE_LOCALE_EXTENSION = 117; // 0x0075 'u'
+ field public static final android.icu.util.ULocale US;
+ }
+
+ public static final class ULocale.Builder {
+ ctor public ULocale.Builder();
+ method public android.icu.util.ULocale.Builder addUnicodeLocaleAttribute(java.lang.String);
+ method public android.icu.util.ULocale build();
+ method public android.icu.util.ULocale.Builder clear();
+ method public android.icu.util.ULocale.Builder clearExtensions();
+ method public android.icu.util.ULocale.Builder removeUnicodeLocaleAttribute(java.lang.String);
+ method public android.icu.util.ULocale.Builder setExtension(char, java.lang.String);
+ method public android.icu.util.ULocale.Builder setLanguage(java.lang.String);
+ method public android.icu.util.ULocale.Builder setLanguageTag(java.lang.String);
+ method public android.icu.util.ULocale.Builder setLocale(android.icu.util.ULocale);
+ method public android.icu.util.ULocale.Builder setRegion(java.lang.String);
+ method public android.icu.util.ULocale.Builder setScript(java.lang.String);
+ method public android.icu.util.ULocale.Builder setUnicodeLocaleKeyword(java.lang.String, java.lang.String);
+ method public android.icu.util.ULocale.Builder setVariant(java.lang.String);
+ }
+
+ public static final class ULocale.Category extends java.lang.Enum {
+ method public static android.icu.util.ULocale.Category valueOf(java.lang.String);
+ method public static final android.icu.util.ULocale.Category[] values();
+ enum_constant public static final android.icu.util.ULocale.Category DISPLAY;
+ enum_constant public static final android.icu.util.ULocale.Category FORMAT;
+ }
+
+ public abstract interface ValueIterator {
+ method public abstract boolean next(android.icu.util.ValueIterator.Element);
+ method public abstract void reset();
+ method public abstract void setRange(int, int);
+ }
+
+ public static final class ValueIterator.Element {
+ ctor public ValueIterator.Element();
+ field public int integer;
+ field public java.lang.Object value;
+ }
+
+ public final class VersionInfo implements java.lang.Comparable {
+ method public int compareTo(android.icu.util.VersionInfo);
+ method public static android.icu.util.VersionInfo getInstance(java.lang.String);
+ method public static android.icu.util.VersionInfo getInstance(int, int, int, int);
+ method public static android.icu.util.VersionInfo getInstance(int, int, int);
+ method public static android.icu.util.VersionInfo getInstance(int, int);
+ method public static android.icu.util.VersionInfo getInstance(int);
+ method public int getMajor();
+ method public int getMicro();
+ method public int getMilli();
+ method public int getMinor();
+ method public static void main(java.lang.String[]);
+ field public static final android.icu.util.VersionInfo ICU_VERSION;
+ field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION;
+ field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION;
+ field public static final android.icu.util.VersionInfo UNICODE_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_1_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_1_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_1_1_5;
+ field public static final android.icu.util.VersionInfo UNICODE_2_0;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_2;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_5;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_8;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_9;
+ field public static final android.icu.util.VersionInfo UNICODE_3_0;
+ field public static final android.icu.util.VersionInfo UNICODE_3_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_3_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_3_1_1;
+ field public static final android.icu.util.VersionInfo UNICODE_3_2;
+ field public static final android.icu.util.VersionInfo UNICODE_4_0;
+ field public static final android.icu.util.VersionInfo UNICODE_4_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_4_1;
+ field public static final android.icu.util.VersionInfo UNICODE_5_0;
+ field public static final android.icu.util.VersionInfo UNICODE_5_1;
+ field public static final android.icu.util.VersionInfo UNICODE_5_2;
+ field public static final android.icu.util.VersionInfo UNICODE_6_0;
+ field public static final android.icu.util.VersionInfo UNICODE_6_1;
+ field public static final android.icu.util.VersionInfo UNICODE_6_2;
+ field public static final android.icu.util.VersionInfo UNICODE_6_3;
+ field public static final android.icu.util.VersionInfo UNICODE_7_0;
+ field public static final android.icu.util.VersionInfo UNICODE_8_0;
+ }
+
+}
+
package android.inputmethodservice {
public abstract class AbstractInputMethodService extends android.app.Service implements android.view.KeyEvent.Callback {
@@ -21494,10 +25691,13 @@
method public void writeToParcel(android.os.Parcel, int);
field public int band;
field public android.net.wifi.WifiScanner.ChannelSpec[] channels;
+ field public int exponent;
+ field public int maxPeriodInMs;
field public int maxScansToCache;
field public int numBssidsPerScan;
field public int periodInMs;
field public int reportEvents;
+ field public int stepCount;
}
public static abstract interface WifiScanner.WifiChangeListener implements android.net.wifi.WifiScanner.ActionListener {
@@ -25849,6 +30049,7 @@
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
+ method public boolean isUserRunningUnlocked(android.os.UserHandle);
method public deprecated boolean setRestrictionsChallenge(java.lang.String);
method public deprecated void setUserRestriction(java.lang.String, boolean);
method public deprecated void setUserRestrictions(android.os.Bundle);
@@ -26653,6 +30854,8 @@
method public boolean isFailed();
method public boolean isQueued();
method public boolean isStarted();
+ method public void setProgress(float);
+ method public void setStatus(java.lang.CharSequence);
method public boolean setTag(java.lang.String);
method public boolean start();
}
@@ -27737,6 +31940,7 @@
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";
field public static final android.net.Uri CONTENT_VCARD_URI;
+ field public static final android.net.Uri CORP_CONTENT_FILTER_URI;
field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
@@ -27857,12 +32061,15 @@
}
public static final class ContactsContract.Directory implements android.provider.BaseColumns {
+ method public static boolean isEnterpriseDirectoryId(long);
+ method public static boolean isRemoteDirectory(long);
method public static void notifyDirectoryChange(android.content.ContentResolver);
field public static final java.lang.String ACCOUNT_NAME = "accountName";
field public static final java.lang.String ACCOUNT_TYPE = "accountType";
field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_directory";
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_directories";
field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri CORP_CONTENT_URI;
field public static final long DEFAULT = 0L; // 0x0L
field public static final java.lang.String DIRECTORY_AUTHORITY = "authority";
field public static final java.lang.String DISPLAY_NAME = "displayName";
@@ -28252,6 +32459,7 @@
field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
field public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 512; // 0x200
field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
+ field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
}
@@ -29323,7 +33531,10 @@
public static final class Telephony.Sms.Intents {
method public static android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent);
field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.provider.Telephony.ACTION_CHANGE_DEFAULT";
+ field public static final java.lang.String ACTION_DEFAULT_SMS_PACKAGE_CHANGED = "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED";
+ field public static final java.lang.String ACTION_EXTERNAL_PROVIDER_CHANGE = "android.provider.action.EXTERNAL_PROVIDER_CHANGE";
field public static final java.lang.String DATA_SMS_RECEIVED_ACTION = "android.intent.action.DATA_SMS_RECEIVED";
+ field public static final java.lang.String EXTRA_IS_DEFAULT_SMS_APP = "android.provider.extra.IS_DEFAULT_SMS_APP";
field public static final java.lang.String EXTRA_PACKAGE_NAME = "package";
field public static final int RESULT_SMS_DUPLICATED = 5; // 0x5
field public static final int RESULT_SMS_GENERIC_ERROR = 2; // 0x2
@@ -31089,6 +35300,8 @@
field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
+ field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
+ field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
field public static final int TRIM_FULL = 0; // 0x0
field public static final int TRIM_LIGHT = 1; // 0x1
}
@@ -31097,6 +35310,7 @@
ctor public NotificationListenerService.Ranking();
method public java.lang.String getKey();
method public int getRank();
+ method public int getSuppressedVisualEffects();
method public boolean isAmbient();
method public boolean matchesInterruptionFilter();
}
@@ -31156,6 +35370,35 @@
}
+package android.service.quicksettings {
+
+ public final class Tile implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.CharSequence getContentDescription();
+ method public android.graphics.drawable.Icon getIcon();
+ method public java.lang.CharSequence getLabel();
+ method public void setContentDescription(java.lang.CharSequence);
+ method public void setIcon(android.graphics.drawable.Icon);
+ method public void setLabel(java.lang.CharSequence);
+ method public void updateTile();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
+ }
+
+ public class TileService extends android.app.Service {
+ ctor public TileService();
+ method public final android.service.quicksettings.Tile getQsTile();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onClick();
+ method public void onStartListening();
+ method public void onStopListening();
+ method public void onTileAdded();
+ method public void onTileRemoved();
+ field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
+ }
+
+}
+
package android.service.restrictions {
public abstract class RestrictionsReceiver extends android.content.BroadcastReceiver {
@@ -32968,6 +37211,7 @@
public class TelecomManager {
method public void acceptRingingCall();
+ method public void acceptRingingCall(int);
method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
method public void addNewUnknownCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
method public void cancelMissedCallsNotification();
@@ -34283,6 +38527,7 @@
method public java.lang.String getPackageResourcePath();
method public android.content.res.Resources getResources();
method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
method public java.lang.Object getSystemService(java.lang.String);
method public java.lang.String getSystemServiceName(java.lang.Class<?>);
method public android.content.res.Resources.Theme getTheme();
@@ -36695,6 +40940,7 @@
ctor public LocaleList(java.util.Locale[]);
method public static android.util.LocaleList forLanguageTags(java.lang.String);
method public java.util.Locale get(int);
+ method public java.util.Locale getBestMatch(java.lang.String[]);
method public static android.util.LocaleList getDefault();
method public static android.util.LocaleList getEmptyLocaleList();
method public java.util.Locale getPrimary();
@@ -38526,6 +42772,7 @@
method public boolean canResolveTextDirection();
method public boolean canScrollHorizontally(int);
method public boolean canScrollVertically(int);
+ method public final void cancelDragAndDrop();
method public void cancelLongPress();
method public final void cancelPendingInputEvents();
method public boolean checkInputConnectionProxy(android.view.View);
@@ -38543,6 +42790,7 @@
method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo();
method public void createContextMenu(android.view.ContextMenu);
method public void destroyDrawingCache();
+ method public final boolean didLayoutParamsChange();
method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets);
method public void dispatchConfigurationChanged(android.content.res.Configuration);
method public void dispatchDisplayHint(int);
@@ -38768,6 +43016,7 @@
method public boolean isOpaque();
method protected boolean isPaddingOffsetRequired();
method public boolean isPaddingRelative();
+ method public final boolean isPartialLayoutRequested();
method public boolean isPressed();
method public boolean isSaveEnabled();
method public boolean isSaveFromParentEnabled();
@@ -39004,11 +43253,13 @@
method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);
method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);
method public void startAnimation(android.view.animation.Animation);
- method public final boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
+ method public final deprecated boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
+ method public final boolean startDragAndDrop(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
method public boolean startNestedScroll(int);
method public void stopNestedScroll();
method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
method public void unscheduleDrawable(android.graphics.drawable.Drawable);
+ method public final void updateDragShadow(android.view.View.DragShadowBuilder);
method protected boolean verifyDrawable(android.graphics.drawable.Drawable);
method public boolean willNotCacheDrawing();
method public boolean willNotDraw();
@@ -39377,6 +43628,7 @@
method protected void dispatchThawSelfOnly(android.util.SparseArray<android.os.Parcelable>);
method protected boolean drawChild(android.graphics.Canvas, android.view.View, long);
method public void endViewTransition(android.view.View);
+ method public int findDependentLayoutAxes(android.view.View, int);
method public android.view.View focusSearch(android.view.View, int);
method public void focusableViewAvailable(android.view.View);
method public boolean gatherTransparentRegion(android.graphics.Region);
@@ -39443,6 +43695,8 @@
method public void requestChildFocus(android.view.View, android.view.View);
method public boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean);
method public void requestDisallowInterceptTouchEvent(boolean);
+ method public void requestLayoutForChild(android.view.View);
+ method public void requestPartialLayoutForChild(android.view.View);
method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
method public void requestTransparentRegion(android.view.View);
method public void scheduleLayoutAnimation();
@@ -39557,6 +43811,7 @@
method public abstract void childHasTransientStateChanged(android.view.View, boolean);
method public abstract void clearChildFocus(android.view.View);
method public abstract void createContextMenu(android.view.ContextMenu);
+ method public abstract int findDependentLayoutAxes(android.view.View, int);
method public abstract android.view.View focusSearch(android.view.View, int);
method public abstract void focusableViewAvailable(android.view.View);
method public abstract boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point);
@@ -39586,12 +43841,16 @@
method public abstract void requestDisallowInterceptTouchEvent(boolean);
method public abstract void requestFitSystemWindows();
method public abstract void requestLayout();
+ method public abstract void requestLayoutForChild(android.view.View);
method public abstract boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
method public abstract void requestTransparentRegion(android.view.View);
method public abstract boolean showContextMenuForChild(android.view.View);
method public abstract boolean showContextMenuForChild(android.view.View, float, float);
method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);
method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);
+ field public static final int FLAG_LAYOUT_AXIS_ANY = 3; // 0x3
+ field public static final int FLAG_LAYOUT_AXIS_HORIZONTAL = 1; // 0x1
+ field public static final int FLAG_LAYOUT_AXIS_VERTICAL = 2; // 0x2
}
public class ViewPropertyAnimator {
@@ -45299,13 +49558,18 @@
package java.awt.font {
public final class NumericShaper implements java.io.Serializable {
- method public static java.awt.font.NumericShaper getContextualShaper(int, int);
method public static java.awt.font.NumericShaper getContextualShaper(int);
+ method public static java.awt.font.NumericShaper getContextualShaper(java.util.Set<java.awt.font.NumericShaper.Range>);
+ method public static java.awt.font.NumericShaper getContextualShaper(int, int);
+ method public static java.awt.font.NumericShaper getContextualShaper(java.util.Set<java.awt.font.NumericShaper.Range>, java.awt.font.NumericShaper.Range);
+ method public java.util.Set<java.awt.font.NumericShaper.Range> getRangeSet();
method public int getRanges();
method public static java.awt.font.NumericShaper getShaper(int);
+ method public static java.awt.font.NumericShaper getShaper(java.awt.font.NumericShaper.Range);
method public boolean isContextual();
- method public void shape(char[], int, int, int);
method public void shape(char[], int, int);
+ method public void shape(char[], int, int, int);
+ method public void shape(char[], int, int, java.awt.font.NumericShaper.Range);
field public static final int ALL_RANGES = 524287; // 0x7ffff
field public static final int ARABIC = 2; // 0x2
field public static final int BENGALI = 16; // 0x10
@@ -45328,6 +49592,46 @@
field public static final int TIBETAN = 16384; // 0x4000
}
+ public static class NumericShaper.Range extends java.lang.Enum {
+ method public static java.awt.font.NumericShaper.Range valueOf(java.lang.String);
+ method public static final java.awt.font.NumericShaper.Range[] values();
+ enum_constant public static final java.awt.font.NumericShaper.Range ARABIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range BALINESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range BENGALI;
+ enum_constant public static final java.awt.font.NumericShaper.Range CHAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range DEVANAGARI;
+ enum_constant public static final java.awt.font.NumericShaper.Range EASTERN_ARABIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range ETHIOPIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range EUROPEAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range GUJARATI;
+ enum_constant public static final java.awt.font.NumericShaper.Range GURMUKHI;
+ enum_constant public static final java.awt.font.NumericShaper.Range JAVANESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range KANNADA;
+ enum_constant public static final java.awt.font.NumericShaper.Range KAYAH_LI;
+ enum_constant public static final java.awt.font.NumericShaper.Range KHMER;
+ enum_constant public static final java.awt.font.NumericShaper.Range LAO;
+ enum_constant public static final java.awt.font.NumericShaper.Range LEPCHA;
+ enum_constant public static final java.awt.font.NumericShaper.Range LIMBU;
+ enum_constant public static final java.awt.font.NumericShaper.Range MALAYALAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range MEETEI_MAYEK;
+ enum_constant public static final java.awt.font.NumericShaper.Range MONGOLIAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range MYANMAR;
+ enum_constant public static final java.awt.font.NumericShaper.Range MYANMAR_SHAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range NEW_TAI_LUE;
+ enum_constant public static final java.awt.font.NumericShaper.Range NKO;
+ enum_constant public static final java.awt.font.NumericShaper.Range OL_CHIKI;
+ enum_constant public static final java.awt.font.NumericShaper.Range ORIYA;
+ enum_constant public static final java.awt.font.NumericShaper.Range SAURASHTRA;
+ enum_constant public static final java.awt.font.NumericShaper.Range SUNDANESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAI_THAM_HORA;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAI_THAM_THAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAMIL;
+ enum_constant public static final java.awt.font.NumericShaper.Range TELUGU;
+ enum_constant public static final java.awt.font.NumericShaper.Range THAI;
+ enum_constant public static final java.awt.font.NumericShaper.Range TIBETAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range VAI;
+ }
+
public final class TextAttribute extends java.text.AttributedCharacterIterator.Attribute {
ctor protected TextAttribute(java.lang.String);
field public static final java.awt.font.TextAttribute BACKGROUND;
@@ -45421,20 +49725,20 @@
public class PropertyChangeSupport implements java.io.Serializable {
ctor public PropertyChangeSupport(java.lang.Object);
- method public void addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
method public void addPropertyChangeListener(java.beans.PropertyChangeListener);
+ method public void addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
method public void fireIndexedPropertyChange(java.lang.String, int, java.lang.Object, java.lang.Object);
- method public void fireIndexedPropertyChange(java.lang.String, int, boolean, boolean);
method public void fireIndexedPropertyChange(java.lang.String, int, int, int);
+ method public void fireIndexedPropertyChange(java.lang.String, int, boolean, boolean);
method public void firePropertyChange(java.lang.String, java.lang.Object, java.lang.Object);
- method public void firePropertyChange(java.lang.String, boolean, boolean);
method public void firePropertyChange(java.lang.String, int, int);
+ method public void firePropertyChange(java.lang.String, boolean, boolean);
method public void firePropertyChange(java.beans.PropertyChangeEvent);
- method public java.beans.PropertyChangeListener[] getPropertyChangeListeners(java.lang.String);
method public java.beans.PropertyChangeListener[] getPropertyChangeListeners();
+ method public java.beans.PropertyChangeListener[] getPropertyChangeListeners(java.lang.String);
method public boolean hasListeners(java.lang.String);
- method public void removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
method public void removePropertyChangeListener(java.beans.PropertyChangeListener);
+ method public void removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
}
}
@@ -45459,8 +49763,8 @@
}
public class BufferedReader extends java.io.Reader {
- ctor public BufferedReader(java.io.Reader);
ctor public BufferedReader(java.io.Reader, int);
+ ctor public BufferedReader(java.io.Reader);
method public void close() throws java.io.IOException;
method public int read(char[], int, int) throws java.io.IOException;
method public java.lang.String readLine() throws java.io.IOException;
@@ -45489,10 +49793,10 @@
ctor public ByteArrayOutputStream();
ctor public ByteArrayOutputStream(int);
method public synchronized void reset();
- method public int size();
+ method public synchronized int size();
method public synchronized byte[] toByteArray();
- method public deprecated java.lang.String toString(int);
- method public java.lang.String toString(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public synchronized java.lang.String toString(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public deprecated synchronized java.lang.String toString(int);
method public synchronized void write(int);
method public synchronized void writeTo(java.io.OutputStream) throws java.io.IOException;
field protected byte[] buf;
@@ -45534,13 +49838,15 @@
}
public final class Console implements java.io.Flushable {
+ method public static java.io.Console console();
method public void flush();
method public java.io.Console format(java.lang.String, java.lang.Object...);
+ method public static synchronized java.io.Console getConsole();
method public java.io.Console printf(java.lang.String, java.lang.Object...);
- method public java.lang.String readLine();
method public java.lang.String readLine(java.lang.String, java.lang.Object...);
- method public char[] readPassword();
+ method public java.lang.String readLine();
method public char[] readPassword(java.lang.String, java.lang.Object...);
+ method public char[] readPassword();
method public java.io.Reader reader();
method public java.io.PrintWriter writer();
}
@@ -45586,9 +49892,9 @@
}
public abstract interface DataOutput {
+ method public abstract void write(int) throws java.io.IOException;
method public abstract void write(byte[]) throws java.io.IOException;
method public abstract void write(byte[], int, int) throws java.io.IOException;
- method public abstract void write(int) throws java.io.IOException;
method public abstract void writeBoolean(boolean) throws java.io.IOException;
method public abstract void writeByte(int) throws java.io.IOException;
method public abstract void writeBytes(java.lang.String) throws java.io.IOException;
@@ -45630,17 +49936,17 @@
}
public class File implements java.lang.Comparable java.io.Serializable {
- ctor public File(java.io.File, java.lang.String);
ctor public File(java.lang.String);
ctor public File(java.lang.String, java.lang.String);
+ ctor public File(java.io.File, java.lang.String);
ctor public File(java.net.URI);
method public boolean canExecute();
method public boolean canRead();
method public boolean canWrite();
method public int compareTo(java.io.File);
method public boolean createNewFile() throws java.io.IOException;
- method public static java.io.File createTempFile(java.lang.String, java.lang.String) throws java.io.IOException;
method public static java.io.File createTempFile(java.lang.String, java.lang.String, java.io.File) throws java.io.IOException;
+ method public static java.io.File createTempFile(java.lang.String, java.lang.String) throws java.io.IOException;
method public boolean delete();
method public void deleteOnExit();
method public boolean exists();
@@ -45678,6 +49984,7 @@
method public boolean setReadable(boolean);
method public boolean setWritable(boolean, boolean);
method public boolean setWritable(boolean);
+ method public java.nio.file.Path toPath();
method public java.net.URI toURI();
method public deprecated java.net.URL toURL() throws java.net.MalformedURLException;
field public static final java.lang.String pathSeparator;
@@ -45700,9 +50007,9 @@
}
public class FileInputStream extends java.io.InputStream {
+ ctor public FileInputStream(java.lang.String) throws java.io.FileNotFoundException;
ctor public FileInputStream(java.io.File) throws java.io.FileNotFoundException;
ctor public FileInputStream(java.io.FileDescriptor);
- ctor public FileInputStream(java.lang.String) throws java.io.FileNotFoundException;
method public java.nio.channels.FileChannel getChannel();
method public final java.io.FileDescriptor getFD() throws java.io.IOException;
method public int read() throws java.io.IOException;
@@ -45714,11 +50021,11 @@
}
public class FileOutputStream extends java.io.OutputStream {
+ ctor public FileOutputStream(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public FileOutputStream(java.lang.String, boolean) throws java.io.FileNotFoundException;
ctor public FileOutputStream(java.io.File) throws java.io.FileNotFoundException;
ctor public FileOutputStream(java.io.File, boolean) throws java.io.FileNotFoundException;
ctor public FileOutputStream(java.io.FileDescriptor);
- ctor public FileOutputStream(java.lang.String) throws java.io.FileNotFoundException;
- ctor public FileOutputStream(java.lang.String, boolean) throws java.io.FileNotFoundException;
method public java.nio.channels.FileChannel getChannel();
method public final java.io.FileDescriptor getFD() throws java.io.IOException;
method public void write(int) throws java.io.IOException;
@@ -45726,22 +50033,24 @@
public final class FilePermission extends java.security.Permission implements java.io.Serializable {
ctor public FilePermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
public class FileReader extends java.io.InputStreamReader {
+ ctor public FileReader(java.lang.String) throws java.io.FileNotFoundException;
ctor public FileReader(java.io.File) throws java.io.FileNotFoundException;
ctor public FileReader(java.io.FileDescriptor);
- ctor public FileReader(java.lang.String) throws java.io.FileNotFoundException;
}
public class FileWriter extends java.io.OutputStreamWriter {
+ ctor public FileWriter(java.lang.String) throws java.io.IOException;
+ ctor public FileWriter(java.lang.String, boolean) throws java.io.IOException;
ctor public FileWriter(java.io.File) throws java.io.IOException;
ctor public FileWriter(java.io.File, boolean) throws java.io.IOException;
ctor public FileWriter(java.io.FileDescriptor);
- ctor public FileWriter(java.lang.String) throws java.io.IOException;
- ctor public FileWriter(java.lang.String, boolean) throws java.io.IOException;
}
public abstract interface FilenameFilter {
@@ -45794,7 +50103,7 @@
ctor public InputStream();
method public int available() throws java.io.IOException;
method public void close() throws java.io.IOException;
- method public void mark(int);
+ method public synchronized void mark(int);
method public boolean markSupported();
method public abstract int read() throws java.io.IOException;
method public int read(byte[]) throws java.io.IOException;
@@ -45806,8 +50115,8 @@
public class InputStreamReader extends java.io.Reader {
ctor public InputStreamReader(java.io.InputStream);
ctor public InputStreamReader(java.io.InputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public InputStreamReader(java.io.InputStream, java.nio.charset.CharsetDecoder);
ctor public InputStreamReader(java.io.InputStream, java.nio.charset.Charset);
+ ctor public InputStreamReader(java.io.InputStream, java.nio.charset.CharsetDecoder);
method public void close() throws java.io.IOException;
method public java.lang.String getEncoding();
method public int read(char[], int, int) throws java.io.IOException;
@@ -45816,6 +50125,7 @@
public class InterruptedIOException extends java.io.IOException {
ctor public InterruptedIOException();
ctor public InterruptedIOException(java.lang.String);
+ ctor public InterruptedIOException(java.lang.Throwable);
field public int bytesTransferred;
}
@@ -45843,13 +50153,13 @@
}
public class NotActiveException extends java.io.ObjectStreamException {
- ctor public NotActiveException();
ctor public NotActiveException(java.lang.String);
+ ctor public NotActiveException();
}
public class NotSerializableException extends java.io.ObjectStreamException {
- ctor public NotSerializableException();
ctor public NotSerializableException(java.lang.String);
+ ctor public NotSerializableException();
}
public abstract interface ObjectInput implements java.lang.AutoCloseable java.io.DataInput {
@@ -45863,32 +50173,32 @@
}
public class ObjectInputStream extends java.io.InputStream implements java.io.ObjectInput java.io.ObjectStreamConstants {
- ctor protected ObjectInputStream() throws java.io.IOException;
- ctor public ObjectInputStream(java.io.InputStream) throws java.io.IOException, java.io.StreamCorruptedException;
- method public void defaultReadObject() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.NotActiveException;
- method protected boolean enableResolveObject(boolean);
+ ctor public ObjectInputStream(java.io.InputStream) throws java.io.IOException;
+ ctor protected ObjectInputStream() throws java.io.IOException, java.lang.SecurityException;
+ method public void defaultReadObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected boolean enableResolveObject(boolean) throws java.lang.SecurityException;
method public int read() throws java.io.IOException;
method public boolean readBoolean() throws java.io.IOException;
method public byte readByte() throws java.io.IOException;
method public char readChar() throws java.io.IOException;
method protected java.io.ObjectStreamClass readClassDescriptor() throws java.lang.ClassNotFoundException, java.io.IOException;
method public double readDouble() throws java.io.IOException;
- method public java.io.ObjectInputStream.GetField readFields() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.NotActiveException;
+ method public java.io.ObjectInputStream.GetField readFields() throws java.lang.ClassNotFoundException, java.io.IOException;
method public float readFloat() throws java.io.IOException;
method public void readFully(byte[]) throws java.io.IOException;
method public void readFully(byte[], int, int) throws java.io.IOException;
method public int readInt() throws java.io.IOException;
method public deprecated java.lang.String readLine() throws java.io.IOException;
method public long readLong() throws java.io.IOException;
- method public final java.lang.Object readObject() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.OptionalDataException;
- method protected java.lang.Object readObjectOverride() throws java.lang.ClassNotFoundException, java.io.IOException, java.io.OptionalDataException;
+ method public final java.lang.Object readObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected java.lang.Object readObjectOverride() throws java.lang.ClassNotFoundException, java.io.IOException;
method public short readShort() throws java.io.IOException;
method protected void readStreamHeader() throws java.io.IOException, java.io.StreamCorruptedException;
method public java.lang.String readUTF() throws java.io.IOException;
method public java.lang.Object readUnshared() throws java.lang.ClassNotFoundException, java.io.IOException;
method public int readUnsignedByte() throws java.io.IOException;
method public int readUnsignedShort() throws java.io.IOException;
- method public synchronized void registerValidation(java.io.ObjectInputValidation, int) throws java.io.InvalidObjectException, java.io.NotActiveException;
+ method public void registerValidation(java.io.ObjectInputValidation, int) throws java.io.InvalidObjectException, java.io.NotActiveException;
method protected java.lang.Class<?> resolveClass(java.io.ObjectStreamClass) throws java.lang.ClassNotFoundException, java.io.IOException;
method protected java.lang.Object resolveObject(java.lang.Object) throws java.io.IOException;
method protected java.lang.Class<?> resolveProxyClass(java.lang.String[]) throws java.lang.ClassNotFoundException, java.io.IOException;
@@ -45897,16 +50207,16 @@
public static abstract class ObjectInputStream.GetField {
ctor public ObjectInputStream.GetField();
- method public abstract boolean defaulted(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract boolean get(java.lang.String, boolean) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract char get(java.lang.String, char) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract byte get(java.lang.String, byte) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract short get(java.lang.String, short) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract int get(java.lang.String, int) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract long get(java.lang.String, long) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract float get(java.lang.String, float) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract double get(java.lang.String, double) throws java.io.IOException, java.lang.IllegalArgumentException;
- method public abstract java.lang.Object get(java.lang.String, java.lang.Object) throws java.io.IOException, java.lang.IllegalArgumentException;
+ method public abstract boolean defaulted(java.lang.String) throws java.io.IOException;
+ method public abstract boolean get(java.lang.String, boolean) throws java.io.IOException;
+ method public abstract byte get(java.lang.String, byte) throws java.io.IOException;
+ method public abstract char get(java.lang.String, char) throws java.io.IOException;
+ method public abstract short get(java.lang.String, short) throws java.io.IOException;
+ method public abstract int get(java.lang.String, int) throws java.io.IOException;
+ method public abstract long get(java.lang.String, long) throws java.io.IOException;
+ method public abstract float get(java.lang.String, float) throws java.io.IOException;
+ method public abstract double get(java.lang.String, double) throws java.io.IOException;
+ method public abstract java.lang.Object get(java.lang.String, java.lang.Object) throws java.io.IOException;
method public abstract java.io.ObjectStreamClass getObjectStreamClass();
}
@@ -45917,20 +50227,20 @@
public abstract interface ObjectOutput implements java.lang.AutoCloseable java.io.DataOutput {
method public abstract void close() throws java.io.IOException;
method public abstract void flush() throws java.io.IOException;
+ method public abstract void write(int) throws java.io.IOException;
method public abstract void write(byte[]) throws java.io.IOException;
method public abstract void write(byte[], int, int) throws java.io.IOException;
- method public abstract void write(int) throws java.io.IOException;
method public abstract void writeObject(java.lang.Object) throws java.io.IOException;
}
public class ObjectOutputStream extends java.io.OutputStream implements java.io.ObjectOutput java.io.ObjectStreamConstants {
- ctor protected ObjectOutputStream() throws java.io.IOException;
ctor public ObjectOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor protected ObjectOutputStream() throws java.io.IOException, java.lang.SecurityException;
method protected void annotateClass(java.lang.Class<?>) throws java.io.IOException;
method protected void annotateProxyClass(java.lang.Class<?>) throws java.io.IOException;
method public void defaultWriteObject() throws java.io.IOException;
method protected void drain() throws java.io.IOException;
- method protected boolean enableReplaceObject(boolean);
+ method protected boolean enableReplaceObject(boolean) throws java.lang.SecurityException;
method public java.io.ObjectOutputStream.PutField putFields() throws java.io.IOException;
method protected java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException;
method public void reset() throws java.io.IOException;
@@ -45958,8 +50268,8 @@
public static abstract class ObjectOutputStream.PutField {
ctor public ObjectOutputStream.PutField();
method public abstract void put(java.lang.String, boolean);
- method public abstract void put(java.lang.String, char);
method public abstract void put(java.lang.String, byte);
+ method public abstract void put(java.lang.String, char);
method public abstract void put(java.lang.String, short);
method public abstract void put(java.lang.String, int);
method public abstract void put(java.lang.String, long);
@@ -46013,8 +50323,8 @@
}
public abstract class ObjectStreamException extends java.io.IOException {
- ctor protected ObjectStreamException();
ctor protected ObjectStreamException(java.lang.String);
+ ctor protected ObjectStreamException();
}
public class ObjectStreamField implements java.lang.Comparable {
@@ -46040,14 +50350,14 @@
ctor public OutputStream();
method public void close() throws java.io.IOException;
method public void flush() throws java.io.IOException;
+ method public abstract void write(int) throws java.io.IOException;
method public void write(byte[]) throws java.io.IOException;
method public void write(byte[], int, int) throws java.io.IOException;
- method public abstract void write(int) throws java.io.IOException;
}
public class OutputStreamWriter extends java.io.Writer {
- ctor public OutputStreamWriter(java.io.OutputStream);
ctor public OutputStreamWriter(java.io.OutputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public OutputStreamWriter(java.io.OutputStream);
ctor public OutputStreamWriter(java.io.OutputStream, java.nio.charset.Charset);
ctor public OutputStreamWriter(java.io.OutputStream, java.nio.charset.CharsetEncoder);
method public void close() throws java.io.IOException;
@@ -46057,10 +50367,10 @@
}
public class PipedInputStream extends java.io.InputStream {
- ctor public PipedInputStream();
ctor public PipedInputStream(java.io.PipedOutputStream) throws java.io.IOException;
- ctor public PipedInputStream(int);
ctor public PipedInputStream(java.io.PipedOutputStream, int) throws java.io.IOException;
+ ctor public PipedInputStream();
+ ctor public PipedInputStream(int);
method public void connect(java.io.PipedOutputStream) throws java.io.IOException;
method public synchronized int read() throws java.io.IOException;
method protected synchronized void receive(int) throws java.io.IOException;
@@ -46071,28 +50381,28 @@
}
public class PipedOutputStream extends java.io.OutputStream {
- ctor public PipedOutputStream();
ctor public PipedOutputStream(java.io.PipedInputStream) throws java.io.IOException;
- method public void connect(java.io.PipedInputStream) throws java.io.IOException;
+ ctor public PipedOutputStream();
+ method public synchronized void connect(java.io.PipedInputStream) throws java.io.IOException;
method public void write(int) throws java.io.IOException;
}
public class PipedReader extends java.io.Reader {
- ctor public PipedReader();
ctor public PipedReader(java.io.PipedWriter) throws java.io.IOException;
- ctor public PipedReader(int);
ctor public PipedReader(java.io.PipedWriter, int) throws java.io.IOException;
- method public synchronized void close() throws java.io.IOException;
+ ctor public PipedReader();
+ ctor public PipedReader(int);
+ method public void close() throws java.io.IOException;
method public void connect(java.io.PipedWriter) throws java.io.IOException;
method public synchronized int read(char[], int, int) throws java.io.IOException;
}
public class PipedWriter extends java.io.Writer {
- ctor public PipedWriter();
ctor public PipedWriter(java.io.PipedReader) throws java.io.IOException;
+ ctor public PipedWriter();
method public void close() throws java.io.IOException;
- method public void connect(java.io.PipedReader) throws java.io.IOException;
- method public void flush() throws java.io.IOException;
+ method public synchronized void connect(java.io.PipedReader) throws java.io.IOException;
+ method public synchronized void flush() throws java.io.IOException;
method public void write(char[], int, int) throws java.io.IOException;
}
@@ -46100,111 +50410,111 @@
ctor public PrintStream(java.io.OutputStream);
ctor public PrintStream(java.io.OutputStream, boolean);
ctor public PrintStream(java.io.OutputStream, boolean, java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public PrintStream(java.io.File) throws java.io.FileNotFoundException;
- ctor public PrintStream(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
ctor public PrintStream(java.lang.String) throws java.io.FileNotFoundException;
ctor public PrintStream(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
- method public java.io.PrintStream append(char);
+ ctor public PrintStream(java.io.File) throws java.io.FileNotFoundException;
+ ctor public PrintStream(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
method public java.io.PrintStream append(java.lang.CharSequence);
method public java.io.PrintStream append(java.lang.CharSequence, int, int);
+ method public java.io.PrintStream append(char);
method public boolean checkError();
method protected void clearError();
method public java.io.PrintStream format(java.lang.String, java.lang.Object...);
method public java.io.PrintStream format(java.util.Locale, java.lang.String, java.lang.Object...);
- method public void print(char[]);
+ method public void print(boolean);
method public void print(char);
- method public void print(double);
- method public void print(float);
method public void print(int);
method public void print(long);
+ method public void print(float);
+ method public void print(double);
+ method public void print(char[]);
+ method public void print(java.lang.String);
method public void print(java.lang.Object);
- method public synchronized void print(java.lang.String);
- method public void print(boolean);
method public java.io.PrintStream printf(java.lang.String, java.lang.Object...);
method public java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...);
method public void println();
- method public void println(char[]);
+ method public void println(boolean);
method public void println(char);
- method public void println(double);
- method public void println(float);
method public void println(int);
method public void println(long);
+ method public void println(float);
+ method public void println(double);
+ method public void println(char[]);
+ method public void println(java.lang.String);
method public void println(java.lang.Object);
- method public synchronized void println(java.lang.String);
- method public void println(boolean);
method protected void setError();
}
public class PrintWriter extends java.io.Writer {
- ctor public PrintWriter(java.io.OutputStream);
- ctor public PrintWriter(java.io.OutputStream, boolean);
ctor public PrintWriter(java.io.Writer);
ctor public PrintWriter(java.io.Writer, boolean);
- ctor public PrintWriter(java.io.File) throws java.io.FileNotFoundException;
- ctor public PrintWriter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public PrintWriter(java.io.OutputStream);
+ ctor public PrintWriter(java.io.OutputStream, boolean);
ctor public PrintWriter(java.lang.String) throws java.io.FileNotFoundException;
ctor public PrintWriter(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public PrintWriter(java.io.File) throws java.io.FileNotFoundException;
+ ctor public PrintWriter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
method public boolean checkError();
method protected void clearError();
method public void close();
method public void flush();
method public java.io.PrintWriter format(java.lang.String, java.lang.Object...);
method public java.io.PrintWriter format(java.util.Locale, java.lang.String, java.lang.Object...);
- method public void print(char[]);
+ method public void print(boolean);
method public void print(char);
- method public void print(double);
- method public void print(float);
method public void print(int);
method public void print(long);
- method public void print(java.lang.Object);
+ method public void print(float);
+ method public void print(double);
+ method public void print(char[]);
method public void print(java.lang.String);
- method public void print(boolean);
+ method public void print(java.lang.Object);
method public java.io.PrintWriter printf(java.lang.String, java.lang.Object...);
method public java.io.PrintWriter printf(java.util.Locale, java.lang.String, java.lang.Object...);
method public void println();
- method public void println(char[]);
+ method public void println(boolean);
method public void println(char);
- method public void println(double);
- method public void println(float);
method public void println(int);
method public void println(long);
- method public void println(java.lang.Object);
+ method public void println(float);
+ method public void println(double);
+ method public void println(char[]);
method public void println(java.lang.String);
- method public void println(boolean);
+ method public void println(java.lang.Object);
method protected void setError();
method public void write(char[], int, int);
field protected java.io.Writer out;
}
public class PushbackInputStream extends java.io.FilterInputStream {
- ctor public PushbackInputStream(java.io.InputStream);
ctor public PushbackInputStream(java.io.InputStream, int);
- method public void unread(byte[]) throws java.io.IOException;
- method public void unread(byte[], int, int) throws java.io.IOException;
+ ctor public PushbackInputStream(java.io.InputStream);
method public void unread(int) throws java.io.IOException;
+ method public void unread(byte[], int, int) throws java.io.IOException;
+ method public void unread(byte[]) throws java.io.IOException;
field protected byte[] buf;
field protected int pos;
}
public class PushbackReader extends java.io.FilterReader {
- ctor public PushbackReader(java.io.Reader);
ctor public PushbackReader(java.io.Reader, int);
- method public void unread(char[]) throws java.io.IOException;
- method public void unread(char[], int, int) throws java.io.IOException;
+ ctor public PushbackReader(java.io.Reader);
method public void unread(int) throws java.io.IOException;
+ method public void unread(char[], int, int) throws java.io.IOException;
+ method public void unread(char[]) throws java.io.IOException;
}
public class RandomAccessFile implements java.io.Closeable java.io.DataInput java.io.DataOutput {
- ctor public RandomAccessFile(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
ctor public RandomAccessFile(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+ ctor public RandomAccessFile(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
method public void close() throws java.io.IOException;
- method public final synchronized java.nio.channels.FileChannel getChannel();
+ method public final java.nio.channels.FileChannel getChannel();
method public final java.io.FileDescriptor getFD() throws java.io.IOException;
method public long getFilePointer() throws java.io.IOException;
method public long length() throws java.io.IOException;
method public int read() throws java.io.IOException;
- method public int read(byte[]) throws java.io.IOException;
method public int read(byte[], int, int) throws java.io.IOException;
+ method public int read(byte[]) throws java.io.IOException;
method public final boolean readBoolean() throws java.io.IOException;
method public final byte readByte() throws java.io.IOException;
method public final char readChar() throws java.io.IOException;
@@ -46222,9 +50532,9 @@
method public void seek(long) throws java.io.IOException;
method public void setLength(long) throws java.io.IOException;
method public int skipBytes(int) throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
method public void write(byte[]) throws java.io.IOException;
method public void write(byte[], int, int) throws java.io.IOException;
- method public void write(int) throws java.io.IOException;
method public final void writeBoolean(boolean) throws java.io.IOException;
method public final void writeByte(int) throws java.io.IOException;
method public final void writeBytes(java.lang.String) throws java.io.IOException;
@@ -46244,10 +50554,10 @@
method public abstract void close() throws java.io.IOException;
method public void mark(int) throws java.io.IOException;
method public boolean markSupported();
+ method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public int read() throws java.io.IOException;
method public int read(char[]) throws java.io.IOException;
method public abstract int read(char[], int, int) throws java.io.IOException;
- method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public boolean ready() throws java.io.IOException;
method public void reset() throws java.io.IOException;
method public long skip(long) throws java.io.IOException;
@@ -46255,8 +50565,8 @@
}
public class SequenceInputStream extends java.io.InputStream {
- ctor public SequenceInputStream(java.io.InputStream, java.io.InputStream);
ctor public SequenceInputStream(java.util.Enumeration<? extends java.io.InputStream>);
+ ctor public SequenceInputStream(java.io.InputStream, java.io.InputStream);
method public int read() throws java.io.IOException;
}
@@ -46269,8 +50579,8 @@
}
public class StreamCorruptedException extends java.io.ObjectStreamException {
- ctor public StreamCorruptedException();
ctor public StreamCorruptedException(java.lang.String);
+ ctor public StreamCorruptedException();
}
public class StreamTokenizer {
@@ -46345,14 +50655,14 @@
public abstract class Writer implements java.lang.Appendable java.io.Closeable java.io.Flushable {
ctor protected Writer();
ctor protected Writer(java.lang.Object);
- method public java.io.Writer append(char) throws java.io.IOException;
method public java.io.Writer append(java.lang.CharSequence) throws java.io.IOException;
method public java.io.Writer append(java.lang.CharSequence, int, int) throws java.io.IOException;
+ method public java.io.Writer append(char) throws java.io.IOException;
method public abstract void close() throws java.io.IOException;
method public abstract void flush() throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
method public void write(char[]) throws java.io.IOException;
method public abstract void write(char[], int, int) throws java.io.IOException;
- method public void write(int) throws java.io.IOException;
method public void write(java.lang.String) throws java.io.IOException;
method public void write(java.lang.String, int, int) throws java.io.IOException;
field protected java.lang.Object lock;
@@ -46367,32 +50677,63 @@
ctor public AbstractMethodError(java.lang.String);
}
- abstract class AbstractStringBuilder {
+ abstract class AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence {
+ method public java.lang.AbstractStringBuilder append(java.lang.Object);
+ method public java.lang.AbstractStringBuilder append(java.lang.String);
+ method public java.lang.AbstractStringBuilder append(java.lang.StringBuffer);
+ method public java.lang.AbstractStringBuilder append(java.lang.CharSequence);
+ method public java.lang.AbstractStringBuilder append(java.lang.CharSequence, int, int);
+ method public java.lang.AbstractStringBuilder append(char[]);
+ method public java.lang.AbstractStringBuilder append(char[], int, int);
+ method public java.lang.AbstractStringBuilder append(boolean);
+ method public java.lang.AbstractStringBuilder append(char);
+ method public java.lang.AbstractStringBuilder append(int);
+ method public java.lang.AbstractStringBuilder append(long);
+ method public java.lang.AbstractStringBuilder append(float);
+ method public java.lang.AbstractStringBuilder append(double);
+ method public java.lang.AbstractStringBuilder appendCodePoint(int);
method public int capacity();
method public char charAt(int);
method public int codePointAt(int);
method public int codePointBefore(int);
method public int codePointCount(int, int);
+ method public java.lang.AbstractStringBuilder delete(int, int);
+ method public java.lang.AbstractStringBuilder deleteCharAt(int);
method public void ensureCapacity(int);
method public void getChars(int, int, char[], int);
method public int indexOf(java.lang.String);
method public int indexOf(java.lang.String, int);
+ method public java.lang.AbstractStringBuilder insert(int, char[], int, int);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.Object);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.String);
+ method public java.lang.AbstractStringBuilder insert(int, char[]);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.CharSequence);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.CharSequence, int, int);
+ method public java.lang.AbstractStringBuilder insert(int, boolean);
+ method public java.lang.AbstractStringBuilder insert(int, char);
+ method public java.lang.AbstractStringBuilder insert(int, int);
+ method public java.lang.AbstractStringBuilder insert(int, long);
+ method public java.lang.AbstractStringBuilder insert(int, float);
+ method public java.lang.AbstractStringBuilder insert(int, double);
method public int lastIndexOf(java.lang.String);
method public int lastIndexOf(java.lang.String, int);
method public int length();
method public int offsetByCodePoints(int, int);
+ method public java.lang.AbstractStringBuilder replace(int, int, java.lang.String);
+ method public java.lang.AbstractStringBuilder reverse();
method public void setCharAt(int, char);
method public void setLength(int);
method public java.lang.CharSequence subSequence(int, int);
method public java.lang.String substring(int);
method public java.lang.String substring(int, int);
+ method public abstract java.lang.String toString();
method public void trimToSize();
}
public abstract interface Appendable {
- method public abstract java.lang.Appendable append(char) throws java.io.IOException;
method public abstract java.lang.Appendable append(java.lang.CharSequence) throws java.io.IOException;
method public abstract java.lang.Appendable append(java.lang.CharSequence, int, int) throws java.io.IOException;
+ method public abstract java.lang.Appendable append(char) throws java.io.IOException;
}
public class ArithmeticException extends java.lang.RuntimeException {
@@ -46413,7 +50754,6 @@
public class AssertionError extends java.lang.Error {
ctor public AssertionError();
- ctor public AssertionError(java.lang.String, java.lang.Throwable);
ctor public AssertionError(java.lang.Object);
ctor public AssertionError(boolean);
ctor public AssertionError(char);
@@ -46421,6 +50761,7 @@
ctor public AssertionError(long);
ctor public AssertionError(float);
ctor public AssertionError(double);
+ ctor public AssertionError(java.lang.String, java.lang.Throwable);
}
public abstract interface AutoCloseable {
@@ -46428,16 +50769,16 @@
}
public final class Boolean implements java.lang.Comparable java.io.Serializable {
- ctor public Boolean(java.lang.String);
ctor public Boolean(boolean);
+ ctor public Boolean(java.lang.String);
method public boolean booleanValue();
method public static int compare(boolean, boolean);
method public int compareTo(java.lang.Boolean);
method public static boolean getBoolean(java.lang.String);
method public static boolean parseBoolean(java.lang.String);
method public static java.lang.String toString(boolean);
- method public static java.lang.Boolean valueOf(java.lang.String);
method public static java.lang.Boolean valueOf(boolean);
+ method public static java.lang.Boolean valueOf(java.lang.String);
field public static final java.lang.Boolean FALSE;
field public static final java.lang.Boolean TRUE;
field public static final java.lang.Class<java.lang.Boolean> TYPE;
@@ -46453,12 +50794,13 @@
method public float floatValue();
method public int intValue();
method public long longValue();
- method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
method public static byte parseByte(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toHexString(byte, boolean);
method public static java.lang.String toString(byte);
- method public static java.lang.Byte valueOf(java.lang.String) throws java.lang.NumberFormatException;
- method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
method public static java.lang.Byte valueOf(byte);
+ method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Byte valueOf(java.lang.String) throws java.lang.NumberFormatException;
field public static final byte MAX_VALUE = 127; // 0x7f
field public static final byte MIN_VALUE = -128; // 0xffffff80
field public static final int SIZE = 8; // 0x8
@@ -46631,7 +50973,7 @@
}
public static final class Character.UnicodeBlock extends java.lang.Character.Subset {
- method public static java.lang.Character.UnicodeBlock forName(java.lang.String);
+ method public static final java.lang.Character.UnicodeBlock forName(java.lang.String);
method public static java.lang.Character.UnicodeBlock of(char);
method public static java.lang.Character.UnicodeBlock of(int);
field public static final java.lang.Character.UnicodeBlock AEGEAN_NUMBERS;
@@ -46846,6 +51188,109 @@
field public static final java.lang.Character.UnicodeBlock YI_SYLLABLES;
}
+ public static final class Character.UnicodeScript extends java.lang.Enum {
+ method public static final java.lang.Character.UnicodeScript forName(java.lang.String);
+ method public static java.lang.Character.UnicodeScript of(int);
+ method public static java.lang.Character.UnicodeScript valueOf(java.lang.String);
+ method public static final java.lang.Character.UnicodeScript[] values();
+ enum_constant public static final java.lang.Character.UnicodeScript ARABIC;
+ enum_constant public static final java.lang.Character.UnicodeScript ARMENIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript AVESTAN;
+ enum_constant public static final java.lang.Character.UnicodeScript BALINESE;
+ enum_constant public static final java.lang.Character.UnicodeScript BAMUM;
+ enum_constant public static final java.lang.Character.UnicodeScript BATAK;
+ enum_constant public static final java.lang.Character.UnicodeScript BENGALI;
+ enum_constant public static final java.lang.Character.UnicodeScript BOPOMOFO;
+ enum_constant public static final java.lang.Character.UnicodeScript BRAHMI;
+ enum_constant public static final java.lang.Character.UnicodeScript BRAILLE;
+ enum_constant public static final java.lang.Character.UnicodeScript BUGINESE;
+ enum_constant public static final java.lang.Character.UnicodeScript BUHID;
+ enum_constant public static final java.lang.Character.UnicodeScript CANADIAN_ABORIGINAL;
+ enum_constant public static final java.lang.Character.UnicodeScript CARIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript CHAM;
+ enum_constant public static final java.lang.Character.UnicodeScript CHEROKEE;
+ enum_constant public static final java.lang.Character.UnicodeScript COMMON;
+ enum_constant public static final java.lang.Character.UnicodeScript COPTIC;
+ enum_constant public static final java.lang.Character.UnicodeScript CUNEIFORM;
+ enum_constant public static final java.lang.Character.UnicodeScript CYPRIOT;
+ enum_constant public static final java.lang.Character.UnicodeScript CYRILLIC;
+ enum_constant public static final java.lang.Character.UnicodeScript DESERET;
+ enum_constant public static final java.lang.Character.UnicodeScript DEVANAGARI;
+ enum_constant public static final java.lang.Character.UnicodeScript EGYPTIAN_HIEROGLYPHS;
+ enum_constant public static final java.lang.Character.UnicodeScript ETHIOPIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GEORGIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript GLAGOLITIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GOTHIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GREEK;
+ enum_constant public static final java.lang.Character.UnicodeScript GUJARATI;
+ enum_constant public static final java.lang.Character.UnicodeScript GURMUKHI;
+ enum_constant public static final java.lang.Character.UnicodeScript HAN;
+ enum_constant public static final java.lang.Character.UnicodeScript HANGUL;
+ enum_constant public static final java.lang.Character.UnicodeScript HANUNOO;
+ enum_constant public static final java.lang.Character.UnicodeScript HEBREW;
+ enum_constant public static final java.lang.Character.UnicodeScript HIRAGANA;
+ enum_constant public static final java.lang.Character.UnicodeScript IMPERIAL_ARAMAIC;
+ enum_constant public static final java.lang.Character.UnicodeScript INHERITED;
+ enum_constant public static final java.lang.Character.UnicodeScript INSCRIPTIONAL_PAHLAVI;
+ enum_constant public static final java.lang.Character.UnicodeScript INSCRIPTIONAL_PARTHIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript JAVANESE;
+ enum_constant public static final java.lang.Character.UnicodeScript KAITHI;
+ enum_constant public static final java.lang.Character.UnicodeScript KANNADA;
+ enum_constant public static final java.lang.Character.UnicodeScript KATAKANA;
+ enum_constant public static final java.lang.Character.UnicodeScript KAYAH_LI;
+ enum_constant public static final java.lang.Character.UnicodeScript KHAROSHTHI;
+ enum_constant public static final java.lang.Character.UnicodeScript KHMER;
+ enum_constant public static final java.lang.Character.UnicodeScript LAO;
+ enum_constant public static final java.lang.Character.UnicodeScript LATIN;
+ enum_constant public static final java.lang.Character.UnicodeScript LEPCHA;
+ enum_constant public static final java.lang.Character.UnicodeScript LIMBU;
+ enum_constant public static final java.lang.Character.UnicodeScript LINEAR_B;
+ enum_constant public static final java.lang.Character.UnicodeScript LISU;
+ enum_constant public static final java.lang.Character.UnicodeScript LYCIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript LYDIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript MALAYALAM;
+ enum_constant public static final java.lang.Character.UnicodeScript MANDAIC;
+ enum_constant public static final java.lang.Character.UnicodeScript MEETEI_MAYEK;
+ enum_constant public static final java.lang.Character.UnicodeScript MONGOLIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript MYANMAR;
+ enum_constant public static final java.lang.Character.UnicodeScript NEW_TAI_LUE;
+ enum_constant public static final java.lang.Character.UnicodeScript NKO;
+ enum_constant public static final java.lang.Character.UnicodeScript OGHAM;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_ITALIC;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_PERSIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_SOUTH_ARABIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_TURKIC;
+ enum_constant public static final java.lang.Character.UnicodeScript OL_CHIKI;
+ enum_constant public static final java.lang.Character.UnicodeScript ORIYA;
+ enum_constant public static final java.lang.Character.UnicodeScript OSMANYA;
+ enum_constant public static final java.lang.Character.UnicodeScript PHAGS_PA;
+ enum_constant public static final java.lang.Character.UnicodeScript PHOENICIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript REJANG;
+ enum_constant public static final java.lang.Character.UnicodeScript RUNIC;
+ enum_constant public static final java.lang.Character.UnicodeScript SAMARITAN;
+ enum_constant public static final java.lang.Character.UnicodeScript SAURASHTRA;
+ enum_constant public static final java.lang.Character.UnicodeScript SHAVIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript SINHALA;
+ enum_constant public static final java.lang.Character.UnicodeScript SUNDANESE;
+ enum_constant public static final java.lang.Character.UnicodeScript SYLOTI_NAGRI;
+ enum_constant public static final java.lang.Character.UnicodeScript SYRIAC;
+ enum_constant public static final java.lang.Character.UnicodeScript TAGALOG;
+ enum_constant public static final java.lang.Character.UnicodeScript TAGBANWA;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_LE;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_THAM;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_VIET;
+ enum_constant public static final java.lang.Character.UnicodeScript TAMIL;
+ enum_constant public static final java.lang.Character.UnicodeScript TELUGU;
+ enum_constant public static final java.lang.Character.UnicodeScript THAANA;
+ enum_constant public static final java.lang.Character.UnicodeScript THAI;
+ enum_constant public static final java.lang.Character.UnicodeScript TIBETAN;
+ enum_constant public static final java.lang.Character.UnicodeScript TIFINAGH;
+ enum_constant public static final java.lang.Character.UnicodeScript UGARITIC;
+ enum_constant public static final java.lang.Character.UnicodeScript UNKNOWN;
+ enum_constant public static final java.lang.Character.UnicodeScript VAI;
+ enum_constant public static final java.lang.Character.UnicodeScript YI;
+ }
+
public final class Class implements java.lang.reflect.AnnotatedElement java.lang.reflect.GenericDeclaration java.io.Serializable java.lang.reflect.Type {
method public java.lang.Class<? extends U> asSubclass(java.lang.Class<U>);
method public T cast(java.lang.Object);
@@ -46858,28 +51303,28 @@
method public java.lang.ClassLoader getClassLoader();
method public java.lang.Class<?>[] getClasses();
method public java.lang.Class<?> getComponentType();
- method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Constructor<?>[] getConstructors();
+ method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?>[] getDeclaredClasses();
- method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors();
+ method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
method public java.lang.reflect.Field getDeclaredField(java.lang.String) throws java.lang.NoSuchFieldException;
method public java.lang.reflect.Field[] getDeclaredFields();
- method public java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Method[] getDeclaredMethods();
+ method public java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Method[] getDeclaredMethods() throws java.lang.SecurityException;
method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Class<?> getEnclosingClass();
method public java.lang.reflect.Constructor<?> getEnclosingConstructor();
method public java.lang.reflect.Method getEnclosingMethod();
method public T[] getEnumConstants();
method public java.lang.reflect.Field getField(java.lang.String) throws java.lang.NoSuchFieldException;
- method public java.lang.reflect.Field[] getFields();
+ method public java.lang.reflect.Field[] getFields() throws java.lang.SecurityException;
method public java.lang.reflect.Type[] getGenericInterfaces();
method public java.lang.reflect.Type getGenericSuperclass();
method public java.lang.Class<?>[] getInterfaces();
- method public java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException;
- method public java.lang.reflect.Method[] getMethods();
+ method public java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Method[] getMethods() throws java.lang.SecurityException;
method public int getModifiers();
method public java.lang.String getName();
method public java.lang.Package getPackage();
@@ -46921,8 +51366,8 @@
}
public abstract class ClassLoader {
- ctor protected ClassLoader();
ctor protected ClassLoader(java.lang.ClassLoader);
+ ctor protected ClassLoader();
method public void clearAssertionStatus();
method protected final deprecated java.lang.Class<?> defineClass(byte[], int, int) throws java.lang.ClassFormatError;
method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int) throws java.lang.ClassFormatError;
@@ -46947,6 +51392,7 @@
method public static java.util.Enumeration<java.net.URL> getSystemResources(java.lang.String) throws java.io.IOException;
method public java.lang.Class<?> loadClass(java.lang.String) throws java.lang.ClassNotFoundException;
method protected java.lang.Class<?> loadClass(java.lang.String, boolean) throws java.lang.ClassNotFoundException;
+ method protected static boolean registerAsParallelCapable();
method protected final void resolveClass(java.lang.Class<?>);
method public void setClassAssertionStatus(java.lang.String, boolean);
method public void setDefaultAssertionStatus(boolean);
@@ -46994,10 +51440,10 @@
method public double doubleValue();
method public float floatValue();
method public int intValue();
- method public boolean isInfinite();
method public static boolean isInfinite(double);
- method public boolean isNaN();
+ method public boolean isInfinite();
method public static boolean isNaN(double);
+ method public boolean isNaN();
method public static double longBitsToDouble(long);
method public long longValue();
method public static double parseDouble(java.lang.String) throws java.lang.NumberFormatException;
@@ -47041,6 +51487,7 @@
ctor public Error(java.lang.String);
ctor public Error(java.lang.String, java.lang.Throwable);
ctor public Error(java.lang.Throwable);
+ ctor protected Error(java.lang.String, java.lang.Throwable, boolean, boolean);
}
public class Exception extends java.lang.Throwable {
@@ -47048,12 +51495,13 @@
ctor public Exception(java.lang.String);
ctor public Exception(java.lang.String, java.lang.Throwable);
ctor public Exception(java.lang.Throwable);
+ ctor protected Exception(java.lang.String, java.lang.Throwable, boolean, boolean);
}
public class ExceptionInInitializerError extends java.lang.LinkageError {
ctor public ExceptionInInitializerError();
- ctor public ExceptionInInitializerError(java.lang.String);
ctor public ExceptionInInitializerError(java.lang.Throwable);
+ ctor public ExceptionInInitializerError(java.lang.String);
method public java.lang.Throwable getException();
}
@@ -47069,10 +51517,10 @@
method public float floatValue();
method public static float intBitsToFloat(int);
method public int intValue();
- method public boolean isInfinite();
method public static boolean isInfinite(float);
- method public boolean isNaN();
+ method public boolean isInfinite();
method public static boolean isNaN(float);
+ method public boolean isNaN();
method public long longValue();
method public static float parseFloat(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.String toHexString(float);
@@ -47168,8 +51616,8 @@
method public static int lowestOneBit(int);
method public static int numberOfLeadingZeros(int);
method public static int numberOfTrailingZeros(int);
- method public static int parseInt(java.lang.String) throws java.lang.NumberFormatException;
method public static int parseInt(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static int parseInt(java.lang.String) throws java.lang.NumberFormatException;
method public static int reverse(int);
method public static int reverseBytes(int);
method public static int rotateLeft(int, int);
@@ -47178,10 +51626,10 @@
method public static java.lang.String toBinaryString(int);
method public static java.lang.String toHexString(int);
method public static java.lang.String toOctalString(int);
- method public static java.lang.String toString(int);
method public static java.lang.String toString(int, int);
- method public static java.lang.Integer valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toString(int);
method public static java.lang.Integer valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Integer valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Integer valueOf(int);
field public static final int MAX_VALUE = 2147483647; // 0x7fffffff
field public static final int MIN_VALUE = -2147483648; // 0x80000000
@@ -47227,8 +51675,8 @@
method public static long lowestOneBit(long);
method public static int numberOfLeadingZeros(long);
method public static int numberOfTrailingZeros(long);
- method public static long parseLong(java.lang.String) throws java.lang.NumberFormatException;
method public static long parseLong(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static long parseLong(java.lang.String) throws java.lang.NumberFormatException;
method public static long reverse(long);
method public static long reverseBytes(long);
method public static long rotateLeft(long, int);
@@ -47237,10 +51685,10 @@
method public static java.lang.String toBinaryString(long);
method public static java.lang.String toHexString(long);
method public static java.lang.String toOctalString(long);
- method public static java.lang.String toString(long);
method public static java.lang.String toString(long, int);
- method public static java.lang.Long valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toString(long);
method public static java.lang.Long valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Long valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Long valueOf(long);
field public static final long MAX_VALUE = 9223372036854775807L; // 0x7fffffffffffffffL
field public static final long MIN_VALUE = -9223372036854775808L; // 0x8000000000000000L
@@ -47250,10 +51698,10 @@
public final class Math {
method public static double IEEEremainder(double, double);
- method public static double abs(double);
- method public static float abs(float);
method public static int abs(int);
method public static long abs(long);
+ method public static float abs(float);
+ method public static double abs(double);
method public static double acos(double);
method public static double asin(double);
method public static double atan(double);
@@ -47273,14 +51721,14 @@
method public static double log(double);
method public static double log10(double);
method public static double log1p(double);
- method public static double max(double, double);
- method public static float max(float, float);
method public static int max(int, int);
method public static long max(long, long);
- method public static double min(double, double);
- method public static float min(float, float);
+ method public static float max(float, float);
+ method public static double max(double, double);
method public static int min(int, int);
method public static long min(long, long);
+ method public static float min(float, float);
+ method public static double min(double, double);
method public static double nextAfter(double, double);
method public static float nextAfter(float, double);
method public static double nextUp(double);
@@ -47288,8 +51736,8 @@
method public static double pow(double, double);
method public static double random();
method public static double rint(double);
- method public static long round(double);
method public static int round(float);
+ method public static long round(double);
method public static double scalb(double, int);
method public static float scalb(float, int);
method public static double signum(double);
@@ -47367,9 +51815,9 @@
method public final void notify();
method public final void notifyAll();
method public java.lang.String toString();
- method public final void wait() throws java.lang.InterruptedException;
method public final void wait(long) throws java.lang.InterruptedException;
method public final void wait(long, int) throws java.lang.InterruptedException;
+ method public final void wait() throws java.lang.InterruptedException;
}
public class OutOfMemoryError extends java.lang.VirtualMachineError {
@@ -47410,19 +51858,49 @@
}
public final class ProcessBuilder {
- ctor public ProcessBuilder(java.lang.String...);
ctor public ProcessBuilder(java.util.List<java.lang.String>);
- method public java.util.List<java.lang.String> command();
- method public java.lang.ProcessBuilder command(java.lang.String...);
+ ctor public ProcessBuilder(java.lang.String...);
method public java.lang.ProcessBuilder command(java.util.List<java.lang.String>);
+ method public java.lang.ProcessBuilder command(java.lang.String...);
+ method public java.util.List<java.lang.String> command();
method public java.io.File directory();
method public java.lang.ProcessBuilder directory(java.io.File);
method public java.util.Map<java.lang.String, java.lang.String> environment();
+ method public java.lang.ProcessBuilder inheritIO();
+ method public java.lang.ProcessBuilder redirectError(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectError(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectError();
method public boolean redirectErrorStream();
method public java.lang.ProcessBuilder redirectErrorStream(boolean);
+ method public java.lang.ProcessBuilder redirectInput(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectInput(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectInput();
+ method public java.lang.ProcessBuilder redirectOutput(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectOutput(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectOutput();
method public java.lang.Process start() throws java.io.IOException;
}
+ public static abstract class ProcessBuilder.Redirect {
+ method public static java.lang.ProcessBuilder.Redirect appendTo(java.io.File);
+ method public java.io.File file();
+ method public static java.lang.ProcessBuilder.Redirect from(java.io.File);
+ method public static java.lang.ProcessBuilder.Redirect to(java.io.File);
+ method public abstract java.lang.ProcessBuilder.Redirect.Type type();
+ field public static final java.lang.ProcessBuilder.Redirect INHERIT;
+ field public static final java.lang.ProcessBuilder.Redirect PIPE;
+ }
+
+ public static final class ProcessBuilder.Redirect.Type extends java.lang.Enum {
+ method public static java.lang.ProcessBuilder.Redirect.Type valueOf(java.lang.String);
+ method public static final java.lang.ProcessBuilder.Redirect.Type[] values();
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type APPEND;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type INHERIT;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type PIPE;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type READ;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type WRITE;
+ }
+
public abstract interface Readable {
method public abstract int read(java.nio.CharBuffer) throws java.io.IOException;
}
@@ -47430,8 +51908,8 @@
public class ReflectiveOperationException extends java.lang.Exception {
ctor public ReflectiveOperationException();
ctor public ReflectiveOperationException(java.lang.String);
- ctor public ReflectiveOperationException(java.lang.Throwable);
ctor public ReflectiveOperationException(java.lang.String, java.lang.Throwable);
+ ctor public ReflectiveOperationException(java.lang.Throwable);
}
public abstract interface Runnable {
@@ -47441,12 +51919,12 @@
public class Runtime {
method public void addShutdownHook(java.lang.Thread);
method public int availableProcessors();
- method public java.lang.Process exec(java.lang.String[]) throws java.io.IOException;
- method public java.lang.Process exec(java.lang.String[], java.lang.String[]) throws java.io.IOException;
- method public java.lang.Process exec(java.lang.String[], java.lang.String[], java.io.File) throws java.io.IOException;
method public java.lang.Process exec(java.lang.String) throws java.io.IOException;
method public java.lang.Process exec(java.lang.String, java.lang.String[]) throws java.io.IOException;
method public java.lang.Process exec(java.lang.String, java.lang.String[], java.io.File) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[], java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[], java.lang.String[], java.io.File) throws java.io.IOException;
method public void exit(int);
method public long freeMemory();
method public void gc();
@@ -47470,6 +51948,7 @@
ctor public RuntimeException(java.lang.String);
ctor public RuntimeException(java.lang.String, java.lang.Throwable);
ctor public RuntimeException(java.lang.Throwable);
+ ctor protected RuntimeException(java.lang.String, java.lang.Throwable, boolean, boolean);
}
public final class RuntimePermission extends java.security.BasicPermission {
@@ -47534,8 +52013,8 @@
}
public final class Short extends java.lang.Number implements java.lang.Comparable {
- ctor public Short(java.lang.String) throws java.lang.NumberFormatException;
ctor public Short(short);
+ ctor public Short(java.lang.String) throws java.lang.NumberFormatException;
method public static int compare(short, short);
method public int compareTo(java.lang.Short);
method public static java.lang.Short decode(java.lang.String) throws java.lang.NumberFormatException;
@@ -47543,12 +52022,12 @@
method public float floatValue();
method public int intValue();
method public long longValue();
- method public static short parseShort(java.lang.String) throws java.lang.NumberFormatException;
method public static short parseShort(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static short parseShort(java.lang.String) throws java.lang.NumberFormatException;
method public static short reverseBytes(short);
method public static java.lang.String toString(short);
- method public static java.lang.Short valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Short valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Short valueOf(java.lang.String) throws java.lang.NumberFormatException;
method public static java.lang.Short valueOf(short);
field public static final short MAX_VALUE = 32767; // 0x7fff
field public static final short MIN_VALUE = -32768; // 0xffff8000
@@ -47572,10 +52051,10 @@
public final class StrictMath {
method public static double IEEEremainder(double, double);
- method public static double abs(double);
- method public static float abs(float);
method public static int abs(int);
method public static long abs(long);
+ method public static float abs(float);
+ method public static double abs(double);
method public static double acos(double);
method public static double asin(double);
method public static double atan(double);
@@ -47595,14 +52074,14 @@
method public static double log(double);
method public static double log10(double);
method public static double log1p(double);
- method public static double max(double, double);
- method public static float max(float, float);
method public static int max(int, int);
method public static long max(long, long);
- method public static double min(double, double);
- method public static float min(float, float);
+ method public static float max(float, float);
+ method public static double max(double, double);
method public static int min(int, int);
method public static long min(long, long);
+ method public static float min(float, float);
+ method public static double min(double, double);
method public static double nextAfter(double, double);
method public static float nextAfter(float, double);
method public static double nextUp(double);
@@ -47610,8 +52089,8 @@
method public static double pow(double, double);
method public static double random();
method public static double rint(double);
- method public static long round(double);
method public static int round(float);
+ method public static long round(double);
method public static double scalb(double, int);
method public static float scalb(float, int);
method public static double signum(double);
@@ -47631,19 +52110,19 @@
public final class String implements java.lang.CharSequence java.lang.Comparable java.io.Serializable {
ctor public String();
- ctor public String(byte[]);
- ctor public deprecated String(byte[], int);
- ctor public String(byte[], int, int);
- ctor public deprecated String(byte[], int, int, int);
- ctor public String(byte[], int, int, java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public String(byte[], java.lang.String) throws java.io.UnsupportedEncodingException;
- ctor public String(byte[], int, int, java.nio.charset.Charset);
- ctor public String(byte[], java.nio.charset.Charset);
+ ctor public String(java.lang.String);
ctor public String(char[]);
ctor public String(char[], int, int);
- ctor public String(java.lang.String);
- ctor public String(java.lang.StringBuffer);
ctor public String(int[], int, int);
+ ctor public deprecated String(byte[], int, int, int);
+ ctor public deprecated String(byte[], int);
+ ctor public String(byte[], int, int, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public String(byte[], int, int, java.nio.charset.Charset);
+ ctor public String(byte[], java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public String(byte[], java.nio.charset.Charset);
+ ctor public String(byte[], int, int);
+ ctor public String(byte[]);
+ ctor public String(java.lang.StringBuffer);
ctor public String(java.lang.StringBuilder);
method public char charAt(int);
method public int codePointAt(int);
@@ -47655,16 +52134,16 @@
method public boolean contains(java.lang.CharSequence);
method public boolean contentEquals(java.lang.StringBuffer);
method public boolean contentEquals(java.lang.CharSequence);
- method public static java.lang.String copyValueOf(char[]);
method public static java.lang.String copyValueOf(char[], int, int);
+ method public static java.lang.String copyValueOf(char[]);
method public boolean endsWith(java.lang.String);
method public boolean equalsIgnoreCase(java.lang.String);
method public static java.lang.String format(java.lang.String, java.lang.Object...);
method public static java.lang.String format(java.util.Locale, java.lang.String, java.lang.Object...);
method public deprecated void getBytes(int, int, byte[], int);
- method public byte[] getBytes();
method public byte[] getBytes(java.lang.String) throws java.io.UnsupportedEncodingException;
method public byte[] getBytes(java.nio.charset.Charset);
+ method public byte[] getBytes();
method public void getChars(int, int, char[], int);
method public int indexOf(int);
method public int indexOf(int, int);
@@ -47685,109 +52164,51 @@
method public java.lang.String replace(java.lang.CharSequence, java.lang.CharSequence);
method public java.lang.String replaceAll(java.lang.String, java.lang.String);
method public java.lang.String replaceFirst(java.lang.String, java.lang.String);
- method public java.lang.String[] split(java.lang.String);
method public java.lang.String[] split(java.lang.String, int);
- method public boolean startsWith(java.lang.String);
+ method public java.lang.String[] split(java.lang.String);
method public boolean startsWith(java.lang.String, int);
+ method public boolean startsWith(java.lang.String);
method public java.lang.CharSequence subSequence(int, int);
method public java.lang.String substring(int);
method public java.lang.String substring(int, int);
method public char[] toCharArray();
- method public java.lang.String toLowerCase();
method public java.lang.String toLowerCase(java.util.Locale);
- method public java.lang.String toUpperCase();
+ method public java.lang.String toLowerCase();
method public java.lang.String toUpperCase(java.util.Locale);
+ method public java.lang.String toUpperCase();
method public java.lang.String trim();
+ method public static java.lang.String valueOf(java.lang.Object);
method public static java.lang.String valueOf(char[]);
method public static java.lang.String valueOf(char[], int, int);
+ method public static java.lang.String valueOf(boolean);
method public static java.lang.String valueOf(char);
- method public static java.lang.String valueOf(double);
- method public static java.lang.String valueOf(float);
method public static java.lang.String valueOf(int);
method public static java.lang.String valueOf(long);
- method public static java.lang.String valueOf(java.lang.Object);
- method public static java.lang.String valueOf(boolean);
+ method public static java.lang.String valueOf(float);
+ method public static java.lang.String valueOf(double);
field public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;
}
- public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
+ public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuffer();
ctor public StringBuffer(int);
ctor public StringBuffer(java.lang.String);
ctor public StringBuffer(java.lang.CharSequence);
- method public java.lang.StringBuffer append(boolean);
- method public synchronized java.lang.StringBuffer append(char);
- method public java.lang.StringBuffer append(double);
- method public java.lang.StringBuffer append(float);
- method public java.lang.StringBuffer append(int);
- method public java.lang.StringBuffer append(long);
- method public synchronized java.lang.StringBuffer append(java.lang.Object);
- method public synchronized java.lang.StringBuffer append(java.lang.String);
- method public synchronized java.lang.StringBuffer append(java.lang.StringBuffer);
- method public synchronized java.lang.StringBuffer append(char[]);
- method public synchronized java.lang.StringBuffer append(char[], int, int);
- method public synchronized java.lang.StringBuffer append(java.lang.CharSequence);
- method public synchronized java.lang.StringBuffer append(java.lang.CharSequence, int, int);
- method public java.lang.StringBuffer appendCodePoint(int);
- method public synchronized java.lang.StringBuffer delete(int, int);
- method public synchronized java.lang.StringBuffer deleteCharAt(int);
- method public synchronized java.lang.StringBuffer insert(int, char);
- method public java.lang.StringBuffer insert(int, boolean);
- method public java.lang.StringBuffer insert(int, int);
- method public java.lang.StringBuffer insert(int, long);
- method public java.lang.StringBuffer insert(int, double);
- method public java.lang.StringBuffer insert(int, float);
- method public java.lang.StringBuffer insert(int, java.lang.Object);
- method public synchronized java.lang.StringBuffer insert(int, java.lang.String);
- method public synchronized java.lang.StringBuffer insert(int, char[]);
- method public synchronized java.lang.StringBuffer insert(int, char[], int, int);
- method public synchronized java.lang.StringBuffer insert(int, java.lang.CharSequence);
- method public synchronized java.lang.StringBuffer insert(int, java.lang.CharSequence, int, int);
- method public synchronized java.lang.StringBuffer replace(int, int, java.lang.String);
- method public synchronized java.lang.StringBuffer reverse();
+ method public synchronized java.lang.String toString();
}
- public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence java.io.Serializable {
+ public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
ctor public StringBuilder();
ctor public StringBuilder(int);
- ctor public StringBuilder(java.lang.CharSequence);
ctor public StringBuilder(java.lang.String);
- method public java.lang.StringBuilder append(boolean);
- method public java.lang.StringBuilder append(char);
- method public java.lang.StringBuilder append(int);
- method public java.lang.StringBuilder append(long);
- method public java.lang.StringBuilder append(float);
- method public java.lang.StringBuilder append(double);
- method public java.lang.StringBuilder append(java.lang.Object);
- method public java.lang.StringBuilder append(java.lang.String);
- method public java.lang.StringBuilder append(java.lang.StringBuffer);
- method public java.lang.StringBuilder append(char[]);
- method public java.lang.StringBuilder append(char[], int, int);
- method public java.lang.StringBuilder append(java.lang.CharSequence);
- method public java.lang.StringBuilder append(java.lang.CharSequence, int, int);
- method public java.lang.StringBuilder appendCodePoint(int);
- method public java.lang.StringBuilder delete(int, int);
- method public java.lang.StringBuilder deleteCharAt(int);
- method public java.lang.StringBuilder insert(int, boolean);
- method public java.lang.StringBuilder insert(int, char);
- method public java.lang.StringBuilder insert(int, int);
- method public java.lang.StringBuilder insert(int, long);
- method public java.lang.StringBuilder insert(int, float);
- method public java.lang.StringBuilder insert(int, double);
- method public java.lang.StringBuilder insert(int, java.lang.Object);
- method public java.lang.StringBuilder insert(int, java.lang.String);
- method public java.lang.StringBuilder insert(int, char[]);
- method public java.lang.StringBuilder insert(int, char[], int, int);
- method public java.lang.StringBuilder insert(int, java.lang.CharSequence);
- method public java.lang.StringBuilder insert(int, java.lang.CharSequence, int, int);
- method public java.lang.StringBuilder replace(int, int, java.lang.String);
- method public java.lang.StringBuilder reverse();
+ ctor public StringBuilder(java.lang.CharSequence);
+ method public java.lang.String toString();
}
public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
ctor public StringIndexOutOfBoundsException();
- ctor public StringIndexOutOfBoundsException(int);
ctor public StringIndexOutOfBoundsException(java.lang.String);
+ ctor public StringIndexOutOfBoundsException(int);
}
public abstract class SuppressWarnings implements java.lang.annotation.Annotation {
@@ -47829,11 +52250,11 @@
public class Thread implements java.lang.Runnable {
ctor public Thread();
ctor public Thread(java.lang.Runnable);
- ctor public Thread(java.lang.Runnable, java.lang.String);
- ctor public Thread(java.lang.String);
ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable);
- ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String);
+ ctor public Thread(java.lang.String);
ctor public Thread(java.lang.ThreadGroup, java.lang.String);
+ ctor public Thread(java.lang.Runnable, java.lang.String);
+ ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String);
ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String, long);
method public static int activeCount();
method public final void checkAccess();
@@ -47858,9 +52279,9 @@
method public final boolean isAlive();
method public final boolean isDaemon();
method public boolean isInterrupted();
- method public final void join() throws java.lang.InterruptedException;
method public final void join(long) throws java.lang.InterruptedException;
method public final void join(long, int) throws java.lang.InterruptedException;
+ method public final void join() throws java.lang.InterruptedException;
method public final deprecated void resume();
method public void run();
method public void setContextClassLoader(java.lang.ClassLoader);
@@ -47873,7 +52294,7 @@
method public static void sleep(long, int) throws java.lang.InterruptedException;
method public synchronized void start();
method public final deprecated void stop();
- method public final deprecated synchronized void stop(java.lang.Throwable);
+ method public final deprecated void stop(java.lang.Throwable);
method public final deprecated void suspend();
method public static void yield();
field public static final int MAX_PRIORITY = 10; // 0xa
@@ -47942,14 +52363,14 @@
ctor public Throwable(java.lang.String, java.lang.Throwable);
ctor public Throwable(java.lang.Throwable);
ctor protected Throwable(java.lang.String, java.lang.Throwable, boolean, boolean);
- method public final void addSuppressed(java.lang.Throwable);
- method public java.lang.Throwable fillInStackTrace();
- method public java.lang.Throwable getCause();
+ method public final synchronized void addSuppressed(java.lang.Throwable);
+ method public synchronized java.lang.Throwable fillInStackTrace();
+ method public synchronized java.lang.Throwable getCause();
method public java.lang.String getLocalizedMessage();
method public java.lang.String getMessage();
method public java.lang.StackTraceElement[] getStackTrace();
- method public final java.lang.Throwable[] getSuppressed();
- method public java.lang.Throwable initCause(java.lang.Throwable);
+ method public final synchronized java.lang.Throwable[] getSuppressed();
+ method public synchronized java.lang.Throwable initCause(java.lang.Throwable);
method public void printStackTrace();
method public void printStackTrace(java.io.PrintStream);
method public void printStackTrace(java.io.PrintWriter);
@@ -48070,15 +52491,16 @@
public abstract class Reference {
method public void clear();
method public boolean enqueue();
+ method public final synchronized boolean enqueueInternal();
method public T get();
method public boolean isEnqueued();
}
public class ReferenceQueue {
ctor public ReferenceQueue();
- method public synchronized java.lang.ref.Reference<? extends T> poll();
+ method public java.lang.ref.Reference<? extends T> poll();
+ method public java.lang.ref.Reference<? extends T> remove(long) throws java.lang.IllegalArgumentException, java.lang.InterruptedException;
method public java.lang.ref.Reference<? extends T> remove() throws java.lang.InterruptedException;
- method public synchronized java.lang.ref.Reference<? extends T> remove(long) throws java.lang.InterruptedException;
}
public class SoftReference extends java.lang.ref.Reference {
@@ -48102,8 +52524,8 @@
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public boolean isAccessible();
method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
- method public void setAccessible(boolean);
- method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean);
+ method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException;
+ method public void setAccessible(boolean) throws java.lang.SecurityException;
}
public abstract interface AnnotatedElement {
@@ -48124,8 +52546,9 @@
method public static int getLength(java.lang.Object);
method public static long getLong(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
method public static short getShort(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
- method public static java.lang.Object newInstance(java.lang.Class<?>, int...) throws java.lang.IllegalArgumentException, java.lang.NegativeArraySizeException;
+ method public static java.lang.Object newArray(java.lang.Class<?>, int) throws java.lang.NegativeArraySizeException;
method public static java.lang.Object newInstance(java.lang.Class<?>, int) throws java.lang.NegativeArraySizeException;
+ method public static java.lang.Object newInstance(java.lang.Class<?>, int...) throws java.lang.IllegalArgumentException, java.lang.NegativeArraySizeException;
method public static void set(java.lang.Object, int, java.lang.Object) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
method public static void setBoolean(java.lang.Object, int, boolean);
method public static void setByte(java.lang.Object, int, byte) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
@@ -48140,7 +52563,6 @@
public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
method public boolean equals(java.lang.Object);
method public A getAnnotation(java.lang.Class<A>);
- method public java.lang.annotation.Annotation[] getAnnotations();
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<T> getDeclaringClass();
method public java.lang.Class<?>[] getExceptionTypes();
@@ -48227,7 +52649,6 @@
public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
method public boolean equals(java.lang.Object);
method public A getAnnotation(java.lang.Class<A>);
- method public java.lang.annotation.Annotation[] getAnnotations();
method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
method public java.lang.Class<?> getDeclaringClass();
method public java.lang.Object getDefaultValue();
@@ -48508,10 +52929,10 @@
method protected final java.net.InetAddress getRequestingSite();
method protected java.net.URL getRequestingURL();
method protected java.net.Authenticator.RequestorType getRequestorType();
- method public static synchronized java.net.PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
- method public static synchronized java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String, java.net.URL, java.net.Authenticator.RequestorType);
- method public static void setDefault(java.net.Authenticator);
+ method public static synchronized void setDefault(java.net.Authenticator);
}
public static final class Authenticator.RequestorType extends java.lang.Enum {
@@ -48522,8 +52943,9 @@
}
public class BindException extends java.net.SocketException {
- ctor public BindException();
ctor public BindException(java.lang.String);
+ ctor public BindException();
+ ctor public BindException(java.lang.String, java.lang.Throwable);
}
public abstract class CacheRequest {
@@ -48539,8 +52961,9 @@
}
public class ConnectException extends java.net.SocketException {
- ctor public ConnectException();
ctor public ConnectException(java.lang.String);
+ ctor public ConnectException();
+ ctor public ConnectException(java.lang.String, java.lang.Throwable);
}
public abstract class ContentHandler {
@@ -48556,9 +52979,9 @@
public abstract class CookieHandler {
ctor public CookieHandler();
method public abstract java.util.Map<java.lang.String, java.util.List<java.lang.String>> get(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public static java.net.CookieHandler getDefault();
+ method public static synchronized java.net.CookieHandler getDefault();
method public abstract void put(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public static void setDefault(java.net.CookieHandler);
+ method public static synchronized void setDefault(java.net.CookieHandler);
}
public class CookieManager extends java.net.CookieHandler {
@@ -48587,12 +53010,12 @@
}
public final class DatagramPacket {
- ctor public DatagramPacket(byte[], int);
ctor public DatagramPacket(byte[], int, int);
+ ctor public DatagramPacket(byte[], int);
ctor public DatagramPacket(byte[], int, int, java.net.InetAddress, int);
+ ctor public DatagramPacket(byte[], int, int, java.net.SocketAddress) throws java.net.SocketException;
ctor public DatagramPacket(byte[], int, java.net.InetAddress, int);
ctor public DatagramPacket(byte[], int, java.net.SocketAddress) throws java.net.SocketException;
- ctor public DatagramPacket(byte[], int, int, java.net.SocketAddress) throws java.net.SocketException;
method public synchronized java.net.InetAddress getAddress();
method public synchronized byte[] getData();
method public synchronized int getLength();
@@ -48609,17 +53032,18 @@
public class DatagramSocket implements java.io.Closeable {
ctor public DatagramSocket() throws java.net.SocketException;
- ctor public DatagramSocket(int) throws java.net.SocketException;
- ctor public DatagramSocket(int, java.net.InetAddress) throws java.net.SocketException;
ctor protected DatagramSocket(java.net.DatagramSocketImpl);
ctor public DatagramSocket(java.net.SocketAddress) throws java.net.SocketException;
- method public void bind(java.net.SocketAddress) throws java.net.SocketException;
+ ctor public DatagramSocket(int) throws java.net.SocketException;
+ ctor public DatagramSocket(int, java.net.InetAddress) throws java.net.SocketException;
+ method public synchronized void bind(java.net.SocketAddress) throws java.net.SocketException;
method public void close();
- method public void connect(java.net.SocketAddress) throws java.net.SocketException;
method public void connect(java.net.InetAddress, int);
+ method public void connect(java.net.SocketAddress) throws java.net.SocketException;
method public void disconnect();
- method public boolean getBroadcast() throws java.net.SocketException;
+ method public synchronized boolean getBroadcast() throws java.net.SocketException;
method public java.nio.channels.DatagramChannel getChannel();
+ method public final java.io.FileDescriptor getFileDescriptor$();
method public java.net.InetAddress getInetAddress();
method public java.net.InetAddress getLocalAddress();
method public int getLocalPort();
@@ -48627,22 +53051,22 @@
method public int getPort();
method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
method public java.net.SocketAddress getRemoteSocketAddress();
- method public boolean getReuseAddress() throws java.net.SocketException;
+ method public synchronized boolean getReuseAddress() throws java.net.SocketException;
method public synchronized int getSendBufferSize() throws java.net.SocketException;
method public synchronized int getSoTimeout() throws java.net.SocketException;
- method public int getTrafficClass() throws java.net.SocketException;
+ method public synchronized int getTrafficClass() throws java.net.SocketException;
method public boolean isBound();
method public boolean isClosed();
method public boolean isConnected();
method public synchronized void receive(java.net.DatagramPacket) throws java.io.IOException;
method public void send(java.net.DatagramPacket) throws java.io.IOException;
- method public void setBroadcast(boolean) throws java.net.SocketException;
+ method public synchronized void setBroadcast(boolean) throws java.net.SocketException;
method public static synchronized void setDatagramSocketImplFactory(java.net.DatagramSocketImplFactory) throws java.io.IOException;
method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
- method public void setReuseAddress(boolean) throws java.net.SocketException;
+ method public synchronized void setReuseAddress(boolean) throws java.net.SocketException;
method public synchronized void setSendBufferSize(int) throws java.net.SocketException;
method public synchronized void setSoTimeout(int) throws java.net.SocketException;
- method public void setTrafficClass(int) throws java.net.SocketException;
+ method public synchronized void setTrafficClass(int) throws java.net.SocketException;
}
public abstract class DatagramSocketImpl implements java.net.SocketOptions {
@@ -48694,11 +53118,14 @@
method public java.lang.String getValue();
method public int getVersion();
method public boolean hasExpired();
+ method public boolean isHttpOnly();
method public static java.util.List<java.net.HttpCookie> parse(java.lang.String);
+ method public static java.util.List<java.net.HttpCookie> parse(java.lang.String, boolean);
method public void setComment(java.lang.String);
method public void setCommentURL(java.lang.String);
method public void setDiscard(boolean);
method public void setDomain(java.lang.String);
+ method public void setHttpOnly(boolean);
method public void setMaxAge(long);
method public void setPath(java.lang.String);
method public void setPortlist(java.lang.String);
@@ -48725,8 +53152,8 @@
method public int getResponseCode() throws java.io.IOException;
method public java.lang.String getResponseMessage() throws java.io.IOException;
method public void setChunkedStreamingMode(int);
- method public void setFixedLengthStreamingMode(long);
method public void setFixedLengthStreamingMode(int);
+ method public void setFixedLengthStreamingMode(long);
method public static void setFollowRedirects(boolean);
method public void setInstanceFollowRedirects(boolean);
method public void setRequestMethod(java.lang.String) throws java.net.ProtocolException;
@@ -48786,21 +53213,27 @@
}
public final class Inet4Address extends java.net.InetAddress {
+ field public static final java.net.InetAddress ALL;
+ field public static final java.net.InetAddress ANY;
+ field public static final java.net.InetAddress LOOPBACK;
}
public final class Inet6Address extends java.net.InetAddress {
- method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], int) throws java.net.UnknownHostException;
method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], java.net.NetworkInterface) throws java.net.UnknownHostException;
+ method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], int) throws java.net.UnknownHostException;
method public int getScopeId();
method public java.net.NetworkInterface getScopedInterface();
method public boolean isIPv4CompatibleAddress();
+ field public static final java.net.InetAddress ANY;
+ field public static final java.net.InetAddress LOOPBACK;
}
public class InetAddress implements java.io.Serializable {
method public byte[] getAddress();
+ method public byte[] getAddressInternal();
method public static java.net.InetAddress[] getAllByName(java.lang.String) throws java.net.UnknownHostException;
- method public static java.net.InetAddress getByAddress(byte[]) throws java.net.UnknownHostException;
method public static java.net.InetAddress getByAddress(java.lang.String, byte[]) throws java.net.UnknownHostException;
+ method public static java.net.InetAddress getByAddress(byte[]) throws java.net.UnknownHostException;
method public static java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException;
method public java.lang.String getCanonicalHostName();
method public java.lang.String getHostAddress();
@@ -48907,8 +53340,8 @@
}
public class NoRouteToHostException extends java.net.SocketException {
- ctor public NoRouteToHostException();
ctor public NoRouteToHostException(java.lang.String);
+ ctor public NoRouteToHostException();
}
public final class PasswordAuthentication {
@@ -48918,13 +53351,19 @@
}
public class PortUnreachableException extends java.net.SocketException {
- ctor public PortUnreachableException();
ctor public PortUnreachableException(java.lang.String);
+ ctor public PortUnreachableException();
+ ctor public PortUnreachableException(java.lang.String, java.lang.Throwable);
}
public class ProtocolException extends java.io.IOException {
- ctor public ProtocolException();
ctor public ProtocolException(java.lang.String);
+ ctor public ProtocolException();
+ ctor public ProtocolException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract interface ProtocolFamily {
+ method public abstract java.lang.String name();
}
public class Proxy {
@@ -48955,9 +53394,9 @@
public abstract class ResponseCache {
ctor public ResponseCache();
method public abstract java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public static java.net.ResponseCache getDefault();
+ method public static synchronized java.net.ResponseCache getDefault();
method public abstract java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
- method public static void setDefault(java.net.ResponseCache);
+ method public static synchronized void setDefault(java.net.ResponseCache);
}
public abstract class SecureCacheResponse extends java.net.CacheResponse {
@@ -48982,14 +53421,14 @@
method public java.net.InetAddress getInetAddress();
method public int getLocalPort();
method public java.net.SocketAddress getLocalSocketAddress();
- method public int getReceiveBufferSize() throws java.net.SocketException;
+ method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
method public boolean getReuseAddress() throws java.net.SocketException;
method public synchronized int getSoTimeout() throws java.io.IOException;
method protected final void implAccept(java.net.Socket) throws java.io.IOException;
method public boolean isBound();
method public boolean isClosed();
method public void setPerformancePreferences(int, int, int);
- method public void setReceiveBufferSize(int) throws java.net.SocketException;
+ method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
method public void setReuseAddress(boolean) throws java.net.SocketException;
method public synchronized void setSoTimeout(int) throws java.net.SocketException;
method public static synchronized void setSocketFactory(java.net.SocketImplFactory) throws java.io.IOException;
@@ -48998,13 +53437,13 @@
public class Socket implements java.io.Closeable {
ctor public Socket();
ctor public Socket(java.net.Proxy);
- ctor public Socket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
- ctor public Socket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException;
- ctor public deprecated Socket(java.lang.String, int, boolean) throws java.io.IOException;
- ctor public Socket(java.net.InetAddress, int) throws java.io.IOException;
- ctor public Socket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
- ctor public deprecated Socket(java.net.InetAddress, int, boolean) throws java.io.IOException;
ctor protected Socket(java.net.SocketImpl) throws java.net.SocketException;
+ ctor public Socket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
+ ctor public Socket(java.net.InetAddress, int) throws java.io.IOException;
+ ctor public Socket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException;
+ ctor public Socket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
+ ctor public deprecated Socket(java.lang.String, int, boolean) throws java.io.IOException;
+ ctor public deprecated Socket(java.net.InetAddress, int, boolean) throws java.io.IOException;
method public void bind(java.net.SocketAddress) throws java.io.IOException;
method public synchronized void close() throws java.io.IOException;
method public void connect(java.net.SocketAddress) throws java.io.IOException;
@@ -49053,8 +53492,10 @@
}
public class SocketException extends java.io.IOException {
- ctor public SocketException();
ctor public SocketException(java.lang.String);
+ ctor public SocketException();
+ ctor public SocketException(java.lang.Throwable);
+ ctor public SocketException(java.lang.String, java.lang.Throwable);
}
public abstract class SocketImpl implements java.net.SocketOptions {
@@ -49067,7 +53508,7 @@
method protected abstract void connect(java.net.InetAddress, int) throws java.io.IOException;
method protected abstract void connect(java.net.SocketAddress, int) throws java.io.IOException;
method protected abstract void create(boolean) throws java.io.IOException;
- method protected java.io.FileDescriptor getFileDescriptor();
+ method public java.io.FileDescriptor getFileDescriptor();
method protected java.net.InetAddress getInetAddress();
method protected abstract java.io.InputStream getInputStream() throws java.io.IOException;
method protected int getLocalPort();
@@ -49089,6 +53530,11 @@
method public abstract java.net.SocketImpl createSocketImpl();
}
+ public abstract interface SocketOption {
+ method public abstract java.lang.String name();
+ method public abstract java.lang.Class<T> type();
+ }
+
public abstract interface SocketOptions {
method public abstract java.lang.Object getOption(int) throws java.net.SocketException;
method public abstract void setOption(int, java.lang.Object) throws java.net.SocketException;
@@ -49110,21 +53556,46 @@
public final class SocketPermission extends java.security.Permission implements java.io.Serializable {
ctor public SocketPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
public class SocketTimeoutException extends java.io.InterruptedIOException {
- ctor public SocketTimeoutException();
ctor public SocketTimeoutException(java.lang.String);
+ ctor public SocketTimeoutException();
+ ctor public SocketTimeoutException(java.lang.Throwable);
+ ctor public SocketTimeoutException(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class StandardProtocolFamily extends java.lang.Enum implements java.net.ProtocolFamily {
+ method public static java.net.StandardProtocolFamily valueOf(java.lang.String);
+ method public static final java.net.StandardProtocolFamily[] values();
+ enum_constant public static final java.net.StandardProtocolFamily INET;
+ enum_constant public static final java.net.StandardProtocolFamily INET6;
+ }
+
+ public final class StandardSocketOptions {
+ field public static final java.net.SocketOption<java.net.NetworkInterface> IP_MULTICAST_IF;
+ field public static final java.net.SocketOption<java.lang.Boolean> IP_MULTICAST_LOOP;
+ field public static final java.net.SocketOption<java.lang.Integer> IP_MULTICAST_TTL;
+ field public static final java.net.SocketOption<java.lang.Integer> IP_TOS;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_BROADCAST;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_KEEPALIVE;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_LINGER;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_RCVBUF;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_REUSEADDR;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_SNDBUF;
+ field public static final java.net.SocketOption<java.lang.Boolean> TCP_NODELAY;
}
public final class URI implements java.lang.Comparable java.io.Serializable {
ctor public URI(java.lang.String) throws java.net.URISyntaxException;
- ctor public URI(java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
ctor public URI(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
- ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
method public int compareTo(java.net.URI);
method public static java.net.URI create(java.lang.String);
method public java.lang.String getAuthority();
@@ -49162,12 +53633,12 @@
}
public final class URL implements java.io.Serializable {
+ ctor public URL(java.lang.String, java.lang.String, int, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String, java.lang.String, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
ctor public URL(java.lang.String) throws java.net.MalformedURLException;
ctor public URL(java.net.URL, java.lang.String) throws java.net.MalformedURLException;
ctor public URL(java.net.URL, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
- ctor public URL(java.lang.String, java.lang.String, java.lang.String) throws java.net.MalformedURLException;
- ctor public URL(java.lang.String, java.lang.String, int, java.lang.String) throws java.net.MalformedURLException;
- ctor public URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
method public java.lang.String getAuthority();
method public final java.lang.Object getContent() throws java.io.IOException;
method public final java.lang.Object getContent(java.lang.Class[]) throws java.io.IOException;
@@ -49186,22 +53657,24 @@
method public boolean sameFile(java.net.URL);
method protected void set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
method protected void set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
- method public static synchronized void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory);
+ method public static void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory);
method public java.lang.String toExternalForm();
method public java.net.URI toURI() throws java.net.URISyntaxException;
+ method public java.net.URI toURILenient() throws java.net.URISyntaxException;
}
- public class URLClassLoader extends java.security.SecureClassLoader {
- ctor public URLClassLoader(java.net.URL[]);
+ public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable {
ctor public URLClassLoader(java.net.URL[], java.lang.ClassLoader);
+ ctor public URLClassLoader(java.net.URL[]);
ctor public URLClassLoader(java.net.URL[], java.lang.ClassLoader, java.net.URLStreamHandlerFactory);
method protected void addURL(java.net.URL);
+ method public void close() throws java.io.IOException;
method protected java.lang.Package definePackage(java.lang.String, java.util.jar.Manifest, java.net.URL) throws java.lang.IllegalArgumentException;
method public java.net.URL findResource(java.lang.String);
method public java.util.Enumeration<java.net.URL> findResources(java.lang.String) throws java.io.IOException;
method public java.net.URL[] getURLs();
- method public static java.net.URLClassLoader newInstance(java.net.URL[]);
method public static java.net.URLClassLoader newInstance(java.net.URL[], java.lang.ClassLoader);
+ method public static java.net.URLClassLoader newInstance(java.net.URL[]);
}
public abstract class URLConnection {
@@ -49214,6 +53687,7 @@
method public java.lang.Object getContent(java.lang.Class[]) throws java.io.IOException;
method public java.lang.String getContentEncoding();
method public int getContentLength();
+ method public long getContentLengthLong();
method public java.lang.String getContentType();
method public long getDate();
method public static boolean getDefaultAllowUserInteraction();
@@ -49222,12 +53696,13 @@
method public boolean getDoInput();
method public boolean getDoOutput();
method public long getExpiration();
- method public static java.net.FileNameMap getFileNameMap();
- method public java.lang.String getHeaderField(int);
+ method public static synchronized java.net.FileNameMap getFileNameMap();
method public java.lang.String getHeaderField(java.lang.String);
+ method public java.lang.String getHeaderField(int);
method public long getHeaderFieldDate(java.lang.String, long);
method public int getHeaderFieldInt(java.lang.String, int);
method public java.lang.String getHeaderFieldKey(int);
+ method public long getHeaderFieldLong(java.lang.String, long);
method public java.util.Map<java.lang.String, java.util.List<java.lang.String>> getHeaderFields();
method public long getIfModifiedSince();
method public java.io.InputStream getInputStream() throws java.io.IOException;
@@ -49278,15 +53753,15 @@
ctor public URLStreamHandler();
method protected boolean equals(java.net.URL, java.net.URL);
method protected int getDefaultPort();
- method protected java.net.InetAddress getHostAddress(java.net.URL);
+ method protected synchronized java.net.InetAddress getHostAddress(java.net.URL);
method protected int hashCode(java.net.URL);
method protected boolean hostsEqual(java.net.URL, java.net.URL);
method protected abstract java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException;
method protected java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException;
method protected void parseURL(java.net.URL, java.lang.String, int, int);
method protected boolean sameFile(java.net.URL, java.net.URL);
- method protected deprecated void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
method protected void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method protected deprecated void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
method protected java.lang.String toExternalForm(java.net.URL);
}
@@ -49295,8 +53770,8 @@
}
public class UnknownHostException extends java.io.IOException {
- ctor public UnknownHostException();
ctor public UnknownHostException(java.lang.String);
+ ctor public UnknownHostException();
}
public class UnknownServiceException extends java.io.IOException {
@@ -49352,9 +53827,9 @@
method public int compareTo(java.nio.ByteBuffer);
method public abstract java.nio.ByteBuffer duplicate();
method public abstract byte get();
- method public java.nio.ByteBuffer get(byte[]);
- method public java.nio.ByteBuffer get(byte[], int, int);
method public abstract byte get(int);
+ method public java.nio.ByteBuffer get(byte[], int, int);
+ method public java.nio.ByteBuffer get(byte[]);
method public abstract char getChar();
method public abstract char getChar(int);
method public abstract double getDouble();
@@ -49372,10 +53847,10 @@
method public final java.nio.ByteOrder order();
method public final java.nio.ByteBuffer order(java.nio.ByteOrder);
method public abstract java.nio.ByteBuffer put(byte);
- method public final java.nio.ByteBuffer put(byte[]);
- method public java.nio.ByteBuffer put(byte[], int, int);
- method public java.nio.ByteBuffer put(java.nio.ByteBuffer);
method public abstract java.nio.ByteBuffer put(int, byte);
+ method public java.nio.ByteBuffer put(java.nio.ByteBuffer);
+ method public java.nio.ByteBuffer put(byte[], int, int);
+ method public final java.nio.ByteBuffer put(byte[]);
method public abstract java.nio.ByteBuffer putChar(char);
method public abstract java.nio.ByteBuffer putChar(int, char);
method public abstract java.nio.ByteBuffer putDouble(double);
@@ -49389,8 +53864,8 @@
method public abstract java.nio.ByteBuffer putShort(short);
method public abstract java.nio.ByteBuffer putShort(int, short);
method public abstract java.nio.ByteBuffer slice();
- method public static java.nio.ByteBuffer wrap(byte[]);
method public static java.nio.ByteBuffer wrap(byte[], int, int);
+ method public static java.nio.ByteBuffer wrap(byte[]);
}
public final class ByteOrder {
@@ -49401,9 +53876,9 @@
public abstract class CharBuffer extends java.nio.Buffer implements java.lang.Appendable java.lang.CharSequence java.lang.Comparable java.lang.Readable {
method public static java.nio.CharBuffer allocate(int);
- method public java.nio.CharBuffer append(char);
method public java.nio.CharBuffer append(java.lang.CharSequence);
method public java.nio.CharBuffer append(java.lang.CharSequence, int, int);
+ method public java.nio.CharBuffer append(char);
method public final char[] array();
method public final int arrayOffset();
method public abstract java.nio.CharBuffer asReadOnlyBuffer();
@@ -49412,27 +53887,27 @@
method public int compareTo(java.nio.CharBuffer);
method public abstract java.nio.CharBuffer duplicate();
method public abstract char get();
- method public java.nio.CharBuffer get(char[]);
- method public java.nio.CharBuffer get(char[], int, int);
method public abstract char get(int);
+ method public java.nio.CharBuffer get(char[], int, int);
+ method public java.nio.CharBuffer get(char[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public final int length();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.CharBuffer put(char);
- method public final java.nio.CharBuffer put(char[]);
- method public java.nio.CharBuffer put(char[], int, int);
- method public java.nio.CharBuffer put(java.nio.CharBuffer);
method public abstract java.nio.CharBuffer put(int, char);
- method public final java.nio.CharBuffer put(java.lang.String);
+ method public java.nio.CharBuffer put(java.nio.CharBuffer);
+ method public java.nio.CharBuffer put(char[], int, int);
+ method public final java.nio.CharBuffer put(char[]);
method public java.nio.CharBuffer put(java.lang.String, int, int);
+ method public final java.nio.CharBuffer put(java.lang.String);
method public int read(java.nio.CharBuffer) throws java.io.IOException;
method public abstract java.nio.CharBuffer slice();
method public abstract java.nio.CharBuffer subSequence(int, int);
- method public static java.nio.CharBuffer wrap(char[]);
method public static java.nio.CharBuffer wrap(char[], int, int);
- method public static java.nio.CharBuffer wrap(java.lang.CharSequence);
+ method public static java.nio.CharBuffer wrap(char[]);
method public static java.nio.CharBuffer wrap(java.lang.CharSequence, int, int);
+ method public static java.nio.CharBuffer wrap(java.lang.CharSequence);
}
public abstract class DoubleBuffer extends java.nio.Buffer implements java.lang.Comparable {
@@ -49444,20 +53919,20 @@
method public int compareTo(java.nio.DoubleBuffer);
method public abstract java.nio.DoubleBuffer duplicate();
method public abstract double get();
- method public java.nio.DoubleBuffer get(double[]);
- method public java.nio.DoubleBuffer get(double[], int, int);
method public abstract double get(int);
+ method public java.nio.DoubleBuffer get(double[], int, int);
+ method public java.nio.DoubleBuffer get(double[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.DoubleBuffer put(double);
- method public final java.nio.DoubleBuffer put(double[]);
- method public java.nio.DoubleBuffer put(double[], int, int);
- method public java.nio.DoubleBuffer put(java.nio.DoubleBuffer);
method public abstract java.nio.DoubleBuffer put(int, double);
+ method public java.nio.DoubleBuffer put(java.nio.DoubleBuffer);
+ method public java.nio.DoubleBuffer put(double[], int, int);
+ method public final java.nio.DoubleBuffer put(double[]);
method public abstract java.nio.DoubleBuffer slice();
- method public static java.nio.DoubleBuffer wrap(double[]);
method public static java.nio.DoubleBuffer wrap(double[], int, int);
+ method public static java.nio.DoubleBuffer wrap(double[]);
}
public abstract class FloatBuffer extends java.nio.Buffer implements java.lang.Comparable {
@@ -49469,20 +53944,20 @@
method public int compareTo(java.nio.FloatBuffer);
method public abstract java.nio.FloatBuffer duplicate();
method public abstract float get();
- method public java.nio.FloatBuffer get(float[]);
- method public java.nio.FloatBuffer get(float[], int, int);
method public abstract float get(int);
+ method public java.nio.FloatBuffer get(float[], int, int);
+ method public java.nio.FloatBuffer get(float[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.FloatBuffer put(float);
- method public final java.nio.FloatBuffer put(float[]);
- method public java.nio.FloatBuffer put(float[], int, int);
- method public java.nio.FloatBuffer put(java.nio.FloatBuffer);
method public abstract java.nio.FloatBuffer put(int, float);
+ method public java.nio.FloatBuffer put(java.nio.FloatBuffer);
+ method public java.nio.FloatBuffer put(float[], int, int);
+ method public final java.nio.FloatBuffer put(float[]);
method public abstract java.nio.FloatBuffer slice();
- method public static java.nio.FloatBuffer wrap(float[]);
method public static java.nio.FloatBuffer wrap(float[], int, int);
+ method public static java.nio.FloatBuffer wrap(float[]);
}
public abstract class IntBuffer extends java.nio.Buffer implements java.lang.Comparable {
@@ -49494,20 +53969,20 @@
method public int compareTo(java.nio.IntBuffer);
method public abstract java.nio.IntBuffer duplicate();
method public abstract int get();
- method public java.nio.IntBuffer get(int[]);
- method public java.nio.IntBuffer get(int[], int, int);
method public abstract int get(int);
+ method public java.nio.IntBuffer get(int[], int, int);
+ method public java.nio.IntBuffer get(int[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.IntBuffer put(int);
- method public final java.nio.IntBuffer put(int[]);
- method public java.nio.IntBuffer put(int[], int, int);
- method public java.nio.IntBuffer put(java.nio.IntBuffer);
method public abstract java.nio.IntBuffer put(int, int);
+ method public java.nio.IntBuffer put(java.nio.IntBuffer);
+ method public java.nio.IntBuffer put(int[], int, int);
+ method public final java.nio.IntBuffer put(int[]);
method public abstract java.nio.IntBuffer slice();
- method public static java.nio.IntBuffer wrap(int[]);
method public static java.nio.IntBuffer wrap(int[], int, int);
+ method public static java.nio.IntBuffer wrap(int[]);
}
public class InvalidMarkException extends java.lang.IllegalStateException {
@@ -49523,20 +53998,20 @@
method public int compareTo(java.nio.LongBuffer);
method public abstract java.nio.LongBuffer duplicate();
method public abstract long get();
- method public java.nio.LongBuffer get(long[]);
- method public java.nio.LongBuffer get(long[], int, int);
method public abstract long get(int);
+ method public java.nio.LongBuffer get(long[], int, int);
+ method public java.nio.LongBuffer get(long[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.LongBuffer put(long);
- method public final java.nio.LongBuffer put(long[]);
- method public java.nio.LongBuffer put(long[], int, int);
- method public java.nio.LongBuffer put(java.nio.LongBuffer);
method public abstract java.nio.LongBuffer put(int, long);
+ method public java.nio.LongBuffer put(java.nio.LongBuffer);
+ method public java.nio.LongBuffer put(long[], int, int);
+ method public final java.nio.LongBuffer put(long[]);
method public abstract java.nio.LongBuffer slice();
- method public static java.nio.LongBuffer wrap(long[]);
method public static java.nio.LongBuffer wrap(long[], int, int);
+ method public static java.nio.LongBuffer wrap(long[]);
}
public abstract class MappedByteBuffer extends java.nio.ByteBuffer {
@@ -49558,34 +54033,119 @@
method public int compareTo(java.nio.ShortBuffer);
method public abstract java.nio.ShortBuffer duplicate();
method public abstract short get();
- method public java.nio.ShortBuffer get(short[]);
- method public java.nio.ShortBuffer get(short[], int, int);
method public abstract short get(int);
+ method public java.nio.ShortBuffer get(short[], int, int);
+ method public java.nio.ShortBuffer get(short[]);
method public final boolean hasArray();
method public abstract boolean isDirect();
method public abstract java.nio.ByteOrder order();
method public abstract java.nio.ShortBuffer put(short);
- method public final java.nio.ShortBuffer put(short[]);
- method public java.nio.ShortBuffer put(short[], int, int);
- method public java.nio.ShortBuffer put(java.nio.ShortBuffer);
method public abstract java.nio.ShortBuffer put(int, short);
+ method public java.nio.ShortBuffer put(java.nio.ShortBuffer);
+ method public java.nio.ShortBuffer put(short[], int, int);
+ method public final java.nio.ShortBuffer put(short[]);
method public abstract java.nio.ShortBuffer slice();
- method public static java.nio.ShortBuffer wrap(short[]);
method public static java.nio.ShortBuffer wrap(short[], int, int);
+ method public static java.nio.ShortBuffer wrap(short[]);
}
}
package java.nio.channels {
+ public class AcceptPendingException extends java.lang.IllegalStateException {
+ ctor public AcceptPendingException();
+ }
+
+ public class AlreadyBoundException extends java.lang.IllegalStateException {
+ ctor public AlreadyBoundException();
+ }
+
public class AlreadyConnectedException extends java.lang.IllegalStateException {
ctor public AlreadyConnectedException();
}
+ public abstract interface AsynchronousByteChannel implements java.nio.channels.AsynchronousChannel {
+ method public abstract void read(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer);
+ method public abstract void write(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer);
+ }
+
+ public abstract interface AsynchronousChannel implements java.nio.channels.Channel {
+ method public abstract void close() throws java.io.IOException;
+ }
+
+ public abstract class AsynchronousChannelGroup {
+ ctor protected AsynchronousChannelGroup(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract boolean awaitTermination(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract boolean isShutdown();
+ method public abstract boolean isTerminated();
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract void shutdown();
+ method public abstract void shutdownNow() throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withCachedThreadPool(java.util.concurrent.ExecutorService, int) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withFixedThreadPool(int, java.util.concurrent.ThreadFactory) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withThreadPool(java.util.concurrent.ExecutorService) throws java.io.IOException;
+ }
+
public class AsynchronousCloseException extends java.nio.channels.ClosedChannelException {
ctor public AsynchronousCloseException();
}
+ public abstract class AsynchronousFileChannel implements java.nio.channels.AsynchronousChannel {
+ ctor protected AsynchronousFileChannel();
+ method public abstract void force(boolean) throws java.io.IOException;
+ method public abstract void lock(long, long, boolean, A, java.nio.channels.CompletionHandler<java.nio.channels.FileLock, ? super A>);
+ method public final void lock(A, java.nio.channels.CompletionHandler<java.nio.channels.FileLock, ? super A>);
+ method public abstract java.util.concurrent.Future<java.nio.channels.FileLock> lock(long, long, boolean);
+ method public final java.util.concurrent.Future<java.nio.channels.FileLock> lock();
+ method public static java.nio.channels.AsynchronousFileChannel open(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.util.concurrent.ExecutorService, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousFileChannel open(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract void read(java.nio.ByteBuffer, long, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer, long);
+ method public abstract long size() throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousFileChannel truncate(long) throws java.io.IOException;
+ method public abstract java.nio.channels.FileLock tryLock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
+ method public abstract void write(java.nio.ByteBuffer, long, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer, long);
+ }
+
+ public abstract class AsynchronousServerSocketChannel implements java.nio.channels.AsynchronousChannel java.nio.channels.NetworkChannel {
+ ctor protected AsynchronousServerSocketChannel(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract void accept(A, java.nio.channels.CompletionHandler<java.nio.channels.AsynchronousSocketChannel, ? super A>);
+ method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();
+ method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ }
+
+ public abstract class AsynchronousSocketChannel implements java.nio.channels.AsynchronousByteChannel java.nio.channels.NetworkChannel {
+ ctor protected AsynchronousSocketChannel(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract void read(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public final void read(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer);
+ method public abstract void read(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Long, ? super A>);
+ method public abstract java.nio.channels.AsynchronousSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel shutdownInput() throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel shutdownOutput() throws java.io.IOException;
+ method public abstract void write(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public final void write(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer);
+ method public abstract void write(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Long, ? super A>);
+ }
+
public abstract interface ByteChannel implements java.nio.channels.ReadableByteChannel java.nio.channels.WritableByteChannel {
}
@@ -49602,7 +54162,9 @@
method public static java.nio.channels.ReadableByteChannel newChannel(java.io.InputStream);
method public static java.nio.channels.WritableByteChannel newChannel(java.io.OutputStream);
method public static java.io.InputStream newInputStream(java.nio.channels.ReadableByteChannel);
+ method public static java.io.InputStream newInputStream(java.nio.channels.AsynchronousByteChannel);
method public static java.io.OutputStream newOutputStream(java.nio.channels.WritableByteChannel);
+ method public static java.io.OutputStream newOutputStream(java.nio.channels.AsynchronousByteChannel);
method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.nio.charset.CharsetDecoder, int);
method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.lang.String);
method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, java.nio.charset.CharsetEncoder, int);
@@ -49621,50 +54183,61 @@
ctor public ClosedSelectorException();
}
+ public abstract interface CompletionHandler {
+ method public abstract void completed(V, A);
+ method public abstract void failed(java.lang.Throwable, A);
+ }
+
public class ConnectionPendingException extends java.lang.IllegalStateException {
ctor public ConnectionPendingException();
}
- public abstract class DatagramChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel {
+ public abstract class DatagramChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.MulticastChannel java.nio.channels.ScatteringByteChannel {
ctor protected DatagramChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
+ method public static java.nio.channels.DatagramChannel open(java.net.ProtocolFamily) throws java.io.IOException;
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract java.net.SocketAddress receive(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract int send(java.nio.ByteBuffer, java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.DatagramSocket socket();
method public final int validOps();
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
}
- public abstract class FileChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel {
+ public abstract class FileChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel java.nio.channels.SeekableByteChannel {
ctor protected FileChannel();
method public abstract void force(boolean) throws java.io.IOException;
- method public final java.nio.channels.FileLock lock() throws java.io.IOException;
method public abstract java.nio.channels.FileLock lock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock lock() throws java.io.IOException;
method public abstract java.nio.MappedByteBuffer map(java.nio.channels.FileChannel.MapMode, long, long) throws java.io.IOException;
+ method public static java.nio.channels.FileChannel open(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.FileChannel open(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
method public abstract long position() throws java.io.IOException;
method public abstract java.nio.channels.FileChannel position(long) throws java.io.IOException;
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
- method public abstract int read(java.nio.ByteBuffer, long) throws java.io.IOException;
- method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer, long) throws java.io.IOException;
method public abstract long size() throws java.io.IOException;
method public abstract long transferFrom(java.nio.channels.ReadableByteChannel, long, long) throws java.io.IOException;
method public abstract long transferTo(long, long, java.nio.channels.WritableByteChannel) throws java.io.IOException;
method public abstract java.nio.channels.FileChannel truncate(long) throws java.io.IOException;
- method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
method public abstract java.nio.channels.FileLock tryLock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
- method public abstract int write(java.nio.ByteBuffer, long) throws java.io.IOException;
- method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer, long) throws java.io.IOException;
}
public static class FileChannel.MapMode {
@@ -49675,6 +54248,8 @@
public abstract class FileLock implements java.lang.AutoCloseable {
ctor protected FileLock(java.nio.channels.FileChannel, long, long, boolean);
+ ctor protected FileLock(java.nio.channels.AsynchronousFileChannel, long, long, boolean);
+ method public java.nio.channels.Channel acquiredBy();
method public final java.nio.channels.FileChannel channel();
method public final void close() throws java.io.IOException;
method public final boolean isShared();
@@ -49691,22 +54266,56 @@
}
public abstract interface GatheringByteChannel implements java.nio.channels.WritableByteChannel {
- method public abstract long write(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public abstract long write(java.nio.ByteBuffer[]) throws java.io.IOException;
}
public class IllegalBlockingModeException extends java.lang.IllegalStateException {
ctor public IllegalBlockingModeException();
}
+ public class IllegalChannelGroupException extends java.lang.IllegalArgumentException {
+ ctor public IllegalChannelGroupException();
+ }
+
public class IllegalSelectorException extends java.lang.IllegalArgumentException {
ctor public IllegalSelectorException();
}
+ public class InterruptedByTimeoutException extends java.io.IOException {
+ ctor public InterruptedByTimeoutException();
+ }
+
public abstract interface InterruptibleChannel implements java.nio.channels.Channel {
method public abstract void close() throws java.io.IOException;
}
+ public abstract class MembershipKey {
+ ctor protected MembershipKey();
+ method public abstract java.nio.channels.MembershipKey block(java.net.InetAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.MulticastChannel channel();
+ method public abstract void drop();
+ method public abstract java.net.InetAddress group();
+ method public abstract boolean isValid();
+ method public abstract java.net.NetworkInterface networkInterface();
+ method public abstract java.net.InetAddress sourceAddress();
+ method public abstract java.nio.channels.MembershipKey unblock(java.net.InetAddress);
+ }
+
+ public abstract interface MulticastChannel implements java.nio.channels.NetworkChannel {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.nio.channels.MembershipKey join(java.net.InetAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method public abstract java.nio.channels.MembershipKey join(java.net.InetAddress, java.net.NetworkInterface, java.net.InetAddress) throws java.io.IOException;
+ }
+
+ public abstract interface NetworkChannel implements java.nio.channels.Channel {
+ method public abstract java.nio.channels.NetworkChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
+ method public abstract T getOption(java.net.SocketOption<T>) throws java.io.IOException;
+ method public abstract java.nio.channels.NetworkChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.util.Set<java.net.SocketOption<?>> supportedOptions();
+ }
+
public class NoConnectionPendingException extends java.lang.IllegalStateException {
ctor public NoConnectionPendingException();
}
@@ -49748,13 +54357,26 @@
method public final int validOps();
}
+ public class ReadPendingException extends java.lang.IllegalStateException {
+ ctor public ReadPendingException();
+ }
+
public abstract interface ReadableByteChannel implements java.nio.channels.Channel {
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
}
public abstract interface ScatteringByteChannel implements java.nio.channels.ReadableByteChannel {
- method public abstract long read(java.nio.ByteBuffer[]) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public abstract long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ }
+
+ public abstract interface SeekableByteChannel implements java.nio.channels.ByteChannel {
+ method public abstract long position() throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel position(long) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long size() throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel truncate(long) throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
}
public abstract class SelectableChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.Channel {
@@ -49765,8 +54387,8 @@
method public abstract boolean isRegistered();
method public abstract java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
method public abstract java.nio.channels.spi.SelectorProvider provider();
- method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int) throws java.nio.channels.ClosedChannelException;
method public abstract java.nio.channels.SelectionKey register(java.nio.channels.Selector, int, java.lang.Object) throws java.nio.channels.ClosedChannelException;
+ method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int) throws java.nio.channels.ClosedChannelException;
method public abstract int validOps();
}
@@ -49798,37 +54420,49 @@
method public abstract java.util.Set<java.nio.channels.SelectionKey> keys();
method public static java.nio.channels.Selector open() throws java.io.IOException;
method public abstract java.nio.channels.spi.SelectorProvider provider();
- method public abstract int select() throws java.io.IOException;
method public abstract int select(long) throws java.io.IOException;
+ method public abstract int select() throws java.io.IOException;
method public abstract int selectNow() throws java.io.IOException;
method public abstract java.util.Set<java.nio.channels.SelectionKey> selectedKeys();
method public abstract java.nio.channels.Selector wakeup();
}
- public abstract class ServerSocketChannel extends java.nio.channels.spi.AbstractSelectableChannel {
+ public abstract class ServerSocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.NetworkChannel {
ctor protected ServerSocketChannel(java.nio.channels.spi.SelectorProvider);
method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;
+ method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
method public abstract java.net.ServerSocket socket();
method public final int validOps();
}
- public abstract class SocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel {
+ public class ShutdownChannelGroupException extends java.lang.IllegalStateException {
+ ctor public ShutdownChannelGroupException();
+ }
+
+ public abstract class SocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.NetworkChannel java.nio.channels.ScatteringByteChannel {
ctor protected SocketChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;
method public abstract boolean finishConnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
method public abstract boolean isConnected();
method public abstract boolean isConnectionPending();
method public static java.nio.channels.SocketChannel open() throws java.io.IOException;
method public static java.nio.channels.SocketChannel open(java.net.SocketAddress) throws java.io.IOException;
method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel shutdownInput() throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel shutdownOutput() throws java.io.IOException;
method public abstract java.net.Socket socket();
method public final int validOps();
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
- method public final synchronized long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
}
public class UnresolvedAddressException extends java.lang.IllegalArgumentException {
@@ -49843,6 +54477,10 @@
method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
}
+ public class WritePendingException extends java.lang.IllegalStateException {
+ ctor public WritePendingException();
+ }
+
}
package java.nio.channels.spi {
@@ -49853,19 +54491,19 @@
method public final void close() throws java.io.IOException;
method protected final void end(boolean) throws java.nio.channels.AsynchronousCloseException;
method protected abstract void implCloseChannel() throws java.io.IOException;
- method public final synchronized boolean isOpen();
+ method public final boolean isOpen();
}
public abstract class AbstractSelectableChannel extends java.nio.channels.SelectableChannel {
ctor protected AbstractSelectableChannel(java.nio.channels.spi.SelectorProvider);
method public final java.lang.Object blockingLock();
method public final java.nio.channels.SelectableChannel configureBlocking(boolean) throws java.io.IOException;
- method protected final synchronized void implCloseChannel() throws java.io.IOException;
+ method protected final void implCloseChannel() throws java.io.IOException;
method protected abstract void implCloseSelectableChannel() throws java.io.IOException;
method protected abstract void implConfigureBlocking(boolean) throws java.io.IOException;
method public final boolean isBlocking();
- method public final synchronized boolean isRegistered();
- method public final synchronized java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
+ method public final boolean isRegistered();
+ method public final java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
method public final java.nio.channels.spi.SelectorProvider provider();
method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int, java.lang.Object) throws java.nio.channels.ClosedChannelException;
}
@@ -49889,15 +54527,25 @@
method protected abstract java.nio.channels.SelectionKey register(java.nio.channels.spi.AbstractSelectableChannel, int, java.lang.Object);
}
+ public abstract class AsynchronousChannelProvider {
+ ctor protected AsynchronousChannelProvider();
+ method public abstract java.nio.channels.AsynchronousChannelGroup openAsynchronousChannelGroup(int, java.util.concurrent.ThreadFactory) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousChannelGroup openAsynchronousChannelGroup(java.util.concurrent.ExecutorService, int) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel openAsynchronousServerSocketChannel(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel openAsynchronousSocketChannel(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.spi.AsynchronousChannelProvider provider();
+ }
+
public abstract class SelectorProvider {
ctor protected SelectorProvider();
method public java.nio.channels.Channel inheritedChannel() throws java.io.IOException;
method public abstract java.nio.channels.DatagramChannel openDatagramChannel() throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel openDatagramChannel(java.net.ProtocolFamily) throws java.io.IOException;
method public abstract java.nio.channels.Pipe openPipe() throws java.io.IOException;
method public abstract java.nio.channels.spi.AbstractSelector openSelector() throws java.io.IOException;
method public abstract java.nio.channels.ServerSocketChannel openServerSocketChannel() throws java.io.IOException;
method public abstract java.nio.channels.SocketChannel openSocketChannel() throws java.io.IOException;
- method public static synchronized java.nio.channels.spi.SelectorProvider provider();
+ method public static java.nio.channels.spi.SelectorProvider provider();
}
}
@@ -49936,8 +54584,8 @@
ctor protected CharsetDecoder(java.nio.charset.Charset, float, float);
method public final float averageCharsPerByte();
method public final java.nio.charset.Charset charset();
- method public final java.nio.CharBuffer decode(java.nio.ByteBuffer) throws java.nio.charset.CharacterCodingException;
method public final java.nio.charset.CoderResult decode(java.nio.ByteBuffer, java.nio.CharBuffer, boolean);
+ method public final java.nio.CharBuffer decode(java.nio.ByteBuffer) throws java.nio.charset.CharacterCodingException;
method protected abstract java.nio.charset.CoderResult decodeLoop(java.nio.ByteBuffer, java.nio.CharBuffer);
method public java.nio.charset.Charset detectedCharset();
method public final java.nio.charset.CoderResult flush(java.nio.CharBuffer);
@@ -49959,14 +54607,14 @@
}
public abstract class CharsetEncoder {
- ctor protected CharsetEncoder(java.nio.charset.Charset, float, float);
ctor protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[]);
+ ctor protected CharsetEncoder(java.nio.charset.Charset, float, float);
method public final float averageBytesPerChar();
method public boolean canEncode(char);
method public boolean canEncode(java.lang.CharSequence);
method public final java.nio.charset.Charset charset();
- method public final java.nio.ByteBuffer encode(java.nio.CharBuffer) throws java.nio.charset.CharacterCodingException;
method public final java.nio.charset.CoderResult encode(java.nio.CharBuffer, java.nio.ByteBuffer, boolean);
+ method public final java.nio.ByteBuffer encode(java.nio.CharBuffer) throws java.nio.charset.CharacterCodingException;
method protected abstract java.nio.charset.CoderResult encodeLoop(java.nio.CharBuffer, java.nio.ByteBuffer);
method public final java.nio.charset.CoderResult flush(java.nio.ByteBuffer);
method protected java.nio.charset.CoderResult implFlush(java.nio.ByteBuffer);
@@ -49995,10 +54643,10 @@
method public boolean isOverflow();
method public boolean isUnderflow();
method public boolean isUnmappable();
- method public int length() throws java.lang.UnsupportedOperationException;
- method public static synchronized java.nio.charset.CoderResult malformedForLength(int) throws java.lang.IllegalArgumentException;
- method public void throwException() throws java.nio.BufferOverflowException, java.nio.BufferUnderflowException, java.nio.charset.CharacterCodingException, java.nio.charset.MalformedInputException, java.nio.charset.UnmappableCharacterException;
- method public static synchronized java.nio.charset.CoderResult unmappableForLength(int) throws java.lang.IllegalArgumentException;
+ method public int length();
+ method public static java.nio.charset.CoderResult malformedForLength(int);
+ method public void throwException() throws java.nio.charset.CharacterCodingException;
+ method public static java.nio.charset.CoderResult unmappableForLength(int);
field public static final java.nio.charset.CoderResult OVERFLOW;
field public static final java.nio.charset.CoderResult UNDERFLOW;
}
@@ -50050,11 +54698,597 @@
}
+package java.nio.file {
+
+ public class AccessDeniedException extends java.nio.file.FileSystemException {
+ ctor public AccessDeniedException(java.lang.String);
+ ctor public AccessDeniedException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public final class AccessMode extends java.lang.Enum {
+ method public static java.nio.file.AccessMode valueOf(java.lang.String);
+ method public static final java.nio.file.AccessMode[] values();
+ enum_constant public static final java.nio.file.AccessMode EXECUTE;
+ enum_constant public static final java.nio.file.AccessMode READ;
+ enum_constant public static final java.nio.file.AccessMode WRITE;
+ }
+
+ public class AtomicMoveNotSupportedException extends java.nio.file.FileSystemException {
+ ctor public AtomicMoveNotSupportedException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public class ClosedDirectoryStreamException extends java.lang.IllegalStateException {
+ ctor public ClosedDirectoryStreamException();
+ }
+
+ public class ClosedFileSystemException extends java.lang.IllegalStateException {
+ ctor public ClosedFileSystemException();
+ }
+
+ public class ClosedWatchServiceException extends java.lang.IllegalStateException {
+ ctor public ClosedWatchServiceException();
+ }
+
+ public abstract interface CopyOption {
+ }
+
+ public final class DirectoryIteratorException extends java.util.ConcurrentModificationException {
+ ctor public DirectoryIteratorException(java.io.IOException);
+ }
+
+ public class DirectoryNotEmptyException extends java.nio.file.FileSystemException {
+ ctor public DirectoryNotEmptyException(java.lang.String);
+ }
+
+ public abstract interface DirectoryStream implements java.io.Closeable java.lang.Iterable {
+ method public abstract java.util.Iterator<T> iterator();
+ }
+
+ public static abstract interface DirectoryStream.Filter {
+ method public abstract boolean accept(T) throws java.io.IOException;
+ }
+
+ public class FileAlreadyExistsException extends java.nio.file.FileSystemException {
+ ctor public FileAlreadyExistsException(java.lang.String);
+ ctor public FileAlreadyExistsException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract class FileStore {
+ ctor protected FileStore();
+ method public abstract java.lang.Object getAttribute(java.lang.String) throws java.io.IOException;
+ method public abstract V getFileStoreAttributeView(java.lang.Class<V>);
+ method public abstract long getTotalSpace() throws java.io.IOException;
+ method public abstract long getUnallocatedSpace() throws java.io.IOException;
+ method public abstract long getUsableSpace() throws java.io.IOException;
+ method public abstract boolean isReadOnly();
+ method public abstract java.lang.String name();
+ method public abstract boolean supportsFileAttributeView(java.lang.Class<? extends java.nio.file.attribute.FileAttributeView>);
+ method public abstract boolean supportsFileAttributeView(java.lang.String);
+ method public abstract java.lang.String type();
+ }
+
+ public abstract class FileSystem implements java.io.Closeable {
+ ctor protected FileSystem();
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.lang.Iterable<java.nio.file.FileStore> getFileStores();
+ method public abstract java.nio.file.Path getPath(java.lang.String, java.lang.String...);
+ method public abstract java.nio.file.PathMatcher getPathMatcher(java.lang.String);
+ method public abstract java.lang.Iterable<java.nio.file.Path> getRootDirectories();
+ method public abstract java.lang.String getSeparator();
+ method public abstract java.nio.file.attribute.UserPrincipalLookupService getUserPrincipalLookupService();
+ method public abstract boolean isOpen();
+ method public abstract boolean isReadOnly();
+ method public abstract java.nio.file.WatchService newWatchService() throws java.io.IOException;
+ method public abstract java.nio.file.spi.FileSystemProvider provider();
+ method public abstract java.util.Set<java.lang.String> supportedFileAttributeViews();
+ }
+
+ public class FileSystemAlreadyExistsException extends java.lang.RuntimeException {
+ ctor public FileSystemAlreadyExistsException();
+ ctor public FileSystemAlreadyExistsException(java.lang.String);
+ }
+
+ public class FileSystemException extends java.io.IOException {
+ ctor public FileSystemException(java.lang.String);
+ ctor public FileSystemException(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String getFile();
+ method public java.lang.String getOtherFile();
+ method public java.lang.String getReason();
+ }
+
+ public class FileSystemLoopException extends java.nio.file.FileSystemException {
+ ctor public FileSystemLoopException(java.lang.String);
+ }
+
+ public class FileSystemNotFoundException extends java.lang.RuntimeException {
+ ctor public FileSystemNotFoundException();
+ ctor public FileSystemNotFoundException(java.lang.String);
+ }
+
+ public final class FileSystems {
+ method public static java.nio.file.FileSystem getDefault();
+ method public static java.nio.file.FileSystem getFileSystem(java.net.URI);
+ method public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>, java.lang.ClassLoader) throws java.io.IOException;
+ method public static java.nio.file.FileSystem newFileSystem(java.nio.file.Path, java.lang.ClassLoader) throws java.io.IOException;
+ }
+
+ public final class FileVisitOption extends java.lang.Enum {
+ method public static java.nio.file.FileVisitOption valueOf(java.lang.String);
+ method public static final java.nio.file.FileVisitOption[] values();
+ enum_constant public static final java.nio.file.FileVisitOption FOLLOW_LINKS;
+ }
+
+ public final class FileVisitResult extends java.lang.Enum {
+ method public static java.nio.file.FileVisitResult valueOf(java.lang.String);
+ method public static final java.nio.file.FileVisitResult[] values();
+ enum_constant public static final java.nio.file.FileVisitResult CONTINUE;
+ enum_constant public static final java.nio.file.FileVisitResult SKIP_SIBLINGS;
+ enum_constant public static final java.nio.file.FileVisitResult SKIP_SUBTREE;
+ enum_constant public static final java.nio.file.FileVisitResult TERMINATE;
+ }
+
+ public abstract interface FileVisitor {
+ method public abstract java.nio.file.FileVisitResult postVisitDirectory(T, java.io.IOException) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult preVisitDirectory(T, java.nio.file.attribute.BasicFileAttributes) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult visitFile(T, java.nio.file.attribute.BasicFileAttributes) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult visitFileFailed(T, java.io.IOException) throws java.io.IOException;
+ }
+
+ public final class Files {
+ method public static java.nio.file.Path copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static long copy(java.io.InputStream, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static long copy(java.nio.file.Path, java.io.OutputStream) throws java.io.IOException;
+ method public static java.nio.file.Path createDirectories(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createDirectory(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createFile(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createLink(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path createSymbolicLink(java.nio.file.Path, java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempDirectory(java.nio.file.Path, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempDirectory(java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempFile(java.nio.file.Path, java.lang.String, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempFile(java.lang.String, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static void delete(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean deleteIfExists(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean exists(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static java.lang.Object getAttribute(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static V getFileAttributeView(java.nio.file.Path, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public static java.nio.file.FileStore getFileStore(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.attribute.FileTime getLastModifiedTime(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.attribute.UserPrincipal getOwner(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.util.Set<java.nio.file.attribute.PosixFilePermission> getPosixFilePermissions(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static boolean isDirectory(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static boolean isExecutable(java.nio.file.Path);
+ method public static boolean isHidden(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean isReadable(java.nio.file.Path);
+ method public static boolean isRegularFile(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static boolean isSameFile(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public static boolean isSymbolicLink(java.nio.file.Path);
+ method public static boolean isWritable(java.nio.file.Path);
+ method public static java.nio.file.Path move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static java.io.BufferedReader newBufferedReader(java.nio.file.Path, java.nio.charset.Charset) throws java.io.IOException;
+ method public static java.io.BufferedWriter newBufferedWriter(java.nio.file.Path, java.nio.charset.Charset, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.lang.String) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.nio.file.DirectoryStream.Filter<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.io.InputStream newInputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.io.OutputStream newOutputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static boolean notExists(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static java.lang.String probeContentType(java.nio.file.Path) throws java.io.IOException;
+ method public static byte[] readAllBytes(java.nio.file.Path) throws java.io.IOException;
+ method public static java.util.List<java.lang.String> readAllLines(java.nio.file.Path, java.nio.charset.Charset) throws java.io.IOException;
+ method public static A readAttributes(java.nio.file.Path, java.lang.Class<A>, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.util.Map<java.lang.String, java.lang.Object> readAttributes(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.Path readSymbolicLink(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path setAttribute(java.nio.file.Path, java.lang.String, java.lang.Object, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.Path setLastModifiedTime(java.nio.file.Path, java.nio.file.attribute.FileTime) throws java.io.IOException;
+ method public static java.nio.file.Path setOwner(java.nio.file.Path, java.nio.file.attribute.UserPrincipal) throws java.io.IOException;
+ method public static java.nio.file.Path setPosixFilePermissions(java.nio.file.Path, java.util.Set<java.nio.file.attribute.PosixFilePermission>) throws java.io.IOException;
+ method public static long size(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path walkFileTree(java.nio.file.Path, java.util.Set<java.nio.file.FileVisitOption>, int, java.nio.file.FileVisitor<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.nio.file.Path walkFileTree(java.nio.file.Path, java.nio.file.FileVisitor<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.nio.file.Path write(java.nio.file.Path, byte[], java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.file.Path write(java.nio.file.Path, java.lang.Iterable<? extends java.lang.CharSequence>, java.nio.charset.Charset, java.nio.file.OpenOption...) throws java.io.IOException;
+ }
+
+ public class InvalidPathException extends java.lang.IllegalArgumentException {
+ ctor public InvalidPathException(java.lang.String, java.lang.String, int);
+ ctor public InvalidPathException(java.lang.String, java.lang.String);
+ method public int getIndex();
+ method public java.lang.String getInput();
+ method public java.lang.String getReason();
+ }
+
+ public final class LinkOption extends java.lang.Enum implements java.nio.file.CopyOption java.nio.file.OpenOption {
+ method public static java.nio.file.LinkOption valueOf(java.lang.String);
+ method public static final java.nio.file.LinkOption[] values();
+ enum_constant public static final java.nio.file.LinkOption NOFOLLOW_LINKS;
+ }
+
+ public final class LinkPermission extends java.security.BasicPermission {
+ ctor public LinkPermission(java.lang.String);
+ ctor public LinkPermission(java.lang.String, java.lang.String);
+ }
+
+ public class NoSuchFileException extends java.nio.file.FileSystemException {
+ ctor public NoSuchFileException(java.lang.String);
+ ctor public NoSuchFileException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public class NotDirectoryException extends java.nio.file.FileSystemException {
+ ctor public NotDirectoryException(java.lang.String);
+ }
+
+ public class NotLinkException extends java.nio.file.FileSystemException {
+ ctor public NotLinkException(java.lang.String);
+ ctor public NotLinkException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract interface OpenOption {
+ }
+
+ public abstract interface Path implements java.lang.Comparable java.lang.Iterable java.nio.file.Watchable {
+ method public abstract int compareTo(java.nio.file.Path);
+ method public abstract boolean endsWith(java.nio.file.Path);
+ method public abstract boolean endsWith(java.lang.String);
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract java.nio.file.Path getFileName();
+ method public abstract java.nio.file.FileSystem getFileSystem();
+ method public abstract java.nio.file.Path getName(int);
+ method public abstract int getNameCount();
+ method public abstract java.nio.file.Path getParent();
+ method public abstract java.nio.file.Path getRoot();
+ method public abstract int hashCode();
+ method public abstract boolean isAbsolute();
+ method public abstract java.util.Iterator<java.nio.file.Path> iterator();
+ method public abstract java.nio.file.Path normalize();
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>[], java.nio.file.WatchEvent.Modifier...) throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.Path relativize(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolve(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolve(java.lang.String);
+ method public abstract java.nio.file.Path resolveSibling(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolveSibling(java.lang.String);
+ method public abstract boolean startsWith(java.nio.file.Path);
+ method public abstract boolean startsWith(java.lang.String);
+ method public abstract java.nio.file.Path subpath(int, int);
+ method public abstract java.nio.file.Path toAbsolutePath();
+ method public abstract java.io.File toFile();
+ method public abstract java.nio.file.Path toRealPath(java.nio.file.LinkOption...) throws java.io.IOException;
+ method public abstract java.lang.String toString();
+ method public abstract java.net.URI toUri();
+ }
+
+ public abstract interface PathMatcher {
+ method public abstract boolean matches(java.nio.file.Path);
+ }
+
+ public final class Paths {
+ method public static java.nio.file.Path get(java.lang.String, java.lang.String...);
+ method public static java.nio.file.Path get(java.net.URI);
+ }
+
+ public class ProviderMismatchException extends java.lang.IllegalArgumentException {
+ ctor public ProviderMismatchException();
+ ctor public ProviderMismatchException(java.lang.String);
+ }
+
+ public class ProviderNotFoundException extends java.lang.RuntimeException {
+ ctor public ProviderNotFoundException();
+ ctor public ProviderNotFoundException(java.lang.String);
+ }
+
+ public class ReadOnlyFileSystemException extends java.lang.UnsupportedOperationException {
+ ctor public ReadOnlyFileSystemException();
+ }
+
+ public abstract interface SecureDirectoryStream implements java.nio.file.DirectoryStream {
+ method public abstract void deleteDirectory(T) throws java.io.IOException;
+ method public abstract void deleteFile(T) throws java.io.IOException;
+ method public abstract V getFileAttributeView(java.lang.Class<V>);
+ method public abstract V getFileAttributeView(T, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public abstract void move(T, java.nio.file.SecureDirectoryStream<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel newByteChannel(T, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.SecureDirectoryStream<T> newDirectoryStream(T, java.nio.file.LinkOption...) throws java.io.IOException;
+ }
+
+ public final class StandardCopyOption extends java.lang.Enum implements java.nio.file.CopyOption {
+ method public static java.nio.file.StandardCopyOption valueOf(java.lang.String);
+ method public static final java.nio.file.StandardCopyOption[] values();
+ enum_constant public static final java.nio.file.StandardCopyOption ATOMIC_MOVE;
+ enum_constant public static final java.nio.file.StandardCopyOption COPY_ATTRIBUTES;
+ enum_constant public static final java.nio.file.StandardCopyOption REPLACE_EXISTING;
+ }
+
+ public final class StandardOpenOption extends java.lang.Enum implements java.nio.file.OpenOption {
+ method public static java.nio.file.StandardOpenOption valueOf(java.lang.String);
+ method public static final java.nio.file.StandardOpenOption[] values();
+ enum_constant public static final java.nio.file.StandardOpenOption APPEND;
+ enum_constant public static final java.nio.file.StandardOpenOption CREATE;
+ enum_constant public static final java.nio.file.StandardOpenOption CREATE_NEW;
+ enum_constant public static final java.nio.file.StandardOpenOption DELETE_ON_CLOSE;
+ enum_constant public static final java.nio.file.StandardOpenOption DSYNC;
+ enum_constant public static final java.nio.file.StandardOpenOption READ;
+ enum_constant public static final java.nio.file.StandardOpenOption SPARSE;
+ enum_constant public static final java.nio.file.StandardOpenOption SYNC;
+ enum_constant public static final java.nio.file.StandardOpenOption TRUNCATE_EXISTING;
+ enum_constant public static final java.nio.file.StandardOpenOption WRITE;
+ }
+
+ public final class StandardWatchEventKinds {
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_CREATE;
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_DELETE;
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_MODIFY;
+ field public static final java.nio.file.WatchEvent.Kind<java.lang.Object> OVERFLOW;
+ }
+
+ public abstract interface WatchEvent {
+ method public abstract T context();
+ method public abstract int count();
+ method public abstract java.nio.file.WatchEvent.Kind<T> kind();
+ }
+
+ public static abstract interface WatchEvent.Kind {
+ method public abstract java.lang.String name();
+ method public abstract java.lang.Class<T> type();
+ }
+
+ public static abstract interface WatchEvent.Modifier {
+ method public abstract java.lang.String name();
+ }
+
+ public abstract interface WatchKey {
+ method public abstract void cancel();
+ method public abstract boolean isValid();
+ method public abstract java.util.List<java.nio.file.WatchEvent<?>> pollEvents();
+ method public abstract boolean reset();
+ method public abstract java.nio.file.Watchable watchable();
+ }
+
+ public abstract interface WatchService implements java.io.Closeable {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey poll();
+ method public abstract java.nio.file.WatchKey poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract java.nio.file.WatchKey take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface Watchable {
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>[], java.nio.file.WatchEvent.Modifier...) throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>...) throws java.io.IOException;
+ }
+
+}
+
+package java.nio.file.attribute {
+
+ public final class AclEntry {
+ method public java.util.Set<java.nio.file.attribute.AclEntryFlag> flags();
+ method public static java.nio.file.attribute.AclEntry.Builder newBuilder();
+ method public static java.nio.file.attribute.AclEntry.Builder newBuilder(java.nio.file.attribute.AclEntry);
+ method public java.util.Set<java.nio.file.attribute.AclEntryPermission> permissions();
+ method public java.nio.file.attribute.UserPrincipal principal();
+ method public java.nio.file.attribute.AclEntryType type();
+ }
+
+ public static final class AclEntry.Builder {
+ method public java.nio.file.attribute.AclEntry build();
+ method public java.nio.file.attribute.AclEntry.Builder setFlags(java.util.Set<java.nio.file.attribute.AclEntryFlag>);
+ method public java.nio.file.attribute.AclEntry.Builder setFlags(java.nio.file.attribute.AclEntryFlag...);
+ method public java.nio.file.attribute.AclEntry.Builder setPermissions(java.util.Set<java.nio.file.attribute.AclEntryPermission>);
+ method public java.nio.file.attribute.AclEntry.Builder setPermissions(java.nio.file.attribute.AclEntryPermission...);
+ method public java.nio.file.attribute.AclEntry.Builder setPrincipal(java.nio.file.attribute.UserPrincipal);
+ method public java.nio.file.attribute.AclEntry.Builder setType(java.nio.file.attribute.AclEntryType);
+ }
+
+ public final class AclEntryFlag extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryFlag valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryFlag[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag DIRECTORY_INHERIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag FILE_INHERIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag INHERIT_ONLY;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag NO_PROPAGATE_INHERIT;
+ }
+
+ public final class AclEntryPermission extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryPermission valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryPermission[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission APPEND_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission DELETE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission DELETE_CHILD;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission EXECUTE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_ACL;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_ATTRIBUTES;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_NAMED_ATTRS;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission SYNCHRONIZE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_ACL;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_ATTRIBUTES;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_NAMED_ATTRS;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_OWNER;
+ field public static final java.nio.file.attribute.AclEntryPermission ADD_FILE;
+ field public static final java.nio.file.attribute.AclEntryPermission ADD_SUBDIRECTORY;
+ field public static final java.nio.file.attribute.AclEntryPermission LIST_DIRECTORY;
+ }
+
+ public final class AclEntryType extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryType valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryType[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryType ALARM;
+ enum_constant public static final java.nio.file.attribute.AclEntryType ALLOW;
+ enum_constant public static final java.nio.file.attribute.AclEntryType AUDIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryType DENY;
+ }
+
+ public abstract interface AclFileAttributeView implements java.nio.file.attribute.FileOwnerAttributeView {
+ method public abstract java.util.List<java.nio.file.attribute.AclEntry> getAcl() throws java.io.IOException;
+ method public abstract java.lang.String name();
+ method public abstract void setAcl(java.util.List<java.nio.file.attribute.AclEntry>) throws java.io.IOException;
+ }
+
+ public abstract interface AttributeView {
+ method public abstract java.lang.String name();
+ }
+
+ public abstract interface BasicFileAttributeView implements java.nio.file.attribute.FileAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.BasicFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setTimes(java.nio.file.attribute.FileTime, java.nio.file.attribute.FileTime, java.nio.file.attribute.FileTime) throws java.io.IOException;
+ }
+
+ public abstract interface BasicFileAttributes {
+ method public abstract java.nio.file.attribute.FileTime creationTime();
+ method public abstract java.lang.Object fileKey();
+ method public abstract boolean isDirectory();
+ method public abstract boolean isOther();
+ method public abstract boolean isRegularFile();
+ method public abstract boolean isSymbolicLink();
+ method public abstract java.nio.file.attribute.FileTime lastAccessTime();
+ method public abstract java.nio.file.attribute.FileTime lastModifiedTime();
+ method public abstract long size();
+ }
+
+ public abstract interface DosFileAttributeView implements java.nio.file.attribute.BasicFileAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.DosFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setArchive(boolean) throws java.io.IOException;
+ method public abstract void setHidden(boolean) throws java.io.IOException;
+ method public abstract void setReadOnly(boolean) throws java.io.IOException;
+ method public abstract void setSystem(boolean) throws java.io.IOException;
+ }
+
+ public abstract interface DosFileAttributes implements java.nio.file.attribute.BasicFileAttributes {
+ method public abstract boolean isArchive();
+ method public abstract boolean isHidden();
+ method public abstract boolean isReadOnly();
+ method public abstract boolean isSystem();
+ }
+
+ public abstract interface FileAttribute {
+ method public abstract java.lang.String name();
+ method public abstract T value();
+ }
+
+ public abstract interface FileAttributeView implements java.nio.file.attribute.AttributeView {
+ }
+
+ public abstract interface FileOwnerAttributeView implements java.nio.file.attribute.FileAttributeView {
+ method public abstract java.nio.file.attribute.UserPrincipal getOwner() throws java.io.IOException;
+ method public abstract java.lang.String name();
+ method public abstract void setOwner(java.nio.file.attribute.UserPrincipal) throws java.io.IOException;
+ }
+
+ public abstract interface FileStoreAttributeView implements java.nio.file.attribute.AttributeView {
+ }
+
+ public final class FileTime implements java.lang.Comparable {
+ method public int compareTo(java.nio.file.attribute.FileTime);
+ method public static java.nio.file.attribute.FileTime from(long, java.util.concurrent.TimeUnit);
+ method public static java.nio.file.attribute.FileTime fromMillis(long);
+ method public long to(java.util.concurrent.TimeUnit);
+ method public long toMillis();
+ }
+
+ public abstract interface GroupPrincipal implements java.nio.file.attribute.UserPrincipal {
+ }
+
+ public abstract interface PosixFileAttributeView implements java.nio.file.attribute.BasicFileAttributeView java.nio.file.attribute.FileOwnerAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.PosixFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setGroup(java.nio.file.attribute.GroupPrincipal) throws java.io.IOException;
+ method public abstract void setPermissions(java.util.Set<java.nio.file.attribute.PosixFilePermission>) throws java.io.IOException;
+ }
+
+ public abstract interface PosixFileAttributes implements java.nio.file.attribute.BasicFileAttributes {
+ method public abstract java.nio.file.attribute.GroupPrincipal group();
+ method public abstract java.nio.file.attribute.UserPrincipal owner();
+ method public abstract java.util.Set<java.nio.file.attribute.PosixFilePermission> permissions();
+ }
+
+ public final class PosixFilePermission extends java.lang.Enum {
+ method public static java.nio.file.attribute.PosixFilePermission valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.PosixFilePermission[] values();
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_WRITE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_WRITE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_WRITE;
+ }
+
+ public final class PosixFilePermissions {
+ method public static java.nio.file.attribute.FileAttribute<java.util.Set<java.nio.file.attribute.PosixFilePermission>> asFileAttribute(java.util.Set<java.nio.file.attribute.PosixFilePermission>);
+ method public static java.util.Set<java.nio.file.attribute.PosixFilePermission> fromString(java.lang.String);
+ method public static java.lang.String toString(java.util.Set<java.nio.file.attribute.PosixFilePermission>);
+ }
+
+ public abstract interface UserPrincipal implements java.security.Principal {
+ }
+
+ public abstract class UserPrincipalLookupService {
+ ctor protected UserPrincipalLookupService();
+ method public abstract java.nio.file.attribute.GroupPrincipal lookupPrincipalByGroupName(java.lang.String) throws java.io.IOException;
+ method public abstract java.nio.file.attribute.UserPrincipal lookupPrincipalByName(java.lang.String) throws java.io.IOException;
+ }
+
+ public class UserPrincipalNotFoundException extends java.io.IOException {
+ ctor public UserPrincipalNotFoundException(java.lang.String);
+ method public java.lang.String getName();
+ }
+
+}
+
+package java.nio.file.spi {
+
+ public abstract class FileSystemProvider {
+ ctor protected FileSystemProvider();
+ method public abstract void checkAccess(java.nio.file.Path, java.nio.file.AccessMode...) throws java.io.IOException;
+ method public abstract void copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public abstract void createDirectory(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public void createLink(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public void createSymbolicLink(java.nio.file.Path, java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract void delete(java.nio.file.Path) throws java.io.IOException;
+ method public boolean deleteIfExists(java.nio.file.Path) throws java.io.IOException;
+ method public abstract V getFileAttributeView(java.nio.file.Path, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public abstract java.nio.file.FileStore getFileStore(java.nio.file.Path) throws java.io.IOException;
+ method public abstract java.nio.file.FileSystem getFileSystem(java.net.URI);
+ method public abstract java.nio.file.Path getPath(java.net.URI);
+ method public abstract java.lang.String getScheme();
+ method public static java.util.List<java.nio.file.spi.FileSystemProvider> installedProviders();
+ method public abstract boolean isHidden(java.nio.file.Path) throws java.io.IOException;
+ method public abstract boolean isSameFile(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public abstract void move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public java.nio.channels.AsynchronousFileChannel newAsynchronousFileChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.util.concurrent.ExecutorService, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.nio.file.DirectoryStream.Filter<? super java.nio.file.Path>) throws java.io.IOException;
+ method public java.nio.channels.FileChannel newFileChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public java.nio.file.FileSystem newFileSystem(java.nio.file.Path, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public java.io.InputStream newInputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public java.io.OutputStream newOutputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract A readAttributes(java.nio.file.Path, java.lang.Class<A>, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public abstract java.util.Map<java.lang.String, java.lang.Object> readAttributes(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public java.nio.file.Path readSymbolicLink(java.nio.file.Path) throws java.io.IOException;
+ method public abstract void setAttribute(java.nio.file.Path, java.lang.String, java.lang.Object, java.nio.file.LinkOption...) throws java.io.IOException;
+ }
+
+ public abstract class FileTypeDetector {
+ ctor protected FileTypeDetector();
+ method public abstract java.lang.String probeContentType(java.nio.file.Path) throws java.io.IOException;
+ }
+
+}
+
package java.security {
public final class AccessControlContext {
- ctor public AccessControlContext(java.security.AccessControlContext, java.security.DomainCombiner);
ctor public AccessControlContext(java.security.ProtectionDomain[]);
+ ctor public AccessControlContext(java.security.AccessControlContext, java.security.DomainCombiner);
method public void checkPermission(java.security.Permission) throws java.security.AccessControlException;
method public java.security.DomainCombiner getDomainCombiner();
}
@@ -50076,6 +55310,12 @@
method public static java.security.AccessControlContext getContext();
}
+ public abstract interface AlgorithmConstraints {
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.lang.String, java.security.AlgorithmParameters);
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.security.Key);
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.lang.String, java.security.Key, java.security.AlgorithmParameters);
+ }
+
public class AlgorithmParameterGenerator {
ctor protected AlgorithmParameterGenerator(java.security.AlgorithmParameterGeneratorSpi, java.security.Provider, java.lang.String);
method public final java.security.AlgorithmParameters generateParameters();
@@ -50125,9 +55365,11 @@
}
public final class AllPermission extends java.security.Permission {
- ctor public AllPermission(java.lang.String, java.lang.String);
ctor public AllPermission();
+ ctor public AllPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -50141,7 +55383,9 @@
public abstract class BasicPermission extends java.security.Permission implements java.io.Serializable {
ctor public BasicPermission(java.lang.String);
ctor public BasicPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -50170,9 +55414,24 @@
method public boolean implies(java.security.CodeSource);
}
+ public final class CryptoPrimitive extends java.lang.Enum {
+ method public static java.security.CryptoPrimitive valueOf(java.lang.String);
+ method public static final java.security.CryptoPrimitive[] values();
+ enum_constant public static final java.security.CryptoPrimitive BLOCK_CIPHER;
+ enum_constant public static final java.security.CryptoPrimitive KEY_AGREEMENT;
+ enum_constant public static final java.security.CryptoPrimitive KEY_ENCAPSULATION;
+ enum_constant public static final java.security.CryptoPrimitive KEY_WRAP;
+ enum_constant public static final java.security.CryptoPrimitive MAC;
+ enum_constant public static final java.security.CryptoPrimitive MESSAGE_DIGEST;
+ enum_constant public static final java.security.CryptoPrimitive PUBLIC_KEY_ENCRYPTION;
+ enum_constant public static final java.security.CryptoPrimitive SECURE_RANDOM;
+ enum_constant public static final java.security.CryptoPrimitive SIGNATURE;
+ enum_constant public static final java.security.CryptoPrimitive STREAM_CIPHER;
+ }
+
public class DigestException extends java.security.GeneralSecurityException {
- ctor public DigestException(java.lang.String);
ctor public DigestException();
+ ctor public DigestException(java.lang.String);
ctor public DigestException(java.lang.String, java.lang.Throwable);
ctor public DigestException(java.lang.Throwable);
}
@@ -50198,8 +55457,8 @@
}
public class GeneralSecurityException extends java.lang.Exception {
- ctor public GeneralSecurityException(java.lang.String);
ctor public GeneralSecurityException();
+ ctor public GeneralSecurityException(java.lang.String);
ctor public GeneralSecurityException(java.lang.String, java.lang.Throwable);
ctor public GeneralSecurityException(java.lang.Throwable);
}
@@ -50215,8 +55474,8 @@
public abstract deprecated class Identity implements java.security.Principal java.io.Serializable {
ctor protected Identity();
- ctor public Identity(java.lang.String);
ctor public Identity(java.lang.String, java.security.IdentityScope) throws java.security.KeyManagementException;
+ ctor public Identity(java.lang.String);
method public void addCertificate(java.security.Certificate) throws java.security.KeyManagementException;
method public java.security.Certificate[] certificates();
method public final boolean equals(java.lang.Object);
@@ -50247,22 +55506,22 @@
}
public class InvalidAlgorithmParameterException extends java.security.GeneralSecurityException {
- ctor public InvalidAlgorithmParameterException(java.lang.String);
ctor public InvalidAlgorithmParameterException();
+ ctor public InvalidAlgorithmParameterException(java.lang.String);
ctor public InvalidAlgorithmParameterException(java.lang.String, java.lang.Throwable);
ctor public InvalidAlgorithmParameterException(java.lang.Throwable);
}
public class InvalidKeyException extends java.security.KeyException {
- ctor public InvalidKeyException(java.lang.String);
ctor public InvalidKeyException();
+ ctor public InvalidKeyException(java.lang.String);
ctor public InvalidKeyException(java.lang.String, java.lang.Throwable);
ctor public InvalidKeyException(java.lang.Throwable);
}
public class InvalidParameterException extends java.lang.IllegalArgumentException {
- ctor public InvalidParameterException(java.lang.String);
ctor public InvalidParameterException();
+ ctor public InvalidParameterException(java.lang.String);
}
public abstract interface Key implements java.io.Serializable {
@@ -50273,8 +55532,8 @@
}
public class KeyException extends java.security.GeneralSecurityException {
- ctor public KeyException(java.lang.String);
ctor public KeyException();
+ ctor public KeyException(java.lang.String);
ctor public KeyException(java.lang.String, java.lang.Throwable);
ctor public KeyException(java.lang.Throwable);
}
@@ -50301,8 +55560,8 @@
}
public class KeyManagementException extends java.security.KeyException {
- ctor public KeyManagementException(java.lang.String);
ctor public KeyManagementException();
+ ctor public KeyManagementException(java.lang.String);
ctor public KeyManagementException(java.lang.String, java.lang.Throwable);
ctor public KeyManagementException(java.lang.Throwable);
}
@@ -50323,8 +55582,8 @@
method public static java.security.KeyPairGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
method public void initialize(int);
- method public void initialize(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
method public void initialize(int, java.security.SecureRandom);
+ method public void initialize(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
}
public abstract class KeyPairGeneratorSpi {
@@ -50427,8 +55686,8 @@
}
public class KeyStoreException extends java.security.GeneralSecurityException {
- ctor public KeyStoreException(java.lang.String);
ctor public KeyStoreException();
+ ctor public KeyStoreException(java.lang.String);
ctor public KeyStoreException(java.lang.String, java.lang.Throwable);
ctor public KeyStoreException(java.lang.Throwable);
}
@@ -50490,22 +55749,24 @@
}
public class NoSuchAlgorithmException extends java.security.GeneralSecurityException {
- ctor public NoSuchAlgorithmException(java.lang.String);
ctor public NoSuchAlgorithmException();
+ ctor public NoSuchAlgorithmException(java.lang.String);
ctor public NoSuchAlgorithmException(java.lang.String, java.lang.Throwable);
ctor public NoSuchAlgorithmException(java.lang.Throwable);
}
public class NoSuchProviderException extends java.security.GeneralSecurityException {
- ctor public NoSuchProviderException(java.lang.String);
ctor public NoSuchProviderException();
+ ctor public NoSuchProviderException(java.lang.String);
}
public abstract class Permission implements java.security.Guard java.io.Serializable {
ctor public Permission(java.lang.String);
method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;
+ method public abstract boolean equals(java.lang.Object);
method public abstract java.lang.String getActions();
method public final java.lang.String getName();
+ method public abstract int hashCode();
method public abstract boolean implies(java.security.Permission);
method public java.security.PermissionCollection newPermissionCollection();
}
@@ -50613,8 +55874,8 @@
}
public class ProviderException extends java.lang.RuntimeException {
- ctor public ProviderException(java.lang.String);
ctor public ProviderException();
+ ctor public ProviderException(java.lang.String);
ctor public ProviderException(java.lang.String, java.lang.Throwable);
ctor public ProviderException(java.lang.Throwable);
}
@@ -50624,8 +55885,8 @@
}
public class SecureClassLoader extends java.lang.ClassLoader {
- ctor protected SecureClassLoader();
ctor protected SecureClassLoader(java.lang.ClassLoader);
+ ctor protected SecureClassLoader();
method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int, java.security.CodeSource);
method protected final java.lang.Class<?> defineClass(java.lang.String, java.nio.ByteBuffer, java.security.CodeSource);
method protected java.security.PermissionCollection getPermissions(java.security.CodeSource);
@@ -50658,10 +55919,10 @@
method public static deprecated java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String);
method public static java.util.Set<java.lang.String> getAlgorithms(java.lang.String);
method public static java.lang.String getProperty(java.lang.String);
- method public static synchronized java.security.Provider getProvider(java.lang.String);
- method public static synchronized java.security.Provider[] getProviders();
+ method public static java.security.Provider getProvider(java.lang.String);
+ method public static java.security.Provider[] getProviders();
method public static java.security.Provider[] getProviders(java.lang.String);
- method public static synchronized java.security.Provider[] getProviders(java.util.Map<java.lang.String, java.lang.String>);
+ method public static java.security.Provider[] getProviders(java.util.Map<java.lang.String, java.lang.String>);
method public static synchronized int insertProviderAt(java.security.Provider, int);
method public static synchronized void removeProvider(java.lang.String);
method public static void setProperty(java.lang.String, java.lang.String);
@@ -50675,6 +55936,7 @@
public abstract class Signature extends java.security.SignatureSpi {
ctor protected Signature(java.lang.String);
method public final java.lang.String getAlgorithm();
+ method public java.security.SignatureSpi getCurrentSpi();
method public static java.security.Signature getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static java.security.Signature getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static java.security.Signature getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
@@ -50702,8 +55964,8 @@
}
public class SignatureException extends java.security.GeneralSecurityException {
- ctor public SignatureException(java.lang.String);
ctor public SignatureException();
+ ctor public SignatureException(java.lang.String);
ctor public SignatureException(java.lang.String, java.lang.Throwable);
ctor public SignatureException(java.lang.Throwable);
}
@@ -50756,17 +56018,19 @@
}
public class UnrecoverableKeyException extends java.security.UnrecoverableEntryException {
- ctor public UnrecoverableKeyException(java.lang.String);
ctor public UnrecoverableKeyException();
+ ctor public UnrecoverableKeyException(java.lang.String);
}
public final class UnresolvedPermission extends java.security.Permission implements java.io.Serializable {
ctor public UnresolvedPermission(java.lang.String, java.lang.String, java.lang.String, java.security.cert.Certificate[]);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
method public java.lang.String getUnresolvedActions();
method public java.security.cert.Certificate[] getUnresolvedCerts();
method public java.lang.String getUnresolvedName();
method public java.lang.String getUnresolvedType();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -50840,12 +56104,28 @@
}
public class CRLException extends java.security.GeneralSecurityException {
- ctor public CRLException(java.lang.String);
ctor public CRLException();
+ ctor public CRLException(java.lang.String);
ctor public CRLException(java.lang.String, java.lang.Throwable);
ctor public CRLException(java.lang.Throwable);
}
+ public final class CRLReason extends java.lang.Enum {
+ method public static java.security.cert.CRLReason valueOf(java.lang.String);
+ method public static final java.security.cert.CRLReason[] values();
+ enum_constant public static final java.security.cert.CRLReason AA_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason AFFILIATION_CHANGED;
+ enum_constant public static final java.security.cert.CRLReason CA_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason CERTIFICATE_HOLD;
+ enum_constant public static final java.security.cert.CRLReason CESSATION_OF_OPERATION;
+ enum_constant public static final java.security.cert.CRLReason KEY_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason PRIVILEGE_WITHDRAWN;
+ enum_constant public static final java.security.cert.CRLReason REMOVE_FROM_CRL;
+ enum_constant public static final java.security.cert.CRLReason SUPERSEDED;
+ enum_constant public static final java.security.cert.CRLReason UNSPECIFIED;
+ enum_constant public static final java.security.cert.CRLReason UNUSED;
+ }
+
public abstract interface CRLSelector implements java.lang.Cloneable {
method public abstract java.lang.Object clone();
method public abstract boolean match(java.security.cert.CRL);
@@ -50878,10 +56158,10 @@
}
public class CertPathBuilderException extends java.security.GeneralSecurityException {
- ctor public CertPathBuilderException(java.lang.String, java.lang.Throwable);
- ctor public CertPathBuilderException(java.lang.Throwable);
- ctor public CertPathBuilderException(java.lang.String);
ctor public CertPathBuilderException();
+ ctor public CertPathBuilderException(java.lang.String);
+ ctor public CertPathBuilderException(java.lang.Throwable);
+ ctor public CertPathBuilderException(java.lang.String, java.lang.Throwable);
}
public abstract interface CertPathBuilderResult implements java.lang.Cloneable {
@@ -50910,13 +56190,30 @@
}
public class CertPathValidatorException extends java.security.GeneralSecurityException {
- ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int);
- ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable);
- ctor public CertPathValidatorException(java.lang.Throwable);
- ctor public CertPathValidatorException(java.lang.String);
ctor public CertPathValidatorException();
+ ctor public CertPathValidatorException(java.lang.String);
+ ctor public CertPathValidatorException(java.lang.Throwable);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int, java.security.cert.CertPathValidatorException.Reason);
method public java.security.cert.CertPath getCertPath();
method public int getIndex();
+ method public java.security.cert.CertPathValidatorException.Reason getReason();
+ }
+
+ public static final class CertPathValidatorException.BasicReason extends java.lang.Enum implements java.security.cert.CertPathValidatorException.Reason {
+ method public static java.security.cert.CertPathValidatorException.BasicReason valueOf(java.lang.String);
+ method public static final java.security.cert.CertPathValidatorException.BasicReason[] values();
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason ALGORITHM_CONSTRAINED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason EXPIRED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason INVALID_SIGNATURE;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason NOT_YET_VALID;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason REVOKED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason UNDETERMINED_REVOCATION_STATUS;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason UNSPECIFIED;
+ }
+
+ public static abstract interface CertPathValidatorException.Reason implements java.io.Serializable {
}
public abstract interface CertPathValidatorResult implements java.lang.Cloneable {
@@ -50947,10 +56244,10 @@
}
public class CertStoreException extends java.security.GeneralSecurityException {
- ctor public CertStoreException(java.lang.String, java.lang.Throwable);
- ctor public CertStoreException(java.lang.Throwable);
- ctor public CertStoreException(java.lang.String);
ctor public CertStoreException();
+ ctor public CertStoreException(java.lang.String);
+ ctor public CertStoreException(java.lang.Throwable);
+ ctor public CertStoreException(java.lang.String, java.lang.Throwable);
}
public abstract interface CertStoreParameters implements java.lang.Cloneable {
@@ -50980,22 +56277,22 @@
}
public class CertificateEncodingException extends java.security.cert.CertificateException {
- ctor public CertificateEncodingException(java.lang.String);
ctor public CertificateEncodingException();
+ ctor public CertificateEncodingException(java.lang.String);
ctor public CertificateEncodingException(java.lang.String, java.lang.Throwable);
ctor public CertificateEncodingException(java.lang.Throwable);
}
public class CertificateException extends java.security.GeneralSecurityException {
- ctor public CertificateException(java.lang.String);
ctor public CertificateException();
+ ctor public CertificateException(java.lang.String);
ctor public CertificateException(java.lang.String, java.lang.Throwable);
ctor public CertificateException(java.lang.Throwable);
}
public class CertificateExpiredException extends java.security.cert.CertificateException {
- ctor public CertificateExpiredException(java.lang.String);
ctor public CertificateExpiredException();
+ ctor public CertificateExpiredException(java.lang.String);
}
public class CertificateFactory {
@@ -51028,28 +56325,44 @@
}
public class CertificateNotYetValidException extends java.security.cert.CertificateException {
- ctor public CertificateNotYetValidException(java.lang.String);
ctor public CertificateNotYetValidException();
+ ctor public CertificateNotYetValidException(java.lang.String);
}
public class CertificateParsingException extends java.security.cert.CertificateException {
- ctor public CertificateParsingException(java.lang.String);
ctor public CertificateParsingException();
+ ctor public CertificateParsingException(java.lang.String);
ctor public CertificateParsingException(java.lang.String, java.lang.Throwable);
ctor public CertificateParsingException(java.lang.Throwable);
}
+ public class CertificateRevokedException extends java.security.cert.CertificateException {
+ ctor public CertificateRevokedException(java.util.Date, java.security.cert.CRLReason, javax.security.auth.x500.X500Principal, java.util.Map<java.lang.String, java.security.cert.Extension>);
+ method public javax.security.auth.x500.X500Principal getAuthorityName();
+ method public java.util.Map<java.lang.String, java.security.cert.Extension> getExtensions();
+ method public java.util.Date getInvalidityDate();
+ method public java.util.Date getRevocationDate();
+ method public java.security.cert.CRLReason getRevocationReason();
+ }
+
public class CollectionCertStoreParameters implements java.security.cert.CertStoreParameters {
- ctor public CollectionCertStoreParameters();
ctor public CollectionCertStoreParameters(java.util.Collection<?>);
+ ctor public CollectionCertStoreParameters();
method public java.lang.Object clone();
method public java.util.Collection<?> getCollection();
}
+ public abstract interface Extension {
+ method public abstract void encode(java.io.OutputStream) throws java.io.IOException;
+ method public abstract java.lang.String getId();
+ method public abstract byte[] getValue();
+ method public abstract boolean isCritical();
+ }
+
public class LDAPCertStoreParameters implements java.security.cert.CertStoreParameters {
ctor public LDAPCertStoreParameters(java.lang.String, int);
- ctor public LDAPCertStoreParameters();
ctor public LDAPCertStoreParameters(java.lang.String);
+ ctor public LDAPCertStoreParameters();
method public java.lang.Object clone();
method public int getPort();
method public java.lang.String getServerName();
@@ -51116,6 +56429,19 @@
method public void setTrustAnchors(java.util.Set<java.security.cert.TrustAnchor>) throws java.security.InvalidAlgorithmParameterException;
}
+ public final class PKIXReason extends java.lang.Enum implements java.security.cert.CertPathValidatorException.Reason {
+ method public static java.security.cert.PKIXReason valueOf(java.lang.String);
+ method public static final java.security.cert.PKIXReason[] values();
+ enum_constant public static final java.security.cert.PKIXReason INVALID_KEY_USAGE;
+ enum_constant public static final java.security.cert.PKIXReason INVALID_NAME;
+ enum_constant public static final java.security.cert.PKIXReason INVALID_POLICY;
+ enum_constant public static final java.security.cert.PKIXReason NAME_CHAINING;
+ enum_constant public static final java.security.cert.PKIXReason NOT_CA_CERT;
+ enum_constant public static final java.security.cert.PKIXReason NO_TRUST_ANCHOR;
+ enum_constant public static final java.security.cert.PKIXReason PATH_TOO_LONG;
+ enum_constant public static final java.security.cert.PKIXReason UNRECOGNIZED_CRIT_EXT;
+ }
+
public abstract interface PolicyNode {
method public abstract java.util.Iterator<? extends java.security.cert.PolicyNode> getChildren();
method public abstract int getDepth();
@@ -51135,8 +56461,8 @@
public class TrustAnchor {
ctor public TrustAnchor(java.security.cert.X509Certificate, byte[]);
- ctor public TrustAnchor(java.lang.String, java.security.PublicKey, byte[]);
ctor public TrustAnchor(javax.security.auth.x500.X500Principal, java.security.PublicKey, byte[]);
+ ctor public TrustAnchor(java.lang.String, java.security.PublicKey, byte[]);
method public final javax.security.auth.x500.X500Principal getCA();
method public final java.lang.String getCAName();
method public final java.security.PublicKey getCAPublicKey();
@@ -51169,6 +56495,7 @@
method public javax.security.auth.x500.X500Principal getCertificateIssuer();
method public abstract byte[] getEncoded() throws java.security.cert.CRLException;
method public abstract java.util.Date getRevocationDate();
+ method public java.security.cert.CRLReason getRevocationReason();
method public abstract java.math.BigInteger getSerialNumber();
method public abstract boolean hasExtensions();
method public abstract java.lang.String toString();
@@ -51444,8 +56771,8 @@
}
public class EllipticCurve {
- ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger, byte[]);
ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger);
+ ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger, byte[]);
method public java.math.BigInteger getA();
method public java.math.BigInteger getB();
method public java.security.spec.ECField getField();
@@ -51459,15 +56786,15 @@
}
public class InvalidKeySpecException extends java.security.GeneralSecurityException {
- ctor public InvalidKeySpecException(java.lang.String);
ctor public InvalidKeySpecException();
+ ctor public InvalidKeySpecException(java.lang.String);
ctor public InvalidKeySpecException(java.lang.String, java.lang.Throwable);
ctor public InvalidKeySpecException(java.lang.Throwable);
}
public class InvalidParameterSpecException extends java.security.GeneralSecurityException {
- ctor public InvalidParameterSpecException(java.lang.String);
ctor public InvalidParameterSpecException();
+ ctor public InvalidParameterSpecException(java.lang.String);
}
public abstract interface KeySpec {
@@ -51488,8 +56815,8 @@
}
public class PSSParameterSpec implements java.security.spec.AlgorithmParameterSpec {
- ctor public PSSParameterSpec(int);
ctor public PSSParameterSpec(java.lang.String, java.lang.String, java.security.spec.AlgorithmParameterSpec, int, int);
+ ctor public PSSParameterSpec(int);
method public java.lang.String getDigestAlgorithm();
method public java.lang.String getMGFAlgorithm();
method public java.security.spec.AlgorithmParameterSpec getMGFParameters();
@@ -51558,28 +56885,28 @@
public abstract interface Array {
method public abstract void free() throws java.sql.SQLException;
method public abstract java.lang.Object getArray() throws java.sql.SQLException;
+ method public abstract java.lang.Object getArray(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.lang.Object getArray(long, int) throws java.sql.SQLException;
method public abstract java.lang.Object getArray(long, int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
- method public abstract java.lang.Object getArray(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract int getBaseType() throws java.sql.SQLException;
method public abstract java.lang.String getBaseTypeName() throws java.sql.SQLException;
method public abstract java.sql.ResultSet getResultSet() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.sql.ResultSet getResultSet(long, int) throws java.sql.SQLException;
method public abstract java.sql.ResultSet getResultSet(long, int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
- method public abstract java.sql.ResultSet getResultSet(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
}
- public class BatchUpdateException extends java.sql.SQLException implements java.io.Serializable {
+ public class BatchUpdateException extends java.sql.SQLException {
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[]);
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int[]);
+ ctor public BatchUpdateException(java.lang.String, int[]);
+ ctor public BatchUpdateException(int[]);
ctor public BatchUpdateException();
ctor public BatchUpdateException(java.lang.Throwable);
ctor public BatchUpdateException(int[], java.lang.Throwable);
ctor public BatchUpdateException(java.lang.String, int[], java.lang.Throwable);
ctor public BatchUpdateException(java.lang.String, java.lang.String, int[], java.lang.Throwable);
ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[], java.lang.Throwable);
- ctor public BatchUpdateException(int[]);
- ctor public BatchUpdateException(java.lang.String, int[]);
- ctor public BatchUpdateException(java.lang.String, java.lang.String, int[]);
- ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[]);
method public int[] getUpdateCounts();
}
@@ -51589,8 +56916,8 @@
method public abstract java.io.InputStream getBinaryStream(long, long) throws java.sql.SQLException;
method public abstract byte[] getBytes(long, int) throws java.sql.SQLException;
method public abstract long length() throws java.sql.SQLException;
- method public abstract long position(java.sql.Blob, long) throws java.sql.SQLException;
method public abstract long position(byte[], long) throws java.sql.SQLException;
+ method public abstract long position(java.sql.Blob, long) throws java.sql.SQLException;
method public abstract java.io.OutputStream setBinaryStream(long) throws java.sql.SQLException;
method public abstract int setBytes(long, byte[]) throws java.sql.SQLException;
method public abstract int setBytes(long, byte[], int, int) throws java.sql.SQLException;
@@ -51600,8 +56927,8 @@
public abstract interface CallableStatement implements java.sql.PreparedStatement {
method public abstract java.sql.Array getArray(int) throws java.sql.SQLException;
method public abstract java.sql.Array getArray(java.lang.String) throws java.sql.SQLException;
- method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
method public abstract deprecated java.math.BigDecimal getBigDecimal(int, int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
method public abstract java.sql.Blob getBlob(int) throws java.sql.SQLException;
method public abstract java.sql.Blob getBlob(java.lang.String) throws java.sql.SQLException;
@@ -51696,9 +57023,9 @@
method public abstract void setNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
method public abstract void setObject(java.lang.String, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
method public abstract void setRowId(java.lang.String, java.sql.RowId) throws java.sql.SQLException;
method public abstract void setSQLXML(java.lang.String, java.sql.SQLXML) throws java.sql.SQLException;
method public abstract void setShort(java.lang.String, short) throws java.sql.SQLException;
@@ -51727,8 +57054,8 @@
method public abstract java.io.Reader getCharacterStream(long, long) throws java.sql.SQLException;
method public abstract java.lang.String getSubString(long, int) throws java.sql.SQLException;
method public abstract long length() throws java.sql.SQLException;
- method public abstract long position(java.sql.Clob, long) throws java.sql.SQLException;
method public abstract long position(java.lang.String, long) throws java.sql.SQLException;
+ method public abstract long position(java.sql.Clob, long) throws java.sql.SQLException;
method public abstract java.io.OutputStream setAsciiStream(long) throws java.sql.SQLException;
method public abstract java.io.Writer setCharacterStream(long) throws java.sql.SQLException;
method public abstract int setString(long, java.lang.String) throws java.sql.SQLException;
@@ -51766,10 +57093,10 @@
method public abstract java.sql.CallableStatement prepareCall(java.lang.String, int, int) throws java.sql.SQLException;
method public abstract java.sql.CallableStatement prepareCall(java.lang.String, int, int, int) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String) throws java.sql.SQLException;
- method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int) throws java.sql.SQLException;
- method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int[]) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int, int) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int[]) throws java.sql.SQLException;
method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, java.lang.String[]) throws java.sql.SQLException;
method public abstract void releaseSavepoint(java.sql.Savepoint) throws java.sql.SQLException;
method public abstract void rollback() throws java.sql.SQLException;
@@ -51791,7 +57118,7 @@
field public static final int TRANSACTION_SERIALIZABLE = 8; // 0x8
}
- public class DataTruncation extends java.sql.SQLWarning implements java.io.Serializable {
+ public class DataTruncation extends java.sql.SQLWarning {
ctor public DataTruncation(int, boolean, boolean, int, int);
ctor public DataTruncation(int, boolean, boolean, int, int, java.lang.Throwable);
method public int getDataSize();
@@ -52053,17 +57380,17 @@
}
public class DriverManager {
- method public static void deregisterDriver(java.sql.Driver) throws java.sql.SQLException;
- method public static java.sql.Connection getConnection(java.lang.String) throws java.sql.SQLException;
+ method public static synchronized void deregisterDriver(java.sql.Driver) throws java.sql.SQLException;
method public static java.sql.Connection getConnection(java.lang.String, java.util.Properties) throws java.sql.SQLException;
method public static java.sql.Connection getConnection(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public static java.sql.Connection getConnection(java.lang.String) throws java.sql.SQLException;
method public static java.sql.Driver getDriver(java.lang.String) throws java.sql.SQLException;
method public static java.util.Enumeration<java.sql.Driver> getDrivers();
method public static deprecated java.io.PrintStream getLogStream();
method public static java.io.PrintWriter getLogWriter();
method public static int getLoginTimeout();
method public static void println(java.lang.String);
- method public static void registerDriver(java.sql.Driver) throws java.sql.SQLException;
+ method public static synchronized void registerDriver(java.sql.Driver) throws java.sql.SQLException;
method public static deprecated void setLogStream(java.io.PrintStream);
method public static void setLogWriter(java.io.PrintWriter);
method public static void setLoginTimeout(int);
@@ -52142,8 +57469,8 @@
method public abstract void setNString(int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(int, int) throws java.sql.SQLException;
method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
- method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void setObject(int, java.lang.Object, int, int) throws java.sql.SQLException;
method public abstract void setRef(int, java.sql.Ref) throws java.sql.SQLException;
method public abstract void setRowId(int, java.sql.RowId) throws java.sql.SQLException;
@@ -52160,8 +57487,8 @@
public abstract interface Ref {
method public abstract java.lang.String getBaseTypeName() throws java.sql.SQLException;
- method public abstract java.lang.Object getObject() throws java.sql.SQLException;
method public abstract java.lang.Object getObject(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject() throws java.sql.SQLException;
method public abstract void setObject(java.lang.Object) throws java.sql.SQLException;
}
@@ -52179,10 +57506,10 @@
method public abstract java.sql.Array getArray(java.lang.String) throws java.sql.SQLException;
method public abstract java.io.InputStream getAsciiStream(int) throws java.sql.SQLException;
method public abstract java.io.InputStream getAsciiStream(java.lang.String) throws java.sql.SQLException;
- method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
method public abstract deprecated java.math.BigDecimal getBigDecimal(int, int) throws java.sql.SQLException;
- method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
method public abstract deprecated java.math.BigDecimal getBigDecimal(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
method public abstract java.io.InputStream getBinaryStream(int) throws java.sql.SQLException;
method public abstract java.io.InputStream getBinaryStream(java.lang.String) throws java.sql.SQLException;
method public abstract java.sql.Blob getBlob(int) throws java.sql.SQLException;
@@ -52200,8 +57527,8 @@
method public abstract int getConcurrency() throws java.sql.SQLException;
method public abstract java.lang.String getCursorName() throws java.sql.SQLException;
method public abstract java.sql.Date getDate(int) throws java.sql.SQLException;
- method public abstract java.sql.Date getDate(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Date getDate(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Date getDate(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
method public abstract double getDouble(int) throws java.sql.SQLException;
method public abstract double getDouble(java.lang.String) throws java.sql.SQLException;
@@ -52222,8 +57549,8 @@
method public abstract java.lang.String getNString(int) throws java.sql.SQLException;
method public abstract java.lang.String getNString(java.lang.String) throws java.sql.SQLException;
method public abstract java.lang.Object getObject(int) throws java.sql.SQLException;
- method public abstract java.lang.Object getObject(int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.lang.Object getObject(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.lang.Object getObject(java.lang.String, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
method public abstract java.sql.Ref getRef(int) throws java.sql.SQLException;
method public abstract java.sql.Ref getRef(java.lang.String) throws java.sql.SQLException;
@@ -52238,12 +57565,12 @@
method public abstract java.lang.String getString(int) throws java.sql.SQLException;
method public abstract java.lang.String getString(java.lang.String) throws java.sql.SQLException;
method public abstract java.sql.Time getTime(int) throws java.sql.SQLException;
- method public abstract java.sql.Time getTime(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Time getTime(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Time getTime(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Timestamp getTimestamp(int) throws java.sql.SQLException;
- method public abstract java.sql.Timestamp getTimestamp(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Timestamp getTimestamp(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(int, java.util.Calendar) throws java.sql.SQLException;
method public abstract java.sql.Timestamp getTimestamp(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
method public abstract int getType() throws java.sql.SQLException;
method public abstract java.net.URL getURL(int) throws java.sql.SQLException;
@@ -52333,10 +57660,10 @@
method public abstract void updateNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
method public abstract void updateNull(int) throws java.sql.SQLException;
method public abstract void updateNull(java.lang.String) throws java.sql.SQLException;
- method public abstract void updateObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void updateObject(int, java.lang.Object, int) throws java.sql.SQLException;
- method public abstract void updateObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void updateObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void updateObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void updateObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
method public abstract void updateRef(int, java.sql.Ref) throws java.sql.SQLException;
method public abstract void updateRef(java.lang.String, java.sql.Ref) throws java.sql.SQLException;
method public abstract void updateRow() throws java.sql.SQLException;
@@ -52415,10 +57742,10 @@
ctor public SQLClientInfoException(java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
ctor public SQLClientInfoException(java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
ctor public SQLClientInfoException(java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
- ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
- ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
ctor public SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
ctor public SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
method public java.util.Map<java.lang.String, java.sql.ClientInfoStatus> getFailedProperties();
}
@@ -52439,11 +57766,11 @@
ctor public SQLDataException(java.lang.String, java.lang.String, int, java.lang.Throwable);
}
- public class SQLException extends java.lang.Exception implements java.lang.Iterable java.io.Serializable {
- ctor public SQLException();
- ctor public SQLException(java.lang.String);
- ctor public SQLException(java.lang.String, java.lang.String);
+ public class SQLException extends java.lang.Exception implements java.lang.Iterable {
ctor public SQLException(java.lang.String, java.lang.String, int);
+ ctor public SQLException(java.lang.String, java.lang.String);
+ ctor public SQLException(java.lang.String);
+ ctor public SQLException();
ctor public SQLException(java.lang.Throwable);
ctor public SQLException(java.lang.String, java.lang.Throwable);
ctor public SQLException(java.lang.String, java.lang.String, java.lang.Throwable);
@@ -52570,7 +57897,7 @@
method public abstract void writeURL(java.net.URL) throws java.sql.SQLException;
}
- public final class SQLPermission extends java.security.BasicPermission implements java.security.Guard java.io.Serializable {
+ public final class SQLPermission extends java.security.BasicPermission {
ctor public SQLPermission(java.lang.String);
ctor public SQLPermission(java.lang.String, java.lang.String);
}
@@ -52641,11 +57968,11 @@
ctor public SQLTransientException(java.lang.String, java.lang.String, int, java.lang.Throwable);
}
- public class SQLWarning extends java.sql.SQLException implements java.io.Serializable {
- ctor public SQLWarning();
- ctor public SQLWarning(java.lang.String);
- ctor public SQLWarning(java.lang.String, java.lang.String);
+ public class SQLWarning extends java.sql.SQLException {
ctor public SQLWarning(java.lang.String, java.lang.String, int);
+ ctor public SQLWarning(java.lang.String, java.lang.String);
+ ctor public SQLWarning(java.lang.String);
+ ctor public SQLWarning();
ctor public SQLWarning(java.lang.Throwable);
ctor public SQLWarning(java.lang.String, java.lang.Throwable);
ctor public SQLWarning(java.lang.String, java.lang.String, java.lang.Throwable);
@@ -52734,15 +58061,15 @@
}
public class Timestamp extends java.util.Date {
- ctor public deprecated Timestamp(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
+ ctor public deprecated Timestamp(int, int, int, int, int, int, int);
ctor public Timestamp(long);
method public boolean after(java.sql.Timestamp);
method public boolean before(java.sql.Timestamp);
method public int compareTo(java.sql.Timestamp);
method public boolean equals(java.sql.Timestamp);
method public int getNanos();
- method public void setNanos(int) throws java.lang.IllegalArgumentException;
- method public static java.sql.Timestamp valueOf(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public void setNanos(int);
+ method public static java.sql.Timestamp valueOf(java.lang.String);
}
public class Types {
@@ -52822,11 +58149,11 @@
}
public class AttributedString {
+ ctor public AttributedString(java.lang.String);
+ ctor public AttributedString(java.lang.String, java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>);
ctor public AttributedString(java.text.AttributedCharacterIterator);
ctor public AttributedString(java.text.AttributedCharacterIterator, int, int);
ctor public AttributedString(java.text.AttributedCharacterIterator, int, int, java.text.AttributedCharacterIterator.Attribute[]);
- ctor public AttributedString(java.lang.String);
- ctor public AttributedString(java.lang.String, java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>);
method public void addAttribute(java.text.AttributedCharacterIterator.Attribute, java.lang.Object);
method public void addAttribute(java.text.AttributedCharacterIterator.Attribute, java.lang.Object, int, int);
method public void addAttributes(java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>, int, int);
@@ -52836,9 +58163,9 @@
}
public final class Bidi {
+ ctor public Bidi(java.lang.String, int);
ctor public Bidi(java.text.AttributedCharacterIterator);
ctor public Bidi(char[], int, byte[], int, int, int);
- ctor public Bidi(java.lang.String, int);
method public boolean baseIsLeftToRight();
method public java.text.Bidi createLineBidi(int, int);
method public int getBaseLevel();
@@ -52865,7 +58192,7 @@
method public abstract int current();
method public abstract int first();
method public abstract int following(int);
- method public static java.util.Locale[] getAvailableLocales();
+ method public static synchronized java.util.Locale[] getAvailableLocales();
method public static java.text.BreakIterator getCharacterInstance();
method public static java.text.BreakIterator getCharacterInstance(java.util.Locale);
method public static java.text.BreakIterator getLineInstance();
@@ -52877,8 +58204,8 @@
method public static java.text.BreakIterator getWordInstance(java.util.Locale);
method public boolean isBoundary(int);
method public abstract int last();
- method public abstract int next();
method public abstract int next(int);
+ method public abstract int next();
method public int preceding(int);
method public abstract int previous();
method public void setText(java.lang.String);
@@ -52901,11 +58228,11 @@
}
public class ChoiceFormat extends java.text.NumberFormat {
- ctor public ChoiceFormat(double[], java.lang.String[]);
ctor public ChoiceFormat(java.lang.String);
+ ctor public ChoiceFormat(double[], java.lang.String[]);
method public void applyPattern(java.lang.String);
- method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.Object[] getFormats();
method public double[] getLimits();
method public static final double nextDouble(double);
@@ -52925,8 +58252,8 @@
method public void reset();
method public static final short secondaryOrder(int);
method public void setOffset(int);
- method public void setText(java.text.CharacterIterator);
method public void setText(java.lang.String);
+ method public void setText(java.text.CharacterIterator);
method public static final short tertiaryOrder(int);
field public static final int NULLORDER = -1; // 0xffffffff
}
@@ -52941,18 +58268,18 @@
public abstract class Collator implements java.lang.Cloneable java.util.Comparator {
ctor protected Collator();
method public java.lang.Object clone();
- method public int compare(java.lang.Object, java.lang.Object);
method public abstract int compare(java.lang.String, java.lang.String);
+ method public int compare(java.lang.Object, java.lang.Object);
method public boolean equals(java.lang.String, java.lang.String);
- method public static java.util.Locale[] getAvailableLocales();
+ method public static synchronized java.util.Locale[] getAvailableLocales();
method public abstract java.text.CollationKey getCollationKey(java.lang.String);
- method public int getDecomposition();
- method public static java.text.Collator getInstance();
- method public static java.text.Collator getInstance(java.util.Locale);
- method public int getStrength();
+ method public synchronized int getDecomposition();
+ method public static synchronized java.text.Collator getInstance();
+ method public static synchronized java.text.Collator getInstance(java.util.Locale);
+ method public synchronized int getStrength();
method public abstract int hashCode();
- method public void setDecomposition(int);
- method public void setStrength(int);
+ method public synchronized void setDecomposition(int);
+ method public synchronized void setStrength(int);
field public static final int CANONICAL_DECOMPOSITION = 1; // 0x1
field public static final int FULL_DECOMPOSITION = 2; // 0x2
field public static final int IDENTICAL = 3; // 0x3
@@ -52965,8 +58292,8 @@
public abstract class DateFormat extends java.text.Format {
ctor protected DateFormat();
method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.String format(java.util.Date);
method public abstract java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(java.util.Date);
method public static java.util.Locale[] getAvailableLocales();
method public java.util.Calendar getCalendar();
method public static final java.text.DateFormat getDateInstance();
@@ -53071,9 +58398,9 @@
ctor public DecimalFormat(java.lang.String, java.text.DecimalFormatSymbols);
method public void applyLocalizedPattern(java.lang.String);
method public void applyPattern(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.text.DecimalFormatSymbols getDecimalFormatSymbols();
method public int getGroupingSize();
method public int getMultiplier();
@@ -53109,15 +58436,17 @@
method public java.lang.String getExponentSeparator();
method public char getGroupingSeparator();
method public java.lang.String getInfinity();
- method public static java.text.DecimalFormatSymbols getInstance();
- method public static java.text.DecimalFormatSymbols getInstance(java.util.Locale);
+ method public static final java.text.DecimalFormatSymbols getInstance();
+ method public static final java.text.DecimalFormatSymbols getInstance(java.util.Locale);
method public java.lang.String getInternationalCurrencySymbol();
method public char getMinusSign();
+ method public java.lang.String getMinusSignString();
method public char getMonetaryDecimalSeparator();
method public java.lang.String getNaN();
method public char getPatternSeparator();
method public char getPerMill();
method public char getPercent();
+ method public java.lang.String getPercentString();
method public char getZeroDigit();
method public void setCurrency(java.util.Currency);
method public void setCurrencySymbol(java.lang.String);
@@ -53154,8 +58483,8 @@
method public final java.lang.String format(java.lang.Object);
method public abstract java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object);
- method public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException;
method public abstract java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException;
}
public static class Format.Field extends java.text.AttributedCharacterIterator.Attribute {
@@ -53163,17 +58492,17 @@
}
public class MessageFormat extends java.text.Format {
- ctor public MessageFormat(java.lang.String, java.util.Locale);
ctor public MessageFormat(java.lang.String);
+ ctor public MessageFormat(java.lang.String, java.util.Locale);
method public void applyPattern(java.lang.String);
method public final java.lang.StringBuffer format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
method public java.text.Format[] getFormats();
method public java.text.Format[] getFormatsByArgumentIndex();
method public java.util.Locale getLocale();
- method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
method public java.lang.Object[] parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
method public void setFormat(int, java.text.Format);
method public void setFormatByArgumentIndex(int, java.text.Format);
@@ -53204,11 +58533,11 @@
public abstract class NumberFormat extends java.text.Format {
ctor protected NumberFormat();
- method public final java.lang.String format(double);
- method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
- method public final java.lang.String format(long);
- method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(double);
+ method public final java.lang.String format(long);
+ method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
method public static java.util.Locale[] getAvailableLocales();
method public java.util.Currency getCurrency();
method public static final java.text.NumberFormat getCurrencyInstance();
@@ -53228,8 +58557,8 @@
method public java.math.RoundingMode getRoundingMode();
method public boolean isGroupingUsed();
method public boolean isParseIntegerOnly();
- method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
method public abstract java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
method public void setCurrency(java.util.Currency);
method public void setGroupingUsed(boolean);
@@ -53273,10 +58602,10 @@
public class RuleBasedCollator extends java.text.Collator {
ctor public RuleBasedCollator(java.lang.String) throws java.text.ParseException;
- method public int compare(java.lang.String, java.lang.String);
- method public java.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public synchronized int compare(java.lang.String, java.lang.String);
method public java.text.CollationElementIterator getCollationElementIterator(java.lang.String);
- method public java.text.CollationKey getCollationKey(java.lang.String);
+ method public java.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public synchronized java.text.CollationKey getCollationKey(java.lang.String);
method public java.lang.String getRules();
method public int hashCode();
}
@@ -53284,8 +58613,8 @@
public class SimpleDateFormat extends java.text.DateFormat {
ctor public SimpleDateFormat();
ctor public SimpleDateFormat(java.lang.String);
- ctor public SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols);
ctor public SimpleDateFormat(java.lang.String, java.util.Locale);
+ ctor public SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols);
method public void applyLocalizedPattern(java.lang.String);
method public void applyPattern(java.lang.String);
method public java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
@@ -53432,7 +58761,7 @@
method public int size();
}
- public class ArrayList extends java.util.AbstractList implements java.lang.Cloneable java.util.RandomAccess java.io.Serializable {
+ public class ArrayList extends java.util.AbstractList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
ctor public ArrayList(int);
ctor public ArrayList();
ctor public ArrayList(java.util.Collection<? extends E>);
@@ -53445,109 +58774,109 @@
public class Arrays {
method public static java.util.List<T> asList(T...);
- method public static int binarySearch(byte[], byte);
- method public static int binarySearch(byte[], int, int, byte);
+ method public static int binarySearch(long[], long);
+ method public static int binarySearch(long[], int, int, long);
+ method public static int binarySearch(int[], int);
+ method public static int binarySearch(int[], int, int, int);
+ method public static int binarySearch(short[], short);
+ method public static int binarySearch(short[], int, int, short);
method public static int binarySearch(char[], char);
method public static int binarySearch(char[], int, int, char);
+ method public static int binarySearch(byte[], byte);
+ method public static int binarySearch(byte[], int, int, byte);
method public static int binarySearch(double[], double);
method public static int binarySearch(double[], int, int, double);
method public static int binarySearch(float[], float);
method public static int binarySearch(float[], int, int, float);
- method public static int binarySearch(int[], int);
- method public static int binarySearch(int[], int, int, int);
- method public static int binarySearch(long[], long);
- method public static int binarySearch(long[], int, int, long);
method public static int binarySearch(java.lang.Object[], java.lang.Object);
method public static int binarySearch(java.lang.Object[], int, int, java.lang.Object);
method public static int binarySearch(T[], T, java.util.Comparator<? super T>);
method public static int binarySearch(T[], int, int, T, java.util.Comparator<? super T>);
- method public static int binarySearch(short[], short);
- method public static int binarySearch(short[], int, int, short);
- method public static boolean[] copyOf(boolean[], int);
- method public static byte[] copyOf(byte[], int);
- method public static char[] copyOf(char[], int);
- method public static double[] copyOf(double[], int);
- method public static float[] copyOf(float[], int);
- method public static int[] copyOf(int[], int);
- method public static long[] copyOf(long[], int);
- method public static short[] copyOf(short[], int);
method public static T[] copyOf(T[], int);
method public static T[] copyOf(U[], int, java.lang.Class<? extends T[]>);
- method public static boolean[] copyOfRange(boolean[], int, int);
- method public static byte[] copyOfRange(byte[], int, int);
- method public static char[] copyOfRange(char[], int, int);
- method public static double[] copyOfRange(double[], int, int);
- method public static float[] copyOfRange(float[], int, int);
- method public static int[] copyOfRange(int[], int, int);
- method public static long[] copyOfRange(long[], int, int);
- method public static short[] copyOfRange(short[], int, int);
+ method public static byte[] copyOf(byte[], int);
+ method public static short[] copyOf(short[], int);
+ method public static int[] copyOf(int[], int);
+ method public static long[] copyOf(long[], int);
+ method public static char[] copyOf(char[], int);
+ method public static float[] copyOf(float[], int);
+ method public static double[] copyOf(double[], int);
+ method public static boolean[] copyOf(boolean[], int);
method public static T[] copyOfRange(T[], int, int);
method public static T[] copyOfRange(U[], int, int, java.lang.Class<? extends T[]>);
+ method public static byte[] copyOfRange(byte[], int, int);
+ method public static short[] copyOfRange(short[], int, int);
+ method public static int[] copyOfRange(int[], int, int);
+ method public static long[] copyOfRange(long[], int, int);
+ method public static char[] copyOfRange(char[], int, int);
+ method public static float[] copyOfRange(float[], int, int);
+ method public static double[] copyOfRange(double[], int, int);
+ method public static boolean[] copyOfRange(boolean[], int, int);
method public static boolean deepEquals(java.lang.Object[], java.lang.Object[]);
method public static int deepHashCode(java.lang.Object[]);
method public static java.lang.String deepToString(java.lang.Object[]);
- method public static boolean equals(byte[], byte[]);
+ method public static boolean equals(long[], long[]);
+ method public static boolean equals(int[], int[]);
method public static boolean equals(short[], short[]);
method public static boolean equals(char[], char[]);
- method public static boolean equals(int[], int[]);
- method public static boolean equals(long[], long[]);
- method public static boolean equals(float[], float[]);
- method public static boolean equals(double[], double[]);
+ method public static boolean equals(byte[], byte[]);
method public static boolean equals(boolean[], boolean[]);
+ method public static boolean equals(double[], double[]);
+ method public static boolean equals(float[], float[]);
method public static boolean equals(java.lang.Object[], java.lang.Object[]);
- method public static void fill(byte[], byte);
- method public static void fill(byte[], int, int, byte);
+ method public static void fill(long[], long);
+ method public static void fill(long[], int, int, long);
+ method public static void fill(int[], int);
+ method public static void fill(int[], int, int, int);
method public static void fill(short[], short);
method public static void fill(short[], int, int, short);
method public static void fill(char[], char);
method public static void fill(char[], int, int, char);
- method public static void fill(int[], int);
- method public static void fill(int[], int, int, int);
- method public static void fill(long[], long);
- method public static void fill(long[], int, int, long);
- method public static void fill(float[], float);
- method public static void fill(float[], int, int, float);
- method public static void fill(double[], double);
- method public static void fill(double[], int, int, double);
+ method public static void fill(byte[], byte);
+ method public static void fill(byte[], int, int, byte);
method public static void fill(boolean[], boolean);
method public static void fill(boolean[], int, int, boolean);
+ method public static void fill(double[], double);
+ method public static void fill(double[], int, int, double);
+ method public static void fill(float[], float);
+ method public static void fill(float[], int, int, float);
method public static void fill(java.lang.Object[], java.lang.Object);
method public static void fill(java.lang.Object[], int, int, java.lang.Object);
- method public static int hashCode(boolean[]);
+ method public static int hashCode(long[]);
method public static int hashCode(int[]);
method public static int hashCode(short[]);
method public static int hashCode(char[]);
method public static int hashCode(byte[]);
- method public static int hashCode(long[]);
+ method public static int hashCode(boolean[]);
method public static int hashCode(float[]);
method public static int hashCode(double[]);
method public static int hashCode(java.lang.Object[]);
- method public static void sort(byte[]);
- method public static void sort(byte[], int, int);
- method public static void sort(char[]);
- method public static void sort(char[], int, int);
- method public static void sort(double[]);
- method public static void sort(double[], int, int);
- method public static void sort(float[]);
- method public static void sort(float[], int, int);
method public static void sort(int[]);
method public static void sort(int[], int, int);
method public static void sort(long[]);
method public static void sort(long[], int, int);
method public static void sort(short[]);
method public static void sort(short[], int, int);
+ method public static void sort(char[]);
+ method public static void sort(char[], int, int);
+ method public static void sort(byte[]);
+ method public static void sort(byte[], int, int);
+ method public static void sort(float[]);
+ method public static void sort(float[], int, int);
+ method public static void sort(double[]);
+ method public static void sort(double[], int, int);
method public static void sort(java.lang.Object[]);
method public static void sort(java.lang.Object[], int, int);
- method public static void sort(T[], int, int, java.util.Comparator<? super T>);
method public static void sort(T[], java.util.Comparator<? super T>);
- method public static java.lang.String toString(boolean[]);
- method public static java.lang.String toString(byte[]);
- method public static java.lang.String toString(char[]);
- method public static java.lang.String toString(double[]);
- method public static java.lang.String toString(float[]);
- method public static java.lang.String toString(int[]);
+ method public static void sort(T[], int, int, java.util.Comparator<? super T>);
method public static java.lang.String toString(long[]);
+ method public static java.lang.String toString(int[]);
method public static java.lang.String toString(short[]);
+ method public static java.lang.String toString(char[]);
+ method public static java.lang.String toString(byte[]);
+ method public static java.lang.String toString(boolean[]);
+ method public static java.lang.String toString(float[]);
+ method public static java.lang.String toString(double[]);
method public static java.lang.String toString(java.lang.Object[]);
}
@@ -53558,8 +58887,8 @@
method public void andNot(java.util.BitSet);
method public int cardinality();
method public void clear(int);
- method public void clear();
method public void clear(int, int);
+ method public void clear();
method public java.lang.Object clone();
method public void flip(int);
method public void flip(int, int);
@@ -53575,8 +58904,8 @@
method public int previousSetBit(int);
method public void set(int);
method public void set(int, boolean);
- method public void set(int, int, boolean);
method public void set(int, int);
+ method public void set(int, int, boolean);
method public int size();
method public byte[] toByteArray();
method public long[] toLongArray();
@@ -53608,10 +58937,10 @@
method public java.util.Map<java.lang.String, java.lang.Integer> getDisplayNames(int, int, java.util.Locale);
method public int getFirstDayOfWeek();
method public abstract int getGreatestMinimum(int);
- method public static synchronized java.util.Calendar getInstance();
- method public static synchronized java.util.Calendar getInstance(java.util.Locale);
- method public static synchronized java.util.Calendar getInstance(java.util.TimeZone);
- method public static synchronized java.util.Calendar getInstance(java.util.TimeZone, java.util.Locale);
+ method public static java.util.Calendar getInstance();
+ method public static java.util.Calendar getInstance(java.util.TimeZone);
+ method public static java.util.Calendar getInstance(java.util.Locale);
+ method public static java.util.Calendar getInstance(java.util.TimeZone, java.util.Locale);
method public abstract int getLeastMaximum(int);
method public abstract int getMaximum(int);
method public int getMinimalDaysInFirstWeek();
@@ -53619,11 +58948,14 @@
method public final java.util.Date getTime();
method public long getTimeInMillis();
method public java.util.TimeZone getTimeZone();
+ method public int getWeekYear();
+ method public int getWeeksInWeekYear();
method protected final int internalGet(int);
method public boolean isLenient();
method public final boolean isSet(int);
- method public void roll(int, int);
+ method public boolean isWeekDateSupported();
method public abstract void roll(int, boolean);
+ method public void roll(int, int);
method public void set(int, int);
method public final void set(int, int, int);
method public final void set(int, int, int, int, int);
@@ -53634,6 +58966,7 @@
method public final void setTime(java.util.Date);
method public void setTimeInMillis(long);
method public void setTimeZone(java.util.TimeZone);
+ method public void setWeekDate(int, int, int);
field public static final int ALL_STYLES = 0; // 0x0
field public static final int AM = 0; // 0x0
field public static final int AM_PM = 9; // 0x9
@@ -53750,15 +59083,15 @@
method public static java.util.Collection<T> synchronizedCollection(java.util.Collection<T>);
method public static java.util.List<T> synchronizedList(java.util.List<T>);
method public static java.util.Map<K, V> synchronizedMap(java.util.Map<K, V>);
- method public static java.util.Set<E> synchronizedSet(java.util.Set<E>);
+ method public static java.util.Set<T> synchronizedSet(java.util.Set<T>);
method public static java.util.SortedMap<K, V> synchronizedSortedMap(java.util.SortedMap<K, V>);
- method public static java.util.SortedSet<E> synchronizedSortedSet(java.util.SortedSet<E>);
- method public static java.util.Collection<E> unmodifiableCollection(java.util.Collection<? extends E>);
- method public static java.util.List<E> unmodifiableList(java.util.List<? extends E>);
+ method public static java.util.SortedSet<T> synchronizedSortedSet(java.util.SortedSet<T>);
+ method public static java.util.Collection<T> unmodifiableCollection(java.util.Collection<? extends T>);
+ method public static java.util.List<T> unmodifiableList(java.util.List<? extends T>);
method public static java.util.Map<K, V> unmodifiableMap(java.util.Map<? extends K, ? extends V>);
- method public static java.util.Set<E> unmodifiableSet(java.util.Set<? extends E>);
+ method public static java.util.Set<T> unmodifiableSet(java.util.Set<? extends T>);
method public static java.util.SortedMap<K, V> unmodifiableSortedMap(java.util.SortedMap<K, ? extends V>);
- method public static java.util.SortedSet<E> unmodifiableSortedSet(java.util.SortedSet<E>);
+ method public static java.util.SortedSet<T> unmodifiableSortedSet(java.util.SortedSet<T>);
field public static final java.util.List EMPTY_LIST;
field public static final java.util.Map EMPTY_MAP;
field public static final java.util.Set EMPTY_SET;
@@ -53772,8 +59105,8 @@
public class ConcurrentModificationException extends java.lang.RuntimeException {
ctor public ConcurrentModificationException();
ctor public ConcurrentModificationException(java.lang.String);
- ctor public ConcurrentModificationException(java.lang.String, java.lang.Throwable);
ctor public ConcurrentModificationException(java.lang.Throwable);
+ ctor public ConcurrentModificationException(java.lang.String, java.lang.Throwable);
}
public final class Currency implements java.io.Serializable {
@@ -53784,16 +59117,17 @@
method public java.lang.String getDisplayName(java.util.Locale);
method public static java.util.Currency getInstance(java.lang.String);
method public static java.util.Currency getInstance(java.util.Locale);
+ method public int getNumericCode();
method public java.lang.String getSymbol();
method public java.lang.String getSymbol(java.util.Locale);
}
public class Date implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
ctor public Date();
+ ctor public Date(long);
ctor public deprecated Date(int, int, int);
ctor public deprecated Date(int, int, int, int, int);
ctor public deprecated Date(int, int, int, int, int, int);
- ctor public Date(long);
ctor public deprecated Date(java.lang.String);
method public static deprecated long UTC(int, int, int, int, int, int);
method public boolean after(java.util.Date);
@@ -53871,7 +59205,7 @@
ctor public EmptyStackException();
}
- public class EnumMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
+ public class EnumMap extends java.util.AbstractMap implements java.lang.Cloneable java.io.Serializable {
ctor public EnumMap(java.lang.Class<K>);
ctor public EnumMap(java.util.EnumMap<K, ? extends V>);
ctor public EnumMap(java.util.Map<K, ? extends V>);
@@ -53904,8 +59238,8 @@
}
public abstract class EventListenerProxy implements java.util.EventListener {
- ctor public EventListenerProxy(java.util.EventListener);
- method public java.util.EventListener getListener();
+ ctor public EventListenerProxy(T);
+ method public T getListener();
}
public class EventObject implements java.io.Serializable {
@@ -53914,14 +59248,14 @@
field protected transient java.lang.Object source;
}
- public class FormatFlagsConversionMismatchException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class FormatFlagsConversionMismatchException extends java.util.IllegalFormatException {
ctor public FormatFlagsConversionMismatchException(java.lang.String, char);
method public char getConversion();
method public java.lang.String getFlags();
}
public abstract interface Formattable {
- method public abstract void formatTo(java.util.Formatter, int, int, int) throws java.util.IllegalFormatException;
+ method public abstract void formatTo(java.util.Formatter, int, int, int);
}
public class FormattableFlags {
@@ -53941,10 +59275,10 @@
ctor public Formatter(java.io.File) throws java.io.FileNotFoundException;
ctor public Formatter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
ctor public Formatter(java.io.File, java.lang.String, java.util.Locale) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.io.PrintStream);
ctor public Formatter(java.io.OutputStream);
ctor public Formatter(java.io.OutputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
ctor public Formatter(java.io.OutputStream, java.lang.String, java.util.Locale) throws java.io.UnsupportedEncodingException;
- ctor public Formatter(java.io.PrintStream);
method public void close();
method public void flush();
method public java.util.Formatter format(java.lang.String, java.lang.Object...);
@@ -53961,18 +59295,18 @@
enum_constant public static final java.util.Formatter.BigDecimalLayoutForm SCIENTIFIC;
}
- public class FormatterClosedException extends java.lang.IllegalStateException implements java.io.Serializable {
+ public class FormatterClosedException extends java.lang.IllegalStateException {
ctor public FormatterClosedException();
}
public class GregorianCalendar extends java.util.Calendar {
ctor public GregorianCalendar();
+ ctor public GregorianCalendar(java.util.TimeZone);
+ ctor public GregorianCalendar(java.util.Locale);
+ ctor public GregorianCalendar(java.util.TimeZone, java.util.Locale);
ctor public GregorianCalendar(int, int, int);
ctor public GregorianCalendar(int, int, int, int, int);
ctor public GregorianCalendar(int, int, int, int, int, int);
- ctor public GregorianCalendar(java.util.Locale);
- ctor public GregorianCalendar(java.util.TimeZone);
- ctor public GregorianCalendar(java.util.TimeZone, java.util.Locale);
method public void add(int, int);
method protected void computeFields();
method protected void computeTime();
@@ -53982,16 +59316,17 @@
method public int getMaximum(int);
method public int getMinimum(int);
method public boolean isLeapYear(int);
+ method public final boolean isWeekDateSupported();
method public void roll(int, boolean);
method public void setGregorianChange(java.util.Date);
field public static final int AD = 1; // 0x1
field public static final int BC = 0; // 0x0
}
- public class HashMap extends java.util.AbstractMap implements java.lang.Cloneable java.io.Serializable {
- ctor public HashMap();
- ctor public HashMap(int);
+ public class HashMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
ctor public HashMap(int, float);
+ ctor public HashMap(int);
+ ctor public HashMap();
ctor public HashMap(java.util.Map<? extends K, ? extends V>);
method public java.lang.Object clone();
method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
@@ -53999,36 +59334,36 @@
public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {
ctor public HashSet();
- ctor public HashSet(int);
- ctor public HashSet(int, float);
ctor public HashSet(java.util.Collection<? extends E>);
+ ctor public HashSet(int, float);
+ ctor public HashSet(int);
method public java.lang.Object clone();
method public java.util.Iterator<E> iterator();
method public int size();
}
public class Hashtable extends java.util.Dictionary implements java.lang.Cloneable java.util.Map java.io.Serializable {
- ctor public Hashtable();
- ctor public Hashtable(int);
ctor public Hashtable(int, float);
+ ctor public Hashtable(int);
+ ctor public Hashtable();
ctor public Hashtable(java.util.Map<? extends K, ? extends V>);
method public synchronized void clear();
method public synchronized java.lang.Object clone();
- method public boolean contains(java.lang.Object);
+ method public synchronized boolean contains(java.lang.Object);
method public synchronized boolean containsKey(java.lang.Object);
- method public synchronized boolean containsValue(java.lang.Object);
+ method public boolean containsValue(java.lang.Object);
method public synchronized java.util.Enumeration<V> elements();
- method public synchronized java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
method public synchronized V get(java.lang.Object);
method public synchronized boolean isEmpty();
- method public synchronized java.util.Set<K> keySet();
+ method public java.util.Set<K> keySet();
method public synchronized java.util.Enumeration<K> keys();
method public synchronized V put(K, V);
method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);
method protected void rehash();
method public synchronized V remove(java.lang.Object);
method public synchronized int size();
- method public synchronized java.util.Collection<V> values();
+ method public java.util.Collection<V> values();
}
public class IdentityHashMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
@@ -54039,21 +59374,21 @@
method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
}
- public class IllegalFormatCodePointException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class IllegalFormatCodePointException extends java.util.IllegalFormatException {
ctor public IllegalFormatCodePointException(int);
method public int getCodePoint();
}
- public class IllegalFormatConversionException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class IllegalFormatConversionException extends java.util.IllegalFormatException {
ctor public IllegalFormatConversionException(char, java.lang.Class<?>);
method public java.lang.Class<?> getArgumentClass();
method public char getConversion();
}
- public class IllegalFormatException extends java.lang.IllegalArgumentException implements java.io.Serializable {
+ public class IllegalFormatException extends java.lang.IllegalArgumentException {
}
- public class IllegalFormatFlagsException extends java.util.IllegalFormatException implements java.io.Serializable {
+ public class IllegalFormatFlagsException extends java.util.IllegalFormatException {
ctor public IllegalFormatFlagsException(java.lang.String);
method public java.lang.String getFlags();
}
@@ -54075,14 +59410,14 @@
method public int getErrorIndex();
}
- public class InputMismatchException extends java.util.NoSuchElementException implements java.io.Serializable {
+ public class InputMismatchException extends java.util.NoSuchElementException {
ctor public InputMismatchException();
ctor public InputMismatchException(java.lang.String);
}
public class InvalidPropertiesFormatException extends java.io.IOException {
- ctor public InvalidPropertiesFormatException(java.lang.String);
ctor public InvalidPropertiesFormatException(java.lang.Throwable);
+ ctor public InvalidPropertiesFormatException(java.lang.String);
}
public abstract interface Iterator {
@@ -54091,23 +59426,23 @@
method public abstract void remove();
}
- public class LinkedHashMap extends java.util.HashMap {
- ctor public LinkedHashMap();
- ctor public LinkedHashMap(int);
+ public class LinkedHashMap extends java.util.HashMap implements java.util.Map {
ctor public LinkedHashMap(int, float);
- ctor public LinkedHashMap(int, float, boolean);
+ ctor public LinkedHashMap(int);
+ ctor public LinkedHashMap();
ctor public LinkedHashMap(java.util.Map<? extends K, ? extends V>);
+ ctor public LinkedHashMap(int, float, boolean);
method protected boolean removeEldestEntry(java.util.Map.Entry<K, V>);
}
public class LinkedHashSet extends java.util.HashSet implements java.lang.Cloneable java.io.Serializable java.util.Set {
- ctor public LinkedHashSet();
- ctor public LinkedHashSet(int);
ctor public LinkedHashSet(int, float);
+ ctor public LinkedHashSet(int);
+ ctor public LinkedHashSet();
ctor public LinkedHashSet(java.util.Collection<? extends E>);
}
- public class LinkedList extends java.util.AbstractSequentialList implements java.lang.Cloneable java.util.Deque java.util.List java.util.Queue java.io.Serializable {
+ public class LinkedList extends java.util.AbstractSequentialList implements java.lang.Cloneable java.util.Deque java.util.List java.io.Serializable {
ctor public LinkedList();
ctor public LinkedList(java.util.Collection<? extends E>);
method public void addFirst(E);
@@ -54138,10 +59473,10 @@
}
public abstract interface List implements java.util.Collection {
- method public abstract void add(int, E);
method public abstract boolean add(E);
- method public abstract boolean addAll(int, java.util.Collection<? extends E>);
+ method public abstract void add(int, E);
method public abstract boolean addAll(java.util.Collection<? extends E>);
+ method public abstract boolean addAll(int, java.util.Collection<? extends E>);
method public abstract void clear();
method public abstract boolean contains(java.lang.Object);
method public abstract boolean containsAll(java.util.Collection<?>);
@@ -54154,8 +59489,8 @@
method public abstract int lastIndexOf(java.lang.Object);
method public abstract java.util.ListIterator<E> listIterator();
method public abstract java.util.ListIterator<E> listIterator(int);
- method public abstract E remove(int);
method public abstract boolean remove(java.lang.Object);
+ method public abstract E remove(int);
method public abstract boolean removeAll(java.util.Collection<?>);
method public abstract boolean retainAll(java.util.Collection<?>);
method public abstract E set(int, E);
@@ -54185,14 +59520,15 @@
}
public final class Locale implements java.lang.Cloneable java.io.Serializable {
- ctor public Locale(java.lang.String);
- ctor public Locale(java.lang.String, java.lang.String);
ctor public Locale(java.lang.String, java.lang.String, java.lang.String);
+ ctor public Locale(java.lang.String, java.lang.String);
+ ctor public Locale(java.lang.String);
method public java.lang.Object clone();
method public static java.util.Locale forLanguageTag(java.lang.String);
method public static java.util.Locale[] getAvailableLocales();
method public java.lang.String getCountry();
method public static java.util.Locale getDefault();
+ method public static java.util.Locale getDefault(java.util.Locale.Category);
method public final java.lang.String getDisplayCountry();
method public java.lang.String getDisplayCountry(java.util.Locale);
method public final java.lang.String getDisplayLanguage();
@@ -54205,8 +59541,8 @@
method public java.lang.String getDisplayVariant(java.util.Locale);
method public java.lang.String getExtension(char);
method public java.util.Set<java.lang.Character> getExtensionKeys();
- method public java.lang.String getISO3Country();
- method public java.lang.String getISO3Language();
+ method public java.lang.String getISO3Country() throws java.util.MissingResourceException;
+ method public java.lang.String getISO3Language() throws java.util.MissingResourceException;
method public static java.lang.String[] getISOCountries();
method public static java.lang.String[] getISOLanguages();
method public java.lang.String getLanguage();
@@ -54216,6 +59552,7 @@
method public java.lang.String getUnicodeLocaleType(java.lang.String);
method public java.lang.String getVariant();
method public static synchronized void setDefault(java.util.Locale);
+ method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
method public java.lang.String toLanguageTag();
method public final java.lang.String toString();
field public static final java.util.Locale CANADA;
@@ -54261,6 +59598,13 @@
method public java.util.Locale.Builder setVariant(java.lang.String);
}
+ public static final class Locale.Category extends java.lang.Enum {
+ method public static java.util.Locale.Category valueOf(java.lang.String);
+ method public static final java.util.Locale.Category[] values();
+ enum_constant public static final java.util.Locale.Category DISPLAY;
+ enum_constant public static final java.util.Locale.Category FORMAT;
+ }
+
public abstract interface Map {
method public abstract void clear();
method public abstract boolean containsKey(java.lang.Object);
@@ -54363,15 +59707,15 @@
public class Observable {
ctor public Observable();
- method public void addObserver(java.util.Observer);
- method protected void clearChanged();
- method public int countObservers();
+ method public synchronized void addObserver(java.util.Observer);
+ method protected synchronized void clearChanged();
+ method public synchronized int countObservers();
method public synchronized void deleteObserver(java.util.Observer);
method public synchronized void deleteObservers();
- method public boolean hasChanged();
+ method public synchronized boolean hasChanged();
method public void notifyObservers();
method public void notifyObservers(java.lang.Object);
- method protected void setChanged();
+ method protected synchronized void setChanged();
}
public abstract interface Observer {
@@ -54400,16 +59744,16 @@
method public java.lang.String getProperty(java.lang.String, java.lang.String);
method public void list(java.io.PrintStream);
method public void list(java.io.PrintWriter);
- method public synchronized void load(java.io.InputStream) throws java.io.IOException;
method public synchronized void load(java.io.Reader) throws java.io.IOException;
+ method public synchronized void load(java.io.InputStream) throws java.io.IOException;
method public synchronized void loadFromXML(java.io.InputStream) throws java.io.IOException, java.util.InvalidPropertiesFormatException;
method public java.util.Enumeration<?> propertyNames();
method public deprecated void save(java.io.OutputStream, java.lang.String);
- method public java.lang.Object setProperty(java.lang.String, java.lang.String);
- method public synchronized void store(java.io.OutputStream, java.lang.String) throws java.io.IOException;
- method public synchronized void store(java.io.Writer, java.lang.String) throws java.io.IOException;
+ method public synchronized java.lang.Object setProperty(java.lang.String, java.lang.String);
+ method public void store(java.io.Writer, java.lang.String) throws java.io.IOException;
+ method public void store(java.io.OutputStream, java.lang.String) throws java.io.IOException;
method public void storeToXML(java.io.OutputStream, java.lang.String) throws java.io.IOException;
- method public synchronized void storeToXML(java.io.OutputStream, java.lang.String, java.lang.String) throws java.io.IOException;
+ method public void storeToXML(java.io.OutputStream, java.lang.String, java.lang.String) throws java.io.IOException;
method public java.util.Set<java.lang.String> stringPropertyNames();
field protected java.util.Properties defaults;
}
@@ -54437,7 +59781,7 @@
public class Random implements java.io.Serializable {
ctor public Random();
ctor public Random(long);
- method protected synchronized int next(int);
+ method protected int next(int);
method public boolean nextBoolean();
method public void nextBytes(byte[]);
method public double nextDouble();
@@ -54454,14 +59798,14 @@
public abstract class ResourceBundle {
ctor public ResourceBundle();
- method public static void clearCache();
- method public static void clearCache(java.lang.ClassLoader);
+ method public static final void clearCache();
+ method public static final void clearCache(java.lang.ClassLoader);
method public boolean containsKey(java.lang.String);
- method public static java.util.ResourceBundle getBundle(java.lang.String) throws java.util.MissingResourceException;
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale);
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) throws java.util.MissingResourceException;
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control);
- method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control);
+ method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader);
method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control);
method public abstract java.util.Enumeration<java.lang.String> getKeys();
method public java.util.Locale getLocale();
@@ -54478,10 +59822,10 @@
public static class ResourceBundle.Control {
ctor protected ResourceBundle.Control();
method public java.util.List<java.util.Locale> getCandidateLocales(java.lang.String, java.util.Locale);
- method public static java.util.ResourceBundle.Control getControl(java.util.List<java.lang.String>);
+ method public static final java.util.ResourceBundle.Control getControl(java.util.List<java.lang.String>);
method public java.util.Locale getFallbackLocale(java.lang.String, java.util.Locale);
method public java.util.List<java.lang.String> getFormats(java.lang.String);
- method public static java.util.ResourceBundle.Control getNoFallbackControl(java.util.List<java.lang.String>);
+ method public static final java.util.ResourceBundle.Control getNoFallbackControl(java.util.List<java.lang.String>);
method public long getTimeToLive(java.lang.String, java.util.Locale);
method public boolean needsReload(java.lang.String, java.util.Locale, java.lang.String, java.lang.ClassLoader, java.util.ResourceBundle, long);
method public java.util.ResourceBundle newBundle(java.lang.String, java.util.Locale, java.lang.String, java.lang.ClassLoader, boolean) throws java.io.IOException, java.lang.IllegalAccessException, java.lang.InstantiationException;
@@ -54495,23 +59839,25 @@
}
public final class Scanner implements java.io.Closeable java.util.Iterator {
- ctor public Scanner(java.io.File) throws java.io.FileNotFoundException;
- ctor public Scanner(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
- ctor public Scanner(java.lang.String);
+ ctor public Scanner(java.lang.Readable);
ctor public Scanner(java.io.InputStream);
ctor public Scanner(java.io.InputStream, java.lang.String);
- ctor public Scanner(java.lang.Readable);
+ ctor public Scanner(java.io.File) throws java.io.FileNotFoundException;
+ ctor public Scanner(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
+ ctor public Scanner(java.nio.file.Path) throws java.io.IOException;
+ ctor public Scanner(java.nio.file.Path, java.lang.String) throws java.io.IOException;
+ ctor public Scanner(java.lang.String);
ctor public Scanner(java.nio.channels.ReadableByteChannel);
ctor public Scanner(java.nio.channels.ReadableByteChannel, java.lang.String);
method public void close();
method public java.util.regex.Pattern delimiter();
- method public java.lang.String findInLine(java.util.regex.Pattern);
method public java.lang.String findInLine(java.lang.String);
- method public java.lang.String findWithinHorizon(java.util.regex.Pattern, int);
+ method public java.lang.String findInLine(java.util.regex.Pattern);
method public java.lang.String findWithinHorizon(java.lang.String, int);
+ method public java.lang.String findWithinHorizon(java.util.regex.Pattern, int);
method public boolean hasNext();
- method public boolean hasNext(java.util.regex.Pattern);
method public boolean hasNext(java.lang.String);
+ method public boolean hasNext(java.util.regex.Pattern);
method public boolean hasNextBigDecimal();
method public boolean hasNextBigInteger();
method public boolean hasNextBigInteger(int);
@@ -54531,8 +59877,8 @@
method public java.util.Locale locale();
method public java.util.regex.MatchResult match();
method public java.lang.String next();
- method public java.lang.String next(java.util.regex.Pattern);
method public java.lang.String next(java.lang.String);
+ method public java.lang.String next(java.util.regex.Pattern);
method public java.math.BigDecimal nextBigDecimal();
method public java.math.BigInteger nextBigInteger();
method public java.math.BigInteger nextBigInteger(int);
@@ -54599,12 +59945,12 @@
method public int getRawOffset();
method public boolean inDaylightTime(java.util.Date);
method public void setDSTSavings(int);
- method public void setEndRule(int, int, int);
method public void setEndRule(int, int, int, int);
+ method public void setEndRule(int, int, int);
method public void setEndRule(int, int, int, int, boolean);
method public void setRawOffset(int);
- method public void setStartRule(int, int, int);
method public void setStartRule(int, int, int, int);
+ method public void setStartRule(int, int, int);
method public void setStartRule(int, int, int, int, boolean);
method public void setStartYear(int);
method public boolean useDaylightTime();
@@ -54615,11 +59961,14 @@
public abstract interface SortedMap implements java.util.Map {
method public abstract java.util.Comparator<? super K> comparator();
+ method public abstract java.util.Set<java.util.Map.Entry<K, V>> entrySet();
method public abstract K firstKey();
method public abstract java.util.SortedMap<K, V> headMap(K);
+ method public abstract java.util.Set<K> keySet();
method public abstract K lastKey();
method public abstract java.util.SortedMap<K, V> subMap(K, K);
method public abstract java.util.SortedMap<K, V> tailMap(K);
+ method public abstract java.util.Collection<V> values();
}
public abstract interface SortedSet implements java.util.Set {
@@ -54641,9 +59990,9 @@
}
public class StringTokenizer implements java.util.Enumeration {
- ctor public StringTokenizer(java.lang.String);
- ctor public StringTokenizer(java.lang.String, java.lang.String);
ctor public StringTokenizer(java.lang.String, java.lang.String, boolean);
+ ctor public StringTokenizer(java.lang.String, java.lang.String);
+ ctor public StringTokenizer(java.lang.String);
method public int countTokens();
method public boolean hasMoreElements();
method public boolean hasMoreTokens();
@@ -54655,21 +60004,22 @@
public abstract class TimeZone implements java.lang.Cloneable java.io.Serializable {
ctor public TimeZone();
method public java.lang.Object clone();
- method public static synchronized java.lang.String[] getAvailableIDs();
method public static synchronized java.lang.String[] getAvailableIDs(int);
+ method public static synchronized java.lang.String[] getAvailableIDs();
method public int getDSTSavings();
- method public static synchronized java.util.TimeZone getDefault();
+ method public static java.util.TimeZone getDefault();
method public final java.lang.String getDisplayName();
method public final java.lang.String getDisplayName(java.util.Locale);
method public final java.lang.String getDisplayName(boolean, int);
method public java.lang.String getDisplayName(boolean, int, java.util.Locale);
method public java.lang.String getID();
- method public int getOffset(long);
method public abstract int getOffset(int, int, int, int, int, int);
+ method public int getOffset(long);
method public abstract int getRawOffset();
method public static synchronized java.util.TimeZone getTimeZone(java.lang.String);
method public boolean hasSameRules(java.util.TimeZone);
method public abstract boolean inDaylightTime(java.util.Date);
+ method public boolean observesDaylightTime();
method public static synchronized void setDefault(java.util.TimeZone);
method public void setID(java.lang.String);
method public abstract void setRawOffset(int);
@@ -54679,14 +60029,14 @@
}
public class Timer {
- ctor public Timer(java.lang.String, boolean);
- ctor public Timer(java.lang.String);
- ctor public Timer(boolean);
ctor public Timer();
+ ctor public Timer(boolean);
+ ctor public Timer(java.lang.String);
+ ctor public Timer(java.lang.String, boolean);
method public void cancel();
method public int purge();
- method public void schedule(java.util.TimerTask, java.util.Date);
method public void schedule(java.util.TimerTask, long);
+ method public void schedule(java.util.TimerTask, java.util.Date);
method public void schedule(java.util.TimerTask, long, long);
method public void schedule(java.util.TimerTask, java.util.Date, long);
method public void scheduleAtFixedRate(java.util.TimerTask, long, long);
@@ -54705,10 +60055,10 @@
ctor public TooManyListenersException(java.lang.String);
}
- public class TreeMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.NavigableMap java.io.Serializable java.util.SortedMap {
+ public class TreeMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.NavigableMap java.io.Serializable {
ctor public TreeMap();
- ctor public TreeMap(java.util.Map<? extends K, ? extends V>);
ctor public TreeMap(java.util.Comparator<? super K>);
+ ctor public TreeMap(java.util.Map<? extends K, ? extends V>);
ctor public TreeMap(java.util.SortedMap<K, ? extends V>);
method public java.util.Map.Entry<K, V> ceilingEntry(K);
method public K ceilingKey(K);
@@ -54740,8 +60090,8 @@
public class TreeSet extends java.util.AbstractSet implements java.lang.Cloneable java.util.NavigableSet java.io.Serializable {
ctor public TreeSet();
- ctor public TreeSet(java.util.Collection<? extends E>);
ctor public TreeSet(java.util.Comparator<? super E>);
+ ctor public TreeSet(java.util.Collection<? extends E>);
ctor public TreeSet(java.util.SortedSet<E>);
method public E ceiling(E);
method public java.lang.Object clone();
@@ -54791,9 +60141,9 @@
}
public class Vector extends java.util.AbstractList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
- ctor public Vector();
- ctor public Vector(int);
ctor public Vector(int, int);
+ ctor public Vector(int);
+ ctor public Vector();
ctor public Vector(java.util.Collection<? extends E>);
method public synchronized void addElement(E);
method public synchronized int capacity();
@@ -54803,7 +60153,7 @@
method public java.util.Enumeration<E> elements();
method public synchronized void ensureCapacity(int);
method public synchronized E firstElement();
- method public E get(int);
+ method public synchronized E get(int);
method public synchronized int indexOf(java.lang.Object, int);
method public synchronized void insertElementAt(E, int);
method public synchronized E lastElement();
@@ -54821,9 +60171,9 @@
}
public class WeakHashMap extends java.util.AbstractMap implements java.util.Map {
- ctor public WeakHashMap();
- ctor public WeakHashMap(int);
ctor public WeakHashMap(int, float);
+ ctor public WeakHashMap(int);
+ ctor public WeakHashMap();
ctor public WeakHashMap(java.util.Map<? extends K, ? extends V>);
method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
}
@@ -56061,16 +61411,16 @@
public class Attributes implements java.lang.Cloneable java.util.Map {
ctor public Attributes();
- ctor public Attributes(java.util.jar.Attributes);
ctor public Attributes(int);
+ ctor public Attributes(java.util.jar.Attributes);
method public void clear();
method public java.lang.Object clone();
method public boolean containsKey(java.lang.Object);
method public boolean containsValue(java.lang.Object);
method public java.util.Set<java.util.Map.Entry<java.lang.Object, java.lang.Object>> entrySet();
method public java.lang.Object get(java.lang.Object);
- method public java.lang.String getValue(java.util.jar.Attributes.Name);
method public java.lang.String getValue(java.lang.String);
+ method public java.lang.String getValue(java.util.jar.Attributes.Name);
method public boolean isEmpty();
method public java.util.Set<java.lang.Object> keySet();
method public java.lang.Object put(java.lang.Object, java.lang.Object);
@@ -56118,19 +61468,20 @@
}
public class JarFile extends java.util.zip.ZipFile {
+ ctor public JarFile(java.lang.String) throws java.io.IOException;
+ ctor public JarFile(java.lang.String, boolean) throws java.io.IOException;
ctor public JarFile(java.io.File) throws java.io.IOException;
ctor public JarFile(java.io.File, boolean) throws java.io.IOException;
ctor public JarFile(java.io.File, boolean, int) throws java.io.IOException;
- ctor public JarFile(java.lang.String) throws java.io.IOException;
- ctor public JarFile(java.lang.String, boolean) throws java.io.IOException;
method public java.util.jar.JarEntry getJarEntry(java.lang.String);
method public java.util.jar.Manifest getManifest() throws java.io.IOException;
+ method public boolean hasClassPathAttribute() throws java.io.IOException;
field public static final java.lang.String MANIFEST_NAME = "META-INF/MANIFEST.MF";
}
public class JarInputStream extends java.util.zip.ZipInputStream {
- ctor public JarInputStream(java.io.InputStream, boolean) throws java.io.IOException;
ctor public JarInputStream(java.io.InputStream) throws java.io.IOException;
+ ctor public JarInputStream(java.io.InputStream, boolean) throws java.io.IOException;
method public java.util.jar.Manifest getManifest();
method public java.util.jar.JarEntry getNextJarEntry() throws java.io.IOException;
}
@@ -56154,7 +61505,7 @@
}
public abstract class Pack200 {
- method public static java.util.jar.Pack200.Packer newPacker();
+ method public static synchronized java.util.jar.Pack200.Packer newPacker();
method public static java.util.jar.Pack200.Unpacker newUnpacker();
}
@@ -56208,7 +61559,7 @@
public class ErrorManager {
ctor public ErrorManager();
- method public void error(java.lang.String, java.lang.Exception, int);
+ method public synchronized void error(java.lang.String, java.lang.Exception, int);
field public static final int CLOSE_FAILURE = 3; // 0x3
field public static final int FLUSH_FAILURE = 2; // 0x2
field public static final int FORMAT_FAILURE = 5; // 0x5
@@ -56218,11 +61569,11 @@
}
public class FileHandler extends java.util.logging.StreamHandler {
- ctor public FileHandler() throws java.io.IOException;
- ctor public FileHandler(java.lang.String) throws java.io.IOException;
- ctor public FileHandler(java.lang.String, boolean) throws java.io.IOException;
- ctor public FileHandler(java.lang.String, int, int) throws java.io.IOException;
- ctor public FileHandler(java.lang.String, int, int, boolean) throws java.io.IOException;
+ ctor public FileHandler() throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, boolean) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, int, int) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, int, int, boolean) throws java.io.IOException, java.lang.SecurityException;
}
public abstract interface Filter {
@@ -56232,28 +61583,28 @@
public abstract class Formatter {
ctor protected Formatter();
method public abstract java.lang.String format(java.util.logging.LogRecord);
- method public java.lang.String formatMessage(java.util.logging.LogRecord);
+ method public synchronized java.lang.String formatMessage(java.util.logging.LogRecord);
method public java.lang.String getHead(java.util.logging.Handler);
method public java.lang.String getTail(java.util.logging.Handler);
}
public abstract class Handler {
ctor protected Handler();
- method public abstract void close();
+ method public abstract void close() throws java.lang.SecurityException;
method public abstract void flush();
method public java.lang.String getEncoding();
method public java.util.logging.ErrorManager getErrorManager();
method public java.util.logging.Filter getFilter();
method public java.util.logging.Formatter getFormatter();
- method public java.util.logging.Level getLevel();
+ method public synchronized java.util.logging.Level getLevel();
method public boolean isLoggable(java.util.logging.LogRecord);
method public abstract void publish(java.util.logging.LogRecord);
method protected void reportError(java.lang.String, java.lang.Exception, int);
- method public void setEncoding(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public void setEncoding(java.lang.String) throws java.lang.SecurityException, java.io.UnsupportedEncodingException;
method public void setErrorManager(java.util.logging.ErrorManager);
- method public void setFilter(java.util.logging.Filter);
- method public void setFormatter(java.util.logging.Formatter);
- method public void setLevel(java.util.logging.Level);
+ method public void setFilter(java.util.logging.Filter) throws java.lang.SecurityException;
+ method public void setFormatter(java.util.logging.Formatter) throws java.lang.SecurityException;
+ method public synchronized void setLevel(java.util.logging.Level) throws java.lang.SecurityException;
}
public class Level implements java.io.Serializable {
@@ -56263,7 +61614,7 @@
method public java.lang.String getName();
method public java.lang.String getResourceBundleName();
method public final int intValue();
- method public static java.util.logging.Level parse(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public static synchronized java.util.logging.Level parse(java.lang.String) throws java.lang.IllegalArgumentException;
method public final java.lang.String toString();
field public static final java.util.logging.Level ALL;
field public static final java.util.logging.Level CONFIG;
@@ -56278,18 +61629,18 @@
public class LogManager {
ctor protected LogManager();
- method public synchronized boolean addLogger(java.util.logging.Logger);
- method public void addPropertyChangeListener(java.beans.PropertyChangeListener);
- method public void checkAccess();
+ method public boolean addLogger(java.util.logging.Logger);
+ method public void addPropertyChangeListener(java.beans.PropertyChangeListener) throws java.lang.SecurityException;
+ method public void checkAccess() throws java.lang.SecurityException;
method public static java.util.logging.LogManager getLogManager();
- method public synchronized java.util.logging.Logger getLogger(java.lang.String);
- method public synchronized java.util.Enumeration<java.lang.String> getLoggerNames();
- method public static java.util.logging.LoggingMXBean getLoggingMXBean();
+ method public java.util.logging.Logger getLogger(java.lang.String);
+ method public java.util.Enumeration<java.lang.String> getLoggerNames();
+ method public static synchronized java.util.logging.LoggingMXBean getLoggingMXBean();
method public java.lang.String getProperty(java.lang.String);
- method public void readConfiguration() throws java.io.IOException;
- method public void readConfiguration(java.io.InputStream) throws java.io.IOException;
- method public void removePropertyChangeListener(java.beans.PropertyChangeListener);
- method public synchronized void reset();
+ method public void readConfiguration() throws java.io.IOException, java.lang.SecurityException;
+ method public void readConfiguration(java.io.InputStream) throws java.io.IOException, java.lang.SecurityException;
+ method public void removePropertyChangeListener(java.beans.PropertyChangeListener) throws java.lang.SecurityException;
+ method public void reset() throws java.lang.SecurityException;
field public static final java.lang.String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging";
}
@@ -56323,7 +61674,7 @@
public class Logger {
ctor protected Logger(java.lang.String, java.lang.String);
- method public void addHandler(java.util.logging.Handler);
+ method public void addHandler(java.util.logging.Handler) throws java.lang.SecurityException;
method public void config(java.lang.String);
method public void entering(java.lang.String, java.lang.String);
method public void entering(java.lang.String, java.lang.String, java.lang.Object);
@@ -56336,7 +61687,7 @@
method public static java.util.logging.Logger getAnonymousLogger();
method public static java.util.logging.Logger getAnonymousLogger(java.lang.String);
method public java.util.logging.Filter getFilter();
- method public static java.util.logging.Logger getGlobal();
+ method public static final java.util.logging.Logger getGlobal();
method public java.util.logging.Handler[] getHandlers();
method public java.util.logging.Level getLevel();
method public static java.util.logging.Logger getLogger(java.lang.String);
@@ -56348,11 +61699,11 @@
method public boolean getUseParentHandlers();
method public void info(java.lang.String);
method public boolean isLoggable(java.util.logging.Level);
+ method public void log(java.util.logging.LogRecord);
method public void log(java.util.logging.Level, java.lang.String);
method public void log(java.util.logging.Level, java.lang.String, java.lang.Object);
method public void log(java.util.logging.Level, java.lang.String, java.lang.Object[]);
method public void log(java.util.logging.Level, java.lang.String, java.lang.Throwable);
- method public void log(java.util.logging.LogRecord);
method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String);
method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object);
method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[]);
@@ -56361,9 +61712,9 @@
method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object);
method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[]);
method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable);
- method public void removeHandler(java.util.logging.Handler);
- method public void setFilter(java.util.logging.Filter);
- method public void setLevel(java.util.logging.Level);
+ method public void removeHandler(java.util.logging.Handler) throws java.lang.SecurityException;
+ method public void setFilter(java.util.logging.Filter) throws java.lang.SecurityException;
+ method public void setLevel(java.util.logging.Level) throws java.lang.SecurityException;
method public void setParent(java.util.logging.Logger);
method public void setUseParentHandlers(boolean);
method public void severe(java.lang.String);
@@ -56380,24 +61731,24 @@
method public abstract void setLoggerLevel(java.lang.String, java.lang.String);
}
- public final class LoggingPermission extends java.security.BasicPermission implements java.security.Guard java.io.Serializable {
- ctor public LoggingPermission(java.lang.String, java.lang.String);
+ public final class LoggingPermission extends java.security.BasicPermission {
+ ctor public LoggingPermission(java.lang.String, java.lang.String) throws java.lang.IllegalArgumentException;
}
public class MemoryHandler extends java.util.logging.Handler {
ctor public MemoryHandler();
ctor public MemoryHandler(java.util.logging.Handler, int, java.util.logging.Level);
- method public void close();
+ method public void close() throws java.lang.SecurityException;
method public void flush();
- method public java.util.logging.Level getPushLevel();
+ method public synchronized java.util.logging.Level getPushLevel();
method public synchronized void publish(java.util.logging.LogRecord);
- method public void push();
- method public void setPushLevel(java.util.logging.Level);
+ method public synchronized void push();
+ method public void setPushLevel(java.util.logging.Level) throws java.lang.SecurityException;
}
public class SimpleFormatter extends java.util.logging.Formatter {
ctor public SimpleFormatter();
- method public java.lang.String format(java.util.logging.LogRecord);
+ method public synchronized java.lang.String format(java.util.logging.LogRecord);
}
public class SocketHandler extends java.util.logging.StreamHandler {
@@ -56408,10 +61759,10 @@
public class StreamHandler extends java.util.logging.Handler {
ctor public StreamHandler();
ctor public StreamHandler(java.io.OutputStream, java.util.logging.Formatter);
- method public void close();
- method public void flush();
+ method public synchronized void close() throws java.lang.SecurityException;
+ method public synchronized void flush();
method public synchronized void publish(java.util.logging.LogRecord);
- method protected void setOutputStream(java.io.OutputStream);
+ method protected synchronized void setOutputStream(java.io.OutputStream) throws java.lang.SecurityException;
}
public class XMLFormatter extends java.util.logging.Formatter {
@@ -56481,12 +61832,12 @@
}
public class InvalidPreferencesFormatException extends java.lang.Exception {
+ ctor public InvalidPreferencesFormatException(java.lang.Throwable);
ctor public InvalidPreferencesFormatException(java.lang.String);
ctor public InvalidPreferencesFormatException(java.lang.String, java.lang.Throwable);
- ctor public InvalidPreferencesFormatException(java.lang.Throwable);
}
- public class NodeChangeEvent extends java.util.EventObject implements java.io.Serializable {
+ public class NodeChangeEvent extends java.util.EventObject {
ctor public NodeChangeEvent(java.util.prefs.Preferences, java.util.prefs.Preferences);
method public java.util.prefs.Preferences getChild();
method public java.util.prefs.Preferences getParent();
@@ -56497,7 +61848,7 @@
method public abstract void childRemoved(java.util.prefs.NodeChangeEvent);
}
- public class PreferenceChangeEvent extends java.util.EventObject implements java.io.Serializable {
+ public class PreferenceChangeEvent extends java.util.EventObject {
ctor public PreferenceChangeEvent(java.util.prefs.Preferences, java.lang.String, java.lang.String);
method public java.lang.String getKey();
method public java.lang.String getNewValue();
@@ -56642,8 +61993,8 @@
method public long getValue();
method public void reset();
method public void update(int);
- method public void update(byte[]);
method public void update(byte[], int, int);
+ method public void update(byte[]);
}
public class CRC32 implements java.util.zip.Checksum {
@@ -56651,8 +62002,8 @@
method public long getValue();
method public void reset();
method public void update(int);
- method public void update(byte[]);
method public void update(byte[], int, int);
+ method public void update(byte[]);
}
public class CheckedInputStream extends java.io.FilterInputStream {
@@ -56668,8 +62019,8 @@
public abstract interface Checksum {
method public abstract long getValue();
method public abstract void reset();
- method public abstract void update(byte[], int, int);
method public abstract void update(int);
+ method public abstract void update(byte[], int, int);
}
public class DataFormatException extends java.lang.Exception {
@@ -56678,28 +62029,28 @@
}
public class Deflater {
- ctor public Deflater();
- ctor public Deflater(int);
ctor public Deflater(int, boolean);
+ ctor public Deflater(int);
+ ctor public Deflater();
+ method public int deflate(byte[], int, int);
method public int deflate(byte[]);
- method public synchronized int deflate(byte[], int, int);
- method public synchronized int deflate(byte[], int, int, int);
- method public synchronized void end();
- method public synchronized void finish();
- method public synchronized boolean finished();
- method public synchronized int getAdler();
- method public synchronized long getBytesRead();
- method public synchronized long getBytesWritten();
- method public synchronized int getTotalIn();
- method public synchronized int getTotalOut();
- method public synchronized boolean needsInput();
- method public synchronized void reset();
+ method public int deflate(byte[], int, int, int);
+ method public void end();
+ method public void finish();
+ method public boolean finished();
+ method public int getAdler();
+ method public long getBytesRead();
+ method public long getBytesWritten();
+ method public int getTotalIn();
+ method public int getTotalOut();
+ method public boolean needsInput();
+ method public void reset();
+ method public void setDictionary(byte[], int, int);
method public void setDictionary(byte[]);
- method public synchronized void setDictionary(byte[], int, int);
+ method public void setInput(byte[], int, int);
method public void setInput(byte[]);
- method public synchronized void setInput(byte[], int, int);
- method public synchronized void setLevel(int);
- method public synchronized void setStrategy(int);
+ method public void setLevel(int);
+ method public void setStrategy(int);
field public static final int BEST_COMPRESSION = 9; // 0x9
field public static final int BEST_SPEED = 1; // 0x1
field public static final int DEFAULT_COMPRESSION = -1; // 0xffffffff
@@ -56722,12 +62073,12 @@
}
public class DeflaterOutputStream extends java.io.FilterOutputStream {
- ctor public DeflaterOutputStream(java.io.OutputStream);
- ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater);
- ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int);
- ctor public DeflaterOutputStream(java.io.OutputStream, boolean);
- ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, boolean);
ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater);
+ ctor public DeflaterOutputStream(java.io.OutputStream, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream);
method protected void deflate() throws java.io.IOException;
method public void finish() throws java.io.IOException;
field protected byte[] buf;
@@ -56735,49 +62086,50 @@
}
public class GZIPInputStream extends java.util.zip.InflaterInputStream {
- ctor public GZIPInputStream(java.io.InputStream) throws java.io.IOException;
ctor public GZIPInputStream(java.io.InputStream, int) throws java.io.IOException;
+ ctor public GZIPInputStream(java.io.InputStream) throws java.io.IOException;
field public static final int GZIP_MAGIC = 35615; // 0x8b1f
field protected java.util.zip.CRC32 crc;
field protected boolean eos;
}
public class GZIPOutputStream extends java.util.zip.DeflaterOutputStream {
- ctor public GZIPOutputStream(java.io.OutputStream) throws java.io.IOException;
- ctor public GZIPOutputStream(java.io.OutputStream, boolean) throws java.io.IOException;
ctor public GZIPOutputStream(java.io.OutputStream, int) throws java.io.IOException;
ctor public GZIPOutputStream(java.io.OutputStream, int, boolean) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream, boolean) throws java.io.IOException;
field protected java.util.zip.CRC32 crc;
}
public class Inflater {
- ctor public Inflater();
ctor public Inflater(boolean);
- method public synchronized void end();
- method public synchronized boolean finished();
- method public synchronized int getAdler();
- method public synchronized long getBytesRead();
- method public synchronized long getBytesWritten();
- method public synchronized int getRemaining();
- method public synchronized int getTotalIn();
- method public synchronized int getTotalOut();
+ ctor public Inflater();
+ method public void end();
+ method public boolean finished();
+ method public int getAdler();
+ method public long getBytesRead();
+ method public long getBytesWritten();
+ method public int getRemaining();
+ method public int getTotalIn();
+ method public int getTotalOut();
+ method public int inflate(byte[], int, int) throws java.util.zip.DataFormatException;
method public int inflate(byte[]) throws java.util.zip.DataFormatException;
- method public synchronized int inflate(byte[], int, int) throws java.util.zip.DataFormatException;
- method public synchronized boolean needsDictionary();
- method public synchronized boolean needsInput();
- method public synchronized void reset();
- method public synchronized void setDictionary(byte[]);
- method public synchronized void setDictionary(byte[], int, int);
- method public synchronized void setInput(byte[]);
- method public synchronized void setInput(byte[], int, int);
+ method public boolean needsDictionary();
+ method public boolean needsInput();
+ method public void reset();
+ method public void setDictionary(byte[], int, int);
+ method public void setDictionary(byte[]);
+ method public void setInput(byte[], int, int);
+ method public void setInput(byte[]);
}
public class InflaterInputStream extends java.io.FilterInputStream {
- ctor public InflaterInputStream(java.io.InputStream);
- ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater);
ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater, int);
+ ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater);
+ ctor public InflaterInputStream(java.io.InputStream);
method protected void fill() throws java.io.IOException;
field protected byte[] buf;
+ field protected boolean closed;
field protected java.util.zip.Inflater inf;
field protected int len;
}
@@ -56865,9 +62217,12 @@
}
public class ZipFile implements java.io.Closeable {
- ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
ctor public ZipFile(java.lang.String) throws java.io.IOException;
ctor public ZipFile(java.io.File, int) throws java.io.IOException;
+ ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
+ ctor public ZipFile(java.io.File, int, java.nio.charset.Charset) throws java.io.IOException;
+ ctor public ZipFile(java.lang.String, java.nio.charset.Charset) throws java.io.IOException;
+ ctor public ZipFile(java.io.File, java.nio.charset.Charset) throws java.io.IOException;
method public void close() throws java.io.IOException;
method public java.util.Enumeration<? extends java.util.zip.ZipEntry> entries();
method public java.lang.String getComment();
@@ -56921,6 +62276,7 @@
public class ZipInputStream extends java.util.zip.InflaterInputStream {
ctor public ZipInputStream(java.io.InputStream);
+ ctor public ZipInputStream(java.io.InputStream, java.nio.charset.Charset);
method public void closeEntry() throws java.io.IOException;
method protected java.util.zip.ZipEntry createZipEntry(java.lang.String);
method public java.util.zip.ZipEntry getNextEntry() throws java.io.IOException;
@@ -56968,6 +62324,7 @@
public class ZipOutputStream extends java.util.zip.DeflaterOutputStream {
ctor public ZipOutputStream(java.io.OutputStream);
+ ctor public ZipOutputStream(java.io.OutputStream, java.nio.charset.Charset);
method public void closeEntry() throws java.io.IOException;
method public void putNextEntry(java.util.zip.ZipEntry) throws java.io.IOException;
method public void setComment(java.lang.String);
@@ -57027,8 +62384,8 @@
}
public class BadPaddingException extends java.security.GeneralSecurityException {
- ctor public BadPaddingException(java.lang.String);
ctor public BadPaddingException();
+ ctor public BadPaddingException(java.lang.String);
}
public class Cipher {
@@ -57139,14 +62496,14 @@
method public final int getOutputSize(int) throws java.lang.IllegalStateException;
method public final java.security.Provider getProvider();
method public final void init(java.security.Key) throws javax.crypto.ExemptionMechanismException, java.security.InvalidKeyException;
- method public final void init(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final boolean isCryptoAllowed(java.security.Key) throws javax.crypto.ExemptionMechanismException;
}
public class ExemptionMechanismException extends java.security.GeneralSecurityException {
- ctor public ExemptionMechanismException(java.lang.String);
ctor public ExemptionMechanismException();
+ ctor public ExemptionMechanismException(java.lang.String);
}
public abstract class ExemptionMechanismSpi {
@@ -57155,13 +62512,13 @@
method protected abstract int engineGenExemptionBlob(byte[], int) throws javax.crypto.ExemptionMechanismException, javax.crypto.ShortBufferException;
method protected abstract int engineGetOutputSize(int);
method protected abstract void engineInit(java.security.Key) throws javax.crypto.ExemptionMechanismException, java.security.InvalidKeyException;
- method protected abstract void engineInit(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method protected abstract void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method protected abstract void engineInit(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
}
public class IllegalBlockSizeException extends java.security.GeneralSecurityException {
- ctor public IllegalBlockSizeException(java.lang.String);
ctor public IllegalBlockSizeException();
+ ctor public IllegalBlockSizeException(java.lang.String);
}
public class KeyAgreement {
@@ -57199,19 +62556,19 @@
method public static final javax.crypto.KeyGenerator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static final javax.crypto.KeyGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
+ method public final void init(java.security.SecureRandom);
method public final void init(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
method public final void init(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
method public final void init(int);
method public final void init(int, java.security.SecureRandom);
- method public final void init(java.security.SecureRandom);
}
public abstract class KeyGeneratorSpi {
ctor public KeyGeneratorSpi();
method protected abstract javax.crypto.SecretKey engineGenerateKey();
+ method protected abstract void engineInit(java.security.SecureRandom);
method protected abstract void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
method protected abstract void engineInit(int, java.security.SecureRandom);
- method protected abstract void engineInit(java.security.SecureRandom);
}
public class Mac implements java.lang.Cloneable {
@@ -57226,12 +62583,12 @@
method public static final javax.crypto.Mac getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
method public final int getMacLength();
method public final java.security.Provider getProvider();
- method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final void init(java.security.Key) throws java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
method public final void reset();
method public final void update(byte) throws java.lang.IllegalStateException;
- method public final void update(byte[], int, int) throws java.lang.IllegalStateException;
method public final void update(byte[]) throws java.lang.IllegalStateException;
+ method public final void update(byte[], int, int) throws java.lang.IllegalStateException;
method public final void update(java.nio.ByteBuffer);
}
@@ -57248,8 +62605,8 @@
}
public class NoSuchPaddingException extends java.security.GeneralSecurityException {
- ctor public NoSuchPaddingException(java.lang.String);
ctor public NoSuchPaddingException();
+ ctor public NoSuchPaddingException(java.lang.String);
}
public class NullCipher extends javax.crypto.Cipher {
@@ -57290,8 +62647,8 @@
}
public class ShortBufferException extends java.security.GeneralSecurityException {
- ctor public ShortBufferException(java.lang.String);
ctor public ShortBufferException();
+ ctor public ShortBufferException(java.lang.String);
}
}
@@ -57436,7 +62793,7 @@
method public int getWordSize();
}
- public class SecretKeySpec implements java.security.spec.KeySpec javax.crypto.SecretKey java.io.Serializable {
+ public class SecretKeySpec implements java.security.spec.KeySpec javax.crypto.SecretKey {
ctor public SecretKeySpec(byte[], java.lang.String);
ctor public SecretKeySpec(byte[], int, int, java.lang.String);
method public java.lang.String getAlgorithm();
@@ -58331,7 +63688,7 @@
method public abstract java.net.ServerSocket createServerSocket(int) throws java.io.IOException;
method public abstract java.net.ServerSocket createServerSocket(int, int) throws java.io.IOException;
method public abstract java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress) throws java.io.IOException;
- method public static synchronized javax.net.ServerSocketFactory getDefault();
+ method public static javax.net.ServerSocketFactory getDefault();
}
public abstract class SocketFactory {
@@ -58341,7 +63698,7 @@
method public abstract java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException, java.net.UnknownHostException;
method public abstract java.net.Socket createSocket(java.net.InetAddress, int) throws java.io.IOException;
method public abstract java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
- method public static synchronized javax.net.SocketFactory getDefault();
+ method public static javax.net.SocketFactory getDefault();
}
}
@@ -58353,6 +63710,12 @@
method public java.security.cert.CertPathParameters getParameters();
}
+ public abstract class ExtendedSSLSession implements javax.net.ssl.SSLSession {
+ ctor public ExtendedSSLSession();
+ method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms();
+ method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms();
+ }
+
public class HandshakeCompletedEvent extends java.util.EventObject {
ctor public HandshakeCompletedEvent(javax.net.ssl.SSLSocket, javax.net.ssl.SSLSession);
method public java.lang.String getCipherSuite();
@@ -58428,7 +63791,7 @@
method public final javax.net.ssl.SSLEngine createSSLEngine();
method public final javax.net.ssl.SSLEngine createSSLEngine(java.lang.String, int);
method public final javax.net.ssl.SSLSessionContext getClientSessionContext();
- method public static javax.net.ssl.SSLContext getDefault() throws java.security.NoSuchAlgorithmException;
+ method public static synchronized javax.net.ssl.SSLContext getDefault() throws java.security.NoSuchAlgorithmException;
method public final javax.net.ssl.SSLParameters getDefaultSSLParameters();
method public static javax.net.ssl.SSLContext getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static javax.net.ssl.SSLContext getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
@@ -58440,13 +63803,13 @@
method public final javax.net.ssl.SSLSocketFactory getSocketFactory();
method public final javax.net.ssl.SSLParameters getSupportedSSLParameters();
method public final void init(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[], java.security.SecureRandom) throws java.security.KeyManagementException;
- method public static void setDefault(javax.net.ssl.SSLContext);
+ method public static synchronized void setDefault(javax.net.ssl.SSLContext);
}
public abstract class SSLContextSpi {
ctor public SSLContextSpi();
- method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int);
method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine();
+ method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int);
method protected abstract javax.net.ssl.SSLSessionContext engineGetClientSessionContext();
method protected javax.net.ssl.SSLParameters engineGetDefaultSSLParameters();
method protected abstract javax.net.ssl.SSLSessionContext engineGetServerSessionContext();
@@ -58466,6 +63829,7 @@
method public abstract boolean getEnableSessionCreation();
method public abstract java.lang.String[] getEnabledCipherSuites();
method public abstract java.lang.String[] getEnabledProtocols();
+ method public javax.net.ssl.SSLSession getHandshakeSession();
method public abstract javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus();
method public abstract boolean getNeedClientAuth();
method public java.lang.String getPeerHost();
@@ -58485,12 +63849,12 @@
method public void setSSLParameters(javax.net.ssl.SSLParameters);
method public abstract void setUseClientMode(boolean);
method public abstract void setWantClientAuth(boolean);
- method public abstract javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int) throws javax.net.ssl.SSLException;
method public javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
method public javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[]) throws javax.net.ssl.SSLException;
- method public abstract javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
- method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public abstract javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int) throws javax.net.ssl.SSLException;
method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public abstract javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
}
public class SSLEngineResult {
@@ -58538,11 +63902,15 @@
ctor public SSLParameters();
ctor public SSLParameters(java.lang.String[]);
ctor public SSLParameters(java.lang.String[], java.lang.String[]);
+ method public java.security.AlgorithmConstraints getAlgorithmConstraints();
method public java.lang.String[] getCipherSuites();
+ method public java.lang.String getEndpointIdentificationAlgorithm();
method public boolean getNeedClientAuth();
method public java.lang.String[] getProtocols();
method public boolean getWantClientAuth();
+ method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
method public void setCipherSuites(java.lang.String[]);
+ method public void setEndpointIdentificationAlgorithm(java.lang.String);
method public void setNeedClientAuth(boolean);
method public void setProtocols(java.lang.String[]);
method public void setWantClientAuth(boolean);
@@ -58570,6 +63938,7 @@
method public abstract java.lang.String[] getEnabledCipherSuites();
method public abstract java.lang.String[] getEnabledProtocols();
method public abstract boolean getNeedClientAuth();
+ method public javax.net.ssl.SSLParameters getSSLParameters();
method public abstract java.lang.String[] getSupportedCipherSuites();
method public abstract java.lang.String[] getSupportedProtocols();
method public abstract boolean getUseClientMode();
@@ -58578,6 +63947,7 @@
method public abstract void setEnabledCipherSuites(java.lang.String[]);
method public abstract void setEnabledProtocols(java.lang.String[]);
method public abstract void setNeedClientAuth(boolean);
+ method public void setSSLParameters(javax.net.ssl.SSLParameters);
method public abstract void setUseClientMode(boolean);
method public abstract void setWantClientAuth(boolean);
}
@@ -58643,6 +64013,7 @@
method public abstract boolean getEnableSessionCreation();
method public abstract java.lang.String[] getEnabledCipherSuites();
method public abstract java.lang.String[] getEnabledProtocols();
+ method public javax.net.ssl.SSLSession getHandshakeSession();
method public abstract boolean getNeedClientAuth();
method public javax.net.ssl.SSLParameters getSSLParameters();
method public abstract javax.net.ssl.SSLSession getSession();
@@ -58698,6 +64069,14 @@
method public java.lang.String chooseEngineServerAlias(java.lang.String, java.security.Principal[], javax.net.ssl.SSLEngine);
}
+ public abstract class X509ExtendedTrustManager implements javax.net.ssl.X509TrustManager {
+ ctor public X509ExtendedTrustManager();
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException;
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+ }
+
public abstract interface X509KeyManager implements javax.net.ssl.KeyManager {
method public abstract java.lang.String chooseClientAlias(java.lang.String[], java.security.Principal[], java.net.Socket);
method public abstract java.lang.String chooseServerAlias(java.lang.String, java.security.Principal[], java.net.Socket);
@@ -58732,11 +64111,21 @@
method public abstract boolean isDestroyed();
}
+ public abstract deprecated class Policy {
+ ctor protected Policy();
+ method public abstract java.security.PermissionCollection getPermissions(javax.security.auth.Subject, java.security.CodeSource);
+ method public static javax.security.auth.Policy getPolicy();
+ method public abstract void refresh();
+ method public static void setPolicy(javax.security.auth.Policy);
+ }
+
public final class PrivateCredentialPermission extends java.security.Permission {
ctor public PrivateCredentialPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
method public java.lang.String getActions();
method public java.lang.String getCredentialClass();
method public java.lang.String[][] getPrincipals();
+ method public int hashCode();
method public boolean implies(java.security.Permission);
}
@@ -58794,6 +64183,43 @@
package javax.security.auth.login {
+ public class AppConfigurationEntry {
+ ctor public AppConfigurationEntry(java.lang.String, javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag, java.util.Map<java.lang.String, ?>);
+ method public javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag getControlFlag();
+ method public java.lang.String getLoginModuleName();
+ method public java.util.Map<java.lang.String, ?> getOptions();
+ }
+
+ public static class AppConfigurationEntry.LoginModuleControlFlag {
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag OPTIONAL;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag REQUIRED;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag REQUISITE;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag SUFFICIENT;
+ }
+
+ public abstract class Configuration {
+ ctor protected Configuration();
+ method public abstract javax.security.auth.login.AppConfigurationEntry[] getAppConfigurationEntry(java.lang.String);
+ method public static javax.security.auth.login.Configuration getConfiguration();
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters) throws java.security.NoSuchAlgorithmException;
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public javax.security.auth.login.Configuration.Parameters getParameters();
+ method public java.security.Provider getProvider();
+ method public java.lang.String getType();
+ method public void refresh();
+ method public static void setConfiguration(javax.security.auth.login.Configuration);
+ }
+
+ public static abstract interface Configuration.Parameters {
+ }
+
+ public abstract class ConfigurationSpi {
+ ctor public ConfigurationSpi();
+ method protected abstract javax.security.auth.login.AppConfigurationEntry[] engineGetAppConfigurationEntry(java.lang.String);
+ method protected void engineRefresh();
+ }
+
public class LoginException extends java.security.GeneralSecurityException {
ctor public LoginException();
ctor public LoginException(java.lang.String);
@@ -58804,10 +64230,10 @@
package javax.security.auth.x500 {
public final class X500Principal implements java.security.Principal java.io.Serializable {
- ctor public X500Principal(byte[]);
- ctor public X500Principal(java.io.InputStream);
ctor public X500Principal(java.lang.String);
ctor public X500Principal(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
+ ctor public X500Principal(byte[]);
+ ctor public X500Principal(java.io.InputStream);
method public byte[] getEncoded();
method public java.lang.String getName();
method public java.lang.String getName(java.lang.String);
@@ -58831,28 +64257,28 @@
}
public class CertificateEncodingException extends javax.security.cert.CertificateException {
- ctor public CertificateEncodingException(java.lang.String);
ctor public CertificateEncodingException();
+ ctor public CertificateEncodingException(java.lang.String);
}
public class CertificateException extends java.lang.Exception {
- ctor public CertificateException(java.lang.String);
ctor public CertificateException();
+ ctor public CertificateException(java.lang.String);
}
public class CertificateExpiredException extends javax.security.cert.CertificateException {
- ctor public CertificateExpiredException(java.lang.String);
ctor public CertificateExpiredException();
+ ctor public CertificateExpiredException(java.lang.String);
}
public class CertificateNotYetValidException extends javax.security.cert.CertificateException {
- ctor public CertificateNotYetValidException(java.lang.String);
ctor public CertificateNotYetValidException();
+ ctor public CertificateNotYetValidException(java.lang.String);
}
public class CertificateParsingException extends javax.security.cert.CertificateException {
- ctor public CertificateParsingException(java.lang.String);
ctor public CertificateParsingException();
+ ctor public CertificateParsingException(java.lang.String);
}
public abstract class X509Certificate extends javax.security.cert.Certificate {
@@ -58879,11 +64305,12 @@
public abstract interface CommonDataSource {
method public abstract java.io.PrintWriter getLogWriter() throws java.sql.SQLException;
method public abstract int getLoginTimeout() throws java.sql.SQLException;
+ method public abstract java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException;
method public abstract void setLogWriter(java.io.PrintWriter) throws java.sql.SQLException;
method public abstract void setLoginTimeout(int) throws java.sql.SQLException;
}
- public class ConnectionEvent extends java.util.EventObject implements java.io.Serializable {
+ public class ConnectionEvent extends java.util.EventObject {
ctor public ConnectionEvent(javax.sql.PooledConnection);
ctor public ConnectionEvent(javax.sql.PooledConnection, java.sql.SQLException);
method public java.sql.SQLException getSQLException();
@@ -58932,21 +64359,21 @@
method public abstract void removeRowSetListener(javax.sql.RowSetListener);
method public abstract void setArray(int, java.sql.Array) throws java.sql.SQLException;
method public abstract void setAsciiStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setAsciiStream(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setAsciiStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
- method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setBigDecimal(int, java.math.BigDecimal) throws java.sql.SQLException;
method public abstract void setBigDecimal(java.lang.String, java.math.BigDecimal) throws java.sql.SQLException;
method public abstract void setBinaryStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setBinaryStream(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBinaryStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
- method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
method public abstract void setBlob(int, java.sql.Blob) throws java.sql.SQLException;
- method public abstract void setBlob(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBlob(int, java.io.InputStream, long) throws java.sql.SQLException;
- method public abstract void setBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBlob(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
method public abstract void setBlob(java.lang.String, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
method public abstract void setBoolean(int, boolean) throws java.sql.SQLException;
method public abstract void setBoolean(java.lang.String, boolean) throws java.sql.SQLException;
method public abstract void setByte(int, byte) throws java.sql.SQLException;
@@ -58954,15 +64381,15 @@
method public abstract void setBytes(int, byte[]) throws java.sql.SQLException;
method public abstract void setBytes(java.lang.String, byte[]) throws java.sql.SQLException;
method public abstract void setCharacterStream(int, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
method public abstract void setCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
method public abstract void setCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
method public abstract void setClob(int, java.sql.Clob) throws java.sql.SQLException;
- method public abstract void setClob(int, java.io.Reader) throws java.sql.SQLException;
method public abstract void setClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setClob(java.lang.String, java.sql.Clob) throws java.sql.SQLException;
method public abstract void setClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setCommand(java.lang.String) throws java.sql.SQLException;
method public abstract void setConcurrency(int) throws java.sql.SQLException;
method public abstract void setDataSourceName(java.lang.String) throws java.sql.SQLException;
@@ -58983,26 +64410,26 @@
method public abstract void setMaxRows(int) throws java.sql.SQLException;
method public abstract void setNCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
method public abstract void setNCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
- method public abstract void setNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
method public abstract void setNCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setNClob(int, java.sql.NClob) throws java.sql.SQLException;
method public abstract void setNClob(int, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setNClob(int, java.io.Reader, long) throws java.sql.SQLException;
- method public abstract void setNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
- method public abstract void setNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
- method public abstract void setNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
method public abstract void setNString(int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(int, int) throws java.sql.SQLException;
- method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
method public abstract void setNull(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
- method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
- method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
method public abstract void setObject(int, java.lang.Object, int, int) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
- method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
method public abstract void setObject(java.lang.String, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
method public abstract void setPassword(java.lang.String) throws java.sql.SQLException;
method public abstract void setQueryTimeout(int) throws java.sql.SQLException;
method public abstract void setReadOnly(boolean) throws java.sql.SQLException;
@@ -59020,8 +64447,8 @@
method public abstract void setTime(java.lang.String, java.sql.Time) throws java.sql.SQLException;
method public abstract void setTime(java.lang.String, java.sql.Time, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTimestamp(int, java.sql.Timestamp) throws java.sql.SQLException;
- method public abstract void setTimestamp(int, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void setTimestamp(int, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
method public abstract void setTransactionIsolation(int) throws java.sql.SQLException;
method public abstract void setType(int) throws java.sql.SQLException;
@@ -59031,7 +64458,7 @@
method public abstract void setUsername(java.lang.String) throws java.sql.SQLException;
}
- public class RowSetEvent extends java.util.EventObject implements java.io.Serializable {
+ public class RowSetEvent extends java.util.EventObject {
ctor public RowSetEvent(javax.sql.RowSet);
}
@@ -59078,8 +64505,8 @@
}
public class StatementEvent extends java.util.EventObject {
- ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement, java.sql.SQLException);
ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement);
+ ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement, java.sql.SQLException);
method public java.sql.SQLException getSQLException();
method public java.sql.PreparedStatement getStatement();
}
diff --git a/api/test-current.txt b/api/test-current.txt
new file mode 100644
index 0000000..904347d
--- /dev/null
+++ b/api/test-current.txt
@@ -0,0 +1,64048 @@
+package android {
+
+ public final class Manifest {
+ ctor public Manifest();
+ }
+
+ public static final class Manifest.permission {
+ ctor public Manifest.permission();
+ field public static final java.lang.String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
+ field public static final java.lang.String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";
+ field public static final java.lang.String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";
+ field public static final java.lang.String ACCESS_LOCATION_EXTRA_COMMANDS = "android.permission.ACCESS_LOCATION_EXTRA_COMMANDS";
+ field public static final java.lang.String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";
+ field public static final java.lang.String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY";
+ field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";
+ field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
+ field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";
+ field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
+ field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
+ field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
+ field public static final deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
+ field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";
+ field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
+ field public static final java.lang.String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE";
+ field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
+ field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
+ field public static final java.lang.String BIND_INCALL_SERVICE = "android.permission.BIND_INCALL_SERVICE";
+ field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
+ field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";
+ field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
+ field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
+ field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
+ field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";
+ field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
+ field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
+ field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
+ field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";
+ field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";
+ field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
+ field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";
+ field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";
+ field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";
+ field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";
+ field public static final java.lang.String BODY_SENSORS = "android.permission.BODY_SENSORS";
+ field public static final java.lang.String BROADCAST_PACKAGE_REMOVED = "android.permission.BROADCAST_PACKAGE_REMOVED";
+ field public static final java.lang.String BROADCAST_SMS = "android.permission.BROADCAST_SMS";
+ field public static final java.lang.String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";
+ field public static final java.lang.String BROADCAST_WAP_PUSH = "android.permission.BROADCAST_WAP_PUSH";
+ 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 CAPTURE_AUDIO_OUTPUT = "android.permission.CAPTURE_AUDIO_OUTPUT";
+ field public static final java.lang.String CAPTURE_SECURE_VIDEO_OUTPUT = "android.permission.CAPTURE_SECURE_VIDEO_OUTPUT";
+ field public static final java.lang.String CAPTURE_VIDEO_OUTPUT = "android.permission.CAPTURE_VIDEO_OUTPUT";
+ 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";
+ field public static final java.lang.String CHANGE_WIFI_MULTICAST_STATE = "android.permission.CHANGE_WIFI_MULTICAST_STATE";
+ field public static final java.lang.String CHANGE_WIFI_STATE = "android.permission.CHANGE_WIFI_STATE";
+ field public static final java.lang.String CLEAR_APP_CACHE = "android.permission.CLEAR_APP_CACHE";
+ field public static final java.lang.String CONTROL_LOCATION_UPDATES = "android.permission.CONTROL_LOCATION_UPDATES";
+ field public static final java.lang.String DELETE_CACHE_FILES = "android.permission.DELETE_CACHE_FILES";
+ field public static final java.lang.String DELETE_PACKAGES = "android.permission.DELETE_PACKAGES";
+ field public static final java.lang.String DIAGNOSTIC = "android.permission.DIAGNOSTIC";
+ field public static final java.lang.String DISABLE_KEYGUARD = "android.permission.DISABLE_KEYGUARD";
+ field public static final java.lang.String DUMP = "android.permission.DUMP";
+ field public static final java.lang.String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";
+ field public static final java.lang.String FACTORY_TEST = "android.permission.FACTORY_TEST";
+ field public static final java.lang.String FLASHLIGHT = "android.permission.FLASHLIGHT";
+ field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
+ field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";
+ field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
+ field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";
+ field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";
+ field public static final java.lang.String INSTALL_LOCATION_PROVIDER = "android.permission.INSTALL_LOCATION_PROVIDER";
+ field public static final java.lang.String INSTALL_PACKAGES = "android.permission.INSTALL_PACKAGES";
+ field public static final java.lang.String INSTALL_SHORTCUT = "com.android.launcher.permission.INSTALL_SHORTCUT";
+ field public static final java.lang.String INTERNET = "android.permission.INTERNET";
+ field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
+ field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
+ field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
+ field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
+ field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
+ field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
+ field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
+ field public static final java.lang.String MOUNT_FORMAT_FILESYSTEMS = "android.permission.MOUNT_FORMAT_FILESYSTEMS";
+ field public static final java.lang.String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS";
+ field public static final java.lang.String NFC = "android.permission.NFC";
+ field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
+ field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
+ field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
+ field public static final java.lang.String READ_CALENDAR = "android.permission.READ_CALENDAR";
+ field public static final java.lang.String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
+ field public static final java.lang.String READ_CONTACTS = "android.permission.READ_CONTACTS";
+ field public static final java.lang.String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
+ field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";
+ field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
+ field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";
+ field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
+ field public static final java.lang.String READ_SMS = "android.permission.READ_SMS";
+ field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
+ field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS";
+ field public static final java.lang.String READ_VOICEMAIL = "com.android.voicemail.permission.READ_VOICEMAIL";
+ field public static final java.lang.String READ_WRITE_CONTACT_METADATA = "android.permission.READ_WRITE_CONTACT_METADATA";
+ field public static final java.lang.String REBOOT = "android.permission.REBOOT";
+ field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
+ field public static final java.lang.String RECEIVE_MMS = "android.permission.RECEIVE_MMS";
+ field public static final java.lang.String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
+ field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
+ field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
+ field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";
+ field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
+ field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";
+ field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
+ field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
+ field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
+ field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";
+ field public static final java.lang.String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";
+ field public static final java.lang.String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";
+ field public static final java.lang.String SET_DEBUG_APP = "android.permission.SET_DEBUG_APP";
+ field public static final deprecated java.lang.String SET_PREFERRED_APPLICATIONS = "android.permission.SET_PREFERRED_APPLICATIONS";
+ field public static final java.lang.String SET_PROCESS_LIMIT = "android.permission.SET_PROCESS_LIMIT";
+ field public static final java.lang.String SET_TIME = "android.permission.SET_TIME";
+ field public static final java.lang.String SET_TIME_ZONE = "android.permission.SET_TIME_ZONE";
+ field public static final java.lang.String SET_WALLPAPER = "android.permission.SET_WALLPAPER";
+ field public static final java.lang.String SET_WALLPAPER_HINTS = "android.permission.SET_WALLPAPER_HINTS";
+ field public static final java.lang.String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";
+ field public static final java.lang.String STATUS_BAR = "android.permission.STATUS_BAR";
+ field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
+ field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
+ field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";
+ field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";
+ field public static final java.lang.String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT";
+ field public static final java.lang.String USE_SIP = "android.permission.USE_SIP";
+ field public static final java.lang.String VIBRATE = "android.permission.VIBRATE";
+ field public static final java.lang.String WAKE_LOCK = "android.permission.WAKE_LOCK";
+ field public static final java.lang.String WRITE_APN_SETTINGS = "android.permission.WRITE_APN_SETTINGS";
+ field public static final java.lang.String WRITE_CALENDAR = "android.permission.WRITE_CALENDAR";
+ field public static final java.lang.String WRITE_CALL_LOG = "android.permission.WRITE_CALL_LOG";
+ field public static final java.lang.String WRITE_CONTACTS = "android.permission.WRITE_CONTACTS";
+ field public static final java.lang.String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE";
+ field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES";
+ field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";
+ field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS";
+ field public static final java.lang.String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS";
+ field public static final java.lang.String WRITE_VOICEMAIL = "com.android.voicemail.permission.WRITE_VOICEMAIL";
+ }
+
+ public static final class Manifest.permission_group {
+ ctor public Manifest.permission_group();
+ field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
+ field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
+ field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";
+ field public static final java.lang.String LOCATION = "android.permission-group.LOCATION";
+ field public static final java.lang.String MICROPHONE = "android.permission-group.MICROPHONE";
+ field public static final java.lang.String PHONE = "android.permission-group.PHONE";
+ field public static final java.lang.String SENSORS = "android.permission-group.SENSORS";
+ field public static final java.lang.String SMS = "android.permission-group.SMS";
+ field public static final java.lang.String STORAGE = "android.permission-group.STORAGE";
+ }
+
+ public final class R {
+ ctor public R();
+ }
+
+ public static final class R.anim {
+ ctor public R.anim();
+ field public static final int accelerate_decelerate_interpolator = 17432580; // 0x10a0004
+ field public static final int accelerate_interpolator = 17432581; // 0x10a0005
+ field public static final int anticipate_interpolator = 17432583; // 0x10a0007
+ field public static final int anticipate_overshoot_interpolator = 17432585; // 0x10a0009
+ field public static final int bounce_interpolator = 17432586; // 0x10a000a
+ field public static final int cycle_interpolator = 17432588; // 0x10a000c
+ field public static final int decelerate_interpolator = 17432582; // 0x10a0006
+ field public static final int fade_in = 17432576; // 0x10a0000
+ field public static final int fade_out = 17432577; // 0x10a0001
+ field public static final int linear_interpolator = 17432587; // 0x10a000b
+ field public static final int overshoot_interpolator = 17432584; // 0x10a0008
+ field public static final int slide_in_left = 17432578; // 0x10a0002
+ field public static final int slide_out_right = 17432579; // 0x10a0003
+ }
+
+ public static final class R.animator {
+ ctor public R.animator();
+ field public static final int fade_in = 17498112; // 0x10b0000
+ field public static final int fade_out = 17498113; // 0x10b0001
+ }
+
+ public static final class R.array {
+ ctor public R.array();
+ field public static final int emailAddressTypes = 17235968; // 0x1070000
+ field public static final int imProtocols = 17235969; // 0x1070001
+ field public static final int organizationTypes = 17235970; // 0x1070002
+ field public static final int phoneTypes = 17235971; // 0x1070003
+ field public static final int postalAddressTypes = 17235972; // 0x1070004
+ }
+
+ public static final class R.attr {
+ ctor public R.attr();
+ field public static final int absListViewStyle = 16842858; // 0x101006a
+ field public static final int accessibilityEventTypes = 16843648; // 0x1010380
+ field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
+ field public static final int accessibilityFlags = 16843652; // 0x1010384
+ field public static final int accessibilityLiveRegion = 16843758; // 0x10103ee
+ field public static final int accessibilityTraversalAfter = 16843986; // 0x10104d2
+ field public static final int accessibilityTraversalBefore = 16843985; // 0x10104d1
+ field public static final int accountPreferences = 16843423; // 0x101029f
+ field public static final int accountType = 16843407; // 0x101028f
+ field public static final int action = 16842797; // 0x101002d
+ field public static final int actionBarDivider = 16843675; // 0x101039b
+ field public static final int actionBarItemBackground = 16843676; // 0x101039c
+ field public static final int actionBarPopupTheme = 16843917; // 0x101048d
+ field public static final int actionBarSize = 16843499; // 0x10102eb
+ field public static final int actionBarSplitStyle = 16843656; // 0x1010388
+ field public static final int actionBarStyle = 16843470; // 0x10102ce
+ field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4
+ field public static final int actionBarTabStyle = 16843507; // 0x10102f3
+ field public static final int actionBarTabTextStyle = 16843509; // 0x10102f5
+ field public static final int actionBarTheme = 16843825; // 0x1010431
+ field public static final int actionBarWidgetTheme = 16843671; // 0x1010397
+ field public static final int actionButtonStyle = 16843480; // 0x10102d8
+ field public static final int actionDropDownStyle = 16843479; // 0x10102d7
+ field public static final int actionLayout = 16843515; // 0x10102fb
+ field public static final int actionMenuTextAppearance = 16843616; // 0x1010360
+ field public static final int actionMenuTextColor = 16843617; // 0x1010361
+ field public static final int actionModeBackground = 16843483; // 0x10102db
+ field public static final int actionModeCloseButtonStyle = 16843511; // 0x10102f7
+ field public static final int actionModeCloseDrawable = 16843484; // 0x10102dc
+ field public static final int actionModeCopyDrawable = 16843538; // 0x1010312
+ field public static final int actionModeCutDrawable = 16843537; // 0x1010311
+ field public static final int actionModeFindDrawable = 16843898; // 0x101047a
+ field public static final int actionModePasteDrawable = 16843539; // 0x1010313
+ field public static final int actionModeSelectAllDrawable = 16843646; // 0x101037e
+ field public static final int actionModeShareDrawable = 16843897; // 0x1010479
+ field public static final int actionModeSplitBackground = 16843677; // 0x101039d
+ field public static final int actionModeStyle = 16843668; // 0x1010394
+ field public static final int actionModeWebSearchDrawable = 16843899; // 0x101047b
+ field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6
+ field public static final int actionOverflowMenuStyle = 16843844; // 0x1010444
+ field public static final int actionProviderClass = 16843657; // 0x1010389
+ field public static final int actionViewClass = 16843516; // 0x10102fc
+ field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd
+ field public static final int activityCloseEnterAnimation = 16842938; // 0x10100ba
+ field public static final int activityCloseExitAnimation = 16842939; // 0x10100bb
+ field public static final int activityOpenEnterAnimation = 16842936; // 0x10100b8
+ field public static final int activityOpenExitAnimation = 16842937; // 0x10100b9
+ field public static final int addPrintersActivity = 16843750; // 0x10103e6
+ field public static final int addStatesFromChildren = 16842992; // 0x10100f0
+ field public static final int adjustViewBounds = 16843038; // 0x101011e
+ field public static final int advancedPrintOptionsActivity = 16843761; // 0x10103f1
+ field public static final int alertDialogIcon = 16843605; // 0x1010355
+ field public static final int alertDialogStyle = 16842845; // 0x101005d
+ field public static final int alertDialogTheme = 16843529; // 0x1010309
+ field public static final int alignmentMode = 16843642; // 0x101037a
+ field public static final int allContactsName = 16843468; // 0x10102cc
+ field public static final int allowBackup = 16843392; // 0x1010280
+ field public static final int allowClearUserData = 16842757; // 0x1010005
+ field public static final int allowEmbedded = 16843765; // 0x10103f5
+ field public static final int allowParallelSyncs = 16843570; // 0x1010332
+ field public static final int allowSingleTap = 16843353; // 0x1010259
+ field public static final int allowTaskReparenting = 16843268; // 0x1010204
+ field public static final int allowUndo = 16843999; // 0x10104df
+ field public static final int alpha = 16843551; // 0x101031f
+ field public static final int alphabeticShortcut = 16843235; // 0x10101e3
+ field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef
+ field public static final int alwaysRetainTaskState = 16843267; // 0x1010203
+ field public static final deprecated int amPmBackgroundColor = 16843941; // 0x10104a5
+ field public static final deprecated int amPmTextColor = 16843940; // 0x10104a4
+ field public static final int ambientShadowAlpha = 16843966; // 0x10104be
+ field public static final int angle = 16843168; // 0x10101a0
+ field public static final int animateFirstView = 16843477; // 0x10102d5
+ field public static final int animateLayoutChanges = 16843506; // 0x10102f2
+ field public static final int animateOnClick = 16843356; // 0x101025c
+ field public static final int animation = 16843213; // 0x10101cd
+ field public static final int animationCache = 16842989; // 0x10100ed
+ field public static final int animationDuration = 16843026; // 0x1010112
+ field public static final int animationOrder = 16843214; // 0x10101ce
+ field public static final deprecated int animationResolution = 16843546; // 0x101031a
+ field public static final int antialias = 16843034; // 0x101011a
+ field public static final int anyDensity = 16843372; // 0x101026c
+ field public static final int apduServiceBanner = 16843757; // 0x10103ed
+ field public static final int apiKey = 16843281; // 0x1010211
+ field public static final int author = 16843444; // 0x10102b4
+ field public static final int authorities = 16842776; // 0x1010018
+ field public static final int autoAdvanceViewId = 16843535; // 0x101030f
+ field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b
+ field public static final int autoLink = 16842928; // 0x10100b0
+ field public static final int autoMirrored = 16843754; // 0x10103ea
+ field public static final int autoRemoveFromRecents = 16843847; // 0x1010447
+ field public static final int autoStart = 16843445; // 0x10102b5
+ field public static final deprecated int autoText = 16843114; // 0x101016a
+ field public static final int autoUrlDetect = 16843404; // 0x101028c
+ field public static final int autoVerify = 16844014; // 0x10104ee
+ field public static final int background = 16842964; // 0x10100d4
+ field public static final int backgroundDimAmount = 16842802; // 0x1010032
+ field public static final int backgroundDimEnabled = 16843295; // 0x101021f
+ field public static final int backgroundSplit = 16843659; // 0x101038b
+ field public static final int backgroundStacked = 16843658; // 0x101038a
+ field public static final int backgroundTint = 16843883; // 0x101046b
+ field public static final int backgroundTintMode = 16843884; // 0x101046c
+ field public static final int backupAgent = 16843391; // 0x101027f
+ field public static final int banner = 16843762; // 0x10103f2
+ field public static final int baseline = 16843548; // 0x101031c
+ field public static final int baselineAlignBottom = 16843042; // 0x1010122
+ field public static final int baselineAligned = 16843046; // 0x1010126
+ field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127
+ field public static final int borderlessButtonStyle = 16843563; // 0x101032b
+ field public static final int bottom = 16843184; // 0x10101b0
+ field public static final int bottomBright = 16842957; // 0x10100cd
+ field public static final int bottomDark = 16842953; // 0x10100c9
+ field public static final int bottomLeftRadius = 16843179; // 0x10101ab
+ field public static final int bottomMedium = 16842958; // 0x10100ce
+ field public static final int bottomOffset = 16843351; // 0x1010257
+ field public static final int bottomRightRadius = 16843180; // 0x10101ac
+ field public static final int breadCrumbShortTitle = 16843524; // 0x1010304
+ field public static final int breadCrumbTitle = 16843523; // 0x1010303
+ field public static final int breakStrategy = 16843997; // 0x10104dd
+ field public static final int bufferType = 16843086; // 0x101014e
+ field public static final int button = 16843015; // 0x1010107
+ field public static final int buttonBarButtonStyle = 16843567; // 0x101032f
+ field public static final int buttonBarNegativeButtonStyle = 16843915; // 0x101048b
+ field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a
+ field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489
+ field public static final int buttonBarStyle = 16843566; // 0x101032e
+ field public static final int buttonGravity = 16844031; // 0x10104ff
+ field public static final int buttonStyle = 16842824; // 0x1010048
+ field public static final int buttonStyleInset = 16842826; // 0x101004a
+ field public static final int buttonStyleSmall = 16842825; // 0x1010049
+ field public static final int buttonStyleToggle = 16842827; // 0x101004b
+ field public static final int buttonTint = 16843887; // 0x101046f
+ field public static final int buttonTintMode = 16843888; // 0x1010470
+ field public static final int cacheColorHint = 16843009; // 0x1010101
+ field public static final int calendarTextColor = 16843931; // 0x101049b
+ field public static final int calendarViewShown = 16843596; // 0x101034c
+ field public static final int calendarViewStyle = 16843613; // 0x101035d
+ field public static final int canControlMagnification = 16844040; // 0x1010508
+ field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8
+ field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9
+ field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
+ 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
+ field public static final int category = 16843752; // 0x10103e8
+ field public static final int centerBright = 16842956; // 0x10100cc
+ field public static final int centerColor = 16843275; // 0x101020b
+ field public static final int centerDark = 16842952; // 0x10100c8
+ field public static final int centerMedium = 16842959; // 0x10100cf
+ field public static final int centerX = 16843170; // 0x10101a2
+ field public static final int centerY = 16843171; // 0x10101a3
+ field public static final int checkBoxPreferenceStyle = 16842895; // 0x101008f
+ field public static final int checkMark = 16843016; // 0x1010108
+ field public static final int checkMarkTint = 16843943; // 0x10104a7
+ field public static final int checkMarkTintMode = 16843944; // 0x10104a8
+ field public static final int checkable = 16843237; // 0x10101e5
+ field public static final int checkableBehavior = 16843232; // 0x10101e0
+ field public static final int checkboxStyle = 16842860; // 0x101006c
+ field public static final int checked = 16843014; // 0x1010106
+ field public static final int checkedButton = 16843080; // 0x1010148
+ field public static final int checkedTextViewStyle = 16843720; // 0x10103c8
+ field public static final int childDivider = 16843025; // 0x1010111
+ field public static final int childIndicator = 16843020; // 0x101010c
+ field public static final int childIndicatorEnd = 16843732; // 0x10103d4
+ field public static final int childIndicatorLeft = 16843023; // 0x101010f
+ field public static final int childIndicatorRight = 16843024; // 0x1010110
+ field public static final int childIndicatorStart = 16843731; // 0x10103d3
+ field public static final int choiceMode = 16843051; // 0x101012b
+ field public static final int clearTaskOnLaunch = 16842773; // 0x1010015
+ field public static final int clickable = 16842981; // 0x10100e5
+ field public static final int clipChildren = 16842986; // 0x10100ea
+ field public static final int clipOrientation = 16843274; // 0x101020a
+ field public static final int clipToPadding = 16842987; // 0x10100eb
+ field public static final int closeIcon = 16843905; // 0x1010481
+ field public static final int codes = 16843330; // 0x1010242
+ field public static final int collapseColumns = 16843083; // 0x101014b
+ field public static final int collapseContentDescription = 16843984; // 0x10104d0
+ field public static final int collapseIcon = 16844032; // 0x1010500
+ field public static final int color = 16843173; // 0x10101a5
+ field public static final int colorAccent = 16843829; // 0x1010435
+ field public static final int colorActivatedHighlight = 16843664; // 0x1010390
+ field public static final int colorBackground = 16842801; // 0x1010031
+ field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab
+ field public static final int colorBackgroundFloating = 16844002; // 0x10104e2
+ field public static final int colorButtonNormal = 16843819; // 0x101042b
+ field public static final int colorControlActivated = 16843818; // 0x101042a
+ field public static final int colorControlHighlight = 16843820; // 0x101042c
+ field public static final int colorControlNormal = 16843817; // 0x1010429
+ field public static final int colorEdgeEffect = 16843982; // 0x10104ce
+ field public static final int colorFocusedHighlight = 16843663; // 0x101038f
+ field public static final int colorForeground = 16842800; // 0x1010030
+ field public static final int colorForegroundInverse = 16843270; // 0x1010206
+ field public static final int colorLongPressedHighlight = 16843662; // 0x101038e
+ field public static final int colorMultiSelectHighlight = 16843665; // 0x1010391
+ field public static final int colorPressedHighlight = 16843661; // 0x101038d
+ field public static final int colorPrimary = 16843827; // 0x1010433
+ field public static final int colorPrimaryDark = 16843828; // 0x1010434
+ field public static final int columnCount = 16843639; // 0x1010377
+ field public static final int columnDelay = 16843215; // 0x10101cf
+ field public static final int columnOrderPreserved = 16843640; // 0x1010378
+ field public static final int columnWidth = 16843031; // 0x1010117
+ field public static final int commitIcon = 16843909; // 0x1010485
+ field public static final int compatibleWidthLimitDp = 16843621; // 0x1010365
+ field public static final int completionHint = 16843122; // 0x1010172
+ field public static final int completionHintView = 16843123; // 0x1010173
+ field public static final int completionThreshold = 16843124; // 0x1010174
+ field public static final int configChanges = 16842783; // 0x101001f
+ field public static final int configure = 16843357; // 0x101025d
+ field public static final int constantSize = 16843158; // 0x1010196
+ field public static final int content = 16843355; // 0x101025b
+ field public static final int contentAgeHint = 16843961; // 0x10104b9
+ field public static final int contentAuthority = 16843408; // 0x1010290
+ field public static final int contentDescription = 16843379; // 0x1010273
+ field public static final int contentInsetEnd = 16843860; // 0x1010454
+ field public static final int contentInsetLeft = 16843861; // 0x1010455
+ field public static final int contentInsetRight = 16843862; // 0x1010456
+ field public static final int contentInsetStart = 16843859; // 0x1010453
+ field public static final int contextClickable = 16844007; // 0x10104e7
+ field public static final int contextPopupMenuStyle = 16844034; // 0x1010502
+ field public static final int controlX1 = 16843772; // 0x10103fc
+ field public static final int controlX2 = 16843774; // 0x10103fe
+ field public static final int controlY1 = 16843773; // 0x10103fd
+ field public static final int controlY2 = 16843775; // 0x10103ff
+ field public static final int country = 16843962; // 0x10104ba
+ field public static final int cropToPadding = 16843043; // 0x1010123
+ field public static final int cursorVisible = 16843090; // 0x1010152
+ field public static final int customNavigationLayout = 16843474; // 0x10102d2
+ field public static final int customTokens = 16843579; // 0x101033b
+ field public static final int cycles = 16843220; // 0x10101d4
+ field public static final int dashGap = 16843175; // 0x10101a7
+ field public static final int dashWidth = 16843174; // 0x10101a6
+ field public static final int data = 16842798; // 0x101002e
+ field public static final int datePickerDialogTheme = 16843948; // 0x10104ac
+ field public static final int datePickerMode = 16843955; // 0x10104b3
+ field public static final int datePickerStyle = 16843612; // 0x101035c
+ field public static final int dateTextAppearance = 16843593; // 0x1010349
+ field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494
+ field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
+ field public static final int debuggable = 16842767; // 0x101000f
+ field public static final int defaultValue = 16843245; // 0x10101ed
+ field public static final int delay = 16843212; // 0x10101cc
+ field public static final int dependency = 16843244; // 0x10101ec
+ field public static final int descendantFocusability = 16842993; // 0x10100f1
+ field public static final int description = 16842784; // 0x1010020
+ field public static final int detachWallpaper = 16843430; // 0x10102a6
+ field public static final int detailColumn = 16843427; // 0x10102a3
+ field public static final int detailSocialSummary = 16843428; // 0x10102a4
+ field public static final int detailsElementBackground = 16843598; // 0x101034e
+ field public static final int dial = 16843010; // 0x1010102
+ field public static final int dialogIcon = 16843252; // 0x10101f4
+ field public static final int dialogLayout = 16843255; // 0x10101f7
+ field public static final int dialogMessage = 16843251; // 0x10101f3
+ field public static final int dialogPreferenceStyle = 16842897; // 0x1010091
+ field public static final int dialogPreferredPadding = 16843987; // 0x10104d3
+ field public static final int dialogTheme = 16843528; // 0x1010308
+ field public static final int dialogTitle = 16843250; // 0x10101f2
+ field public static final int digits = 16843110; // 0x1010166
+ field public static final int direction = 16843217; // 0x10101d1
+ field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1
+ field public static final int directionPriority = 16843218; // 0x10101d2
+ field public static final int disableDependentsState = 16843249; // 0x10101f1
+ field public static final int disabledAlpha = 16842803; // 0x1010033
+ field public static final int displayOptions = 16843472; // 0x10102d0
+ field public static final int dither = 16843036; // 0x101011c
+ field public static final int divider = 16843049; // 0x1010129
+ field public static final int dividerHeight = 16843050; // 0x101012a
+ field public static final int dividerHorizontal = 16843564; // 0x101032c
+ field public static final int dividerPadding = 16843562; // 0x101032a
+ field public static final int dividerVertical = 16843530; // 0x101030a
+ field public static final int documentLaunchMode = 16843845; // 0x1010445
+ field public static final int drawSelectorOnTop = 16843004; // 0x10100fc
+ field public static final int drawable = 16843161; // 0x1010199
+ field public static final int drawableBottom = 16843118; // 0x101016e
+ field public static final int drawableEnd = 16843667; // 0x1010393
+ field public static final int drawableLeft = 16843119; // 0x101016f
+ field public static final int drawablePadding = 16843121; // 0x1010171
+ field public static final int drawableRight = 16843120; // 0x1010170
+ field public static final int drawableStart = 16843666; // 0x1010392
+ field public static final int drawableTint = 16843990; // 0x10104d6
+ field public static final int drawableTintMode = 16843991; // 0x10104d7
+ field public static final int drawableTop = 16843117; // 0x101016d
+ field public static final int drawingCacheQuality = 16842984; // 0x10100e8
+ field public static final int dropDownAnchor = 16843363; // 0x1010263
+ field public static final int dropDownHeight = 16843395; // 0x1010283
+ field public static final int dropDownHintAppearance = 16842888; // 0x1010088
+ field public static final int dropDownHorizontalOffset = 16843436; // 0x10102ac
+ field public static final int dropDownItemStyle = 16842886; // 0x1010086
+ field public static final int dropDownListViewStyle = 16842861; // 0x101006d
+ field public static final int dropDownSelector = 16843125; // 0x1010175
+ field public static final int dropDownSpinnerStyle = 16843478; // 0x10102d6
+ field public static final int dropDownVerticalOffset = 16843437; // 0x10102ad
+ field public static final int dropDownWidth = 16843362; // 0x1010262
+ field public static final int duplicateParentState = 16842985; // 0x10100e9
+ field public static final int duration = 16843160; // 0x1010198
+ field public static final int editTextBackground = 16843602; // 0x1010352
+ field public static final int editTextColor = 16843601; // 0x1010351
+ field public static final int editTextPreferenceStyle = 16842898; // 0x1010092
+ field public static final int editTextStyle = 16842862; // 0x101006e
+ field public static final deprecated int editable = 16843115; // 0x101016b
+ field public static final int editorExtras = 16843300; // 0x1010224
+ field public static final int elegantTextHeight = 16843869; // 0x101045d
+ field public static final int elevation = 16843840; // 0x1010440
+ field public static final int ellipsize = 16842923; // 0x10100ab
+ field public static final int ems = 16843096; // 0x1010158
+ field public static final int enabled = 16842766; // 0x101000e
+ field public static final int encryptionAware = 16844038; // 0x1010506
+ field public static final int end = 16843996; // 0x10104dc
+ field public static final int endColor = 16843166; // 0x101019e
+ field public static final deprecated int endYear = 16843133; // 0x101017d
+ field public static final int enterFadeDuration = 16843532; // 0x101030c
+ field public static final int entries = 16842930; // 0x10100b2
+ field public static final int entryValues = 16843256; // 0x10101f8
+ field public static final int eventsInterceptionEnabled = 16843389; // 0x101027d
+ field public static final int excludeClass = 16843842; // 0x1010442
+ field public static final int excludeFromRecents = 16842775; // 0x1010017
+ field public static final int excludeId = 16843841; // 0x1010441
+ field public static final int excludeName = 16843854; // 0x101044e
+ field public static final int exitFadeDuration = 16843533; // 0x101030d
+ field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052
+ field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
+ field public static final int expandableListPreferredChildPaddingLeft = 16842831; // 0x101004f
+ field public static final int expandableListPreferredItemIndicatorLeft = 16842832; // 0x1010050
+ field public static final int expandableListPreferredItemIndicatorRight = 16842833; // 0x1010051
+ field public static final int expandableListPreferredItemPaddingLeft = 16842830; // 0x101004e
+ field public static final int expandableListViewStyle = 16842863; // 0x101006f
+ field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6
+ field public static final int exported = 16842768; // 0x1010010
+ field public static final int extraTension = 16843371; // 0x101026b
+ field public static final int extractNativeLibs = 16844010; // 0x10104ea
+ field public static final int factor = 16843219; // 0x10101d3
+ field public static final int fadeDuration = 16843384; // 0x1010278
+ field public static final int fadeEnabled = 16843390; // 0x101027e
+ field public static final int fadeOffset = 16843383; // 0x1010277
+ field public static final int fadeScrollbars = 16843434; // 0x10102aa
+ field public static final int fadingEdge = 16842975; // 0x10100df
+ field public static final int fadingEdgeLength = 16842976; // 0x10100e0
+ field public static final int fadingMode = 16843745; // 0x10103e1
+ field public static final int fastScrollAlwaysVisible = 16843573; // 0x1010335
+ field public static final int fastScrollEnabled = 16843302; // 0x1010226
+ field public static final int fastScrollOverlayPosition = 16843578; // 0x101033a
+ field public static final int fastScrollPreviewBackgroundLeft = 16843575; // 0x1010337
+ field public static final int fastScrollPreviewBackgroundRight = 16843576; // 0x1010338
+ field public static final int fastScrollStyle = 16843767; // 0x10103f7
+ field public static final int fastScrollTextColor = 16843609; // 0x1010359
+ field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336
+ field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339
+ field public static final int fillAfter = 16843197; // 0x10101bd
+ field public static final int fillAlpha = 16843980; // 0x10104cc
+ field public static final int fillBefore = 16843196; // 0x10101bc
+ field public static final int fillColor = 16843780; // 0x1010404
+ field public static final int fillEnabled = 16843343; // 0x101024f
+ field public static final int fillViewport = 16843130; // 0x101017a
+ field public static final int filter = 16843035; // 0x101011b
+ field public static final int filterTouchesWhenObscured = 16843460; // 0x10102c4
+ field public static final int fingerprintAuthDrawable = 16844008; // 0x10104e8
+ field public static final int finishOnCloseSystemDialogs = 16843431; // 0x10102a7
+ field public static final int finishOnTaskLaunch = 16842772; // 0x1010014
+ field public static final int firstDayOfWeek = 16843581; // 0x101033d
+ field public static final int fitsSystemWindows = 16842973; // 0x10100dd
+ field public static final int flipInterval = 16843129; // 0x1010179
+ field public static final int focusable = 16842970; // 0x10100da
+ field public static final int focusableInTouchMode = 16842971; // 0x10100db
+ field public static final deprecated int focusedMonthDateColor = 16843587; // 0x1010343
+ field public static final int fontFamily = 16843692; // 0x10103ac
+ field public static final int fontFeatureSettings = 16843959; // 0x10104b7
+ field public static final int footerDividersEnabled = 16843311; // 0x101022f
+ field public static final int forceDeviceEncrypted = 16844037; // 0x1010505
+ field public static final int foreground = 16843017; // 0x1010109
+ field public static final int foregroundGravity = 16843264; // 0x1010200
+ field public static final int foregroundTint = 16843885; // 0x101046d
+ field public static final int foregroundTintMode = 16843886; // 0x101046e
+ field public static final int format = 16843013; // 0x1010105
+ field public static final int format12Hour = 16843722; // 0x10103ca
+ field public static final int format24Hour = 16843723; // 0x10103cb
+ field public static final int fraction = 16843992; // 0x10104d8
+ field public static final int fragment = 16843491; // 0x10102e3
+ field public static final int fragmentAllowEnterTransitionOverlap = 16843976; // 0x10104c8
+ field public static final int fragmentAllowReturnTransitionOverlap = 16843977; // 0x10104c9
+ field public static final int fragmentCloseEnterAnimation = 16843495; // 0x10102e7
+ field public static final int fragmentCloseExitAnimation = 16843496; // 0x10102e8
+ field public static final int fragmentEnterTransition = 16843971; // 0x10104c3
+ field public static final int fragmentExitTransition = 16843970; // 0x10104c2
+ field public static final int fragmentFadeEnterAnimation = 16843497; // 0x10102e9
+ field public static final int fragmentFadeExitAnimation = 16843498; // 0x10102ea
+ field public static final int fragmentOpenEnterAnimation = 16843493; // 0x10102e5
+ field public static final int fragmentOpenExitAnimation = 16843494; // 0x10102e6
+ field public static final int fragmentReenterTransition = 16843975; // 0x10104c7
+ field public static final int fragmentReturnTransition = 16843973; // 0x10104c5
+ field public static final int fragmentSharedElementEnterTransition = 16843972; // 0x10104c4
+ field public static final int fragmentSharedElementReturnTransition = 16843974; // 0x10104c6
+ field public static final int freezesText = 16843116; // 0x101016c
+ field public static final int fromAlpha = 16843210; // 0x10101ca
+ field public static final int fromDegrees = 16843187; // 0x10101b3
+ field public static final int fromId = 16843850; // 0x101044a
+ field public static final int fromScene = 16843741; // 0x10103dd
+ field public static final int fromXDelta = 16843206; // 0x10101c6
+ field public static final int fromXScale = 16843202; // 0x10101c2
+ field public static final int fromYDelta = 16843208; // 0x10101c8
+ field public static final int fromYScale = 16843204; // 0x10101c4
+ field public static final int fullBackupContent = 16844011; // 0x10104eb
+ field public static final int fullBackupOnly = 16843891; // 0x1010473
+ field public static final int fullBright = 16842954; // 0x10100ca
+ field public static final int fullDark = 16842950; // 0x10100c6
+ field public static final int functionalTest = 16842787; // 0x1010023
+ field public static final int galleryItemBackground = 16842828; // 0x101004c
+ field public static final int galleryStyle = 16842864; // 0x1010070
+ field public static final int gestureColor = 16843381; // 0x1010275
+ field public static final int gestureStrokeAngleThreshold = 16843388; // 0x101027c
+ field public static final int gestureStrokeLengthThreshold = 16843386; // 0x101027a
+ field public static final int gestureStrokeSquarenessThreshold = 16843387; // 0x101027b
+ field public static final int gestureStrokeType = 16843385; // 0x1010279
+ field public static final int gestureStrokeWidth = 16843380; // 0x1010274
+ field public static final int glEsVersion = 16843393; // 0x1010281
+ field public static final int goIcon = 16843906; // 0x1010482
+ field public static final int gradientRadius = 16843172; // 0x10101a4
+ field public static final int grantUriPermissions = 16842779; // 0x101001b
+ field public static final int gravity = 16842927; // 0x10100af
+ field public static final int gridViewStyle = 16842865; // 0x1010071
+ field public static final int groupIndicator = 16843019; // 0x101010b
+ field public static final int hand_hour = 16843011; // 0x1010103
+ field public static final int hand_minute = 16843012; // 0x1010104
+ field public static final int handle = 16843354; // 0x101025a
+ field public static final int handleProfiling = 16842786; // 0x1010022
+ field public static final int hapticFeedbackEnabled = 16843358; // 0x101025e
+ field public static final int hardwareAccelerated = 16843475; // 0x10102d3
+ field public static final int hasCode = 16842764; // 0x101000c
+ field public static final deprecated int headerAmPmTextAppearance = 16843936; // 0x10104a0
+ field public static final int headerBackground = 16843055; // 0x101012f
+ field public static final deprecated int headerDayOfMonthTextAppearance = 16843927; // 0x1010497
+ field public static final int headerDividersEnabled = 16843310; // 0x101022e
+ field public static final deprecated int headerMonthTextAppearance = 16843926; // 0x1010496
+ field public static final deprecated int headerTimeTextAppearance = 16843935; // 0x101049f
+ field public static final deprecated int headerYearTextAppearance = 16843928; // 0x1010498
+ field public static final int height = 16843093; // 0x1010155
+ field public static final int hideOnContentScroll = 16843843; // 0x1010443
+ field public static final int hint = 16843088; // 0x1010150
+ field public static final int homeAsUpIndicator = 16843531; // 0x101030b
+ field public static final int homeLayout = 16843549; // 0x101031d
+ field public static final int horizontalDivider = 16843053; // 0x101012d
+ field public static final int horizontalGap = 16843327; // 0x101023f
+ field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353
+ field public static final int horizontalSpacing = 16843028; // 0x1010114
+ field public static final int host = 16842792; // 0x1010028
+ field public static final int hyphenationFrequency = 16843998; // 0x10104de
+ field public static final int icon = 16842754; // 0x1010002
+ field public static final int iconPreview = 16843337; // 0x1010249
+ field public static final int iconifiedByDefault = 16843514; // 0x10102fa
+ field public static final int id = 16842960; // 0x10100d0
+ field public static final int ignoreGravity = 16843263; // 0x10101ff
+ field public static final int imageButtonStyle = 16842866; // 0x1010072
+ field public static final int imageWellStyle = 16842867; // 0x1010073
+ field public static final int imeActionId = 16843366; // 0x1010266
+ field public static final int imeActionLabel = 16843365; // 0x1010265
+ field public static final int imeExtractEnterAnimation = 16843368; // 0x1010268
+ field public static final int imeExtractExitAnimation = 16843369; // 0x1010269
+ field public static final int imeFullscreenBackground = 16843308; // 0x101022c
+ field public static final int imeOptions = 16843364; // 0x1010264
+ field public static final int imeSubtypeExtraValue = 16843502; // 0x10102ee
+ field public static final int imeSubtypeLocale = 16843500; // 0x10102ec
+ field public static final int imeSubtypeMode = 16843501; // 0x10102ed
+ field public static final int immersive = 16843456; // 0x10102c0
+ field public static final int importantForAccessibility = 16843690; // 0x10103aa
+ field public static final int inAnimation = 16843127; // 0x1010177
+ field public static final int includeFontPadding = 16843103; // 0x101015f
+ field public static final int includeInGlobalSearch = 16843374; // 0x101026e
+ field public static final int indeterminate = 16843065; // 0x1010139
+ field public static final int indeterminateBehavior = 16843070; // 0x101013e
+ field public static final int indeterminateDrawable = 16843067; // 0x101013b
+ field public static final int indeterminateDuration = 16843069; // 0x101013d
+ field public static final int indeterminateOnly = 16843066; // 0x101013a
+ field public static final int indeterminateProgressStyle = 16843544; // 0x1010318
+ field public static final int indeterminateTint = 16843881; // 0x1010469
+ field public static final int indeterminateTintMode = 16843882; // 0x101046a
+ field public static final int indicatorEnd = 16843730; // 0x10103d2
+ field public static final int indicatorLeft = 16843021; // 0x101010d
+ field public static final int indicatorRight = 16843022; // 0x101010e
+ field public static final int indicatorStart = 16843729; // 0x10103d1
+ field public static final int inflatedId = 16842995; // 0x10100f3
+ field public static final int initOrder = 16842778; // 0x101001a
+ field public static final int initialHeight = 16844021; // 0x10104f5
+ field public static final int initialKeyguardLayout = 16843714; // 0x10103c2
+ field public static final int initialLayout = 16843345; // 0x1010251
+ field public static final int initialWidth = 16844020; // 0x10104f4
+ field public static final int innerRadius = 16843359; // 0x101025f
+ field public static final int innerRadiusRatio = 16843163; // 0x101019b
+ field public static final deprecated int inputMethod = 16843112; // 0x1010168
+ field public static final int inputType = 16843296; // 0x1010220
+ field public static final int inset = 16843957; // 0x10104b5
+ field public static final int insetBottom = 16843194; // 0x10101ba
+ field public static final int insetLeft = 16843191; // 0x10101b7
+ field public static final int insetRight = 16843192; // 0x10101b8
+ field public static final int insetTop = 16843193; // 0x10101b9
+ field public static final int installLocation = 16843447; // 0x10102b7
+ field public static final int interpolator = 16843073; // 0x1010141
+ field public static final int isAlwaysSyncable = 16843571; // 0x1010333
+ field public static final int isAsciiCapable = 16843753; // 0x10103e9
+ field public static final int isAuxiliary = 16843647; // 0x101037f
+ field public static final int isDefault = 16843297; // 0x1010221
+ field public static final int isGame = 16843764; // 0x10103f4
+ field public static final int isIndicator = 16843079; // 0x1010147
+ field public static final int isModifier = 16843334; // 0x1010246
+ field public static final int isRepeatable = 16843336; // 0x1010248
+ field public static final int isScrollContainer = 16843342; // 0x101024e
+ field public static final int isSticky = 16843335; // 0x1010247
+ field public static final int isolatedProcess = 16843689; // 0x10103a9
+ field public static final int itemBackground = 16843056; // 0x1010130
+ field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131
+ field public static final int itemPadding = 16843565; // 0x101032d
+ field public static final int itemTextAppearance = 16843052; // 0x101012c
+ field public static final int keepScreenOn = 16843286; // 0x1010216
+ field public static final int key = 16843240; // 0x10101e8
+ field public static final int keyBackground = 16843315; // 0x1010233
+ field public static final int keyEdgeFlags = 16843333; // 0x1010245
+ field public static final int keyHeight = 16843326; // 0x101023e
+ field public static final int keyIcon = 16843340; // 0x101024c
+ field public static final int keyLabel = 16843339; // 0x101024b
+ field public static final int keyOutputText = 16843338; // 0x101024a
+ field public static final int keyPreviewHeight = 16843321; // 0x1010239
+ field public static final int keyPreviewLayout = 16843319; // 0x1010237
+ field public static final int keyPreviewOffset = 16843320; // 0x1010238
+ field public static final int keySet = 16843739; // 0x10103db
+ field public static final int keyTextColor = 16843318; // 0x1010236
+ field public static final int keyTextSize = 16843316; // 0x1010234
+ field public static final int keyWidth = 16843325; // 0x101023d
+ field public static final int keyboardLayout = 16843691; // 0x10103ab
+ field public static final int keyboardMode = 16843341; // 0x101024d
+ field public static final int keycode = 16842949; // 0x10100c5
+ field public static final int killAfterRestore = 16843420; // 0x101029c
+ field public static final int label = 16842753; // 0x1010001
+ field public static final int labelFor = 16843718; // 0x10103c6
+ field public static final int labelTextSize = 16843317; // 0x1010235
+ field public static final int largeHeap = 16843610; // 0x101035a
+ field public static final int largeScreens = 16843398; // 0x1010286
+ field public static final int largestWidthLimitDp = 16843622; // 0x1010366
+ field public static final int launchMode = 16842781; // 0x101001d
+ field public static final int launchTaskBehindSourceAnimation = 16843922; // 0x1010492
+ field public static final int launchTaskBehindTargetAnimation = 16843921; // 0x1010491
+ field public static final int layerType = 16843604; // 0x1010354
+ field public static final int layout = 16842994; // 0x10100f2
+ field public static final int layoutAnimation = 16842988; // 0x10100ec
+ field public static final int layoutDirection = 16843698; // 0x10103b2
+ field public static final int layoutMode = 16843738; // 0x10103da
+ field public static final int layout_above = 16843140; // 0x1010184
+ field public static final int layout_alignBaseline = 16843142; // 0x1010186
+ field public static final int layout_alignBottom = 16843146; // 0x101018a
+ field public static final int layout_alignEnd = 16843706; // 0x10103ba
+ field public static final int layout_alignLeft = 16843143; // 0x1010187
+ field public static final int layout_alignParentBottom = 16843150; // 0x101018e
+ field public static final int layout_alignParentEnd = 16843708; // 0x10103bc
+ field public static final int layout_alignParentLeft = 16843147; // 0x101018b
+ field public static final int layout_alignParentRight = 16843149; // 0x101018d
+ field public static final int layout_alignParentStart = 16843707; // 0x10103bb
+ field public static final int layout_alignParentTop = 16843148; // 0x101018c
+ field public static final int layout_alignRight = 16843145; // 0x1010189
+ field public static final int layout_alignStart = 16843705; // 0x10103b9
+ field public static final int layout_alignTop = 16843144; // 0x1010188
+ field public static final int layout_alignWithParentIfMissing = 16843154; // 0x1010192
+ field public static final int layout_below = 16843141; // 0x1010185
+ field public static final int layout_centerHorizontal = 16843152; // 0x1010190
+ field public static final int layout_centerInParent = 16843151; // 0x101018f
+ field public static final int layout_centerVertical = 16843153; // 0x1010191
+ field public static final int layout_column = 16843084; // 0x101014c
+ field public static final int layout_columnSpan = 16843645; // 0x101037d
+ field public static final int layout_columnWeight = 16843865; // 0x1010459
+ field public static final int layout_gravity = 16842931; // 0x10100b3
+ field public static final int layout_height = 16842997; // 0x10100f5
+ field public static final int layout_margin = 16842998; // 0x10100f6
+ field public static final int layout_marginBottom = 16843002; // 0x10100fa
+ field public static final int layout_marginEnd = 16843702; // 0x10103b6
+ field public static final int layout_marginLeft = 16842999; // 0x10100f7
+ field public static final int layout_marginRight = 16843001; // 0x10100f9
+ field public static final int layout_marginStart = 16843701; // 0x10103b5
+ field public static final int layout_marginTop = 16843000; // 0x10100f8
+ field public static final int layout_row = 16843643; // 0x101037b
+ field public static final int layout_rowSpan = 16843644; // 0x101037c
+ field public static final int layout_rowWeight = 16843864; // 0x1010458
+ field public static final int layout_scale = 16843155; // 0x1010193
+ field public static final int layout_span = 16843085; // 0x101014d
+ field public static final int layout_toEndOf = 16843704; // 0x10103b8
+ field public static final int layout_toLeftOf = 16843138; // 0x1010182
+ field public static final int layout_toRightOf = 16843139; // 0x1010183
+ field public static final int layout_toStartOf = 16843703; // 0x10103b7
+ field public static final int layout_weight = 16843137; // 0x1010181
+ field public static final int layout_width = 16842996; // 0x10100f4
+ field public static final int layout_x = 16843135; // 0x101017f
+ field public static final int layout_y = 16843136; // 0x1010180
+ field public static final int left = 16843181; // 0x10101ad
+ field public static final int letterSpacing = 16843958; // 0x10104b6
+ field public static final int level = 16844033; // 0x1010501
+ field public static final int lineSpacingExtra = 16843287; // 0x1010217
+ field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
+ field public static final int lines = 16843092; // 0x1010154
+ field public static final int linksClickable = 16842929; // 0x10100b1
+ field public static final int listChoiceBackgroundIndicator = 16843504; // 0x10102f0
+ field public static final int listChoiceIndicatorMultiple = 16843290; // 0x101021a
+ field public static final int listChoiceIndicatorSingle = 16843289; // 0x1010219
+ field public static final int listDivider = 16843284; // 0x1010214
+ field public static final int listDividerAlertDialog = 16843525; // 0x1010305
+ field public static final int listMenuViewStyle = 16844018; // 0x10104f2
+ field public static final int listPopupWindowStyle = 16843519; // 0x10102ff
+ field public static final int listPreferredItemHeight = 16842829; // 0x101004d
+ field public static final int listPreferredItemHeightLarge = 16843654; // 0x1010386
+ field public static final int listPreferredItemHeightSmall = 16843655; // 0x1010387
+ field public static final int listPreferredItemPaddingEnd = 16843710; // 0x10103be
+ field public static final int listPreferredItemPaddingLeft = 16843683; // 0x10103a3
+ field public static final int listPreferredItemPaddingRight = 16843684; // 0x10103a4
+ field public static final int listPreferredItemPaddingStart = 16843709; // 0x10103bd
+ field public static final int listSelector = 16843003; // 0x10100fb
+ field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208
+ field public static final int listViewStyle = 16842868; // 0x1010074
+ field public static final int listViewWhiteStyle = 16842869; // 0x1010075
+ field public static final int lockTaskMode = 16844013; // 0x10104ed
+ field public static final int logo = 16843454; // 0x10102be
+ field public static final int logoDescription = 16844009; // 0x10104e9
+ field public static final int longClickable = 16842982; // 0x10100e6
+ field public static final int loopViews = 16843527; // 0x1010307
+ field public static final int manageSpaceActivity = 16842756; // 0x1010004
+ field public static final int mapViewStyle = 16842890; // 0x101008a
+ field public static final int marqueeRepeatLimit = 16843293; // 0x101021d
+ field public static final int matchOrder = 16843855; // 0x101044f
+ field public static final int max = 16843062; // 0x1010136
+ field public static final int maxButtonHeight = 16844030; // 0x10104fe
+ field public static final int maxDate = 16843584; // 0x1010340
+ field public static final int maxEms = 16843095; // 0x1010157
+ field public static final int maxHeight = 16843040; // 0x1010120
+ field public static final int maxItemsPerRow = 16843060; // 0x1010134
+ field public static final int maxLength = 16843104; // 0x1010160
+ field public static final int maxLevel = 16843186; // 0x10101b2
+ field public static final int maxLines = 16843091; // 0x1010153
+ field public static final int maxRecents = 16843846; // 0x1010446
+ field public static final int maxRows = 16843059; // 0x1010133
+ field public static final int maxSdkVersion = 16843377; // 0x1010271
+ field public static final int maxWidth = 16843039; // 0x101011f
+ field public static final int maximumAngle = 16843903; // 0x101047f
+ field public static final int measureAllChildren = 16843018; // 0x101010a
+ field public static final int measureWithLargestChild = 16843476; // 0x10102d4
+ field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad
+ field public static final int mediaRouteTypes = 16843694; // 0x10103ae
+ field public static final int menuCategory = 16843230; // 0x10101de
+ field public static final int mimeType = 16842790; // 0x1010026
+ field public static final int minDate = 16843583; // 0x101033f
+ field public static final int minEms = 16843098; // 0x101015a
+ field public static final int minHeight = 16843072; // 0x1010140
+ field public static final int minLevel = 16843185; // 0x10101b1
+ field public static final int minLines = 16843094; // 0x1010156
+ field public static final int minResizeHeight = 16843670; // 0x1010396
+ field public static final int minResizeWidth = 16843669; // 0x1010395
+ field public static final int minSdkVersion = 16843276; // 0x101020c
+ field public static final int minWidth = 16843071; // 0x101013f
+ field public static final int minimalSize = 16844022; // 0x10104f6
+ field public static final int minimumHorizontalAngle = 16843901; // 0x101047d
+ field public static final int minimumVerticalAngle = 16843902; // 0x101047e
+ field public static final int mipMap = 16843725; // 0x10103cd
+ field public static final int mirrorForRtl = 16843726; // 0x10103ce
+ field public static final int mode = 16843134; // 0x101017e
+ field public static final int moreIcon = 16843061; // 0x1010135
+ field public static final int multiArch = 16843918; // 0x101048e
+ field public static final int multiprocess = 16842771; // 0x1010013
+ field public static final int name = 16842755; // 0x1010003
+ field public static final int navigationBarColor = 16843858; // 0x1010452
+ field public static final int navigationContentDescription = 16843969; // 0x10104c1
+ field public static final int navigationIcon = 16843968; // 0x10104c0
+ field public static final int navigationMode = 16843471; // 0x10102cf
+ field public static final int negativeButtonText = 16843254; // 0x10101f6
+ field public static final int nestedScrollingEnabled = 16843830; // 0x1010436
+ field public static final int nextFocusDown = 16842980; // 0x10100e4
+ field public static final int nextFocusForward = 16843580; // 0x101033c
+ field public static final int nextFocusLeft = 16842977; // 0x10100e1
+ field public static final int nextFocusRight = 16842978; // 0x10100e2
+ field public static final int nextFocusUp = 16842979; // 0x10100e3
+ field public static final int noHistory = 16843309; // 0x101022d
+ field public static final int normalScreens = 16843397; // 0x1010285
+ field public static final int notificationTimeout = 16843651; // 0x1010383
+ field public static final int numColumns = 16843032; // 0x1010118
+ field public static final int numStars = 16843076; // 0x1010144
+ field public static final int numbersBackgroundColor = 16843938; // 0x10104a2
+ field public static final int numbersInnerTextColor = 16844001; // 0x10104e1
+ field public static final int numbersSelectorColor = 16843939; // 0x10104a3
+ field public static final int numbersTextColor = 16843937; // 0x10104a1
+ field public static final deprecated int numeric = 16843109; // 0x1010165
+ field public static final int numericShortcut = 16843236; // 0x10101e4
+ field public static final int onClick = 16843375; // 0x101026f
+ field public static final int oneshot = 16843159; // 0x1010197
+ field public static final int opacity = 16843550; // 0x101031e
+ field public static final int order = 16843242; // 0x10101ea
+ field public static final int orderInCategory = 16843231; // 0x10101df
+ field public static final int ordering = 16843490; // 0x10102e2
+ field public static final int orderingFromXml = 16843239; // 0x10101e7
+ field public static final int orientation = 16842948; // 0x10100c4
+ field public static final int outAnimation = 16843128; // 0x1010178
+ field public static final int outlineProvider = 16843960; // 0x10104b8
+ field public static final int overScrollFooter = 16843459; // 0x10102c3
+ field public static final int overScrollHeader = 16843458; // 0x10102c2
+ field public static final int overScrollMode = 16843457; // 0x10102c1
+ field public static final int overlapAnchor = 16843874; // 0x1010462
+ field public static final int overridesImplicitlyEnabledSubtype = 16843682; // 0x10103a2
+ field public static final int packageNames = 16843649; // 0x1010381
+ field public static final int padding = 16842965; // 0x10100d5
+ field public static final int paddingBottom = 16842969; // 0x10100d9
+ field public static final int paddingEnd = 16843700; // 0x10103b4
+ field public static final int paddingLeft = 16842966; // 0x10100d6
+ field public static final int paddingMode = 16843863; // 0x1010457
+ field public static final int paddingRight = 16842968; // 0x10100d8
+ field public static final int paddingStart = 16843699; // 0x10103b3
+ field public static final int paddingTop = 16842967; // 0x10100d7
+ field public static final int panelBackground = 16842846; // 0x101005e
+ field public static final int panelColorBackground = 16842849; // 0x1010061
+ field public static final int panelColorForeground = 16842848; // 0x1010060
+ field public static final int panelFullBackground = 16842847; // 0x101005f
+ field public static final int panelTextAppearance = 16842850; // 0x1010062
+ field public static final int parentActivityName = 16843687; // 0x10103a7
+ field public static final deprecated int password = 16843100; // 0x101015c
+ field public static final int path = 16842794; // 0x101002a
+ field public static final int pathData = 16843781; // 0x1010405
+ field public static final int pathPattern = 16842796; // 0x101002c
+ field public static final int pathPrefix = 16842795; // 0x101002b
+ field public static final int patternPathData = 16843978; // 0x10104ca
+ field public static final int permission = 16842758; // 0x1010006
+ field public static final int permissionFlags = 16843719; // 0x10103c7
+ field public static final int permissionGroup = 16842762; // 0x101000a
+ field public static final int permissionGroupFlags = 16843717; // 0x10103c5
+ field public static final int persistableMode = 16843821; // 0x101042d
+ field public static final int persistent = 16842765; // 0x101000d
+ field public static final int persistentDrawingCache = 16842990; // 0x10100ee
+ field public static final deprecated int phoneNumber = 16843111; // 0x1010167
+ field public static final int pivotX = 16843189; // 0x10101b5
+ field public static final int pivotY = 16843190; // 0x10101b6
+ field public static final int popupAnimationStyle = 16843465; // 0x10102c9
+ field public static final int popupBackground = 16843126; // 0x1010176
+ field public static final int popupCharacters = 16843332; // 0x1010244
+ field public static final int popupElevation = 16843916; // 0x101048c
+ field public static final int popupKeyboard = 16843331; // 0x1010243
+ field public static final int popupLayout = 16843323; // 0x101023b
+ field public static final int popupMenuStyle = 16843520; // 0x1010300
+ field public static final int popupTheme = 16843945; // 0x10104a9
+ field public static final int popupWindowStyle = 16842870; // 0x1010076
+ field public static final int port = 16842793; // 0x1010029
+ field public static final int positiveButtonText = 16843253; // 0x10101f5
+ field public static final int preferenceCategoryStyle = 16842892; // 0x101008c
+ field public static final int preferenceFragmentStyle = 16844039; // 0x1010507
+ field public static final int preferenceInformationStyle = 16842893; // 0x101008d
+ field public static final int preferenceLayoutChild = 16842900; // 0x1010094
+ field public static final int preferenceScreenStyle = 16842891; // 0x101008b
+ field public static final int preferenceStyle = 16842894; // 0x101008e
+ field public static final int presentationTheme = 16843712; // 0x10103c0
+ field public static final int previewImage = 16843482; // 0x10102da
+ field public static final int priority = 16842780; // 0x101001c
+ field public static final int privateImeOptions = 16843299; // 0x1010223
+ field public static final int process = 16842769; // 0x1010011
+ field public static final int progress = 16843063; // 0x1010137
+ field public static final int progressBackgroundTint = 16843877; // 0x1010465
+ field public static final int progressBackgroundTintMode = 16843878; // 0x1010466
+ field public static final int progressBarPadding = 16843545; // 0x1010319
+ field public static final int progressBarStyle = 16842871; // 0x1010077
+ field public static final int progressBarStyleHorizontal = 16842872; // 0x1010078
+ field public static final int progressBarStyleInverse = 16843399; // 0x1010287
+ field public static final int progressBarStyleLarge = 16842874; // 0x101007a
+ field public static final int progressBarStyleLargeInverse = 16843401; // 0x1010289
+ field public static final int progressBarStyleSmall = 16842873; // 0x1010079
+ field public static final int progressBarStyleSmallInverse = 16843400; // 0x1010288
+ field public static final int progressBarStyleSmallTitle = 16843279; // 0x101020f
+ field public static final int progressDrawable = 16843068; // 0x101013c
+ field public static final int progressTint = 16843875; // 0x1010463
+ field public static final int progressTintMode = 16843876; // 0x1010464
+ field public static final int prompt = 16843131; // 0x101017b
+ field public static final int propertyName = 16843489; // 0x10102e1
+ field public static final int propertyXName = 16843892; // 0x1010474
+ field public static final int propertyYName = 16843893; // 0x1010475
+ field public static final int protectionLevel = 16842761; // 0x1010009
+ field public static final int publicKey = 16843686; // 0x10103a6
+ field public static final int queryActionMsg = 16843227; // 0x10101db
+ field public static final int queryAfterZeroResults = 16843394; // 0x1010282
+ field public static final int queryBackground = 16843911; // 0x1010487
+ field public static final int queryHint = 16843608; // 0x1010358
+ field public static final int quickContactBadgeStyleSmallWindowLarge = 16843443; // 0x10102b3
+ field public static final int quickContactBadgeStyleSmallWindowMedium = 16843442; // 0x10102b2
+ field public static final int quickContactBadgeStyleSmallWindowSmall = 16843441; // 0x10102b1
+ field public static final int quickContactBadgeStyleWindowLarge = 16843440; // 0x10102b0
+ field public static final int quickContactBadgeStyleWindowMedium = 16843439; // 0x10102af
+ field public static final int quickContactBadgeStyleWindowSmall = 16843438; // 0x10102ae
+ field public static final int radioButtonStyle = 16842878; // 0x101007e
+ field public static final int radius = 16843176; // 0x10101a8
+ field public static final int rating = 16843077; // 0x1010145
+ field public static final int ratingBarStyle = 16842876; // 0x101007c
+ field public static final int ratingBarStyleIndicator = 16843280; // 0x1010210
+ field public static final int ratingBarStyleSmall = 16842877; // 0x101007d
+ field public static final int readPermission = 16842759; // 0x1010007
+ field public static final int recognitionService = 16843932; // 0x101049c
+ field public static final int relinquishTaskIdentity = 16843894; // 0x1010476
+ field public static final int reparent = 16843964; // 0x10104bc
+ field public static final int reparentWithOverlay = 16843965; // 0x10104bd
+ field public static final int repeatCount = 16843199; // 0x10101bf
+ field public static final int repeatMode = 16843200; // 0x10101c0
+ field public static final int reqFiveWayNav = 16843314; // 0x1010232
+ field public static final int reqHardKeyboard = 16843305; // 0x1010229
+ field public static final int reqKeyboardType = 16843304; // 0x1010228
+ field public static final int reqNavigation = 16843306; // 0x101022a
+ field public static final int reqTouchScreen = 16843303; // 0x1010227
+ field public static final int requireDeviceUnlock = 16843756; // 0x10103ec
+ field public static final int required = 16843406; // 0x101028e
+ field public static final int requiredAccountType = 16843734; // 0x10103d6
+ field public static final int requiredForAllUsers = 16843728; // 0x10103d0
+ field public static final int requiresFadingEdge = 16843685; // 0x10103a5
+ field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
+ field public static final int resizeClip = 16843983; // 0x10104cf
+ field public static final int resizeMode = 16843619; // 0x1010363
+ field public static final int resizeable = 16843405; // 0x101028d
+ field public static final int resizeableActivity = 16844023; // 0x10104f7
+ field public static final int resource = 16842789; // 0x1010025
+ field public static final int restoreAnyVersion = 16843450; // 0x10102ba
+ field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
+ field public static final int restrictedAccountType = 16843733; // 0x10103d5
+ field public static final int restrictionType = 16843923; // 0x1010493
+ field public static final int resumeWhilePausing = 16843954; // 0x10104b2
+ field public static final int reversible = 16843851; // 0x101044b
+ field public static final int revisionCode = 16843989; // 0x10104d5
+ field public static final int right = 16843183; // 0x10101af
+ field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
+ field public static final int ringtoneType = 16843257; // 0x10101f9
+ field public static final int rotation = 16843558; // 0x1010326
+ field public static final int rotationX = 16843559; // 0x1010327
+ field public static final int rotationY = 16843560; // 0x1010328
+ field public static final int rowCount = 16843637; // 0x1010375
+ field public static final int rowDelay = 16843216; // 0x10101d0
+ field public static final int rowEdgeFlags = 16843329; // 0x1010241
+ field public static final int rowHeight = 16843058; // 0x1010132
+ field public static final int rowOrderPreserved = 16843638; // 0x1010376
+ field public static final int saveEnabled = 16842983; // 0x10100e7
+ field public static final int scaleGravity = 16843262; // 0x10101fe
+ field public static final int scaleHeight = 16843261; // 0x10101fd
+ field public static final int scaleType = 16843037; // 0x101011d
+ field public static final int scaleWidth = 16843260; // 0x10101fc
+ field public static final int scaleX = 16843556; // 0x1010324
+ field public static final int scaleY = 16843557; // 0x1010325
+ field public static final int scheme = 16842791; // 0x1010027
+ field public static final int screenDensity = 16843467; // 0x10102cb
+ field public static final int screenOrientation = 16842782; // 0x101001e
+ field public static final int screenSize = 16843466; // 0x10102ca
+ field public static final int scrollHorizontally = 16843099; // 0x101015b
+ field public static final int scrollIndicators = 16844006; // 0x10104e6
+ field public static final int scrollViewStyle = 16842880; // 0x1010080
+ field public static final int scrollX = 16842962; // 0x10100d2
+ field public static final int scrollY = 16842963; // 0x10100d3
+ field public static final int scrollbarAlwaysDrawHorizontalTrack = 16842856; // 0x1010068
+ field public static final int scrollbarAlwaysDrawVerticalTrack = 16842857; // 0x1010069
+ field public static final int scrollbarDefaultDelayBeforeFade = 16843433; // 0x10102a9
+ field public static final int scrollbarFadeDuration = 16843432; // 0x10102a8
+ field public static final int scrollbarSize = 16842851; // 0x1010063
+ field public static final int scrollbarStyle = 16842879; // 0x101007f
+ field public static final int scrollbarThumbHorizontal = 16842852; // 0x1010064
+ field public static final int scrollbarThumbVertical = 16842853; // 0x1010065
+ field public static final int scrollbarTrackHorizontal = 16842854; // 0x1010066
+ field public static final int scrollbarTrackVertical = 16842855; // 0x1010067
+ field public static final int scrollbars = 16842974; // 0x10100de
+ field public static final int scrollingCache = 16843006; // 0x10100fe
+ field public static final deprecated int searchButtonText = 16843269; // 0x1010205
+ field public static final int searchHintIcon = 16843988; // 0x10104d4
+ field public static final int searchIcon = 16843907; // 0x1010483
+ field public static final int searchMode = 16843221; // 0x10101d5
+ field public static final int searchSettingsDescription = 16843402; // 0x101028a
+ field public static final int searchSuggestAuthority = 16843222; // 0x10101d6
+ field public static final int searchSuggestIntentAction = 16843225; // 0x10101d9
+ field public static final int searchSuggestIntentData = 16843226; // 0x10101da
+ field public static final int searchSuggestPath = 16843223; // 0x10101d7
+ field public static final int searchSuggestSelection = 16843224; // 0x10101d8
+ field public static final int searchSuggestThreshold = 16843373; // 0x101026d
+ field public static final int searchViewStyle = 16843904; // 0x1010480
+ field public static final int secondaryProgress = 16843064; // 0x1010138
+ field public static final int secondaryProgressTint = 16843879; // 0x1010467
+ field public static final int secondaryProgressTintMode = 16843880; // 0x1010468
+ field public static final int seekBarStyle = 16842875; // 0x101007b
+ field public static final int segmentedButtonStyle = 16843568; // 0x1010330
+ field public static final int selectAllOnFocus = 16843102; // 0x101015e
+ field public static final int selectable = 16843238; // 0x10101e6
+ field public static final int selectableItemBackground = 16843534; // 0x101030e
+ field public static final int selectableItemBackgroundBorderless = 16843868; // 0x101045c
+ field public static final deprecated int selectedDateVerticalBar = 16843591; // 0x1010347
+ field public static final deprecated int selectedWeekBackgroundColor = 16843586; // 0x1010342
+ field public static final int sessionService = 16843837; // 0x101043d
+ field public static final int settingsActivity = 16843301; // 0x1010225
+ field public static final int setupActivity = 16843766; // 0x10103f6
+ field public static final int shadowColor = 16843105; // 0x1010161
+ field public static final int shadowDx = 16843106; // 0x1010162
+ field public static final int shadowDy = 16843107; // 0x1010163
+ field public static final int shadowRadius = 16843108; // 0x1010164
+ field public static final int shape = 16843162; // 0x101019a
+ field public static final int shareInterpolator = 16843195; // 0x10101bb
+ field public static final int sharedUserId = 16842763; // 0x101000b
+ field public static final int sharedUserLabel = 16843361; // 0x1010261
+ field public static final int shouldDisableView = 16843246; // 0x10101ee
+ field public static final int showAsAction = 16843481; // 0x10102d9
+ field public static final int showDefault = 16843258; // 0x10101fa
+ field public static final int showDividers = 16843561; // 0x1010329
+ field public static final int showForAllUsers = 16844015; // 0x10104ef
+ field public static final deprecated int showOnLockScreen = 16843721; // 0x10103c9
+ field public static final int showSilent = 16843259; // 0x10101fb
+ field public static final int showText = 16843949; // 0x10104ad
+ field public static final deprecated int showWeekNumber = 16843582; // 0x101033e
+ field public static final deprecated int shownWeekCount = 16843585; // 0x1010341
+ field public static final int shrinkColumns = 16843082; // 0x101014a
+ field public static final deprecated int singleLine = 16843101; // 0x101015d
+ field public static final int singleUser = 16843711; // 0x10103bf
+ field public static final int slideEdge = 16843824; // 0x1010430
+ field public static final int smallIcon = 16843422; // 0x101029e
+ field public static final int smallScreens = 16843396; // 0x1010284
+ field public static final int smoothScrollbar = 16843313; // 0x1010231
+ field public static final int soundEffectsEnabled = 16843285; // 0x1010215
+ field public static final int spacing = 16843027; // 0x1010113
+ field public static final int spinnerDropDownItemStyle = 16842887; // 0x1010087
+ field public static final int spinnerItemStyle = 16842889; // 0x1010089
+ field public static final int spinnerMode = 16843505; // 0x10102f1
+ field public static final int spinnerStyle = 16842881; // 0x1010081
+ field public static final int spinnersShown = 16843595; // 0x101034b
+ field public static final int splitMotionEvents = 16843503; // 0x10102ef
+ field public static final int splitTrack = 16843852; // 0x101044c
+ field public static final int spotShadowAlpha = 16843967; // 0x10104bf
+ field public static final int src = 16843033; // 0x1010119
+ field public static final int ssp = 16843747; // 0x10103e3
+ field public static final int sspPattern = 16843749; // 0x10103e5
+ field public static final int sspPrefix = 16843748; // 0x10103e4
+ field public static final int stackFromBottom = 16843005; // 0x10100fd
+ field public static final int stackViewStyle = 16843838; // 0x101043e
+ field public static final int starStyle = 16842882; // 0x1010082
+ field public static final int start = 16843995; // 0x10104db
+ field public static final int startColor = 16843165; // 0x101019d
+ field public static final int startDelay = 16843746; // 0x10103e2
+ field public static final int startOffset = 16843198; // 0x10101be
+ field public static final deprecated int startYear = 16843132; // 0x101017c
+ field public static final int stateListAnimator = 16843848; // 0x1010448
+ field public static final int stateNotNeeded = 16842774; // 0x1010016
+ field public static final int state_above_anchor = 16842922; // 0x10100aa
+ field public static final int state_accelerated = 16843547; // 0x101031b
+ field public static final int state_activated = 16843518; // 0x10102fe
+ field public static final int state_active = 16842914; // 0x10100a2
+ field public static final int state_checkable = 16842911; // 0x101009f
+ field public static final int state_checked = 16842912; // 0x10100a0
+ field public static final int state_drag_can_accept = 16843624; // 0x1010368
+ field public static final int state_drag_hovered = 16843625; // 0x1010369
+ field public static final int state_empty = 16842921; // 0x10100a9
+ field public static final int state_enabled = 16842910; // 0x101009e
+ field public static final int state_expanded = 16842920; // 0x10100a8
+ field public static final int state_first = 16842916; // 0x10100a4
+ field public static final int state_focused = 16842908; // 0x101009c
+ field public static final int state_hovered = 16843623; // 0x1010367
+ field public static final int state_last = 16842918; // 0x10100a6
+ field public static final int state_long_pressable = 16843324; // 0x101023c
+ field public static final int state_middle = 16842917; // 0x10100a5
+ field public static final int state_multiline = 16843597; // 0x101034d
+ field public static final int state_pressed = 16842919; // 0x10100a7
+ field public static final int state_selected = 16842913; // 0x10100a1
+ field public static final int state_single = 16842915; // 0x10100a3
+ field public static final int state_window_focused = 16842909; // 0x101009d
+ field public static final int staticWallpaperPreview = 16843569; // 0x1010331
+ field public static final int statusBarColor = 16843857; // 0x1010451
+ field public static final int stepSize = 16843078; // 0x1010146
+ field public static final int stopWithTask = 16843626; // 0x101036a
+ field public static final int streamType = 16843273; // 0x1010209
+ field public static final int stretchColumns = 16843081; // 0x1010149
+ field public static final int stretchMode = 16843030; // 0x1010116
+ field public static final int strokeAlpha = 16843979; // 0x10104cb
+ field public static final int strokeColor = 16843782; // 0x1010406
+ field public static final int strokeLineCap = 16843787; // 0x101040b
+ field public static final int strokeLineJoin = 16843788; // 0x101040c
+ field public static final int strokeMiterLimit = 16843789; // 0x101040d
+ field public static final int strokeWidth = 16843783; // 0x1010407
+ field public static final int subMenuArrow = 16844019; // 0x10104f3
+ field public static final int submitBackground = 16843912; // 0x1010488
+ field public static final int subtitle = 16843473; // 0x10102d1
+ field public static final int subtitleTextAppearance = 16843823; // 0x101042f
+ field public static final int subtitleTextColor = 16844004; // 0x10104e4
+ field public static final int subtitleTextStyle = 16843513; // 0x10102f9
+ field public static final int subtypeExtraValue = 16843674; // 0x101039a
+ field public static final int subtypeId = 16843713; // 0x10103c1
+ field public static final int subtypeLocale = 16843673; // 0x1010399
+ field public static final int suggestActionMsg = 16843228; // 0x10101dc
+ field public static final int suggestActionMsgColumn = 16843229; // 0x10101dd
+ field public static final int suggestionRowLayout = 16843910; // 0x1010486
+ field public static final int summary = 16843241; // 0x10101e9
+ field public static final int summaryColumn = 16843426; // 0x10102a2
+ field public static final int summaryOff = 16843248; // 0x10101f0
+ field public static final int summaryOn = 16843247; // 0x10101ef
+ field public static final int supportsAssist = 16844016; // 0x10104f0
+ field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
+ field public static final int supportsPictureInPicture = 16844024; // 0x10104f8
+ field public static final int supportsRtl = 16843695; // 0x10103af
+ field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb
+ field public static final int supportsUploading = 16843419; // 0x101029b
+ field public static final int switchMinWidth = 16843632; // 0x1010370
+ field public static final int switchPadding = 16843633; // 0x1010371
+ field public static final int switchPreferenceStyle = 16843629; // 0x101036d
+ field public static final int switchStyle = 16843839; // 0x101043f
+ field public static final int switchTextAppearance = 16843630; // 0x101036e
+ field public static final int switchTextOff = 16843628; // 0x101036c
+ field public static final int switchTextOn = 16843627; // 0x101036b
+ field public static final int syncable = 16842777; // 0x1010019
+ field public static final int tabStripEnabled = 16843453; // 0x10102bd
+ field public static final int tabStripLeft = 16843451; // 0x10102bb
+ field public static final int tabStripRight = 16843452; // 0x10102bc
+ field public static final int tabWidgetStyle = 16842883; // 0x1010083
+ field public static final int tag = 16842961; // 0x10100d1
+ field public static final int targetActivity = 16843266; // 0x1010202
+ field public static final int targetClass = 16842799; // 0x101002f
+ field public static final deprecated int targetDescriptions = 16843680; // 0x10103a0
+ field public static final int targetId = 16843740; // 0x10103dc
+ field public static final int targetName = 16843853; // 0x101044d
+ field public static final int targetPackage = 16842785; // 0x1010021
+ field public static final int targetSdkVersion = 16843376; // 0x1010270
+ field public static final int taskAffinity = 16842770; // 0x1010012
+ field public static final int taskCloseEnterAnimation = 16842942; // 0x10100be
+ field public static final int taskCloseExitAnimation = 16842943; // 0x10100bf
+ field public static final int taskOpenEnterAnimation = 16842940; // 0x10100bc
+ field public static final int taskOpenExitAnimation = 16842941; // 0x10100bd
+ field public static final int taskToBackEnterAnimation = 16842946; // 0x10100c2
+ field public static final int taskToBackExitAnimation = 16842947; // 0x10100c3
+ field public static final int taskToFrontEnterAnimation = 16842944; // 0x10100c0
+ field public static final int taskToFrontExitAnimation = 16842945; // 0x10100c1
+ field public static final int tension = 16843370; // 0x101026a
+ field public static final int testOnly = 16843378; // 0x1010272
+ field public static final int text = 16843087; // 0x101014f
+ field public static final int textAlignment = 16843697; // 0x10103b1
+ field public static final int textAllCaps = 16843660; // 0x101038c
+ field public static final int textAppearance = 16842804; // 0x1010034
+ field public static final int textAppearanceButton = 16843271; // 0x1010207
+ field public static final int textAppearanceInverse = 16842805; // 0x1010035
+ field public static final int textAppearanceLarge = 16842816; // 0x1010040
+ field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043
+ field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301
+ field public static final int textAppearanceListItem = 16843678; // 0x101039e
+ field public static final int textAppearanceListItemSecondary = 16843826; // 0x1010432
+ field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f
+ field public static final int textAppearanceMedium = 16842817; // 0x1010041
+ field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044
+ field public static final int textAppearancePopupMenuHeader = 16844035; // 0x1010503
+ field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0
+ field public static final int textAppearanceSearchResultTitle = 16843425; // 0x10102a1
+ field public static final int textAppearanceSmall = 16842818; // 0x1010042
+ field public static final int textAppearanceSmallInverse = 16842821; // 0x1010045
+ field public static final int textAppearanceSmallPopupMenu = 16843522; // 0x1010302
+ field public static final int textCheckMark = 16842822; // 0x1010046
+ field public static final int textCheckMarkInverse = 16842823; // 0x1010047
+ field public static final int textColor = 16842904; // 0x1010098
+ field public static final int textColorAlertDialogListItem = 16843526; // 0x1010306
+ field public static final int textColorHighlight = 16842905; // 0x1010099
+ field public static final int textColorHighlightInverse = 16843599; // 0x101034f
+ field public static final int textColorHint = 16842906; // 0x101009a
+ field public static final int textColorHintInverse = 16842815; // 0x101003f
+ field public static final int textColorLink = 16842907; // 0x101009b
+ field public static final int textColorLinkInverse = 16843600; // 0x1010350
+ field public static final int textColorPrimary = 16842806; // 0x1010036
+ field public static final int textColorPrimaryDisableOnly = 16842807; // 0x1010037
+ field public static final int textColorPrimaryInverse = 16842809; // 0x1010039
+ field public static final int textColorPrimaryInverseDisableOnly = 16843403; // 0x101028b
+ field public static final int textColorPrimaryInverseNoDisable = 16842813; // 0x101003d
+ field public static final int textColorPrimaryNoDisable = 16842811; // 0x101003b
+ field public static final int textColorSecondary = 16842808; // 0x1010038
+ field public static final int textColorSecondaryInverse = 16842810; // 0x101003a
+ field public static final int textColorSecondaryInverseNoDisable = 16842814; // 0x101003e
+ field public static final int textColorSecondaryNoDisable = 16842812; // 0x101003c
+ field public static final int textColorTertiary = 16843282; // 0x1010212
+ field public static final int textColorTertiaryInverse = 16843283; // 0x1010213
+ field public static final int textCursorDrawable = 16843618; // 0x1010362
+ field public static final int textDirection = 16843696; // 0x10103b0
+ field public static final int textEditNoPasteWindowLayout = 16843541; // 0x1010315
+ field public static final int textEditPasteWindowLayout = 16843540; // 0x1010314
+ field public static final int textEditSideNoPasteWindowLayout = 16843615; // 0x101035f
+ field public static final int textEditSidePasteWindowLayout = 16843614; // 0x101035e
+ field public static final int textEditSuggestionItemLayout = 16843636; // 0x1010374
+ field public static final int textFilterEnabled = 16843007; // 0x10100ff
+ field public static final int textIsSelectable = 16843542; // 0x1010316
+ field public static final int textOff = 16843045; // 0x1010125
+ field public static final int textOn = 16843044; // 0x1010124
+ field public static final int textScaleX = 16843089; // 0x1010151
+ field public static final int textSelectHandle = 16843463; // 0x10102c7
+ field public static final int textSelectHandleLeft = 16843461; // 0x10102c5
+ field public static final int textSelectHandleRight = 16843462; // 0x10102c6
+ field public static final int textSelectHandleWindowStyle = 16843464; // 0x10102c8
+ field public static final int textSize = 16842901; // 0x1010095
+ field public static final int textStyle = 16842903; // 0x1010097
+ field public static final int textSuggestionsWindowStyle = 16843635; // 0x1010373
+ field public static final int textViewStyle = 16842884; // 0x1010084
+ field public static final int theme = 16842752; // 0x1010000
+ field public static final int thickness = 16843360; // 0x1010260
+ field public static final int thicknessRatio = 16843164; // 0x101019c
+ field public static final int thumb = 16843074; // 0x1010142
+ field public static final int thumbOffset = 16843075; // 0x1010143
+ field public static final int thumbPosition = 16844005; // 0x10104e5
+ field public static final int thumbTextPadding = 16843634; // 0x1010372
+ field public static final int thumbTint = 16843889; // 0x1010471
+ field public static final int thumbTintMode = 16843890; // 0x1010472
+ field public static final int thumbnail = 16843429; // 0x10102a5
+ field public static final int tileMode = 16843265; // 0x1010201
+ field public static final int tileModeX = 16843895; // 0x1010477
+ field public static final int tileModeY = 16843896; // 0x1010478
+ field public static final int timePickerDialogTheme = 16843934; // 0x101049e
+ field public static final int timePickerMode = 16843956; // 0x10104b4
+ field public static final int timePickerStyle = 16843933; // 0x101049d
+ field public static final int timeZone = 16843724; // 0x10103cc
+ field public static final int tint = 16843041; // 0x1010121
+ field public static final int tintMode = 16843771; // 0x10103fb
+ field public static final int title = 16843233; // 0x10101e1
+ field public static final int titleCondensed = 16843234; // 0x10101e2
+ field public static final int titleMargin = 16844025; // 0x10104f9
+ field public static final int titleMarginBottom = 16844029; // 0x10104fd
+ field public static final int titleMarginEnd = 16844027; // 0x10104fb
+ field public static final int titleMarginStart = 16844026; // 0x10104fa
+ field public static final int titleMarginTop = 16844028; // 0x10104fc
+ field public static final int titleTextAppearance = 16843822; // 0x101042e
+ field public static final int titleTextColor = 16844003; // 0x10104e3
+ field public static final int titleTextStyle = 16843512; // 0x10102f8
+ field public static final int toAlpha = 16843211; // 0x10101cb
+ field public static final int toDegrees = 16843188; // 0x10101b4
+ field public static final int toId = 16843849; // 0x1010449
+ field public static final int toScene = 16843742; // 0x10103de
+ field public static final int toXDelta = 16843207; // 0x10101c7
+ field public static final int toXScale = 16843203; // 0x10101c3
+ field public static final int toYDelta = 16843209; // 0x10101c9
+ field public static final int toYScale = 16843205; // 0x10101c5
+ field public static final int toolbarStyle = 16843946; // 0x10104aa
+ field public static final int top = 16843182; // 0x10101ae
+ field public static final int topBright = 16842955; // 0x10100cb
+ field public static final int topDark = 16842951; // 0x10100c7
+ field public static final int topLeftRadius = 16843177; // 0x10101a9
+ field public static final int topOffset = 16843352; // 0x1010258
+ field public static final int topRightRadius = 16843178; // 0x10101aa
+ field public static final int touchscreenBlocksFocus = 16843919; // 0x101048f
+ field public static final int track = 16843631; // 0x101036f
+ field public static final int trackTint = 16843993; // 0x10104d9
+ field public static final int trackTintMode = 16843994; // 0x10104da
+ field public static final int transcriptMode = 16843008; // 0x1010100
+ field public static final int transformPivotX = 16843552; // 0x1010320
+ field public static final int transformPivotY = 16843553; // 0x1010321
+ field public static final int transition = 16843743; // 0x10103df
+ field public static final int transitionGroup = 16843777; // 0x1010401
+ field public static final int transitionName = 16843776; // 0x1010400
+ field public static final int transitionOrdering = 16843744; // 0x10103e0
+ field public static final int transitionVisibilityMode = 16843900; // 0x101047c
+ field public static final int translateX = 16843866; // 0x101045a
+ field public static final int translateY = 16843867; // 0x101045b
+ field public static final int translationX = 16843554; // 0x1010322
+ field public static final int translationY = 16843555; // 0x1010323
+ field public static final int translationZ = 16843770; // 0x10103fa
+ field public static final int trimPathEnd = 16843785; // 0x1010409
+ field public static final int trimPathOffset = 16843786; // 0x101040a
+ field public static final int trimPathStart = 16843784; // 0x1010408
+ field public static final int type = 16843169; // 0x10101a1
+ field public static final int typeface = 16842902; // 0x1010096
+ field public static final int uiOptions = 16843672; // 0x1010398
+ field public static final int uncertainGestureColor = 16843382; // 0x1010276
+ field public static final deprecated int unfocusedMonthDateColor = 16843588; // 0x1010344
+ field public static final int unselectedAlpha = 16843278; // 0x101020e
+ field public static final int updatePeriodMillis = 16843344; // 0x1010250
+ field public static final int useDefaultMargins = 16843641; // 0x1010379
+ field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310
+ field public static final int useLevel = 16843167; // 0x101019f
+ field public static final int userVisible = 16843409; // 0x1010291
+ field public static final int usesCleartextTraffic = 16844012; // 0x10104ec
+ field public static final int value = 16842788; // 0x1010024
+ field public static final int valueFrom = 16843486; // 0x10102de
+ field public static final int valueTo = 16843487; // 0x10102df
+ field public static final int valueType = 16843488; // 0x10102e0
+ field public static final int variablePadding = 16843157; // 0x1010195
+ field public static final int vendor = 16843751; // 0x10103e7
+ field public static final int versionCode = 16843291; // 0x101021b
+ field public static final int versionName = 16843292; // 0x101021c
+ field public static final int verticalCorrection = 16843322; // 0x101023a
+ field public static final int verticalDivider = 16843054; // 0x101012e
+ field public static final int verticalGap = 16843328; // 0x1010240
+ field public static final int verticalScrollbarPosition = 16843572; // 0x1010334
+ field public static final int verticalSpacing = 16843029; // 0x1010115
+ field public static final int viewportHeight = 16843779; // 0x1010403
+ field public static final int viewportWidth = 16843778; // 0x1010402
+ field public static final int visibility = 16842972; // 0x10100dc
+ field public static final int visible = 16843156; // 0x1010194
+ field public static final int vmSafeMode = 16843448; // 0x10102b8
+ field public static final int voiceIcon = 16843908; // 0x1010484
+ field public static final int voiceLanguage = 16843349; // 0x1010255
+ field public static final int voiceLanguageModel = 16843347; // 0x1010253
+ field public static final int voiceMaxResults = 16843350; // 0x1010256
+ field public static final int voicePromptText = 16843348; // 0x1010254
+ field public static final int voiceSearchMode = 16843346; // 0x1010252
+ field public static final int wallpaperCloseEnterAnimation = 16843413; // 0x1010295
+ field public static final int wallpaperCloseExitAnimation = 16843414; // 0x1010296
+ field public static final int wallpaperIntraCloseEnterAnimation = 16843417; // 0x1010299
+ field public static final int wallpaperIntraCloseExitAnimation = 16843418; // 0x101029a
+ field public static final int wallpaperIntraOpenEnterAnimation = 16843415; // 0x1010297
+ field public static final int wallpaperIntraOpenExitAnimation = 16843416; // 0x1010298
+ field public static final int wallpaperOpenEnterAnimation = 16843411; // 0x1010293
+ field public static final int wallpaperOpenExitAnimation = 16843412; // 0x1010294
+ field public static final int webTextViewStyle = 16843449; // 0x10102b9
+ field public static final int webViewStyle = 16842885; // 0x1010085
+ field public static final int weekDayTextAppearance = 16843592; // 0x1010348
+ field public static final deprecated int weekNumberColor = 16843589; // 0x1010345
+ field public static final deprecated int weekSeparatorLineColor = 16843590; // 0x1010346
+ field public static final int weightSum = 16843048; // 0x1010128
+ field public static final int widgetCategory = 16843716; // 0x10103c4
+ field public static final int widgetLayout = 16843243; // 0x10101eb
+ field public static final int width = 16843097; // 0x1010159
+ field public static final int windowActionBar = 16843469; // 0x10102cd
+ field public static final int windowActionBarOverlay = 16843492; // 0x10102e4
+ field public static final int windowActionModeOverlay = 16843485; // 0x10102dd
+ field public static final int windowActivityTransitions = 16843981; // 0x10104cd
+ field public static final int windowAllowEnterTransitionOverlap = 16843836; // 0x101043c
+ field public static final int windowAllowReturnTransitionOverlap = 16843835; // 0x101043b
+ field public static final int windowAnimationStyle = 16842926; // 0x10100ae
+ field public static final int windowBackground = 16842836; // 0x1010054
+ field public static final int windowBackgroundFallback = 16844036; // 0x1010504
+ field public static final int windowClipToOutline = 16843947; // 0x10104ab
+ field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b
+ field public static final int windowContentOverlay = 16842841; // 0x1010059
+ field public static final int windowContentTransitionManager = 16843769; // 0x10103f9
+ field public static final int windowContentTransitions = 16843768; // 0x10103f8
+ field public static final int windowDisablePreview = 16843298; // 0x1010222
+ field public static final int windowDrawsSystemBarBackgrounds = 16843856; // 0x1010450
+ field public static final int windowElevation = 16843920; // 0x1010490
+ field public static final int windowEnableSplitTouch = 16843543; // 0x1010317
+ field public static final int windowEnterAnimation = 16842932; // 0x10100b4
+ field public static final int windowEnterTransition = 16843831; // 0x1010437
+ field public static final int windowExitAnimation = 16842933; // 0x10100b5
+ field public static final int windowExitTransition = 16843832; // 0x1010438
+ field public static final int windowFrame = 16842837; // 0x1010055
+ field public static final int windowFullscreen = 16843277; // 0x101020d
+ field public static final int windowHideAnimation = 16842935; // 0x10100b7
+ field public static final int windowIsFloating = 16842839; // 0x1010057
+ field public static final int windowIsTranslucent = 16842840; // 0x1010058
+ field public static final int windowLightStatusBar = 16844000; // 0x10104e0
+ field public static final int windowMinWidthMajor = 16843606; // 0x1010356
+ field public static final int windowMinWidthMinor = 16843607; // 0x1010357
+ field public static final int windowNoDisplay = 16843294; // 0x101021e
+ field public static final int windowNoTitle = 16842838; // 0x1010056
+ field public static final int windowOverscan = 16843727; // 0x10103cf
+ field public static final int windowReenterTransition = 16843951; // 0x10104af
+ field public static final int windowReturnTransition = 16843950; // 0x10104ae
+ field public static final int windowSharedElementEnterTransition = 16843833; // 0x1010439
+ field public static final int windowSharedElementExitTransition = 16843834; // 0x101043a
+ field public static final int windowSharedElementReenterTransition = 16843953; // 0x10104b1
+ field public static final int windowSharedElementReturnTransition = 16843952; // 0x10104b0
+ field public static final int windowSharedElementsUseOverlay = 16843963; // 0x10104bb
+ field public static final int windowShowAnimation = 16842934; // 0x10100b6
+ field public static final int windowShowWallpaper = 16843410; // 0x1010292
+ field public static final int windowSoftInputMode = 16843307; // 0x101022b
+ field public static final int windowSwipeToDismiss = 16843763; // 0x10103f3
+ field public static final int windowTitleBackgroundStyle = 16842844; // 0x101005c
+ field public static final int windowTitleSize = 16842842; // 0x101005a
+ field public static final int windowTitleStyle = 16842843; // 0x101005b
+ field public static final int windowTransitionBackgroundFadeDuration = 16843873; // 0x1010461
+ field public static final int windowTranslucentNavigation = 16843760; // 0x10103f0
+ field public static final int windowTranslucentStatus = 16843759; // 0x10103ef
+ field public static final int writePermission = 16842760; // 0x1010008
+ field public static final int x = 16842924; // 0x10100ac
+ field public static final int xlargeScreens = 16843455; // 0x10102bf
+ field public static final int y = 16842925; // 0x10100ad
+ field public static final deprecated int yearListItemTextAppearance = 16843929; // 0x1010499
+ field public static final deprecated int yearListSelectorColor = 16843930; // 0x101049a
+ field public static final int yesNoPreferenceStyle = 16842896; // 0x1010090
+ field public static final int zAdjustment = 16843201; // 0x10101c1
+ }
+
+ public static final class R.bool {
+ ctor public R.bool();
+ }
+
+ public static final class R.color {
+ ctor public R.color();
+ field public static final int background_dark = 17170446; // 0x106000e
+ field public static final int background_light = 17170447; // 0x106000f
+ field public static final int black = 17170444; // 0x106000c
+ field public static final int darker_gray = 17170432; // 0x1060000
+ field public static final int holo_blue_bright = 17170459; // 0x106001b
+ field public static final int holo_blue_dark = 17170451; // 0x1060013
+ field public static final int holo_blue_light = 17170450; // 0x1060012
+ field public static final int holo_green_dark = 17170453; // 0x1060015
+ field public static final int holo_green_light = 17170452; // 0x1060014
+ field public static final int holo_orange_dark = 17170457; // 0x1060019
+ field public static final int holo_orange_light = 17170456; // 0x1060018
+ field public static final int holo_purple = 17170458; // 0x106001a
+ field public static final int holo_red_dark = 17170455; // 0x1060017
+ field public static final int holo_red_light = 17170454; // 0x1060016
+ field public static final int primary_text_dark = 17170433; // 0x1060001
+ field public static final int primary_text_dark_nodisable = 17170434; // 0x1060002
+ field public static final int primary_text_light = 17170435; // 0x1060003
+ field public static final int primary_text_light_nodisable = 17170436; // 0x1060004
+ field public static final int secondary_text_dark = 17170437; // 0x1060005
+ field public static final int secondary_text_dark_nodisable = 17170438; // 0x1060006
+ field public static final int secondary_text_light = 17170439; // 0x1060007
+ field public static final int secondary_text_light_nodisable = 17170440; // 0x1060008
+ field public static final int tab_indicator_text = 17170441; // 0x1060009
+ field public static final int tertiary_text_dark = 17170448; // 0x1060010
+ field public static final int tertiary_text_light = 17170449; // 0x1060011
+ field public static final int transparent = 17170445; // 0x106000d
+ field public static final int white = 17170443; // 0x106000b
+ field public static final int widget_edittext_dark = 17170442; // 0x106000a
+ }
+
+ public static final class R.dimen {
+ ctor public R.dimen();
+ field public static final int app_icon_size = 17104896; // 0x1050000
+ field public static final int dialog_min_width_major = 17104899; // 0x1050003
+ field public static final int dialog_min_width_minor = 17104900; // 0x1050004
+ field public static final int notification_large_icon_height = 17104902; // 0x1050006
+ field public static final int notification_large_icon_width = 17104901; // 0x1050005
+ field public static final int thumbnail_height = 17104897; // 0x1050001
+ field public static final int thumbnail_width = 17104898; // 0x1050002
+ }
+
+ public static final class R.drawable {
+ ctor public R.drawable();
+ field public static final int alert_dark_frame = 17301504; // 0x1080000
+ field public static final int alert_light_frame = 17301505; // 0x1080001
+ field public static final int arrow_down_float = 17301506; // 0x1080002
+ field public static final int arrow_up_float = 17301507; // 0x1080003
+ field public static final int bottom_bar = 17301658; // 0x108009a
+ field public static final int btn_default = 17301508; // 0x1080004
+ field public static final int btn_default_small = 17301509; // 0x1080005
+ field public static final int btn_dialog = 17301527; // 0x1080017
+ field public static final int btn_dropdown = 17301510; // 0x1080006
+ field public static final int btn_minus = 17301511; // 0x1080007
+ field public static final int btn_plus = 17301512; // 0x1080008
+ field public static final int btn_radio = 17301513; // 0x1080009
+ field public static final int btn_star = 17301514; // 0x108000a
+ field public static final int btn_star_big_off = 17301515; // 0x108000b
+ field public static final int btn_star_big_on = 17301516; // 0x108000c
+ field public static final int button_onoff_indicator_off = 17301518; // 0x108000e
+ field public static final int button_onoff_indicator_on = 17301517; // 0x108000d
+ field public static final int checkbox_off_background = 17301519; // 0x108000f
+ field public static final int checkbox_on_background = 17301520; // 0x1080010
+ field public static final int dark_header = 17301669; // 0x10800a5
+ field public static final int dialog_frame = 17301521; // 0x1080011
+ field public static final int dialog_holo_dark_frame = 17301682; // 0x10800b2
+ field public static final int dialog_holo_light_frame = 17301683; // 0x10800b3
+ field public static final int divider_horizontal_bright = 17301522; // 0x1080012
+ field public static final int divider_horizontal_dark = 17301524; // 0x1080014
+ field public static final int divider_horizontal_dim_dark = 17301525; // 0x1080015
+ field public static final int divider_horizontal_textfield = 17301523; // 0x1080013
+ field public static final int edit_text = 17301526; // 0x1080016
+ field public static final int editbox_background = 17301528; // 0x1080018
+ field public static final int editbox_background_normal = 17301529; // 0x1080019
+ field public static final int editbox_dropdown_dark_frame = 17301530; // 0x108001a
+ field public static final int editbox_dropdown_light_frame = 17301531; // 0x108001b
+ field public static final int gallery_thumb = 17301532; // 0x108001c
+ field public static final int ic_btn_speak_now = 17301668; // 0x10800a4
+ field public static final int ic_delete = 17301533; // 0x108001d
+ field public static final int ic_dialog_alert = 17301543; // 0x1080027
+ field public static final int ic_dialog_dialer = 17301544; // 0x1080028
+ field public static final int ic_dialog_email = 17301545; // 0x1080029
+ field public static final int ic_dialog_info = 17301659; // 0x108009b
+ field public static final int ic_dialog_map = 17301546; // 0x108002a
+ field public static final int ic_input_add = 17301547; // 0x108002b
+ field public static final int ic_input_delete = 17301548; // 0x108002c
+ field public static final int ic_input_get = 17301549; // 0x108002d
+ field public static final int ic_lock_idle_alarm = 17301550; // 0x108002e
+ field public static final int ic_lock_idle_charging = 17301534; // 0x108001e
+ field public static final int ic_lock_idle_lock = 17301535; // 0x108001f
+ field public static final int ic_lock_idle_low_battery = 17301536; // 0x1080020
+ field public static final int ic_lock_lock = 17301551; // 0x108002f
+ field public static final int ic_lock_power_off = 17301552; // 0x1080030
+ field public static final int ic_lock_silent_mode = 17301553; // 0x1080031
+ field public static final int ic_lock_silent_mode_off = 17301554; // 0x1080032
+ field public static final int ic_media_ff = 17301537; // 0x1080021
+ field public static final int ic_media_next = 17301538; // 0x1080022
+ field public static final int ic_media_pause = 17301539; // 0x1080023
+ field public static final int ic_media_play = 17301540; // 0x1080024
+ field public static final int ic_media_previous = 17301541; // 0x1080025
+ field public static final int ic_media_rew = 17301542; // 0x1080026
+ field public static final int ic_menu_add = 17301555; // 0x1080033
+ field public static final int ic_menu_agenda = 17301556; // 0x1080034
+ field public static final int ic_menu_always_landscape_portrait = 17301557; // 0x1080035
+ field public static final int ic_menu_call = 17301558; // 0x1080036
+ field public static final int ic_menu_camera = 17301559; // 0x1080037
+ field public static final int ic_menu_close_clear_cancel = 17301560; // 0x1080038
+ field public static final int ic_menu_compass = 17301561; // 0x1080039
+ field public static final int ic_menu_crop = 17301562; // 0x108003a
+ field public static final int ic_menu_day = 17301563; // 0x108003b
+ field public static final int ic_menu_delete = 17301564; // 0x108003c
+ field public static final int ic_menu_directions = 17301565; // 0x108003d
+ field public static final int ic_menu_edit = 17301566; // 0x108003e
+ field public static final int ic_menu_gallery = 17301567; // 0x108003f
+ field public static final int ic_menu_help = 17301568; // 0x1080040
+ field public static final int ic_menu_info_details = 17301569; // 0x1080041
+ field public static final int ic_menu_manage = 17301570; // 0x1080042
+ field public static final int ic_menu_mapmode = 17301571; // 0x1080043
+ field public static final int ic_menu_month = 17301572; // 0x1080044
+ field public static final int ic_menu_more = 17301573; // 0x1080045
+ field public static final int ic_menu_my_calendar = 17301574; // 0x1080046
+ field public static final int ic_menu_mylocation = 17301575; // 0x1080047
+ field public static final int ic_menu_myplaces = 17301576; // 0x1080048
+ field public static final int ic_menu_preferences = 17301577; // 0x1080049
+ field public static final int ic_menu_recent_history = 17301578; // 0x108004a
+ field public static final int ic_menu_report_image = 17301579; // 0x108004b
+ field public static final int ic_menu_revert = 17301580; // 0x108004c
+ field public static final int ic_menu_rotate = 17301581; // 0x108004d
+ field public static final int ic_menu_save = 17301582; // 0x108004e
+ field public static final int ic_menu_search = 17301583; // 0x108004f
+ field public static final int ic_menu_send = 17301584; // 0x1080050
+ field public static final int ic_menu_set_as = 17301585; // 0x1080051
+ field public static final int ic_menu_share = 17301586; // 0x1080052
+ field public static final int ic_menu_slideshow = 17301587; // 0x1080053
+ field public static final int ic_menu_sort_alphabetically = 17301660; // 0x108009c
+ field public static final int ic_menu_sort_by_size = 17301661; // 0x108009d
+ field public static final int ic_menu_today = 17301588; // 0x1080054
+ field public static final int ic_menu_upload = 17301589; // 0x1080055
+ field public static final int ic_menu_upload_you_tube = 17301590; // 0x1080056
+ field public static final int ic_menu_view = 17301591; // 0x1080057
+ field public static final int ic_menu_week = 17301592; // 0x1080058
+ field public static final int ic_menu_zoom = 17301593; // 0x1080059
+ field public static final int ic_notification_clear_all = 17301594; // 0x108005a
+ field public static final int ic_notification_overlay = 17301595; // 0x108005b
+ field public static final int ic_partial_secure = 17301596; // 0x108005c
+ field public static final int ic_popup_disk_full = 17301597; // 0x108005d
+ field public static final int ic_popup_reminder = 17301598; // 0x108005e
+ field public static final int ic_popup_sync = 17301599; // 0x108005f
+ field public static final int ic_search_category_default = 17301600; // 0x1080060
+ field public static final int ic_secure = 17301601; // 0x1080061
+ field public static final int list_selector_background = 17301602; // 0x1080062
+ field public static final int menu_frame = 17301603; // 0x1080063
+ field public static final int menu_full_frame = 17301604; // 0x1080064
+ field public static final int menuitem_background = 17301605; // 0x1080065
+ field public static final int picture_frame = 17301606; // 0x1080066
+ field public static final int presence_audio_away = 17301679; // 0x10800af
+ field public static final int presence_audio_busy = 17301680; // 0x10800b0
+ field public static final int presence_audio_online = 17301681; // 0x10800b1
+ field public static final int presence_away = 17301607; // 0x1080067
+ field public static final int presence_busy = 17301608; // 0x1080068
+ field public static final int presence_invisible = 17301609; // 0x1080069
+ field public static final int presence_offline = 17301610; // 0x108006a
+ field public static final int presence_online = 17301611; // 0x108006b
+ field public static final int presence_video_away = 17301676; // 0x10800ac
+ field public static final int presence_video_busy = 17301677; // 0x10800ad
+ field public static final int presence_video_online = 17301678; // 0x10800ae
+ field public static final int progress_horizontal = 17301612; // 0x108006c
+ field public static final int progress_indeterminate_horizontal = 17301613; // 0x108006d
+ field public static final int radiobutton_off_background = 17301614; // 0x108006e
+ field public static final int radiobutton_on_background = 17301615; // 0x108006f
+ field public static final int screen_background_dark = 17301656; // 0x1080098
+ field public static final int screen_background_dark_transparent = 17301673; // 0x10800a9
+ field public static final int screen_background_light = 17301657; // 0x1080099
+ field public static final int screen_background_light_transparent = 17301674; // 0x10800aa
+ field public static final int spinner_background = 17301616; // 0x1080070
+ field public static final int spinner_dropdown_background = 17301617; // 0x1080071
+ field public static final int star_big_off = 17301619; // 0x1080073
+ field public static final int star_big_on = 17301618; // 0x1080072
+ field public static final int star_off = 17301621; // 0x1080075
+ field public static final int star_on = 17301620; // 0x1080074
+ field public static final int stat_notify_call_mute = 17301622; // 0x1080076
+ field public static final int stat_notify_chat = 17301623; // 0x1080077
+ field public static final int stat_notify_error = 17301624; // 0x1080078
+ field public static final int stat_notify_missed_call = 17301631; // 0x108007f
+ field public static final int stat_notify_more = 17301625; // 0x1080079
+ field public static final int stat_notify_sdcard = 17301626; // 0x108007a
+ field public static final int stat_notify_sdcard_prepare = 17301675; // 0x10800ab
+ field public static final int stat_notify_sdcard_usb = 17301627; // 0x108007b
+ field public static final int stat_notify_sync = 17301628; // 0x108007c
+ field public static final int stat_notify_sync_noanim = 17301629; // 0x108007d
+ field public static final int stat_notify_voicemail = 17301630; // 0x108007e
+ field public static final int stat_sys_data_bluetooth = 17301632; // 0x1080080
+ field public static final int stat_sys_download = 17301633; // 0x1080081
+ field public static final int stat_sys_download_done = 17301634; // 0x1080082
+ field public static final int stat_sys_headset = 17301635; // 0x1080083
+ field public static final deprecated int stat_sys_phone_call = 17301636; // 0x1080084
+ field public static final deprecated int stat_sys_phone_call_forward = 17301637; // 0x1080085
+ field public static final deprecated int stat_sys_phone_call_on_hold = 17301638; // 0x1080086
+ field public static final int stat_sys_speakerphone = 17301639; // 0x1080087
+ field public static final int stat_sys_upload = 17301640; // 0x1080088
+ field public static final int stat_sys_upload_done = 17301641; // 0x1080089
+ field public static final deprecated int stat_sys_vp_phone_call = 17301671; // 0x10800a7
+ field public static final deprecated int stat_sys_vp_phone_call_on_hold = 17301672; // 0x10800a8
+ field public static final int stat_sys_warning = 17301642; // 0x108008a
+ field public static final int status_bar_item_app_background = 17301643; // 0x108008b
+ field public static final int status_bar_item_background = 17301644; // 0x108008c
+ field public static final int sym_action_call = 17301645; // 0x108008d
+ field public static final int sym_action_chat = 17301646; // 0x108008e
+ field public static final int sym_action_email = 17301647; // 0x108008f
+ field public static final int sym_call_incoming = 17301648; // 0x1080090
+ field public static final int sym_call_missed = 17301649; // 0x1080091
+ field public static final int sym_call_outgoing = 17301650; // 0x1080092
+ field public static final int sym_contact_card = 17301652; // 0x1080094
+ field public static final int sym_def_app_icon = 17301651; // 0x1080093
+ field public static final int title_bar = 17301653; // 0x1080095
+ field public static final int title_bar_tall = 17301670; // 0x10800a6
+ field public static final int toast_frame = 17301654; // 0x1080096
+ field public static final int zoom_plate = 17301655; // 0x1080097
+ }
+
+ public static final class R.fraction {
+ ctor public R.fraction();
+ }
+
+ public static final class R.id {
+ ctor public R.id();
+ field public static final int accessibilityActionContextClick = 16908348; // 0x102003c
+ field public static final int accessibilityActionScrollDown = 16908346; // 0x102003a
+ field public static final int accessibilityActionScrollLeft = 16908345; // 0x1020039
+ field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b
+ field public static final int accessibilityActionScrollToPosition = 16908343; // 0x1020037
+ field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038
+ field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d
+ field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036
+ field public static final int addToDictionary = 16908330; // 0x102002a
+ field public static final int background = 16908288; // 0x1020000
+ field public static final int button1 = 16908313; // 0x1020019
+ field public static final int button2 = 16908314; // 0x102001a
+ field public static final int button3 = 16908315; // 0x102001b
+ field public static final int candidatesArea = 16908317; // 0x102001d
+ field public static final int checkbox = 16908289; // 0x1020001
+ field public static final int closeButton = 16908327; // 0x1020027
+ field public static final int content = 16908290; // 0x1020002
+ field public static final int copy = 16908321; // 0x1020021
+ field public static final int copyUrl = 16908323; // 0x1020023
+ field public static final int custom = 16908331; // 0x102002b
+ field public static final int cut = 16908320; // 0x1020020
+ field public static final int edit = 16908291; // 0x1020003
+ field public static final int empty = 16908292; // 0x1020004
+ field public static final int extractArea = 16908316; // 0x102001c
+ field public static final int hint = 16908293; // 0x1020005
+ field public static final int home = 16908332; // 0x102002c
+ field public static final int icon = 16908294; // 0x1020006
+ field public static final int icon1 = 16908295; // 0x1020007
+ field public static final int icon2 = 16908296; // 0x1020008
+ field public static final int icon_frame = 16908350; // 0x102003e
+ field public static final int input = 16908297; // 0x1020009
+ field public static final int inputArea = 16908318; // 0x102001e
+ field public static final int inputExtractEditText = 16908325; // 0x1020025
+ field public static final int keyboardView = 16908326; // 0x1020026
+ field public static final int list = 16908298; // 0x102000a
+ field public static final int list_container = 16908351; // 0x102003f
+ field public static final int mask = 16908334; // 0x102002e
+ field public static final int message = 16908299; // 0x102000b
+ field public static final int navigationBarBackground = 16908336; // 0x1020030
+ field public static final int paste = 16908322; // 0x1020022
+ field public static final int pasteAsPlainText = 16908337; // 0x1020031
+ field public static final int primary = 16908300; // 0x102000c
+ field public static final int progress = 16908301; // 0x102000d
+ field public static final int redo = 16908339; // 0x1020033
+ field public static final int replaceText = 16908340; // 0x1020034
+ field public static final int secondaryProgress = 16908303; // 0x102000f
+ field public static final int selectAll = 16908319; // 0x102001f
+ field public static final int selectTextMode = 16908333; // 0x102002d
+ field public static final int selectedIcon = 16908302; // 0x102000e
+ field public static final int shareText = 16908341; // 0x1020035
+ field public static final int startSelectingText = 16908328; // 0x1020028
+ field public static final int statusBarBackground = 16908335; // 0x102002f
+ field public static final int stopSelectingText = 16908329; // 0x1020029
+ field public static final int summary = 16908304; // 0x1020010
+ field public static final int switchInputMethod = 16908324; // 0x1020024
+ field public static final int switch_widget = 16908352; // 0x1020040
+ field public static final int tabcontent = 16908305; // 0x1020011
+ field public static final int tabhost = 16908306; // 0x1020012
+ field public static final int tabs = 16908307; // 0x1020013
+ field public static final int text1 = 16908308; // 0x1020014
+ field public static final int text2 = 16908309; // 0x1020015
+ field public static final int title = 16908310; // 0x1020016
+ field public static final int toggle = 16908311; // 0x1020017
+ field public static final int undo = 16908338; // 0x1020032
+ field public static final int widget_frame = 16908312; // 0x1020018
+ }
+
+ public static final class R.integer {
+ ctor public R.integer();
+ field public static final int config_longAnimTime = 17694722; // 0x10e0002
+ field public static final int config_mediumAnimTime = 17694721; // 0x10e0001
+ field public static final int config_shortAnimTime = 17694720; // 0x10e0000
+ field public static final int status_bar_notification_info_maxnum = 17694723; // 0x10e0003
+ }
+
+ public static final class R.interpolator {
+ ctor public R.interpolator();
+ field public static final int accelerate_cubic = 17563650; // 0x10c0002
+ field public static final int accelerate_decelerate = 17563654; // 0x10c0006
+ field public static final int accelerate_quad = 17563648; // 0x10c0000
+ field public static final int accelerate_quint = 17563652; // 0x10c0004
+ field public static final int anticipate = 17563655; // 0x10c0007
+ field public static final int anticipate_overshoot = 17563657; // 0x10c0009
+ field public static final int bounce = 17563658; // 0x10c000a
+ field public static final int cycle = 17563660; // 0x10c000c
+ field public static final int decelerate_cubic = 17563651; // 0x10c0003
+ field public static final int decelerate_quad = 17563649; // 0x10c0001
+ field public static final int decelerate_quint = 17563653; // 0x10c0005
+ field public static final int fast_out_linear_in = 17563663; // 0x10c000f
+ field public static final int fast_out_slow_in = 17563661; // 0x10c000d
+ field public static final int linear = 17563659; // 0x10c000b
+ field public static final int linear_out_slow_in = 17563662; // 0x10c000e
+ field public static final int overshoot = 17563656; // 0x10c0008
+ }
+
+ public static final class R.layout {
+ ctor public R.layout();
+ field public static final int activity_list_item = 17367040; // 0x1090000
+ field public static final int browser_link_context_header = 17367054; // 0x109000e
+ field public static final int expandable_list_content = 17367041; // 0x1090001
+ field public static final int list_content = 17367060; // 0x1090014
+ field public static final int preference_category = 17367042; // 0x1090002
+ field public static final int select_dialog_item = 17367057; // 0x1090011
+ field public static final int select_dialog_multichoice = 17367059; // 0x1090013
+ field public static final int select_dialog_singlechoice = 17367058; // 0x1090012
+ field public static final int simple_dropdown_item_1line = 17367050; // 0x109000a
+ field public static final int simple_expandable_list_item_1 = 17367046; // 0x1090006
+ field public static final int simple_expandable_list_item_2 = 17367047; // 0x1090007
+ field public static final int simple_gallery_item = 17367051; // 0x109000b
+ field public static final int simple_list_item_1 = 17367043; // 0x1090003
+ field public static final int simple_list_item_2 = 17367044; // 0x1090004
+ field public static final int simple_list_item_activated_1 = 17367062; // 0x1090016
+ field public static final int simple_list_item_activated_2 = 17367063; // 0x1090017
+ field public static final int simple_list_item_checked = 17367045; // 0x1090005
+ field public static final int simple_list_item_multiple_choice = 17367056; // 0x1090010
+ field public static final int simple_list_item_single_choice = 17367055; // 0x109000f
+ field public static final int simple_selectable_list_item = 17367061; // 0x1090015
+ field public static final int simple_spinner_dropdown_item = 17367049; // 0x1090009
+ field public static final int simple_spinner_item = 17367048; // 0x1090008
+ field public static final int test_list_item = 17367052; // 0x109000c
+ field public static final int two_line_list_item = 17367053; // 0x109000d
+ }
+
+ public static final class R.menu {
+ ctor public R.menu();
+ }
+
+ public static final class R.mipmap {
+ ctor public R.mipmap();
+ field public static final int sym_def_app_icon = 17629184; // 0x10d0000
+ }
+
+ public static final class R.plurals {
+ ctor public R.plurals();
+ }
+
+ public static final class R.raw {
+ ctor public R.raw();
+ }
+
+ public static final class R.string {
+ ctor public R.string();
+ field public static final int VideoView_error_button = 17039376; // 0x1040010
+ field public static final int VideoView_error_text_invalid_progressive_playback = 17039381; // 0x1040015
+ field public static final int VideoView_error_text_unknown = 17039377; // 0x1040011
+ field public static final int VideoView_error_title = 17039378; // 0x1040012
+ field public static final int cancel = 17039360; // 0x1040000
+ field public static final int copy = 17039361; // 0x1040001
+ field public static final int copyUrl = 17039362; // 0x1040002
+ field public static final int cut = 17039363; // 0x1040003
+ field public static final int defaultMsisdnAlphaTag = 17039365; // 0x1040005
+ field public static final int defaultVoiceMailAlphaTag = 17039364; // 0x1040004
+ field public static final int dialog_alert_title = 17039380; // 0x1040014
+ field public static final int emptyPhoneNumber = 17039366; // 0x1040006
+ field public static final int fingerprint_icon_content_description = 17039384; // 0x1040018
+ field public static final int httpErrorBadUrl = 17039367; // 0x1040007
+ field public static final int httpErrorUnsupportedScheme = 17039368; // 0x1040008
+ field public static final int no = 17039369; // 0x1040009
+ field public static final int ok = 17039370; // 0x104000a
+ field public static final int paste = 17039371; // 0x104000b
+ field public static final int search_go = 17039372; // 0x104000c
+ field public static final int selectAll = 17039373; // 0x104000d
+ field public static final int selectTextMode = 17039382; // 0x1040016
+ field public static final int status_bar_notification_info_overflow = 17039383; // 0x1040017
+ field public static final int unknownName = 17039374; // 0x104000e
+ field public static final int untitled = 17039375; // 0x104000f
+ field public static final int yes = 17039379; // 0x1040013
+ }
+
+ public static final class R.style {
+ ctor public R.style();
+ field public static final int Animation = 16973824; // 0x1030000
+ field public static final int Animation_Activity = 16973825; // 0x1030001
+ field public static final int Animation_Dialog = 16973826; // 0x1030002
+ field public static final int Animation_InputMethod = 16973910; // 0x1030056
+ field public static final int Animation_Toast = 16973828; // 0x1030004
+ field public static final int Animation_Translucent = 16973827; // 0x1030003
+ field public static final int DeviceDefault_ButtonBar = 16974287; // 0x10301cf
+ field public static final int DeviceDefault_ButtonBar_AlertDialog = 16974288; // 0x10301d0
+ field public static final int DeviceDefault_Light_ButtonBar = 16974290; // 0x10301d2
+ field public static final int DeviceDefault_Light_ButtonBar_AlertDialog = 16974291; // 0x10301d3
+ field public static final int DeviceDefault_Light_SegmentedButton = 16974292; // 0x10301d4
+ field public static final int DeviceDefault_SegmentedButton = 16974289; // 0x10301d1
+ field public static final int Holo_ButtonBar = 16974053; // 0x10300e5
+ field public static final int Holo_ButtonBar_AlertDialog = 16974055; // 0x10300e7
+ field public static final int Holo_Light_ButtonBar = 16974054; // 0x10300e6
+ field public static final int Holo_Light_ButtonBar_AlertDialog = 16974056; // 0x10300e8
+ field public static final int Holo_Light_SegmentedButton = 16974058; // 0x10300ea
+ field public static final int Holo_SegmentedButton = 16974057; // 0x10300e9
+ field public static final int MediaButton = 16973879; // 0x1030037
+ field public static final int MediaButton_Ffwd = 16973883; // 0x103003b
+ field public static final int MediaButton_Next = 16973881; // 0x1030039
+ field public static final int MediaButton_Pause = 16973885; // 0x103003d
+ field public static final int MediaButton_Play = 16973882; // 0x103003a
+ field public static final int MediaButton_Previous = 16973880; // 0x1030038
+ field public static final int MediaButton_Rew = 16973884; // 0x103003c
+ field public static final int TextAppearance = 16973886; // 0x103003e
+ field public static final int TextAppearance_DeviceDefault = 16974253; // 0x10301ad
+ field public static final int TextAppearance_DeviceDefault_DialogWindowTitle = 16974264; // 0x10301b8
+ field public static final int TextAppearance_DeviceDefault_Inverse = 16974254; // 0x10301ae
+ field public static final int TextAppearance_DeviceDefault_Large = 16974255; // 0x10301af
+ field public static final int TextAppearance_DeviceDefault_Large_Inverse = 16974256; // 0x10301b0
+ field public static final int TextAppearance_DeviceDefault_Medium = 16974257; // 0x10301b1
+ field public static final int TextAppearance_DeviceDefault_Medium_Inverse = 16974258; // 0x10301b2
+ field public static final int TextAppearance_DeviceDefault_SearchResult_Subtitle = 16974262; // 0x10301b6
+ field public static final int TextAppearance_DeviceDefault_SearchResult_Title = 16974261; // 0x10301b5
+ field public static final int TextAppearance_DeviceDefault_Small = 16974259; // 0x10301b3
+ field public static final int TextAppearance_DeviceDefault_Small_Inverse = 16974260; // 0x10301b4
+ field public static final int TextAppearance_DeviceDefault_Widget = 16974265; // 0x10301b9
+ field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Menu = 16974286; // 0x10301ce
+ field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle = 16974279; // 0x10301c7
+ field public static final deprecated int TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_Inverse = 16974283; // 0x10301cb
+ field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Title = 16974278; // 0x10301c6
+ field public static final deprecated int TextAppearance_DeviceDefault_Widget_ActionBar_Title_Inverse = 16974282; // 0x10301ca
+ field public static final int TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle = 16974281; // 0x10301c9
+ field public static final deprecated int TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_Inverse = 16974285; // 0x10301cd
+ field public static final int TextAppearance_DeviceDefault_Widget_ActionMode_Title = 16974280; // 0x10301c8
+ field public static final deprecated int TextAppearance_DeviceDefault_Widget_ActionMode_Title_Inverse = 16974284; // 0x10301cc
+ field public static final int TextAppearance_DeviceDefault_Widget_Button = 16974266; // 0x10301ba
+ field public static final int TextAppearance_DeviceDefault_Widget_DropDownHint = 16974271; // 0x10301bf
+ field public static final int TextAppearance_DeviceDefault_Widget_DropDownItem = 16974272; // 0x10301c0
+ field public static final int TextAppearance_DeviceDefault_Widget_EditText = 16974274; // 0x10301c2
+ field public static final int TextAppearance_DeviceDefault_Widget_IconMenu_Item = 16974267; // 0x10301bb
+ field public static final int TextAppearance_DeviceDefault_Widget_PopupMenu = 16974275; // 0x10301c3
+ field public static final int TextAppearance_DeviceDefault_Widget_PopupMenu_Large = 16974276; // 0x10301c4
+ field public static final int TextAppearance_DeviceDefault_Widget_PopupMenu_Small = 16974277; // 0x10301c5
+ field public static final int TextAppearance_DeviceDefault_Widget_TabWidget = 16974268; // 0x10301bc
+ field public static final int TextAppearance_DeviceDefault_Widget_TextView = 16974269; // 0x10301bd
+ field public static final int TextAppearance_DeviceDefault_Widget_TextView_PopupMenu = 16974270; // 0x10301be
+ field public static final int TextAppearance_DeviceDefault_Widget_TextView_SpinnerItem = 16974273; // 0x10301c1
+ field public static final int TextAppearance_DeviceDefault_WindowTitle = 16974263; // 0x10301b7
+ field public static final int TextAppearance_DialogWindowTitle = 16973889; // 0x1030041
+ field public static final int TextAppearance_Holo = 16974075; // 0x10300fb
+ field public static final int TextAppearance_Holo_DialogWindowTitle = 16974103; // 0x1030117
+ field public static final int TextAppearance_Holo_Inverse = 16974076; // 0x10300fc
+ field public static final int TextAppearance_Holo_Large = 16974077; // 0x10300fd
+ field public static final int TextAppearance_Holo_Large_Inverse = 16974078; // 0x10300fe
+ field public static final int TextAppearance_Holo_Medium = 16974079; // 0x10300ff
+ field public static final int TextAppearance_Holo_Medium_Inverse = 16974080; // 0x1030100
+ field public static final int TextAppearance_Holo_SearchResult_Subtitle = 16974084; // 0x1030104
+ field public static final int TextAppearance_Holo_SearchResult_Title = 16974083; // 0x1030103
+ field public static final int TextAppearance_Holo_Small = 16974081; // 0x1030101
+ field public static final int TextAppearance_Holo_Small_Inverse = 16974082; // 0x1030102
+ field public static final int TextAppearance_Holo_Widget = 16974085; // 0x1030105
+ field public static final int TextAppearance_Holo_Widget_ActionBar_Menu = 16974112; // 0x1030120
+ field public static final int TextAppearance_Holo_Widget_ActionBar_Subtitle = 16974099; // 0x1030113
+ field public static final int TextAppearance_Holo_Widget_ActionBar_Subtitle_Inverse = 16974109; // 0x103011d
+ field public static final int TextAppearance_Holo_Widget_ActionBar_Title = 16974098; // 0x1030112
+ field public static final int TextAppearance_Holo_Widget_ActionBar_Title_Inverse = 16974108; // 0x103011c
+ field public static final int TextAppearance_Holo_Widget_ActionMode_Subtitle = 16974101; // 0x1030115
+ field public static final int TextAppearance_Holo_Widget_ActionMode_Subtitle_Inverse = 16974111; // 0x103011f
+ field public static final int TextAppearance_Holo_Widget_ActionMode_Title = 16974100; // 0x1030114
+ field public static final int TextAppearance_Holo_Widget_ActionMode_Title_Inverse = 16974110; // 0x103011e
+ field public static final int TextAppearance_Holo_Widget_Button = 16974086; // 0x1030106
+ field public static final int TextAppearance_Holo_Widget_DropDownHint = 16974091; // 0x103010b
+ field public static final int TextAppearance_Holo_Widget_DropDownItem = 16974092; // 0x103010c
+ field public static final int TextAppearance_Holo_Widget_EditText = 16974094; // 0x103010e
+ field public static final int TextAppearance_Holo_Widget_IconMenu_Item = 16974087; // 0x1030107
+ field public static final int TextAppearance_Holo_Widget_PopupMenu = 16974095; // 0x103010f
+ field public static final int TextAppearance_Holo_Widget_PopupMenu_Large = 16974096; // 0x1030110
+ field public static final int TextAppearance_Holo_Widget_PopupMenu_Small = 16974097; // 0x1030111
+ field public static final int TextAppearance_Holo_Widget_TabWidget = 16974088; // 0x1030108
+ field public static final int TextAppearance_Holo_Widget_TextView = 16974089; // 0x1030109
+ field public static final int TextAppearance_Holo_Widget_TextView_PopupMenu = 16974090; // 0x103010a
+ field public static final int TextAppearance_Holo_Widget_TextView_SpinnerItem = 16974093; // 0x103010d
+ field public static final int TextAppearance_Holo_WindowTitle = 16974102; // 0x1030116
+ field public static final int TextAppearance_Inverse = 16973887; // 0x103003f
+ field public static final int TextAppearance_Large = 16973890; // 0x1030042
+ field public static final int TextAppearance_Large_Inverse = 16973891; // 0x1030043
+ field public static final int TextAppearance_Material = 16974317; // 0x10301ed
+ field public static final int TextAppearance_Material_Body1 = 16974320; // 0x10301f0
+ field public static final int TextAppearance_Material_Body2 = 16974319; // 0x10301ef
+ field public static final int TextAppearance_Material_Button = 16974318; // 0x10301ee
+ field public static final int TextAppearance_Material_Caption = 16974321; // 0x10301f1
+ field public static final int TextAppearance_Material_DialogWindowTitle = 16974322; // 0x10301f2
+ field public static final int TextAppearance_Material_Display1 = 16974326; // 0x10301f6
+ field public static final int TextAppearance_Material_Display2 = 16974325; // 0x10301f5
+ field public static final int TextAppearance_Material_Display3 = 16974324; // 0x10301f4
+ field public static final int TextAppearance_Material_Display4 = 16974323; // 0x10301f3
+ field public static final int TextAppearance_Material_Headline = 16974327; // 0x10301f7
+ field public static final int TextAppearance_Material_Inverse = 16974328; // 0x10301f8
+ field public static final int TextAppearance_Material_Large = 16974329; // 0x10301f9
+ field public static final int TextAppearance_Material_Large_Inverse = 16974330; // 0x10301fa
+ field public static final int TextAppearance_Material_Medium = 16974331; // 0x10301fb
+ field public static final int TextAppearance_Material_Medium_Inverse = 16974332; // 0x10301fc
+ field public static final int TextAppearance_Material_Menu = 16974333; // 0x10301fd
+ field public static final int TextAppearance_Material_Notification = 16974334; // 0x10301fe
+ field public static final int TextAppearance_Material_Notification_Emphasis = 16974335; // 0x10301ff
+ field public static final int TextAppearance_Material_Notification_Info = 16974336; // 0x1030200
+ field public static final int TextAppearance_Material_Notification_Line2 = 16974337; // 0x1030201
+ field public static final int TextAppearance_Material_Notification_Time = 16974338; // 0x1030202
+ field public static final int TextAppearance_Material_Notification_Title = 16974339; // 0x1030203
+ field public static final int TextAppearance_Material_SearchResult_Subtitle = 16974340; // 0x1030204
+ field public static final int TextAppearance_Material_SearchResult_Title = 16974341; // 0x1030205
+ field public static final int TextAppearance_Material_Small = 16974342; // 0x1030206
+ field public static final int TextAppearance_Material_Small_Inverse = 16974343; // 0x1030207
+ field public static final int TextAppearance_Material_Subhead = 16974344; // 0x1030208
+ field public static final int TextAppearance_Material_Title = 16974345; // 0x1030209
+ field public static final int TextAppearance_Material_Widget = 16974347; // 0x103020b
+ field public static final int TextAppearance_Material_Widget_ActionBar_Menu = 16974348; // 0x103020c
+ field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle = 16974349; // 0x103020d
+ field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle_Inverse = 16974350; // 0x103020e
+ field public static final int TextAppearance_Material_Widget_ActionBar_Title = 16974351; // 0x103020f
+ field public static final int TextAppearance_Material_Widget_ActionBar_Title_Inverse = 16974352; // 0x1030210
+ field public static final int TextAppearance_Material_Widget_ActionMode_Subtitle = 16974353; // 0x1030211
+ field public static final int TextAppearance_Material_Widget_ActionMode_Subtitle_Inverse = 16974354; // 0x1030212
+ field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213
+ field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214
+ field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215
+ field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4
+ field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216
+ field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217
+ field public static final int TextAppearance_Material_Widget_EditText = 16974360; // 0x1030218
+ field public static final int TextAppearance_Material_Widget_IconMenu_Item = 16974361; // 0x1030219
+ field public static final int TextAppearance_Material_Widget_PopupMenu = 16974362; // 0x103021a
+ field public static final int TextAppearance_Material_Widget_PopupMenu_Large = 16974363; // 0x103021b
+ field public static final int TextAppearance_Material_Widget_PopupMenu_Small = 16974364; // 0x103021c
+ field public static final int TextAppearance_Material_Widget_TabWidget = 16974365; // 0x103021d
+ field public static final int TextAppearance_Material_Widget_TextView = 16974366; // 0x103021e
+ field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974367; // 0x103021f
+ field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974368; // 0x1030220
+ field public static final int TextAppearance_Material_Widget_Toolbar_Subtitle = 16974369; // 0x1030221
+ field public static final int TextAppearance_Material_Widget_Toolbar_Title = 16974370; // 0x1030222
+ field public static final int TextAppearance_Material_WindowTitle = 16974346; // 0x103020a
+ field public static final int TextAppearance_Medium = 16973892; // 0x1030044
+ field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045
+ field public static final int TextAppearance_Small = 16973894; // 0x1030046
+ field public static final int TextAppearance_Small_Inverse = 16973895; // 0x1030047
+ field public static final int TextAppearance_StatusBar_EventContent = 16973927; // 0x1030067
+ field public static final int TextAppearance_StatusBar_EventContent_Title = 16973928; // 0x1030068
+ field public static final int TextAppearance_StatusBar_Icon = 16973926; // 0x1030066
+ field public static final int TextAppearance_StatusBar_Title = 16973925; // 0x1030065
+ field public static final int TextAppearance_SuggestionHighlight = 16974104; // 0x1030118
+ field public static final int TextAppearance_Theme = 16973888; // 0x1030040
+ field public static final int TextAppearance_Theme_Dialog = 16973896; // 0x1030048
+ field public static final int TextAppearance_Widget = 16973897; // 0x1030049
+ field public static final int TextAppearance_Widget_Button = 16973898; // 0x103004a
+ field public static final int TextAppearance_Widget_DropDownHint = 16973904; // 0x1030050
+ field public static final int TextAppearance_Widget_DropDownItem = 16973905; // 0x1030051
+ field public static final int TextAppearance_Widget_EditText = 16973900; // 0x103004c
+ field public static final int TextAppearance_Widget_IconMenu_Item = 16973899; // 0x103004b
+ field public static final int TextAppearance_Widget_PopupMenu_Large = 16973952; // 0x1030080
+ field public static final int TextAppearance_Widget_PopupMenu_Small = 16973953; // 0x1030081
+ field public static final int TextAppearance_Widget_TabWidget = 16973901; // 0x103004d
+ field public static final int TextAppearance_Widget_TextView = 16973902; // 0x103004e
+ field public static final int TextAppearance_Widget_TextView_PopupMenu = 16973903; // 0x103004f
+ field public static final int TextAppearance_Widget_TextView_SpinnerItem = 16973906; // 0x1030052
+ field public static final int TextAppearance_WindowTitle = 16973907; // 0x1030053
+ field public static final int Theme = 16973829; // 0x1030005
+ field public static final int ThemeOverlay = 16974407; // 0x1030247
+ field public static final int ThemeOverlay_Material = 16974408; // 0x1030248
+ field public static final int ThemeOverlay_Material_ActionBar = 16974409; // 0x1030249
+ field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b
+ field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974412; // 0x103024c
+ field public static final int ThemeOverlay_Material_Dialog = 16974550; // 0x10302d6
+ field public static final int ThemeOverlay_Material_Dialog_Alert = 16974551; // 0x10302d7
+ field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a
+ field public static final int Theme_Black = 16973832; // 0x1030008
+ field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
+ field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a
+ field public static final int Theme_DeviceDefault = 16974120; // 0x1030128
+ field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e
+ field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136
+ field public static final int Theme_DeviceDefault_DialogWhenLarge_NoActionBar = 16974135; // 0x1030137
+ field public static final int Theme_DeviceDefault_Dialog_Alert = 16974545; // 0x10302d1
+ field public static final int Theme_DeviceDefault_Dialog_MinWidth = 16974127; // 0x103012f
+ field public static final int Theme_DeviceDefault_Dialog_NoActionBar = 16974128; // 0x1030130
+ field public static final int Theme_DeviceDefault_Dialog_NoActionBar_MinWidth = 16974129; // 0x1030131
+ field public static final int Theme_DeviceDefault_InputMethod = 16974142; // 0x103013e
+ field public static final int Theme_DeviceDefault_Light = 16974123; // 0x103012b
+ field public static final int Theme_DeviceDefault_Light_DarkActionBar = 16974143; // 0x103013f
+ field public static final int Theme_DeviceDefault_Light_Dialog = 16974130; // 0x1030132
+ field public static final int Theme_DeviceDefault_Light_DialogWhenLarge = 16974136; // 0x1030138
+ field public static final int Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar = 16974137; // 0x1030139
+ field public static final int Theme_DeviceDefault_Light_Dialog_Alert = 16974546; // 0x10302d2
+ field public static final int Theme_DeviceDefault_Light_Dialog_MinWidth = 16974131; // 0x1030133
+ field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar = 16974132; // 0x1030134
+ field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth = 16974133; // 0x1030135
+ field public static final int Theme_DeviceDefault_Light_NoActionBar = 16974124; // 0x103012c
+ field public static final int Theme_DeviceDefault_Light_NoActionBar_Fullscreen = 16974125; // 0x103012d
+ field public static final int Theme_DeviceDefault_Light_NoActionBar_Overscan = 16974304; // 0x10301e0
+ field public static final int Theme_DeviceDefault_Light_NoActionBar_TranslucentDecor = 16974308; // 0x10301e4
+ field public static final int Theme_DeviceDefault_Light_Panel = 16974139; // 0x103013b
+ field public static final int Theme_DeviceDefault_NoActionBar = 16974121; // 0x1030129
+ field public static final int Theme_DeviceDefault_NoActionBar_Fullscreen = 16974122; // 0x103012a
+ field public static final int Theme_DeviceDefault_NoActionBar_Overscan = 16974303; // 0x10301df
+ field public static final int Theme_DeviceDefault_NoActionBar_TranslucentDecor = 16974307; // 0x10301e3
+ field public static final int Theme_DeviceDefault_Panel = 16974138; // 0x103013a
+ field public static final int Theme_DeviceDefault_Settings = 16974371; // 0x1030223
+ field public static final int Theme_DeviceDefault_Wallpaper = 16974140; // 0x103013c
+ field public static final int Theme_DeviceDefault_Wallpaper_NoTitleBar = 16974141; // 0x103013d
+ field public static final int Theme_Dialog = 16973835; // 0x103000b
+ field public static final int Theme_Holo = 16973931; // 0x103006b
+ field public static final int Theme_Holo_Dialog = 16973935; // 0x103006f
+ field public static final int Theme_Holo_DialogWhenLarge = 16973943; // 0x1030077
+ field public static final int Theme_Holo_DialogWhenLarge_NoActionBar = 16973944; // 0x1030078
+ field public static final int Theme_Holo_Dialog_MinWidth = 16973936; // 0x1030070
+ field public static final int Theme_Holo_Dialog_NoActionBar = 16973937; // 0x1030071
+ field public static final int Theme_Holo_Dialog_NoActionBar_MinWidth = 16973938; // 0x1030072
+ field public static final int Theme_Holo_InputMethod = 16973951; // 0x103007f
+ field public static final int Theme_Holo_Light = 16973934; // 0x103006e
+ field public static final int Theme_Holo_Light_DarkActionBar = 16974105; // 0x1030119
+ field public static final int Theme_Holo_Light_Dialog = 16973939; // 0x1030073
+ field public static final int Theme_Holo_Light_DialogWhenLarge = 16973945; // 0x1030079
+ field public static final int Theme_Holo_Light_DialogWhenLarge_NoActionBar = 16973946; // 0x103007a
+ field public static final int Theme_Holo_Light_Dialog_MinWidth = 16973940; // 0x1030074
+ field public static final int Theme_Holo_Light_Dialog_NoActionBar = 16973941; // 0x1030075
+ field public static final int Theme_Holo_Light_Dialog_NoActionBar_MinWidth = 16973942; // 0x1030076
+ field public static final int Theme_Holo_Light_NoActionBar = 16974064; // 0x10300f0
+ field public static final int Theme_Holo_Light_NoActionBar_Fullscreen = 16974065; // 0x10300f1
+ field public static final int Theme_Holo_Light_NoActionBar_Overscan = 16974302; // 0x10301de
+ field public static final int Theme_Holo_Light_NoActionBar_TranslucentDecor = 16974306; // 0x10301e2
+ field public static final int Theme_Holo_Light_Panel = 16973948; // 0x103007c
+ field public static final int Theme_Holo_NoActionBar = 16973932; // 0x103006c
+ field public static final int Theme_Holo_NoActionBar_Fullscreen = 16973933; // 0x103006d
+ field public static final int Theme_Holo_NoActionBar_Overscan = 16974301; // 0x10301dd
+ field public static final int Theme_Holo_NoActionBar_TranslucentDecor = 16974305; // 0x10301e1
+ field public static final int Theme_Holo_Panel = 16973947; // 0x103007b
+ field public static final int Theme_Holo_Wallpaper = 16973949; // 0x103007d
+ field public static final int Theme_Holo_Wallpaper_NoTitleBar = 16973950; // 0x103007e
+ field public static final int Theme_InputMethod = 16973908; // 0x1030054
+ field public static final int Theme_Light = 16973836; // 0x103000c
+ field public static final int Theme_Light_NoTitleBar = 16973837; // 0x103000d
+ field public static final int Theme_Light_NoTitleBar_Fullscreen = 16973838; // 0x103000e
+ field public static final int Theme_Light_Panel = 16973914; // 0x103005a
+ field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
+ field public static final int Theme_Material = 16974372; // 0x1030224
+ field public static final int Theme_Material_DayNight = 16974552; // 0x10302d8
+ field public static final int Theme_Material_DayNight_DarkActionBar = 16974553; // 0x10302d9
+ field public static final int Theme_Material_DayNight_Dialog = 16974554; // 0x10302da
+ field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974560; // 0x10302e0
+ field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8
+ field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974561; // 0x10302e1
+ field public static final int Theme_Material_DayNight_Dialog_Alert = 16974555; // 0x10302db
+ field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974556; // 0x10302dc
+ field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974557; // 0x10302dd
+ field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974558; // 0x10302de
+ field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974559; // 0x10302df
+ field public static final int Theme_Material_DayNight_NoActionBar = 16974562; // 0x10302e2
+ field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974563; // 0x10302e3
+ field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974564; // 0x10302e4
+ field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974565; // 0x10302e5
+ field public static final int Theme_Material_DayNight_Panel = 16974566; // 0x10302e6
+ field public static final int Theme_Material_Dialog = 16974373; // 0x1030225
+ field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b
+ field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c
+ field public static final int Theme_Material_Dialog_Alert = 16974374; // 0x1030226
+ field public static final int Theme_Material_Dialog_MinWidth = 16974375; // 0x1030227
+ field public static final int Theme_Material_Dialog_NoActionBar = 16974376; // 0x1030228
+ field public static final int Theme_Material_Dialog_NoActionBar_MinWidth = 16974377; // 0x1030229
+ field public static final int Theme_Material_Dialog_Presentation = 16974378; // 0x103022a
+ field public static final int Theme_Material_InputMethod = 16974381; // 0x103022d
+ field public static final int Theme_Material_Light = 16974391; // 0x1030237
+ field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238
+ field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239
+ field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f
+ field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7
+ field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240
+ field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a
+ field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b
+ field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974396; // 0x103023c
+ field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974397; // 0x103023d
+ field public static final int Theme_Material_Light_Dialog_Presentation = 16974398; // 0x103023e
+ field public static final int Theme_Material_Light_LightStatusBar = 16974549; // 0x10302d5
+ field public static final int Theme_Material_Light_NoActionBar = 16974401; // 0x1030241
+ field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974402; // 0x1030242
+ field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974403; // 0x1030243
+ field public static final int Theme_Material_Light_NoActionBar_TranslucentDecor = 16974404; // 0x1030244
+ field public static final int Theme_Material_Light_Panel = 16974405; // 0x1030245
+ field public static final int Theme_Material_Light_Voice = 16974406; // 0x1030246
+ field public static final int Theme_Material_NoActionBar = 16974382; // 0x103022e
+ field public static final int Theme_Material_NoActionBar_Fullscreen = 16974383; // 0x103022f
+ field public static final int Theme_Material_NoActionBar_Overscan = 16974384; // 0x1030230
+ field public static final int Theme_Material_NoActionBar_TranslucentDecor = 16974385; // 0x1030231
+ field public static final int Theme_Material_Panel = 16974386; // 0x1030232
+ field public static final int Theme_Material_Settings = 16974387; // 0x1030233
+ field public static final int Theme_Material_Voice = 16974388; // 0x1030234
+ field public static final int Theme_Material_Wallpaper = 16974389; // 0x1030235
+ field public static final int Theme_Material_Wallpaper_NoTitleBar = 16974390; // 0x1030236
+ field public static final int Theme_NoDisplay = 16973909; // 0x1030055
+ field public static final int Theme_NoTitleBar = 16973830; // 0x1030006
+ field public static final int Theme_NoTitleBar_Fullscreen = 16973831; // 0x1030007
+ field public static final int Theme_NoTitleBar_OverlayActionModes = 16973930; // 0x103006a
+ field public static final int Theme_Panel = 16973913; // 0x1030059
+ field public static final int Theme_Translucent = 16973839; // 0x103000f
+ field public static final int Theme_Translucent_NoTitleBar = 16973840; // 0x1030010
+ field public static final int Theme_Translucent_NoTitleBar_Fullscreen = 16973841; // 0x1030011
+ field public static final int Theme_Wallpaper = 16973918; // 0x103005e
+ field public static final int Theme_WallpaperSettings = 16973921; // 0x1030061
+ field public static final int Theme_Wallpaper_NoTitleBar = 16973919; // 0x103005f
+ field public static final int Theme_Wallpaper_NoTitleBar_Fullscreen = 16973920; // 0x1030060
+ field public static final int Theme_WithActionBar = 16973929; // 0x1030069
+ field public static final int Widget = 16973842; // 0x1030012
+ field public static final int Widget_AbsListView = 16973843; // 0x1030013
+ field public static final int Widget_ActionBar = 16973954; // 0x1030082
+ field public static final int Widget_ActionBar_TabBar = 16974068; // 0x10300f4
+ field public static final int Widget_ActionBar_TabText = 16974067; // 0x10300f3
+ field public static final int Widget_ActionBar_TabView = 16974066; // 0x10300f2
+ field public static final int Widget_ActionButton = 16973956; // 0x1030084
+ field public static final int Widget_ActionButton_CloseMode = 16973960; // 0x1030088
+ field public static final int Widget_ActionButton_Overflow = 16973959; // 0x1030087
+ field public static final int Widget_AutoCompleteTextView = 16973863; // 0x1030027
+ field public static final int Widget_Button = 16973844; // 0x1030014
+ field public static final int Widget_Button_Inset = 16973845; // 0x1030015
+ field public static final int Widget_Button_Small = 16973846; // 0x1030016
+ field public static final int Widget_Button_Toggle = 16973847; // 0x1030017
+ field public static final int Widget_CalendarView = 16974059; // 0x10300eb
+ field public static final int Widget_CompoundButton = 16973848; // 0x1030018
+ field public static final int Widget_CompoundButton_CheckBox = 16973849; // 0x1030019
+ field public static final int Widget_CompoundButton_RadioButton = 16973850; // 0x103001a
+ field public static final int Widget_CompoundButton_Star = 16973851; // 0x103001b
+ field public static final int Widget_DatePicker = 16974062; // 0x10300ee
+ field public static final int Widget_DeviceDefault = 16974144; // 0x1030140
+ field public static final int Widget_DeviceDefault_ActionBar = 16974187; // 0x103016b
+ field public static final int Widget_DeviceDefault_ActionBar_Solid = 16974195; // 0x1030173
+ field public static final int Widget_DeviceDefault_ActionBar_TabBar = 16974194; // 0x1030172
+ field public static final int Widget_DeviceDefault_ActionBar_TabText = 16974193; // 0x1030171
+ field public static final int Widget_DeviceDefault_ActionBar_TabView = 16974192; // 0x1030170
+ field public static final int Widget_DeviceDefault_ActionButton = 16974182; // 0x1030166
+ field public static final int Widget_DeviceDefault_ActionButton_CloseMode = 16974186; // 0x103016a
+ field public static final int Widget_DeviceDefault_ActionButton_Overflow = 16974183; // 0x1030167
+ field public static final int Widget_DeviceDefault_ActionButton_TextButton = 16974184; // 0x1030168
+ field public static final int Widget_DeviceDefault_ActionMode = 16974185; // 0x1030169
+ field public static final int Widget_DeviceDefault_AutoCompleteTextView = 16974151; // 0x1030147
+ field public static final int Widget_DeviceDefault_Button = 16974145; // 0x1030141
+ field public static final int Widget_DeviceDefault_Button_Borderless = 16974188; // 0x103016c
+ field public static final int Widget_DeviceDefault_Button_Borderless_Small = 16974149; // 0x1030145
+ field public static final int Widget_DeviceDefault_Button_Inset = 16974147; // 0x1030143
+ field public static final int Widget_DeviceDefault_Button_Small = 16974146; // 0x1030142
+ field public static final int Widget_DeviceDefault_Button_Toggle = 16974148; // 0x1030144
+ field public static final int Widget_DeviceDefault_CalendarView = 16974190; // 0x103016e
+ field public static final int Widget_DeviceDefault_CheckedTextView = 16974299; // 0x10301db
+ field public static final int Widget_DeviceDefault_CompoundButton_CheckBox = 16974152; // 0x1030148
+ field public static final int Widget_DeviceDefault_CompoundButton_RadioButton = 16974169; // 0x1030159
+ field public static final int Widget_DeviceDefault_CompoundButton_Star = 16974173; // 0x103015d
+ field public static final int Widget_DeviceDefault_DatePicker = 16974191; // 0x103016f
+ field public static final int Widget_DeviceDefault_DropDownItem = 16974177; // 0x1030161
+ field public static final int Widget_DeviceDefault_DropDownItem_Spinner = 16974178; // 0x1030162
+ field public static final int Widget_DeviceDefault_EditText = 16974154; // 0x103014a
+ field public static final int Widget_DeviceDefault_ExpandableListView = 16974155; // 0x103014b
+ field public static final int Widget_DeviceDefault_FastScroll = 16974313; // 0x10301e9
+ field public static final int Widget_DeviceDefault_GridView = 16974156; // 0x103014c
+ field public static final int Widget_DeviceDefault_HorizontalScrollView = 16974171; // 0x103015b
+ field public static final int Widget_DeviceDefault_ImageButton = 16974157; // 0x103014d
+ field public static final int Widget_DeviceDefault_Light = 16974196; // 0x1030174
+ field public static final int Widget_DeviceDefault_Light_ActionBar = 16974243; // 0x10301a3
+ field public static final int Widget_DeviceDefault_Light_ActionBar_Solid = 16974247; // 0x10301a7
+ field public static final deprecated int Widget_DeviceDefault_Light_ActionBar_Solid_Inverse = 16974248; // 0x10301a8
+ field public static final int Widget_DeviceDefault_Light_ActionBar_TabBar = 16974246; // 0x10301a6
+ field public static final deprecated int Widget_DeviceDefault_Light_ActionBar_TabBar_Inverse = 16974249; // 0x10301a9
+ field public static final int Widget_DeviceDefault_Light_ActionBar_TabText = 16974245; // 0x10301a5
+ field public static final deprecated int Widget_DeviceDefault_Light_ActionBar_TabText_Inverse = 16974251; // 0x10301ab
+ field public static final int Widget_DeviceDefault_Light_ActionBar_TabView = 16974244; // 0x10301a4
+ field public static final deprecated int Widget_DeviceDefault_Light_ActionBar_TabView_Inverse = 16974250; // 0x10301aa
+ field public static final int Widget_DeviceDefault_Light_ActionButton = 16974239; // 0x103019f
+ field public static final int Widget_DeviceDefault_Light_ActionButton_CloseMode = 16974242; // 0x10301a2
+ field public static final int Widget_DeviceDefault_Light_ActionButton_Overflow = 16974240; // 0x10301a0
+ field public static final int Widget_DeviceDefault_Light_ActionMode = 16974241; // 0x10301a1
+ field public static final deprecated int Widget_DeviceDefault_Light_ActionMode_Inverse = 16974252; // 0x10301ac
+ field public static final int Widget_DeviceDefault_Light_AutoCompleteTextView = 16974203; // 0x103017b
+ field public static final int Widget_DeviceDefault_Light_Button = 16974197; // 0x1030175
+ field public static final int Widget_DeviceDefault_Light_Button_Borderless_Small = 16974201; // 0x1030179
+ field public static final int Widget_DeviceDefault_Light_Button_Inset = 16974199; // 0x1030177
+ field public static final int Widget_DeviceDefault_Light_Button_Small = 16974198; // 0x1030176
+ field public static final int Widget_DeviceDefault_Light_Button_Toggle = 16974200; // 0x1030178
+ field public static final int Widget_DeviceDefault_Light_CalendarView = 16974238; // 0x103019e
+ field public static final int Widget_DeviceDefault_Light_CheckedTextView = 16974300; // 0x10301dc
+ field public static final int Widget_DeviceDefault_Light_CompoundButton_CheckBox = 16974204; // 0x103017c
+ field public static final int Widget_DeviceDefault_Light_CompoundButton_RadioButton = 16974224; // 0x1030190
+ field public static final int Widget_DeviceDefault_Light_CompoundButton_Star = 16974228; // 0x1030194
+ field public static final int Widget_DeviceDefault_Light_DropDownItem = 16974232; // 0x1030198
+ field public static final int Widget_DeviceDefault_Light_DropDownItem_Spinner = 16974233; // 0x1030199
+ field public static final int Widget_DeviceDefault_Light_EditText = 16974206; // 0x103017e
+ field public static final int Widget_DeviceDefault_Light_ExpandableListView = 16974207; // 0x103017f
+ field public static final int Widget_DeviceDefault_Light_FastScroll = 16974315; // 0x10301eb
+ field public static final int Widget_DeviceDefault_Light_GridView = 16974208; // 0x1030180
+ field public static final int Widget_DeviceDefault_Light_HorizontalScrollView = 16974226; // 0x1030192
+ field public static final int Widget_DeviceDefault_Light_ImageButton = 16974209; // 0x1030181
+ field public static final int Widget_DeviceDefault_Light_ListPopupWindow = 16974235; // 0x103019b
+ field public static final int Widget_DeviceDefault_Light_ListView = 16974210; // 0x1030182
+ field public static final int Widget_DeviceDefault_Light_ListView_DropDown = 16974205; // 0x103017d
+ field public static final int Widget_DeviceDefault_Light_MediaRouteButton = 16974296; // 0x10301d8
+ field public static final int Widget_DeviceDefault_Light_PopupMenu = 16974236; // 0x103019c
+ field public static final int Widget_DeviceDefault_Light_PopupWindow = 16974211; // 0x1030183
+ field public static final int Widget_DeviceDefault_Light_ProgressBar = 16974212; // 0x1030184
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Horizontal = 16974213; // 0x1030185
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Inverse = 16974217; // 0x1030189
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Large = 16974216; // 0x1030188
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Large_Inverse = 16974219; // 0x103018b
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Small = 16974214; // 0x1030186
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Small_Inverse = 16974218; // 0x103018a
+ field public static final int Widget_DeviceDefault_Light_ProgressBar_Small_Title = 16974215; // 0x1030187
+ field public static final int Widget_DeviceDefault_Light_RatingBar = 16974221; // 0x103018d
+ field public static final int Widget_DeviceDefault_Light_RatingBar_Indicator = 16974222; // 0x103018e
+ field public static final int Widget_DeviceDefault_Light_RatingBar_Small = 16974223; // 0x103018f
+ field public static final int Widget_DeviceDefault_Light_ScrollView = 16974225; // 0x1030191
+ field public static final int Widget_DeviceDefault_Light_SeekBar = 16974220; // 0x103018c
+ field public static final int Widget_DeviceDefault_Light_Spinner = 16974227; // 0x1030193
+ field public static final int Widget_DeviceDefault_Light_StackView = 16974316; // 0x10301ec
+ field public static final int Widget_DeviceDefault_Light_Tab = 16974237; // 0x103019d
+ field public static final int Widget_DeviceDefault_Light_TabWidget = 16974229; // 0x1030195
+ field public static final int Widget_DeviceDefault_Light_TextView = 16974202; // 0x103017a
+ field public static final int Widget_DeviceDefault_Light_TextView_SpinnerItem = 16974234; // 0x103019a
+ field public static final int Widget_DeviceDefault_Light_WebTextView = 16974230; // 0x1030196
+ field public static final int Widget_DeviceDefault_Light_WebView = 16974231; // 0x1030197
+ field public static final int Widget_DeviceDefault_ListPopupWindow = 16974180; // 0x1030164
+ field public static final int Widget_DeviceDefault_ListView = 16974158; // 0x103014e
+ field public static final int Widget_DeviceDefault_ListView_DropDown = 16974153; // 0x1030149
+ field public static final int Widget_DeviceDefault_MediaRouteButton = 16974295; // 0x10301d7
+ field public static final int Widget_DeviceDefault_PopupMenu = 16974181; // 0x1030165
+ field public static final int Widget_DeviceDefault_PopupWindow = 16974159; // 0x103014f
+ field public static final int Widget_DeviceDefault_ProgressBar = 16974160; // 0x1030150
+ field public static final int Widget_DeviceDefault_ProgressBar_Horizontal = 16974161; // 0x1030151
+ field public static final int Widget_DeviceDefault_ProgressBar_Large = 16974164; // 0x1030154
+ field public static final int Widget_DeviceDefault_ProgressBar_Small = 16974162; // 0x1030152
+ field public static final int Widget_DeviceDefault_ProgressBar_Small_Title = 16974163; // 0x1030153
+ field public static final int Widget_DeviceDefault_RatingBar = 16974166; // 0x1030156
+ field public static final int Widget_DeviceDefault_RatingBar_Indicator = 16974167; // 0x1030157
+ field public static final int Widget_DeviceDefault_RatingBar_Small = 16974168; // 0x1030158
+ field public static final int Widget_DeviceDefault_ScrollView = 16974170; // 0x103015a
+ field public static final int Widget_DeviceDefault_SeekBar = 16974165; // 0x1030155
+ field public static final int Widget_DeviceDefault_Spinner = 16974172; // 0x103015c
+ field public static final int Widget_DeviceDefault_StackView = 16974314; // 0x10301ea
+ field public static final int Widget_DeviceDefault_Tab = 16974189; // 0x103016d
+ field public static final int Widget_DeviceDefault_TabWidget = 16974174; // 0x103015e
+ field public static final int Widget_DeviceDefault_TextView = 16974150; // 0x1030146
+ field public static final int Widget_DeviceDefault_TextView_SpinnerItem = 16974179; // 0x1030163
+ field public static final int Widget_DeviceDefault_WebTextView = 16974175; // 0x103015f
+ field public static final int Widget_DeviceDefault_WebView = 16974176; // 0x1030160
+ field public static final int Widget_DropDownItem = 16973867; // 0x103002b
+ field public static final int Widget_DropDownItem_Spinner = 16973868; // 0x103002c
+ field public static final int Widget_EditText = 16973859; // 0x1030023
+ field public static final int Widget_ExpandableListView = 16973860; // 0x1030024
+ field public static final int Widget_FastScroll = 16974309; // 0x10301e5
+ field public static final int Widget_FragmentBreadCrumbs = 16973961; // 0x1030089
+ field public static final int Widget_Gallery = 16973877; // 0x1030035
+ field public static final int Widget_GridView = 16973874; // 0x1030032
+ field public static final int Widget_Holo = 16973962; // 0x103008a
+ field public static final int Widget_Holo_ActionBar = 16974004; // 0x10300b4
+ field public static final int Widget_Holo_ActionBar_Solid = 16974113; // 0x1030121
+ field public static final int Widget_Holo_ActionBar_TabBar = 16974071; // 0x10300f7
+ field public static final int Widget_Holo_ActionBar_TabText = 16974070; // 0x10300f6
+ field public static final int Widget_Holo_ActionBar_TabView = 16974069; // 0x10300f5
+ field public static final int Widget_Holo_ActionButton = 16973999; // 0x10300af
+ field public static final int Widget_Holo_ActionButton_CloseMode = 16974003; // 0x10300b3
+ field public static final int Widget_Holo_ActionButton_Overflow = 16974000; // 0x10300b0
+ field public static final int Widget_Holo_ActionButton_TextButton = 16974001; // 0x10300b1
+ field public static final int Widget_Holo_ActionMode = 16974002; // 0x10300b2
+ field public static final int Widget_Holo_AutoCompleteTextView = 16973968; // 0x1030090
+ field public static final int Widget_Holo_Button = 16973963; // 0x103008b
+ field public static final int Widget_Holo_Button_Borderless = 16974050; // 0x10300e2
+ field public static final int Widget_Holo_Button_Borderless_Small = 16974106; // 0x103011a
+ field public static final int Widget_Holo_Button_Inset = 16973965; // 0x103008d
+ field public static final int Widget_Holo_Button_Small = 16973964; // 0x103008c
+ field public static final int Widget_Holo_Button_Toggle = 16973966; // 0x103008e
+ field public static final int Widget_Holo_CalendarView = 16974060; // 0x10300ec
+ field public static final int Widget_Holo_CheckedTextView = 16974297; // 0x10301d9
+ field public static final int Widget_Holo_CompoundButton_CheckBox = 16973969; // 0x1030091
+ field public static final int Widget_Holo_CompoundButton_RadioButton = 16973986; // 0x10300a2
+ field public static final int Widget_Holo_CompoundButton_Star = 16973990; // 0x10300a6
+ field public static final int Widget_Holo_DatePicker = 16974063; // 0x10300ef
+ field public static final int Widget_Holo_DropDownItem = 16973994; // 0x10300aa
+ field public static final int Widget_Holo_DropDownItem_Spinner = 16973995; // 0x10300ab
+ field public static final int Widget_Holo_EditText = 16973971; // 0x1030093
+ field public static final int Widget_Holo_ExpandableListView = 16973972; // 0x1030094
+ field public static final int Widget_Holo_GridView = 16973973; // 0x1030095
+ field public static final int Widget_Holo_HorizontalScrollView = 16973988; // 0x10300a4
+ field public static final int Widget_Holo_ImageButton = 16973974; // 0x1030096
+ field public static final int Widget_Holo_Light = 16974005; // 0x10300b5
+ field public static final int Widget_Holo_Light_ActionBar = 16974049; // 0x10300e1
+ field public static final int Widget_Holo_Light_ActionBar_Solid = 16974114; // 0x1030122
+ field public static final int Widget_Holo_Light_ActionBar_Solid_Inverse = 16974115; // 0x1030123
+ field public static final int Widget_Holo_Light_ActionBar_TabBar = 16974074; // 0x10300fa
+ field public static final int Widget_Holo_Light_ActionBar_TabBar_Inverse = 16974116; // 0x1030124
+ field public static final int Widget_Holo_Light_ActionBar_TabText = 16974073; // 0x10300f9
+ field public static final int Widget_Holo_Light_ActionBar_TabText_Inverse = 16974118; // 0x1030126
+ field public static final int Widget_Holo_Light_ActionBar_TabView = 16974072; // 0x10300f8
+ field public static final int Widget_Holo_Light_ActionBar_TabView_Inverse = 16974117; // 0x1030125
+ field public static final int Widget_Holo_Light_ActionButton = 16974045; // 0x10300dd
+ field public static final int Widget_Holo_Light_ActionButton_CloseMode = 16974048; // 0x10300e0
+ field public static final int Widget_Holo_Light_ActionButton_Overflow = 16974046; // 0x10300de
+ field public static final int Widget_Holo_Light_ActionMode = 16974047; // 0x10300df
+ field public static final int Widget_Holo_Light_ActionMode_Inverse = 16974119; // 0x1030127
+ field public static final int Widget_Holo_Light_AutoCompleteTextView = 16974011; // 0x10300bb
+ field public static final int Widget_Holo_Light_Button = 16974006; // 0x10300b6
+ field public static final int Widget_Holo_Light_Button_Borderless_Small = 16974107; // 0x103011b
+ field public static final int Widget_Holo_Light_Button_Inset = 16974008; // 0x10300b8
+ field public static final int Widget_Holo_Light_Button_Small = 16974007; // 0x10300b7
+ field public static final int Widget_Holo_Light_Button_Toggle = 16974009; // 0x10300b9
+ field public static final int Widget_Holo_Light_CalendarView = 16974061; // 0x10300ed
+ field public static final int Widget_Holo_Light_CheckedTextView = 16974298; // 0x10301da
+ field public static final int Widget_Holo_Light_CompoundButton_CheckBox = 16974012; // 0x10300bc
+ field public static final int Widget_Holo_Light_CompoundButton_RadioButton = 16974032; // 0x10300d0
+ field public static final int Widget_Holo_Light_CompoundButton_Star = 16974036; // 0x10300d4
+ field public static final int Widget_Holo_Light_DropDownItem = 16974040; // 0x10300d8
+ field public static final int Widget_Holo_Light_DropDownItem_Spinner = 16974041; // 0x10300d9
+ field public static final int Widget_Holo_Light_EditText = 16974014; // 0x10300be
+ field public static final int Widget_Holo_Light_ExpandableListView = 16974015; // 0x10300bf
+ field public static final int Widget_Holo_Light_GridView = 16974016; // 0x10300c0
+ field public static final int Widget_Holo_Light_HorizontalScrollView = 16974034; // 0x10300d2
+ field public static final int Widget_Holo_Light_ImageButton = 16974017; // 0x10300c1
+ field public static final int Widget_Holo_Light_ListPopupWindow = 16974043; // 0x10300db
+ field public static final int Widget_Holo_Light_ListView = 16974018; // 0x10300c2
+ field public static final int Widget_Holo_Light_ListView_DropDown = 16974013; // 0x10300bd
+ field public static final int Widget_Holo_Light_MediaRouteButton = 16974294; // 0x10301d6
+ field public static final int Widget_Holo_Light_PopupMenu = 16974044; // 0x10300dc
+ field public static final int Widget_Holo_Light_PopupWindow = 16974019; // 0x10300c3
+ field public static final int Widget_Holo_Light_ProgressBar = 16974020; // 0x10300c4
+ field public static final int Widget_Holo_Light_ProgressBar_Horizontal = 16974021; // 0x10300c5
+ field public static final int Widget_Holo_Light_ProgressBar_Inverse = 16974025; // 0x10300c9
+ field public static final int Widget_Holo_Light_ProgressBar_Large = 16974024; // 0x10300c8
+ field public static final int Widget_Holo_Light_ProgressBar_Large_Inverse = 16974027; // 0x10300cb
+ field public static final int Widget_Holo_Light_ProgressBar_Small = 16974022; // 0x10300c6
+ field public static final int Widget_Holo_Light_ProgressBar_Small_Inverse = 16974026; // 0x10300ca
+ field public static final int Widget_Holo_Light_ProgressBar_Small_Title = 16974023; // 0x10300c7
+ field public static final int Widget_Holo_Light_RatingBar = 16974029; // 0x10300cd
+ field public static final int Widget_Holo_Light_RatingBar_Indicator = 16974030; // 0x10300ce
+ field public static final int Widget_Holo_Light_RatingBar_Small = 16974031; // 0x10300cf
+ field public static final int Widget_Holo_Light_ScrollView = 16974033; // 0x10300d1
+ field public static final int Widget_Holo_Light_SeekBar = 16974028; // 0x10300cc
+ field public static final int Widget_Holo_Light_Spinner = 16974035; // 0x10300d3
+ field public static final int Widget_Holo_Light_Tab = 16974052; // 0x10300e4
+ field public static final int Widget_Holo_Light_TabWidget = 16974037; // 0x10300d5
+ field public static final int Widget_Holo_Light_TextView = 16974010; // 0x10300ba
+ field public static final int Widget_Holo_Light_TextView_SpinnerItem = 16974042; // 0x10300da
+ field public static final int Widget_Holo_Light_WebTextView = 16974038; // 0x10300d6
+ field public static final int Widget_Holo_Light_WebView = 16974039; // 0x10300d7
+ field public static final int Widget_Holo_ListPopupWindow = 16973997; // 0x10300ad
+ field public static final int Widget_Holo_ListView = 16973975; // 0x1030097
+ field public static final int Widget_Holo_ListView_DropDown = 16973970; // 0x1030092
+ field public static final int Widget_Holo_MediaRouteButton = 16974293; // 0x10301d5
+ field public static final int Widget_Holo_PopupMenu = 16973998; // 0x10300ae
+ field public static final int Widget_Holo_PopupWindow = 16973976; // 0x1030098
+ field public static final int Widget_Holo_ProgressBar = 16973977; // 0x1030099
+ field public static final int Widget_Holo_ProgressBar_Horizontal = 16973978; // 0x103009a
+ field public static final int Widget_Holo_ProgressBar_Large = 16973981; // 0x103009d
+ field public static final int Widget_Holo_ProgressBar_Small = 16973979; // 0x103009b
+ field public static final int Widget_Holo_ProgressBar_Small_Title = 16973980; // 0x103009c
+ field public static final int Widget_Holo_RatingBar = 16973983; // 0x103009f
+ field public static final int Widget_Holo_RatingBar_Indicator = 16973984; // 0x10300a0
+ field public static final int Widget_Holo_RatingBar_Small = 16973985; // 0x10300a1
+ field public static final int Widget_Holo_ScrollView = 16973987; // 0x10300a3
+ field public static final int Widget_Holo_SeekBar = 16973982; // 0x103009e
+ field public static final int Widget_Holo_Spinner = 16973989; // 0x10300a5
+ field public static final int Widget_Holo_Tab = 16974051; // 0x10300e3
+ field public static final int Widget_Holo_TabWidget = 16973991; // 0x10300a7
+ field public static final int Widget_Holo_TextView = 16973967; // 0x103008f
+ field public static final int Widget_Holo_TextView_SpinnerItem = 16973996; // 0x10300ac
+ field public static final int Widget_Holo_WebTextView = 16973992; // 0x10300a8
+ field public static final int Widget_Holo_WebView = 16973993; // 0x10300a9
+ field public static final int Widget_ImageButton = 16973862; // 0x1030026
+ field public static final int Widget_ImageWell = 16973861; // 0x1030025
+ field public static final int Widget_KeyboardView = 16973911; // 0x1030057
+ field public static final int Widget_ListPopupWindow = 16973957; // 0x1030085
+ field public static final int Widget_ListView = 16973870; // 0x103002e
+ field public static final int Widget_ListView_DropDown = 16973872; // 0x1030030
+ field public static final int Widget_ListView_Menu = 16973873; // 0x1030031
+ field public static final int Widget_ListView_White = 16973871; // 0x103002f
+ field public static final int Widget_Material = 16974413; // 0x103024d
+ field public static final int Widget_Material_ActionBar = 16974414; // 0x103024e
+ field public static final int Widget_Material_ActionBar_Solid = 16974415; // 0x103024f
+ field public static final int Widget_Material_ActionBar_TabBar = 16974416; // 0x1030250
+ field public static final int Widget_Material_ActionBar_TabText = 16974417; // 0x1030251
+ field public static final int Widget_Material_ActionBar_TabView = 16974418; // 0x1030252
+ field public static final int Widget_Material_ActionButton = 16974419; // 0x1030253
+ field public static final int Widget_Material_ActionButton_CloseMode = 16974420; // 0x1030254
+ field public static final int Widget_Material_ActionButton_Overflow = 16974421; // 0x1030255
+ field public static final int Widget_Material_ActionMode = 16974422; // 0x1030256
+ field public static final int Widget_Material_AutoCompleteTextView = 16974423; // 0x1030257
+ field public static final int Widget_Material_Button = 16974424; // 0x1030258
+ field public static final int Widget_Material_ButtonBar = 16974431; // 0x103025f
+ field public static final int Widget_Material_ButtonBar_AlertDialog = 16974432; // 0x1030260
+ field public static final int Widget_Material_Button_Borderless = 16974425; // 0x1030259
+ field public static final int Widget_Material_Button_Borderless_Colored = 16974426; // 0x103025a
+ field public static final int Widget_Material_Button_Borderless_Small = 16974427; // 0x103025b
+ field public static final int Widget_Material_Button_Colored = 16974547; // 0x10302d3
+ field public static final int Widget_Material_Button_Inset = 16974428; // 0x103025c
+ field public static final int Widget_Material_Button_Small = 16974429; // 0x103025d
+ field public static final int Widget_Material_Button_Toggle = 16974430; // 0x103025e
+ field public static final int Widget_Material_CalendarView = 16974433; // 0x1030261
+ field public static final int Widget_Material_CheckedTextView = 16974434; // 0x1030262
+ field public static final int Widget_Material_CompoundButton_CheckBox = 16974435; // 0x1030263
+ field public static final int Widget_Material_CompoundButton_RadioButton = 16974436; // 0x1030264
+ field public static final int Widget_Material_CompoundButton_Star = 16974437; // 0x1030265
+ field public static final int Widget_Material_DatePicker = 16974438; // 0x1030266
+ field public static final int Widget_Material_DropDownItem = 16974439; // 0x1030267
+ field public static final int Widget_Material_DropDownItem_Spinner = 16974440; // 0x1030268
+ field public static final int Widget_Material_EditText = 16974441; // 0x1030269
+ field public static final int Widget_Material_ExpandableListView = 16974442; // 0x103026a
+ field public static final int Widget_Material_FastScroll = 16974443; // 0x103026b
+ field public static final int Widget_Material_GridView = 16974444; // 0x103026c
+ field public static final int Widget_Material_HorizontalScrollView = 16974445; // 0x103026d
+ field public static final int Widget_Material_ImageButton = 16974446; // 0x103026e
+ field public static final int Widget_Material_Light = 16974478; // 0x103028e
+ field public static final int Widget_Material_Light_ActionBar = 16974479; // 0x103028f
+ field public static final int Widget_Material_Light_ActionBar_Solid = 16974480; // 0x1030290
+ field public static final int Widget_Material_Light_ActionBar_TabBar = 16974481; // 0x1030291
+ field public static final int Widget_Material_Light_ActionBar_TabText = 16974482; // 0x1030292
+ field public static final int Widget_Material_Light_ActionBar_TabView = 16974483; // 0x1030293
+ field public static final int Widget_Material_Light_ActionButton = 16974484; // 0x1030294
+ field public static final int Widget_Material_Light_ActionButton_CloseMode = 16974485; // 0x1030295
+ field public static final int Widget_Material_Light_ActionButton_Overflow = 16974486; // 0x1030296
+ field public static final int Widget_Material_Light_ActionMode = 16974487; // 0x1030297
+ field public static final int Widget_Material_Light_AutoCompleteTextView = 16974488; // 0x1030298
+ field public static final int Widget_Material_Light_Button = 16974489; // 0x1030299
+ field public static final int Widget_Material_Light_ButtonBar = 16974496; // 0x10302a0
+ field public static final int Widget_Material_Light_ButtonBar_AlertDialog = 16974497; // 0x10302a1
+ field public static final int Widget_Material_Light_Button_Borderless = 16974490; // 0x103029a
+ field public static final int Widget_Material_Light_Button_Borderless_Colored = 16974491; // 0x103029b
+ field public static final int Widget_Material_Light_Button_Borderless_Small = 16974492; // 0x103029c
+ field public static final int Widget_Material_Light_Button_Inset = 16974493; // 0x103029d
+ field public static final int Widget_Material_Light_Button_Small = 16974494; // 0x103029e
+ field public static final int Widget_Material_Light_Button_Toggle = 16974495; // 0x103029f
+ field public static final int Widget_Material_Light_CalendarView = 16974498; // 0x10302a2
+ field public static final int Widget_Material_Light_CheckedTextView = 16974499; // 0x10302a3
+ field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974500; // 0x10302a4
+ field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974501; // 0x10302a5
+ field public static final int Widget_Material_Light_CompoundButton_Star = 16974502; // 0x10302a6
+ field public static final int Widget_Material_Light_DatePicker = 16974503; // 0x10302a7
+ field public static final int Widget_Material_Light_DropDownItem = 16974504; // 0x10302a8
+ field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974505; // 0x10302a9
+ field public static final int Widget_Material_Light_EditText = 16974506; // 0x10302aa
+ field public static final int Widget_Material_Light_ExpandableListView = 16974507; // 0x10302ab
+ field public static final int Widget_Material_Light_FastScroll = 16974508; // 0x10302ac
+ field public static final int Widget_Material_Light_GridView = 16974509; // 0x10302ad
+ field public static final int Widget_Material_Light_HorizontalScrollView = 16974510; // 0x10302ae
+ field public static final int Widget_Material_Light_ImageButton = 16974511; // 0x10302af
+ field public static final int Widget_Material_Light_ListPopupWindow = 16974512; // 0x10302b0
+ field public static final int Widget_Material_Light_ListView = 16974513; // 0x10302b1
+ field public static final int Widget_Material_Light_ListView_DropDown = 16974514; // 0x10302b2
+ field public static final int Widget_Material_Light_MediaRouteButton = 16974515; // 0x10302b3
+ field public static final int Widget_Material_Light_PopupMenu = 16974516; // 0x10302b4
+ field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974517; // 0x10302b5
+ field public static final int Widget_Material_Light_PopupWindow = 16974518; // 0x10302b6
+ field public static final int Widget_Material_Light_ProgressBar = 16974519; // 0x10302b7
+ field public static final int Widget_Material_Light_ProgressBar_Horizontal = 16974520; // 0x10302b8
+ field public static final int Widget_Material_Light_ProgressBar_Inverse = 16974521; // 0x10302b9
+ field public static final int Widget_Material_Light_ProgressBar_Large = 16974522; // 0x10302ba
+ field public static final int Widget_Material_Light_ProgressBar_Large_Inverse = 16974523; // 0x10302bb
+ field public static final int Widget_Material_Light_ProgressBar_Small = 16974524; // 0x10302bc
+ field public static final int Widget_Material_Light_ProgressBar_Small_Inverse = 16974525; // 0x10302bd
+ field public static final int Widget_Material_Light_ProgressBar_Small_Title = 16974526; // 0x10302be
+ field public static final int Widget_Material_Light_RatingBar = 16974527; // 0x10302bf
+ field public static final int Widget_Material_Light_RatingBar_Indicator = 16974528; // 0x10302c0
+ field public static final int Widget_Material_Light_RatingBar_Small = 16974529; // 0x10302c1
+ field public static final int Widget_Material_Light_ScrollView = 16974530; // 0x10302c2
+ field public static final int Widget_Material_Light_SearchView = 16974531; // 0x10302c3
+ field public static final int Widget_Material_Light_SeekBar = 16974532; // 0x10302c4
+ field public static final int Widget_Material_Light_SegmentedButton = 16974533; // 0x10302c5
+ field public static final int Widget_Material_Light_Spinner = 16974535; // 0x10302c7
+ field public static final int Widget_Material_Light_Spinner_Underlined = 16974536; // 0x10302c8
+ field public static final int Widget_Material_Light_StackView = 16974534; // 0x10302c6
+ field public static final int Widget_Material_Light_Tab = 16974537; // 0x10302c9
+ field public static final int Widget_Material_Light_TabWidget = 16974538; // 0x10302ca
+ field public static final int Widget_Material_Light_TextView = 16974539; // 0x10302cb
+ field public static final int Widget_Material_Light_TextView_SpinnerItem = 16974540; // 0x10302cc
+ field public static final int Widget_Material_Light_TimePicker = 16974541; // 0x10302cd
+ field public static final int Widget_Material_Light_WebTextView = 16974542; // 0x10302ce
+ field public static final int Widget_Material_Light_WebView = 16974543; // 0x10302cf
+ field public static final int Widget_Material_ListPopupWindow = 16974447; // 0x103026f
+ field public static final int Widget_Material_ListView = 16974448; // 0x1030270
+ field public static final int Widget_Material_ListView_DropDown = 16974449; // 0x1030271
+ field public static final int Widget_Material_MediaRouteButton = 16974450; // 0x1030272
+ field public static final int Widget_Material_PopupMenu = 16974451; // 0x1030273
+ field public static final int Widget_Material_PopupMenu_Overflow = 16974452; // 0x1030274
+ field public static final int Widget_Material_PopupWindow = 16974453; // 0x1030275
+ field public static final int Widget_Material_ProgressBar = 16974454; // 0x1030276
+ field public static final int Widget_Material_ProgressBar_Horizontal = 16974455; // 0x1030277
+ field public static final int Widget_Material_ProgressBar_Large = 16974456; // 0x1030278
+ field public static final int Widget_Material_ProgressBar_Small = 16974457; // 0x1030279
+ field public static final int Widget_Material_ProgressBar_Small_Title = 16974458; // 0x103027a
+ field public static final int Widget_Material_RatingBar = 16974459; // 0x103027b
+ field public static final int Widget_Material_RatingBar_Indicator = 16974460; // 0x103027c
+ field public static final int Widget_Material_RatingBar_Small = 16974461; // 0x103027d
+ field public static final int Widget_Material_ScrollView = 16974462; // 0x103027e
+ field public static final int Widget_Material_SearchView = 16974463; // 0x103027f
+ field public static final int Widget_Material_SeekBar = 16974464; // 0x1030280
+ field public static final int Widget_Material_SegmentedButton = 16974465; // 0x1030281
+ field public static final int Widget_Material_Spinner = 16974467; // 0x1030283
+ field public static final int Widget_Material_Spinner_Underlined = 16974468; // 0x1030284
+ field public static final int Widget_Material_StackView = 16974466; // 0x1030282
+ field public static final int Widget_Material_Tab = 16974469; // 0x1030285
+ field public static final int Widget_Material_TabWidget = 16974470; // 0x1030286
+ field public static final int Widget_Material_TextView = 16974471; // 0x1030287
+ field public static final int Widget_Material_TextView_SpinnerItem = 16974472; // 0x1030288
+ field public static final int Widget_Material_TimePicker = 16974473; // 0x1030289
+ field public static final int Widget_Material_Toolbar = 16974474; // 0x103028a
+ field public static final int Widget_Material_Toolbar_Button_Navigation = 16974475; // 0x103028b
+ field public static final int Widget_Material_WebTextView = 16974476; // 0x103028c
+ field public static final int Widget_Material_WebView = 16974477; // 0x103028d
+ field public static final int Widget_PopupMenu = 16973958; // 0x1030086
+ field public static final int Widget_PopupWindow = 16973878; // 0x1030036
+ field public static final int Widget_ProgressBar = 16973852; // 0x103001c
+ field public static final int Widget_ProgressBar_Horizontal = 16973855; // 0x103001f
+ field public static final int Widget_ProgressBar_Inverse = 16973915; // 0x103005b
+ field public static final int Widget_ProgressBar_Large = 16973853; // 0x103001d
+ field public static final int Widget_ProgressBar_Large_Inverse = 16973916; // 0x103005c
+ field public static final int Widget_ProgressBar_Small = 16973854; // 0x103001e
+ field public static final int Widget_ProgressBar_Small_Inverse = 16973917; // 0x103005d
+ field public static final int Widget_RatingBar = 16973857; // 0x1030021
+ field public static final int Widget_ScrollView = 16973869; // 0x103002d
+ field public static final int Widget_SeekBar = 16973856; // 0x1030020
+ field public static final int Widget_Spinner = 16973864; // 0x1030028
+ field public static final int Widget_Spinner_DropDown = 16973955; // 0x1030083
+ field public static final int Widget_StackView = 16974310; // 0x10301e6
+ field public static final int Widget_TabWidget = 16973876; // 0x1030034
+ field public static final int Widget_TextView = 16973858; // 0x1030022
+ field public static final int Widget_TextView_PopupMenu = 16973865; // 0x1030029
+ field public static final int Widget_TextView_SpinnerItem = 16973866; // 0x103002a
+ field public static final int Widget_Toolbar = 16974311; // 0x10301e7
+ field public static final int Widget_Toolbar_Button_Navigation = 16974312; // 0x10301e8
+ field public static final int Widget_WebView = 16973875; // 0x1030033
+ }
+
+ public static final class R.transition {
+ ctor public R.transition();
+ field public static final int explode = 17760259; // 0x10f0003
+ field public static final int fade = 17760258; // 0x10f0002
+ field public static final int move = 17760257; // 0x10f0001
+ field public static final int no_transition = 17760256; // 0x10f0000
+ field public static final int slide_bottom = 17760260; // 0x10f0004
+ field public static final int slide_left = 17760263; // 0x10f0007
+ field public static final int slide_right = 17760262; // 0x10f0006
+ field public static final int slide_top = 17760261; // 0x10f0005
+ }
+
+ public static final class R.xml {
+ ctor public R.xml();
+ }
+
+}
+
+package android.accessibilityservice {
+
+ public abstract class AccessibilityService extends android.app.Service {
+ ctor public AccessibilityService();
+ method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+ method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
+ method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
+ method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
+ method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
+ method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method protected boolean onGesture(int);
+ method public abstract void onInterrupt();
+ method protected boolean onKeyEvent(android.view.KeyEvent);
+ method protected void onServiceConnected();
+ method public final boolean performGlobalAction(int);
+ method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
+ field public static final int GESTURE_SWIPE_DOWN = 2; // 0x2
+ field public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 15; // 0xf
+ field public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16; // 0x10
+ field public static final int GESTURE_SWIPE_DOWN_AND_UP = 8; // 0x8
+ field public static final int GESTURE_SWIPE_LEFT = 3; // 0x3
+ field public static final int GESTURE_SWIPE_LEFT_AND_DOWN = 10; // 0xa
+ field public static final int GESTURE_SWIPE_LEFT_AND_RIGHT = 5; // 0x5
+ field public static final int GESTURE_SWIPE_LEFT_AND_UP = 9; // 0x9
+ field public static final int GESTURE_SWIPE_RIGHT = 4; // 0x4
+ field public static final int GESTURE_SWIPE_RIGHT_AND_DOWN = 12; // 0xc
+ field public static final int GESTURE_SWIPE_RIGHT_AND_LEFT = 6; // 0x6
+ field public static final int GESTURE_SWIPE_RIGHT_AND_UP = 11; // 0xb
+ field public static final int GESTURE_SWIPE_UP = 1; // 0x1
+ field public static final int GESTURE_SWIPE_UP_AND_DOWN = 7; // 0x7
+ field public static final int GESTURE_SWIPE_UP_AND_LEFT = 13; // 0xd
+ field public static final int GESTURE_SWIPE_UP_AND_RIGHT = 14; // 0xe
+ 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
+ field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6
+ field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5
+ field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3
+ field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";
+ field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
+ }
+
+ public static final class AccessibilityService.MagnificationController {
+ method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
+ method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener, android.os.Handler);
+ method public float getCenterX();
+ method public float getCenterY();
+ method public android.graphics.Region getMagnifiedRegion();
+ method public float getScale();
+ method public boolean removeListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
+ method public boolean reset(boolean);
+ method public boolean setCenter(float, float, boolean);
+ method public boolean setScale(float, boolean);
+ }
+
+ public static abstract interface AccessibilityService.MagnificationController.OnMagnificationChangedListener {
+ method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);
+ }
+
+ public class AccessibilityServiceInfo implements android.os.Parcelable {
+ ctor public AccessibilityServiceInfo();
+ method public static java.lang.String capabilityToString(int);
+ method public int describeContents();
+ method public static java.lang.String feedbackTypeToString(int);
+ method public static java.lang.String flagToString(int);
+ method public deprecated boolean getCanRetrieveWindowContent();
+ method public int getCapabilities();
+ method public deprecated java.lang.String getDescription();
+ method public java.lang.String getId();
+ method public android.content.pm.ResolveInfo getResolveInfo();
+ method public java.lang.String getSettingsActivityName();
+ method public java.lang.String loadDescription(android.content.pm.PackageManager);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10
+ field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4
+ field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8
+ field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2
+ field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityServiceInfo> CREATOR;
+ field public static final int DEFAULT = 1; // 0x1
+ field public static final int FEEDBACK_ALL_MASK = -1; // 0xffffffff
+ field public static final int FEEDBACK_AUDIBLE = 4; // 0x4
+ field public static final int FEEDBACK_BRAILLE = 32; // 0x20
+ field public static final int FEEDBACK_GENERIC = 16; // 0x10
+ field public static final int FEEDBACK_HAPTIC = 2; // 0x2
+ 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 = 16; // 0x10
+ field public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8
+ field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20
+ field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4
+ field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40
+ field public int eventTypes;
+ field public int feedbackType;
+ field public int flags;
+ field public long notificationTimeout;
+ field public java.lang.String[] packageNames;
+ }
+
+}
+
+package android.accounts {
+
+ public abstract class AbstractAccountAuthenticator {
+ ctor public AbstractAccountAuthenticator(android.content.Context);
+ method public abstract android.os.Bundle addAccount(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle addAccountFromCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public abstract android.os.Bundle confirmCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public abstract android.os.Bundle editProperties(android.accounts.AccountAuthenticatorResponse, java.lang.String);
+ method public android.os.Bundle getAccountCredentialsForCloning(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle getAccountRemovalAllowed(android.accounts.AccountAuthenticatorResponse, android.accounts.Account) throws android.accounts.NetworkErrorException;
+ method public abstract android.os.Bundle getAuthToken(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public abstract java.lang.String getAuthTokenLabel(java.lang.String);
+ method public final android.os.IBinder getIBinder();
+ method public abstract android.os.Bundle hasFeatures(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String[]) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startAddAccountSession(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public android.os.Bundle startUpdateCredentialsSession(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
+ method public abstract android.os.Bundle updateCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
+ field public static final java.lang.String KEY_CUSTOM_TOKEN_EXPIRY = "android.accounts.expiry";
+ }
+
+ public class Account implements android.os.Parcelable {
+ ctor public Account(java.lang.String, java.lang.String);
+ ctor public Account(android.os.Parcel);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.accounts.Account> CREATOR;
+ field public final java.lang.String name;
+ field public final java.lang.String type;
+ }
+
+ public class AccountAuthenticatorActivity extends android.app.Activity {
+ ctor public AccountAuthenticatorActivity();
+ method public final void setAccountAuthenticatorResult(android.os.Bundle);
+ }
+
+ public class AccountAuthenticatorResponse implements android.os.Parcelable {
+ ctor public AccountAuthenticatorResponse(android.os.Parcel);
+ method public int describeContents();
+ method public void onError(int, java.lang.String);
+ method public void onRequestContinued();
+ method public void onResult(android.os.Bundle);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.accounts.AccountAuthenticatorResponse> CREATOR;
+ }
+
+ public class AccountManager {
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> addAccount(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public boolean addAccountExplicitly(android.accounts.Account, java.lang.String, android.os.Bundle);
+ method public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean);
+ method public java.lang.String blockingGetAuthToken(android.accounts.Account, java.lang.String, boolean) throws android.accounts.AuthenticatorException, java.io.IOException, android.accounts.OperationCanceledException;
+ method public void clearPassword(android.accounts.Account);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties(java.lang.String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public static android.accounts.AccountManager get(android.content.Context);
+ method public android.accounts.Account[] getAccounts();
+ method public android.accounts.Account[] getAccountsByType(java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.accounts.Account[]> getAccountsByTypeAndFeatures(java.lang.String, java.lang.String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler);
+ method public android.accounts.Account[] getAccountsByTypeForPackage(java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public deprecated android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, java.lang.String, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, java.lang.String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthTokenByFeatures(java.lang.String, java.lang.String, java.lang.String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AuthenticatorDescription[] getAuthenticatorTypes();
+ method public java.lang.String getPassword(android.accounts.Account);
+ method public java.lang.String getPreviousName(android.accounts.Account);
+ method public java.lang.String getUserData(android.accounts.Account, java.lang.String);
+ method public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android.accounts.Account, java.lang.String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
+ method public void invalidateAuthToken(java.lang.String, java.lang.String);
+ method public static deprecated android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
+ method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.List<android.accounts.Account>, java.lang.String[], java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle);
+ method public boolean notifyAccountAuthenticated(android.accounts.Account);
+ method public java.lang.String peekAuthToken(android.accounts.Account, java.lang.String);
+ method public deprecated android.accounts.AccountManagerFuture<java.lang.Boolean> removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public boolean removeAccountExplicitly(android.accounts.Account);
+ method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener);
+ method public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler);
+ method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String);
+ method public void setPassword(android.accounts.Account, java.lang.String);
+ method public void setUserData(android.accounts.Account, java.lang.String, java.lang.String);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startAddAccountSession(java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> startUpdateCredentialsSession(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ method public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials(android.accounts.Account, java.lang.String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler);
+ field public static final java.lang.String ACTION_AUTHENTICATOR_INTENT = "android.accounts.AccountAuthenticator";
+ field public static final java.lang.String AUTHENTICATOR_ATTRIBUTES_NAME = "account-authenticator";
+ field public static final java.lang.String AUTHENTICATOR_META_DATA_NAME = "android.accounts.AccountAuthenticator";
+ field public static final int ERROR_CODE_BAD_ARGUMENTS = 7; // 0x7
+ field public static final int ERROR_CODE_BAD_AUTHENTICATION = 9; // 0x9
+ field public static final int ERROR_CODE_BAD_REQUEST = 8; // 0x8
+ field public static final int ERROR_CODE_CANCELED = 4; // 0x4
+ field public static final int ERROR_CODE_INVALID_RESPONSE = 5; // 0x5
+ field public static final int ERROR_CODE_NETWORK_ERROR = 3; // 0x3
+ field public static final int ERROR_CODE_REMOTE_EXCEPTION = 1; // 0x1
+ field public static final int ERROR_CODE_UNSUPPORTED_OPERATION = 6; // 0x6
+ field public static final java.lang.String KEY_ACCOUNTS = "accounts";
+ field public static final java.lang.String KEY_ACCOUNT_AUTHENTICATOR_RESPONSE = "accountAuthenticatorResponse";
+ field public static final java.lang.String KEY_ACCOUNT_MANAGER_RESPONSE = "accountManagerResponse";
+ field public static final java.lang.String KEY_ACCOUNT_NAME = "authAccount";
+ field public static final java.lang.String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
+ field public static final java.lang.String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
+ field public static final java.lang.String KEY_ACCOUNT_TYPE = "accountType";
+ field public static final java.lang.String KEY_ANDROID_PACKAGE_NAME = "androidPackageName";
+ field public static final java.lang.String KEY_AUTHENTICATOR_TYPES = "authenticator_types";
+ field public static final java.lang.String KEY_AUTHTOKEN = "authtoken";
+ field public static final java.lang.String KEY_AUTH_FAILED_MESSAGE = "authFailedMessage";
+ field public static final java.lang.String KEY_AUTH_TOKEN_LABEL = "authTokenLabelKey";
+ field public static final java.lang.String KEY_BOOLEAN_RESULT = "booleanResult";
+ field public static final java.lang.String KEY_CALLER_PID = "callerPid";
+ field public static final java.lang.String KEY_CALLER_UID = "callerUid";
+ field public static final java.lang.String KEY_ERROR_CODE = "errorCode";
+ field public static final java.lang.String KEY_ERROR_MESSAGE = "errorMessage";
+ field public static final java.lang.String KEY_INTENT = "intent";
+ field public static final java.lang.String KEY_LAST_AUTHENTICATED_TIME = "lastAuthenticatedTime";
+ field public static final java.lang.String KEY_PASSWORD = "password";
+ field public static final java.lang.String KEY_USERDATA = "userdata";
+ field public static final java.lang.String LOGIN_ACCOUNTS_CHANGED_ACTION = "android.accounts.LOGIN_ACCOUNTS_CHANGED";
+ }
+
+ public abstract interface AccountManagerCallback {
+ method public abstract void run(android.accounts.AccountManagerFuture<V>);
+ }
+
+ public abstract interface AccountManagerFuture {
+ method public abstract boolean cancel(boolean);
+ method public abstract V getResult() throws android.accounts.AuthenticatorException, java.io.IOException, android.accounts.OperationCanceledException;
+ method public abstract V getResult(long, java.util.concurrent.TimeUnit) throws android.accounts.AuthenticatorException, java.io.IOException, android.accounts.OperationCanceledException;
+ method public abstract boolean isCancelled();
+ method public abstract boolean isDone();
+ }
+
+ public class AccountsException extends java.lang.Exception {
+ ctor public AccountsException();
+ ctor public AccountsException(java.lang.String);
+ ctor public AccountsException(java.lang.String, java.lang.Throwable);
+ ctor public AccountsException(java.lang.Throwable);
+ }
+
+ public class AuthenticatorDescription implements android.os.Parcelable {
+ ctor public AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int, boolean);
+ ctor public AuthenticatorDescription(java.lang.String, java.lang.String, int, int, int, int);
+ method public int describeContents();
+ method public static android.accounts.AuthenticatorDescription newKey(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.accounts.AuthenticatorDescription> CREATOR;
+ field public final int accountPreferencesId;
+ field public final boolean customTokens;
+ field public final int iconId;
+ field public final int labelId;
+ field public final java.lang.String packageName;
+ field public final int smallIconId;
+ field public final java.lang.String type;
+ }
+
+ public class AuthenticatorException extends android.accounts.AccountsException {
+ ctor public AuthenticatorException();
+ ctor public AuthenticatorException(java.lang.String);
+ ctor public AuthenticatorException(java.lang.String, java.lang.Throwable);
+ ctor public AuthenticatorException(java.lang.Throwable);
+ }
+
+ public class NetworkErrorException extends android.accounts.AccountsException {
+ ctor public NetworkErrorException();
+ ctor public NetworkErrorException(java.lang.String);
+ ctor public NetworkErrorException(java.lang.String, java.lang.Throwable);
+ ctor public NetworkErrorException(java.lang.Throwable);
+ }
+
+ public abstract interface OnAccountsUpdateListener {
+ method public abstract void onAccountsUpdated(android.accounts.Account[]);
+ }
+
+ public class OperationCanceledException extends android.accounts.AccountsException {
+ ctor public OperationCanceledException();
+ ctor public OperationCanceledException(java.lang.String);
+ ctor public OperationCanceledException(java.lang.String, java.lang.Throwable);
+ ctor public OperationCanceledException(java.lang.Throwable);
+ }
+
+}
+
+package android.animation {
+
+ public abstract class Animator implements java.lang.Cloneable {
+ ctor public Animator();
+ method public void addListener(android.animation.Animator.AnimatorListener);
+ method public void addPauseListener(android.animation.Animator.AnimatorPauseListener);
+ method public void cancel();
+ method public android.animation.Animator clone();
+ method public void end();
+ method public abstract long getDuration();
+ method public android.animation.TimeInterpolator getInterpolator();
+ method public java.util.ArrayList<android.animation.Animator.AnimatorListener> getListeners();
+ method public abstract long getStartDelay();
+ method public long getTotalDuration();
+ method public boolean isPaused();
+ method public abstract boolean isRunning();
+ method public boolean isStarted();
+ method public void pause();
+ method public void removeAllListeners();
+ method public void removeListener(android.animation.Animator.AnimatorListener);
+ method public void removePauseListener(android.animation.Animator.AnimatorPauseListener);
+ method public void resume();
+ method public abstract android.animation.Animator setDuration(long);
+ method public abstract void setInterpolator(android.animation.TimeInterpolator);
+ method public abstract void setStartDelay(long);
+ method public void setTarget(java.lang.Object);
+ method public void setupEndValues();
+ method public void setupStartValues();
+ method public void start();
+ field public static final long DURATION_INFINITE = -1L; // 0xffffffffffffffffL
+ }
+
+ public static abstract interface Animator.AnimatorListener {
+ method public abstract void onAnimationCancel(android.animation.Animator);
+ method public abstract void onAnimationEnd(android.animation.Animator);
+ method public abstract void onAnimationRepeat(android.animation.Animator);
+ method public abstract void onAnimationStart(android.animation.Animator);
+ }
+
+ public static abstract interface Animator.AnimatorPauseListener {
+ method public abstract void onAnimationPause(android.animation.Animator);
+ method public abstract void onAnimationResume(android.animation.Animator);
+ }
+
+ public class AnimatorInflater {
+ ctor public AnimatorInflater();
+ method public static android.animation.Animator loadAnimator(android.content.Context, int) throws android.content.res.Resources.NotFoundException;
+ method public static android.animation.StateListAnimator loadStateListAnimator(android.content.Context, int) throws android.content.res.Resources.NotFoundException;
+ }
+
+ public abstract class AnimatorListenerAdapter implements android.animation.Animator.AnimatorListener android.animation.Animator.AnimatorPauseListener {
+ ctor public AnimatorListenerAdapter();
+ method public void onAnimationCancel(android.animation.Animator);
+ method public void onAnimationEnd(android.animation.Animator);
+ method public void onAnimationPause(android.animation.Animator);
+ method public void onAnimationRepeat(android.animation.Animator);
+ method public void onAnimationResume(android.animation.Animator);
+ method public void onAnimationStart(android.animation.Animator);
+ }
+
+ public final class AnimatorSet extends android.animation.Animator {
+ ctor public AnimatorSet();
+ method public java.util.ArrayList<android.animation.Animator> getChildAnimations();
+ method public long getDuration();
+ method public long getStartDelay();
+ method public boolean isRunning();
+ method public android.animation.AnimatorSet.Builder play(android.animation.Animator);
+ method public void playSequentially(android.animation.Animator...);
+ method public void playSequentially(java.util.List<android.animation.Animator>);
+ method public void playTogether(android.animation.Animator...);
+ method public void playTogether(java.util.Collection<android.animation.Animator>);
+ method public android.animation.AnimatorSet setDuration(long);
+ method public void setInterpolator(android.animation.TimeInterpolator);
+ method public void setStartDelay(long);
+ }
+
+ public class AnimatorSet.Builder {
+ method public android.animation.AnimatorSet.Builder after(android.animation.Animator);
+ method public android.animation.AnimatorSet.Builder after(long);
+ method public android.animation.AnimatorSet.Builder before(android.animation.Animator);
+ method public android.animation.AnimatorSet.Builder with(android.animation.Animator);
+ }
+
+ public class ArgbEvaluator implements android.animation.TypeEvaluator {
+ ctor public ArgbEvaluator();
+ method public java.lang.Object evaluate(float, java.lang.Object, java.lang.Object);
+ }
+
+ public abstract class BidirectionalTypeConverter extends android.animation.TypeConverter {
+ ctor public BidirectionalTypeConverter(java.lang.Class<T>, java.lang.Class<V>);
+ method public abstract T convertBack(V);
+ method public android.animation.BidirectionalTypeConverter<V, T> invert();
+ }
+
+ public class FloatArrayEvaluator implements android.animation.TypeEvaluator {
+ ctor public FloatArrayEvaluator();
+ ctor public FloatArrayEvaluator(float[]);
+ method public float[] evaluate(float, float[], float[]);
+ }
+
+ public class FloatEvaluator implements android.animation.TypeEvaluator {
+ ctor public FloatEvaluator();
+ method public java.lang.Float evaluate(float, java.lang.Number, java.lang.Number);
+ }
+
+ public class IntArrayEvaluator implements android.animation.TypeEvaluator {
+ ctor public IntArrayEvaluator();
+ ctor public IntArrayEvaluator(int[]);
+ method public int[] evaluate(float, int[], int[]);
+ }
+
+ public class IntEvaluator implements android.animation.TypeEvaluator {
+ ctor public IntEvaluator();
+ method public java.lang.Integer evaluate(float, java.lang.Integer, java.lang.Integer);
+ }
+
+ public abstract class Keyframe implements java.lang.Cloneable {
+ ctor public Keyframe();
+ method public abstract android.animation.Keyframe clone();
+ method public float getFraction();
+ method public android.animation.TimeInterpolator getInterpolator();
+ method public java.lang.Class getType();
+ method public abstract java.lang.Object getValue();
+ method public boolean hasValue();
+ method public static android.animation.Keyframe ofFloat(float, float);
+ method public static android.animation.Keyframe ofFloat(float);
+ method public static android.animation.Keyframe ofInt(float, int);
+ method public static android.animation.Keyframe ofInt(float);
+ method public static android.animation.Keyframe ofObject(float, java.lang.Object);
+ method public static android.animation.Keyframe ofObject(float);
+ method public void setFraction(float);
+ method public void setInterpolator(android.animation.TimeInterpolator);
+ method public abstract void setValue(java.lang.Object);
+ }
+
+ public class LayoutTransition {
+ ctor public LayoutTransition();
+ method public void addChild(android.view.ViewGroup, android.view.View);
+ method public void addTransitionListener(android.animation.LayoutTransition.TransitionListener);
+ method public void disableTransitionType(int);
+ method public void enableTransitionType(int);
+ method public android.animation.Animator getAnimator(int);
+ method public long getDuration(int);
+ method public android.animation.TimeInterpolator getInterpolator(int);
+ method public long getStagger(int);
+ method public long getStartDelay(int);
+ method public java.util.List<android.animation.LayoutTransition.TransitionListener> getTransitionListeners();
+ method public deprecated void hideChild(android.view.ViewGroup, android.view.View);
+ method public void hideChild(android.view.ViewGroup, android.view.View, int);
+ method public boolean isChangingLayout();
+ method public boolean isRunning();
+ method public boolean isTransitionTypeEnabled(int);
+ method public void removeChild(android.view.ViewGroup, android.view.View);
+ method public void removeTransitionListener(android.animation.LayoutTransition.TransitionListener);
+ method public void setAnimateParentHierarchy(boolean);
+ method public void setAnimator(int, android.animation.Animator);
+ method public void setDuration(long);
+ method public void setDuration(int, long);
+ method public void setInterpolator(int, android.animation.TimeInterpolator);
+ method public void setStagger(int, long);
+ method public void setStartDelay(int, long);
+ method public deprecated void showChild(android.view.ViewGroup, android.view.View);
+ method public void showChild(android.view.ViewGroup, android.view.View, int);
+ field public static final int APPEARING = 2; // 0x2
+ field public static final int CHANGE_APPEARING = 0; // 0x0
+ field public static final int CHANGE_DISAPPEARING = 1; // 0x1
+ field public static final int CHANGING = 4; // 0x4
+ field public static final int DISAPPEARING = 3; // 0x3
+ }
+
+ public static abstract interface LayoutTransition.TransitionListener {
+ method public abstract void endTransition(android.animation.LayoutTransition, android.view.ViewGroup, android.view.View, int);
+ method public abstract void startTransition(android.animation.LayoutTransition, android.view.ViewGroup, android.view.View, int);
+ }
+
+ public final class ObjectAnimator extends android.animation.ValueAnimator {
+ ctor public ObjectAnimator();
+ method public java.lang.String getPropertyName();
+ method public java.lang.Object getTarget();
+ method public static android.animation.ObjectAnimator ofArgb(java.lang.Object, java.lang.String, int...);
+ method public static android.animation.ObjectAnimator ofArgb(T, android.util.Property<T, java.lang.Integer>, int...);
+ method public static android.animation.ObjectAnimator ofFloat(java.lang.Object, java.lang.String, float...);
+ method public static android.animation.ObjectAnimator ofFloat(java.lang.Object, java.lang.String, java.lang.String, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofFloat(T, android.util.Property<T, java.lang.Float>, float...);
+ method public static android.animation.ObjectAnimator ofFloat(T, android.util.Property<T, java.lang.Float>, android.util.Property<T, java.lang.Float>, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofInt(java.lang.Object, java.lang.String, int...);
+ method public static android.animation.ObjectAnimator ofInt(java.lang.Object, java.lang.String, java.lang.String, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofInt(T, android.util.Property<T, java.lang.Integer>, int...);
+ method public static android.animation.ObjectAnimator ofInt(T, android.util.Property<T, java.lang.Integer>, android.util.Property<T, java.lang.Integer>, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofMultiFloat(java.lang.Object, java.lang.String, float[][]);
+ method public static android.animation.ObjectAnimator ofMultiFloat(java.lang.Object, java.lang.String, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofMultiFloat(java.lang.Object, java.lang.String, android.animation.TypeConverter<T, float[]>, android.animation.TypeEvaluator<T>, T...);
+ method public static android.animation.ObjectAnimator ofMultiInt(java.lang.Object, java.lang.String, int[][]);
+ method public static android.animation.ObjectAnimator ofMultiInt(java.lang.Object, java.lang.String, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofMultiInt(java.lang.Object, java.lang.String, android.animation.TypeConverter<T, int[]>, android.animation.TypeEvaluator<T>, T...);
+ method public static android.animation.ObjectAnimator ofObject(java.lang.Object, java.lang.String, android.animation.TypeEvaluator, java.lang.Object...);
+ method public static android.animation.ObjectAnimator ofObject(java.lang.Object, java.lang.String, android.animation.TypeConverter<android.graphics.PointF, ?>, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofObject(T, android.util.Property<T, V>, android.animation.TypeEvaluator<V>, V...);
+ method public static android.animation.ObjectAnimator ofObject(T, android.util.Property<T, P>, android.animation.TypeConverter<V, P>, android.animation.TypeEvaluator<V>, V...);
+ method public static android.animation.ObjectAnimator ofObject(T, android.util.Property<T, V>, android.animation.TypeConverter<android.graphics.PointF, V>, android.graphics.Path);
+ method public static android.animation.ObjectAnimator ofPropertyValuesHolder(java.lang.Object, android.animation.PropertyValuesHolder...);
+ method public void setAutoCancel(boolean);
+ method public void setProperty(android.util.Property);
+ method public void setPropertyName(java.lang.String);
+ }
+
+ public class PointFEvaluator implements android.animation.TypeEvaluator {
+ ctor public PointFEvaluator();
+ ctor public PointFEvaluator(android.graphics.PointF);
+ method public android.graphics.PointF evaluate(float, android.graphics.PointF, android.graphics.PointF);
+ }
+
+ public class PropertyValuesHolder implements java.lang.Cloneable {
+ method public android.animation.PropertyValuesHolder clone();
+ method public java.lang.String getPropertyName();
+ method public static android.animation.PropertyValuesHolder ofFloat(java.lang.String, float...);
+ method public static android.animation.PropertyValuesHolder ofFloat(android.util.Property<?, java.lang.Float>, float...);
+ method public static android.animation.PropertyValuesHolder ofInt(java.lang.String, int...);
+ method public static android.animation.PropertyValuesHolder ofInt(android.util.Property<?, java.lang.Integer>, int...);
+ method public static android.animation.PropertyValuesHolder ofKeyframe(java.lang.String, android.animation.Keyframe...);
+ method public static android.animation.PropertyValuesHolder ofKeyframe(android.util.Property, android.animation.Keyframe...);
+ method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, float[][]);
+ method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, android.graphics.Path);
+ method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, android.animation.TypeConverter<V, float[]>, android.animation.TypeEvaluator<V>, V...);
+ method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, android.animation.TypeConverter<T, float[]>, android.animation.TypeEvaluator<T>, android.animation.Keyframe...);
+ method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, int[][]);
+ method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, android.graphics.Path);
+ method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, android.animation.TypeConverter<V, int[]>, android.animation.TypeEvaluator<V>, V...);
+ method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, android.animation.TypeConverter<T, int[]>, android.animation.TypeEvaluator<T>, android.animation.Keyframe...);
+ method public static android.animation.PropertyValuesHolder ofObject(java.lang.String, android.animation.TypeEvaluator, java.lang.Object...);
+ method public static android.animation.PropertyValuesHolder ofObject(java.lang.String, android.animation.TypeConverter<android.graphics.PointF, ?>, android.graphics.Path);
+ method public static android.animation.PropertyValuesHolder ofObject(android.util.Property, android.animation.TypeEvaluator<V>, V...);
+ method public static android.animation.PropertyValuesHolder ofObject(android.util.Property<?, V>, android.animation.TypeConverter<T, V>, android.animation.TypeEvaluator<T>, T...);
+ method public static android.animation.PropertyValuesHolder ofObject(android.util.Property<?, V>, android.animation.TypeConverter<android.graphics.PointF, V>, android.graphics.Path);
+ method public void setConverter(android.animation.TypeConverter);
+ method public void setEvaluator(android.animation.TypeEvaluator);
+ method public void setFloatValues(float...);
+ method public void setIntValues(int...);
+ method public void setKeyframes(android.animation.Keyframe...);
+ method public void setObjectValues(java.lang.Object...);
+ method public void setProperty(android.util.Property);
+ method public void setPropertyName(java.lang.String);
+ }
+
+ public class RectEvaluator implements android.animation.TypeEvaluator {
+ ctor public RectEvaluator();
+ ctor public RectEvaluator(android.graphics.Rect);
+ method public android.graphics.Rect evaluate(float, android.graphics.Rect, android.graphics.Rect);
+ }
+
+ public class StateListAnimator implements java.lang.Cloneable {
+ ctor public StateListAnimator();
+ method public void addState(int[], android.animation.Animator);
+ method public android.animation.StateListAnimator clone();
+ method public void jumpToCurrentState();
+ }
+
+ public class TimeAnimator extends android.animation.ValueAnimator {
+ ctor public TimeAnimator();
+ method public void setTimeListener(android.animation.TimeAnimator.TimeListener);
+ }
+
+ public static abstract interface TimeAnimator.TimeListener {
+ method public abstract void onTimeUpdate(android.animation.TimeAnimator, long, long);
+ }
+
+ public abstract interface TimeInterpolator {
+ method public abstract float getInterpolation(float);
+ }
+
+ public abstract class TypeConverter {
+ ctor public TypeConverter(java.lang.Class<T>, java.lang.Class<V>);
+ method public abstract V convert(T);
+ }
+
+ public abstract interface TypeEvaluator {
+ method public abstract T evaluate(float, T, T);
+ }
+
+ public class ValueAnimator extends android.animation.Animator {
+ ctor public ValueAnimator();
+ method public void addUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener);
+ method public float getAnimatedFraction();
+ method public java.lang.Object getAnimatedValue();
+ method public java.lang.Object getAnimatedValue(java.lang.String);
+ method public long getCurrentPlayTime();
+ method public long getDuration();
+ method public static long getFrameDelay();
+ method public int getRepeatCount();
+ method public int getRepeatMode();
+ method public long getStartDelay();
+ method public android.animation.PropertyValuesHolder[] getValues();
+ method public boolean isRunning();
+ method public static android.animation.ValueAnimator ofArgb(int...);
+ method public static android.animation.ValueAnimator ofFloat(float...);
+ method public static android.animation.ValueAnimator ofInt(int...);
+ method public static android.animation.ValueAnimator ofObject(android.animation.TypeEvaluator, java.lang.Object...);
+ method public static android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...);
+ method public void removeAllUpdateListeners();
+ method public void removeUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener);
+ method public void reverse();
+ method public void setCurrentFraction(float);
+ method public void setCurrentPlayTime(long);
+ method public android.animation.ValueAnimator setDuration(long);
+ method public void setEvaluator(android.animation.TypeEvaluator);
+ method public void setFloatValues(float...);
+ method public static void setFrameDelay(long);
+ method public void setIntValues(int...);
+ method public void setInterpolator(android.animation.TimeInterpolator);
+ method public void setObjectValues(java.lang.Object...);
+ method public void setRepeatCount(int);
+ method public void setRepeatMode(int);
+ method public void setStartDelay(long);
+ method public void setValues(android.animation.PropertyValuesHolder...);
+ field public static final int INFINITE = -1; // 0xffffffff
+ field public static final int RESTART = 1; // 0x1
+ field public static final int REVERSE = 2; // 0x2
+ }
+
+ public static abstract interface ValueAnimator.AnimatorUpdateListener {
+ method public abstract void onAnimationUpdate(android.animation.ValueAnimator);
+ }
+
+}
+
+package android.annotation {
+
+ public abstract class SuppressLint implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class TargetApi implements java.lang.annotation.Annotation {
+ }
+
+}
+
+package android.app {
+
+ public abstract class ActionBar {
+ ctor public ActionBar();
+ method public abstract void addOnMenuVisibilityListener(android.app.ActionBar.OnMenuVisibilityListener);
+ method public abstract deprecated void addTab(android.app.ActionBar.Tab);
+ method public abstract deprecated void addTab(android.app.ActionBar.Tab, boolean);
+ method public abstract deprecated void addTab(android.app.ActionBar.Tab, int);
+ method public abstract deprecated void addTab(android.app.ActionBar.Tab, int, boolean);
+ method public abstract android.view.View getCustomView();
+ method public abstract int getDisplayOptions();
+ method public float getElevation();
+ method public abstract int getHeight();
+ method public int getHideOffset();
+ method public abstract deprecated int getNavigationItemCount();
+ method public abstract deprecated int getNavigationMode();
+ method public abstract deprecated int getSelectedNavigationIndex();
+ method public abstract deprecated android.app.ActionBar.Tab getSelectedTab();
+ method public abstract java.lang.CharSequence getSubtitle();
+ method public abstract deprecated android.app.ActionBar.Tab getTabAt(int);
+ method public abstract deprecated int getTabCount();
+ method public android.content.Context getThemedContext();
+ method public abstract java.lang.CharSequence getTitle();
+ method public abstract void hide();
+ method public boolean isHideOnContentScrollEnabled();
+ method public abstract boolean isShowing();
+ method public abstract deprecated android.app.ActionBar.Tab newTab();
+ method public abstract deprecated void removeAllTabs();
+ method public abstract void removeOnMenuVisibilityListener(android.app.ActionBar.OnMenuVisibilityListener);
+ method public abstract deprecated void removeTab(android.app.ActionBar.Tab);
+ method public abstract deprecated void removeTabAt(int);
+ method public abstract deprecated void selectTab(android.app.ActionBar.Tab);
+ method public abstract void setBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public abstract void setCustomView(android.view.View);
+ method public abstract void setCustomView(android.view.View, android.app.ActionBar.LayoutParams);
+ method public abstract void setCustomView(int);
+ method public abstract void setDisplayHomeAsUpEnabled(boolean);
+ method public abstract void setDisplayOptions(int);
+ method public abstract void setDisplayOptions(int, int);
+ method public abstract void setDisplayShowCustomEnabled(boolean);
+ method public abstract void setDisplayShowHomeEnabled(boolean);
+ method public abstract void setDisplayShowTitleEnabled(boolean);
+ method public abstract void setDisplayUseLogoEnabled(boolean);
+ method public void setElevation(float);
+ method public void setHideOffset(int);
+ method public void setHideOnContentScrollEnabled(boolean);
+ method public void setHomeActionContentDescription(java.lang.CharSequence);
+ method public void setHomeActionContentDescription(int);
+ method public void setHomeAsUpIndicator(android.graphics.drawable.Drawable);
+ method public void setHomeAsUpIndicator(int);
+ method public void setHomeButtonEnabled(boolean);
+ method public abstract void setIcon(int);
+ method public abstract void setIcon(android.graphics.drawable.Drawable);
+ method public abstract deprecated void setListNavigationCallbacks(android.widget.SpinnerAdapter, android.app.ActionBar.OnNavigationListener);
+ method public abstract void setLogo(int);
+ method public abstract void setLogo(android.graphics.drawable.Drawable);
+ method public abstract deprecated void setNavigationMode(int);
+ method public abstract deprecated void setSelectedNavigationItem(int);
+ method public void setSplitBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setStackedBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public abstract void setSubtitle(java.lang.CharSequence);
+ method public abstract void setSubtitle(int);
+ method public abstract void setTitle(java.lang.CharSequence);
+ method public abstract void setTitle(int);
+ method public abstract void show();
+ field public static final int DISPLAY_HOME_AS_UP = 4; // 0x4
+ field public static final int DISPLAY_SHOW_CUSTOM = 16; // 0x10
+ field public static final int DISPLAY_SHOW_HOME = 2; // 0x2
+ field public static final int DISPLAY_SHOW_TITLE = 8; // 0x8
+ field public static final int DISPLAY_USE_LOGO = 1; // 0x1
+ field public static final deprecated int NAVIGATION_MODE_LIST = 1; // 0x1
+ field public static final deprecated int NAVIGATION_MODE_STANDARD = 0; // 0x0
+ field public static final deprecated int NAVIGATION_MODE_TABS = 2; // 0x2
+ }
+
+ public static class ActionBar.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+ ctor public ActionBar.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public ActionBar.LayoutParams(int, int);
+ ctor public ActionBar.LayoutParams(int, int, int);
+ ctor public ActionBar.LayoutParams(int);
+ ctor public ActionBar.LayoutParams(android.app.ActionBar.LayoutParams);
+ ctor public ActionBar.LayoutParams(android.view.ViewGroup.LayoutParams);
+ field public int gravity;
+ }
+
+ public static abstract interface ActionBar.OnMenuVisibilityListener {
+ method public abstract void onMenuVisibilityChanged(boolean);
+ }
+
+ public static abstract deprecated interface ActionBar.OnNavigationListener {
+ method public abstract boolean onNavigationItemSelected(int, long);
+ }
+
+ public static abstract deprecated class ActionBar.Tab {
+ ctor public ActionBar.Tab();
+ method public abstract java.lang.CharSequence getContentDescription();
+ method public abstract android.view.View getCustomView();
+ method public abstract android.graphics.drawable.Drawable getIcon();
+ method public abstract int getPosition();
+ method public abstract java.lang.Object getTag();
+ method public abstract java.lang.CharSequence getText();
+ method public abstract void select();
+ method public abstract android.app.ActionBar.Tab setContentDescription(int);
+ method public abstract android.app.ActionBar.Tab setContentDescription(java.lang.CharSequence);
+ method public abstract android.app.ActionBar.Tab setCustomView(android.view.View);
+ method public abstract android.app.ActionBar.Tab setCustomView(int);
+ method public abstract android.app.ActionBar.Tab setIcon(android.graphics.drawable.Drawable);
+ method public abstract android.app.ActionBar.Tab setIcon(int);
+ method public abstract android.app.ActionBar.Tab setTabListener(android.app.ActionBar.TabListener);
+ method public abstract android.app.ActionBar.Tab setTag(java.lang.Object);
+ method public abstract android.app.ActionBar.Tab setText(java.lang.CharSequence);
+ method public abstract android.app.ActionBar.Tab setText(int);
+ field public static final int INVALID_POSITION = -1; // 0xffffffff
+ }
+
+ public static abstract deprecated interface ActionBar.TabListener {
+ method public abstract void onTabReselected(android.app.ActionBar.Tab, android.app.FragmentTransaction);
+ method public abstract void onTabSelected(android.app.ActionBar.Tab, android.app.FragmentTransaction);
+ method public abstract void onTabUnselected(android.app.ActionBar.Tab, android.app.FragmentTransaction);
+ }
+
+ public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
+ ctor public Activity();
+ method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public void closeContextMenu();
+ method public void closeOptionsMenu();
+ method public android.app.PendingIntent createPendingResult(int, android.content.Intent, int);
+ method public final deprecated void dismissDialog(int);
+ method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);
+ method public boolean dispatchKeyEvent(android.view.KeyEvent);
+ method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);
+ method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public boolean dispatchTouchEvent(android.view.MotionEvent);
+ method public boolean dispatchTrackballEvent(android.view.MotionEvent);
+ method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public android.view.View findViewById(int);
+ method public void finish();
+ method public void finishActivity(int);
+ method public void finishActivityFromChild(android.app.Activity, int);
+ method public void finishAffinity();
+ method public void finishAfterTransition();
+ method public void finishAndRemoveTask();
+ method public void finishFromChild(android.app.Activity);
+ method public android.app.ActionBar getActionBar();
+ method public final android.app.Application getApplication();
+ method public android.content.ComponentName getCallingActivity();
+ method public java.lang.String getCallingPackage();
+ method public int getChangingConfigurations();
+ method public android.content.ComponentName getComponentName();
+ method public android.transition.Scene getContentScene();
+ method public android.transition.TransitionManager getContentTransitionManager();
+ method public android.view.View getCurrentFocus();
+ method public android.app.FragmentManager getFragmentManager();
+ method public android.content.Intent getIntent();
+ method public deprecated java.lang.Object getLastNonConfigurationInstance();
+ method public android.view.LayoutInflater getLayoutInflater();
+ method public android.app.LoaderManager getLoaderManager();
+ method public java.lang.String getLocalClassName();
+ method public final android.media.session.MediaController getMediaController();
+ method public android.view.MenuInflater getMenuInflater();
+ method public final android.app.Activity getParent();
+ method public android.content.Intent getParentActivityIntent();
+ method public android.content.SharedPreferences getPreferences(int);
+ method public android.net.Uri getReferrer();
+ method public int getRequestedOrientation();
+ method public final android.view.SearchEvent getSearchEvent();
+ method public int getTaskId();
+ method public final java.lang.CharSequence getTitle();
+ method public final int getTitleColor();
+ method public android.app.VoiceInteractor getVoiceInteractor();
+ method public final int getVolumeControlStream();
+ method public android.view.Window getWindow();
+ method public android.view.WindowManager getWindowManager();
+ method public boolean hasWindowFocus();
+ method public void invalidateOptionsMenu();
+ method public boolean isChangingConfigurations();
+ method public final boolean isChild();
+ method public boolean isDestroyed();
+ method public boolean isFinishing();
+ method public boolean isImmersive();
+ method public boolean isTaskRoot();
+ method public boolean isVoiceInteraction();
+ method public boolean isVoiceInteractionRoot();
+ method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public boolean moveTaskToBack(boolean);
+ method public boolean navigateUpTo(android.content.Intent);
+ method public boolean navigateUpToFromChild(android.app.Activity, android.content.Intent);
+ method public void onActionModeFinished(android.view.ActionMode);
+ method public void onActionModeStarted(android.view.ActionMode);
+ method public void onActivityReenter(int, android.content.Intent);
+ method protected void onActivityResult(int, int, android.content.Intent);
+ method public void onAttachFragment(android.app.Fragment);
+ method public void onAttachedToWindow();
+ method public void onBackPressed();
+ method protected void onChildTitleChanged(android.app.Activity, java.lang.CharSequence);
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public void onContentChanged();
+ method public boolean onContextItemSelected(android.view.MenuItem);
+ method public void onContextMenuClosed(android.view.Menu);
+ method protected void onCreate(android.os.Bundle);
+ method public void onCreate(android.os.Bundle, android.os.PersistableBundle);
+ method public void onCreateContextMenu(android.view.ContextMenu, android.view.View, android.view.ContextMenu.ContextMenuInfo);
+ method public java.lang.CharSequence onCreateDescription();
+ method protected deprecated android.app.Dialog onCreateDialog(int);
+ method protected deprecated android.app.Dialog onCreateDialog(int, android.os.Bundle);
+ method public void onCreateNavigateUpTaskStack(android.app.TaskStackBuilder);
+ method public boolean onCreateOptionsMenu(android.view.Menu);
+ method public boolean onCreatePanelMenu(int, android.view.Menu);
+ method public android.view.View onCreatePanelView(int);
+ method public boolean onCreateThumbnail(android.graphics.Bitmap, android.graphics.Canvas);
+ method public android.view.View onCreateView(java.lang.String, android.content.Context, android.util.AttributeSet);
+ method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);
+ method protected void onDestroy();
+ method public void onDetachedFromWindow();
+ method public void onEnterAnimationComplete();
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public boolean onKeyShortcut(int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method public void onLowMemory();
+ method public boolean onMenuItemSelected(int, android.view.MenuItem);
+ method public boolean onMenuOpened(int, android.view.Menu);
+ method public boolean onNavigateUp();
+ method public boolean onNavigateUpFromChild(android.app.Activity);
+ method protected void onNewIntent(android.content.Intent);
+ method public boolean onOptionsItemSelected(android.view.MenuItem);
+ method public void onOptionsMenuClosed(android.view.Menu);
+ method public void onPanelClosed(int, android.view.Menu);
+ method protected void onPause();
+ method protected void onPostCreate(android.os.Bundle);
+ method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle);
+ method protected void onPostResume();
+ method protected deprecated void onPrepareDialog(int, android.app.Dialog);
+ method protected deprecated void onPrepareDialog(int, android.app.Dialog, android.os.Bundle);
+ method public void onPrepareNavigateUpTaskStack(android.app.TaskStackBuilder);
+ method public boolean onPrepareOptionsMenu(android.view.Menu);
+ method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
+ method public void onProvideAssistContent(android.app.assist.AssistContent);
+ method public void onProvideAssistData(android.os.Bundle);
+ method public android.net.Uri onProvideReferrer();
+ method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
+ method protected void onRestart();
+ method protected void onRestoreInstanceState(android.os.Bundle);
+ method public void onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle);
+ method protected void onResume();
+ method public deprecated java.lang.Object onRetainNonConfigurationInstance();
+ method protected void onSaveInstanceState(android.os.Bundle);
+ method public void onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle);
+ method public boolean onSearchRequested(android.view.SearchEvent);
+ method public boolean onSearchRequested();
+ method protected void onStart();
+ method public void onStateNotSaved();
+ method protected void onStop();
+ method protected void onTitleChanged(java.lang.CharSequence, int);
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ method public boolean onTrackballEvent(android.view.MotionEvent);
+ method public void onTrimMemory(int);
+ method public void onUserInteraction();
+ method protected void onUserLeaveHint();
+ method public void onVisibleBehindCanceled();
+ method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
+ method public void onWindowFocusChanged(boolean);
+ method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
+ method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);
+ method public void openContextMenu(android.view.View);
+ method public void openOptionsMenu();
+ method public void overlayWithDecorCaption(boolean);
+ method public void overridePendingTransition(int, int);
+ method public void postponeEnterTransition();
+ method public void recreate();
+ method public void registerForContextMenu(android.view.View);
+ method public boolean releaseInstance();
+ method public final deprecated void removeDialog(int);
+ method public void reportFullyDrawn();
+ method public final void requestPermissions(java.lang.String[], int);
+ method public boolean requestVisibleBehind(boolean);
+ method public final boolean requestWindowFeature(int);
+ method public final void runOnUiThread(java.lang.Runnable);
+ method public void setActionBar(android.widget.Toolbar);
+ method public void setContentTransitionManager(android.transition.TransitionManager);
+ method public void setContentView(int);
+ method public void setContentView(android.view.View);
+ method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public final void setDefaultKeyMode(int);
+ method public void setEnterSharedElementCallback(android.app.SharedElementCallback);
+ method public void setExitSharedElementCallback(android.app.SharedElementCallback);
+ method public final void setFeatureDrawable(int, android.graphics.drawable.Drawable);
+ method public final void setFeatureDrawableAlpha(int, int);
+ method public final void setFeatureDrawableResource(int, int);
+ method public final void setFeatureDrawableUri(int, android.net.Uri);
+ method public void setFinishOnTouchOutside(boolean);
+ method public void setImmersive(boolean);
+ method public void setIntent(android.content.Intent);
+ method public final void setMediaController(android.media.session.MediaController);
+ method public final deprecated void setProgress(int);
+ method public final deprecated void setProgressBarIndeterminate(boolean);
+ method public final deprecated void setProgressBarIndeterminateVisibility(boolean);
+ method public final deprecated void setProgressBarVisibility(boolean);
+ method public void setRequestedOrientation(int);
+ method public final void setResult(int);
+ method public final void setResult(int, android.content.Intent);
+ method public final deprecated void setSecondaryProgress(int);
+ method public void setTaskDescription(android.app.ActivityManager.TaskDescription);
+ method public void setTitle(java.lang.CharSequence);
+ method public void setTitle(int);
+ method public deprecated void setTitleColor(int);
+ method public void setVisible(boolean);
+ method public final void setVolumeControlStream(int);
+ method public boolean shouldShowRequestPermissionRationale(java.lang.String);
+ method public boolean shouldUpRecreateTask(android.content.Intent);
+ method public boolean showAssist(android.os.Bundle);
+ method public final deprecated void showDialog(int);
+ method public final deprecated boolean showDialog(int, android.os.Bundle);
+ method public void showLockTaskEscapeMessage();
+ method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);
+ method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);
+ method public void startActivityForResult(android.content.Intent, int);
+ method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);
+ method public void startActivityFromChild(android.app.Activity, android.content.Intent, int);
+ method public void startActivityFromChild(android.app.Activity, android.content.Intent, int, android.os.Bundle);
+ method public void startActivityFromFragment(android.app.Fragment, android.content.Intent, int);
+ method public void startActivityFromFragment(android.app.Fragment, android.content.Intent, int, android.os.Bundle);
+ method public boolean startActivityIfNeeded(android.content.Intent, int);
+ method public boolean startActivityIfNeeded(android.content.Intent, int, android.os.Bundle);
+ method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
+ method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
+ method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
+ method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
+ method public void startLockTask();
+ method public deprecated void startManagingCursor(android.database.Cursor);
+ method public boolean startNextMatchingActivity(android.content.Intent);
+ method public boolean startNextMatchingActivity(android.content.Intent, android.os.Bundle);
+ method public void startPostponedEnterTransition();
+ method public void startSearch(java.lang.String, boolean, android.os.Bundle, boolean);
+ method public void stopLockTask();
+ method public deprecated void stopManagingCursor(android.database.Cursor);
+ method public void takeKeyEvents(boolean);
+ method public void triggerSearch(java.lang.String, android.os.Bundle);
+ method public void unregisterForContextMenu(android.view.View);
+ field public static final int DEFAULT_KEYS_DIALER = 1; // 0x1
+ field public static final int DEFAULT_KEYS_DISABLE = 0; // 0x0
+ field public static final int DEFAULT_KEYS_SEARCH_GLOBAL = 4; // 0x4
+ field public static final int DEFAULT_KEYS_SEARCH_LOCAL = 3; // 0x3
+ field public static final int DEFAULT_KEYS_SHORTCUT = 2; // 0x2
+ field protected static final int[] FOCUSED_STATE_SET;
+ field public static final int RESULT_CANCELED = 0; // 0x0
+ field public static final int RESULT_FIRST_USER = 1; // 0x1
+ field public static final int RESULT_OK = -1; // 0xffffffff
+ }
+
+ public deprecated class ActivityGroup extends android.app.Activity {
+ ctor public ActivityGroup();
+ ctor public ActivityGroup(boolean);
+ method public android.app.Activity getCurrentActivity();
+ method public final android.app.LocalActivityManager getLocalActivityManager();
+ }
+
+ public class ActivityManager {
+ method public int addAppTask(android.app.Activity, android.content.Intent, android.app.ActivityManager.TaskDescription, android.graphics.Bitmap);
+ method public boolean clearApplicationUserData();
+ method public void clearWatchHeapLimit();
+ method public void dumpPackageState(java.io.FileDescriptor, java.lang.String);
+ method public android.util.Size getAppTaskThumbnailSize();
+ method public java.util.List<android.app.ActivityManager.AppTask> getAppTasks();
+ method public android.content.pm.ConfigurationInfo getDeviceConfigurationInfo();
+ method public int getLargeMemoryClass();
+ method public int getLauncherLargeIconDensity();
+ method public int getLauncherLargeIconSize();
+ method public int getLockTaskModeState();
+ method public int getMemoryClass();
+ method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo);
+ method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo);
+ method public android.os.Debug.MemoryInfo[] getProcessMemoryInfo(int[]);
+ method public java.util.List<android.app.ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState();
+ method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException;
+ method public java.util.List<android.app.ActivityManager.RunningAppProcessInfo> getRunningAppProcesses();
+ method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException;
+ method public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;
+ method public deprecated java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException;
+ method public deprecated boolean isInLockTaskMode();
+ method public boolean isLowRamDevice();
+ method public static boolean isRunningInTestHarness();
+ method public static boolean isUserAMonkey();
+ method public void killBackgroundProcesses(java.lang.String);
+ method public void moveTaskToFront(int, int);
+ method public void moveTaskToFront(int, int, android.os.Bundle);
+ method public deprecated void restartPackage(java.lang.String);
+ method public void setWatchHeapLimit(long);
+ field public static final java.lang.String ACTION_REPORT_HEAP_LIMIT = "android.app.action.REPORT_HEAP_LIMIT";
+ field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1
+ field public static final int LOCK_TASK_MODE_NONE = 0; // 0x0
+ field public static final int LOCK_TASK_MODE_PINNED = 2; // 0x2
+ field public static final java.lang.String META_HOME_ALTERNATE = "android.app.home.alternate";
+ field public static final int MOVE_TASK_NO_USER_ACTION = 2; // 0x2
+ field public static final int MOVE_TASK_WITH_HOME = 1; // 0x1
+ field public static final int RECENT_IGNORE_UNAVAILABLE = 2; // 0x2
+ field public static final int RECENT_WITH_EXCLUDED = 1; // 0x1
+ }
+
+ public static class ActivityManager.AppTask {
+ method public void finishAndRemoveTask();
+ method public android.app.ActivityManager.RecentTaskInfo getTaskInfo();
+ method public void moveToFront();
+ method public void setExcludeFromRecents(boolean);
+ method public void startActivity(android.content.Context, android.content.Intent, android.os.Bundle);
+ }
+
+ public static class ActivityManager.MemoryInfo implements android.os.Parcelable {
+ ctor public ActivityManager.MemoryInfo();
+ method public int describeContents();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.MemoryInfo> CREATOR;
+ field public long availMem;
+ field public boolean lowMemory;
+ field public long threshold;
+ field public long totalMem;
+ }
+
+ public static class ActivityManager.ProcessErrorStateInfo implements android.os.Parcelable {
+ ctor public ActivityManager.ProcessErrorStateInfo();
+ method public int describeContents();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CRASHED = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.ProcessErrorStateInfo> CREATOR;
+ field public static final int NOT_RESPONDING = 2; // 0x2
+ field public static final int NO_ERROR = 0; // 0x0
+ field public int condition;
+ field public byte[] crashData;
+ field public java.lang.String longMsg;
+ field public int pid;
+ field public java.lang.String processName;
+ field public java.lang.String shortMsg;
+ field public java.lang.String stackTrace;
+ field public java.lang.String tag;
+ field public int uid;
+ }
+
+ public static class ActivityManager.RecentTaskInfo implements android.os.Parcelable {
+ ctor public ActivityManager.RecentTaskInfo();
+ method public int describeContents();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RecentTaskInfo> CREATOR;
+ field public int affiliatedTaskId;
+ field public android.content.ComponentName baseActivity;
+ field public android.content.Intent baseIntent;
+ field public java.lang.CharSequence description;
+ field public int id;
+ field public int numActivities;
+ field public android.content.ComponentName origActivity;
+ field public int persistentId;
+ field public android.app.ActivityManager.TaskDescription taskDescription;
+ field public android.content.ComponentName topActivity;
+ }
+
+ public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {
+ ctor public ActivityManager.RunningAppProcessInfo();
+ ctor public ActivityManager.RunningAppProcessInfo(java.lang.String, int, java.lang.String[]);
+ method public int describeContents();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningAppProcessInfo> CREATOR;
+ field public static final int IMPORTANCE_BACKGROUND = 400; // 0x190
+ field public static final int IMPORTANCE_EMPTY = 500; // 0x1f4
+ field public static final int IMPORTANCE_FOREGROUND = 100; // 0x64
+ field public static final int IMPORTANCE_FOREGROUND_SERVICE = 125; // 0x7d
+ field public static final int IMPORTANCE_GONE = 1000; // 0x3e8
+ field public static final int IMPORTANCE_PERCEPTIBLE = 130; // 0x82
+ field public static final int IMPORTANCE_SERVICE = 300; // 0x12c
+ field public static final int IMPORTANCE_TOP_SLEEPING = 150; // 0x96
+ field public static final int IMPORTANCE_VISIBLE = 200; // 0xc8
+ field public static final int REASON_PROVIDER_IN_USE = 1; // 0x1
+ field public static final int REASON_SERVICE_IN_USE = 2; // 0x2
+ field public static final int REASON_UNKNOWN = 0; // 0x0
+ field public int importance;
+ field public int importanceReasonCode;
+ field public android.content.ComponentName importanceReasonComponent;
+ field public int importanceReasonPid;
+ field public int lastTrimLevel;
+ field public int lru;
+ field public int pid;
+ field public java.lang.String[] pkgList;
+ field public java.lang.String processName;
+ field public int uid;
+ }
+
+ public static class ActivityManager.RunningServiceInfo implements android.os.Parcelable {
+ ctor public ActivityManager.RunningServiceInfo();
+ method public int describeContents();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningServiceInfo> CREATOR;
+ field public static final int FLAG_FOREGROUND = 2; // 0x2
+ field public static final int FLAG_PERSISTENT_PROCESS = 8; // 0x8
+ field public static final int FLAG_STARTED = 1; // 0x1
+ field public static final int FLAG_SYSTEM_PROCESS = 4; // 0x4
+ field public long activeSince;
+ field public int clientCount;
+ field public int clientLabel;
+ field public java.lang.String clientPackage;
+ field public int crashCount;
+ field public int flags;
+ field public boolean foreground;
+ field public long lastActivityTime;
+ field public int pid;
+ field public java.lang.String process;
+ field public long restarting;
+ field public android.content.ComponentName service;
+ field public boolean started;
+ field public int uid;
+ }
+
+ public static class ActivityManager.RunningTaskInfo implements android.os.Parcelable {
+ ctor public ActivityManager.RunningTaskInfo();
+ method public int describeContents();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningTaskInfo> CREATOR;
+ field public android.content.ComponentName baseActivity;
+ field public java.lang.CharSequence description;
+ field public int id;
+ field public int numActivities;
+ field public int numRunning;
+ field public android.graphics.Bitmap thumbnail;
+ field public android.content.ComponentName topActivity;
+ }
+
+ public static class ActivityManager.TaskDescription implements android.os.Parcelable {
+ ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);
+ ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);
+ ctor public ActivityManager.TaskDescription(java.lang.String);
+ ctor public ActivityManager.TaskDescription();
+ ctor public ActivityManager.TaskDescription(android.app.ActivityManager.TaskDescription);
+ method public int describeContents();
+ method public android.graphics.Bitmap getIcon();
+ method public java.lang.String getLabel();
+ method public int getPrimaryColor();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ActivityManager.TaskDescription> CREATOR;
+ }
+
+ public class ActivityOptions {
+ method public android.graphics.Rect getLaunchBounds();
+ method public boolean hasLaunchBounds();
+ method public static android.app.ActivityOptions makeBasic();
+ method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
+ method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
+ method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int);
+ method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.view.View, java.lang.String);
+ method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.util.Pair<android.view.View, java.lang.String>...);
+ method public static android.app.ActivityOptions makeTaskLaunchBehind();
+ method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);
+ method public void requestUsageTimeReport(android.app.PendingIntent);
+ method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);
+ method public android.os.Bundle toBundle();
+ method public void update(android.app.ActivityOptions);
+ field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";
+ field public static final java.lang.String EXTRA_USAGE_TIME_REPORT_PACKAGES = "android.usage_time_packages";
+ }
+
+ public class AlarmManager {
+ method public void cancel(android.app.PendingIntent);
+ method public void cancel(android.app.AlarmManager.OnAlarmListener);
+ method public android.app.AlarmManager.AlarmClockInfo getNextAlarmClock();
+ method public void set(int, long, android.app.PendingIntent);
+ method public void set(int, long, java.lang.String, android.app.AlarmManager.OnAlarmListener, android.os.Handler);
+ method public void setAlarmClock(android.app.AlarmManager.AlarmClockInfo, android.app.PendingIntent);
+ method public void setAndAllowWhileIdle(int, long, android.app.PendingIntent);
+ method public void setExact(int, long, android.app.PendingIntent);
+ method public void setExact(int, long, java.lang.String, android.app.AlarmManager.OnAlarmListener, android.os.Handler);
+ method public void setExactAndAllowWhileIdle(int, long, android.app.PendingIntent);
+ method public void setInexactRepeating(int, long, long, android.app.PendingIntent);
+ method public void setRepeating(int, long, long, android.app.PendingIntent);
+ method public void setTime(long);
+ method public void setTimeZone(java.lang.String);
+ method public void setWindow(int, long, long, android.app.PendingIntent);
+ method public void setWindow(int, long, long, java.lang.String, android.app.AlarmManager.OnAlarmListener, android.os.Handler);
+ field public static final java.lang.String ACTION_NEXT_ALARM_CLOCK_CHANGED = "android.app.action.NEXT_ALARM_CLOCK_CHANGED";
+ field public static final int ELAPSED_REALTIME = 3; // 0x3
+ field public static final int ELAPSED_REALTIME_WAKEUP = 2; // 0x2
+ field public static final long INTERVAL_DAY = 86400000L; // 0x5265c00L
+ field public static final long INTERVAL_FIFTEEN_MINUTES = 900000L; // 0xdbba0L
+ field public static final long INTERVAL_HALF_DAY = 43200000L; // 0x2932e00L
+ field public static final long INTERVAL_HALF_HOUR = 1800000L; // 0x1b7740L
+ field public static final long INTERVAL_HOUR = 3600000L; // 0x36ee80L
+ field public static final int RTC = 1; // 0x1
+ field public static final int RTC_WAKEUP = 0; // 0x0
+ }
+
+ public static final class AlarmManager.AlarmClockInfo implements android.os.Parcelable {
+ ctor public AlarmManager.AlarmClockInfo(long, android.app.PendingIntent);
+ method public int describeContents();
+ method public android.app.PendingIntent getShowIntent();
+ method public long getTriggerTime();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.AlarmManager.AlarmClockInfo> CREATOR;
+ }
+
+ public static abstract interface AlarmManager.OnAlarmListener {
+ method public abstract void onAlarm();
+ }
+
+ public class AlertDialog extends android.app.Dialog implements android.content.DialogInterface {
+ ctor protected AlertDialog(android.content.Context);
+ ctor protected AlertDialog(android.content.Context, boolean, android.content.DialogInterface.OnCancelListener);
+ ctor protected AlertDialog(android.content.Context, int);
+ method public android.widget.Button getButton(int);
+ method public android.widget.ListView getListView();
+ method public void setButton(int, java.lang.CharSequence, android.os.Message);
+ method public void setButton(int, java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public deprecated void setButton(java.lang.CharSequence, android.os.Message);
+ method public deprecated void setButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public deprecated void setButton2(java.lang.CharSequence, android.os.Message);
+ method public deprecated void setButton2(java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public deprecated void setButton3(java.lang.CharSequence, android.os.Message);
+ method public deprecated void setButton3(java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public void setCustomTitle(android.view.View);
+ method public void setIcon(int);
+ method public void setIcon(android.graphics.drawable.Drawable);
+ method public void setIconAttribute(int);
+ method public void setInverseBackgroundForced(boolean);
+ method public void setMessage(java.lang.CharSequence);
+ method public void setView(android.view.View);
+ method public void setView(android.view.View, int, int, int, int);
+ field public static final deprecated int THEME_DEVICE_DEFAULT_DARK = 4; // 0x4
+ field public static final deprecated int THEME_DEVICE_DEFAULT_LIGHT = 5; // 0x5
+ field public static final deprecated int THEME_HOLO_DARK = 2; // 0x2
+ field public static final deprecated int THEME_HOLO_LIGHT = 3; // 0x3
+ field public static final deprecated int THEME_TRADITIONAL = 1; // 0x1
+ }
+
+ public static class AlertDialog.Builder {
+ ctor public AlertDialog.Builder(android.content.Context);
+ ctor public AlertDialog.Builder(android.content.Context, int);
+ method public android.app.AlertDialog create();
+ method public android.content.Context getContext();
+ method public android.app.AlertDialog.Builder setAdapter(android.widget.ListAdapter, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setCancelable(boolean);
+ method public android.app.AlertDialog.Builder setCursor(android.database.Cursor, android.content.DialogInterface.OnClickListener, java.lang.String);
+ method public android.app.AlertDialog.Builder setCustomTitle(android.view.View);
+ method public android.app.AlertDialog.Builder setIcon(int);
+ method public android.app.AlertDialog.Builder setIcon(android.graphics.drawable.Drawable);
+ method public android.app.AlertDialog.Builder setIconAttribute(int);
+ method public deprecated android.app.AlertDialog.Builder setInverseBackgroundForced(boolean);
+ method public android.app.AlertDialog.Builder setItems(int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setItems(java.lang.CharSequence[], android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setMessage(int);
+ method public android.app.AlertDialog.Builder setMessage(java.lang.CharSequence);
+ method public android.app.AlertDialog.Builder setMultiChoiceItems(int, boolean[], android.content.DialogInterface.OnMultiChoiceClickListener);
+ method public android.app.AlertDialog.Builder setMultiChoiceItems(java.lang.CharSequence[], boolean[], android.content.DialogInterface.OnMultiChoiceClickListener);
+ method public android.app.AlertDialog.Builder setMultiChoiceItems(android.database.Cursor, java.lang.String, java.lang.String, android.content.DialogInterface.OnMultiChoiceClickListener);
+ method public android.app.AlertDialog.Builder setNegativeButton(int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setNegativeButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setNeutralButton(int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setNeutralButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setOnCancelListener(android.content.DialogInterface.OnCancelListener);
+ method public android.app.AlertDialog.Builder setOnDismissListener(android.content.DialogInterface.OnDismissListener);
+ method public android.app.AlertDialog.Builder setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener);
+ method public android.app.AlertDialog.Builder setOnKeyListener(android.content.DialogInterface.OnKeyListener);
+ method public android.app.AlertDialog.Builder setPositiveButton(int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setPositiveButton(java.lang.CharSequence, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setSingleChoiceItems(int, int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setSingleChoiceItems(android.database.Cursor, int, java.lang.String, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setSingleChoiceItems(java.lang.CharSequence[], int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setSingleChoiceItems(android.widget.ListAdapter, int, android.content.DialogInterface.OnClickListener);
+ method public android.app.AlertDialog.Builder setTitle(int);
+ method public android.app.AlertDialog.Builder setTitle(java.lang.CharSequence);
+ method public android.app.AlertDialog.Builder setView(int);
+ method public android.app.AlertDialog.Builder setView(android.view.View);
+ method public android.app.AlertDialog show();
+ }
+
+ public class AliasActivity extends android.app.Activity {
+ ctor public AliasActivity();
+ }
+
+ public class AppOpsManager {
+ method public int checkOp(java.lang.String, int, java.lang.String);
+ method public int checkOpNoThrow(java.lang.String, int, java.lang.String);
+ method public void checkPackage(int, java.lang.String);
+ method public void finishOp(java.lang.String, int, java.lang.String);
+ method public int noteOp(java.lang.String, int, java.lang.String);
+ method public int noteOpNoThrow(java.lang.String, int, java.lang.String);
+ method public int noteProxyOp(java.lang.String, java.lang.String);
+ method public int noteProxyOpNoThrow(java.lang.String, java.lang.String);
+ method public static java.lang.String permissionToOp(java.lang.String);
+ method public int startOp(java.lang.String, int, java.lang.String);
+ method public int startOpNoThrow(java.lang.String, int, java.lang.String);
+ method public void startWatchingMode(java.lang.String, java.lang.String, android.app.AppOpsManager.OnOpChangedListener);
+ method public void stopWatchingMode(android.app.AppOpsManager.OnOpChangedListener);
+ field public static final int MODE_ALLOWED = 0; // 0x0
+ field public static final int MODE_DEFAULT = 3; // 0x3
+ field public static final int MODE_ERRORED = 2; // 0x2
+ field public static final int MODE_IGNORED = 1; // 0x1
+ field public static final java.lang.String OPSTR_ADD_VOICEMAIL = "android:add_voicemail";
+ field public static final java.lang.String OPSTR_BODY_SENSORS = "android:body_sensors";
+ field public static final java.lang.String OPSTR_CALL_PHONE = "android:call_phone";
+ field public static final java.lang.String OPSTR_CAMERA = "android:camera";
+ field public static final java.lang.String OPSTR_COARSE_LOCATION = "android:coarse_location";
+ field public static final java.lang.String OPSTR_FINE_LOCATION = "android:fine_location";
+ field public static final java.lang.String OPSTR_GET_USAGE_STATS = "android:get_usage_stats";
+ field public static final java.lang.String OPSTR_MOCK_LOCATION = "android:mock_location";
+ field public static final java.lang.String OPSTR_MONITOR_HIGH_POWER_LOCATION = "android:monitor_location_high_power";
+ field public static final java.lang.String OPSTR_MONITOR_LOCATION = "android:monitor_location";
+ field public static final java.lang.String OPSTR_READ_CALENDAR = "android:read_calendar";
+ field public static final java.lang.String OPSTR_READ_CALL_LOG = "android:read_call_log";
+ field public static final java.lang.String OPSTR_READ_CELL_BROADCASTS = "android:read_cell_broadcasts";
+ field public static final java.lang.String OPSTR_READ_CONTACTS = "android:read_contacts";
+ field public static final java.lang.String OPSTR_READ_EXTERNAL_STORAGE = "android:read_external_storage";
+ field public static final java.lang.String OPSTR_READ_PHONE_STATE = "android:read_phone_state";
+ field public static final java.lang.String OPSTR_READ_SMS = "android:read_sms";
+ field public static final java.lang.String OPSTR_RECEIVE_MMS = "android:receive_mms";
+ field public static final java.lang.String OPSTR_RECEIVE_SMS = "android:receive_sms";
+ field public static final java.lang.String OPSTR_RECEIVE_WAP_PUSH = "android:receive_wap_push";
+ field public static final java.lang.String OPSTR_RECORD_AUDIO = "android:record_audio";
+ field public static final java.lang.String OPSTR_SEND_SMS = "android:send_sms";
+ field public static final java.lang.String OPSTR_SYSTEM_ALERT_WINDOW = "android:system_alert_window";
+ field public static final java.lang.String OPSTR_USE_FINGERPRINT = "android:use_fingerprint";
+ field public static final java.lang.String OPSTR_USE_SIP = "android:use_sip";
+ field public static final java.lang.String OPSTR_WRITE_CALENDAR = "android:write_calendar";
+ field public static final java.lang.String OPSTR_WRITE_CALL_LOG = "android:write_call_log";
+ field public static final java.lang.String OPSTR_WRITE_CONTACTS = "android:write_contacts";
+ field public static final java.lang.String OPSTR_WRITE_EXTERNAL_STORAGE = "android:write_external_storage";
+ field public static final java.lang.String OPSTR_WRITE_SETTINGS = "android:write_settings";
+ }
+
+ public static abstract interface AppOpsManager.OnOpChangedListener {
+ method public abstract void onOpChanged(java.lang.String, java.lang.String);
+ }
+
+ public class Application extends android.content.ContextWrapper implements android.content.ComponentCallbacks2 {
+ ctor public Application();
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public void onCreate();
+ method public void onLowMemory();
+ method public void onTerminate();
+ method public void onTrimMemory(int);
+ method public void registerActivityLifecycleCallbacks(android.app.Application.ActivityLifecycleCallbacks);
+ method public void registerOnProvideAssistDataListener(android.app.Application.OnProvideAssistDataListener);
+ method public void unregisterActivityLifecycleCallbacks(android.app.Application.ActivityLifecycleCallbacks);
+ method public void unregisterOnProvideAssistDataListener(android.app.Application.OnProvideAssistDataListener);
+ }
+
+ public static abstract interface Application.ActivityLifecycleCallbacks {
+ method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle);
+ method public abstract void onActivityDestroyed(android.app.Activity);
+ method public abstract void onActivityPaused(android.app.Activity);
+ method public abstract void onActivityResumed(android.app.Activity);
+ method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle);
+ method public abstract void onActivityStarted(android.app.Activity);
+ method public abstract void onActivityStopped(android.app.Activity);
+ }
+
+ public static abstract interface Application.OnProvideAssistDataListener {
+ method public abstract void onProvideAssistData(android.app.Activity, android.os.Bundle);
+ }
+
+ public class ApplicationErrorReport implements android.os.Parcelable {
+ ctor public ApplicationErrorReport();
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public static android.content.ComponentName getErrorReportReceiver(android.content.Context, java.lang.String, int);
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.ApplicationErrorReport> CREATOR;
+ field public static final int TYPE_ANR = 2; // 0x2
+ field public static final int TYPE_BATTERY = 3; // 0x3
+ field public static final int TYPE_CRASH = 1; // 0x1
+ field public static final int TYPE_NONE = 0; // 0x0
+ field public static final int TYPE_RUNNING_SERVICE = 5; // 0x5
+ field public android.app.ApplicationErrorReport.AnrInfo anrInfo;
+ field public android.app.ApplicationErrorReport.BatteryInfo batteryInfo;
+ field public android.app.ApplicationErrorReport.CrashInfo crashInfo;
+ field public java.lang.String installerPackageName;
+ field public java.lang.String packageName;
+ field public java.lang.String processName;
+ field public android.app.ApplicationErrorReport.RunningServiceInfo runningServiceInfo;
+ field public boolean systemApp;
+ field public long time;
+ field public int type;
+ }
+
+ public static class ApplicationErrorReport.AnrInfo {
+ ctor public ApplicationErrorReport.AnrInfo();
+ ctor public ApplicationErrorReport.AnrInfo(android.os.Parcel);
+ method public void dump(android.util.Printer, java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public java.lang.String activity;
+ field public java.lang.String cause;
+ field public java.lang.String info;
+ }
+
+ public static class ApplicationErrorReport.BatteryInfo {
+ ctor public ApplicationErrorReport.BatteryInfo();
+ ctor public ApplicationErrorReport.BatteryInfo(android.os.Parcel);
+ method public void dump(android.util.Printer, java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public java.lang.String checkinDetails;
+ field public long durationMicros;
+ field public java.lang.String usageDetails;
+ field public int usagePercent;
+ }
+
+ public static class ApplicationErrorReport.CrashInfo {
+ ctor public ApplicationErrorReport.CrashInfo();
+ ctor public ApplicationErrorReport.CrashInfo(java.lang.Throwable);
+ ctor public ApplicationErrorReport.CrashInfo(android.os.Parcel);
+ method public void dump(android.util.Printer, java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public java.lang.String exceptionClassName;
+ field public java.lang.String exceptionMessage;
+ field public java.lang.String stackTrace;
+ field public java.lang.String throwClassName;
+ field public java.lang.String throwFileName;
+ field public int throwLineNumber;
+ field public java.lang.String throwMethodName;
+ }
+
+ public static class ApplicationErrorReport.RunningServiceInfo {
+ ctor public ApplicationErrorReport.RunningServiceInfo();
+ ctor public ApplicationErrorReport.RunningServiceInfo(android.os.Parcel);
+ method public void dump(android.util.Printer, java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public long durationMillis;
+ field public java.lang.String serviceDetails;
+ }
+
+ public class AutomaticZenRule implements android.os.Parcelable {
+ ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);
+ ctor public AutomaticZenRule(android.os.Parcel);
+ method public int describeContents();
+ method public android.net.Uri getConditionId();
+ method public long getCreationTime();
+ method public java.lang.String getId();
+ method public int getInterruptionFilter();
+ method public java.lang.String getName();
+ method public android.content.ComponentName getOwner();
+ method public boolean isEnabled();
+ method public void setConditionId(android.net.Uri);
+ method public void setEnabled(boolean);
+ method public void setInterruptionFilter(int);
+ method public void setName(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.AutomaticZenRule> CREATOR;
+ }
+
+ public class DatePickerDialog extends android.app.AlertDialog implements android.widget.DatePicker.OnDateChangedListener android.content.DialogInterface.OnClickListener {
+ ctor public DatePickerDialog(android.content.Context, android.app.DatePickerDialog.OnDateSetListener, int, int, int);
+ ctor public DatePickerDialog(android.content.Context, int, android.app.DatePickerDialog.OnDateSetListener, int, int, int);
+ method public android.widget.DatePicker getDatePicker();
+ method public void onClick(android.content.DialogInterface, int);
+ method public void onDateChanged(android.widget.DatePicker, int, int, int);
+ method public void updateDate(int, int, int);
+ }
+
+ public static abstract interface DatePickerDialog.OnDateSetListener {
+ method public abstract void onDateSet(android.widget.DatePicker, int, int, int);
+ }
+
+ public class Dialog implements android.content.DialogInterface android.view.KeyEvent.Callback android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
+ ctor public Dialog(android.content.Context);
+ ctor public Dialog(android.content.Context, int);
+ ctor protected Dialog(android.content.Context, boolean, android.content.DialogInterface.OnCancelListener);
+ method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public void cancel();
+ method public void closeOptionsMenu();
+ method public void create();
+ method public void dismiss();
+ method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);
+ method public boolean dispatchKeyEvent(android.view.KeyEvent);
+ method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);
+ method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public boolean dispatchTouchEvent(android.view.MotionEvent);
+ method public boolean dispatchTrackballEvent(android.view.MotionEvent);
+ method public android.view.View findViewById(int);
+ method public android.app.ActionBar getActionBar();
+ method public final android.content.Context getContext();
+ method public android.view.View getCurrentFocus();
+ method public android.view.LayoutInflater getLayoutInflater();
+ method public final android.app.Activity getOwnerActivity();
+ method public final android.view.SearchEvent getSearchEvent();
+ method public final int getVolumeControlStream();
+ method public android.view.Window getWindow();
+ method public void hide();
+ method public void invalidateOptionsMenu();
+ method public boolean isShowing();
+ method public void onActionModeFinished(android.view.ActionMode);
+ method public void onActionModeStarted(android.view.ActionMode);
+ method public void onAttachedToWindow();
+ method public void onBackPressed();
+ method public void onContentChanged();
+ method public boolean onContextItemSelected(android.view.MenuItem);
+ method public void onContextMenuClosed(android.view.Menu);
+ method protected void onCreate(android.os.Bundle);
+ method public void onCreateContextMenu(android.view.ContextMenu, android.view.View, android.view.ContextMenu.ContextMenuInfo);
+ method public boolean onCreateOptionsMenu(android.view.Menu);
+ method public boolean onCreatePanelMenu(int, android.view.Menu);
+ method public android.view.View onCreatePanelView(int);
+ method public void onDetachedFromWindow();
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public boolean onKeyShortcut(int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method public boolean onMenuItemSelected(int, android.view.MenuItem);
+ method public boolean onMenuOpened(int, android.view.Menu);
+ method public boolean onOptionsItemSelected(android.view.MenuItem);
+ method public void onOptionsMenuClosed(android.view.Menu);
+ method public void onPanelClosed(int, android.view.Menu);
+ method public boolean onPrepareOptionsMenu(android.view.Menu);
+ method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
+ method public void onRestoreInstanceState(android.os.Bundle);
+ method public android.os.Bundle onSaveInstanceState();
+ method public boolean onSearchRequested(android.view.SearchEvent);
+ method public boolean onSearchRequested();
+ method protected void onStart();
+ method protected void onStop();
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ method public boolean onTrackballEvent(android.view.MotionEvent);
+ method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
+ method public void onWindowFocusChanged(boolean);
+ method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
+ method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);
+ method public void openContextMenu(android.view.View);
+ method public void openOptionsMenu();
+ method public void registerForContextMenu(android.view.View);
+ method public final boolean requestWindowFeature(int);
+ method public void setCancelMessage(android.os.Message);
+ method public void setCancelable(boolean);
+ method public void setCanceledOnTouchOutside(boolean);
+ method public void setContentView(int);
+ method public void setContentView(android.view.View);
+ method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public void setDismissMessage(android.os.Message);
+ method public final void setFeatureDrawable(int, android.graphics.drawable.Drawable);
+ method public final void setFeatureDrawableAlpha(int, int);
+ method public final void setFeatureDrawableResource(int, int);
+ method public final void setFeatureDrawableUri(int, android.net.Uri);
+ method public void setOnCancelListener(android.content.DialogInterface.OnCancelListener);
+ method public void setOnDismissListener(android.content.DialogInterface.OnDismissListener);
+ method public void setOnKeyListener(android.content.DialogInterface.OnKeyListener);
+ method public void setOnShowListener(android.content.DialogInterface.OnShowListener);
+ method public final void setOwnerActivity(android.app.Activity);
+ method public void setTitle(java.lang.CharSequence);
+ method public void setTitle(int);
+ method public final void setVolumeControlStream(int);
+ method public void show();
+ method public void takeKeyEvents(boolean);
+ method public void unregisterForContextMenu(android.view.View);
+ }
+
+ public class DialogFragment extends android.app.Fragment implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener {
+ ctor public DialogFragment();
+ method public void dismiss();
+ method public void dismissAllowingStateLoss();
+ method public android.app.Dialog getDialog();
+ method public boolean getShowsDialog();
+ method public int getTheme();
+ method public boolean isCancelable();
+ method public void onCancel(android.content.DialogInterface);
+ method public android.app.Dialog onCreateDialog(android.os.Bundle);
+ method public void onDismiss(android.content.DialogInterface);
+ method public void setCancelable(boolean);
+ method public void setShowsDialog(boolean);
+ method public void setStyle(int, int);
+ method public void show(android.app.FragmentManager, java.lang.String);
+ method public int show(android.app.FragmentTransaction, java.lang.String);
+ field public static final int STYLE_NORMAL = 0; // 0x0
+ field public static final int STYLE_NO_FRAME = 2; // 0x2
+ field public static final int STYLE_NO_INPUT = 3; // 0x3
+ field public static final int STYLE_NO_TITLE = 1; // 0x1
+ }
+
+ public class DownloadManager {
+ method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean);
+ method public long enqueue(android.app.DownloadManager.Request);
+ method public static java.lang.Long getMaxBytesOverMobile(android.content.Context);
+ method public java.lang.String getMimeTypeForDownloadedFile(long);
+ method public static java.lang.Long getRecommendedMaxBytesOverMobile(android.content.Context);
+ method public android.net.Uri getUriForDownloadedFile(long);
+ method public android.os.ParcelFileDescriptor openDownloadedFile(long) throws java.io.FileNotFoundException;
+ method public android.database.Cursor query(android.app.DownloadManager.Query);
+ method public int remove(long...);
+ field public static final java.lang.String ACTION_DOWNLOAD_COMPLETE = "android.intent.action.DOWNLOAD_COMPLETE";
+ field public static final java.lang.String ACTION_NOTIFICATION_CLICKED = "android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED";
+ field public static final java.lang.String ACTION_VIEW_DOWNLOADS = "android.intent.action.VIEW_DOWNLOADS";
+ field public static final java.lang.String COLUMN_BYTES_DOWNLOADED_SO_FAR = "bytes_so_far";
+ field public static final java.lang.String COLUMN_DESCRIPTION = "description";
+ field public static final java.lang.String COLUMN_ID = "_id";
+ field public static final java.lang.String COLUMN_LAST_MODIFIED_TIMESTAMP = "last_modified_timestamp";
+ field public static final java.lang.String COLUMN_LOCAL_FILENAME = "local_filename";
+ field public static final java.lang.String COLUMN_LOCAL_URI = "local_uri";
+ field public static final java.lang.String COLUMN_MEDIAPROVIDER_URI = "mediaprovider_uri";
+ field public static final java.lang.String COLUMN_MEDIA_TYPE = "media_type";
+ field public static final java.lang.String COLUMN_REASON = "reason";
+ field public static final java.lang.String COLUMN_STATUS = "status";
+ field public static final java.lang.String COLUMN_TITLE = "title";
+ field public static final java.lang.String COLUMN_TOTAL_SIZE_BYTES = "total_size";
+ field public static final java.lang.String COLUMN_URI = "uri";
+ field public static final int ERROR_CANNOT_RESUME = 1008; // 0x3f0
+ field public static final int ERROR_DEVICE_NOT_FOUND = 1007; // 0x3ef
+ field public static final int ERROR_FILE_ALREADY_EXISTS = 1009; // 0x3f1
+ field public static final int ERROR_FILE_ERROR = 1001; // 0x3e9
+ field public static final int ERROR_HTTP_DATA_ERROR = 1004; // 0x3ec
+ field public static final int ERROR_INSUFFICIENT_SPACE = 1006; // 0x3ee
+ field public static final int ERROR_TOO_MANY_REDIRECTS = 1005; // 0x3ed
+ field public static final int ERROR_UNHANDLED_HTTP_CODE = 1002; // 0x3ea
+ field public static final int ERROR_UNKNOWN = 1000; // 0x3e8
+ field public static final java.lang.String EXTRA_DOWNLOAD_ID = "extra_download_id";
+ field public static final java.lang.String EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS = "extra_click_download_ids";
+ field public static final java.lang.String INTENT_EXTRAS_SORT_BY_SIZE = "android.app.DownloadManager.extra_sortBySize";
+ field public static final int PAUSED_QUEUED_FOR_WIFI = 3; // 0x3
+ field public static final int PAUSED_UNKNOWN = 4; // 0x4
+ field public static final int PAUSED_WAITING_FOR_NETWORK = 2; // 0x2
+ field public static final int PAUSED_WAITING_TO_RETRY = 1; // 0x1
+ field public static final int STATUS_FAILED = 16; // 0x10
+ field public static final int STATUS_PAUSED = 4; // 0x4
+ field public static final int STATUS_PENDING = 1; // 0x1
+ field public static final int STATUS_RUNNING = 2; // 0x2
+ field public static final int STATUS_SUCCESSFUL = 8; // 0x8
+ }
+
+ public static class DownloadManager.Query {
+ ctor public DownloadManager.Query();
+ method public android.app.DownloadManager.Query setFilterById(long...);
+ method public android.app.DownloadManager.Query setFilterByStatus(int);
+ }
+
+ public static class DownloadManager.Request {
+ ctor public DownloadManager.Request(android.net.Uri);
+ method public android.app.DownloadManager.Request addRequestHeader(java.lang.String, java.lang.String);
+ method public void allowScanningByMediaScanner();
+ method public android.app.DownloadManager.Request setAllowedNetworkTypes(int);
+ method public android.app.DownloadManager.Request setAllowedOverMetered(boolean);
+ method public android.app.DownloadManager.Request setAllowedOverRoaming(boolean);
+ method public android.app.DownloadManager.Request setDescription(java.lang.CharSequence);
+ method public android.app.DownloadManager.Request setDestinationInExternalFilesDir(android.content.Context, java.lang.String, java.lang.String);
+ method public android.app.DownloadManager.Request setDestinationInExternalPublicDir(java.lang.String, java.lang.String);
+ method public android.app.DownloadManager.Request setDestinationUri(android.net.Uri);
+ method public android.app.DownloadManager.Request setMimeType(java.lang.String);
+ method public android.app.DownloadManager.Request setNotificationVisibility(int);
+ method public deprecated android.app.DownloadManager.Request setShowRunningNotification(boolean);
+ method public android.app.DownloadManager.Request setTitle(java.lang.CharSequence);
+ method public android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean);
+ field public static final int NETWORK_MOBILE = 1; // 0x1
+ field public static final int NETWORK_WIFI = 2; // 0x2
+ field public static final int VISIBILITY_HIDDEN = 2; // 0x2
+ field public static final int VISIBILITY_VISIBLE = 0; // 0x0
+ field public static final int VISIBILITY_VISIBLE_NOTIFY_COMPLETED = 1; // 0x1
+ field public static final int VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION = 3; // 0x3
+ }
+
+ public class ExpandableListActivity extends android.app.Activity implements android.widget.ExpandableListView.OnChildClickListener android.widget.ExpandableListView.OnGroupCollapseListener android.widget.ExpandableListView.OnGroupExpandListener android.view.View.OnCreateContextMenuListener {
+ ctor public ExpandableListActivity();
+ method public android.widget.ExpandableListAdapter getExpandableListAdapter();
+ method public android.widget.ExpandableListView getExpandableListView();
+ method public long getSelectedId();
+ method public long getSelectedPosition();
+ method public boolean onChildClick(android.widget.ExpandableListView, android.view.View, int, int, long);
+ method public void onGroupCollapse(int);
+ method public void onGroupExpand(int);
+ method public void setListAdapter(android.widget.ExpandableListAdapter);
+ method public boolean setSelectedChild(int, int, boolean);
+ method public void setSelectedGroup(int);
+ }
+
+ public class Fragment implements android.content.ComponentCallbacks2 android.view.View.OnCreateContextMenuListener {
+ ctor public Fragment();
+ method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public final boolean equals(java.lang.Object);
+ method public final android.app.Activity getActivity();
+ method public boolean getAllowEnterTransitionOverlap();
+ method public boolean getAllowReturnTransitionOverlap();
+ method public final android.os.Bundle getArguments();
+ method public final android.app.FragmentManager getChildFragmentManager();
+ method public android.content.Context getContext();
+ method public android.transition.Transition getEnterTransition();
+ method public android.transition.Transition getExitTransition();
+ method public final android.app.FragmentManager getFragmentManager();
+ method public final java.lang.Object getHost();
+ method public final int getId();
+ method public android.app.LoaderManager getLoaderManager();
+ method public final android.app.Fragment getParentFragment();
+ method public android.transition.Transition getReenterTransition();
+ method public final android.content.res.Resources getResources();
+ method public final boolean getRetainInstance();
+ method public android.transition.Transition getReturnTransition();
+ method public android.transition.Transition getSharedElementEnterTransition();
+ method public android.transition.Transition getSharedElementReturnTransition();
+ method public final java.lang.String getString(int);
+ method public final java.lang.String getString(int, java.lang.Object...);
+ method public final java.lang.String getTag();
+ method public final android.app.Fragment getTargetFragment();
+ method public final int getTargetRequestCode();
+ method public final java.lang.CharSequence getText(int);
+ method public boolean getUserVisibleHint();
+ method public android.view.View getView();
+ method public final int hashCode();
+ method public static android.app.Fragment instantiate(android.content.Context, java.lang.String);
+ method public static android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle);
+ method public final boolean isAdded();
+ method public final boolean isDetached();
+ method public final boolean isHidden();
+ method public final boolean isInLayout();
+ method public final boolean isRemoving();
+ method public final boolean isResumed();
+ method public final boolean isVisible();
+ method public void onActivityCreated(android.os.Bundle);
+ method public void onActivityResult(int, int, android.content.Intent);
+ method public void onAttach(android.content.Context);
+ method public deprecated void onAttach(android.app.Activity);
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public boolean onContextItemSelected(android.view.MenuItem);
+ method public void onCreate(android.os.Bundle);
+ method public android.animation.Animator onCreateAnimator(int, boolean, int);
+ method public void onCreateContextMenu(android.view.ContextMenu, android.view.View, android.view.ContextMenu.ContextMenuInfo);
+ method public void onCreateOptionsMenu(android.view.Menu, android.view.MenuInflater);
+ method public android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle);
+ method public void onDestroy();
+ method public void onDestroyOptionsMenu();
+ method public void onDestroyView();
+ method public void onDetach();
+ method public void onHiddenChanged(boolean);
+ method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);
+ method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
+ method public deprecated void onInflate(android.app.Activity, android.util.AttributeSet, android.os.Bundle);
+ method public void onLowMemory();
+ method public boolean onOptionsItemSelected(android.view.MenuItem);
+ method public void onOptionsMenuClosed(android.view.Menu);
+ method public void onPause();
+ method public void onPrepareOptionsMenu(android.view.Menu);
+ method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
+ method public void onResume();
+ method public void onSaveInstanceState(android.os.Bundle);
+ method public void onStart();
+ method public void onStop();
+ method public void onTrimMemory(int);
+ method public void onViewCreated(android.view.View, android.os.Bundle);
+ method public void onViewStateRestored(android.os.Bundle);
+ method public void registerForContextMenu(android.view.View);
+ method public final void requestPermissions(java.lang.String[], int);
+ method public void setAllowEnterTransitionOverlap(boolean);
+ method public void setAllowReturnTransitionOverlap(boolean);
+ method public void setArguments(android.os.Bundle);
+ method public void setEnterSharedElementCallback(android.app.SharedElementCallback);
+ method public void setEnterTransition(android.transition.Transition);
+ method public void setExitSharedElementCallback(android.app.SharedElementCallback);
+ method public void setExitTransition(android.transition.Transition);
+ method public void setHasOptionsMenu(boolean);
+ method public void setInitialSavedState(android.app.Fragment.SavedState);
+ method public void setMenuVisibility(boolean);
+ method public void setReenterTransition(android.transition.Transition);
+ method public void setRetainInstance(boolean);
+ method public void setReturnTransition(android.transition.Transition);
+ method public void setSharedElementEnterTransition(android.transition.Transition);
+ method public void setSharedElementReturnTransition(android.transition.Transition);
+ method public void setTargetFragment(android.app.Fragment, int);
+ method public void setUserVisibleHint(boolean);
+ method public boolean shouldShowRequestPermissionRationale(java.lang.String);
+ method public void startActivity(android.content.Intent);
+ method public void startActivity(android.content.Intent, android.os.Bundle);
+ method public void startActivityForResult(android.content.Intent, int);
+ method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);
+ method public void unregisterForContextMenu(android.view.View);
+ }
+
+ public static class Fragment.InstantiationException extends android.util.AndroidRuntimeException {
+ ctor public Fragment.InstantiationException(java.lang.String, java.lang.Exception);
+ }
+
+ public static class Fragment.SavedState implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.ClassLoaderCreator<android.app.Fragment.SavedState> CREATOR;
+ }
+
+ public deprecated class FragmentBreadCrumbs extends android.view.ViewGroup implements android.app.FragmentManager.OnBackStackChangedListener {
+ ctor public FragmentBreadCrumbs(android.content.Context);
+ ctor public FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet);
+ ctor public FragmentBreadCrumbs(android.content.Context, android.util.AttributeSet, int);
+ method public void onBackStackChanged();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setActivity(android.app.Activity);
+ method public void setMaxVisible(int);
+ method public void setOnBreadCrumbClickListener(android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener);
+ method public void setParentTitle(java.lang.CharSequence, java.lang.CharSequence, android.view.View.OnClickListener);
+ method public void setTitle(java.lang.CharSequence, java.lang.CharSequence);
+ }
+
+ public static abstract interface FragmentBreadCrumbs.OnBreadCrumbClickListener {
+ method public abstract boolean onBreadCrumbClick(android.app.FragmentManager.BackStackEntry, int);
+ }
+
+ public abstract class FragmentContainer {
+ ctor public FragmentContainer();
+ method public abstract android.view.View onFindViewById(int);
+ method public abstract boolean onHasView();
+ }
+
+ public class FragmentController {
+ method public void attachHost(android.app.Fragment);
+ method public static final android.app.FragmentController createController(android.app.FragmentHostCallback<?>);
+ method public void dispatchActivityCreated();
+ method public void dispatchConfigurationChanged(android.content.res.Configuration);
+ method public boolean dispatchContextItemSelected(android.view.MenuItem);
+ method public void dispatchCreate();
+ method public boolean dispatchCreateOptionsMenu(android.view.Menu, android.view.MenuInflater);
+ method public void dispatchDestroy();
+ method public void dispatchDestroyView();
+ method public void dispatchLowMemory();
+ method public boolean dispatchOptionsItemSelected(android.view.MenuItem);
+ method public void dispatchOptionsMenuClosed(android.view.Menu);
+ method public void dispatchPause();
+ method public boolean dispatchPrepareOptionsMenu(android.view.Menu);
+ method public void dispatchResume();
+ method public void dispatchStart();
+ method public void dispatchStop();
+ method public void dispatchTrimMemory(int);
+ method public void doLoaderDestroy();
+ method public void doLoaderStart();
+ method public void doLoaderStop(boolean);
+ method public void dumpLoaders(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public boolean execPendingActions();
+ method public android.app.Fragment findFragmentByWho(java.lang.String);
+ method public android.app.FragmentManager getFragmentManager();
+ method public android.app.LoaderManager getLoaderManager();
+ method public void noteStateNotSaved();
+ method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);
+ method public void reportLoaderStart();
+ method public void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);
+ method public void restoreLoaderNonConfig(android.util.ArrayMap<java.lang.String, android.app.LoaderManager>);
+ method public android.util.ArrayMap<java.lang.String, android.app.LoaderManager> retainLoaderNonConfig();
+ method public java.util.List<android.app.Fragment> retainNonConfig();
+ method public android.os.Parcelable saveAllState();
+ }
+
+ public abstract class FragmentHostCallback extends android.app.FragmentContainer {
+ ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);
+ method public void onAttachFragment(android.app.Fragment);
+ method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public android.view.View onFindViewById(int);
+ method public abstract E onGetHost();
+ method public android.view.LayoutInflater onGetLayoutInflater();
+ method public int onGetWindowAnimations();
+ method public boolean onHasView();
+ method public boolean onHasWindowAnimations();
+ method public void onInvalidateOptionsMenu();
+ method public void onRequestPermissionsFromFragment(android.app.Fragment, java.lang.String[], int);
+ method public boolean onShouldSaveFragmentState(android.app.Fragment);
+ method public void onStartActivityFromFragment(android.app.Fragment, android.content.Intent, int, android.os.Bundle);
+ method public boolean onUseFragmentManagerInflaterFactory();
+ }
+
+ public abstract class FragmentManager {
+ ctor public FragmentManager();
+ method public abstract void addOnBackStackChangedListener(android.app.FragmentManager.OnBackStackChangedListener);
+ method public abstract android.app.FragmentTransaction beginTransaction();
+ method public abstract void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public static void enableDebugLogging(boolean);
+ method public abstract boolean executePendingTransactions();
+ method public abstract android.app.Fragment findFragmentById(int);
+ method public abstract android.app.Fragment findFragmentByTag(java.lang.String);
+ method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);
+ method public abstract int getBackStackEntryCount();
+ method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);
+ method public void invalidateOptionsMenu();
+ method public abstract boolean isDestroyed();
+ method public abstract void popBackStack();
+ method public abstract void popBackStack(java.lang.String, int);
+ method public abstract void popBackStack(int, int);
+ method public abstract boolean popBackStackImmediate();
+ method public abstract boolean popBackStackImmediate(java.lang.String, int);
+ method public abstract boolean popBackStackImmediate(int, int);
+ method public abstract void putFragment(android.os.Bundle, java.lang.String, android.app.Fragment);
+ method public abstract void removeOnBackStackChangedListener(android.app.FragmentManager.OnBackStackChangedListener);
+ method public abstract android.app.Fragment.SavedState saveFragmentInstanceState(android.app.Fragment);
+ field public static final int POP_BACK_STACK_INCLUSIVE = 1; // 0x1
+ }
+
+ public static abstract interface FragmentManager.BackStackEntry {
+ method public abstract java.lang.CharSequence getBreadCrumbShortTitle();
+ method public abstract int getBreadCrumbShortTitleRes();
+ method public abstract java.lang.CharSequence getBreadCrumbTitle();
+ method public abstract int getBreadCrumbTitleRes();
+ method public abstract int getId();
+ method public abstract java.lang.String getName();
+ }
+
+ public static abstract interface FragmentManager.OnBackStackChangedListener {
+ method public abstract void onBackStackChanged();
+ }
+
+ public abstract class FragmentTransaction {
+ ctor public FragmentTransaction();
+ method public abstract android.app.FragmentTransaction add(android.app.Fragment, java.lang.String);
+ method public abstract android.app.FragmentTransaction add(int, android.app.Fragment);
+ method public abstract android.app.FragmentTransaction add(int, android.app.Fragment, java.lang.String);
+ method public abstract android.app.FragmentTransaction addSharedElement(android.view.View, java.lang.String);
+ method public abstract android.app.FragmentTransaction addToBackStack(java.lang.String);
+ method public abstract android.app.FragmentTransaction attach(android.app.Fragment);
+ method public abstract int commit();
+ method public abstract int commitAllowingStateLoss();
+ method public abstract android.app.FragmentTransaction detach(android.app.Fragment);
+ method public abstract android.app.FragmentTransaction disallowAddToBackStack();
+ method public abstract android.app.FragmentTransaction hide(android.app.Fragment);
+ method public abstract boolean isAddToBackStackAllowed();
+ method public abstract boolean isEmpty();
+ method public abstract android.app.FragmentTransaction remove(android.app.Fragment);
+ method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment);
+ method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String);
+ method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int);
+ method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence);
+ method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int);
+ method public abstract android.app.FragmentTransaction setBreadCrumbTitle(java.lang.CharSequence);
+ method public abstract android.app.FragmentTransaction setCustomAnimations(int, int);
+ method public abstract android.app.FragmentTransaction setCustomAnimations(int, int, int, int);
+ method public abstract android.app.FragmentTransaction setTransition(int);
+ method public abstract android.app.FragmentTransaction setTransitionStyle(int);
+ method public abstract android.app.FragmentTransaction show(android.app.Fragment);
+ field public static final int TRANSIT_ENTER_MASK = 4096; // 0x1000
+ field public static final int TRANSIT_EXIT_MASK = 8192; // 0x2000
+ field public static final int TRANSIT_FRAGMENT_CLOSE = 8194; // 0x2002
+ field public static final int TRANSIT_FRAGMENT_FADE = 4099; // 0x1003
+ field public static final int TRANSIT_FRAGMENT_OPEN = 4097; // 0x1001
+ field public static final int TRANSIT_NONE = 0; // 0x0
+ field public static final int TRANSIT_UNSET = -1; // 0xffffffff
+ }
+
+ public class Instrumentation {
+ ctor public Instrumentation();
+ method public void addMonitor(android.app.Instrumentation.ActivityMonitor);
+ method public android.app.Instrumentation.ActivityMonitor addMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean);
+ method public android.app.Instrumentation.ActivityMonitor addMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean);
+ method public void callActivityOnCreate(android.app.Activity, android.os.Bundle);
+ method public void callActivityOnCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);
+ method public void callActivityOnDestroy(android.app.Activity);
+ method public void callActivityOnNewIntent(android.app.Activity, android.content.Intent);
+ method public void callActivityOnPause(android.app.Activity);
+ method public void callActivityOnPostCreate(android.app.Activity, android.os.Bundle);
+ method public void callActivityOnPostCreate(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);
+ method public void callActivityOnRestart(android.app.Activity);
+ method public void callActivityOnRestoreInstanceState(android.app.Activity, android.os.Bundle);
+ method public void callActivityOnRestoreInstanceState(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);
+ method public void callActivityOnResume(android.app.Activity);
+ method public void callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle);
+ method public void callActivityOnSaveInstanceState(android.app.Activity, android.os.Bundle, android.os.PersistableBundle);
+ method public void callActivityOnStart(android.app.Activity);
+ method public void callActivityOnStop(android.app.Activity);
+ method public void callActivityOnUserLeaving(android.app.Activity);
+ method public void callApplicationOnCreate(android.app.Application);
+ method public boolean checkMonitorHit(android.app.Instrumentation.ActivityMonitor, int);
+ method public void endPerformanceSnapshot();
+ method public void finish(int, android.os.Bundle);
+ method public android.os.Bundle getAllocCounts();
+ method public android.os.Bundle getBinderCounts();
+ method public android.content.ComponentName getComponentName();
+ method public android.content.Context getContext();
+ method public android.content.Context getTargetContext();
+ method public android.app.UiAutomation getUiAutomation();
+ method public boolean invokeContextMenuAction(android.app.Activity, int, int);
+ method public boolean invokeMenuActionSync(android.app.Activity, int, int);
+ method public boolean isProfiling();
+ method public android.app.Activity newActivity(java.lang.Class<?>, android.content.Context, android.os.IBinder, android.app.Application, android.content.Intent, android.content.pm.ActivityInfo, java.lang.CharSequence, android.app.Activity, java.lang.String, java.lang.Object) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public android.app.Activity newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public android.app.Application newApplication(java.lang.ClassLoader, java.lang.String, android.content.Context) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public static android.app.Application newApplication(java.lang.Class<?>, android.content.Context) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public void onCreate(android.os.Bundle);
+ method public void onDestroy();
+ method public boolean onException(java.lang.Object, java.lang.Throwable);
+ method public void onStart();
+ method public void removeMonitor(android.app.Instrumentation.ActivityMonitor);
+ method public void runOnMainSync(java.lang.Runnable);
+ method public void sendCharacterSync(int);
+ method public void sendKeyDownUpSync(int);
+ method public void sendKeySync(android.view.KeyEvent);
+ method public void sendPointerSync(android.view.MotionEvent);
+ method public void sendStatus(int, android.os.Bundle);
+ method public void sendStringSync(java.lang.String);
+ method public void sendTrackballEventSync(android.view.MotionEvent);
+ method public void setAutomaticPerformanceSnapshots();
+ method public void setInTouchMode(boolean);
+ method public void start();
+ method public android.app.Activity startActivitySync(android.content.Intent);
+ method public deprecated void startAllocCounting();
+ method public void startPerformanceSnapshot();
+ method public void startProfiling();
+ method public deprecated void stopAllocCounting();
+ method public void stopProfiling();
+ method public void waitForIdle(java.lang.Runnable);
+ method public void waitForIdleSync();
+ method public android.app.Activity waitForMonitor(android.app.Instrumentation.ActivityMonitor);
+ method public android.app.Activity waitForMonitorWithTimeout(android.app.Instrumentation.ActivityMonitor, long);
+ field public static final java.lang.String REPORT_KEY_IDENTIFIER = "id";
+ field public static final java.lang.String REPORT_KEY_STREAMRESULT = "stream";
+ }
+
+ public static class Instrumentation.ActivityMonitor {
+ ctor public Instrumentation.ActivityMonitor(android.content.IntentFilter, android.app.Instrumentation.ActivityResult, boolean);
+ ctor public Instrumentation.ActivityMonitor(java.lang.String, android.app.Instrumentation.ActivityResult, boolean);
+ method public final android.content.IntentFilter getFilter();
+ method public final int getHits();
+ method public final android.app.Activity getLastActivity();
+ method public final android.app.Instrumentation.ActivityResult getResult();
+ method public final boolean isBlocking();
+ method public final android.app.Activity waitForActivity();
+ method public final android.app.Activity waitForActivityWithTimeout(long);
+ }
+
+ public static final class Instrumentation.ActivityResult {
+ ctor public Instrumentation.ActivityResult(int, android.content.Intent);
+ method public int getResultCode();
+ method public android.content.Intent getResultData();
+ }
+
+ public abstract class IntentService extends android.app.Service {
+ ctor public IntentService(java.lang.String);
+ method public android.os.IBinder onBind(android.content.Intent);
+ method protected abstract void onHandleIntent(android.content.Intent);
+ method public void setIntentRedelivery(boolean);
+ }
+
+ public class KeyguardManager {
+ method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
+ method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
+ method public boolean inKeyguardRestrictedInputMode();
+ method public boolean isDeviceLocked();
+ method public boolean isDeviceSecure();
+ method public boolean isKeyguardLocked();
+ method public boolean isKeyguardSecure();
+ method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);
+ }
+
+ public deprecated class KeyguardManager.KeyguardLock {
+ method public void disableKeyguard();
+ method public void reenableKeyguard();
+ }
+
+ public static abstract interface KeyguardManager.OnKeyguardExitResult {
+ method public abstract void onKeyguardExitResult(boolean);
+ }
+
+ public abstract class LauncherActivity extends android.app.ListActivity {
+ ctor public LauncherActivity();
+ method protected android.content.Intent getTargetIntent();
+ method protected android.content.Intent intentForPosition(int);
+ method protected android.app.LauncherActivity.ListItem itemForPosition(int);
+ method public java.util.List<android.app.LauncherActivity.ListItem> makeListItems();
+ method protected java.util.List<android.content.pm.ResolveInfo> onQueryPackageManager(android.content.Intent);
+ method protected void onSetContentView();
+ }
+
+ public class LauncherActivity.IconResizer {
+ ctor public LauncherActivity.IconResizer();
+ method public android.graphics.drawable.Drawable createIconThumbnail(android.graphics.drawable.Drawable);
+ }
+
+ public static class LauncherActivity.ListItem {
+ ctor public LauncherActivity.ListItem();
+ field public java.lang.String className;
+ field public android.os.Bundle extras;
+ field public android.graphics.drawable.Drawable icon;
+ field public java.lang.CharSequence label;
+ field public java.lang.String packageName;
+ field public android.content.pm.ResolveInfo resolveInfo;
+ }
+
+ public class ListActivity extends android.app.Activity {
+ ctor public ListActivity();
+ method public android.widget.ListAdapter getListAdapter();
+ method public android.widget.ListView getListView();
+ method public long getSelectedItemId();
+ method public int getSelectedItemPosition();
+ method protected void onListItemClick(android.widget.ListView, android.view.View, int, long);
+ method public void setListAdapter(android.widget.ListAdapter);
+ method public void setSelection(int);
+ }
+
+ public class ListFragment extends android.app.Fragment {
+ ctor public ListFragment();
+ method public android.widget.ListAdapter getListAdapter();
+ method public android.widget.ListView getListView();
+ method public long getSelectedItemId();
+ method public int getSelectedItemPosition();
+ method public void onListItemClick(android.widget.ListView, android.view.View, int, long);
+ method public void setEmptyText(java.lang.CharSequence);
+ method public void setListAdapter(android.widget.ListAdapter);
+ method public void setListShown(boolean);
+ method public void setListShownNoAnimation(boolean);
+ method public void setSelection(int);
+ }
+
+ public abstract class LoaderManager {
+ ctor public LoaderManager();
+ method public abstract void destroyLoader(int);
+ method public abstract void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public static void enableDebugLogging(boolean);
+ method public abstract android.content.Loader<D> getLoader(int);
+ method public abstract android.content.Loader<D> initLoader(int, android.os.Bundle, android.app.LoaderManager.LoaderCallbacks<D>);
+ method public abstract android.content.Loader<D> restartLoader(int, android.os.Bundle, android.app.LoaderManager.LoaderCallbacks<D>);
+ }
+
+ public static abstract interface LoaderManager.LoaderCallbacks {
+ method public abstract android.content.Loader<D> onCreateLoader(int, android.os.Bundle);
+ method public abstract void onLoadFinished(android.content.Loader<D>, D);
+ method public abstract void onLoaderReset(android.content.Loader<D>);
+ }
+
+ public deprecated class LocalActivityManager {
+ ctor public LocalActivityManager(android.app.Activity, boolean);
+ method public android.view.Window destroyActivity(java.lang.String, boolean);
+ method public void dispatchCreate(android.os.Bundle);
+ method public void dispatchDestroy(boolean);
+ method public void dispatchPause(boolean);
+ method public void dispatchResume();
+ method public void dispatchStop();
+ method public android.app.Activity getActivity(java.lang.String);
+ method public android.app.Activity getCurrentActivity();
+ method public java.lang.String getCurrentId();
+ method public void removeAllActivities();
+ method public android.os.Bundle saveInstanceState();
+ method public android.view.Window startActivity(java.lang.String, android.content.Intent);
+ }
+
+ public class MediaRouteActionProvider extends android.view.ActionProvider {
+ ctor public MediaRouteActionProvider(android.content.Context);
+ method public android.view.View onCreateActionView();
+ method public void setExtendedSettingsClickListener(android.view.View.OnClickListener);
+ method public void setRouteTypes(int);
+ }
+
+ public class MediaRouteButton extends android.view.View {
+ ctor public MediaRouteButton(android.content.Context);
+ ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet);
+ ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int);
+ ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getRouteTypes();
+ method public void onAttachedToWindow();
+ method public void onDetachedFromWindow();
+ method public void setExtendedSettingsClickListener(android.view.View.OnClickListener);
+ method public void setRouteTypes(int);
+ method public void showDialog();
+ }
+
+ public class NativeActivity extends android.app.Activity implements android.view.InputQueue.Callback android.view.SurfaceHolder.Callback2 android.view.ViewTreeObserver.OnGlobalLayoutListener {
+ ctor public NativeActivity();
+ method public void onGlobalLayout();
+ method public void onInputQueueCreated(android.view.InputQueue);
+ method public void onInputQueueDestroyed(android.view.InputQueue);
+ 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 void surfaceRedrawNeeded(android.view.SurfaceHolder);
+ field public static final java.lang.String META_DATA_FUNC_NAME = "android.app.func_name";
+ field public static final java.lang.String META_DATA_LIB_NAME = "android.app.lib_name";
+ }
+
+ public class Notification implements android.os.Parcelable {
+ ctor public Notification();
+ ctor public deprecated Notification(int, java.lang.CharSequence, long);
+ ctor public Notification(android.os.Parcel);
+ method public android.app.Notification clone();
+ method public int describeContents();
+ method public java.lang.String getGroup();
+ method public android.graphics.drawable.Icon getLargeIcon();
+ method public android.graphics.drawable.Icon getSmallIcon();
+ method public java.lang.String getSortKey();
+ method public android.app.Notification.Topic getTopic();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
+ field public static final java.lang.String CATEGORY_ALARM = "alarm";
+ field public static final java.lang.String CATEGORY_CALL = "call";
+ field public static final java.lang.String CATEGORY_EMAIL = "email";
+ field public static final java.lang.String CATEGORY_ERROR = "err";
+ field public static final java.lang.String CATEGORY_EVENT = "event";
+ field public static final java.lang.String CATEGORY_MESSAGE = "msg";
+ field public static final java.lang.String CATEGORY_PROGRESS = "progress";
+ field public static final java.lang.String CATEGORY_PROMO = "promo";
+ field public static final java.lang.String CATEGORY_RECOMMENDATION = "recommendation";
+ field public static final java.lang.String CATEGORY_REMINDER = "reminder";
+ field public static final java.lang.String CATEGORY_SERVICE = "service";
+ field public static final java.lang.String CATEGORY_SOCIAL = "social";
+ field public static final java.lang.String CATEGORY_STATUS = "status";
+ field public static final java.lang.String CATEGORY_SYSTEM = "sys";
+ field public static final java.lang.String CATEGORY_TRANSPORT = "transport";
+ field public static final int COLOR_DEFAULT = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.app.Notification> CREATOR;
+ field public static final int DEFAULT_ALL = -1; // 0xffffffff
+ field public static final int DEFAULT_LIGHTS = 4; // 0x4
+ field public static final int DEFAULT_SOUND = 1; // 0x1
+ field public static final int DEFAULT_VIBRATE = 2; // 0x2
+ field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
+ field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
+ field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";
+ field public static final java.lang.String EXTRA_INFO_TEXT = "android.infoText";
+ field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";
+ field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";
+ field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";
+ field public static final java.lang.String EXTRA_PEOPLE = "android.people";
+ field public static final java.lang.String EXTRA_PICTURE = "android.picture";
+ field public static final java.lang.String EXTRA_PROGRESS = "android.progress";
+ field public static final java.lang.String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate";
+ field public static final java.lang.String EXTRA_PROGRESS_MAX = "android.progressMax";
+ field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";
+ field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";
+ field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";
+ field public static final java.lang.String EXTRA_SUB_TEXT = "android.subText";
+ field public static final java.lang.String EXTRA_SUMMARY_TEXT = "android.summaryText";
+ field public static final java.lang.String EXTRA_TEMPLATE = "android.template";
+ field public static final java.lang.String EXTRA_TEXT = "android.text";
+ field public static final java.lang.String EXTRA_TEXT_LINES = "android.textLines";
+ field public static final java.lang.String EXTRA_TITLE = "android.title";
+ field public static final java.lang.String EXTRA_TITLE_BIG = "android.title.big";
+ field public static final int FLAG_AUTO_CANCEL = 16; // 0x10
+ field public static final int FLAG_FOREGROUND_SERVICE = 64; // 0x40
+ field public static final int FLAG_GROUP_SUMMARY = 512; // 0x200
+ field public static final deprecated int FLAG_HIGH_PRIORITY = 128; // 0x80
+ field public static final int FLAG_INSISTENT = 4; // 0x4
+ field public static final int FLAG_LOCAL_ONLY = 256; // 0x100
+ field public static final int FLAG_NO_CLEAR = 32; // 0x20
+ field public static final int FLAG_ONGOING_EVENT = 2; // 0x2
+ field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8
+ field public static final int FLAG_SHOW_LIGHTS = 1; // 0x1
+ field public static final java.lang.String INTENT_CATEGORY_NOTIFICATION_PREFERENCES = "android.intent.category.NOTIFICATION_PREFERENCES";
+ field public static final int PRIORITY_DEFAULT = 0; // 0x0
+ field public static final int PRIORITY_HIGH = 1; // 0x1
+ field public static final int PRIORITY_LOW = -1; // 0xffffffff
+ field public static final int PRIORITY_MAX = 2; // 0x2
+ field public static final int PRIORITY_MIN = -2; // 0xfffffffe
+ field public static final deprecated int STREAM_DEFAULT = -1; // 0xffffffff
+ field public static final java.lang.String TOPIC_DEFAULT = "system_default_topic";
+ field public static final int VISIBILITY_PRIVATE = 0; // 0x0
+ field public static final int VISIBILITY_PUBLIC = 1; // 0x1
+ field public static final int VISIBILITY_SECRET = -1; // 0xffffffff
+ field public android.app.Notification.Action[] actions;
+ field public android.media.AudioAttributes audioAttributes;
+ field public deprecated int audioStreamType;
+ field public deprecated android.widget.RemoteViews bigContentView;
+ field public java.lang.String category;
+ field public int color;
+ field public android.app.PendingIntent contentIntent;
+ field public deprecated android.widget.RemoteViews contentView;
+ field public int defaults;
+ field public android.app.PendingIntent deleteIntent;
+ field public android.os.Bundle extras;
+ field public int flags;
+ field public android.app.PendingIntent fullScreenIntent;
+ field public deprecated android.widget.RemoteViews headsUpContentView;
+ field public deprecated int icon;
+ field public int iconLevel;
+ field public deprecated android.graphics.Bitmap largeIcon;
+ field public int ledARGB;
+ field public int ledOffMS;
+ field public int ledOnMS;
+ field public int number;
+ field public int priority;
+ field public android.app.Notification publicVersion;
+ field public android.net.Uri sound;
+ field public java.lang.CharSequence tickerText;
+ field public deprecated android.widget.RemoteViews tickerView;
+ field public long[] vibrate;
+ field public int visibility;
+ field public long when;
+ }
+
+ public static class Notification.Action implements android.os.Parcelable {
+ ctor public deprecated Notification.Action(int, java.lang.CharSequence, android.app.PendingIntent);
+ method public android.app.Notification.Action clone();
+ method public int describeContents();
+ method public android.os.Bundle getExtras();
+ method public android.graphics.drawable.Icon getIcon();
+ method public android.app.RemoteInput[] getRemoteInputs();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.Notification.Action> CREATOR;
+ field public android.app.PendingIntent actionIntent;
+ field public deprecated int icon;
+ field public java.lang.CharSequence title;
+ }
+
+ public static final class Notification.Action.Builder {
+ ctor public deprecated Notification.Action.Builder(int, java.lang.CharSequence, android.app.PendingIntent);
+ ctor public Notification.Action.Builder(android.graphics.drawable.Icon, java.lang.CharSequence, android.app.PendingIntent);
+ ctor public Notification.Action.Builder(android.app.Notification.Action);
+ method public android.app.Notification.Action.Builder addExtras(android.os.Bundle);
+ method public android.app.Notification.Action.Builder addRemoteInput(android.app.RemoteInput);
+ method public android.app.Notification.Action build();
+ method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Extender);
+ method public android.os.Bundle getExtras();
+ }
+
+ public static abstract interface Notification.Action.Extender {
+ method public abstract android.app.Notification.Action.Builder extend(android.app.Notification.Action.Builder);
+ }
+
+ public static final class Notification.Action.WearableExtender implements android.app.Notification.Action.Extender {
+ ctor public Notification.Action.WearableExtender();
+ ctor public Notification.Action.WearableExtender(android.app.Notification.Action);
+ method public android.app.Notification.Action.WearableExtender clone();
+ method public android.app.Notification.Action.Builder extend(android.app.Notification.Action.Builder);
+ method public java.lang.CharSequence getCancelLabel();
+ method public java.lang.CharSequence getConfirmLabel();
+ method public java.lang.CharSequence getInProgressLabel();
+ method public boolean isAvailableOffline();
+ method public android.app.Notification.Action.WearableExtender setAvailableOffline(boolean);
+ method public android.app.Notification.Action.WearableExtender setCancelLabel(java.lang.CharSequence);
+ method public android.app.Notification.Action.WearableExtender setConfirmLabel(java.lang.CharSequence);
+ method public android.app.Notification.Action.WearableExtender setInProgressLabel(java.lang.CharSequence);
+ }
+
+ public static class Notification.BigPictureStyle extends android.app.Notification.Style {
+ ctor public Notification.BigPictureStyle();
+ ctor public Notification.BigPictureStyle(android.app.Notification.Builder);
+ method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);
+ method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.drawable.Icon);
+ method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);
+ method public android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence);
+ method public android.app.Notification.BigPictureStyle setSummaryText(java.lang.CharSequence);
+ }
+
+ public static class Notification.BigTextStyle extends android.app.Notification.Style {
+ ctor public Notification.BigTextStyle();
+ ctor public Notification.BigTextStyle(android.app.Notification.Builder);
+ method public android.app.Notification.BigTextStyle bigText(java.lang.CharSequence);
+ method public android.app.Notification.BigTextStyle setBigContentTitle(java.lang.CharSequence);
+ method public android.app.Notification.BigTextStyle setSummaryText(java.lang.CharSequence);
+ }
+
+ public static class Notification.Builder {
+ ctor public Notification.Builder(android.content.Context);
+ method public deprecated android.app.Notification.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent);
+ method public android.app.Notification.Builder addAction(android.app.Notification.Action);
+ method public android.app.Notification.Builder addExtras(android.os.Bundle);
+ method public android.app.Notification.Builder addPerson(java.lang.String);
+ method public android.app.Notification build();
+ method public android.app.Notification.Builder extend(android.app.Notification.Extender);
+ method public android.os.Bundle getExtras();
+ method public deprecated android.app.Notification getNotification();
+ method public android.widget.RemoteViews makeBigContentView();
+ method public android.widget.RemoteViews makeContentView();
+ method public android.widget.RemoteViews makeHeadsUpContentView();
+ method public static android.app.Notification.Builder recoverBuilder(android.content.Context, android.app.Notification);
+ method public android.app.Notification.Builder setActions(android.app.Notification.Action...);
+ method public android.app.Notification.Builder setAutoCancel(boolean);
+ method public android.app.Notification.Builder setCategory(java.lang.String);
+ method public android.app.Notification.Builder setColor(int);
+ method public deprecated android.app.Notification.Builder setContent(android.widget.RemoteViews);
+ method public android.app.Notification.Builder setContentInfo(java.lang.CharSequence);
+ method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent);
+ method public android.app.Notification.Builder setContentText(java.lang.CharSequence);
+ method public android.app.Notification.Builder setContentTitle(java.lang.CharSequence);
+ method public android.app.Notification.Builder setCustomBigContentView(android.widget.RemoteViews);
+ method public android.app.Notification.Builder setCustomContentView(android.widget.RemoteViews);
+ method public android.app.Notification.Builder setCustomHeadsUpContentView(android.widget.RemoteViews);
+ method public android.app.Notification.Builder setDefaults(int);
+ method public android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent);
+ method public android.app.Notification.Builder setExtras(android.os.Bundle);
+ method public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);
+ method public android.app.Notification.Builder setGroup(java.lang.String);
+ method public android.app.Notification.Builder setGroupSummary(boolean);
+ method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap);
+ method public android.app.Notification.Builder setLargeIcon(android.graphics.drawable.Icon);
+ method public android.app.Notification.Builder setLights(int, int, int);
+ method public android.app.Notification.Builder setLocalOnly(boolean);
+ method public android.app.Notification.Builder setNumber(int);
+ method public android.app.Notification.Builder setOngoing(boolean);
+ method public android.app.Notification.Builder setOnlyAlertOnce(boolean);
+ method public android.app.Notification.Builder setPriority(int);
+ method public android.app.Notification.Builder setProgress(int, int, boolean);
+ method public android.app.Notification.Builder setPublicVersion(android.app.Notification);
+ method public android.app.Notification.Builder setShowWhen(boolean);
+ method public android.app.Notification.Builder setSmallIcon(int);
+ method public android.app.Notification.Builder setSmallIcon(int, int);
+ method public android.app.Notification.Builder setSmallIcon(android.graphics.drawable.Icon);
+ method public android.app.Notification.Builder setSortKey(java.lang.String);
+ method public android.app.Notification.Builder setSound(android.net.Uri);
+ method public deprecated android.app.Notification.Builder setSound(android.net.Uri, int);
+ method public android.app.Notification.Builder setSound(android.net.Uri, android.media.AudioAttributes);
+ method public android.app.Notification.Builder setStyle(android.app.Notification.Style);
+ method public android.app.Notification.Builder setSubText(java.lang.CharSequence);
+ method public android.app.Notification.Builder setTicker(java.lang.CharSequence);
+ method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews);
+ method public android.app.Notification.Builder setTopic(android.app.Notification.Topic);
+ method public android.app.Notification.Builder setUsesChronometer(boolean);
+ method public android.app.Notification.Builder setVibrate(long[]);
+ method public android.app.Notification.Builder setVisibility(int);
+ method public android.app.Notification.Builder setWhen(long);
+ }
+
+ public static final class Notification.CarExtender implements android.app.Notification.Extender {
+ ctor public Notification.CarExtender();
+ ctor public Notification.CarExtender(android.app.Notification);
+ method public android.app.Notification.Builder extend(android.app.Notification.Builder);
+ method public int getColor();
+ method public android.graphics.Bitmap getLargeIcon();
+ method public android.app.Notification.CarExtender.UnreadConversation getUnreadConversation();
+ method public android.app.Notification.CarExtender setColor(int);
+ method public android.app.Notification.CarExtender setLargeIcon(android.graphics.Bitmap);
+ method public android.app.Notification.CarExtender setUnreadConversation(android.app.Notification.CarExtender.UnreadConversation);
+ }
+
+ public static class Notification.CarExtender.Builder {
+ ctor public Notification.CarExtender.Builder(java.lang.String);
+ method public android.app.Notification.CarExtender.Builder addMessage(java.lang.String);
+ method public android.app.Notification.CarExtender.UnreadConversation build();
+ method public android.app.Notification.CarExtender.Builder setLatestTimestamp(long);
+ method public android.app.Notification.CarExtender.Builder setReadPendingIntent(android.app.PendingIntent);
+ method public android.app.Notification.CarExtender.Builder setReplyAction(android.app.PendingIntent, android.app.RemoteInput);
+ }
+
+ public static class Notification.CarExtender.UnreadConversation {
+ method public long getLatestTimestamp();
+ method public java.lang.String[] getMessages();
+ method public java.lang.String getParticipant();
+ method public java.lang.String[] getParticipants();
+ method public android.app.PendingIntent getReadPendingIntent();
+ method public android.app.RemoteInput getRemoteInput();
+ method public android.app.PendingIntent getReplyPendingIntent();
+ }
+
+ public static abstract interface Notification.Extender {
+ method public abstract android.app.Notification.Builder extend(android.app.Notification.Builder);
+ }
+
+ public static class Notification.InboxStyle extends android.app.Notification.Style {
+ ctor public Notification.InboxStyle();
+ ctor public Notification.InboxStyle(android.app.Notification.Builder);
+ method public android.app.Notification.InboxStyle addLine(java.lang.CharSequence);
+ method public android.app.Notification.InboxStyle setBigContentTitle(java.lang.CharSequence);
+ method public android.app.Notification.InboxStyle setSummaryText(java.lang.CharSequence);
+ }
+
+ public static class Notification.MediaStyle extends android.app.Notification.Style {
+ ctor public Notification.MediaStyle();
+ ctor public Notification.MediaStyle(android.app.Notification.Builder);
+ method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token);
+ method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
+ }
+
+ public static abstract class Notification.Style {
+ ctor public Notification.Style();
+ method public android.app.Notification build();
+ method protected void checkBuilder();
+ method protected android.widget.RemoteViews getStandardView(int);
+ method protected void internalSetBigContentTitle(java.lang.CharSequence);
+ method protected void internalSetSummaryText(java.lang.CharSequence);
+ method public void setBuilder(android.app.Notification.Builder);
+ field protected android.app.Notification.Builder mBuilder;
+ }
+
+ public static class Notification.Topic implements android.os.Parcelable {
+ ctor public Notification.Topic(java.lang.String, java.lang.CharSequence);
+ method public android.app.Notification.Topic clone();
+ method public int describeContents();
+ method public java.lang.String getId();
+ method public java.lang.CharSequence getLabel();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.Notification.Topic> CREATOR;
+ }
+
+ public static final class Notification.WearableExtender implements android.app.Notification.Extender {
+ ctor public Notification.WearableExtender();
+ ctor public Notification.WearableExtender(android.app.Notification);
+ method public android.app.Notification.WearableExtender addAction(android.app.Notification.Action);
+ method public android.app.Notification.WearableExtender addActions(java.util.List<android.app.Notification.Action>);
+ method public android.app.Notification.WearableExtender addPage(android.app.Notification);
+ method public android.app.Notification.WearableExtender addPages(java.util.List<android.app.Notification>);
+ method public android.app.Notification.WearableExtender clearActions();
+ method public android.app.Notification.WearableExtender clearPages();
+ method public android.app.Notification.WearableExtender clone();
+ method public android.app.Notification.Builder extend(android.app.Notification.Builder);
+ method public java.util.List<android.app.Notification.Action> getActions();
+ method public android.graphics.Bitmap getBackground();
+ method public int getContentAction();
+ method public int getContentIcon();
+ method public int getContentIconGravity();
+ method public boolean getContentIntentAvailableOffline();
+ method public int getCustomContentHeight();
+ method public int getCustomSizePreset();
+ method public android.app.PendingIntent getDisplayIntent();
+ method public int getGravity();
+ method public boolean getHintAvoidBackgroundClipping();
+ method public boolean getHintHideIcon();
+ method public int getHintScreenTimeout();
+ method public boolean getHintShowBackgroundOnly();
+ method public java.util.List<android.app.Notification> getPages();
+ method public boolean getStartScrollBottom();
+ method public android.app.Notification.WearableExtender setBackground(android.graphics.Bitmap);
+ method public android.app.Notification.WearableExtender setContentAction(int);
+ method public android.app.Notification.WearableExtender setContentIcon(int);
+ method public android.app.Notification.WearableExtender setContentIconGravity(int);
+ method public android.app.Notification.WearableExtender setContentIntentAvailableOffline(boolean);
+ method public android.app.Notification.WearableExtender setCustomContentHeight(int);
+ method public android.app.Notification.WearableExtender setCustomSizePreset(int);
+ method public android.app.Notification.WearableExtender setDisplayIntent(android.app.PendingIntent);
+ method public android.app.Notification.WearableExtender setGravity(int);
+ method public android.app.Notification.WearableExtender setHintAvoidBackgroundClipping(boolean);
+ method public android.app.Notification.WearableExtender setHintHideIcon(boolean);
+ method public android.app.Notification.WearableExtender setHintScreenTimeout(int);
+ method public android.app.Notification.WearableExtender setHintShowBackgroundOnly(boolean);
+ method public android.app.Notification.WearableExtender setStartScrollBottom(boolean);
+ field public static final int SCREEN_TIMEOUT_LONG = -1; // 0xffffffff
+ field public static final int SCREEN_TIMEOUT_SHORT = 0; // 0x0
+ field public static final int SIZE_DEFAULT = 0; // 0x0
+ field public static final int SIZE_FULL_SCREEN = 5; // 0x5
+ field public static final int SIZE_LARGE = 4; // 0x4
+ field public static final int SIZE_MEDIUM = 3; // 0x3
+ field public static final int SIZE_SMALL = 2; // 0x2
+ field public static final int SIZE_XSMALL = 1; // 0x1
+ field public static final int UNSET_ACTION_INDEX = -1; // 0xffffffff
+ }
+
+ public class NotificationManager {
+ method public android.app.AutomaticZenRule addAutomaticZenRule(android.app.AutomaticZenRule);
+ method public void cancel(int);
+ method public void cancel(java.lang.String, int);
+ method public void cancelAll();
+ method public android.service.notification.StatusBarNotification[] getActiveNotifications();
+ method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);
+ method public java.util.List<android.app.AutomaticZenRule> getAutomaticZenRules();
+ method public final int getCurrentInterruptionFilter();
+ method public android.app.NotificationManager.Policy getNotificationPolicy();
+ method public boolean isNotificationPolicyAccessGranted();
+ method public void notify(int, android.app.Notification);
+ method public void notify(java.lang.String, int, android.app.Notification);
+ method public boolean removeAutomaticZenRule(java.lang.String);
+ method public final void setInterruptionFilter(int);
+ method public void setNotificationPolicy(android.app.NotificationManager.Policy);
+ method public boolean updateAutomaticZenRule(android.app.AutomaticZenRule);
+ field public static final java.lang.String ACTION_INTERRUPTION_FILTER_CHANGED = "android.app.action.INTERRUPTION_FILTER_CHANGED";
+ field public static final java.lang.String ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";
+ field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";
+ field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4
+ field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1
+ field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
+ field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
+ field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
+ }
+
+ public static class NotificationManager.Policy implements android.os.Parcelable {
+ ctor public deprecated NotificationManager.Policy(int, int, int);
+ ctor public NotificationManager.Policy(int, int, int, int);
+ method public int describeContents();
+ method public static java.lang.String priorityCategoriesToString(int);
+ method public static java.lang.String prioritySendersToString(int);
+ method public static java.lang.String suppressedEffectsToString(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.NotificationManager.Policy> CREATOR;
+ field public static final int PRIORITY_CATEGORY_CALLS = 8; // 0x8
+ field public static final int PRIORITY_CATEGORY_EVENTS = 2; // 0x2
+ field public static final int PRIORITY_CATEGORY_MESSAGES = 4; // 0x4
+ field public static final int PRIORITY_CATEGORY_REMINDERS = 1; // 0x1
+ field public static final int PRIORITY_CATEGORY_REPEAT_CALLERS = 16; // 0x10
+ field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
+ field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
+ field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
+ field public static final int SUPPRESSED_EFFECTS_UNSET = -1; // 0xffffffff
+ field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
+ field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
+ field public final int priorityCallSenders;
+ field public final int priorityCategories;
+ field public final int priorityMessageSenders;
+ field public final int suppressedVisualEffects;
+ }
+
+ public final class PendingIntent implements android.os.Parcelable {
+ method public void cancel();
+ method public int describeContents();
+ method public static android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent[], int);
+ method public static android.app.PendingIntent getActivities(android.content.Context, int, android.content.Intent[], int, android.os.Bundle);
+ method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int);
+ method public static android.app.PendingIntent getActivity(android.content.Context, int, android.content.Intent, int, android.os.Bundle);
+ method public static android.app.PendingIntent getBroadcast(android.content.Context, int, android.content.Intent, int);
+ method public java.lang.String getCreatorPackage();
+ method public int getCreatorUid();
+ method public android.os.UserHandle getCreatorUserHandle();
+ method public android.content.IntentSender getIntentSender();
+ method public static android.app.PendingIntent getService(android.content.Context, int, android.content.Intent, int);
+ method public deprecated java.lang.String getTargetPackage();
+ method public static android.app.PendingIntent readPendingIntentOrNullFromParcel(android.os.Parcel);
+ method public void send() throws android.app.PendingIntent.CanceledException;
+ method public void send(int) throws android.app.PendingIntent.CanceledException;
+ method public void send(android.content.Context, int, android.content.Intent) throws android.app.PendingIntent.CanceledException;
+ method public void send(int, android.app.PendingIntent.OnFinished, android.os.Handler) throws android.app.PendingIntent.CanceledException;
+ method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler) throws android.app.PendingIntent.CanceledException;
+ method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String) throws android.app.PendingIntent.CanceledException;
+ method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String, android.os.Bundle) throws android.app.PendingIntent.CanceledException;
+ method public static void writePendingIntentOrNullToParcel(android.app.PendingIntent, android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.PendingIntent> CREATOR;
+ field public static final int FLAG_CANCEL_CURRENT = 268435456; // 0x10000000
+ field public static final int FLAG_IMMUTABLE = 67108864; // 0x4000000
+ field public static final int FLAG_NO_CREATE = 536870912; // 0x20000000
+ field public static final int FLAG_ONE_SHOT = 1073741824; // 0x40000000
+ field public static final int FLAG_UPDATE_CURRENT = 134217728; // 0x8000000
+ }
+
+ public static class PendingIntent.CanceledException extends android.util.AndroidException {
+ ctor public PendingIntent.CanceledException();
+ ctor public PendingIntent.CanceledException(java.lang.String);
+ ctor public PendingIntent.CanceledException(java.lang.Exception);
+ }
+
+ public static abstract interface PendingIntent.OnFinished {
+ method public abstract void onSendFinished(android.app.PendingIntent, android.content.Intent, int, java.lang.String, android.os.Bundle);
+ }
+
+ public class Presentation extends android.app.Dialog {
+ ctor public Presentation(android.content.Context, android.view.Display);
+ ctor public Presentation(android.content.Context, android.view.Display, int);
+ method public android.view.Display getDisplay();
+ method public android.content.res.Resources getResources();
+ method public void onDisplayChanged();
+ method public void onDisplayRemoved();
+ }
+
+ public class ProgressDialog extends android.app.AlertDialog {
+ ctor public ProgressDialog(android.content.Context);
+ ctor public ProgressDialog(android.content.Context, int);
+ method public int getMax();
+ method public int getProgress();
+ method public int getSecondaryProgress();
+ method public void incrementProgressBy(int);
+ method public void incrementSecondaryProgressBy(int);
+ method public boolean isIndeterminate();
+ method public void onStart();
+ method public void setIndeterminate(boolean);
+ method public void setIndeterminateDrawable(android.graphics.drawable.Drawable);
+ method public void setMax(int);
+ method public void setProgress(int);
+ method public void setProgressDrawable(android.graphics.drawable.Drawable);
+ method public void setProgressNumberFormat(java.lang.String);
+ method public void setProgressPercentFormat(java.text.NumberFormat);
+ method public void setProgressStyle(int);
+ method public void setSecondaryProgress(int);
+ method public static android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence);
+ method public static android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean);
+ method public static android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean);
+ method public static android.app.ProgressDialog show(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, boolean, boolean, android.content.DialogInterface.OnCancelListener);
+ field public static final int STYLE_HORIZONTAL = 1; // 0x1
+ field public static final int STYLE_SPINNER = 0; // 0x0
+ }
+
+ public final class RemoteInput implements android.os.Parcelable {
+ method public static void addResultsToIntent(android.app.RemoteInput[], android.content.Intent, android.os.Bundle);
+ method public int describeContents();
+ method public boolean getAllowFreeFormInput();
+ method public java.lang.CharSequence[] getChoices();
+ method public android.os.Bundle getExtras();
+ method public java.lang.CharSequence getLabel();
+ method public java.lang.String getResultKey();
+ method public static android.os.Bundle getResultsFromIntent(android.content.Intent);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.RemoteInput> CREATOR;
+ field public static final java.lang.String EXTRA_RESULTS_DATA = "android.remoteinput.resultsData";
+ field public static final java.lang.String RESULTS_CLIP_LABEL = "android.remoteinput.results";
+ }
+
+ public static final class RemoteInput.Builder {
+ ctor public RemoteInput.Builder(java.lang.String);
+ method public android.app.RemoteInput.Builder addExtras(android.os.Bundle);
+ method public android.app.RemoteInput build();
+ method public android.os.Bundle getExtras();
+ method public android.app.RemoteInput.Builder setAllowFreeFormInput(boolean);
+ method public android.app.RemoteInput.Builder setChoices(java.lang.CharSequence[]);
+ method public android.app.RemoteInput.Builder setLabel(java.lang.CharSequence);
+ }
+
+ public class SearchManager implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener {
+ method public android.content.ComponentName getGlobalSearchActivity();
+ method public android.app.SearchableInfo getSearchableInfo(android.content.ComponentName);
+ method public java.util.List<android.app.SearchableInfo> getSearchablesInGlobalSearch();
+ method public deprecated void onCancel(android.content.DialogInterface);
+ method public deprecated void onDismiss(android.content.DialogInterface);
+ method public void setOnCancelListener(android.app.SearchManager.OnCancelListener);
+ method public void setOnDismissListener(android.app.SearchManager.OnDismissListener);
+ method public void startSearch(java.lang.String, boolean, android.content.ComponentName, android.os.Bundle, boolean);
+ method public void stopSearch();
+ method public void triggerSearch(java.lang.String, android.content.ComponentName, android.os.Bundle);
+ field public static final java.lang.String ACTION_KEY = "action_key";
+ field public static final java.lang.String ACTION_MSG = "action_msg";
+ field public static final java.lang.String APP_DATA = "app_data";
+ field public static final java.lang.String CURSOR_EXTRA_KEY_IN_PROGRESS = "in_progress";
+ field public static final java.lang.String EXTRA_DATA_KEY = "intent_extra_data_key";
+ field public static final java.lang.String EXTRA_NEW_SEARCH = "new_search";
+ field public static final java.lang.String EXTRA_SELECT_QUERY = "select_query";
+ field public static final java.lang.String EXTRA_WEB_SEARCH_PENDINGINTENT = "web_search_pendingintent";
+ field public static final int FLAG_QUERY_REFINEMENT = 1; // 0x1
+ field public static final java.lang.String INTENT_ACTION_GLOBAL_SEARCH = "android.search.action.GLOBAL_SEARCH";
+ field public static final java.lang.String INTENT_ACTION_SEARCHABLES_CHANGED = "android.search.action.SEARCHABLES_CHANGED";
+ field public static final java.lang.String INTENT_ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
+ field public static final java.lang.String INTENT_ACTION_SEARCH_SETTINGS_CHANGED = "android.search.action.SETTINGS_CHANGED";
+ field public static final java.lang.String INTENT_ACTION_WEB_SEARCH_SETTINGS = "android.search.action.WEB_SEARCH_SETTINGS";
+ field public static final java.lang.String INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED = "android.search.action.GLOBAL_SEARCH_ACTIVITY_CHANGED";
+ field public static final char MENU_KEY = 115; // 0x0073 's'
+ field public static final int MENU_KEYCODE = 47; // 0x2f
+ field public static final java.lang.String QUERY = "query";
+ field public static final java.lang.String SHORTCUT_MIME_TYPE = "vnd.android.cursor.item/vnd.android.search.suggest";
+ field public static final java.lang.String SUGGEST_COLUMN_AUDIO_CHANNEL_CONFIG = "suggest_audio_channel_config";
+ field public static final java.lang.String SUGGEST_COLUMN_CONTENT_TYPE = "suggest_content_type";
+ field public static final java.lang.String SUGGEST_COLUMN_DURATION = "suggest_duration";
+ field public static final java.lang.String SUGGEST_COLUMN_FLAGS = "suggest_flags";
+ field public static final java.lang.String SUGGEST_COLUMN_FORMAT = "suggest_format";
+ field public static final java.lang.String SUGGEST_COLUMN_ICON_1 = "suggest_icon_1";
+ field public static final java.lang.String SUGGEST_COLUMN_ICON_2 = "suggest_icon_2";
+ field public static final java.lang.String SUGGEST_COLUMN_INTENT_ACTION = "suggest_intent_action";
+ field public static final java.lang.String SUGGEST_COLUMN_INTENT_DATA = "suggest_intent_data";
+ field public static final java.lang.String SUGGEST_COLUMN_INTENT_DATA_ID = "suggest_intent_data_id";
+ field public static final java.lang.String SUGGEST_COLUMN_INTENT_EXTRA_DATA = "suggest_intent_extra_data";
+ field public static final java.lang.String SUGGEST_COLUMN_IS_LIVE = "suggest_is_live";
+ field public static final java.lang.String SUGGEST_COLUMN_LAST_ACCESS_HINT = "suggest_last_access_hint";
+ field public static final java.lang.String SUGGEST_COLUMN_PRODUCTION_YEAR = "suggest_production_year";
+ field public static final java.lang.String SUGGEST_COLUMN_PURCHASE_PRICE = "suggest_purchase_price";
+ field public static final java.lang.String SUGGEST_COLUMN_QUERY = "suggest_intent_query";
+ field public static final java.lang.String SUGGEST_COLUMN_RATING_SCORE = "suggest_rating_score";
+ field public static final java.lang.String SUGGEST_COLUMN_RATING_STYLE = "suggest_rating_style";
+ field public static final java.lang.String SUGGEST_COLUMN_RENTAL_PRICE = "suggest_rental_price";
+ field public static final java.lang.String SUGGEST_COLUMN_RESULT_CARD_IMAGE = "suggest_result_card_image";
+ field public static final java.lang.String SUGGEST_COLUMN_SHORTCUT_ID = "suggest_shortcut_id";
+ field public static final java.lang.String SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING = "suggest_spinner_while_refreshing";
+ field public static final java.lang.String SUGGEST_COLUMN_TEXT_1 = "suggest_text_1";
+ field public static final java.lang.String SUGGEST_COLUMN_TEXT_2 = "suggest_text_2";
+ field public static final java.lang.String SUGGEST_COLUMN_TEXT_2_URL = "suggest_text_2_url";
+ field public static final java.lang.String SUGGEST_COLUMN_VIDEO_HEIGHT = "suggest_video_height";
+ field public static final java.lang.String SUGGEST_COLUMN_VIDEO_WIDTH = "suggest_video_width";
+ field public static final java.lang.String SUGGEST_MIME_TYPE = "vnd.android.cursor.dir/vnd.android.search.suggest";
+ field public static final java.lang.String SUGGEST_NEVER_MAKE_SHORTCUT = "_-1";
+ field public static final java.lang.String SUGGEST_PARAMETER_LIMIT = "limit";
+ field public static final java.lang.String SUGGEST_URI_PATH_QUERY = "search_suggest_query";
+ field public static final java.lang.String SUGGEST_URI_PATH_SHORTCUT = "search_suggest_shortcut";
+ field public static final java.lang.String USER_QUERY = "user_query";
+ }
+
+ public static abstract interface SearchManager.OnCancelListener {
+ method public abstract void onCancel();
+ }
+
+ public static abstract interface SearchManager.OnDismissListener {
+ method public abstract void onDismiss();
+ }
+
+ public final class SearchableInfo implements android.os.Parcelable {
+ method public boolean autoUrlDetect();
+ method public int describeContents();
+ method public int getHintId();
+ method public int getImeOptions();
+ method public int getInputType();
+ method public android.content.ComponentName getSearchActivity();
+ method public int getSettingsDescriptionId();
+ method public java.lang.String getSuggestAuthority();
+ method public java.lang.String getSuggestIntentAction();
+ method public java.lang.String getSuggestIntentData();
+ method public java.lang.String getSuggestPackage();
+ method public java.lang.String getSuggestPath();
+ method public java.lang.String getSuggestSelection();
+ method public int getSuggestThreshold();
+ method public int getVoiceLanguageId();
+ method public int getVoiceLanguageModeId();
+ method public int getVoiceMaxResults();
+ method public int getVoicePromptTextId();
+ method public boolean getVoiceSearchEnabled();
+ method public boolean getVoiceSearchLaunchRecognizer();
+ method public boolean getVoiceSearchLaunchWebSearch();
+ method public boolean queryAfterZeroResults();
+ method public boolean shouldIncludeInGlobalSearch();
+ method public boolean shouldRewriteQueryFromData();
+ method public boolean shouldRewriteQueryFromText();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.SearchableInfo> CREATOR;
+ }
+
+ public abstract class Service extends android.content.ContextWrapper implements android.content.ComponentCallbacks2 {
+ ctor public Service();
+ method protected void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public final android.app.Application getApplication();
+ method public abstract android.os.IBinder onBind(android.content.Intent);
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public void onCreate();
+ method public void onDestroy();
+ method public void onLowMemory();
+ method public void onRebind(android.content.Intent);
+ method public deprecated void onStart(android.content.Intent, int);
+ method public int onStartCommand(android.content.Intent, int, int);
+ method public void onTaskRemoved(android.content.Intent);
+ method public void onTrimMemory(int);
+ method public boolean onUnbind(android.content.Intent);
+ method public final void startForeground(int, android.app.Notification);
+ method public final void stopForeground(boolean);
+ method public final void stopSelf();
+ method public final void stopSelf(int);
+ method public final boolean stopSelfResult(int);
+ field public static final int START_CONTINUATION_MASK = 15; // 0xf
+ field public static final int START_FLAG_REDELIVERY = 1; // 0x1
+ field public static final int START_FLAG_RETRY = 2; // 0x2
+ field public static final int START_NOT_STICKY = 2; // 0x2
+ field public static final int START_REDELIVER_INTENT = 3; // 0x3
+ field public static final int START_STICKY = 1; // 0x1
+ field public static final int START_STICKY_COMPATIBILITY = 0; // 0x0
+ }
+
+ public abstract class SharedElementCallback {
+ ctor public SharedElementCallback();
+ method public android.os.Parcelable onCaptureSharedElementSnapshot(android.view.View, android.graphics.Matrix, android.graphics.RectF);
+ method public android.view.View onCreateSnapshotView(android.content.Context, android.os.Parcelable);
+ method public void onMapSharedElements(java.util.List<java.lang.String>, java.util.Map<java.lang.String, android.view.View>);
+ method public void onRejectSharedElements(java.util.List<android.view.View>);
+ method public void onSharedElementEnd(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>);
+ method public void onSharedElementStart(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>);
+ method public void onSharedElementsArrived(java.util.List<java.lang.String>, java.util.List<android.view.View>, android.app.SharedElementCallback.OnSharedElementsReadyListener);
+ }
+
+ public static abstract interface SharedElementCallback.OnSharedElementsReadyListener {
+ method public abstract void onSharedElementsReady();
+ }
+
+ public deprecated class TabActivity extends android.app.ActivityGroup {
+ ctor public TabActivity();
+ method public android.widget.TabHost getTabHost();
+ method public android.widget.TabWidget getTabWidget();
+ method public void setDefaultTab(java.lang.String);
+ method public void setDefaultTab(int);
+ }
+
+ public class TaskStackBuilder {
+ method public android.app.TaskStackBuilder addNextIntent(android.content.Intent);
+ method public android.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent);
+ method public android.app.TaskStackBuilder addParentStack(android.app.Activity);
+ method public android.app.TaskStackBuilder addParentStack(java.lang.Class<?>);
+ method public android.app.TaskStackBuilder addParentStack(android.content.ComponentName);
+ method public static android.app.TaskStackBuilder create(android.content.Context);
+ method public android.content.Intent editIntentAt(int);
+ method public int getIntentCount();
+ method public android.content.Intent[] getIntents();
+ method public android.app.PendingIntent getPendingIntent(int, int);
+ method public android.app.PendingIntent getPendingIntent(int, int, android.os.Bundle);
+ method public void startActivities();
+ method public void startActivities(android.os.Bundle);
+ }
+
+ public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener {
+ ctor public TimePickerDialog(android.content.Context, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean);
+ ctor public TimePickerDialog(android.content.Context, int, android.app.TimePickerDialog.OnTimeSetListener, int, int, boolean);
+ method public void onClick(android.content.DialogInterface, int);
+ method public void onTimeChanged(android.widget.TimePicker, int, int);
+ method public void updateTime(int, int);
+ }
+
+ public static abstract interface TimePickerDialog.OnTimeSetListener {
+ method public abstract void onTimeSet(android.widget.TimePicker, int, int);
+ }
+
+ public final class UiAutomation {
+ method public void clearWindowAnimationFrameStats();
+ method public boolean clearWindowContentFrameStats(int);
+ method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
+ method public android.os.ParcelFileDescriptor executeShellCommand(java.lang.String);
+ method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+ method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
+ method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
+ method public android.view.WindowAnimationFrameStats getWindowAnimationFrameStats();
+ method public android.view.WindowContentFrameStats getWindowContentFrameStats(int);
+ method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
+ method public boolean injectInputEvent(android.view.InputEvent, boolean);
+ method public final boolean performGlobalAction(int);
+ method public void setOnAccessibilityEventListener(android.app.UiAutomation.OnAccessibilityEventListener);
+ method public boolean setRotation(int);
+ method public void setRunAsMonkey(boolean);
+ method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
+ method public android.graphics.Bitmap takeScreenshot();
+ method public void waitForIdle(long, long) throws java.util.concurrent.TimeoutException;
+ field public static final int ROTATION_FREEZE_0 = 0; // 0x0
+ field public static final int ROTATION_FREEZE_180 = 2; // 0x2
+ field public static final int ROTATION_FREEZE_270 = 3; // 0x3
+ field public static final int ROTATION_FREEZE_90 = 1; // 0x1
+ field public static final int ROTATION_FREEZE_CURRENT = -1; // 0xffffffff
+ field public static final int ROTATION_UNFREEZE = -2; // 0xfffffffe
+ }
+
+ public static abstract interface UiAutomation.AccessibilityEventFilter {
+ method public abstract boolean accept(android.view.accessibility.AccessibilityEvent);
+ }
+
+ public static abstract interface UiAutomation.OnAccessibilityEventListener {
+ method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ }
+
+ public class UiModeManager {
+ method public void disableCarMode(int);
+ method public void enableCarMode(int);
+ method public int getCurrentModeType();
+ method public int getNightMode();
+ method public void setNightMode(int);
+ field public static java.lang.String ACTION_ENTER_CAR_MODE;
+ field public static java.lang.String ACTION_ENTER_DESK_MODE;
+ field public static java.lang.String ACTION_EXIT_CAR_MODE;
+ field public static java.lang.String ACTION_EXIT_DESK_MODE;
+ field public static final int DISABLE_CAR_MODE_GO_HOME = 1; // 0x1
+ field public static final int ENABLE_CAR_MODE_ALLOW_SLEEP = 2; // 0x2
+ field public static final int ENABLE_CAR_MODE_GO_CAR_HOME = 1; // 0x1
+ field public static final int MODE_NIGHT_AUTO = 0; // 0x0
+ field public static final int MODE_NIGHT_NO = 1; // 0x1
+ field public static final int MODE_NIGHT_YES = 2; // 0x2
+ }
+
+ public final class VoiceInteractor {
+ method public android.app.VoiceInteractor.Request getActiveRequest(java.lang.String);
+ method public android.app.VoiceInteractor.Request[] getActiveRequests();
+ method public boolean submitRequest(android.app.VoiceInteractor.Request);
+ method public boolean submitRequest(android.app.VoiceInteractor.Request, java.lang.String);
+ method public boolean[] supportsCommands(java.lang.String[]);
+ }
+
+ public static class VoiceInteractor.AbortVoiceRequest extends android.app.VoiceInteractor.Request {
+ ctor public VoiceInteractor.AbortVoiceRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle);
+ method public void onAbortResult(android.os.Bundle);
+ }
+
+ public static class VoiceInteractor.CommandRequest extends android.app.VoiceInteractor.Request {
+ ctor public VoiceInteractor.CommandRequest(java.lang.String, android.os.Bundle);
+ method public void onCommandResult(boolean, android.os.Bundle);
+ }
+
+ public static class VoiceInteractor.CompleteVoiceRequest extends android.app.VoiceInteractor.Request {
+ ctor public VoiceInteractor.CompleteVoiceRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle);
+ method public void onCompleteResult(android.os.Bundle);
+ }
+
+ public static class VoiceInteractor.ConfirmationRequest extends android.app.VoiceInteractor.Request {
+ ctor public VoiceInteractor.ConfirmationRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle);
+ method public void onConfirmationResult(boolean, android.os.Bundle);
+ }
+
+ public static class VoiceInteractor.PickOptionRequest extends android.app.VoiceInteractor.Request {
+ ctor public VoiceInteractor.PickOptionRequest(android.app.VoiceInteractor.Prompt, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle);
+ method public void onPickOptionResult(boolean, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle);
+ }
+
+ public static final class VoiceInteractor.PickOptionRequest.Option implements android.os.Parcelable {
+ ctor public VoiceInteractor.PickOptionRequest.Option(java.lang.CharSequence, int);
+ method public android.app.VoiceInteractor.PickOptionRequest.Option addSynonym(java.lang.CharSequence);
+ method public int countSynonyms();
+ method public int describeContents();
+ method public android.os.Bundle getExtras();
+ method public int getIndex();
+ method public java.lang.CharSequence getLabel();
+ method public java.lang.CharSequence getSynonymAt(int);
+ method public void setExtras(android.os.Bundle);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.VoiceInteractor.PickOptionRequest.Option> CREATOR;
+ }
+
+ public static class VoiceInteractor.Prompt implements android.os.Parcelable {
+ ctor public VoiceInteractor.Prompt(java.lang.CharSequence[], java.lang.CharSequence);
+ ctor public VoiceInteractor.Prompt(java.lang.CharSequence);
+ method public int countVoicePrompts();
+ method public int describeContents();
+ method public java.lang.CharSequence getVisualPrompt();
+ method public java.lang.CharSequence getVoicePromptAt(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.VoiceInteractor.Prompt> CREATOR;
+ }
+
+ public static abstract class VoiceInteractor.Request {
+ method public void cancel();
+ method public android.app.Activity getActivity();
+ method public android.content.Context getContext();
+ method public java.lang.String getName();
+ method public void onAttached(android.app.Activity);
+ method public void onCancel();
+ method public void onDetached();
+ }
+
+ public final class WallpaperInfo implements android.os.Parcelable {
+ ctor public WallpaperInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public android.content.ComponentName getComponent();
+ method public java.lang.String getPackageName();
+ method public android.content.pm.ServiceInfo getServiceInfo();
+ method public java.lang.String getServiceName();
+ method public java.lang.String getSettingsActivity();
+ method public java.lang.CharSequence loadAuthor(android.content.pm.PackageManager) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager) throws android.content.res.Resources.NotFoundException;
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public android.graphics.drawable.Drawable loadThumbnail(android.content.pm.PackageManager);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.WallpaperInfo> CREATOR;
+ }
+
+ public class WallpaperManager {
+ method public void clear() throws java.io.IOException;
+ method public void clearWallpaperOffsets(android.os.IBinder);
+ method public void forgetLoadedWallpaper();
+ method public android.graphics.drawable.Drawable getBuiltInDrawable();
+ method public android.graphics.drawable.Drawable getBuiltInDrawable(int, int, boolean, float, float);
+ method public android.content.Intent getCropAndSetWallpaperIntent(android.net.Uri);
+ method public int getDesiredMinimumHeight();
+ method public int getDesiredMinimumWidth();
+ method public android.graphics.drawable.Drawable getDrawable();
+ method public android.graphics.drawable.Drawable getFastDrawable();
+ method public static android.app.WallpaperManager getInstance(android.content.Context);
+ method public android.app.WallpaperInfo getWallpaperInfo();
+ method public boolean hasResourceWallpaper(int);
+ method public boolean isWallpaperSupported();
+ method public android.graphics.drawable.Drawable peekDrawable();
+ method public android.graphics.drawable.Drawable peekFastDrawable();
+ method public void sendWallpaperCommand(android.os.IBinder, java.lang.String, int, int, int, android.os.Bundle);
+ method public void setBitmap(android.graphics.Bitmap) throws java.io.IOException;
+ method public void setResource(int) throws java.io.IOException;
+ method public void setStream(java.io.InputStream) throws java.io.IOException;
+ 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_CROP_AND_SET_WALLPAPER = "android.service.wallpaper.CROP_AND_SET_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";
+ }
+
+}
+
+package android.app.admin {
+
+ public final class DeviceAdminInfo implements android.os.Parcelable {
+ ctor public DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public android.content.pm.ActivityInfo getActivityInfo();
+ method public android.content.ComponentName getComponent();
+ method public java.lang.String getPackageName();
+ method public java.lang.String getReceiverName();
+ method public java.lang.String getTagForPolicy(int);
+ method public boolean isVisible();
+ method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager) throws android.content.res.Resources.NotFoundException;
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public boolean usesPolicy(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.admin.DeviceAdminInfo> CREATOR;
+ field public static final int USES_ENCRYPTED_STORAGE = 7; // 0x7
+ field public static final int USES_POLICY_DISABLE_CAMERA = 8; // 0x8
+ field public static final int USES_POLICY_DISABLE_KEYGUARD_FEATURES = 9; // 0x9
+ field public static final int USES_POLICY_EXPIRE_PASSWORD = 6; // 0x6
+ field public static final int USES_POLICY_FORCE_LOCK = 3; // 0x3
+ field public static final int USES_POLICY_LIMIT_PASSWORD = 0; // 0x0
+ field public static final int USES_POLICY_RESET_PASSWORD = 2; // 0x2
+ field public static final int USES_POLICY_WATCH_LOGIN = 1; // 0x1
+ field public static final int USES_POLICY_WIPE_DATA = 4; // 0x4
+ }
+
+ public class DeviceAdminReceiver extends android.content.BroadcastReceiver {
+ ctor public DeviceAdminReceiver();
+ method public android.app.admin.DevicePolicyManager getManager(android.content.Context);
+ method public android.content.ComponentName getWho(android.content.Context);
+ method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, android.net.Uri, java.lang.String);
+ method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent);
+ method public void onDisabled(android.content.Context, android.content.Intent);
+ method public void onEnabled(android.content.Context, android.content.Intent);
+ method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, java.lang.String);
+ method public void onLockTaskModeExiting(android.content.Context, android.content.Intent);
+ method public void onPasswordChanged(android.content.Context, android.content.Intent);
+ method public void onPasswordExpiring(android.content.Context, android.content.Intent);
+ method public void onPasswordFailed(android.content.Context, android.content.Intent);
+ method public void onPasswordSucceeded(android.content.Context, android.content.Intent);
+ method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent);
+ method public deprecated void onReadyForUserInitialization(android.content.Context, android.content.Intent);
+ method public void onReceive(android.content.Context, android.content.Intent);
+ method public void onSystemUpdatePending(android.content.Context, android.content.Intent, long);
+ field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED";
+ field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED";
+ field public static final java.lang.String ACTION_DEVICE_ADMIN_ENABLED = "android.app.action.DEVICE_ADMIN_ENABLED";
+ field public static final java.lang.String ACTION_LOCK_TASK_ENTERING = "android.app.action.LOCK_TASK_ENTERING";
+ field public static final java.lang.String ACTION_LOCK_TASK_EXITING = "android.app.action.LOCK_TASK_EXITING";
+ field public static final java.lang.String ACTION_PASSWORD_CHANGED = "android.app.action.ACTION_PASSWORD_CHANGED";
+ field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING";
+ field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";
+ field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";
+ field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";
+ field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
+ field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";
+ field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
+ }
+
+ public class DevicePolicyManager {
+ method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int);
+ method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);
+ method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);
+ method public void addUserRestriction(android.content.ComponentName, java.lang.String);
+ method public void clearCrossProfileIntentFilters(android.content.ComponentName);
+ method public void clearDeviceOwnerApp(java.lang.String);
+ method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
+ method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
+ method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
+ method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
+ method public void enableSystemApp(android.content.ComponentName, java.lang.String);
+ method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
+ method public java.lang.String[] getAccountTypesWithManagementDisabled();
+ method public java.util.List<android.content.ComponentName> getActiveAdmins();
+ method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
+ method public boolean getAutoTimeRequired();
+ method public boolean getBluetoothContactSharingDisabled(android.content.ComponentName);
+ method public boolean getCameraDisabled(android.content.ComponentName);
+ method public java.lang.String getCertInstallerPackage(android.content.ComponentName) throws java.lang.SecurityException;
+ method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);
+ method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);
+ method public int getCurrentFailedPasswordAttempts();
+ method public java.lang.String getDeviceOwnerLockScreenInfo();
+ method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);
+ method public int getKeyguardDisabledFeatures(android.content.ComponentName);
+ method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
+ method public long getMaximumTimeToLock(android.content.ComponentName);
+ method public long getPasswordExpiration(android.content.ComponentName);
+ method public long getPasswordExpirationTimeout(android.content.ComponentName);
+ method public int getPasswordHistoryLength(android.content.ComponentName);
+ method public int getPasswordMaximumLength(int);
+ method public int getPasswordMinimumLength(android.content.ComponentName);
+ method public int getPasswordMinimumLetters(android.content.ComponentName);
+ method public int getPasswordMinimumLowerCase(android.content.ComponentName);
+ method public int getPasswordMinimumNonLetter(android.content.ComponentName);
+ method public int getPasswordMinimumNumeric(android.content.ComponentName);
+ method public int getPasswordMinimumSymbols(android.content.ComponentName);
+ method public int getPasswordMinimumUpperCase(android.content.ComponentName);
+ method public int getPasswordQuality(android.content.ComponentName);
+ method public int getPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String);
+ method public int getPermissionPolicy(android.content.ComponentName);
+ method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName);
+ method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName);
+ method public boolean getScreenCaptureDisabled(android.content.ComponentName);
+ method public boolean getStorageEncryption(android.content.ComponentName);
+ method public int getStorageEncryptionStatus();
+ method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();
+ method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);
+ method public android.os.Bundle getUserRestrictions(android.content.ComponentName);
+ method public java.lang.String getWifiMacAddress();
+ method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);
+ method public boolean hasGrantedPolicy(android.content.ComponentName, int);
+ method public boolean installCaCert(android.content.ComponentName, byte[]);
+ method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);
+ method public boolean isActivePasswordSufficient();
+ method public boolean isAdminActive(android.content.ComponentName);
+ method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String);
+ method public boolean isDeviceOwnerApp(java.lang.String);
+ method public boolean isLockTaskPermitted(java.lang.String);
+ method public boolean isMasterVolumeMuted(android.content.ComponentName);
+ method public boolean isProfileOwnerApp(java.lang.String);
+ method public boolean isProvisioningAllowed(java.lang.String);
+ method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String);
+ method public void lockNow();
+ method public void removeActiveAdmin(android.content.ComponentName);
+ method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);
+ method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);
+ method public boolean resetPassword(java.lang.String, int);
+ method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
+ method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
+ method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);
+ method public void setAutoTimeRequired(android.content.ComponentName, boolean);
+ method public void setBluetoothContactSharingDisabled(android.content.ComponentName, boolean);
+ method public void setCameraDisabled(android.content.ComponentName, boolean);
+ method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;
+ method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
+ method public boolean setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.String);
+ method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
+ method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
+ method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);
+ method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;
+ method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
+ method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
+ method public void setMaximumTimeToLock(android.content.ComponentName, long);
+ method public void setPasswordExpirationTimeout(android.content.ComponentName, long);
+ method public void setPasswordHistoryLength(android.content.ComponentName, int);
+ method public void setPasswordMinimumLength(android.content.ComponentName, int);
+ method public void setPasswordMinimumLetters(android.content.ComponentName, int);
+ method public void setPasswordMinimumLowerCase(android.content.ComponentName, int);
+ method public void setPasswordMinimumNonLetter(android.content.ComponentName, int);
+ method public void setPasswordMinimumNumeric(android.content.ComponentName, int);
+ method public void setPasswordMinimumSymbols(android.content.ComponentName, int);
+ method public void setPasswordMinimumUpperCase(android.content.ComponentName, int);
+ method public void setPasswordQuality(android.content.ComponentName, int);
+ method public boolean setPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String, int);
+ method public void setPermissionPolicy(android.content.ComponentName, int);
+ method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>);
+ method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>);
+ method public void setProfileEnabled(android.content.ComponentName);
+ method public void setProfileName(android.content.ComponentName, java.lang.String);
+ method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo);
+ method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);
+ method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);
+ method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);
+ method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);
+ method public int setStorageEncryption(android.content.ComponentName, boolean);
+ method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);
+ method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);
+ method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
+ method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);
+ method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);
+ method public void uninstallAllUserCaCerts(android.content.ComponentName);
+ method public void uninstallCaCert(android.content.ComponentName, byte[]);
+ method public void wipeData(int);
+ field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";
+ field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED";
+ field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";
+ field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE";
+ field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE";
+ field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD";
+ field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";
+ field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";
+ field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2
+ field public static final int ENCRYPTION_STATUS_ACTIVE = 3; // 0x3
+ field public static final int ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY = 4; // 0x4
+ field public static final int ENCRYPTION_STATUS_INACTIVE = 1; // 0x1
+ field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0
+ field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";
+ field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN";
+ field public static final java.lang.String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE";
+ field public static final java.lang.String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE";
+ field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME";
+ field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE";
+ field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";
+ field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";
+ field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";
+ field public static final deprecated java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME";
+ field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM";
+ field public static final java.lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";
+ field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";
+ field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";
+ field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";
+ field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
+ field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";
+ field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
+ field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PASSWORD = "android.app.extra.PROVISIONING_WIFI_PASSWORD";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_HOST = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";
+ field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";
+ field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2
+ field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1
+ field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff
+ field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0
+ field public static final int KEYGUARD_DISABLE_FINGERPRINT = 32; // 0x20
+ field public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 2; // 0x2
+ field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4
+ field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10
+ field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8
+ field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1
+ field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning";
+ field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000
+ field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000
+ field public static final int PASSWORD_QUALITY_BIOMETRIC_WEAK = 32768; // 0x8000
+ field public static final int PASSWORD_QUALITY_COMPLEX = 393216; // 0x60000
+ field public static final int PASSWORD_QUALITY_NUMERIC = 131072; // 0x20000
+ field public static final int PASSWORD_QUALITY_NUMERIC_COMPLEX = 196608; // 0x30000
+ field public static final int PASSWORD_QUALITY_SOMETHING = 65536; // 0x10000
+ field public static final int PASSWORD_QUALITY_UNSPECIFIED = 0; // 0x0
+ field public static final int PERMISSION_GRANT_STATE_DEFAULT = 0; // 0x0
+ field public static final int PERMISSION_GRANT_STATE_DENIED = 2; // 0x2
+ field public static final int PERMISSION_GRANT_STATE_GRANTED = 1; // 0x1
+ field public static final int PERMISSION_POLICY_AUTO_DENY = 2; // 0x2
+ field public static final int PERMISSION_POLICY_AUTO_GRANT = 1; // 0x1
+ field public static final int PERMISSION_POLICY_PROMPT = 0; // 0x0
+ field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2
+ field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1
+ field public static final int WIPE_EXTERNAL_STORAGE = 1; // 0x1
+ field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
+ }
+
+ public class SystemUpdatePolicy implements android.os.Parcelable {
+ method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();
+ method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();
+ method public static android.app.admin.SystemUpdatePolicy createWindowedInstallPolicy(int, int);
+ method public int describeContents();
+ method public int getInstallWindowEnd();
+ method public int getInstallWindowStart();
+ method public int getPolicyType();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.admin.SystemUpdatePolicy> CREATOR;
+ field public static final int TYPE_INSTALL_AUTOMATIC = 1; // 0x1
+ field public static final int TYPE_INSTALL_WINDOWED = 2; // 0x2
+ field public static final int TYPE_POSTPONE = 3; // 0x3
+ }
+
+}
+
+package android.app.assist {
+
+ public class AssistContent implements android.os.Parcelable {
+ ctor public AssistContent();
+ method public int describeContents();
+ method public android.content.ClipData getClipData();
+ method public android.os.Bundle getExtras();
+ method public android.content.Intent getIntent();
+ method public java.lang.String getStructuredData();
+ method public android.net.Uri getWebUri();
+ method public boolean isAppProvidedIntent();
+ method public boolean isAppProvidedWebUri();
+ method public void setClipData(android.content.ClipData);
+ method public void setIntent(android.content.Intent);
+ method public void setStructuredData(java.lang.String);
+ method public void setWebUri(android.net.Uri);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.assist.AssistContent> CREATOR;
+ }
+
+ public class AssistStructure implements android.os.Parcelable {
+ ctor public AssistStructure();
+ method public int describeContents();
+ method public android.content.ComponentName getActivityComponent();
+ method public android.app.assist.AssistStructure.WindowNode getWindowNodeAt(int);
+ method public int getWindowNodeCount();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.assist.AssistStructure> CREATOR;
+ }
+
+ public static class AssistStructure.ViewNode {
+ method public float getAlpha();
+ method public android.app.assist.AssistStructure.ViewNode getChildAt(int);
+ method public int getChildCount();
+ method public java.lang.String getClassName();
+ method public java.lang.CharSequence getContentDescription();
+ method public float getElevation();
+ method public android.os.Bundle getExtras();
+ method public int getHeight();
+ method public java.lang.String getHint();
+ method public int getId();
+ method public java.lang.String getIdEntry();
+ method public java.lang.String getIdPackage();
+ method public java.lang.String getIdType();
+ method public int getLeft();
+ method public int getScrollX();
+ method public int getScrollY();
+ method public java.lang.CharSequence getText();
+ method public int getTextBackgroundColor();
+ method public int getTextColor();
+ method public int[] getTextLineBaselines();
+ method public int[] getTextLineCharOffsets();
+ method public int getTextSelectionEnd();
+ method public int getTextSelectionStart();
+ method public float getTextSize();
+ method public int getTextStyle();
+ method public int getTop();
+ method public android.graphics.Matrix getTransformation();
+ method public int getVisibility();
+ method public int getWidth();
+ method public boolean isAccessibilityFocused();
+ method public boolean isActivated();
+ method public boolean isAssistBlocked();
+ method public boolean isCheckable();
+ method public boolean isChecked();
+ method public boolean isClickable();
+ method public boolean isContextClickable();
+ method public boolean isEnabled();
+ method public boolean isFocusable();
+ method public boolean isFocused();
+ method public boolean isLongClickable();
+ method public boolean isSelected();
+ field public static final int TEXT_COLOR_UNDEFINED = 1; // 0x1
+ field public static final int TEXT_STYLE_BOLD = 1; // 0x1
+ field public static final int TEXT_STYLE_ITALIC = 2; // 0x2
+ field public static final int TEXT_STYLE_STRIKE_THRU = 8; // 0x8
+ field public static final int TEXT_STYLE_UNDERLINE = 4; // 0x4
+ }
+
+ public static class AssistStructure.WindowNode {
+ method public int getDisplayId();
+ method public int getHeight();
+ method public int getLeft();
+ method public android.app.assist.AssistStructure.ViewNode getRootViewNode();
+ method public java.lang.CharSequence getTitle();
+ method public int getTop();
+ method public int getWidth();
+ }
+
+}
+
+package android.app.backup {
+
+ public abstract class BackupAgent extends android.content.ContextWrapper {
+ ctor public BackupAgent();
+ method public final void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput);
+ method public abstract void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) throws java.io.IOException;
+ method public void onCreate();
+ method public void onDestroy();
+ method public void onFullBackup(android.app.backup.FullBackupDataOutput) throws java.io.IOException;
+ method public abstract void onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) throws java.io.IOException;
+ method public void onRestoreFile(android.os.ParcelFileDescriptor, long, java.io.File, int, long, long) throws java.io.IOException;
+ method public void onRestoreFinished();
+ field public static final int TYPE_DIRECTORY = 2; // 0x2
+ field public static final int TYPE_FILE = 1; // 0x1
+ }
+
+ public class BackupAgentHelper extends android.app.backup.BackupAgent {
+ ctor public BackupAgentHelper();
+ method public void addHelper(java.lang.String, android.app.backup.BackupHelper);
+ method public void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) throws java.io.IOException;
+ method public void onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) throws java.io.IOException;
+ }
+
+ public class BackupDataInput {
+ method public int getDataSize();
+ method public java.lang.String getKey();
+ method public int readEntityData(byte[], int, int) throws java.io.IOException;
+ method public boolean readNextHeader() throws java.io.IOException;
+ method public void skipEntityData() throws java.io.IOException;
+ }
+
+ public class BackupDataInputStream extends java.io.InputStream {
+ method public java.lang.String getKey();
+ method public int read() throws java.io.IOException;
+ method public int size();
+ }
+
+ public class BackupDataOutput {
+ method public int writeEntityData(byte[], int) throws java.io.IOException;
+ method public int writeEntityHeader(java.lang.String, int) throws java.io.IOException;
+ }
+
+ public abstract interface BackupHelper {
+ method public abstract void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor);
+ method public abstract void restoreEntity(android.app.backup.BackupDataInputStream);
+ method public abstract void writeNewStateDescription(android.os.ParcelFileDescriptor);
+ }
+
+ public class BackupManager {
+ ctor public BackupManager(android.content.Context);
+ method public void dataChanged();
+ method public static void dataChanged(java.lang.String);
+ method public int requestRestore(android.app.backup.RestoreObserver);
+ }
+
+ public class FileBackupHelper extends android.app.backup.FileBackupHelperBase implements android.app.backup.BackupHelper {
+ ctor public FileBackupHelper(android.content.Context, java.lang.String...);
+ method public void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor);
+ method public void restoreEntity(android.app.backup.BackupDataInputStream);
+ }
+
+ class FileBackupHelperBase {
+ method public void writeNewStateDescription(android.os.ParcelFileDescriptor);
+ }
+
+ public class FullBackupDataOutput {
+ }
+
+ public abstract class RestoreObserver {
+ ctor public RestoreObserver();
+ method public void onUpdate(int, java.lang.String);
+ method public void restoreFinished(int);
+ method public void restoreStarting(int);
+ }
+
+ public class SharedPreferencesBackupHelper extends android.app.backup.FileBackupHelperBase implements android.app.backup.BackupHelper {
+ ctor public SharedPreferencesBackupHelper(android.content.Context, java.lang.String...);
+ method public void performBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor);
+ method public void restoreEntity(android.app.backup.BackupDataInputStream);
+ }
+
+}
+
+package android.app.job {
+
+ public class JobInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getBackoffPolicy();
+ method public android.os.PersistableBundle getExtras();
+ method public int getId();
+ method public long getInitialBackoffMillis();
+ method public long getIntervalMillis();
+ method public long getMaxExecutionDelayMillis();
+ method public long getMinLatencyMillis();
+ method public int getNetworkType();
+ method public android.content.ComponentName getService();
+ method public boolean isPeriodic();
+ method public boolean isPersisted();
+ method public boolean isRequireCharging();
+ method public boolean isRequireDeviceIdle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int BACKOFF_POLICY_EXPONENTIAL = 1; // 0x1
+ field public static final int BACKOFF_POLICY_LINEAR = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.app.job.JobInfo> CREATOR;
+ field public static final long DEFAULT_INITIAL_BACKOFF_MILLIS = 30000L; // 0x7530L
+ field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L
+ field public static final int NETWORK_TYPE_ANY = 1; // 0x1
+ field public static final int NETWORK_TYPE_NONE = 0; // 0x0
+ field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2
+ }
+
+ public static final class JobInfo.Builder {
+ ctor public JobInfo.Builder(int, android.content.ComponentName);
+ method public android.app.job.JobInfo build();
+ method public android.app.job.JobInfo.Builder setBackoffCriteria(long, int);
+ method public android.app.job.JobInfo.Builder setExtras(android.os.PersistableBundle);
+ method public android.app.job.JobInfo.Builder setMinimumLatency(long);
+ method public android.app.job.JobInfo.Builder setOverrideDeadline(long);
+ method public android.app.job.JobInfo.Builder setPeriodic(long);
+ method public android.app.job.JobInfo.Builder setPersisted(boolean);
+ method public android.app.job.JobInfo.Builder setRequiredNetworkType(int);
+ method public android.app.job.JobInfo.Builder setRequiresCharging(boolean);
+ method public android.app.job.JobInfo.Builder setRequiresDeviceIdle(boolean);
+ }
+
+ public class JobParameters implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.os.PersistableBundle getExtras();
+ method public int getJobId();
+ method public boolean isOverrideDeadlineExpired();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.job.JobParameters> CREATOR;
+ }
+
+ public abstract class JobScheduler {
+ ctor public JobScheduler();
+ method public abstract void cancel(int);
+ method public abstract void cancelAll();
+ method public abstract java.util.List<android.app.job.JobInfo> getAllPendingJobs();
+ method public abstract int schedule(android.app.job.JobInfo);
+ field public static final int RESULT_FAILURE = 0; // 0x0
+ field public static final int RESULT_SUCCESS = 1; // 0x1
+ }
+
+ public abstract class JobService extends android.app.Service {
+ ctor public JobService();
+ method public final void jobFinished(android.app.job.JobParameters, boolean);
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public abstract boolean onStartJob(android.app.job.JobParameters);
+ method public abstract boolean onStopJob(android.app.job.JobParameters);
+ field public static final java.lang.String PERMISSION_BIND = "android.permission.BIND_JOB_SERVICE";
+ }
+
+}
+
+package android.app.usage {
+
+ public final class ConfigurationStats implements android.os.Parcelable {
+ ctor public ConfigurationStats(android.app.usage.ConfigurationStats);
+ method public int describeContents();
+ method public int getActivationCount();
+ method public android.content.res.Configuration getConfiguration();
+ method public long getFirstTimeStamp();
+ method public long getLastTimeActive();
+ method public long getLastTimeStamp();
+ method public long getTotalTimeActive();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.usage.ConfigurationStats> CREATOR;
+ }
+
+ public final class NetworkStats implements java.lang.AutoCloseable {
+ method public void close();
+ method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket);
+ method public boolean hasNextBucket();
+ }
+
+ public static class NetworkStats.Bucket {
+ ctor public NetworkStats.Bucket();
+ method public long getEndTimeStamp();
+ method public long getRxBytes();
+ method public long getRxPackets();
+ method public long getStartTimeStamp();
+ method public int getState();
+ method public long getTxBytes();
+ method public long getTxPackets();
+ method public int getUid();
+ field public static final int STATE_ALL = -1; // 0xffffffff
+ field public static final int STATE_DEFAULT = 1; // 0x1
+ field public static final int STATE_FOREGROUND = 2; // 0x2
+ field public static final int UID_ALL = -1; // 0xffffffff
+ field public static final int UID_REMOVED = -4; // 0xfffffffc
+ field public static final int UID_TETHERING = -5; // 0xfffffffb
+ }
+
+ public class NetworkStatsManager {
+ method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
+ method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException;
+ method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
+ method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
+ method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
+ }
+
+ public final class UsageEvents implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean getNextEvent(android.app.usage.UsageEvents.Event);
+ method public boolean hasNextEvent();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.usage.UsageEvents> CREATOR;
+ }
+
+ public static final class UsageEvents.Event {
+ ctor public UsageEvents.Event();
+ method public java.lang.String getClassName();
+ method public android.content.res.Configuration getConfiguration();
+ method public int getEventType();
+ method public java.lang.String getPackageName();
+ method public long getTimeStamp();
+ field public static final int CONFIGURATION_CHANGE = 5; // 0x5
+ field public static final int MOVE_TO_BACKGROUND = 2; // 0x2
+ field public static final int MOVE_TO_FOREGROUND = 1; // 0x1
+ field public static final int NONE = 0; // 0x0
+ field public static final int USER_INTERACTION = 7; // 0x7
+ }
+
+ public final class UsageStats implements android.os.Parcelable {
+ ctor public UsageStats(android.app.usage.UsageStats);
+ method public void add(android.app.usage.UsageStats);
+ method public int describeContents();
+ method public long getFirstTimeStamp();
+ method public long getLastTimeStamp();
+ method public long getLastTimeUsed();
+ method public java.lang.String getPackageName();
+ method public long getTotalTimeInForeground();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.app.usage.UsageStats> CREATOR;
+ }
+
+ public final class UsageStatsManager {
+ method public boolean isAppInactive(java.lang.String);
+ method public java.util.Map<java.lang.String, android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);
+ method public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);
+ method public android.app.usage.UsageEvents queryEvents(long, long);
+ method public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);
+ field public static final int INTERVAL_BEST = 4; // 0x4
+ field public static final int INTERVAL_DAILY = 0; // 0x0
+ field public static final int INTERVAL_MONTHLY = 2; // 0x2
+ field public static final int INTERVAL_WEEKLY = 1; // 0x1
+ field public static final int INTERVAL_YEARLY = 3; // 0x3
+ }
+
+}
+
+package android.appwidget {
+
+ public class AppWidgetHost {
+ ctor public AppWidgetHost(android.content.Context, int);
+ method public int allocateAppWidgetId();
+ method protected void clearViews();
+ method public final android.appwidget.AppWidgetHostView createView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo);
+ method public static void deleteAllHosts();
+ method public void deleteAppWidgetId(int);
+ method public void deleteHost();
+ method protected android.appwidget.AppWidgetHostView onCreateView(android.content.Context, int, android.appwidget.AppWidgetProviderInfo);
+ method protected void onProviderChanged(int, android.appwidget.AppWidgetProviderInfo);
+ method protected void onProvidersChanged();
+ method public final void startAppWidgetConfigureActivityForResult(android.app.Activity, int, int, int, android.os.Bundle);
+ method public void startListening();
+ method public void stopListening();
+ }
+
+ public class AppWidgetHostView extends android.widget.FrameLayout {
+ ctor public AppWidgetHostView(android.content.Context);
+ ctor public AppWidgetHostView(android.content.Context, int, int);
+ method public int getAppWidgetId();
+ method public android.appwidget.AppWidgetProviderInfo getAppWidgetInfo();
+ method public static android.graphics.Rect getDefaultPaddingForWidget(android.content.Context, android.content.ComponentName, android.graphics.Rect);
+ method protected android.view.View getDefaultView();
+ method protected android.view.View getErrorView();
+ 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 updateAppWidgetOptions(android.os.Bundle);
+ method public void updateAppWidgetSize(android.os.Bundle, int, int, int, int);
+ }
+
+ public class AppWidgetManager {
+ method public boolean bindAppWidgetIdIfAllowed(int, android.content.ComponentName);
+ method public boolean bindAppWidgetIdIfAllowed(int, android.content.ComponentName, android.os.Bundle);
+ method public boolean bindAppWidgetIdIfAllowed(int, android.os.UserHandle, android.content.ComponentName, android.os.Bundle);
+ method public int[] getAppWidgetIds(android.content.ComponentName);
+ method public android.appwidget.AppWidgetProviderInfo getAppWidgetInfo(int);
+ method public android.os.Bundle getAppWidgetOptions(int);
+ method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProviders();
+ method public java.util.List<android.appwidget.AppWidgetProviderInfo> getInstalledProvidersForProfile(android.os.UserHandle);
+ method public static android.appwidget.AppWidgetManager getInstance(android.content.Context);
+ method public void notifyAppWidgetViewDataChanged(int[], int);
+ method public void notifyAppWidgetViewDataChanged(int, int);
+ method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews);
+ method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews);
+ 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 updateAppWidgetOptions(int, android.os.Bundle);
+ field public static final java.lang.String ACTION_APPWIDGET_BIND = "android.appwidget.action.APPWIDGET_BIND";
+ 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_HOST_RESTORED = "android.appwidget.action.APPWIDGET_HOST_RESTORED";
+ field public static final java.lang.String ACTION_APPWIDGET_OPTIONS_CHANGED = "android.appwidget.action.APPWIDGET_UPDATE_OPTIONS";
+ field public static final java.lang.String ACTION_APPWIDGET_PICK = "android.appwidget.action.APPWIDGET_PICK";
+ field public static final java.lang.String ACTION_APPWIDGET_RESTORED = "android.appwidget.action.APPWIDGET_RESTORED";
+ field public static final java.lang.String ACTION_APPWIDGET_UPDATE = "android.appwidget.action.APPWIDGET_UPDATE";
+ 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_OLD_IDS = "appWidgetOldIds";
+ field public static final java.lang.String EXTRA_APPWIDGET_OPTIONS = "appWidgetOptions";
+ field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER = "appWidgetProvider";
+ field public static final java.lang.String EXTRA_APPWIDGET_PROVIDER_PROFILE = "appWidgetProviderProfile";
+ 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 java.lang.String EXTRA_HOST_ID = "hostId";
+ field public static final int INVALID_APPWIDGET_ID = 0; // 0x0
+ field public static final java.lang.String META_DATA_APPWIDGET_PROVIDER = "android.appwidget.provider";
+ field public static final java.lang.String OPTION_APPWIDGET_HOST_CATEGORY = "appWidgetCategory";
+ field public static final java.lang.String OPTION_APPWIDGET_MAX_HEIGHT = "appWidgetMaxHeight";
+ field public static final java.lang.String OPTION_APPWIDGET_MAX_WIDTH = "appWidgetMaxWidth";
+ field public static final java.lang.String OPTION_APPWIDGET_MIN_HEIGHT = "appWidgetMinHeight";
+ field public static final java.lang.String OPTION_APPWIDGET_MIN_WIDTH = "appWidgetMinWidth";
+ }
+
+ public class AppWidgetProvider extends android.content.BroadcastReceiver {
+ ctor public AppWidgetProvider();
+ method public void onAppWidgetOptionsChanged(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);
+ method public void onReceive(android.content.Context, android.content.Intent);
+ method public void onRestored(android.content.Context, int[], int[]);
+ method public void onUpdate(android.content.Context, android.appwidget.AppWidgetManager, int[]);
+ }
+
+ public class AppWidgetProviderInfo implements android.os.Parcelable {
+ ctor public AppWidgetProviderInfo();
+ ctor public AppWidgetProviderInfo(android.os.Parcel);
+ method public android.appwidget.AppWidgetProviderInfo clone();
+ method public int describeContents();
+ method public final android.os.UserHandle getProfile();
+ method public final android.graphics.drawable.Drawable loadIcon(android.content.Context, int);
+ method public final java.lang.String loadLabel(android.content.pm.PackageManager);
+ method public final android.graphics.drawable.Drawable loadPreviewImage(android.content.Context, int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.appwidget.AppWidgetProviderInfo> CREATOR;
+ field public static final int RESIZE_BOTH = 3; // 0x3
+ field public static final int RESIZE_HORIZONTAL = 1; // 0x1
+ field public static final int RESIZE_NONE = 0; // 0x0
+ field public static final int RESIZE_VERTICAL = 2; // 0x2
+ field public static final int WIDGET_CATEGORY_HOME_SCREEN = 1; // 0x1
+ field public static final int WIDGET_CATEGORY_KEYGUARD = 2; // 0x2
+ field public static final int WIDGET_CATEGORY_SEARCHBOX = 4; // 0x4
+ field public int autoAdvanceViewId;
+ field public android.content.ComponentName configure;
+ field public int icon;
+ field public int initialKeyguardLayout;
+ field public int initialLayout;
+ field public deprecated java.lang.String label;
+ field public int minHeight;
+ field public int minResizeHeight;
+ field public int minResizeWidth;
+ field public int minWidth;
+ field public int previewImage;
+ field public android.content.ComponentName provider;
+ field public int resizeMode;
+ field public int updatePeriodMillis;
+ field public int widgetCategory;
+ }
+
+}
+
+package android.bluetooth {
+
+ public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {
+ method public void finalize();
+ method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method public int getConnectionState(android.bluetooth.BluetoothDevice);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+ method public boolean isA2dpPlaying(android.bluetooth.BluetoothDevice);
+ field public static final java.lang.String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED";
+ field public static final java.lang.String ACTION_PLAYING_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED";
+ field public static final int STATE_NOT_PLAYING = 11; // 0xb
+ field public static final int STATE_PLAYING = 10; // 0xa
+ }
+
+ public final class BluetoothAdapter {
+ method public boolean cancelDiscovery();
+ method public static boolean checkBluetoothAddress(java.lang.String);
+ method public void closeProfileProxy(int, android.bluetooth.BluetoothProfile);
+ method public boolean disable();
+ method public boolean enable();
+ method public java.lang.String getAddress();
+ method public android.bluetooth.le.BluetoothLeAdvertiser getBluetoothLeAdvertiser();
+ method public android.bluetooth.le.BluetoothLeScanner getBluetoothLeScanner();
+ method public java.util.Set<android.bluetooth.BluetoothDevice> getBondedDevices();
+ method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter();
+ method public java.lang.String getName();
+ method public int getProfileConnectionState(int);
+ method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);
+ method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String);
+ method public android.bluetooth.BluetoothDevice getRemoteDevice(byte[]);
+ method public int getScanMode();
+ method public int getState();
+ method public boolean isDiscovering();
+ method public boolean isEnabled();
+ method public boolean isMultipleAdvertisementSupported();
+ method public boolean isOffloadedFilteringSupported();
+ method public boolean isOffloadedScanBatchingSupported();
+ method public android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(java.lang.String, java.util.UUID) throws java.io.IOException;
+ method public android.bluetooth.BluetoothServerSocket listenUsingRfcommWithServiceRecord(java.lang.String, java.util.UUID) throws java.io.IOException;
+ method public boolean setName(java.lang.String);
+ method public boolean startDiscovery();
+ method public deprecated boolean startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);
+ method public deprecated boolean startLeScan(java.util.UUID[], android.bluetooth.BluetoothAdapter.LeScanCallback);
+ method public deprecated void stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);
+ field public static final java.lang.String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED";
+ field public static final java.lang.String ACTION_DISCOVERY_FINISHED = "android.bluetooth.adapter.action.DISCOVERY_FINISHED";
+ field public static final java.lang.String ACTION_DISCOVERY_STARTED = "android.bluetooth.adapter.action.DISCOVERY_STARTED";
+ field public static final java.lang.String ACTION_LOCAL_NAME_CHANGED = "android.bluetooth.adapter.action.LOCAL_NAME_CHANGED";
+ field public static final java.lang.String ACTION_REQUEST_DISCOVERABLE = "android.bluetooth.adapter.action.REQUEST_DISCOVERABLE";
+ field public static final java.lang.String ACTION_REQUEST_ENABLE = "android.bluetooth.adapter.action.REQUEST_ENABLE";
+ field public static final java.lang.String ACTION_SCAN_MODE_CHANGED = "android.bluetooth.adapter.action.SCAN_MODE_CHANGED";
+ field public static final java.lang.String ACTION_STATE_CHANGED = "android.bluetooth.adapter.action.STATE_CHANGED";
+ field public static final int ERROR = -2147483648; // 0x80000000
+ field public static final java.lang.String EXTRA_CONNECTION_STATE = "android.bluetooth.adapter.extra.CONNECTION_STATE";
+ field public static final java.lang.String EXTRA_DISCOVERABLE_DURATION = "android.bluetooth.adapter.extra.DISCOVERABLE_DURATION";
+ field public static final java.lang.String EXTRA_LOCAL_NAME = "android.bluetooth.adapter.extra.LOCAL_NAME";
+ field public static final java.lang.String EXTRA_PREVIOUS_CONNECTION_STATE = "android.bluetooth.adapter.extra.PREVIOUS_CONNECTION_STATE";
+ field public static final java.lang.String EXTRA_PREVIOUS_SCAN_MODE = "android.bluetooth.adapter.extra.PREVIOUS_SCAN_MODE";
+ field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.adapter.extra.PREVIOUS_STATE";
+ field public static final java.lang.String EXTRA_SCAN_MODE = "android.bluetooth.adapter.extra.SCAN_MODE";
+ field public static final java.lang.String EXTRA_STATE = "android.bluetooth.adapter.extra.STATE";
+ field public static final int SCAN_MODE_CONNECTABLE = 21; // 0x15
+ field public static final int SCAN_MODE_CONNECTABLE_DISCOVERABLE = 23; // 0x17
+ field public static final int SCAN_MODE_NONE = 20; // 0x14
+ field public static final int STATE_CONNECTED = 2; // 0x2
+ field public static final int STATE_CONNECTING = 1; // 0x1
+ field public static final int STATE_DISCONNECTED = 0; // 0x0
+ field public static final int STATE_DISCONNECTING = 3; // 0x3
+ field public static final int STATE_OFF = 10; // 0xa
+ field public static final int STATE_ON = 12; // 0xc
+ field public static final int STATE_TURNING_OFF = 13; // 0xd
+ field public static final int STATE_TURNING_ON = 11; // 0xb
+ }
+
+ public static abstract interface BluetoothAdapter.LeScanCallback {
+ method public abstract void onLeScan(android.bluetooth.BluetoothDevice, int, byte[]);
+ }
+
+ public class BluetoothAssignedNumbers {
+ field public static final int AAMP_OF_AMERICA = 190; // 0xbe
+ field public static final int ACCEL_SEMICONDUCTOR = 74; // 0x4a
+ field public static final int ACE_SENSOR = 188; // 0xbc
+ field public static final int ADIDAS = 195; // 0xc3
+ field public static final int ADVANCED_PANMOBIL_SYSTEMS = 145; // 0x91
+ field public static final int AIROHA_TECHNOLOGY = 148; // 0x94
+ field public static final int ALCATEL = 36; // 0x24
+ field public static final int ALPWISE = 154; // 0x9a
+ field public static final int AMICCOM_ELECTRONICS = 192; // 0xc0
+ field public static final int APLIX = 189; // 0xbd
+ field public static final int APPLE = 76; // 0x4c
+ field public static final int APT_LICENSING = 79; // 0x4f
+ field public static final int ARCHOS = 207; // 0xcf
+ field public static final int ARP_DEVICES = 168; // 0xa8
+ field public static final int ATHEROS_COMMUNICATIONS = 69; // 0x45
+ field public static final int ATMEL = 19; // 0x13
+ field public static final int AUSTCO_COMMUNICATION_SYSTEMS = 213; // 0xd5
+ field public static final int AUTONET_MOBILE = 127; // 0x7f
+ field public static final int AVAGO = 78; // 0x4e
+ field public static final int AVM_BERLIN = 31; // 0x1f
+ field public static final int A_AND_D_ENGINEERING = 105; // 0x69
+ field public static final int A_AND_R_CAMBRIDGE = 124; // 0x7c
+ field public static final int BANDSPEED = 32; // 0x20
+ field public static final int BAND_XI_INTERNATIONAL = 100; // 0x64
+ field public static final int BDE_TECHNOLOGY = 180; // 0xb4
+ field public static final int BEATS_ELECTRONICS = 204; // 0xcc
+ field public static final int BEAUTIFUL_ENTERPRISE = 108; // 0x6c
+ field public static final int BEKEY = 178; // 0xb2
+ field public static final int BELKIN_INTERNATIONAL = 92; // 0x5c
+ field public static final int BINAURIC = 203; // 0xcb
+ field public static final int BIOSENTRONICS = 219; // 0xdb
+ field public static final int BLUEGIGA = 71; // 0x47
+ field public static final int BLUERADIOS = 133; // 0x85
+ field public static final int BLUETOOTH_SIG = 63; // 0x3f
+ field public static final int BLUETREK_TECHNOLOGIES = 151; // 0x97
+ field public static final int BOSE = 158; // 0x9e
+ field public static final int BRIARTEK = 109; // 0x6d
+ field public static final int BROADCOM = 15; // 0xf
+ field public static final int CAEN_RFID = 170; // 0xaa
+ field public static final int CAMBRIDGE_SILICON_RADIO = 10; // 0xa
+ field public static final int CATC = 52; // 0x34
+ field public static final int CINETIX = 175; // 0xaf
+ field public static final int CLARINOX_TECHNOLOGIES = 179; // 0xb3
+ field public static final int COLORFY = 156; // 0x9c
+ field public static final int COMMIL = 51; // 0x33
+ field public static final int CONEXANT_SYSTEMS = 28; // 0x1c
+ field public static final int CONNECTBLUE = 113; // 0x71
+ field public static final int CONTINENTAL_AUTOMOTIVE = 75; // 0x4b
+ field public static final int CONWISE_TECHNOLOGY = 66; // 0x42
+ field public static final int CREATIVE_TECHNOLOGY = 118; // 0x76
+ field public static final int C_TECHNOLOGIES = 38; // 0x26
+ field public static final int DANLERS = 225; // 0xe1
+ field public static final int DELORME_PUBLISHING_COMPANY = 128; // 0x80
+ field public static final int DEXCOM = 208; // 0xd0
+ field public static final int DIALOG_SEMICONDUCTOR = 210; // 0xd2
+ field public static final int DIGIANSWER = 12; // 0xc
+ field public static final int ECLIPSE = 53; // 0x35
+ field public static final int ECOTEST = 136; // 0x88
+ field public static final int ELGATO_SYSTEMS = 206; // 0xce
+ field public static final int EM_MICROELECTRONIC_MARIN = 90; // 0x5a
+ field public static final int EQUINOX_AG = 134; // 0x86
+ field public static final int ERICSSON_TECHNOLOGY = 0; // 0x0
+ field public static final int EVLUMA = 201; // 0xc9
+ field public static final int FREE2MOVE = 83; // 0x53
+ field public static final int FUNAI_ELECTRIC = 144; // 0x90
+ field public static final int GARMIN_INTERNATIONAL = 135; // 0x87
+ field public static final int GCT_SEMICONDUCTOR = 45; // 0x2d
+ field public static final int GELO = 200; // 0xc8
+ field public static final int GENEQ = 194; // 0xc2
+ field public static final int GENERAL_MOTORS = 104; // 0x68
+ field public static final int GENNUM = 59; // 0x3b
+ field public static final int GEOFORCE = 157; // 0x9d
+ field public static final int GIBSON_GUITARS = 98; // 0x62
+ field public static final int GN_NETCOM = 103; // 0x67
+ field public static final int GN_RESOUND = 137; // 0x89
+ field public static final int GOOGLE = 224; // 0xe0
+ field public static final int GREEN_THROTTLE_GAMES = 172; // 0xac
+ field public static final int GROUP_SENSE = 115; // 0x73
+ field public static final int HANLYNN_TECHNOLOGIES = 123; // 0x7b
+ field public static final int HARMAN_INTERNATIONAL = 87; // 0x57
+ field public static final int HEWLETT_PACKARD = 101; // 0x65
+ field public static final int HITACHI = 41; // 0x29
+ field public static final int HOSIDEN = 221; // 0xdd
+ field public static final int IBM = 3; // 0x3
+ field public static final int INFINEON_TECHNOLOGIES = 9; // 0x9
+ field public static final int INGENIEUR_SYSTEMGRUPPE_ZAHN = 171; // 0xab
+ field public static final int INTEGRATED_SILICON_SOLUTION = 65; // 0x41
+ field public static final int INTEGRATED_SYSTEM_SOLUTION = 57; // 0x39
+ field public static final int INTEL = 2; // 0x2
+ field public static final int INVENTEL = 30; // 0x1e
+ field public static final int IPEXTREME = 61; // 0x3d
+ field public static final int I_TECH_DYNAMIC_GLOBAL_DISTRIBUTION = 153; // 0x99
+ field public static final int JAWBONE = 138; // 0x8a
+ field public static final int JIANGSU_TOPPOWER_AUTOMOTIVE_ELECTRONICS = 155; // 0x9b
+ field public static final int JOHNSON_CONTROLS = 185; // 0xb9
+ field public static final int J_AND_M = 82; // 0x52
+ field public static final int KAWANTECH = 212; // 0xd4
+ field public static final int KC_TECHNOLOGY = 22; // 0x16
+ field public static final int KENSINGTON_COMPUTER_PRODUCTS_GROUP = 160; // 0xa0
+ field public static final int LAIRD_TECHNOLOGIES = 119; // 0x77
+ field public static final int LESSWIRE = 121; // 0x79
+ field public static final int LG_ELECTRONICS = 196; // 0xc4
+ field public static final int LINAK = 164; // 0xa4
+ field public static final int LUCENT = 7; // 0x7
+ field public static final int LUDUS_HELSINKI = 132; // 0x84
+ field public static final int MACRONIX = 44; // 0x2c
+ field public static final int MAGNETI_MARELLI = 169; // 0xa9
+ field public static final int MANSELLA = 33; // 0x21
+ field public static final int MARVELL = 72; // 0x48
+ field public static final int MATSUSHITA_ELECTRIC = 58; // 0x3a
+ field public static final int MC10 = 202; // 0xca
+ field public static final int MEDIATEK = 70; // 0x46
+ field public static final int MESO_INTERNATIONAL = 182; // 0xb6
+ field public static final int META_WATCH = 163; // 0xa3
+ field public static final int MEWTEL_TECHNOLOGY = 47; // 0x2f
+ field public static final int MICOMMAND = 99; // 0x63
+ field public static final int MICROCHIP_TECHNOLOGY = 205; // 0xcd
+ field public static final int MICROSOFT = 6; // 0x6
+ field public static final int MINDTREE = 106; // 0x6a
+ field public static final int MISFIT_WEARABLES = 223; // 0xdf
+ field public static final int MITEL_SEMICONDUCTOR = 16; // 0x10
+ field public static final int MITSUBISHI_ELECTRIC = 20; // 0x14
+ field public static final int MOBILIAN_CORPORATION = 55; // 0x37
+ field public static final int MONSTER = 112; // 0x70
+ field public static final int MOTOROLA = 8; // 0x8
+ field public static final int MSTAR_SEMICONDUCTOR = 122; // 0x7a
+ field public static final int MUZIK = 222; // 0xde
+ field public static final int NEC = 34; // 0x22
+ field public static final int NEC_LIGHTING = 149; // 0x95
+ field public static final int NEWLOGIC = 23; // 0x17
+ field public static final int NIKE = 120; // 0x78
+ field public static final int NINE_SOLUTIONS = 102; // 0x66
+ field public static final int NOKIA_MOBILE_PHONES = 1; // 0x1
+ field public static final int NORDIC_SEMICONDUCTOR = 89; // 0x59
+ field public static final int NORWOOD_SYSTEMS = 46; // 0x2e
+ field public static final int ODM_TECHNOLOGY = 150; // 0x96
+ field public static final int OMEGAWAVE = 174; // 0xae
+ field public static final int ONSET_COMPUTER = 197; // 0xc5
+ field public static final int OPEN_INTERFACE = 39; // 0x27
+ field public static final int OTL_DYNAMICS = 165; // 0xa5
+ field public static final int PANDA_OCEAN = 166; // 0xa6
+ field public static final int PARROT = 67; // 0x43
+ field public static final int PARTHUS_TECHNOLOGIES = 14; // 0xe
+ field public static final int PASSIF_SEMICONDUCTOR = 176; // 0xb0
+ field public static final int PETER_SYSTEMTECHNIK = 173; // 0xad
+ field public static final int PHILIPS_SEMICONDUCTORS = 37; // 0x25
+ field public static final int PLANTRONICS = 85; // 0x55
+ field public static final int POLAR_ELECTRO = 107; // 0x6b
+ field public static final int POLAR_ELECTRO_EUROPE = 209; // 0xd1
+ field public static final int PROCTER_AND_GAMBLE = 220; // 0xdc
+ field public static final int QUALCOMM = 29; // 0x1d
+ field public static final int QUALCOMM_CONNECTED_EXPERIENCES = 216; // 0xd8
+ field public static final int QUALCOMM_INNOVATION_CENTER = 184; // 0xb8
+ field public static final int QUALCOMM_LABS = 140; // 0x8c
+ field public static final int QUALCOMM_TECHNOLOGIES = 215; // 0xd7
+ field public static final int QUINTIC = 142; // 0x8e
+ field public static final int QUUPPA = 199; // 0xc7
+ field public static final int RALINK_TECHNOLOGY = 91; // 0x5b
+ field public static final int RDA_MICROELECTRONICS = 97; // 0x61
+ field public static final int REALTEK_SEMICONDUCTOR = 93; // 0x5d
+ field public static final int RED_M = 50; // 0x32
+ field public static final int RENESAS_TECHNOLOGY = 54; // 0x36
+ field public static final int RESEARCH_IN_MOTION = 60; // 0x3c
+ field public static final int RF_MICRO_DEVICES = 40; // 0x28
+ field public static final int RIVIERAWAVES = 96; // 0x60
+ field public static final int ROHDE_AND_SCHWARZ = 25; // 0x19
+ field public static final int RTX_TELECOM = 21; // 0x15
+ field public static final int SAMSUNG_ELECTRONICS = 117; // 0x75
+ field public static final int SARIS_CYCLING_GROUP = 177; // 0xb1
+ field public static final int SEERS_TECHNOLOGY = 125; // 0x7d
+ field public static final int SEIKO_EPSON = 64; // 0x40
+ field public static final int SELFLY = 198; // 0xc6
+ field public static final int SEMILINK = 226; // 0xe2
+ field public static final int SENNHEISER_COMMUNICATIONS = 130; // 0x82
+ field public static final int SHANGHAI_SUPER_SMART_ELECTRONICS = 114; // 0x72
+ field public static final int SHENZHEN_EXCELSECU_DATA_TECHNOLOGY = 193; // 0xc1
+ field public static final int SIGNIA_TECHNOLOGIES = 27; // 0x1b
+ field public static final int SILICON_WAVE = 11; // 0xb
+ field public static final int SIRF_TECHNOLOGY = 80; // 0x50
+ field public static final int SOCKET_MOBILE = 68; // 0x44
+ field public static final int SONY_ERICSSON = 86; // 0x56
+ field public static final int SOUND_ID = 111; // 0x6f
+ field public static final int SPORTS_TRACKING_TECHNOLOGIES = 126; // 0x7e
+ field public static final int SR_MEDIZINELEKTRONIK = 161; // 0xa1
+ field public static final int STACCATO_COMMUNICATIONS = 77; // 0x4d
+ field public static final int STALMART_TECHNOLOGY = 191; // 0xbf
+ field public static final int STARKEY_LABORATORIES = 186; // 0xba
+ field public static final int STOLLMAN_E_PLUS_V = 143; // 0x8f
+ field public static final int STONESTREET_ONE = 94; // 0x5e
+ field public static final int ST_MICROELECTRONICS = 48; // 0x30
+ field public static final int SUMMIT_DATA_COMMUNICATIONS = 110; // 0x6e
+ field public static final int SUUNTO = 159; // 0x9f
+ field public static final int SWIRL_NETWORKS = 181; // 0xb5
+ field public static final int SYMBOL_TECHNOLOGIES = 42; // 0x2a
+ field public static final int SYNOPSYS = 49; // 0x31
+ field public static final int SYSTEMS_AND_CHIPS = 62; // 0x3e
+ field public static final int S_POWER_ELECTRONICS = 187; // 0xbb
+ field public static final int TAIXINGBANG_TECHNOLOGY = 211; // 0xd3
+ field public static final int TENOVIS = 43; // 0x2b
+ field public static final int TERAX = 56; // 0x38
+ field public static final int TEXAS_INSTRUMENTS = 13; // 0xd
+ field public static final int THINKOPTICS = 146; // 0x92
+ field public static final int THREECOM = 5; // 0x5
+ field public static final int THREE_DIJOY = 84; // 0x54
+ field public static final int THREE_DSP = 73; // 0x49
+ field public static final int TIMEKEEPING_SYSTEMS = 131; // 0x83
+ field public static final int TIMEX_GROUP_USA = 214; // 0xd6
+ field public static final int TOPCORN_POSITIONING_SYSTEMS = 139; // 0x8b
+ field public static final int TOSHIBA = 4; // 0x4
+ field public static final int TRANSILICA = 24; // 0x18
+ field public static final int TRELAB = 183; // 0xb7
+ field public static final int TTPCOM = 26; // 0x1a
+ field public static final int TXTR = 218; // 0xda
+ field public static final int TZERO_TECHNOLOGIES = 81; // 0x51
+ field public static final int UNIVERSAL_ELECTRONICS = 147; // 0x93
+ field public static final int VERTU = 162; // 0xa2
+ field public static final int VISTEON = 167; // 0xa7
+ field public static final int VIZIO = 88; // 0x58
+ field public static final int VOYETRA_TURTLE_BEACH = 217; // 0xd9
+ field public static final int WAVEPLUS_TECHNOLOGY = 35; // 0x23
+ field public static final int WICENTRIC = 95; // 0x5f
+ field public static final int WIDCOMM = 17; // 0x11
+ field public static final int WUXI_VIMICRO = 129; // 0x81
+ field public static final int ZEEVO = 18; // 0x12
+ field public static final int ZER01_TV = 152; // 0x98
+ field public static final int ZOMM = 116; // 0x74
+ field public static final int ZSCAN_SOFTWARE = 141; // 0x8d
+ }
+
+ public final class BluetoothClass implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getDeviceClass();
+ method public int getMajorDeviceClass();
+ method public boolean hasService(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothClass> CREATOR;
+ }
+
+ public static class BluetoothClass.Device {
+ ctor public BluetoothClass.Device();
+ field public static final int AUDIO_VIDEO_CAMCORDER = 1076; // 0x434
+ field public static final int AUDIO_VIDEO_CAR_AUDIO = 1056; // 0x420
+ field public static final int AUDIO_VIDEO_HANDSFREE = 1032; // 0x408
+ field public static final int AUDIO_VIDEO_HEADPHONES = 1048; // 0x418
+ field public static final int AUDIO_VIDEO_HIFI_AUDIO = 1064; // 0x428
+ field public static final int AUDIO_VIDEO_LOUDSPEAKER = 1044; // 0x414
+ field public static final int AUDIO_VIDEO_MICROPHONE = 1040; // 0x410
+ field public static final int AUDIO_VIDEO_PORTABLE_AUDIO = 1052; // 0x41c
+ field public static final int AUDIO_VIDEO_SET_TOP_BOX = 1060; // 0x424
+ field public static final int AUDIO_VIDEO_UNCATEGORIZED = 1024; // 0x400
+ field public static final int AUDIO_VIDEO_VCR = 1068; // 0x42c
+ field public static final int AUDIO_VIDEO_VIDEO_CAMERA = 1072; // 0x430
+ field public static final int AUDIO_VIDEO_VIDEO_CONFERENCING = 1088; // 0x440
+ field public static final int AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER = 1084; // 0x43c
+ field public static final int AUDIO_VIDEO_VIDEO_GAMING_TOY = 1096; // 0x448
+ field public static final int AUDIO_VIDEO_VIDEO_MONITOR = 1080; // 0x438
+ field public static final int AUDIO_VIDEO_WEARABLE_HEADSET = 1028; // 0x404
+ field public static final int COMPUTER_DESKTOP = 260; // 0x104
+ field public static final int COMPUTER_HANDHELD_PC_PDA = 272; // 0x110
+ field public static final int COMPUTER_LAPTOP = 268; // 0x10c
+ field public static final int COMPUTER_PALM_SIZE_PC_PDA = 276; // 0x114
+ field public static final int COMPUTER_SERVER = 264; // 0x108
+ field public static final int COMPUTER_UNCATEGORIZED = 256; // 0x100
+ field public static final int COMPUTER_WEARABLE = 280; // 0x118
+ field public static final int HEALTH_BLOOD_PRESSURE = 2308; // 0x904
+ field public static final int HEALTH_DATA_DISPLAY = 2332; // 0x91c
+ field public static final int HEALTH_GLUCOSE = 2320; // 0x910
+ field public static final int HEALTH_PULSE_OXIMETER = 2324; // 0x914
+ field public static final int HEALTH_PULSE_RATE = 2328; // 0x918
+ field public static final int HEALTH_THERMOMETER = 2312; // 0x908
+ field public static final int HEALTH_UNCATEGORIZED = 2304; // 0x900
+ field public static final int HEALTH_WEIGHING = 2316; // 0x90c
+ field public static final int PHONE_CELLULAR = 516; // 0x204
+ field public static final int PHONE_CORDLESS = 520; // 0x208
+ field public static final int PHONE_ISDN = 532; // 0x214
+ field public static final int PHONE_MODEM_OR_GATEWAY = 528; // 0x210
+ field public static final int PHONE_SMART = 524; // 0x20c
+ field public static final int PHONE_UNCATEGORIZED = 512; // 0x200
+ field public static final int TOY_CONTROLLER = 2064; // 0x810
+ field public static final int TOY_DOLL_ACTION_FIGURE = 2060; // 0x80c
+ field public static final int TOY_GAME = 2068; // 0x814
+ field public static final int TOY_ROBOT = 2052; // 0x804
+ field public static final int TOY_UNCATEGORIZED = 2048; // 0x800
+ field public static final int TOY_VEHICLE = 2056; // 0x808
+ field public static final int WEARABLE_GLASSES = 1812; // 0x714
+ field public static final int WEARABLE_HELMET = 1808; // 0x710
+ field public static final int WEARABLE_JACKET = 1804; // 0x70c
+ field public static final int WEARABLE_PAGER = 1800; // 0x708
+ field public static final int WEARABLE_UNCATEGORIZED = 1792; // 0x700
+ field public static final int WEARABLE_WRIST_WATCH = 1796; // 0x704
+ }
+
+ public static class BluetoothClass.Device.Major {
+ ctor public BluetoothClass.Device.Major();
+ field public static final int AUDIO_VIDEO = 1024; // 0x400
+ field public static final int COMPUTER = 256; // 0x100
+ field public static final int HEALTH = 2304; // 0x900
+ field public static final int IMAGING = 1536; // 0x600
+ field public static final int MISC = 0; // 0x0
+ field public static final int NETWORKING = 768; // 0x300
+ field public static final int PERIPHERAL = 1280; // 0x500
+ field public static final int PHONE = 512; // 0x200
+ field public static final int TOY = 2048; // 0x800
+ field public static final int UNCATEGORIZED = 7936; // 0x1f00
+ field public static final int WEARABLE = 1792; // 0x700
+ }
+
+ public static final class BluetoothClass.Service {
+ ctor public BluetoothClass.Service();
+ field public static final int AUDIO = 2097152; // 0x200000
+ field public static final int CAPTURE = 524288; // 0x80000
+ field public static final int INFORMATION = 8388608; // 0x800000
+ field public static final int LIMITED_DISCOVERABILITY = 8192; // 0x2000
+ field public static final int NETWORKING = 131072; // 0x20000
+ field public static final int OBJECT_TRANSFER = 1048576; // 0x100000
+ field public static final int POSITIONING = 65536; // 0x10000
+ field public static final int RENDER = 262144; // 0x40000
+ field public static final int TELEPHONY = 4194304; // 0x400000
+ }
+
+ public final class BluetoothDevice implements android.os.Parcelable {
+ method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback);
+ method public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int);
+ method public boolean createBond();
+ method public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
+ method public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
+ method public int describeContents();
+ method public boolean fetchUuidsWithSdp();
+ method public java.lang.String getAddress();
+ method public android.bluetooth.BluetoothClass getBluetoothClass();
+ method public int getBondState();
+ method public java.lang.String getName();
+ method public int getType();
+ method public android.os.ParcelUuid[] getUuids();
+ method public boolean setPairingConfirmation(boolean);
+ method public boolean setPin(byte[]);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final java.lang.String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";
+ field public static final java.lang.String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED";
+ field public static final java.lang.String ACTION_ACL_DISCONNECT_REQUESTED = "android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED";
+ field public static final java.lang.String ACTION_BOND_STATE_CHANGED = "android.bluetooth.device.action.BOND_STATE_CHANGED";
+ field public static final java.lang.String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED";
+ field public static final java.lang.String ACTION_FOUND = "android.bluetooth.device.action.FOUND";
+ field public static final java.lang.String ACTION_NAME_CHANGED = "android.bluetooth.device.action.NAME_CHANGED";
+ field public static final java.lang.String ACTION_PAIRING_REQUEST = "android.bluetooth.device.action.PAIRING_REQUEST";
+ field public static final java.lang.String ACTION_UUID = "android.bluetooth.device.action.UUID";
+ field public static final int BOND_BONDED = 12; // 0xc
+ field public static final int BOND_BONDING = 11; // 0xb
+ field public static final int BOND_NONE = 10; // 0xa
+ field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothDevice> CREATOR;
+ field public static final int DEVICE_TYPE_CLASSIC = 1; // 0x1
+ field public static final int DEVICE_TYPE_DUAL = 3; // 0x3
+ field public static final int DEVICE_TYPE_LE = 2; // 0x2
+ field public static final int DEVICE_TYPE_UNKNOWN = 0; // 0x0
+ field public static final int ERROR = -2147483648; // 0x80000000
+ field public static final java.lang.String EXTRA_BOND_STATE = "android.bluetooth.device.extra.BOND_STATE";
+ field public static final java.lang.String EXTRA_CLASS = "android.bluetooth.device.extra.CLASS";
+ field public static final java.lang.String EXTRA_DEVICE = "android.bluetooth.device.extra.DEVICE";
+ field public static final java.lang.String EXTRA_NAME = "android.bluetooth.device.extra.NAME";
+ field public static final java.lang.String EXTRA_PAIRING_KEY = "android.bluetooth.device.extra.PAIRING_KEY";
+ field public static final java.lang.String EXTRA_PAIRING_VARIANT = "android.bluetooth.device.extra.PAIRING_VARIANT";
+ field public static final java.lang.String EXTRA_PREVIOUS_BOND_STATE = "android.bluetooth.device.extra.PREVIOUS_BOND_STATE";
+ field public static final java.lang.String EXTRA_RSSI = "android.bluetooth.device.extra.RSSI";
+ field public static final java.lang.String EXTRA_UUID = "android.bluetooth.device.extra.UUID";
+ field public static final int PAIRING_VARIANT_PASSKEY_CONFIRMATION = 2; // 0x2
+ field public static final int PAIRING_VARIANT_PIN = 0; // 0x0
+ field public static final int TRANSPORT_AUTO = 0; // 0x0
+ field public static final int TRANSPORT_BREDR = 1; // 0x1
+ field public static final int TRANSPORT_LE = 2; // 0x2
+ }
+
+ public final class BluetoothGatt implements android.bluetooth.BluetoothProfile {
+ method public void abortReliableWrite();
+ method public deprecated void abortReliableWrite(android.bluetooth.BluetoothDevice);
+ method public boolean beginReliableWrite();
+ method public void close();
+ method public boolean connect();
+ method public void disconnect();
+ method public boolean discoverServices();
+ method public boolean executeReliableWrite();
+ method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method public int getConnectionState(android.bluetooth.BluetoothDevice);
+ method public android.bluetooth.BluetoothDevice getDevice();
+ method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+ method public android.bluetooth.BluetoothGattService getService(java.util.UUID);
+ method public java.util.List<android.bluetooth.BluetoothGattService> getServices();
+ method public boolean readCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
+ method public boolean readDescriptor(android.bluetooth.BluetoothGattDescriptor);
+ method public boolean readRemoteRssi();
+ method public boolean requestConnectionPriority(int);
+ method public boolean requestMtu(int);
+ method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean);
+ method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
+ method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor);
+ field public static final int CONNECTION_PRIORITY_BALANCED = 0; // 0x0
+ field public static final int CONNECTION_PRIORITY_HIGH = 1; // 0x1
+ field public static final int CONNECTION_PRIORITY_LOW_POWER = 2; // 0x2
+ field public static final int GATT_CONNECTION_CONGESTED = 143; // 0x8f
+ field public static final int GATT_FAILURE = 257; // 0x101
+ field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5
+ field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf
+ field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd
+ field public static final int GATT_INVALID_OFFSET = 7; // 0x7
+ field public static final int GATT_READ_NOT_PERMITTED = 2; // 0x2
+ field public static final int GATT_REQUEST_NOT_SUPPORTED = 6; // 0x6
+ field public static final int GATT_SUCCESS = 0; // 0x0
+ field public static final int GATT_WRITE_NOT_PERMITTED = 3; // 0x3
+ }
+
+ public abstract class BluetoothGattCallback {
+ ctor public BluetoothGattCallback();
+ method public void onCharacteristicChanged(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic);
+ method public void onCharacteristicRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
+ method public void onCharacteristicWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
+ method public void onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int);
+ method public void onDescriptorRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
+ method public void onDescriptorWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
+ method public void onMtuChanged(android.bluetooth.BluetoothGatt, int, int);
+ method public void onReadRemoteRssi(android.bluetooth.BluetoothGatt, int, int);
+ method public void onReliableWriteCompleted(android.bluetooth.BluetoothGatt, int);
+ method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int);
+ }
+
+ public class BluetoothGattCharacteristic {
+ ctor public BluetoothGattCharacteristic(java.util.UUID, int, int);
+ method public boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor);
+ method public android.bluetooth.BluetoothGattDescriptor getDescriptor(java.util.UUID);
+ method public java.util.List<android.bluetooth.BluetoothGattDescriptor> getDescriptors();
+ method public java.lang.Float getFloatValue(int, int);
+ method public int getInstanceId();
+ method public java.lang.Integer getIntValue(int, int);
+ method public int getPermissions();
+ method public int getProperties();
+ method public android.bluetooth.BluetoothGattService getService();
+ method public java.lang.String getStringValue(int);
+ method public java.util.UUID getUuid();
+ method public byte[] getValue();
+ method public int getWriteType();
+ method public boolean setValue(byte[]);
+ method public boolean setValue(int, int, int);
+ method public boolean setValue(int, int, int, int);
+ method public boolean setValue(java.lang.String);
+ method public void setWriteType(int);
+ field public static final int FORMAT_FLOAT = 52; // 0x34
+ field public static final int FORMAT_SFLOAT = 50; // 0x32
+ field public static final int FORMAT_SINT16 = 34; // 0x22
+ field public static final int FORMAT_SINT32 = 36; // 0x24
+ field public static final int FORMAT_SINT8 = 33; // 0x21
+ field public static final int FORMAT_UINT16 = 18; // 0x12
+ field public static final int FORMAT_UINT32 = 20; // 0x14
+ field public static final int FORMAT_UINT8 = 17; // 0x11
+ field public static final int PERMISSION_READ = 1; // 0x1
+ field public static final int PERMISSION_READ_ENCRYPTED = 2; // 0x2
+ field public static final int PERMISSION_READ_ENCRYPTED_MITM = 4; // 0x4
+ field public static final int PERMISSION_WRITE = 16; // 0x10
+ field public static final int PERMISSION_WRITE_ENCRYPTED = 32; // 0x20
+ field public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 64; // 0x40
+ field public static final int PERMISSION_WRITE_SIGNED = 128; // 0x80
+ field public static final int PERMISSION_WRITE_SIGNED_MITM = 256; // 0x100
+ field public static final int PROPERTY_BROADCAST = 1; // 0x1
+ field public static final int PROPERTY_EXTENDED_PROPS = 128; // 0x80
+ field public static final int PROPERTY_INDICATE = 32; // 0x20
+ field public static final int PROPERTY_NOTIFY = 16; // 0x10
+ field public static final int PROPERTY_READ = 2; // 0x2
+ field public static final int PROPERTY_SIGNED_WRITE = 64; // 0x40
+ field public static final int PROPERTY_WRITE = 8; // 0x8
+ field public static final int PROPERTY_WRITE_NO_RESPONSE = 4; // 0x4
+ field public static final int WRITE_TYPE_DEFAULT = 2; // 0x2
+ field public static final int WRITE_TYPE_NO_RESPONSE = 1; // 0x1
+ field public static final int WRITE_TYPE_SIGNED = 4; // 0x4
+ field protected java.util.List<android.bluetooth.BluetoothGattDescriptor> mDescriptors;
+ }
+
+ public class BluetoothGattDescriptor {
+ ctor public BluetoothGattDescriptor(java.util.UUID, int);
+ method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic();
+ method public int getPermissions();
+ method public java.util.UUID getUuid();
+ method public byte[] getValue();
+ method public boolean setValue(byte[]);
+ field public static final byte[] DISABLE_NOTIFICATION_VALUE;
+ field public static final byte[] ENABLE_INDICATION_VALUE;
+ field public static final byte[] ENABLE_NOTIFICATION_VALUE;
+ field public static final int PERMISSION_READ = 1; // 0x1
+ field public static final int PERMISSION_READ_ENCRYPTED = 2; // 0x2
+ field public static final int PERMISSION_READ_ENCRYPTED_MITM = 4; // 0x4
+ field public static final int PERMISSION_WRITE = 16; // 0x10
+ field public static final int PERMISSION_WRITE_ENCRYPTED = 32; // 0x20
+ field public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 64; // 0x40
+ field public static final int PERMISSION_WRITE_SIGNED = 128; // 0x80
+ field public static final int PERMISSION_WRITE_SIGNED_MITM = 256; // 0x100
+ }
+
+ public final class BluetoothGattServer implements android.bluetooth.BluetoothProfile {
+ method public boolean addService(android.bluetooth.BluetoothGattService);
+ method public void cancelConnection(android.bluetooth.BluetoothDevice);
+ method public void clearServices();
+ method public void close();
+ method public boolean connect(android.bluetooth.BluetoothDevice, boolean);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method public int getConnectionState(android.bluetooth.BluetoothDevice);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+ method public android.bluetooth.BluetoothGattService getService(java.util.UUID);
+ method public java.util.List<android.bluetooth.BluetoothGattService> getServices();
+ method public boolean notifyCharacteristicChanged(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothGattCharacteristic, boolean);
+ method public boolean removeService(android.bluetooth.BluetoothGattService);
+ method public boolean sendResponse(android.bluetooth.BluetoothDevice, int, int, int, byte[]);
+ }
+
+ public abstract class BluetoothGattServerCallback {
+ ctor public BluetoothGattServerCallback();
+ method public void onCharacteristicReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattCharacteristic);
+ method public void onCharacteristicWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattCharacteristic, boolean, boolean, int, byte[]);
+ method public void onConnectionStateChange(android.bluetooth.BluetoothDevice, int, int);
+ method public void onDescriptorReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattDescriptor);
+ method public void onDescriptorWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattDescriptor, boolean, boolean, int, byte[]);
+ method public void onExecuteWrite(android.bluetooth.BluetoothDevice, int, boolean);
+ method public void onMtuChanged(android.bluetooth.BluetoothDevice, int);
+ method public void onNotificationSent(android.bluetooth.BluetoothDevice, int);
+ method public void onServiceAdded(int, android.bluetooth.BluetoothGattService);
+ }
+
+ public class BluetoothGattService {
+ ctor public BluetoothGattService(java.util.UUID, int);
+ method public boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
+ method public boolean addService(android.bluetooth.BluetoothGattService);
+ method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(java.util.UUID);
+ method public java.util.List<android.bluetooth.BluetoothGattCharacteristic> getCharacteristics();
+ method public java.util.List<android.bluetooth.BluetoothGattService> getIncludedServices();
+ method public int getInstanceId();
+ method public int getType();
+ method public java.util.UUID getUuid();
+ field public static final int SERVICE_TYPE_PRIMARY = 0; // 0x0
+ field public static final int SERVICE_TYPE_SECONDARY = 1; // 0x1
+ field protected java.util.List<android.bluetooth.BluetoothGattCharacteristic> mCharacteristics;
+ field protected java.util.List<android.bluetooth.BluetoothGattService> mIncludedServices;
+ }
+
+ public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
+ method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method public int getConnectionState(android.bluetooth.BluetoothDevice);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+ method public boolean isAudioConnected(android.bluetooth.BluetoothDevice);
+ method public boolean sendVendorSpecificResultCode(android.bluetooth.BluetoothDevice, java.lang.String, java.lang.String);
+ method public boolean startVoiceRecognition(android.bluetooth.BluetoothDevice);
+ method public boolean stopVoiceRecognition(android.bluetooth.BluetoothDevice);
+ field public static final java.lang.String ACTION_AUDIO_STATE_CHANGED = "android.bluetooth.headset.profile.action.AUDIO_STATE_CHANGED";
+ field public static final java.lang.String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headset.profile.action.CONNECTION_STATE_CHANGED";
+ field public static final java.lang.String ACTION_VENDOR_SPECIFIC_HEADSET_EVENT = "android.bluetooth.headset.action.VENDOR_SPECIFIC_HEADSET_EVENT";
+ field public static final int AT_CMD_TYPE_ACTION = 4; // 0x4
+ field public static final int AT_CMD_TYPE_BASIC = 3; // 0x3
+ field public static final int AT_CMD_TYPE_READ = 0; // 0x0
+ field public static final int AT_CMD_TYPE_SET = 2; // 0x2
+ field public static final int AT_CMD_TYPE_TEST = 1; // 0x1
+ field public static final java.lang.String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_ARGS";
+ field public static final java.lang.String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_CMD";
+ field public static final java.lang.String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE";
+ field public static final int STATE_AUDIO_CONNECTED = 12; // 0xc
+ field public static final int STATE_AUDIO_CONNECTING = 11; // 0xb
+ field public static final int STATE_AUDIO_DISCONNECTED = 10; // 0xa
+ field public static final java.lang.String VENDOR_RESULT_CODE_COMMAND_ANDROID = "+ANDROID";
+ field public static final java.lang.String VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY = "android.bluetooth.headset.intent.category.companyid";
+ }
+
+ public final class BluetoothHealth implements android.bluetooth.BluetoothProfile {
+ method public boolean connectChannelToSource(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);
+ method public boolean disconnectChannel(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration, int);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method public int getConnectionState(android.bluetooth.BluetoothDevice);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+ method public android.os.ParcelFileDescriptor getMainChannelFd(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);
+ method public boolean registerSinkAppConfiguration(java.lang.String, int, android.bluetooth.BluetoothHealthCallback);
+ method public boolean unregisterAppConfiguration(android.bluetooth.BluetoothHealthAppConfiguration);
+ field public static final int APP_CONFIG_REGISTRATION_FAILURE = 1; // 0x1
+ field public static final int APP_CONFIG_REGISTRATION_SUCCESS = 0; // 0x0
+ field public static final int APP_CONFIG_UNREGISTRATION_FAILURE = 3; // 0x3
+ field public static final int APP_CONFIG_UNREGISTRATION_SUCCESS = 2; // 0x2
+ field public static final int CHANNEL_TYPE_RELIABLE = 10; // 0xa
+ field public static final int CHANNEL_TYPE_STREAMING = 11; // 0xb
+ field public static final int SINK_ROLE = 2; // 0x2
+ field public static final int SOURCE_ROLE = 1; // 0x1
+ field public static final int STATE_CHANNEL_CONNECTED = 2; // 0x2
+ field public static final int STATE_CHANNEL_CONNECTING = 1; // 0x1
+ field public static final int STATE_CHANNEL_DISCONNECTED = 0; // 0x0
+ field public static final int STATE_CHANNEL_DISCONNECTING = 3; // 0x3
+ }
+
+ public final class BluetoothHealthAppConfiguration implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getDataType();
+ method public java.lang.String getName();
+ method public int getRole();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHealthAppConfiguration> CREATOR;
+ }
+
+ public abstract class BluetoothHealthCallback {
+ ctor public BluetoothHealthCallback();
+ method public void onHealthAppConfigurationStatusChange(android.bluetooth.BluetoothHealthAppConfiguration, int);
+ method public void onHealthChannelStateChange(android.bluetooth.BluetoothHealthAppConfiguration, android.bluetooth.BluetoothDevice, int, int, android.os.ParcelFileDescriptor, int);
+ }
+
+ public final class BluetoothManager {
+ method public android.bluetooth.BluetoothAdapter getAdapter();
+ method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(int);
+ method public int getConnectionState(android.bluetooth.BluetoothDevice, int);
+ method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int, int[]);
+ method public android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback);
+ }
+
+ public abstract interface BluetoothProfile {
+ method public abstract java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method public abstract int getConnectionState(android.bluetooth.BluetoothDevice);
+ method public abstract java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+ field public static final int A2DP = 2; // 0x2
+ field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
+ field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
+ field public static final int GATT = 7; // 0x7
+ field public static final int GATT_SERVER = 8; // 0x8
+ field public static final int HEADSET = 1; // 0x1
+ field public static final int HEALTH = 3; // 0x3
+ field public static final int SAP = 10; // 0xa
+ field public static final int STATE_CONNECTED = 2; // 0x2
+ field public static final int STATE_CONNECTING = 1; // 0x1
+ field public static final int STATE_DISCONNECTED = 0; // 0x0
+ field public static final int STATE_DISCONNECTING = 3; // 0x3
+ }
+
+ public static abstract interface BluetoothProfile.ServiceListener {
+ method public abstract void onServiceConnected(int, android.bluetooth.BluetoothProfile);
+ method public abstract void onServiceDisconnected(int);
+ }
+
+ public final class BluetoothServerSocket implements java.io.Closeable {
+ method public android.bluetooth.BluetoothSocket accept() throws java.io.IOException;
+ method public android.bluetooth.BluetoothSocket accept(int) throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ }
+
+ public final class BluetoothSocket implements java.io.Closeable {
+ method public void close() throws java.io.IOException;
+ method public void connect() throws java.io.IOException;
+ method public int getConnectionType();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public int getMaxReceivePacketSize();
+ method public int getMaxTransmitPacketSize();
+ method public java.io.OutputStream getOutputStream() throws java.io.IOException;
+ method public android.bluetooth.BluetoothDevice getRemoteDevice();
+ method public boolean isConnected();
+ field public static final int TYPE_L2CAP = 3; // 0x3
+ field public static final int TYPE_RFCOMM = 1; // 0x1
+ field public static final int TYPE_SCO = 2; // 0x2
+ }
+
+}
+
+package android.bluetooth.le {
+
+ public abstract class AdvertiseCallback {
+ ctor public AdvertiseCallback();
+ method public void onStartFailure(int);
+ method public void onStartSuccess(android.bluetooth.le.AdvertiseSettings);
+ field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3
+ field public static final int ADVERTISE_FAILED_DATA_TOO_LARGE = 1; // 0x1
+ field public static final int ADVERTISE_FAILED_FEATURE_UNSUPPORTED = 5; // 0x5
+ field public static final int ADVERTISE_FAILED_INTERNAL_ERROR = 4; // 0x4
+ field public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2; // 0x2
+ }
+
+ public final class AdvertiseData implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean getIncludeDeviceName();
+ method public boolean getIncludeTxPowerLevel();
+ method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
+ method public java.util.Map<android.os.ParcelUuid, byte[]> getServiceData();
+ method public java.util.List<android.os.ParcelUuid> getServiceUuids();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseData> CREATOR;
+ }
+
+ public static final class AdvertiseData.Builder {
+ ctor public AdvertiseData.Builder();
+ method public android.bluetooth.le.AdvertiseData.Builder addManufacturerData(int, byte[]);
+ method public android.bluetooth.le.AdvertiseData.Builder addServiceData(android.os.ParcelUuid, byte[]);
+ method public android.bluetooth.le.AdvertiseData.Builder addServiceUuid(android.os.ParcelUuid);
+ method public android.bluetooth.le.AdvertiseData build();
+ method public android.bluetooth.le.AdvertiseData.Builder setIncludeDeviceName(boolean);
+ method public android.bluetooth.le.AdvertiseData.Builder setIncludeTxPowerLevel(boolean);
+ }
+
+ public final class AdvertiseSettings implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getMode();
+ method public int getTimeout();
+ method public int getTxPowerLevel();
+ method public boolean isConnectable();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ADVERTISE_MODE_BALANCED = 1; // 0x1
+ field public static final int ADVERTISE_MODE_LOW_LATENCY = 2; // 0x2
+ field public static final int ADVERTISE_MODE_LOW_POWER = 0; // 0x0
+ field public static final int ADVERTISE_TX_POWER_HIGH = 3; // 0x3
+ field public static final int ADVERTISE_TX_POWER_LOW = 1; // 0x1
+ field public static final int ADVERTISE_TX_POWER_MEDIUM = 2; // 0x2
+ field public static final int ADVERTISE_TX_POWER_ULTRA_LOW = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseSettings> CREATOR;
+ }
+
+ public static final class AdvertiseSettings.Builder {
+ ctor public AdvertiseSettings.Builder();
+ method public android.bluetooth.le.AdvertiseSettings build();
+ method public android.bluetooth.le.AdvertiseSettings.Builder setAdvertiseMode(int);
+ method public android.bluetooth.le.AdvertiseSettings.Builder setConnectable(boolean);
+ method public android.bluetooth.le.AdvertiseSettings.Builder setTimeout(int);
+ method public android.bluetooth.le.AdvertiseSettings.Builder setTxPowerLevel(int);
+ }
+
+ public final class BluetoothLeAdvertiser {
+ method public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback);
+ method public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback);
+ method public void stopAdvertising(android.bluetooth.le.AdvertiseCallback);
+ }
+
+ public final class BluetoothLeScanner {
+ method public void flushPendingScanResults(android.bluetooth.le.ScanCallback);
+ method public void startScan(android.bluetooth.le.ScanCallback);
+ method public void startScan(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);
+ method public void stopScan(android.bluetooth.le.ScanCallback);
+ }
+
+ public abstract class ScanCallback {
+ ctor public ScanCallback();
+ method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>);
+ method public void onScanFailed(int);
+ method public void onScanResult(int, android.bluetooth.le.ScanResult);
+ field public static final int SCAN_FAILED_ALREADY_STARTED = 1; // 0x1
+ field public static final int SCAN_FAILED_APPLICATION_REGISTRATION_FAILED = 2; // 0x2
+ field public static final int SCAN_FAILED_FEATURE_UNSUPPORTED = 4; // 0x4
+ field public static final int SCAN_FAILED_INTERNAL_ERROR = 3; // 0x3
+ }
+
+ public final class ScanFilter implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String getDeviceAddress();
+ method public java.lang.String getDeviceName();
+ method public byte[] getManufacturerData();
+ method public byte[] getManufacturerDataMask();
+ method public int getManufacturerId();
+ method public byte[] getServiceData();
+ method public byte[] getServiceDataMask();
+ method public android.os.ParcelUuid getServiceDataUuid();
+ method public android.os.ParcelUuid getServiceUuid();
+ method public android.os.ParcelUuid getServiceUuidMask();
+ method public boolean matches(android.bluetooth.le.ScanResult);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanFilter> CREATOR;
+ }
+
+ public static final class ScanFilter.Builder {
+ ctor public ScanFilter.Builder();
+ method public android.bluetooth.le.ScanFilter build();
+ method public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(java.lang.String);
+ method public android.bluetooth.le.ScanFilter.Builder setDeviceName(java.lang.String);
+ method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[]);
+ method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);
+ method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]);
+ method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]);
+ method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);
+ method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);
+ }
+
+ public final class ScanRecord {
+ method public int getAdvertiseFlags();
+ method public byte[] getBytes();
+ method public java.lang.String getDeviceName();
+ method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
+ method public byte[] getManufacturerSpecificData(int);
+ method public java.util.Map<android.os.ParcelUuid, byte[]> getServiceData();
+ method public byte[] getServiceData(android.os.ParcelUuid);
+ method public java.util.List<android.os.ParcelUuid> getServiceUuids();
+ method public int getTxPowerLevel();
+ }
+
+ public final class ScanResult implements android.os.Parcelable {
+ ctor public ScanResult(android.bluetooth.BluetoothDevice, android.bluetooth.le.ScanRecord, int, long);
+ method public int describeContents();
+ method public android.bluetooth.BluetoothDevice getDevice();
+ method public int getRssi();
+ method public android.bluetooth.le.ScanRecord getScanRecord();
+ method public long getTimestampNanos();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanResult> CREATOR;
+ }
+
+ public final class ScanSettings implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getCallbackType();
+ method public long getReportDelayMillis();
+ method public int getScanMode();
+ method public int getScanResultType();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CALLBACK_TYPE_ALL_MATCHES = 1; // 0x1
+ field public static final int CALLBACK_TYPE_FIRST_MATCH = 2; // 0x2
+ field public static final int CALLBACK_TYPE_MATCH_LOST = 4; // 0x4
+ field public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanSettings> CREATOR;
+ field public static final int MATCH_MODE_AGGRESSIVE = 1; // 0x1
+ field public static final int MATCH_MODE_STICKY = 2; // 0x2
+ field public static final int MATCH_NUM_FEW_ADVERTISEMENT = 2; // 0x2
+ field public static final int MATCH_NUM_MAX_ADVERTISEMENT = 3; // 0x3
+ field public static final int MATCH_NUM_ONE_ADVERTISEMENT = 1; // 0x1
+ field public static final int SCAN_MODE_BALANCED = 1; // 0x1
+ field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2
+ field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0
+ field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
+ }
+
+ public static final class ScanSettings.Builder {
+ ctor public ScanSettings.Builder();
+ method public android.bluetooth.le.ScanSettings build();
+ method public android.bluetooth.le.ScanSettings.Builder setCallbackType(int);
+ method public android.bluetooth.le.ScanSettings.Builder setMatchMode(int);
+ method public android.bluetooth.le.ScanSettings.Builder setNumOfMatches(int);
+ method public android.bluetooth.le.ScanSettings.Builder setReportDelay(long);
+ method public android.bluetooth.le.ScanSettings.Builder setScanMode(int);
+ }
+
+}
+
+package android.content {
+
+ public abstract class AbstractThreadedSyncAdapter {
+ ctor public AbstractThreadedSyncAdapter(android.content.Context, boolean);
+ ctor public AbstractThreadedSyncAdapter(android.content.Context, boolean, boolean);
+ method public android.content.Context getContext();
+ method public final android.os.IBinder getSyncAdapterBinder();
+ method public abstract void onPerformSync(android.accounts.Account, android.os.Bundle, java.lang.String, android.content.ContentProviderClient, android.content.SyncResult);
+ method public void onSecurityException(android.accounts.Account, android.os.Bundle, java.lang.String, android.content.SyncResult);
+ method public void onSyncCanceled();
+ method public void onSyncCanceled(java.lang.Thread);
+ field public static final deprecated int LOG_SYNC_DETAILS = 2743; // 0xab7
+ }
+
+ public class ActivityNotFoundException extends java.lang.RuntimeException {
+ ctor public ActivityNotFoundException();
+ ctor public ActivityNotFoundException(java.lang.String);
+ }
+
+ public abstract class AsyncQueryHandler extends android.os.Handler {
+ ctor public AsyncQueryHandler(android.content.ContentResolver);
+ method public final void cancelOperation(int);
+ method protected android.os.Handler createHandler(android.os.Looper);
+ method protected void onDeleteComplete(int, java.lang.Object, int);
+ method protected void onInsertComplete(int, java.lang.Object, android.net.Uri);
+ method protected void onQueryComplete(int, java.lang.Object, android.database.Cursor);
+ method protected void onUpdateComplete(int, java.lang.Object, int);
+ method public final void startDelete(int, java.lang.Object, android.net.Uri, java.lang.String, java.lang.String[]);
+ method public final void startInsert(int, java.lang.Object, android.net.Uri, android.content.ContentValues);
+ method public void startQuery(int, java.lang.Object, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public final void startUpdate(int, java.lang.Object, android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ }
+
+ protected static final class AsyncQueryHandler.WorkerArgs {
+ ctor protected AsyncQueryHandler.WorkerArgs();
+ field public java.lang.Object cookie;
+ field public android.os.Handler handler;
+ field public java.lang.String orderBy;
+ field public java.lang.String[] projection;
+ field public java.lang.Object result;
+ field public java.lang.String selection;
+ field public java.lang.String[] selectionArgs;
+ field public android.net.Uri uri;
+ field public android.content.ContentValues values;
+ }
+
+ protected class AsyncQueryHandler.WorkerHandler extends android.os.Handler {
+ ctor public AsyncQueryHandler.WorkerHandler(android.os.Looper);
+ }
+
+ public abstract class AsyncTaskLoader extends android.content.Loader {
+ ctor public AsyncTaskLoader(android.content.Context);
+ method public void cancelLoadInBackground();
+ method public boolean isLoadInBackgroundCanceled();
+ method public abstract D loadInBackground();
+ method public void onCanceled(D);
+ method protected D onLoadInBackground();
+ method public void setUpdateThrottle(long);
+ }
+
+ public abstract class BroadcastReceiver {
+ ctor public BroadcastReceiver();
+ method public final void abortBroadcast();
+ method public final void clearAbortBroadcast();
+ method public final boolean getAbortBroadcast();
+ method public final boolean getDebugUnregister();
+ method public final int getResultCode();
+ method public final java.lang.String getResultData();
+ method public final android.os.Bundle getResultExtras(boolean);
+ method public final android.content.BroadcastReceiver.PendingResult goAsync();
+ method public final boolean isInitialStickyBroadcast();
+ method public final boolean isOrderedBroadcast();
+ method public abstract void onReceive(android.content.Context, android.content.Intent);
+ method public android.os.IBinder peekService(android.content.Context, android.content.Intent);
+ method public final void setDebugUnregister(boolean);
+ method public final void setOrderedHint(boolean);
+ method public final void setResult(int, java.lang.String, android.os.Bundle);
+ method public final void setResultCode(int);
+ method public final void setResultData(java.lang.String);
+ method public final void setResultExtras(android.os.Bundle);
+ }
+
+ public static class BroadcastReceiver.PendingResult {
+ method public final void abortBroadcast();
+ method public final void clearAbortBroadcast();
+ method public final void finish();
+ method public final boolean getAbortBroadcast();
+ method public final int getResultCode();
+ method public final java.lang.String getResultData();
+ method public final android.os.Bundle getResultExtras(boolean);
+ method public final void setResult(int, java.lang.String, android.os.Bundle);
+ method public final void setResultCode(int);
+ method public final void setResultData(java.lang.String);
+ method public final void setResultExtras(android.os.Bundle);
+ }
+
+ public class ClipData implements android.os.Parcelable {
+ ctor public ClipData(java.lang.CharSequence, java.lang.String[], android.content.ClipData.Item);
+ ctor public ClipData(android.content.ClipDescription, android.content.ClipData.Item);
+ ctor public ClipData(android.content.ClipData);
+ method public void addItem(android.content.ClipData.Item);
+ method public int describeContents();
+ method public android.content.ClipDescription getDescription();
+ method public android.content.ClipData.Item getItemAt(int);
+ method public int getItemCount();
+ method public static android.content.ClipData newHtmlText(java.lang.CharSequence, java.lang.CharSequence, java.lang.String);
+ method public static android.content.ClipData newIntent(java.lang.CharSequence, android.content.Intent);
+ method public static android.content.ClipData newPlainText(java.lang.CharSequence, java.lang.CharSequence);
+ method public static android.content.ClipData newRawUri(java.lang.CharSequence, android.net.Uri);
+ method public static android.content.ClipData newUri(android.content.ContentResolver, java.lang.CharSequence, android.net.Uri);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.ClipData> CREATOR;
+ }
+
+ public static class ClipData.Item {
+ ctor public ClipData.Item(java.lang.CharSequence);
+ ctor public ClipData.Item(java.lang.CharSequence, java.lang.String);
+ ctor public ClipData.Item(android.content.Intent);
+ ctor public ClipData.Item(android.net.Uri);
+ ctor public ClipData.Item(java.lang.CharSequence, android.content.Intent, android.net.Uri);
+ ctor public ClipData.Item(java.lang.CharSequence, java.lang.String, android.content.Intent, android.net.Uri);
+ method public java.lang.String coerceToHtmlText(android.content.Context);
+ method public java.lang.CharSequence coerceToStyledText(android.content.Context);
+ method public java.lang.CharSequence coerceToText(android.content.Context);
+ method public java.lang.String getHtmlText();
+ method public android.content.Intent getIntent();
+ method public java.lang.CharSequence getText();
+ method public android.net.Uri getUri();
+ }
+
+ public class ClipDescription implements android.os.Parcelable {
+ ctor public ClipDescription(java.lang.CharSequence, java.lang.String[]);
+ ctor public ClipDescription(android.content.ClipDescription);
+ method public static boolean compareMimeTypes(java.lang.String, java.lang.String);
+ method public int describeContents();
+ method public java.lang.String[] filterMimeTypes(java.lang.String);
+ method public android.os.PersistableBundle getExtras();
+ method public java.lang.CharSequence getLabel();
+ method public java.lang.String getMimeType(int);
+ method public int getMimeTypeCount();
+ method public boolean hasMimeType(java.lang.String);
+ method public void setExtras(android.os.PersistableBundle);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;
+ field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";
+ field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";
+ field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";
+ field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
+ field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";
+ field public static final java.lang.String MIMETYPE_TEXT_URILIST = "text/uri-list";
+ }
+
+ public class ClipboardManager extends android.text.ClipboardManager {
+ method public void addPrimaryClipChangedListener(android.content.ClipboardManager.OnPrimaryClipChangedListener);
+ method public android.content.ClipData getPrimaryClip();
+ method public android.content.ClipDescription getPrimaryClipDescription();
+ method public deprecated java.lang.CharSequence getText();
+ method public boolean hasPrimaryClip();
+ method public deprecated boolean hasText();
+ method public void removePrimaryClipChangedListener(android.content.ClipboardManager.OnPrimaryClipChangedListener);
+ method public void setPrimaryClip(android.content.ClipData);
+ method public deprecated void setText(java.lang.CharSequence);
+ }
+
+ public static abstract interface ClipboardManager.OnPrimaryClipChangedListener {
+ method public abstract void onPrimaryClipChanged();
+ }
+
+ public abstract interface ComponentCallbacks {
+ method public abstract void onConfigurationChanged(android.content.res.Configuration);
+ method public abstract void onLowMemory();
+ }
+
+ public abstract interface ComponentCallbacks2 implements android.content.ComponentCallbacks {
+ method public abstract void onTrimMemory(int);
+ field public static final int TRIM_MEMORY_BACKGROUND = 40; // 0x28
+ field public static final int TRIM_MEMORY_COMPLETE = 80; // 0x50
+ field public static final int TRIM_MEMORY_MODERATE = 60; // 0x3c
+ field public static final int TRIM_MEMORY_RUNNING_CRITICAL = 15; // 0xf
+ field public static final int TRIM_MEMORY_RUNNING_LOW = 10; // 0xa
+ field public static final int TRIM_MEMORY_RUNNING_MODERATE = 5; // 0x5
+ field public static final int TRIM_MEMORY_UI_HIDDEN = 20; // 0x14
+ }
+
+ public final class ComponentName implements java.lang.Cloneable java.lang.Comparable android.os.Parcelable {
+ ctor public ComponentName(java.lang.String, java.lang.String);
+ ctor public ComponentName(android.content.Context, java.lang.String);
+ ctor public ComponentName(android.content.Context, java.lang.Class<?>);
+ ctor public ComponentName(android.os.Parcel);
+ method public android.content.ComponentName clone();
+ method public int compareTo(android.content.ComponentName);
+ method public static android.content.ComponentName createRelative(java.lang.String, java.lang.String);
+ method public static android.content.ComponentName createRelative(android.content.Context, java.lang.String);
+ method public int describeContents();
+ method public java.lang.String flattenToShortString();
+ method public java.lang.String flattenToString();
+ method public java.lang.String getClassName();
+ method public java.lang.String getPackageName();
+ method public java.lang.String getShortClassName();
+ method public static android.content.ComponentName readFromParcel(android.os.Parcel);
+ method public java.lang.String toShortString();
+ method public static android.content.ComponentName unflattenFromString(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ method public static void writeToParcel(android.content.ComponentName, android.os.Parcel);
+ field public static final android.os.Parcelable.Creator<android.content.ComponentName> CREATOR;
+ }
+
+ public abstract class ContentProvider implements android.content.ComponentCallbacks2 {
+ ctor public ContentProvider();
+ method public android.content.ContentProviderResult[] applyBatch(java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException;
+ method public void attachInfo(android.content.Context, android.content.pm.ProviderInfo);
+ method public int bulkInsert(android.net.Uri, android.content.ContentValues[]);
+ method public android.os.Bundle call(java.lang.String, java.lang.String, android.os.Bundle);
+ method public android.net.Uri canonicalize(android.net.Uri);
+ method public abstract int delete(android.net.Uri, java.lang.String, java.lang.String[]);
+ method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public final java.lang.String getCallingPackage();
+ method public final android.content.Context getContext();
+ method public final android.content.pm.PathPermission[] getPathPermissions();
+ method public final java.lang.String getReadPermission();
+ method public java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String);
+ method public abstract java.lang.String getType(android.net.Uri);
+ method public final java.lang.String getWritePermission();
+ method public abstract android.net.Uri insert(android.net.Uri, android.content.ContentValues);
+ method protected boolean isTemporary();
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public abstract boolean onCreate();
+ method public void onLowMemory();
+ method public void onTrimMemory(int);
+ method public android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method protected final android.os.ParcelFileDescriptor openFileHelper(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public android.os.ParcelFileDescriptor openPipeHelper(android.net.Uri, java.lang.String, android.os.Bundle, T, android.content.ContentProvider.PipeDataWriter<T>) throws java.io.FileNotFoundException;
+ method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
+ method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);
+ method protected final void setPathPermissions(android.content.pm.PathPermission[]);
+ method protected final void setReadPermission(java.lang.String);
+ method protected final void setWritePermission(java.lang.String);
+ method public void shutdown();
+ method public android.net.Uri uncanonicalize(android.net.Uri);
+ method public abstract int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ }
+
+ public static abstract interface ContentProvider.PipeDataWriter {
+ method public abstract void writeDataToPipe(android.os.ParcelFileDescriptor, android.net.Uri, java.lang.String, android.os.Bundle, T);
+ }
+
+ public class ContentProviderClient {
+ method public android.content.ContentProviderResult[] applyBatch(java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException, android.os.RemoteException;
+ method public int bulkInsert(android.net.Uri, android.content.ContentValues[]) throws android.os.RemoteException;
+ method public android.os.Bundle call(java.lang.String, java.lang.String, android.os.Bundle) throws android.os.RemoteException;
+ method public final android.net.Uri canonicalize(android.net.Uri) throws android.os.RemoteException;
+ method public int delete(android.net.Uri, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
+ method public android.content.ContentProvider getLocalContentProvider();
+ method public java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String) throws android.os.RemoteException;
+ method public java.lang.String getType(android.net.Uri) throws android.os.RemoteException;
+ method public android.net.Uri insert(android.net.Uri, android.content.ContentValues) throws android.os.RemoteException;
+ method public android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException, android.os.RemoteException;
+ method public android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;
+ method public android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException, android.os.RemoteException;
+ method public android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;
+ method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException, android.os.RemoteException;
+ method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;
+ method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;
+ method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;
+ method public boolean release();
+ method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;
+ method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
+ }
+
+ public class ContentProviderOperation implements android.os.Parcelable {
+ method public android.content.ContentProviderResult apply(android.content.ContentProvider, android.content.ContentProviderResult[], int) throws android.content.OperationApplicationException;
+ method public int describeContents();
+ method public android.net.Uri getUri();
+ method public boolean isAssertQuery();
+ method public boolean isDelete();
+ method public boolean isInsert();
+ method public boolean isReadOperation();
+ method public boolean isUpdate();
+ method public boolean isWriteOperation();
+ method public boolean isYieldAllowed();
+ method public static android.content.ContentProviderOperation.Builder newAssertQuery(android.net.Uri);
+ method public static android.content.ContentProviderOperation.Builder newDelete(android.net.Uri);
+ method public static android.content.ContentProviderOperation.Builder newInsert(android.net.Uri);
+ method public static android.content.ContentProviderOperation.Builder newUpdate(android.net.Uri);
+ method public java.lang.String[] resolveSelectionArgsBackReferences(android.content.ContentProviderResult[], int);
+ method public android.content.ContentValues resolveValueBackReferences(android.content.ContentProviderResult[], int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.ContentProviderOperation> CREATOR;
+ }
+
+ public static class ContentProviderOperation.Builder {
+ method public android.content.ContentProviderOperation build();
+ method public android.content.ContentProviderOperation.Builder withExpectedCount(int);
+ method public android.content.ContentProviderOperation.Builder withSelection(java.lang.String, java.lang.String[]);
+ method public android.content.ContentProviderOperation.Builder withSelectionBackReference(int, int);
+ method public android.content.ContentProviderOperation.Builder withValue(java.lang.String, java.lang.Object);
+ method public android.content.ContentProviderOperation.Builder withValueBackReference(java.lang.String, int);
+ method public android.content.ContentProviderOperation.Builder withValueBackReferences(android.content.ContentValues);
+ method public android.content.ContentProviderOperation.Builder withValues(android.content.ContentValues);
+ method public android.content.ContentProviderOperation.Builder withYieldAllowed(boolean);
+ }
+
+ public class ContentProviderResult implements android.os.Parcelable {
+ ctor public ContentProviderResult(android.net.Uri);
+ ctor public ContentProviderResult(int);
+ ctor public ContentProviderResult(android.os.Parcel);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.ContentProviderResult> CREATOR;
+ field public final java.lang.Integer count;
+ field public final android.net.Uri uri;
+ }
+
+ public class ContentQueryMap extends java.util.Observable {
+ ctor public ContentQueryMap(android.database.Cursor, java.lang.String, boolean, android.os.Handler);
+ method public synchronized void close();
+ method public synchronized java.util.Map<java.lang.String, android.content.ContentValues> getRows();
+ method public synchronized android.content.ContentValues getValues(java.lang.String);
+ method public void requery();
+ method public void setKeepUpdated(boolean);
+ }
+
+ public abstract class ContentResolver {
+ ctor public ContentResolver(android.content.Context);
+ method public final android.content.ContentProviderClient acquireContentProviderClient(android.net.Uri);
+ method public final android.content.ContentProviderClient acquireContentProviderClient(java.lang.String);
+ method public final android.content.ContentProviderClient acquireUnstableContentProviderClient(android.net.Uri);
+ method public final android.content.ContentProviderClient acquireUnstableContentProviderClient(java.lang.String);
+ method public static void addPeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long);
+ method public static java.lang.Object addStatusChangeListener(int, android.content.SyncStatusObserver);
+ method public android.content.ContentProviderResult[] applyBatch(java.lang.String, java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException, android.os.RemoteException;
+ method public final int bulkInsert(android.net.Uri, android.content.ContentValues[]);
+ method public final android.os.Bundle call(android.net.Uri, java.lang.String, java.lang.String, android.os.Bundle);
+ method public deprecated void cancelSync(android.net.Uri);
+ method public static void cancelSync(android.accounts.Account, java.lang.String);
+ method public static void cancelSync(android.content.SyncRequest);
+ method public final android.net.Uri canonicalize(android.net.Uri);
+ method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
+ method public static deprecated android.content.SyncInfo getCurrentSync();
+ method public static java.util.List<android.content.SyncInfo> getCurrentSyncs();
+ method public static int getIsSyncable(android.accounts.Account, java.lang.String);
+ method public static boolean getMasterSyncAutomatically();
+ method public java.util.List<android.content.UriPermission> getOutgoingPersistedUriPermissions();
+ method public static java.util.List<android.content.PeriodicSync> getPeriodicSyncs(android.accounts.Account, java.lang.String);
+ method public java.util.List<android.content.UriPermission> getPersistedUriPermissions();
+ method public java.lang.String[] getStreamTypes(android.net.Uri, java.lang.String);
+ method public static android.content.SyncAdapterType[] getSyncAdapterTypes();
+ method public static boolean getSyncAutomatically(android.accounts.Account, java.lang.String);
+ method public final java.lang.String getType(android.net.Uri);
+ method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
+ method public static boolean isSyncActive(android.accounts.Account, java.lang.String);
+ method public static boolean isSyncPending(android.accounts.Account, java.lang.String);
+ method public void notifyChange(android.net.Uri, android.database.ContentObserver);
+ method public void notifyChange(android.net.Uri, android.database.ContentObserver, boolean);
+ method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public final android.os.ParcelFileDescriptor openFileDescriptor(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public final android.os.ParcelFileDescriptor openFileDescriptor(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public final java.io.InputStream openInputStream(android.net.Uri) throws java.io.FileNotFoundException;
+ method public final java.io.OutputStream openOutputStream(android.net.Uri) throws java.io.FileNotFoundException;
+ method public final java.io.OutputStream openOutputStream(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
+ method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);
+ method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver);
+ method public void releasePersistableUriPermission(android.net.Uri, int);
+ method public static void removePeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle);
+ method public static void removeStatusChangeListener(java.lang.Object);
+ method public static void requestSync(android.accounts.Account, java.lang.String, android.os.Bundle);
+ method public static void requestSync(android.content.SyncRequest);
+ method public static void setIsSyncable(android.accounts.Account, java.lang.String, int);
+ method public static void setMasterSyncAutomatically(boolean);
+ method public static void setSyncAutomatically(android.accounts.Account, java.lang.String, boolean);
+ method public deprecated void startSync(android.net.Uri, android.os.Bundle);
+ method public void takePersistableUriPermission(android.net.Uri, int);
+ method public final android.net.Uri uncanonicalize(android.net.Uri);
+ method public final void unregisterContentObserver(android.database.ContentObserver);
+ method public final int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ method public static void validateSyncExtrasBundle(android.os.Bundle);
+ field public static final java.lang.String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";
+ field public static final java.lang.String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
+ field public static final java.lang.String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
+ field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";
+ field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";
+ field public static final java.lang.String SCHEME_CONTENT = "content";
+ field public static final java.lang.String SCHEME_FILE = "file";
+ field public static final deprecated java.lang.String SYNC_EXTRAS_ACCOUNT = "account";
+ field public static final java.lang.String SYNC_EXTRAS_DISCARD_LOCAL_DELETIONS = "discard_deletions";
+ field public static final java.lang.String SYNC_EXTRAS_DO_NOT_RETRY = "do_not_retry";
+ field public static final java.lang.String SYNC_EXTRAS_EXPEDITED = "expedited";
+ field public static final deprecated java.lang.String SYNC_EXTRAS_FORCE = "force";
+ field public static final java.lang.String SYNC_EXTRAS_IGNORE_BACKOFF = "ignore_backoff";
+ field public static final java.lang.String SYNC_EXTRAS_IGNORE_SETTINGS = "ignore_settings";
+ field public static final java.lang.String SYNC_EXTRAS_INITIALIZE = "initialize";
+ field public static final java.lang.String SYNC_EXTRAS_MANUAL = "force";
+ field public static final java.lang.String SYNC_EXTRAS_OVERRIDE_TOO_MANY_DELETIONS = "deletions_override";
+ field public static final java.lang.String SYNC_EXTRAS_UPLOAD = "upload";
+ field public static final int SYNC_OBSERVER_TYPE_ACTIVE = 4; // 0x4
+ field public static final int SYNC_OBSERVER_TYPE_PENDING = 2; // 0x2
+ field public static final int SYNC_OBSERVER_TYPE_SETTINGS = 1; // 0x1
+ }
+
+ public class ContentUris {
+ ctor public ContentUris();
+ method public static android.net.Uri.Builder appendId(android.net.Uri.Builder, long);
+ method public static long parseId(android.net.Uri);
+ method public static android.net.Uri withAppendedId(android.net.Uri, long);
+ }
+
+ public final class ContentValues implements android.os.Parcelable {
+ ctor public ContentValues();
+ ctor public ContentValues(int);
+ ctor public ContentValues(android.content.ContentValues);
+ method public void clear();
+ method public boolean containsKey(java.lang.String);
+ method public int describeContents();
+ method public java.lang.Object get(java.lang.String);
+ method public java.lang.Boolean getAsBoolean(java.lang.String);
+ method public java.lang.Byte getAsByte(java.lang.String);
+ method public byte[] getAsByteArray(java.lang.String);
+ method public java.lang.Double getAsDouble(java.lang.String);
+ method public java.lang.Float getAsFloat(java.lang.String);
+ method public java.lang.Integer getAsInteger(java.lang.String);
+ method public java.lang.Long getAsLong(java.lang.String);
+ method public java.lang.Short getAsShort(java.lang.String);
+ method public java.lang.String getAsString(java.lang.String);
+ method public java.util.Set<java.lang.String> keySet();
+ method public void put(java.lang.String, java.lang.String);
+ method public void put(java.lang.String, java.lang.Byte);
+ method public void put(java.lang.String, java.lang.Short);
+ method public void put(java.lang.String, java.lang.Integer);
+ method public void put(java.lang.String, java.lang.Long);
+ method public void put(java.lang.String, java.lang.Float);
+ method public void put(java.lang.String, java.lang.Double);
+ method public void put(java.lang.String, java.lang.Boolean);
+ method public void put(java.lang.String, byte[]);
+ method public void putAll(android.content.ContentValues);
+ method public void putNull(java.lang.String);
+ method public void remove(java.lang.String);
+ method public int size();
+ method public java.util.Set<java.util.Map.Entry<java.lang.String, java.lang.Object>> valueSet();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.ContentValues> CREATOR;
+ field public static final java.lang.String TAG = "ContentValues";
+ }
+
+ public abstract class Context {
+ ctor public Context();
+ method public abstract boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
+ method public abstract int checkCallingOrSelfPermission(java.lang.String);
+ method public abstract int checkCallingOrSelfUriPermission(android.net.Uri, int);
+ method public abstract int checkCallingPermission(java.lang.String);
+ method public abstract int checkCallingUriPermission(android.net.Uri, int);
+ method public abstract int checkPermission(java.lang.String, int, int);
+ method public abstract int checkSelfPermission(java.lang.String);
+ method public abstract int checkUriPermission(android.net.Uri, int, int, int);
+ method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
+ method public abstract deprecated void clearWallpaper() throws java.io.IOException;
+ method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);
+ method public abstract android.content.Context createDisplayContext(android.view.Display);
+ method public abstract android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract java.lang.String[] databaseList();
+ method public abstract boolean deleteDatabase(java.lang.String);
+ method public abstract boolean deleteFile(java.lang.String);
+ method public abstract void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
+ method public abstract void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
+ method public abstract void enforceCallingPermission(java.lang.String, java.lang.String);
+ method public abstract void enforceCallingUriPermission(android.net.Uri, int, java.lang.String);
+ method public abstract void enforcePermission(java.lang.String, int, int, java.lang.String);
+ method public abstract void enforceUriPermission(android.net.Uri, int, int, int, java.lang.String);
+ method public abstract void enforceUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int, java.lang.String);
+ method public abstract java.lang.String[] fileList();
+ method public abstract android.content.Context getApplicationContext();
+ method public abstract android.content.pm.ApplicationInfo getApplicationInfo();
+ method public abstract android.content.res.AssetManager getAssets();
+ method public abstract java.io.File getCacheDir();
+ method public abstract java.lang.ClassLoader getClassLoader();
+ method public abstract java.io.File getCodeCacheDir();
+ method public final int getColor(int);
+ method public final android.content.res.ColorStateList getColorStateList(int);
+ method public abstract android.content.ContentResolver getContentResolver();
+ method public abstract java.io.File getDatabasePath(java.lang.String);
+ method public abstract java.io.File getDeviceEncryptedFilesDir();
+ method public abstract java.io.File getDir(java.lang.String, int);
+ method public final android.graphics.drawable.Drawable getDrawable(int);
+ method public abstract java.io.File getExternalCacheDir();
+ method public abstract java.io.File[] getExternalCacheDirs();
+ method public abstract java.io.File getExternalFilesDir(java.lang.String);
+ method public abstract java.io.File[] getExternalFilesDirs(java.lang.String);
+ method public abstract java.io.File[] getExternalMediaDirs();
+ method public abstract java.io.File getFileStreamPath(java.lang.String);
+ method public abstract java.io.File getFilesDir();
+ method public abstract android.os.Looper getMainLooper();
+ method public abstract java.io.File getNoBackupFilesDir();
+ method public abstract java.io.File getObbDir();
+ method public abstract java.io.File[] getObbDirs();
+ method public abstract java.lang.String getPackageCodePath();
+ method public abstract android.content.pm.PackageManager getPackageManager();
+ method public abstract java.lang.String getPackageName();
+ method public abstract java.lang.String getPackageResourcePath();
+ method public abstract android.content.res.Resources getResources();
+ method public abstract android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);
+ method public final java.lang.String getString(int);
+ method public final java.lang.String getString(int, java.lang.Object...);
+ method public abstract java.lang.Object getSystemService(java.lang.String);
+ method public final T getSystemService(java.lang.Class<T>);
+ method public abstract java.lang.String getSystemServiceName(java.lang.Class<?>);
+ method public final java.lang.CharSequence getText(int);
+ method public abstract android.content.res.Resources.Theme getTheme();
+ method public abstract deprecated android.graphics.drawable.Drawable getWallpaper();
+ method public abstract deprecated int getWallpaperDesiredMinimumHeight();
+ method public abstract deprecated int getWallpaperDesiredMinimumWidth();
+ method public abstract void grantUriPermission(java.lang.String, android.net.Uri, int);
+ method public boolean isRestricted();
+ method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
+ method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
+ method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
+ method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int);
+ method public abstract java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
+ method public abstract java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
+ method public abstract android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public abstract android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
+ method public abstract deprecated android.graphics.drawable.Drawable peekWallpaper();
+ method public void registerComponentCallbacks(android.content.ComponentCallbacks);
+ method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);
+ method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);
+ method public abstract deprecated void removeStickyBroadcast(android.content.Intent);
+ method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public abstract void revokeUriPermission(android.net.Uri, int);
+ method public abstract void sendBroadcast(android.content.Intent);
+ method public abstract void sendBroadcast(android.content.Intent, java.lang.String);
+ method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
+ method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String);
+ method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public abstract void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public abstract deprecated void sendStickyBroadcast(android.content.Intent);
+ method public abstract deprecated void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public abstract deprecated void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public abstract deprecated void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public abstract void setTheme(int);
+ method public abstract deprecated void setWallpaper(android.graphics.Bitmap) throws java.io.IOException;
+ method public abstract deprecated void setWallpaper(java.io.InputStream) throws java.io.IOException;
+ method public abstract void startActivities(android.content.Intent[]);
+ method public abstract void startActivities(android.content.Intent[], android.os.Bundle);
+ method public abstract void startActivity(android.content.Intent);
+ method public abstract void startActivity(android.content.Intent, android.os.Bundle);
+ method public abstract boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle);
+ method public abstract void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
+ method public abstract void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
+ method public abstract android.content.ComponentName startService(android.content.Intent);
+ method public abstract boolean stopService(android.content.Intent);
+ method public abstract void unbindService(android.content.ServiceConnection);
+ method public void unregisterComponentCallbacks(android.content.ComponentCallbacks);
+ method public abstract void unregisterReceiver(android.content.BroadcastReceiver);
+ field public static final java.lang.String ACCESSIBILITY_SERVICE = "accessibility";
+ field public static final java.lang.String ACCOUNT_SERVICE = "account";
+ field public static final java.lang.String ACTIVITY_SERVICE = "activity";
+ field public static final java.lang.String ALARM_SERVICE = "alarm";
+ field public static final java.lang.String APPWIDGET_SERVICE = "appwidget";
+ field public static final java.lang.String APP_OPS_SERVICE = "appops";
+ field public static final java.lang.String AUDIO_SERVICE = "audio";
+ field public static final java.lang.String BATTERY_SERVICE = "batterymanager";
+ field public static final int BIND_ABOVE_CLIENT = 8; // 0x8
+ field public static final int BIND_ADJUST_WITH_ACTIVITY = 128; // 0x80
+ field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10
+ field public static final int BIND_AUTO_CREATE = 1; // 0x1
+ field public static final int BIND_DEBUG_UNBIND = 2; // 0x2
+ field public static final int BIND_IMPORTANT = 64; // 0x40
+ field public static final int BIND_NOT_FOREGROUND = 4; // 0x4
+ field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
+ field public static final java.lang.String BLUETOOTH_SERVICE = "bluetooth";
+ field public static final java.lang.String CAMERA_SERVICE = "camera";
+ field public static final java.lang.String CAPTIONING_SERVICE = "captioning";
+ field public static final java.lang.String CARRIER_CONFIG_SERVICE = "carrier_config";
+ field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";
+ field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";
+ field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";
+ field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2
+ field public static final int CONTEXT_INCLUDE_CODE = 1; // 0x1
+ field public static final int CONTEXT_RESTRICTED = 4; // 0x4
+ field public static final java.lang.String DEVICE_POLICY_SERVICE = "device_policy";
+ field public static final java.lang.String DISPLAY_SERVICE = "display";
+ field public static final java.lang.String DOWNLOAD_SERVICE = "download";
+ field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
+ field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
+ field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
+ field public static final java.lang.String INPUT_SERVICE = "input";
+ field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";
+ field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";
+ field public static final java.lang.String LAUNCHER_APPS_SERVICE = "launcherapps";
+ field public static final java.lang.String LAYOUT_INFLATER_SERVICE = "layout_inflater";
+ field public static final java.lang.String LOCATION_SERVICE = "location";
+ field public static final java.lang.String MEDIA_PROJECTION_SERVICE = "media_projection";
+ field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router";
+ field public static final java.lang.String MEDIA_SESSION_SERVICE = "media_session";
+ field public static final java.lang.String MIDI_SERVICE = "midi";
+ field public static final int MODE_APPEND = 32768; // 0x8000
+ field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
+ field public static final deprecated int MODE_MULTI_PROCESS = 4; // 0x4
+ field public static final int MODE_NO_LOCALIZED_COLLATORS = 16; // 0x10
+ field public static final int MODE_PRIVATE = 0; // 0x0
+ field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
+ field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2
+ field public static final java.lang.String NETWORK_STATS_SERVICE = "netstats";
+ field public static final java.lang.String NFC_SERVICE = "nfc";
+ field public static final java.lang.String NOTIFICATION_SERVICE = "notification";
+ field public static final java.lang.String NSD_SERVICE = "servicediscovery";
+ field public static final java.lang.String POWER_SERVICE = "power";
+ field public static final java.lang.String PRINT_SERVICE = "print";
+ field public static final java.lang.String RESTRICTIONS_SERVICE = "restrictions";
+ field public static final java.lang.String SEARCH_SERVICE = "search";
+ field public static final java.lang.String SENSOR_SERVICE = "sensor";
+ field public static final java.lang.String STORAGE_SERVICE = "storage";
+ field public static final java.lang.String TELECOM_SERVICE = "telecom";
+ field public static final java.lang.String TELEPHONY_SERVICE = "phone";
+ field public static final java.lang.String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
+ field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
+ field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";
+ field public static final java.lang.String UI_MODE_SERVICE = "uimode";
+ field public static final java.lang.String USAGE_STATS_SERVICE = "usagestats";
+ field public static final java.lang.String USB_SERVICE = "usb";
+ field public static final java.lang.String USER_SERVICE = "user";
+ field public static final java.lang.String VIBRATOR_SERVICE = "vibrator";
+ field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper";
+ field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p";
+ field public static final java.lang.String WIFI_SERVICE = "wifi";
+ field public static final java.lang.String WINDOW_SERVICE = "window";
+ }
+
+ public class ContextWrapper extends android.content.Context {
+ ctor public ContextWrapper(android.content.Context);
+ method protected void attachBaseContext(android.content.Context);
+ method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
+ method public int checkCallingOrSelfPermission(java.lang.String);
+ method public int checkCallingOrSelfUriPermission(android.net.Uri, int);
+ method public int checkCallingPermission(java.lang.String);
+ method public int checkCallingUriPermission(android.net.Uri, int);
+ method public int checkPermission(java.lang.String, int, int);
+ method public int checkSelfPermission(java.lang.String);
+ method public int checkUriPermission(android.net.Uri, int, int, int);
+ method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
+ method public deprecated void clearWallpaper() throws java.io.IOException;
+ method public android.content.Context createConfigurationContext(android.content.res.Configuration);
+ method public android.content.Context createDisplayContext(android.view.Display);
+ method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public java.lang.String[] databaseList();
+ method public boolean deleteDatabase(java.lang.String);
+ method public boolean deleteFile(java.lang.String);
+ method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
+ method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
+ method public void enforceCallingPermission(java.lang.String, java.lang.String);
+ method public void enforceCallingUriPermission(android.net.Uri, int, java.lang.String);
+ method public void enforcePermission(java.lang.String, int, int, java.lang.String);
+ method public void enforceUriPermission(android.net.Uri, int, int, int, java.lang.String);
+ method public void enforceUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int, java.lang.String);
+ method public java.lang.String[] fileList();
+ method public android.content.Context getApplicationContext();
+ method public android.content.pm.ApplicationInfo getApplicationInfo();
+ method public android.content.res.AssetManager getAssets();
+ method public android.content.Context getBaseContext();
+ method public java.io.File getCacheDir();
+ method public java.lang.ClassLoader getClassLoader();
+ method public java.io.File getCodeCacheDir();
+ method public android.content.ContentResolver getContentResolver();
+ method public java.io.File getDatabasePath(java.lang.String);
+ method public java.io.File getDeviceEncryptedFilesDir();
+ method public java.io.File getDir(java.lang.String, int);
+ method public java.io.File getExternalCacheDir();
+ method public java.io.File[] getExternalCacheDirs();
+ method public java.io.File getExternalFilesDir(java.lang.String);
+ method public java.io.File[] getExternalFilesDirs(java.lang.String);
+ method public java.io.File[] getExternalMediaDirs();
+ method public java.io.File getFileStreamPath(java.lang.String);
+ method public java.io.File getFilesDir();
+ method public android.os.Looper getMainLooper();
+ method public java.io.File getNoBackupFilesDir();
+ method public java.io.File getObbDir();
+ method public java.io.File[] getObbDirs();
+ method public java.lang.String getPackageCodePath();
+ method public android.content.pm.PackageManager getPackageManager();
+ method public java.lang.String getPackageName();
+ method public java.lang.String getPackageResourcePath();
+ method public android.content.res.Resources getResources();
+ method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
+ method public java.lang.Object getSystemService(java.lang.String);
+ method public java.lang.String getSystemServiceName(java.lang.Class<?>);
+ method public android.content.res.Resources.Theme getTheme();
+ method public deprecated android.graphics.drawable.Drawable getWallpaper();
+ method public deprecated int getWallpaperDesiredMinimumHeight();
+ method public deprecated int getWallpaperDesiredMinimumWidth();
+ method public void grantUriPermission(java.lang.String, android.net.Uri, int);
+ method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
+ method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
+ method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
+ method public deprecated android.graphics.drawable.Drawable peekWallpaper();
+ method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);
+ method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);
+ method public deprecated void removeStickyBroadcast(android.content.Intent);
+ method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public void revokeUriPermission(android.net.Uri, int);
+ method public void sendBroadcast(android.content.Intent);
+ method public void sendBroadcast(android.content.Intent, java.lang.String);
+ method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
+ method public void sendOrderedBroadcast(android.content.Intent, java.lang.String);
+ method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public deprecated void sendStickyBroadcast(android.content.Intent);
+ method public deprecated void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public deprecated void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public deprecated void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public void setTheme(int);
+ method public deprecated void setWallpaper(android.graphics.Bitmap) throws java.io.IOException;
+ method public deprecated void setWallpaper(java.io.InputStream) throws java.io.IOException;
+ method public void startActivities(android.content.Intent[]);
+ method public void startActivities(android.content.Intent[], android.os.Bundle);
+ method public void startActivity(android.content.Intent);
+ method public void startActivity(android.content.Intent, android.os.Bundle);
+ method public boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle);
+ method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
+ method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
+ method public android.content.ComponentName startService(android.content.Intent);
+ method public boolean stopService(android.content.Intent);
+ method public void unbindService(android.content.ServiceConnection);
+ method public void unregisterReceiver(android.content.BroadcastReceiver);
+ }
+
+ public class CursorLoader extends android.content.AsyncTaskLoader {
+ ctor public CursorLoader(android.content.Context);
+ ctor public CursorLoader(android.content.Context, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public void deliverResult(android.database.Cursor);
+ method public java.lang.String[] getProjection();
+ method public java.lang.String getSelection();
+ method public java.lang.String[] getSelectionArgs();
+ method public java.lang.String getSortOrder();
+ method public android.net.Uri getUri();
+ method public android.database.Cursor loadInBackground();
+ method public void onCanceled(android.database.Cursor);
+ method public void setProjection(java.lang.String[]);
+ method public void setSelection(java.lang.String);
+ method public void setSelectionArgs(java.lang.String[]);
+ method public void setSortOrder(java.lang.String);
+ method public void setUri(android.net.Uri);
+ }
+
+ public abstract interface DialogInterface {
+ method public abstract void cancel();
+ method public abstract void dismiss();
+ field public static final deprecated int BUTTON1 = -1; // 0xffffffff
+ field public static final deprecated int BUTTON2 = -2; // 0xfffffffe
+ field public static final deprecated int BUTTON3 = -3; // 0xfffffffd
+ field public static final int BUTTON_NEGATIVE = -2; // 0xfffffffe
+ field public static final int BUTTON_NEUTRAL = -3; // 0xfffffffd
+ field public static final int BUTTON_POSITIVE = -1; // 0xffffffff
+ }
+
+ public static abstract interface DialogInterface.OnCancelListener {
+ method public abstract void onCancel(android.content.DialogInterface);
+ }
+
+ public static abstract interface DialogInterface.OnClickListener {
+ method public abstract void onClick(android.content.DialogInterface, int);
+ }
+
+ public static abstract interface DialogInterface.OnDismissListener {
+ method public abstract void onDismiss(android.content.DialogInterface);
+ }
+
+ public static abstract interface DialogInterface.OnKeyListener {
+ method public abstract boolean onKey(android.content.DialogInterface, int, android.view.KeyEvent);
+ }
+
+ public static abstract interface DialogInterface.OnMultiChoiceClickListener {
+ method public abstract void onClick(android.content.DialogInterface, int, boolean);
+ }
+
+ public static abstract interface DialogInterface.OnShowListener {
+ method public abstract void onShow(android.content.DialogInterface);
+ }
+
+ public final class Entity {
+ ctor public Entity(android.content.ContentValues);
+ method public void addSubValue(android.net.Uri, android.content.ContentValues);
+ method public android.content.ContentValues getEntityValues();
+ method public java.util.ArrayList<android.content.Entity.NamedContentValues> getSubValues();
+ }
+
+ public static class Entity.NamedContentValues {
+ ctor public Entity.NamedContentValues(android.net.Uri, android.content.ContentValues);
+ field public final android.net.Uri uri;
+ field public final android.content.ContentValues values;
+ }
+
+ public abstract interface EntityIterator implements java.util.Iterator {
+ method public abstract void close();
+ method public abstract void reset();
+ }
+
+ public class Intent implements java.lang.Cloneable android.os.Parcelable {
+ ctor public Intent();
+ ctor public Intent(android.content.Intent);
+ ctor public Intent(java.lang.String);
+ ctor public Intent(java.lang.String, android.net.Uri);
+ ctor public Intent(android.content.Context, java.lang.Class<?>);
+ ctor public Intent(java.lang.String, android.net.Uri, android.content.Context, java.lang.Class<?>);
+ method public android.content.Intent addCategory(java.lang.String);
+ method public android.content.Intent addFlags(int);
+ method public java.lang.Object clone();
+ method public android.content.Intent cloneFilter();
+ method public static android.content.Intent createChooser(android.content.Intent, java.lang.CharSequence);
+ method public static android.content.Intent createChooser(android.content.Intent, java.lang.CharSequence, android.content.IntentSender);
+ method public int describeContents();
+ method public int fillIn(android.content.Intent, int);
+ method public boolean filterEquals(android.content.Intent);
+ method public int filterHashCode();
+ method public java.lang.String getAction();
+ method public boolean[] getBooleanArrayExtra(java.lang.String);
+ method public boolean getBooleanExtra(java.lang.String, boolean);
+ method public android.os.Bundle getBundleExtra(java.lang.String);
+ method public byte[] getByteArrayExtra(java.lang.String);
+ method public byte getByteExtra(java.lang.String, byte);
+ method public java.util.Set<java.lang.String> getCategories();
+ method public char[] getCharArrayExtra(java.lang.String);
+ method public char getCharExtra(java.lang.String, char);
+ method public java.lang.CharSequence[] getCharSequenceArrayExtra(java.lang.String);
+ method public java.util.ArrayList<java.lang.CharSequence> getCharSequenceArrayListExtra(java.lang.String);
+ method public java.lang.CharSequence getCharSequenceExtra(java.lang.String);
+ method public android.content.ClipData getClipData();
+ method public android.content.ComponentName getComponent();
+ method public android.net.Uri getData();
+ method public java.lang.String getDataString();
+ method public double[] getDoubleArrayExtra(java.lang.String);
+ method public double getDoubleExtra(java.lang.String, double);
+ method public android.os.Bundle getExtras();
+ method public int getFlags();
+ method public float[] getFloatArrayExtra(java.lang.String);
+ method public float getFloatExtra(java.lang.String, float);
+ method public int[] getIntArrayExtra(java.lang.String);
+ method public int getIntExtra(java.lang.String, int);
+ method public java.util.ArrayList<java.lang.Integer> getIntegerArrayListExtra(java.lang.String);
+ method public static deprecated android.content.Intent getIntent(java.lang.String) throws java.net.URISyntaxException;
+ method public static android.content.Intent getIntentOld(java.lang.String) throws java.net.URISyntaxException;
+ method public long[] getLongArrayExtra(java.lang.String);
+ method public long getLongExtra(java.lang.String, long);
+ method public java.lang.String getPackage();
+ method public android.os.Parcelable[] getParcelableArrayExtra(java.lang.String);
+ method public java.util.ArrayList<T> getParcelableArrayListExtra(java.lang.String);
+ method public T getParcelableExtra(java.lang.String);
+ method public java.lang.String getScheme();
+ method public android.content.Intent getSelector();
+ method public java.io.Serializable getSerializableExtra(java.lang.String);
+ method public short[] getShortArrayExtra(java.lang.String);
+ method public short getShortExtra(java.lang.String, short);
+ method public android.graphics.Rect getSourceBounds();
+ method public java.lang.String[] getStringArrayExtra(java.lang.String);
+ method public java.util.ArrayList<java.lang.String> getStringArrayListExtra(java.lang.String);
+ method public java.lang.String getStringExtra(java.lang.String);
+ method public java.lang.String getType();
+ method public boolean hasCategory(java.lang.String);
+ method public boolean hasExtra(java.lang.String);
+ method public boolean hasFileDescriptors();
+ method public static android.content.Intent makeMainActivity(android.content.ComponentName);
+ method public static android.content.Intent makeMainSelectorActivity(java.lang.String, java.lang.String);
+ method public static android.content.Intent makeRestartActivityTask(android.content.ComponentName);
+ method public static java.lang.String normalizeMimeType(java.lang.String);
+ method public static android.content.Intent parseIntent(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static android.content.Intent parseUri(java.lang.String, int) throws java.net.URISyntaxException;
+ method public android.content.Intent putCharSequenceArrayListExtra(java.lang.String, java.util.ArrayList<java.lang.CharSequence>);
+ method public android.content.Intent putExtra(java.lang.String, boolean);
+ method public android.content.Intent putExtra(java.lang.String, byte);
+ method public android.content.Intent putExtra(java.lang.String, char);
+ method public android.content.Intent putExtra(java.lang.String, short);
+ method public android.content.Intent putExtra(java.lang.String, int);
+ method public android.content.Intent putExtra(java.lang.String, long);
+ method public android.content.Intent putExtra(java.lang.String, float);
+ method public android.content.Intent putExtra(java.lang.String, double);
+ method public android.content.Intent putExtra(java.lang.String, java.lang.String);
+ method public android.content.Intent putExtra(java.lang.String, java.lang.CharSequence);
+ method public android.content.Intent putExtra(java.lang.String, android.os.Parcelable);
+ method public android.content.Intent putExtra(java.lang.String, android.os.Parcelable[]);
+ method public android.content.Intent putExtra(java.lang.String, java.io.Serializable);
+ method public android.content.Intent putExtra(java.lang.String, boolean[]);
+ method public android.content.Intent putExtra(java.lang.String, byte[]);
+ method public android.content.Intent putExtra(java.lang.String, short[]);
+ method public android.content.Intent putExtra(java.lang.String, char[]);
+ method public android.content.Intent putExtra(java.lang.String, int[]);
+ method public android.content.Intent putExtra(java.lang.String, long[]);
+ method public android.content.Intent putExtra(java.lang.String, float[]);
+ method public android.content.Intent putExtra(java.lang.String, double[]);
+ method public android.content.Intent putExtra(java.lang.String, java.lang.String[]);
+ method public android.content.Intent putExtra(java.lang.String, java.lang.CharSequence[]);
+ method public android.content.Intent putExtra(java.lang.String, android.os.Bundle);
+ method public android.content.Intent putExtras(android.content.Intent);
+ method public android.content.Intent putExtras(android.os.Bundle);
+ method public android.content.Intent putIntegerArrayListExtra(java.lang.String, java.util.ArrayList<java.lang.Integer>);
+ method public android.content.Intent putParcelableArrayListExtra(java.lang.String, java.util.ArrayList<? extends android.os.Parcelable>);
+ method public android.content.Intent putStringArrayListExtra(java.lang.String, java.util.ArrayList<java.lang.String>);
+ method public void readFromParcel(android.os.Parcel);
+ method public void removeCategory(java.lang.String);
+ method public void removeExtra(java.lang.String);
+ method public android.content.Intent replaceExtras(android.content.Intent);
+ method public android.content.Intent replaceExtras(android.os.Bundle);
+ method public android.content.ComponentName resolveActivity(android.content.pm.PackageManager);
+ method public android.content.pm.ActivityInfo resolveActivityInfo(android.content.pm.PackageManager, int);
+ method public java.lang.String resolveType(android.content.Context);
+ method public java.lang.String resolveType(android.content.ContentResolver);
+ method public java.lang.String resolveTypeIfNeeded(android.content.ContentResolver);
+ method public android.content.Intent setAction(java.lang.String);
+ method public android.content.Intent setClass(android.content.Context, java.lang.Class<?>);
+ method public android.content.Intent setClassName(android.content.Context, java.lang.String);
+ method public android.content.Intent setClassName(java.lang.String, java.lang.String);
+ method public void setClipData(android.content.ClipData);
+ method public android.content.Intent setComponent(android.content.ComponentName);
+ method public android.content.Intent setData(android.net.Uri);
+ method public android.content.Intent setDataAndNormalize(android.net.Uri);
+ method public android.content.Intent setDataAndType(android.net.Uri, java.lang.String);
+ method public android.content.Intent setDataAndTypeAndNormalize(android.net.Uri, java.lang.String);
+ method public void setExtrasClassLoader(java.lang.ClassLoader);
+ method public android.content.Intent setFlags(int);
+ method public android.content.Intent setPackage(java.lang.String);
+ method public void setSelector(android.content.Intent);
+ method public void setSourceBounds(android.graphics.Rect);
+ method public android.content.Intent setType(java.lang.String);
+ method public android.content.Intent setTypeAndNormalize(java.lang.String);
+ method public deprecated java.lang.String toURI();
+ method public java.lang.String toUri(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final java.lang.String ACTION_AIRPLANE_MODE_CHANGED = "android.intent.action.AIRPLANE_MODE";
+ field public static final java.lang.String ACTION_ALL_APPS = "android.intent.action.ALL_APPS";
+ field public static final java.lang.String ACTION_ANSWER = "android.intent.action.ANSWER";
+ field public static final java.lang.String ACTION_APPLICATION_RESTRICTIONS_CHANGED = "android.intent.action.APPLICATION_RESTRICTIONS_CHANGED";
+ field public static final java.lang.String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";
+ field public static final java.lang.String ACTION_ASSIST = "android.intent.action.ASSIST";
+ field public static final java.lang.String ACTION_ATTACH_DATA = "android.intent.action.ATTACH_DATA";
+ field public static final java.lang.String ACTION_BATTERY_CHANGED = "android.intent.action.BATTERY_CHANGED";
+ field public static final java.lang.String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";
+ field public static final java.lang.String ACTION_BATTERY_OKAY = "android.intent.action.BATTERY_OKAY";
+ field public static final java.lang.String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";
+ field public static final java.lang.String ACTION_BUG_REPORT = "android.intent.action.BUG_REPORT";
+ field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL";
+ field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON";
+ field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON";
+ field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";
+ field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";
+ field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED";
+ field public static final java.lang.String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT";
+ field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";
+ field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";
+ field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";
+ field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";
+ field public static final java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";
+ field public static final java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";
+ field public static final java.lang.String ACTION_DIAL = "android.intent.action.DIAL";
+ field public static final java.lang.String ACTION_DOCK_EVENT = "android.intent.action.DOCK_EVENT";
+ field public static final java.lang.String ACTION_DREAMING_STARTED = "android.intent.action.DREAMING_STARTED";
+ field public static final java.lang.String ACTION_DREAMING_STOPPED = "android.intent.action.DREAMING_STOPPED";
+ field public static final java.lang.String ACTION_EDIT = "android.intent.action.EDIT";
+ field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE";
+ field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE";
+ field public static final java.lang.String ACTION_FACTORY_TEST = "android.intent.action.FACTORY_TEST";
+ field public static final java.lang.String ACTION_GET_CONTENT = "android.intent.action.GET_CONTENT";
+ field public static final java.lang.String ACTION_GET_RESTRICTION_ENTRIES = "android.intent.action.GET_RESTRICTION_ENTRIES";
+ field public static final java.lang.String ACTION_GTALK_SERVICE_CONNECTED = "android.intent.action.GTALK_CONNECTED";
+ field public static final java.lang.String ACTION_GTALK_SERVICE_DISCONNECTED = "android.intent.action.GTALK_DISCONNECTED";
+ field public static final java.lang.String ACTION_HEADSET_PLUG = "android.intent.action.HEADSET_PLUG";
+ field public static final java.lang.String ACTION_INPUT_METHOD_CHANGED = "android.intent.action.INPUT_METHOD_CHANGED";
+ field public static final java.lang.String ACTION_INSERT = "android.intent.action.INSERT";
+ field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";
+ field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
+ field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
+ field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";
+ field public static final java.lang.String ACTION_MANAGED_PROFILE_ADDED = "android.intent.action.MANAGED_PROFILE_ADDED";
+ field public static final java.lang.String ACTION_MANAGED_PROFILE_REMOVED = "android.intent.action.MANAGED_PROFILE_REMOVED";
+ field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE";
+ field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE";
+ field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL";
+ field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON";
+ field public static final java.lang.String ACTION_MEDIA_CHECKING = "android.intent.action.MEDIA_CHECKING";
+ field public static final java.lang.String ACTION_MEDIA_EJECT = "android.intent.action.MEDIA_EJECT";
+ field public static final java.lang.String ACTION_MEDIA_MOUNTED = "android.intent.action.MEDIA_MOUNTED";
+ field public static final java.lang.String ACTION_MEDIA_NOFS = "android.intent.action.MEDIA_NOFS";
+ field public static final java.lang.String ACTION_MEDIA_REMOVED = "android.intent.action.MEDIA_REMOVED";
+ field public static final java.lang.String ACTION_MEDIA_SCANNER_FINISHED = "android.intent.action.MEDIA_SCANNER_FINISHED";
+ field public static final java.lang.String ACTION_MEDIA_SCANNER_SCAN_FILE = "android.intent.action.MEDIA_SCANNER_SCAN_FILE";
+ field public static final java.lang.String ACTION_MEDIA_SCANNER_STARTED = "android.intent.action.MEDIA_SCANNER_STARTED";
+ field public static final java.lang.String ACTION_MEDIA_SHARED = "android.intent.action.MEDIA_SHARED";
+ field public static final java.lang.String ACTION_MEDIA_UNMOUNTABLE = "android.intent.action.MEDIA_UNMOUNTABLE";
+ field public static final java.lang.String ACTION_MEDIA_UNMOUNTED = "android.intent.action.MEDIA_UNMOUNTED";
+ field public static final java.lang.String ACTION_MY_PACKAGE_REPLACED = "android.intent.action.MY_PACKAGE_REPLACED";
+ field public static final java.lang.String ACTION_NEW_OUTGOING_CALL = "android.intent.action.NEW_OUTGOING_CALL";
+ field public static final java.lang.String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";
+ field public static final java.lang.String ACTION_OPEN_DOCUMENT_TREE = "android.intent.action.OPEN_DOCUMENT_TREE";
+ field public static final java.lang.String ACTION_PACKAGE_ADDED = "android.intent.action.PACKAGE_ADDED";
+ field public static final java.lang.String ACTION_PACKAGE_CHANGED = "android.intent.action.PACKAGE_CHANGED";
+ field public static final java.lang.String ACTION_PACKAGE_DATA_CLEARED = "android.intent.action.PACKAGE_DATA_CLEARED";
+ field public static final java.lang.String ACTION_PACKAGE_FIRST_LAUNCH = "android.intent.action.PACKAGE_FIRST_LAUNCH";
+ field public static final java.lang.String ACTION_PACKAGE_FULLY_REMOVED = "android.intent.action.PACKAGE_FULLY_REMOVED";
+ field public static final deprecated java.lang.String ACTION_PACKAGE_INSTALL = "android.intent.action.PACKAGE_INSTALL";
+ field public static final java.lang.String ACTION_PACKAGE_NEEDS_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_VERIFICATION";
+ field public static final java.lang.String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";
+ field public static final java.lang.String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";
+ field public static final java.lang.String ACTION_PACKAGE_RESTARTED = "android.intent.action.PACKAGE_RESTARTED";
+ field public static final java.lang.String ACTION_PACKAGE_VERIFIED = "android.intent.action.PACKAGE_VERIFIED";
+ field public static final java.lang.String ACTION_PASTE = "android.intent.action.PASTE";
+ field public static final java.lang.String ACTION_PICK = "android.intent.action.PICK";
+ field public static final java.lang.String ACTION_PICK_ACTIVITY = "android.intent.action.PICK_ACTIVITY";
+ field public static final java.lang.String ACTION_POWER_CONNECTED = "android.intent.action.ACTION_POWER_CONNECTED";
+ field public static final java.lang.String ACTION_POWER_DISCONNECTED = "android.intent.action.ACTION_POWER_DISCONNECTED";
+ field public static final java.lang.String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";
+ field public static final java.lang.String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";
+ field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
+ field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
+ field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
+ field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
+ field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";
+ field public static final java.lang.String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";
+ field public static final java.lang.String ACTION_SEARCH = "android.intent.action.SEARCH";
+ field public static final java.lang.String ACTION_SEARCH_LONG_PRESS = "android.intent.action.SEARCH_LONG_PRESS";
+ field public static final java.lang.String ACTION_SEND = "android.intent.action.SEND";
+ field public static final java.lang.String ACTION_SENDTO = "android.intent.action.SENDTO";
+ field public static final java.lang.String ACTION_SEND_MULTIPLE = "android.intent.action.SEND_MULTIPLE";
+ field public static final java.lang.String ACTION_SET_WALLPAPER = "android.intent.action.SET_WALLPAPER";
+ field public static final java.lang.String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN";
+ field public static final java.lang.String ACTION_SYNC = "android.intent.action.SYNC";
+ field public static final java.lang.String ACTION_SYSTEM_TUTORIAL = "android.intent.action.SYSTEM_TUTORIAL";
+ field public static final java.lang.String ACTION_TIMEZONE_CHANGED = "android.intent.action.TIMEZONE_CHANGED";
+ field public static final java.lang.String ACTION_TIME_CHANGED = "android.intent.action.TIME_SET";
+ field public static final java.lang.String ACTION_TIME_TICK = "android.intent.action.TIME_TICK";
+ field public static final java.lang.String ACTION_UID_REMOVED = "android.intent.action.UID_REMOVED";
+ field public static final deprecated java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";
+ field public static final deprecated java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";
+ field public static final java.lang.String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";
+ field public static final java.lang.String ACTION_USER_BACKGROUND = "android.intent.action.USER_BACKGROUND";
+ field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";
+ field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";
+ field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";
+ field public static final java.lang.String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED";
+ field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW";
+ field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";
+ field public static final deprecated java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";
+ field public static final java.lang.String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";
+ field public static final java.lang.String CATEGORY_ALTERNATIVE = "android.intent.category.ALTERNATIVE";
+ field public static final java.lang.String CATEGORY_APP_BROWSER = "android.intent.category.APP_BROWSER";
+ field public static final java.lang.String CATEGORY_APP_CALCULATOR = "android.intent.category.APP_CALCULATOR";
+ field public static final java.lang.String CATEGORY_APP_CALENDAR = "android.intent.category.APP_CALENDAR";
+ field public static final java.lang.String CATEGORY_APP_CONTACTS = "android.intent.category.APP_CONTACTS";
+ field public static final java.lang.String CATEGORY_APP_EMAIL = "android.intent.category.APP_EMAIL";
+ field public static final java.lang.String CATEGORY_APP_GALLERY = "android.intent.category.APP_GALLERY";
+ field public static final java.lang.String CATEGORY_APP_MAPS = "android.intent.category.APP_MAPS";
+ field public static final java.lang.String CATEGORY_APP_MARKET = "android.intent.category.APP_MARKET";
+ field public static final java.lang.String CATEGORY_APP_MESSAGING = "android.intent.category.APP_MESSAGING";
+ field public static final java.lang.String CATEGORY_APP_MUSIC = "android.intent.category.APP_MUSIC";
+ field public static final java.lang.String CATEGORY_BROWSABLE = "android.intent.category.BROWSABLE";
+ field public static final java.lang.String CATEGORY_CAR_DOCK = "android.intent.category.CAR_DOCK";
+ field public static final java.lang.String CATEGORY_CAR_MODE = "android.intent.category.CAR_MODE";
+ field public static final java.lang.String CATEGORY_DEFAULT = "android.intent.category.DEFAULT";
+ field public static final java.lang.String CATEGORY_DESK_DOCK = "android.intent.category.DESK_DOCK";
+ field public static final java.lang.String CATEGORY_DEVELOPMENT_PREFERENCE = "android.intent.category.DEVELOPMENT_PREFERENCE";
+ field public static final java.lang.String CATEGORY_EMBED = "android.intent.category.EMBED";
+ field public static final java.lang.String CATEGORY_FRAMEWORK_INSTRUMENTATION_TEST = "android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST";
+ field public static final java.lang.String CATEGORY_HE_DESK_DOCK = "android.intent.category.HE_DESK_DOCK";
+ field public static final java.lang.String CATEGORY_HOME = "android.intent.category.HOME";
+ field public static final java.lang.String CATEGORY_INFO = "android.intent.category.INFO";
+ field public static final java.lang.String CATEGORY_LAUNCHER = "android.intent.category.LAUNCHER";
+ field public static final java.lang.String CATEGORY_LEANBACK_LAUNCHER = "android.intent.category.LEANBACK_LAUNCHER";
+ field public static final java.lang.String CATEGORY_LE_DESK_DOCK = "android.intent.category.LE_DESK_DOCK";
+ field public static final java.lang.String CATEGORY_MONKEY = "android.intent.category.MONKEY";
+ field public static final java.lang.String CATEGORY_OPENABLE = "android.intent.category.OPENABLE";
+ field public static final java.lang.String CATEGORY_PREFERENCE = "android.intent.category.PREFERENCE";
+ field public static final java.lang.String CATEGORY_SAMPLE_CODE = "android.intent.category.SAMPLE_CODE";
+ field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE";
+ field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";
+ field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";
+ field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";
+ field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE";
+ field public static final android.os.Parcelable.Creator<android.content.Intent> CREATOR;
+ field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
+ field public static final java.lang.String EXTRA_ALLOW_MULTIPLE = "android.intent.extra.ALLOW_MULTIPLE";
+ field public static final deprecated java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";
+ field public static final java.lang.String EXTRA_ALTERNATE_INTENTS = "android.intent.extra.ALTERNATE_INTENTS";
+ field public static final java.lang.String EXTRA_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT";
+ field public static final java.lang.String EXTRA_ASSIST_INPUT_DEVICE_ID = "android.intent.extra.ASSIST_INPUT_DEVICE_ID";
+ field public static final java.lang.String EXTRA_ASSIST_INPUT_HINT_KEYBOARD = "android.intent.extra.ASSIST_INPUT_HINT_KEYBOARD";
+ field public static final java.lang.String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE";
+ field public static final java.lang.String EXTRA_ASSIST_UID = "android.intent.extra.ASSIST_UID";
+ field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";
+ field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";
+ field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";
+ field public static final deprecated java.lang.String EXTRA_CHANGED_COMPONENT_NAME = "android.intent.extra.changed_component_name";
+ field public static final java.lang.String EXTRA_CHANGED_COMPONENT_NAME_LIST = "android.intent.extra.changed_component_name_list";
+ field public static final java.lang.String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";
+ field public static final java.lang.String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";
+ field public static final java.lang.String EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER = "android.intent.extra.CHOOSER_REFINEMENT_INTENT_SENDER";
+ field public static final java.lang.String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";
+ field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
+ field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
+ field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";
+ field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2
+ field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1
+ field public static final int EXTRA_DOCK_STATE_HE_DESK = 4; // 0x4
+ field public static final int EXTRA_DOCK_STATE_LE_DESK = 3; // 0x3
+ field public static final int EXTRA_DOCK_STATE_UNDOCKED = 0; // 0x0
+ field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
+ field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";
+ field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
+ field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";
+ field public static final java.lang.String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";
+ field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT";
+ field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";
+ field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";
+ field public static final java.lang.String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES";
+ field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";
+ field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";
+ field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
+ field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
+ field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
+ field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
+ field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
+ field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";
+ field public static final java.lang.String EXTRA_REPLACEMENT_EXTRAS = "android.intent.extra.REPLACEMENT_EXTRAS";
+ field public static final java.lang.String EXTRA_REPLACING = "android.intent.extra.REPLACING";
+ field public static final java.lang.String EXTRA_RESTRICTIONS_BUNDLE = "android.intent.extra.restrictions_bundle";
+ field public static final java.lang.String EXTRA_RESTRICTIONS_INTENT = "android.intent.extra.restrictions_intent";
+ field public static final java.lang.String EXTRA_RESTRICTIONS_LIST = "android.intent.extra.restrictions_list";
+ field public static final java.lang.String EXTRA_RESULT_RECEIVER = "android.intent.extra.RESULT_RECEIVER";
+ field public static final java.lang.String EXTRA_RETURN_RESULT = "android.intent.extra.RETURN_RESULT";
+ field public static final java.lang.String EXTRA_SHORTCUT_ICON = "android.intent.extra.shortcut.ICON";
+ field public static final java.lang.String EXTRA_SHORTCUT_ICON_RESOURCE = "android.intent.extra.shortcut.ICON_RESOURCE";
+ field public static final java.lang.String EXTRA_SHORTCUT_INTENT = "android.intent.extra.shortcut.INTENT";
+ field public static final java.lang.String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";
+ field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";
+ field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";
+ field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";
+ field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";
+ field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";
+ field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";
+ field public static final java.lang.String EXTRA_UID = "android.intent.extra.UID";
+ field public static final java.lang.String EXTRA_USER = "android.intent.extra.USER";
+ field public static final int FILL_IN_ACTION = 1; // 0x1
+ field public static final int FILL_IN_CATEGORIES = 4; // 0x4
+ field public static final int FILL_IN_CLIP_DATA = 128; // 0x80
+ field public static final int FILL_IN_COMPONENT = 8; // 0x8
+ field public static final int FILL_IN_DATA = 2; // 0x2
+ field public static final int FILL_IN_PACKAGE = 16; // 0x10
+ field public static final int FILL_IN_SELECTOR = 64; // 0x40
+ field public static final int FILL_IN_SOURCE_BOUNDS = 32; // 0x20
+ field public static final int FLAG_ACTIVITY_BROUGHT_TO_FRONT = 4194304; // 0x400000
+ field public static final int FLAG_ACTIVITY_CLEAR_TASK = 32768; // 0x8000
+ field public static final int FLAG_ACTIVITY_CLEAR_TOP = 67108864; // 0x4000000
+ field public static final deprecated int FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET = 524288; // 0x80000
+ field public static final int FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS = 8388608; // 0x800000
+ field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000
+ field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000
+ field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000
+ field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000
+ field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000
+ field public static final int FLAG_ACTIVITY_NO_ANIMATION = 65536; // 0x10000
+ field public static final int FLAG_ACTIVITY_NO_HISTORY = 1073741824; // 0x40000000
+ field public static final int FLAG_ACTIVITY_NO_USER_ACTION = 262144; // 0x40000
+ field public static final int FLAG_ACTIVITY_PREVIOUS_IS_TOP = 16777216; // 0x1000000
+ field public static final int FLAG_ACTIVITY_REORDER_TO_FRONT = 131072; // 0x20000
+ field public static final int FLAG_ACTIVITY_RESET_TASK_IF_NEEDED = 2097152; // 0x200000
+ field public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 8192; // 0x2000
+ field public static final int FLAG_ACTIVITY_SINGLE_TOP = 536870912; // 0x20000000
+ field public static final int FLAG_ACTIVITY_TASK_ON_HOME = 16384; // 0x4000
+ field public static final int FLAG_DEBUG_LOG_RESOLUTION = 8; // 0x8
+ field public static final int FLAG_EXCLUDE_STOPPED_PACKAGES = 16; // 0x10
+ field public static final int FLAG_FROM_BACKGROUND = 4; // 0x4
+ field public static final int FLAG_GRANT_PERSISTABLE_URI_PERMISSION = 64; // 0x40
+ field public static final int FLAG_GRANT_PREFIX_URI_PERMISSION = 128; // 0x80
+ field public static final int FLAG_GRANT_READ_URI_PERMISSION = 1; // 0x1
+ field public static final int FLAG_GRANT_WRITE_URI_PERMISSION = 2; // 0x2
+ field public static final int FLAG_INCLUDE_STOPPED_PACKAGES = 32; // 0x20
+ field public static final int FLAG_RECEIVER_FOREGROUND = 268435456; // 0x10000000
+ field public static final int FLAG_RECEIVER_NO_ABORT = 134217728; // 0x8000000
+ field public static final int FLAG_RECEIVER_REGISTERED_ONLY = 1073741824; // 0x40000000
+ field public static final int FLAG_RECEIVER_REPLACE_PENDING = 536870912; // 0x20000000
+ field public static final java.lang.String METADATA_DOCK_HOME = "android.dock_home";
+ field public static final int URI_ALLOW_UNSAFE = 4; // 0x4
+ field public static final int URI_ANDROID_APP_SCHEME = 2; // 0x2
+ field public static final int URI_INTENT_SCHEME = 1; // 0x1
+ }
+
+ public static final class Intent.FilterComparison {
+ ctor public Intent.FilterComparison(android.content.Intent);
+ method public android.content.Intent getIntent();
+ }
+
+ public static class Intent.ShortcutIconResource implements android.os.Parcelable {
+ ctor public Intent.ShortcutIconResource();
+ method public int describeContents();
+ method public static android.content.Intent.ShortcutIconResource fromContext(android.content.Context, int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.Intent.ShortcutIconResource> CREATOR;
+ field public java.lang.String packageName;
+ field public java.lang.String resourceName;
+ }
+
+ public class IntentFilter implements android.os.Parcelable {
+ ctor public IntentFilter();
+ ctor public IntentFilter(java.lang.String);
+ ctor public IntentFilter(java.lang.String, java.lang.String) throws android.content.IntentFilter.MalformedMimeTypeException;
+ ctor public IntentFilter(android.content.IntentFilter);
+ method public final java.util.Iterator<java.lang.String> actionsIterator();
+ method public final void addAction(java.lang.String);
+ method public final void addCategory(java.lang.String);
+ method public final void addDataAuthority(java.lang.String, java.lang.String);
+ method public final void addDataPath(java.lang.String, int);
+ method public final void addDataScheme(java.lang.String);
+ method public final void addDataSchemeSpecificPart(java.lang.String, int);
+ method public final void addDataType(java.lang.String) throws android.content.IntentFilter.MalformedMimeTypeException;
+ method public final java.util.Iterator<android.content.IntentFilter.AuthorityEntry> authoritiesIterator();
+ method public final java.util.Iterator<java.lang.String> categoriesIterator();
+ method public final int countActions();
+ method public final int countCategories();
+ method public final int countDataAuthorities();
+ method public final int countDataPaths();
+ method public final int countDataSchemeSpecificParts();
+ method public final int countDataSchemes();
+ method public final int countDataTypes();
+ method public static android.content.IntentFilter create(java.lang.String, java.lang.String);
+ method public final int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public final java.lang.String getAction(int);
+ method public final java.lang.String getCategory(int);
+ method public final android.content.IntentFilter.AuthorityEntry getDataAuthority(int);
+ method public final android.os.PatternMatcher getDataPath(int);
+ method public final java.lang.String getDataScheme(int);
+ method public final android.os.PatternMatcher getDataSchemeSpecificPart(int);
+ method public final java.lang.String getDataType(int);
+ method public final int getPriority();
+ method public final boolean hasAction(java.lang.String);
+ method public final boolean hasCategory(java.lang.String);
+ method public final boolean hasDataAuthority(android.net.Uri);
+ method public final boolean hasDataPath(java.lang.String);
+ method public final boolean hasDataScheme(java.lang.String);
+ method public final boolean hasDataSchemeSpecificPart(java.lang.String);
+ method public final boolean hasDataType(java.lang.String);
+ method public final int match(android.content.ContentResolver, android.content.Intent, boolean, java.lang.String);
+ method public final int match(java.lang.String, java.lang.String, java.lang.String, android.net.Uri, java.util.Set<java.lang.String>, java.lang.String);
+ method public final boolean matchAction(java.lang.String);
+ method public final java.lang.String matchCategories(java.util.Set<java.lang.String>);
+ method public final int matchData(java.lang.String, java.lang.String, android.net.Uri);
+ method public final int matchDataAuthority(android.net.Uri);
+ method public final java.util.Iterator<android.os.PatternMatcher> pathsIterator();
+ method public void readFromXml(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public final java.util.Iterator<android.os.PatternMatcher> schemeSpecificPartsIterator();
+ method public final java.util.Iterator<java.lang.String> schemesIterator();
+ method public final void setPriority(int);
+ method public final java.util.Iterator<java.lang.String> typesIterator();
+ method public final void writeToParcel(android.os.Parcel, int);
+ method public void writeToXml(org.xmlpull.v1.XmlSerializer) throws java.io.IOException;
+ field public static final android.os.Parcelable.Creator<android.content.IntentFilter> CREATOR;
+ field public static final int MATCH_ADJUSTMENT_MASK = 65535; // 0xffff
+ field public static final int MATCH_ADJUSTMENT_NORMAL = 32768; // 0x8000
+ field public static final int MATCH_CATEGORY_EMPTY = 1048576; // 0x100000
+ field public static final int MATCH_CATEGORY_HOST = 3145728; // 0x300000
+ field public static final int MATCH_CATEGORY_MASK = 268369920; // 0xfff0000
+ field public static final int MATCH_CATEGORY_PATH = 5242880; // 0x500000
+ field public static final int MATCH_CATEGORY_PORT = 4194304; // 0x400000
+ field public static final int MATCH_CATEGORY_SCHEME = 2097152; // 0x200000
+ field public static final int MATCH_CATEGORY_SCHEME_SPECIFIC_PART = 5767168; // 0x580000
+ field public static final int MATCH_CATEGORY_TYPE = 6291456; // 0x600000
+ field public static final int NO_MATCH_ACTION = -3; // 0xfffffffd
+ field public static final int NO_MATCH_CATEGORY = -4; // 0xfffffffc
+ field public static final int NO_MATCH_DATA = -2; // 0xfffffffe
+ field public static final int NO_MATCH_TYPE = -1; // 0xffffffff
+ field public static final int SYSTEM_HIGH_PRIORITY = 1000; // 0x3e8
+ field public static final int SYSTEM_LOW_PRIORITY = -1000; // 0xfffffc18
+ }
+
+ public static final class IntentFilter.AuthorityEntry {
+ ctor public IntentFilter.AuthorityEntry(java.lang.String, java.lang.String);
+ method public java.lang.String getHost();
+ method public int getPort();
+ method public int match(android.net.Uri);
+ }
+
+ public static class IntentFilter.MalformedMimeTypeException extends android.util.AndroidException {
+ ctor public IntentFilter.MalformedMimeTypeException();
+ ctor public IntentFilter.MalformedMimeTypeException(java.lang.String);
+ }
+
+ public class IntentSender implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String getCreatorPackage();
+ method public int getCreatorUid();
+ method public android.os.UserHandle getCreatorUserHandle();
+ method public deprecated java.lang.String getTargetPackage();
+ method public static android.content.IntentSender readIntentSenderOrNullFromParcel(android.os.Parcel);
+ method public void sendIntent(android.content.Context, int, android.content.Intent, android.content.IntentSender.OnFinished, android.os.Handler) throws android.content.IntentSender.SendIntentException;
+ method public void sendIntent(android.content.Context, int, android.content.Intent, android.content.IntentSender.OnFinished, android.os.Handler, java.lang.String) throws android.content.IntentSender.SendIntentException;
+ method public static void writeIntentSenderOrNullToParcel(android.content.IntentSender, android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.IntentSender> CREATOR;
+ }
+
+ public static abstract interface IntentSender.OnFinished {
+ method public abstract void onSendFinished(android.content.IntentSender, android.content.Intent, int, java.lang.String, android.os.Bundle);
+ }
+
+ public static class IntentSender.SendIntentException extends android.util.AndroidException {
+ ctor public IntentSender.SendIntentException();
+ ctor public IntentSender.SendIntentException(java.lang.String);
+ ctor public IntentSender.SendIntentException(java.lang.Exception);
+ }
+
+ public class Loader {
+ ctor public Loader(android.content.Context);
+ method public void abandon();
+ method public boolean cancelLoad();
+ method public void commitContentChanged();
+ method public java.lang.String dataToString(D);
+ method public void deliverCancellation();
+ method public void deliverResult(D);
+ method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public void forceLoad();
+ method public android.content.Context getContext();
+ method public int getId();
+ method public boolean isAbandoned();
+ method public boolean isReset();
+ method public boolean isStarted();
+ method protected void onAbandon();
+ method protected boolean onCancelLoad();
+ method public void onContentChanged();
+ method protected void onForceLoad();
+ method protected void onReset();
+ method protected void onStartLoading();
+ method protected void onStopLoading();
+ method public void registerListener(int, android.content.Loader.OnLoadCompleteListener<D>);
+ method public void registerOnLoadCanceledListener(android.content.Loader.OnLoadCanceledListener<D>);
+ method public void reset();
+ method public void rollbackContentChanged();
+ method public final void startLoading();
+ method public void stopLoading();
+ method public boolean takeContentChanged();
+ method public void unregisterListener(android.content.Loader.OnLoadCompleteListener<D>);
+ method public void unregisterOnLoadCanceledListener(android.content.Loader.OnLoadCanceledListener<D>);
+ }
+
+ public final class Loader.ForceLoadContentObserver extends android.database.ContentObserver {
+ ctor public Loader.ForceLoadContentObserver();
+ }
+
+ public static abstract interface Loader.OnLoadCanceledListener {
+ method public abstract void onLoadCanceled(android.content.Loader<D>);
+ }
+
+ public static abstract interface Loader.OnLoadCompleteListener {
+ method public abstract void onLoadComplete(android.content.Loader<D>, D);
+ }
+
+ public class MutableContextWrapper extends android.content.ContextWrapper {
+ ctor public MutableContextWrapper(android.content.Context);
+ method public void setBaseContext(android.content.Context);
+ }
+
+ public class OperationApplicationException extends java.lang.Exception {
+ ctor public OperationApplicationException();
+ ctor public OperationApplicationException(java.lang.String);
+ ctor public OperationApplicationException(java.lang.String, java.lang.Throwable);
+ ctor public OperationApplicationException(java.lang.Throwable);
+ ctor public OperationApplicationException(int);
+ ctor public OperationApplicationException(java.lang.String, int);
+ method public int getNumSuccessfulYieldPoints();
+ }
+
+ public class PeriodicSync implements android.os.Parcelable {
+ ctor public PeriodicSync(android.accounts.Account, java.lang.String, android.os.Bundle, long);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.PeriodicSync> CREATOR;
+ field public final android.accounts.Account account;
+ field public final java.lang.String authority;
+ field public final android.os.Bundle extras;
+ field public final long period;
+ }
+
+ public class ReceiverCallNotAllowedException extends android.util.AndroidRuntimeException {
+ ctor public ReceiverCallNotAllowedException(java.lang.String);
+ }
+
+ public class RestrictionEntry implements android.os.Parcelable {
+ ctor public RestrictionEntry(int, java.lang.String);
+ ctor public RestrictionEntry(java.lang.String, java.lang.String);
+ ctor public RestrictionEntry(java.lang.String, boolean);
+ ctor public RestrictionEntry(java.lang.String, java.lang.String[]);
+ ctor public RestrictionEntry(java.lang.String, int);
+ ctor public RestrictionEntry(android.os.Parcel);
+ method public static android.content.RestrictionEntry createBundleArrayEntry(java.lang.String, android.content.RestrictionEntry[]);
+ method public static android.content.RestrictionEntry createBundleEntry(java.lang.String, android.content.RestrictionEntry[]);
+ method public int describeContents();
+ method public java.lang.String[] getAllSelectedStrings();
+ method public java.lang.String[] getChoiceEntries();
+ method public java.lang.String[] getChoiceValues();
+ method public java.lang.String getDescription();
+ method public int getIntValue();
+ method public java.lang.String getKey();
+ method public android.content.RestrictionEntry[] getRestrictions();
+ method public boolean getSelectedState();
+ method public java.lang.String getSelectedString();
+ method public java.lang.String getTitle();
+ method public int getType();
+ method public void setAllSelectedStrings(java.lang.String[]);
+ method public void setChoiceEntries(java.lang.String[]);
+ method public void setChoiceEntries(android.content.Context, int);
+ method public void setChoiceValues(java.lang.String[]);
+ method public void setChoiceValues(android.content.Context, int);
+ method public void setDescription(java.lang.String);
+ method public void setIntValue(int);
+ method public void setRestrictions(android.content.RestrictionEntry[]);
+ method public void setSelectedState(boolean);
+ method public void setSelectedString(java.lang.String);
+ method public void setTitle(java.lang.String);
+ method public void setType(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.RestrictionEntry> CREATOR;
+ field public static final int TYPE_BOOLEAN = 1; // 0x1
+ field public static final int TYPE_BUNDLE = 7; // 0x7
+ field public static final int TYPE_BUNDLE_ARRAY = 8; // 0x8
+ field public static final int TYPE_CHOICE = 2; // 0x2
+ field public static final int TYPE_INTEGER = 5; // 0x5
+ field public static final int TYPE_MULTI_SELECT = 4; // 0x4
+ field public static final int TYPE_NULL = 0; // 0x0
+ field public static final int TYPE_STRING = 6; // 0x6
+ }
+
+ public class RestrictionsManager {
+ method public static android.os.Bundle convertRestrictionsToBundle(java.util.List<android.content.RestrictionEntry>);
+ method public android.content.Intent createLocalApprovalIntent();
+ method public android.os.Bundle getApplicationRestrictions();
+ method public java.util.List<android.content.RestrictionEntry> getManifestRestrictions(java.lang.String);
+ method public boolean hasRestrictionsProvider();
+ method public void notifyPermissionResponse(java.lang.String, android.os.PersistableBundle);
+ method public void requestPermission(java.lang.String, java.lang.String, android.os.PersistableBundle);
+ field public static final java.lang.String ACTION_PERMISSION_RESPONSE_RECEIVED = "android.content.action.PERMISSION_RESPONSE_RECEIVED";
+ field public static final java.lang.String ACTION_REQUEST_LOCAL_APPROVAL = "android.content.action.REQUEST_LOCAL_APPROVAL";
+ field public static final java.lang.String ACTION_REQUEST_PERMISSION = "android.content.action.REQUEST_PERMISSION";
+ field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME";
+ field public static final java.lang.String EXTRA_REQUEST_BUNDLE = "android.content.extra.REQUEST_BUNDLE";
+ field public static final java.lang.String EXTRA_REQUEST_ID = "android.content.extra.REQUEST_ID";
+ field public static final java.lang.String EXTRA_REQUEST_TYPE = "android.content.extra.REQUEST_TYPE";
+ field public static final java.lang.String EXTRA_RESPONSE_BUNDLE = "android.content.extra.RESPONSE_BUNDLE";
+ field public static final java.lang.String META_DATA_APP_RESTRICTIONS = "android.content.APP_RESTRICTIONS";
+ field public static final java.lang.String REQUEST_KEY_APPROVE_LABEL = "android.request.approve_label";
+ field public static final java.lang.String REQUEST_KEY_DATA = "android.request.data";
+ field public static final java.lang.String REQUEST_KEY_DENY_LABEL = "android.request.deny_label";
+ field public static final java.lang.String REQUEST_KEY_ICON = "android.request.icon";
+ field public static final java.lang.String REQUEST_KEY_ID = "android.request.id";
+ field public static final java.lang.String REQUEST_KEY_MESSAGE = "android.request.mesg";
+ field public static final java.lang.String REQUEST_KEY_NEW_REQUEST = "android.request.new_request";
+ field public static final java.lang.String REQUEST_KEY_TITLE = "android.request.title";
+ field public static final java.lang.String REQUEST_TYPE_APPROVAL = "android.request.type.approval";
+ field public static final java.lang.String RESPONSE_KEY_ERROR_CODE = "android.response.errorcode";
+ field public static final java.lang.String RESPONSE_KEY_MESSAGE = "android.response.msg";
+ field public static final java.lang.String RESPONSE_KEY_RESPONSE_TIMESTAMP = "android.response.timestamp";
+ field public static final java.lang.String RESPONSE_KEY_RESULT = "android.response.result";
+ field public static final int RESULT_APPROVED = 1; // 0x1
+ field public static final int RESULT_DENIED = 2; // 0x2
+ field public static final int RESULT_ERROR = 5; // 0x5
+ field public static final int RESULT_ERROR_BAD_REQUEST = 1; // 0x1
+ field public static final int RESULT_ERROR_INTERNAL = 3; // 0x3
+ field public static final int RESULT_ERROR_NETWORK = 2; // 0x2
+ field public static final int RESULT_NO_RESPONSE = 3; // 0x3
+ field public static final int RESULT_UNKNOWN_REQUEST = 4; // 0x4
+ }
+
+ public class SearchRecentSuggestionsProvider extends android.content.ContentProvider {
+ ctor public SearchRecentSuggestionsProvider();
+ method public int delete(android.net.Uri, java.lang.String, java.lang.String[]);
+ method public java.lang.String getType(android.net.Uri);
+ method public android.net.Uri insert(android.net.Uri, android.content.ContentValues);
+ method public boolean onCreate();
+ method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method protected void setupSuggestions(java.lang.String, int);
+ method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ field public static final int DATABASE_MODE_2LINES = 2; // 0x2
+ field public static final int DATABASE_MODE_QUERIES = 1; // 0x1
+ }
+
+ public abstract interface ServiceConnection {
+ method public abstract void onServiceConnected(android.content.ComponentName, android.os.IBinder);
+ method public abstract void onServiceDisconnected(android.content.ComponentName);
+ }
+
+ public abstract interface SharedPreferences {
+ method public abstract boolean contains(java.lang.String);
+ method public abstract android.content.SharedPreferences.Editor edit();
+ method public abstract java.util.Map<java.lang.String, ?> getAll();
+ method public abstract boolean getBoolean(java.lang.String, boolean);
+ method public abstract float getFloat(java.lang.String, float);
+ method public abstract int getInt(java.lang.String, int);
+ method public abstract long getLong(java.lang.String, long);
+ method public abstract java.lang.String getString(java.lang.String, java.lang.String);
+ method public abstract java.util.Set<java.lang.String> getStringSet(java.lang.String, java.util.Set<java.lang.String>);
+ method public abstract void registerOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener);
+ method public abstract void unregisterOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener);
+ }
+
+ public static abstract interface SharedPreferences.Editor {
+ method public abstract void apply();
+ method public abstract android.content.SharedPreferences.Editor clear();
+ method public abstract boolean commit();
+ method public abstract android.content.SharedPreferences.Editor putBoolean(java.lang.String, boolean);
+ method public abstract android.content.SharedPreferences.Editor putFloat(java.lang.String, float);
+ method public abstract android.content.SharedPreferences.Editor putInt(java.lang.String, int);
+ method public abstract android.content.SharedPreferences.Editor putLong(java.lang.String, long);
+ method public abstract android.content.SharedPreferences.Editor putString(java.lang.String, java.lang.String);
+ method public abstract android.content.SharedPreferences.Editor putStringSet(java.lang.String, java.util.Set<java.lang.String>);
+ method public abstract android.content.SharedPreferences.Editor remove(java.lang.String);
+ }
+
+ public static abstract interface SharedPreferences.OnSharedPreferenceChangeListener {
+ method public abstract void onSharedPreferenceChanged(android.content.SharedPreferences, java.lang.String);
+ }
+
+ public class SyncAdapterType implements android.os.Parcelable {
+ ctor public SyncAdapterType(java.lang.String, java.lang.String, boolean, boolean);
+ ctor public SyncAdapterType(android.os.Parcel);
+ method public boolean allowParallelSyncs();
+ method public int describeContents();
+ method public java.lang.String getSettingsActivity();
+ method public boolean isAlwaysSyncable();
+ method public boolean isUserVisible();
+ method public static android.content.SyncAdapterType newKey(java.lang.String, java.lang.String);
+ method public boolean supportsUploading();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.SyncAdapterType> CREATOR;
+ field public final java.lang.String accountType;
+ field public final java.lang.String authority;
+ field public final boolean isKey;
+ }
+
+ public class SyncContext {
+ method public android.os.IBinder getSyncContextBinder();
+ method public void onFinished(android.content.SyncResult);
+ }
+
+ public class SyncInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public final android.accounts.Account account;
+ field public final java.lang.String authority;
+ field public final long startTime;
+ }
+
+ public class SyncRequest implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.SyncRequest> CREATOR;
+ }
+
+ public static class SyncRequest.Builder {
+ ctor public SyncRequest.Builder();
+ method public android.content.SyncRequest build();
+ method public android.content.SyncRequest.Builder setDisallowMetered(boolean);
+ method public android.content.SyncRequest.Builder setExpedited(boolean);
+ method public android.content.SyncRequest.Builder setExtras(android.os.Bundle);
+ method public android.content.SyncRequest.Builder setIgnoreBackoff(boolean);
+ method public android.content.SyncRequest.Builder setIgnoreSettings(boolean);
+ method public android.content.SyncRequest.Builder setManual(boolean);
+ method public android.content.SyncRequest.Builder setNoRetry(boolean);
+ method public android.content.SyncRequest.Builder setSyncAdapter(android.accounts.Account, java.lang.String);
+ method public android.content.SyncRequest.Builder syncOnce();
+ method public android.content.SyncRequest.Builder syncPeriodic(long, long);
+ }
+
+ public final class SyncResult implements android.os.Parcelable {
+ ctor public SyncResult();
+ method public void clear();
+ method public int describeContents();
+ method public boolean hasError();
+ method public boolean hasHardError();
+ method public boolean hasSoftError();
+ method public boolean madeSomeProgress();
+ method public java.lang.String toDebugString();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.content.SyncResult ALREADY_IN_PROGRESS;
+ field public static final android.os.Parcelable.Creator<android.content.SyncResult> CREATOR;
+ field public boolean databaseError;
+ field public long delayUntil;
+ field public boolean fullSyncRequested;
+ field public boolean moreRecordsToGet;
+ field public boolean partialSyncUnavailable;
+ field public final android.content.SyncStats stats;
+ field public final boolean syncAlreadyInProgress;
+ field public boolean tooManyDeletions;
+ field public boolean tooManyRetries;
+ }
+
+ public class SyncStats implements android.os.Parcelable {
+ ctor public SyncStats();
+ ctor public SyncStats(android.os.Parcel);
+ method public void clear();
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.SyncStats> CREATOR;
+ field public long numAuthExceptions;
+ field public long numConflictDetectedExceptions;
+ field public long numDeletes;
+ field public long numEntries;
+ field public long numInserts;
+ field public long numIoExceptions;
+ field public long numParseExceptions;
+ field public long numSkippedEntries;
+ field public long numUpdates;
+ }
+
+ public abstract interface SyncStatusObserver {
+ method public abstract void onStatusChanged(int);
+ }
+
+ public class UriMatcher {
+ ctor public UriMatcher(int);
+ method public void addURI(java.lang.String, java.lang.String, int);
+ method public int match(android.net.Uri);
+ field public static final int NO_MATCH = -1; // 0xffffffff
+ }
+
+ public final class UriPermission implements android.os.Parcelable {
+ method public int describeContents();
+ method public long getPersistedTime();
+ method public android.net.Uri getUri();
+ method public boolean isReadPermission();
+ method public boolean isWritePermission();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.UriPermission> CREATOR;
+ field public static final long INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
+ }
+
+}
+
+package android.content.pm {
+
+ public class ActivityInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable {
+ ctor public ActivityInfo();
+ ctor public ActivityInfo(android.content.pm.ActivityInfo);
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public final int getThemeResource();
+ field public static final int CONFIG_DENSITY = 4096; // 0x1000
+ field public static final int CONFIG_FONT_SCALE = 1073741824; // 0x40000000
+ field public static final int CONFIG_KEYBOARD = 16; // 0x10
+ field public static final int CONFIG_KEYBOARD_HIDDEN = 32; // 0x20
+ field public static final int CONFIG_LAYOUT_DIRECTION = 8192; // 0x2000
+ field public static final int CONFIG_LOCALE = 4; // 0x4
+ field public static final int CONFIG_MCC = 1; // 0x1
+ field public static final int CONFIG_MNC = 2; // 0x2
+ field public static final int CONFIG_NAVIGATION = 64; // 0x40
+ field public static final int CONFIG_ORIENTATION = 128; // 0x80
+ field public static final int CONFIG_SCREEN_LAYOUT = 256; // 0x100
+ field public static final int CONFIG_SCREEN_SIZE = 1024; // 0x400
+ field public static final int CONFIG_SMALLEST_SCREEN_SIZE = 2048; // 0x800
+ field public static final int CONFIG_TOUCHSCREEN = 8; // 0x8
+ field public static final int CONFIG_UI_MODE = 512; // 0x200
+ field public static final android.os.Parcelable.Creator<android.content.pm.ActivityInfo> CREATOR;
+ field public static final int DOCUMENT_LAUNCH_ALWAYS = 2; // 0x2
+ field public static final int DOCUMENT_LAUNCH_INTO_EXISTING = 1; // 0x1
+ field public static final int DOCUMENT_LAUNCH_NEVER = 3; // 0x3
+ field public static final int DOCUMENT_LAUNCH_NONE = 0; // 0x0
+ field public static final int FLAG_ALLOW_TASK_REPARENTING = 64; // 0x40
+ field public static final int FLAG_ALWAYS_RETAIN_TASK_STATE = 8; // 0x8
+ field public static final int FLAG_AUTO_REMOVE_FROM_RECENTS = 8192; // 0x2000
+ field public static final int FLAG_CLEAR_TASK_ON_LAUNCH = 4; // 0x4
+ field public static final int FLAG_EXCLUDE_FROM_RECENTS = 32; // 0x20
+ field public static final int FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS = 256; // 0x100
+ field public static final int FLAG_FINISH_ON_TASK_LAUNCH = 2; // 0x2
+ field public static final int FLAG_HARDWARE_ACCELERATED = 512; // 0x200
+ field public static final int FLAG_IMMERSIVE = 2048; // 0x800
+ field public static final int FLAG_MULTIPROCESS = 1; // 0x1
+ field public static final int FLAG_NO_HISTORY = 128; // 0x80
+ field public static final int FLAG_RELINQUISH_TASK_IDENTITY = 4096; // 0x1000
+ field public static final int FLAG_RESUME_WHILE_PAUSING = 16384; // 0x4000
+ field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
+ field public static final int FLAG_STATE_NOT_NEEDED = 16; // 0x10
+ field public static final int LAUNCH_MULTIPLE = 0; // 0x0
+ field public static final int LAUNCH_SINGLE_INSTANCE = 3; // 0x3
+ field public static final int LAUNCH_SINGLE_TASK = 2; // 0x2
+ field public static final int LAUNCH_SINGLE_TOP = 1; // 0x1
+ field public static final int PERSIST_ACROSS_REBOOTS = 2; // 0x2
+ field public static final int PERSIST_NEVER = 1; // 0x1
+ field public static final int PERSIST_ROOT_ONLY = 0; // 0x0
+ field public static final int SCREEN_ORIENTATION_BEHIND = 3; // 0x3
+ field public static final int SCREEN_ORIENTATION_FULL_SENSOR = 10; // 0xa
+ field public static final int SCREEN_ORIENTATION_FULL_USER = 13; // 0xd
+ field public static final int SCREEN_ORIENTATION_LANDSCAPE = 0; // 0x0
+ field public static final int SCREEN_ORIENTATION_LOCKED = 14; // 0xe
+ field public static final int SCREEN_ORIENTATION_NOSENSOR = 5; // 0x5
+ field public static final int SCREEN_ORIENTATION_PORTRAIT = 1; // 0x1
+ field public static final int SCREEN_ORIENTATION_REVERSE_LANDSCAPE = 8; // 0x8
+ field public static final int SCREEN_ORIENTATION_REVERSE_PORTRAIT = 9; // 0x9
+ field public static final int SCREEN_ORIENTATION_SENSOR = 4; // 0x4
+ field public static final int SCREEN_ORIENTATION_SENSOR_LANDSCAPE = 6; // 0x6
+ field public static final int SCREEN_ORIENTATION_SENSOR_PORTRAIT = 7; // 0x7
+ field public static final int SCREEN_ORIENTATION_UNSPECIFIED = -1; // 0xffffffff
+ field public static final int SCREEN_ORIENTATION_USER = 2; // 0x2
+ field public static final int SCREEN_ORIENTATION_USER_LANDSCAPE = 11; // 0xb
+ field public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; // 0xc
+ field public static final int UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW = 1; // 0x1
+ field public int configChanges;
+ field public int documentLaunchMode;
+ field public int flags;
+ field public int launchMode;
+ field public android.content.pm.ActivityInfo.Layout layout;
+ field public int maxRecents;
+ field public java.lang.String parentActivityName;
+ field public java.lang.String permission;
+ field public int persistableMode;
+ field public int screenOrientation;
+ field public int softInputMode;
+ field public java.lang.String targetActivity;
+ field public java.lang.String taskAffinity;
+ field public int theme;
+ field public int uiOptions;
+ }
+
+ public static final class ActivityInfo.Layout {
+ ctor public ActivityInfo.Layout(int, float, int, float, int, int);
+ field public final int gravity;
+ field public final int height;
+ field public final float heightFraction;
+ field public final int minimalSize;
+ field public final int width;
+ field public final float widthFraction;
+ }
+
+ public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ ctor public ApplicationInfo();
+ ctor public ApplicationInfo(android.content.pm.ApplicationInfo);
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);
+ field public static final android.os.Parcelable.Creator<android.content.pm.ApplicationInfo> CREATOR;
+ field public static final int FLAG_ALLOW_BACKUP = 32768; // 0x8000
+ field public static final int FLAG_ALLOW_CLEAR_USER_DATA = 64; // 0x40
+ field public static final int FLAG_ALLOW_TASK_REPARENTING = 32; // 0x20
+ field public static final int FLAG_DEBUGGABLE = 2; // 0x2
+ field public static final int FLAG_EXTERNAL_STORAGE = 262144; // 0x40000
+ field public static final int FLAG_EXTRACT_NATIVE_LIBS = 268435456; // 0x10000000
+ field public static final int FLAG_FACTORY_TEST = 16; // 0x10
+ field public static final int FLAG_FULL_BACKUP_ONLY = 67108864; // 0x4000000
+ field public static final int FLAG_HARDWARE_ACCELERATED = 536870912; // 0x20000000
+ field public static final int FLAG_HAS_CODE = 4; // 0x4
+ field public static final int FLAG_INSTALLED = 8388608; // 0x800000
+ field public static final int FLAG_IS_DATA_ONLY = 16777216; // 0x1000000
+ field public static final int FLAG_IS_GAME = 33554432; // 0x2000000
+ field public static final int FLAG_KILL_AFTER_RESTORE = 65536; // 0x10000
+ field public static final int FLAG_LARGE_HEAP = 1048576; // 0x100000
+ field public static final int FLAG_MULTIARCH = -2147483648; // 0x80000000
+ field public static final int FLAG_PERSISTENT = 8; // 0x8
+ field public static final int FLAG_RESIZEABLE_FOR_SCREENS = 4096; // 0x1000
+ field public static final int FLAG_RESTORE_ANY_VERSION = 131072; // 0x20000
+ field public static final int FLAG_STOPPED = 2097152; // 0x200000
+ field public static final int FLAG_SUPPORTS_LARGE_SCREENS = 2048; // 0x800
+ field public static final int FLAG_SUPPORTS_NORMAL_SCREENS = 1024; // 0x400
+ field public static final int FLAG_SUPPORTS_RTL = 4194304; // 0x400000
+ field public static final int FLAG_SUPPORTS_SCREEN_DENSITIES = 8192; // 0x2000
+ field public static final int FLAG_SUPPORTS_SMALL_SCREENS = 512; // 0x200
+ field public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 524288; // 0x80000
+ field public static final int FLAG_SYSTEM = 1; // 0x1
+ field public static final int FLAG_TEST_ONLY = 256; // 0x100
+ field public static final int FLAG_UPDATED_SYSTEM_APP = 128; // 0x80
+ field public static final int FLAG_USES_CLEARTEXT_TRAFFIC = 134217728; // 0x8000000
+ field public static final int FLAG_VM_SAFE_MODE = 16384; // 0x4000
+ field public java.lang.String backupAgentName;
+ field public java.lang.String className;
+ field public int compatibleWidthLimitDp;
+ field public java.lang.String dataDir;
+ field public int descriptionRes;
+ field public boolean enabled;
+ field public int flags;
+ field public int largestWidthLimitDp;
+ field public java.lang.String manageSpaceActivityName;
+ field public java.lang.String nativeLibraryDir;
+ field public java.lang.String permission;
+ field public java.lang.String processName;
+ field public java.lang.String publicSourceDir;
+ field public int requiresSmallestWidthDp;
+ field public java.lang.String[] sharedLibraryFiles;
+ field public java.lang.String sourceDir;
+ field public java.lang.String[] splitPublicSourceDirs;
+ field public java.lang.String[] splitSourceDirs;
+ field public int targetSdkVersion;
+ field public java.lang.String taskAffinity;
+ field public int theme;
+ field public int uiOptions;
+ field public int uid;
+ }
+
+ public static class ApplicationInfo.DisplayNameComparator implements java.util.Comparator {
+ ctor public ApplicationInfo.DisplayNameComparator(android.content.pm.PackageManager);
+ method public final int compare(android.content.pm.ApplicationInfo, android.content.pm.ApplicationInfo);
+ }
+
+ public class ComponentInfo extends android.content.pm.PackageItemInfo {
+ ctor public ComponentInfo();
+ ctor public ComponentInfo(android.content.pm.ComponentInfo);
+ ctor protected ComponentInfo(android.os.Parcel);
+ method public final int getBannerResource();
+ method public final int getIconResource();
+ method public final int getLogoResource();
+ method public boolean isEnabled();
+ field public android.content.pm.ApplicationInfo applicationInfo;
+ field public int descriptionRes;
+ field public boolean enabled;
+ field public boolean encryptionAware;
+ field public boolean exported;
+ field public java.lang.String processName;
+ }
+
+ public class ConfigurationInfo implements android.os.Parcelable {
+ ctor public ConfigurationInfo();
+ ctor public ConfigurationInfo(android.content.pm.ConfigurationInfo);
+ method public int describeContents();
+ method public java.lang.String getGlEsVersion();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.ConfigurationInfo> CREATOR;
+ field public static final int GL_ES_VERSION_UNDEFINED = 0; // 0x0
+ field public static final int INPUT_FEATURE_FIVE_WAY_NAV = 2; // 0x2
+ field public static final int INPUT_FEATURE_HARD_KEYBOARD = 1; // 0x1
+ field public int reqGlEsVersion;
+ field public int reqInputFeatures;
+ field public int reqKeyboardType;
+ field public int reqNavigation;
+ field public int reqTouchScreen;
+ }
+
+ public final class FeatureGroupInfo implements android.os.Parcelable {
+ ctor public FeatureGroupInfo();
+ ctor public FeatureGroupInfo(android.content.pm.FeatureGroupInfo);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.FeatureGroupInfo> CREATOR;
+ field public android.content.pm.FeatureInfo[] features;
+ }
+
+ public class FeatureInfo implements android.os.Parcelable {
+ ctor public FeatureInfo();
+ ctor public FeatureInfo(android.content.pm.FeatureInfo);
+ method public int describeContents();
+ method public java.lang.String getGlEsVersion();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.FeatureInfo> CREATOR;
+ field public static final int FLAG_REQUIRED = 1; // 0x1
+ field public static final int GL_ES_VERSION_UNDEFINED = 0; // 0x0
+ field public int flags;
+ field public java.lang.String name;
+ field public int reqGlEsVersion;
+ }
+
+ public class InstrumentationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ ctor public InstrumentationInfo();
+ ctor public InstrumentationInfo(android.content.pm.InstrumentationInfo);
+ method public int describeContents();
+ field public static final android.os.Parcelable.Creator<android.content.pm.InstrumentationInfo> CREATOR;
+ field public java.lang.String dataDir;
+ field public boolean functionalTest;
+ field public boolean handleProfiling;
+ field public java.lang.String publicSourceDir;
+ field public java.lang.String sourceDir;
+ field public java.lang.String[] splitPublicSourceDirs;
+ field public java.lang.String[] splitSourceDirs;
+ field public java.lang.String targetPackage;
+ }
+
+ public class LabeledIntent extends android.content.Intent {
+ ctor public LabeledIntent(android.content.Intent, java.lang.String, int, int);
+ ctor public LabeledIntent(android.content.Intent, java.lang.String, java.lang.CharSequence, int);
+ ctor public LabeledIntent(java.lang.String, int, int);
+ ctor public LabeledIntent(java.lang.String, java.lang.CharSequence, int);
+ method public int getIconResource();
+ method public int getLabelResource();
+ method public java.lang.CharSequence getNonLocalizedLabel();
+ method public java.lang.String getSourcePackage();
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ field public static final android.os.Parcelable.Creator<android.content.pm.LabeledIntent> CREATOR;
+ }
+
+ public class LauncherActivityInfo {
+ method public android.content.pm.ApplicationInfo getApplicationInfo();
+ method public android.graphics.drawable.Drawable getBadgedIcon(int);
+ method public android.content.ComponentName getComponentName();
+ method public long getFirstInstallTime();
+ method public android.graphics.drawable.Drawable getIcon(int);
+ method public java.lang.CharSequence getLabel();
+ method public java.lang.String getName();
+ method public android.os.UserHandle getUser();
+ }
+
+ public class LauncherApps {
+ method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
+ method public boolean isActivityEnabled(android.content.ComponentName, android.os.UserHandle);
+ method public boolean isPackageEnabled(java.lang.String, android.os.UserHandle);
+ method public void registerCallback(android.content.pm.LauncherApps.Callback);
+ method public void registerCallback(android.content.pm.LauncherApps.Callback, android.os.Handler);
+ method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
+ method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
+ method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
+ method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
+ }
+
+ public static abstract class LauncherApps.Callback {
+ ctor public LauncherApps.Callback();
+ method public abstract void onPackageAdded(java.lang.String, android.os.UserHandle);
+ method public abstract void onPackageChanged(java.lang.String, android.os.UserHandle);
+ method public abstract void onPackageRemoved(java.lang.String, android.os.UserHandle);
+ method public abstract void onPackagesAvailable(java.lang.String[], android.os.UserHandle, boolean);
+ method public abstract void onPackagesUnavailable(java.lang.String[], android.os.UserHandle, boolean);
+ }
+
+ public class PackageInfo implements android.os.Parcelable {
+ ctor public PackageInfo();
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.PackageInfo> CREATOR;
+ field public static final int INSTALL_LOCATION_AUTO = 0; // 0x0
+ field public static final int INSTALL_LOCATION_INTERNAL_ONLY = 1; // 0x1
+ field public static final int INSTALL_LOCATION_PREFER_EXTERNAL = 2; // 0x2
+ field public static final int REQUESTED_PERMISSION_GRANTED = 2; // 0x2
+ field public android.content.pm.ActivityInfo[] activities;
+ field public android.content.pm.ApplicationInfo applicationInfo;
+ field public int baseRevisionCode;
+ field public android.content.pm.ConfigurationInfo[] configPreferences;
+ field public android.content.pm.FeatureGroupInfo[] featureGroups;
+ field public long firstInstallTime;
+ field public int[] gids;
+ field public int installLocation;
+ field public android.content.pm.InstrumentationInfo[] instrumentation;
+ field public long lastUpdateTime;
+ field public java.lang.String packageName;
+ field public android.content.pm.PermissionInfo[] permissions;
+ field public android.content.pm.ProviderInfo[] providers;
+ field public android.content.pm.ActivityInfo[] receivers;
+ field public android.content.pm.FeatureInfo[] reqFeatures;
+ field public java.lang.String[] requestedPermissions;
+ field public int[] requestedPermissionsFlags;
+ field public android.content.pm.ServiceInfo[] services;
+ field public java.lang.String sharedUserId;
+ field public int sharedUserLabel;
+ field public android.content.pm.Signature[] signatures;
+ field public java.lang.String[] splitNames;
+ field public int[] splitRevisionCodes;
+ field public int versionCode;
+ field public java.lang.String versionName;
+ }
+
+ public class PackageInstaller {
+ method public void abandonSession(int);
+ method public int createSession(android.content.pm.PackageInstaller.SessionParams) throws java.io.IOException;
+ method public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getAllSessions();
+ method public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getMySessions();
+ method public android.content.pm.PackageInstaller.SessionInfo getSessionInfo(int);
+ method public android.content.pm.PackageInstaller.Session openSession(int) throws java.io.IOException;
+ method public void registerSessionCallback(android.content.pm.PackageInstaller.SessionCallback);
+ method public void registerSessionCallback(android.content.pm.PackageInstaller.SessionCallback, android.os.Handler);
+ method public void uninstall(java.lang.String, android.content.IntentSender);
+ method public void unregisterSessionCallback(android.content.pm.PackageInstaller.SessionCallback);
+ method public void updateSessionAppIcon(int, android.graphics.Bitmap);
+ method public void updateSessionAppLabel(int, java.lang.CharSequence);
+ field public static final java.lang.String ACTION_SESSION_DETAILS = "android.content.pm.action.SESSION_DETAILS";
+ field public static final java.lang.String EXTRA_OTHER_PACKAGE_NAME = "android.content.pm.extra.OTHER_PACKAGE_NAME";
+ field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.content.pm.extra.PACKAGE_NAME";
+ field public static final java.lang.String EXTRA_SESSION_ID = "android.content.pm.extra.SESSION_ID";
+ field public static final java.lang.String EXTRA_STATUS = "android.content.pm.extra.STATUS";
+ field public static final java.lang.String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE";
+ field public static final java.lang.String EXTRA_STORAGE_PATH = "android.content.pm.extra.STORAGE_PATH";
+ field public static final int STATUS_FAILURE = 1; // 0x1
+ field public static final int STATUS_FAILURE_ABORTED = 3; // 0x3
+ field public static final int STATUS_FAILURE_BLOCKED = 2; // 0x2
+ field public static final int STATUS_FAILURE_CONFLICT = 5; // 0x5
+ field public static final int STATUS_FAILURE_INCOMPATIBLE = 7; // 0x7
+ field public static final int STATUS_FAILURE_INVALID = 4; // 0x4
+ field public static final int STATUS_FAILURE_STORAGE = 6; // 0x6
+ field public static final int STATUS_PENDING_USER_ACTION = -1; // 0xffffffff
+ field public static final int STATUS_SUCCESS = 0; // 0x0
+ }
+
+ public static class PackageInstaller.Session implements java.io.Closeable {
+ method public void abandon();
+ method public void close();
+ method public void commit(android.content.IntentSender);
+ method public void fsync(java.io.OutputStream) throws java.io.IOException;
+ method public java.lang.String[] getNames() throws java.io.IOException;
+ method public java.io.InputStream openRead(java.lang.String) throws java.io.IOException;
+ method public java.io.OutputStream openWrite(java.lang.String, long, long) throws java.io.IOException;
+ method public void setStagingProgress(float);
+ }
+
+ public static abstract class PackageInstaller.SessionCallback {
+ ctor public PackageInstaller.SessionCallback();
+ method public abstract void onActiveChanged(int, boolean);
+ method public abstract void onBadgingChanged(int);
+ method public abstract void onCreated(int);
+ method public abstract void onFinished(int, boolean);
+ method public abstract void onProgressChanged(int, float);
+ }
+
+ public static class PackageInstaller.SessionInfo implements android.os.Parcelable {
+ method public android.content.Intent createDetailsIntent();
+ method public int describeContents();
+ method public android.graphics.Bitmap getAppIcon();
+ method public java.lang.CharSequence getAppLabel();
+ method public java.lang.String getAppPackageName();
+ method public java.lang.String getInstallerPackageName();
+ method public float getProgress();
+ method public int getSessionId();
+ method public boolean isActive();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.PackageInstaller.SessionInfo> CREATOR;
+ }
+
+ public static class PackageInstaller.SessionParams implements android.os.Parcelable {
+ ctor public PackageInstaller.SessionParams(int);
+ method public int describeContents();
+ method public void setAppIcon(android.graphics.Bitmap);
+ method public void setAppLabel(java.lang.CharSequence);
+ method public void setAppPackageName(java.lang.String);
+ method public void setInstallLocation(int);
+ method public void setOriginatingUid(int);
+ method public void setOriginatingUri(android.net.Uri);
+ method public void setReferrerUri(android.net.Uri);
+ method public void setSize(long);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.PackageInstaller.SessionParams> CREATOR;
+ field public static final int MODE_FULL_INSTALL = 1; // 0x1
+ field public static final int MODE_INHERIT_EXISTING = 2; // 0x2
+ }
+
+ public class PackageItemInfo {
+ ctor public PackageItemInfo();
+ ctor public PackageItemInfo(android.content.pm.PackageItemInfo);
+ ctor protected PackageItemInfo(android.os.Parcel);
+ method protected void dumpBack(android.util.Printer, java.lang.String);
+ method protected void dumpFront(android.util.Printer, java.lang.String);
+ method public android.graphics.drawable.Drawable loadBanner(android.content.pm.PackageManager);
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public android.graphics.drawable.Drawable loadLogo(android.content.pm.PackageManager);
+ method public android.graphics.drawable.Drawable loadUnbadgedIcon(android.content.pm.PackageManager);
+ method public android.content.res.XmlResourceParser loadXmlMetaData(android.content.pm.PackageManager, java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public int banner;
+ field public int icon;
+ field public int labelRes;
+ field public int logo;
+ field public android.os.Bundle metaData;
+ field public java.lang.String name;
+ field public java.lang.CharSequence nonLocalizedLabel;
+ field public java.lang.String packageName;
+ }
+
+ public static class PackageItemInfo.DisplayNameComparator implements java.util.Comparator {
+ ctor public PackageItemInfo.DisplayNameComparator(android.content.pm.PackageManager);
+ method public final int compare(android.content.pm.PackageItemInfo, android.content.pm.PackageItemInfo);
+ }
+
+ public abstract class PackageManager {
+ ctor public PackageManager();
+ method public abstract deprecated void addPackageToPreferred(java.lang.String);
+ method public abstract boolean addPermission(android.content.pm.PermissionInfo);
+ method public abstract boolean addPermissionAsync(android.content.pm.PermissionInfo);
+ method public abstract deprecated void addPreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName);
+ method public abstract java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]);
+ method public abstract int checkPermission(java.lang.String, java.lang.String);
+ method public abstract int checkSignatures(java.lang.String, java.lang.String);
+ method public abstract int checkSignatures(int, int);
+ method public abstract void clearPackagePreferredActivities(java.lang.String);
+ method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
+ method public abstract void extendVerificationTimeout(int, int, long);
+ method public abstract android.graphics.drawable.Drawable getActivityBanner(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.graphics.drawable.Drawable getActivityBanner(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.graphics.drawable.Drawable getActivityLogo(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);
+ method public abstract android.graphics.drawable.Drawable getApplicationBanner(android.content.pm.ApplicationInfo);
+ method public abstract android.graphics.drawable.Drawable getApplicationBanner(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract int getApplicationEnabledSetting(java.lang.String);
+ method public abstract android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo);
+ method public abstract android.graphics.drawable.Drawable getApplicationIcon(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.ApplicationInfo getApplicationInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract java.lang.CharSequence getApplicationLabel(android.content.pm.ApplicationInfo);
+ method public abstract android.graphics.drawable.Drawable getApplicationLogo(android.content.pm.ApplicationInfo);
+ method public abstract android.graphics.drawable.Drawable getApplicationLogo(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract int getComponentEnabledSetting(android.content.ComponentName);
+ method public abstract android.graphics.drawable.Drawable getDefaultActivityIcon();
+ method public abstract android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);
+ method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
+ method public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
+ method public abstract java.lang.String getInstallerPackageName(java.lang.String);
+ method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.Intent getLaunchIntentForPackage(java.lang.String);
+ method public abstract android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
+ method public abstract java.lang.String getNameForUid(int);
+ method public android.content.pm.PackageInfo getPackageArchiveInfo(java.lang.String, int);
+ method public abstract int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.PackageInstaller getPackageInstaller();
+ method public abstract java.lang.String[] getPackagesForUid(int);
+ method public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);
+ method public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);
+ method public abstract java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int);
+ method public abstract android.content.pm.ProviderInfo getProviderInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.ActivityInfo getReceiverInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.res.Resources getResourcesForActivity(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.res.Resources getResourcesForApplication(android.content.pm.ApplicationInfo) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.res.Resources getResourcesForApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.ServiceInfo getServiceInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract android.content.pm.FeatureInfo[] getSystemAvailableFeatures();
+ method public abstract java.lang.String[] getSystemSharedLibraryNames();
+ method public abstract java.lang.CharSequence getText(java.lang.String, int, android.content.pm.ApplicationInfo);
+ method public abstract android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
+ method public abstract android.graphics.drawable.Drawable getUserBadgedIcon(android.graphics.drawable.Drawable, android.os.UserHandle);
+ method public abstract java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
+ method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
+ method public abstract boolean hasSystemFeature(java.lang.String);
+ method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
+ method public abstract boolean isSafeMode();
+ method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
+ method public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);
+ method public abstract java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(java.lang.String, int);
+ method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(android.content.Intent, int);
+ method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int);
+ method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);
+ method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);
+ method public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public abstract deprecated void removePackageFromPreferred(java.lang.String);
+ method public abstract void removePermission(java.lang.String);
+ method public abstract android.content.pm.ResolveInfo resolveActivity(android.content.Intent, int);
+ method public abstract android.content.pm.ProviderInfo resolveContentProvider(java.lang.String, int);
+ method public abstract android.content.pm.ResolveInfo resolveService(android.content.Intent, int);
+ method public abstract void setApplicationEnabledSetting(java.lang.String, int, int);
+ method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
+ method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
+ method public abstract void verifyPendingInstall(int, int);
+ field public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0; // 0x0
+ field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
+ field public static final int COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED = 4; // 0x4
+ field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
+ field public static final int COMPONENT_ENABLED_STATE_ENABLED = 1; // 0x1
+ field public static final int DONT_KILL_APP = 1; // 0x1
+ field public static final java.lang.String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";
+ field public static final java.lang.String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";
+ field public static final java.lang.String FEATURE_APP_WIDGETS = "android.software.app_widgets";
+ field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
+ field public static final java.lang.String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";
+ field public static final java.lang.String FEATURE_AUDIO_PRO = "android.hardware.audio.pro";
+ field public static final java.lang.String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive";
+ field public static final java.lang.String FEATURE_BACKUP = "android.software.backup";
+ field public static final java.lang.String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
+ field public static final java.lang.String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";
+ field public static final java.lang.String FEATURE_CAMERA = "android.hardware.camera";
+ field public static final java.lang.String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
+ field public static final java.lang.String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";
+ field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING = "android.hardware.camera.capability.manual_post_processing";
+ field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR = "android.hardware.camera.capability.manual_sensor";
+ field public static final java.lang.String FEATURE_CAMERA_CAPABILITY_RAW = "android.hardware.camera.capability.raw";
+ field public static final java.lang.String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external";
+ field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
+ field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";
+ field public static final java.lang.String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";
+ field public static final java.lang.String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
+ field public static final java.lang.String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
+ field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin";
+ field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";
+ field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
+ field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";
+ field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.fingerprint";
+ field public static final java.lang.String FEATURE_FREEFORM_WINDOW_MANAGEMENT = "android.software.freeform_window_management";
+ field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad";
+ field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";
+ field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";
+ field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";
+ field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";
+ field public static final java.lang.String FEATURE_LIVE_TV = "android.software.live_tv";
+ field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";
+ field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";
+ field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
+ field public static final java.lang.String FEATURE_LOCATION_NETWORK = "android.hardware.location.network";
+ field public static final java.lang.String FEATURE_MANAGED_USERS = "android.software.managed_users";
+ field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone";
+ field public static final java.lang.String FEATURE_MIDI = "android.software.midi";
+ field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";
+ field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";
+ field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";
+ field public static final java.lang.String FEATURE_PRINTING = "android.software.print";
+ field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";
+ field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";
+ field public static final java.lang.String FEATURE_SECURELY_REMOVES_USERS = "android.software.securely_removes_users";
+ field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";
+ field public static final java.lang.String FEATURE_SENSOR_AMBIENT_TEMPERATURE = "android.hardware.sensor.ambient_temperature";
+ field public static final java.lang.String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";
+ field public static final java.lang.String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass";
+ field public static final java.lang.String FEATURE_SENSOR_GYROSCOPE = "android.hardware.sensor.gyroscope";
+ field public static final java.lang.String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate";
+ field public static final java.lang.String FEATURE_SENSOR_HEART_RATE_ECG = "android.hardware.sensor.heartrate.ecg";
+ field public static final java.lang.String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light";
+ field public static final java.lang.String FEATURE_SENSOR_PROXIMITY = "android.hardware.sensor.proximity";
+ field public static final java.lang.String FEATURE_SENSOR_RELATIVE_HUMIDITY = "android.hardware.sensor.relative_humidity";
+ field public static final java.lang.String FEATURE_SENSOR_STEP_COUNTER = "android.hardware.sensor.stepcounter";
+ field public static final java.lang.String FEATURE_SENSOR_STEP_DETECTOR = "android.hardware.sensor.stepdetector";
+ field public static final java.lang.String FEATURE_SIP = "android.software.sip";
+ field public static final java.lang.String FEATURE_SIP_VOIP = "android.software.sip.voip";
+ field public static final java.lang.String FEATURE_TELEPHONY = "android.hardware.telephony";
+ field public static final java.lang.String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
+ field public static final java.lang.String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
+ field public static final deprecated java.lang.String FEATURE_TELEVISION = "android.hardware.type.television";
+ field public static final java.lang.String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
+ field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
+ field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";
+ field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand";
+ field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory";
+ field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host";
+ field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot";
+ field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch";
+ field public static final java.lang.String FEATURE_WEBVIEW = "android.software.webview";
+ field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";
+ field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
+ field public static final int GET_ACTIVITIES = 1; // 0x1
+ field public static final int GET_CONFIGURATIONS = 16384; // 0x4000
+ field public static final int GET_DISABLED_COMPONENTS = 512; // 0x200
+ field public static final int GET_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
+ field public static final int GET_ENCRYPTION_UNAWARE_COMPONENTS = 262144; // 0x40000
+ field public static final int GET_GIDS = 256; // 0x100
+ field public static final int GET_INSTRUMENTATION = 16; // 0x10
+ field public static final int GET_INTENT_FILTERS = 32; // 0x20
+ field public static final int GET_META_DATA = 128; // 0x80
+ field public static final int GET_PERMISSIONS = 4096; // 0x1000
+ field public static final int GET_PROVIDERS = 8; // 0x8
+ field public static final int GET_RECEIVERS = 2; // 0x2
+ field public static final int GET_RESOLVED_FILTER = 64; // 0x40
+ field public static final int GET_SERVICES = 4; // 0x4
+ field public static final int GET_SHARED_LIBRARY_FILES = 1024; // 0x400
+ field public static final int GET_SIGNATURES = 64; // 0x40
+ field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
+ field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
+ field public static final int MATCH_ALL = 131072; // 0x20000
+ field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
+ field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
+ field public static final int PERMISSION_DENIED = -1; // 0xffffffff
+ field public static final int PERMISSION_GRANTED = 0; // 0x0
+ field public static final int SIGNATURE_FIRST_NOT_SIGNED = -1; // 0xffffffff
+ field public static final int SIGNATURE_MATCH = 0; // 0x0
+ field public static final int SIGNATURE_NEITHER_SIGNED = 1; // 0x1
+ field public static final int SIGNATURE_NO_MATCH = -3; // 0xfffffffd
+ field public static final int SIGNATURE_SECOND_NOT_SIGNED = -2; // 0xfffffffe
+ field public static final int SIGNATURE_UNKNOWN_PACKAGE = -4; // 0xfffffffc
+ field public static final int VERIFICATION_ALLOW = 1; // 0x1
+ field public static final int VERIFICATION_REJECT = -1; // 0xffffffff
+ }
+
+ public static class PackageManager.NameNotFoundException extends android.util.AndroidException {
+ ctor public PackageManager.NameNotFoundException();
+ ctor public PackageManager.NameNotFoundException(java.lang.String);
+ }
+
+ public class PackageStats implements android.os.Parcelable {
+ ctor public PackageStats(java.lang.String);
+ ctor public PackageStats(android.os.Parcel);
+ ctor public PackageStats(android.content.pm.PackageStats);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.PackageStats> CREATOR;
+ field public long cacheSize;
+ field public long codeSize;
+ field public long dataSize;
+ field public long externalCacheSize;
+ field public long externalCodeSize;
+ field public long externalDataSize;
+ field public long externalMediaSize;
+ field public long externalObbSize;
+ field public java.lang.String packageName;
+ }
+
+ public class PathPermission extends android.os.PatternMatcher {
+ ctor public PathPermission(java.lang.String, int, java.lang.String, java.lang.String);
+ ctor public PathPermission(android.os.Parcel);
+ method public java.lang.String getReadPermission();
+ method public java.lang.String getWritePermission();
+ field public static final android.os.Parcelable.Creator<android.content.pm.PathPermission> CREATOR;
+ }
+
+ public class PermissionGroupInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ ctor public PermissionGroupInfo();
+ ctor public PermissionGroupInfo(android.content.pm.PermissionGroupInfo);
+ method public int describeContents();
+ method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);
+ field public static final android.os.Parcelable.Creator<android.content.pm.PermissionGroupInfo> CREATOR;
+ field public static final int FLAG_PERSONAL_INFO = 1; // 0x1
+ field public int descriptionRes;
+ field public int flags;
+ field public java.lang.CharSequence nonLocalizedDescription;
+ field public int priority;
+ }
+
+ public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ ctor public PermissionInfo();
+ ctor public PermissionInfo(android.content.pm.PermissionInfo);
+ method public int describeContents();
+ method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);
+ field public static final android.os.Parcelable.Creator<android.content.pm.PermissionInfo> CREATOR;
+ field public static final int FLAG_COSTS_MONEY = 1; // 0x1
+ field public static final int FLAG_INSTALLED = 1073741824; // 0x40000000
+ field public static final int PROTECTION_DANGEROUS = 1; // 0x1
+ field public static final int PROTECTION_FLAG_APPOP = 64; // 0x40
+ field public static final int PROTECTION_FLAG_DEVELOPMENT = 32; // 0x20
+ field public static final int PROTECTION_FLAG_INSTALLER = 256; // 0x100
+ field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80
+ field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400
+ field public static final int PROTECTION_FLAG_PRIVILEGED = 16; // 0x10
+ field public static final deprecated int PROTECTION_FLAG_SYSTEM = 16; // 0x10
+ field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200
+ field public static final int PROTECTION_MASK_BASE = 15; // 0xf
+ field public static final int PROTECTION_MASK_FLAGS = 4080; // 0xff0
+ field public static final int PROTECTION_NORMAL = 0; // 0x0
+ field public static final int PROTECTION_SIGNATURE = 2; // 0x2
+ field public static final deprecated int PROTECTION_SIGNATURE_OR_SYSTEM = 3; // 0x3
+ field public int descriptionRes;
+ field public int flags;
+ field public java.lang.String group;
+ field public java.lang.CharSequence nonLocalizedDescription;
+ field public int protectionLevel;
+ }
+
+ public final class ProviderInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable {
+ ctor public ProviderInfo();
+ ctor public ProviderInfo(android.content.pm.ProviderInfo);
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ field public static final android.os.Parcelable.Creator<android.content.pm.ProviderInfo> CREATOR;
+ field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
+ field public java.lang.String authority;
+ field public int flags;
+ field public boolean grantUriPermissions;
+ field public int initOrder;
+ field public deprecated boolean isSyncable;
+ field public boolean multiprocess;
+ field public android.content.pm.PathPermission[] pathPermissions;
+ field public java.lang.String readPermission;
+ field public android.os.PatternMatcher[] uriPermissionPatterns;
+ field public java.lang.String writePermission;
+ }
+
+ public class ResolveInfo implements android.os.Parcelable {
+ ctor public ResolveInfo();
+ ctor public ResolveInfo(android.content.pm.ResolveInfo);
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public final int getIconResource();
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.ResolveInfo> CREATOR;
+ field public android.content.pm.ActivityInfo activityInfo;
+ field public android.content.IntentFilter filter;
+ field public int icon;
+ field public boolean isDefault;
+ field public int labelRes;
+ field public int match;
+ field public java.lang.CharSequence nonLocalizedLabel;
+ field public int preferredOrder;
+ field public int priority;
+ field public android.content.pm.ProviderInfo providerInfo;
+ field public java.lang.String resolvePackageName;
+ field public android.content.pm.ServiceInfo serviceInfo;
+ field public int specificIndex;
+ }
+
+ public static class ResolveInfo.DisplayNameComparator implements java.util.Comparator {
+ ctor public ResolveInfo.DisplayNameComparator(android.content.pm.PackageManager);
+ method public final int compare(android.content.pm.ResolveInfo, android.content.pm.ResolveInfo);
+ }
+
+ public class ServiceInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable {
+ ctor public ServiceInfo();
+ ctor public ServiceInfo(android.content.pm.ServiceInfo);
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR;
+ field public static final int FLAG_ISOLATED_PROCESS = 2; // 0x2
+ field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
+ field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1
+ field public int flags;
+ field public java.lang.String permission;
+ }
+
+ public class Signature implements android.os.Parcelable {
+ ctor public Signature(byte[]);
+ ctor public Signature(java.lang.String);
+ method public int describeContents();
+ method public byte[] toByteArray();
+ method public char[] toChars();
+ method public char[] toChars(char[], int[]);
+ method public java.lang.String toCharsString();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.pm.Signature> CREATOR;
+ }
+
+}
+
+package android.content.res {
+
+ public class AssetFileDescriptor implements java.io.Closeable android.os.Parcelable {
+ ctor public AssetFileDescriptor(android.os.ParcelFileDescriptor, long, long);
+ ctor public AssetFileDescriptor(android.os.ParcelFileDescriptor, long, long, android.os.Bundle);
+ method public void close() throws java.io.IOException;
+ method public java.io.FileInputStream createInputStream() throws java.io.IOException;
+ method public java.io.FileOutputStream createOutputStream() throws java.io.IOException;
+ method public int describeContents();
+ method public long getDeclaredLength();
+ method public android.os.Bundle getExtras();
+ method public java.io.FileDescriptor getFileDescriptor();
+ method public long getLength();
+ method public android.os.ParcelFileDescriptor getParcelFileDescriptor();
+ method public long getStartOffset();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.res.AssetFileDescriptor> CREATOR;
+ field public static final long UNKNOWN_LENGTH = -1L; // 0xffffffffffffffffL
+ }
+
+ public static class AssetFileDescriptor.AutoCloseInputStream extends android.os.ParcelFileDescriptor.AutoCloseInputStream {
+ ctor public AssetFileDescriptor.AutoCloseInputStream(android.content.res.AssetFileDescriptor) throws java.io.IOException;
+ }
+
+ public static class AssetFileDescriptor.AutoCloseOutputStream extends android.os.ParcelFileDescriptor.AutoCloseOutputStream {
+ ctor public AssetFileDescriptor.AutoCloseOutputStream(android.content.res.AssetFileDescriptor) throws java.io.IOException;
+ }
+
+ public final class AssetManager implements java.lang.AutoCloseable {
+ method public void close();
+ method public final java.lang.String[] getLocales();
+ method public final java.lang.String[] list(java.lang.String) throws java.io.IOException;
+ method public final java.io.InputStream open(java.lang.String) throws java.io.IOException;
+ method public final java.io.InputStream open(java.lang.String, int) throws java.io.IOException;
+ method public final android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;
+ method public final android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;
+ method public final android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;
+ method public final android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;
+ method public final android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;
+ field public static final int ACCESS_BUFFER = 3; // 0x3
+ field public static final int ACCESS_RANDOM = 1; // 0x1
+ field public static final int ACCESS_STREAMING = 2; // 0x2
+ field public static final int ACCESS_UNKNOWN = 0; // 0x0
+ }
+
+ public final class AssetManager.AssetInputStream extends java.io.InputStream {
+ method public final int available() throws java.io.IOException;
+ method public final void close() throws java.io.IOException;
+ method public final void mark(int);
+ method public final boolean markSupported();
+ method public final int read() throws java.io.IOException;
+ method public final int read(byte[]) throws java.io.IOException;
+ method public final int read(byte[], int, int) throws java.io.IOException;
+ method public final void reset() throws java.io.IOException;
+ method public final long skip(long) throws java.io.IOException;
+ }
+
+ public class ColorStateList implements android.os.Parcelable {
+ ctor public ColorStateList(int[][], int[]);
+ method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public int describeContents();
+ method public int getChangingConfigurations();
+ method public int getColorForState(int[], int);
+ method public int getDefaultColor();
+ method public boolean isOpaque();
+ method public boolean isStateful();
+ method public static android.content.res.ColorStateList valueOf(int);
+ method public android.content.res.ColorStateList withAlpha(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR;
+ }
+
+ public final class Configuration implements java.lang.Comparable android.os.Parcelable {
+ ctor public Configuration();
+ ctor public Configuration(android.content.res.Configuration);
+ method public int compareTo(android.content.res.Configuration);
+ method public int describeContents();
+ method public int diff(android.content.res.Configuration);
+ method public boolean equals(android.content.res.Configuration);
+ method public int getLayoutDirection();
+ method public android.util.LocaleList getLocales();
+ method public boolean isLayoutSizeAtLeast(int);
+ method public boolean isScreenRound();
+ method public static boolean needNewResources(int, int);
+ method public void readFromParcel(android.os.Parcel);
+ method public void setLayoutDirection(java.util.Locale);
+ method public void setLocale(java.util.Locale);
+ method public void setLocales(android.util.LocaleList);
+ method public void setTo(android.content.res.Configuration);
+ method public void setToDefaults();
+ method public int updateFrom(android.content.res.Configuration);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.res.Configuration> CREATOR;
+ field public static final int DENSITY_DPI_UNDEFINED = 0; // 0x0
+ field public static final int HARDKEYBOARDHIDDEN_NO = 1; // 0x1
+ field public static final int HARDKEYBOARDHIDDEN_UNDEFINED = 0; // 0x0
+ field public static final int HARDKEYBOARDHIDDEN_YES = 2; // 0x2
+ field public static final int KEYBOARDHIDDEN_NO = 1; // 0x1
+ field public static final int KEYBOARDHIDDEN_UNDEFINED = 0; // 0x0
+ field public static final int KEYBOARDHIDDEN_YES = 2; // 0x2
+ field public static final int KEYBOARD_12KEY = 3; // 0x3
+ field public static final int KEYBOARD_NOKEYS = 1; // 0x1
+ field public static final int KEYBOARD_QWERTY = 2; // 0x2
+ field public static final int KEYBOARD_UNDEFINED = 0; // 0x0
+ field public static final int MNC_ZERO = 65535; // 0xffff
+ field public static final int NAVIGATIONHIDDEN_NO = 1; // 0x1
+ field public static final int NAVIGATIONHIDDEN_UNDEFINED = 0; // 0x0
+ field public static final int NAVIGATIONHIDDEN_YES = 2; // 0x2
+ field public static final int NAVIGATION_DPAD = 2; // 0x2
+ field public static final int NAVIGATION_NONAV = 1; // 0x1
+ field public static final int NAVIGATION_TRACKBALL = 3; // 0x3
+ field public static final int NAVIGATION_UNDEFINED = 0; // 0x0
+ field public static final int NAVIGATION_WHEEL = 4; // 0x4
+ field public static final int ORIENTATION_LANDSCAPE = 2; // 0x2
+ field public static final int ORIENTATION_PORTRAIT = 1; // 0x1
+ field public static final deprecated int ORIENTATION_SQUARE = 3; // 0x3
+ field public static final int ORIENTATION_UNDEFINED = 0; // 0x0
+ field public static final int SCREENLAYOUT_LAYOUTDIR_LTR = 64; // 0x40
+ field public static final int SCREENLAYOUT_LAYOUTDIR_MASK = 192; // 0xc0
+ field public static final int SCREENLAYOUT_LAYOUTDIR_RTL = 128; // 0x80
+ field public static final int SCREENLAYOUT_LAYOUTDIR_SHIFT = 6; // 0x6
+ field public static final int SCREENLAYOUT_LAYOUTDIR_UNDEFINED = 0; // 0x0
+ field public static final int SCREENLAYOUT_LONG_MASK = 48; // 0x30
+ field public static final int SCREENLAYOUT_LONG_NO = 16; // 0x10
+ field public static final int SCREENLAYOUT_LONG_UNDEFINED = 0; // 0x0
+ field public static final int SCREENLAYOUT_LONG_YES = 32; // 0x20
+ field public static final int SCREENLAYOUT_ROUND_MASK = 768; // 0x300
+ field public static final int SCREENLAYOUT_ROUND_NO = 256; // 0x100
+ field public static final int SCREENLAYOUT_ROUND_UNDEFINED = 0; // 0x0
+ field public static final int SCREENLAYOUT_ROUND_YES = 512; // 0x200
+ field public static final int SCREENLAYOUT_SIZE_LARGE = 3; // 0x3
+ field public static final int SCREENLAYOUT_SIZE_MASK = 15; // 0xf
+ field public static final int SCREENLAYOUT_SIZE_NORMAL = 2; // 0x2
+ field public static final int SCREENLAYOUT_SIZE_SMALL = 1; // 0x1
+ field public static final int SCREENLAYOUT_SIZE_UNDEFINED = 0; // 0x0
+ field public static final int SCREENLAYOUT_SIZE_XLARGE = 4; // 0x4
+ field public static final int SCREENLAYOUT_UNDEFINED = 0; // 0x0
+ field public static final int SCREEN_HEIGHT_DP_UNDEFINED = 0; // 0x0
+ field public static final int SCREEN_WIDTH_DP_UNDEFINED = 0; // 0x0
+ field public static final int SMALLEST_SCREEN_WIDTH_DP_UNDEFINED = 0; // 0x0
+ field public static final int TOUCHSCREEN_FINGER = 3; // 0x3
+ field public static final int TOUCHSCREEN_NOTOUCH = 1; // 0x1
+ field public static final deprecated int TOUCHSCREEN_STYLUS = 2; // 0x2
+ field public static final int TOUCHSCREEN_UNDEFINED = 0; // 0x0
+ field public static final int UI_MODE_NIGHT_MASK = 48; // 0x30
+ field public static final int UI_MODE_NIGHT_NO = 16; // 0x10
+ field public static final int UI_MODE_NIGHT_UNDEFINED = 0; // 0x0
+ field public static final int UI_MODE_NIGHT_YES = 32; // 0x20
+ field public static final int UI_MODE_TYPE_APPLIANCE = 5; // 0x5
+ field public static final int UI_MODE_TYPE_CAR = 3; // 0x3
+ field public static final int UI_MODE_TYPE_DESK = 2; // 0x2
+ field public static final int UI_MODE_TYPE_MASK = 15; // 0xf
+ field public static final int UI_MODE_TYPE_NORMAL = 1; // 0x1
+ field public static final int UI_MODE_TYPE_TELEVISION = 4; // 0x4
+ field public static final int UI_MODE_TYPE_UNDEFINED = 0; // 0x0
+ field public static final int UI_MODE_TYPE_WATCH = 6; // 0x6
+ field public int densityDpi;
+ field public float fontScale;
+ field public int hardKeyboardHidden;
+ field public int keyboard;
+ field public int keyboardHidden;
+ field public deprecated java.util.Locale locale;
+ field public int mcc;
+ field public int mnc;
+ field public int navigation;
+ field public int navigationHidden;
+ field public int orientation;
+ field public int screenHeightDp;
+ field public int screenLayout;
+ field public int screenWidthDp;
+ field public int smallestScreenWidthDp;
+ field public int touchscreen;
+ field public int uiMode;
+ }
+
+ public class ObbInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.content.res.ObbInfo> CREATOR;
+ field public static final int OBB_OVERLAY = 1; // 0x1
+ field public java.lang.String filename;
+ field public int flags;
+ field public java.lang.String packageName;
+ field public int version;
+ }
+
+ public class ObbScanner {
+ method public static android.content.res.ObbInfo getObbInfo(java.lang.String) throws java.io.IOException;
+ }
+
+ public class Resources {
+ ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);
+ method public final void finishPreloading();
+ method public final void flushLayoutCache();
+ method public android.content.res.XmlResourceParser getAnimation(int) throws android.content.res.Resources.NotFoundException;
+ method public final android.content.res.AssetManager getAssets();
+ method public boolean getBoolean(int) throws android.content.res.Resources.NotFoundException;
+ method public deprecated int getColor(int) throws android.content.res.Resources.NotFoundException;
+ method public int getColor(int, android.content.res.Resources.Theme) throws android.content.res.Resources.NotFoundException;
+ method public deprecated android.content.res.ColorStateList getColorStateList(int) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.ColorStateList getColorStateList(int, android.content.res.Resources.Theme) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.Configuration getConfiguration();
+ method public float getDimension(int) throws android.content.res.Resources.NotFoundException;
+ method public int getDimensionPixelOffset(int) throws android.content.res.Resources.NotFoundException;
+ method public int getDimensionPixelSize(int) throws android.content.res.Resources.NotFoundException;
+ method public android.util.DisplayMetrics getDisplayMetrics();
+ method public deprecated android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;
+ method public android.graphics.drawable.Drawable getDrawable(int, android.content.res.Resources.Theme) throws android.content.res.Resources.NotFoundException;
+ method public deprecated android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;
+ method public android.graphics.drawable.Drawable getDrawableForDensity(int, int, android.content.res.Resources.Theme);
+ method public float getFraction(int, int, int);
+ method public int getIdentifier(java.lang.String, java.lang.String, java.lang.String);
+ method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;
+ method public int getInteger(int) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.XmlResourceParser getLayout(int) throws android.content.res.Resources.NotFoundException;
+ method public android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getQuantityString(int, int, java.lang.Object...) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getQuantityString(int, int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.CharSequence getQuantityText(int, int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getResourceEntryName(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getResourceName(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getResourcePackageName(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getResourceTypeName(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getString(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String getString(int, java.lang.Object...) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.String[] getStringArray(int) throws android.content.res.Resources.NotFoundException;
+ method public static android.content.res.Resources getSystem();
+ method public java.lang.CharSequence getText(int) throws android.content.res.Resources.NotFoundException;
+ method public java.lang.CharSequence getText(int, java.lang.CharSequence);
+ method public java.lang.CharSequence[] getTextArray(int) throws android.content.res.Resources.NotFoundException;
+ method public void getValue(int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
+ method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
+ method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;
+ method public final android.content.res.Resources.Theme newTheme();
+ method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);
+ method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException;
+ method public java.io.InputStream openRawResource(int) throws android.content.res.Resources.NotFoundException;
+ method public java.io.InputStream openRawResource(int, android.util.TypedValue) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.AssetFileDescriptor openRawResourceFd(int) throws android.content.res.Resources.NotFoundException;
+ method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;
+ method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
+ }
+
+ public static class Resources.NotFoundException extends java.lang.RuntimeException {
+ ctor public Resources.NotFoundException();
+ ctor public Resources.NotFoundException(java.lang.String);
+ ctor public Resources.NotFoundException(java.lang.String, java.lang.Exception);
+ }
+
+ public final class Resources.Theme {
+ method public void applyStyle(int, boolean);
+ method public void dump(int, java.lang.String, java.lang.String);
+ method public int getChangingConfigurations();
+ method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.Resources getResources();
+ method public android.content.res.TypedArray obtainStyledAttributes(int[]);
+ method public android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
+ method public android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[], int, int);
+ method public boolean resolveAttribute(int, android.util.TypedValue, boolean);
+ method public void setTo(android.content.res.Resources.Theme);
+ }
+
+ public class TypedArray {
+ method public boolean getBoolean(int, boolean);
+ method public int getChangingConfigurations();
+ method public int getColor(int, int);
+ method public android.content.res.ColorStateList getColorStateList(int);
+ method public float getDimension(int, float);
+ method public int getDimensionPixelOffset(int, int);
+ method public int getDimensionPixelSize(int, int);
+ method public android.graphics.drawable.Drawable getDrawable(int);
+ method public float getFloat(int, float);
+ method public float getFraction(int, int, int, float);
+ method public int getIndex(int);
+ method public int getIndexCount();
+ method public int getInt(int, int);
+ method public int getInteger(int, int);
+ method public int getLayoutDimension(int, java.lang.String);
+ method public int getLayoutDimension(int, int);
+ method public java.lang.String getNonResourceString(int);
+ method public java.lang.String getPositionDescription();
+ method public int getResourceId(int, int);
+ method public android.content.res.Resources getResources();
+ method public java.lang.String getString(int);
+ method public java.lang.CharSequence getText(int);
+ method public java.lang.CharSequence[] getTextArray(int);
+ method public int getType(int);
+ method public boolean getValue(int, android.util.TypedValue);
+ method public boolean hasValue(int);
+ method public boolean hasValueOrEmpty(int);
+ method public int length();
+ method public android.util.TypedValue peekValue(int);
+ method public void recycle();
+ }
+
+ public abstract interface XmlResourceParser implements android.util.AttributeSet java.lang.AutoCloseable org.xmlpull.v1.XmlPullParser {
+ method public abstract void close();
+ }
+
+}
+
+package android.database {
+
+ public abstract class AbstractCursor implements android.database.CrossProcessCursor {
+ ctor public AbstractCursor();
+ method protected void checkPosition();
+ method public void close();
+ method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
+ method public void deactivate();
+ method public void fillWindow(int, android.database.CursorWindow);
+ method public byte[] getBlob(int);
+ method public int getColumnCount();
+ method public int getColumnIndex(java.lang.String);
+ method public int getColumnIndexOrThrow(java.lang.String);
+ method public java.lang.String getColumnName(int);
+ method public abstract java.lang.String[] getColumnNames();
+ method public abstract int getCount();
+ method public abstract double getDouble(int);
+ method public android.os.Bundle getExtras();
+ method public abstract float getFloat(int);
+ method public abstract int getInt(int);
+ method public abstract long getLong(int);
+ method public android.net.Uri getNotificationUri();
+ method public final int getPosition();
+ method public abstract short getShort(int);
+ method public abstract java.lang.String getString(int);
+ method public int getType(int);
+ method protected deprecated java.lang.Object getUpdatedField(int);
+ method public boolean getWantsAllOnMoveCalls();
+ method public android.database.CursorWindow getWindow();
+ method public final boolean isAfterLast();
+ method public final boolean isBeforeFirst();
+ method public boolean isClosed();
+ method protected deprecated boolean isFieldUpdated(int);
+ method public final boolean isFirst();
+ method public final boolean isLast();
+ method public abstract boolean isNull(int);
+ method public final boolean move(int);
+ method public final boolean moveToFirst();
+ method public final boolean moveToLast();
+ method public final boolean moveToNext();
+ method public final boolean moveToPosition(int);
+ method public final boolean moveToPrevious();
+ method protected void onChange(boolean);
+ method public boolean onMove(int, int);
+ method public void registerContentObserver(android.database.ContentObserver);
+ method public void registerDataSetObserver(android.database.DataSetObserver);
+ method public boolean requery();
+ method public android.os.Bundle respond(android.os.Bundle);
+ method public void setExtras(android.os.Bundle);
+ method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
+ method public void unregisterContentObserver(android.database.ContentObserver);
+ method public void unregisterDataSetObserver(android.database.DataSetObserver);
+ field protected deprecated boolean mClosed;
+ field protected deprecated android.content.ContentResolver mContentResolver;
+ field protected deprecated int mPos;
+ }
+
+ protected static class AbstractCursor.SelfContentObserver extends android.database.ContentObserver {
+ ctor public AbstractCursor.SelfContentObserver(android.database.AbstractCursor);
+ }
+
+ public abstract class AbstractWindowedCursor extends android.database.AbstractCursor {
+ ctor public AbstractWindowedCursor();
+ method public double getDouble(int);
+ method public float getFloat(int);
+ method public int getInt(int);
+ method public long getLong(int);
+ method public short getShort(int);
+ method public java.lang.String getString(int);
+ method public boolean hasWindow();
+ method public deprecated boolean isBlob(int);
+ method public deprecated boolean isFloat(int);
+ method public deprecated boolean isLong(int);
+ method public boolean isNull(int);
+ method public deprecated boolean isString(int);
+ method public void setWindow(android.database.CursorWindow);
+ field protected android.database.CursorWindow mWindow;
+ }
+
+ public final class CharArrayBuffer {
+ ctor public CharArrayBuffer(int);
+ ctor public CharArrayBuffer(char[]);
+ field public char[] data;
+ field public int sizeCopied;
+ }
+
+ public class ContentObservable extends android.database.Observable {
+ ctor public ContentObservable();
+ method public deprecated void dispatchChange(boolean);
+ method public void dispatchChange(boolean, android.net.Uri);
+ method public deprecated void notifyChange(boolean);
+ method public void registerObserver(android.database.ContentObserver);
+ }
+
+ public abstract class ContentObserver {
+ ctor public ContentObserver(android.os.Handler);
+ method public boolean deliverSelfNotifications();
+ method public final deprecated void dispatchChange(boolean);
+ method public final void dispatchChange(boolean, android.net.Uri);
+ method public void onChange(boolean);
+ method public void onChange(boolean, android.net.Uri);
+ }
+
+ public abstract interface CrossProcessCursor implements android.database.Cursor {
+ method public abstract void fillWindow(int, android.database.CursorWindow);
+ method public abstract android.database.CursorWindow getWindow();
+ method public abstract boolean onMove(int, int);
+ }
+
+ public class CrossProcessCursorWrapper extends android.database.CursorWrapper implements android.database.CrossProcessCursor {
+ ctor public CrossProcessCursorWrapper(android.database.Cursor);
+ method public void fillWindow(int, android.database.CursorWindow);
+ method public android.database.CursorWindow getWindow();
+ method public boolean onMove(int, int);
+ }
+
+ public abstract interface Cursor implements java.io.Closeable {
+ method public abstract void close();
+ method public abstract void copyStringToBuffer(int, android.database.CharArrayBuffer);
+ method public abstract deprecated void deactivate();
+ method public abstract byte[] getBlob(int);
+ method public abstract int getColumnCount();
+ method public abstract int getColumnIndex(java.lang.String);
+ method public abstract int getColumnIndexOrThrow(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public abstract java.lang.String getColumnName(int);
+ method public abstract java.lang.String[] getColumnNames();
+ method public abstract int getCount();
+ method public abstract double getDouble(int);
+ method public abstract android.os.Bundle getExtras();
+ method public abstract float getFloat(int);
+ method public abstract int getInt(int);
+ method public abstract long getLong(int);
+ method public abstract android.net.Uri getNotificationUri();
+ method public abstract int getPosition();
+ method public abstract short getShort(int);
+ method public abstract java.lang.String getString(int);
+ method public abstract int getType(int);
+ method public abstract boolean getWantsAllOnMoveCalls();
+ method public abstract boolean isAfterLast();
+ method public abstract boolean isBeforeFirst();
+ method public abstract boolean isClosed();
+ method public abstract boolean isFirst();
+ method public abstract boolean isLast();
+ method public abstract boolean isNull(int);
+ method public abstract boolean move(int);
+ method public abstract boolean moveToFirst();
+ method public abstract boolean moveToLast();
+ method public abstract boolean moveToNext();
+ method public abstract boolean moveToPosition(int);
+ method public abstract boolean moveToPrevious();
+ method public abstract void registerContentObserver(android.database.ContentObserver);
+ method public abstract void registerDataSetObserver(android.database.DataSetObserver);
+ method public abstract deprecated boolean requery();
+ method public abstract android.os.Bundle respond(android.os.Bundle);
+ method public abstract void setExtras(android.os.Bundle);
+ method public abstract void setNotificationUri(android.content.ContentResolver, android.net.Uri);
+ method public abstract void unregisterContentObserver(android.database.ContentObserver);
+ method public abstract void unregisterDataSetObserver(android.database.DataSetObserver);
+ field public static final int FIELD_TYPE_BLOB = 4; // 0x4
+ field public static final int FIELD_TYPE_FLOAT = 2; // 0x2
+ field public static final int FIELD_TYPE_INTEGER = 1; // 0x1
+ field public static final int FIELD_TYPE_NULL = 0; // 0x0
+ field public static final int FIELD_TYPE_STRING = 3; // 0x3
+ }
+
+ public class CursorIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
+ ctor public CursorIndexOutOfBoundsException(int, int);
+ ctor public CursorIndexOutOfBoundsException(java.lang.String);
+ }
+
+ public final class CursorJoiner implements java.lang.Iterable java.util.Iterator {
+ ctor public CursorJoiner(android.database.Cursor, java.lang.String[], android.database.Cursor, java.lang.String[]);
+ method public boolean hasNext();
+ method public java.util.Iterator<android.database.CursorJoiner.Result> iterator();
+ method public android.database.CursorJoiner.Result next();
+ method public void remove();
+ }
+
+ public static final class CursorJoiner.Result extends java.lang.Enum {
+ method public static android.database.CursorJoiner.Result valueOf(java.lang.String);
+ method public static final android.database.CursorJoiner.Result[] values();
+ enum_constant public static final android.database.CursorJoiner.Result BOTH;
+ enum_constant public static final android.database.CursorJoiner.Result LEFT;
+ enum_constant public static final android.database.CursorJoiner.Result RIGHT;
+ }
+
+ public class CursorWindow extends android.database.sqlite.SQLiteClosable implements android.os.Parcelable {
+ ctor public CursorWindow(java.lang.String);
+ ctor public deprecated CursorWindow(boolean);
+ method public boolean allocRow();
+ method public void clear();
+ method public void copyStringToBuffer(int, int, android.database.CharArrayBuffer);
+ method public int describeContents();
+ method public void freeLastRow();
+ method public byte[] getBlob(int, int);
+ method public double getDouble(int, int);
+ method public float getFloat(int, int);
+ method public int getInt(int, int);
+ method public long getLong(int, int);
+ method public int getNumRows();
+ method public short getShort(int, int);
+ method public int getStartPosition();
+ method public java.lang.String getString(int, int);
+ method public int getType(int, int);
+ method public deprecated boolean isBlob(int, int);
+ method public deprecated boolean isFloat(int, int);
+ method public deprecated boolean isLong(int, int);
+ method public deprecated boolean isNull(int, int);
+ method public deprecated boolean isString(int, int);
+ method public static android.database.CursorWindow newFromParcel(android.os.Parcel);
+ method protected void onAllReferencesReleased();
+ method public boolean putBlob(byte[], int, int);
+ method public boolean putDouble(double, int, int);
+ method public boolean putLong(long, int, int);
+ method public boolean putNull(int, int);
+ method public boolean putString(java.lang.String, int, int);
+ method public boolean setNumColumns(int);
+ method public void setStartPosition(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.database.CursorWindow> CREATOR;
+ }
+
+ public class CursorWrapper implements android.database.Cursor {
+ ctor public CursorWrapper(android.database.Cursor);
+ method public void close();
+ method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
+ method public deprecated void deactivate();
+ method public byte[] getBlob(int);
+ method public int getColumnCount();
+ method public int getColumnIndex(java.lang.String);
+ method public int getColumnIndexOrThrow(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public java.lang.String getColumnName(int);
+ method public java.lang.String[] getColumnNames();
+ method public int getCount();
+ method public double getDouble(int);
+ method public android.os.Bundle getExtras();
+ method public float getFloat(int);
+ method public int getInt(int);
+ method public long getLong(int);
+ method public android.net.Uri getNotificationUri();
+ method public int getPosition();
+ method public short getShort(int);
+ method public java.lang.String getString(int);
+ method public int getType(int);
+ method public boolean getWantsAllOnMoveCalls();
+ method public android.database.Cursor getWrappedCursor();
+ method public boolean isAfterLast();
+ method public boolean isBeforeFirst();
+ method public boolean isClosed();
+ method public boolean isFirst();
+ method public boolean isLast();
+ method public boolean isNull(int);
+ method public boolean move(int);
+ method public boolean moveToFirst();
+ method public boolean moveToLast();
+ method public boolean moveToNext();
+ method public boolean moveToPosition(int);
+ method public boolean moveToPrevious();
+ method public void registerContentObserver(android.database.ContentObserver);
+ method public void registerDataSetObserver(android.database.DataSetObserver);
+ method public deprecated boolean requery();
+ method public android.os.Bundle respond(android.os.Bundle);
+ method public void setExtras(android.os.Bundle);
+ method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
+ method public void unregisterContentObserver(android.database.ContentObserver);
+ method public void unregisterDataSetObserver(android.database.DataSetObserver);
+ }
+
+ public class DataSetObservable extends android.database.Observable {
+ ctor public DataSetObservable();
+ method public void notifyChanged();
+ method public void notifyInvalidated();
+ }
+
+ public abstract class DataSetObserver {
+ ctor public DataSetObserver();
+ method public void onChanged();
+ method public void onInvalidated();
+ }
+
+ public abstract interface DatabaseErrorHandler {
+ method public abstract void onCorruption(android.database.sqlite.SQLiteDatabase);
+ }
+
+ public class DatabaseUtils {
+ ctor public DatabaseUtils();
+ method public static void appendEscapedSQLString(java.lang.StringBuilder, java.lang.String);
+ method public static java.lang.String[] appendSelectionArgs(java.lang.String[], java.lang.String[]);
+ method public static final void appendValueToSql(java.lang.StringBuilder, java.lang.Object);
+ method public static void bindObjectToProgram(android.database.sqlite.SQLiteProgram, int, java.lang.Object);
+ method public static android.os.ParcelFileDescriptor blobFileDescriptorForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[]);
+ method public static android.os.ParcelFileDescriptor blobFileDescriptorForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[]);
+ method public static java.lang.String concatenateWhere(java.lang.String, java.lang.String);
+ method public static void createDbFromSqlStatements(android.content.Context, java.lang.String, int, java.lang.String);
+ method public static void cursorDoubleToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String);
+ method public static void cursorDoubleToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String);
+ method public static void cursorDoubleToCursorValues(android.database.Cursor, java.lang.String, android.content.ContentValues);
+ method public static void cursorFloatToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String);
+ method public static void cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues);
+ method public static void cursorIntToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String);
+ method public static void cursorIntToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String);
+ method public static void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues);
+ method public static void cursorLongToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String);
+ method public static void cursorLongToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String);
+ method public static void cursorRowToContentValues(android.database.Cursor, android.content.ContentValues);
+ method public static void cursorShortToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String);
+ method public static void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues);
+ method public static void cursorStringToContentValues(android.database.Cursor, java.lang.String, android.content.ContentValues, java.lang.String);
+ method public static void cursorStringToContentValuesIfPresent(android.database.Cursor, android.content.ContentValues, java.lang.String);
+ method public static void cursorStringToInsertHelper(android.database.Cursor, java.lang.String, android.database.DatabaseUtils.InsertHelper, int);
+ method public static void dumpCurrentRow(android.database.Cursor);
+ method public static void dumpCurrentRow(android.database.Cursor, java.io.PrintStream);
+ method public static void dumpCurrentRow(android.database.Cursor, java.lang.StringBuilder);
+ method public static java.lang.String dumpCurrentRowToString(android.database.Cursor);
+ method public static void dumpCursor(android.database.Cursor);
+ method public static void dumpCursor(android.database.Cursor, java.io.PrintStream);
+ method public static void dumpCursor(android.database.Cursor, java.lang.StringBuilder);
+ method public static java.lang.String dumpCursorToString(android.database.Cursor);
+ method public static java.lang.String getCollationKey(java.lang.String);
+ method public static java.lang.String getHexCollationKey(java.lang.String);
+ method public static int getSqlStatementType(java.lang.String);
+ method public static long longForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[]);
+ method public static long longForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[]);
+ method public static long queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String);
+ method public static long queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String);
+ method public static long queryNumEntries(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String, java.lang.String[]);
+ method public static final void readExceptionFromParcel(android.os.Parcel);
+ method public static void readExceptionWithFileNotFoundExceptionFromParcel(android.os.Parcel) throws java.io.FileNotFoundException;
+ method public static void readExceptionWithOperationApplicationExceptionFromParcel(android.os.Parcel) throws android.content.OperationApplicationException;
+ method public static java.lang.String sqlEscapeString(java.lang.String);
+ method public static java.lang.String stringForQuery(android.database.sqlite.SQLiteDatabase, java.lang.String, java.lang.String[]);
+ method public static java.lang.String stringForQuery(android.database.sqlite.SQLiteStatement, java.lang.String[]);
+ method public static final void writeExceptionToParcel(android.os.Parcel, java.lang.Exception);
+ field public static final int STATEMENT_ABORT = 6; // 0x6
+ field public static final int STATEMENT_ATTACH = 3; // 0x3
+ field public static final int STATEMENT_BEGIN = 4; // 0x4
+ field public static final int STATEMENT_COMMIT = 5; // 0x5
+ field public static final int STATEMENT_DDL = 8; // 0x8
+ field public static final int STATEMENT_OTHER = 99; // 0x63
+ field public static final int STATEMENT_PRAGMA = 7; // 0x7
+ field public static final int STATEMENT_SELECT = 1; // 0x1
+ field public static final int STATEMENT_UNPREPARED = 9; // 0x9
+ field public static final int STATEMENT_UPDATE = 2; // 0x2
+ }
+
+ public static deprecated class DatabaseUtils.InsertHelper {
+ ctor public DatabaseUtils.InsertHelper(android.database.sqlite.SQLiteDatabase, java.lang.String);
+ method public void bind(int, double);
+ method public void bind(int, float);
+ method public void bind(int, long);
+ method public void bind(int, int);
+ method public void bind(int, boolean);
+ method public void bind(int, byte[]);
+ method public void bind(int, java.lang.String);
+ method public void bindNull(int);
+ method public void close();
+ method public long execute();
+ method public int getColumnIndex(java.lang.String);
+ method public long insert(android.content.ContentValues);
+ method public void prepareForInsert();
+ method public void prepareForReplace();
+ method public long replace(android.content.ContentValues);
+ }
+
+ public final class DefaultDatabaseErrorHandler implements android.database.DatabaseErrorHandler {
+ ctor public DefaultDatabaseErrorHandler();
+ method public void onCorruption(android.database.sqlite.SQLiteDatabase);
+ }
+
+ public class MatrixCursor extends android.database.AbstractCursor {
+ ctor public MatrixCursor(java.lang.String[], int);
+ ctor public MatrixCursor(java.lang.String[]);
+ method public void addRow(java.lang.Object[]);
+ method public void addRow(java.lang.Iterable<?>);
+ method public java.lang.String[] getColumnNames();
+ method public int getCount();
+ method public double getDouble(int);
+ method public float getFloat(int);
+ method public int getInt(int);
+ method public long getLong(int);
+ method public short getShort(int);
+ method public java.lang.String getString(int);
+ method public boolean isNull(int);
+ method public android.database.MatrixCursor.RowBuilder newRow();
+ }
+
+ public class MatrixCursor.RowBuilder {
+ method public android.database.MatrixCursor.RowBuilder add(java.lang.Object);
+ method public android.database.MatrixCursor.RowBuilder add(java.lang.String, java.lang.Object);
+ }
+
+ public class MergeCursor extends android.database.AbstractCursor {
+ ctor public MergeCursor(android.database.Cursor[]);
+ method public java.lang.String[] getColumnNames();
+ method public int getCount();
+ method public double getDouble(int);
+ method public float getFloat(int);
+ method public int getInt(int);
+ method public long getLong(int);
+ method public short getShort(int);
+ method public java.lang.String getString(int);
+ method public boolean isNull(int);
+ }
+
+ public abstract class Observable {
+ ctor public Observable();
+ method public void registerObserver(T);
+ method public void unregisterAll();
+ method public void unregisterObserver(T);
+ field protected final java.util.ArrayList<T> mObservers;
+ }
+
+ public class SQLException extends java.lang.RuntimeException {
+ ctor public SQLException();
+ ctor public SQLException(java.lang.String);
+ ctor public SQLException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class StaleDataException extends java.lang.RuntimeException {
+ ctor public StaleDataException();
+ ctor public StaleDataException(java.lang.String);
+ }
+
+}
+
+package android.database.sqlite {
+
+ public class SQLiteAbortException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteAbortException();
+ ctor public SQLiteAbortException(java.lang.String);
+ }
+
+ public class SQLiteAccessPermException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteAccessPermException();
+ ctor public SQLiteAccessPermException(java.lang.String);
+ }
+
+ public class SQLiteBindOrColumnIndexOutOfRangeException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteBindOrColumnIndexOutOfRangeException();
+ ctor public SQLiteBindOrColumnIndexOutOfRangeException(java.lang.String);
+ }
+
+ public class SQLiteBlobTooBigException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteBlobTooBigException();
+ ctor public SQLiteBlobTooBigException(java.lang.String);
+ }
+
+ public class SQLiteCantOpenDatabaseException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteCantOpenDatabaseException();
+ ctor public SQLiteCantOpenDatabaseException(java.lang.String);
+ }
+
+ public abstract class SQLiteClosable implements java.io.Closeable {
+ ctor public SQLiteClosable();
+ method public void acquireReference();
+ method public void close();
+ method protected abstract void onAllReferencesReleased();
+ method protected deprecated void onAllReferencesReleasedFromContainer();
+ method public void releaseReference();
+ method public deprecated void releaseReferenceFromContainer();
+ }
+
+ public class SQLiteConstraintException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteConstraintException();
+ ctor public SQLiteConstraintException(java.lang.String);
+ }
+
+ public class SQLiteCursor extends android.database.AbstractWindowedCursor {
+ ctor public deprecated SQLiteCursor(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery);
+ ctor public SQLiteCursor(android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery);
+ method public java.lang.String[] getColumnNames();
+ method public int getCount();
+ method public android.database.sqlite.SQLiteDatabase getDatabase();
+ method public void setSelectionArguments(java.lang.String[]);
+ }
+
+ public abstract interface SQLiteCursorDriver {
+ method public abstract void cursorClosed();
+ method public abstract void cursorDeactivated();
+ method public abstract void cursorRequeried(android.database.Cursor);
+ method public abstract android.database.Cursor query(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String[]);
+ method public abstract void setBindArguments(java.lang.String[]);
+ }
+
+ public final class SQLiteDatabase extends android.database.sqlite.SQLiteClosable {
+ method public void beginTransaction();
+ method public void beginTransactionNonExclusive();
+ method public void beginTransactionWithListener(android.database.sqlite.SQLiteTransactionListener);
+ method public void beginTransactionWithListenerNonExclusive(android.database.sqlite.SQLiteTransactionListener);
+ method public android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) throws android.database.SQLException;
+ method public static android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public int delete(java.lang.String, java.lang.String, java.lang.String[]);
+ method public static boolean deleteDatabase(java.io.File);
+ method public void disableWriteAheadLogging();
+ method public boolean enableWriteAheadLogging();
+ method public void endTransaction();
+ method public void execSQL(java.lang.String) throws android.database.SQLException;
+ method public void execSQL(java.lang.String, java.lang.Object[]) throws android.database.SQLException;
+ method public static java.lang.String findEditTable(java.lang.String);
+ method public java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttachedDbs();
+ method public long getMaximumSize();
+ method public long getPageSize();
+ method public final java.lang.String getPath();
+ method public deprecated java.util.Map<java.lang.String, java.lang.String> getSyncedTables();
+ method public int getVersion();
+ method public boolean inTransaction();
+ method public long insert(java.lang.String, java.lang.String, android.content.ContentValues);
+ method public long insertOrThrow(java.lang.String, java.lang.String, android.content.ContentValues) throws android.database.SQLException;
+ method public long insertWithOnConflict(java.lang.String, java.lang.String, android.content.ContentValues, int);
+ method public boolean isDatabaseIntegrityOk();
+ method public boolean isDbLockedByCurrentThread();
+ method public deprecated boolean isDbLockedByOtherThreads();
+ method public boolean isOpen();
+ method public boolean isReadOnly();
+ method public boolean isWriteAheadLoggingEnabled();
+ method public deprecated void markTableSyncable(java.lang.String, java.lang.String);
+ method public deprecated void markTableSyncable(java.lang.String, java.lang.String, java.lang.String);
+ method public boolean needUpgrade(int);
+ method protected void onAllReferencesReleased();
+ method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int);
+ method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler);
+ method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
+ method public android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public android.database.Cursor query(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal);
+ method public android.database.Cursor query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String);
+ method public android.database.Cursor query(java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public android.database.Cursor queryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal);
+ method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[]);
+ method public android.database.Cursor rawQuery(java.lang.String, java.lang.String[], android.os.CancellationSignal);
+ method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String);
+ method public android.database.Cursor rawQueryWithFactory(android.database.sqlite.SQLiteDatabase.CursorFactory, java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);
+ method public static int releaseMemory();
+ method public long replace(java.lang.String, java.lang.String, android.content.ContentValues);
+ method public long replaceOrThrow(java.lang.String, java.lang.String, android.content.ContentValues) throws android.database.SQLException;
+ method public void setForeignKeyConstraintsEnabled(boolean);
+ method public void setLocale(java.util.Locale);
+ method public deprecated void setLockingEnabled(boolean);
+ method public void setMaxSqlCacheSize(int);
+ method public long setMaximumSize(long);
+ method public void setPageSize(long);
+ method public void setTransactionSuccessful();
+ method public void setVersion(int);
+ method public int update(java.lang.String, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ method public int updateWithOnConflict(java.lang.String, android.content.ContentValues, java.lang.String, java.lang.String[], int);
+ method public deprecated boolean yieldIfContended();
+ method public boolean yieldIfContendedSafely();
+ method public boolean yieldIfContendedSafely(long);
+ field public static final int CONFLICT_ABORT = 2; // 0x2
+ field public static final int CONFLICT_FAIL = 3; // 0x3
+ field public static final int CONFLICT_IGNORE = 4; // 0x4
+ field public static final int CONFLICT_NONE = 0; // 0x0
+ field public static final int CONFLICT_REPLACE = 5; // 0x5
+ field public static final int CONFLICT_ROLLBACK = 1; // 0x1
+ field public static final int CREATE_IF_NECESSARY = 268435456; // 0x10000000
+ field public static final int ENABLE_WRITE_AHEAD_LOGGING = 536870912; // 0x20000000
+ field public static final int MAX_SQL_CACHE_SIZE = 100; // 0x64
+ field public static final int NO_LOCALIZED_COLLATORS = 16; // 0x10
+ field public static final int OPEN_READONLY = 1; // 0x1
+ field public static final int OPEN_READWRITE = 0; // 0x0
+ field public static final int SQLITE_MAX_LIKE_PATTERN_LENGTH = 50000; // 0xc350
+ }
+
+ public static abstract interface SQLiteDatabase.CursorFactory {
+ method public abstract android.database.Cursor newCursor(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery);
+ }
+
+ public class SQLiteDatabaseCorruptException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteDatabaseCorruptException();
+ ctor public SQLiteDatabaseCorruptException(java.lang.String);
+ }
+
+ public class SQLiteDatabaseLockedException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteDatabaseLockedException();
+ ctor public SQLiteDatabaseLockedException(java.lang.String);
+ }
+
+ public class SQLiteDatatypeMismatchException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteDatatypeMismatchException();
+ ctor public SQLiteDatatypeMismatchException(java.lang.String);
+ }
+
+ public class SQLiteDiskIOException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteDiskIOException();
+ ctor public SQLiteDiskIOException(java.lang.String);
+ }
+
+ public class SQLiteDoneException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteDoneException();
+ ctor public SQLiteDoneException(java.lang.String);
+ }
+
+ public class SQLiteException extends android.database.SQLException {
+ ctor public SQLiteException();
+ ctor public SQLiteException(java.lang.String);
+ ctor public SQLiteException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class SQLiteFullException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteFullException();
+ ctor public SQLiteFullException(java.lang.String);
+ }
+
+ public class SQLiteMisuseException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteMisuseException();
+ ctor public SQLiteMisuseException(java.lang.String);
+ }
+
+ public abstract class SQLiteOpenHelper {
+ ctor public SQLiteOpenHelper(android.content.Context, java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int);
+ ctor public SQLiteOpenHelper(android.content.Context, java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler);
+ method public synchronized void close();
+ method public java.lang.String getDatabaseName();
+ method public android.database.sqlite.SQLiteDatabase getReadableDatabase();
+ method public android.database.sqlite.SQLiteDatabase getWritableDatabase();
+ method public void onConfigure(android.database.sqlite.SQLiteDatabase);
+ method public abstract void onCreate(android.database.sqlite.SQLiteDatabase);
+ method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int);
+ method public void onOpen(android.database.sqlite.SQLiteDatabase);
+ method public abstract void onUpgrade(android.database.sqlite.SQLiteDatabase, int, int);
+ method public void setWriteAheadLoggingEnabled(boolean);
+ }
+
+ public class SQLiteOutOfMemoryException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteOutOfMemoryException();
+ ctor public SQLiteOutOfMemoryException(java.lang.String);
+ }
+
+ public abstract class SQLiteProgram extends android.database.sqlite.SQLiteClosable {
+ method public void bindAllArgsAsStrings(java.lang.String[]);
+ method public void bindBlob(int, byte[]);
+ method public void bindDouble(int, double);
+ method public void bindLong(int, long);
+ method public void bindNull(int);
+ method public void bindString(int, java.lang.String);
+ method public void clearBindings();
+ method public final deprecated int getUniqueId();
+ method protected void onAllReferencesReleased();
+ }
+
+ public final class SQLiteQuery extends android.database.sqlite.SQLiteProgram {
+ }
+
+ public class SQLiteQueryBuilder {
+ ctor public SQLiteQueryBuilder();
+ method public static void appendColumns(java.lang.StringBuilder, java.lang.String[]);
+ method public void appendWhere(java.lang.CharSequence);
+ method public void appendWhereEscapeString(java.lang.String);
+ method public java.lang.String buildQuery(java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public deprecated java.lang.String buildQuery(java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.lang.String buildQueryString(boolean, java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String buildUnionQuery(java.lang.String[], java.lang.String, java.lang.String);
+ method public java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set<java.lang.String>, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public deprecated java.lang.String buildUnionSubQuery(java.lang.String, java.lang.String[], java.util.Set<java.lang.String>, int, java.lang.String, java.lang.String, java.lang.String[], java.lang.String, java.lang.String);
+ method public java.lang.String getTables();
+ method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String);
+ method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, java.lang.String, java.lang.String, java.lang.String, android.os.CancellationSignal);
+ method public void setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public void setDistinct(boolean);
+ method public void setProjectionMap(java.util.Map<java.lang.String, java.lang.String>);
+ method public void setStrict(boolean);
+ method public void setTables(java.lang.String);
+ }
+
+ public class SQLiteReadOnlyDatabaseException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteReadOnlyDatabaseException();
+ ctor public SQLiteReadOnlyDatabaseException(java.lang.String);
+ }
+
+ public final class SQLiteStatement extends android.database.sqlite.SQLiteProgram {
+ method public void execute();
+ method public long executeInsert();
+ method public int executeUpdateDelete();
+ method public android.os.ParcelFileDescriptor simpleQueryForBlobFileDescriptor();
+ method public long simpleQueryForLong();
+ method public java.lang.String simpleQueryForString();
+ }
+
+ public class SQLiteTableLockedException extends android.database.sqlite.SQLiteException {
+ ctor public SQLiteTableLockedException();
+ ctor public SQLiteTableLockedException(java.lang.String);
+ }
+
+ public abstract interface SQLiteTransactionListener {
+ method public abstract void onBegin();
+ method public abstract void onCommit();
+ method public abstract void onRollback();
+ }
+
+}
+
+package android.drm {
+
+ public class DrmConvertedStatus {
+ ctor public DrmConvertedStatus(int, byte[], int);
+ field public static final int STATUS_ERROR = 3; // 0x3
+ field public static final int STATUS_INPUTDATA_ERROR = 2; // 0x2
+ field public static final int STATUS_OK = 1; // 0x1
+ field public final byte[] convertedData;
+ field public final int offset;
+ field public final int statusCode;
+ }
+
+ public class DrmErrorEvent extends android.drm.DrmEvent {
+ ctor public DrmErrorEvent(int, int, java.lang.String);
+ ctor public DrmErrorEvent(int, int, java.lang.String, java.util.HashMap<java.lang.String, java.lang.Object>);
+ field public static final int TYPE_ACQUIRE_DRM_INFO_FAILED = 2008; // 0x7d8
+ field public static final int TYPE_NOT_SUPPORTED = 2003; // 0x7d3
+ field public static final int TYPE_NO_INTERNET_CONNECTION = 2005; // 0x7d5
+ field public static final int TYPE_OUT_OF_MEMORY = 2004; // 0x7d4
+ field public static final int TYPE_PROCESS_DRM_INFO_FAILED = 2006; // 0x7d6
+ field public static final int TYPE_REMOVE_ALL_RIGHTS_FAILED = 2007; // 0x7d7
+ field public static final int TYPE_RIGHTS_NOT_INSTALLED = 2001; // 0x7d1
+ field public static final int TYPE_RIGHTS_RENEWAL_NOT_ALLOWED = 2002; // 0x7d2
+ }
+
+ public class DrmEvent {
+ ctor protected DrmEvent(int, int, java.lang.String, java.util.HashMap<java.lang.String, java.lang.Object>);
+ ctor protected DrmEvent(int, int, java.lang.String);
+ method public java.lang.Object getAttribute(java.lang.String);
+ method public java.lang.String getMessage();
+ method public int getType();
+ method public int getUniqueId();
+ field public static final java.lang.String DRM_INFO_OBJECT = "drm_info_object";
+ field public static final java.lang.String DRM_INFO_STATUS_OBJECT = "drm_info_status_object";
+ field public static final int TYPE_ALL_RIGHTS_REMOVED = 1001; // 0x3e9
+ field public static final int TYPE_DRM_INFO_PROCESSED = 1002; // 0x3ea
+ }
+
+ public class DrmInfo {
+ ctor public DrmInfo(int, byte[], java.lang.String);
+ ctor public DrmInfo(int, java.lang.String, java.lang.String);
+ method public java.lang.Object get(java.lang.String);
+ method public byte[] getData();
+ method public int getInfoType();
+ method public java.lang.String getMimeType();
+ method public java.util.Iterator<java.lang.Object> iterator();
+ method public java.util.Iterator<java.lang.String> keyIterator();
+ method public void put(java.lang.String, java.lang.Object);
+ }
+
+ public class DrmInfoEvent extends android.drm.DrmEvent {
+ ctor public DrmInfoEvent(int, int, java.lang.String);
+ ctor public DrmInfoEvent(int, int, java.lang.String, java.util.HashMap<java.lang.String, java.lang.Object>);
+ field public static final int TYPE_ACCOUNT_ALREADY_REGISTERED = 5; // 0x5
+ field public static final int TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT = 1; // 0x1
+ field public static final int TYPE_REMOVE_RIGHTS = 2; // 0x2
+ field public static final int TYPE_RIGHTS_INSTALLED = 3; // 0x3
+ field public static final int TYPE_RIGHTS_REMOVED = 6; // 0x6
+ field public static final int TYPE_WAIT_FOR_RIGHTS = 4; // 0x4
+ }
+
+ public class DrmInfoRequest {
+ ctor public DrmInfoRequest(int, java.lang.String);
+ method public java.lang.Object get(java.lang.String);
+ method public int getInfoType();
+ method public java.lang.String getMimeType();
+ method public java.util.Iterator<java.lang.Object> iterator();
+ method public java.util.Iterator<java.lang.String> keyIterator();
+ method public void put(java.lang.String, java.lang.Object);
+ field public static final java.lang.String ACCOUNT_ID = "account_id";
+ field public static final java.lang.String SUBSCRIPTION_ID = "subscription_id";
+ field public static final int TYPE_REGISTRATION_INFO = 1; // 0x1
+ field public static final int TYPE_RIGHTS_ACQUISITION_INFO = 3; // 0x3
+ field public static final int TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO = 4; // 0x4
+ field public static final int TYPE_UNREGISTRATION_INFO = 2; // 0x2
+ }
+
+ public class DrmInfoStatus {
+ ctor public DrmInfoStatus(int, int, android.drm.ProcessedData, java.lang.String);
+ field public static final int STATUS_ERROR = 2; // 0x2
+ field public static final int STATUS_OK = 1; // 0x1
+ field public final android.drm.ProcessedData data;
+ field public final int infoType;
+ field public final java.lang.String mimeType;
+ field public final int statusCode;
+ }
+
+ public class DrmManagerClient {
+ ctor public DrmManagerClient(android.content.Context);
+ method public android.drm.DrmInfo acquireDrmInfo(android.drm.DrmInfoRequest);
+ method public int acquireRights(android.drm.DrmInfoRequest);
+ method public boolean canHandle(java.lang.String, java.lang.String);
+ method public boolean canHandle(android.net.Uri, java.lang.String);
+ method public int checkRightsStatus(java.lang.String);
+ method public int checkRightsStatus(android.net.Uri);
+ method public int checkRightsStatus(java.lang.String, int);
+ method public int checkRightsStatus(android.net.Uri, int);
+ method public android.drm.DrmConvertedStatus closeConvertSession(int);
+ method public android.drm.DrmConvertedStatus convertData(int, byte[]);
+ method public java.lang.String[] getAvailableDrmEngines();
+ method public android.content.ContentValues getConstraints(java.lang.String, int);
+ method public android.content.ContentValues getConstraints(android.net.Uri, int);
+ method public int getDrmObjectType(java.lang.String, java.lang.String);
+ method public int getDrmObjectType(android.net.Uri, java.lang.String);
+ method public android.content.ContentValues getMetadata(java.lang.String);
+ method public android.content.ContentValues getMetadata(android.net.Uri);
+ method public java.lang.String getOriginalMimeType(java.lang.String);
+ method public java.lang.String getOriginalMimeType(android.net.Uri);
+ method public int openConvertSession(java.lang.String);
+ method public int processDrmInfo(android.drm.DrmInfo);
+ method public void release();
+ method public int removeAllRights();
+ method public int removeRights(java.lang.String);
+ method public int removeRights(android.net.Uri);
+ method public int saveRights(android.drm.DrmRights, java.lang.String, java.lang.String) throws java.io.IOException;
+ method public synchronized void setOnErrorListener(android.drm.DrmManagerClient.OnErrorListener);
+ method public synchronized void setOnEventListener(android.drm.DrmManagerClient.OnEventListener);
+ method public synchronized void setOnInfoListener(android.drm.DrmManagerClient.OnInfoListener);
+ field public static final int ERROR_NONE = 0; // 0x0
+ field public static final int ERROR_UNKNOWN = -2000; // 0xfffff830
+ }
+
+ public static abstract interface DrmManagerClient.OnErrorListener {
+ method public abstract void onError(android.drm.DrmManagerClient, android.drm.DrmErrorEvent);
+ }
+
+ public static abstract interface DrmManagerClient.OnEventListener {
+ method public abstract void onEvent(android.drm.DrmManagerClient, android.drm.DrmEvent);
+ }
+
+ public static abstract interface DrmManagerClient.OnInfoListener {
+ method public abstract void onInfo(android.drm.DrmManagerClient, android.drm.DrmInfoEvent);
+ }
+
+ public class DrmRights {
+ ctor public DrmRights(java.lang.String, java.lang.String);
+ ctor public DrmRights(java.lang.String, java.lang.String, java.lang.String);
+ ctor public DrmRights(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ ctor public DrmRights(java.io.File, java.lang.String);
+ ctor public DrmRights(android.drm.ProcessedData, java.lang.String);
+ method public java.lang.String getAccountId();
+ method public byte[] getData();
+ method public java.lang.String getMimeType();
+ method public java.lang.String getSubscriptionId();
+ }
+
+ public class DrmStore {
+ ctor public deprecated DrmStore();
+ }
+
+ public static class DrmStore.Action {
+ ctor public deprecated DrmStore.Action();
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int DISPLAY = 7; // 0x7
+ field public static final int EXECUTE = 6; // 0x6
+ field public static final int OUTPUT = 4; // 0x4
+ field public static final int PLAY = 1; // 0x1
+ field public static final int PREVIEW = 5; // 0x5
+ field public static final int RINGTONE = 2; // 0x2
+ field public static final int TRANSFER = 3; // 0x3
+ }
+
+ public static abstract interface DrmStore.ConstraintsColumns {
+ field public static final java.lang.String EXTENDED_METADATA = "extended_metadata";
+ field public static final java.lang.String LICENSE_AVAILABLE_TIME = "license_available_time";
+ field public static final java.lang.String LICENSE_EXPIRY_TIME = "license_expiry_time";
+ field public static final java.lang.String LICENSE_START_TIME = "license_start_time";
+ field public static final java.lang.String MAX_REPEAT_COUNT = "max_repeat_count";
+ field public static final java.lang.String REMAINING_REPEAT_COUNT = "remaining_repeat_count";
+ }
+
+ public static class DrmStore.DrmObjectType {
+ ctor public deprecated DrmStore.DrmObjectType();
+ field public static final int CONTENT = 1; // 0x1
+ field public static final int RIGHTS_OBJECT = 2; // 0x2
+ field public static final int TRIGGER_OBJECT = 3; // 0x3
+ field public static final int UNKNOWN = 0; // 0x0
+ }
+
+ public static class DrmStore.Playback {
+ ctor public deprecated DrmStore.Playback();
+ field public static final int PAUSE = 2; // 0x2
+ field public static final int RESUME = 3; // 0x3
+ field public static final int START = 0; // 0x0
+ field public static final int STOP = 1; // 0x1
+ }
+
+ public static class DrmStore.RightsStatus {
+ ctor public deprecated DrmStore.RightsStatus();
+ field public static final int RIGHTS_EXPIRED = 2; // 0x2
+ field public static final int RIGHTS_INVALID = 1; // 0x1
+ field public static final int RIGHTS_NOT_ACQUIRED = 3; // 0x3
+ field public static final int RIGHTS_VALID = 0; // 0x0
+ }
+
+ public class DrmSupportInfo {
+ ctor public DrmSupportInfo();
+ method public void addFileSuffix(java.lang.String);
+ method public void addMimeType(java.lang.String);
+ method public deprecated java.lang.String getDescriprition();
+ method public java.lang.String getDescription();
+ method public java.util.Iterator<java.lang.String> getFileSuffixIterator();
+ method public java.util.Iterator<java.lang.String> getMimeTypeIterator();
+ method public void setDescription(java.lang.String);
+ }
+
+ public class DrmUtils {
+ ctor public DrmUtils();
+ method public static android.drm.DrmUtils.ExtendedMetadataParser getExtendedMetadataParser(byte[]);
+ }
+
+ public static class DrmUtils.ExtendedMetadataParser {
+ method public java.lang.String get(java.lang.String);
+ method public java.util.Iterator<java.lang.String> iterator();
+ method public java.util.Iterator<java.lang.String> keyIterator();
+ }
+
+ public class ProcessedData {
+ method public java.lang.String getAccountId();
+ method public byte[] getData();
+ method public java.lang.String getSubscriptionId();
+ }
+
+}
+
+package android.gesture {
+
+ public class Gesture implements android.os.Parcelable {
+ ctor public Gesture();
+ method public void addStroke(android.gesture.GestureStroke);
+ method public java.lang.Object clone();
+ method public int describeContents();
+ method public android.graphics.RectF getBoundingBox();
+ method public long getID();
+ method public float getLength();
+ method public java.util.ArrayList<android.gesture.GestureStroke> getStrokes();
+ method public int getStrokesCount();
+ method public android.graphics.Bitmap toBitmap(int, int, int, int, int);
+ method public android.graphics.Bitmap toBitmap(int, int, int, int);
+ method public android.graphics.Path toPath();
+ method public android.graphics.Path toPath(android.graphics.Path);
+ method public android.graphics.Path toPath(int, int, int, int);
+ method public android.graphics.Path toPath(android.graphics.Path, int, int, int, int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.gesture.Gesture> CREATOR;
+ }
+
+ public final class GestureLibraries {
+ method public static android.gesture.GestureLibrary fromFile(java.lang.String);
+ method public static android.gesture.GestureLibrary fromFile(java.io.File);
+ method public static android.gesture.GestureLibrary fromPrivateFile(android.content.Context, java.lang.String);
+ method public static android.gesture.GestureLibrary fromRawResource(android.content.Context, int);
+ }
+
+ public abstract class GestureLibrary {
+ ctor protected GestureLibrary();
+ method public void addGesture(java.lang.String, android.gesture.Gesture);
+ method public java.util.Set<java.lang.String> getGestureEntries();
+ method public java.util.ArrayList<android.gesture.Gesture> getGestures(java.lang.String);
+ method public int getOrientationStyle();
+ method public int getSequenceType();
+ method public boolean isReadOnly();
+ method public abstract boolean load();
+ method public java.util.ArrayList<android.gesture.Prediction> recognize(android.gesture.Gesture);
+ method public void removeEntry(java.lang.String);
+ method public void removeGesture(java.lang.String, android.gesture.Gesture);
+ method public abstract boolean save();
+ method public void setOrientationStyle(int);
+ method public void setSequenceType(int);
+ field protected final android.gesture.GestureStore mStore;
+ }
+
+ public class GestureOverlayView extends android.widget.FrameLayout {
+ ctor public GestureOverlayView(android.content.Context);
+ ctor public GestureOverlayView(android.content.Context, android.util.AttributeSet);
+ ctor public GestureOverlayView(android.content.Context, android.util.AttributeSet, int);
+ ctor public GestureOverlayView(android.content.Context, android.util.AttributeSet, int, int);
+ method public void addOnGestureListener(android.gesture.GestureOverlayView.OnGestureListener);
+ method public void addOnGesturePerformedListener(android.gesture.GestureOverlayView.OnGesturePerformedListener);
+ method public void addOnGesturingListener(android.gesture.GestureOverlayView.OnGesturingListener);
+ method public void cancelClearAnimation();
+ method public void cancelGesture();
+ method public void clear(boolean);
+ method public java.util.ArrayList<android.gesture.GesturePoint> getCurrentStroke();
+ method public long getFadeOffset();
+ method public android.gesture.Gesture getGesture();
+ method public int getGestureColor();
+ method public android.graphics.Path getGesturePath();
+ method public android.graphics.Path getGesturePath(android.graphics.Path);
+ method public float getGestureStrokeAngleThreshold();
+ method public float getGestureStrokeLengthThreshold();
+ method public float getGestureStrokeSquarenessTreshold();
+ method public int getGestureStrokeType();
+ method public float getGestureStrokeWidth();
+ method public int getOrientation();
+ method public int getUncertainGestureColor();
+ method public boolean isEventsInterceptionEnabled();
+ method public boolean isFadeEnabled();
+ method public boolean isGestureVisible();
+ method public boolean isGesturing();
+ method public void removeAllOnGestureListeners();
+ method public void removeAllOnGesturePerformedListeners();
+ method public void removeAllOnGesturingListeners();
+ method public void removeOnGestureListener(android.gesture.GestureOverlayView.OnGestureListener);
+ method public void removeOnGesturePerformedListener(android.gesture.GestureOverlayView.OnGesturePerformedListener);
+ method public void removeOnGesturingListener(android.gesture.GestureOverlayView.OnGesturingListener);
+ method public void setEventsInterceptionEnabled(boolean);
+ method public void setFadeEnabled(boolean);
+ method public void setFadeOffset(long);
+ method public void setGesture(android.gesture.Gesture);
+ method public void setGestureColor(int);
+ method public void setGestureStrokeAngleThreshold(float);
+ method public void setGestureStrokeLengthThreshold(float);
+ method public void setGestureStrokeSquarenessTreshold(float);
+ method public void setGestureStrokeType(int);
+ method public void setGestureStrokeWidth(float);
+ method public void setGestureVisible(boolean);
+ method public void setOrientation(int);
+ method public void setUncertainGestureColor(int);
+ field public static final int GESTURE_STROKE_TYPE_MULTIPLE = 1; // 0x1
+ field public static final int GESTURE_STROKE_TYPE_SINGLE = 0; // 0x0
+ field public static final int ORIENTATION_HORIZONTAL = 0; // 0x0
+ field public static final int ORIENTATION_VERTICAL = 1; // 0x1
+ }
+
+ public static abstract interface GestureOverlayView.OnGestureListener {
+ method public abstract void onGesture(android.gesture.GestureOverlayView, android.view.MotionEvent);
+ method public abstract void onGestureCancelled(android.gesture.GestureOverlayView, android.view.MotionEvent);
+ method public abstract void onGestureEnded(android.gesture.GestureOverlayView, android.view.MotionEvent);
+ method public abstract void onGestureStarted(android.gesture.GestureOverlayView, android.view.MotionEvent);
+ }
+
+ public static abstract interface GestureOverlayView.OnGesturePerformedListener {
+ method public abstract void onGesturePerformed(android.gesture.GestureOverlayView, android.gesture.Gesture);
+ }
+
+ public static abstract interface GestureOverlayView.OnGesturingListener {
+ method public abstract void onGesturingEnded(android.gesture.GestureOverlayView);
+ method public abstract void onGesturingStarted(android.gesture.GestureOverlayView);
+ }
+
+ public class GesturePoint {
+ ctor public GesturePoint(float, float, long);
+ method public java.lang.Object clone();
+ field public final long timestamp;
+ field public final float x;
+ field public final float y;
+ }
+
+ public class GestureStore {
+ ctor public GestureStore();
+ method public void addGesture(java.lang.String, android.gesture.Gesture);
+ method public java.util.Set<java.lang.String> getGestureEntries();
+ method public java.util.ArrayList<android.gesture.Gesture> getGestures(java.lang.String);
+ method public int getOrientationStyle();
+ method public int getSequenceType();
+ method public boolean hasChanged();
+ method public void load(java.io.InputStream) throws java.io.IOException;
+ method public void load(java.io.InputStream, boolean) throws java.io.IOException;
+ method public java.util.ArrayList<android.gesture.Prediction> recognize(android.gesture.Gesture);
+ method public void removeEntry(java.lang.String);
+ method public void removeGesture(java.lang.String, android.gesture.Gesture);
+ method public void save(java.io.OutputStream) throws java.io.IOException;
+ method public void save(java.io.OutputStream, boolean) throws java.io.IOException;
+ method public void setOrientationStyle(int);
+ method public void setSequenceType(int);
+ field public static final int ORIENTATION_INVARIANT = 1; // 0x1
+ field public static final int ORIENTATION_SENSITIVE = 2; // 0x2
+ field public static final int SEQUENCE_INVARIANT = 1; // 0x1
+ field public static final int SEQUENCE_SENSITIVE = 2; // 0x2
+ }
+
+ public class GestureStroke {
+ ctor public GestureStroke(java.util.ArrayList<android.gesture.GesturePoint>);
+ method public void clearPath();
+ method public java.lang.Object clone();
+ method public android.gesture.OrientedBoundingBox computeOrientedBoundingBox();
+ method public android.graphics.Path getPath();
+ method public android.graphics.Path toPath(float, float, int);
+ field public final android.graphics.RectF boundingBox;
+ field public final float length;
+ field public final float[] points;
+ }
+
+ public final class GestureUtils {
+ method public static android.gesture.OrientedBoundingBox computeOrientedBoundingBox(java.util.ArrayList<android.gesture.GesturePoint>);
+ method public static android.gesture.OrientedBoundingBox computeOrientedBoundingBox(float[]);
+ method public static float[] spatialSampling(android.gesture.Gesture, int);
+ method public static float[] spatialSampling(android.gesture.Gesture, int, boolean);
+ method public static float[] temporalSampling(android.gesture.GestureStroke, int);
+ }
+
+ public class OrientedBoundingBox {
+ field public final float centerX;
+ field public final float centerY;
+ field public final float height;
+ field public final float orientation;
+ field public final float squareness;
+ field public final float width;
+ }
+
+ public class Prediction {
+ field public final java.lang.String name;
+ field public double score;
+ }
+
+}
+
+package android.graphics {
+
+ public deprecated class AvoidXfermode extends android.graphics.Xfermode {
+ ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
+ }
+
+ public static final class AvoidXfermode.Mode extends java.lang.Enum {
+ method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
+ method public static final android.graphics.AvoidXfermode.Mode[] values();
+ enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
+ enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
+ }
+
+ public final class Bitmap implements android.os.Parcelable {
+ method public boolean compress(android.graphics.Bitmap.CompressFormat, int, java.io.OutputStream);
+ method public android.graphics.Bitmap copy(android.graphics.Bitmap.Config, boolean);
+ method public void copyPixelsFromBuffer(java.nio.Buffer);
+ method public void copyPixelsToBuffer(java.nio.Buffer);
+ method public static android.graphics.Bitmap createBitmap(android.graphics.Bitmap);
+ method public static android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int);
+ method public static android.graphics.Bitmap createBitmap(android.graphics.Bitmap, int, int, int, int, android.graphics.Matrix, boolean);
+ method public static android.graphics.Bitmap createBitmap(int, int, android.graphics.Bitmap.Config);
+ method public static android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int, int, android.graphics.Bitmap.Config);
+ method public static android.graphics.Bitmap createBitmap(int[], int, int, int, int, android.graphics.Bitmap.Config);
+ method public static android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int[], int, int, int, int, android.graphics.Bitmap.Config);
+ method public static android.graphics.Bitmap createBitmap(int[], int, int, android.graphics.Bitmap.Config);
+ method public static android.graphics.Bitmap createBitmap(android.util.DisplayMetrics, int[], int, int, android.graphics.Bitmap.Config);
+ method public static android.graphics.Bitmap createScaledBitmap(android.graphics.Bitmap, int, int, boolean);
+ method public int describeContents();
+ method public void eraseColor(int);
+ method public android.graphics.Bitmap extractAlpha();
+ method public android.graphics.Bitmap extractAlpha(android.graphics.Paint, int[]);
+ method public final int getAllocationByteCount();
+ method public final int getByteCount();
+ method public final android.graphics.Bitmap.Config getConfig();
+ method public int getDensity();
+ method public int getGenerationId();
+ method public final int getHeight();
+ method public byte[] getNinePatchChunk();
+ method public int getPixel(int, int);
+ method public void getPixels(int[], int, int, int, int, int, int);
+ method public final int getRowBytes();
+ method public int getScaledHeight(android.graphics.Canvas);
+ method public int getScaledHeight(android.util.DisplayMetrics);
+ method public int getScaledHeight(int);
+ method public int getScaledWidth(android.graphics.Canvas);
+ method public int getScaledWidth(android.util.DisplayMetrics);
+ method public int getScaledWidth(int);
+ method public final int getWidth();
+ method public final boolean hasAlpha();
+ method public final boolean hasMipMap();
+ method public final boolean isMutable();
+ method public final boolean isPremultiplied();
+ method public final boolean isRecycled();
+ method public void prepareToDraw();
+ method public void reconfigure(int, int, android.graphics.Bitmap.Config);
+ method public void recycle();
+ method public boolean sameAs(android.graphics.Bitmap);
+ method public void setConfig(android.graphics.Bitmap.Config);
+ method public void setDensity(int);
+ method public void setHasAlpha(boolean);
+ method public final void setHasMipMap(boolean);
+ method public void setHeight(int);
+ method public void setPixel(int, int, int);
+ method public void setPixels(int[], int, int, int, int, int, int);
+ method public final void setPremultiplied(boolean);
+ method public void setWidth(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.Bitmap> CREATOR;
+ field public static final int DENSITY_NONE = 0; // 0x0
+ }
+
+ public static final class Bitmap.CompressFormat extends java.lang.Enum {
+ method public static android.graphics.Bitmap.CompressFormat valueOf(java.lang.String);
+ method public static final android.graphics.Bitmap.CompressFormat[] values();
+ enum_constant public static final android.graphics.Bitmap.CompressFormat JPEG;
+ enum_constant public static final android.graphics.Bitmap.CompressFormat PNG;
+ enum_constant public static final android.graphics.Bitmap.CompressFormat WEBP;
+ }
+
+ public static final class Bitmap.Config extends java.lang.Enum {
+ method public static android.graphics.Bitmap.Config valueOf(java.lang.String);
+ method public static final android.graphics.Bitmap.Config[] values();
+ enum_constant public static final android.graphics.Bitmap.Config ALPHA_8;
+ enum_constant public static final deprecated android.graphics.Bitmap.Config ARGB_4444;
+ enum_constant public static final android.graphics.Bitmap.Config ARGB_8888;
+ enum_constant public static final android.graphics.Bitmap.Config RGB_565;
+ }
+
+ public class BitmapFactory {
+ ctor public BitmapFactory();
+ method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap decodeByteArray(byte[], int, int);
+ method public static android.graphics.Bitmap decodeFile(java.lang.String, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap decodeFile(java.lang.String);
+ method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor, android.graphics.Rect, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor);
+ method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int);
+ method public static android.graphics.Bitmap decodeResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap decodeStream(java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap decodeStream(java.io.InputStream);
+ }
+
+ public static class BitmapFactory.Options {
+ ctor public BitmapFactory.Options();
+ method public void requestCancelDecode();
+ field public android.graphics.Bitmap inBitmap;
+ field public int inDensity;
+ field public boolean inDither;
+ field public deprecated boolean inInputShareable;
+ field public boolean inJustDecodeBounds;
+ field public boolean inMutable;
+ field public boolean inPreferQualityOverSpeed;
+ field public android.graphics.Bitmap.Config inPreferredConfig;
+ field public boolean inPremultiplied;
+ field public deprecated boolean inPurgeable;
+ field public int inSampleSize;
+ field public boolean inScaled;
+ field public int inScreenDensity;
+ field public int inTargetDensity;
+ field public byte[] inTempStorage;
+ field public boolean mCancel;
+ field public int outHeight;
+ field public java.lang.String outMimeType;
+ field public int outWidth;
+ }
+
+ public final class BitmapRegionDecoder {
+ method public android.graphics.Bitmap decodeRegion(android.graphics.Rect, android.graphics.BitmapFactory.Options);
+ method public int getHeight();
+ method public int getWidth();
+ method public final boolean isRecycled();
+ method public static android.graphics.BitmapRegionDecoder newInstance(byte[], int, int, boolean) throws java.io.IOException;
+ method public static android.graphics.BitmapRegionDecoder newInstance(java.io.FileDescriptor, boolean) throws java.io.IOException;
+ method public static android.graphics.BitmapRegionDecoder newInstance(java.io.InputStream, boolean) throws java.io.IOException;
+ method public static android.graphics.BitmapRegionDecoder newInstance(java.lang.String, boolean) throws java.io.IOException;
+ method public void recycle();
+ }
+
+ public class BitmapShader extends android.graphics.Shader {
+ ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
+ }
+
+ public class BlurMaskFilter extends android.graphics.MaskFilter {
+ ctor public BlurMaskFilter(float, android.graphics.BlurMaskFilter.Blur);
+ }
+
+ public static final class BlurMaskFilter.Blur extends java.lang.Enum {
+ method public static android.graphics.BlurMaskFilter.Blur valueOf(java.lang.String);
+ method public static final android.graphics.BlurMaskFilter.Blur[] values();
+ enum_constant public static final android.graphics.BlurMaskFilter.Blur INNER;
+ enum_constant public static final android.graphics.BlurMaskFilter.Blur NORMAL;
+ enum_constant public static final android.graphics.BlurMaskFilter.Blur OUTER;
+ enum_constant public static final android.graphics.BlurMaskFilter.Blur SOLID;
+ }
+
+ public class Camera {
+ ctor public Camera();
+ method public void applyToCanvas(android.graphics.Canvas);
+ method public float dotWithNormal(float, float, float);
+ method public float getLocationX();
+ method public float getLocationY();
+ method public float getLocationZ();
+ method public void getMatrix(android.graphics.Matrix);
+ method public void restore();
+ method public void rotate(float, float, float);
+ method public void rotateX(float);
+ method public void rotateY(float);
+ method public void rotateZ(float);
+ method public void save();
+ method public void setLocation(float, float, float);
+ method public void translate(float, float, float);
+ }
+
+ public class Canvas {
+ ctor public Canvas();
+ ctor public Canvas(android.graphics.Bitmap);
+ method public boolean clipPath(android.graphics.Path, android.graphics.Region.Op);
+ method public boolean clipPath(android.graphics.Path);
+ method public boolean clipRect(android.graphics.RectF, android.graphics.Region.Op);
+ method public boolean clipRect(android.graphics.Rect, android.graphics.Region.Op);
+ method public boolean clipRect(android.graphics.RectF);
+ method public boolean clipRect(android.graphics.Rect);
+ method public boolean clipRect(float, float, float, float, android.graphics.Region.Op);
+ method public boolean clipRect(float, float, float, float);
+ method public boolean clipRect(int, int, int, int);
+ method public deprecated boolean clipRegion(android.graphics.Region, android.graphics.Region.Op);
+ method public deprecated boolean clipRegion(android.graphics.Region);
+ method public void concat(android.graphics.Matrix);
+ method public void drawARGB(int, int, int, int);
+ method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);
+ method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
+ method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);
+ method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);
+ method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
+ method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);
+ method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);
+ method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
+ method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);
+ method public void drawCircle(float, float, float, android.graphics.Paint);
+ method public void drawColor(int);
+ method public void drawColor(int, android.graphics.PorterDuff.Mode);
+ method public void drawLine(float, float, float, float, android.graphics.Paint);
+ method public void drawLines(float[], int, int, android.graphics.Paint);
+ method public void drawLines(float[], android.graphics.Paint);
+ method public void drawOval(android.graphics.RectF, android.graphics.Paint);
+ method public void drawOval(float, float, float, float, android.graphics.Paint);
+ method public void drawPaint(android.graphics.Paint);
+ method public void drawPath(android.graphics.Path, android.graphics.Paint);
+ method public void drawPicture(android.graphics.Picture);
+ method public void drawPicture(android.graphics.Picture, android.graphics.RectF);
+ method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
+ method public void drawPoint(float, float, android.graphics.Paint);
+ method public void drawPoints(float[], int, int, android.graphics.Paint);
+ method public void drawPoints(float[], android.graphics.Paint);
+ method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);
+ method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);
+ method public void drawRGB(int, int, int);
+ method public void drawRect(android.graphics.RectF, android.graphics.Paint);
+ method public void drawRect(android.graphics.Rect, android.graphics.Paint);
+ method public void drawRect(float, float, float, float, android.graphics.Paint);
+ method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);
+ method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
+ method public void drawText(char[], int, int, float, float, android.graphics.Paint);
+ method public void drawText(java.lang.String, float, float, android.graphics.Paint);
+ method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);
+ method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
+ method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);
+ method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);
+ method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);
+ method public void drawTextRun(java.lang.CharSequence, int, int, int, int, float, float, boolean, android.graphics.Paint);
+ method public void drawVertices(android.graphics.Canvas.VertexMode, int, float[], int, float[], int, int[], int, short[], int, int, android.graphics.Paint);
+ method public boolean getClipBounds(android.graphics.Rect);
+ method public final android.graphics.Rect getClipBounds();
+ method public int getDensity();
+ method public android.graphics.DrawFilter getDrawFilter();
+ method public int getHeight();
+ method public deprecated void getMatrix(android.graphics.Matrix);
+ method public final deprecated android.graphics.Matrix getMatrix();
+ method public int getMaximumBitmapHeight();
+ method public int getMaximumBitmapWidth();
+ method public int getSaveCount();
+ method public int getWidth();
+ method public boolean isHardwareAccelerated();
+ method public boolean isOpaque();
+ method public boolean quickReject(android.graphics.RectF, android.graphics.Canvas.EdgeType);
+ method public boolean quickReject(android.graphics.Path, android.graphics.Canvas.EdgeType);
+ method public boolean quickReject(float, float, float, float, android.graphics.Canvas.EdgeType);
+ method public void restore();
+ method public void restoreToCount(int);
+ method public void rotate(float);
+ method public final void rotate(float, float, float);
+ method public int save();
+ method public int save(int);
+ method public int saveLayer(android.graphics.RectF, android.graphics.Paint, int);
+ method public int saveLayer(android.graphics.RectF, android.graphics.Paint);
+ method public int saveLayer(float, float, float, float, android.graphics.Paint, int);
+ method public int saveLayer(float, float, float, float, android.graphics.Paint);
+ method public int saveLayerAlpha(android.graphics.RectF, int, int);
+ method public int saveLayerAlpha(android.graphics.RectF, int);
+ method public int saveLayerAlpha(float, float, float, float, int, int);
+ method public int saveLayerAlpha(float, float, float, float, int);
+ method public void scale(float, float);
+ method public final void scale(float, float, float, float);
+ method public void setBitmap(android.graphics.Bitmap);
+ method public void setDensity(int);
+ method public void setDrawFilter(android.graphics.DrawFilter);
+ method public void setMatrix(android.graphics.Matrix);
+ method public void skew(float, float);
+ method public void translate(float, float);
+ field public static final int ALL_SAVE_FLAG = 31; // 0x1f
+ field public static final int CLIP_SAVE_FLAG = 2; // 0x2
+ field public static final int CLIP_TO_LAYER_SAVE_FLAG = 16; // 0x10
+ field public static final int FULL_COLOR_LAYER_SAVE_FLAG = 8; // 0x8
+ field public static final int HAS_ALPHA_LAYER_SAVE_FLAG = 4; // 0x4
+ field public static final int MATRIX_SAVE_FLAG = 1; // 0x1
+ }
+
+ public static final class Canvas.EdgeType extends java.lang.Enum {
+ method public static android.graphics.Canvas.EdgeType valueOf(java.lang.String);
+ method public static final android.graphics.Canvas.EdgeType[] values();
+ enum_constant public static final android.graphics.Canvas.EdgeType AA;
+ enum_constant public static final android.graphics.Canvas.EdgeType BW;
+ }
+
+ public static final class Canvas.VertexMode extends java.lang.Enum {
+ method public static android.graphics.Canvas.VertexMode valueOf(java.lang.String);
+ method public static final android.graphics.Canvas.VertexMode[] values();
+ enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLES;
+ enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_FAN;
+ enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
+ }
+
+ public class Color {
+ ctor public Color();
+ method public static int HSVToColor(float[]);
+ method public static int HSVToColor(int, float[]);
+ method public static void RGBToHSV(int, int, int, float[]);
+ method public static int alpha(int);
+ method public static int argb(int, int, int, int);
+ method public static int blue(int);
+ method public static void colorToHSV(int, float[]);
+ method public static int green(int);
+ method public static float luminance(int);
+ method public static int parseColor(java.lang.String);
+ method public static int red(int);
+ method public static int rgb(int, int, int);
+ field public static final int BLACK = -16777216; // 0xff000000
+ field public static final int BLUE = -16776961; // 0xff0000ff
+ field public static final int CYAN = -16711681; // 0xff00ffff
+ field public static final int DKGRAY = -12303292; // 0xff444444
+ field public static final int GRAY = -7829368; // 0xff888888
+ field public static final int GREEN = -16711936; // 0xff00ff00
+ field public static final int LTGRAY = -3355444; // 0xffcccccc
+ field public static final int MAGENTA = -65281; // 0xffff00ff
+ field public static final int RED = -65536; // 0xffff0000
+ field public static final int TRANSPARENT = 0; // 0x0
+ field public static final int WHITE = -1; // 0xffffffff
+ field public static final int YELLOW = -256; // 0xffffff00
+ }
+
+ public class ColorFilter {
+ ctor public ColorFilter();
+ }
+
+ public class ColorMatrix {
+ ctor public ColorMatrix();
+ ctor public ColorMatrix(float[]);
+ ctor public ColorMatrix(android.graphics.ColorMatrix);
+ method public final float[] getArray();
+ method public void postConcat(android.graphics.ColorMatrix);
+ method public void preConcat(android.graphics.ColorMatrix);
+ method public void reset();
+ method public void set(android.graphics.ColorMatrix);
+ method public void set(float[]);
+ method public void setConcat(android.graphics.ColorMatrix, android.graphics.ColorMatrix);
+ method public void setRGB2YUV();
+ method public void setRotate(int, float);
+ method public void setSaturation(float);
+ method public void setScale(float, float, float, float);
+ method public void setYUV2RGB();
+ }
+
+ public class ColorMatrixColorFilter extends android.graphics.ColorFilter {
+ ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);
+ ctor public ColorMatrixColorFilter(float[]);
+ }
+
+ public class ComposePathEffect extends android.graphics.PathEffect {
+ ctor public ComposePathEffect(android.graphics.PathEffect, android.graphics.PathEffect);
+ }
+
+ public class ComposeShader extends android.graphics.Shader {
+ ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
+ ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
+ }
+
+ public class CornerPathEffect extends android.graphics.PathEffect {
+ ctor public CornerPathEffect(float);
+ }
+
+ public class DashPathEffect extends android.graphics.PathEffect {
+ ctor public DashPathEffect(float[], float);
+ }
+
+ public class DiscretePathEffect extends android.graphics.PathEffect {
+ ctor public DiscretePathEffect(float, float);
+ }
+
+ public class DrawFilter {
+ ctor public DrawFilter();
+ }
+
+ public class EmbossMaskFilter extends android.graphics.MaskFilter {
+ ctor public EmbossMaskFilter(float[], float, float, float);
+ }
+
+ public class ImageFormat {
+ ctor public ImageFormat();
+ method public static int getBitsPerPixel(int);
+ field public static final int DEPTH16 = 1144402265; // 0x44363159
+ field public static final int DEPTH_POINT_CLOUD = 257; // 0x101
+ field public static final int FLEX_RGBA_8888 = 42; // 0x2a
+ field public static final int FLEX_RGB_888 = 41; // 0x29
+ field public static final int JPEG = 256; // 0x100
+ field public static final int NV16 = 16; // 0x10
+ field public static final int NV21 = 17; // 0x11
+ field public static final int PRIVATE = 34; // 0x22
+ field public static final int RAW10 = 37; // 0x25
+ field public static final int RAW12 = 38; // 0x26
+ field public static final int RAW_SENSOR = 32; // 0x20
+ field public static final int RGB_565 = 4; // 0x4
+ field public static final int UNKNOWN = 0; // 0x0
+ field public static final int YUV_420_888 = 35; // 0x23
+ field public static final int YUV_422_888 = 39; // 0x27
+ field public static final int YUV_444_888 = 40; // 0x28
+ field public static final int YUY2 = 20; // 0x14
+ field public static final int YV12 = 842094169; // 0x32315659
+ }
+
+ public class Interpolator {
+ ctor public Interpolator(int);
+ ctor public Interpolator(int, int);
+ method public final int getKeyFrameCount();
+ method public final int getValueCount();
+ method public void reset(int);
+ method public void reset(int, int);
+ method public void setKeyFrame(int, int, float[]);
+ method public void setKeyFrame(int, int, float[], float[]);
+ method public void setRepeatMirror(float, boolean);
+ method public android.graphics.Interpolator.Result timeToValues(float[]);
+ method public android.graphics.Interpolator.Result timeToValues(int, float[]);
+ }
+
+ public static final class Interpolator.Result extends java.lang.Enum {
+ method public static android.graphics.Interpolator.Result valueOf(java.lang.String);
+ method public static final android.graphics.Interpolator.Result[] values();
+ enum_constant public static final android.graphics.Interpolator.Result FREEZE_END;
+ enum_constant public static final android.graphics.Interpolator.Result FREEZE_START;
+ enum_constant public static final android.graphics.Interpolator.Result NORMAL;
+ }
+
+ public deprecated class LayerRasterizer extends android.graphics.Rasterizer {
+ ctor public LayerRasterizer();
+ method public void addLayer(android.graphics.Paint, float, float);
+ method public void addLayer(android.graphics.Paint);
+ }
+
+ public class LightingColorFilter extends android.graphics.ColorFilter {
+ ctor public LightingColorFilter(int, int);
+ }
+
+ public class LinearGradient extends android.graphics.Shader {
+ ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
+ ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);
+ }
+
+ public class MaskFilter {
+ ctor public MaskFilter();
+ }
+
+ public class Matrix {
+ ctor public Matrix();
+ ctor public Matrix(android.graphics.Matrix);
+ method public void getValues(float[]);
+ method public boolean invert(android.graphics.Matrix);
+ method public boolean isAffine();
+ method public boolean isIdentity();
+ method public void mapPoints(float[], int, float[], int, int);
+ method public void mapPoints(float[], float[]);
+ method public void mapPoints(float[]);
+ method public float mapRadius(float);
+ method public boolean mapRect(android.graphics.RectF, android.graphics.RectF);
+ method public boolean mapRect(android.graphics.RectF);
+ method public void mapVectors(float[], int, float[], int, int);
+ method public void mapVectors(float[], float[]);
+ method public void mapVectors(float[]);
+ method public boolean postConcat(android.graphics.Matrix);
+ method public boolean postRotate(float, float, float);
+ method public boolean postRotate(float);
+ method public boolean postScale(float, float, float, float);
+ method public boolean postScale(float, float);
+ method public boolean postSkew(float, float, float, float);
+ method public boolean postSkew(float, float);
+ method public boolean postTranslate(float, float);
+ method public boolean preConcat(android.graphics.Matrix);
+ method public boolean preRotate(float, float, float);
+ method public boolean preRotate(float);
+ method public boolean preScale(float, float, float, float);
+ method public boolean preScale(float, float);
+ method public boolean preSkew(float, float, float, float);
+ method public boolean preSkew(float, float);
+ method public boolean preTranslate(float, float);
+ method public boolean rectStaysRect();
+ method public void reset();
+ method public void set(android.graphics.Matrix);
+ method public boolean setConcat(android.graphics.Matrix, android.graphics.Matrix);
+ method public boolean setPolyToPoly(float[], int, float[], int, int);
+ method public boolean setRectToRect(android.graphics.RectF, android.graphics.RectF, android.graphics.Matrix.ScaleToFit);
+ method public void setRotate(float, float, float);
+ method public void setRotate(float);
+ method public void setScale(float, float, float, float);
+ method public void setScale(float, float);
+ method public void setSinCos(float, float, float, float);
+ method public void setSinCos(float, float);
+ method public void setSkew(float, float, float, float);
+ method public void setSkew(float, float);
+ method public void setTranslate(float, float);
+ method public void setValues(float[]);
+ method public java.lang.String toShortString();
+ field public static final int MPERSP_0 = 6; // 0x6
+ field public static final int MPERSP_1 = 7; // 0x7
+ field public static final int MPERSP_2 = 8; // 0x8
+ field public static final int MSCALE_X = 0; // 0x0
+ field public static final int MSCALE_Y = 4; // 0x4
+ field public static final int MSKEW_X = 1; // 0x1
+ field public static final int MSKEW_Y = 3; // 0x3
+ field public static final int MTRANS_X = 2; // 0x2
+ field public static final int MTRANS_Y = 5; // 0x5
+ }
+
+ public static final class Matrix.ScaleToFit extends java.lang.Enum {
+ method public static android.graphics.Matrix.ScaleToFit valueOf(java.lang.String);
+ method public static final android.graphics.Matrix.ScaleToFit[] values();
+ enum_constant public static final android.graphics.Matrix.ScaleToFit CENTER;
+ enum_constant public static final android.graphics.Matrix.ScaleToFit END;
+ enum_constant public static final android.graphics.Matrix.ScaleToFit FILL;
+ enum_constant public static final android.graphics.Matrix.ScaleToFit START;
+ }
+
+ public class Movie {
+ method public static android.graphics.Movie decodeByteArray(byte[], int, int);
+ method public static android.graphics.Movie decodeFile(java.lang.String);
+ method public static android.graphics.Movie decodeStream(java.io.InputStream);
+ method public void draw(android.graphics.Canvas, float, float, android.graphics.Paint);
+ method public void draw(android.graphics.Canvas, float, float);
+ method public int duration();
+ method public int height();
+ method public boolean isOpaque();
+ method public boolean setTime(int);
+ method public int width();
+ }
+
+ public class NinePatch {
+ ctor public NinePatch(android.graphics.Bitmap, byte[]);
+ ctor public NinePatch(android.graphics.Bitmap, byte[], java.lang.String);
+ method public void draw(android.graphics.Canvas, android.graphics.RectF);
+ method public void draw(android.graphics.Canvas, android.graphics.Rect);
+ method public void draw(android.graphics.Canvas, android.graphics.Rect, android.graphics.Paint);
+ method public android.graphics.Bitmap getBitmap();
+ method public int getDensity();
+ method public int getHeight();
+ method public java.lang.String getName();
+ method public android.graphics.Paint getPaint();
+ method public final android.graphics.Region getTransparentRegion(android.graphics.Rect);
+ method public int getWidth();
+ method public final boolean hasAlpha();
+ method public static boolean isNinePatchChunk(byte[]);
+ method public void setPaint(android.graphics.Paint);
+ }
+
+ public final class Outline {
+ ctor public Outline();
+ ctor public Outline(android.graphics.Outline);
+ method public boolean canClip();
+ method public float getAlpha();
+ method public boolean isEmpty();
+ method public void offset(int, int);
+ method public void set(android.graphics.Outline);
+ method public void setAlpha(float);
+ method public void setConvexPath(android.graphics.Path);
+ method public void setEmpty();
+ method public void setOval(int, int, int, int);
+ method public void setOval(android.graphics.Rect);
+ method public void setRect(int, int, int, int);
+ method public void setRect(android.graphics.Rect);
+ method public void setRoundRect(int, int, int, int, float);
+ method public void setRoundRect(android.graphics.Rect, float);
+ }
+
+ public class Paint {
+ ctor public Paint();
+ ctor public Paint(int);
+ ctor public Paint(android.graphics.Paint);
+ method public float ascent();
+ method public int breakText(char[], int, int, float, float[]);
+ method public int breakText(java.lang.CharSequence, int, int, boolean, float, float[]);
+ method public int breakText(java.lang.String, boolean, float, float[]);
+ method public void clearShadowLayer();
+ method public float descent();
+ method public int getAlpha();
+ method public int getColor();
+ method public android.graphics.ColorFilter getColorFilter();
+ method public boolean getFillPath(android.graphics.Path, android.graphics.Path);
+ method public int getFlags();
+ method public java.lang.String getFontFeatureSettings();
+ method public float getFontMetrics(android.graphics.Paint.FontMetrics);
+ method public android.graphics.Paint.FontMetrics getFontMetrics();
+ method public int getFontMetricsInt(android.graphics.Paint.FontMetricsInt);
+ method public android.graphics.Paint.FontMetricsInt getFontMetricsInt();
+ method public float getFontSpacing();
+ method public int getHinting();
+ method public float getLetterSpacing();
+ method public android.graphics.MaskFilter getMaskFilter();
+ method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float);
+ method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float);
+ method public android.graphics.PathEffect getPathEffect();
+ method public deprecated android.graphics.Rasterizer getRasterizer();
+ method public float getRunAdvance(char[], int, int, int, int, boolean, int);
+ method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int);
+ method public android.graphics.Shader getShader();
+ method public android.graphics.Paint.Cap getStrokeCap();
+ method public android.graphics.Paint.Join getStrokeJoin();
+ method public float getStrokeMiter();
+ method public float getStrokeWidth();
+ method public android.graphics.Paint.Style getStyle();
+ method public android.graphics.Paint.Align getTextAlign();
+ method public void getTextBounds(java.lang.String, int, int, android.graphics.Rect);
+ method public void getTextBounds(char[], int, int, android.graphics.Rect);
+ method public java.util.Locale getTextLocale();
+ method public android.util.LocaleList getTextLocales();
+ method public void getTextPath(char[], int, int, float, float, android.graphics.Path);
+ method public void getTextPath(java.lang.String, int, int, float, float, android.graphics.Path);
+ method public float getTextScaleX();
+ method public float getTextSize();
+ method public float getTextSkewX();
+ method public int getTextWidths(char[], int, int, float[]);
+ method public int getTextWidths(java.lang.CharSequence, int, int, float[]);
+ method public int getTextWidths(java.lang.String, int, int, float[]);
+ method public int getTextWidths(java.lang.String, float[]);
+ method public android.graphics.Typeface getTypeface();
+ method public android.graphics.Xfermode getXfermode();
+ method public boolean hasGlyph(java.lang.String);
+ method public final boolean isAntiAlias();
+ method public final boolean isDither();
+ method public boolean isElegantTextHeight();
+ method public final boolean isFakeBoldText();
+ method public final boolean isFilterBitmap();
+ method public final boolean isLinearText();
+ method public final boolean isStrikeThruText();
+ method public final boolean isSubpixelText();
+ method public final boolean isUnderlineText();
+ method public float measureText(char[], int, int);
+ method public float measureText(java.lang.String, int, int);
+ method public float measureText(java.lang.String);
+ method public float measureText(java.lang.CharSequence, int, int);
+ method public void reset();
+ method public void set(android.graphics.Paint);
+ method public void setARGB(int, int, int, int);
+ method public void setAlpha(int);
+ method public void setAntiAlias(boolean);
+ method public void setColor(int);
+ method public android.graphics.ColorFilter setColorFilter(android.graphics.ColorFilter);
+ method public void setDither(boolean);
+ method public void setElegantTextHeight(boolean);
+ method public void setFakeBoldText(boolean);
+ method public void setFilterBitmap(boolean);
+ method public void setFlags(int);
+ method public void setFontFeatureSettings(java.lang.String);
+ method public void setHinting(int);
+ method public void setLetterSpacing(float);
+ method public void setLinearText(boolean);
+ method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter);
+ method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
+ method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
+ method public android.graphics.Shader setShader(android.graphics.Shader);
+ method public void setShadowLayer(float, float, float, int);
+ method public void setStrikeThruText(boolean);
+ method public void setStrokeCap(android.graphics.Paint.Cap);
+ method public void setStrokeJoin(android.graphics.Paint.Join);
+ method public void setStrokeMiter(float);
+ method public void setStrokeWidth(float);
+ method public void setStyle(android.graphics.Paint.Style);
+ method public void setSubpixelText(boolean);
+ method public void setTextAlign(android.graphics.Paint.Align);
+ method public void setTextLocale(java.util.Locale);
+ method public void setTextLocales(android.util.LocaleList);
+ method public void setTextScaleX(float);
+ method public void setTextSize(float);
+ method public void setTextSkewX(float);
+ method public android.graphics.Typeface setTypeface(android.graphics.Typeface);
+ method public void setUnderlineText(boolean);
+ method public android.graphics.Xfermode setXfermode(android.graphics.Xfermode);
+ field public static final int ANTI_ALIAS_FLAG = 1; // 0x1
+ field public static final int DEV_KERN_TEXT_FLAG = 256; // 0x100
+ field public static final int DITHER_FLAG = 4; // 0x4
+ field public static final int EMBEDDED_BITMAP_TEXT_FLAG = 1024; // 0x400
+ field public static final int FAKE_BOLD_TEXT_FLAG = 32; // 0x20
+ field public static final int FILTER_BITMAP_FLAG = 2; // 0x2
+ field public static final int HINTING_OFF = 0; // 0x0
+ field public static final int HINTING_ON = 1; // 0x1
+ field public static final int LINEAR_TEXT_FLAG = 64; // 0x40
+ field public static final int STRIKE_THRU_TEXT_FLAG = 16; // 0x10
+ field public static final int SUBPIXEL_TEXT_FLAG = 128; // 0x80
+ field public static final int UNDERLINE_TEXT_FLAG = 8; // 0x8
+ }
+
+ public static final class Paint.Align extends java.lang.Enum {
+ method public static android.graphics.Paint.Align valueOf(java.lang.String);
+ method public static final android.graphics.Paint.Align[] values();
+ enum_constant public static final android.graphics.Paint.Align CENTER;
+ enum_constant public static final android.graphics.Paint.Align LEFT;
+ enum_constant public static final android.graphics.Paint.Align RIGHT;
+ }
+
+ public static final class Paint.Cap extends java.lang.Enum {
+ method public static android.graphics.Paint.Cap valueOf(java.lang.String);
+ method public static final android.graphics.Paint.Cap[] values();
+ enum_constant public static final android.graphics.Paint.Cap BUTT;
+ enum_constant public static final android.graphics.Paint.Cap ROUND;
+ enum_constant public static final android.graphics.Paint.Cap SQUARE;
+ }
+
+ public static class Paint.FontMetrics {
+ ctor public Paint.FontMetrics();
+ field public float ascent;
+ field public float bottom;
+ field public float descent;
+ field public float leading;
+ field public float top;
+ }
+
+ public static class Paint.FontMetricsInt {
+ ctor public Paint.FontMetricsInt();
+ field public int ascent;
+ field public int bottom;
+ field public int descent;
+ field public int leading;
+ field public int top;
+ }
+
+ public static final class Paint.Join extends java.lang.Enum {
+ method public static android.graphics.Paint.Join valueOf(java.lang.String);
+ method public static final android.graphics.Paint.Join[] values();
+ enum_constant public static final android.graphics.Paint.Join BEVEL;
+ enum_constant public static final android.graphics.Paint.Join MITER;
+ enum_constant public static final android.graphics.Paint.Join ROUND;
+ }
+
+ public static final class Paint.Style extends java.lang.Enum {
+ method public static android.graphics.Paint.Style valueOf(java.lang.String);
+ method public static final android.graphics.Paint.Style[] values();
+ enum_constant public static final android.graphics.Paint.Style FILL;
+ enum_constant public static final android.graphics.Paint.Style FILL_AND_STROKE;
+ enum_constant public static final android.graphics.Paint.Style STROKE;
+ }
+
+ public class PaintFlagsDrawFilter extends android.graphics.DrawFilter {
+ ctor public PaintFlagsDrawFilter(int, int);
+ }
+
+ public class Path {
+ ctor public Path();
+ ctor public Path(android.graphics.Path);
+ method public void addArc(android.graphics.RectF, float, float);
+ method public void addArc(float, float, float, float, float, float);
+ method public void addCircle(float, float, float, android.graphics.Path.Direction);
+ method public void addOval(android.graphics.RectF, android.graphics.Path.Direction);
+ method public void addOval(float, float, float, float, android.graphics.Path.Direction);
+ method public void addPath(android.graphics.Path, float, float);
+ method public void addPath(android.graphics.Path);
+ method public void addPath(android.graphics.Path, android.graphics.Matrix);
+ method public void addRect(android.graphics.RectF, android.graphics.Path.Direction);
+ method public void addRect(float, float, float, float, android.graphics.Path.Direction);
+ method public void addRoundRect(android.graphics.RectF, float, float, android.graphics.Path.Direction);
+ method public void addRoundRect(float, float, float, float, float, float, android.graphics.Path.Direction);
+ method public void addRoundRect(android.graphics.RectF, float[], android.graphics.Path.Direction);
+ method public void addRoundRect(float, float, float, float, float[], android.graphics.Path.Direction);
+ method public void arcTo(android.graphics.RectF, float, float, boolean);
+ method public void arcTo(android.graphics.RectF, float, float);
+ method public void arcTo(float, float, float, float, float, float, boolean);
+ method public void close();
+ method public void computeBounds(android.graphics.RectF, boolean);
+ method public void cubicTo(float, float, float, float, float, float);
+ method public android.graphics.Path.FillType getFillType();
+ method public void incReserve(int);
+ method public boolean isConvex();
+ method public boolean isEmpty();
+ method public boolean isInverseFillType();
+ method public boolean isRect(android.graphics.RectF);
+ method public void lineTo(float, float);
+ method public void moveTo(float, float);
+ method public void offset(float, float, android.graphics.Path);
+ method public void offset(float, float);
+ method public boolean op(android.graphics.Path, android.graphics.Path.Op);
+ method public boolean op(android.graphics.Path, android.graphics.Path, android.graphics.Path.Op);
+ method public void quadTo(float, float, float, float);
+ method public void rCubicTo(float, float, float, float, float, float);
+ method public void rLineTo(float, float);
+ method public void rMoveTo(float, float);
+ method public void rQuadTo(float, float, float, float);
+ method public void reset();
+ method public void rewind();
+ method public void set(android.graphics.Path);
+ method public void setFillType(android.graphics.Path.FillType);
+ method public void setLastPoint(float, float);
+ method public void toggleInverseFillType();
+ method public void transform(android.graphics.Matrix, android.graphics.Path);
+ method public void transform(android.graphics.Matrix);
+ }
+
+ public static final class Path.Direction extends java.lang.Enum {
+ method public static android.graphics.Path.Direction valueOf(java.lang.String);
+ method public static final android.graphics.Path.Direction[] values();
+ enum_constant public static final android.graphics.Path.Direction CCW;
+ enum_constant public static final android.graphics.Path.Direction CW;
+ }
+
+ public static final class Path.FillType extends java.lang.Enum {
+ method public static android.graphics.Path.FillType valueOf(java.lang.String);
+ method public static final android.graphics.Path.FillType[] values();
+ enum_constant public static final android.graphics.Path.FillType EVEN_ODD;
+ enum_constant public static final android.graphics.Path.FillType INVERSE_EVEN_ODD;
+ enum_constant public static final android.graphics.Path.FillType INVERSE_WINDING;
+ enum_constant public static final android.graphics.Path.FillType WINDING;
+ }
+
+ public static final class Path.Op extends java.lang.Enum {
+ method public static android.graphics.Path.Op valueOf(java.lang.String);
+ method public static final android.graphics.Path.Op[] values();
+ enum_constant public static final android.graphics.Path.Op DIFFERENCE;
+ enum_constant public static final android.graphics.Path.Op INTERSECT;
+ enum_constant public static final android.graphics.Path.Op REVERSE_DIFFERENCE;
+ enum_constant public static final android.graphics.Path.Op UNION;
+ enum_constant public static final android.graphics.Path.Op XOR;
+ }
+
+ public class PathDashPathEffect extends android.graphics.PathEffect {
+ ctor public PathDashPathEffect(android.graphics.Path, float, float, android.graphics.PathDashPathEffect.Style);
+ }
+
+ public static final class PathDashPathEffect.Style extends java.lang.Enum {
+ method public static android.graphics.PathDashPathEffect.Style valueOf(java.lang.String);
+ method public static final android.graphics.PathDashPathEffect.Style[] values();
+ enum_constant public static final android.graphics.PathDashPathEffect.Style MORPH;
+ enum_constant public static final android.graphics.PathDashPathEffect.Style ROTATE;
+ enum_constant public static final android.graphics.PathDashPathEffect.Style TRANSLATE;
+ }
+
+ public class PathEffect {
+ ctor public PathEffect();
+ }
+
+ public class PathMeasure {
+ ctor public PathMeasure();
+ ctor public PathMeasure(android.graphics.Path, boolean);
+ method public float getLength();
+ method public boolean getMatrix(float, android.graphics.Matrix, int);
+ method public boolean getPosTan(float, float[], float[]);
+ method public boolean getSegment(float, float, android.graphics.Path, boolean);
+ method public boolean isClosed();
+ method public boolean nextContour();
+ method public void setPath(android.graphics.Path, boolean);
+ field public static final int POSITION_MATRIX_FLAG = 1; // 0x1
+ field public static final int TANGENT_MATRIX_FLAG = 2; // 0x2
+ }
+
+ public class Picture {
+ ctor public Picture();
+ ctor public Picture(android.graphics.Picture);
+ method public android.graphics.Canvas beginRecording(int, int);
+ method public static deprecated android.graphics.Picture createFromStream(java.io.InputStream);
+ method public void draw(android.graphics.Canvas);
+ method public void endRecording();
+ method public int getHeight();
+ method public int getWidth();
+ method public deprecated void writeToStream(java.io.OutputStream);
+ }
+
+ public class PixelFormat {
+ ctor public PixelFormat();
+ method public static boolean formatHasAlpha(int);
+ method public static void getPixelFormatInfo(int, android.graphics.PixelFormat);
+ field public static final deprecated int A_8 = 8; // 0x8
+ field public static final deprecated int JPEG = 256; // 0x100
+ field public static final deprecated int LA_88 = 10; // 0xa
+ field public static final deprecated int L_8 = 9; // 0x9
+ field public static final int OPAQUE = -1; // 0xffffffff
+ field public static final deprecated int RGBA_4444 = 7; // 0x7
+ field public static final deprecated int RGBA_5551 = 6; // 0x6
+ field public static final int RGBA_8888 = 1; // 0x1
+ field public static final int RGBX_8888 = 2; // 0x2
+ field public static final deprecated int RGB_332 = 11; // 0xb
+ field public static final int RGB_565 = 4; // 0x4
+ field public static final int RGB_888 = 3; // 0x3
+ field public static final int TRANSLUCENT = -3; // 0xfffffffd
+ field public static final int TRANSPARENT = -2; // 0xfffffffe
+ field public static final int UNKNOWN = 0; // 0x0
+ field public static final deprecated int YCbCr_420_SP = 17; // 0x11
+ field public static final deprecated int YCbCr_422_I = 20; // 0x14
+ field public static final deprecated int YCbCr_422_SP = 16; // 0x10
+ field public int bitsPerPixel;
+ field public int bytesPerPixel;
+ }
+
+ public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
+ ctor public PixelXorXfermode(int);
+ }
+
+ public class Point implements android.os.Parcelable {
+ ctor public Point();
+ ctor public Point(int, int);
+ ctor public Point(android.graphics.Point);
+ method public int describeContents();
+ method public final boolean equals(int, int);
+ method public final void negate();
+ method public final void offset(int, int);
+ method public void readFromParcel(android.os.Parcel);
+ method public void set(int, int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.Point> CREATOR;
+ field public int x;
+ field public int y;
+ }
+
+ public class PointF implements android.os.Parcelable {
+ ctor public PointF();
+ ctor public PointF(float, float);
+ ctor public PointF(android.graphics.Point);
+ method public int describeContents();
+ method public final boolean equals(float, float);
+ method public final float length();
+ method public static float length(float, float);
+ method public final void negate();
+ method public final void offset(float, float);
+ method public void readFromParcel(android.os.Parcel);
+ method public final void set(float, float);
+ method public final void set(android.graphics.PointF);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.PointF> CREATOR;
+ field public float x;
+ field public float y;
+ }
+
+ public class PorterDuff {
+ ctor public PorterDuff();
+ }
+
+ public static final class PorterDuff.Mode extends java.lang.Enum {
+ method public static android.graphics.PorterDuff.Mode valueOf(java.lang.String);
+ method public static final android.graphics.PorterDuff.Mode[] values();
+ enum_constant public static final android.graphics.PorterDuff.Mode ADD;
+ enum_constant public static final android.graphics.PorterDuff.Mode CLEAR;
+ enum_constant public static final android.graphics.PorterDuff.Mode DARKEN;
+ enum_constant public static final android.graphics.PorterDuff.Mode DST;
+ enum_constant public static final android.graphics.PorterDuff.Mode DST_ATOP;
+ enum_constant public static final android.graphics.PorterDuff.Mode DST_IN;
+ enum_constant public static final android.graphics.PorterDuff.Mode DST_OUT;
+ enum_constant public static final android.graphics.PorterDuff.Mode DST_OVER;
+ enum_constant public static final android.graphics.PorterDuff.Mode LIGHTEN;
+ enum_constant public static final android.graphics.PorterDuff.Mode MULTIPLY;
+ enum_constant public static final android.graphics.PorterDuff.Mode OVERLAY;
+ enum_constant public static final android.graphics.PorterDuff.Mode SCREEN;
+ enum_constant public static final android.graphics.PorterDuff.Mode SRC;
+ enum_constant public static final android.graphics.PorterDuff.Mode SRC_ATOP;
+ enum_constant public static final android.graphics.PorterDuff.Mode SRC_IN;
+ enum_constant public static final android.graphics.PorterDuff.Mode SRC_OUT;
+ enum_constant public static final android.graphics.PorterDuff.Mode SRC_OVER;
+ enum_constant public static final android.graphics.PorterDuff.Mode XOR;
+ }
+
+ public class PorterDuffColorFilter extends android.graphics.ColorFilter {
+ ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);
+ }
+
+ public class PorterDuffXfermode extends android.graphics.Xfermode {
+ ctor public PorterDuffXfermode(android.graphics.PorterDuff.Mode);
+ }
+
+ public class RadialGradient extends android.graphics.Shader {
+ ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);
+ ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
+ }
+
+ public deprecated class Rasterizer {
+ ctor public Rasterizer();
+ }
+
+ public final class Rect implements android.os.Parcelable {
+ ctor public Rect();
+ ctor public Rect(int, int, int, int);
+ ctor public Rect(android.graphics.Rect);
+ method public final int centerX();
+ method public final int centerY();
+ method public boolean contains(int, int);
+ method public boolean contains(int, int, int, int);
+ method public boolean contains(android.graphics.Rect);
+ method public int describeContents();
+ method public final float exactCenterX();
+ method public final float exactCenterY();
+ method public java.lang.String flattenToString();
+ method public final int height();
+ method public void inset(int, int);
+ method public boolean intersect(int, int, int, int);
+ method public boolean intersect(android.graphics.Rect);
+ method public boolean intersects(int, int, int, int);
+ method public static boolean intersects(android.graphics.Rect, android.graphics.Rect);
+ method public final boolean isEmpty();
+ method public void offset(int, int);
+ method public void offsetTo(int, int);
+ method public void readFromParcel(android.os.Parcel);
+ method public void set(int, int, int, int);
+ method public void set(android.graphics.Rect);
+ method public void setEmpty();
+ method public boolean setIntersect(android.graphics.Rect, android.graphics.Rect);
+ method public void sort();
+ method public java.lang.String toShortString();
+ method public static android.graphics.Rect unflattenFromString(java.lang.String);
+ method public void union(int, int, int, int);
+ method public void union(android.graphics.Rect);
+ method public void union(int, int);
+ method public final int width();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.Rect> CREATOR;
+ field public int bottom;
+ field public int left;
+ field public int right;
+ field public int top;
+ }
+
+ public class RectF implements android.os.Parcelable {
+ ctor public RectF();
+ ctor public RectF(float, float, float, float);
+ ctor public RectF(android.graphics.RectF);
+ ctor public RectF(android.graphics.Rect);
+ method public final float centerX();
+ method public final float centerY();
+ method public boolean contains(float, float);
+ method public boolean contains(float, float, float, float);
+ method public boolean contains(android.graphics.RectF);
+ method public int describeContents();
+ method public final float height();
+ method public void inset(float, float);
+ method public boolean intersect(float, float, float, float);
+ method public boolean intersect(android.graphics.RectF);
+ method public boolean intersects(float, float, float, float);
+ method public static boolean intersects(android.graphics.RectF, android.graphics.RectF);
+ method public final boolean isEmpty();
+ method public void offset(float, float);
+ method public void offsetTo(float, float);
+ method public void readFromParcel(android.os.Parcel);
+ method public void round(android.graphics.Rect);
+ method public void roundOut(android.graphics.Rect);
+ method public void set(float, float, float, float);
+ method public void set(android.graphics.RectF);
+ method public void set(android.graphics.Rect);
+ method public void setEmpty();
+ method public boolean setIntersect(android.graphics.RectF, android.graphics.RectF);
+ method public void sort();
+ method public java.lang.String toShortString();
+ method public void union(float, float, float, float);
+ method public void union(android.graphics.RectF);
+ method public void union(float, float);
+ method public final float width();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.RectF> CREATOR;
+ field public float bottom;
+ field public float left;
+ field public float right;
+ field public float top;
+ }
+
+ public class Region implements android.os.Parcelable {
+ ctor public Region();
+ ctor public Region(android.graphics.Region);
+ ctor public Region(android.graphics.Rect);
+ ctor public Region(int, int, int, int);
+ method public boolean contains(int, int);
+ method public int describeContents();
+ method public android.graphics.Path getBoundaryPath();
+ method public boolean getBoundaryPath(android.graphics.Path);
+ method public android.graphics.Rect getBounds();
+ method public boolean getBounds(android.graphics.Rect);
+ method public boolean isComplex();
+ method public boolean isEmpty();
+ method public boolean isRect();
+ method public boolean op(android.graphics.Rect, android.graphics.Region.Op);
+ method public boolean op(int, int, int, int, android.graphics.Region.Op);
+ method public boolean op(android.graphics.Region, android.graphics.Region.Op);
+ method public boolean op(android.graphics.Rect, android.graphics.Region, android.graphics.Region.Op);
+ method public boolean op(android.graphics.Region, android.graphics.Region, android.graphics.Region.Op);
+ method public boolean quickContains(android.graphics.Rect);
+ method public boolean quickContains(int, int, int, int);
+ method public boolean quickReject(android.graphics.Rect);
+ method public boolean quickReject(int, int, int, int);
+ method public boolean quickReject(android.graphics.Region);
+ method public boolean set(android.graphics.Region);
+ method public boolean set(android.graphics.Rect);
+ method public boolean set(int, int, int, int);
+ method public void setEmpty();
+ method public boolean setPath(android.graphics.Path, android.graphics.Region);
+ method public void translate(int, int);
+ method public void translate(int, int, android.graphics.Region);
+ method public final boolean union(android.graphics.Rect);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.Region> CREATOR;
+ }
+
+ public static final class Region.Op extends java.lang.Enum {
+ method public static android.graphics.Region.Op valueOf(java.lang.String);
+ method public static final android.graphics.Region.Op[] values();
+ enum_constant public static final android.graphics.Region.Op DIFFERENCE;
+ enum_constant public static final android.graphics.Region.Op INTERSECT;
+ enum_constant public static final android.graphics.Region.Op REPLACE;
+ enum_constant public static final android.graphics.Region.Op REVERSE_DIFFERENCE;
+ enum_constant public static final android.graphics.Region.Op UNION;
+ enum_constant public static final android.graphics.Region.Op XOR;
+ }
+
+ public class RegionIterator {
+ ctor public RegionIterator(android.graphics.Region);
+ method public final boolean next(android.graphics.Rect);
+ }
+
+ public class Shader {
+ ctor public Shader();
+ method public boolean getLocalMatrix(android.graphics.Matrix);
+ method public void setLocalMatrix(android.graphics.Matrix);
+ }
+
+ public static final class Shader.TileMode extends java.lang.Enum {
+ method public static android.graphics.Shader.TileMode valueOf(java.lang.String);
+ method public static final android.graphics.Shader.TileMode[] values();
+ enum_constant public static final android.graphics.Shader.TileMode CLAMP;
+ enum_constant public static final android.graphics.Shader.TileMode MIRROR;
+ enum_constant public static final android.graphics.Shader.TileMode REPEAT;
+ }
+
+ public class SumPathEffect extends android.graphics.PathEffect {
+ ctor public SumPathEffect(android.graphics.PathEffect, android.graphics.PathEffect);
+ }
+
+ public class SurfaceTexture {
+ ctor public SurfaceTexture(int);
+ ctor public SurfaceTexture(int, boolean);
+ method public void attachToGLContext(int);
+ method public void detachFromGLContext();
+ method public long getTimestamp();
+ method public void getTransformMatrix(float[]);
+ method public void release();
+ method public void releaseTexImage();
+ method public void setDefaultBufferSize(int, int);
+ method public void setOnFrameAvailableListener(android.graphics.SurfaceTexture.OnFrameAvailableListener);
+ method public void setOnFrameAvailableListener(android.graphics.SurfaceTexture.OnFrameAvailableListener, android.os.Handler);
+ method public void updateTexImage();
+ }
+
+ public static abstract interface SurfaceTexture.OnFrameAvailableListener {
+ method public abstract void onFrameAvailable(android.graphics.SurfaceTexture);
+ }
+
+ public static deprecated class SurfaceTexture.OutOfResourcesException extends java.lang.Exception {
+ ctor public SurfaceTexture.OutOfResourcesException();
+ ctor public SurfaceTexture.OutOfResourcesException(java.lang.String);
+ }
+
+ public class SweepGradient extends android.graphics.Shader {
+ ctor public SweepGradient(float, float, int[], float[]);
+ ctor public SweepGradient(float, float, int, int);
+ }
+
+ public class Typeface {
+ method public static android.graphics.Typeface create(java.lang.String, int);
+ method public static android.graphics.Typeface create(android.graphics.Typeface, int);
+ method public static android.graphics.Typeface createFromAsset(android.content.res.AssetManager, java.lang.String);
+ method public static android.graphics.Typeface createFromFile(java.io.File);
+ method public static android.graphics.Typeface createFromFile(java.lang.String);
+ method public static android.graphics.Typeface defaultFromStyle(int);
+ method public int getStyle();
+ method public final boolean isBold();
+ method public final boolean isItalic();
+ field public static final int BOLD = 1; // 0x1
+ field public static final int BOLD_ITALIC = 3; // 0x3
+ field public static final android.graphics.Typeface DEFAULT;
+ field public static final android.graphics.Typeface DEFAULT_BOLD;
+ field public static final int ITALIC = 2; // 0x2
+ field public static final android.graphics.Typeface MONOSPACE;
+ field public static final int NORMAL = 0; // 0x0
+ field public static final android.graphics.Typeface SANS_SERIF;
+ field public static final android.graphics.Typeface SERIF;
+ }
+
+ public class Xfermode {
+ ctor public Xfermode();
+ }
+
+ public class YuvImage {
+ ctor public YuvImage(byte[], int, int, int, int[]);
+ method public boolean compressToJpeg(android.graphics.Rect, int, java.io.OutputStream);
+ method public int getHeight();
+ method public int[] getStrides();
+ method public int getWidth();
+ method public byte[] getYuvData();
+ method public int getYuvFormat();
+ }
+
+}
+
+package android.graphics.drawable {
+
+ public abstract interface Animatable {
+ method public abstract boolean isRunning();
+ method public abstract void start();
+ method public abstract void stop();
+ }
+
+ public abstract interface Animatable2 implements android.graphics.drawable.Animatable {
+ method public abstract void clearAnimationCallbacks();
+ method public abstract void registerAnimationCallback(android.graphics.drawable.Animatable2.AnimationCallback);
+ method public abstract boolean unregisterAnimationCallback(android.graphics.drawable.Animatable2.AnimationCallback);
+ }
+
+ public static abstract class Animatable2.AnimationCallback {
+ ctor public Animatable2.AnimationCallback();
+ method public void onAnimationEnd(android.graphics.drawable.Drawable);
+ method public void onAnimationStart(android.graphics.drawable.Drawable);
+ }
+
+ public class AnimatedStateListDrawable extends android.graphics.drawable.StateListDrawable {
+ ctor public AnimatedStateListDrawable();
+ method public void addState(int[], android.graphics.drawable.Drawable, int);
+ method public void addTransition(int, int, T, boolean);
+ }
+
+ public class AnimatedVectorDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Animatable2 {
+ ctor public AnimatedVectorDrawable();
+ method public void clearAnimationCallbacks();
+ method public void draw(android.graphics.Canvas);
+ method public int getOpacity();
+ method public boolean isRunning();
+ method public void registerAnimationCallback(android.graphics.drawable.Animatable2.AnimationCallback);
+ method public void reset();
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void start();
+ method public void stop();
+ method public boolean unregisterAnimationCallback(android.graphics.drawable.Animatable2.AnimationCallback);
+ }
+
+ public class AnimationDrawable extends android.graphics.drawable.DrawableContainer implements android.graphics.drawable.Animatable java.lang.Runnable {
+ ctor public AnimationDrawable();
+ method public void addFrame(android.graphics.drawable.Drawable, int);
+ method public int getDuration(int);
+ method public android.graphics.drawable.Drawable getFrame(int);
+ method public int getNumberOfFrames();
+ method public boolean isOneShot();
+ method public boolean isRunning();
+ method public void run();
+ method public void setOneShot(boolean);
+ method public void start();
+ method public void stop();
+ }
+
+ public class BitmapDrawable extends android.graphics.drawable.Drawable {
+ ctor public deprecated BitmapDrawable();
+ ctor public deprecated BitmapDrawable(android.content.res.Resources);
+ ctor public deprecated BitmapDrawable(android.graphics.Bitmap);
+ ctor public BitmapDrawable(android.content.res.Resources, android.graphics.Bitmap);
+ ctor public deprecated BitmapDrawable(java.lang.String);
+ ctor public BitmapDrawable(android.content.res.Resources, java.lang.String);
+ ctor public deprecated BitmapDrawable(java.io.InputStream);
+ ctor public BitmapDrawable(android.content.res.Resources, java.io.InputStream);
+ method public void draw(android.graphics.Canvas);
+ method public final android.graphics.Bitmap getBitmap();
+ method public final android.graphics.drawable.Drawable.ConstantState getConstantState();
+ method public int getGravity();
+ method public int getOpacity();
+ method public final android.graphics.Paint getPaint();
+ method public android.graphics.Shader.TileMode getTileModeX();
+ method public android.graphics.Shader.TileMode getTileModeY();
+ method public boolean hasAntiAlias();
+ method public boolean hasMipMap();
+ method public final boolean isAutoMirrored();
+ method public void setAlpha(int);
+ method public void setAntiAlias(boolean);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setGravity(int);
+ method public void setMipMap(boolean);
+ method public void setTargetDensity(android.graphics.Canvas);
+ method public void setTargetDensity(android.util.DisplayMetrics);
+ method public void setTargetDensity(int);
+ method public void setTileModeX(android.graphics.Shader.TileMode);
+ method public void setTileModeXY(android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
+ method public final void setTileModeY(android.graphics.Shader.TileMode);
+ }
+
+ public class ClipDrawable extends android.graphics.drawable.DrawableWrapper {
+ ctor public ClipDrawable(android.graphics.drawable.Drawable, int, int);
+ field public static final int HORIZONTAL = 1; // 0x1
+ field public static final int VERTICAL = 2; // 0x2
+ }
+
+ public class ColorDrawable extends android.graphics.drawable.Drawable {
+ ctor public ColorDrawable();
+ ctor public ColorDrawable(int);
+ method public void draw(android.graphics.Canvas);
+ method public int getColor();
+ method public int getOpacity();
+ method public void setAlpha(int);
+ method public void setColor(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ }
+
+ public abstract class Drawable {
+ ctor public Drawable();
+ method public void applyTheme(android.content.res.Resources.Theme);
+ method public boolean canApplyTheme();
+ method public void clearColorFilter();
+ method public final void copyBounds(android.graphics.Rect);
+ method public final android.graphics.Rect copyBounds();
+ method public static android.graphics.drawable.Drawable createFromPath(java.lang.String);
+ method public static android.graphics.drawable.Drawable createFromResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, java.lang.String);
+ method public static android.graphics.drawable.Drawable createFromResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, java.lang.String, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.drawable.Drawable createFromStream(java.io.InputStream, java.lang.String);
+ method public static android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public abstract void draw(android.graphics.Canvas);
+ method public int getAlpha();
+ method public final android.graphics.Rect getBounds();
+ method public android.graphics.drawable.Drawable.Callback getCallback();
+ method public int getChangingConfigurations();
+ method public android.graphics.ColorFilter getColorFilter();
+ method public android.graphics.drawable.Drawable.ConstantState getConstantState();
+ method public android.graphics.drawable.Drawable getCurrent();
+ method public android.graphics.Rect getDirtyBounds();
+ method public void getHotspotBounds(android.graphics.Rect);
+ method public int getIntrinsicHeight();
+ method public int getIntrinsicWidth();
+ method public int getLayoutDirection();
+ method public final int getLevel();
+ method public int getMinimumHeight();
+ method public int getMinimumWidth();
+ method public abstract int getOpacity();
+ method public void getOutline(android.graphics.Outline);
+ method public boolean getPadding(android.graphics.Rect);
+ method public int[] getState();
+ method public android.graphics.Region getTransparentRegion();
+ method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public void invalidateSelf();
+ method public boolean isAutoMirrored();
+ method public boolean isFilterBitmap();
+ method public boolean isStateful();
+ method public final boolean isVisible();
+ method public void jumpToCurrentState();
+ method public android.graphics.drawable.Drawable mutate();
+ method protected void onBoundsChange(android.graphics.Rect);
+ method public boolean onLayoutDirectionChanged(int);
+ method protected boolean onLevelChange(int);
+ method protected boolean onStateChange(int[]);
+ method public static int resolveOpacity(int, int);
+ method public void scheduleSelf(java.lang.Runnable, long);
+ method public abstract void setAlpha(int);
+ method public void setAutoMirrored(boolean);
+ method public void setBounds(int, int, int, int);
+ method public void setBounds(android.graphics.Rect);
+ method public final void setCallback(android.graphics.drawable.Drawable.Callback);
+ method public void setChangingConfigurations(int);
+ method public abstract void setColorFilter(android.graphics.ColorFilter);
+ method public void setColorFilter(int, android.graphics.PorterDuff.Mode);
+ method public deprecated void setDither(boolean);
+ method public void setFilterBitmap(boolean);
+ method public void setHotspot(float, float);
+ method public void setHotspotBounds(int, int, int, int);
+ method public final boolean setLayoutDirection(int);
+ method public final boolean setLevel(int);
+ method public boolean setState(int[]);
+ method public void setTint(int);
+ method public void setTintList(android.content.res.ColorStateList);
+ method public void setTintMode(android.graphics.PorterDuff.Mode);
+ method public boolean setVisible(boolean, boolean);
+ method public void unscheduleSelf(java.lang.Runnable);
+ }
+
+ public static abstract interface Drawable.Callback {
+ method public abstract void invalidateDrawable(android.graphics.drawable.Drawable);
+ method public abstract void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
+ method public abstract void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
+ }
+
+ public static abstract class Drawable.ConstantState {
+ ctor public Drawable.ConstantState();
+ method public boolean canApplyTheme();
+ method public abstract int getChangingConfigurations();
+ method public abstract android.graphics.drawable.Drawable newDrawable();
+ method public android.graphics.drawable.Drawable newDrawable(android.content.res.Resources);
+ method public android.graphics.drawable.Drawable newDrawable(android.content.res.Resources, android.content.res.Resources.Theme);
+ }
+
+ public class DrawableContainer extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
+ ctor public DrawableContainer();
+ method public void draw(android.graphics.Canvas);
+ method public int getOpacity();
+ method public void invalidateDrawable(android.graphics.drawable.Drawable);
+ method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
+ method public boolean selectDrawable(int);
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method protected void setConstantState(android.graphics.drawable.DrawableContainer.DrawableContainerState);
+ method public void setEnterFadeDuration(int);
+ method public void setExitFadeDuration(int);
+ method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
+ }
+
+ public static abstract class DrawableContainer.DrawableContainerState extends android.graphics.drawable.Drawable.ConstantState {
+ method public final int addChild(android.graphics.drawable.Drawable);
+ method public synchronized boolean canConstantState();
+ method protected void computeConstantSize();
+ method public int getChangingConfigurations();
+ method public final android.graphics.drawable.Drawable getChild(int);
+ method public final int getChildCount();
+ method public final android.graphics.drawable.Drawable[] getChildren();
+ method public final int getConstantHeight();
+ method public final int getConstantMinimumHeight();
+ method public final int getConstantMinimumWidth();
+ method public final android.graphics.Rect getConstantPadding();
+ method public final int getConstantWidth();
+ method public final int getEnterFadeDuration();
+ method public final int getExitFadeDuration();
+ method public final int getOpacity();
+ method public void growArray(int, int);
+ method public final boolean isConstantSize();
+ method public final boolean isStateful();
+ method public final void setConstantSize(boolean);
+ method public final void setEnterFadeDuration(int);
+ method public final void setExitFadeDuration(int);
+ method public final void setVariablePadding(boolean);
+ }
+
+ public abstract class DrawableWrapper extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
+ ctor public DrawableWrapper(android.graphics.drawable.Drawable);
+ method public void draw(android.graphics.Canvas);
+ method public android.graphics.drawable.Drawable getDrawable();
+ method public int getOpacity();
+ method public void invalidateDrawable(android.graphics.drawable.Drawable);
+ method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setDrawable(android.graphics.drawable.Drawable);
+ method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
+ }
+
+ public class GradientDrawable extends android.graphics.drawable.Drawable {
+ ctor public GradientDrawable();
+ ctor public GradientDrawable(android.graphics.drawable.GradientDrawable.Orientation, int[]);
+ method public void draw(android.graphics.Canvas);
+ method public android.content.res.ColorStateList getColor();
+ method public int[] getColors();
+ method public float[] getCornerRadii();
+ method public float getCornerRadius();
+ method public float getGradientCenterX();
+ method public float getGradientCenterY();
+ method public float getGradientRadius();
+ method public int getGradientType();
+ method public int getOpacity();
+ method public android.graphics.drawable.GradientDrawable.Orientation getOrientation();
+ method public boolean isUseLevel();
+ method public void setAlpha(int);
+ method public void setColor(int);
+ method public void setColor(android.content.res.ColorStateList);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setColors(int[]);
+ method public void setCornerRadii(float[]);
+ method public void setCornerRadius(float);
+ method public void setGradientCenter(float, float);
+ method public void setGradientRadius(float);
+ method public void setGradientType(int);
+ method public void setOrientation(android.graphics.drawable.GradientDrawable.Orientation);
+ method public void setShape(int);
+ method public void setSize(int, int);
+ method public void setStroke(int, int);
+ method public void setStroke(int, android.content.res.ColorStateList);
+ method public void setStroke(int, int, float, float);
+ method public void setStroke(int, android.content.res.ColorStateList, float, float);
+ method public void setUseLevel(boolean);
+ field public static final int LINE = 2; // 0x2
+ field public static final int LINEAR_GRADIENT = 0; // 0x0
+ field public static final int OVAL = 1; // 0x1
+ field public static final int RADIAL_GRADIENT = 1; // 0x1
+ field public static final int RECTANGLE = 0; // 0x0
+ field public static final int RING = 3; // 0x3
+ field public static final int SWEEP_GRADIENT = 2; // 0x2
+ }
+
+ public static final class GradientDrawable.Orientation extends java.lang.Enum {
+ method public static android.graphics.drawable.GradientDrawable.Orientation valueOf(java.lang.String);
+ method public static final android.graphics.drawable.GradientDrawable.Orientation[] values();
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation BL_TR;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation BOTTOM_TOP;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation BR_TL;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation LEFT_RIGHT;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation RIGHT_LEFT;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation TL_BR;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation TOP_BOTTOM;
+ enum_constant public static final android.graphics.drawable.GradientDrawable.Orientation TR_BL;
+ }
+
+ public final class Icon implements android.os.Parcelable {
+ method public static android.graphics.drawable.Icon createWithBitmap(android.graphics.Bitmap);
+ method public static android.graphics.drawable.Icon createWithContentUri(java.lang.String);
+ method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri);
+ method public static android.graphics.drawable.Icon createWithData(byte[], int, int);
+ method public static android.graphics.drawable.Icon createWithFilePath(java.lang.String);
+ method public static android.graphics.drawable.Icon createWithResource(android.content.Context, int);
+ method public static android.graphics.drawable.Icon createWithResource(java.lang.String, int);
+ method public int describeContents();
+ method public android.graphics.drawable.Drawable loadDrawable(android.content.Context);
+ method public void loadDrawableAsync(android.content.Context, android.os.Message);
+ method public void loadDrawableAsync(android.content.Context, android.graphics.drawable.Icon.OnDrawableLoadedListener, android.os.Handler);
+ method public android.graphics.drawable.Icon setTint(int);
+ method public android.graphics.drawable.Icon setTintList(android.content.res.ColorStateList);
+ method public android.graphics.drawable.Icon setTintMode(android.graphics.PorterDuff.Mode);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.graphics.drawable.Icon> CREATOR;
+ }
+
+ public static abstract interface Icon.OnDrawableLoadedListener {
+ method public abstract void onDrawableLoaded(android.graphics.drawable.Drawable);
+ }
+
+ public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {
+ ctor public InsetDrawable(android.graphics.drawable.Drawable, int);
+ ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);
+ }
+
+ public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
+ ctor public LayerDrawable(android.graphics.drawable.Drawable[]);
+ method public int addLayer(android.graphics.drawable.Drawable);
+ method public void draw(android.graphics.Canvas);
+ method public android.graphics.drawable.Drawable findDrawableByLayerId(int);
+ method public int findIndexByLayerId(int);
+ method public int getBottomPadding();
+ method public android.graphics.drawable.Drawable getDrawable(int);
+ method public int getEndPadding();
+ method public int getId(int);
+ method public int getLayerGravity(int);
+ method public int getLayerHeight(int);
+ method public int getLayerInsetBottom(int);
+ method public int getLayerInsetEnd(int);
+ method public int getLayerInsetLeft(int);
+ method public int getLayerInsetRight(int);
+ method public int getLayerInsetStart(int);
+ method public int getLayerInsetTop(int);
+ method public int getLayerWidth(int);
+ method public int getLeftPadding();
+ method public int getNumberOfLayers();
+ method public int getOpacity();
+ method public int getPaddingMode();
+ method public int getRightPadding();
+ method public int getStartPadding();
+ method public int getTopPadding();
+ method public void invalidateDrawable(android.graphics.drawable.Drawable);
+ method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setDrawable(int, android.graphics.drawable.Drawable);
+ method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);
+ method public void setId(int, int);
+ method public void setLayerGravity(int, int);
+ method public void setLayerHeight(int, int);
+ method public void setLayerInset(int, int, int, int, int);
+ method public void setLayerInsetBottom(int, int);
+ method public void setLayerInsetEnd(int, int);
+ method public void setLayerInsetLeft(int, int);
+ method public void setLayerInsetRelative(int, int, int, int, int);
+ method public void setLayerInsetRight(int, int);
+ method public void setLayerInsetStart(int, int);
+ method public void setLayerInsetTop(int, int);
+ method public void setLayerSize(int, int, int);
+ method public void setLayerWidth(int, int);
+ method public void setOpacity(int);
+ method public void setPadding(int, int, int, int);
+ method public void setPaddingMode(int);
+ method public void setPaddingRelative(int, int, int, int);
+ method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
+ field public static final int PADDING_MODE_NEST = 0; // 0x0
+ field public static final int PADDING_MODE_STACK = 1; // 0x1
+ }
+
+ public class LevelListDrawable extends android.graphics.drawable.DrawableContainer {
+ ctor public LevelListDrawable();
+ method public void addLevel(int, int, android.graphics.drawable.Drawable);
+ }
+
+ public class NinePatchDrawable extends android.graphics.drawable.Drawable {
+ ctor public deprecated NinePatchDrawable(android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);
+ ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);
+ ctor public deprecated NinePatchDrawable(android.graphics.NinePatch);
+ ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.NinePatch);
+ method public void draw(android.graphics.Canvas);
+ method public android.graphics.NinePatch getNinePatch();
+ method public int getOpacity();
+ method public android.graphics.Paint getPaint();
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setNinePatch(android.graphics.NinePatch);
+ method public void setTargetDensity(android.graphics.Canvas);
+ method public void setTargetDensity(android.util.DisplayMetrics);
+ method public void setTargetDensity(int);
+ }
+
+ public class PaintDrawable extends android.graphics.drawable.ShapeDrawable {
+ ctor public PaintDrawable();
+ ctor public PaintDrawable(int);
+ method public void setCornerRadii(float[]);
+ method public void setCornerRadius(float);
+ }
+
+ public class PictureDrawable extends android.graphics.drawable.Drawable {
+ ctor public PictureDrawable(android.graphics.Picture);
+ method public void draw(android.graphics.Canvas);
+ method public int getOpacity();
+ method public android.graphics.Picture getPicture();
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setPicture(android.graphics.Picture);
+ }
+
+ public class RippleDrawable extends android.graphics.drawable.LayerDrawable {
+ ctor public RippleDrawable(android.content.res.ColorStateList, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
+ method public int getRadius();
+ method public void setColor(android.content.res.ColorStateList);
+ method public void setRadius(int);
+ field public static final int RADIUS_AUTO = -1; // 0xffffffff
+ }
+
+ public class RotateDrawable extends android.graphics.drawable.DrawableWrapper {
+ ctor public RotateDrawable();
+ method public float getFromDegrees();
+ method public float getPivotX();
+ method public float getPivotY();
+ method public float getToDegrees();
+ method public boolean isPivotXRelative();
+ method public boolean isPivotYRelative();
+ method public void setFromDegrees(float);
+ method public void setPivotX(float);
+ method public void setPivotXRelative(boolean);
+ method public void setPivotY(float);
+ method public void setPivotYRelative(boolean);
+ method public void setToDegrees(float);
+ }
+
+ public class ScaleDrawable extends android.graphics.drawable.DrawableWrapper {
+ ctor public ScaleDrawable(android.graphics.drawable.Drawable, int, float, float);
+ }
+
+ public class ShapeDrawable extends android.graphics.drawable.Drawable {
+ ctor public ShapeDrawable();
+ ctor public ShapeDrawable(android.graphics.drawable.shapes.Shape);
+ method public void draw(android.graphics.Canvas);
+ method public int getOpacity();
+ method public android.graphics.Paint getPaint();
+ method public android.graphics.drawable.ShapeDrawable.ShaderFactory getShaderFactory();
+ method public android.graphics.drawable.shapes.Shape getShape();
+ method protected boolean inflateTag(java.lang.String, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet);
+ method protected void onDraw(android.graphics.drawable.shapes.Shape, android.graphics.Canvas, android.graphics.Paint);
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setIntrinsicHeight(int);
+ method public void setIntrinsicWidth(int);
+ method public void setPadding(int, int, int, int);
+ method public void setPadding(android.graphics.Rect);
+ method public void setShaderFactory(android.graphics.drawable.ShapeDrawable.ShaderFactory);
+ method public void setShape(android.graphics.drawable.shapes.Shape);
+ }
+
+ public static abstract class ShapeDrawable.ShaderFactory {
+ ctor public ShapeDrawable.ShaderFactory();
+ method public abstract android.graphics.Shader resize(int, int);
+ }
+
+ public class StateListDrawable extends android.graphics.drawable.DrawableContainer {
+ ctor public StateListDrawable();
+ method public void addState(int[], android.graphics.drawable.Drawable);
+ }
+
+ public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback {
+ ctor public TransitionDrawable(android.graphics.drawable.Drawable[]);
+ method public boolean isCrossFadeEnabled();
+ method public void resetTransition();
+ method public void reverseTransition(int);
+ method public void setCrossFadeEnabled(boolean);
+ method public void startTransition(int);
+ }
+
+ public class VectorDrawable extends android.graphics.drawable.Drawable {
+ ctor public VectorDrawable();
+ method public void draw(android.graphics.Canvas);
+ method public int getOpacity();
+ method public void setAlpha(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ }
+
+}
+
+package android.graphics.drawable.shapes {
+
+ public class ArcShape extends android.graphics.drawable.shapes.RectShape {
+ ctor public ArcShape(float, float);
+ }
+
+ public class OvalShape extends android.graphics.drawable.shapes.RectShape {
+ ctor public OvalShape();
+ }
+
+ public class PathShape extends android.graphics.drawable.shapes.Shape {
+ ctor public PathShape(android.graphics.Path, float, float);
+ method public void draw(android.graphics.Canvas, android.graphics.Paint);
+ }
+
+ public class RectShape extends android.graphics.drawable.shapes.Shape {
+ ctor public RectShape();
+ method public void draw(android.graphics.Canvas, android.graphics.Paint);
+ method protected final android.graphics.RectF rect();
+ }
+
+ public class RoundRectShape extends android.graphics.drawable.shapes.RectShape {
+ ctor public RoundRectShape(float[], android.graphics.RectF, float[]);
+ }
+
+ public abstract class Shape implements java.lang.Cloneable {
+ ctor public Shape();
+ method public android.graphics.drawable.shapes.Shape clone() throws java.lang.CloneNotSupportedException;
+ method public abstract void draw(android.graphics.Canvas, android.graphics.Paint);
+ method public final float getHeight();
+ method public void getOutline(android.graphics.Outline);
+ method public final float getWidth();
+ method public boolean hasAlpha();
+ method protected void onResize(float, float);
+ method public final void resize(float, float);
+ }
+
+}
+
+package android.graphics.pdf {
+
+ public class PdfDocument {
+ ctor public PdfDocument();
+ method public void close();
+ method public void finishPage(android.graphics.pdf.PdfDocument.Page);
+ method public java.util.List<android.graphics.pdf.PdfDocument.PageInfo> getPages();
+ method public android.graphics.pdf.PdfDocument.Page startPage(android.graphics.pdf.PdfDocument.PageInfo);
+ method public void writeTo(java.io.OutputStream) throws java.io.IOException;
+ }
+
+ public static final class PdfDocument.Page {
+ method public android.graphics.Canvas getCanvas();
+ method public android.graphics.pdf.PdfDocument.PageInfo getInfo();
+ }
+
+ public static final class PdfDocument.PageInfo {
+ method public android.graphics.Rect getContentRect();
+ method public int getPageHeight();
+ method public int getPageNumber();
+ method public int getPageWidth();
+ }
+
+ public static final class PdfDocument.PageInfo.Builder {
+ ctor public PdfDocument.PageInfo.Builder(int, int, int);
+ method public android.graphics.pdf.PdfDocument.PageInfo create();
+ method public android.graphics.pdf.PdfDocument.PageInfo.Builder setContentRect(android.graphics.Rect);
+ }
+
+ public final class PdfRenderer implements java.lang.AutoCloseable {
+ ctor public PdfRenderer(android.os.ParcelFileDescriptor) throws java.io.IOException;
+ method public void close();
+ method public int getPageCount();
+ method public android.graphics.pdf.PdfRenderer.Page openPage(int);
+ method public boolean shouldScaleForPrinting();
+ }
+
+ public final class PdfRenderer.Page implements java.lang.AutoCloseable {
+ method public void close();
+ method public int getHeight();
+ method public int getIndex();
+ method public int getWidth();
+ method public void render(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Matrix, int);
+ field public static final int RENDER_MODE_FOR_DISPLAY = 1; // 0x1
+ field public static final int RENDER_MODE_FOR_PRINT = 2; // 0x2
+ }
+
+}
+
+package android.hardware {
+
+ public deprecated class Camera {
+ method public final void addCallbackBuffer(byte[]);
+ method public final void autoFocus(android.hardware.Camera.AutoFocusCallback);
+ method public final void cancelAutoFocus();
+ method public final boolean enableShutterSound(boolean);
+ method public static void getCameraInfo(int, android.hardware.Camera.CameraInfo);
+ method public static int getNumberOfCameras();
+ method public android.hardware.Camera.Parameters getParameters();
+ method public final void lock();
+ method public static android.hardware.Camera open(int);
+ method public static android.hardware.Camera open();
+ method public final void reconnect() throws java.io.IOException;
+ method public final void release();
+ method public void setAutoFocusMoveCallback(android.hardware.Camera.AutoFocusMoveCallback);
+ method public final void setDisplayOrientation(int);
+ method public final void setErrorCallback(android.hardware.Camera.ErrorCallback);
+ method public final void setFaceDetectionListener(android.hardware.Camera.FaceDetectionListener);
+ method public final void setOneShotPreviewCallback(android.hardware.Camera.PreviewCallback);
+ method public void setParameters(android.hardware.Camera.Parameters);
+ method public final void setPreviewCallback(android.hardware.Camera.PreviewCallback);
+ method public final void setPreviewCallbackWithBuffer(android.hardware.Camera.PreviewCallback);
+ method public final void setPreviewDisplay(android.view.SurfaceHolder) throws java.io.IOException;
+ method public final void setPreviewTexture(android.graphics.SurfaceTexture) throws java.io.IOException;
+ method public final void setZoomChangeListener(android.hardware.Camera.OnZoomChangeListener);
+ method public final void startFaceDetection();
+ method public final void startPreview();
+ method public final void startSmoothZoom(int);
+ method public final void stopFaceDetection();
+ method public final void stopPreview();
+ method public final void stopSmoothZoom();
+ method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);
+ method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);
+ method public final void unlock();
+ field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";
+ field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";
+ field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2
+ field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64
+ field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1
+ }
+
+ public static deprecated class Camera.Area {
+ ctor public Camera.Area(android.graphics.Rect, int);
+ field public android.graphics.Rect rect;
+ field public int weight;
+ }
+
+ public static abstract deprecated interface Camera.AutoFocusCallback {
+ method public abstract void onAutoFocus(boolean, android.hardware.Camera);
+ }
+
+ public static abstract deprecated interface Camera.AutoFocusMoveCallback {
+ method public abstract void onAutoFocusMoving(boolean, android.hardware.Camera);
+ }
+
+ public static deprecated class Camera.CameraInfo {
+ ctor public Camera.CameraInfo();
+ field public static final int CAMERA_FACING_BACK = 0; // 0x0
+ field public static final int CAMERA_FACING_FRONT = 1; // 0x1
+ field public boolean canDisableShutterSound;
+ field public int facing;
+ field public int orientation;
+ }
+
+ public static abstract deprecated interface Camera.ErrorCallback {
+ method public abstract void onError(int, android.hardware.Camera);
+ }
+
+ public static deprecated class Camera.Face {
+ ctor public Camera.Face();
+ field public int id;
+ field public android.graphics.Point leftEye;
+ field public android.graphics.Point mouth;
+ field public android.graphics.Rect rect;
+ field public android.graphics.Point rightEye;
+ field public int score;
+ }
+
+ public static abstract deprecated interface Camera.FaceDetectionListener {
+ method public abstract void onFaceDetection(android.hardware.Camera.Face[], android.hardware.Camera);
+ }
+
+ public static abstract deprecated interface Camera.OnZoomChangeListener {
+ method public abstract void onZoomChange(int, boolean, android.hardware.Camera);
+ }
+
+ public deprecated class Camera.Parameters {
+ method public java.lang.String flatten();
+ method public java.lang.String get(java.lang.String);
+ method public java.lang.String getAntibanding();
+ method public boolean getAutoExposureLock();
+ method public boolean getAutoWhiteBalanceLock();
+ method public java.lang.String getColorEffect();
+ method public int getExposureCompensation();
+ method public float getExposureCompensationStep();
+ method public java.lang.String getFlashMode();
+ method public float getFocalLength();
+ method public java.util.List<android.hardware.Camera.Area> getFocusAreas();
+ method public void getFocusDistances(float[]);
+ method public java.lang.String getFocusMode();
+ method public float getHorizontalViewAngle();
+ method public int getInt(java.lang.String);
+ method public int getJpegQuality();
+ method public int getJpegThumbnailQuality();
+ method public android.hardware.Camera.Size getJpegThumbnailSize();
+ method public int getMaxExposureCompensation();
+ method public int getMaxNumDetectedFaces();
+ method public int getMaxNumFocusAreas();
+ method public int getMaxNumMeteringAreas();
+ method public int getMaxZoom();
+ method public java.util.List<android.hardware.Camera.Area> getMeteringAreas();
+ method public int getMinExposureCompensation();
+ method public int getPictureFormat();
+ method public android.hardware.Camera.Size getPictureSize();
+ method public android.hardware.Camera.Size getPreferredPreviewSizeForVideo();
+ method public int getPreviewFormat();
+ method public void getPreviewFpsRange(int[]);
+ method public deprecated int getPreviewFrameRate();
+ method public android.hardware.Camera.Size getPreviewSize();
+ method public java.lang.String getSceneMode();
+ method public java.util.List<java.lang.String> getSupportedAntibanding();
+ method public java.util.List<java.lang.String> getSupportedColorEffects();
+ method public java.util.List<java.lang.String> getSupportedFlashModes();
+ method public java.util.List<java.lang.String> getSupportedFocusModes();
+ method public java.util.List<android.hardware.Camera.Size> getSupportedJpegThumbnailSizes();
+ method public java.util.List<java.lang.Integer> getSupportedPictureFormats();
+ method public java.util.List<android.hardware.Camera.Size> getSupportedPictureSizes();
+ method public java.util.List<java.lang.Integer> getSupportedPreviewFormats();
+ method public java.util.List<int[]> getSupportedPreviewFpsRange();
+ method public deprecated java.util.List<java.lang.Integer> getSupportedPreviewFrameRates();
+ method public java.util.List<android.hardware.Camera.Size> getSupportedPreviewSizes();
+ method public java.util.List<java.lang.String> getSupportedSceneModes();
+ method public java.util.List<android.hardware.Camera.Size> getSupportedVideoSizes();
+ method public java.util.List<java.lang.String> getSupportedWhiteBalance();
+ method public float getVerticalViewAngle();
+ method public boolean getVideoStabilization();
+ method public java.lang.String getWhiteBalance();
+ method public int getZoom();
+ method public java.util.List<java.lang.Integer> getZoomRatios();
+ method public boolean isAutoExposureLockSupported();
+ method public boolean isAutoWhiteBalanceLockSupported();
+ method public boolean isSmoothZoomSupported();
+ method public boolean isVideoSnapshotSupported();
+ method public boolean isVideoStabilizationSupported();
+ method public boolean isZoomSupported();
+ method public void remove(java.lang.String);
+ method public void removeGpsData();
+ method public void set(java.lang.String, java.lang.String);
+ method public void set(java.lang.String, int);
+ method public void setAntibanding(java.lang.String);
+ method public void setAutoExposureLock(boolean);
+ method public void setAutoWhiteBalanceLock(boolean);
+ method public void setColorEffect(java.lang.String);
+ method public void setExposureCompensation(int);
+ method public void setFlashMode(java.lang.String);
+ method public void setFocusAreas(java.util.List<android.hardware.Camera.Area>);
+ method public void setFocusMode(java.lang.String);
+ method public void setGpsAltitude(double);
+ method public void setGpsLatitude(double);
+ method public void setGpsLongitude(double);
+ method public void setGpsProcessingMethod(java.lang.String);
+ method public void setGpsTimestamp(long);
+ method public void setJpegQuality(int);
+ method public void setJpegThumbnailQuality(int);
+ method public void setJpegThumbnailSize(int, int);
+ method public void setMeteringAreas(java.util.List<android.hardware.Camera.Area>);
+ method public void setPictureFormat(int);
+ method public void setPictureSize(int, int);
+ method public void setPreviewFormat(int);
+ method public void setPreviewFpsRange(int, int);
+ method public deprecated void setPreviewFrameRate(int);
+ method public void setPreviewSize(int, int);
+ method public void setRecordingHint(boolean);
+ method public void setRotation(int);
+ method public void setSceneMode(java.lang.String);
+ method public void setVideoStabilization(boolean);
+ method public void setWhiteBalance(java.lang.String);
+ method public void setZoom(int);
+ method public void unflatten(java.lang.String);
+ field public static final java.lang.String ANTIBANDING_50HZ = "50hz";
+ field public static final java.lang.String ANTIBANDING_60HZ = "60hz";
+ field public static final java.lang.String ANTIBANDING_AUTO = "auto";
+ field public static final java.lang.String ANTIBANDING_OFF = "off";
+ field public static final java.lang.String EFFECT_AQUA = "aqua";
+ field public static final java.lang.String EFFECT_BLACKBOARD = "blackboard";
+ field public static final java.lang.String EFFECT_MONO = "mono";
+ field public static final java.lang.String EFFECT_NEGATIVE = "negative";
+ field public static final java.lang.String EFFECT_NONE = "none";
+ field public static final java.lang.String EFFECT_POSTERIZE = "posterize";
+ field public static final java.lang.String EFFECT_SEPIA = "sepia";
+ field public static final java.lang.String EFFECT_SOLARIZE = "solarize";
+ field public static final java.lang.String EFFECT_WHITEBOARD = "whiteboard";
+ field public static final java.lang.String FLASH_MODE_AUTO = "auto";
+ field public static final java.lang.String FLASH_MODE_OFF = "off";
+ field public static final java.lang.String FLASH_MODE_ON = "on";
+ field public static final java.lang.String FLASH_MODE_RED_EYE = "red-eye";
+ field public static final java.lang.String FLASH_MODE_TORCH = "torch";
+ field public static final int FOCUS_DISTANCE_FAR_INDEX = 2; // 0x2
+ field public static final int FOCUS_DISTANCE_NEAR_INDEX = 0; // 0x0
+ field public static final int FOCUS_DISTANCE_OPTIMAL_INDEX = 1; // 0x1
+ field public static final java.lang.String FOCUS_MODE_AUTO = "auto";
+ field public static final java.lang.String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";
+ field public static final java.lang.String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video";
+ field public static final java.lang.String FOCUS_MODE_EDOF = "edof";
+ field public static final java.lang.String FOCUS_MODE_FIXED = "fixed";
+ field public static final java.lang.String FOCUS_MODE_INFINITY = "infinity";
+ field public static final java.lang.String FOCUS_MODE_MACRO = "macro";
+ field public static final int PREVIEW_FPS_MAX_INDEX = 1; // 0x1
+ field public static final int PREVIEW_FPS_MIN_INDEX = 0; // 0x0
+ field public static final java.lang.String SCENE_MODE_ACTION = "action";
+ field public static final java.lang.String SCENE_MODE_AUTO = "auto";
+ field public static final java.lang.String SCENE_MODE_BARCODE = "barcode";
+ field public static final java.lang.String SCENE_MODE_BEACH = "beach";
+ field public static final java.lang.String SCENE_MODE_CANDLELIGHT = "candlelight";
+ field public static final java.lang.String SCENE_MODE_FIREWORKS = "fireworks";
+ field public static final java.lang.String SCENE_MODE_HDR = "hdr";
+ field public static final java.lang.String SCENE_MODE_LANDSCAPE = "landscape";
+ field public static final java.lang.String SCENE_MODE_NIGHT = "night";
+ field public static final java.lang.String SCENE_MODE_NIGHT_PORTRAIT = "night-portrait";
+ field public static final java.lang.String SCENE_MODE_PARTY = "party";
+ field public static final java.lang.String SCENE_MODE_PORTRAIT = "portrait";
+ field public static final java.lang.String SCENE_MODE_SNOW = "snow";
+ field public static final java.lang.String SCENE_MODE_SPORTS = "sports";
+ field public static final java.lang.String SCENE_MODE_STEADYPHOTO = "steadyphoto";
+ field public static final java.lang.String SCENE_MODE_SUNSET = "sunset";
+ field public static final java.lang.String SCENE_MODE_THEATRE = "theatre";
+ field public static final java.lang.String WHITE_BALANCE_AUTO = "auto";
+ field public static final java.lang.String WHITE_BALANCE_CLOUDY_DAYLIGHT = "cloudy-daylight";
+ field public static final java.lang.String WHITE_BALANCE_DAYLIGHT = "daylight";
+ field public static final java.lang.String WHITE_BALANCE_FLUORESCENT = "fluorescent";
+ field public static final java.lang.String WHITE_BALANCE_INCANDESCENT = "incandescent";
+ field public static final java.lang.String WHITE_BALANCE_SHADE = "shade";
+ field public static final java.lang.String WHITE_BALANCE_TWILIGHT = "twilight";
+ field public static final java.lang.String WHITE_BALANCE_WARM_FLUORESCENT = "warm-fluorescent";
+ }
+
+ public static abstract deprecated interface Camera.PictureCallback {
+ method public abstract void onPictureTaken(byte[], android.hardware.Camera);
+ }
+
+ public static abstract deprecated interface Camera.PreviewCallback {
+ method public abstract void onPreviewFrame(byte[], android.hardware.Camera);
+ }
+
+ public static abstract deprecated interface Camera.ShutterCallback {
+ method public abstract void onShutter();
+ }
+
+ public deprecated class Camera.Size {
+ ctor public Camera.Size(int, int);
+ field public int height;
+ field public int width;
+ }
+
+ public final class ConsumerIrManager {
+ method public android.hardware.ConsumerIrManager.CarrierFrequencyRange[] getCarrierFrequencies();
+ method public boolean hasIrEmitter();
+ method public void transmit(int, int[]);
+ }
+
+ public final class ConsumerIrManager.CarrierFrequencyRange {
+ ctor public ConsumerIrManager.CarrierFrequencyRange(int, int);
+ method public int getMaxFrequency();
+ method public int getMinFrequency();
+ }
+
+ public class GeomagneticField {
+ ctor public GeomagneticField(float, float, float, long);
+ method public float getDeclination();
+ method public float getFieldStrength();
+ method public float getHorizontalStrength();
+ method public float getInclination();
+ method public float getX();
+ method public float getY();
+ method public float getZ();
+ }
+
+ public final class Sensor {
+ method public int getFifoMaxEventCount();
+ method public int getFifoReservedEventCount();
+ method public int getMaxDelay();
+ method public float getMaximumRange();
+ method public int getMinDelay();
+ method public java.lang.String getName();
+ method public float getPower();
+ method public int getReportingMode();
+ method public float getResolution();
+ method public java.lang.String getStringType();
+ method public int getType();
+ method public java.lang.String getVendor();
+ method public int getVersion();
+ method public boolean isWakeUpSensor();
+ field public static final int REPORTING_MODE_CONTINUOUS = 0; // 0x0
+ field public static final int REPORTING_MODE_ONE_SHOT = 2; // 0x2
+ field public static final int REPORTING_MODE_ON_CHANGE = 1; // 0x1
+ field public static final int REPORTING_MODE_SPECIAL_TRIGGER = 3; // 0x3
+ field public static final java.lang.String STRING_TYPE_ACCELEROMETER = "android.sensor.accelerometer";
+ field public static final java.lang.String STRING_TYPE_AMBIENT_TEMPERATURE = "android.sensor.ambient_temperature";
+ field public static final java.lang.String STRING_TYPE_GAME_ROTATION_VECTOR = "android.sensor.game_rotation_vector";
+ field public static final java.lang.String STRING_TYPE_GEOMAGNETIC_ROTATION_VECTOR = "android.sensor.geomagnetic_rotation_vector";
+ field public static final java.lang.String STRING_TYPE_GRAVITY = "android.sensor.gravity";
+ field public static final java.lang.String STRING_TYPE_GYROSCOPE = "android.sensor.gyroscope";
+ field public static final java.lang.String STRING_TYPE_GYROSCOPE_UNCALIBRATED = "android.sensor.gyroscope_uncalibrated";
+ field public static final java.lang.String STRING_TYPE_HEART_RATE = "android.sensor.heart_rate";
+ field public static final java.lang.String STRING_TYPE_LIGHT = "android.sensor.light";
+ field public static final java.lang.String STRING_TYPE_LINEAR_ACCELERATION = "android.sensor.linear_acceleration";
+ field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD = "android.sensor.magnetic_field";
+ field public static final java.lang.String STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED = "android.sensor.magnetic_field_uncalibrated";
+ field public static final deprecated java.lang.String STRING_TYPE_ORIENTATION = "android.sensor.orientation";
+ field public static final java.lang.String STRING_TYPE_PRESSURE = "android.sensor.pressure";
+ field public static final java.lang.String STRING_TYPE_PROXIMITY = "android.sensor.proximity";
+ field public static final java.lang.String STRING_TYPE_RELATIVE_HUMIDITY = "android.sensor.relative_humidity";
+ field public static final java.lang.String STRING_TYPE_ROTATION_VECTOR = "android.sensor.rotation_vector";
+ field public static final java.lang.String STRING_TYPE_SIGNIFICANT_MOTION = "android.sensor.significant_motion";
+ field public static final java.lang.String STRING_TYPE_STEP_COUNTER = "android.sensor.step_counter";
+ field public static final java.lang.String STRING_TYPE_STEP_DETECTOR = "android.sensor.step_detector";
+ field public static final deprecated java.lang.String STRING_TYPE_TEMPERATURE = "android.sensor.temperature";
+ field public static final int TYPE_ACCELEROMETER = 1; // 0x1
+ field public static final int TYPE_ALL = -1; // 0xffffffff
+ field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd
+ field public static final int TYPE_GAME_ROTATION_VECTOR = 15; // 0xf
+ field public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20; // 0x14
+ field public static final int TYPE_GRAVITY = 9; // 0x9
+ field public static final int TYPE_GYROSCOPE = 4; // 0x4
+ field public static final int TYPE_GYROSCOPE_UNCALIBRATED = 16; // 0x10
+ field public static final int TYPE_HEART_RATE = 21; // 0x15
+ field public static final int TYPE_LIGHT = 5; // 0x5
+ field public static final int TYPE_LINEAR_ACCELERATION = 10; // 0xa
+ field public static final int TYPE_MAGNETIC_FIELD = 2; // 0x2
+ field public static final int TYPE_MAGNETIC_FIELD_UNCALIBRATED = 14; // 0xe
+ field public static final deprecated int TYPE_ORIENTATION = 3; // 0x3
+ field public static final int TYPE_PRESSURE = 6; // 0x6
+ field public static final int TYPE_PROXIMITY = 8; // 0x8
+ field public static final int TYPE_RELATIVE_HUMIDITY = 12; // 0xc
+ field public static final int TYPE_ROTATION_VECTOR = 11; // 0xb
+ field public static final int TYPE_SIGNIFICANT_MOTION = 17; // 0x11
+ field public static final int TYPE_STEP_COUNTER = 19; // 0x13
+ field public static final int TYPE_STEP_DETECTOR = 18; // 0x12
+ field public static final deprecated int TYPE_TEMPERATURE = 7; // 0x7
+ }
+
+ public class SensorEvent {
+ field public int accuracy;
+ field public android.hardware.Sensor sensor;
+ field public long timestamp;
+ field public final float[] values;
+ }
+
+ public abstract interface SensorEventListener {
+ method public abstract void onAccuracyChanged(android.hardware.Sensor, int);
+ method public abstract void onSensorChanged(android.hardware.SensorEvent);
+ }
+
+ public abstract interface SensorEventListener2 implements android.hardware.SensorEventListener {
+ method public abstract void onFlushCompleted(android.hardware.Sensor);
+ }
+
+ public abstract deprecated interface SensorListener {
+ method public abstract void onAccuracyChanged(int, int);
+ method public abstract void onSensorChanged(int, float[]);
+ }
+
+ public abstract class SensorManager {
+ method public boolean cancelTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
+ method public boolean flush(android.hardware.SensorEventListener);
+ method public static float getAltitude(float, float);
+ method public static void getAngleChange(float[], float[], float[]);
+ method public android.hardware.Sensor getDefaultSensor(int);
+ method public android.hardware.Sensor getDefaultSensor(int, boolean);
+ method public static float getInclination(float[]);
+ method public static float[] getOrientation(float[], float[]);
+ method public static void getQuaternionFromVector(float[], float[]);
+ method public static boolean getRotationMatrix(float[], float[], float[], float[]);
+ method public static void getRotationMatrixFromVector(float[], float[]);
+ method public java.util.List<android.hardware.Sensor> getSensorList(int);
+ method public deprecated int getSensors();
+ method public deprecated boolean registerListener(android.hardware.SensorListener, int);
+ method public deprecated boolean registerListener(android.hardware.SensorListener, int, int);
+ method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int);
+ method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int);
+ method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler);
+ method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, int, android.os.Handler);
+ method public static boolean remapCoordinateSystem(float[], int, int, float[]);
+ method public boolean requestTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor);
+ method public deprecated void unregisterListener(android.hardware.SensorListener);
+ method public deprecated void unregisterListener(android.hardware.SensorListener, int);
+ method public void unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor);
+ method public void unregisterListener(android.hardware.SensorEventListener);
+ field public static final int AXIS_MINUS_X = 129; // 0x81
+ field public static final int AXIS_MINUS_Y = 130; // 0x82
+ field public static final int AXIS_MINUS_Z = 131; // 0x83
+ field public static final int AXIS_X = 1; // 0x1
+ field public static final int AXIS_Y = 2; // 0x2
+ field public static final int AXIS_Z = 3; // 0x3
+ field public static final deprecated int DATA_X = 0; // 0x0
+ field public static final deprecated int DATA_Y = 1; // 0x1
+ field public static final deprecated int DATA_Z = 2; // 0x2
+ field public static final float GRAVITY_DEATH_STAR_I = 3.5303614E-7f;
+ field public static final float GRAVITY_EARTH = 9.80665f;
+ field public static final float GRAVITY_JUPITER = 23.12f;
+ field public static final float GRAVITY_MARS = 3.71f;
+ field public static final float GRAVITY_MERCURY = 3.7f;
+ field public static final float GRAVITY_MOON = 1.6f;
+ field public static final float GRAVITY_NEPTUNE = 11.0f;
+ field public static final float GRAVITY_PLUTO = 0.6f;
+ field public static final float GRAVITY_SATURN = 8.96f;
+ field public static final float GRAVITY_SUN = 275.0f;
+ field public static final float GRAVITY_THE_ISLAND = 4.815162f;
+ field public static final float GRAVITY_URANUS = 8.69f;
+ field public static final float GRAVITY_VENUS = 8.87f;
+ field public static final float LIGHT_CLOUDY = 100.0f;
+ field public static final float LIGHT_FULLMOON = 0.25f;
+ field public static final float LIGHT_NO_MOON = 0.001f;
+ field public static final float LIGHT_OVERCAST = 10000.0f;
+ field public static final float LIGHT_SHADE = 20000.0f;
+ field public static final float LIGHT_SUNLIGHT = 110000.0f;
+ field public static final float LIGHT_SUNLIGHT_MAX = 120000.0f;
+ field public static final float LIGHT_SUNRISE = 400.0f;
+ field public static final float MAGNETIC_FIELD_EARTH_MAX = 60.0f;
+ field public static final float MAGNETIC_FIELD_EARTH_MIN = 30.0f;
+ field public static final float PRESSURE_STANDARD_ATMOSPHERE = 1013.25f;
+ field public static final deprecated int RAW_DATA_INDEX = 3; // 0x3
+ field public static final deprecated int RAW_DATA_X = 3; // 0x3
+ field public static final deprecated int RAW_DATA_Y = 4; // 0x4
+ field public static final deprecated int RAW_DATA_Z = 5; // 0x5
+ field public static final deprecated int SENSOR_ACCELEROMETER = 2; // 0x2
+ field public static final deprecated int SENSOR_ALL = 127; // 0x7f
+ field public static final int SENSOR_DELAY_FASTEST = 0; // 0x0
+ field public static final int SENSOR_DELAY_GAME = 1; // 0x1
+ field public static final int SENSOR_DELAY_NORMAL = 3; // 0x3
+ field public static final int SENSOR_DELAY_UI = 2; // 0x2
+ field public static final deprecated int SENSOR_LIGHT = 16; // 0x10
+ field public static final deprecated int SENSOR_MAGNETIC_FIELD = 8; // 0x8
+ field public static final deprecated int SENSOR_MAX = 64; // 0x40
+ field public static final deprecated int SENSOR_MIN = 1; // 0x1
+ field public static final deprecated int SENSOR_ORIENTATION = 1; // 0x1
+ field public static final deprecated int SENSOR_ORIENTATION_RAW = 128; // 0x80
+ field public static final deprecated int SENSOR_PROXIMITY = 32; // 0x20
+ field public static final int SENSOR_STATUS_ACCURACY_HIGH = 3; // 0x3
+ field public static final int SENSOR_STATUS_ACCURACY_LOW = 1; // 0x1
+ field public static final int SENSOR_STATUS_ACCURACY_MEDIUM = 2; // 0x2
+ field public static final int SENSOR_STATUS_NO_CONTACT = -1; // 0xffffffff
+ field public static final int SENSOR_STATUS_UNRELIABLE = 0; // 0x0
+ field public static final deprecated int SENSOR_TEMPERATURE = 4; // 0x4
+ field public static final deprecated int SENSOR_TRICORDER = 64; // 0x40
+ field public static final float STANDARD_GRAVITY = 9.80665f;
+ }
+
+ public final class TriggerEvent {
+ field public android.hardware.Sensor sensor;
+ field public long timestamp;
+ field public final float[] values;
+ }
+
+ public abstract class TriggerEventListener {
+ ctor public TriggerEventListener();
+ method public abstract void onTrigger(android.hardware.TriggerEvent);
+ }
+
+}
+
+package android.hardware.camera2 {
+
+ public class CameraAccessException extends android.util.AndroidException {
+ ctor public CameraAccessException(int);
+ ctor public CameraAccessException(int, java.lang.String);
+ ctor public CameraAccessException(int, java.lang.String, java.lang.Throwable);
+ ctor public CameraAccessException(int, java.lang.Throwable);
+ method public final int getReason();
+ field public static final int CAMERA_DISABLED = 1; // 0x1
+ field public static final int CAMERA_DISCONNECTED = 2; // 0x2
+ field public static final int CAMERA_ERROR = 3; // 0x3
+ field public static final int CAMERA_IN_USE = 4; // 0x4
+ field public static final int MAX_CAMERAS_IN_USE = 5; // 0x5
+ }
+
+ public abstract class CameraCaptureSession implements java.lang.AutoCloseable {
+ ctor public CameraCaptureSession();
+ method public abstract void abortCaptures() throws android.hardware.camera2.CameraAccessException;
+ method public abstract int capture(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract int captureBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract void close();
+ method public abstract android.hardware.camera2.CameraDevice getDevice();
+ method public abstract android.view.Surface getInputSurface();
+ method public abstract boolean isReprocessable();
+ method public abstract void prepare(android.view.Surface) throws android.hardware.camera2.CameraAccessException;
+ method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException;
+ }
+
+ public static abstract class CameraCaptureSession.CaptureCallback {
+ ctor public CameraCaptureSession.CaptureCallback();
+ method public void onCaptureCompleted(android.hardware.camera2.CameraCaptureSession, android.hardware.camera2.CaptureRequest, android.hardware.camera2.TotalCaptureResult);
+ method public void onCaptureFailed(android.hardware.camera2.CameraCaptureSession, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureFailure);
+ method public void onCaptureProgressed(android.hardware.camera2.CameraCaptureSession, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
+ method public void onCaptureSequenceAborted(android.hardware.camera2.CameraCaptureSession, int);
+ method public void onCaptureSequenceCompleted(android.hardware.camera2.CameraCaptureSession, int, long);
+ method public void onCaptureStarted(android.hardware.camera2.CameraCaptureSession, android.hardware.camera2.CaptureRequest, long, long);
+ }
+
+ public static abstract class CameraCaptureSession.StateCallback {
+ ctor public CameraCaptureSession.StateCallback();
+ method public void onActive(android.hardware.camera2.CameraCaptureSession);
+ method public void onClosed(android.hardware.camera2.CameraCaptureSession);
+ method public abstract void onConfigureFailed(android.hardware.camera2.CameraCaptureSession);
+ method public abstract void onConfigured(android.hardware.camera2.CameraCaptureSession);
+ method public void onReady(android.hardware.camera2.CameraCaptureSession);
+ method public void onSurfacePrepared(android.hardware.camera2.CameraCaptureSession, android.view.Surface);
+ }
+
+ public final class CameraCharacteristics extends android.hardware.camera2.CameraMetadata {
+ method public T get(android.hardware.camera2.CameraCharacteristics.Key<T>);
+ method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableCaptureRequestKeys();
+ method public java.util.List<android.hardware.camera2.CaptureResult.Key<?>> getAvailableCaptureResultKeys();
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AE_AVAILABLE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>[]> CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_COMPENSATION_RANGE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Rational> CONTROL_AE_COMPENSATION_STEP;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AE_LOCK_AVAILABLE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AF_AVAILABLE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_EFFECTS;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_SCENE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AWB_AVAILABLE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AWB_LOCK_AVAILABLE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> INFO_SUPPORTED_HARDWARE_LEVEL;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> LENS_FACING;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INFO_AVAILABLE_APERTURES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INFO_AVAILABLE_FILTER_DENSITIES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INFO_AVAILABLE_FOCAL_LENGTHS;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> LENS_INFO_FOCUS_DISTANCE_CALIBRATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> LENS_INFO_HYPERFOCAL_DISTANCE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> LENS_INFO_MINIMUM_FOCUS_DISTANCE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INTRINSIC_CALIBRATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_POSE_ROTATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_POSE_TRANSLATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_RADIAL_DISTORTION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REPROCESS_MAX_CAPTURE_STALL;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> REQUEST_AVAILABLE_CAPABILITIES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_INPUT_STREAMS;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_PROC;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_PROC_STALLING;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_RAW;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_PARTIAL_RESULT_COUNT;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> REQUEST_PIPELINE_MAX_DEPTH;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SCALER_CROPPING_TYPE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.StreamConfigurationMap> SCALER_STREAM_CONFIGURATION_MAP;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SENSOR_AVAILABLE_TEST_PATTERN_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.BlackLevelPattern> SENSOR_BLACK_LEVEL_PATTERN;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.ColorSpaceTransform> SENSOR_CALIBRATION_TRANSFORM1;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.ColorSpaceTransform> SENSOR_CALIBRATION_TRANSFORM2;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.ColorSpaceTransform> SENSOR_COLOR_TRANSFORM1;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.ColorSpaceTransform> SENSOR_COLOR_TRANSFORM2;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.ColorSpaceTransform> SENSOR_FORWARD_MATRIX1;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.ColorSpaceTransform> SENSOR_FORWARD_MATRIX2;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect> SENSOR_INFO_ACTIVE_ARRAY_SIZE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_COLOR_FILTER_ARRANGEMENT;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Long>> SENSOR_INFO_EXPOSURE_TIME_RANGE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> SENSOR_INFO_LENS_SHADING_APPLIED;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Long> SENSOR_INFO_MAX_FRAME_DURATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.SizeF> SENSOR_INFO_PHYSICAL_SIZE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size> SENSOR_INFO_PIXEL_ARRAY_SIZE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect> SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> SENSOR_INFO_SENSITIVITY_RANGE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_TIMESTAMP_SOURCE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_WHITE_LEVEL;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_MAX_ANALOG_SENSITIVITY;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect[]> SENSOR_OPTICAL_BLACK_REGIONS;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_ORIENTATION;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_REFERENCE_ILLUMINANT1;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> SENSOR_REFERENCE_ILLUMINANT2;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SHADING_AVAILABLE_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<boolean[]> STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> STATISTICS_INFO_MAX_FACE_COUNT;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SYNC_MAX_LATENCY;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> TONEMAP_AVAILABLE_TONE_MAP_MODES;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> TONEMAP_MAX_CURVE_POINTS;
+ }
+
+ public static final class CameraCharacteristics.Key {
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.String getName();
+ method public final int hashCode();
+ }
+
+ public abstract class CameraConstrainedHighSpeedCaptureSession extends android.hardware.camera2.CameraCaptureSession {
+ ctor public CameraConstrainedHighSpeedCaptureSession();
+ method public abstract java.util.List<android.hardware.camera2.CaptureRequest> createHighSpeedRequestList(android.hardware.camera2.CaptureRequest) throws android.hardware.camera2.CameraAccessException;
+ }
+
+ public abstract class CameraDevice implements java.lang.AutoCloseable {
+ method public abstract void close();
+ method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;
+ method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract void createConstrainedHighSpeedCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException;
+ method public abstract void createReprocessableCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public abstract java.lang.String getId();
+ field public static final int TEMPLATE_MANUAL = 6; // 0x6
+ field public static final int TEMPLATE_PREVIEW = 1; // 0x1
+ field public static final int TEMPLATE_RECORD = 3; // 0x3
+ field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2
+ field public static final int TEMPLATE_VIDEO_SNAPSHOT = 4; // 0x4
+ field public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; // 0x5
+ }
+
+ public static abstract class CameraDevice.StateCallback {
+ ctor public CameraDevice.StateCallback();
+ method public void onClosed(android.hardware.camera2.CameraDevice);
+ method public abstract void onDisconnected(android.hardware.camera2.CameraDevice);
+ method public abstract void onError(android.hardware.camera2.CameraDevice, int);
+ method public abstract void onOpened(android.hardware.camera2.CameraDevice);
+ field public static final int ERROR_CAMERA_DEVICE = 4; // 0x4
+ field public static final int ERROR_CAMERA_DISABLED = 3; // 0x3
+ field public static final int ERROR_CAMERA_IN_USE = 1; // 0x1
+ field public static final int ERROR_CAMERA_SERVICE = 5; // 0x5
+ field public static final int ERROR_MAX_CAMERAS_IN_USE = 2; // 0x2
+ }
+
+ public final class CameraManager {
+ method public android.hardware.camera2.CameraCharacteristics getCameraCharacteristics(java.lang.String) throws android.hardware.camera2.CameraAccessException;
+ method public java.lang.String[] getCameraIdList() throws android.hardware.camera2.CameraAccessException;
+ method public void openCamera(java.lang.String, android.hardware.camera2.CameraDevice.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException;
+ method public void registerAvailabilityCallback(android.hardware.camera2.CameraManager.AvailabilityCallback, android.os.Handler);
+ method public void registerTorchCallback(android.hardware.camera2.CameraManager.TorchCallback, android.os.Handler);
+ method public void setTorchMode(java.lang.String, boolean) throws android.hardware.camera2.CameraAccessException;
+ method public void unregisterAvailabilityCallback(android.hardware.camera2.CameraManager.AvailabilityCallback);
+ method public void unregisterTorchCallback(android.hardware.camera2.CameraManager.TorchCallback);
+ }
+
+ public static abstract class CameraManager.AvailabilityCallback {
+ ctor public CameraManager.AvailabilityCallback();
+ method public void onCameraAvailable(java.lang.String);
+ method public void onCameraUnavailable(java.lang.String);
+ }
+
+ public static abstract class CameraManager.TorchCallback {
+ ctor public CameraManager.TorchCallback();
+ method public void onTorchModeChanged(java.lang.String, boolean);
+ method public void onTorchModeUnavailable(java.lang.String);
+ }
+
+ public abstract class CameraMetadata {
+ method public java.util.List<TKey> getKeys();
+ field public static final int COLOR_CORRECTION_ABERRATION_MODE_FAST = 1; // 0x1
+ field public static final int COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int COLOR_CORRECTION_ABERRATION_MODE_OFF = 0; // 0x0
+ field public static final int COLOR_CORRECTION_MODE_FAST = 1; // 0x1
+ field public static final int COLOR_CORRECTION_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int COLOR_CORRECTION_MODE_TRANSFORM_MATRIX = 0; // 0x0
+ field public static final int CONTROL_AE_ANTIBANDING_MODE_50HZ = 1; // 0x1
+ field public static final int CONTROL_AE_ANTIBANDING_MODE_60HZ = 2; // 0x2
+ field public static final int CONTROL_AE_ANTIBANDING_MODE_AUTO = 3; // 0x3
+ field public static final int CONTROL_AE_ANTIBANDING_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_AE_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_AE_MODE_ON = 1; // 0x1
+ field public static final int CONTROL_AE_MODE_ON_ALWAYS_FLASH = 3; // 0x3
+ field public static final int CONTROL_AE_MODE_ON_AUTO_FLASH = 2; // 0x2
+ field public static final int CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE = 4; // 0x4
+ field public static final int CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL = 2; // 0x2
+ field public static final int CONTROL_AE_PRECAPTURE_TRIGGER_IDLE = 0; // 0x0
+ field public static final int CONTROL_AE_PRECAPTURE_TRIGGER_START = 1; // 0x1
+ field public static final int CONTROL_AE_STATE_CONVERGED = 2; // 0x2
+ field public static final int CONTROL_AE_STATE_FLASH_REQUIRED = 4; // 0x4
+ field public static final int CONTROL_AE_STATE_INACTIVE = 0; // 0x0
+ field public static final int CONTROL_AE_STATE_LOCKED = 3; // 0x3
+ field public static final int CONTROL_AE_STATE_PRECAPTURE = 5; // 0x5
+ field public static final int CONTROL_AE_STATE_SEARCHING = 1; // 0x1
+ field public static final int CONTROL_AF_MODE_AUTO = 1; // 0x1
+ field public static final int CONTROL_AF_MODE_CONTINUOUS_PICTURE = 4; // 0x4
+ field public static final int CONTROL_AF_MODE_CONTINUOUS_VIDEO = 3; // 0x3
+ field public static final int CONTROL_AF_MODE_EDOF = 5; // 0x5
+ field public static final int CONTROL_AF_MODE_MACRO = 2; // 0x2
+ field public static final int CONTROL_AF_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_AF_STATE_ACTIVE_SCAN = 3; // 0x3
+ field public static final int CONTROL_AF_STATE_FOCUSED_LOCKED = 4; // 0x4
+ field public static final int CONTROL_AF_STATE_INACTIVE = 0; // 0x0
+ field public static final int CONTROL_AF_STATE_NOT_FOCUSED_LOCKED = 5; // 0x5
+ field public static final int CONTROL_AF_STATE_PASSIVE_FOCUSED = 2; // 0x2
+ field public static final int CONTROL_AF_STATE_PASSIVE_SCAN = 1; // 0x1
+ field public static final int CONTROL_AF_STATE_PASSIVE_UNFOCUSED = 6; // 0x6
+ field public static final int CONTROL_AF_TRIGGER_CANCEL = 2; // 0x2
+ field public static final int CONTROL_AF_TRIGGER_IDLE = 0; // 0x0
+ field public static final int CONTROL_AF_TRIGGER_START = 1; // 0x1
+ field public static final int CONTROL_AWB_MODE_AUTO = 1; // 0x1
+ field public static final int CONTROL_AWB_MODE_CLOUDY_DAYLIGHT = 6; // 0x6
+ field public static final int CONTROL_AWB_MODE_DAYLIGHT = 5; // 0x5
+ field public static final int CONTROL_AWB_MODE_FLUORESCENT = 3; // 0x3
+ field public static final int CONTROL_AWB_MODE_INCANDESCENT = 2; // 0x2
+ field public static final int CONTROL_AWB_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_AWB_MODE_SHADE = 8; // 0x8
+ field public static final int CONTROL_AWB_MODE_TWILIGHT = 7; // 0x7
+ field public static final int CONTROL_AWB_MODE_WARM_FLUORESCENT = 4; // 0x4
+ field public static final int CONTROL_AWB_STATE_CONVERGED = 2; // 0x2
+ field public static final int CONTROL_AWB_STATE_INACTIVE = 0; // 0x0
+ field public static final int CONTROL_AWB_STATE_LOCKED = 3; // 0x3
+ field public static final int CONTROL_AWB_STATE_SEARCHING = 1; // 0x1
+ field public static final int CONTROL_CAPTURE_INTENT_CUSTOM = 0; // 0x0
+ field public static final int CONTROL_CAPTURE_INTENT_MANUAL = 6; // 0x6
+ field public static final int CONTROL_CAPTURE_INTENT_PREVIEW = 1; // 0x1
+ field public static final int CONTROL_CAPTURE_INTENT_STILL_CAPTURE = 2; // 0x2
+ field public static final int CONTROL_CAPTURE_INTENT_VIDEO_RECORD = 3; // 0x3
+ field public static final int CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT = 4; // 0x4
+ field public static final int CONTROL_CAPTURE_INTENT_ZERO_SHUTTER_LAG = 5; // 0x5
+ field public static final int CONTROL_EFFECT_MODE_AQUA = 8; // 0x8
+ field public static final int CONTROL_EFFECT_MODE_BLACKBOARD = 7; // 0x7
+ field public static final int CONTROL_EFFECT_MODE_MONO = 1; // 0x1
+ field public static final int CONTROL_EFFECT_MODE_NEGATIVE = 2; // 0x2
+ field public static final int CONTROL_EFFECT_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_EFFECT_MODE_POSTERIZE = 5; // 0x5
+ field public static final int CONTROL_EFFECT_MODE_SEPIA = 4; // 0x4
+ field public static final int CONTROL_EFFECT_MODE_SOLARIZE = 3; // 0x3
+ field public static final int CONTROL_EFFECT_MODE_WHITEBOARD = 6; // 0x6
+ field public static final int CONTROL_MODE_AUTO = 1; // 0x1
+ field public static final int CONTROL_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_MODE_OFF_KEEP_STATE = 3; // 0x3
+ field public static final int CONTROL_MODE_USE_SCENE_MODE = 2; // 0x2
+ field public static final int CONTROL_SCENE_MODE_ACTION = 2; // 0x2
+ field public static final int CONTROL_SCENE_MODE_BARCODE = 16; // 0x10
+ field public static final int CONTROL_SCENE_MODE_BEACH = 8; // 0x8
+ field public static final int CONTROL_SCENE_MODE_CANDLELIGHT = 15; // 0xf
+ field public static final int CONTROL_SCENE_MODE_DISABLED = 0; // 0x0
+ field public static final int CONTROL_SCENE_MODE_FACE_PRIORITY = 1; // 0x1
+ field public static final int CONTROL_SCENE_MODE_FIREWORKS = 12; // 0xc
+ field public static final int CONTROL_SCENE_MODE_HDR = 18; // 0x12
+ field public static final deprecated int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO = 17; // 0x11
+ field public static final int CONTROL_SCENE_MODE_LANDSCAPE = 4; // 0x4
+ field public static final int CONTROL_SCENE_MODE_NIGHT = 5; // 0x5
+ field public static final int CONTROL_SCENE_MODE_NIGHT_PORTRAIT = 6; // 0x6
+ field public static final int CONTROL_SCENE_MODE_PARTY = 14; // 0xe
+ field public static final int CONTROL_SCENE_MODE_PORTRAIT = 3; // 0x3
+ field public static final int CONTROL_SCENE_MODE_SNOW = 9; // 0x9
+ field public static final int CONTROL_SCENE_MODE_SPORTS = 13; // 0xd
+ field public static final int CONTROL_SCENE_MODE_STEADYPHOTO = 11; // 0xb
+ field public static final int CONTROL_SCENE_MODE_SUNSET = 10; // 0xa
+ field public static final int CONTROL_SCENE_MODE_THEATRE = 7; // 0x7
+ field public static final int CONTROL_VIDEO_STABILIZATION_MODE_OFF = 0; // 0x0
+ field public static final int CONTROL_VIDEO_STABILIZATION_MODE_ON = 1; // 0x1
+ field public static final int EDGE_MODE_FAST = 1; // 0x1
+ field public static final int EDGE_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int EDGE_MODE_OFF = 0; // 0x0
+ field public static final int EDGE_MODE_ZERO_SHUTTER_LAG = 3; // 0x3
+ field public static final int FLASH_MODE_OFF = 0; // 0x0
+ field public static final int FLASH_MODE_SINGLE = 1; // 0x1
+ field public static final int FLASH_MODE_TORCH = 2; // 0x2
+ field public static final int FLASH_STATE_CHARGING = 1; // 0x1
+ field public static final int FLASH_STATE_FIRED = 3; // 0x3
+ field public static final int FLASH_STATE_PARTIAL = 4; // 0x4
+ field public static final int FLASH_STATE_READY = 2; // 0x2
+ field public static final int FLASH_STATE_UNAVAILABLE = 0; // 0x0
+ field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1
+ field public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int HOT_PIXEL_MODE_OFF = 0; // 0x0
+ field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1
+ field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2; // 0x2
+ field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0
+ field public static final int LENS_FACING_BACK = 1; // 0x1
+ field public static final int LENS_FACING_EXTERNAL = 2; // 0x2
+ field public static final int LENS_FACING_FRONT = 0; // 0x0
+ field public static final int LENS_INFO_FOCUS_DISTANCE_CALIBRATION_APPROXIMATE = 1; // 0x1
+ field public static final int LENS_INFO_FOCUS_DISTANCE_CALIBRATION_CALIBRATED = 2; // 0x2
+ field public static final int LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED = 0; // 0x0
+ field public static final int LENS_OPTICAL_STABILIZATION_MODE_OFF = 0; // 0x0
+ field public static final int LENS_OPTICAL_STABILIZATION_MODE_ON = 1; // 0x1
+ field public static final int LENS_STATE_MOVING = 1; // 0x1
+ field public static final int LENS_STATE_STATIONARY = 0; // 0x0
+ field public static final int NOISE_REDUCTION_MODE_FAST = 1; // 0x1
+ field public static final int NOISE_REDUCTION_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int NOISE_REDUCTION_MODE_MINIMAL = 3; // 0x3
+ field public static final int NOISE_REDUCTION_MODE_OFF = 0; // 0x0
+ field public static final int NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG = 4; // 0x4
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE = 0; // 0x0
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO = 9; // 0x9
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5
+ field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7
+ field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0
+ field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1
+ field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR = 3; // 0x3
+ field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GBRG = 2; // 0x2
+ field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GRBG = 1; // 0x1
+ field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGB = 4; // 0x4
+ field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGGB = 0; // 0x0
+ field public static final int SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME = 1; // 0x1
+ field public static final int SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN = 0; // 0x0
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_CLOUDY_WEATHER = 10; // 0xa
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_COOL_WHITE_FLUORESCENT = 14; // 0xe
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_D50 = 23; // 0x17
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_D55 = 20; // 0x14
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_D65 = 21; // 0x15
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_D75 = 22; // 0x16
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_DAYLIGHT = 1; // 0x1
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_DAYLIGHT_FLUORESCENT = 12; // 0xc
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_DAY_WHITE_FLUORESCENT = 13; // 0xd
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_FINE_WEATHER = 9; // 0x9
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_FLASH = 4; // 0x4
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_FLUORESCENT = 2; // 0x2
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_ISO_STUDIO_TUNGSTEN = 24; // 0x18
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_SHADE = 11; // 0xb
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_STANDARD_A = 17; // 0x11
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_STANDARD_B = 18; // 0x12
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_STANDARD_C = 19; // 0x13
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_TUNGSTEN = 3; // 0x3
+ field public static final int SENSOR_REFERENCE_ILLUMINANT1_WHITE_FLUORESCENT = 15; // 0xf
+ field public static final int SENSOR_TEST_PATTERN_MODE_COLOR_BARS = 2; // 0x2
+ field public static final int SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY = 3; // 0x3
+ field public static final int SENSOR_TEST_PATTERN_MODE_CUSTOM1 = 256; // 0x100
+ field public static final int SENSOR_TEST_PATTERN_MODE_OFF = 0; // 0x0
+ field public static final int SENSOR_TEST_PATTERN_MODE_PN9 = 4; // 0x4
+ field public static final int SENSOR_TEST_PATTERN_MODE_SOLID_COLOR = 1; // 0x1
+ field public static final int SHADING_MODE_FAST = 1; // 0x1
+ field public static final int SHADING_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int SHADING_MODE_OFF = 0; // 0x0
+ field public static final int STATISTICS_FACE_DETECT_MODE_FULL = 2; // 0x2
+ field public static final int STATISTICS_FACE_DETECT_MODE_OFF = 0; // 0x0
+ field public static final int STATISTICS_FACE_DETECT_MODE_SIMPLE = 1; // 0x1
+ field public static final int STATISTICS_LENS_SHADING_MAP_MODE_OFF = 0; // 0x0
+ field public static final int STATISTICS_LENS_SHADING_MAP_MODE_ON = 1; // 0x1
+ field public static final int STATISTICS_SCENE_FLICKER_50HZ = 1; // 0x1
+ field public static final int STATISTICS_SCENE_FLICKER_60HZ = 2; // 0x2
+ field public static final int STATISTICS_SCENE_FLICKER_NONE = 0; // 0x0
+ field public static final int SYNC_MAX_LATENCY_PER_FRAME_CONTROL = 0; // 0x0
+ field public static final int SYNC_MAX_LATENCY_UNKNOWN = -1; // 0xffffffff
+ field public static final int TONEMAP_MODE_CONTRAST_CURVE = 0; // 0x0
+ field public static final int TONEMAP_MODE_FAST = 1; // 0x1
+ field public static final int TONEMAP_MODE_GAMMA_VALUE = 3; // 0x3
+ field public static final int TONEMAP_MODE_HIGH_QUALITY = 2; // 0x2
+ field public static final int TONEMAP_MODE_PRESET_CURVE = 4; // 0x4
+ field public static final int TONEMAP_PRESET_CURVE_REC709 = 1; // 0x1
+ field public static final int TONEMAP_PRESET_CURVE_SRGB = 0; // 0x0
+ }
+
+ public class CaptureFailure {
+ method public long getFrameNumber();
+ method public int getReason();
+ method public android.hardware.camera2.CaptureRequest getRequest();
+ method public int getSequenceId();
+ method public boolean wasImageCaptured();
+ field public static final int REASON_ERROR = 0; // 0x0
+ field public static final int REASON_FLUSHED = 1; // 0x1
+ }
+
+ public final class CaptureRequest extends android.hardware.camera2.CameraMetadata implements android.os.Parcelable {
+ method public int describeContents();
+ method public T get(android.hardware.camera2.CaptureRequest.Key<T>);
+ method public java.lang.Object getTag();
+ method public boolean isReprocess();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> BLACK_LEVEL_LOCK;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> COLOR_CORRECTION_ABERRATION_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.RggbChannelVector> COLOR_CORRECTION_GAINS;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> COLOR_CORRECTION_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.ColorSpaceTransform> COLOR_CORRECTION_TRANSFORM;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AE_ANTIBANDING_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AE_EXPOSURE_COMPENSATION;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> CONTROL_AE_LOCK;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AE_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AE_PRECAPTURE_TRIGGER;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AE_REGIONS;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_TARGET_FPS_RANGE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AF_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AF_REGIONS;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AF_TRIGGER;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> CONTROL_AWB_LOCK;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_AWB_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AWB_REGIONS;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_SCENE_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
+ field public static final android.os.Parcelable.Creator<android.hardware.camera2.CaptureRequest> CREATOR;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EDGE_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> FLASH_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> HOT_PIXEL_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.location.Location> JPEG_GPS_LOCATION;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> JPEG_ORIENTATION;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Byte> JPEG_QUALITY;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Byte> JPEG_THUMBNAIL_QUALITY;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.util.Size> JPEG_THUMBNAIL_SIZE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> LENS_APERTURE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> LENS_FILTER_DENSITY;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> LENS_FOCAL_LENGTH;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> LENS_FOCUS_DISTANCE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> LENS_OPTICAL_STABILIZATION_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> NOISE_REDUCTION_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.graphics.Rect> SCALER_CROP_REGION;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Long> SENSOR_EXPOSURE_TIME;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Long> SENSOR_FRAME_DURATION;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> SENSOR_SENSITIVITY;
+ field public static final android.hardware.camera2.CaptureRequest.Key<int[]> SENSOR_TEST_PATTERN_DATA;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> SENSOR_TEST_PATTERN_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> SHADING_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> STATISTICS_FACE_DETECT_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> STATISTICS_HOT_PIXEL_MAP_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> TONEMAP_GAMMA;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> TONEMAP_MODE;
+ field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> TONEMAP_PRESET_CURVE;
+ }
+
+ public static final class CaptureRequest.Builder {
+ method public void addTarget(android.view.Surface);
+ method public android.hardware.camera2.CaptureRequest build();
+ method public T get(android.hardware.camera2.CaptureRequest.Key<T>);
+ method public void removeTarget(android.view.Surface);
+ method public void set(android.hardware.camera2.CaptureRequest.Key<T>, T);
+ method public void setTag(java.lang.Object);
+ }
+
+ public static final class CaptureRequest.Key {
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.String getName();
+ method public final int hashCode();
+ }
+
+ public class CaptureResult extends android.hardware.camera2.CameraMetadata {
+ method public T get(android.hardware.camera2.CaptureResult.Key<T>);
+ method public long getFrameNumber();
+ method public android.hardware.camera2.CaptureRequest getRequest();
+ method public int getSequenceId();
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> BLACK_LEVEL_LOCK;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> COLOR_CORRECTION_ABERRATION_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.RggbChannelVector> COLOR_CORRECTION_GAINS;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> COLOR_CORRECTION_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.ColorSpaceTransform> COLOR_CORRECTION_TRANSFORM;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AE_ANTIBANDING_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AE_EXPOSURE_COMPENSATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> CONTROL_AE_LOCK;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AE_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AE_PRECAPTURE_TRIGGER;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AE_REGIONS;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AE_STATE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.util.Range<java.lang.Integer>> CONTROL_AE_TARGET_FPS_RANGE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AF_REGIONS;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_STATE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AF_TRIGGER;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> CONTROL_AWB_LOCK;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AWB_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AWB_REGIONS;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_AWB_STATE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_CAPTURE_INTENT;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_EFFECT_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_SCENE_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EDGE_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> FLASH_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> FLASH_STATE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> HOT_PIXEL_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.location.Location> JPEG_GPS_LOCATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> JPEG_ORIENTATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> JPEG_QUALITY;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> JPEG_THUMBNAIL_QUALITY;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.util.Size> JPEG_THUMBNAIL_SIZE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_APERTURE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FILTER_DENSITY;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FOCAL_LENGTH;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FOCUS_DISTANCE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Float, java.lang.Float>> LENS_FOCUS_RANGE;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_INTRINSIC_CALIBRATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_OPTICAL_STABILIZATION_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_POSE_ROTATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_POSE_TRANSLATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_RADIAL_DISTORTION;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_STATE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> NOISE_REDUCTION_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> REQUEST_PIPELINE_DEPTH;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> SCALER_CROP_REGION;
+ field public static final android.hardware.camera2.CaptureResult.Key<float[]> SENSOR_DYNAMIC_BLACK_LEVEL;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SENSOR_DYNAMIC_WHITE_LEVEL;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_EXPOSURE_TIME;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_FRAME_DURATION;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> SENSOR_GREEN_SPLIT;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.util.Rational[]> SENSOR_NEUTRAL_COLOR_POINT;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Double, java.lang.Double>[]> SENSOR_NOISE_PROFILE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_ROLLING_SHUTTER_SKEW;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SENSOR_SENSITIVITY;
+ field public static final android.hardware.camera2.CaptureResult.Key<int[]> SENSOR_TEST_PATTERN_DATA;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SENSOR_TEST_PATTERN_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_TIMESTAMP;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SHADING_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.Face[]> STATISTICS_FACES;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_FACE_DETECT_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Point[]> STATISTICS_HOT_PIXEL_MAP;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> STATISTICS_HOT_PIXEL_MAP_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.LensShadingMap> STATISTICS_LENS_SHADING_CORRECTION_MAP;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_SCENE_FLICKER;
+ field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> TONEMAP_GAMMA;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> TONEMAP_MODE;
+ field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> TONEMAP_PRESET_CURVE;
+ }
+
+ public static final class CaptureResult.Key {
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.String getName();
+ method public final int hashCode();
+ }
+
+ public final class DngCreator implements java.lang.AutoCloseable {
+ ctor public DngCreator(android.hardware.camera2.CameraCharacteristics, android.hardware.camera2.CaptureResult);
+ method public void close();
+ method public android.hardware.camera2.DngCreator setDescription(java.lang.String);
+ method public android.hardware.camera2.DngCreator setLocation(android.location.Location);
+ method public android.hardware.camera2.DngCreator setOrientation(int);
+ method public android.hardware.camera2.DngCreator setThumbnail(android.graphics.Bitmap);
+ method public android.hardware.camera2.DngCreator setThumbnail(android.media.Image);
+ method public void writeByteBuffer(java.io.OutputStream, android.util.Size, java.nio.ByteBuffer, long) throws java.io.IOException;
+ method public void writeImage(java.io.OutputStream, android.media.Image) throws java.io.IOException;
+ method public void writeInputStream(java.io.OutputStream, android.util.Size, java.io.InputStream, long) throws java.io.IOException;
+ field public static final int MAX_THUMBNAIL_DIMENSION = 256; // 0x100
+ }
+
+ public final class TotalCaptureResult extends android.hardware.camera2.CaptureResult {
+ method public java.util.List<android.hardware.camera2.CaptureResult> getPartialResults();
+ }
+
+}
+
+package android.hardware.camera2.params {
+
+ public final class BlackLevelPattern {
+ method public void copyTo(int[], int);
+ method public int getOffsetForIndex(int, int);
+ field public static final int COUNT = 4; // 0x4
+ }
+
+ public final class ColorSpaceTransform {
+ ctor public ColorSpaceTransform(android.util.Rational[]);
+ ctor public ColorSpaceTransform(int[]);
+ method public void copyElements(android.util.Rational[], int);
+ method public void copyElements(int[], int);
+ method public android.util.Rational getElement(int, int);
+ }
+
+ public final class Face {
+ method public android.graphics.Rect getBounds();
+ method public int getId();
+ method public android.graphics.Point getLeftEyePosition();
+ method public android.graphics.Point getMouthPosition();
+ method public android.graphics.Point getRightEyePosition();
+ method public int getScore();
+ field public static final int ID_UNSUPPORTED = -1; // 0xffffffff
+ field public static final int SCORE_MAX = 100; // 0x64
+ field public static final int SCORE_MIN = 1; // 0x1
+ }
+
+ public final class InputConfiguration {
+ ctor public InputConfiguration(int, int, int);
+ method public int getFormat();
+ method public int getHeight();
+ method public int getWidth();
+ }
+
+ public final class LensShadingMap {
+ method public void copyGainFactors(float[], int);
+ method public int getColumnCount();
+ method public float getGainFactor(int, int, int);
+ method public int getGainFactorCount();
+ method public android.hardware.camera2.params.RggbChannelVector getGainFactorVector(int, int);
+ method public int getRowCount();
+ field public static final float MINIMUM_GAIN_FACTOR = 1.0f;
+ }
+
+ public final class MeteringRectangle {
+ ctor public MeteringRectangle(int, int, int, int, int);
+ ctor public MeteringRectangle(android.graphics.Point, android.util.Size, int);
+ ctor public MeteringRectangle(android.graphics.Rect, int);
+ method public boolean equals(android.hardware.camera2.params.MeteringRectangle);
+ method public int getHeight();
+ method public int getMeteringWeight();
+ method public android.graphics.Rect getRect();
+ method public android.util.Size getSize();
+ method public android.graphics.Point getUpperLeftPoint();
+ method public int getWidth();
+ method public int getX();
+ method public int getY();
+ field public static final int METERING_WEIGHT_DONT_CARE = 0; // 0x0
+ field public static final int METERING_WEIGHT_MAX = 1000; // 0x3e8
+ field public static final int METERING_WEIGHT_MIN = 0; // 0x0
+ }
+
+ public final class RggbChannelVector {
+ ctor public RggbChannelVector(float, float, float, float);
+ method public void copyTo(float[], int);
+ method public float getBlue();
+ method public float getComponent(int);
+ method public float getGreenEven();
+ method public float getGreenOdd();
+ method public final float getRed();
+ field public static final int BLUE = 3; // 0x3
+ field public static final int COUNT = 4; // 0x4
+ field public static final int GREEN_EVEN = 1; // 0x1
+ field public static final int GREEN_ODD = 2; // 0x2
+ field public static final int RED = 0; // 0x0
+ }
+
+ public final class StreamConfigurationMap {
+ method public android.util.Size[] getHighResolutionOutputSizes(int);
+ method public android.util.Range<java.lang.Integer>[] getHighSpeedVideoFpsRanges();
+ method public android.util.Range<java.lang.Integer>[] getHighSpeedVideoFpsRangesFor(android.util.Size);
+ method public android.util.Size[] getHighSpeedVideoSizes();
+ method public android.util.Size[] getHighSpeedVideoSizesFor(android.util.Range<java.lang.Integer>);
+ method public final int[] getInputFormats();
+ method public android.util.Size[] getInputSizes(int);
+ method public final int[] getOutputFormats();
+ method public long getOutputMinFrameDuration(int, android.util.Size);
+ method public long getOutputMinFrameDuration(java.lang.Class<T>, android.util.Size);
+ method public android.util.Size[] getOutputSizes(java.lang.Class<T>);
+ method public android.util.Size[] getOutputSizes(int);
+ method public long getOutputStallDuration(int, android.util.Size);
+ method public long getOutputStallDuration(java.lang.Class<T>, android.util.Size);
+ method public final int[] getValidOutputFormatsForInput(int);
+ method public boolean isOutputSupportedFor(int);
+ method public static boolean isOutputSupportedFor(java.lang.Class<T>);
+ method public boolean isOutputSupportedFor(android.view.Surface);
+ }
+
+ public final class TonemapCurve {
+ ctor public TonemapCurve(float[], float[], float[]);
+ method public void copyColorCurve(int, float[], int);
+ method public android.graphics.PointF getPoint(int, int);
+ method public int getPointCount(int);
+ field public static final int CHANNEL_BLUE = 2; // 0x2
+ field public static final int CHANNEL_GREEN = 1; // 0x1
+ field public static final int CHANNEL_RED = 0; // 0x0
+ field public static final float LEVEL_BLACK = 0.0f;
+ field public static final float LEVEL_WHITE = 1.0f;
+ field public static final int POINT_SIZE = 2; // 0x2
+ }
+
+}
+
+package android.hardware.display {
+
+ public final class DisplayManager {
+ method public android.hardware.display.VirtualDisplay createVirtualDisplay(java.lang.String, int, int, int, android.view.Surface, int);
+ method public android.hardware.display.VirtualDisplay createVirtualDisplay(java.lang.String, int, int, int, android.view.Surface, int, android.hardware.display.VirtualDisplay.Callback, android.os.Handler);
+ method public android.view.Display getDisplay(int);
+ method public android.view.Display[] getDisplays();
+ method public android.view.Display[] getDisplays(java.lang.String);
+ method public void registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener, android.os.Handler);
+ method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
+ field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
+ field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
+ field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
+ field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
+ field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
+ field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
+ }
+
+ public static abstract interface DisplayManager.DisplayListener {
+ method public abstract void onDisplayAdded(int);
+ method public abstract void onDisplayChanged(int);
+ method public abstract void onDisplayRemoved(int);
+ }
+
+ public final class VirtualDisplay {
+ method public android.view.Display getDisplay();
+ method public android.view.Surface getSurface();
+ method public void release();
+ method public void resize(int, int, int);
+ method public void setSurface(android.view.Surface);
+ }
+
+ public static abstract class VirtualDisplay.Callback {
+ ctor public VirtualDisplay.Callback();
+ method public void onPaused();
+ method public void onResumed();
+ method public void onStopped();
+ }
+
+}
+
+package android.hardware.fingerprint {
+
+ public class FingerprintManager {
+ method public void authenticate(android.hardware.fingerprint.FingerprintManager.CryptoObject, android.os.CancellationSignal, int, android.hardware.fingerprint.FingerprintManager.AuthenticationCallback, android.os.Handler);
+ method public boolean hasEnrolledFingerprints();
+ method public boolean isHardwareDetected();
+ field public static final int FINGERPRINT_ACQUIRED_GOOD = 0; // 0x0
+ field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3
+ field public static final int FINGERPRINT_ACQUIRED_INSUFFICIENT = 2; // 0x2
+ field public static final int FINGERPRINT_ACQUIRED_PARTIAL = 1; // 0x1
+ field public static final int FINGERPRINT_ACQUIRED_TOO_FAST = 5; // 0x5
+ field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4
+ field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5
+ field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1
+ field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7
+ field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4
+ field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3
+ field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2
+ }
+
+ public static abstract class FingerprintManager.AuthenticationCallback {
+ ctor public FingerprintManager.AuthenticationCallback();
+ method public void onAuthenticationError(int, java.lang.CharSequence);
+ method public void onAuthenticationFailed();
+ method public void onAuthenticationHelp(int, java.lang.CharSequence);
+ method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);
+ }
+
+ public static class FingerprintManager.AuthenticationResult {
+ method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();
+ }
+
+ public static final class FingerprintManager.CryptoObject {
+ ctor public FingerprintManager.CryptoObject(java.security.Signature);
+ ctor public FingerprintManager.CryptoObject(javax.crypto.Cipher);
+ ctor public FingerprintManager.CryptoObject(javax.crypto.Mac);
+ method public javax.crypto.Cipher getCipher();
+ method public javax.crypto.Mac getMac();
+ method public java.security.Signature getSignature();
+ }
+
+}
+
+package android.hardware.input {
+
+ public final class InputManager {
+ method public android.view.InputDevice getInputDevice(int);
+ method public int[] getInputDeviceIds();
+ method public void registerInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener, android.os.Handler);
+ method public void unregisterInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener);
+ field public static final java.lang.String ACTION_QUERY_KEYBOARD_LAYOUTS = "android.hardware.input.action.QUERY_KEYBOARD_LAYOUTS";
+ field public static final java.lang.String META_DATA_KEYBOARD_LAYOUTS = "android.hardware.input.metadata.KEYBOARD_LAYOUTS";
+ }
+
+ public static abstract interface InputManager.InputDeviceListener {
+ method public abstract void onInputDeviceAdded(int);
+ method public abstract void onInputDeviceChanged(int);
+ method public abstract void onInputDeviceRemoved(int);
+ }
+
+}
+
+package android.hardware.usb {
+
+ public class UsbAccessory implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String getDescription();
+ method public java.lang.String getManufacturer();
+ method public java.lang.String getModel();
+ method public java.lang.String getSerial();
+ method public java.lang.String getUri();
+ method public java.lang.String getVersion();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbAccessory> CREATOR;
+ }
+
+ public class UsbConfiguration implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getId();
+ method public android.hardware.usb.UsbInterface getInterface(int);
+ method public int getInterfaceCount();
+ method public int getMaxPower();
+ method public java.lang.String getName();
+ method public boolean isRemoteWakeup();
+ method public boolean isSelfPowered();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbConfiguration> CREATOR;
+ }
+
+ public final class UsbConstants {
+ ctor public UsbConstants();
+ field public static final int USB_CLASS_APP_SPEC = 254; // 0xfe
+ field public static final int USB_CLASS_AUDIO = 1; // 0x1
+ field public static final int USB_CLASS_CDC_DATA = 10; // 0xa
+ field public static final int USB_CLASS_COMM = 2; // 0x2
+ field public static final int USB_CLASS_CONTENT_SEC = 13; // 0xd
+ field public static final int USB_CLASS_CSCID = 11; // 0xb
+ field public static final int USB_CLASS_HID = 3; // 0x3
+ field public static final int USB_CLASS_HUB = 9; // 0x9
+ field public static final int USB_CLASS_MASS_STORAGE = 8; // 0x8
+ field public static final int USB_CLASS_MISC = 239; // 0xef
+ field public static final int USB_CLASS_PER_INTERFACE = 0; // 0x0
+ field public static final int USB_CLASS_PHYSICA = 5; // 0x5
+ field public static final int USB_CLASS_PRINTER = 7; // 0x7
+ field public static final int USB_CLASS_STILL_IMAGE = 6; // 0x6
+ field public static final int USB_CLASS_VENDOR_SPEC = 255; // 0xff
+ field public static final int USB_CLASS_VIDEO = 14; // 0xe
+ field public static final int USB_CLASS_WIRELESS_CONTROLLER = 224; // 0xe0
+ field public static final int USB_DIR_IN = 128; // 0x80
+ field public static final int USB_DIR_OUT = 0; // 0x0
+ field public static final int USB_ENDPOINT_DIR_MASK = 128; // 0x80
+ field public static final int USB_ENDPOINT_NUMBER_MASK = 15; // 0xf
+ field public static final int USB_ENDPOINT_XFERTYPE_MASK = 3; // 0x3
+ field public static final int USB_ENDPOINT_XFER_BULK = 2; // 0x2
+ field public static final int USB_ENDPOINT_XFER_CONTROL = 0; // 0x0
+ field public static final int USB_ENDPOINT_XFER_INT = 3; // 0x3
+ field public static final int USB_ENDPOINT_XFER_ISOC = 1; // 0x1
+ field public static final int USB_INTERFACE_SUBCLASS_BOOT = 1; // 0x1
+ field public static final int USB_SUBCLASS_VENDOR_SPEC = 255; // 0xff
+ field public static final int USB_TYPE_CLASS = 32; // 0x20
+ field public static final int USB_TYPE_MASK = 96; // 0x60
+ field public static final int USB_TYPE_RESERVED = 96; // 0x60
+ field public static final int USB_TYPE_STANDARD = 0; // 0x0
+ field public static final int USB_TYPE_VENDOR = 64; // 0x40
+ }
+
+ public class UsbDevice implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.hardware.usb.UsbConfiguration getConfiguration(int);
+ method public int getConfigurationCount();
+ method public int getDeviceClass();
+ method public int getDeviceId();
+ method public static int getDeviceId(java.lang.String);
+ method public java.lang.String getDeviceName();
+ method public static java.lang.String getDeviceName(int);
+ method public int getDeviceProtocol();
+ method public int getDeviceSubclass();
+ method public android.hardware.usb.UsbInterface getInterface(int);
+ method public int getInterfaceCount();
+ method public java.lang.String getManufacturerName();
+ method public int getProductId();
+ method public java.lang.String getProductName();
+ method public java.lang.String getSerialNumber();
+ method public int getVendorId();
+ method public java.lang.String getVersion();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbDevice> CREATOR;
+ }
+
+ public class UsbDeviceConnection {
+ method public int bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int);
+ method public int bulkTransfer(android.hardware.usb.UsbEndpoint, byte[], int, int, int);
+ method public boolean claimInterface(android.hardware.usb.UsbInterface, boolean);
+ method public void close();
+ method public int controlTransfer(int, int, int, int, byte[], int, int);
+ method public int controlTransfer(int, int, int, int, byte[], int, int, int);
+ method public int getFileDescriptor();
+ method public byte[] getRawDescriptors();
+ method public java.lang.String getSerial();
+ method public boolean releaseInterface(android.hardware.usb.UsbInterface);
+ method public android.hardware.usb.UsbRequest requestWait();
+ method public boolean setConfiguration(android.hardware.usb.UsbConfiguration);
+ method public boolean setInterface(android.hardware.usb.UsbInterface);
+ }
+
+ public class UsbEndpoint implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getAddress();
+ method public int getAttributes();
+ method public int getDirection();
+ method public int getEndpointNumber();
+ method public int getInterval();
+ method public int getMaxPacketSize();
+ method public int getType();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbEndpoint> CREATOR;
+ }
+
+ public class UsbInterface implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getAlternateSetting();
+ method public android.hardware.usb.UsbEndpoint getEndpoint(int);
+ method public int getEndpointCount();
+ method public int getId();
+ method public int getInterfaceClass();
+ method public int getInterfaceProtocol();
+ method public int getInterfaceSubclass();
+ method public java.lang.String getName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbInterface> CREATOR;
+ }
+
+ public class UsbManager {
+ method public android.hardware.usb.UsbAccessory[] getAccessoryList();
+ method public java.util.HashMap<java.lang.String, android.hardware.usb.UsbDevice> getDeviceList();
+ method public boolean hasPermission(android.hardware.usb.UsbDevice);
+ method public boolean hasPermission(android.hardware.usb.UsbAccessory);
+ method public android.os.ParcelFileDescriptor openAccessory(android.hardware.usb.UsbAccessory);
+ method public android.hardware.usb.UsbDeviceConnection openDevice(android.hardware.usb.UsbDevice);
+ method public void requestPermission(android.hardware.usb.UsbDevice, android.app.PendingIntent);
+ method public void requestPermission(android.hardware.usb.UsbAccessory, android.app.PendingIntent);
+ field public static final java.lang.String ACTION_USB_ACCESSORY_ATTACHED = "android.hardware.usb.action.USB_ACCESSORY_ATTACHED";
+ field public static final java.lang.String ACTION_USB_ACCESSORY_DETACHED = "android.hardware.usb.action.USB_ACCESSORY_DETACHED";
+ field public static final java.lang.String ACTION_USB_DEVICE_ATTACHED = "android.hardware.usb.action.USB_DEVICE_ATTACHED";
+ field public static final java.lang.String ACTION_USB_DEVICE_DETACHED = "android.hardware.usb.action.USB_DEVICE_DETACHED";
+ field public static final java.lang.String EXTRA_ACCESSORY = "accessory";
+ field public static final java.lang.String EXTRA_DEVICE = "device";
+ field public static final java.lang.String EXTRA_PERMISSION_GRANTED = "permission";
+ }
+
+ public class UsbRequest {
+ ctor public UsbRequest();
+ method public boolean cancel();
+ method public void close();
+ method public java.lang.Object getClientData();
+ method public android.hardware.usb.UsbEndpoint getEndpoint();
+ method public boolean initialize(android.hardware.usb.UsbDeviceConnection, android.hardware.usb.UsbEndpoint);
+ method public boolean queue(java.nio.ByteBuffer, int);
+ method public void setClientData(java.lang.Object);
+ }
+
+}
+
+package android.icu.lang {
+
+ public final class UCharacter implements android.icu.lang.UCharacterEnums.ECharacterCategory android.icu.lang.UCharacterEnums.ECharacterDirection {
+ method public static int charCount(int);
+ method public static final int codePointAt(java.lang.CharSequence, int);
+ method public static final int codePointAt(char[], int);
+ method public static final int codePointAt(char[], int, int);
+ method public static final int codePointBefore(java.lang.CharSequence, int);
+ method public static final int codePointBefore(char[], int);
+ method public static final int codePointBefore(char[], int, int);
+ method public static int codePointCount(java.lang.CharSequence, int, int);
+ method public static int codePointCount(char[], int, int);
+ method public static int digit(int, int);
+ method public static int digit(int);
+ method public static int foldCase(int, boolean);
+ method public static java.lang.String foldCase(java.lang.String, boolean);
+ method public static int foldCase(int, int);
+ method public static final java.lang.String foldCase(java.lang.String, int);
+ method public static char forDigit(int, int);
+ method public static android.icu.util.VersionInfo getAge(int);
+ method public static int getBidiPairedBracket(int);
+ method public static int getCharFromExtendedName(java.lang.String);
+ method public static int getCharFromName(java.lang.String);
+ method public static int getCharFromNameAlias(java.lang.String);
+ method public static int getCodePoint(char, char);
+ method public static int getCodePoint(char);
+ method public static int getCombiningClass(int);
+ method public static int getDirection(int);
+ method public static byte getDirectionality(int);
+ method public static java.lang.String getExtendedName(int);
+ method public static android.icu.util.ValueIterator getExtendedNameIterator();
+ method public static int getHanNumericValue(int);
+ method public static int getIntPropertyMaxValue(int);
+ method public static int getIntPropertyMinValue(int);
+ method public static int getIntPropertyValue(int, int);
+ method public static int getMirror(int);
+ method public static java.lang.String getName(int);
+ method public static java.lang.String getName(java.lang.String, java.lang.String);
+ method public static java.lang.String getNameAlias(int);
+ method public static android.icu.util.ValueIterator getNameIterator();
+ method public static int getNumericValue(int);
+ method public static int getPropertyEnum(java.lang.CharSequence);
+ method public static java.lang.String getPropertyName(int, int);
+ method public static int getPropertyValueEnum(int, java.lang.CharSequence);
+ method public static java.lang.String getPropertyValueName(int, int, int);
+ method public static int getType(int);
+ method public static android.icu.util.RangeValueIterator getTypeIterator();
+ method public static double getUnicodeNumericValue(int);
+ method public static android.icu.util.VersionInfo getUnicodeVersion();
+ method public static boolean hasBinaryProperty(int, int);
+ method public static boolean isBMP(int);
+ method public static boolean isBaseForm(int);
+ method public static boolean isDefined(int);
+ method public static boolean isDigit(int);
+ method public static boolean isHighSurrogate(char);
+ method public static boolean isISOControl(int);
+ method public static boolean isIdentifierIgnorable(int);
+ method public static boolean isJavaIdentifierPart(int);
+ method public static boolean isJavaIdentifierStart(int);
+ method public static boolean isLegal(int);
+ method public static boolean isLegal(java.lang.String);
+ method public static boolean isLetter(int);
+ method public static boolean isLetterOrDigit(int);
+ method public static boolean isLowSurrogate(char);
+ method public static boolean isLowerCase(int);
+ method public static boolean isMirrored(int);
+ method public static boolean isPrintable(int);
+ method public static boolean isSpaceChar(int);
+ method public static boolean isSupplementary(int);
+ method public static final boolean isSupplementaryCodePoint(int);
+ method public static final boolean isSurrogatePair(char, char);
+ method public static boolean isTitleCase(int);
+ method public static boolean isUAlphabetic(int);
+ method public static boolean isULowercase(int);
+ method public static boolean isUUppercase(int);
+ method public static boolean isUWhiteSpace(int);
+ method public static boolean isUnicodeIdentifierPart(int);
+ method public static boolean isUnicodeIdentifierStart(int);
+ method public static boolean isUpperCase(int);
+ method public static final boolean isValidCodePoint(int);
+ method public static boolean isWhitespace(int);
+ method public static int offsetByCodePoints(java.lang.CharSequence, int, int);
+ method public static int offsetByCodePoints(char[], int, int, int, int);
+ method public static final int toChars(int, char[], int);
+ method public static final char[] toChars(int);
+ method public static final int toCodePoint(char, char);
+ method public static int toLowerCase(int);
+ method public static java.lang.String toLowerCase(java.lang.String);
+ method public static java.lang.String toLowerCase(java.util.Locale, java.lang.String);
+ method public static java.lang.String toLowerCase(android.icu.util.ULocale, java.lang.String);
+ method public static java.lang.String toString(int);
+ method public static int toTitleCase(int);
+ method public static java.lang.String toTitleCase(java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(java.util.Locale, java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(android.icu.util.ULocale, java.lang.String, android.icu.text.BreakIterator);
+ method public static java.lang.String toTitleCase(android.icu.util.ULocale, java.lang.String, android.icu.text.BreakIterator, int);
+ method public static java.lang.String toTitleCase(java.util.Locale, java.lang.String, android.icu.text.BreakIterator, int);
+ method public static int toUpperCase(int);
+ method public static java.lang.String toUpperCase(java.lang.String);
+ method public static java.lang.String toUpperCase(java.util.Locale, java.lang.String);
+ method public static java.lang.String toUpperCase(android.icu.util.ULocale, java.lang.String);
+ field public static final int FOLD_CASE_DEFAULT = 0; // 0x0
+ field public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1; // 0x1
+ field public static final int MAX_CODE_POINT = 1114111; // 0x10ffff
+ field public static final char MAX_HIGH_SURROGATE = 56319; // 0xdbff '\udbff'
+ field public static final char MAX_LOW_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_RADIX = 36; // 0x24
+ field public static final char MAX_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_VALUE = 1114111; // 0x10ffff
+ field public static final int MIN_CODE_POINT = 0; // 0x0
+ field public static final char MIN_HIGH_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final char MIN_LOW_SURROGATE = 56320; // 0xdc00 '\udc00'
+ field public static final int MIN_RADIX = 2; // 0x2
+ field public static final int MIN_SUPPLEMENTARY_CODE_POINT = 65536; // 0x10000
+ field public static final char MIN_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final int MIN_VALUE = 0; // 0x0
+ field public static final double NO_NUMERIC_VALUE = -1.23456789E8;
+ field public static final int REPLACEMENT_CHAR = 65533; // 0xfffd
+ field public static final int SUPPLEMENTARY_MIN_VALUE = 65536; // 0x10000
+ field public static final int TITLECASE_NO_BREAK_ADJUSTMENT = 512; // 0x200
+ field public static final int TITLECASE_NO_LOWERCASE = 256; // 0x100
+ }
+
+ public static abstract interface UCharacter.BidiPairedBracketType {
+ field public static final int CLOSE = 2; // 0x2
+ field public static final int COUNT = 3; // 0x3
+ field public static final int NONE = 0; // 0x0
+ field public static final int OPEN = 1; // 0x1
+ }
+
+ public static abstract interface UCharacter.DecompositionType {
+ field public static final int CANONICAL = 1; // 0x1
+ field public static final int CIRCLE = 3; // 0x3
+ field public static final int COMPAT = 2; // 0x2
+ field public static final int COUNT = 18; // 0x12
+ field public static final int FINAL = 4; // 0x4
+ field public static final int FONT = 5; // 0x5
+ field public static final int FRACTION = 6; // 0x6
+ field public static final int INITIAL = 7; // 0x7
+ field public static final int ISOLATED = 8; // 0x8
+ field public static final int MEDIAL = 9; // 0x9
+ field public static final int NARROW = 10; // 0xa
+ field public static final int NOBREAK = 11; // 0xb
+ field public static final int NONE = 0; // 0x0
+ field public static final int SMALL = 12; // 0xc
+ field public static final int SQUARE = 13; // 0xd
+ field public static final int SUB = 14; // 0xe
+ field public static final int SUPER = 15; // 0xf
+ field public static final int VERTICAL = 16; // 0x10
+ field public static final int WIDE = 17; // 0x11
+ }
+
+ public static abstract interface UCharacter.EastAsianWidth {
+ field public static final int AMBIGUOUS = 1; // 0x1
+ field public static final int COUNT = 6; // 0x6
+ field public static final int FULLWIDTH = 3; // 0x3
+ field public static final int HALFWIDTH = 2; // 0x2
+ field public static final int NARROW = 4; // 0x4
+ field public static final int NEUTRAL = 0; // 0x0
+ field public static final int WIDE = 5; // 0x5
+ }
+
+ public static abstract interface UCharacter.GraphemeClusterBreak {
+ field public static final int CONTROL = 1; // 0x1
+ field public static final int COUNT = 13; // 0xd
+ field public static final int CR = 2; // 0x2
+ field public static final int EXTEND = 3; // 0x3
+ field public static final int L = 4; // 0x4
+ field public static final int LF = 5; // 0x5
+ field public static final int LV = 6; // 0x6
+ field public static final int LVT = 7; // 0x7
+ field public static final int OTHER = 0; // 0x0
+ field public static final int PREPEND = 11; // 0xb
+ field public static final int REGIONAL_INDICATOR = 12; // 0xc
+ field public static final int SPACING_MARK = 10; // 0xa
+ field public static final int T = 8; // 0x8
+ field public static final int V = 9; // 0x9
+ }
+
+ public static abstract interface UCharacter.HangulSyllableType {
+ field public static final int COUNT = 6; // 0x6
+ field public static final int LEADING_JAMO = 1; // 0x1
+ field public static final int LVT_SYLLABLE = 5; // 0x5
+ field public static final int LV_SYLLABLE = 4; // 0x4
+ field public static final int NOT_APPLICABLE = 0; // 0x0
+ field public static final int TRAILING_JAMO = 3; // 0x3
+ field public static final int VOWEL_JAMO = 2; // 0x2
+ }
+
+ public static abstract interface UCharacter.JoiningGroup {
+ field public static final int AIN = 1; // 0x1
+ field public static final int ALAPH = 2; // 0x2
+ field public static final int ALEF = 3; // 0x3
+ field public static final int BEH = 4; // 0x4
+ field public static final int BETH = 5; // 0x5
+ field public static final int BURUSHASKI_YEH_BARREE = 54; // 0x36
+ field public static final int COUNT = 86; // 0x56
+ field public static final int DAL = 6; // 0x6
+ field public static final int DALATH_RISH = 7; // 0x7
+ field public static final int E = 8; // 0x8
+ field public static final int FARSI_YEH = 55; // 0x37
+ field public static final int FE = 51; // 0x33
+ field public static final int FEH = 9; // 0x9
+ field public static final int FINAL_SEMKATH = 10; // 0xa
+ field public static final int GAF = 11; // 0xb
+ field public static final int GAMAL = 12; // 0xc
+ field public static final int HAH = 13; // 0xd
+ field public static final int HAMZA_ON_HEH_GOAL = 14; // 0xe
+ field public static final int HE = 15; // 0xf
+ field public static final int HEH = 16; // 0x10
+ field public static final int HEH_GOAL = 17; // 0x11
+ field public static final int HETH = 18; // 0x12
+ field public static final int KAF = 19; // 0x13
+ field public static final int KAPH = 20; // 0x14
+ field public static final int KHAPH = 52; // 0x34
+ field public static final int KNOTTED_HEH = 21; // 0x15
+ field public static final int LAM = 22; // 0x16
+ field public static final int LAMADH = 23; // 0x17
+ field public static final int MANICHAEAN_ALEPH = 58; // 0x3a
+ field public static final int MANICHAEAN_AYIN = 59; // 0x3b
+ field public static final int MANICHAEAN_BETH = 60; // 0x3c
+ field public static final int MANICHAEAN_DALETH = 61; // 0x3d
+ field public static final int MANICHAEAN_DHAMEDH = 62; // 0x3e
+ field public static final int MANICHAEAN_FIVE = 63; // 0x3f
+ field public static final int MANICHAEAN_GIMEL = 64; // 0x40
+ field public static final int MANICHAEAN_HETH = 65; // 0x41
+ field public static final int MANICHAEAN_HUNDRED = 66; // 0x42
+ field public static final int MANICHAEAN_KAPH = 67; // 0x43
+ field public static final int MANICHAEAN_LAMEDH = 68; // 0x44
+ field public static final int MANICHAEAN_MEM = 69; // 0x45
+ field public static final int MANICHAEAN_NUN = 70; // 0x46
+ field public static final int MANICHAEAN_ONE = 71; // 0x47
+ field public static final int MANICHAEAN_PE = 72; // 0x48
+ field public static final int MANICHAEAN_QOPH = 73; // 0x49
+ field public static final int MANICHAEAN_RESH = 74; // 0x4a
+ field public static final int MANICHAEAN_SADHE = 75; // 0x4b
+ field public static final int MANICHAEAN_SAMEKH = 76; // 0x4c
+ field public static final int MANICHAEAN_TAW = 77; // 0x4d
+ field public static final int MANICHAEAN_TEN = 78; // 0x4e
+ field public static final int MANICHAEAN_TETH = 79; // 0x4f
+ field public static final int MANICHAEAN_THAMEDH = 80; // 0x50
+ field public static final int MANICHAEAN_TWENTY = 81; // 0x51
+ field public static final int MANICHAEAN_WAW = 82; // 0x52
+ field public static final int MANICHAEAN_YODH = 83; // 0x53
+ field public static final int MANICHAEAN_ZAYIN = 84; // 0x54
+ field public static final int MEEM = 24; // 0x18
+ field public static final int MIM = 25; // 0x19
+ field public static final int NOON = 26; // 0x1a
+ field public static final int NO_JOINING_GROUP = 0; // 0x0
+ field public static final int NUN = 27; // 0x1b
+ field public static final int NYA = 56; // 0x38
+ field public static final int PE = 28; // 0x1c
+ field public static final int QAF = 29; // 0x1d
+ field public static final int QAPH = 30; // 0x1e
+ field public static final int REH = 31; // 0x1f
+ field public static final int REVERSED_PE = 32; // 0x20
+ field public static final int ROHINGYA_YEH = 57; // 0x39
+ field public static final int SAD = 33; // 0x21
+ field public static final int SADHE = 34; // 0x22
+ field public static final int SEEN = 35; // 0x23
+ field public static final int SEMKATH = 36; // 0x24
+ field public static final int SHIN = 37; // 0x25
+ field public static final int STRAIGHT_WAW = 85; // 0x55
+ field public static final int SWASH_KAF = 38; // 0x26
+ field public static final int SYRIAC_WAW = 39; // 0x27
+ field public static final int TAH = 40; // 0x28
+ field public static final int TAW = 41; // 0x29
+ field public static final int TEH_MARBUTA = 42; // 0x2a
+ field public static final int TEH_MARBUTA_GOAL = 14; // 0xe
+ field public static final int TETH = 43; // 0x2b
+ field public static final int WAW = 44; // 0x2c
+ field public static final int YEH = 45; // 0x2d
+ field public static final int YEH_BARREE = 46; // 0x2e
+ field public static final int YEH_WITH_TAIL = 47; // 0x2f
+ field public static final int YUDH = 48; // 0x30
+ field public static final int YUDH_HE = 49; // 0x31
+ field public static final int ZAIN = 50; // 0x32
+ field public static final int ZHAIN = 53; // 0x35
+ }
+
+ public static abstract interface UCharacter.JoiningType {
+ field public static final int COUNT = 6; // 0x6
+ field public static final int DUAL_JOINING = 2; // 0x2
+ field public static final int JOIN_CAUSING = 1; // 0x1
+ field public static final int LEFT_JOINING = 3; // 0x3
+ field public static final int NON_JOINING = 0; // 0x0
+ field public static final int RIGHT_JOINING = 4; // 0x4
+ field public static final int TRANSPARENT = 5; // 0x5
+ }
+
+ public static abstract interface UCharacter.LineBreak {
+ field public static final int ALPHABETIC = 2; // 0x2
+ field public static final int AMBIGUOUS = 1; // 0x1
+ field public static final int BREAK_AFTER = 4; // 0x4
+ field public static final int BREAK_BEFORE = 5; // 0x5
+ field public static final int BREAK_BOTH = 3; // 0x3
+ field public static final int BREAK_SYMBOLS = 27; // 0x1b
+ field public static final int CARRIAGE_RETURN = 10; // 0xa
+ field public static final int CLOSE_PARENTHESIS = 36; // 0x24
+ field public static final int CLOSE_PUNCTUATION = 8; // 0x8
+ field public static final int COMBINING_MARK = 9; // 0x9
+ field public static final int COMPLEX_CONTEXT = 24; // 0x18
+ field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
+ field public static final int CONTINGENT_BREAK = 7; // 0x7
+ field public static final int COUNT = 40; // 0x28
+ field public static final int EXCLAMATION = 11; // 0xb
+ field public static final int GLUE = 12; // 0xc
+ field public static final int H2 = 31; // 0x1f
+ field public static final int H3 = 32; // 0x20
+ field public static final int HEBREW_LETTER = 38; // 0x26
+ field public static final int HYPHEN = 13; // 0xd
+ field public static final int IDEOGRAPHIC = 14; // 0xe
+ field public static final int INFIX_NUMERIC = 16; // 0x10
+ field public static final int INSEPARABLE = 15; // 0xf
+ field public static final int INSEPERABLE = 15; // 0xf
+ field public static final int JL = 33; // 0x21
+ field public static final int JT = 34; // 0x22
+ field public static final int JV = 35; // 0x23
+ field public static final int LINE_FEED = 17; // 0x11
+ field public static final int MANDATORY_BREAK = 6; // 0x6
+ field public static final int NEXT_LINE = 29; // 0x1d
+ field public static final int NONSTARTER = 18; // 0x12
+ field public static final int NUMERIC = 19; // 0x13
+ field public static final int OPEN_PUNCTUATION = 20; // 0x14
+ field public static final int POSTFIX_NUMERIC = 21; // 0x15
+ field public static final int PREFIX_NUMERIC = 22; // 0x16
+ field public static final int QUOTATION = 23; // 0x17
+ field public static final int REGIONAL_INDICATOR = 39; // 0x27
+ field public static final int SPACE = 26; // 0x1a
+ field public static final int SURROGATE = 25; // 0x19
+ field public static final int UNKNOWN = 0; // 0x0
+ field public static final int WORD_JOINER = 30; // 0x1e
+ field public static final int ZWSPACE = 28; // 0x1c
+ }
+
+ public static abstract interface UCharacter.NumericType {
+ field public static final int COUNT = 4; // 0x4
+ field public static final int DECIMAL = 1; // 0x1
+ field public static final int DIGIT = 2; // 0x2
+ field public static final int NONE = 0; // 0x0
+ field public static final int NUMERIC = 3; // 0x3
+ }
+
+ public static abstract interface UCharacter.SentenceBreak {
+ field public static final int ATERM = 1; // 0x1
+ field public static final int CLOSE = 2; // 0x2
+ field public static final int COUNT = 15; // 0xf
+ field public static final int CR = 11; // 0xb
+ field public static final int EXTEND = 12; // 0xc
+ field public static final int FORMAT = 3; // 0x3
+ field public static final int LF = 13; // 0xd
+ field public static final int LOWER = 4; // 0x4
+ field public static final int NUMERIC = 5; // 0x5
+ field public static final int OLETTER = 6; // 0x6
+ field public static final int OTHER = 0; // 0x0
+ field public static final int SCONTINUE = 14; // 0xe
+ field public static final int SEP = 7; // 0x7
+ field public static final int SP = 8; // 0x8
+ field public static final int STERM = 9; // 0x9
+ field public static final int UPPER = 10; // 0xa
+ }
+
+ public static final class UCharacter.UnicodeBlock extends java.lang.Character.Subset {
+ method public static final android.icu.lang.UCharacter.UnicodeBlock forName(java.lang.String);
+ method public int getID();
+ method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
+ method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
+ field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
+ field public static final int AHOM_ID = 253; // 0xfd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ALCHEMICAL_SYMBOLS;
+ field public static final int ALCHEMICAL_SYMBOLS_ID = 208; // 0xd0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ALPHABETIC_PRESENTATION_FORMS;
+ field public static final int ALPHABETIC_PRESENTATION_FORMS_ID = 80; // 0x50
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANATOLIAN_HIEROGLYPHS;
+ field public static final int ANATOLIAN_HIEROGLYPHS_ID = 254; // 0xfe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION;
+ field public static final int ANCIENT_GREEK_MUSICAL_NOTATION_ID = 126; // 0x7e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_GREEK_NUMBERS;
+ field public static final int ANCIENT_GREEK_NUMBERS_ID = 127; // 0x7f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ANCIENT_SYMBOLS;
+ field public static final int ANCIENT_SYMBOLS_ID = 165; // 0xa5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_EXTENDED_A;
+ field public static final int ARABIC_EXTENDED_A_ID = 210; // 0xd2
+ field public static final int ARABIC_ID = 12; // 0xc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS;
+ field public static final int ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS_ID = 211; // 0xd3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_PRESENTATION_FORMS_A;
+ field public static final int ARABIC_PRESENTATION_FORMS_A_ID = 81; // 0x51
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_PRESENTATION_FORMS_B;
+ field public static final int ARABIC_PRESENTATION_FORMS_B_ID = 85; // 0x55
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARABIC_SUPPLEMENT;
+ field public static final int ARABIC_SUPPLEMENT_ID = 128; // 0x80
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARMENIAN;
+ field public static final int ARMENIAN_ID = 10; // 0xa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ARROWS;
+ field public static final int ARROWS_ID = 46; // 0x2e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock AVESTAN;
+ field public static final int AVESTAN_ID = 188; // 0xbc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BALINESE;
+ field public static final int BALINESE_ID = 147; // 0x93
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BAMUM;
+ field public static final int BAMUM_ID = 177; // 0xb1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BAMUM_SUPPLEMENT;
+ field public static final int BAMUM_SUPPLEMENT_ID = 202; // 0xca
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BASIC_LATIN;
+ field public static final int BASIC_LATIN_ID = 1; // 0x1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BASSA_VAH;
+ field public static final int BASSA_VAH_ID = 221; // 0xdd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BATAK;
+ field public static final int BATAK_ID = 199; // 0xc7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
+ field public static final int BENGALI_ID = 16; // 0x10
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
+ field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO_EXTENDED;
+ field public static final int BOPOMOFO_EXTENDED_ID = 67; // 0x43
+ field public static final int BOPOMOFO_ID = 64; // 0x40
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BOX_DRAWING;
+ field public static final int BOX_DRAWING_ID = 52; // 0x34
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BRAHMI;
+ field public static final int BRAHMI_ID = 201; // 0xc9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BRAILLE_PATTERNS;
+ field public static final int BRAILLE_PATTERNS_ID = 57; // 0x39
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BUGINESE;
+ field public static final int BUGINESE_ID = 129; // 0x81
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BUHID;
+ field public static final int BUHID_ID = 100; // 0x64
+ field public static final android.icu.lang.UCharacter.UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS;
+ field public static final int BYZANTINE_MUSICAL_SYMBOLS_ID = 91; // 0x5b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CARIAN;
+ field public static final int CARIAN_ID = 168; // 0xa8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CAUCASIAN_ALBANIAN;
+ field public static final int CAUCASIAN_ALBANIAN_ID = 222; // 0xde
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHAKMA;
+ field public static final int CHAKMA_ID = 212; // 0xd4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHAM;
+ field public static final int CHAM_ID = 164; // 0xa4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE;
+ field public static final int CHEROKEE_ID = 32; // 0x20
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE_SUPPLEMENT;
+ field public static final int CHEROKEE_SUPPLEMENT_ID = 255; // 0xff
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_FORMS;
+ field public static final int CJK_COMPATIBILITY_FORMS_ID = 83; // 0x53
+ field public static final int CJK_COMPATIBILITY_ID = 69; // 0x45
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS;
+ field public static final int CJK_COMPATIBILITY_IDEOGRAPHS_ID = 79; // 0x4f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT;
+ field public static final int CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT_ID = 95; // 0x5f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_RADICALS_SUPPLEMENT;
+ field public static final int CJK_RADICALS_SUPPLEMENT_ID = 58; // 0x3a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_STROKES;
+ field public static final int CJK_STROKES_ID = 130; // 0x82
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION;
+ field public static final int CJK_SYMBOLS_AND_PUNCTUATION_ID = 61; // 0x3d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A_ID = 70; // 0x46
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B_ID = 94; // 0x5e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C_ID = 197; // 0xc5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D_ID = 209; // 0xd1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E;
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E_ID = 256; // 0x100
+ field public static final int CJK_UNIFIED_IDEOGRAPHS_ID = 71; // 0x47
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_EXTENDED;
+ field public static final int COMBINING_DIACRITICAL_MARKS_EXTENDED_ID = 224; // 0xe0
+ field public static final int COMBINING_DIACRITICAL_MARKS_ID = 7; // 0x7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT;
+ field public static final int COMBINING_DIACRITICAL_MARKS_SUPPLEMENT_ID = 131; // 0x83
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_HALF_MARKS;
+ field public static final int COMBINING_HALF_MARKS_ID = 82; // 0x52
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS;
+ field public static final int COMBINING_MARKS_FOR_SYMBOLS_ID = 43; // 0x2b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COMMON_INDIC_NUMBER_FORMS;
+ field public static final int COMMON_INDIC_NUMBER_FORMS_ID = 178; // 0xb2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CONTROL_PICTURES;
+ field public static final int CONTROL_PICTURES_ID = 49; // 0x31
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COPTIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COPTIC_EPACT_NUMBERS;
+ field public static final int COPTIC_EPACT_NUMBERS_ID = 223; // 0xdf
+ field public static final int COPTIC_ID = 132; // 0x84
+ field public static final int COUNT = 263; // 0x107
+ field public static final android.icu.lang.UCharacter.UnicodeBlock COUNTING_ROD_NUMERALS;
+ field public static final int COUNTING_ROD_NUMERALS_ID = 154; // 0x9a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CUNEIFORM;
+ field public static final int CUNEIFORM_ID = 152; // 0x98
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION;
+ field public static final int CUNEIFORM_NUMBERS_AND_PUNCTUATION_ID = 153; // 0x99
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CURRENCY_SYMBOLS;
+ field public static final int CURRENCY_SYMBOLS_ID = 42; // 0x2a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYPRIOT_SYLLABARY;
+ field public static final int CYPRIOT_SYLLABARY_ID = 123; // 0x7b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_A;
+ field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
+ field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
+ field public static final int CYRILLIC_ID = 9; // 0x9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
+ field public static final int CYRILLIC_SUPPLEMENTARY_ID = 97; // 0x61
+ field public static final int CYRILLIC_SUPPLEMENT_ID = 97; // 0x61
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DESERET;
+ field public static final int DESERET_ID = 90; // 0x5a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DEVANAGARI;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DEVANAGARI_EXTENDED;
+ field public static final int DEVANAGARI_EXTENDED_ID = 179; // 0xb3
+ field public static final int DEVANAGARI_ID = 15; // 0xf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DINGBATS;
+ field public static final int DINGBATS_ID = 56; // 0x38
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DOMINO_TILES;
+ field public static final int DOMINO_TILES_ID = 171; // 0xab
+ field public static final android.icu.lang.UCharacter.UnicodeBlock DUPLOYAN;
+ field public static final int DUPLOYAN_ID = 225; // 0xe1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EARLY_DYNASTIC_CUNEIFORM;
+ field public static final int EARLY_DYNASTIC_CUNEIFORM_ID = 257; // 0x101
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EGYPTIAN_HIEROGLYPHS;
+ field public static final int EGYPTIAN_HIEROGLYPHS_ID = 194; // 0xc2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ELBASAN;
+ field public static final int ELBASAN_ID = 226; // 0xe2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock EMOTICONS;
+ field public static final int EMOTICONS_ID = 206; // 0xce
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_ALPHANUMERICS;
+ field public static final int ENCLOSED_ALPHANUMERICS_ID = 51; // 0x33
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT;
+ field public static final int ENCLOSED_ALPHANUMERIC_SUPPLEMENT_ID = 195; // 0xc3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS;
+ field public static final int ENCLOSED_CJK_LETTERS_AND_MONTHS_ID = 68; // 0x44
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT;
+ field public static final int ENCLOSED_IDEOGRAPHIC_SUPPLEMENT_ID = 196; // 0xc4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_EXTENDED;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_EXTENDED_A;
+ field public static final int ETHIOPIC_EXTENDED_A_ID = 200; // 0xc8
+ field public static final int ETHIOPIC_EXTENDED_ID = 133; // 0x85
+ field public static final int ETHIOPIC_ID = 31; // 0x1f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ETHIOPIC_SUPPLEMENT;
+ field public static final int ETHIOPIC_SUPPLEMENT_ID = 134; // 0x86
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GENERAL_PUNCTUATION;
+ field public static final int GENERAL_PUNCTUATION_ID = 40; // 0x28
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEOMETRIC_SHAPES;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEOMETRIC_SHAPES_EXTENDED;
+ field public static final int GEOMETRIC_SHAPES_EXTENDED_ID = 227; // 0xe3
+ field public static final int GEOMETRIC_SHAPES_ID = 54; // 0x36
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN;
+ field public static final int GEORGIAN_ID = 29; // 0x1d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN_SUPPLEMENT;
+ field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
+ field public static final int GLAGOLITIC_ID = 136; // 0x88
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
+ field public static final int GOTHIC_ID = 89; // 0x59
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
+ field public static final int GRANTHA_ID = 228; // 0xe4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GREEK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GREEK_EXTENDED;
+ field public static final int GREEK_EXTENDED_ID = 39; // 0x27
+ field public static final int GREEK_ID = 8; // 0x8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GUJARATI;
+ field public static final int GUJARATI_ID = 18; // 0x12
+ field public static final android.icu.lang.UCharacter.UnicodeBlock GURMUKHI;
+ field public static final int GURMUKHI_ID = 17; // 0x11
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS;
+ field public static final int HALFWIDTH_AND_FULLWIDTH_FORMS_ID = 87; // 0x57
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_COMPATIBILITY_JAMO;
+ field public static final int HANGUL_COMPATIBILITY_JAMO_ID = 65; // 0x41
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO_EXTENDED_A;
+ field public static final int HANGUL_JAMO_EXTENDED_A_ID = 180; // 0xb4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_JAMO_EXTENDED_B;
+ field public static final int HANGUL_JAMO_EXTENDED_B_ID = 185; // 0xb9
+ field public static final int HANGUL_JAMO_ID = 30; // 0x1e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_SYLLABLES;
+ field public static final int HANGUL_SYLLABLES_ID = 74; // 0x4a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HANUNOO;
+ field public static final int HANUNOO_ID = 99; // 0x63
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HATRAN;
+ field public static final int HATRAN_ID = 258; // 0x102
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HEBREW;
+ field public static final int HEBREW_ID = 11; // 0xb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIGH_PRIVATE_USE_SURROGATES;
+ field public static final int HIGH_PRIVATE_USE_SURROGATES_ID = 76; // 0x4c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIGH_SURROGATES;
+ field public static final int HIGH_SURROGATES_ID = 75; // 0x4b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock HIRAGANA;
+ field public static final int HIRAGANA_ID = 62; // 0x3e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
+ field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
+ field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
+ field public static final int INSCRIPTIONAL_PAHLAVI_ID = 190; // 0xbe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PARTHIAN;
+ field public static final int INSCRIPTIONAL_PARTHIAN_ID = 189; // 0xbd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock INVALID_CODE;
+ field public static final int INVALID_CODE_ID = -1; // 0xffffffff
+ field public static final android.icu.lang.UCharacter.UnicodeBlock IPA_EXTENSIONS;
+ field public static final int IPA_EXTENSIONS_ID = 5; // 0x5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock JAVANESE;
+ field public static final int JAVANESE_ID = 181; // 0xb5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KAITHI;
+ field public static final int KAITHI_ID = 193; // 0xc1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANA_SUPPLEMENT;
+ field public static final int KANA_SUPPLEMENT_ID = 203; // 0xcb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANBUN;
+ field public static final int KANBUN_ID = 66; // 0x42
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANGXI_RADICALS;
+ field public static final int KANGXI_RADICALS_ID = 59; // 0x3b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KANNADA;
+ field public static final int KANNADA_ID = 22; // 0x16
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KATAKANA;
+ field public static final int KATAKANA_ID = 63; // 0x3f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS;
+ field public static final int KATAKANA_PHONETIC_EXTENSIONS_ID = 107; // 0x6b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KAYAH_LI;
+ field public static final int KAYAH_LI_ID = 162; // 0xa2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHAROSHTHI;
+ field public static final int KHAROSHTHI_ID = 137; // 0x89
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHMER;
+ field public static final int KHMER_ID = 36; // 0x24
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHMER_SYMBOLS;
+ field public static final int KHMER_SYMBOLS_ID = 113; // 0x71
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHOJKI;
+ field public static final int KHOJKI_ID = 229; // 0xe5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock KHUDAWADI;
+ field public static final int KHUDAWADI_ID = 230; // 0xe6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LAO;
+ field public static final int LAO_ID = 26; // 0x1a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_1_SUPPLEMENT;
+ field public static final int LATIN_1_SUPPLEMENT_ID = 2; // 0x2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_A;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_ADDITIONAL;
+ field public static final int LATIN_EXTENDED_ADDITIONAL_ID = 38; // 0x26
+ field public static final int LATIN_EXTENDED_A_ID = 3; // 0x3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_B;
+ field public static final int LATIN_EXTENDED_B_ID = 4; // 0x4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_C;
+ field public static final int LATIN_EXTENDED_C_ID = 148; // 0x94
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_D;
+ field public static final int LATIN_EXTENDED_D_ID = 149; // 0x95
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LATIN_EXTENDED_E;
+ field public static final int LATIN_EXTENDED_E_ID = 231; // 0xe7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LEPCHA;
+ field public static final int LEPCHA_ID = 156; // 0x9c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LETTERLIKE_SYMBOLS;
+ field public static final int LETTERLIKE_SYMBOLS_ID = 44; // 0x2c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LIMBU;
+ field public static final int LIMBU_ID = 111; // 0x6f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_A;
+ field public static final int LINEAR_A_ID = 232; // 0xe8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_B_IDEOGRAMS;
+ field public static final int LINEAR_B_IDEOGRAMS_ID = 118; // 0x76
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LINEAR_B_SYLLABARY;
+ field public static final int LINEAR_B_SYLLABARY_ID = 117; // 0x75
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LISU;
+ field public static final int LISU_ID = 176; // 0xb0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LOW_SURROGATES;
+ field public static final int LOW_SURROGATES_ID = 77; // 0x4d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LYCIAN;
+ field public static final int LYCIAN_ID = 167; // 0xa7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock LYDIAN;
+ field public static final int LYDIAN_ID = 169; // 0xa9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MAHAJANI;
+ field public static final int MAHAJANI_ID = 233; // 0xe9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MAHJONG_TILES;
+ field public static final int MAHJONG_TILES_ID = 170; // 0xaa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MALAYALAM;
+ field public static final int MALAYALAM_ID = 23; // 0x17
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MANDAIC;
+ field public static final int MANDAIC_ID = 198; // 0xc6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
+ field public static final int MANICHAEAN_ID = 234; // 0xea
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS;
+ field public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93; // 0x5d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_OPERATORS;
+ field public static final int MATHEMATICAL_OPERATORS_ID = 47; // 0x2f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK_EXTENSIONS;
+ field public static final int MEETEI_MAYEK_EXTENSIONS_ID = 213; // 0xd5
+ field public static final int MEETEI_MAYEK_ID = 184; // 0xb8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MENDE_KIKAKUI;
+ field public static final int MENDE_KIKAKUI_ID = 235; // 0xeb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEROITIC_CURSIVE;
+ field public static final int MEROITIC_CURSIVE_ID = 214; // 0xd6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MEROITIC_HIEROGLYPHS;
+ field public static final int MEROITIC_HIEROGLYPHS_ID = 215; // 0xd7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MIAO;
+ field public static final int MIAO_ID = 216; // 0xd8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A;
+ field public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A_ID = 102; // 0x66
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B;
+ field public static final int MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B_ID = 105; // 0x69
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS;
+ field public static final int MISCELLANEOUS_SYMBOLS_AND_ARROWS_ID = 115; // 0x73
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final int MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS_ID = 205; // 0xcd
+ field public static final int MISCELLANEOUS_SYMBOLS_ID = 55; // 0x37
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MISCELLANEOUS_TECHNICAL;
+ field public static final int MISCELLANEOUS_TECHNICAL_ID = 48; // 0x30
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MODI;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MODIFIER_TONE_LETTERS;
+ field public static final int MODIFIER_TONE_LETTERS_ID = 138; // 0x8a
+ field public static final int MODI_ID = 236; // 0xec
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
+ field public static final int MONGOLIAN_ID = 37; // 0x25
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
+ field public static final int MRO_ID = 237; // 0xed
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
+ field public static final int MULTANI_ID = 259; // 0x103
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MUSICAL_SYMBOLS;
+ field public static final int MUSICAL_SYMBOLS_ID = 92; // 0x5c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR_EXTENDED_A;
+ field public static final int MYANMAR_EXTENDED_A_ID = 182; // 0xb6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock MYANMAR_EXTENDED_B;
+ field public static final int MYANMAR_EXTENDED_B_ID = 238; // 0xee
+ field public static final int MYANMAR_ID = 28; // 0x1c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
+ field public static final int NABATAEAN_ID = 239; // 0xef
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
+ field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
+ field public static final int NKO_ID = 146; // 0x92
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NO_BLOCK;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock NUMBER_FORMS;
+ field public static final int NUMBER_FORMS_ID = 45; // 0x2d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OGHAM;
+ field public static final int OGHAM_ID = 34; // 0x22
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_HUNGARIAN;
+ field public static final int OLD_HUNGARIAN_ID = 260; // 0x104
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_ITALIC;
+ field public static final int OLD_ITALIC_ID = 88; // 0x58
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_NORTH_ARABIAN;
+ field public static final int OLD_NORTH_ARABIAN_ID = 240; // 0xf0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERMIC;
+ field public static final int OLD_PERMIC_ID = 241; // 0xf1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERSIAN;
+ field public static final int OLD_PERSIAN_ID = 140; // 0x8c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_SOUTH_ARABIAN;
+ field public static final int OLD_SOUTH_ARABIAN_ID = 187; // 0xbb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_TURKIC;
+ field public static final int OLD_TURKIC_ID = 191; // 0xbf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OL_CHIKI;
+ field public static final int OL_CHIKI_ID = 157; // 0x9d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OPTICAL_CHARACTER_RECOGNITION;
+ field public static final int OPTICAL_CHARACTER_RECOGNITION_ID = 50; // 0x32
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ORIYA;
+ field public static final int ORIYA_ID = 19; // 0x13
+ field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
+ field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
+ field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
+ field public static final int OSMANYA_ID = 122; // 0x7a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
+ field public static final int PAHAWH_HMONG_ID = 243; // 0xf3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PALMYRENE;
+ field public static final int PALMYRENE_ID = 244; // 0xf4
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PAU_CIN_HAU;
+ field public static final int PAU_CIN_HAU_ID = 245; // 0xf5
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHAGS_PA;
+ field public static final int PHAGS_PA_ID = 150; // 0x96
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHAISTOS_DISC;
+ field public static final int PHAISTOS_DISC_ID = 166; // 0xa6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHOENICIAN;
+ field public static final int PHOENICIAN_ID = 151; // 0x97
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHONETIC_EXTENSIONS;
+ field public static final int PHONETIC_EXTENSIONS_ID = 114; // 0x72
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT;
+ field public static final int PHONETIC_EXTENSIONS_SUPPLEMENT_ID = 141; // 0x8d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PLAYING_CARDS;
+ field public static final int PLAYING_CARDS_ID = 204; // 0xcc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PRIVATE_USE;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PRIVATE_USE_AREA;
+ field public static final int PRIVATE_USE_AREA_ID = 78; // 0x4e
+ field public static final int PRIVATE_USE_ID = 78; // 0x4e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock PSALTER_PAHLAVI;
+ field public static final int PSALTER_PAHLAVI_ID = 246; // 0xf6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock REJANG;
+ field public static final int REJANG_ID = 163; // 0xa3
+ field public static final android.icu.lang.UCharacter.UnicodeBlock RUMI_NUMERAL_SYMBOLS;
+ field public static final int RUMI_NUMERAL_SYMBOLS_ID = 192; // 0xc0
+ field public static final android.icu.lang.UCharacter.UnicodeBlock RUNIC;
+ field public static final int RUNIC_ID = 35; // 0x23
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SAMARITAN;
+ field public static final int SAMARITAN_ID = 172; // 0xac
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SAURASHTRA;
+ field public static final int SAURASHTRA_ID = 161; // 0xa1
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHARADA;
+ field public static final int SHARADA_ID = 217; // 0xd9
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHAVIAN;
+ field public static final int SHAVIAN_ID = 121; // 0x79
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SHORTHAND_FORMAT_CONTROLS;
+ field public static final int SHORTHAND_FORMAT_CONTROLS_ID = 247; // 0xf7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SIDDHAM;
+ field public static final int SIDDHAM_ID = 248; // 0xf8
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SINHALA;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SINHALA_ARCHAIC_NUMBERS;
+ field public static final int SINHALA_ARCHAIC_NUMBERS_ID = 249; // 0xf9
+ field public static final int SINHALA_ID = 24; // 0x18
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SMALL_FORM_VARIANTS;
+ field public static final int SMALL_FORM_VARIANTS_ID = 84; // 0x54
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SORA_SOMPENG;
+ field public static final int SORA_SOMPENG_ID = 218; // 0xda
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SPACING_MODIFIER_LETTERS;
+ field public static final int SPACING_MODIFIER_LETTERS_ID = 6; // 0x6
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SPECIALS;
+ field public static final int SPECIALS_ID = 86; // 0x56
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUNDANESE;
+ field public static final int SUNDANESE_ID = 155; // 0x9b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUNDANESE_SUPPLEMENT;
+ field public static final int SUNDANESE_SUPPLEMENT_ID = 219; // 0xdb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS;
+ field public static final int SUPERSCRIPTS_AND_SUBSCRIPTS_ID = 41; // 0x29
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_A;
+ field public static final int SUPPLEMENTAL_ARROWS_A_ID = 103; // 0x67
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_B;
+ field public static final int SUPPLEMENTAL_ARROWS_B_ID = 104; // 0x68
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_ARROWS_C;
+ field public static final int SUPPLEMENTAL_ARROWS_C_ID = 250; // 0xfa
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS;
+ field public static final int SUPPLEMENTAL_MATHEMATICAL_OPERATORS_ID = 106; // 0x6a
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_PUNCTUATION;
+ field public static final int SUPPLEMENTAL_PUNCTUATION_ID = 142; // 0x8e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final int SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS_ID = 261; // 0x105
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A;
+ field public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_A_ID = 109; // 0x6d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B;
+ field public static final int SUPPLEMENTARY_PRIVATE_USE_AREA_B_ID = 110; // 0x6e
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SUTTON_SIGNWRITING;
+ field public static final int SUTTON_SIGNWRITING_ID = 262; // 0x106
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SYLOTI_NAGRI;
+ field public static final int SYLOTI_NAGRI_ID = 143; // 0x8f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock SYRIAC;
+ field public static final int SYRIAC_ID = 13; // 0xd
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGALOG;
+ field public static final int TAGALOG_ID = 98; // 0x62
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGBANWA;
+ field public static final int TAGBANWA_ID = 101; // 0x65
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAGS;
+ field public static final int TAGS_ID = 96; // 0x60
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_LE;
+ field public static final int TAI_LE_ID = 112; // 0x70
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_THAM;
+ field public static final int TAI_THAM_ID = 174; // 0xae
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_VIET;
+ field public static final int TAI_VIET_ID = 183; // 0xb7
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAI_XUAN_JING_SYMBOLS;
+ field public static final int TAI_XUAN_JING_SYMBOLS_ID = 124; // 0x7c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAKRI;
+ field public static final int TAKRI_ID = 220; // 0xdc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
+ field public static final int TAMIL_ID = 20; // 0x14
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
+ field public static final int TELUGU_ID = 21; // 0x15
+ field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
+ field public static final int THAANA_ID = 14; // 0xe
+ field public static final android.icu.lang.UCharacter.UnicodeBlock THAI;
+ field public static final int THAI_ID = 25; // 0x19
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIBETAN;
+ field public static final int TIBETAN_ID = 27; // 0x1b
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIFINAGH;
+ field public static final int TIFINAGH_ID = 144; // 0x90
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TIRHUTA;
+ field public static final int TIRHUTA_ID = 251; // 0xfb
+ field public static final android.icu.lang.UCharacter.UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS;
+ field public static final int TRANSPORT_AND_MAP_SYMBOLS_ID = 207; // 0xcf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UGARITIC;
+ field public static final int UGARITIC_ID = 120; // 0x78
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS;
+ field public static final android.icu.lang.UCharacter.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED;
+ field public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_ID = 173; // 0xad
+ field public static final int UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_ID = 33; // 0x21
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VAI;
+ field public static final int VAI_ID = 159; // 0x9f
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VARIATION_SELECTORS;
+ field public static final int VARIATION_SELECTORS_ID = 108; // 0x6c
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT;
+ field public static final int VARIATION_SELECTORS_SUPPLEMENT_ID = 125; // 0x7d
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VEDIC_EXTENSIONS;
+ field public static final int VEDIC_EXTENSIONS_ID = 175; // 0xaf
+ field public static final android.icu.lang.UCharacter.UnicodeBlock VERTICAL_FORMS;
+ field public static final int VERTICAL_FORMS_ID = 145; // 0x91
+ field public static final android.icu.lang.UCharacter.UnicodeBlock WARANG_CITI;
+ field public static final int WARANG_CITI_ID = 252; // 0xfc
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YIJING_HEXAGRAM_SYMBOLS;
+ field public static final int YIJING_HEXAGRAM_SYMBOLS_ID = 116; // 0x74
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YI_RADICALS;
+ field public static final int YI_RADICALS_ID = 73; // 0x49
+ field public static final android.icu.lang.UCharacter.UnicodeBlock YI_SYLLABLES;
+ field public static final int YI_SYLLABLES_ID = 72; // 0x48
+ }
+
+ public static abstract interface UCharacter.WordBreak {
+ field public static final int ALETTER = 1; // 0x1
+ field public static final int COUNT = 17; // 0x11
+ field public static final int CR = 8; // 0x8
+ field public static final int DOUBLE_QUOTE = 16; // 0x10
+ field public static final int EXTEND = 9; // 0x9
+ field public static final int EXTENDNUMLET = 7; // 0x7
+ field public static final int FORMAT = 2; // 0x2
+ field public static final int HEBREW_LETTER = 14; // 0xe
+ field public static final int KATAKANA = 3; // 0x3
+ field public static final int LF = 10; // 0xa
+ field public static final int MIDLETTER = 4; // 0x4
+ field public static final int MIDNUM = 5; // 0x5
+ field public static final int MIDNUMLET = 11; // 0xb
+ field public static final int NEWLINE = 12; // 0xc
+ field public static final int NUMERIC = 6; // 0x6
+ field public static final int OTHER = 0; // 0x0
+ field public static final int REGIONAL_INDICATOR = 13; // 0xd
+ field public static final int SINGLE_QUOTE = 15; // 0xf
+ }
+
+ public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
+ method public static java.lang.String toString(int);
+ }
+
+ public final class UCharacterDirection implements android.icu.lang.UCharacterEnums.ECharacterDirection {
+ method public static java.lang.String toString(int);
+ }
+
+ public class UCharacterEnums {
+ }
+
+ public static abstract interface UCharacterEnums.ECharacterCategory {
+ field public static final byte CHAR_CATEGORY_COUNT = 30; // 0x1e
+ field public static final byte COMBINING_SPACING_MARK = 8; // 0x8
+ field public static final byte CONNECTOR_PUNCTUATION = 22; // 0x16
+ field public static final byte CONTROL = 15; // 0xf
+ field public static final byte CURRENCY_SYMBOL = 25; // 0x19
+ field public static final byte DASH_PUNCTUATION = 19; // 0x13
+ field public static final byte DECIMAL_DIGIT_NUMBER = 9; // 0x9
+ field public static final byte ENCLOSING_MARK = 7; // 0x7
+ field public static final byte END_PUNCTUATION = 21; // 0x15
+ field public static final byte FINAL_PUNCTUATION = 29; // 0x1d
+ field public static final byte FINAL_QUOTE_PUNCTUATION = 29; // 0x1d
+ field public static final byte FORMAT = 16; // 0x10
+ field public static final byte GENERAL_OTHER_TYPES = 0; // 0x0
+ field public static final byte INITIAL_PUNCTUATION = 28; // 0x1c
+ field public static final byte INITIAL_QUOTE_PUNCTUATION = 28; // 0x1c
+ field public static final byte LETTER_NUMBER = 10; // 0xa
+ field public static final byte LINE_SEPARATOR = 13; // 0xd
+ field public static final byte LOWERCASE_LETTER = 2; // 0x2
+ field public static final byte MATH_SYMBOL = 24; // 0x18
+ field public static final byte MODIFIER_LETTER = 4; // 0x4
+ field public static final byte MODIFIER_SYMBOL = 26; // 0x1a
+ field public static final byte NON_SPACING_MARK = 6; // 0x6
+ field public static final byte OTHER_LETTER = 5; // 0x5
+ field public static final byte OTHER_NUMBER = 11; // 0xb
+ field public static final byte OTHER_PUNCTUATION = 23; // 0x17
+ field public static final byte OTHER_SYMBOL = 27; // 0x1b
+ field public static final byte PARAGRAPH_SEPARATOR = 14; // 0xe
+ field public static final byte PRIVATE_USE = 17; // 0x11
+ field public static final byte SPACE_SEPARATOR = 12; // 0xc
+ field public static final byte START_PUNCTUATION = 20; // 0x14
+ field public static final byte SURROGATE = 18; // 0x12
+ field public static final byte TITLECASE_LETTER = 3; // 0x3
+ field public static final byte UNASSIGNED = 0; // 0x0
+ field public static final byte UPPERCASE_LETTER = 1; // 0x1
+ }
+
+ public static abstract interface UCharacterEnums.ECharacterDirection {
+ field public static final int ARABIC_NUMBER = 5; // 0x5
+ field public static final int BLOCK_SEPARATOR = 7; // 0x7
+ field public static final int BOUNDARY_NEUTRAL = 18; // 0x12
+ field public static final int CHAR_DIRECTION_COUNT = 23; // 0x17
+ field public static final int COMMON_NUMBER_SEPARATOR = 6; // 0x6
+ field public static final byte DIRECTIONALITY_ARABIC_NUMBER = 5; // 0x5
+ field public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 18; // 0x12
+ field public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 6; // 0x6
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 2; // 0x2
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 3; // 0x3
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 4; // 0x4
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0; // 0x0
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 11; // 0xb
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 12; // 0xc
+ field public static final byte DIRECTIONALITY_NONSPACING_MARK = 17; // 0x11
+ field public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 10; // 0xa
+ field public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 7; // 0x7
+ field public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 16; // 0x10
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1; // 0x1
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 13; // 0xd
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 14; // 0xe
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 15; // 0xf
+ field public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 8; // 0x8
+ field public static final byte DIRECTIONALITY_UNDEFINED = -1; // 0xffffffff
+ field public static final byte DIRECTIONALITY_WHITESPACE = 9; // 0x9
+ field public static final int DIR_NON_SPACING_MARK = 17; // 0x11
+ field public static final int EUROPEAN_NUMBER = 2; // 0x2
+ field public static final int EUROPEAN_NUMBER_SEPARATOR = 3; // 0x3
+ field public static final int EUROPEAN_NUMBER_TERMINATOR = 4; // 0x4
+ field public static final byte FIRST_STRONG_ISOLATE = 19; // 0x13
+ field public static final int LEFT_TO_RIGHT = 0; // 0x0
+ field public static final int LEFT_TO_RIGHT_EMBEDDING = 11; // 0xb
+ field public static final byte LEFT_TO_RIGHT_ISOLATE = 20; // 0x14
+ field public static final int LEFT_TO_RIGHT_OVERRIDE = 12; // 0xc
+ field public static final int OTHER_NEUTRAL = 10; // 0xa
+ field public static final int POP_DIRECTIONAL_FORMAT = 16; // 0x10
+ field public static final byte POP_DIRECTIONAL_ISOLATE = 22; // 0x16
+ field public static final int RIGHT_TO_LEFT = 1; // 0x1
+ field public static final int RIGHT_TO_LEFT_ARABIC = 13; // 0xd
+ field public static final int RIGHT_TO_LEFT_EMBEDDING = 14; // 0xe
+ field public static final byte RIGHT_TO_LEFT_ISOLATE = 21; // 0x15
+ field public static final int RIGHT_TO_LEFT_OVERRIDE = 15; // 0xf
+ field public static final int SEGMENT_SEPARATOR = 8; // 0x8
+ field public static final int WHITE_SPACE_NEUTRAL = 9; // 0x9
+ }
+
+ public abstract interface UProperty {
+ field public static final int AGE = 16384; // 0x4000
+ field public static final int ALPHABETIC = 0; // 0x0
+ field public static final int ASCII_HEX_DIGIT = 1; // 0x1
+ field public static final int BIDI_CLASS = 4096; // 0x1000
+ field public static final int BIDI_CONTROL = 2; // 0x2
+ field public static final int BIDI_MIRRORED = 3; // 0x3
+ field public static final int BIDI_MIRRORING_GLYPH = 16385; // 0x4001
+ field public static final int BIDI_PAIRED_BRACKET = 16397; // 0x400d
+ field public static final int BIDI_PAIRED_BRACKET_TYPE = 4117; // 0x1015
+ field public static final int BINARY_LIMIT = 57; // 0x39
+ field public static final int BINARY_START = 0; // 0x0
+ field public static final int BLOCK = 4097; // 0x1001
+ field public static final int CANONICAL_COMBINING_CLASS = 4098; // 0x1002
+ field public static final int CASED = 49; // 0x31
+ field public static final int CASE_FOLDING = 16386; // 0x4002
+ field public static final int CASE_IGNORABLE = 50; // 0x32
+ field public static final int CASE_SENSITIVE = 34; // 0x22
+ field public static final int CHANGES_WHEN_CASEFOLDED = 54; // 0x36
+ field public static final int CHANGES_WHEN_CASEMAPPED = 55; // 0x37
+ field public static final int CHANGES_WHEN_LOWERCASED = 51; // 0x33
+ field public static final int CHANGES_WHEN_NFKC_CASEFOLDED = 56; // 0x38
+ field public static final int CHANGES_WHEN_TITLECASED = 53; // 0x35
+ field public static final int CHANGES_WHEN_UPPERCASED = 52; // 0x34
+ field public static final int DASH = 4; // 0x4
+ field public static final int DECOMPOSITION_TYPE = 4099; // 0x1003
+ field public static final int DEFAULT_IGNORABLE_CODE_POINT = 5; // 0x5
+ field public static final int DEPRECATED = 6; // 0x6
+ field public static final int DIACRITIC = 7; // 0x7
+ field public static final int DOUBLE_LIMIT = 12289; // 0x3001
+ field public static final int DOUBLE_START = 12288; // 0x3000
+ field public static final int EAST_ASIAN_WIDTH = 4100; // 0x1004
+ field public static final int EXTENDER = 8; // 0x8
+ field public static final int FULL_COMPOSITION_EXCLUSION = 9; // 0x9
+ field public static final int GENERAL_CATEGORY = 4101; // 0x1005
+ field public static final int GENERAL_CATEGORY_MASK = 8192; // 0x2000
+ field public static final int GRAPHEME_BASE = 10; // 0xa
+ field public static final int GRAPHEME_CLUSTER_BREAK = 4114; // 0x1012
+ field public static final int GRAPHEME_EXTEND = 11; // 0xb
+ field public static final int GRAPHEME_LINK = 12; // 0xc
+ field public static final int HANGUL_SYLLABLE_TYPE = 4107; // 0x100b
+ field public static final int HEX_DIGIT = 13; // 0xd
+ field public static final int HYPHEN = 14; // 0xe
+ field public static final int IDEOGRAPHIC = 17; // 0x11
+ field public static final int IDS_BINARY_OPERATOR = 18; // 0x12
+ field public static final int IDS_TRINARY_OPERATOR = 19; // 0x13
+ field public static final int ID_CONTINUE = 15; // 0xf
+ field public static final int ID_START = 16; // 0x10
+ field public static final int INT_LIMIT = 4118; // 0x1016
+ field public static final int INT_START = 4096; // 0x1000
+ field public static final int JOINING_GROUP = 4102; // 0x1006
+ field public static final int JOINING_TYPE = 4103; // 0x1007
+ field public static final int JOIN_CONTROL = 20; // 0x14
+ field public static final int LEAD_CANONICAL_COMBINING_CLASS = 4112; // 0x1010
+ field public static final int LINE_BREAK = 4104; // 0x1008
+ field public static final int LOGICAL_ORDER_EXCEPTION = 21; // 0x15
+ field public static final int LOWERCASE = 22; // 0x16
+ field public static final int LOWERCASE_MAPPING = 16388; // 0x4004
+ field public static final int MASK_LIMIT = 8193; // 0x2001
+ field public static final int MASK_START = 8192; // 0x2000
+ field public static final int MATH = 23; // 0x17
+ field public static final int NAME = 16389; // 0x4005
+ field public static final int NFC_INERT = 39; // 0x27
+ field public static final int NFC_QUICK_CHECK = 4110; // 0x100e
+ field public static final int NFD_INERT = 37; // 0x25
+ field public static final int NFD_QUICK_CHECK = 4108; // 0x100c
+ field public static final int NFKC_INERT = 40; // 0x28
+ field public static final int NFKC_QUICK_CHECK = 4111; // 0x100f
+ field public static final int NFKD_INERT = 38; // 0x26
+ field public static final int NFKD_QUICK_CHECK = 4109; // 0x100d
+ field public static final int NONCHARACTER_CODE_POINT = 24; // 0x18
+ field public static final int NUMERIC_TYPE = 4105; // 0x1009
+ field public static final int NUMERIC_VALUE = 12288; // 0x3000
+ field public static final int OTHER_PROPERTY_LIMIT = 28673; // 0x7001
+ field public static final int OTHER_PROPERTY_START = 28672; // 0x7000
+ field public static final int PATTERN_SYNTAX = 42; // 0x2a
+ field public static final int PATTERN_WHITE_SPACE = 43; // 0x2b
+ field public static final int POSIX_ALNUM = 44; // 0x2c
+ field public static final int POSIX_BLANK = 45; // 0x2d
+ field public static final int POSIX_GRAPH = 46; // 0x2e
+ field public static final int POSIX_PRINT = 47; // 0x2f
+ field public static final int POSIX_XDIGIT = 48; // 0x30
+ field public static final int QUOTATION_MARK = 25; // 0x19
+ field public static final int RADICAL = 26; // 0x1a
+ field public static final int SCRIPT = 4106; // 0x100a
+ field public static final int SCRIPT_EXTENSIONS = 28672; // 0x7000
+ field public static final int SEGMENT_STARTER = 41; // 0x29
+ field public static final int SENTENCE_BREAK = 4115; // 0x1013
+ field public static final int SIMPLE_CASE_FOLDING = 16390; // 0x4006
+ field public static final int SIMPLE_LOWERCASE_MAPPING = 16391; // 0x4007
+ field public static final int SIMPLE_TITLECASE_MAPPING = 16392; // 0x4008
+ field public static final int SIMPLE_UPPERCASE_MAPPING = 16393; // 0x4009
+ field public static final int SOFT_DOTTED = 27; // 0x1b
+ field public static final int STRING_LIMIT = 16398; // 0x400e
+ field public static final int STRING_START = 16384; // 0x4000
+ field public static final int S_TERM = 35; // 0x23
+ field public static final int TERMINAL_PUNCTUATION = 28; // 0x1c
+ field public static final int TITLECASE_MAPPING = 16394; // 0x400a
+ field public static final int TRAIL_CANONICAL_COMBINING_CLASS = 4113; // 0x1011
+ field public static final int UNIFIED_IDEOGRAPH = 29; // 0x1d
+ field public static final int UPPERCASE = 30; // 0x1e
+ field public static final int UPPERCASE_MAPPING = 16396; // 0x400c
+ field public static final int VARIATION_SELECTOR = 36; // 0x24
+ field public static final int WHITE_SPACE = 31; // 0x1f
+ field public static final int WORD_BREAK = 4116; // 0x1014
+ field public static final int XID_CONTINUE = 32; // 0x20
+ field public static final int XID_START = 33; // 0x21
+ }
+
+ public static abstract interface UProperty.NameChoice {
+ field public static final int COUNT = 2; // 0x2
+ field public static final int LONG = 1; // 0x1
+ field public static final int SHORT = 0; // 0x0
+ }
+
+ public final class UScript {
+ method public static final boolean breaksBetweenLetters(int);
+ method public static final int[] getCode(java.util.Locale);
+ method public static final int[] getCode(android.icu.util.ULocale);
+ method public static final int[] getCode(java.lang.String);
+ method public static final int getCodeFromName(java.lang.String);
+ method public static final java.lang.String getName(int);
+ method public static final java.lang.String getSampleString(int);
+ method public static final int getScript(int);
+ method public static final int getScriptExtensions(int, java.util.BitSet);
+ method public static final java.lang.String getShortName(int);
+ method public static final android.icu.lang.UScript.ScriptUsage getUsage(int);
+ method public static final boolean hasScript(int, int);
+ method public static final boolean isCased(int);
+ method public static final boolean isRightToLeft(int);
+ field public static final int AFAKA = 147; // 0x93
+ field public static final int AHOM = 161; // 0xa1
+ field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
+ field public static final int ARABIC = 2; // 0x2
+ field public static final int ARMENIAN = 3; // 0x3
+ field public static final int AVESTAN = 117; // 0x75
+ field public static final int BALINESE = 62; // 0x3e
+ field public static final int BAMUM = 130; // 0x82
+ field public static final int BASSA_VAH = 134; // 0x86
+ field public static final int BATAK = 63; // 0x3f
+ field public static final int BENGALI = 4; // 0x4
+ field public static final int BLISSYMBOLS = 64; // 0x40
+ field public static final int BOOK_PAHLAVI = 124; // 0x7c
+ field public static final int BOPOMOFO = 5; // 0x5
+ field public static final int BRAHMI = 65; // 0x41
+ field public static final int BRAILLE = 46; // 0x2e
+ field public static final int BUGINESE = 55; // 0x37
+ field public static final int BUHID = 44; // 0x2c
+ field public static final int CANADIAN_ABORIGINAL = 40; // 0x28
+ field public static final int CARIAN = 104; // 0x68
+ field public static final int CAUCASIAN_ALBANIAN = 159; // 0x9f
+ field public static final int CHAKMA = 118; // 0x76
+ field public static final int CHAM = 66; // 0x42
+ field public static final int CHEROKEE = 6; // 0x6
+ field public static final int CIRTH = 67; // 0x43
+ field public static final int CODE_LIMIT = 167; // 0xa7
+ field public static final int COMMON = 0; // 0x0
+ field public static final int COPTIC = 7; // 0x7
+ field public static final int CUNEIFORM = 101; // 0x65
+ field public static final int CYPRIOT = 47; // 0x2f
+ field public static final int CYRILLIC = 8; // 0x8
+ field public static final int DEMOTIC_EGYPTIAN = 69; // 0x45
+ field public static final int DESERET = 9; // 0x9
+ field public static final int DEVANAGARI = 10; // 0xa
+ field public static final int DUPLOYAN = 135; // 0x87
+ field public static final int EASTERN_SYRIAC = 97; // 0x61
+ field public static final int EGYPTIAN_HIEROGLYPHS = 71; // 0x47
+ field public static final int ELBASAN = 136; // 0x88
+ field public static final int ESTRANGELO_SYRIAC = 95; // 0x5f
+ field public static final int ETHIOPIC = 11; // 0xb
+ field public static final int GEORGIAN = 12; // 0xc
+ field public static final int GLAGOLITIC = 56; // 0x38
+ field public static final int GOTHIC = 13; // 0xd
+ field public static final int GRANTHA = 137; // 0x89
+ field public static final int GREEK = 14; // 0xe
+ field public static final int GUJARATI = 15; // 0xf
+ field public static final int GURMUKHI = 16; // 0x10
+ field public static final int HAN = 17; // 0x11
+ field public static final int HANGUL = 18; // 0x12
+ field public static final int HANUNOO = 43; // 0x2b
+ field public static final int HARAPPAN_INDUS = 77; // 0x4d
+ field public static final int HATRAN = 162; // 0xa2
+ field public static final int HEBREW = 19; // 0x13
+ field public static final int HIERATIC_EGYPTIAN = 70; // 0x46
+ field public static final int HIRAGANA = 20; // 0x14
+ field public static final int IMPERIAL_ARAMAIC = 116; // 0x74
+ field public static final int INHERITED = 1; // 0x1
+ field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
+ field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
+ field public static final int INVALID_CODE = -1; // 0xffffffff
+ field public static final int JAPANESE = 105; // 0x69
+ field public static final int JAVANESE = 78; // 0x4e
+ field public static final int JURCHEN = 148; // 0x94
+ field public static final int KAITHI = 120; // 0x78
+ field public static final int KANNADA = 21; // 0x15
+ field public static final int KATAKANA = 22; // 0x16
+ field public static final int KATAKANA_OR_HIRAGANA = 54; // 0x36
+ field public static final int KAYAH_LI = 79; // 0x4f
+ field public static final int KHAROSHTHI = 57; // 0x39
+ field public static final int KHMER = 23; // 0x17
+ field public static final int KHOJKI = 157; // 0x9d
+ field public static final int KHUDAWADI = 145; // 0x91
+ field public static final int KHUTSURI = 72; // 0x48
+ field public static final int KOREAN = 119; // 0x77
+ field public static final int KPELLE = 138; // 0x8a
+ field public static final int LANNA = 106; // 0x6a
+ field public static final int LAO = 24; // 0x18
+ field public static final int LATIN = 25; // 0x19
+ field public static final int LATIN_FRAKTUR = 80; // 0x50
+ field public static final int LATIN_GAELIC = 81; // 0x51
+ field public static final int LEPCHA = 82; // 0x52
+ field public static final int LIMBU = 48; // 0x30
+ field public static final int LINEAR_A = 83; // 0x53
+ field public static final int LINEAR_B = 49; // 0x31
+ field public static final int LISU = 131; // 0x83
+ field public static final int LOMA = 139; // 0x8b
+ field public static final int LYCIAN = 107; // 0x6b
+ field public static final int LYDIAN = 108; // 0x6c
+ field public static final int MAHAJANI = 160; // 0xa0
+ field public static final int MALAYALAM = 26; // 0x1a
+ field public static final int MANDAEAN = 84; // 0x54
+ field public static final int MANDAIC = 84; // 0x54
+ field public static final int MANICHAEAN = 121; // 0x79
+ field public static final int MATHEMATICAL_NOTATION = 128; // 0x80
+ field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
+ field public static final int MEITEI_MAYEK = 115; // 0x73
+ field public static final int MENDE = 140; // 0x8c
+ field public static final int MEROITIC = 86; // 0x56
+ field public static final int MEROITIC_CURSIVE = 141; // 0x8d
+ field public static final int MEROITIC_HIEROGLYPHS = 86; // 0x56
+ field public static final int MIAO = 92; // 0x5c
+ field public static final int MODI = 163; // 0xa3
+ field public static final int MONGOLIAN = 27; // 0x1b
+ field public static final int MOON = 114; // 0x72
+ field public static final int MRO = 149; // 0x95
+ field public static final int MULTANI = 164; // 0xa4
+ field public static final int MYANMAR = 28; // 0x1c
+ field public static final int NABATAEAN = 143; // 0x8f
+ field public static final int NAKHI_GEBA = 132; // 0x84
+ field public static final int NEW_TAI_LUE = 59; // 0x3b
+ field public static final int NKO = 87; // 0x57
+ field public static final int NUSHU = 150; // 0x96
+ field public static final int OGHAM = 29; // 0x1d
+ field public static final int OLD_CHURCH_SLAVONIC_CYRILLIC = 68; // 0x44
+ field public static final int OLD_HUNGARIAN = 76; // 0x4c
+ field public static final int OLD_ITALIC = 30; // 0x1e
+ field public static final int OLD_NORTH_ARABIAN = 142; // 0x8e
+ field public static final int OLD_PERMIC = 89; // 0x59
+ field public static final int OLD_PERSIAN = 61; // 0x3d
+ field public static final int OLD_SOUTH_ARABIAN = 133; // 0x85
+ field public static final int OL_CHIKI = 109; // 0x6d
+ field public static final int ORIYA = 31; // 0x1f
+ field public static final int ORKHON = 88; // 0x58
+ field public static final int OSMANYA = 50; // 0x32
+ field public static final int PAHAWH_HMONG = 75; // 0x4b
+ field public static final int PALMYRENE = 144; // 0x90
+ field public static final int PAU_CIN_HAU = 165; // 0xa5
+ field public static final int PHAGS_PA = 90; // 0x5a
+ field public static final int PHOENICIAN = 91; // 0x5b
+ field public static final int PHONETIC_POLLARD = 92; // 0x5c
+ field public static final int PSALTER_PAHLAVI = 123; // 0x7b
+ field public static final int REJANG = 110; // 0x6e
+ field public static final int RONGORONGO = 93; // 0x5d
+ field public static final int RUNIC = 32; // 0x20
+ field public static final int SAMARITAN = 126; // 0x7e
+ field public static final int SARATI = 94; // 0x5e
+ field public static final int SAURASHTRA = 111; // 0x6f
+ field public static final int SHARADA = 151; // 0x97
+ field public static final int SHAVIAN = 51; // 0x33
+ field public static final int SIDDHAM = 166; // 0xa6
+ field public static final int SIGN_WRITING = 112; // 0x70
+ field public static final int SIMPLIFIED_HAN = 73; // 0x49
+ field public static final int SINDHI = 145; // 0x91
+ field public static final int SINHALA = 33; // 0x21
+ field public static final int SORA_SOMPENG = 152; // 0x98
+ field public static final int SUNDANESE = 113; // 0x71
+ field public static final int SYLOTI_NAGRI = 58; // 0x3a
+ field public static final int SYMBOLS = 129; // 0x81
+ field public static final int SYRIAC = 34; // 0x22
+ field public static final int TAGALOG = 42; // 0x2a
+ field public static final int TAGBANWA = 45; // 0x2d
+ field public static final int TAI_LE = 52; // 0x34
+ field public static final int TAI_VIET = 127; // 0x7f
+ field public static final int TAKRI = 153; // 0x99
+ field public static final int TAMIL = 35; // 0x23
+ field public static final int TANGUT = 154; // 0x9a
+ field public static final int TELUGU = 36; // 0x24
+ field public static final int TENGWAR = 98; // 0x62
+ field public static final int THAANA = 37; // 0x25
+ field public static final int THAI = 38; // 0x26
+ field public static final int TIBETAN = 39; // 0x27
+ field public static final int TIFINAGH = 60; // 0x3c
+ field public static final int TIRHUTA = 158; // 0x9e
+ field public static final int TRADITIONAL_HAN = 74; // 0x4a
+ field public static final int UCAS = 40; // 0x28
+ field public static final int UGARITIC = 53; // 0x35
+ field public static final int UNKNOWN = 103; // 0x67
+ field public static final int UNWRITTEN_LANGUAGES = 102; // 0x66
+ field public static final int VAI = 99; // 0x63
+ field public static final int VISIBLE_SPEECH = 100; // 0x64
+ field public static final int WARANG_CITI = 146; // 0x92
+ field public static final int WESTERN_SYRIAC = 96; // 0x60
+ field public static final int WOLEAI = 155; // 0x9b
+ field public static final int YI = 41; // 0x29
+ }
+
+ public static final class UScript.ScriptUsage extends java.lang.Enum {
+ method public static android.icu.lang.UScript.ScriptUsage valueOf(java.lang.String);
+ method public static final android.icu.lang.UScript.ScriptUsage[] values();
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage ASPIRATIONAL;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage EXCLUDED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage LIMITED_USE;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage NOT_ENCODED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage RECOMMENDED;
+ enum_constant public static final android.icu.lang.UScript.ScriptUsage UNKNOWN;
+ }
+
+}
+
+package android.icu.math {
+
+ public class BigDecimal extends java.lang.Number implements java.lang.Comparable java.io.Serializable {
+ ctor public BigDecimal(java.math.BigDecimal);
+ ctor public BigDecimal(java.math.BigInteger);
+ ctor public BigDecimal(java.math.BigInteger, int);
+ ctor public BigDecimal(char[]);
+ ctor public BigDecimal(char[], int, int);
+ ctor public BigDecimal(double);
+ ctor public BigDecimal(int);
+ ctor public BigDecimal(long);
+ ctor public BigDecimal(java.lang.String);
+ method public android.icu.math.BigDecimal abs();
+ method public android.icu.math.BigDecimal abs(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal add(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal add(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public byte byteValueExact();
+ method public int compareTo(android.icu.math.BigDecimal);
+ method public int compareTo(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, int);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, int, int);
+ method public android.icu.math.BigDecimal divide(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal divideInteger(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal divideInteger(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public double doubleValue();
+ method public float floatValue();
+ method public java.lang.String format(int, int);
+ method public java.lang.String format(int, int, int, int, int, int);
+ method public int intValue();
+ method public int intValueExact();
+ method public long longValue();
+ method public long longValueExact();
+ method public android.icu.math.BigDecimal max(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal max(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal min(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal min(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal movePointLeft(int);
+ method public android.icu.math.BigDecimal movePointRight(int);
+ method public android.icu.math.BigDecimal multiply(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal multiply(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal negate();
+ method public android.icu.math.BigDecimal negate(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal plus();
+ method public android.icu.math.BigDecimal plus(android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal pow(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal pow(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public android.icu.math.BigDecimal remainder(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal remainder(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public int scale();
+ method public android.icu.math.BigDecimal setScale(int);
+ method public android.icu.math.BigDecimal setScale(int, int);
+ method public short shortValueExact();
+ method public int signum();
+ method public android.icu.math.BigDecimal subtract(android.icu.math.BigDecimal);
+ method public android.icu.math.BigDecimal subtract(android.icu.math.BigDecimal, android.icu.math.MathContext);
+ method public java.math.BigDecimal toBigDecimal();
+ method public java.math.BigInteger toBigInteger();
+ method public java.math.BigInteger toBigIntegerExact();
+ method public char[] toCharArray();
+ method public java.math.BigInteger unscaledValue();
+ method public static android.icu.math.BigDecimal valueOf(double);
+ method public static android.icu.math.BigDecimal valueOf(long);
+ method public static android.icu.math.BigDecimal valueOf(long, int);
+ field public static final android.icu.math.BigDecimal ONE;
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final android.icu.math.BigDecimal TEN;
+ field public static final android.icu.math.BigDecimal ZERO;
+ }
+
+ public final class MathContext implements java.io.Serializable {
+ ctor public MathContext(int);
+ ctor public MathContext(int, int);
+ ctor public MathContext(int, int, boolean);
+ ctor public MathContext(int, int, boolean, int);
+ method public int getDigits();
+ method public int getForm();
+ method public boolean getLostDigits();
+ method public int getRoundingMode();
+ field public static final android.icu.math.MathContext DEFAULT;
+ field public static final int ENGINEERING = 2; // 0x2
+ field public static final int PLAIN = 0; // 0x0
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final int SCIENTIFIC = 1; // 0x1
+ }
+
+}
+
+package android.icu.text {
+
+ public final class AlphabeticIndex implements java.lang.Iterable {
+ ctor public AlphabeticIndex(android.icu.util.ULocale);
+ ctor public AlphabeticIndex(java.util.Locale);
+ ctor public AlphabeticIndex(android.icu.text.RuleBasedCollator);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(android.icu.text.UnicodeSet);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(android.icu.util.ULocale...);
+ method public android.icu.text.AlphabeticIndex<V> addLabels(java.util.Locale...);
+ method public android.icu.text.AlphabeticIndex<V> addRecord(java.lang.CharSequence, V);
+ method public android.icu.text.AlphabeticIndex.ImmutableIndex<V> buildImmutableIndex();
+ method public android.icu.text.AlphabeticIndex<V> clearRecords();
+ method public int getBucketCount();
+ method public int getBucketIndex(java.lang.CharSequence);
+ method public java.util.List<java.lang.String> getBucketLabels();
+ method public android.icu.text.RuleBasedCollator getCollator();
+ method public java.lang.String getInflowLabel();
+ method public int getMaxLabelCount();
+ method public java.lang.String getOverflowLabel();
+ method public int getRecordCount();
+ method public java.lang.String getUnderflowLabel();
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Bucket<V>> iterator();
+ method public android.icu.text.AlphabeticIndex<V> setInflowLabel(java.lang.String);
+ method public android.icu.text.AlphabeticIndex<V> setMaxLabelCount(int);
+ method public android.icu.text.AlphabeticIndex<V> setOverflowLabel(java.lang.String);
+ method public android.icu.text.AlphabeticIndex<V> setUnderflowLabel(java.lang.String);
+ }
+
+ public static class AlphabeticIndex.Bucket implements java.lang.Iterable {
+ method public java.lang.String getLabel();
+ method public android.icu.text.AlphabeticIndex.Bucket.LabelType getLabelType();
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Record<V>> iterator();
+ method public int size();
+ }
+
+ public static final class AlphabeticIndex.Bucket.LabelType extends java.lang.Enum {
+ method public static android.icu.text.AlphabeticIndex.Bucket.LabelType valueOf(java.lang.String);
+ method public static final android.icu.text.AlphabeticIndex.Bucket.LabelType[] values();
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType INFLOW;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType NORMAL;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType OVERFLOW;
+ enum_constant public static final android.icu.text.AlphabeticIndex.Bucket.LabelType UNDERFLOW;
+ }
+
+ public static final class AlphabeticIndex.ImmutableIndex implements java.lang.Iterable {
+ method public android.icu.text.AlphabeticIndex.Bucket<V> getBucket(int);
+ method public int getBucketCount();
+ method public int getBucketIndex(java.lang.CharSequence);
+ method public java.util.Iterator<android.icu.text.AlphabeticIndex.Bucket<V>> iterator();
+ }
+
+ public static class AlphabeticIndex.Record {
+ method public V getData();
+ method public java.lang.CharSequence getName();
+ }
+
+ public abstract class BreakIterator implements java.lang.Cloneable {
+ ctor protected BreakIterator();
+ method public java.lang.Object clone();
+ method public abstract int current();
+ method public abstract int first();
+ method public abstract int following(int);
+ method public static synchronized java.util.Locale[] getAvailableLocales();
+ method public static android.icu.text.BreakIterator getCharacterInstance();
+ method public static android.icu.text.BreakIterator getCharacterInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getCharacterInstance(android.icu.util.ULocale);
+ method public static android.icu.text.BreakIterator getLineInstance();
+ method public static android.icu.text.BreakIterator getLineInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getLineInstance(android.icu.util.ULocale);
+ method public int getRuleStatus();
+ method public int getRuleStatusVec(int[]);
+ method public static android.icu.text.BreakIterator getSentenceInstance();
+ method public static android.icu.text.BreakIterator getSentenceInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getSentenceInstance(android.icu.util.ULocale);
+ method public abstract java.text.CharacterIterator getText();
+ method public static android.icu.text.BreakIterator getTitleInstance();
+ method public static android.icu.text.BreakIterator getTitleInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getTitleInstance(android.icu.util.ULocale);
+ method public static android.icu.text.BreakIterator getWordInstance();
+ method public static android.icu.text.BreakIterator getWordInstance(java.util.Locale);
+ method public static android.icu.text.BreakIterator getWordInstance(android.icu.util.ULocale);
+ method public boolean isBoundary(int);
+ method public abstract int last();
+ method public abstract int next(int);
+ method public abstract int next();
+ method public int preceding(int);
+ method public abstract int previous();
+ method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, java.util.Locale, int);
+ method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, android.icu.util.ULocale, int);
+ method public void setText(java.lang.String);
+ method public abstract void setText(java.text.CharacterIterator);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int DONE = -1; // 0xffffffff
+ field public static final int KIND_CHARACTER = 0; // 0x0
+ field public static final int KIND_LINE = 2; // 0x2
+ field public static final int KIND_SENTENCE = 3; // 0x3
+ field public static final int KIND_TITLE = 4; // 0x4
+ field public static final int KIND_WORD = 1; // 0x1
+ field public static final int WORD_IDEO = 400; // 0x190
+ field public static final int WORD_IDEO_LIMIT = 500; // 0x1f4
+ field public static final int WORD_KANA = 300; // 0x12c
+ field public static final int WORD_KANA_LIMIT = 400; // 0x190
+ field public static final int WORD_LETTER = 200; // 0xc8
+ field public static final int WORD_LETTER_LIMIT = 300; // 0x12c
+ field public static final int WORD_NONE = 0; // 0x0
+ field public static final int WORD_NONE_LIMIT = 100; // 0x64
+ field public static final int WORD_NUMBER = 100; // 0x64
+ field public static final int WORD_NUMBER_LIMIT = 200; // 0xc8
+ }
+
+ public final class CollationElementIterator {
+ method public int getMaxExpansion(int);
+ method public int getOffset();
+ method public int next();
+ method public int previous();
+ method public static final int primaryOrder(int);
+ method public void reset();
+ method public static final int secondaryOrder(int);
+ method public void setOffset(int);
+ method public void setText(java.lang.String);
+ method public void setText(android.icu.text.UCharacterIterator);
+ method public void setText(java.text.CharacterIterator);
+ method public static final int tertiaryOrder(int);
+ field public static final int IGNORABLE = 0; // 0x0
+ field public static final int NULLORDER = -1; // 0xffffffff
+ }
+
+ public final class CollationKey implements java.lang.Comparable {
+ ctor public CollationKey(java.lang.String, byte[]);
+ ctor public CollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public int compareTo(android.icu.text.CollationKey);
+ method public boolean equals(android.icu.text.CollationKey);
+ method public android.icu.text.CollationKey getBound(int, int);
+ method public java.lang.String getSourceString();
+ method public android.icu.text.CollationKey merge(android.icu.text.CollationKey);
+ method public byte[] toByteArray();
+ }
+
+ public static final class CollationKey.BoundMode {
+ field public static final int COUNT = 3; // 0x3
+ field public static final int LOWER = 0; // 0x0
+ field public static final int UPPER = 1; // 0x1
+ field public static final int UPPER_LONG = 2; // 0x2
+ }
+
+ public abstract class Collator implements java.lang.Cloneable java.util.Comparator android.icu.util.Freezable {
+ ctor protected Collator();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public android.icu.text.Collator cloneAsThawed();
+ method public abstract int compare(java.lang.String, java.lang.String);
+ method public int compare(java.lang.Object, java.lang.Object);
+ method public boolean equals(java.lang.String, java.lang.String);
+ method public android.icu.text.Collator freeze();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public static final android.icu.util.ULocale[] getAvailableULocales();
+ method public abstract android.icu.text.CollationKey getCollationKey(java.lang.String);
+ method public int getDecomposition();
+ method public static java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
+ method public static java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayName(java.util.Locale);
+ method public static java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public static int[] getEquivalentReorderCodes(int);
+ method public static final android.icu.util.ULocale getFunctionalEquivalent(java.lang.String, android.icu.util.ULocale, boolean[]);
+ method public static final android.icu.util.ULocale getFunctionalEquivalent(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.Collator getInstance();
+ method public static final android.icu.text.Collator getInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.Collator getInstance(java.util.Locale);
+ method public static final java.lang.String[] getKeywordValues(java.lang.String);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public static final java.lang.String[] getKeywords();
+ method public int getMaxVariable();
+ method public abstract android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public int[] getReorderCodes();
+ method public int getStrength();
+ method public android.icu.text.UnicodeSet getTailoredSet();
+ method public abstract android.icu.util.VersionInfo getUCAVersion();
+ method public abstract int getVariableTop();
+ method public abstract android.icu.util.VersionInfo getVersion();
+ method public boolean isFrozen();
+ method public static final java.lang.Object registerFactory(android.icu.text.Collator.CollatorFactory);
+ method public static final java.lang.Object registerInstance(android.icu.text.Collator, android.icu.util.ULocale);
+ method public void setDecomposition(int);
+ method public android.icu.text.Collator setMaxVariable(int);
+ method public void setReorderCodes(int...);
+ method public void setStrength(int);
+ method public static final boolean unregister(java.lang.Object);
+ field public static final int CANONICAL_DECOMPOSITION = 17; // 0x11
+ field public static final int FULL_DECOMPOSITION = 15; // 0xf
+ field public static final int IDENTICAL = 15; // 0xf
+ field public static final int NO_DECOMPOSITION = 16; // 0x10
+ field public static final int PRIMARY = 0; // 0x0
+ field public static final int QUATERNARY = 3; // 0x3
+ field public static final int SECONDARY = 1; // 0x1
+ field public static final int TERTIARY = 2; // 0x2
+ }
+
+ public static abstract class Collator.CollatorFactory {
+ ctor protected Collator.CollatorFactory();
+ method public android.icu.text.Collator createCollator(android.icu.util.ULocale);
+ method public android.icu.text.Collator createCollator(java.util.Locale);
+ method public java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
+ method public java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
+ method public abstract java.util.Set<java.lang.String> getSupportedLocaleIDs();
+ method public boolean visible();
+ }
+
+ public static abstract interface Collator.ReorderCodes {
+ field public static final int CURRENCY = 4099; // 0x1003
+ field public static final int DEFAULT = -1; // 0xffffffff
+ field public static final int DIGIT = 4100; // 0x1004
+ field public static final int FIRST = 4096; // 0x1000
+ field public static final int LIMIT = 4101; // 0x1005
+ field public static final int NONE = 103; // 0x67
+ field public static final int OTHERS = 103; // 0x67
+ field public static final int PUNCTUATION = 4097; // 0x1001
+ field public static final int SPACE = 4096; // 0x1000
+ field public static final int SYMBOL = 4098; // 0x1002
+ }
+
+ public class CompactDecimalFormat extends android.icu.text.DecimalFormat {
+ method public static android.icu.text.CompactDecimalFormat getInstance(android.icu.util.ULocale, android.icu.text.CompactDecimalFormat.CompactStyle);
+ method public static android.icu.text.CompactDecimalFormat getInstance(java.util.Locale, android.icu.text.CompactDecimalFormat.CompactStyle);
+ }
+
+ public static final class CompactDecimalFormat.CompactStyle extends java.lang.Enum {
+ method public static android.icu.text.CompactDecimalFormat.CompactStyle valueOf(java.lang.String);
+ method public static final android.icu.text.CompactDecimalFormat.CompactStyle[] values();
+ enum_constant public static final android.icu.text.CompactDecimalFormat.CompactStyle LONG;
+ enum_constant public static final android.icu.text.CompactDecimalFormat.CompactStyle SHORT;
+ }
+
+ public class CurrencyPluralInfo implements java.lang.Cloneable java.io.Serializable {
+ ctor public CurrencyPluralInfo();
+ ctor public CurrencyPluralInfo(java.util.Locale);
+ ctor public CurrencyPluralInfo(android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public java.lang.String getCurrencyPluralPattern(java.lang.String);
+ method public static android.icu.text.CurrencyPluralInfo getInstance();
+ method public static android.icu.text.CurrencyPluralInfo getInstance(java.util.Locale);
+ method public static android.icu.text.CurrencyPluralInfo getInstance(android.icu.util.ULocale);
+ method public android.icu.util.ULocale getLocale();
+ method public android.icu.text.PluralRules getPluralRules();
+ method public void setCurrencyPluralPattern(java.lang.String, java.lang.String);
+ method public void setLocale(android.icu.util.ULocale);
+ method public void setPluralRules(java.lang.String);
+ }
+
+ public abstract class DateFormat extends android.icu.text.UFormat {
+ ctor protected DateFormat();
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public boolean getBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute);
+ method public android.icu.util.Calendar getCalendar();
+ method public android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public static final android.icu.text.DateFormat getDateInstance();
+ method public static final android.icu.text.DateFormat getDateInstance(int);
+ method public static final android.icu.text.DateFormat getDateInstance(int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateInstance(int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateInstance(android.icu.util.Calendar, int);
+ method public static final android.icu.text.DateFormat getDateTimeInstance();
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(int, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getDateTimeInstance(android.icu.util.Calendar, int, int);
+ method public static final android.icu.text.DateFormat getInstance();
+ method public static final android.icu.text.DateFormat getInstance(android.icu.util.Calendar, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstance(android.icu.util.Calendar);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(android.icu.util.Calendar, java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getInstanceForSkeleton(android.icu.util.Calendar, java.lang.String, android.icu.util.ULocale);
+ method public android.icu.text.NumberFormat getNumberFormat();
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String);
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getPatternInstance(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getPatternInstance(android.icu.util.Calendar, java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateFormat getPatternInstance(android.icu.util.Calendar, java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance();
+ method public static final android.icu.text.DateFormat getTimeInstance(int);
+ method public static final android.icu.text.DateFormat getTimeInstance(int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getTimeInstance(int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int, java.util.Locale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int, android.icu.util.ULocale);
+ method public static final android.icu.text.DateFormat getTimeInstance(android.icu.util.Calendar, int);
+ method public android.icu.util.TimeZone getTimeZone();
+ method public boolean isCalendarLenient();
+ method public boolean isLenient();
+ method public java.util.Date parse(java.lang.String) throws java.text.ParseException;
+ method public abstract void parse(java.lang.String, android.icu.util.Calendar, java.text.ParsePosition);
+ method public java.util.Date parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public android.icu.text.DateFormat setBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute, boolean);
+ method public void setCalendar(android.icu.util.Calendar);
+ method public void setCalendarLenient(boolean);
+ method public void setContext(android.icu.text.DisplayContext);
+ method public void setLenient(boolean);
+ method public void setNumberFormat(android.icu.text.NumberFormat);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ field public static final java.lang.String ABBR_GENERIC_TZ = "v";
+ field public static final java.lang.String ABBR_MONTH = "MMM";
+ field public static final java.lang.String ABBR_MONTH_DAY = "MMMd";
+ field public static final java.lang.String ABBR_MONTH_WEEKDAY_DAY = "MMMEd";
+ field public static final java.lang.String ABBR_QUARTER = "QQQ";
+ field public static final java.lang.String ABBR_SPECIFIC_TZ = "z";
+ field public static final java.lang.String ABBR_UTC_TZ = "ZZZZ";
+ field public static final java.lang.String ABBR_WEEKDAY = "E";
+ field public static final int AM_PM_FIELD = 14; // 0xe
+ field public static final int DATE_FIELD = 3; // 0x3
+ field public static final java.lang.String DAY = "d";
+ field public static final int DAY_OF_WEEK_FIELD = 9; // 0x9
+ field public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11; // 0xb
+ field public static final int DAY_OF_YEAR_FIELD = 10; // 0xa
+ field public static final int DEFAULT = 2; // 0x2
+ field public static final int DOW_LOCAL_FIELD = 19; // 0x13
+ field public static final int ERA_FIELD = 0; // 0x0
+ field public static final int EXTENDED_YEAR_FIELD = 20; // 0x14
+ field public static final int FIELD_COUNT = 36; // 0x24
+ field public static final int FRACTIONAL_SECOND_FIELD = 8; // 0x8
+ field public static final int FULL = 0; // 0x0
+ field public static final java.lang.String GENERIC_TZ = "vvvv";
+ field public static final java.lang.String HOUR = "j";
+ field public static final int HOUR0_FIELD = 16; // 0x10
+ field public static final int HOUR1_FIELD = 15; // 0xf
+ field public static final java.lang.String HOUR24 = "H";
+ field public static final java.lang.String HOUR24_MINUTE = "Hm";
+ field public static final java.lang.String HOUR24_MINUTE_SECOND = "Hms";
+ field public static final java.lang.String HOUR_MINUTE = "jm";
+ field public static final java.lang.String HOUR_MINUTE_SECOND = "jms";
+ field public static final int HOUR_OF_DAY0_FIELD = 5; // 0x5
+ field public static final int HOUR_OF_DAY1_FIELD = 4; // 0x4
+ field public static final int JULIAN_DAY_FIELD = 21; // 0x15
+ field public static final java.lang.String LOCATION_TZ = "VVVV";
+ field public static final int LONG = 1; // 0x1
+ field public static final int MEDIUM = 2; // 0x2
+ field public static final int MILLISECONDS_IN_DAY_FIELD = 22; // 0x16
+ field public static final int MILLISECOND_FIELD = 8; // 0x8
+ field public static final java.lang.String MINUTE = "m";
+ field public static final int MINUTE_FIELD = 6; // 0x6
+ field public static final java.lang.String MINUTE_SECOND = "ms";
+ field public static final java.lang.String MONTH = "MMMM";
+ field public static final java.lang.String MONTH_DAY = "MMMMd";
+ field public static final int MONTH_FIELD = 2; // 0x2
+ field public static final java.lang.String MONTH_WEEKDAY_DAY = "MMMMEEEEd";
+ field public static final int NONE = -1; // 0xffffffff
+ field public static final java.lang.String NUM_MONTH = "M";
+ field public static final java.lang.String NUM_MONTH_DAY = "Md";
+ field public static final java.lang.String NUM_MONTH_WEEKDAY_DAY = "MEd";
+ field public static final java.lang.String QUARTER = "QQQQ";
+ field public static final int QUARTER_FIELD = 27; // 0x1b
+ field public static final int RELATIVE = 128; // 0x80
+ field public static final int RELATIVE_DEFAULT = 130; // 0x82
+ field public static final int RELATIVE_FULL = 128; // 0x80
+ field public static final int RELATIVE_LONG = 129; // 0x81
+ field public static final int RELATIVE_MEDIUM = 130; // 0x82
+ field public static final int RELATIVE_SHORT = 131; // 0x83
+ field public static final java.lang.String SECOND = "s";
+ field public static final int SECOND_FIELD = 7; // 0x7
+ field public static final int SHORT = 3; // 0x3
+ field public static final java.lang.String SPECIFIC_TZ = "zzzz";
+ field public static final int STANDALONE_DAY_FIELD = 25; // 0x19
+ field public static final int STANDALONE_MONTH_FIELD = 26; // 0x1a
+ field public static final int STANDALONE_QUARTER_FIELD = 28; // 0x1c
+ field public static final int TIMEZONE_FIELD = 17; // 0x11
+ field public static final int TIMEZONE_GENERIC_FIELD = 24; // 0x18
+ field public static final int TIMEZONE_ISO_FIELD = 32; // 0x20
+ field public static final int TIMEZONE_ISO_LOCAL_FIELD = 33; // 0x21
+ field public static final int TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD = 31; // 0x1f
+ field public static final int TIMEZONE_RFC_FIELD = 23; // 0x17
+ field public static final int TIMEZONE_SPECIAL_FIELD = 29; // 0x1d
+ field public static final java.lang.String WEEKDAY = "EEEE";
+ field public static final int WEEK_OF_MONTH_FIELD = 13; // 0xd
+ field public static final int WEEK_OF_YEAR_FIELD = 12; // 0xc
+ field public static final java.lang.String YEAR = "y";
+ field public static final java.lang.String YEAR_ABBR_MONTH = "yMMM";
+ field public static final java.lang.String YEAR_ABBR_MONTH_DAY = "yMMMd";
+ field public static final java.lang.String YEAR_ABBR_MONTH_WEEKDAY_DAY = "yMMMEd";
+ field public static final java.lang.String YEAR_ABBR_QUARTER = "yQQQ";
+ field public static final int YEAR_FIELD = 1; // 0x1
+ field public static final java.lang.String YEAR_MONTH = "yMMMM";
+ field public static final java.lang.String YEAR_MONTH_DAY = "yMMMMd";
+ field public static final java.lang.String YEAR_MONTH_WEEKDAY_DAY = "yMMMMEEEEd";
+ field public static final int YEAR_NAME_FIELD = 30; // 0x1e
+ field public static final java.lang.String YEAR_NUM_MONTH = "yM";
+ field public static final java.lang.String YEAR_NUM_MONTH_DAY = "yMd";
+ field public static final java.lang.String YEAR_NUM_MONTH_WEEKDAY_DAY = "yMEd";
+ field public static final java.lang.String YEAR_QUARTER = "yQQQQ";
+ field public static final int YEAR_WOY_FIELD = 18; // 0x12
+ field protected android.icu.util.Calendar calendar;
+ field protected android.icu.text.NumberFormat numberFormat;
+ }
+
+ public static final class DateFormat.BooleanAttribute extends java.lang.Enum {
+ method public static android.icu.text.DateFormat.BooleanAttribute valueOf(java.lang.String);
+ method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
+ enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
+ }
+
+ public static class DateFormat.Field extends java.text.Format.Field {
+ ctor protected DateFormat.Field(java.lang.String, int);
+ method public int getCalendarField();
+ method public static android.icu.text.DateFormat.Field ofCalendarField(int);
+ field public static final android.icu.text.DateFormat.Field AM_PM;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_MONTH;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_WEEK;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_WEEK_IN_MONTH;
+ field public static final android.icu.text.DateFormat.Field DAY_OF_YEAR;
+ field public static final android.icu.text.DateFormat.Field DOW_LOCAL;
+ field public static final android.icu.text.DateFormat.Field ERA;
+ field public static final android.icu.text.DateFormat.Field EXTENDED_YEAR;
+ field public static final android.icu.text.DateFormat.Field HOUR0;
+ field public static final android.icu.text.DateFormat.Field HOUR1;
+ field public static final android.icu.text.DateFormat.Field HOUR_OF_DAY0;
+ field public static final android.icu.text.DateFormat.Field HOUR_OF_DAY1;
+ field public static final android.icu.text.DateFormat.Field JULIAN_DAY;
+ field public static final android.icu.text.DateFormat.Field MILLISECOND;
+ field public static final android.icu.text.DateFormat.Field MILLISECONDS_IN_DAY;
+ field public static final android.icu.text.DateFormat.Field MINUTE;
+ field public static final android.icu.text.DateFormat.Field MONTH;
+ field public static final android.icu.text.DateFormat.Field QUARTER;
+ field public static final android.icu.text.DateFormat.Field SECOND;
+ field public static final android.icu.text.DateFormat.Field TIME_ZONE;
+ field public static final android.icu.text.DateFormat.Field WEEK_OF_MONTH;
+ field public static final android.icu.text.DateFormat.Field WEEK_OF_YEAR;
+ field public static final android.icu.text.DateFormat.Field YEAR;
+ field public static final android.icu.text.DateFormat.Field YEAR_WOY;
+ }
+
+ public class DateFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateFormatSymbols();
+ ctor public DateFormatSymbols(java.util.Locale);
+ ctor public DateFormatSymbols(android.icu.util.ULocale);
+ ctor public DateFormatSymbols(android.icu.util.Calendar, java.util.Locale);
+ ctor public DateFormatSymbols(android.icu.util.Calendar, android.icu.util.ULocale);
+ ctor public DateFormatSymbols(java.lang.Class<? extends android.icu.util.Calendar>, java.util.Locale);
+ ctor public DateFormatSymbols(java.lang.Class<? extends android.icu.util.Calendar>, android.icu.util.ULocale);
+ ctor public DateFormatSymbols(java.util.ResourceBundle, java.util.Locale);
+ ctor public DateFormatSymbols(java.util.ResourceBundle, android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public java.lang.String[] getAmPmStrings();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.lang.String[] getEraNames();
+ method public java.lang.String[] getEras();
+ method public static android.icu.text.DateFormatSymbols getInstance();
+ method public static android.icu.text.DateFormatSymbols getInstance(java.util.Locale);
+ method public static android.icu.text.DateFormatSymbols getInstance(android.icu.util.ULocale);
+ method public java.lang.String getLocalPatternChars();
+ method public java.lang.String[] getMonths();
+ method public java.lang.String[] getMonths(int, int);
+ method public java.lang.String[] getQuarters(int, int);
+ method public java.lang.String[] getShortMonths();
+ method public java.lang.String[] getShortWeekdays();
+ method public java.lang.String[] getWeekdays();
+ method public java.lang.String[] getWeekdays(int, int);
+ method public java.lang.String[] getYearNames(int, int);
+ method public java.lang.String[] getZodiacNames(int, int);
+ method public java.lang.String[][] getZoneStrings();
+ method protected void initializeData(android.icu.util.ULocale, java.lang.String);
+ method public void setAmPmStrings(java.lang.String[]);
+ method public void setEraNames(java.lang.String[]);
+ method public void setEras(java.lang.String[]);
+ method public void setLocalPatternChars(java.lang.String);
+ method public void setMonths(java.lang.String[]);
+ method public void setMonths(java.lang.String[], int, int);
+ method public void setQuarters(java.lang.String[], int, int);
+ method public void setShortMonths(java.lang.String[]);
+ method public void setShortWeekdays(java.lang.String[]);
+ method public void setWeekdays(java.lang.String[], int, int);
+ method public void setWeekdays(java.lang.String[]);
+ method public void setYearNames(java.lang.String[], int, int);
+ method public void setZodiacNames(java.lang.String[], int, int);
+ method public void setZoneStrings(java.lang.String[][]);
+ field public static final int ABBREVIATED = 0; // 0x0
+ field public static final int FORMAT = 0; // 0x0
+ field public static final int NARROW = 2; // 0x2
+ field public static final int SHORT = 3; // 0x3
+ field public static final int STANDALONE = 1; // 0x1
+ field public static final int WIDE = 1; // 0x1
+ }
+
+ public class DateIntervalFormat extends android.icu.text.UFormat {
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(android.icu.util.DateInterval, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(android.icu.util.Calendar, android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.DateFormat getDateFormat();
+ method public android.icu.text.DateIntervalInfo getDateIntervalInfo();
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, java.util.Locale);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.util.ULocale);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.text.DateIntervalInfo);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, java.util.Locale, android.icu.text.DateIntervalInfo);
+ method public static final android.icu.text.DateIntervalFormat getInstance(java.lang.String, android.icu.util.ULocale, android.icu.text.DateIntervalInfo);
+ method public android.icu.util.TimeZone getTimeZone();
+ method public deprecated java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setDateIntervalInfo(android.icu.text.DateIntervalInfo);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ }
+
+ public class DateIntervalInfo implements java.lang.Cloneable android.icu.util.Freezable java.io.Serializable {
+ ctor public DateIntervalInfo(android.icu.util.ULocale);
+ ctor public DateIntervalInfo(java.util.Locale);
+ method public java.lang.Object clone();
+ method public android.icu.text.DateIntervalInfo cloneAsThawed();
+ method public android.icu.text.DateIntervalInfo freeze();
+ method public boolean getDefaultOrder();
+ method public java.lang.String getFallbackIntervalPattern();
+ method public android.icu.text.DateIntervalInfo.PatternInfo getIntervalPattern(java.lang.String, int);
+ method public boolean isFrozen();
+ method public void setFallbackIntervalPattern(java.lang.String);
+ method public void setIntervalPattern(java.lang.String, int, java.lang.String);
+ }
+
+ public static final class DateIntervalInfo.PatternInfo implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateIntervalInfo.PatternInfo(java.lang.String, java.lang.String, boolean);
+ method public boolean firstDateInPtnIsLaterDate();
+ method public java.lang.String getFirstPart();
+ method public java.lang.String getSecondPart();
+ }
+
+ public class DateTimePatternGenerator implements java.lang.Cloneable android.icu.util.Freezable {
+ ctor protected DateTimePatternGenerator();
+ method public android.icu.text.DateTimePatternGenerator addPattern(java.lang.String, boolean, android.icu.text.DateTimePatternGenerator.PatternInfo);
+ method public java.lang.Object clone();
+ method public android.icu.text.DateTimePatternGenerator cloneAsThawed();
+ method public android.icu.text.DateTimePatternGenerator freeze();
+ method public java.lang.String getAppendItemFormat(int);
+ method public java.lang.String getAppendItemName(int);
+ method public java.lang.String getBaseSkeleton(java.lang.String);
+ method public java.util.Set<java.lang.String> getBaseSkeletons(java.util.Set<java.lang.String>);
+ method public java.lang.String getBestPattern(java.lang.String);
+ method public java.lang.String getBestPattern(java.lang.String, int);
+ method public java.lang.String getDateTimeFormat();
+ method public java.lang.String getDecimal();
+ method public static android.icu.text.DateTimePatternGenerator getEmptyInstance();
+ method public static android.icu.text.DateTimePatternGenerator getInstance();
+ method public static android.icu.text.DateTimePatternGenerator getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.DateTimePatternGenerator getInstance(java.util.Locale);
+ method public java.lang.String getSkeleton(java.lang.String);
+ method public java.util.Map<java.lang.String, java.lang.String> getSkeletons(java.util.Map<java.lang.String, java.lang.String>);
+ method public boolean isFrozen();
+ method public java.lang.String replaceFieldTypes(java.lang.String, java.lang.String);
+ method public java.lang.String replaceFieldTypes(java.lang.String, java.lang.String, int);
+ method public void setAppendItemFormat(int, java.lang.String);
+ method public void setAppendItemName(int, java.lang.String);
+ method public void setDateTimeFormat(java.lang.String);
+ method public void setDecimal(java.lang.String);
+ field public static final int DAY = 7; // 0x7
+ field public static final int DAYPERIOD = 10; // 0xa
+ field public static final int DAY_OF_WEEK_IN_MONTH = 9; // 0x9
+ field public static final int DAY_OF_YEAR = 8; // 0x8
+ field public static final int ERA = 0; // 0x0
+ field public static final int FRACTIONAL_SECOND = 14; // 0xe
+ field public static final int HOUR = 11; // 0xb
+ field public static final int MATCH_ALL_FIELDS_LENGTH = 65535; // 0xffff
+ field public static final int MATCH_HOUR_FIELD_LENGTH = 2048; // 0x800
+ field public static final int MATCH_NO_OPTIONS = 0; // 0x0
+ field public static final int MINUTE = 12; // 0xc
+ field public static final int MONTH = 3; // 0x3
+ field public static final int QUARTER = 2; // 0x2
+ field public static final int SECOND = 13; // 0xd
+ field public static final int TYPE_LIMIT = 16; // 0x10
+ field public static final int WEEKDAY = 6; // 0x6
+ field public static final int WEEK_OF_MONTH = 5; // 0x5
+ field public static final int WEEK_OF_YEAR = 4; // 0x4
+ field public static final int YEAR = 1; // 0x1
+ field public static final int ZONE = 15; // 0xf
+ }
+
+ public static final class DateTimePatternGenerator.PatternInfo {
+ ctor public DateTimePatternGenerator.PatternInfo();
+ field public static final int BASE_CONFLICT = 1; // 0x1
+ field public static final int CONFLICT = 2; // 0x2
+ field public static final int OK = 0; // 0x0
+ field public java.lang.String conflictingPattern;
+ field public int status;
+ }
+
+ public class DecimalFormat extends android.icu.text.NumberFormat {
+ ctor public DecimalFormat();
+ ctor public DecimalFormat(java.lang.String);
+ ctor public DecimalFormat(java.lang.String, android.icu.text.DecimalFormatSymbols);
+ ctor public DecimalFormat(java.lang.String, android.icu.text.DecimalFormatSymbols, android.icu.text.CurrencyPluralInfo, int);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public boolean areSignificantDigitsUsed();
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.CurrencyPluralInfo getCurrencyPluralInfo();
+ method public android.icu.util.Currency.CurrencyUsage getCurrencyUsage();
+ method public android.icu.text.DecimalFormatSymbols getDecimalFormatSymbols();
+ method public int getFormatWidth();
+ method public int getGroupingSize();
+ method public java.math.MathContext getMathContext();
+ method public android.icu.math.MathContext getMathContextICU();
+ method public int getMaximumSignificantDigits();
+ method public byte getMinimumExponentDigits();
+ method public int getMinimumSignificantDigits();
+ method public int getMultiplier();
+ method public java.lang.String getNegativePrefix();
+ method public java.lang.String getNegativeSuffix();
+ method public char getPadCharacter();
+ method public int getPadPosition();
+ method public int getParseMaxDigits();
+ method public java.lang.String getPositivePrefix();
+ method public java.lang.String getPositiveSuffix();
+ method public java.math.BigDecimal getRoundingIncrement();
+ method public int getSecondaryGroupingSize();
+ method public boolean isDecimalPatternMatchRequired();
+ method public boolean isDecimalSeparatorAlwaysShown();
+ method public boolean isExponentSignAlwaysShown();
+ method public boolean isParseBigDecimal();
+ method public boolean isScientificNotation();
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public void setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo);
+ method public void setCurrencyUsage(android.icu.util.Currency.CurrencyUsage);
+ method public void setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols);
+ method public void setDecimalPatternMatchRequired(boolean);
+ method public void setDecimalSeparatorAlwaysShown(boolean);
+ method public void setExponentSignAlwaysShown(boolean);
+ method public void setFormatWidth(int);
+ method public void setGroupingSize(int);
+ method public void setMathContext(java.math.MathContext);
+ method public void setMathContextICU(android.icu.math.MathContext);
+ method public void setMaximumSignificantDigits(int);
+ method public void setMinimumExponentDigits(byte);
+ method public void setMinimumSignificantDigits(int);
+ method public void setMultiplier(int);
+ method public void setNegativePrefix(java.lang.String);
+ method public void setNegativeSuffix(java.lang.String);
+ method public void setPadCharacter(char);
+ method public void setPadPosition(int);
+ method public void setParseBigDecimal(boolean);
+ method public void setParseMaxDigits(int);
+ method public void setPositivePrefix(java.lang.String);
+ method public void setPositiveSuffix(java.lang.String);
+ method public void setRoundingIncrement(java.math.BigDecimal);
+ method public void setRoundingIncrement(android.icu.math.BigDecimal);
+ method public void setRoundingIncrement(double);
+ method public void setScientificNotation(boolean);
+ method public void setSecondaryGroupingSize(int);
+ method public void setSignificantDigitsUsed(boolean);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ field public static final int PAD_AFTER_PREFIX = 1; // 0x1
+ field public static final int PAD_AFTER_SUFFIX = 3; // 0x3
+ field public static final int PAD_BEFORE_PREFIX = 0; // 0x0
+ field public static final int PAD_BEFORE_SUFFIX = 2; // 0x2
+ }
+
+ public class DecimalFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DecimalFormatSymbols();
+ ctor public DecimalFormatSymbols(java.util.Locale);
+ ctor public DecimalFormatSymbols(android.icu.util.ULocale);
+ method public java.lang.Object clone();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.util.Currency getCurrency();
+ method public java.lang.String getCurrencySymbol();
+ method public char getDecimalSeparator();
+ method public char getDigit();
+ method public char[] getDigits();
+ method public java.lang.String getExponentMultiplicationSign();
+ method public java.lang.String getExponentSeparator();
+ method public char getGroupingSeparator();
+ method public java.lang.String getInfinity();
+ method public static android.icu.text.DecimalFormatSymbols getInstance();
+ method public static android.icu.text.DecimalFormatSymbols getInstance(java.util.Locale);
+ method public static android.icu.text.DecimalFormatSymbols getInstance(android.icu.util.ULocale);
+ method public java.lang.String getInternationalCurrencySymbol();
+ method public java.util.Locale getLocale();
+ method public char getMinusSign();
+ method public char getMonetaryDecimalSeparator();
+ method public char getMonetaryGroupingSeparator();
+ method public java.lang.String getNaN();
+ method public char getPadEscape();
+ method public java.lang.String getPatternForCurrencySpacing(int, boolean);
+ method public char getPatternSeparator();
+ method public char getPerMill();
+ method public char getPercent();
+ method public char getPlusSign();
+ method public char getSignificantDigit();
+ method public android.icu.util.ULocale getULocale();
+ method public char getZeroDigit();
+ method public void setCurrency(android.icu.util.Currency);
+ method public void setCurrencySymbol(java.lang.String);
+ method public void setDecimalSeparator(char);
+ method public void setDigit(char);
+ method public void setExponentMultiplicationSign(java.lang.String);
+ method public void setExponentSeparator(java.lang.String);
+ method public void setGroupingSeparator(char);
+ method public void setInfinity(java.lang.String);
+ method public void setInternationalCurrencySymbol(java.lang.String);
+ method public void setMinusSign(char);
+ method public void setMonetaryDecimalSeparator(char);
+ method public void setMonetaryGroupingSeparator(char);
+ method public void setNaN(java.lang.String);
+ method public void setPadEscape(char);
+ method public void setPatternForCurrencySpacing(int, boolean, java.lang.String);
+ method public void setPatternSeparator(char);
+ method public void setPerMill(char);
+ method public void setPercent(char);
+ method public void setPlusSign(char);
+ method public void setSignificantDigit(char);
+ method public void setZeroDigit(char);
+ field public static final int CURRENCY_SPC_CURRENCY_MATCH = 0; // 0x0
+ field public static final int CURRENCY_SPC_INSERT = 2; // 0x2
+ field public static final int CURRENCY_SPC_SURROUNDING_MATCH = 1; // 0x1
+ }
+
+ public final class DisplayContext extends java.lang.Enum {
+ method public android.icu.text.DisplayContext.Type type();
+ method public int value();
+ method public static android.icu.text.DisplayContext valueOf(java.lang.String);
+ method public static final android.icu.text.DisplayContext[] values();
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_STANDALONE;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_FOR_UI_LIST_OR_MENU;
+ enum_constant public static final android.icu.text.DisplayContext CAPITALIZATION_NONE;
+ enum_constant public static final android.icu.text.DisplayContext DIALECT_NAMES;
+ enum_constant public static final android.icu.text.DisplayContext LENGTH_FULL;
+ enum_constant public static final android.icu.text.DisplayContext LENGTH_SHORT;
+ enum_constant public static final android.icu.text.DisplayContext STANDARD_NAMES;
+ }
+
+ public static final class DisplayContext.Type extends java.lang.Enum {
+ method public static android.icu.text.DisplayContext.Type valueOf(java.lang.String);
+ method public static final android.icu.text.DisplayContext.Type[] values();
+ enum_constant public static final android.icu.text.DisplayContext.Type CAPITALIZATION;
+ enum_constant public static final android.icu.text.DisplayContext.Type DIALECT_HANDLING;
+ enum_constant public static final android.icu.text.DisplayContext.Type DISPLAY_LENGTH;
+ }
+
+ public abstract class IDNA {
+ method public static android.icu.text.IDNA getUTS46Instance(int);
+ method public abstract java.lang.StringBuilder labelToASCII(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder labelToUnicode(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder nameToASCII(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ method public abstract java.lang.StringBuilder nameToUnicode(java.lang.CharSequence, java.lang.StringBuilder, android.icu.text.IDNA.Info);
+ field public static final int CHECK_BIDI = 4; // 0x4
+ field public static final int CHECK_CONTEXTJ = 8; // 0x8
+ field public static final int CHECK_CONTEXTO = 64; // 0x40
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int NONTRANSITIONAL_TO_ASCII = 16; // 0x10
+ field public static final int NONTRANSITIONAL_TO_UNICODE = 32; // 0x20
+ field public static final int USE_STD3_RULES = 2; // 0x2
+ }
+
+ public static final class IDNA.Error extends java.lang.Enum {
+ method public static android.icu.text.IDNA.Error valueOf(java.lang.String);
+ method public static final android.icu.text.IDNA.Error[] values();
+ enum_constant public static final android.icu.text.IDNA.Error BIDI;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTJ;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTO_DIGITS;
+ enum_constant public static final android.icu.text.IDNA.Error CONTEXTO_PUNCTUATION;
+ enum_constant public static final android.icu.text.IDNA.Error DISALLOWED;
+ enum_constant public static final android.icu.text.IDNA.Error DOMAIN_NAME_TOO_LONG;
+ enum_constant public static final android.icu.text.IDNA.Error EMPTY_LABEL;
+ enum_constant public static final android.icu.text.IDNA.Error HYPHEN_3_4;
+ enum_constant public static final android.icu.text.IDNA.Error INVALID_ACE_LABEL;
+ enum_constant public static final android.icu.text.IDNA.Error LABEL_HAS_DOT;
+ enum_constant public static final android.icu.text.IDNA.Error LABEL_TOO_LONG;
+ enum_constant public static final android.icu.text.IDNA.Error LEADING_COMBINING_MARK;
+ enum_constant public static final android.icu.text.IDNA.Error LEADING_HYPHEN;
+ enum_constant public static final android.icu.text.IDNA.Error PUNYCODE;
+ enum_constant public static final android.icu.text.IDNA.Error TRAILING_HYPHEN;
+ }
+
+ public static final class IDNA.Info {
+ ctor public IDNA.Info();
+ method public java.util.Set<android.icu.text.IDNA.Error> getErrors();
+ method public boolean hasErrors();
+ method public boolean isTransitionalDifferent();
+ }
+
+ public abstract class LocaleDisplayNames {
+ method public abstract android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public abstract android.icu.text.LocaleDisplayNames.DialectHandling getDialectHandling();
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale);
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.LocaleDisplayNames.DialectHandling);
+ method public static android.icu.text.LocaleDisplayNames getInstance(android.icu.util.ULocale, android.icu.text.DisplayContext...);
+ method public static android.icu.text.LocaleDisplayNames getInstance(java.util.Locale, android.icu.text.DisplayContext...);
+ method public abstract android.icu.util.ULocale getLocale();
+ method public abstract java.lang.String keyDisplayName(java.lang.String);
+ method public abstract java.lang.String keyValueDisplayName(java.lang.String, java.lang.String);
+ method public abstract java.lang.String languageDisplayName(java.lang.String);
+ method public abstract java.lang.String localeDisplayName(android.icu.util.ULocale);
+ method public abstract java.lang.String localeDisplayName(java.util.Locale);
+ method public abstract java.lang.String localeDisplayName(java.lang.String);
+ method public abstract java.lang.String regionDisplayName(java.lang.String);
+ method public abstract java.lang.String scriptDisplayName(java.lang.String);
+ method public abstract java.lang.String scriptDisplayName(int);
+ method public abstract java.lang.String variantDisplayName(java.lang.String);
+ }
+
+ public static final class LocaleDisplayNames.DialectHandling extends java.lang.Enum {
+ method public static android.icu.text.LocaleDisplayNames.DialectHandling valueOf(java.lang.String);
+ method public static final android.icu.text.LocaleDisplayNames.DialectHandling[] values();
+ enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling DIALECT_NAMES;
+ enum_constant public static final android.icu.text.LocaleDisplayNames.DialectHandling STANDARD_NAMES;
+ }
+
+ public class MeasureFormat extends android.icu.text.UFormat {
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String formatMeasures(android.icu.util.Measure...);
+ method public java.lang.StringBuilder formatMeasures(java.lang.StringBuilder, java.text.FieldPosition, android.icu.util.Measure...);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat(android.icu.util.ULocale);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat(java.util.Locale);
+ method public static android.icu.text.MeasureFormat getCurrencyFormat();
+ method public static android.icu.text.MeasureFormat getInstance(android.icu.util.ULocale, android.icu.text.MeasureFormat.FormatWidth);
+ method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth);
+ method public static android.icu.text.MeasureFormat getInstance(android.icu.util.ULocale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);
+ method public static android.icu.text.MeasureFormat getInstance(java.util.Locale, android.icu.text.MeasureFormat.FormatWidth, android.icu.text.NumberFormat);
+ method public final android.icu.util.ULocale getLocale();
+ method public android.icu.text.NumberFormat getNumberFormat();
+ method public android.icu.text.MeasureFormat.FormatWidth getWidth();
+ method public final int hashCode();
+ method public android.icu.util.Measure parseObject(java.lang.String, java.text.ParsePosition);
+ }
+
+ public static final class MeasureFormat.FormatWidth extends java.lang.Enum {
+ method public static android.icu.text.MeasureFormat.FormatWidth valueOf(java.lang.String);
+ method public static final android.icu.text.MeasureFormat.FormatWidth[] values();
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth NARROW;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth NUMERIC;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth SHORT;
+ enum_constant public static final android.icu.text.MeasureFormat.FormatWidth WIDE;
+ }
+
+ public class MessageFormat extends android.icu.text.UFormat {
+ ctor public MessageFormat(java.lang.String);
+ ctor public MessageFormat(java.lang.String, java.util.Locale);
+ ctor public MessageFormat(java.lang.String, android.icu.util.ULocale);
+ method public void applyPattern(java.lang.String);
+ method public void applyPattern(java.lang.String, android.icu.text.MessagePattern.ApostropheMode);
+ method public static java.lang.String autoQuoteApostrophe(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.StringBuffer format(java.util.Map<java.lang.String, java.lang.Object>, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public static java.lang.String format(java.lang.String, java.util.Map<java.lang.String, java.lang.Object>);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public android.icu.text.MessagePattern.ApostropheMode getApostropheMode();
+ method public java.util.Set<java.lang.String> getArgumentNames();
+ method public java.text.Format getFormatByArgumentName(java.lang.String);
+ method public java.text.Format[] getFormats();
+ method public java.text.Format[] getFormatsByArgumentIndex();
+ method public java.util.Locale getLocale();
+ method public android.icu.util.ULocale getULocale();
+ method public java.lang.Object[] parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.util.Map<java.lang.String, java.lang.Object> parseToMap(java.lang.String, java.text.ParsePosition);
+ method public java.util.Map<java.lang.String, java.lang.Object> parseToMap(java.lang.String) throws java.text.ParseException;
+ method public void setFormat(int, java.text.Format);
+ method public void setFormatByArgumentIndex(int, java.text.Format);
+ method public void setFormatByArgumentName(java.lang.String, java.text.Format);
+ method public void setFormats(java.text.Format[]);
+ method public void setFormatsByArgumentIndex(java.text.Format[]);
+ method public void setFormatsByArgumentName(java.util.Map<java.lang.String, java.text.Format>);
+ method public void setLocale(java.util.Locale);
+ method public void setLocale(android.icu.util.ULocale);
+ method public java.lang.String toPattern();
+ method public boolean usesNamedArguments();
+ }
+
+ public static class MessageFormat.Field extends java.text.Format.Field {
+ ctor protected MessageFormat.Field(java.lang.String);
+ field public static final android.icu.text.MessageFormat.Field ARGUMENT;
+ }
+
+ public final class MessagePattern implements java.lang.Cloneable android.icu.util.Freezable {
+ ctor public MessagePattern();
+ ctor public MessagePattern(android.icu.text.MessagePattern.ApostropheMode);
+ ctor public MessagePattern(java.lang.String);
+ method public java.lang.String autoQuoteApostropheDeep();
+ method public void clear();
+ method public void clearPatternAndSetApostropheMode(android.icu.text.MessagePattern.ApostropheMode);
+ method public java.lang.Object clone();
+ method public android.icu.text.MessagePattern cloneAsThawed();
+ method public int countParts();
+ method public android.icu.text.MessagePattern freeze();
+ method public android.icu.text.MessagePattern.ApostropheMode getApostropheMode();
+ method public int getLimitPartIndex(int);
+ method public double getNumericValue(android.icu.text.MessagePattern.Part);
+ method public android.icu.text.MessagePattern.Part getPart(int);
+ method public android.icu.text.MessagePattern.Part.Type getPartType(int);
+ method public int getPatternIndex(int);
+ method public java.lang.String getPatternString();
+ method public double getPluralOffset(int);
+ method public java.lang.String getSubstring(android.icu.text.MessagePattern.Part);
+ method public boolean hasNamedArguments();
+ method public boolean hasNumberedArguments();
+ method public boolean isFrozen();
+ method public android.icu.text.MessagePattern parse(java.lang.String);
+ method public android.icu.text.MessagePattern parseChoiceStyle(java.lang.String);
+ method public android.icu.text.MessagePattern parsePluralStyle(java.lang.String);
+ method public android.icu.text.MessagePattern parseSelectStyle(java.lang.String);
+ method public boolean partSubstringMatches(android.icu.text.MessagePattern.Part, java.lang.String);
+ method public static int validateArgumentName(java.lang.String);
+ field public static final int ARG_NAME_NOT_NUMBER = -1; // 0xffffffff
+ field public static final int ARG_NAME_NOT_VALID = -2; // 0xfffffffe
+ field public static final double NO_NUMERIC_VALUE = -1.23456789E8;
+ }
+
+ public static final class MessagePattern.ApostropheMode extends java.lang.Enum {
+ method public static android.icu.text.MessagePattern.ApostropheMode valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.ApostropheMode[] values();
+ enum_constant public static final android.icu.text.MessagePattern.ApostropheMode DOUBLE_OPTIONAL;
+ enum_constant public static final android.icu.text.MessagePattern.ApostropheMode DOUBLE_REQUIRED;
+ }
+
+ public static final class MessagePattern.ArgType extends java.lang.Enum {
+ method public boolean hasPluralStyle();
+ method public static android.icu.text.MessagePattern.ArgType valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.ArgType[] values();
+ enum_constant public static final android.icu.text.MessagePattern.ArgType CHOICE;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType NONE;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType PLURAL;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SELECT;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SELECTORDINAL;
+ enum_constant public static final android.icu.text.MessagePattern.ArgType SIMPLE;
+ }
+
+ public static final class MessagePattern.Part {
+ method public android.icu.text.MessagePattern.ArgType getArgType();
+ method public int getIndex();
+ method public int getLength();
+ method public int getLimit();
+ method public android.icu.text.MessagePattern.Part.Type getType();
+ method public int getValue();
+ }
+
+ public static final class MessagePattern.Part.Type extends java.lang.Enum {
+ method public boolean hasNumericValue();
+ method public static android.icu.text.MessagePattern.Part.Type valueOf(java.lang.String);
+ method public static final android.icu.text.MessagePattern.Part.Type[] values();
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_DOUBLE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_INT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_LIMIT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_NAME;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_NUMBER;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_SELECTOR;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_START;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_STYLE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type ARG_TYPE;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type INSERT_CHAR;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type MSG_LIMIT;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type MSG_START;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type REPLACE_NUMBER;
+ enum_constant public static final android.icu.text.MessagePattern.Part.Type SKIP_SYNTAX;
+ }
+
+ public final class Normalizer implements java.lang.Cloneable {
+ method public static int compare(char[], int, int, char[], int, int, int);
+ method public static int compare(java.lang.String, java.lang.String, int);
+ method public static int compare(char[], char[], int);
+ method public static int compare(int, int, int);
+ method public static int compare(int, java.lang.String, int);
+ field public static final int COMPARE_CODE_POINT_ORDER = 32768; // 0x8000
+ field public static final int COMPARE_IGNORE_CASE = 65536; // 0x10000
+ field public static final int FOLD_CASE_DEFAULT = 0; // 0x0
+ field public static final int FOLD_CASE_EXCLUDE_SPECIAL_I = 1; // 0x1
+ field public static final int INPUT_IS_FCD = 131072; // 0x20000
+ field public static final android.icu.text.Normalizer.QuickCheckResult MAYBE;
+ field public static final android.icu.text.Normalizer.QuickCheckResult NO;
+ field public static final android.icu.text.Normalizer.QuickCheckResult YES;
+ }
+
+ public static final class Normalizer.QuickCheckResult {
+ }
+
+ public abstract class Normalizer2 {
+ method public abstract java.lang.StringBuilder append(java.lang.StringBuilder, java.lang.CharSequence);
+ method public int composePair(int, int);
+ method public int getCombiningClass(int);
+ method public abstract java.lang.String getDecomposition(int);
+ method public static android.icu.text.Normalizer2 getInstance(java.io.InputStream, java.lang.String, android.icu.text.Normalizer2.Mode);
+ method public static android.icu.text.Normalizer2 getNFCInstance();
+ method public static android.icu.text.Normalizer2 getNFDInstance();
+ method public static android.icu.text.Normalizer2 getNFKCCasefoldInstance();
+ method public static android.icu.text.Normalizer2 getNFKCInstance();
+ method public static android.icu.text.Normalizer2 getNFKDInstance();
+ method public java.lang.String getRawDecomposition(int);
+ method public abstract boolean hasBoundaryAfter(int);
+ method public abstract boolean hasBoundaryBefore(int);
+ method public abstract boolean isInert(int);
+ method public abstract boolean isNormalized(java.lang.CharSequence);
+ method public java.lang.String normalize(java.lang.CharSequence);
+ method public abstract java.lang.StringBuilder normalize(java.lang.CharSequence, java.lang.StringBuilder);
+ method public abstract java.lang.Appendable normalize(java.lang.CharSequence, java.lang.Appendable);
+ method public abstract java.lang.StringBuilder normalizeSecondAndAppend(java.lang.StringBuilder, java.lang.CharSequence);
+ method public abstract android.icu.text.Normalizer.QuickCheckResult quickCheck(java.lang.CharSequence);
+ method public abstract int spanQuickCheckYes(java.lang.CharSequence);
+ }
+
+ public static final class Normalizer2.Mode extends java.lang.Enum {
+ method public static android.icu.text.Normalizer2.Mode valueOf(java.lang.String);
+ method public static final android.icu.text.Normalizer2.Mode[] values();
+ enum_constant public static final android.icu.text.Normalizer2.Mode COMPOSE;
+ enum_constant public static final android.icu.text.Normalizer2.Mode COMPOSE_CONTIGUOUS;
+ enum_constant public static final android.icu.text.Normalizer2.Mode DECOMPOSE;
+ enum_constant public static final android.icu.text.Normalizer2.Mode FCD;
+ }
+
+ public abstract class NumberFormat extends android.icu.text.UFormat {
+ ctor public NumberFormat();
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(double);
+ method public final java.lang.String format(long);
+ method public final java.lang.String format(java.math.BigInteger);
+ method public final java.lang.String format(java.math.BigDecimal);
+ method public final java.lang.String format(android.icu.math.BigDecimal);
+ method public final java.lang.String format(android.icu.util.CurrencyAmount);
+ method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.math.BigInteger, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(android.icu.math.BigDecimal, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(android.icu.util.CurrencyAmount, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.text.DisplayContext getContext(android.icu.text.DisplayContext.Type);
+ method public android.icu.util.Currency getCurrency();
+ method public static final android.icu.text.NumberFormat getCurrencyInstance();
+ method public static android.icu.text.NumberFormat getCurrencyInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getCurrencyInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.NumberFormat getInstance();
+ method public static android.icu.text.NumberFormat getInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getInstance(android.icu.util.ULocale);
+ method public static final android.icu.text.NumberFormat getInstance(int);
+ method public static android.icu.text.NumberFormat getInstance(java.util.Locale, int);
+ method public static android.icu.text.NumberFormat getInstance(android.icu.util.ULocale, int);
+ method public static final android.icu.text.NumberFormat getIntegerInstance();
+ method public static android.icu.text.NumberFormat getIntegerInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getIntegerInstance(android.icu.util.ULocale);
+ method public int getMaximumFractionDigits();
+ method public int getMaximumIntegerDigits();
+ method public int getMinimumFractionDigits();
+ method public int getMinimumIntegerDigits();
+ method public static final android.icu.text.NumberFormat getNumberInstance();
+ method public static android.icu.text.NumberFormat getNumberInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getNumberInstance(android.icu.util.ULocale);
+ method protected static java.lang.String getPattern(android.icu.util.ULocale, int);
+ method public static final android.icu.text.NumberFormat getPercentInstance();
+ method public static android.icu.text.NumberFormat getPercentInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getPercentInstance(android.icu.util.ULocale);
+ method public int getRoundingMode();
+ method public static final android.icu.text.NumberFormat getScientificInstance();
+ method public static android.icu.text.NumberFormat getScientificInstance(java.util.Locale);
+ method public static android.icu.text.NumberFormat getScientificInstance(android.icu.util.ULocale);
+ method public boolean isGroupingUsed();
+ method public boolean isParseIntegerOnly();
+ method public boolean isParseStrict();
+ method public abstract java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
+ method public android.icu.util.CurrencyAmount parseCurrency(java.lang.CharSequence, java.text.ParsePosition);
+ method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public static java.lang.Object registerFactory(android.icu.text.NumberFormat.NumberFormatFactory);
+ method public void setContext(android.icu.text.DisplayContext);
+ method public void setCurrency(android.icu.util.Currency);
+ method public void setGroupingUsed(boolean);
+ method public void setMaximumFractionDigits(int);
+ method public void setMaximumIntegerDigits(int);
+ method public void setMinimumFractionDigits(int);
+ method public void setMinimumIntegerDigits(int);
+ method public void setParseIntegerOnly(boolean);
+ method public void setParseStrict(boolean);
+ method public void setRoundingMode(int);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int ACCOUNTINGCURRENCYSTYLE = 7; // 0x7
+ field public static final int CASHCURRENCYSTYLE = 8; // 0x8
+ field public static final int CURRENCYSTYLE = 1; // 0x1
+ field public static final int FRACTION_FIELD = 1; // 0x1
+ field public static final int INTEGERSTYLE = 4; // 0x4
+ field public static final int INTEGER_FIELD = 0; // 0x0
+ field public static final int ISOCURRENCYSTYLE = 5; // 0x5
+ field public static final int NUMBERSTYLE = 0; // 0x0
+ field public static final int PERCENTSTYLE = 2; // 0x2
+ field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
+ field public static final int SCIENTIFICSTYLE = 3; // 0x3
+ }
+
+ public static class NumberFormat.Field extends java.text.Format.Field {
+ ctor protected NumberFormat.Field(java.lang.String);
+ field public static final android.icu.text.NumberFormat.Field CURRENCY;
+ field public static final android.icu.text.NumberFormat.Field DECIMAL_SEPARATOR;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT_SIGN;
+ field public static final android.icu.text.NumberFormat.Field EXPONENT_SYMBOL;
+ field public static final android.icu.text.NumberFormat.Field FRACTION;
+ field public static final android.icu.text.NumberFormat.Field GROUPING_SEPARATOR;
+ field public static final android.icu.text.NumberFormat.Field INTEGER;
+ field public static final android.icu.text.NumberFormat.Field PERCENT;
+ field public static final android.icu.text.NumberFormat.Field PERMILLE;
+ field public static final android.icu.text.NumberFormat.Field SIGN;
+ }
+
+ public static abstract class NumberFormat.NumberFormatFactory {
+ ctor protected NumberFormat.NumberFormatFactory();
+ method public android.icu.text.NumberFormat createFormat(android.icu.util.ULocale, int);
+ method public android.icu.text.NumberFormat createFormat(java.util.Locale, int);
+ method public abstract java.util.Set<java.lang.String> getSupportedLocaleNames();
+ method public boolean visible();
+ field public static final int FORMAT_CURRENCY = 1; // 0x1
+ field public static final int FORMAT_INTEGER = 4; // 0x4
+ field public static final int FORMAT_NUMBER = 0; // 0x0
+ field public static final int FORMAT_PERCENT = 2; // 0x2
+ field public static final int FORMAT_SCIENTIFIC = 3; // 0x3
+ }
+
+ public static abstract class NumberFormat.SimpleNumberFormatFactory extends android.icu.text.NumberFormat.NumberFormatFactory {
+ ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale);
+ ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale, boolean);
+ ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale);
+ ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale, boolean);
+ method public final java.util.Set<java.lang.String> getSupportedLocaleNames();
+ method public final boolean visible();
+ }
+
+ public class NumberingSystem {
+ ctor public NumberingSystem();
+ method public static java.lang.String[] getAvailableNames();
+ method public java.lang.String getDescription();
+ method public static android.icu.text.NumberingSystem getInstance(int, boolean, java.lang.String);
+ method public static android.icu.text.NumberingSystem getInstance(java.util.Locale);
+ method public static android.icu.text.NumberingSystem getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.NumberingSystem getInstance();
+ method public static android.icu.text.NumberingSystem getInstanceByName(java.lang.String);
+ method public java.lang.String getName();
+ method public int getRadix();
+ method public boolean isAlgorithmic();
+ method public static boolean isValidDigitString(java.lang.String);
+ }
+
+ public class PluralFormat extends android.icu.text.UFormat {
+ ctor public PluralFormat();
+ ctor public PluralFormat(android.icu.util.ULocale);
+ ctor public PluralFormat(java.util.Locale);
+ ctor public PluralFormat(android.icu.text.PluralRules);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules);
+ ctor public PluralFormat(java.util.Locale, android.icu.text.PluralRules);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType);
+ ctor public PluralFormat(java.util.Locale, android.icu.text.PluralRules.PluralType);
+ ctor public PluralFormat(java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, java.lang.String);
+ ctor public PluralFormat(android.icu.text.PluralRules, java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules, java.lang.String);
+ ctor public PluralFormat(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType, java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public boolean equals(android.icu.text.PluralFormat);
+ method public final java.lang.String format(double);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setNumberFormat(android.icu.text.NumberFormat);
+ method public java.lang.String toPattern();
+ }
+
+ public class PluralRules implements java.io.Serializable {
+ method public static android.icu.text.PluralRules createRules(java.lang.String);
+ method public boolean equals(android.icu.text.PluralRules);
+ method public static android.icu.text.PluralRules forLocale(android.icu.util.ULocale);
+ method public static android.icu.text.PluralRules forLocale(java.util.Locale);
+ method public static android.icu.text.PluralRules forLocale(android.icu.util.ULocale, android.icu.text.PluralRules.PluralType);
+ method public static android.icu.text.PluralRules forLocale(java.util.Locale, android.icu.text.PluralRules.PluralType);
+ method public java.util.Collection<java.lang.Double> getAllKeywordValues(java.lang.String);
+ method public java.util.Set<java.lang.String> getKeywords();
+ method public java.util.Collection<java.lang.Double> getSamples(java.lang.String);
+ method public double getUniqueKeywordValue(java.lang.String);
+ method public static android.icu.text.PluralRules parseDescription(java.lang.String) throws java.text.ParseException;
+ method public java.lang.String select(double);
+ field public static final android.icu.text.PluralRules DEFAULT;
+ field public static final java.lang.String KEYWORD_FEW = "few";
+ field public static final java.lang.String KEYWORD_MANY = "many";
+ field public static final java.lang.String KEYWORD_ONE = "one";
+ field public static final java.lang.String KEYWORD_OTHER = "other";
+ field public static final java.lang.String KEYWORD_TWO = "two";
+ field public static final java.lang.String KEYWORD_ZERO = "zero";
+ field public static final double NO_UNIQUE_VALUE = -0.00123456777;
+ }
+
+ public static final class PluralRules.PluralType extends java.lang.Enum {
+ method public static android.icu.text.PluralRules.PluralType valueOf(java.lang.String);
+ method public static final android.icu.text.PluralRules.PluralType[] values();
+ enum_constant public static final android.icu.text.PluralRules.PluralType CARDINAL;
+ enum_constant public static final android.icu.text.PluralRules.PluralType ORDINAL;
+ }
+
+ public final class RawCollationKey extends android.icu.util.ByteArrayWrapper {
+ ctor public RawCollationKey();
+ ctor public RawCollationKey(int);
+ ctor public RawCollationKey(byte[]);
+ ctor public RawCollationKey(byte[], int);
+ method public int compareTo(android.icu.text.RawCollationKey);
+ }
+
+ public final class RelativeDateTimeFormatter {
+ method public java.lang.String combineDateAndTime(java.lang.String, java.lang.String);
+ method public java.lang.String format(double, android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.RelativeUnit);
+ method public java.lang.String format(android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit);
+ method public android.icu.text.DisplayContext getCapitalizationContext();
+ method public android.icu.text.RelativeDateTimeFormatter.Style getFormatStyle();
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance();
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(java.util.Locale);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale, android.icu.text.NumberFormat);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(android.icu.util.ULocale, android.icu.text.NumberFormat, android.icu.text.RelativeDateTimeFormatter.Style, android.icu.text.DisplayContext);
+ method public static android.icu.text.RelativeDateTimeFormatter getInstance(java.util.Locale, android.icu.text.NumberFormat);
+ method public android.icu.text.NumberFormat getNumberFormat();
+ }
+
+ public static final class RelativeDateTimeFormatter.AbsoluteUnit extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit DAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit FRIDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit MONDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit MONTH;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit NOW;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit SATURDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit SUNDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit THURSDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit TUESDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit WEDNESDAY;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit WEEK;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.AbsoluteUnit YEAR;
+ }
+
+ public static final class RelativeDateTimeFormatter.Direction extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.Direction valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.Direction[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction LAST;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction LAST_2;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction NEXT;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction NEXT_2;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction PLAIN;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Direction THIS;
+ }
+
+ public static final class RelativeDateTimeFormatter.RelativeUnit extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.RelativeUnit valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit DAYS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit HOURS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit MINUTES;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit MONTHS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit SECONDS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit WEEKS;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.RelativeUnit YEARS;
+ }
+
+ public static final class RelativeDateTimeFormatter.Style extends java.lang.Enum {
+ method public static android.icu.text.RelativeDateTimeFormatter.Style valueOf(java.lang.String);
+ method public static final android.icu.text.RelativeDateTimeFormatter.Style[] values();
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style LONG;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style NARROW;
+ enum_constant public static final android.icu.text.RelativeDateTimeFormatter.Style SHORT;
+ }
+
+ public abstract interface Replaceable {
+ method public abstract int char32At(int);
+ method public abstract char charAt(int);
+ method public abstract void copy(int, int, int);
+ method public abstract void getChars(int, int, char[], int);
+ method public abstract boolean hasMetaData();
+ method public abstract int length();
+ method public abstract void replace(int, int, java.lang.String);
+ method public abstract void replace(int, int, char[], int, int);
+ }
+
+ public final class RuleBasedCollator extends android.icu.text.Collator {
+ ctor public RuleBasedCollator(java.lang.String) throws java.lang.Exception;
+ method public int compare(java.lang.String, java.lang.String);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(java.lang.String);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public android.icu.text.CollationElementIterator getCollationElementIterator(android.icu.text.UCharacterIterator);
+ method public android.icu.text.CollationKey getCollationKey(java.lang.String);
+ method public void getContractionsAndExpansions(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet, boolean) throws java.lang.Exception;
+ method public boolean getNumericCollation();
+ method public android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey);
+ method public java.lang.String getRules();
+ method public java.lang.String getRules(boolean);
+ method public android.icu.util.VersionInfo getUCAVersion();
+ method public int getVariableTop();
+ method public android.icu.util.VersionInfo getVersion();
+ method public boolean isAlternateHandlingShifted();
+ method public boolean isCaseLevel();
+ method public boolean isFrenchCollation();
+ method public boolean isLowerCaseFirst();
+ method public boolean isUpperCaseFirst();
+ method public void setAlternateHandlingDefault();
+ method public void setAlternateHandlingShifted(boolean);
+ method public final void setCaseFirstDefault();
+ method public void setCaseLevel(boolean);
+ method public void setCaseLevelDefault();
+ method public void setDecompositionDefault();
+ method public void setFrenchCollation(boolean);
+ method public void setFrenchCollationDefault();
+ method public void setLowerCaseFirst(boolean);
+ method public void setNumericCollation(boolean);
+ method public void setNumericCollationDefault();
+ method public void setStrengthDefault();
+ method public void setUpperCaseFirst(boolean);
+ }
+
+ public abstract class SearchIterator {
+ ctor protected SearchIterator(java.text.CharacterIterator, android.icu.text.BreakIterator);
+ method public final int first();
+ method public final int following(int);
+ method public android.icu.text.BreakIterator getBreakIterator();
+ method public android.icu.text.SearchIterator.ElementComparisonType getElementComparisonType();
+ method public abstract int getIndex();
+ method public int getMatchLength();
+ method public int getMatchStart();
+ method public java.lang.String getMatchedText();
+ method public java.text.CharacterIterator getTarget();
+ method protected abstract int handleNext(int);
+ method protected abstract int handlePrevious(int);
+ method public boolean isOverlapping();
+ method public final int last();
+ method public int next();
+ method public final int preceding(int);
+ method public int previous();
+ method public void reset();
+ method public void setBreakIterator(android.icu.text.BreakIterator);
+ method public void setElementComparisonType(android.icu.text.SearchIterator.ElementComparisonType);
+ method public void setIndex(int);
+ method protected void setMatchLength(int);
+ method public void setOverlapping(boolean);
+ method public void setTarget(java.text.CharacterIterator);
+ field public static final int DONE = -1; // 0xffffffff
+ field protected android.icu.text.BreakIterator breakIterator;
+ field protected int matchLength;
+ field protected java.text.CharacterIterator targetText;
+ }
+
+ public static final class SearchIterator.ElementComparisonType extends java.lang.Enum {
+ method public static android.icu.text.SearchIterator.ElementComparisonType valueOf(java.lang.String);
+ method public static final android.icu.text.SearchIterator.ElementComparisonType[] values();
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType ANY_BASE_WEIGHT_IS_WILDCARD;
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType PATTERN_BASE_WEIGHT_IS_WILDCARD;
+ enum_constant public static final android.icu.text.SearchIterator.ElementComparisonType STANDARD_ELEMENT_COMPARISON;
+ }
+
+ public class SelectFormat extends java.text.Format {
+ ctor public SelectFormat(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public final java.lang.String format(java.lang.String);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.lang.String toPattern();
+ }
+
+ public class SimpleDateFormat extends android.icu.text.DateFormat {
+ ctor public SimpleDateFormat();
+ ctor public SimpleDateFormat(java.lang.String);
+ ctor public SimpleDateFormat(java.lang.String, java.util.Locale);
+ ctor public SimpleDateFormat(java.lang.String, android.icu.util.ULocale);
+ ctor public SimpleDateFormat(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ ctor public SimpleDateFormat(java.lang.String, android.icu.text.DateFormatSymbols);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public java.lang.StringBuffer format(android.icu.util.Calendar, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.util.Date get2DigitYearStart();
+ method public android.icu.text.DateFormatSymbols getDateFormatSymbols();
+ method public android.icu.text.NumberFormat getNumberFormat(char);
+ method protected android.icu.text.DateFormatSymbols getSymbols();
+ method public android.icu.text.TimeZoneFormat getTimeZoneFormat();
+ method protected int matchQuarterString(java.lang.String, int, int, java.lang.String[], android.icu.util.Calendar);
+ method protected int matchString(java.lang.String, int, int, java.lang.String[], android.icu.util.Calendar);
+ method public void parse(java.lang.String, android.icu.util.Calendar, java.text.ParsePosition);
+ method protected android.icu.text.DateFormat.Field patternCharToDateFormatField(char);
+ method public void set2DigitYearStart(java.util.Date);
+ method public void setDateFormatSymbols(android.icu.text.DateFormatSymbols);
+ method public void setNumberFormat(java.lang.String, android.icu.text.NumberFormat);
+ method public void setTimeZoneFormat(android.icu.text.TimeZoneFormat);
+ method protected java.lang.String subFormat(char, int, int, java.text.FieldPosition, android.icu.text.DateFormatSymbols, android.icu.util.Calendar) throws java.lang.IllegalArgumentException;
+ method protected int subParse(java.lang.String, int, char, int, boolean, boolean, boolean[], android.icu.util.Calendar);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ method protected java.lang.String zeroPaddingNumber(long, int, int);
+ }
+
+ public class StringPrepParseException extends java.text.ParseException {
+ ctor public StringPrepParseException(java.lang.String, int);
+ ctor public StringPrepParseException(java.lang.String, int, java.lang.String, int);
+ ctor public StringPrepParseException(java.lang.String, int, java.lang.String, int, int);
+ method public int getError();
+ field public static final int ACE_PREFIX_ERROR = 6; // 0x6
+ field public static final int BUFFER_OVERFLOW_ERROR = 9; // 0x9
+ field public static final int CHECK_BIDI_ERROR = 4; // 0x4
+ field public static final int DOMAIN_NAME_TOO_LONG_ERROR = 11; // 0xb
+ field public static final int ILLEGAL_CHAR_FOUND = 1; // 0x1
+ field public static final int INVALID_CHAR_FOUND = 0; // 0x0
+ field public static final int LABEL_TOO_LONG_ERROR = 8; // 0x8
+ field public static final int PROHIBITED_ERROR = 2; // 0x2
+ field public static final int STD3_ASCII_RULES_ERROR = 5; // 0x5
+ field public static final int UNASSIGNED_ERROR = 3; // 0x3
+ field public static final int VERIFICATION_ERROR = 7; // 0x7
+ field public static final int ZERO_LENGTH_LABEL = 10; // 0xa
+ }
+
+ public final class StringSearch extends android.icu.text.SearchIterator {
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.text.RuleBasedCollator, android.icu.text.BreakIterator);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.text.RuleBasedCollator);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, java.util.Locale);
+ ctor public StringSearch(java.lang.String, java.text.CharacterIterator, android.icu.util.ULocale);
+ ctor public StringSearch(java.lang.String, java.lang.String);
+ method public android.icu.text.RuleBasedCollator getCollator();
+ method public int getIndex();
+ method public java.lang.String getPattern();
+ method protected int handleNext(int);
+ method protected int handlePrevious(int);
+ method public boolean isCanonical();
+ method public void setCanonical(boolean);
+ method public void setCollator(android.icu.text.RuleBasedCollator);
+ method public void setPattern(java.lang.String);
+ }
+
+ public abstract interface SymbolTable {
+ method public abstract char[] lookup(java.lang.String);
+ method public abstract android.icu.text.UnicodeMatcher lookupMatcher(int);
+ method public abstract java.lang.String parseReference(java.lang.String, java.text.ParsePosition, int);
+ field public static final char SYMBOL_REF = 36; // 0x0024 '$'
+ }
+
+ public class TimeZoneFormat extends android.icu.text.UFormat implements android.icu.util.Freezable java.io.Serializable {
+ ctor protected TimeZoneFormat(android.icu.util.ULocale);
+ method public android.icu.text.TimeZoneFormat cloneAsThawed();
+ method public final java.lang.String format(android.icu.text.TimeZoneFormat.Style, android.icu.util.TimeZone, long);
+ method public java.lang.String format(android.icu.text.TimeZoneFormat.Style, android.icu.util.TimeZone, long, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String formatOffsetISO8601Basic(int, boolean, boolean, boolean);
+ method public final java.lang.String formatOffsetISO8601Extended(int, boolean, boolean, boolean);
+ method public java.lang.String formatOffsetLocalizedGMT(int);
+ method public java.lang.String formatOffsetShortLocalizedGMT(int);
+ method public android.icu.text.TimeZoneFormat freeze();
+ method public java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption> getDefaultParseOptions();
+ method public java.lang.String getGMTOffsetDigits();
+ method public java.lang.String getGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType);
+ method public java.lang.String getGMTPattern();
+ method public java.lang.String getGMTZeroFormat();
+ method public static android.icu.text.TimeZoneFormat getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.TimeZoneFormat getInstance(java.util.Locale);
+ method public android.icu.text.TimeZoneNames getTimeZoneNames();
+ method public boolean isFrozen();
+ method public android.icu.util.TimeZone parse(android.icu.text.TimeZoneFormat.Style, java.lang.String, java.text.ParsePosition, java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption>, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public android.icu.util.TimeZone parse(android.icu.text.TimeZoneFormat.Style, java.lang.String, java.text.ParsePosition, android.icu.util.Output<android.icu.text.TimeZoneFormat.TimeType>);
+ method public final android.icu.util.TimeZone parse(java.lang.String, java.text.ParsePosition);
+ method public final android.icu.util.TimeZone parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public final int parseOffsetISO8601(java.lang.String, java.text.ParsePosition);
+ method public int parseOffsetLocalizedGMT(java.lang.String, java.text.ParsePosition);
+ method public int parseOffsetShortLocalizedGMT(java.lang.String, java.text.ParsePosition);
+ method public android.icu.text.TimeZoneFormat setDefaultParseOptions(java.util.EnumSet<android.icu.text.TimeZoneFormat.ParseOption>);
+ method public android.icu.text.TimeZoneFormat setGMTOffsetDigits(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType, java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTPattern(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setGMTZeroFormat(java.lang.String);
+ method public android.icu.text.TimeZoneFormat setTimeZoneNames(android.icu.text.TimeZoneNames);
+ }
+
+ public static final class TimeZoneFormat.GMTOffsetPatternType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.GMTOffsetPatternType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_H;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_HM;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType NEGATIVE_HMS;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_H;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_HM;
+ enum_constant public static final android.icu.text.TimeZoneFormat.GMTOffsetPatternType POSITIVE_HMS;
+ }
+
+ public static final class TimeZoneFormat.ParseOption extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.ParseOption valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.ParseOption[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.ParseOption ALL_STYLES;
+ enum_constant public static final android.icu.text.TimeZoneFormat.ParseOption TZ_DATABASE_ABBREVIATIONS;
+ }
+
+ public static final class TimeZoneFormat.Style extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.Style valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.Style[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style EXEMPLAR_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_LONG;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style GENERIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_LOCAL_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_BASIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_LOCAL_FIXED;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ISO_EXTENDED_LOCAL_FULL;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style LOCALIZED_GMT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style LOCALIZED_GMT_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style SPECIFIC_LONG;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style SPECIFIC_SHORT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ZONE_ID;
+ enum_constant public static final android.icu.text.TimeZoneFormat.Style ZONE_ID_SHORT;
+ }
+
+ public static final class TimeZoneFormat.TimeType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneFormat.TimeType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneFormat.TimeType[] values();
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType STANDARD;
+ enum_constant public static final android.icu.text.TimeZoneFormat.TimeType UNKNOWN;
+ }
+
+ public abstract class TimeZoneNames implements java.io.Serializable {
+ method public abstract java.util.Set<java.lang.String> getAvailableMetaZoneIDs();
+ method public abstract java.util.Set<java.lang.String> getAvailableMetaZoneIDs(java.lang.String);
+ method public final java.lang.String getDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType, long);
+ method public java.lang.String getExemplarLocationName(java.lang.String);
+ method public static android.icu.text.TimeZoneNames getInstance(android.icu.util.ULocale);
+ method public static android.icu.text.TimeZoneNames getInstance(java.util.Locale);
+ method public abstract java.lang.String getMetaZoneDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType);
+ method public abstract java.lang.String getMetaZoneID(java.lang.String, long);
+ method public abstract java.lang.String getReferenceZoneID(java.lang.String, java.lang.String);
+ method public static android.icu.text.TimeZoneNames getTZDBInstance(android.icu.util.ULocale);
+ method public abstract java.lang.String getTimeZoneDisplayName(java.lang.String, android.icu.text.TimeZoneNames.NameType);
+ }
+
+ public static final class TimeZoneNames.NameType extends java.lang.Enum {
+ method public static android.icu.text.TimeZoneNames.NameType valueOf(java.lang.String);
+ method public static final android.icu.text.TimeZoneNames.NameType[] values();
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType EXEMPLAR_LOCATION;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_GENERIC;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType LONG_STANDARD;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_DAYLIGHT;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_GENERIC;
+ enum_constant public static final android.icu.text.TimeZoneNames.NameType SHORT_STANDARD;
+ }
+
+ public abstract class UCharacterIterator implements java.lang.Cloneable {
+ ctor protected UCharacterIterator();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public abstract int current();
+ method public int currentCodePoint();
+ method public java.text.CharacterIterator getCharacterIterator();
+ method public abstract int getIndex();
+ method public static final android.icu.text.UCharacterIterator getInstance(android.icu.text.Replaceable);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.lang.String);
+ method public static final android.icu.text.UCharacterIterator getInstance(char[]);
+ method public static final android.icu.text.UCharacterIterator getInstance(char[], int, int);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.lang.StringBuffer);
+ method public static final android.icu.text.UCharacterIterator getInstance(java.text.CharacterIterator);
+ method public abstract int getLength();
+ method public abstract int getText(char[], int);
+ method public final int getText(char[]);
+ method public java.lang.String getText();
+ method public int moveCodePointIndex(int);
+ method public int moveIndex(int);
+ method public abstract int next();
+ method public int nextCodePoint();
+ method public abstract int previous();
+ method public int previousCodePoint();
+ method public abstract void setIndex(int);
+ method public void setToLimit();
+ method public void setToStart();
+ field public static final int DONE = -1; // 0xffffffff
+ }
+
+ public abstract class UFormat extends java.text.Format {
+ ctor public UFormat();
+ }
+
+ public abstract class UnicodeFilter implements android.icu.text.UnicodeMatcher {
+ method public abstract boolean contains(int);
+ method public int matches(android.icu.text.Replaceable, int[], int, boolean);
+ }
+
+ public abstract interface UnicodeMatcher {
+ method public abstract void addMatchSetTo(android.icu.text.UnicodeSet);
+ method public abstract int matches(android.icu.text.Replaceable, int[], int, boolean);
+ method public abstract boolean matchesIndexValue(int);
+ method public abstract java.lang.String toPattern(boolean);
+ field public static final char ETHER = 65535; // 0xffff '\uffff'
+ field public static final int U_MATCH = 2; // 0x2
+ field public static final int U_MISMATCH = 0; // 0x0
+ field public static final int U_PARTIAL_MATCH = 1; // 0x1
+ }
+
+ public class UnicodeSet extends android.icu.text.UnicodeFilter implements java.lang.Comparable android.icu.util.Freezable java.lang.Iterable {
+ ctor public UnicodeSet();
+ ctor public UnicodeSet(android.icu.text.UnicodeSet);
+ ctor public UnicodeSet(int, int);
+ ctor public UnicodeSet(int...);
+ ctor public UnicodeSet(java.lang.String);
+ ctor public UnicodeSet(java.lang.String, boolean);
+ ctor public UnicodeSet(java.lang.String, int);
+ ctor public UnicodeSet(java.lang.String, java.text.ParsePosition, android.icu.text.SymbolTable);
+ ctor public UnicodeSet(java.lang.String, java.text.ParsePosition, android.icu.text.SymbolTable, int);
+ method public java.lang.StringBuffer _generatePattern(java.lang.StringBuffer, boolean);
+ method public java.lang.StringBuffer _generatePattern(java.lang.StringBuffer, boolean, boolean);
+ method public android.icu.text.UnicodeSet add(int, int);
+ method public final android.icu.text.UnicodeSet add(int);
+ method public final android.icu.text.UnicodeSet add(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet add(java.lang.Iterable<?>);
+ method public android.icu.text.UnicodeSet addAll(int, int);
+ method public final android.icu.text.UnicodeSet addAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet addAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet addAll(java.lang.Iterable<?>);
+ method public android.icu.text.UnicodeSet addAll(T...);
+ method public T addAllTo(T);
+ method public java.lang.String[] addAllTo(java.lang.String[]);
+ method public static U addAllTo(java.lang.Iterable<T>, U);
+ method public static T[] addAllTo(java.lang.Iterable<T>, T[]);
+ method public void addMatchSetTo(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int);
+ method public final android.icu.text.UnicodeSet applyPattern(java.lang.String);
+ method public android.icu.text.UnicodeSet applyPattern(java.lang.String, boolean);
+ method public android.icu.text.UnicodeSet applyPattern(java.lang.String, int);
+ method public android.icu.text.UnicodeSet applyPropertyAlias(java.lang.String, java.lang.String);
+ method public android.icu.text.UnicodeSet applyPropertyAlias(java.lang.String, java.lang.String, android.icu.text.SymbolTable);
+ method public int charAt(int);
+ method public android.icu.text.UnicodeSet clear();
+ method public java.lang.Object clone();
+ method public android.icu.text.UnicodeSet cloneAsThawed();
+ method public android.icu.text.UnicodeSet closeOver(int);
+ method public android.icu.text.UnicodeSet compact();
+ method public static int compare(java.lang.CharSequence, int);
+ method public static int compare(int, java.lang.CharSequence);
+ method public static int compare(java.lang.Iterable<T>, java.lang.Iterable<T>);
+ method public static int compare(java.util.Collection<T>, java.util.Collection<T>, android.icu.text.UnicodeSet.ComparisonStyle);
+ method public int compareTo(android.icu.text.UnicodeSet);
+ method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle);
+ method public int compareTo(java.lang.Iterable<java.lang.String>);
+ method public android.icu.text.UnicodeSet complement(int, int);
+ method public final android.icu.text.UnicodeSet complement(int);
+ method public android.icu.text.UnicodeSet complement();
+ method public final android.icu.text.UnicodeSet complement(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet complementAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet complementAll(android.icu.text.UnicodeSet);
+ method public boolean contains(int);
+ method public boolean contains(int, int);
+ method public final boolean contains(java.lang.CharSequence);
+ method public boolean containsAll(android.icu.text.UnicodeSet);
+ method public boolean containsAll(java.lang.String);
+ method public boolean containsAll(java.lang.Iterable<T>);
+ method public boolean containsNone(int, int);
+ method public boolean containsNone(android.icu.text.UnicodeSet);
+ method public boolean containsNone(java.lang.CharSequence);
+ method public boolean containsNone(java.lang.Iterable<T>);
+ method public final boolean containsSome(int, int);
+ method public final boolean containsSome(android.icu.text.UnicodeSet);
+ method public final boolean containsSome(java.lang.CharSequence);
+ method public final boolean containsSome(java.lang.Iterable<T>);
+ method public android.icu.text.UnicodeSet freeze();
+ method public static android.icu.text.UnicodeSet from(java.lang.CharSequence);
+ method public static android.icu.text.UnicodeSet fromAll(java.lang.CharSequence);
+ method public int getRangeCount();
+ method public int getRangeEnd(int);
+ method public int getRangeStart(int);
+ method public int indexOf(int);
+ method public boolean isEmpty();
+ method public boolean isFrozen();
+ method public java.util.Iterator<java.lang.String> iterator();
+ method public boolean matchesIndexValue(int);
+ method public java.lang.Iterable<android.icu.text.UnicodeSet.EntryRange> ranges();
+ method public android.icu.text.UnicodeSet remove(int, int);
+ method public final android.icu.text.UnicodeSet remove(int);
+ method public final android.icu.text.UnicodeSet remove(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet removeAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable<T>);
+ method public final android.icu.text.UnicodeSet removeAllStrings();
+ method public static boolean resemblesPattern(java.lang.String, int);
+ method public android.icu.text.UnicodeSet retain(int, int);
+ method public final android.icu.text.UnicodeSet retain(int);
+ method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence);
+ method public final android.icu.text.UnicodeSet retainAll(java.lang.CharSequence);
+ method public android.icu.text.UnicodeSet retainAll(android.icu.text.UnicodeSet);
+ method public android.icu.text.UnicodeSet retainAll(java.lang.Iterable<T>);
+ method public android.icu.text.UnicodeSet set(int, int);
+ method public android.icu.text.UnicodeSet set(android.icu.text.UnicodeSet);
+ method public int size();
+ method public int span(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public int span(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition);
+ method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.util.Collection<java.lang.String> strings();
+ method public static java.lang.String[] toArray(android.icu.text.UnicodeSet);
+ method public java.lang.String toPattern(boolean);
+ field public static final int ADD_CASE_MAPPINGS = 4; // 0x4
+ field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS;
+ field public static final int CASE = 2; // 0x2
+ field public static final int CASE_INSENSITIVE = 2; // 0x2
+ field public static final android.icu.text.UnicodeSet EMPTY;
+ field public static final int IGNORE_SPACE = 1; // 0x1
+ field public static final int MAX_VALUE = 1114111; // 0x10ffff
+ field public static final int MIN_VALUE = 0; // 0x0
+ }
+
+ public static final class UnicodeSet.ComparisonStyle extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSet.ComparisonStyle valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSet.ComparisonStyle[] values();
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle LEXICOGRAPHIC;
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle LONGER_FIRST;
+ enum_constant public static final android.icu.text.UnicodeSet.ComparisonStyle SHORTER_FIRST;
+ }
+
+ public static class UnicodeSet.EntryRange {
+ field public int codepoint;
+ field public int codepointEnd;
+ }
+
+ public static final class UnicodeSet.SpanCondition extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSet.SpanCondition valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSet.SpanCondition[] values();
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition CONDITION_COUNT;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition CONTAINED;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition NOT_CONTAINED;
+ enum_constant public static final android.icu.text.UnicodeSet.SpanCondition SIMPLE;
+ }
+
+ public class UnicodeSetIterator {
+ ctor public UnicodeSetIterator(android.icu.text.UnicodeSet);
+ ctor public UnicodeSetIterator();
+ method public java.lang.String getString();
+ method public boolean next();
+ method public boolean nextRange();
+ method public void reset(android.icu.text.UnicodeSet);
+ method public void reset();
+ field public static int IS_STRING;
+ field public int codepoint;
+ field public int codepointEnd;
+ field public java.lang.String string;
+ }
+
+ public class UnicodeSetSpanner {
+ ctor public UnicodeSetSpanner(android.icu.text.UnicodeSet);
+ method public int countIn(java.lang.CharSequence);
+ method public int countIn(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod);
+ method public int countIn(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.lang.String deleteFrom(java.lang.CharSequence);
+ method public java.lang.String deleteFrom(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition);
+ method public android.icu.text.UnicodeSet getUnicodeSet();
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence);
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod);
+ method public java.lang.String replaceFrom(java.lang.CharSequence, java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.CountMethod, android.icu.text.UnicodeSet.SpanCondition);
+ method public java.lang.CharSequence trim(java.lang.CharSequence);
+ method public java.lang.CharSequence trim(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.TrimOption);
+ method public java.lang.CharSequence trim(java.lang.CharSequence, android.icu.text.UnicodeSetSpanner.TrimOption, android.icu.text.UnicodeSet.SpanCondition);
+ }
+
+ public static final class UnicodeSetSpanner.CountMethod extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSetSpanner.CountMethod valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSetSpanner.CountMethod[] values();
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.CountMethod MIN_ELEMENTS;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.CountMethod WHOLE_SPAN;
+ }
+
+ public static final class UnicodeSetSpanner.TrimOption extends java.lang.Enum {
+ method public static android.icu.text.UnicodeSetSpanner.TrimOption valueOf(java.lang.String);
+ method public static final android.icu.text.UnicodeSetSpanner.TrimOption[] values();
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption BOTH;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption LEADING;
+ enum_constant public static final android.icu.text.UnicodeSetSpanner.TrimOption TRAILING;
+ }
+
+}
+
+package android.icu.util {
+
+ public class BuddhistCalendar extends android.icu.util.GregorianCalendar {
+ ctor public BuddhistCalendar();
+ ctor public BuddhistCalendar(android.icu.util.TimeZone);
+ ctor public BuddhistCalendar(java.util.Locale);
+ ctor public BuddhistCalendar(android.icu.util.ULocale);
+ ctor public BuddhistCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public BuddhistCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public BuddhistCalendar(java.util.Date);
+ ctor public BuddhistCalendar(int, int, int);
+ ctor public BuddhistCalendar(int, int, int, int, int, int);
+ field public static final int BE = 0; // 0x0
+ }
+
+ public class ByteArrayWrapper implements java.lang.Comparable {
+ ctor public ByteArrayWrapper();
+ ctor public ByteArrayWrapper(byte[], int);
+ ctor public ByteArrayWrapper(java.nio.ByteBuffer);
+ method public final android.icu.util.ByteArrayWrapper append(byte[], int, int);
+ method public int compareTo(android.icu.util.ByteArrayWrapper);
+ method public android.icu.util.ByteArrayWrapper ensureCapacity(int);
+ method public final byte[] releaseBytes();
+ method public final android.icu.util.ByteArrayWrapper set(byte[], int, int);
+ field public byte[] bytes;
+ field public int size;
+ }
+
+ abstract class CECalendar extends android.icu.util.Calendar {
+ ctor protected CECalendar();
+ ctor protected CECalendar(android.icu.util.TimeZone);
+ ctor protected CECalendar(java.util.Locale);
+ ctor protected CECalendar(android.icu.util.ULocale);
+ ctor protected CECalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor protected CECalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor protected CECalendar(int, int, int);
+ ctor protected CECalendar(java.util.Date);
+ ctor protected CECalendar(int, int, int, int, int, int);
+ method public static int ceToJD(long, int, int, int);
+ method protected abstract int getJDEpochOffset();
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetLimit(int, int);
+ method public static void jdToCE(int, int, int[]);
+ }
+
+ public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
+ ctor protected Calendar();
+ ctor protected Calendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor protected Calendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method public void add(int, int);
+ method public boolean after(java.lang.Object);
+ method public boolean before(java.lang.Object);
+ method public final void clear();
+ method public final void clear(int);
+ method public java.lang.Object clone();
+ method public int compareTo(android.icu.util.Calendar);
+ method protected void complete();
+ method protected void computeFields();
+ method protected final void computeGregorianFields(int);
+ method protected int computeGregorianMonthStart(int, int);
+ method protected int computeJulianDay();
+ method protected int computeMillisInDay();
+ method protected void computeTime();
+ method protected int computeZoneOffset(long, int);
+ method public int fieldDifference(java.util.Date, int);
+ method protected java.lang.String fieldName(int);
+ method protected static final long floorDivide(long, long);
+ method protected static final int floorDivide(int, int);
+ method protected static final int floorDivide(int, int, int[]);
+ method protected static final int floorDivide(long, int, int[]);
+ method public final int get(int);
+ method public int getActualMaximum(int);
+ method public int getActualMinimum(int);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public android.icu.text.DateFormat getDateTimeFormat(int, int, java.util.Locale);
+ method public android.icu.text.DateFormat getDateTimeFormat(int, int, android.icu.util.ULocale);
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public final int getFieldCount();
+ method protected int[][][] getFieldResolutionTable();
+ method public int getFirstDayOfWeek();
+ method public final int getGreatestMinimum(int);
+ method protected final int getGregorianDayOfMonth();
+ method protected final int getGregorianDayOfYear();
+ method protected final int getGregorianMonth();
+ method protected final int getGregorianYear();
+ method public static android.icu.util.Calendar getInstance();
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone);
+ method public static android.icu.util.Calendar getInstance(java.util.Locale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone, java.util.Locale);
+ method public static android.icu.util.Calendar getInstance(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public final int getLeastMaximum(int);
+ method protected int getLimit(int, int);
+ method public final int getMaximum(int);
+ method public int getMinimalDaysInFirstWeek();
+ method public final int getMinimum(int);
+ method public int getRepeatedWallTimeOption();
+ method public int getSkippedWallTimeOption();
+ method protected final int getStamp(int);
+ method public final java.util.Date getTime();
+ method public long getTimeInMillis();
+ method public android.icu.util.TimeZone getTimeZone();
+ method public java.lang.String getType();
+ method public android.icu.util.Calendar.WeekData getWeekData();
+ method public static android.icu.util.Calendar.WeekData getWeekDataForRegion(java.lang.String);
+ method protected static final int gregorianMonthLength(int, int);
+ method protected static final int gregorianPreviousMonthLength(int, int);
+ method protected void handleComputeFields(int);
+ method protected int handleComputeJulianDay(int);
+ method protected abstract int handleComputeMonthStart(int, int, boolean);
+ method protected int[] handleCreateFields();
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.util.Locale);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.lang.String, java.util.Locale);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, android.icu.util.ULocale);
+ method protected abstract int handleGetExtendedYear();
+ method protected abstract int handleGetLimit(int, int);
+ method protected int handleGetMonthLength(int, int);
+ method protected int handleGetYearLength(int);
+ method protected final int internalGet(int);
+ method protected final int internalGet(int, int);
+ method protected final long internalGetTimeInMillis();
+ method protected final void internalSet(int, int);
+ method public boolean isEquivalentTo(android.icu.util.Calendar);
+ method protected static final boolean isGregorianLeapYear(int);
+ method public boolean isLenient();
+ method public final boolean isSet(int);
+ method public boolean isWeekend(java.util.Date);
+ method public boolean isWeekend();
+ method protected static final int julianDayToDayOfWeek(int);
+ method protected static final long julianDayToMillis(int);
+ method protected static final int millisToJulianDay(long);
+ method protected int newerField(int, int);
+ method protected int newestStamp(int, int, int);
+ method protected void pinField(int);
+ method protected void prepareGetActual(int, boolean);
+ method protected int resolveFields(int[][][]);
+ method public final void roll(int, boolean);
+ method public void roll(int, int);
+ method public final void set(int, int);
+ method public final void set(int, int, int);
+ method public final void set(int, int, int, int, int);
+ method public final void set(int, int, int, int, int, int);
+ method public void setFirstDayOfWeek(int);
+ method public void setLenient(boolean);
+ method public void setMinimalDaysInFirstWeek(int);
+ method public void setRepeatedWallTimeOption(int);
+ method public void setSkippedWallTimeOption(int);
+ method public final void setTime(java.util.Date);
+ method public void setTimeInMillis(long);
+ method public void setTimeZone(android.icu.util.TimeZone);
+ method public android.icu.util.Calendar setWeekData(android.icu.util.Calendar.WeekData);
+ method protected void validateField(int);
+ method protected final void validateField(int, int, int);
+ method protected void validateFields();
+ method protected int weekNumber(int, int, int);
+ method protected final int weekNumber(int, int);
+ field public static final int AM = 0; // 0x0
+ field public static final int AM_PM = 9; // 0x9
+ field public static final int APRIL = 3; // 0x3
+ field public static final int AUGUST = 7; // 0x7
+ field protected static final int BASE_FIELD_COUNT = 23; // 0x17
+ field public static final int DATE = 5; // 0x5
+ field public static final int DAY_OF_MONTH = 5; // 0x5
+ field public static final int DAY_OF_WEEK = 7; // 0x7
+ field public static final int DAY_OF_WEEK_IN_MONTH = 8; // 0x8
+ field public static final int DAY_OF_YEAR = 6; // 0x6
+ field public static final int DECEMBER = 11; // 0xb
+ field public static final int DOW_LOCAL = 18; // 0x12
+ field public static final int DST_OFFSET = 16; // 0x10
+ field protected static final int EPOCH_JULIAN_DAY = 2440588; // 0x253d8c
+ field public static final int ERA = 0; // 0x0
+ field public static final int EXTENDED_YEAR = 19; // 0x13
+ field public static final int FEBRUARY = 1; // 0x1
+ field public static final int FRIDAY = 6; // 0x6
+ field protected static final int GREATEST_MINIMUM = 1; // 0x1
+ field public static final int HOUR = 10; // 0xa
+ field public static final int HOUR_OF_DAY = 11; // 0xb
+ field protected static final int INTERNALLY_SET = 1; // 0x1
+ field public static final int IS_LEAP_MONTH = 22; // 0x16
+ field public static final int JANUARY = 0; // 0x0
+ field protected static final int JAN_1_1_JULIAN_DAY = 1721426; // 0x1a4452
+ field public static final int JULIAN_DAY = 20; // 0x14
+ field public static final int JULY = 6; // 0x6
+ field public static final int JUNE = 5; // 0x5
+ field protected static final int LEAST_MAXIMUM = 2; // 0x2
+ field public static final int MARCH = 2; // 0x2
+ field protected static final int MAXIMUM = 3; // 0x3
+ field protected static final java.util.Date MAX_DATE;
+ field protected static final int MAX_FIELD_COUNT = 32; // 0x20
+ field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
+ field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
+ field public static final int MAY = 4; // 0x4
+ field public static final int MILLISECOND = 14; // 0xe
+ field public static final int MILLISECONDS_IN_DAY = 21; // 0x15
+ field protected static final int MINIMUM = 0; // 0x0
+ field protected static final int MINIMUM_USER_STAMP = 2; // 0x2
+ field public static final int MINUTE = 12; // 0xc
+ field protected static final java.util.Date MIN_DATE;
+ field protected static final int MIN_JULIAN = -2130706432; // 0x81000000
+ field protected static final long MIN_MILLIS = -184303902528000000L; // 0xfd713893bf19b000L
+ field public static final int MONDAY = 2; // 0x2
+ field public static final int MONTH = 2; // 0x2
+ field public static final int NOVEMBER = 10; // 0xa
+ field public static final int OCTOBER = 9; // 0x9
+ field protected static final long ONE_DAY = 86400000L; // 0x5265c00L
+ field protected static final int ONE_HOUR = 3600000; // 0x36ee80
+ field protected static final int ONE_MINUTE = 60000; // 0xea60
+ field protected static final int ONE_SECOND = 1000; // 0x3e8
+ field protected static final long ONE_WEEK = 604800000L; // 0x240c8400L
+ field public static final int PM = 1; // 0x1
+ field protected static final int RESOLVE_REMAP = 32; // 0x20
+ field public static final int SATURDAY = 7; // 0x7
+ field public static final int SECOND = 13; // 0xd
+ field public static final int SEPTEMBER = 8; // 0x8
+ field public static final int SUNDAY = 1; // 0x1
+ field public static final int THURSDAY = 5; // 0x5
+ field public static final int TUESDAY = 3; // 0x3
+ field public static final int UNDECIMBER = 12; // 0xc
+ field protected static final int UNSET = 0; // 0x0
+ field public static final int WALLTIME_FIRST = 1; // 0x1
+ field public static final int WALLTIME_LAST = 0; // 0x0
+ field public static final int WALLTIME_NEXT_VALID = 2; // 0x2
+ field public static final int WEDNESDAY = 4; // 0x4
+ field public static final int WEEK_OF_MONTH = 4; // 0x4
+ field public static final int WEEK_OF_YEAR = 3; // 0x3
+ field public static final int YEAR = 1; // 0x1
+ field public static final int YEAR_WOY = 17; // 0x11
+ field public static final int ZONE_OFFSET = 15; // 0xf
+ }
+
+ public static final class Calendar.WeekData {
+ ctor public Calendar.WeekData(int, int, int, int, int, int);
+ field public final int firstDayOfWeek;
+ field public final int minimalDaysInFirstWeek;
+ field public final int weekendCease;
+ field public final int weekendCeaseMillis;
+ field public final int weekendOnset;
+ field public final int weekendOnsetMillis;
+ }
+
+ public class ChineseCalendar extends android.icu.util.Calendar {
+ ctor public ChineseCalendar();
+ ctor public ChineseCalendar(java.util.Date);
+ ctor public ChineseCalendar(int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int);
+ ctor public ChineseCalendar(int, int, int, int, int, int, int, int);
+ ctor public ChineseCalendar(java.util.Locale);
+ ctor public ChineseCalendar(android.icu.util.TimeZone);
+ ctor public ChineseCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public ChineseCalendar(android.icu.util.ULocale);
+ ctor public ChineseCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected android.icu.text.DateFormat handleGetDateFormat(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ }
+
+ public final class CopticCalendar extends android.icu.util.CECalendar {
+ ctor public CopticCalendar();
+ ctor public CopticCalendar(android.icu.util.TimeZone);
+ ctor public CopticCalendar(java.util.Locale);
+ ctor public CopticCalendar(android.icu.util.ULocale);
+ ctor public CopticCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public CopticCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public CopticCalendar(int, int, int);
+ ctor public CopticCalendar(java.util.Date);
+ ctor public CopticCalendar(int, int, int, int, int, int);
+ method protected deprecated int getJDEpochOffset();
+ method protected deprecated int handleGetExtendedYear();
+ field public static final int AMSHIR = 5; // 0x5
+ field public static final int BABA = 1; // 0x1
+ field public static final int BARAMHAT = 6; // 0x6
+ field public static final int BARAMOUDA = 7; // 0x7
+ field public static final int BASHANS = 8; // 0x8
+ field public static final int EPEP = 10; // 0xa
+ field public static final int HATOR = 2; // 0x2
+ field public static final int KIAHK = 3; // 0x3
+ field public static final int MESRA = 11; // 0xb
+ field public static final int NASIE = 12; // 0xc
+ field public static final int PAONA = 9; // 0x9
+ field public static final int TOBA = 4; // 0x4
+ field public static final int TOUT = 0; // 0x0
+ }
+
+ public class Currency extends android.icu.util.MeasureUnit {
+ ctor protected Currency(java.lang.String);
+ method public static java.util.Set<android.icu.util.Currency> getAvailableCurrencies();
+ method public static java.lang.String[] getAvailableCurrencyCodes(android.icu.util.ULocale, java.util.Date);
+ method public static java.lang.String[] getAvailableCurrencyCodes(java.util.Locale, java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public static android.icu.util.ULocale[] getAvailableULocales();
+ method public java.lang.String getCurrencyCode();
+ method public int getDefaultFractionDigits();
+ method public int getDefaultFractionDigits(android.icu.util.Currency.CurrencyUsage);
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public static android.icu.util.Currency getInstance(java.util.Locale);
+ method public static android.icu.util.Currency getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.Currency getInstance(java.lang.String);
+ method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean);
+ method public java.lang.String getName(java.util.Locale, int, boolean[]);
+ method public java.lang.String getName(android.icu.util.ULocale, int, boolean[]);
+ method public java.lang.String getName(java.util.Locale, int, java.lang.String, boolean[]);
+ method public java.lang.String getName(android.icu.util.ULocale, int, java.lang.String, boolean[]);
+ method public int getNumericCode();
+ method public double getRoundingIncrement();
+ method public double getRoundingIncrement(android.icu.util.Currency.CurrencyUsage);
+ method public java.lang.String getSymbol();
+ method public java.lang.String getSymbol(java.util.Locale);
+ method public java.lang.String getSymbol(android.icu.util.ULocale);
+ method public static boolean isAvailable(java.lang.String, java.util.Date, java.util.Date);
+ method public static java.lang.Object registerInstance(android.icu.util.Currency, android.icu.util.ULocale);
+ method public static boolean unregister(java.lang.Object);
+ field public static final int LONG_NAME = 1; // 0x1
+ field public static final int PLURAL_LONG_NAME = 2; // 0x2
+ field public static final int SYMBOL_NAME = 0; // 0x0
+ }
+
+ public static final class Currency.CurrencyUsage extends java.lang.Enum {
+ method public static android.icu.util.Currency.CurrencyUsage valueOf(java.lang.String);
+ method public static final android.icu.util.Currency.CurrencyUsage[] values();
+ enum_constant public static final android.icu.util.Currency.CurrencyUsage CASH;
+ enum_constant public static final android.icu.util.Currency.CurrencyUsage STANDARD;
+ }
+
+ public class CurrencyAmount extends android.icu.util.Measure {
+ ctor public CurrencyAmount(java.lang.Number, android.icu.util.Currency);
+ ctor public CurrencyAmount(double, android.icu.util.Currency);
+ method public android.icu.util.Currency getCurrency();
+ }
+
+ public final class DateInterval implements java.io.Serializable {
+ ctor public DateInterval(long, long);
+ method public long getFromDate();
+ method public long getToDate();
+ }
+
+ public abstract interface Freezable implements java.lang.Cloneable {
+ method public abstract T cloneAsThawed();
+ method public abstract T freeze();
+ method public abstract boolean isFrozen();
+ }
+
+ public class GregorianCalendar extends android.icu.util.Calendar {
+ ctor public GregorianCalendar();
+ ctor public GregorianCalendar(android.icu.util.TimeZone);
+ ctor public GregorianCalendar(java.util.Locale);
+ ctor public GregorianCalendar(android.icu.util.ULocale);
+ ctor public GregorianCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public GregorianCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public GregorianCalendar(int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int, int);
+ method public final java.util.Date getGregorianChange();
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ method public boolean isLeapYear(int);
+ method public void setGregorianChange(java.util.Date);
+ field public static final int AD = 1; // 0x1
+ field public static final int BC = 0; // 0x0
+ field protected transient boolean invertGregorian;
+ field protected transient boolean isGregorian;
+ }
+
+ public class HebrewCalendar extends android.icu.util.Calendar {
+ ctor public HebrewCalendar();
+ ctor public HebrewCalendar(android.icu.util.TimeZone);
+ ctor public HebrewCalendar(java.util.Locale);
+ ctor public HebrewCalendar(android.icu.util.ULocale);
+ ctor public HebrewCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public HebrewCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public HebrewCalendar(int, int, int);
+ ctor public HebrewCalendar(java.util.Date);
+ ctor public HebrewCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ field public static final int ADAR = 6; // 0x6
+ field public static final int ADAR_1 = 5; // 0x5
+ field public static final int AV = 11; // 0xb
+ field public static final int ELUL = 12; // 0xc
+ field public static final int HESHVAN = 1; // 0x1
+ field public static final int IYAR = 8; // 0x8
+ field public static final int KISLEV = 2; // 0x2
+ field public static final int NISAN = 7; // 0x7
+ field public static final int SHEVAT = 4; // 0x4
+ field public static final int SIVAN = 9; // 0x9
+ field public static final int TAMUZ = 10; // 0xa
+ field public static final int TEVET = 3; // 0x3
+ field public static final int TISHRI = 0; // 0x0
+ }
+
+ public class ICUUncheckedIOException extends java.lang.RuntimeException {
+ ctor public ICUUncheckedIOException();
+ ctor public ICUUncheckedIOException(java.lang.String);
+ ctor public ICUUncheckedIOException(java.lang.Throwable);
+ ctor public ICUUncheckedIOException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class IndianCalendar extends android.icu.util.Calendar {
+ ctor public IndianCalendar();
+ ctor public IndianCalendar(android.icu.util.TimeZone);
+ ctor public IndianCalendar(java.util.Locale);
+ ctor public IndianCalendar(android.icu.util.ULocale);
+ ctor public IndianCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public IndianCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public IndianCalendar(java.util.Date);
+ ctor public IndianCalendar(int, int, int);
+ ctor public IndianCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ field public static final int AGRAHAYANA = 8; // 0x8
+ field public static final int ASADHA = 3; // 0x3
+ field public static final int ASVINA = 6; // 0x6
+ field public static final int BHADRA = 5; // 0x5
+ field public static final int CHAITRA = 0; // 0x0
+ field public static final int IE = 0; // 0x0
+ field public static final int JYAISTHA = 2; // 0x2
+ field public static final int KARTIKA = 7; // 0x7
+ field public static final int MAGHA = 10; // 0xa
+ field public static final int PAUSA = 9; // 0x9
+ field public static final int PHALGUNA = 11; // 0xb
+ field public static final int SRAVANA = 4; // 0x4
+ field public static final int VAISAKHA = 1; // 0x1
+ }
+
+ public class IslamicCalendar extends android.icu.util.Calendar {
+ ctor public IslamicCalendar();
+ ctor public IslamicCalendar(android.icu.util.TimeZone);
+ ctor public IslamicCalendar(java.util.Locale);
+ ctor public IslamicCalendar(android.icu.util.ULocale);
+ ctor public IslamicCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public IslamicCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public IslamicCalendar(java.util.Date);
+ ctor public IslamicCalendar(int, int, int);
+ ctor public IslamicCalendar(int, int, int, int, int, int);
+ method protected int handleComputeMonthStart(int, int, boolean);
+ method protected int handleGetExtendedYear();
+ method protected int handleGetLimit(int, int);
+ method public boolean isCivil();
+ method public void setCivil(boolean);
+ field public static final int DHU_AL_HIJJAH = 11; // 0xb
+ field public static final int DHU_AL_QIDAH = 10; // 0xa
+ field public static final int JUMADA_1 = 4; // 0x4
+ field public static final int JUMADA_2 = 5; // 0x5
+ field public static final int MUHARRAM = 0; // 0x0
+ field public static final int RABI_1 = 2; // 0x2
+ field public static final int RABI_2 = 3; // 0x3
+ field public static final int RAJAB = 6; // 0x6
+ field public static final int RAMADAN = 8; // 0x8
+ field public static final int SAFAR = 1; // 0x1
+ field public static final int SHABAN = 7; // 0x7
+ field public static final int SHAWWAL = 9; // 0x9
+ }
+
+ public static final class IslamicCalendar.CalculationType extends java.lang.Enum {
+ method public static android.icu.util.IslamicCalendar.CalculationType valueOf(java.lang.String);
+ method public static final android.icu.util.IslamicCalendar.CalculationType[] values();
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_CIVIL;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_TBLA;
+ enum_constant public static final android.icu.util.IslamicCalendar.CalculationType ISLAMIC_UMALQURA;
+ }
+
+ public class JapaneseCalendar extends android.icu.util.GregorianCalendar {
+ ctor public JapaneseCalendar();
+ ctor public JapaneseCalendar(android.icu.util.TimeZone);
+ ctor public JapaneseCalendar(java.util.Locale);
+ ctor public JapaneseCalendar(android.icu.util.ULocale);
+ ctor public JapaneseCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public JapaneseCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public JapaneseCalendar(java.util.Date);
+ ctor public JapaneseCalendar(int, int, int, int);
+ ctor public JapaneseCalendar(int, int, int);
+ ctor public JapaneseCalendar(int, int, int, int, int, int);
+ field public static final int CURRENT_ERA;
+ field public static final int HEISEI;
+ field public static final int MEIJI;
+ field public static final int SHOWA;
+ field public static final int TAISHO;
+ }
+
+ public class Measure {
+ ctor public Measure(java.lang.Number, android.icu.util.MeasureUnit);
+ method public java.lang.Number getNumber();
+ method public android.icu.util.MeasureUnit getUnit();
+ }
+
+ public class MeasureUnit implements java.io.Serializable {
+ method public static synchronized java.util.Set<android.icu.util.MeasureUnit> getAvailable(java.lang.String);
+ method public static synchronized java.util.Set<android.icu.util.MeasureUnit> getAvailable();
+ method public static synchronized java.util.Set<java.lang.String> getAvailableTypes();
+ method public java.lang.String getSubtype();
+ method public java.lang.String getType();
+ field public static final android.icu.util.MeasureUnit ACRE;
+ field public static final android.icu.util.MeasureUnit ACRE_FOOT;
+ field public static final android.icu.util.MeasureUnit AMPERE;
+ field public static final android.icu.util.MeasureUnit ARC_MINUTE;
+ field public static final android.icu.util.MeasureUnit ARC_SECOND;
+ field public static final android.icu.util.MeasureUnit ASTRONOMICAL_UNIT;
+ field public static final android.icu.util.MeasureUnit BIT;
+ field public static final android.icu.util.MeasureUnit BUSHEL;
+ field public static final android.icu.util.MeasureUnit BYTE;
+ field public static final android.icu.util.MeasureUnit CALORIE;
+ field public static final android.icu.util.MeasureUnit CARAT;
+ field public static final android.icu.util.MeasureUnit CELSIUS;
+ field public static final android.icu.util.MeasureUnit CENTILITER;
+ field public static final android.icu.util.MeasureUnit CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
+ field public static final android.icu.util.MeasureUnit CUBIC_INCH;
+ field public static final android.icu.util.MeasureUnit CUBIC_KILOMETER;
+ field public static final android.icu.util.MeasureUnit CUBIC_METER;
+ field public static final android.icu.util.MeasureUnit CUBIC_MILE;
+ field public static final android.icu.util.MeasureUnit CUBIC_YARD;
+ field public static final android.icu.util.MeasureUnit CUP;
+ field public static final android.icu.util.TimeUnit DAY;
+ field public static final android.icu.util.MeasureUnit DECILITER;
+ field public static final android.icu.util.MeasureUnit DECIMETER;
+ field public static final android.icu.util.MeasureUnit DEGREE;
+ field public static final android.icu.util.MeasureUnit FAHRENHEIT;
+ field public static final android.icu.util.MeasureUnit FATHOM;
+ field public static final android.icu.util.MeasureUnit FLUID_OUNCE;
+ field public static final android.icu.util.MeasureUnit FOODCALORIE;
+ field public static final android.icu.util.MeasureUnit FOOT;
+ field public static final android.icu.util.MeasureUnit FURLONG;
+ field public static final android.icu.util.MeasureUnit GALLON;
+ field public static final android.icu.util.MeasureUnit GIGABIT;
+ field public static final android.icu.util.MeasureUnit GIGABYTE;
+ field public static final android.icu.util.MeasureUnit GIGAHERTZ;
+ field public static final android.icu.util.MeasureUnit GIGAWATT;
+ field public static final android.icu.util.MeasureUnit GRAM;
+ field public static final android.icu.util.MeasureUnit G_FORCE;
+ field public static final android.icu.util.MeasureUnit HECTARE;
+ field public static final android.icu.util.MeasureUnit HECTOLITER;
+ field public static final android.icu.util.MeasureUnit HECTOPASCAL;
+ field public static final android.icu.util.MeasureUnit HERTZ;
+ field public static final android.icu.util.MeasureUnit HORSEPOWER;
+ field public static final android.icu.util.TimeUnit HOUR;
+ field public static final android.icu.util.MeasureUnit INCH;
+ field public static final android.icu.util.MeasureUnit INCH_HG;
+ field public static final android.icu.util.MeasureUnit JOULE;
+ field public static final android.icu.util.MeasureUnit KARAT;
+ field public static final android.icu.util.MeasureUnit KELVIN;
+ field public static final android.icu.util.MeasureUnit KILOBIT;
+ field public static final android.icu.util.MeasureUnit KILOBYTE;
+ field public static final android.icu.util.MeasureUnit KILOCALORIE;
+ field public static final android.icu.util.MeasureUnit KILOGRAM;
+ field public static final android.icu.util.MeasureUnit KILOHERTZ;
+ field public static final android.icu.util.MeasureUnit KILOJOULE;
+ field public static final android.icu.util.MeasureUnit KILOMETER;
+ field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit KILOWATT;
+ field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
+ field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
+ field public static final android.icu.util.MeasureUnit LITER;
+ field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
+ field public static final android.icu.util.MeasureUnit LUX;
+ field public static final android.icu.util.MeasureUnit MEGABIT;
+ field public static final android.icu.util.MeasureUnit MEGABYTE;
+ field public static final android.icu.util.MeasureUnit MEGAHERTZ;
+ field public static final android.icu.util.MeasureUnit MEGALITER;
+ field public static final android.icu.util.MeasureUnit MEGAWATT;
+ field public static final android.icu.util.MeasureUnit METER;
+ field public static final android.icu.util.MeasureUnit METER_PER_SECOND;
+ field public static final android.icu.util.MeasureUnit METER_PER_SECOND_SQUARED;
+ field public static final android.icu.util.MeasureUnit METRIC_TON;
+ field public static final android.icu.util.MeasureUnit MICROGRAM;
+ field public static final android.icu.util.MeasureUnit MICROMETER;
+ field public static final android.icu.util.MeasureUnit MICROSECOND;
+ field public static final android.icu.util.MeasureUnit MILE;
+ field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
+ field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
+ field public static final android.icu.util.MeasureUnit MILLIAMPERE;
+ field public static final android.icu.util.MeasureUnit MILLIBAR;
+ field public static final android.icu.util.MeasureUnit MILLIGRAM;
+ field public static final android.icu.util.MeasureUnit MILLILITER;
+ field public static final android.icu.util.MeasureUnit MILLIMETER;
+ field public static final android.icu.util.MeasureUnit MILLIMETER_OF_MERCURY;
+ field public static final android.icu.util.MeasureUnit MILLISECOND;
+ field public static final android.icu.util.MeasureUnit MILLIWATT;
+ field public static final android.icu.util.TimeUnit MINUTE;
+ field public static final android.icu.util.TimeUnit MONTH;
+ field public static final android.icu.util.MeasureUnit NANOMETER;
+ field public static final android.icu.util.MeasureUnit NANOSECOND;
+ field public static final android.icu.util.MeasureUnit NAUTICAL_MILE;
+ field public static final android.icu.util.MeasureUnit OHM;
+ field public static final android.icu.util.MeasureUnit OUNCE;
+ field public static final android.icu.util.MeasureUnit OUNCE_TROY;
+ field public static final android.icu.util.MeasureUnit PARSEC;
+ field public static final android.icu.util.MeasureUnit PICOMETER;
+ field public static final android.icu.util.MeasureUnit PINT;
+ field public static final android.icu.util.MeasureUnit POUND;
+ field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
+ field public static final android.icu.util.MeasureUnit QUART;
+ field public static final android.icu.util.MeasureUnit RADIAN;
+ field public static final android.icu.util.TimeUnit SECOND;
+ field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
+ field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
+ field public static final android.icu.util.MeasureUnit SQUARE_INCH;
+ field public static final android.icu.util.MeasureUnit SQUARE_KILOMETER;
+ field public static final android.icu.util.MeasureUnit SQUARE_METER;
+ field public static final android.icu.util.MeasureUnit SQUARE_MILE;
+ field public static final android.icu.util.MeasureUnit SQUARE_YARD;
+ field public static final android.icu.util.MeasureUnit STONE;
+ field public static final android.icu.util.MeasureUnit TABLESPOON;
+ field public static final android.icu.util.MeasureUnit TEASPOON;
+ field public static final android.icu.util.MeasureUnit TERABIT;
+ field public static final android.icu.util.MeasureUnit TERABYTE;
+ field public static final android.icu.util.MeasureUnit TON;
+ field public static final android.icu.util.MeasureUnit VOLT;
+ field public static final android.icu.util.MeasureUnit WATT;
+ field public static final android.icu.util.TimeUnit WEEK;
+ field public static final android.icu.util.MeasureUnit YARD;
+ field public static final android.icu.util.TimeUnit YEAR;
+ }
+
+ public class Output {
+ ctor public Output();
+ ctor public Output(T);
+ field public T value;
+ }
+
+ public abstract interface RangeValueIterator {
+ method public abstract boolean next(android.icu.util.RangeValueIterator.Element);
+ method public abstract void reset();
+ }
+
+ public static class RangeValueIterator.Element {
+ ctor public RangeValueIterator.Element();
+ field public int limit;
+ field public int start;
+ field public int value;
+ }
+
+ public class TaiwanCalendar extends android.icu.util.GregorianCalendar {
+ ctor public TaiwanCalendar();
+ ctor public TaiwanCalendar(android.icu.util.TimeZone);
+ ctor public TaiwanCalendar(java.util.Locale);
+ ctor public TaiwanCalendar(android.icu.util.ULocale);
+ ctor public TaiwanCalendar(android.icu.util.TimeZone, java.util.Locale);
+ ctor public TaiwanCalendar(android.icu.util.TimeZone, android.icu.util.ULocale);
+ ctor public TaiwanCalendar(java.util.Date);
+ ctor public TaiwanCalendar(int, int, int);
+ ctor public TaiwanCalendar(int, int, int, int, int, int);
+ field public static final int BEFORE_MINGUO = 0; // 0x0
+ field public static final int MINGUO = 1; // 0x1
+ }
+
+ public class TimeUnit extends android.icu.util.MeasureUnit {
+ method public static android.icu.util.TimeUnit[] values();
+ }
+
+ public abstract class TimeZone implements java.lang.Cloneable android.icu.util.Freezable java.io.Serializable {
+ ctor public TimeZone();
+ method public java.lang.Object clone();
+ method public android.icu.util.TimeZone cloneAsThawed();
+ method public static int countEquivalentIDs(java.lang.String);
+ method public android.icu.util.TimeZone freeze();
+ method public static java.util.Set<java.lang.String> getAvailableIDs(android.icu.util.TimeZone.SystemTimeZoneType, java.lang.String, java.lang.Integer);
+ method public static java.lang.String[] getAvailableIDs(int);
+ method public static java.lang.String[] getAvailableIDs(java.lang.String);
+ method public static java.lang.String[] getAvailableIDs();
+ method public static java.lang.String getCanonicalID(java.lang.String);
+ method public static java.lang.String getCanonicalID(java.lang.String, boolean[]);
+ method public int getDSTSavings();
+ method public static android.icu.util.TimeZone getDefault();
+ method public static int getDefaultTimeZoneType();
+ method public final java.lang.String getDisplayName();
+ method public final java.lang.String getDisplayName(java.util.Locale);
+ method public final java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public final java.lang.String getDisplayName(boolean, int);
+ method public java.lang.String getDisplayName(boolean, int, java.util.Locale);
+ method public java.lang.String getDisplayName(boolean, int, android.icu.util.ULocale);
+ method public static java.lang.String getEquivalentID(java.lang.String, int);
+ method public static android.icu.util.TimeZone getFrozenTimeZone(java.lang.String);
+ method public java.lang.String getID();
+ method public static java.lang.String getIDForWindowsID(java.lang.String, java.lang.String);
+ method public abstract int getOffset(int, int, int, int, int, int);
+ method public int getOffset(long);
+ method public void getOffset(long, boolean, int[]);
+ method public abstract int getRawOffset();
+ method public static java.lang.String getRegion(java.lang.String);
+ method public static java.lang.String getTZDataVersion();
+ method public static android.icu.util.TimeZone getTimeZone(java.lang.String);
+ method public static android.icu.util.TimeZone getTimeZone(java.lang.String, int);
+ method public static java.lang.String getWindowsID(java.lang.String);
+ method public boolean hasSameRules(android.icu.util.TimeZone);
+ method public abstract boolean inDaylightTime(java.util.Date);
+ method public boolean isFrozen();
+ method public boolean observesDaylightTime();
+ method public static synchronized void setDefault(android.icu.util.TimeZone);
+ method public static synchronized void setDefaultTimeZoneType(int);
+ method public void setID(java.lang.String);
+ method public abstract void setRawOffset(int);
+ method public abstract boolean useDaylightTime();
+ field public static final int GENERIC_LOCATION = 7; // 0x7
+ field public static final android.icu.util.TimeZone GMT_ZONE;
+ field public static final int LONG = 1; // 0x1
+ field public static final int LONG_GENERIC = 3; // 0x3
+ field public static final int LONG_GMT = 5; // 0x5
+ field public static final int SHORT = 0; // 0x0
+ field public static final int SHORT_COMMONLY_USED = 6; // 0x6
+ field public static final int SHORT_GENERIC = 2; // 0x2
+ field public static final int SHORT_GMT = 4; // 0x4
+ field public static final int TIMEZONE_ICU = 0; // 0x0
+ field public static final int TIMEZONE_JDK = 1; // 0x1
+ field public static final android.icu.util.TimeZone UNKNOWN_ZONE;
+ field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";
+ }
+
+ public static final class TimeZone.SystemTimeZoneType extends java.lang.Enum {
+ method public static android.icu.util.TimeZone.SystemTimeZoneType valueOf(java.lang.String);
+ method public static final android.icu.util.TimeZone.SystemTimeZoneType[] values();
+ }
+
+ public final class ULocale implements java.lang.Comparable java.io.Serializable {
+ ctor public ULocale(java.lang.String);
+ ctor public ULocale(java.lang.String, java.lang.String);
+ ctor public ULocale(java.lang.String, java.lang.String, java.lang.String);
+ method public static android.icu.util.ULocale acceptLanguage(java.lang.String, android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(android.icu.util.ULocale[], android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(java.lang.String, boolean[]);
+ method public static android.icu.util.ULocale acceptLanguage(android.icu.util.ULocale[], boolean[]);
+ method public static android.icu.util.ULocale addLikelySubtags(android.icu.util.ULocale);
+ method public static java.lang.String canonicalize(java.lang.String);
+ method public java.lang.Object clone();
+ method public int compareTo(android.icu.util.ULocale);
+ method public static android.icu.util.ULocale createCanonical(java.lang.String);
+ method public static android.icu.util.ULocale forLanguageTag(java.lang.String);
+ method public static android.icu.util.ULocale forLocale(java.util.Locale);
+ method public static android.icu.util.ULocale[] getAvailableLocales();
+ method public java.lang.String getBaseName();
+ method public static java.lang.String getBaseName(java.lang.String);
+ method public java.lang.String getCharacterOrientation();
+ method public java.lang.String getCountry();
+ method public static java.lang.String getCountry(java.lang.String);
+ method public static android.icu.util.ULocale getDefault();
+ method public static android.icu.util.ULocale getDefault(android.icu.util.ULocale.Category);
+ method public java.lang.String getDisplayCountry();
+ method public java.lang.String getDisplayCountry(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayCountry(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayCountry(java.lang.String, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayKeyword(java.lang.String);
+ method public static java.lang.String getDisplayKeyword(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayKeyword(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayKeywordValue(java.lang.String);
+ method public java.lang.String getDisplayKeywordValue(java.lang.String, android.icu.util.ULocale);
+ method public static java.lang.String getDisplayKeywordValue(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayKeywordValue(java.lang.String, java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayLanguage();
+ method public java.lang.String getDisplayLanguage(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayLanguage(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayLanguage(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayLanguageWithDialect();
+ method public java.lang.String getDisplayLanguageWithDialect(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayLanguageWithDialect(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayLanguageWithDialect(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayName(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayName(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayNameWithDialect();
+ method public java.lang.String getDisplayNameWithDialect(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayNameWithDialect(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayNameWithDialect(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayScript();
+ method public java.lang.String getDisplayScript(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayScript(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayScript(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getDisplayVariant();
+ method public java.lang.String getDisplayVariant(android.icu.util.ULocale);
+ method public static java.lang.String getDisplayVariant(java.lang.String, java.lang.String);
+ method public static java.lang.String getDisplayVariant(java.lang.String, android.icu.util.ULocale);
+ method public java.lang.String getExtension(char);
+ method public java.util.Set<java.lang.Character> getExtensionKeys();
+ method public static java.lang.String getFallback(java.lang.String);
+ method public android.icu.util.ULocale getFallback();
+ method public java.lang.String getISO3Country();
+ method public static java.lang.String getISO3Country(java.lang.String);
+ method public java.lang.String getISO3Language();
+ method public static java.lang.String getISO3Language(java.lang.String);
+ method public static java.lang.String[] getISOCountries();
+ method public static java.lang.String[] getISOLanguages();
+ method public java.lang.String getKeywordValue(java.lang.String);
+ method public static java.lang.String getKeywordValue(java.lang.String, java.lang.String);
+ method public java.util.Iterator<java.lang.String> getKeywords();
+ method public static java.util.Iterator<java.lang.String> getKeywords(java.lang.String);
+ method public java.lang.String getLanguage();
+ method public static java.lang.String getLanguage(java.lang.String);
+ method public java.lang.String getLineOrientation();
+ method public java.lang.String getName();
+ method public static java.lang.String getName(java.lang.String);
+ method public java.lang.String getScript();
+ method public static java.lang.String getScript(java.lang.String);
+ method public java.util.Set<java.lang.String> getUnicodeLocaleAttributes();
+ method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
+ method public java.lang.String getUnicodeLocaleType(java.lang.String);
+ method public java.lang.String getVariant();
+ method public static java.lang.String getVariant(java.lang.String);
+ method public boolean isRightToLeft();
+ method public static android.icu.util.ULocale minimizeSubtags(android.icu.util.ULocale);
+ method public static synchronized void setDefault(android.icu.util.ULocale);
+ method public static synchronized void setDefault(android.icu.util.ULocale.Category, android.icu.util.ULocale);
+ method public android.icu.util.ULocale setKeywordValue(java.lang.String, java.lang.String);
+ method public static java.lang.String setKeywordValue(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String toLanguageTag();
+ method public static java.lang.String toLegacyKey(java.lang.String);
+ method public static java.lang.String toLegacyType(java.lang.String, java.lang.String);
+ method public java.util.Locale toLocale();
+ method public static java.lang.String toUnicodeLocaleKey(java.lang.String);
+ method public static java.lang.String toUnicodeLocaleType(java.lang.String, java.lang.String);
+ field public static final android.icu.util.ULocale CANADA;
+ field public static final android.icu.util.ULocale CANADA_FRENCH;
+ field public static final android.icu.util.ULocale CHINA;
+ field public static final android.icu.util.ULocale CHINESE;
+ field public static final android.icu.util.ULocale ENGLISH;
+ field public static final android.icu.util.ULocale FRANCE;
+ field public static final android.icu.util.ULocale FRENCH;
+ field public static final android.icu.util.ULocale GERMAN;
+ field public static final android.icu.util.ULocale GERMANY;
+ field public static final android.icu.util.ULocale ITALIAN;
+ field public static final android.icu.util.ULocale ITALY;
+ field public static final android.icu.util.ULocale JAPAN;
+ field public static final android.icu.util.ULocale JAPANESE;
+ field public static final android.icu.util.ULocale KOREA;
+ field public static final android.icu.util.ULocale KOREAN;
+ field public static final android.icu.util.ULocale PRC;
+ field public static final char PRIVATE_USE_EXTENSION = 120; // 0x0078 'x'
+ field public static final android.icu.util.ULocale ROOT;
+ field public static final android.icu.util.ULocale SIMPLIFIED_CHINESE;
+ field public static final android.icu.util.ULocale TAIWAN;
+ field public static final android.icu.util.ULocale TRADITIONAL_CHINESE;
+ field public static final android.icu.util.ULocale UK;
+ field public static final char UNICODE_LOCALE_EXTENSION = 117; // 0x0075 'u'
+ field public static final android.icu.util.ULocale US;
+ }
+
+ public static final class ULocale.Builder {
+ ctor public ULocale.Builder();
+ method public android.icu.util.ULocale.Builder addUnicodeLocaleAttribute(java.lang.String);
+ method public android.icu.util.ULocale build();
+ method public android.icu.util.ULocale.Builder clear();
+ method public android.icu.util.ULocale.Builder clearExtensions();
+ method public android.icu.util.ULocale.Builder removeUnicodeLocaleAttribute(java.lang.String);
+ method public android.icu.util.ULocale.Builder setExtension(char, java.lang.String);
+ method public android.icu.util.ULocale.Builder setLanguage(java.lang.String);
+ method public android.icu.util.ULocale.Builder setLanguageTag(java.lang.String);
+ method public android.icu.util.ULocale.Builder setLocale(android.icu.util.ULocale);
+ method public android.icu.util.ULocale.Builder setRegion(java.lang.String);
+ method public android.icu.util.ULocale.Builder setScript(java.lang.String);
+ method public android.icu.util.ULocale.Builder setUnicodeLocaleKeyword(java.lang.String, java.lang.String);
+ method public android.icu.util.ULocale.Builder setVariant(java.lang.String);
+ }
+
+ public static final class ULocale.Category extends java.lang.Enum {
+ method public static android.icu.util.ULocale.Category valueOf(java.lang.String);
+ method public static final android.icu.util.ULocale.Category[] values();
+ enum_constant public static final android.icu.util.ULocale.Category DISPLAY;
+ enum_constant public static final android.icu.util.ULocale.Category FORMAT;
+ }
+
+ public abstract interface ValueIterator {
+ method public abstract boolean next(android.icu.util.ValueIterator.Element);
+ method public abstract void reset();
+ method public abstract void setRange(int, int);
+ }
+
+ public static final class ValueIterator.Element {
+ ctor public ValueIterator.Element();
+ field public int integer;
+ field public java.lang.Object value;
+ }
+
+ public final class VersionInfo implements java.lang.Comparable {
+ method public int compareTo(android.icu.util.VersionInfo);
+ method public static android.icu.util.VersionInfo getInstance(java.lang.String);
+ method public static android.icu.util.VersionInfo getInstance(int, int, int, int);
+ method public static android.icu.util.VersionInfo getInstance(int, int, int);
+ method public static android.icu.util.VersionInfo getInstance(int, int);
+ method public static android.icu.util.VersionInfo getInstance(int);
+ method public int getMajor();
+ method public int getMicro();
+ method public int getMilli();
+ method public int getMinor();
+ method public static void main(java.lang.String[]);
+ field public static final android.icu.util.VersionInfo ICU_VERSION;
+ field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION;
+ field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION;
+ field public static final android.icu.util.VersionInfo UNICODE_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_1_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_1_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_1_1_5;
+ field public static final android.icu.util.VersionInfo UNICODE_2_0;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_2;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_5;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_8;
+ field public static final android.icu.util.VersionInfo UNICODE_2_1_9;
+ field public static final android.icu.util.VersionInfo UNICODE_3_0;
+ field public static final android.icu.util.VersionInfo UNICODE_3_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_3_1_0;
+ field public static final android.icu.util.VersionInfo UNICODE_3_1_1;
+ field public static final android.icu.util.VersionInfo UNICODE_3_2;
+ field public static final android.icu.util.VersionInfo UNICODE_4_0;
+ field public static final android.icu.util.VersionInfo UNICODE_4_0_1;
+ field public static final android.icu.util.VersionInfo UNICODE_4_1;
+ field public static final android.icu.util.VersionInfo UNICODE_5_0;
+ field public static final android.icu.util.VersionInfo UNICODE_5_1;
+ field public static final android.icu.util.VersionInfo UNICODE_5_2;
+ field public static final android.icu.util.VersionInfo UNICODE_6_0;
+ field public static final android.icu.util.VersionInfo UNICODE_6_1;
+ field public static final android.icu.util.VersionInfo UNICODE_6_2;
+ field public static final android.icu.util.VersionInfo UNICODE_6_3;
+ field public static final android.icu.util.VersionInfo UNICODE_7_0;
+ field public static final android.icu.util.VersionInfo UNICODE_8_0;
+ }
+
+}
+
+package android.inputmethodservice {
+
+ public abstract class AbstractInputMethodService extends android.app.Service implements android.view.KeyEvent.Callback {
+ ctor public AbstractInputMethodService();
+ method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface();
+ method public abstract android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface();
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public boolean onTrackballEvent(android.view.MotionEvent);
+ }
+
+ public abstract class AbstractInputMethodService.AbstractInputMethodImpl implements android.view.inputmethod.InputMethod {
+ ctor public AbstractInputMethodService.AbstractInputMethodImpl();
+ method public void createSession(android.view.inputmethod.InputMethod.SessionCallback);
+ method public void revokeSession(android.view.inputmethod.InputMethodSession);
+ method public void setSessionEnabled(android.view.inputmethod.InputMethodSession, boolean);
+ }
+
+ public abstract class AbstractInputMethodService.AbstractInputMethodSessionImpl implements android.view.inputmethod.InputMethodSession {
+ ctor public AbstractInputMethodService.AbstractInputMethodSessionImpl();
+ method public void dispatchGenericMotionEvent(int, android.view.MotionEvent, android.view.inputmethod.InputMethodSession.EventCallback);
+ method public void dispatchKeyEvent(int, android.view.KeyEvent, android.view.inputmethod.InputMethodSession.EventCallback);
+ method public void dispatchTrackballEvent(int, android.view.MotionEvent, android.view.inputmethod.InputMethodSession.EventCallback);
+ method public boolean isEnabled();
+ method public boolean isRevoked();
+ method public void revokeSelf();
+ method public void setEnabled(boolean);
+ }
+
+ public class ExtractEditText extends android.widget.EditText {
+ ctor public ExtractEditText(android.content.Context);
+ ctor public ExtractEditText(android.content.Context, android.util.AttributeSet);
+ ctor public ExtractEditText(android.content.Context, android.util.AttributeSet, int);
+ ctor public ExtractEditText(android.content.Context, android.util.AttributeSet, int, int);
+ method public void finishInternalChanges();
+ method public boolean hasVerticalScrollBar();
+ method public void startInternalChanges();
+ }
+
+ public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
+ ctor public InputMethodService();
+ method public deprecated boolean enableHardwareAcceleration();
+ method public int getBackDisposition();
+ method public int getCandidatesHiddenVisibility();
+ method public android.view.inputmethod.InputBinding getCurrentInputBinding();
+ method public android.view.inputmethod.InputConnection getCurrentInputConnection();
+ method public android.view.inputmethod.EditorInfo getCurrentInputEditorInfo();
+ method public boolean getCurrentInputStarted();
+ method public int getInputMethodWindowRecommendedHeight();
+ method public android.view.LayoutInflater getLayoutInflater();
+ method public int getMaxWidth();
+ method public java.lang.CharSequence getTextForImeAction(int);
+ method public android.app.Dialog getWindow();
+ method public void hideStatusIcon();
+ method public void hideWindow();
+ method public boolean isExtractViewShown();
+ method public boolean isFullscreenMode();
+ method public boolean isInputViewShown();
+ method public boolean isShowInputRequested();
+ method public void onAppPrivateCommand(java.lang.String, android.os.Bundle);
+ method public void onBindInput();
+ method public void onComputeInsets(android.inputmethodservice.InputMethodService.Insets);
+ method public void onConfigureWindow(android.view.Window, boolean, boolean);
+ method public android.view.View onCreateCandidatesView();
+ method public android.view.View onCreateExtractTextView();
+ method public android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface();
+ method public android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface();
+ method public android.view.View onCreateInputView();
+ method protected void onCurrentInputMethodSubtypeChanged(android.view.inputmethod.InputMethodSubtype);
+ method public void onDisplayCompletions(android.view.inputmethod.CompletionInfo[]);
+ method public boolean onEvaluateFullscreenMode();
+ method public boolean onEvaluateInputViewShown();
+ method public boolean onExtractTextContextMenuItem(int);
+ method public void onExtractedCursorMovement(int, int);
+ method public void onExtractedSelectionChanged(int, int);
+ method public void onExtractedTextClicked();
+ method public void onExtractingInputChanged(android.view.inputmethod.EditorInfo);
+ method public void onFinishCandidatesView(boolean);
+ method public void onFinishInput();
+ method public void onFinishInputView(boolean);
+ method public void onInitializeInterface();
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method public boolean onShowInputRequested(int, boolean);
+ method public void onStartCandidatesView(android.view.inputmethod.EditorInfo, boolean);
+ method public void onStartInput(android.view.inputmethod.EditorInfo, boolean);
+ method public void onStartInputView(android.view.inputmethod.EditorInfo, boolean);
+ method public void onUnbindInput();
+ method public deprecated void onUpdateCursor(android.graphics.Rect);
+ method public void onUpdateCursorAnchorInfo(android.view.inputmethod.CursorAnchorInfo);
+ method public void onUpdateExtractedText(int, android.view.inputmethod.ExtractedText);
+ method public void onUpdateExtractingViews(android.view.inputmethod.EditorInfo);
+ method public void onUpdateExtractingVisibility(android.view.inputmethod.EditorInfo);
+ method public void onUpdateSelection(int, int, int, int, int, int);
+ method public void onViewClicked(boolean);
+ method public void onWindowHidden();
+ method public void onWindowShown();
+ method public void requestHideSelf(int);
+ method public boolean sendDefaultEditorAction(boolean);
+ method public void sendDownUpKeyEvents(int);
+ method public void sendKeyChar(char);
+ method public void setBackDisposition(int);
+ method public void setCandidatesView(android.view.View);
+ method public void setCandidatesViewShown(boolean);
+ method public void setExtractView(android.view.View);
+ method public void setExtractViewShown(boolean);
+ method public void setInputView(android.view.View);
+ method public void showStatusIcon(int);
+ method public void showWindow(boolean);
+ method public void switchInputMethod(java.lang.String);
+ method public void updateFullscreenMode();
+ method public void updateInputViewShown();
+ field public static final int BACK_DISPOSITION_DEFAULT = 0; // 0x0
+ field public static final int BACK_DISPOSITION_WILL_DISMISS = 2; // 0x2
+ field public static final int BACK_DISPOSITION_WILL_NOT_DISMISS = 1; // 0x1
+ }
+
+ public class InputMethodService.InputMethodImpl extends android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl {
+ ctor public InputMethodService.InputMethodImpl();
+ method public void attachToken(android.os.IBinder);
+ method public void bindInput(android.view.inputmethod.InputBinding);
+ method public void changeInputMethodSubtype(android.view.inputmethod.InputMethodSubtype);
+ method public void hideSoftInput(int, android.os.ResultReceiver);
+ method public void restartInput(android.view.inputmethod.InputConnection, android.view.inputmethod.EditorInfo);
+ method public void showSoftInput(int, android.os.ResultReceiver);
+ method public void startInput(android.view.inputmethod.InputConnection, android.view.inputmethod.EditorInfo);
+ method public void unbindInput();
+ }
+
+ public class InputMethodService.InputMethodSessionImpl extends android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl {
+ ctor public InputMethodService.InputMethodSessionImpl();
+ method public void appPrivateCommand(java.lang.String, android.os.Bundle);
+ method public void displayCompletions(android.view.inputmethod.CompletionInfo[]);
+ method public void finishInput();
+ method public void toggleSoftInput(int, int);
+ method public void updateCursor(android.graphics.Rect);
+ method public void updateCursorAnchorInfo(android.view.inputmethod.CursorAnchorInfo);
+ method public void updateExtractedText(int, android.view.inputmethod.ExtractedText);
+ method public void updateSelection(int, int, int, int, int, int);
+ method public void viewClicked(boolean);
+ }
+
+ public static final class InputMethodService.Insets {
+ ctor public InputMethodService.Insets();
+ field public static final int TOUCHABLE_INSETS_CONTENT = 1; // 0x1
+ field public static final int TOUCHABLE_INSETS_FRAME = 0; // 0x0
+ field public static final int TOUCHABLE_INSETS_REGION = 3; // 0x3
+ field public static final int TOUCHABLE_INSETS_VISIBLE = 2; // 0x2
+ field public int contentTopInsets;
+ field public int touchableInsets;
+ field public final android.graphics.Region touchableRegion;
+ field public int visibleTopInsets;
+ }
+
+ public class Keyboard {
+ ctor public Keyboard(android.content.Context, int);
+ ctor public Keyboard(android.content.Context, int, int, int, int);
+ ctor public Keyboard(android.content.Context, int, int);
+ ctor public Keyboard(android.content.Context, int, java.lang.CharSequence, int, int);
+ method protected android.inputmethodservice.Keyboard.Key createKeyFromXml(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser);
+ method protected android.inputmethodservice.Keyboard.Row createRowFromXml(android.content.res.Resources, android.content.res.XmlResourceParser);
+ method public int getHeight();
+ method protected int getHorizontalGap();
+ method protected int getKeyHeight();
+ method protected int getKeyWidth();
+ method public java.util.List<android.inputmethodservice.Keyboard.Key> getKeys();
+ method public int getMinWidth();
+ method public java.util.List<android.inputmethodservice.Keyboard.Key> getModifierKeys();
+ method public int[] getNearestKeys(int, int);
+ method public int getShiftKeyIndex();
+ method protected int getVerticalGap();
+ method public boolean isShifted();
+ method protected void setHorizontalGap(int);
+ method protected void setKeyHeight(int);
+ method protected void setKeyWidth(int);
+ method public boolean setShifted(boolean);
+ method protected void setVerticalGap(int);
+ field public static final int EDGE_BOTTOM = 8; // 0x8
+ field public static final int EDGE_LEFT = 1; // 0x1
+ field public static final int EDGE_RIGHT = 2; // 0x2
+ field public static final int EDGE_TOP = 4; // 0x4
+ field public static final int KEYCODE_ALT = -6; // 0xfffffffa
+ field public static final int KEYCODE_CANCEL = -3; // 0xfffffffd
+ field public static final int KEYCODE_DELETE = -5; // 0xfffffffb
+ field public static final int KEYCODE_DONE = -4; // 0xfffffffc
+ field public static final int KEYCODE_MODE_CHANGE = -2; // 0xfffffffe
+ field public static final int KEYCODE_SHIFT = -1; // 0xffffffff
+ }
+
+ public static class Keyboard.Key {
+ ctor public Keyboard.Key(android.inputmethodservice.Keyboard.Row);
+ ctor public Keyboard.Key(android.content.res.Resources, android.inputmethodservice.Keyboard.Row, int, int, android.content.res.XmlResourceParser);
+ method public int[] getCurrentDrawableState();
+ method public boolean isInside(int, int);
+ method public void onPressed();
+ method public void onReleased(boolean);
+ method public int squaredDistanceFrom(int, int);
+ field public int[] codes;
+ field public int edgeFlags;
+ field public int gap;
+ field public int height;
+ field public android.graphics.drawable.Drawable icon;
+ field public android.graphics.drawable.Drawable iconPreview;
+ field public java.lang.CharSequence label;
+ field public boolean modifier;
+ field public boolean on;
+ field public java.lang.CharSequence popupCharacters;
+ field public int popupResId;
+ field public boolean pressed;
+ field public boolean repeatable;
+ field public boolean sticky;
+ field public java.lang.CharSequence text;
+ field public int width;
+ field public int x;
+ field public int y;
+ }
+
+ public static class Keyboard.Row {
+ ctor public Keyboard.Row(android.inputmethodservice.Keyboard);
+ ctor public Keyboard.Row(android.content.res.Resources, android.inputmethodservice.Keyboard, android.content.res.XmlResourceParser);
+ field public int defaultHeight;
+ field public int defaultHorizontalGap;
+ field public int defaultWidth;
+ field public int mode;
+ field public int rowEdgeFlags;
+ field public int verticalGap;
+ }
+
+ public class KeyboardView extends android.view.View implements android.view.View.OnClickListener {
+ ctor public KeyboardView(android.content.Context, android.util.AttributeSet);
+ ctor public KeyboardView(android.content.Context, android.util.AttributeSet, int);
+ ctor public KeyboardView(android.content.Context, android.util.AttributeSet, int, int);
+ method public void closing();
+ method public android.inputmethodservice.Keyboard getKeyboard();
+ method protected android.inputmethodservice.KeyboardView.OnKeyboardActionListener getOnKeyboardActionListener();
+ method public boolean handleBack();
+ method public void invalidateAllKeys();
+ method public void invalidateKey(int);
+ method public boolean isPreviewEnabled();
+ method public boolean isProximityCorrectionEnabled();
+ method public boolean isShifted();
+ method public void onClick(android.view.View);
+ method public void onDetachedFromWindow();
+ method public void onDraw(android.graphics.Canvas);
+ method protected boolean onLongPress(android.inputmethodservice.Keyboard.Key);
+ method public void onMeasure(int, int);
+ method public void onSizeChanged(int, int, int, int);
+ method public void setKeyboard(android.inputmethodservice.Keyboard);
+ method public void setOnKeyboardActionListener(android.inputmethodservice.KeyboardView.OnKeyboardActionListener);
+ method public void setPopupOffset(int, int);
+ method public void setPopupParent(android.view.View);
+ method public void setPreviewEnabled(boolean);
+ method public void setProximityCorrectionEnabled(boolean);
+ method public boolean setShifted(boolean);
+ method public void setVerticalCorrection(int);
+ method protected void swipeDown();
+ method protected void swipeLeft();
+ method protected void swipeRight();
+ method protected void swipeUp();
+ }
+
+ public static abstract interface KeyboardView.OnKeyboardActionListener {
+ method public abstract void onKey(int, int[]);
+ method public abstract void onPress(int);
+ method public abstract void onRelease(int);
+ method public abstract void onText(java.lang.CharSequence);
+ method public abstract void swipeDown();
+ method public abstract void swipeLeft();
+ method public abstract void swipeRight();
+ method public abstract void swipeUp();
+ }
+
+}
+
+package android.location {
+
+ public class Address implements android.os.Parcelable {
+ ctor public Address(java.util.Locale);
+ method public void clearLatitude();
+ method public void clearLongitude();
+ method public int describeContents();
+ method public java.lang.String getAddressLine(int);
+ method public java.lang.String getAdminArea();
+ method public java.lang.String getCountryCode();
+ method public java.lang.String getCountryName();
+ method public android.os.Bundle getExtras();
+ method public java.lang.String getFeatureName();
+ method public double getLatitude();
+ method public java.util.Locale getLocale();
+ method public java.lang.String getLocality();
+ method public double getLongitude();
+ method public int getMaxAddressLineIndex();
+ method public java.lang.String getPhone();
+ method public java.lang.String getPostalCode();
+ method public java.lang.String getPremises();
+ method public java.lang.String getSubAdminArea();
+ method public java.lang.String getSubLocality();
+ method public java.lang.String getSubThoroughfare();
+ method public java.lang.String getThoroughfare();
+ method public java.lang.String getUrl();
+ method public boolean hasLatitude();
+ method public boolean hasLongitude();
+ method public void setAddressLine(int, java.lang.String);
+ method public void setAdminArea(java.lang.String);
+ method public void setCountryCode(java.lang.String);
+ method public void setCountryName(java.lang.String);
+ method public void setExtras(android.os.Bundle);
+ method public void setFeatureName(java.lang.String);
+ method public void setLatitude(double);
+ method public void setLocality(java.lang.String);
+ method public void setLongitude(double);
+ method public void setPhone(java.lang.String);
+ method public void setPostalCode(java.lang.String);
+ method public void setPremises(java.lang.String);
+ method public void setSubAdminArea(java.lang.String);
+ method public void setSubLocality(java.lang.String);
+ method public void setSubThoroughfare(java.lang.String);
+ method public void setThoroughfare(java.lang.String);
+ method public void setUrl(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.Address> CREATOR;
+ }
+
+ public class Criteria implements android.os.Parcelable {
+ ctor public Criteria();
+ ctor public Criteria(android.location.Criteria);
+ method public int describeContents();
+ method public int getAccuracy();
+ method public int getBearingAccuracy();
+ method public int getHorizontalAccuracy();
+ method public int getPowerRequirement();
+ method public int getSpeedAccuracy();
+ method public int getVerticalAccuracy();
+ method public boolean isAltitudeRequired();
+ method public boolean isBearingRequired();
+ method public boolean isCostAllowed();
+ method public boolean isSpeedRequired();
+ method public void setAccuracy(int);
+ method public void setAltitudeRequired(boolean);
+ method public void setBearingAccuracy(int);
+ method public void setBearingRequired(boolean);
+ method public void setCostAllowed(boolean);
+ method public void setHorizontalAccuracy(int);
+ method public void setPowerRequirement(int);
+ method public void setSpeedAccuracy(int);
+ method public void setSpeedRequired(boolean);
+ method public void setVerticalAccuracy(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ACCURACY_COARSE = 2; // 0x2
+ field public static final int ACCURACY_FINE = 1; // 0x1
+ field public static final int ACCURACY_HIGH = 3; // 0x3
+ field public static final int ACCURACY_LOW = 1; // 0x1
+ field public static final int ACCURACY_MEDIUM = 2; // 0x2
+ field public static final android.os.Parcelable.Creator<android.location.Criteria> CREATOR;
+ field public static final int NO_REQUIREMENT = 0; // 0x0
+ field public static final int POWER_HIGH = 3; // 0x3
+ field public static final int POWER_LOW = 1; // 0x1
+ field public static final int POWER_MEDIUM = 2; // 0x2
+ }
+
+ public final class Geocoder {
+ ctor public Geocoder(android.content.Context, java.util.Locale);
+ ctor public Geocoder(android.content.Context);
+ method public java.util.List<android.location.Address> getFromLocation(double, double, int) throws java.io.IOException;
+ method public java.util.List<android.location.Address> getFromLocationName(java.lang.String, int) throws java.io.IOException;
+ method public java.util.List<android.location.Address> getFromLocationName(java.lang.String, int, double, double, double, double) throws java.io.IOException;
+ method public static boolean isPresent();
+ }
+
+ public final class GpsSatellite {
+ method public float getAzimuth();
+ method public float getElevation();
+ method public int getPrn();
+ method public float getSnr();
+ method public boolean hasAlmanac();
+ method public boolean hasEphemeris();
+ method public boolean usedInFix();
+ }
+
+ public final class GpsStatus {
+ method public int getMaxSatellites();
+ method public java.lang.Iterable<android.location.GpsSatellite> getSatellites();
+ method public int getTimeToFirstFix();
+ field public static final int GPS_EVENT_FIRST_FIX = 3; // 0x3
+ field public static final int GPS_EVENT_SATELLITE_STATUS = 4; // 0x4
+ field public static final int GPS_EVENT_STARTED = 1; // 0x1
+ field public static final int GPS_EVENT_STOPPED = 2; // 0x2
+ }
+
+ public static abstract interface GpsStatus.Listener {
+ method public abstract void onGpsStatusChanged(int);
+ }
+
+ public static abstract interface GpsStatus.NmeaListener {
+ method public abstract void onNmeaReceived(long, java.lang.String);
+ }
+
+ public class Location implements android.os.Parcelable {
+ ctor public Location(java.lang.String);
+ ctor public Location(android.location.Location);
+ method public float bearingTo(android.location.Location);
+ method public static java.lang.String convert(double, int);
+ method public static double convert(java.lang.String);
+ method public int describeContents();
+ method public static void distanceBetween(double, double, double, double, float[]);
+ method public float distanceTo(android.location.Location);
+ method public void dump(android.util.Printer, java.lang.String);
+ method public float getAccuracy();
+ method public double getAltitude();
+ method public float getBearing();
+ method public long getElapsedRealtimeNanos();
+ method public android.os.Bundle getExtras();
+ method public double getLatitude();
+ method public double getLongitude();
+ method public java.lang.String getProvider();
+ method public float getSpeed();
+ method public long getTime();
+ method public boolean hasAccuracy();
+ method public boolean hasAltitude();
+ method public boolean hasBearing();
+ method public boolean hasSpeed();
+ method public boolean isFromMockProvider();
+ method public void removeAccuracy();
+ method public void removeAltitude();
+ method public void removeBearing();
+ method public void removeSpeed();
+ method public void reset();
+ method public void set(android.location.Location);
+ method public void setAccuracy(float);
+ method public void setAltitude(double);
+ method public void setBearing(float);
+ method public void setElapsedRealtimeNanos(long);
+ method public void setExtras(android.os.Bundle);
+ method public void setLatitude(double);
+ method public void setLongitude(double);
+ method public void setProvider(java.lang.String);
+ method public void setSpeed(float);
+ method public void setTime(long);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.location.Location> CREATOR;
+ field public static final int FORMAT_DEGREES = 0; // 0x0
+ field public static final int FORMAT_MINUTES = 1; // 0x1
+ field public static final int FORMAT_SECONDS = 2; // 0x2
+ }
+
+ public abstract interface LocationListener {
+ method public abstract void onLocationChanged(android.location.Location);
+ method public abstract void onProviderDisabled(java.lang.String);
+ method public abstract void onProviderEnabled(java.lang.String);
+ method public abstract void onStatusChanged(java.lang.String, int, android.os.Bundle);
+ }
+
+ public class LocationManager {
+ method public boolean addGpsStatusListener(android.location.GpsStatus.Listener);
+ method public boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public void addProximityAlert(double, double, float, long, android.app.PendingIntent);
+ method public void addTestProvider(java.lang.String, boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int);
+ method public void clearTestProviderEnabled(java.lang.String);
+ method public void clearTestProviderLocation(java.lang.String);
+ method public void clearTestProviderStatus(java.lang.String);
+ method public java.util.List<java.lang.String> getAllProviders();
+ method public java.lang.String getBestProvider(android.location.Criteria, boolean);
+ method public android.location.GpsStatus getGpsStatus(android.location.GpsStatus);
+ method public android.location.Location getLastKnownLocation(java.lang.String);
+ method public android.location.LocationProvider getProvider(java.lang.String);
+ method public java.util.List<java.lang.String> getProviders(boolean);
+ method public java.util.List<java.lang.String> getProviders(android.location.Criteria, boolean);
+ method public boolean isProviderEnabled(java.lang.String);
+ method public void removeGpsStatusListener(android.location.GpsStatus.Listener);
+ method public void removeNmeaListener(android.location.GpsStatus.NmeaListener);
+ method public void removeProximityAlert(android.app.PendingIntent);
+ method public void removeTestProvider(java.lang.String);
+ method public void removeUpdates(android.location.LocationListener);
+ method public void removeUpdates(android.app.PendingIntent);
+ method public void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener);
+ method public void requestLocationUpdates(java.lang.String, long, float, android.location.LocationListener, android.os.Looper);
+ method public void requestLocationUpdates(long, float, android.location.Criteria, android.location.LocationListener, android.os.Looper);
+ method public void requestLocationUpdates(java.lang.String, long, float, android.app.PendingIntent);
+ method public void requestLocationUpdates(long, float, android.location.Criteria, android.app.PendingIntent);
+ method public void requestSingleUpdate(java.lang.String, android.location.LocationListener, android.os.Looper);
+ method public void requestSingleUpdate(android.location.Criteria, android.location.LocationListener, android.os.Looper);
+ method public void requestSingleUpdate(java.lang.String, android.app.PendingIntent);
+ method public void requestSingleUpdate(android.location.Criteria, android.app.PendingIntent);
+ method public boolean sendExtraCommand(java.lang.String, java.lang.String, android.os.Bundle);
+ method public void setTestProviderEnabled(java.lang.String, boolean);
+ method public void setTestProviderLocation(java.lang.String, android.location.Location);
+ method public void setTestProviderStatus(java.lang.String, int, android.os.Bundle, long);
+ field public static final java.lang.String GPS_PROVIDER = "gps";
+ field public static final java.lang.String KEY_LOCATION_CHANGED = "location";
+ field public static final java.lang.String KEY_PROVIDER_ENABLED = "providerEnabled";
+ field public static final java.lang.String KEY_PROXIMITY_ENTERING = "entering";
+ field public static final java.lang.String KEY_STATUS_CHANGED = "status";
+ field public static final java.lang.String MODE_CHANGED_ACTION = "android.location.MODE_CHANGED";
+ field public static final java.lang.String NETWORK_PROVIDER = "network";
+ field public static final java.lang.String PASSIVE_PROVIDER = "passive";
+ field public static final java.lang.String PROVIDERS_CHANGED_ACTION = "android.location.PROVIDERS_CHANGED";
+ }
+
+ public class LocationProvider {
+ method public int getAccuracy();
+ method public java.lang.String getName();
+ method public int getPowerRequirement();
+ method public boolean hasMonetaryCost();
+ method public boolean meetsCriteria(android.location.Criteria);
+ method public boolean requiresCell();
+ method public boolean requiresNetwork();
+ method public boolean requiresSatellite();
+ method public boolean supportsAltitude();
+ method public boolean supportsBearing();
+ method public boolean supportsSpeed();
+ field public static final int AVAILABLE = 2; // 0x2
+ field public static final int OUT_OF_SERVICE = 0; // 0x0
+ field public static final int TEMPORARILY_UNAVAILABLE = 1; // 0x1
+ }
+
+ public abstract class SettingInjectorService extends android.app.Service {
+ ctor public SettingInjectorService(java.lang.String);
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method protected abstract boolean onGetEnabled();
+ method protected abstract deprecated java.lang.String onGetSummary();
+ method public final void onStart(android.content.Intent, int);
+ method public final int onStartCommand(android.content.Intent, int, int);
+ field public static final java.lang.String ACTION_INJECTED_SETTING_CHANGED = "android.location.InjectedSettingChanged";
+ field public static final java.lang.String ACTION_SERVICE_INTENT = "android.location.SettingInjectorService";
+ field public static final java.lang.String ATTRIBUTES_NAME = "injected-location-setting";
+ field public static final java.lang.String META_DATA_NAME = "android.location.SettingInjectorService";
+ }
+
+}
+
+package android.media {
+
+ public class AsyncPlayer {
+ ctor public AsyncPlayer(java.lang.String);
+ method public deprecated void play(android.content.Context, android.net.Uri, boolean, int);
+ method public void play(android.content.Context, android.net.Uri, boolean, android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+ method public void stop();
+ }
+
+ public final class AudioAttributes implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getContentType();
+ method public int getFlags();
+ method public int getUsage();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
+ field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2
+ field public static final int CONTENT_TYPE_SONIFICATION = 4; // 0x4
+ field public static final int CONTENT_TYPE_SPEECH = 1; // 0x1
+ field public static final int CONTENT_TYPE_UNKNOWN = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.media.AudioAttributes> CREATOR;
+ field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1
+ field public static final int FLAG_HW_AV_SYNC = 16; // 0x10
+ field public static final int USAGE_ALARM = 4; // 0x4
+ field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb
+ field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc
+ field public static final int USAGE_ASSISTANCE_SONIFICATION = 13; // 0xd
+ field public static final int USAGE_GAME = 14; // 0xe
+ field public static final int USAGE_MEDIA = 1; // 0x1
+ field public static final int USAGE_NOTIFICATION = 5; // 0x5
+ field public static final int USAGE_NOTIFICATION_COMMUNICATION_DELAYED = 9; // 0x9
+ field public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = 8; // 0x8
+ field public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = 7; // 0x7
+ field public static final int USAGE_NOTIFICATION_EVENT = 10; // 0xa
+ field public static final int USAGE_NOTIFICATION_RINGTONE = 6; // 0x6
+ field public static final int USAGE_UNKNOWN = 0; // 0x0
+ field public static final int USAGE_VOICE_COMMUNICATION = 2; // 0x2
+ field public static final int USAGE_VOICE_COMMUNICATION_SIGNALLING = 3; // 0x3
+ }
+
+ public static class AudioAttributes.Builder {
+ ctor public AudioAttributes.Builder();
+ ctor public AudioAttributes.Builder(android.media.AudioAttributes);
+ method public android.media.AudioAttributes build();
+ method public android.media.AudioAttributes.Builder setContentType(int);
+ method public android.media.AudioAttributes.Builder setFlags(int);
+ method public android.media.AudioAttributes.Builder setLegacyStreamType(int);
+ method public android.media.AudioAttributes.Builder setUsage(int);
+ }
+
+ public abstract class AudioDeviceCallback {
+ ctor public AudioDeviceCallback();
+ method public void onAudioDevicesAdded(android.media.AudioDeviceInfo[]);
+ method public void onAudioDevicesRemoved(android.media.AudioDeviceInfo[]);
+ }
+
+ public final class AudioDeviceInfo {
+ method public int[] getChannelCounts();
+ method public int[] getChannelIndexMasks();
+ method public int[] getChannelMasks();
+ method public int[] getEncodings();
+ method public int getId();
+ method public java.lang.CharSequence getProductName();
+ method public int[] getSampleRates();
+ method public int getType();
+ method public boolean isSink();
+ method public boolean isSource();
+ field public static final int TYPE_AUX_LINE = 19; // 0x13
+ field public static final int TYPE_BLUETOOTH_A2DP = 8; // 0x8
+ field public static final int TYPE_BLUETOOTH_SCO = 7; // 0x7
+ field public static final int TYPE_BUILTIN_EARPIECE = 1; // 0x1
+ field public static final int TYPE_BUILTIN_MIC = 15; // 0xf
+ field public static final int TYPE_BUILTIN_SPEAKER = 2; // 0x2
+ field public static final int TYPE_DOCK = 13; // 0xd
+ field public static final int TYPE_FM = 14; // 0xe
+ field public static final int TYPE_FM_TUNER = 16; // 0x10
+ field public static final int TYPE_HDMI = 9; // 0x9
+ field public static final int TYPE_HDMI_ARC = 10; // 0xa
+ field public static final int TYPE_IP = 20; // 0x14
+ field public static final int TYPE_LINE_ANALOG = 5; // 0x5
+ field public static final int TYPE_LINE_DIGITAL = 6; // 0x6
+ field public static final int TYPE_TELEPHONY = 18; // 0x12
+ field public static final int TYPE_TV_TUNER = 17; // 0x11
+ field public static final int TYPE_UNKNOWN = 0; // 0x0
+ field public static final int TYPE_USB_ACCESSORY = 12; // 0xc
+ field public static final int TYPE_USB_DEVICE = 11; // 0xb
+ field public static final int TYPE_WIRED_HEADPHONES = 4; // 0x4
+ field public static final int TYPE_WIRED_HEADSET = 3; // 0x3
+ }
+
+ public class AudioFormat {
+ method public int getChannelCount();
+ method public int getChannelIndexMask();
+ method public int getChannelMask();
+ method public int getEncoding();
+ method public int getSampleRate();
+ field public static final deprecated int CHANNEL_CONFIGURATION_DEFAULT = 1; // 0x1
+ field public static final deprecated int CHANNEL_CONFIGURATION_INVALID = 0; // 0x0
+ field public static final deprecated int CHANNEL_CONFIGURATION_MONO = 2; // 0x2
+ field public static final deprecated int CHANNEL_CONFIGURATION_STEREO = 3; // 0x3
+ field public static final int CHANNEL_INVALID = 0; // 0x0
+ field public static final int CHANNEL_IN_BACK = 32; // 0x20
+ field public static final int CHANNEL_IN_BACK_PROCESSED = 512; // 0x200
+ field public static final int CHANNEL_IN_DEFAULT = 1; // 0x1
+ field public static final int CHANNEL_IN_FRONT = 16; // 0x10
+ field public static final int CHANNEL_IN_FRONT_PROCESSED = 256; // 0x100
+ field public static final int CHANNEL_IN_LEFT = 4; // 0x4
+ field public static final int CHANNEL_IN_LEFT_PROCESSED = 64; // 0x40
+ field public static final int CHANNEL_IN_MONO = 16; // 0x10
+ field public static final int CHANNEL_IN_PRESSURE = 1024; // 0x400
+ field public static final int CHANNEL_IN_RIGHT = 8; // 0x8
+ field public static final int CHANNEL_IN_RIGHT_PROCESSED = 128; // 0x80
+ field public static final int CHANNEL_IN_STEREO = 12; // 0xc
+ field public static final int CHANNEL_IN_VOICE_DNLINK = 32768; // 0x8000
+ field public static final int CHANNEL_IN_VOICE_UPLINK = 16384; // 0x4000
+ field public static final int CHANNEL_IN_X_AXIS = 2048; // 0x800
+ field public static final int CHANNEL_IN_Y_AXIS = 4096; // 0x1000
+ field public static final int CHANNEL_IN_Z_AXIS = 8192; // 0x2000
+ field public static final int CHANNEL_OUT_5POINT1 = 252; // 0xfc
+ field public static final deprecated int CHANNEL_OUT_7POINT1 = 1020; // 0x3fc
+ field public static final int CHANNEL_OUT_7POINT1_SURROUND = 6396; // 0x18fc
+ field public static final int CHANNEL_OUT_BACK_CENTER = 1024; // 0x400
+ field public static final int CHANNEL_OUT_BACK_LEFT = 64; // 0x40
+ field public static final int CHANNEL_OUT_BACK_RIGHT = 128; // 0x80
+ field public static final int CHANNEL_OUT_DEFAULT = 1; // 0x1
+ field public static final int CHANNEL_OUT_FRONT_CENTER = 16; // 0x10
+ field public static final int CHANNEL_OUT_FRONT_LEFT = 4; // 0x4
+ field public static final int CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 256; // 0x100
+ field public static final int CHANNEL_OUT_FRONT_RIGHT = 8; // 0x8
+ field public static final int CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 512; // 0x200
+ field public static final int CHANNEL_OUT_LOW_FREQUENCY = 32; // 0x20
+ field public static final int CHANNEL_OUT_MONO = 4; // 0x4
+ field public static final int CHANNEL_OUT_QUAD = 204; // 0xcc
+ field public static final int CHANNEL_OUT_SIDE_LEFT = 2048; // 0x800
+ field public static final int CHANNEL_OUT_SIDE_RIGHT = 4096; // 0x1000
+ field public static final int CHANNEL_OUT_STEREO = 12; // 0xc
+ field public static final int CHANNEL_OUT_SURROUND = 1052; // 0x41c
+ field public static final int ENCODING_AC3 = 5; // 0x5
+ field public static final int ENCODING_DEFAULT = 1; // 0x1
+ field public static final int ENCODING_DTS = 7; // 0x7
+ field public static final int ENCODING_DTS_HD = 8; // 0x8
+ field public static final int ENCODING_E_AC3 = 6; // 0x6
+ field public static final int ENCODING_INVALID = 0; // 0x0
+ field public static final int ENCODING_PCM_16BIT = 2; // 0x2
+ field public static final int ENCODING_PCM_8BIT = 3; // 0x3
+ field public static final int ENCODING_PCM_FLOAT = 4; // 0x4
+ }
+
+ public static class AudioFormat.Builder {
+ ctor public AudioFormat.Builder();
+ ctor public AudioFormat.Builder(android.media.AudioFormat);
+ method public android.media.AudioFormat build();
+ method public android.media.AudioFormat.Builder setChannelIndexMask(int);
+ method public android.media.AudioFormat.Builder setChannelMask(int);
+ method public android.media.AudioFormat.Builder setEncoding(int) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioFormat.Builder setSampleRate(int) throws java.lang.IllegalArgumentException;
+ }
+
+ public class AudioManager {
+ method public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);
+ method public void adjustStreamVolume(int, int, int);
+ method public void adjustSuggestedStreamVolume(int, int, int);
+ method public void adjustVolume(int, int);
+ method public void dispatchMediaKeyEvent(android.view.KeyEvent);
+ method public int generateAudioSessionId();
+ method public android.media.AudioDeviceInfo[] getDevices(int);
+ method public int getMode();
+ method public java.lang.String getParameters(java.lang.String);
+ method public java.lang.String getProperty(java.lang.String);
+ method public int getRingerMode();
+ method public deprecated int getRouting(int);
+ method public int getStreamMaxVolume(int);
+ method public int getStreamVolume(int);
+ method public deprecated int getVibrateSetting(int);
+ method public boolean isBluetoothA2dpOn();
+ method public boolean isBluetoothScoAvailableOffCall();
+ method public boolean isBluetoothScoOn();
+ method public boolean isMicrophoneMute();
+ method public boolean isMusicActive();
+ method public boolean isSpeakerphoneOn();
+ method public boolean isStreamMute(int);
+ method public boolean isVolumeFixed();
+ method public deprecated boolean isWiredHeadsetOn();
+ method public void loadSoundEffects();
+ method public void playSoundEffect(int);
+ method public void playSoundEffect(int, float);
+ method public void registerAudioDeviceCallback(android.media.AudioDeviceCallback, android.os.Handler);
+ method public deprecated void registerMediaButtonEventReceiver(android.content.ComponentName);
+ method public deprecated void registerMediaButtonEventReceiver(android.app.PendingIntent);
+ method public deprecated void registerRemoteControlClient(android.media.RemoteControlClient);
+ method public deprecated boolean registerRemoteController(android.media.RemoteController);
+ method public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);
+ method public deprecated void setBluetoothA2dpOn(boolean);
+ method public void setBluetoothScoOn(boolean);
+ method public void setMicrophoneMute(boolean);
+ method public void setMode(int);
+ method public void setParameters(java.lang.String);
+ method public void setRingerMode(int);
+ method public deprecated void setRouting(int, int, int);
+ method public void setSpeakerphoneOn(boolean);
+ method public deprecated void setStreamMute(int, boolean);
+ method public deprecated void setStreamSolo(int, boolean);
+ method public void setStreamVolume(int, int, int);
+ method public deprecated void setVibrateSetting(int, int);
+ method public deprecated void setWiredHeadsetOn(boolean);
+ method public deprecated boolean shouldVibrate(int);
+ method public void startBluetoothSco();
+ method public void stopBluetoothSco();
+ method public void unloadSoundEffects();
+ method public void unregisterAudioDeviceCallback(android.media.AudioDeviceCallback);
+ method public deprecated void unregisterMediaButtonEventReceiver(android.content.ComponentName);
+ method public deprecated void unregisterMediaButtonEventReceiver(android.app.PendingIntent);
+ method public deprecated void unregisterRemoteControlClient(android.media.RemoteControlClient);
+ method public deprecated void unregisterRemoteController(android.media.RemoteController);
+ field public static final java.lang.String ACTION_AUDIO_BECOMING_NOISY = "android.media.AUDIO_BECOMING_NOISY";
+ field public static final java.lang.String ACTION_HDMI_AUDIO_PLUG = "android.media.action.HDMI_AUDIO_PLUG";
+ field public static final java.lang.String ACTION_HEADSET_PLUG = "android.intent.action.HEADSET_PLUG";
+ field public static final deprecated java.lang.String ACTION_SCO_AUDIO_STATE_CHANGED = "android.media.SCO_AUDIO_STATE_CHANGED";
+ field public static final java.lang.String ACTION_SCO_AUDIO_STATE_UPDATED = "android.media.ACTION_SCO_AUDIO_STATE_UPDATED";
+ field public static final int ADJUST_LOWER = -1; // 0xffffffff
+ field public static final int ADJUST_MUTE = -100; // 0xffffff9c
+ field public static final int ADJUST_RAISE = 1; // 0x1
+ field public static final int ADJUST_SAME = 0; // 0x0
+ field public static final int ADJUST_TOGGLE_MUTE = 101; // 0x65
+ field public static final int ADJUST_UNMUTE = 100; // 0x64
+ field public static final int AUDIOFOCUS_GAIN = 1; // 0x1
+ field public static final int AUDIOFOCUS_GAIN_TRANSIENT = 2; // 0x2
+ field public static final int AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE = 4; // 0x4
+ field public static final int AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK = 3; // 0x3
+ field public static final int AUDIOFOCUS_LOSS = -1; // 0xffffffff
+ field public static final int AUDIOFOCUS_LOSS_TRANSIENT = -2; // 0xfffffffe
+ field public static final int AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK = -3; // 0xfffffffd
+ field public static final int AUDIOFOCUS_REQUEST_FAILED = 0; // 0x0
+ field public static final int AUDIOFOCUS_REQUEST_GRANTED = 1; // 0x1
+ field public static final int AUDIO_SESSION_ID_GENERATE = 0; // 0x0
+ field public static final int ERROR = -1; // 0xffffffff
+ field public static final int ERROR_DEAD_OBJECT = -6; // 0xfffffffa
+ field public static final java.lang.String EXTRA_AUDIO_PLUG_STATE = "android.media.extra.AUDIO_PLUG_STATE";
+ field public static final java.lang.String EXTRA_ENCODINGS = "android.media.extra.ENCODINGS";
+ field public static final java.lang.String EXTRA_MAX_CHANNEL_COUNT = "android.media.extra.MAX_CHANNEL_COUNT";
+ field public static final java.lang.String EXTRA_RINGER_MODE = "android.media.EXTRA_RINGER_MODE";
+ field public static final java.lang.String EXTRA_SCO_AUDIO_PREVIOUS_STATE = "android.media.extra.SCO_AUDIO_PREVIOUS_STATE";
+ field public static final java.lang.String EXTRA_SCO_AUDIO_STATE = "android.media.extra.SCO_AUDIO_STATE";
+ field public static final deprecated java.lang.String EXTRA_VIBRATE_SETTING = "android.media.EXTRA_VIBRATE_SETTING";
+ field public static final deprecated java.lang.String EXTRA_VIBRATE_TYPE = "android.media.EXTRA_VIBRATE_TYPE";
+ field public static final int FLAG_ALLOW_RINGER_MODES = 2; // 0x2
+ field public static final int FLAG_PLAY_SOUND = 4; // 0x4
+ field public static final int FLAG_REMOVE_SOUND_AND_VIBRATE = 8; // 0x8
+ field public static final int FLAG_SHOW_UI = 1; // 0x1
+ field public static final int FLAG_VIBRATE = 16; // 0x10
+ field public static final int FX_FOCUS_NAVIGATION_DOWN = 2; // 0x2
+ field public static final int FX_FOCUS_NAVIGATION_LEFT = 3; // 0x3
+ field public static final int FX_FOCUS_NAVIGATION_RIGHT = 4; // 0x4
+ field public static final int FX_FOCUS_NAVIGATION_UP = 1; // 0x1
+ field public static final int FX_KEYPRESS_DELETE = 7; // 0x7
+ field public static final int FX_KEYPRESS_INVALID = 9; // 0x9
+ field public static final int FX_KEYPRESS_RETURN = 8; // 0x8
+ field public static final int FX_KEYPRESS_SPACEBAR = 6; // 0x6
+ field public static final int FX_KEYPRESS_STANDARD = 5; // 0x5
+ field public static final int FX_KEY_CLICK = 0; // 0x0
+ field public static final int GET_DEVICES_ALL = 3; // 0x3
+ field public static final int GET_DEVICES_INPUTS = 1; // 0x1
+ field public static final int GET_DEVICES_OUTPUTS = 2; // 0x2
+ field public static final int MODE_CURRENT = -1; // 0xffffffff
+ field public static final int MODE_INVALID = -2; // 0xfffffffe
+ field public static final int MODE_IN_CALL = 2; // 0x2
+ field public static final int MODE_IN_COMMUNICATION = 3; // 0x3
+ field public static final int MODE_NORMAL = 0; // 0x0
+ field public static final int MODE_RINGTONE = 1; // 0x1
+ field public static final deprecated int NUM_STREAMS = 5; // 0x5
+ field public static final java.lang.String PROPERTY_OUTPUT_FRAMES_PER_BUFFER = "android.media.property.OUTPUT_FRAMES_PER_BUFFER";
+ field public static final java.lang.String PROPERTY_OUTPUT_SAMPLE_RATE = "android.media.property.OUTPUT_SAMPLE_RATE";
+ field public static final java.lang.String PROPERTY_SUPPORT_MIC_NEAR_ULTRASOUND = "android.media.property.SUPPORT_MIC_NEAR_ULTRASOUND";
+ field public static final java.lang.String PROPERTY_SUPPORT_SPEAKER_NEAR_ULTRASOUND = "android.media.property.SUPPORT_SPEAKER_NEAR_ULTRASOUND";
+ field public static final java.lang.String RINGER_MODE_CHANGED_ACTION = "android.media.RINGER_MODE_CHANGED";
+ field public static final int RINGER_MODE_NORMAL = 2; // 0x2
+ field public static final int RINGER_MODE_SILENT = 0; // 0x0
+ field public static final int RINGER_MODE_VIBRATE = 1; // 0x1
+ field public static final deprecated int ROUTE_ALL = -1; // 0xffffffff
+ field public static final deprecated int ROUTE_BLUETOOTH = 4; // 0x4
+ field public static final deprecated int ROUTE_BLUETOOTH_A2DP = 16; // 0x10
+ field public static final deprecated int ROUTE_BLUETOOTH_SCO = 4; // 0x4
+ field public static final deprecated int ROUTE_EARPIECE = 1; // 0x1
+ field public static final deprecated int ROUTE_HEADSET = 8; // 0x8
+ field public static final deprecated int ROUTE_SPEAKER = 2; // 0x2
+ field public static final int SCO_AUDIO_STATE_CONNECTED = 1; // 0x1
+ field public static final int SCO_AUDIO_STATE_CONNECTING = 2; // 0x2
+ field public static final int SCO_AUDIO_STATE_DISCONNECTED = 0; // 0x0
+ field public static final int SCO_AUDIO_STATE_ERROR = -1; // 0xffffffff
+ field public static final int STREAM_ALARM = 4; // 0x4
+ field public static final int STREAM_DTMF = 8; // 0x8
+ field public static final int STREAM_MUSIC = 3; // 0x3
+ field public static final int STREAM_NOTIFICATION = 5; // 0x5
+ field public static final int STREAM_RING = 2; // 0x2
+ field public static final int STREAM_SYSTEM = 1; // 0x1
+ field public static final int STREAM_VOICE_CALL = 0; // 0x0
+ field public static final int USE_DEFAULT_STREAM_TYPE = -2147483648; // 0x80000000
+ field public static final deprecated java.lang.String VIBRATE_SETTING_CHANGED_ACTION = "android.media.VIBRATE_SETTING_CHANGED";
+ field public static final deprecated int VIBRATE_SETTING_OFF = 0; // 0x0
+ field public static final deprecated int VIBRATE_SETTING_ON = 1; // 0x1
+ field public static final deprecated int VIBRATE_SETTING_ONLY_SILENT = 2; // 0x2
+ field public static final deprecated int VIBRATE_TYPE_NOTIFICATION = 1; // 0x1
+ field public static final deprecated int VIBRATE_TYPE_RINGER = 0; // 0x0
+ }
+
+ public static abstract interface AudioManager.OnAudioFocusChangeListener {
+ method public abstract void onAudioFocusChange(int);
+ }
+
+ public class AudioRecord {
+ ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;
+ method public void addOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener, android.os.Handler);
+ method public int getAudioFormat();
+ method public int getAudioSessionId();
+ method public int getAudioSource();
+ method public int getBufferSizeInFrames();
+ method public int getChannelConfiguration();
+ method public int getChannelCount();
+ method public android.media.AudioFormat getFormat();
+ method public static int getMinBufferSize(int, int, int);
+ method public int getNotificationMarkerPosition();
+ method public int getPositionNotificationPeriod();
+ method public android.media.AudioDeviceInfo getPreferredDevice();
+ method public int getRecordingState();
+ method public android.media.AudioDeviceInfo getRoutedDevice();
+ method public int getSampleRate();
+ method public int getState();
+ method public int read(byte[], int, int);
+ method public int read(byte[], int, int, int);
+ method public int read(short[], int, int);
+ method public int read(short[], int, int, int);
+ method public int read(float[], int, int, int);
+ method public int read(java.nio.ByteBuffer, int);
+ method public int read(java.nio.ByteBuffer, int, int);
+ method public void release();
+ method public void removeOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener);
+ method public int setNotificationMarkerPosition(int);
+ method public int setPositionNotificationPeriod(int);
+ method public boolean setPreferredDevice(android.media.AudioDeviceInfo);
+ method public void setRecordPositionUpdateListener(android.media.AudioRecord.OnRecordPositionUpdateListener);
+ method public void setRecordPositionUpdateListener(android.media.AudioRecord.OnRecordPositionUpdateListener, android.os.Handler);
+ method public void startRecording() throws java.lang.IllegalStateException;
+ method public void startRecording(android.media.MediaSyncEvent) throws java.lang.IllegalStateException;
+ method public void stop() throws java.lang.IllegalStateException;
+ field public static final int ERROR = -1; // 0xffffffff
+ field public static final int ERROR_BAD_VALUE = -2; // 0xfffffffe
+ field public static final int ERROR_INVALID_OPERATION = -3; // 0xfffffffd
+ field public static final int READ_BLOCKING = 0; // 0x0
+ field public static final int READ_NON_BLOCKING = 1; // 0x1
+ field public static final int RECORDSTATE_RECORDING = 3; // 0x3
+ field public static final int RECORDSTATE_STOPPED = 1; // 0x1
+ field public static final int STATE_INITIALIZED = 1; // 0x1
+ field public static final int STATE_UNINITIALIZED = 0; // 0x0
+ field public static final int SUCCESS = 0; // 0x0
+ }
+
+ public static class AudioRecord.Builder {
+ ctor public AudioRecord.Builder();
+ method public android.media.AudioRecord build() throws java.lang.UnsupportedOperationException;
+ method public android.media.AudioRecord.Builder setAudioFormat(android.media.AudioFormat) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioRecord.Builder setAudioSource(int) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioRecord.Builder setBufferSizeInBytes(int) throws java.lang.IllegalArgumentException;
+ }
+
+ public static abstract interface AudioRecord.OnRecordPositionUpdateListener {
+ method public abstract void onMarkerReached(android.media.AudioRecord);
+ method public abstract void onPeriodicNotification(android.media.AudioRecord);
+ }
+
+ public static abstract interface AudioRecord.OnRoutingChangedListener {
+ method public abstract void onRoutingChanged(android.media.AudioRecord);
+ }
+
+ public final class AudioTimestamp {
+ ctor public AudioTimestamp();
+ field public long framePosition;
+ field public long nanoTime;
+ }
+
+ public class AudioTrack {
+ ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
+ ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
+ ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;
+ method public void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);
+ method public int attachAuxEffect(int);
+ method public void flush();
+ method public int getAudioFormat();
+ method public int getAudioSessionId();
+ method public int getBufferSizeInFrames();
+ method public int getChannelConfiguration();
+ method public int getChannelCount();
+ method public android.media.AudioFormat getFormat();
+ method public static float getMaxVolume();
+ method public static int getMinBufferSize(int, int, int);
+ method public static float getMinVolume();
+ method protected deprecated int getNativeFrameCount();
+ method public static int getNativeOutputSampleRate(int);
+ method public int getNotificationMarkerPosition();
+ method public int getPlayState();
+ method public int getPlaybackHeadPosition();
+ method public android.media.PlaybackParams getPlaybackParams();
+ method public int getPlaybackRate();
+ method public int getPositionNotificationPeriod();
+ method public android.media.AudioDeviceInfo getPreferredDevice();
+ method public android.media.AudioDeviceInfo getRoutedDevice();
+ method public int getSampleRate();
+ method public int getState();
+ method public int getStreamType();
+ method public boolean getTimestamp(android.media.AudioTimestamp);
+ method public void pause() throws java.lang.IllegalStateException;
+ method public void play() throws java.lang.IllegalStateException;
+ method public void release();
+ method public int reloadStaticData();
+ method public void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);
+ method public int setAuxEffectSendLevel(float);
+ method public int setLoopPoints(int, int, int);
+ method public int setNotificationMarkerPosition(int);
+ method public int setPlaybackHeadPosition(int);
+ method public void setPlaybackParams(android.media.PlaybackParams);
+ method public void setPlaybackPositionUpdateListener(android.media.AudioTrack.OnPlaybackPositionUpdateListener);
+ method public void setPlaybackPositionUpdateListener(android.media.AudioTrack.OnPlaybackPositionUpdateListener, android.os.Handler);
+ method public int setPlaybackRate(int);
+ method public int setPositionNotificationPeriod(int);
+ method public boolean setPreferredDevice(android.media.AudioDeviceInfo);
+ method protected deprecated void setState(int);
+ method public deprecated int setStereoVolume(float, float);
+ method public int setVolume(float);
+ method public void stop() throws java.lang.IllegalStateException;
+ method public int write(byte[], int, int);
+ method public int write(byte[], int, int, int);
+ method public int write(short[], int, int);
+ method public int write(short[], int, int, int);
+ method public int write(float[], int, int, int);
+ method public int write(java.nio.ByteBuffer, int, int);
+ method public int write(java.nio.ByteBuffer, int, int, long);
+ field public static final int ERROR = -1; // 0xffffffff
+ field public static final int ERROR_BAD_VALUE = -2; // 0xfffffffe
+ field public static final int ERROR_INVALID_OPERATION = -3; // 0xfffffffd
+ field public static final int MODE_STATIC = 0; // 0x0
+ field public static final int MODE_STREAM = 1; // 0x1
+ field public static final int PLAYSTATE_PAUSED = 2; // 0x2
+ field public static final int PLAYSTATE_PLAYING = 3; // 0x3
+ field public static final int PLAYSTATE_STOPPED = 1; // 0x1
+ field public static final int STATE_INITIALIZED = 1; // 0x1
+ field public static final int STATE_NO_STATIC_DATA = 2; // 0x2
+ field public static final int STATE_UNINITIALIZED = 0; // 0x0
+ field public static final int SUCCESS = 0; // 0x0
+ field public static final int WRITE_BLOCKING = 0; // 0x0
+ field public static final int WRITE_NON_BLOCKING = 1; // 0x1
+ }
+
+ public static class AudioTrack.Builder {
+ ctor public AudioTrack.Builder();
+ method public android.media.AudioTrack build() throws java.lang.UnsupportedOperationException;
+ method public android.media.AudioTrack.Builder setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioTrack.Builder setAudioFormat(android.media.AudioFormat) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioTrack.Builder setBufferSizeInBytes(int) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioTrack.Builder setSessionId(int) throws java.lang.IllegalArgumentException;
+ method public android.media.AudioTrack.Builder setTransferMode(int) throws java.lang.IllegalArgumentException;
+ }
+
+ public static abstract interface AudioTrack.OnPlaybackPositionUpdateListener {
+ method public abstract void onMarkerReached(android.media.AudioTrack);
+ method public abstract void onPeriodicNotification(android.media.AudioTrack);
+ }
+
+ public static abstract interface AudioTrack.OnRoutingChangedListener {
+ method public abstract void onRoutingChanged(android.media.AudioTrack);
+ }
+
+ public class CamcorderProfile {
+ method public static android.media.CamcorderProfile get(int);
+ method public static android.media.CamcorderProfile get(int, int);
+ method public static boolean hasProfile(int);
+ method public static boolean hasProfile(int, int);
+ field public static final int QUALITY_1080P = 6; // 0x6
+ field public static final int QUALITY_2160P = 8; // 0x8
+ field public static final int QUALITY_480P = 4; // 0x4
+ field public static final int QUALITY_720P = 5; // 0x5
+ field public static final int QUALITY_CIF = 3; // 0x3
+ field public static final int QUALITY_HIGH = 1; // 0x1
+ field public static final int QUALITY_HIGH_SPEED_1080P = 2004; // 0x7d4
+ field public static final int QUALITY_HIGH_SPEED_2160P = 2005; // 0x7d5
+ field public static final int QUALITY_HIGH_SPEED_480P = 2002; // 0x7d2
+ field public static final int QUALITY_HIGH_SPEED_720P = 2003; // 0x7d3
+ field public static final int QUALITY_HIGH_SPEED_HIGH = 2001; // 0x7d1
+ field public static final int QUALITY_HIGH_SPEED_LOW = 2000; // 0x7d0
+ field public static final int QUALITY_LOW = 0; // 0x0
+ field public static final int QUALITY_QCIF = 2; // 0x2
+ field public static final int QUALITY_QVGA = 7; // 0x7
+ field public static final int QUALITY_TIME_LAPSE_1080P = 1006; // 0x3ee
+ field public static final int QUALITY_TIME_LAPSE_2160P = 1008; // 0x3f0
+ field public static final int QUALITY_TIME_LAPSE_480P = 1004; // 0x3ec
+ field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed
+ field public static final int QUALITY_TIME_LAPSE_CIF = 1003; // 0x3eb
+ field public static final int QUALITY_TIME_LAPSE_HIGH = 1001; // 0x3e9
+ field public static final int QUALITY_TIME_LAPSE_LOW = 1000; // 0x3e8
+ field public static final int QUALITY_TIME_LAPSE_QCIF = 1002; // 0x3ea
+ field public static final int QUALITY_TIME_LAPSE_QVGA = 1007; // 0x3ef
+ field public int audioBitRate;
+ field public int audioChannels;
+ field public int audioCodec;
+ field public int audioSampleRate;
+ field public int duration;
+ field public int fileFormat;
+ field public int quality;
+ field public int videoBitRate;
+ field public int videoCodec;
+ field public int videoFrameHeight;
+ field public int videoFrameRate;
+ field public int videoFrameWidth;
+ }
+
+ public class CameraProfile {
+ ctor public CameraProfile();
+ method public static int getJpegEncodingQualityParameter(int);
+ method public static int getJpegEncodingQualityParameter(int, int);
+ field public static final int QUALITY_HIGH = 2; // 0x2
+ field public static final int QUALITY_LOW = 0; // 0x0
+ field public static final int QUALITY_MEDIUM = 1; // 0x1
+ }
+
+ public final class DeniedByServerException extends android.media.MediaDrmException {
+ ctor public DeniedByServerException(java.lang.String);
+ }
+
+ public class ExifInterface {
+ ctor public ExifInterface(java.lang.String) throws java.io.IOException;
+ method public double getAltitude(double);
+ method public java.lang.String getAttribute(java.lang.String);
+ method public double getAttributeDouble(java.lang.String, double);
+ method public int getAttributeInt(java.lang.String, int);
+ method public boolean getLatLong(float[]);
+ method public byte[] getThumbnail();
+ method public boolean hasThumbnail();
+ method public void saveAttributes() throws java.io.IOException;
+ method public void setAttribute(java.lang.String, java.lang.String);
+ field public static final int ORIENTATION_FLIP_HORIZONTAL = 2; // 0x2
+ field public static final int ORIENTATION_FLIP_VERTICAL = 4; // 0x4
+ field public static final int ORIENTATION_NORMAL = 1; // 0x1
+ field public static final int ORIENTATION_ROTATE_180 = 3; // 0x3
+ field public static final int ORIENTATION_ROTATE_270 = 8; // 0x8
+ field public static final int ORIENTATION_ROTATE_90 = 6; // 0x6
+ field public static final int ORIENTATION_TRANSPOSE = 5; // 0x5
+ field public static final int ORIENTATION_TRANSVERSE = 7; // 0x7
+ field public static final int ORIENTATION_UNDEFINED = 0; // 0x0
+ field public static final java.lang.String TAG_APERTURE = "FNumber";
+ field public static final java.lang.String TAG_DATETIME = "DateTime";
+ field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
+ field public static final java.lang.String TAG_EXPOSURE_TIME = "ExposureTime";
+ field public static final java.lang.String TAG_FLASH = "Flash";
+ field public static final java.lang.String TAG_FOCAL_LENGTH = "FocalLength";
+ field public static final java.lang.String TAG_GPS_ALTITUDE = "GPSAltitude";
+ field public static final java.lang.String TAG_GPS_ALTITUDE_REF = "GPSAltitudeRef";
+ field public static final java.lang.String TAG_GPS_DATESTAMP = "GPSDateStamp";
+ field public static final java.lang.String TAG_GPS_LATITUDE = "GPSLatitude";
+ field public static final java.lang.String TAG_GPS_LATITUDE_REF = "GPSLatitudeRef";
+ field public static final java.lang.String TAG_GPS_LONGITUDE = "GPSLongitude";
+ field public static final java.lang.String TAG_GPS_LONGITUDE_REF = "GPSLongitudeRef";
+ field public static final java.lang.String TAG_GPS_PROCESSING_METHOD = "GPSProcessingMethod";
+ field public static final java.lang.String TAG_GPS_TIMESTAMP = "GPSTimeStamp";
+ field public static final java.lang.String TAG_IMAGE_LENGTH = "ImageLength";
+ field public static final java.lang.String TAG_IMAGE_WIDTH = "ImageWidth";
+ field public static final java.lang.String TAG_ISO = "ISOSpeedRatings";
+ field public static final java.lang.String TAG_MAKE = "Make";
+ field public static final java.lang.String TAG_MODEL = "Model";
+ field public static final java.lang.String TAG_ORIENTATION = "Orientation";
+ field public static final java.lang.String TAG_SUBSEC_TIME = "SubSecTime";
+ field public static final java.lang.String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";
+ field public static final java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";
+ field public static final java.lang.String TAG_WHITE_BALANCE = "WhiteBalance";
+ field public static final int WHITEBALANCE_AUTO = 0; // 0x0
+ field public static final int WHITEBALANCE_MANUAL = 1; // 0x1
+ }
+
+ public class FaceDetector {
+ ctor public FaceDetector(int, int, int);
+ method public int findFaces(android.graphics.Bitmap, android.media.FaceDetector.Face[]);
+ }
+
+ public class FaceDetector.Face {
+ method public float confidence();
+ method public float eyesDistance();
+ method public void getMidPoint(android.graphics.PointF);
+ method public float pose(int);
+ field public static final float CONFIDENCE_THRESHOLD = 0.4f;
+ field public static final int EULER_X = 0; // 0x0
+ field public static final int EULER_Y = 1; // 0x1
+ field public static final int EULER_Z = 2; // 0x2
+ }
+
+ public abstract class Image implements java.lang.AutoCloseable {
+ method public abstract void close();
+ method public android.graphics.Rect getCropRect();
+ method public abstract int getFormat();
+ method public abstract int getHeight();
+ method public abstract android.media.Image.Plane[] getPlanes();
+ method public abstract long getTimestamp();
+ method public abstract int getWidth();
+ method public void setCropRect(android.graphics.Rect);
+ method public void setTimestamp(long);
+ }
+
+ public static abstract class Image.Plane {
+ method public abstract java.nio.ByteBuffer getBuffer();
+ method public abstract int getPixelStride();
+ method public abstract int getRowStride();
+ }
+
+ public class ImageReader implements java.lang.AutoCloseable {
+ method public android.media.Image acquireLatestImage();
+ method public android.media.Image acquireNextImage();
+ method public void close();
+ method public int getHeight();
+ method public int getImageFormat();
+ method public int getMaxImages();
+ method public android.view.Surface getSurface();
+ method public int getWidth();
+ method public static android.media.ImageReader newInstance(int, int, int, int);
+ method public void setOnImageAvailableListener(android.media.ImageReader.OnImageAvailableListener, android.os.Handler);
+ }
+
+ public static abstract interface ImageReader.OnImageAvailableListener {
+ method public abstract void onImageAvailable(android.media.ImageReader);
+ }
+
+ public class ImageWriter implements java.lang.AutoCloseable {
+ method public void close();
+ method public android.media.Image dequeueInputImage();
+ method public int getFormat();
+ method public int getMaxImages();
+ method public static android.media.ImageWriter newInstance(android.view.Surface, int);
+ method public void queueInputImage(android.media.Image);
+ method public void setOnImageReleasedListener(android.media.ImageWriter.OnImageReleasedListener, android.os.Handler);
+ }
+
+ public static abstract interface ImageWriter.OnImageReleasedListener {
+ method public abstract void onImageReleased(android.media.ImageWriter);
+ }
+
+ public class JetPlayer {
+ method public boolean clearQueue();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public boolean closeJetFile();
+ method public static android.media.JetPlayer getJetPlayer();
+ method public static int getMaxTracks();
+ method public boolean loadJetFile(java.lang.String);
+ method public boolean loadJetFile(android.content.res.AssetFileDescriptor);
+ method public boolean pause();
+ method public boolean play();
+ method public boolean queueJetSegment(int, int, int, int, int, byte);
+ method public boolean queueJetSegmentMuteArray(int, int, int, int, boolean[], byte);
+ method public void release();
+ method public void setEventListener(android.media.JetPlayer.OnJetEventListener);
+ method public void setEventListener(android.media.JetPlayer.OnJetEventListener, android.os.Handler);
+ method public boolean setMuteArray(boolean[], boolean);
+ method public boolean setMuteFlag(int, boolean, boolean);
+ method public boolean setMuteFlags(int, boolean);
+ method public boolean triggerClip(int);
+ }
+
+ public static abstract interface JetPlayer.OnJetEventListener {
+ method public abstract void onJetEvent(android.media.JetPlayer, short, byte, byte, byte, byte);
+ method public abstract void onJetNumQueuedSegmentUpdate(android.media.JetPlayer, int);
+ method public abstract void onJetPauseUpdate(android.media.JetPlayer, int);
+ method public abstract void onJetUserIdUpdate(android.media.JetPlayer, int, int);
+ }
+
+ public class MediaActionSound {
+ ctor public MediaActionSound();
+ method public synchronized void load(int);
+ method public synchronized void play(int);
+ method public void release();
+ field public static final int FOCUS_COMPLETE = 1; // 0x1
+ field public static final int SHUTTER_CLICK = 0; // 0x0
+ field public static final int START_VIDEO_RECORDING = 2; // 0x2
+ field public static final int STOP_VIDEO_RECORDING = 3; // 0x3
+ }
+
+ public final class MediaCodec {
+ method public void configure(android.media.MediaFormat, android.view.Surface, android.media.MediaCrypto, int);
+ method public static android.media.MediaCodec createByCodecName(java.lang.String) throws java.io.IOException;
+ method public static android.media.MediaCodec createDecoderByType(java.lang.String) throws java.io.IOException;
+ method public static android.media.MediaCodec createEncoderByType(java.lang.String) throws java.io.IOException;
+ method public final android.view.Surface createInputSurface();
+ method public static android.view.Surface createPersistentInputSurface();
+ method public final int dequeueInputBuffer(long);
+ method public final int dequeueOutputBuffer(android.media.MediaCodec.BufferInfo, long);
+ method public final void flush();
+ method public android.media.MediaCodecInfo getCodecInfo();
+ method public java.nio.ByteBuffer getInputBuffer(int);
+ method public deprecated java.nio.ByteBuffer[] getInputBuffers();
+ method public final android.media.MediaFormat getInputFormat();
+ method public android.media.Image getInputImage(int);
+ method public final java.lang.String getName();
+ method public java.nio.ByteBuffer getOutputBuffer(int);
+ method public deprecated java.nio.ByteBuffer[] getOutputBuffers();
+ method public final android.media.MediaFormat getOutputFormat();
+ method public final android.media.MediaFormat getOutputFormat(int);
+ method public android.media.Image getOutputImage(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 releaseOutputBuffer(int, long);
+ method public final void reset();
+ method public void setCallback(android.media.MediaCodec.Callback, android.os.Handler);
+ method public void setCallback(android.media.MediaCodec.Callback);
+ method public void setInputSurface(android.view.Surface);
+ method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler);
+ method public void setOutputSurface(android.view.Surface);
+ method public final void setParameters(android.os.Bundle);
+ method public final void setVideoScalingMode(int);
+ method public final void signalEndOfInputStream();
+ method public final void start();
+ method public final void stop();
+ field public static final int BUFFER_FLAG_CODEC_CONFIG = 2; // 0x2
+ field public static final int BUFFER_FLAG_END_OF_STREAM = 4; // 0x4
+ field public static final int BUFFER_FLAG_KEY_FRAME = 1; // 0x1
+ field public static final deprecated int BUFFER_FLAG_SYNC_FRAME = 1; // 0x1
+ field public static final int CONFIGURE_FLAG_ENCODE = 1; // 0x1
+ field public static final int CRYPTO_MODE_AES_CBC = 2; // 0x2
+ field public static final int CRYPTO_MODE_AES_CTR = 1; // 0x1
+ field public static final int CRYPTO_MODE_UNENCRYPTED = 0; // 0x0
+ field public static final deprecated int INFO_OUTPUT_BUFFERS_CHANGED = -3; // 0xfffffffd
+ field public static final int INFO_OUTPUT_FORMAT_CHANGED = -2; // 0xfffffffe
+ field public static final int INFO_TRY_AGAIN_LATER = -1; // 0xffffffff
+ field public static final java.lang.String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync";
+ field public static final java.lang.String PARAMETER_KEY_SUSPEND = "drop-input-frames";
+ field public static final java.lang.String PARAMETER_KEY_VIDEO_BITRATE = "video-bitrate";
+ field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1
+ field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2
+ }
+
+ public static final class MediaCodec.BufferInfo {
+ ctor public MediaCodec.BufferInfo();
+ method public void set(int, int, long, int);
+ field public int flags;
+ field public int offset;
+ field public long presentationTimeUs;
+ field public int size;
+ }
+
+ public static abstract class MediaCodec.Callback {
+ ctor public MediaCodec.Callback();
+ method public abstract void onError(android.media.MediaCodec, android.media.MediaCodec.CodecException);
+ method public abstract void onInputBufferAvailable(android.media.MediaCodec, int);
+ method public abstract void onOutputBufferAvailable(android.media.MediaCodec, int, android.media.MediaCodec.BufferInfo);
+ method public abstract void onOutputFormatChanged(android.media.MediaCodec, android.media.MediaFormat);
+ }
+
+ public static final class MediaCodec.CodecException extends java.lang.IllegalStateException {
+ method public java.lang.String getDiagnosticInfo();
+ method public int getErrorCode();
+ method public boolean isRecoverable();
+ method public boolean isTransient();
+ field public static final int ERROR_INSUFFICIENT_RESOURCE = 1100; // 0x44c
+ field public static final int ERROR_RECLAIMED = 1101; // 0x44d
+ }
+
+ public static final class MediaCodec.CryptoException extends java.lang.RuntimeException {
+ ctor public MediaCodec.CryptoException(int, java.lang.String);
+ method public int getErrorCode();
+ field public static final int ERROR_INSUFFICIENT_OUTPUT_PROTECTION = 4; // 0x4
+ field public static final int ERROR_KEY_EXPIRED = 2; // 0x2
+ field public static final int ERROR_NO_KEY = 1; // 0x1
+ field public static final int ERROR_RESOURCE_BUSY = 3; // 0x3
+ field public static final int ERROR_SESSION_NOT_OPENED = 5; // 0x5
+ }
+
+ public static final class MediaCodec.CryptoInfo {
+ ctor public MediaCodec.CryptoInfo();
+ method public void set(int, int[], int[], byte[], byte[], int);
+ method public void setPattern(android.media.MediaCodec.CryptoInfo.Pattern);
+ field public byte[] iv;
+ field public byte[] key;
+ field public int mode;
+ field public int[] numBytesOfClearData;
+ field public int[] numBytesOfEncryptedData;
+ field public int numSubSamples;
+ }
+
+ public static final class MediaCodec.CryptoInfo.Pattern {
+ ctor public MediaCodec.CryptoInfo.Pattern(int, int);
+ method public int getEncryptBlocks();
+ method public int getSkipBlocks();
+ method public void set(int, int);
+ }
+
+ public static abstract interface MediaCodec.OnFrameRenderedListener {
+ method public abstract void onFrameRendered(android.media.MediaCodec, long, long);
+ }
+
+ public final class MediaCodecInfo {
+ method public final android.media.MediaCodecInfo.CodecCapabilities getCapabilitiesForType(java.lang.String);
+ method public final java.lang.String getName();
+ method public final java.lang.String[] getSupportedTypes();
+ method public final boolean isEncoder();
+ }
+
+ public static final class MediaCodecInfo.AudioCapabilities {
+ method public android.util.Range<java.lang.Integer> getBitrateRange();
+ method public int getMaxInputChannelCount();
+ method public android.util.Range<java.lang.Integer>[] getSupportedSampleRateRanges();
+ method public int[] getSupportedSampleRates();
+ method public boolean isSampleRateSupported(int);
+ }
+
+ public static final class MediaCodecInfo.CodecCapabilities {
+ ctor public MediaCodecInfo.CodecCapabilities();
+ method public static android.media.MediaCodecInfo.CodecCapabilities createFromProfileLevel(java.lang.String, int, int);
+ method public android.media.MediaCodecInfo.AudioCapabilities getAudioCapabilities();
+ method public android.media.MediaFormat getDefaultFormat();
+ method public android.media.MediaCodecInfo.EncoderCapabilities getEncoderCapabilities();
+ method public int getMaxSupportedInstances();
+ method public java.lang.String getMimeType();
+ method public android.media.MediaCodecInfo.VideoCapabilities getVideoCapabilities();
+ method public final boolean isFeatureRequired(java.lang.String);
+ method public final boolean isFeatureSupported(java.lang.String);
+ method public final boolean isFormatSupported(android.media.MediaFormat);
+ field public static final deprecated int COLOR_Format12bitRGB444 = 3; // 0x3
+ field public static final deprecated int COLOR_Format16bitARGB1555 = 5; // 0x5
+ field public static final deprecated int COLOR_Format16bitARGB4444 = 4; // 0x4
+ field public static final deprecated int COLOR_Format16bitBGR565 = 7; // 0x7
+ field public static final int COLOR_Format16bitRGB565 = 6; // 0x6
+ field public static final deprecated int COLOR_Format18BitBGR666 = 41; // 0x29
+ field public static final deprecated int COLOR_Format18bitARGB1665 = 9; // 0x9
+ field public static final deprecated int COLOR_Format18bitRGB666 = 8; // 0x8
+ field public static final deprecated int COLOR_Format19bitARGB1666 = 10; // 0xa
+ field public static final deprecated int COLOR_Format24BitABGR6666 = 43; // 0x2b
+ field public static final deprecated int COLOR_Format24BitARGB6666 = 42; // 0x2a
+ field public static final deprecated int COLOR_Format24bitARGB1887 = 13; // 0xd
+ field public static final int COLOR_Format24bitBGR888 = 12; // 0xc
+ field public static final deprecated int COLOR_Format24bitRGB888 = 11; // 0xb
+ field public static final deprecated int COLOR_Format25bitARGB1888 = 14; // 0xe
+ field public static final int COLOR_Format32bitABGR8888 = 2130747392; // 0x7f00a000
+ field public static final deprecated int COLOR_Format32bitARGB8888 = 16; // 0x10
+ field public static final deprecated int COLOR_Format32bitBGRA8888 = 15; // 0xf
+ field public static final deprecated int COLOR_Format8bitRGB332 = 2; // 0x2
+ field public static final deprecated int COLOR_FormatCbYCrY = 27; // 0x1b
+ field public static final deprecated int COLOR_FormatCrYCbY = 28; // 0x1c
+ field public static final int COLOR_FormatL16 = 36; // 0x24
+ field public static final deprecated int COLOR_FormatL2 = 33; // 0x21
+ field public static final deprecated int COLOR_FormatL24 = 37; // 0x25
+ field public static final deprecated int COLOR_FormatL32 = 38; // 0x26
+ field public static final deprecated int COLOR_FormatL4 = 34; // 0x22
+ field public static final int COLOR_FormatL8 = 35; // 0x23
+ field public static final deprecated int COLOR_FormatMonochrome = 1; // 0x1
+ field public static final int COLOR_FormatRGBAFlexible = 2134288520; // 0x7f36a888
+ field public static final int COLOR_FormatRGBFlexible = 2134292616; // 0x7f36b888
+ field public static final int COLOR_FormatRawBayer10bit = 31; // 0x1f
+ field public static final int COLOR_FormatRawBayer8bit = 30; // 0x1e
+ field public static final int COLOR_FormatRawBayer8bitcompressed = 32; // 0x20
+ field public static final int COLOR_FormatSurface = 2130708361; // 0x7f000789
+ field public static final deprecated int COLOR_FormatYCbYCr = 25; // 0x19
+ field public static final deprecated int COLOR_FormatYCrYCb = 26; // 0x1a
+ field public static final deprecated int COLOR_FormatYUV411PackedPlanar = 18; // 0x12
+ field public static final deprecated int COLOR_FormatYUV411Planar = 17; // 0x11
+ field public static final int COLOR_FormatYUV420Flexible = 2135033992; // 0x7f420888
+ field public static final deprecated int COLOR_FormatYUV420PackedPlanar = 20; // 0x14
+ field public static final deprecated int COLOR_FormatYUV420PackedSemiPlanar = 39; // 0x27
+ field public static final deprecated int COLOR_FormatYUV420Planar = 19; // 0x13
+ field public static final deprecated int COLOR_FormatYUV420SemiPlanar = 21; // 0x15
+ field public static final int COLOR_FormatYUV422Flexible = 2135042184; // 0x7f422888
+ field public static final deprecated int COLOR_FormatYUV422PackedPlanar = 23; // 0x17
+ field public static final deprecated int COLOR_FormatYUV422PackedSemiPlanar = 40; // 0x28
+ field public static final deprecated int COLOR_FormatYUV422Planar = 22; // 0x16
+ field public static final deprecated int COLOR_FormatYUV422SemiPlanar = 24; // 0x18
+ field public static final int COLOR_FormatYUV444Flexible = 2135181448; // 0x7f444888
+ field public static final deprecated int COLOR_FormatYUV444Interleaved = 29; // 0x1d
+ field public static final deprecated int COLOR_QCOM_FormatYUV420SemiPlanar = 2141391872; // 0x7fa30c00
+ field public static final deprecated int COLOR_TI_FormatYUV420PackedSemiPlanar = 2130706688; // 0x7f000100
+ field public static final java.lang.String FEATURE_AdaptivePlayback = "adaptive-playback";
+ field public static final java.lang.String FEATURE_SecurePlayback = "secure-playback";
+ field public static final java.lang.String FEATURE_TunneledPlayback = "tunneled-playback";
+ field public int[] colorFormats;
+ field public android.media.MediaCodecInfo.CodecProfileLevel[] profileLevels;
+ }
+
+ public static final class MediaCodecInfo.CodecProfileLevel {
+ ctor public MediaCodecInfo.CodecProfileLevel();
+ field public static final int AACObjectELD = 39; // 0x27
+ field public static final int AACObjectERLC = 17; // 0x11
+ field public static final int AACObjectHE = 5; // 0x5
+ field public static final int AACObjectHE_PS = 29; // 0x1d
+ field public static final int AACObjectLC = 2; // 0x2
+ field public static final int AACObjectLD = 23; // 0x17
+ field public static final int AACObjectLTP = 4; // 0x4
+ field public static final int AACObjectMain = 1; // 0x1
+ field public static final int AACObjectSSR = 3; // 0x3
+ field public static final int AACObjectScalable = 6; // 0x6
+ field public static final int AVCLevel1 = 1; // 0x1
+ field public static final int AVCLevel11 = 4; // 0x4
+ field public static final int AVCLevel12 = 8; // 0x8
+ field public static final int AVCLevel13 = 16; // 0x10
+ field public static final int AVCLevel1b = 2; // 0x2
+ field public static final int AVCLevel2 = 32; // 0x20
+ field public static final int AVCLevel21 = 64; // 0x40
+ field public static final int AVCLevel22 = 128; // 0x80
+ field public static final int AVCLevel3 = 256; // 0x100
+ field public static final int AVCLevel31 = 512; // 0x200
+ field public static final int AVCLevel32 = 1024; // 0x400
+ field public static final int AVCLevel4 = 2048; // 0x800
+ field public static final int AVCLevel41 = 4096; // 0x1000
+ field public static final int AVCLevel42 = 8192; // 0x2000
+ field public static final int AVCLevel5 = 16384; // 0x4000
+ field public static final int AVCLevel51 = 32768; // 0x8000
+ field public static final int AVCLevel52 = 65536; // 0x10000
+ field public static final int AVCProfileBaseline = 1; // 0x1
+ field public static final int AVCProfileExtended = 4; // 0x4
+ field public static final int AVCProfileHigh = 8; // 0x8
+ field public static final int AVCProfileHigh10 = 16; // 0x10
+ field public static final int AVCProfileHigh422 = 32; // 0x20
+ field public static final int AVCProfileHigh444 = 64; // 0x40
+ field public static final int AVCProfileMain = 2; // 0x2
+ field public static final int H263Level10 = 1; // 0x1
+ field public static final int H263Level20 = 2; // 0x2
+ field public static final int H263Level30 = 4; // 0x4
+ field public static final int H263Level40 = 8; // 0x8
+ field public static final int H263Level45 = 16; // 0x10
+ field public static final int H263Level50 = 32; // 0x20
+ field public static final int H263Level60 = 64; // 0x40
+ field public static final int H263Level70 = 128; // 0x80
+ field public static final int H263ProfileBackwardCompatible = 4; // 0x4
+ field public static final int H263ProfileBaseline = 1; // 0x1
+ field public static final int H263ProfileH320Coding = 2; // 0x2
+ field public static final int H263ProfileHighCompression = 32; // 0x20
+ field public static final int H263ProfileHighLatency = 256; // 0x100
+ field public static final int H263ProfileISWV2 = 8; // 0x8
+ field public static final int H263ProfileISWV3 = 16; // 0x10
+ field public static final int H263ProfileInterlace = 128; // 0x80
+ field public static final int H263ProfileInternet = 64; // 0x40
+ field public static final int HEVCHighTierLevel1 = 2; // 0x2
+ field public static final int HEVCHighTierLevel2 = 8; // 0x8
+ field public static final int HEVCHighTierLevel21 = 32; // 0x20
+ field public static final int HEVCHighTierLevel3 = 128; // 0x80
+ field public static final int HEVCHighTierLevel31 = 512; // 0x200
+ field public static final int HEVCHighTierLevel4 = 2048; // 0x800
+ field public static final int HEVCHighTierLevel41 = 8192; // 0x2000
+ field public static final int HEVCHighTierLevel5 = 32768; // 0x8000
+ field public static final int HEVCHighTierLevel51 = 131072; // 0x20000
+ field public static final int HEVCHighTierLevel52 = 524288; // 0x80000
+ field public static final int HEVCHighTierLevel6 = 2097152; // 0x200000
+ field public static final int HEVCHighTierLevel61 = 8388608; // 0x800000
+ field public static final int HEVCHighTierLevel62 = 33554432; // 0x2000000
+ field public static final int HEVCMainTierLevel1 = 1; // 0x1
+ field public static final int HEVCMainTierLevel2 = 4; // 0x4
+ field public static final int HEVCMainTierLevel21 = 16; // 0x10
+ field public static final int HEVCMainTierLevel3 = 64; // 0x40
+ field public static final int HEVCMainTierLevel31 = 256; // 0x100
+ field public static final int HEVCMainTierLevel4 = 1024; // 0x400
+ field public static final int HEVCMainTierLevel41 = 4096; // 0x1000
+ field public static final int HEVCMainTierLevel5 = 16384; // 0x4000
+ field public static final int HEVCMainTierLevel51 = 65536; // 0x10000
+ field public static final int HEVCMainTierLevel52 = 262144; // 0x40000
+ field public static final int HEVCMainTierLevel6 = 1048576; // 0x100000
+ field public static final int HEVCMainTierLevel61 = 4194304; // 0x400000
+ field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000
+ field public static final int HEVCProfileMain = 1; // 0x1
+ field public static final int HEVCProfileMain10 = 2; // 0x2
+ field public static final int MPEG2LevelH14 = 2; // 0x2
+ field public static final int MPEG2LevelHL = 3; // 0x3
+ field public static final int MPEG2LevelLL = 0; // 0x0
+ field public static final int MPEG2LevelML = 1; // 0x1
+ field public static final int MPEG2Profile422 = 2; // 0x2
+ field public static final int MPEG2ProfileHigh = 5; // 0x5
+ field public static final int MPEG2ProfileMain = 1; // 0x1
+ field public static final int MPEG2ProfileSNR = 3; // 0x3
+ field public static final int MPEG2ProfileSimple = 0; // 0x0
+ field public static final int MPEG2ProfileSpatial = 4; // 0x4
+ field public static final int MPEG4Level0 = 1; // 0x1
+ field public static final int MPEG4Level0b = 2; // 0x2
+ field public static final int MPEG4Level1 = 4; // 0x4
+ field public static final int MPEG4Level2 = 8; // 0x8
+ field public static final int MPEG4Level3 = 16; // 0x10
+ field public static final int MPEG4Level4 = 32; // 0x20
+ field public static final int MPEG4Level4a = 64; // 0x40
+ field public static final int MPEG4Level5 = 128; // 0x80
+ field public static final int MPEG4ProfileAdvancedCoding = 4096; // 0x1000
+ field public static final int MPEG4ProfileAdvancedCore = 8192; // 0x2000
+ field public static final int MPEG4ProfileAdvancedRealTime = 1024; // 0x400
+ field public static final int MPEG4ProfileAdvancedScalable = 16384; // 0x4000
+ field public static final int MPEG4ProfileAdvancedSimple = 32768; // 0x8000
+ field public static final int MPEG4ProfileBasicAnimated = 256; // 0x100
+ field public static final int MPEG4ProfileCore = 4; // 0x4
+ field public static final int MPEG4ProfileCoreScalable = 2048; // 0x800
+ field public static final int MPEG4ProfileHybrid = 512; // 0x200
+ field public static final int MPEG4ProfileMain = 8; // 0x8
+ field public static final int MPEG4ProfileNbit = 16; // 0x10
+ field public static final int MPEG4ProfileScalableTexture = 32; // 0x20
+ field public static final int MPEG4ProfileSimple = 1; // 0x1
+ field public static final int MPEG4ProfileSimpleFBA = 128; // 0x80
+ field public static final int MPEG4ProfileSimpleFace = 64; // 0x40
+ field public static final int MPEG4ProfileSimpleScalable = 2; // 0x2
+ field public static final int VP8Level_Version0 = 1; // 0x1
+ field public static final int VP8Level_Version1 = 2; // 0x2
+ field public static final int VP8Level_Version2 = 4; // 0x4
+ field public static final int VP8Level_Version3 = 8; // 0x8
+ field public static final int VP8ProfileMain = 1; // 0x1
+ field public int level;
+ field public int profile;
+ }
+
+ public static final class MediaCodecInfo.EncoderCapabilities {
+ method public android.util.Range<java.lang.Integer> getComplexityRange();
+ method public boolean isBitrateModeSupported(int);
+ field public static final int BITRATE_MODE_CBR = 2; // 0x2
+ field public static final int BITRATE_MODE_CQ = 0; // 0x0
+ field public static final int BITRATE_MODE_VBR = 1; // 0x1
+ }
+
+ public static final class MediaCodecInfo.VideoCapabilities {
+ method public boolean areSizeAndRateSupported(int, int, double);
+ method public android.util.Range<java.lang.Double> getAchievableFrameRatesFor(int, int);
+ method public android.util.Range<java.lang.Integer> getBitrateRange();
+ method public int getHeightAlignment();
+ method public android.util.Range<java.lang.Integer> getSupportedFrameRates();
+ method public android.util.Range<java.lang.Double> getSupportedFrameRatesFor(int, int);
+ method public android.util.Range<java.lang.Integer> getSupportedHeights();
+ method public android.util.Range<java.lang.Integer> getSupportedHeightsFor(int);
+ method public android.util.Range<java.lang.Integer> getSupportedWidths();
+ method public android.util.Range<java.lang.Integer> getSupportedWidthsFor(int);
+ method public int getWidthAlignment();
+ method public boolean isSizeSupported(int, int);
+ }
+
+ public final class MediaCodecList {
+ ctor public MediaCodecList(int);
+ method public final java.lang.String findDecoderForFormat(android.media.MediaFormat);
+ method public final java.lang.String findEncoderForFormat(android.media.MediaFormat);
+ method public static final deprecated int getCodecCount();
+ method public static final deprecated android.media.MediaCodecInfo getCodecInfoAt(int);
+ method public final android.media.MediaCodecInfo[] getCodecInfos();
+ field public static final int ALL_CODECS = 1; // 0x1
+ field public static final int REGULAR_CODECS = 0; // 0x0
+ }
+
+ public final class MediaCrypto {
+ ctor public MediaCrypto(java.util.UUID, byte[]) throws android.media.MediaCryptoException;
+ method public static final boolean isCryptoSchemeSupported(java.util.UUID);
+ method public final void release();
+ method public final boolean requiresSecureDecoderComponent(java.lang.String);
+ method public final void setMediaDrmSession(byte[]) throws android.media.MediaCryptoException;
+ }
+
+ public final class MediaCryptoException extends java.lang.Exception {
+ ctor public MediaCryptoException(java.lang.String);
+ }
+
+ public abstract class MediaDataSource implements java.io.Closeable {
+ ctor public MediaDataSource();
+ method public abstract long getSize() throws java.io.IOException;
+ method public abstract int readAt(long, byte[], int, int) throws java.io.IOException;
+ }
+
+ public class MediaDescription implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.CharSequence getDescription();
+ method public android.os.Bundle getExtras();
+ method public android.graphics.Bitmap getIconBitmap();
+ method public android.net.Uri getIconUri();
+ method public java.lang.String getMediaId();
+ method public android.net.Uri getMediaUri();
+ method public java.lang.CharSequence getSubtitle();
+ method public java.lang.CharSequence getTitle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.MediaDescription> CREATOR;
+ }
+
+ public static class MediaDescription.Builder {
+ ctor public MediaDescription.Builder();
+ method public android.media.MediaDescription build();
+ method public android.media.MediaDescription.Builder setDescription(java.lang.CharSequence);
+ method public android.media.MediaDescription.Builder setExtras(android.os.Bundle);
+ method public android.media.MediaDescription.Builder setIconBitmap(android.graphics.Bitmap);
+ method public android.media.MediaDescription.Builder setIconUri(android.net.Uri);
+ method public android.media.MediaDescription.Builder setMediaId(java.lang.String);
+ method public android.media.MediaDescription.Builder setMediaUri(android.net.Uri);
+ method public android.media.MediaDescription.Builder setSubtitle(java.lang.CharSequence);
+ method public android.media.MediaDescription.Builder setTitle(java.lang.CharSequence);
+ }
+
+ public final class MediaDrm {
+ ctor public MediaDrm(java.util.UUID) throws android.media.UnsupportedSchemeException;
+ method public void closeSession(byte[]);
+ method public android.media.MediaDrm.CryptoSession getCryptoSession(byte[], java.lang.String, java.lang.String);
+ method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], byte[], java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>) throws android.media.NotProvisionedException;
+ method public byte[] getPropertyByteArray(java.lang.String);
+ method public java.lang.String getPropertyString(java.lang.String);
+ method public android.media.MediaDrm.ProvisionRequest getProvisionRequest();
+ method public byte[] getSecureStop(byte[]);
+ method public java.util.List<byte[]> getSecureStops();
+ method public static final boolean isCryptoSchemeSupported(java.util.UUID);
+ method public static final boolean isCryptoSchemeSupported(java.util.UUID, java.lang.String);
+ method public byte[] openSession() throws android.media.NotProvisionedException, android.media.ResourceBusyException;
+ method public byte[] provideKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.NotProvisionedException;
+ method public void provideProvisionResponse(byte[]) throws android.media.DeniedByServerException;
+ method public java.util.HashMap<java.lang.String, java.lang.String> queryKeyStatus(byte[]);
+ method public final void release();
+ method public void releaseAllSecureStops();
+ method public void releaseSecureStops(byte[]);
+ method public void removeKeys(byte[]);
+ method public void restoreKeys(byte[], byte[]);
+ method public void setOnEventListener(android.media.MediaDrm.OnEventListener);
+ method public void setOnExpirationUpdateListener(android.media.MediaDrm.OnExpirationUpdateListener, android.os.Handler);
+ method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler);
+ method public void setPropertyByteArray(java.lang.String, byte[]);
+ method public void setPropertyString(java.lang.String, java.lang.String);
+ field public static final int EVENT_KEY_EXPIRED = 3; // 0x3
+ field public static final int EVENT_KEY_REQUIRED = 2; // 0x2
+ field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1
+ field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5
+ field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4
+ field public static final int KEY_TYPE_OFFLINE = 2; // 0x2
+ field public static final int KEY_TYPE_RELEASE = 3; // 0x3
+ field public static final int KEY_TYPE_STREAMING = 1; // 0x1
+ field public static final java.lang.String PROPERTY_ALGORITHMS = "algorithms";
+ field public static final java.lang.String PROPERTY_DESCRIPTION = "description";
+ field public static final java.lang.String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId";
+ field public static final java.lang.String PROPERTY_VENDOR = "vendor";
+ field public static final java.lang.String PROPERTY_VERSION = "version";
+ }
+
+ public final class MediaDrm.CryptoSession {
+ method public byte[] decrypt(byte[], byte[], byte[]);
+ method public byte[] encrypt(byte[], byte[], byte[]);
+ method public byte[] sign(byte[], byte[]);
+ method public boolean verify(byte[], byte[], byte[]);
+ }
+
+ public static final class MediaDrm.KeyRequest {
+ method public byte[] getData();
+ method public java.lang.String getDefaultUrl();
+ method public int getRequestType();
+ field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0
+ field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2
+ field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1
+ }
+
+ public static final class MediaDrm.KeyStatus {
+ method public byte[] getKeyId();
+ method public int getStatusCode();
+ field public static final int STATUS_EXPIRED = 1; // 0x1
+ field public static final int STATUS_INTERNAL_ERROR = 4; // 0x4
+ field public static final int STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2
+ field public static final int STATUS_PENDING = 3; // 0x3
+ field public static final int STATUS_USABLE = 0; // 0x0
+ }
+
+ public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException {
+ method public java.lang.String getDiagnosticInfo();
+ }
+
+ public static abstract interface MediaDrm.OnEventListener {
+ method public abstract void onEvent(android.media.MediaDrm, byte[], int, int, byte[]);
+ }
+
+ public static abstract interface MediaDrm.OnExpirationUpdateListener {
+ method public abstract void onExpirationUpdate(android.media.MediaDrm, byte[], long);
+ }
+
+ public static abstract interface MediaDrm.OnKeyStatusChangeListener {
+ method public abstract void onKeyStatusChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean);
+ }
+
+ public static final class MediaDrm.ProvisionRequest {
+ method public byte[] getData();
+ method public java.lang.String getDefaultUrl();
+ }
+
+ public class MediaDrmException extends java.lang.Exception {
+ ctor public MediaDrmException(java.lang.String);
+ }
+
+ public class MediaDrmResetException extends java.lang.IllegalStateException {
+ ctor public MediaDrmResetException(java.lang.String);
+ }
+
+ public final class MediaExtractor {
+ ctor public MediaExtractor();
+ method public boolean advance();
+ method public long getCachedDuration();
+ method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
+ method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
+ method public int getSampleFlags();
+ method public long getSampleTime();
+ method public int getSampleTrackIndex();
+ method public final int getTrackCount();
+ method public android.media.MediaFormat getTrackFormat(int);
+ method public boolean hasCacheReachedEndOfStream();
+ method public int readSampleData(java.nio.ByteBuffer, int);
+ method public final void release();
+ method public void seekTo(long, int);
+ method public void selectTrack(int);
+ method public final void setDataSource(android.media.MediaDataSource) throws java.io.IOException;
+ method public final void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
+ method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
+ method public final void setDataSource(java.lang.String) throws java.io.IOException;
+ method public final void setDataSource(java.io.FileDescriptor) throws java.io.IOException;
+ method public final void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException;
+ method public void unselectTrack(int);
+ field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2
+ field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1
+ field public static final int SEEK_TO_CLOSEST_SYNC = 2; // 0x2
+ field public static final int SEEK_TO_NEXT_SYNC = 1; // 0x1
+ field public static final int SEEK_TO_PREVIOUS_SYNC = 0; // 0x0
+ }
+
+ public final class MediaFormat {
+ ctor public MediaFormat();
+ method public final boolean containsKey(java.lang.String);
+ method public static final android.media.MediaFormat createAudioFormat(java.lang.String, int, int);
+ method public static final android.media.MediaFormat createSubtitleFormat(java.lang.String, java.lang.String);
+ method public static final android.media.MediaFormat createVideoFormat(java.lang.String, int, int);
+ method public final java.nio.ByteBuffer getByteBuffer(java.lang.String);
+ method public boolean getFeatureEnabled(java.lang.String);
+ method public final float getFloat(java.lang.String);
+ method public final int getInteger(java.lang.String);
+ method public final long getLong(java.lang.String);
+ method public final java.lang.String getString(java.lang.String);
+ method public final void setByteBuffer(java.lang.String, java.nio.ByteBuffer);
+ method public void setFeatureEnabled(java.lang.String, boolean);
+ method public final void setFloat(java.lang.String, float);
+ method public final void setInteger(java.lang.String, int);
+ method public final void setLong(java.lang.String, long);
+ method public final void setString(java.lang.String, java.lang.String);
+ field public static final java.lang.String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
+ field public static final java.lang.String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
+ field public static final java.lang.String KEY_AAC_DRC_HEAVY_COMPRESSION = "aac-drc-heavy-compression";
+ field public static final java.lang.String KEY_AAC_DRC_TARGET_REFERENCE_LEVEL = "aac-target-ref-level";
+ field public static final java.lang.String KEY_AAC_ENCODED_TARGET_LEVEL = "aac-encoded-target-level";
+ field public static final java.lang.String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT = "aac-max-output-channel_count";
+ field public static final java.lang.String KEY_AAC_PROFILE = "aac-profile";
+ field public static final java.lang.String KEY_AAC_SBR_MODE = "aac-sbr-mode";
+ field public static final java.lang.String KEY_AUDIO_SESSION_ID = "audio-session-id";
+ field public static final java.lang.String KEY_BITRATE_MODE = "bitrate-mode";
+ field public static final java.lang.String KEY_BIT_RATE = "bitrate";
+ field public static final java.lang.String KEY_CAPTURE_RATE = "capture-rate";
+ field public static final java.lang.String KEY_CHANNEL_COUNT = "channel-count";
+ field public static final java.lang.String KEY_CHANNEL_MASK = "channel-mask";
+ field public static final java.lang.String KEY_COLOR_FORMAT = "color-format";
+ field public static final java.lang.String KEY_COMPLEXITY = "complexity";
+ field public static final java.lang.String KEY_DURATION = "durationUs";
+ field public static final java.lang.String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";
+ field public static final java.lang.String KEY_FRAME_RATE = "frame-rate";
+ field public static final java.lang.String KEY_HEIGHT = "height";
+ field public static final java.lang.String KEY_IS_ADTS = "is-adts";
+ field public static final java.lang.String KEY_IS_AUTOSELECT = "is-autoselect";
+ field public static final java.lang.String KEY_IS_DEFAULT = "is-default";
+ field public static final java.lang.String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";
+ field public static final java.lang.String KEY_I_FRAME_INTERVAL = "i-frame-interval";
+ field public static final java.lang.String KEY_LANGUAGE = "language";
+ field public static final java.lang.String KEY_LEVEL = "level";
+ field public static final java.lang.String KEY_MAX_HEIGHT = "max-height";
+ field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size";
+ field public static final java.lang.String KEY_MAX_WIDTH = "max-width";
+ field public static final java.lang.String KEY_MIME = "mime";
+ field public static final java.lang.String KEY_OPERATING_RATE = "operating-rate";
+ field public static final java.lang.String KEY_PRIORITY = "priority";
+ field public static final java.lang.String KEY_PROFILE = "profile";
+ field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";
+ field public static final java.lang.String KEY_REPEAT_PREVIOUS_FRAME_AFTER = "repeat-previous-frame-after";
+ field public static final java.lang.String KEY_ROTATION = "rotation-degrees";
+ field public static final java.lang.String KEY_SAMPLE_RATE = "sample-rate";
+ field public static final java.lang.String KEY_SLICE_HEIGHT = "slice-height";
+ field public static final java.lang.String KEY_STRIDE = "stride";
+ field public static final java.lang.String KEY_TEMPORAL_LAYERING = "ts-schema";
+ field public static final java.lang.String KEY_WIDTH = "width";
+ field public static final java.lang.String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";
+ field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";
+ field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
+ field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
+ field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
+ field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";
+ field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
+ field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
+ field public static final java.lang.String MIMETYPE_AUDIO_MPEG = "audio/mpeg";
+ field public static final java.lang.String MIMETYPE_AUDIO_MSGSM = "audio/gsm";
+ field public static final java.lang.String MIMETYPE_AUDIO_OPUS = "audio/opus";
+ field public static final java.lang.String MIMETYPE_AUDIO_QCELP = "audio/qcelp";
+ field public static final java.lang.String MIMETYPE_AUDIO_RAW = "audio/raw";
+ field public static final java.lang.String MIMETYPE_AUDIO_VORBIS = "audio/vorbis";
+ field public static final java.lang.String MIMETYPE_TEXT_CEA_608 = "text/cea-608";
+ field public static final java.lang.String MIMETYPE_TEXT_VTT = "text/vtt";
+ field public static final java.lang.String MIMETYPE_VIDEO_AVC = "video/avc";
+ field public static final java.lang.String MIMETYPE_VIDEO_H263 = "video/3gpp";
+ field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";
+ field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";
+ field public static final java.lang.String MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es";
+ field public static final java.lang.String MIMETYPE_VIDEO_RAW = "video/raw";
+ field public static final java.lang.String MIMETYPE_VIDEO_VP8 = "video/x-vnd.on2.vp8";
+ field public static final java.lang.String MIMETYPE_VIDEO_VP9 = "video/x-vnd.on2.vp9";
+ }
+
+ public final class MediaMetadata implements android.os.Parcelable {
+ method public boolean containsKey(java.lang.String);
+ method public int describeContents();
+ method public android.graphics.Bitmap getBitmap(java.lang.String);
+ method public android.media.MediaDescription getDescription();
+ method public long getLong(java.lang.String);
+ method public android.media.Rating getRating(java.lang.String);
+ method public java.lang.String getString(java.lang.String);
+ method public java.lang.CharSequence getText(java.lang.String);
+ method public java.util.Set<java.lang.String> keySet();
+ method public int size();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.MediaMetadata> CREATOR;
+ field public static final java.lang.String METADATA_KEY_ALBUM = "android.media.metadata.ALBUM";
+ field public static final java.lang.String METADATA_KEY_ALBUM_ART = "android.media.metadata.ALBUM_ART";
+ field public static final java.lang.String METADATA_KEY_ALBUM_ARTIST = "android.media.metadata.ALBUM_ARTIST";
+ field public static final java.lang.String METADATA_KEY_ALBUM_ART_URI = "android.media.metadata.ALBUM_ART_URI";
+ field public static final java.lang.String METADATA_KEY_ART = "android.media.metadata.ART";
+ field public static final java.lang.String METADATA_KEY_ARTIST = "android.media.metadata.ARTIST";
+ field public static final java.lang.String METADATA_KEY_ART_URI = "android.media.metadata.ART_URI";
+ field public static final java.lang.String METADATA_KEY_AUTHOR = "android.media.metadata.AUTHOR";
+ field public static final java.lang.String METADATA_KEY_COMPILATION = "android.media.metadata.COMPILATION";
+ field public static final java.lang.String METADATA_KEY_COMPOSER = "android.media.metadata.COMPOSER";
+ field public static final java.lang.String METADATA_KEY_DATE = "android.media.metadata.DATE";
+ field public static final java.lang.String METADATA_KEY_DISC_NUMBER = "android.media.metadata.DISC_NUMBER";
+ field public static final java.lang.String METADATA_KEY_DISPLAY_DESCRIPTION = "android.media.metadata.DISPLAY_DESCRIPTION";
+ field public static final java.lang.String METADATA_KEY_DISPLAY_ICON = "android.media.metadata.DISPLAY_ICON";
+ field public static final java.lang.String METADATA_KEY_DISPLAY_ICON_URI = "android.media.metadata.DISPLAY_ICON_URI";
+ field public static final java.lang.String METADATA_KEY_DISPLAY_SUBTITLE = "android.media.metadata.DISPLAY_SUBTITLE";
+ field public static final java.lang.String METADATA_KEY_DISPLAY_TITLE = "android.media.metadata.DISPLAY_TITLE";
+ field public static final java.lang.String METADATA_KEY_DURATION = "android.media.metadata.DURATION";
+ field public static final java.lang.String METADATA_KEY_GENRE = "android.media.metadata.GENRE";
+ field public static final java.lang.String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";
+ field public static final java.lang.String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS";
+ field public static final java.lang.String METADATA_KEY_RATING = "android.media.metadata.RATING";
+ field public static final java.lang.String METADATA_KEY_TITLE = "android.media.metadata.TITLE";
+ field public static final java.lang.String METADATA_KEY_TRACK_NUMBER = "android.media.metadata.TRACK_NUMBER";
+ field public static final java.lang.String METADATA_KEY_USER_RATING = "android.media.metadata.USER_RATING";
+ field public static final java.lang.String METADATA_KEY_WRITER = "android.media.metadata.WRITER";
+ field public static final java.lang.String METADATA_KEY_YEAR = "android.media.metadata.YEAR";
+ }
+
+ public static final class MediaMetadata.Builder {
+ ctor public MediaMetadata.Builder();
+ ctor public MediaMetadata.Builder(android.media.MediaMetadata);
+ method public android.media.MediaMetadata build();
+ method public android.media.MediaMetadata.Builder putBitmap(java.lang.String, android.graphics.Bitmap);
+ method public android.media.MediaMetadata.Builder putLong(java.lang.String, long);
+ method public android.media.MediaMetadata.Builder putRating(java.lang.String, android.media.Rating);
+ method public android.media.MediaMetadata.Builder putString(java.lang.String, java.lang.String);
+ method public android.media.MediaMetadata.Builder putText(java.lang.String, java.lang.CharSequence);
+ }
+
+ public abstract deprecated class MediaMetadataEditor {
+ method public synchronized void addEditableKey(int);
+ method public abstract void apply();
+ method public synchronized void clear();
+ method public synchronized android.graphics.Bitmap getBitmap(int, android.graphics.Bitmap) throws java.lang.IllegalArgumentException;
+ method public synchronized int[] getEditableKeys();
+ method public synchronized long getLong(int, long) throws java.lang.IllegalArgumentException;
+ method public synchronized java.lang.Object getObject(int, java.lang.Object) throws java.lang.IllegalArgumentException;
+ method public synchronized java.lang.String getString(int, java.lang.String) throws java.lang.IllegalArgumentException;
+ method public synchronized android.media.MediaMetadataEditor putBitmap(int, android.graphics.Bitmap) throws java.lang.IllegalArgumentException;
+ method public synchronized android.media.MediaMetadataEditor putLong(int, long) throws java.lang.IllegalArgumentException;
+ method public synchronized android.media.MediaMetadataEditor putObject(int, java.lang.Object) throws java.lang.IllegalArgumentException;
+ method public synchronized android.media.MediaMetadataEditor putString(int, java.lang.String) throws java.lang.IllegalArgumentException;
+ method public synchronized void removeEditableKeys();
+ field public static final int BITMAP_KEY_ARTWORK = 100; // 0x64
+ field public static final int RATING_KEY_BY_OTHERS = 101; // 0x65
+ field public static final int RATING_KEY_BY_USER = 268435457; // 0x10000001
+ }
+
+ public class MediaMetadataRetriever {
+ ctor public MediaMetadataRetriever();
+ method public java.lang.String extractMetadata(int);
+ method public byte[] getEmbeddedPicture();
+ method public android.graphics.Bitmap getFrameAtTime(long, int);
+ method public android.graphics.Bitmap getFrameAtTime(long);
+ method public android.graphics.Bitmap getFrameAtTime();
+ method public void release();
+ method public void setDataSource(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>) throws java.lang.IllegalArgumentException;
+ method public void setDataSource(java.io.FileDescriptor, long, long) throws java.lang.IllegalArgumentException;
+ method public void setDataSource(java.io.FileDescriptor) throws java.lang.IllegalArgumentException;
+ method public void setDataSource(android.content.Context, android.net.Uri) throws java.lang.IllegalArgumentException, java.lang.SecurityException;
+ method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException;
+ field public static final int METADATA_KEY_ALBUM = 1; // 0x1
+ field public static final int METADATA_KEY_ALBUMARTIST = 13; // 0xd
+ field public static final int METADATA_KEY_ARTIST = 2; // 0x2
+ field public static final int METADATA_KEY_AUTHOR = 3; // 0x3
+ field public static final int METADATA_KEY_BITRATE = 20; // 0x14
+ field public static final int METADATA_KEY_CAPTURE_FRAMERATE = 25; // 0x19
+ field public static final int METADATA_KEY_CD_TRACK_NUMBER = 0; // 0x0
+ field public static final int METADATA_KEY_COMPILATION = 15; // 0xf
+ field public static final int METADATA_KEY_COMPOSER = 4; // 0x4
+ field public static final int METADATA_KEY_DATE = 5; // 0x5
+ field public static final int METADATA_KEY_DISC_NUMBER = 14; // 0xe
+ field public static final int METADATA_KEY_DURATION = 9; // 0x9
+ field public static final int METADATA_KEY_GENRE = 6; // 0x6
+ field public static final int METADATA_KEY_HAS_AUDIO = 16; // 0x10
+ field public static final int METADATA_KEY_HAS_VIDEO = 17; // 0x11
+ field public static final int METADATA_KEY_LOCATION = 23; // 0x17
+ field public static final int METADATA_KEY_MIMETYPE = 12; // 0xc
+ field public static final int METADATA_KEY_NUM_TRACKS = 10; // 0xa
+ field public static final int METADATA_KEY_TITLE = 7; // 0x7
+ field public static final int METADATA_KEY_VIDEO_HEIGHT = 19; // 0x13
+ field public static final int METADATA_KEY_VIDEO_ROTATION = 24; // 0x18
+ field public static final int METADATA_KEY_VIDEO_WIDTH = 18; // 0x12
+ field public static final int METADATA_KEY_WRITER = 11; // 0xb
+ field public static final int METADATA_KEY_YEAR = 8; // 0x8
+ field public static final int OPTION_CLOSEST = 3; // 0x3
+ field public static final int OPTION_CLOSEST_SYNC = 2; // 0x2
+ field public static final int OPTION_NEXT_SYNC = 1; // 0x1
+ field public static final int OPTION_PREVIOUS_SYNC = 0; // 0x0
+ }
+
+ public final class MediaMuxer {
+ ctor public MediaMuxer(java.lang.String, int) throws java.io.IOException;
+ method public int addTrack(android.media.MediaFormat);
+ method public void release();
+ method public void setLocation(float, float);
+ method public void setOrientationHint(int);
+ method public void start();
+ method public void stop();
+ method public void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo);
+ }
+
+ public static final class MediaMuxer.OutputFormat {
+ field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0
+ field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1
+ }
+
+ public class MediaPlayer {
+ ctor public MediaPlayer();
+ method public void addTimedTextSource(java.lang.String, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void addTimedTextSource(android.content.Context, android.net.Uri, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void addTimedTextSource(java.io.FileDescriptor, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void addTimedTextSource(java.io.FileDescriptor, long, long, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void attachAuxEffect(int);
+ method public static android.media.MediaPlayer create(android.content.Context, android.net.Uri);
+ method public static android.media.MediaPlayer create(android.content.Context, android.net.Uri, android.view.SurfaceHolder);
+ method public static android.media.MediaPlayer create(android.content.Context, android.net.Uri, android.view.SurfaceHolder, android.media.AudioAttributes, int);
+ method public static android.media.MediaPlayer create(android.content.Context, int);
+ method public static android.media.MediaPlayer create(android.content.Context, int, android.media.AudioAttributes, int);
+ method public void deselectTrack(int) throws java.lang.IllegalStateException;
+ method public int getAudioSessionId();
+ method public int getCurrentPosition();
+ method public int getDuration();
+ method public android.media.PlaybackParams getPlaybackParams();
+ method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
+ method public android.media.SyncParams getSyncParams();
+ method public android.media.MediaTimestamp getTimestamp();
+ method public android.media.MediaPlayer.TrackInfo[] getTrackInfo() throws java.lang.IllegalStateException;
+ method public int getVideoHeight();
+ method public int getVideoWidth();
+ method public boolean isLooping();
+ method public boolean isPlaying();
+ method public void pause() throws java.lang.IllegalStateException;
+ method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
+ method public void prepareAsync() throws java.lang.IllegalStateException;
+ method public void release();
+ method public void reset();
+ method public void seekTo(int) throws java.lang.IllegalStateException;
+ method public void selectTrack(int) throws java.lang.IllegalStateException;
+ method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+ method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void setAudioStreamType(int);
+ method public void setAuxEffectSendLevel(float);
+ method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
+ method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
+ method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;
+ method public void setDataSource(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public void setDisplay(android.view.SurfaceHolder);
+ method public void setLooping(boolean);
+ method public void setNextMediaPlayer(android.media.MediaPlayer);
+ method public void setOnBufferingUpdateListener(android.media.MediaPlayer.OnBufferingUpdateListener);
+ method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);
+ method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);
+ method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);
+ method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);
+ method public void setOnSeekCompleteListener(android.media.MediaPlayer.OnSeekCompleteListener);
+ method public void setOnTimedMetaDataAvailableListener(android.media.MediaPlayer.OnTimedMetaDataAvailableListener);
+ method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener);
+ method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener);
+ method public void setPlaybackParams(android.media.PlaybackParams);
+ method public void setScreenOnWhilePlaying(boolean);
+ method public void setSurface(android.view.Surface);
+ method public void setSyncParams(android.media.SyncParams);
+ method public void setVideoScalingMode(int);
+ method public void setVolume(float, float);
+ method public void setWakeMode(android.content.Context, int);
+ method public void start() throws java.lang.IllegalStateException;
+ method public void stop() throws java.lang.IllegalStateException;
+ field public static final int MEDIA_ERROR_IO = -1004; // 0xfffffc14
+ field public static final int MEDIA_ERROR_MALFORMED = -1007; // 0xfffffc11
+ field public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200; // 0xc8
+ field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64
+ field public static final int MEDIA_ERROR_TIMED_OUT = -110; // 0xffffff92
+ field public static final int MEDIA_ERROR_UNKNOWN = 1; // 0x1
+ field public static final int MEDIA_ERROR_UNSUPPORTED = -1010; // 0xfffffc0e
+ field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320
+ field public static final int MEDIA_INFO_BUFFERING_END = 702; // 0x2be
+ field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd
+ field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322
+ field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321
+ field public static final int MEDIA_INFO_SUBTITLE_TIMED_OUT = 902; // 0x386
+ field public static final int MEDIA_INFO_UNKNOWN = 1; // 0x1
+ field public static final int MEDIA_INFO_UNSUPPORTED_SUBTITLE = 901; // 0x385
+ field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3
+ field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
+ field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
+ field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1
+ field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2
+ }
+
+ public static abstract interface MediaPlayer.OnBufferingUpdateListener {
+ method public abstract void onBufferingUpdate(android.media.MediaPlayer, int);
+ }
+
+ public static abstract interface MediaPlayer.OnCompletionListener {
+ method public abstract void onCompletion(android.media.MediaPlayer);
+ }
+
+ public static abstract interface MediaPlayer.OnErrorListener {
+ method public abstract boolean onError(android.media.MediaPlayer, int, int);
+ }
+
+ public static abstract interface MediaPlayer.OnInfoListener {
+ method public abstract boolean onInfo(android.media.MediaPlayer, int, int);
+ }
+
+ public static abstract interface MediaPlayer.OnPreparedListener {
+ method public abstract void onPrepared(android.media.MediaPlayer);
+ }
+
+ public static abstract interface MediaPlayer.OnSeekCompleteListener {
+ method public abstract void onSeekComplete(android.media.MediaPlayer);
+ }
+
+ public static abstract interface MediaPlayer.OnTimedMetaDataAvailableListener {
+ method public abstract void onTimedMetaDataAvailable(android.media.MediaPlayer, android.media.TimedMetaData);
+ }
+
+ public static abstract interface MediaPlayer.OnTimedTextListener {
+ method public abstract void onTimedText(android.media.MediaPlayer, android.media.TimedText);
+ }
+
+ public static abstract interface MediaPlayer.OnVideoSizeChangedListener {
+ method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
+ }
+
+ public static class MediaPlayer.TrackInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.media.MediaFormat getFormat();
+ method public java.lang.String getLanguage();
+ method public int getTrackType();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int MEDIA_TRACK_TYPE_AUDIO = 2; // 0x2
+ field public static final int MEDIA_TRACK_TYPE_METADATA = 5; // 0x5
+ field public static final int MEDIA_TRACK_TYPE_SUBTITLE = 4; // 0x4
+ field public static final int MEDIA_TRACK_TYPE_TIMEDTEXT = 3; // 0x3
+ field public static final int MEDIA_TRACK_TYPE_UNKNOWN = 0; // 0x0
+ field public static final int MEDIA_TRACK_TYPE_VIDEO = 1; // 0x1
+ }
+
+ public class MediaRecorder {
+ ctor public MediaRecorder();
+ method public static final int getAudioSourceMax();
+ method public int getMaxAmplitude() throws java.lang.IllegalStateException;
+ method public android.view.Surface getSurface();
+ method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
+ method public void release();
+ method public void reset();
+ method public void setAudioChannels(int);
+ method public void setAudioEncoder(int) throws java.lang.IllegalStateException;
+ method public void setAudioEncodingBitRate(int);
+ method public void setAudioSamplingRate(int);
+ method public void setAudioSource(int) throws java.lang.IllegalStateException;
+ method public deprecated void setCamera(android.hardware.Camera);
+ method public void setCaptureRate(double);
+ method public void setInputSurface(android.view.Surface);
+ method public void setLocation(float, float);
+ method public void setMaxDuration(int) throws java.lang.IllegalArgumentException;
+ method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException;
+ method public void setOnErrorListener(android.media.MediaRecorder.OnErrorListener);
+ method public void setOnInfoListener(android.media.MediaRecorder.OnInfoListener);
+ method public void setOrientationHint(int);
+ method public void setOutputFile(java.io.FileDescriptor) throws java.lang.IllegalStateException;
+ method public void setOutputFile(java.lang.String) throws java.lang.IllegalStateException;
+ method public void setOutputFormat(int) throws java.lang.IllegalStateException;
+ method public void setPreviewDisplay(android.view.Surface);
+ method public void setProfile(android.media.CamcorderProfile);
+ method public void setVideoEncoder(int) throws java.lang.IllegalStateException;
+ method public void setVideoEncodingBitRate(int);
+ method public void setVideoFrameRate(int) throws java.lang.IllegalStateException;
+ method public void setVideoSize(int, int) throws java.lang.IllegalStateException;
+ method public void setVideoSource(int) throws java.lang.IllegalStateException;
+ method public void start() throws java.lang.IllegalStateException;
+ method public void stop() throws java.lang.IllegalStateException;
+ field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64
+ field public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1; // 0x1
+ field public static final int MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800; // 0x320
+ field public static final int MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801; // 0x321
+ field public static final int MEDIA_RECORDER_INFO_UNKNOWN = 1; // 0x1
+ }
+
+ public final class MediaRecorder.AudioEncoder {
+ field public static final int AAC = 3; // 0x3
+ field public static final int AAC_ELD = 5; // 0x5
+ field public static final int AMR_NB = 1; // 0x1
+ field public static final int AMR_WB = 2; // 0x2
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int HE_AAC = 4; // 0x4
+ field public static final int VORBIS = 6; // 0x6
+ }
+
+ public final class MediaRecorder.AudioSource {
+ field public static final int CAMCORDER = 5; // 0x5
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int MIC = 1; // 0x1
+ field public static final int REMOTE_SUBMIX = 8; // 0x8
+ field public static final int VOICE_CALL = 4; // 0x4
+ field public static final int VOICE_COMMUNICATION = 7; // 0x7
+ field public static final int VOICE_DOWNLINK = 3; // 0x3
+ field public static final int VOICE_RECOGNITION = 6; // 0x6
+ field public static final int VOICE_UPLINK = 2; // 0x2
+ }
+
+ public static abstract interface MediaRecorder.OnErrorListener {
+ method public abstract void onError(android.media.MediaRecorder, int, int);
+ }
+
+ public static abstract interface MediaRecorder.OnInfoListener {
+ method public abstract void onInfo(android.media.MediaRecorder, int, int);
+ }
+
+ public final class MediaRecorder.OutputFormat {
+ field public static final int AAC_ADTS = 6; // 0x6
+ field public static final int AMR_NB = 3; // 0x3
+ field public static final int AMR_WB = 4; // 0x4
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int MPEG_4 = 2; // 0x2
+ field public static final deprecated int RAW_AMR = 3; // 0x3
+ field public static final int THREE_GPP = 1; // 0x1
+ field public static final int WEBM = 9; // 0x9
+ }
+
+ public final class MediaRecorder.VideoEncoder {
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int H263 = 1; // 0x1
+ field public static final int H264 = 2; // 0x2
+ field public static final int MPEG_4_SP = 3; // 0x3
+ field public static final int VP8 = 4; // 0x4
+ }
+
+ public final class MediaRecorder.VideoSource {
+ field public static final int CAMERA = 1; // 0x1
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int SURFACE = 2; // 0x2
+ }
+
+ public class MediaRouter {
+ method public void addCallback(int, android.media.MediaRouter.Callback);
+ method public void addCallback(int, android.media.MediaRouter.Callback, int);
+ method public void addUserRoute(android.media.MediaRouter.UserRouteInfo);
+ method public void clearUserRoutes();
+ method public android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean);
+ method public android.media.MediaRouter.RouteCategory createRouteCategory(int, boolean);
+ method public android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory);
+ method public android.media.MediaRouter.RouteCategory getCategoryAt(int);
+ method public int getCategoryCount();
+ method public android.media.MediaRouter.RouteInfo getDefaultRoute();
+ method public android.media.MediaRouter.RouteInfo getRouteAt(int);
+ method public int getRouteCount();
+ method public android.media.MediaRouter.RouteInfo getSelectedRoute(int);
+ method public void removeCallback(android.media.MediaRouter.Callback);
+ method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo);
+ method public void selectRoute(int, android.media.MediaRouter.RouteInfo);
+ field public static final int CALLBACK_FLAG_PERFORM_ACTIVE_SCAN = 1; // 0x1
+ field public static final int CALLBACK_FLAG_UNFILTERED_EVENTS = 2; // 0x2
+ field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1
+ field public static final int ROUTE_TYPE_LIVE_VIDEO = 2; // 0x2
+ field public static final int ROUTE_TYPE_USER = 8388608; // 0x800000
+ }
+
+ public static abstract class MediaRouter.Callback {
+ ctor public MediaRouter.Callback();
+ method public abstract void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public abstract void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public abstract void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int);
+ method public void onRoutePresentationDisplayChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public abstract void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
+ method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);
+ method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
+ method public abstract void onRouteVolumeChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ }
+
+ public static class MediaRouter.RouteCategory {
+ method public java.lang.CharSequence getName();
+ method public java.lang.CharSequence getName(android.content.Context);
+ method public java.util.List<android.media.MediaRouter.RouteInfo> getRoutes(java.util.List<android.media.MediaRouter.RouteInfo>);
+ method public int getSupportedTypes();
+ method public boolean isGroupable();
+ }
+
+ public static class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {
+ method public void addRoute(android.media.MediaRouter.RouteInfo);
+ method public void addRoute(android.media.MediaRouter.RouteInfo, int);
+ method public android.media.MediaRouter.RouteInfo getRouteAt(int);
+ method public int getRouteCount();
+ method public void removeRoute(android.media.MediaRouter.RouteInfo);
+ method public void removeRoute(int);
+ method public void setIconDrawable(android.graphics.drawable.Drawable);
+ method public void setIconResource(int);
+ }
+
+ public static class MediaRouter.RouteInfo {
+ method public android.media.MediaRouter.RouteCategory getCategory();
+ method public java.lang.CharSequence getDescription();
+ method public android.media.MediaRouter.RouteGroup getGroup();
+ method public android.graphics.drawable.Drawable getIconDrawable();
+ method public java.lang.CharSequence getName();
+ method public java.lang.CharSequence getName(android.content.Context);
+ method public int getPlaybackStream();
+ method public int getPlaybackType();
+ method public android.view.Display getPresentationDisplay();
+ method public java.lang.CharSequence getStatus();
+ method public int getSupportedTypes();
+ method public java.lang.Object getTag();
+ method public int getVolume();
+ method public int getVolumeHandling();
+ method public int getVolumeMax();
+ method public boolean isConnecting();
+ method public boolean isEnabled();
+ method public void requestSetVolume(int);
+ method public void requestUpdateVolume(int);
+ method public void setTag(java.lang.Object);
+ field public static final int PLAYBACK_TYPE_LOCAL = 0; // 0x0
+ field public static final int PLAYBACK_TYPE_REMOTE = 1; // 0x1
+ field public static final int PLAYBACK_VOLUME_FIXED = 0; // 0x0
+ field public static final int PLAYBACK_VOLUME_VARIABLE = 1; // 0x1
+ }
+
+ public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback {
+ ctor public MediaRouter.SimpleCallback();
+ method public void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int);
+ method public void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
+ method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);
+ method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
+ method public void onRouteVolumeChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);
+ }
+
+ public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
+ method public android.media.RemoteControlClient getRemoteControlClient();
+ method public void setDescription(java.lang.CharSequence);
+ method public void setIconDrawable(android.graphics.drawable.Drawable);
+ method public void setIconResource(int);
+ method public void setName(java.lang.CharSequence);
+ method public void setName(int);
+ method public void setPlaybackStream(int);
+ method public void setPlaybackType(int);
+ method public void setRemoteControlClient(android.media.RemoteControlClient);
+ method public void setStatus(java.lang.CharSequence);
+ method public void setVolume(int);
+ method public void setVolumeCallback(android.media.MediaRouter.VolumeCallback);
+ method public void setVolumeHandling(int);
+ method public void setVolumeMax(int);
+ }
+
+ public static abstract class MediaRouter.VolumeCallback {
+ ctor public MediaRouter.VolumeCallback();
+ method public abstract void onVolumeSetRequest(android.media.MediaRouter.RouteInfo, int);
+ method public abstract void onVolumeUpdateRequest(android.media.MediaRouter.RouteInfo, int);
+ }
+
+ public class MediaScannerConnection implements android.content.ServiceConnection {
+ ctor public MediaScannerConnection(android.content.Context, android.media.MediaScannerConnection.MediaScannerConnectionClient);
+ method public void connect();
+ method public void disconnect();
+ method public synchronized boolean isConnected();
+ method public void onServiceConnected(android.content.ComponentName, android.os.IBinder);
+ method public void onServiceDisconnected(android.content.ComponentName);
+ method public void scanFile(java.lang.String, java.lang.String);
+ method public static void scanFile(android.content.Context, java.lang.String[], java.lang.String[], android.media.MediaScannerConnection.OnScanCompletedListener);
+ }
+
+ public static abstract interface MediaScannerConnection.MediaScannerConnectionClient implements android.media.MediaScannerConnection.OnScanCompletedListener {
+ method public abstract void onMediaScannerConnected();
+ method public abstract void onScanCompleted(java.lang.String, android.net.Uri);
+ }
+
+ public static abstract interface MediaScannerConnection.OnScanCompletedListener {
+ method public abstract void onScanCompleted(java.lang.String, android.net.Uri);
+ }
+
+ public final class MediaSync {
+ ctor public MediaSync();
+ method public final android.view.Surface createInputSurface();
+ method public void flush();
+ method public android.media.PlaybackParams getPlaybackParams();
+ method public android.media.SyncParams getSyncParams();
+ method public android.media.MediaTimestamp getTimestamp();
+ method public void queueAudio(java.nio.ByteBuffer, int, long);
+ method public final void release();
+ method public void setAudioTrack(android.media.AudioTrack);
+ method public void setCallback(android.media.MediaSync.Callback, android.os.Handler);
+ method public void setOnErrorListener(android.media.MediaSync.OnErrorListener, android.os.Handler);
+ method public void setPlaybackParams(android.media.PlaybackParams);
+ method public void setSurface(android.view.Surface);
+ method public void setSyncParams(android.media.SyncParams);
+ field public static final int MEDIASYNC_ERROR_AUDIOTRACK_FAIL = 1; // 0x1
+ field public static final int MEDIASYNC_ERROR_SURFACE_FAIL = 2; // 0x2
+ }
+
+ public static abstract class MediaSync.Callback {
+ ctor public MediaSync.Callback();
+ method public abstract void onAudioBufferConsumed(android.media.MediaSync, java.nio.ByteBuffer, int);
+ }
+
+ public static abstract interface MediaSync.OnErrorListener {
+ method public abstract void onError(android.media.MediaSync, int, int);
+ }
+
+ public class MediaSyncEvent {
+ method public static android.media.MediaSyncEvent createEvent(int) throws java.lang.IllegalArgumentException;
+ method public int getAudioSessionId();
+ method public int getType();
+ method public android.media.MediaSyncEvent setAudioSessionId(int) throws java.lang.IllegalArgumentException;
+ field public static final int SYNC_EVENT_NONE = 0; // 0x0
+ field public static final int SYNC_EVENT_PRESENTATION_COMPLETE = 1; // 0x1
+ }
+
+ public final class MediaTimestamp {
+ method public long getAnchorMediaTimeUs();
+ method public long getAnchorSytemNanoTime();
+ method public float getMediaClockRate();
+ }
+
+ public final class NotProvisionedException extends android.media.MediaDrmException {
+ ctor public NotProvisionedException(java.lang.String);
+ }
+
+ public final class PlaybackParams implements android.os.Parcelable {
+ ctor public PlaybackParams();
+ method public android.media.PlaybackParams allowDefaults();
+ method public int describeContents();
+ method public int getAudioFallbackMode();
+ method public float getPitch();
+ method public float getSpeed();
+ method public android.media.PlaybackParams setAudioFallbackMode(int);
+ method public android.media.PlaybackParams setPitch(float);
+ method public android.media.PlaybackParams setSpeed(float);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0
+ field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2
+ field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.media.PlaybackParams> CREATOR;
+ }
+
+ public final class Rating implements android.os.Parcelable {
+ method public int describeContents();
+ method public float getPercentRating();
+ method public int getRatingStyle();
+ method public float getStarRating();
+ method public boolean hasHeart();
+ method public boolean isRated();
+ method public boolean isThumbUp();
+ method public static android.media.Rating newHeartRating(boolean);
+ method public static android.media.Rating newPercentageRating(float);
+ method public static android.media.Rating newStarRating(int, float);
+ method public static android.media.Rating newThumbRating(boolean);
+ method public static android.media.Rating newUnratedRating(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.Rating> CREATOR;
+ field public static final int RATING_3_STARS = 3; // 0x3
+ field public static final int RATING_4_STARS = 4; // 0x4
+ field public static final int RATING_5_STARS = 5; // 0x5
+ field public static final int RATING_HEART = 1; // 0x1
+ field public static final int RATING_NONE = 0; // 0x0
+ field public static final int RATING_PERCENTAGE = 6; // 0x6
+ field public static final int RATING_THUMB_UP_DOWN = 2; // 0x2
+ }
+
+ public deprecated class RemoteControlClient {
+ ctor public RemoteControlClient(android.app.PendingIntent);
+ ctor public RemoteControlClient(android.app.PendingIntent, android.os.Looper);
+ method public android.media.RemoteControlClient.MetadataEditor editMetadata(boolean);
+ method public android.media.session.MediaSession getMediaSession();
+ method public void setMetadataUpdateListener(android.media.RemoteControlClient.OnMetadataUpdateListener);
+ method public void setOnGetPlaybackPositionListener(android.media.RemoteControlClient.OnGetPlaybackPositionListener);
+ method public void setPlaybackPositionUpdateListener(android.media.RemoteControlClient.OnPlaybackPositionUpdateListener);
+ method public void setPlaybackState(int);
+ method public void setPlaybackState(int, long, float);
+ method public void setTransportControlFlags(int);
+ field public static final int FLAG_KEY_MEDIA_FAST_FORWARD = 64; // 0x40
+ field public static final int FLAG_KEY_MEDIA_NEXT = 128; // 0x80
+ field public static final int FLAG_KEY_MEDIA_PAUSE = 16; // 0x10
+ field public static final int FLAG_KEY_MEDIA_PLAY = 4; // 0x4
+ field public static final int FLAG_KEY_MEDIA_PLAY_PAUSE = 8; // 0x8
+ field public static final int FLAG_KEY_MEDIA_POSITION_UPDATE = 256; // 0x100
+ field public static final int FLAG_KEY_MEDIA_PREVIOUS = 1; // 0x1
+ field public static final int FLAG_KEY_MEDIA_RATING = 512; // 0x200
+ field public static final int FLAG_KEY_MEDIA_REWIND = 2; // 0x2
+ field public static final int FLAG_KEY_MEDIA_STOP = 32; // 0x20
+ field public static final int PLAYSTATE_BUFFERING = 8; // 0x8
+ field public static final int PLAYSTATE_ERROR = 9; // 0x9
+ field public static final int PLAYSTATE_FAST_FORWARDING = 4; // 0x4
+ field public static final int PLAYSTATE_PAUSED = 2; // 0x2
+ field public static final int PLAYSTATE_PLAYING = 3; // 0x3
+ field public static final int PLAYSTATE_REWINDING = 5; // 0x5
+ field public static final int PLAYSTATE_SKIPPING_BACKWARDS = 7; // 0x7
+ field public static final int PLAYSTATE_SKIPPING_FORWARDS = 6; // 0x6
+ field public static final int PLAYSTATE_STOPPED = 1; // 0x1
+ }
+
+ public deprecated class RemoteControlClient.MetadataEditor extends android.media.MediaMetadataEditor {
+ method public synchronized void apply();
+ field public static final int BITMAP_KEY_ARTWORK = 100; // 0x64
+ }
+
+ public static abstract interface RemoteControlClient.OnGetPlaybackPositionListener {
+ method public abstract long onGetPlaybackPosition();
+ }
+
+ public static abstract interface RemoteControlClient.OnMetadataUpdateListener {
+ method public abstract void onMetadataUpdate(int, java.lang.Object);
+ }
+
+ public static abstract interface RemoteControlClient.OnPlaybackPositionUpdateListener {
+ method public abstract void onPlaybackPositionUpdate(long);
+ }
+
+ public final deprecated class RemoteController {
+ ctor public RemoteController(android.content.Context, android.media.RemoteController.OnClientUpdateListener) throws java.lang.IllegalArgumentException;
+ ctor public RemoteController(android.content.Context, android.media.RemoteController.OnClientUpdateListener, android.os.Looper) throws java.lang.IllegalArgumentException;
+ method public boolean clearArtworkConfiguration();
+ method public android.media.RemoteController.MetadataEditor editMetadata();
+ method public long getEstimatedMediaPosition();
+ method public boolean seekTo(long) throws java.lang.IllegalArgumentException;
+ method public boolean sendMediaKeyEvent(android.view.KeyEvent) throws java.lang.IllegalArgumentException;
+ method public boolean setArtworkConfiguration(int, int) throws java.lang.IllegalArgumentException;
+ method public boolean setSynchronizationMode(int) throws java.lang.IllegalArgumentException;
+ field public static final int POSITION_SYNCHRONIZATION_CHECK = 1; // 0x1
+ field public static final int POSITION_SYNCHRONIZATION_NONE = 0; // 0x0
+ }
+
+ public class RemoteController.MetadataEditor extends android.media.MediaMetadataEditor {
+ method public synchronized void apply();
+ }
+
+ public static abstract interface RemoteController.OnClientUpdateListener {
+ method public abstract void onClientChange(boolean);
+ method public abstract void onClientMetadataUpdate(android.media.RemoteController.MetadataEditor);
+ method public abstract void onClientPlaybackStateUpdate(int);
+ method public abstract void onClientPlaybackStateUpdate(int, long, long, float);
+ method public abstract void onClientTransportControlUpdate(int);
+ }
+
+ public final class ResourceBusyException extends android.media.MediaDrmException {
+ ctor public ResourceBusyException(java.lang.String);
+ }
+
+ public class Ringtone {
+ method public android.media.AudioAttributes getAudioAttributes();
+ method public deprecated int getStreamType();
+ method public java.lang.String getTitle(android.content.Context);
+ method public boolean isPlaying();
+ method public void play();
+ method public void setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+ method public deprecated void setStreamType(int);
+ method public void stop();
+ }
+
+ public class RingtoneManager {
+ ctor public RingtoneManager(android.app.Activity);
+ ctor public RingtoneManager(android.content.Context);
+ method public static android.net.Uri getActualDefaultRingtoneUri(android.content.Context, int);
+ method public android.database.Cursor getCursor();
+ method public static int getDefaultType(android.net.Uri);
+ method public static android.net.Uri getDefaultUri(int);
+ method public deprecated boolean getIncludeDrm();
+ method public android.media.Ringtone getRingtone(int);
+ method public static android.media.Ringtone getRingtone(android.content.Context, android.net.Uri);
+ method public int getRingtonePosition(android.net.Uri);
+ method public android.net.Uri getRingtoneUri(int);
+ method public boolean getStopPreviousRingtone();
+ method public static android.net.Uri getValidRingtoneUri(android.content.Context);
+ method public int inferStreamType();
+ method public static boolean isDefault(android.net.Uri);
+ method public static void setActualDefaultRingtoneUri(android.content.Context, int, android.net.Uri);
+ method public deprecated void setIncludeDrm(boolean);
+ method public void setStopPreviousRingtone(boolean);
+ method public void setType(int);
+ method public void stopPreviousRingtone();
+ field public static final java.lang.String ACTION_RINGTONE_PICKER = "android.intent.action.RINGTONE_PICKER";
+ field public static final java.lang.String EXTRA_RINGTONE_DEFAULT_URI = "android.intent.extra.ringtone.DEFAULT_URI";
+ field public static final java.lang.String EXTRA_RINGTONE_EXISTING_URI = "android.intent.extra.ringtone.EXISTING_URI";
+ field public static final deprecated java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";
+ field public static final java.lang.String EXTRA_RINGTONE_PICKED_URI = "android.intent.extra.ringtone.PICKED_URI";
+ field public static final java.lang.String EXTRA_RINGTONE_SHOW_DEFAULT = "android.intent.extra.ringtone.SHOW_DEFAULT";
+ field public static final java.lang.String EXTRA_RINGTONE_SHOW_SILENT = "android.intent.extra.ringtone.SHOW_SILENT";
+ field public static final java.lang.String EXTRA_RINGTONE_TITLE = "android.intent.extra.ringtone.TITLE";
+ field public static final java.lang.String EXTRA_RINGTONE_TYPE = "android.intent.extra.ringtone.TYPE";
+ field public static final int ID_COLUMN_INDEX = 0; // 0x0
+ field public static final int TITLE_COLUMN_INDEX = 1; // 0x1
+ field public static final int TYPE_ALARM = 4; // 0x4
+ field public static final int TYPE_ALL = 7; // 0x7
+ field public static final int TYPE_NOTIFICATION = 2; // 0x2
+ field public static final int TYPE_RINGTONE = 1; // 0x1
+ field public static final int URI_COLUMN_INDEX = 2; // 0x2
+ }
+
+ public class SoundPool {
+ ctor public deprecated SoundPool(int, int, int);
+ method public final void autoPause();
+ method public final void autoResume();
+ method public int load(java.lang.String, int);
+ method public int load(android.content.Context, int, int);
+ method public int load(android.content.res.AssetFileDescriptor, int);
+ method public int load(java.io.FileDescriptor, long, long, int);
+ method public final void pause(int);
+ method public final int play(int, float, float, int, int, float);
+ method public final void release();
+ method public final void resume(int);
+ method public final void setLoop(int, int);
+ method public void setOnLoadCompleteListener(android.media.SoundPool.OnLoadCompleteListener);
+ method public final void setPriority(int, int);
+ method public final void setRate(int, float);
+ method public final void setVolume(int, float, float);
+ method public final void stop(int);
+ method public final boolean unload(int);
+ }
+
+ public static class SoundPool.Builder {
+ ctor public SoundPool.Builder();
+ method public android.media.SoundPool build();
+ method public android.media.SoundPool.Builder setAudioAttributes(android.media.AudioAttributes) throws java.lang.IllegalArgumentException;
+ method public android.media.SoundPool.Builder setMaxStreams(int) throws java.lang.IllegalArgumentException;
+ }
+
+ public static abstract interface SoundPool.OnLoadCompleteListener {
+ method public abstract void onLoadComplete(android.media.SoundPool, int, int);
+ }
+
+ public final class SyncParams {
+ ctor public SyncParams();
+ method public android.media.SyncParams allowDefaults();
+ method public int getAudioAdjustMode();
+ method public float getFrameRate();
+ method public int getSyncSource();
+ method public float getTolerance();
+ method public android.media.SyncParams setAudioAdjustMode(int);
+ method public android.media.SyncParams setFrameRate(float);
+ method public android.media.SyncParams setSyncSource(int);
+ method public android.media.SyncParams setTolerance(float);
+ field public static final int AUDIO_ADJUST_MODE_DEFAULT = 0; // 0x0
+ field public static final int AUDIO_ADJUST_MODE_RESAMPLE = 2; // 0x2
+ field public static final int AUDIO_ADJUST_MODE_STRETCH = 1; // 0x1
+ field public static final int SYNC_SOURCE_AUDIO = 2; // 0x2
+ field public static final int SYNC_SOURCE_DEFAULT = 0; // 0x0
+ field public static final int SYNC_SOURCE_SYSTEM_CLOCK = 1; // 0x1
+ field public static final int SYNC_SOURCE_VSYNC = 3; // 0x3
+ }
+
+ public class ThumbnailUtils {
+ ctor public ThumbnailUtils();
+ method public static android.graphics.Bitmap createVideoThumbnail(java.lang.String, int);
+ method public static android.graphics.Bitmap extractThumbnail(android.graphics.Bitmap, int, int);
+ method public static android.graphics.Bitmap extractThumbnail(android.graphics.Bitmap, int, int, int);
+ field public static final int OPTIONS_RECYCLE_INPUT = 2; // 0x2
+ }
+
+ public final class TimedMetaData {
+ method public byte[] getMetaData();
+ method public long getTimestamp();
+ }
+
+ public final class TimedText {
+ method public android.graphics.Rect getBounds();
+ method public java.lang.String getText();
+ }
+
+ public class ToneGenerator {
+ ctor public ToneGenerator(int, int);
+ method public final int getAudioSessionId();
+ method public void release();
+ method public boolean startTone(int);
+ method public boolean startTone(int, int);
+ method public void stopTone();
+ field public static final int MAX_VOLUME = 100; // 0x64
+ field public static final int MIN_VOLUME = 0; // 0x0
+ field public static final int TONE_CDMA_ABBR_ALERT = 97; // 0x61
+ field public static final int TONE_CDMA_ABBR_INTERCEPT = 37; // 0x25
+ field public static final int TONE_CDMA_ABBR_REORDER = 39; // 0x27
+ field public static final int TONE_CDMA_ALERT_AUTOREDIAL_LITE = 87; // 0x57
+ field public static final int TONE_CDMA_ALERT_CALL_GUARD = 93; // 0x5d
+ field public static final int TONE_CDMA_ALERT_INCALL_LITE = 91; // 0x5b
+ field public static final int TONE_CDMA_ALERT_NETWORK_LITE = 86; // 0x56
+ field public static final int TONE_CDMA_ANSWER = 42; // 0x2a
+ field public static final int TONE_CDMA_CALLDROP_LITE = 95; // 0x5f
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP = 46; // 0x2e
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL = 45; // 0x2d
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_PAT3 = 48; // 0x30
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_PAT5 = 50; // 0x32
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_PAT6 = 51; // 0x33
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_PAT7 = 52; // 0x34
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING = 49; // 0x31
+ field public static final int TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI = 47; // 0x2f
+ field public static final int TONE_CDMA_CONFIRM = 41; // 0x29
+ field public static final int TONE_CDMA_DIAL_TONE_LITE = 34; // 0x22
+ field public static final int TONE_CDMA_EMERGENCY_RINGBACK = 92; // 0x5c
+ field public static final int TONE_CDMA_HIGH_L = 53; // 0x35
+ field public static final int TONE_CDMA_HIGH_PBX_L = 71; // 0x47
+ field public static final int TONE_CDMA_HIGH_PBX_SLS = 80; // 0x50
+ field public static final int TONE_CDMA_HIGH_PBX_SS = 74; // 0x4a
+ field public static final int TONE_CDMA_HIGH_PBX_SSL = 77; // 0x4d
+ field public static final int TONE_CDMA_HIGH_PBX_S_X4 = 83; // 0x53
+ field public static final int TONE_CDMA_HIGH_SLS = 65; // 0x41
+ field public static final int TONE_CDMA_HIGH_SS = 56; // 0x38
+ field public static final int TONE_CDMA_HIGH_SSL = 59; // 0x3b
+ field public static final int TONE_CDMA_HIGH_SS_2 = 62; // 0x3e
+ field public static final int TONE_CDMA_HIGH_S_X4 = 68; // 0x44
+ field public static final int TONE_CDMA_INTERCEPT = 36; // 0x24
+ field public static final int TONE_CDMA_KEYPAD_VOLUME_KEY_LITE = 89; // 0x59
+ field public static final int TONE_CDMA_LOW_L = 55; // 0x37
+ field public static final int TONE_CDMA_LOW_PBX_L = 73; // 0x49
+ field public static final int TONE_CDMA_LOW_PBX_SLS = 82; // 0x52
+ field public static final int TONE_CDMA_LOW_PBX_SS = 76; // 0x4c
+ field public static final int TONE_CDMA_LOW_PBX_SSL = 79; // 0x4f
+ field public static final int TONE_CDMA_LOW_PBX_S_X4 = 85; // 0x55
+ field public static final int TONE_CDMA_LOW_SLS = 67; // 0x43
+ field public static final int TONE_CDMA_LOW_SS = 58; // 0x3a
+ field public static final int TONE_CDMA_LOW_SSL = 61; // 0x3d
+ field public static final int TONE_CDMA_LOW_SS_2 = 64; // 0x40
+ field public static final int TONE_CDMA_LOW_S_X4 = 70; // 0x46
+ field public static final int TONE_CDMA_MED_L = 54; // 0x36
+ field public static final int TONE_CDMA_MED_PBX_L = 72; // 0x48
+ field public static final int TONE_CDMA_MED_PBX_SLS = 81; // 0x51
+ field public static final int TONE_CDMA_MED_PBX_SS = 75; // 0x4b
+ field public static final int TONE_CDMA_MED_PBX_SSL = 78; // 0x4e
+ field public static final int TONE_CDMA_MED_PBX_S_X4 = 84; // 0x54
+ field public static final int TONE_CDMA_MED_SLS = 66; // 0x42
+ field public static final int TONE_CDMA_MED_SS = 57; // 0x39
+ field public static final int TONE_CDMA_MED_SSL = 60; // 0x3c
+ field public static final int TONE_CDMA_MED_SS_2 = 63; // 0x3f
+ field public static final int TONE_CDMA_MED_S_X4 = 69; // 0x45
+ field public static final int TONE_CDMA_NETWORK_BUSY = 40; // 0x28
+ field public static final int TONE_CDMA_NETWORK_BUSY_ONE_SHOT = 96; // 0x60
+ field public static final int TONE_CDMA_NETWORK_CALLWAITING = 43; // 0x2b
+ field public static final int TONE_CDMA_NETWORK_USA_RINGBACK = 35; // 0x23
+ field public static final int TONE_CDMA_ONE_MIN_BEEP = 88; // 0x58
+ field public static final int TONE_CDMA_PIP = 44; // 0x2c
+ field public static final int TONE_CDMA_PRESSHOLDKEY_LITE = 90; // 0x5a
+ field public static final int TONE_CDMA_REORDER = 38; // 0x26
+ field public static final int TONE_CDMA_SIGNAL_OFF = 98; // 0x62
+ field public static final int TONE_CDMA_SOFT_ERROR_LITE = 94; // 0x5e
+ field public static final int TONE_DTMF_0 = 0; // 0x0
+ field public static final int TONE_DTMF_1 = 1; // 0x1
+ field public static final int TONE_DTMF_2 = 2; // 0x2
+ field public static final int TONE_DTMF_3 = 3; // 0x3
+ field public static final int TONE_DTMF_4 = 4; // 0x4
+ field public static final int TONE_DTMF_5 = 5; // 0x5
+ field public static final int TONE_DTMF_6 = 6; // 0x6
+ field public static final int TONE_DTMF_7 = 7; // 0x7
+ field public static final int TONE_DTMF_8 = 8; // 0x8
+ field public static final int TONE_DTMF_9 = 9; // 0x9
+ field public static final int TONE_DTMF_A = 12; // 0xc
+ field public static final int TONE_DTMF_B = 13; // 0xd
+ field public static final int TONE_DTMF_C = 14; // 0xe
+ field public static final int TONE_DTMF_D = 15; // 0xf
+ field public static final int TONE_DTMF_P = 11; // 0xb
+ field public static final int TONE_DTMF_S = 10; // 0xa
+ field public static final int TONE_PROP_ACK = 25; // 0x19
+ field public static final int TONE_PROP_BEEP = 24; // 0x18
+ field public static final int TONE_PROP_BEEP2 = 28; // 0x1c
+ field public static final int TONE_PROP_NACK = 26; // 0x1a
+ field public static final int TONE_PROP_PROMPT = 27; // 0x1b
+ field public static final int TONE_SUP_BUSY = 17; // 0x11
+ field public static final int TONE_SUP_CALL_WAITING = 22; // 0x16
+ field public static final int TONE_SUP_CONFIRM = 32; // 0x20
+ field public static final int TONE_SUP_CONGESTION = 18; // 0x12
+ field public static final int TONE_SUP_CONGESTION_ABBREV = 31; // 0x1f
+ field public static final int TONE_SUP_DIAL = 16; // 0x10
+ field public static final int TONE_SUP_ERROR = 21; // 0x15
+ field public static final int TONE_SUP_INTERCEPT = 29; // 0x1d
+ field public static final int TONE_SUP_INTERCEPT_ABBREV = 30; // 0x1e
+ field public static final int TONE_SUP_PIP = 33; // 0x21
+ field public static final int TONE_SUP_RADIO_ACK = 19; // 0x13
+ field public static final int TONE_SUP_RADIO_NOTAVAIL = 20; // 0x14
+ field public static final int TONE_SUP_RINGTONE = 23; // 0x17
+ }
+
+ public final class UnsupportedSchemeException extends android.media.MediaDrmException {
+ ctor public UnsupportedSchemeException(java.lang.String);
+ }
+
+ public abstract class VolumeProvider {
+ ctor public VolumeProvider(int, int, int);
+ method public final int getCurrentVolume();
+ method public final int getMaxVolume();
+ method public final int getVolumeControl();
+ method public void onAdjustVolume(int);
+ method public void onSetVolumeTo(int);
+ method public final void setCurrentVolume(int);
+ field public static final int VOLUME_CONTROL_ABSOLUTE = 2; // 0x2
+ field public static final int VOLUME_CONTROL_FIXED = 0; // 0x0
+ field public static final int VOLUME_CONTROL_RELATIVE = 1; // 0x1
+ }
+
+}
+
+package android.media.audiofx {
+
+ public class AcousticEchoCanceler extends android.media.audiofx.AudioEffect {
+ method public static android.media.audiofx.AcousticEchoCanceler create(int);
+ method public static boolean isAvailable();
+ }
+
+ public class AudioEffect {
+ method public android.media.audiofx.AudioEffect.Descriptor getDescriptor() throws java.lang.IllegalStateException;
+ method public boolean getEnabled() throws java.lang.IllegalStateException;
+ method public int getId() throws java.lang.IllegalStateException;
+ method public boolean hasControl() throws java.lang.IllegalStateException;
+ method public static android.media.audiofx.AudioEffect.Descriptor[] queryEffects();
+ method public void release();
+ method public void setControlStatusListener(android.media.audiofx.AudioEffect.OnControlStatusChangeListener);
+ method public void setEnableStatusListener(android.media.audiofx.AudioEffect.OnEnableStatusChangeListener);
+ method public int setEnabled(boolean) throws java.lang.IllegalStateException;
+ field public static final java.lang.String ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION = "android.media.action.CLOSE_AUDIO_EFFECT_CONTROL_SESSION";
+ field public static final java.lang.String ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL = "android.media.action.DISPLAY_AUDIO_EFFECT_CONTROL_PANEL";
+ field public static final java.lang.String ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION = "android.media.action.OPEN_AUDIO_EFFECT_CONTROL_SESSION";
+ field public static final int ALREADY_EXISTS = -2; // 0xfffffffe
+ field public static final int CONTENT_TYPE_GAME = 2; // 0x2
+ field public static final int CONTENT_TYPE_MOVIE = 1; // 0x1
+ field public static final int CONTENT_TYPE_MUSIC = 0; // 0x0
+ field public static final int CONTENT_TYPE_VOICE = 3; // 0x3
+ field public static final java.lang.String EFFECT_AUXILIARY = "Auxiliary";
+ field public static final java.lang.String EFFECT_INSERT = "Insert";
+ field public static final java.util.UUID EFFECT_TYPE_AEC;
+ field public static final java.util.UUID EFFECT_TYPE_AGC;
+ field public static final java.util.UUID EFFECT_TYPE_BASS_BOOST;
+ field public static final java.util.UUID EFFECT_TYPE_ENV_REVERB;
+ field public static final java.util.UUID EFFECT_TYPE_EQUALIZER;
+ field public static final java.util.UUID EFFECT_TYPE_LOUDNESS_ENHANCER;
+ field public static final java.util.UUID EFFECT_TYPE_NS;
+ field public static final java.util.UUID EFFECT_TYPE_PRESET_REVERB;
+ field public static final java.util.UUID EFFECT_TYPE_VIRTUALIZER;
+ field public static final int ERROR = -1; // 0xffffffff
+ field public static final int ERROR_BAD_VALUE = -4; // 0xfffffffc
+ field public static final int ERROR_DEAD_OBJECT = -7; // 0xfffffff9
+ field public static final int ERROR_INVALID_OPERATION = -5; // 0xfffffffb
+ field public static final int ERROR_NO_INIT = -3; // 0xfffffffd
+ field public static final int ERROR_NO_MEMORY = -6; // 0xfffffffa
+ field public static final java.lang.String EXTRA_AUDIO_SESSION = "android.media.extra.AUDIO_SESSION";
+ field public static final java.lang.String EXTRA_CONTENT_TYPE = "android.media.extra.CONTENT_TYPE";
+ field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.media.extra.PACKAGE_NAME";
+ field public static final int SUCCESS = 0; // 0x0
+ }
+
+ public static class AudioEffect.Descriptor {
+ ctor public AudioEffect.Descriptor();
+ ctor public AudioEffect.Descriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ field public java.lang.String connectMode;
+ field public java.lang.String implementor;
+ field public java.lang.String name;
+ field public java.util.UUID type;
+ field public java.util.UUID uuid;
+ }
+
+ public static abstract interface AudioEffect.OnControlStatusChangeListener {
+ method public abstract void onControlStatusChange(android.media.audiofx.AudioEffect, boolean);
+ }
+
+ public static abstract interface AudioEffect.OnEnableStatusChangeListener {
+ method public abstract void onEnableStatusChange(android.media.audiofx.AudioEffect, boolean);
+ }
+
+ public class AutomaticGainControl extends android.media.audiofx.AudioEffect {
+ method public static android.media.audiofx.AutomaticGainControl create(int);
+ method public static boolean isAvailable();
+ }
+
+ public class BassBoost extends android.media.audiofx.AudioEffect {
+ ctor public BassBoost(int, int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public android.media.audiofx.BassBoost.Settings getProperties() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getRoundedStrength() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public boolean getStrengthSupported();
+ method public void setParameterListener(android.media.audiofx.BassBoost.OnParameterChangeListener);
+ method public void setProperties(android.media.audiofx.BassBoost.Settings) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setStrength(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ field public static final int PARAM_STRENGTH = 1; // 0x1
+ field public static final int PARAM_STRENGTH_SUPPORTED = 0; // 0x0
+ }
+
+ public static abstract interface BassBoost.OnParameterChangeListener {
+ method public abstract void onParameterChange(android.media.audiofx.BassBoost, int, int, short);
+ }
+
+ public static class BassBoost.Settings {
+ ctor public BassBoost.Settings();
+ ctor public BassBoost.Settings(java.lang.String);
+ field public short strength;
+ }
+
+ public class EnvironmentalReverb extends android.media.audiofx.AudioEffect {
+ ctor public EnvironmentalReverb(int, int) throws java.lang.IllegalArgumentException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public short getDecayHFRatio() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public int getDecayTime() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getDensity() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getDiffusion() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public android.media.audiofx.EnvironmentalReverb.Settings getProperties() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public int getReflectionsDelay() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getReflectionsLevel() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public int getReverbDelay() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getReverbLevel() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getRoomHFLevel() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getRoomLevel() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setDecayHFRatio(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setDecayTime(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setDensity(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setDiffusion(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setParameterListener(android.media.audiofx.EnvironmentalReverb.OnParameterChangeListener);
+ method public void setProperties(android.media.audiofx.EnvironmentalReverb.Settings) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setReflectionsDelay(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setReflectionsLevel(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setReverbDelay(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setReverbLevel(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setRoomHFLevel(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setRoomLevel(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ field public static final int PARAM_DECAY_HF_RATIO = 3; // 0x3
+ field public static final int PARAM_DECAY_TIME = 2; // 0x2
+ field public static final int PARAM_DENSITY = 9; // 0x9
+ field public static final int PARAM_DIFFUSION = 8; // 0x8
+ field public static final int PARAM_REFLECTIONS_DELAY = 5; // 0x5
+ field public static final int PARAM_REFLECTIONS_LEVEL = 4; // 0x4
+ field public static final int PARAM_REVERB_DELAY = 7; // 0x7
+ field public static final int PARAM_REVERB_LEVEL = 6; // 0x6
+ field public static final int PARAM_ROOM_HF_LEVEL = 1; // 0x1
+ field public static final int PARAM_ROOM_LEVEL = 0; // 0x0
+ }
+
+ public static abstract interface EnvironmentalReverb.OnParameterChangeListener {
+ method public abstract void onParameterChange(android.media.audiofx.EnvironmentalReverb, int, int, int);
+ }
+
+ public static class EnvironmentalReverb.Settings {
+ ctor public EnvironmentalReverb.Settings();
+ ctor public EnvironmentalReverb.Settings(java.lang.String);
+ field public short decayHFRatio;
+ field public int decayTime;
+ field public short density;
+ field public short diffusion;
+ field public int reflectionsDelay;
+ field public short reflectionsLevel;
+ field public int reverbDelay;
+ field public short reverbLevel;
+ field public short roomHFLevel;
+ field public short roomLevel;
+ }
+
+ public class Equalizer extends android.media.audiofx.AudioEffect {
+ ctor public Equalizer(int, int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public short getBand(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public int[] getBandFreqRange(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getBandLevel(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short[] getBandLevelRange() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public int getCenterFreq(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getCurrentPreset() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getNumberOfBands() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getNumberOfPresets() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public java.lang.String getPresetName(short);
+ method public android.media.audiofx.Equalizer.Settings getProperties() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setBandLevel(short, short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setParameterListener(android.media.audiofx.Equalizer.OnParameterChangeListener);
+ method public void setProperties(android.media.audiofx.Equalizer.Settings) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void usePreset(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ field public static final int PARAM_BAND_FREQ_RANGE = 4; // 0x4
+ field public static final int PARAM_BAND_LEVEL = 2; // 0x2
+ field public static final int PARAM_CENTER_FREQ = 3; // 0x3
+ field public static final int PARAM_CURRENT_PRESET = 6; // 0x6
+ field public static final int PARAM_GET_BAND = 5; // 0x5
+ field public static final int PARAM_GET_NUM_OF_PRESETS = 7; // 0x7
+ field public static final int PARAM_GET_PRESET_NAME = 8; // 0x8
+ field public static final int PARAM_LEVEL_RANGE = 1; // 0x1
+ field public static final int PARAM_NUM_BANDS = 0; // 0x0
+ field public static final int PARAM_STRING_SIZE_MAX = 32; // 0x20
+ }
+
+ public static abstract interface Equalizer.OnParameterChangeListener {
+ method public abstract void onParameterChange(android.media.audiofx.Equalizer, int, int, int, int);
+ }
+
+ public static class Equalizer.Settings {
+ ctor public Equalizer.Settings();
+ ctor public Equalizer.Settings(java.lang.String);
+ field public short[] bandLevels;
+ field public short curPreset;
+ field public short numBands;
+ }
+
+ public class LoudnessEnhancer extends android.media.audiofx.AudioEffect {
+ ctor public LoudnessEnhancer(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public float getTargetGain() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setTargetGain(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ field public static final int PARAM_TARGET_GAIN_MB = 0; // 0x0
+ }
+
+ public class NoiseSuppressor extends android.media.audiofx.AudioEffect {
+ method public static android.media.audiofx.NoiseSuppressor create(int);
+ method public static boolean isAvailable();
+ }
+
+ public class PresetReverb extends android.media.audiofx.AudioEffect {
+ ctor public PresetReverb(int, int) throws java.lang.IllegalArgumentException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public short getPreset() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public android.media.audiofx.PresetReverb.Settings getProperties() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setParameterListener(android.media.audiofx.PresetReverb.OnParameterChangeListener);
+ method public void setPreset(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setProperties(android.media.audiofx.PresetReverb.Settings) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ field public static final int PARAM_PRESET = 0; // 0x0
+ field public static final short PRESET_LARGEHALL = 5; // 0x5
+ field public static final short PRESET_LARGEROOM = 3; // 0x3
+ field public static final short PRESET_MEDIUMHALL = 4; // 0x4
+ field public static final short PRESET_MEDIUMROOM = 2; // 0x2
+ field public static final short PRESET_NONE = 0; // 0x0
+ field public static final short PRESET_PLATE = 6; // 0x6
+ field public static final short PRESET_SMALLROOM = 1; // 0x1
+ }
+
+ public static abstract interface PresetReverb.OnParameterChangeListener {
+ method public abstract void onParameterChange(android.media.audiofx.PresetReverb, int, int, short);
+ }
+
+ public static class PresetReverb.Settings {
+ ctor public PresetReverb.Settings();
+ ctor public PresetReverb.Settings(java.lang.String);
+ field public short preset;
+ }
+
+ public class Virtualizer extends android.media.audiofx.AudioEffect {
+ ctor public Virtualizer(int, int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public boolean canVirtualize(int, int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public boolean forceVirtualizationMode(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public android.media.audiofx.Virtualizer.Settings getProperties() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public short getRoundedStrength() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public boolean getSpeakerAngles(int, int, int[]) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public boolean getStrengthSupported();
+ method public int getVirtualizationMode() throws java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setParameterListener(android.media.audiofx.Virtualizer.OnParameterChangeListener);
+ method public void setProperties(android.media.audiofx.Virtualizer.Settings) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ method public void setStrength(short) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
+ field public static final int PARAM_STRENGTH = 1; // 0x1
+ field public static final int PARAM_STRENGTH_SUPPORTED = 0; // 0x0
+ field public static final int VIRTUALIZATION_MODE_AUTO = 1; // 0x1
+ field public static final int VIRTUALIZATION_MODE_BINAURAL = 2; // 0x2
+ field public static final int VIRTUALIZATION_MODE_OFF = 0; // 0x0
+ field public static final int VIRTUALIZATION_MODE_TRANSAURAL = 3; // 0x3
+ }
+
+ public static abstract interface Virtualizer.OnParameterChangeListener {
+ method public abstract void onParameterChange(android.media.audiofx.Virtualizer, int, int, short);
+ }
+
+ public static class Virtualizer.Settings {
+ ctor public Virtualizer.Settings();
+ ctor public Virtualizer.Settings(java.lang.String);
+ field public short strength;
+ }
+
+ public class Visualizer {
+ ctor public Visualizer(int) throws java.lang.RuntimeException, java.lang.UnsupportedOperationException;
+ method public int getCaptureSize() throws java.lang.IllegalStateException;
+ method public static int[] getCaptureSizeRange();
+ method public boolean getEnabled();
+ method public int getFft(byte[]) throws java.lang.IllegalStateException;
+ method public static int getMaxCaptureRate();
+ method public int getMeasurementMode() throws java.lang.IllegalStateException;
+ method public int getMeasurementPeakRms(android.media.audiofx.Visualizer.MeasurementPeakRms);
+ method public int getSamplingRate() throws java.lang.IllegalStateException;
+ method public int getScalingMode() throws java.lang.IllegalStateException;
+ method public int getWaveForm(byte[]) throws java.lang.IllegalStateException;
+ method public void release();
+ method public int setCaptureSize(int) throws java.lang.IllegalStateException;
+ method public int setDataCaptureListener(android.media.audiofx.Visualizer.OnDataCaptureListener, int, boolean, boolean);
+ method public int setEnabled(boolean) throws java.lang.IllegalStateException;
+ method public int setMeasurementMode(int) throws java.lang.IllegalStateException;
+ method public int setScalingMode(int) throws java.lang.IllegalStateException;
+ field public static final int ALREADY_EXISTS = -2; // 0xfffffffe
+ field public static final int ERROR = -1; // 0xffffffff
+ field public static final int ERROR_BAD_VALUE = -4; // 0xfffffffc
+ field public static final int ERROR_DEAD_OBJECT = -7; // 0xfffffff9
+ field public static final int ERROR_INVALID_OPERATION = -5; // 0xfffffffb
+ field public static final int ERROR_NO_INIT = -3; // 0xfffffffd
+ field public static final int ERROR_NO_MEMORY = -6; // 0xfffffffa
+ field public static final int MEASUREMENT_MODE_NONE = 0; // 0x0
+ field public static final int MEASUREMENT_MODE_PEAK_RMS = 1; // 0x1
+ field public static final int SCALING_MODE_AS_PLAYED = 1; // 0x1
+ field public static final int SCALING_MODE_NORMALIZED = 0; // 0x0
+ field public static final int STATE_ENABLED = 2; // 0x2
+ field public static final int STATE_INITIALIZED = 1; // 0x1
+ field public static final int STATE_UNINITIALIZED = 0; // 0x0
+ field public static final int SUCCESS = 0; // 0x0
+ }
+
+ public static final class Visualizer.MeasurementPeakRms {
+ ctor public Visualizer.MeasurementPeakRms();
+ field public int mPeak;
+ field public int mRms;
+ }
+
+ public static abstract interface Visualizer.OnDataCaptureListener {
+ method public abstract void onFftDataCapture(android.media.audiofx.Visualizer, byte[], int);
+ method public abstract void onWaveFormDataCapture(android.media.audiofx.Visualizer, byte[], int);
+ }
+
+}
+
+package android.media.browse {
+
+ public final class MediaBrowser {
+ ctor public MediaBrowser(android.content.Context, android.content.ComponentName, android.media.browse.MediaBrowser.ConnectionCallback, android.os.Bundle);
+ method public void connect();
+ method public void disconnect();
+ method public android.os.Bundle getExtras();
+ method public void getItem(java.lang.String, android.media.browse.MediaBrowser.ItemCallback);
+ method public java.lang.String getRoot();
+ method public android.content.ComponentName getServiceComponent();
+ method public android.media.session.MediaSession.Token getSessionToken();
+ method public boolean isConnected();
+ method public void subscribe(java.lang.String, android.media.browse.MediaBrowser.SubscriptionCallback);
+ method public void unsubscribe(java.lang.String);
+ }
+
+ public static class MediaBrowser.ConnectionCallback {
+ ctor public MediaBrowser.ConnectionCallback();
+ method public void onConnected();
+ method public void onConnectionFailed();
+ method public void onConnectionSuspended();
+ }
+
+ public static abstract class MediaBrowser.ItemCallback {
+ ctor public MediaBrowser.ItemCallback();
+ method public void onError(java.lang.String);
+ method public void onItemLoaded(android.media.browse.MediaBrowser.MediaItem);
+ }
+
+ public static class MediaBrowser.MediaItem implements android.os.Parcelable {
+ ctor public MediaBrowser.MediaItem(android.media.MediaDescription, int);
+ method public int describeContents();
+ method public android.media.MediaDescription getDescription();
+ method public int getFlags();
+ method public java.lang.String getMediaId();
+ method public boolean isBrowsable();
+ method public boolean isPlayable();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.browse.MediaBrowser.MediaItem> CREATOR;
+ field public static final int FLAG_BROWSABLE = 1; // 0x1
+ field public static final int FLAG_PLAYABLE = 2; // 0x2
+ }
+
+ public static abstract class MediaBrowser.SubscriptionCallback {
+ ctor public MediaBrowser.SubscriptionCallback();
+ method public void onChildrenLoaded(java.lang.String, java.util.List<android.media.browse.MediaBrowser.MediaItem>);
+ method public void onError(java.lang.String);
+ }
+
+}
+
+package android.media.effect {
+
+ public abstract class Effect {
+ ctor public Effect();
+ method public abstract void apply(int, int, int, int);
+ method public abstract java.lang.String getName();
+ method public abstract void release();
+ method public abstract void setParameter(java.lang.String, java.lang.Object);
+ method public void setUpdateListener(android.media.effect.EffectUpdateListener);
+ }
+
+ public class EffectContext {
+ method public static android.media.effect.EffectContext createWithCurrentGlContext();
+ method public android.media.effect.EffectFactory getFactory();
+ method public void release();
+ }
+
+ public class EffectFactory {
+ method public android.media.effect.Effect createEffect(java.lang.String);
+ method public static boolean isEffectSupported(java.lang.String);
+ field public static final java.lang.String EFFECT_AUTOFIX = "android.media.effect.effects.AutoFixEffect";
+ field public static final java.lang.String EFFECT_BACKDROPPER = "android.media.effect.effects.BackDropperEffect";
+ field public static final java.lang.String EFFECT_BITMAPOVERLAY = "android.media.effect.effects.BitmapOverlayEffect";
+ field public static final java.lang.String EFFECT_BLACKWHITE = "android.media.effect.effects.BlackWhiteEffect";
+ field public static final java.lang.String EFFECT_BRIGHTNESS = "android.media.effect.effects.BrightnessEffect";
+ field public static final java.lang.String EFFECT_CONTRAST = "android.media.effect.effects.ContrastEffect";
+ field public static final java.lang.String EFFECT_CROP = "android.media.effect.effects.CropEffect";
+ field public static final java.lang.String EFFECT_CROSSPROCESS = "android.media.effect.effects.CrossProcessEffect";
+ field public static final java.lang.String EFFECT_DOCUMENTARY = "android.media.effect.effects.DocumentaryEffect";
+ field public static final java.lang.String EFFECT_DUOTONE = "android.media.effect.effects.DuotoneEffect";
+ field public static final java.lang.String EFFECT_FILLLIGHT = "android.media.effect.effects.FillLightEffect";
+ field public static final java.lang.String EFFECT_FISHEYE = "android.media.effect.effects.FisheyeEffect";
+ field public static final java.lang.String EFFECT_FLIP = "android.media.effect.effects.FlipEffect";
+ field public static final java.lang.String EFFECT_GRAIN = "android.media.effect.effects.GrainEffect";
+ field public static final java.lang.String EFFECT_GRAYSCALE = "android.media.effect.effects.GrayscaleEffect";
+ field public static final java.lang.String EFFECT_LOMOISH = "android.media.effect.effects.LomoishEffect";
+ field public static final java.lang.String EFFECT_NEGATIVE = "android.media.effect.effects.NegativeEffect";
+ field public static final java.lang.String EFFECT_POSTERIZE = "android.media.effect.effects.PosterizeEffect";
+ field public static final java.lang.String EFFECT_REDEYE = "android.media.effect.effects.RedEyeEffect";
+ field public static final java.lang.String EFFECT_ROTATE = "android.media.effect.effects.RotateEffect";
+ field public static final java.lang.String EFFECT_SATURATE = "android.media.effect.effects.SaturateEffect";
+ field public static final java.lang.String EFFECT_SEPIA = "android.media.effect.effects.SepiaEffect";
+ field public static final java.lang.String EFFECT_SHARPEN = "android.media.effect.effects.SharpenEffect";
+ field public static final java.lang.String EFFECT_STRAIGHTEN = "android.media.effect.effects.StraightenEffect";
+ field public static final java.lang.String EFFECT_TEMPERATURE = "android.media.effect.effects.ColorTemperatureEffect";
+ field public static final java.lang.String EFFECT_TINT = "android.media.effect.effects.TintEffect";
+ field public static final java.lang.String EFFECT_VIGNETTE = "android.media.effect.effects.VignetteEffect";
+ }
+
+ public abstract interface EffectUpdateListener {
+ method public abstract void onEffectUpdated(android.media.effect.Effect, java.lang.Object);
+ }
+
+}
+
+package android.media.midi {
+
+ public final class MidiDevice implements java.io.Closeable {
+ method public void close() throws java.io.IOException;
+ method public android.media.midi.MidiDevice.MidiConnection connectPorts(android.media.midi.MidiInputPort, int);
+ method public android.media.midi.MidiDeviceInfo getInfo();
+ method public android.media.midi.MidiInputPort openInputPort(int);
+ method public android.media.midi.MidiOutputPort openOutputPort(int);
+ }
+
+ public class MidiDevice.MidiConnection implements java.io.Closeable {
+ method public void close() throws java.io.IOException;
+ }
+
+ public final class MidiDeviceInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getId();
+ method public int getInputPortCount();
+ method public int getOutputPortCount();
+ method public android.media.midi.MidiDeviceInfo.PortInfo[] getPorts();
+ method public android.os.Bundle getProperties();
+ method public int getType();
+ method public boolean isPrivate();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.midi.MidiDeviceInfo> CREATOR;
+ field public static final java.lang.String PROPERTY_BLUETOOTH_DEVICE = "bluetooth_device";
+ field public static final java.lang.String PROPERTY_MANUFACTURER = "manufacturer";
+ field public static final java.lang.String PROPERTY_NAME = "name";
+ field public static final java.lang.String PROPERTY_PRODUCT = "product";
+ field public static final java.lang.String PROPERTY_SERIAL_NUMBER = "serial_number";
+ field public static final java.lang.String PROPERTY_USB_DEVICE = "usb_device";
+ field public static final java.lang.String PROPERTY_VERSION = "version";
+ field public static final int TYPE_BLUETOOTH = 3; // 0x3
+ field public static final int TYPE_USB = 1; // 0x1
+ field public static final int TYPE_VIRTUAL = 2; // 0x2
+ }
+
+ public static final class MidiDeviceInfo.PortInfo {
+ method public java.lang.String getName();
+ method public int getPortNumber();
+ method public int getType();
+ field public static final int TYPE_INPUT = 1; // 0x1
+ field public static final int TYPE_OUTPUT = 2; // 0x2
+ }
+
+ public abstract class MidiDeviceService extends android.app.Service {
+ ctor public MidiDeviceService();
+ method public final android.media.midi.MidiDeviceInfo getDeviceInfo();
+ method public final android.media.midi.MidiReceiver[] getOutputPortReceivers();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onClose();
+ method public void onDeviceStatusChanged(android.media.midi.MidiDeviceStatus);
+ method public abstract android.media.midi.MidiReceiver[] onGetInputPortReceivers();
+ field public static final java.lang.String SERVICE_INTERFACE = "android.media.midi.MidiDeviceService";
+ }
+
+ public final class MidiDeviceStatus implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.media.midi.MidiDeviceInfo getDeviceInfo();
+ method public int getOutputPortOpenCount(int);
+ method public boolean isInputPortOpen(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.midi.MidiDeviceStatus> CREATOR;
+ }
+
+ public final class MidiInputPort extends android.media.midi.MidiReceiver implements java.io.Closeable {
+ method public void close() throws java.io.IOException;
+ method public final int getPortNumber();
+ method public void onSend(byte[], int, int, long) throws java.io.IOException;
+ }
+
+ public final class MidiManager {
+ method public android.media.midi.MidiDeviceInfo[] getDevices();
+ method public void openBluetoothDevice(android.bluetooth.BluetoothDevice, android.media.midi.MidiManager.OnDeviceOpenedListener, android.os.Handler);
+ method public void openDevice(android.media.midi.MidiDeviceInfo, android.media.midi.MidiManager.OnDeviceOpenedListener, android.os.Handler);
+ method public void registerDeviceCallback(android.media.midi.MidiManager.DeviceCallback, android.os.Handler);
+ method public void unregisterDeviceCallback(android.media.midi.MidiManager.DeviceCallback);
+ }
+
+ public static class MidiManager.DeviceCallback {
+ ctor public MidiManager.DeviceCallback();
+ method public void onDeviceAdded(android.media.midi.MidiDeviceInfo);
+ method public void onDeviceRemoved(android.media.midi.MidiDeviceInfo);
+ method public void onDeviceStatusChanged(android.media.midi.MidiDeviceStatus);
+ }
+
+ public static abstract interface MidiManager.OnDeviceOpenedListener {
+ method public abstract void onDeviceOpened(android.media.midi.MidiDevice);
+ }
+
+ public final class MidiOutputPort extends android.media.midi.MidiSender implements java.io.Closeable {
+ method public void close() throws java.io.IOException;
+ method public final int getPortNumber();
+ method public void onConnect(android.media.midi.MidiReceiver);
+ method public void onDisconnect(android.media.midi.MidiReceiver);
+ }
+
+ public abstract class MidiReceiver {
+ ctor public MidiReceiver();
+ ctor public MidiReceiver(int);
+ method public void flush() throws java.io.IOException;
+ method public final int getMaxMessageSize();
+ method public void onFlush() throws java.io.IOException;
+ method public abstract void onSend(byte[], int, int, long) throws java.io.IOException;
+ method public void send(byte[], int, int) throws java.io.IOException;
+ method public void send(byte[], int, int, long) throws java.io.IOException;
+ }
+
+ public abstract class MidiSender {
+ ctor public MidiSender();
+ method public void connect(android.media.midi.MidiReceiver);
+ method public void disconnect(android.media.midi.MidiReceiver);
+ method public abstract void onConnect(android.media.midi.MidiReceiver);
+ method public abstract void onDisconnect(android.media.midi.MidiReceiver);
+ }
+
+}
+
+package android.media.projection {
+
+ public final class MediaProjection {
+ method public android.hardware.display.VirtualDisplay createVirtualDisplay(java.lang.String, int, int, int, int, android.view.Surface, android.hardware.display.VirtualDisplay.Callback, android.os.Handler);
+ method public void registerCallback(android.media.projection.MediaProjection.Callback, android.os.Handler);
+ method public void stop();
+ method public void unregisterCallback(android.media.projection.MediaProjection.Callback);
+ }
+
+ public static abstract class MediaProjection.Callback {
+ ctor public MediaProjection.Callback();
+ method public void onStop();
+ }
+
+ public final class MediaProjectionManager {
+ method public android.content.Intent createScreenCaptureIntent();
+ method public android.media.projection.MediaProjection getMediaProjection(int, android.content.Intent);
+ }
+
+}
+
+package android.media.session {
+
+ public final class MediaController {
+ ctor public MediaController(android.content.Context, android.media.session.MediaSession.Token);
+ method public void adjustVolume(int, int);
+ method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);
+ method public android.os.Bundle getExtras();
+ method public long getFlags();
+ method public android.media.MediaMetadata getMetadata();
+ method public java.lang.String getPackageName();
+ method public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();
+ method public android.media.session.PlaybackState getPlaybackState();
+ method public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();
+ method public java.lang.CharSequence getQueueTitle();
+ method public int getRatingType();
+ method public android.app.PendingIntent getSessionActivity();
+ method public android.media.session.MediaSession.Token getSessionToken();
+ method public android.media.session.MediaController.TransportControls getTransportControls();
+ method public void registerCallback(android.media.session.MediaController.Callback);
+ method public void registerCallback(android.media.session.MediaController.Callback, android.os.Handler);
+ method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
+ method public void setVolumeTo(int, int);
+ method public void unregisterCallback(android.media.session.MediaController.Callback);
+ }
+
+ public static abstract class MediaController.Callback {
+ ctor public MediaController.Callback();
+ method public void onAudioInfoChanged(android.media.session.MediaController.PlaybackInfo);
+ method public void onExtrasChanged(android.os.Bundle);
+ method public void onMetadataChanged(android.media.MediaMetadata);
+ method public void onPlaybackStateChanged(android.media.session.PlaybackState);
+ method public void onQueueChanged(java.util.List<android.media.session.MediaSession.QueueItem>);
+ method public void onQueueTitleChanged(java.lang.CharSequence);
+ method public void onSessionDestroyed();
+ method public void onSessionEvent(java.lang.String, android.os.Bundle);
+ }
+
+ public static final class MediaController.PlaybackInfo {
+ method public android.media.AudioAttributes getAudioAttributes();
+ method public int getCurrentVolume();
+ method public int getMaxVolume();
+ method public int getPlaybackType();
+ method public int getVolumeControl();
+ field public static final int PLAYBACK_TYPE_LOCAL = 1; // 0x1
+ field public static final int PLAYBACK_TYPE_REMOTE = 2; // 0x2
+ }
+
+ public final class MediaController.TransportControls {
+ method public void fastForward();
+ method public void pause();
+ method public void play();
+ method public void playFromMediaId(java.lang.String, android.os.Bundle);
+ method public void playFromSearch(java.lang.String, android.os.Bundle);
+ method public void playFromUri(android.net.Uri, android.os.Bundle);
+ method public void rewind();
+ method public void seekTo(long);
+ method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);
+ method public void sendCustomAction(java.lang.String, android.os.Bundle);
+ method public void setRating(android.media.Rating);
+ method public void skipToNext();
+ method public void skipToPrevious();
+ method public void skipToQueueItem(long);
+ method public void stop();
+ }
+
+ public final class MediaSession {
+ ctor public MediaSession(android.content.Context, java.lang.String);
+ method public android.media.session.MediaController getController();
+ method public android.media.session.MediaSession.Token getSessionToken();
+ method public boolean isActive();
+ method public void release();
+ method public void sendSessionEvent(java.lang.String, android.os.Bundle);
+ method public void setActive(boolean);
+ method public void setCallback(android.media.session.MediaSession.Callback);
+ method public void setCallback(android.media.session.MediaSession.Callback, android.os.Handler);
+ method public void setExtras(android.os.Bundle);
+ method public void setFlags(int);
+ method public void setMediaButtonReceiver(android.app.PendingIntent);
+ method public void setMetadata(android.media.MediaMetadata);
+ method public void setPlaybackState(android.media.session.PlaybackState);
+ method public void setPlaybackToLocal(android.media.AudioAttributes);
+ method public void setPlaybackToRemote(android.media.VolumeProvider);
+ method public void setQueue(java.util.List<android.media.session.MediaSession.QueueItem>);
+ method public void setQueueTitle(java.lang.CharSequence);
+ method public void setRatingType(int);
+ method public void setSessionActivity(android.app.PendingIntent);
+ field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
+ field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2
+ }
+
+ public static abstract class MediaSession.Callback {
+ ctor public MediaSession.Callback();
+ method public void onCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
+ method public void onCustomAction(java.lang.String, android.os.Bundle);
+ method public void onFastForward();
+ method public boolean onMediaButtonEvent(android.content.Intent);
+ method public void onPause();
+ method public void onPlay();
+ method public void onPlayFromMediaId(java.lang.String, android.os.Bundle);
+ method public void onPlayFromSearch(java.lang.String, android.os.Bundle);
+ method public void onPlayFromUri(android.net.Uri, android.os.Bundle);
+ method public void onRewind();
+ method public void onSeekTo(long);
+ method public void onSetRating(android.media.Rating);
+ method public void onSkipToNext();
+ method public void onSkipToPrevious();
+ method public void onSkipToQueueItem(long);
+ method public void onStop();
+ }
+
+ public static final class MediaSession.QueueItem implements android.os.Parcelable {
+ ctor public MediaSession.QueueItem(android.media.MediaDescription, long);
+ method public int describeContents();
+ method public android.media.MediaDescription getDescription();
+ method public long getQueueId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.session.MediaSession.QueueItem> CREATOR;
+ field public static final int UNKNOWN_ID = -1; // 0xffffffff
+ }
+
+ public static final class MediaSession.Token implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.session.MediaSession.Token> CREATOR;
+ }
+
+ public final class MediaSessionManager {
+ method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName);
+ method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName, android.os.Handler);
+ method public java.util.List<android.media.session.MediaController> getActiveSessions(android.content.ComponentName);
+ method public void removeOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
+ }
+
+ public static abstract interface MediaSessionManager.OnActiveSessionsChangedListener {
+ method public abstract void onActiveSessionsChanged(java.util.List<android.media.session.MediaController>);
+ }
+
+ public final class PlaybackState implements android.os.Parcelable {
+ method public int describeContents();
+ method public long getActions();
+ method public long getActiveQueueItemId();
+ method public long getBufferedPosition();
+ method public java.util.List<android.media.session.PlaybackState.CustomAction> getCustomActions();
+ method public java.lang.CharSequence getErrorMessage();
+ method public android.os.Bundle getExtras();
+ method public long getLastPositionUpdateTime();
+ method public float getPlaybackSpeed();
+ method public long getPosition();
+ method public int getState();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final long ACTION_FAST_FORWARD = 64L; // 0x40L
+ field public static final long ACTION_PAUSE = 2L; // 0x2L
+ field public static final long ACTION_PLAY = 4L; // 0x4L
+ field public static final long ACTION_PLAY_FROM_MEDIA_ID = 1024L; // 0x400L
+ field public static final long ACTION_PLAY_FROM_SEARCH = 2048L; // 0x800L
+ field public static final long ACTION_PLAY_FROM_URI = 8192L; // 0x2000L
+ field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L
+ field public static final long ACTION_REWIND = 8L; // 0x8L
+ field public static final long ACTION_SEEK_TO = 256L; // 0x100L
+ field public static final long ACTION_SET_RATING = 128L; // 0x80L
+ field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L
+ field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L
+ field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L
+ field public static final long ACTION_STOP = 1L; // 0x1L
+ field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;
+ field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL
+ field public static final int STATE_BUFFERING = 6; // 0x6
+ field public static final int STATE_CONNECTING = 8; // 0x8
+ field public static final int STATE_ERROR = 7; // 0x7
+ field public static final int STATE_FAST_FORWARDING = 4; // 0x4
+ field public static final int STATE_NONE = 0; // 0x0
+ field public static final int STATE_PAUSED = 2; // 0x2
+ field public static final int STATE_PLAYING = 3; // 0x3
+ field public static final int STATE_REWINDING = 5; // 0x5
+ field public static final int STATE_SKIPPING_TO_NEXT = 10; // 0xa
+ field public static final int STATE_SKIPPING_TO_PREVIOUS = 9; // 0x9
+ field public static final int STATE_SKIPPING_TO_QUEUE_ITEM = 11; // 0xb
+ field public static final int STATE_STOPPED = 1; // 0x1
+ }
+
+ public static final class PlaybackState.Builder {
+ ctor public PlaybackState.Builder();
+ ctor public PlaybackState.Builder(android.media.session.PlaybackState);
+ method public android.media.session.PlaybackState.Builder addCustomAction(java.lang.String, java.lang.String, int);
+ method public android.media.session.PlaybackState.Builder addCustomAction(android.media.session.PlaybackState.CustomAction);
+ method public android.media.session.PlaybackState build();
+ method public android.media.session.PlaybackState.Builder setActions(long);
+ method public android.media.session.PlaybackState.Builder setActiveQueueItemId(long);
+ method public android.media.session.PlaybackState.Builder setBufferedPosition(long);
+ method public android.media.session.PlaybackState.Builder setErrorMessage(java.lang.CharSequence);
+ method public android.media.session.PlaybackState.Builder setExtras(android.os.Bundle);
+ method public android.media.session.PlaybackState.Builder setState(int, long, float, long);
+ method public android.media.session.PlaybackState.Builder setState(int, long, float);
+ }
+
+ public static final class PlaybackState.CustomAction implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String getAction();
+ method public android.os.Bundle getExtras();
+ method public int getIcon();
+ method public java.lang.CharSequence getName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState.CustomAction> CREATOR;
+ }
+
+ public static final class PlaybackState.CustomAction.Builder {
+ ctor public PlaybackState.CustomAction.Builder(java.lang.String, java.lang.CharSequence, int);
+ method public android.media.session.PlaybackState.CustomAction build();
+ method public android.media.session.PlaybackState.CustomAction.Builder setExtras(android.os.Bundle);
+ }
+
+}
+
+package android.media.tv {
+
+ public final class TvContentRating {
+ method public final boolean contains(android.media.tv.TvContentRating);
+ method public static android.media.tv.TvContentRating createRating(java.lang.String, java.lang.String, java.lang.String, java.lang.String...);
+ method public java.lang.String flattenToString();
+ method public java.lang.String getDomain();
+ method public java.lang.String getMainRating();
+ method public java.lang.String getRatingSystem();
+ method public java.util.List<java.lang.String> getSubRatings();
+ method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);
+ field public static final android.media.tv.TvContentRating UNRATED;
+ }
+
+ public final class TvContract {
+ method public static final android.net.Uri buildChannelLogoUri(long);
+ method public static final android.net.Uri buildChannelLogoUri(android.net.Uri);
+ method public static final android.net.Uri buildChannelUri(long);
+ method public static final android.net.Uri buildChannelUriForPassthroughInput(java.lang.String);
+ method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);
+ method public static final java.lang.String buildInputId(android.content.ComponentName);
+ method public static final android.net.Uri buildProgramUri(long);
+ method public static final android.net.Uri buildProgramsUriForChannel(long);
+ method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);
+ method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);
+ method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
+ field public static final java.lang.String AUTHORITY = "android.media.tv";
+ }
+
+ public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {
+ field public static final java.lang.String COLUMN_PACKAGE_NAME = "package_name";
+ }
+
+ public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
+ method public static final java.lang.String getVideoResolution(java.lang.String);
+ field public static final java.lang.String COLUMN_APP_LINK_COLOR = "app_link_color";
+ field public static final java.lang.String COLUMN_APP_LINK_ICON_URI = "app_link_icon_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
+ field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";
+ field public static final java.lang.String COLUMN_DESCRIPTION = "description";
+ field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
+ field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";
+ field public static final java.lang.String COLUMN_INPUT_ID = "input_id";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
+ field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";
+ field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";
+ field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
+ field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
+ field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
+ field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
+ field public static final java.lang.String COLUMN_TYPE = "type";
+ field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
+ field public static final java.lang.String COLUMN_VIDEO_FORMAT = "video_format";
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/channel";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/channel";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String SERVICE_TYPE_AUDIO = "SERVICE_TYPE_AUDIO";
+ field public static final java.lang.String SERVICE_TYPE_AUDIO_VIDEO = "SERVICE_TYPE_AUDIO_VIDEO";
+ field public static final java.lang.String SERVICE_TYPE_OTHER = "SERVICE_TYPE_OTHER";
+ field public static final java.lang.String TYPE_1SEG = "TYPE_1SEG";
+ field public static final java.lang.String TYPE_ATSC_C = "TYPE_ATSC_C";
+ field public static final java.lang.String TYPE_ATSC_M_H = "TYPE_ATSC_M_H";
+ field public static final java.lang.String TYPE_ATSC_T = "TYPE_ATSC_T";
+ field public static final java.lang.String TYPE_CMMB = "TYPE_CMMB";
+ field public static final java.lang.String TYPE_DTMB = "TYPE_DTMB";
+ field public static final java.lang.String TYPE_DVB_C = "TYPE_DVB_C";
+ field public static final java.lang.String TYPE_DVB_C2 = "TYPE_DVB_C2";
+ field public static final java.lang.String TYPE_DVB_H = "TYPE_DVB_H";
+ field public static final java.lang.String TYPE_DVB_S = "TYPE_DVB_S";
+ field public static final java.lang.String TYPE_DVB_S2 = "TYPE_DVB_S2";
+ field public static final java.lang.String TYPE_DVB_SH = "TYPE_DVB_SH";
+ field public static final java.lang.String TYPE_DVB_T = "TYPE_DVB_T";
+ field public static final java.lang.String TYPE_DVB_T2 = "TYPE_DVB_T2";
+ field public static final java.lang.String TYPE_ISDB_C = "TYPE_ISDB_C";
+ field public static final java.lang.String TYPE_ISDB_S = "TYPE_ISDB_S";
+ field public static final java.lang.String TYPE_ISDB_T = "TYPE_ISDB_T";
+ field public static final java.lang.String TYPE_ISDB_TB = "TYPE_ISDB_TB";
+ field public static final java.lang.String TYPE_NTSC = "TYPE_NTSC";
+ field public static final java.lang.String TYPE_OTHER = "TYPE_OTHER";
+ field public static final java.lang.String TYPE_PAL = "TYPE_PAL";
+ field public static final java.lang.String TYPE_SECAM = "TYPE_SECAM";
+ field public static final java.lang.String TYPE_S_DMB = "TYPE_S_DMB";
+ field public static final java.lang.String TYPE_T_DMB = "TYPE_T_DMB";
+ field public static final java.lang.String VIDEO_FORMAT_1080I = "VIDEO_FORMAT_1080I";
+ field public static final java.lang.String VIDEO_FORMAT_1080P = "VIDEO_FORMAT_1080P";
+ field public static final java.lang.String VIDEO_FORMAT_2160P = "VIDEO_FORMAT_2160P";
+ field public static final java.lang.String VIDEO_FORMAT_240P = "VIDEO_FORMAT_240P";
+ field public static final java.lang.String VIDEO_FORMAT_360P = "VIDEO_FORMAT_360P";
+ field public static final java.lang.String VIDEO_FORMAT_4320P = "VIDEO_FORMAT_4320P";
+ field public static final java.lang.String VIDEO_FORMAT_480I = "VIDEO_FORMAT_480I";
+ field public static final java.lang.String VIDEO_FORMAT_480P = "VIDEO_FORMAT_480P";
+ field public static final java.lang.String VIDEO_FORMAT_576I = "VIDEO_FORMAT_576I";
+ field public static final java.lang.String VIDEO_FORMAT_576P = "VIDEO_FORMAT_576P";
+ field public static final java.lang.String VIDEO_FORMAT_720P = "VIDEO_FORMAT_720P";
+ field public static final java.lang.String VIDEO_RESOLUTION_ED = "VIDEO_RESOLUTION_ED";
+ field public static final java.lang.String VIDEO_RESOLUTION_FHD = "VIDEO_RESOLUTION_FHD";
+ field public static final java.lang.String VIDEO_RESOLUTION_HD = "VIDEO_RESOLUTION_HD";
+ field public static final java.lang.String VIDEO_RESOLUTION_SD = "VIDEO_RESOLUTION_SD";
+ field public static final java.lang.String VIDEO_RESOLUTION_UHD = "VIDEO_RESOLUTION_UHD";
+ }
+
+ public static final class TvContract.Channels.Logo {
+ field public static final java.lang.String CONTENT_DIRECTORY = "logo";
+ }
+
+ public static final class TvContract.Programs implements android.media.tv.TvContract.BaseTvColumns {
+ field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";
+ field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";
+ field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";
+ field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";
+ field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";
+ field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
+ field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
+ field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
+ field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
+ field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
+ field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";
+ field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
+ field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
+ field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";
+ field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
+ field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
+ field public static final java.lang.String COLUMN_TITLE = "title";
+ field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
+ field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";
+ field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public static final class TvContract.Programs.Genres {
+ method public static java.lang.String[] decode(java.lang.String);
+ method public static java.lang.String encode(java.lang.String...);
+ field public static final java.lang.String ANIMAL_WILDLIFE = "ANIMAL_WILDLIFE";
+ field public static final java.lang.String ARTS = "ARTS";
+ field public static final java.lang.String COMEDY = "COMEDY";
+ field public static final java.lang.String DRAMA = "DRAMA";
+ field public static final java.lang.String EDUCATION = "EDUCATION";
+ field public static final java.lang.String ENTERTAINMENT = "ENTERTAINMENT";
+ field public static final java.lang.String FAMILY_KIDS = "FAMILY_KIDS";
+ field public static final java.lang.String GAMING = "GAMING";
+ field public static final java.lang.String LIFE_STYLE = "LIFE_STYLE";
+ field public static final java.lang.String MOVIES = "MOVIES";
+ field public static final java.lang.String MUSIC = "MUSIC";
+ field public static final java.lang.String NEWS = "NEWS";
+ field public static final java.lang.String PREMIER = "PREMIER";
+ field public static final java.lang.String SHOPPING = "SHOPPING";
+ field public static final java.lang.String SPORTS = "SPORTS";
+ field public static final java.lang.String TECH_SCIENCE = "TECH_SCIENCE";
+ field public static final java.lang.String TRAVEL = "TRAVEL";
+ }
+
+ public final class TvInputInfo implements android.os.Parcelable {
+ method public android.content.Intent createSettingsIntent();
+ method public android.content.Intent createSetupIntent();
+ method public int describeContents();
+ method public java.lang.String getId();
+ method public java.lang.String getParentId();
+ method public android.content.pm.ServiceInfo getServiceInfo();
+ method public int getType();
+ method public boolean isPassthroughInput();
+ method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
+ method public java.lang.CharSequence loadLabel(android.content.Context);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.tv.TvInputInfo> CREATOR;
+ field public static final java.lang.String EXTRA_INPUT_ID = "android.media.tv.extra.INPUT_ID";
+ field public static final int TYPE_COMPONENT = 1004; // 0x3ec
+ field public static final int TYPE_COMPOSITE = 1001; // 0x3e9
+ field public static final int TYPE_DISPLAY_PORT = 1008; // 0x3f0
+ field public static final int TYPE_DVI = 1006; // 0x3ee
+ field public static final int TYPE_HDMI = 1007; // 0x3ef
+ field public static final int TYPE_OTHER = 1000; // 0x3e8
+ field public static final int TYPE_SCART = 1003; // 0x3eb
+ field public static final int TYPE_SVIDEO = 1002; // 0x3ea
+ field public static final int TYPE_TUNER = 0; // 0x0
+ field public static final int TYPE_VGA = 1005; // 0x3ed
+ }
+
+ public final class TvInputManager {
+ method public int getInputState(java.lang.String);
+ method public android.media.tv.TvInputInfo getTvInputInfo(java.lang.String);
+ method public java.util.List<android.media.tv.TvInputInfo> getTvInputList();
+ method public boolean isParentalControlsEnabled();
+ method public boolean isRatingBlocked(android.media.tv.TvContentRating);
+ method public void registerCallback(android.media.tv.TvInputManager.TvInputCallback, android.os.Handler);
+ method public void unregisterCallback(android.media.tv.TvInputManager.TvInputCallback);
+ field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED";
+ field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";
+ field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";
+ field public static final int INPUT_STATE_CONNECTED = 0; // 0x0
+ field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
+ field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
+ field public static final java.lang.String META_DATA_CONTENT_RATING_SYSTEMS = "android.media.tv.metadata.CONTENT_RATING_SYSTEMS";
+ field public static final long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
+ field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
+ field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2
+ field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0
+ field public static final int TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1
+ field public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = 4; // 0x4
+ field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
+ field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1
+ field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0
+ field public static final int VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL = 2; // 0x2
+ }
+
+ public static abstract class TvInputManager.TvInputCallback {
+ ctor public TvInputManager.TvInputCallback();
+ method public void onInputAdded(java.lang.String);
+ method public void onInputRemoved(java.lang.String);
+ method public void onInputStateChanged(java.lang.String, int);
+ }
+
+ public abstract class TvInputService extends android.app.Service {
+ ctor public TvInputService();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
+ field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
+ }
+
+ public static abstract class TvInputService.HardwareSession extends android.media.tv.TvInputService.Session {
+ ctor public TvInputService.HardwareSession(android.content.Context);
+ method public abstract java.lang.String getHardwareInputId();
+ method public void onHardwareVideoAvailable();
+ method public void onHardwareVideoUnavailable(int);
+ method public final boolean onSetSurface(android.view.Surface);
+ }
+
+ public static abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
+ ctor public TvInputService.Session(android.content.Context);
+ method public void layoutSurface(int, int, int, int);
+ method public void notifyChannelRetuned(android.net.Uri);
+ method public void notifyContentAllowed();
+ method public void notifyContentBlocked(android.media.tv.TvContentRating);
+ method public void notifyTimeShiftStatusChanged(int);
+ method public void notifyTrackSelected(int, java.lang.String);
+ method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);
+ method public void notifyVideoAvailable();
+ method public void notifyVideoUnavailable(int);
+ method public android.view.View onCreateOverlayView();
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method public void onOverlayViewSizeChanged(int, int);
+ method public abstract void onRelease();
+ method public boolean onSelectTrack(int, java.lang.String);
+ method public abstract void onSetCaptionEnabled(boolean);
+ method public abstract void onSetStreamVolume(float);
+ method public abstract boolean onSetSurface(android.view.Surface);
+ method public void onSurfaceChanged(int, int, int);
+ method public long onTimeShiftGetCurrentPosition();
+ method public long onTimeShiftGetStartPosition();
+ method public void onTimeShiftPause();
+ method public void onTimeShiftResume();
+ method public void onTimeShiftSeekTo(long);
+ method public void onTimeShiftSetPlaybackParams(android.media.PlaybackParams);
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ method public boolean onTrackballEvent(android.view.MotionEvent);
+ method public abstract boolean onTune(android.net.Uri);
+ method public void onUnblockContent(android.media.tv.TvContentRating);
+ method public void setOverlayViewEnabled(boolean);
+ }
+
+ public final class TvTrackInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public final int getAudioChannelCount();
+ method public final int getAudioSampleRate();
+ method public final java.lang.CharSequence getDescription();
+ method public final android.os.Bundle getExtra();
+ method public final java.lang.String getId();
+ method public final java.lang.String getLanguage();
+ method public final int getType();
+ method public final float getVideoFrameRate();
+ method public final int getVideoHeight();
+ method public final float getVideoPixelAspectRatio();
+ method public final int getVideoWidth();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.media.tv.TvTrackInfo> CREATOR;
+ field public static final int TYPE_AUDIO = 0; // 0x0
+ field public static final int TYPE_SUBTITLE = 2; // 0x2
+ field public static final int TYPE_VIDEO = 1; // 0x1
+ }
+
+ public static final class TvTrackInfo.Builder {
+ ctor public TvTrackInfo.Builder(int, java.lang.String);
+ method public android.media.tv.TvTrackInfo build();
+ method public final android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int);
+ method public final android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);
+ method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.CharSequence);
+ method public final android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);
+ method public final android.media.tv.TvTrackInfo.Builder setLanguage(java.lang.String);
+ method public final android.media.tv.TvTrackInfo.Builder setVideoFrameRate(float);
+ method public final android.media.tv.TvTrackInfo.Builder setVideoHeight(int);
+ method public final android.media.tv.TvTrackInfo.Builder setVideoPixelAspectRatio(float);
+ method public final android.media.tv.TvTrackInfo.Builder setVideoWidth(int);
+ }
+
+ public class TvView extends android.view.ViewGroup {
+ ctor public TvView(android.content.Context);
+ ctor public TvView(android.content.Context, android.util.AttributeSet);
+ ctor public TvView(android.content.Context, android.util.AttributeSet, int);
+ method public boolean dispatchUnhandledInputEvent(android.view.InputEvent);
+ method public java.lang.String getSelectedTrack(int);
+ method public java.util.List<android.media.tv.TvTrackInfo> getTracks(int);
+ method protected void onLayout(boolean, int, int, int, int);
+ method public boolean onUnhandledInputEvent(android.view.InputEvent);
+ method public void reset();
+ method public void selectTrack(int, java.lang.String);
+ method public void setCallback(android.media.tv.TvView.TvInputCallback);
+ method public void setCaptionEnabled(boolean);
+ method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);
+ method public void setStreamVolume(float);
+ method public void setTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
+ method public void timeShiftPause();
+ method public void timeShiftResume();
+ method public void timeShiftSeekTo(long);
+ method public void timeShiftSetPlaybackParams(android.media.PlaybackParams);
+ method public void tune(java.lang.String, android.net.Uri);
+ }
+
+ public static abstract interface TvView.OnUnhandledInputEventListener {
+ method public abstract boolean onUnhandledInputEvent(android.view.InputEvent);
+ }
+
+ public static abstract class TvView.TimeShiftPositionCallback {
+ ctor public TvView.TimeShiftPositionCallback();
+ method public void onTimeShiftCurrentPositionChanged(java.lang.String, long);
+ method public void onTimeShiftStartPositionChanged(java.lang.String, long);
+ }
+
+ public static abstract class TvView.TvInputCallback {
+ ctor public TvView.TvInputCallback();
+ method public void onChannelRetuned(java.lang.String, android.net.Uri);
+ method public void onConnectionFailed(java.lang.String);
+ method public void onContentAllowed(java.lang.String);
+ method public void onContentBlocked(java.lang.String, android.media.tv.TvContentRating);
+ method public void onDisconnected(java.lang.String);
+ method public void onTimeShiftStatusChanged(java.lang.String, int);
+ method public void onTrackSelected(java.lang.String, int, java.lang.String);
+ method public void onTracksChanged(java.lang.String, java.util.List<android.media.tv.TvTrackInfo>);
+ method public void onVideoAvailable(java.lang.String);
+ method public void onVideoSizeChanged(java.lang.String, int, int);
+ method public void onVideoUnavailable(java.lang.String, int);
+ }
+
+}
+
+package android.mtp {
+
+ public final class MtpConstants {
+ ctor public MtpConstants();
+ method public static boolean isAbstractObject(int);
+ field public static final int ASSOCIATION_TYPE_GENERIC_FOLDER = 1; // 0x1
+ field public static final int FORMAT_3GP_CONTAINER = 47492; // 0xb984
+ field public static final int FORMAT_AAC = 47363; // 0xb903
+ field public static final int FORMAT_ABSTRACT_AUDIO_ALBUM = 47619; // 0xba03
+ field public static final int FORMAT_ABSTRACT_AUDIO_PLAYLIST = 47625; // 0xba09
+ field public static final int FORMAT_ABSTRACT_AV_PLAYLIST = 47621; // 0xba05
+ field public static final int FORMAT_ABSTRACT_DOCUMENT = 47745; // 0xba81
+ field public static final int FORMAT_ABSTRACT_IMAGE_ALBUM = 47618; // 0xba02
+ field public static final int FORMAT_ABSTRACT_MEDIACAST = 47627; // 0xba0b
+ field public static final int FORMAT_ABSTRACT_MULTIMEDIA_ALBUM = 47617; // 0xba01
+ field public static final int FORMAT_ABSTRACT_VIDEO_ALBUM = 47620; // 0xba04
+ field public static final int FORMAT_ABSTRACT_VIDEO_PLAYLIST = 47626; // 0xba0a
+ field public static final int FORMAT_AIFF = 12295; // 0x3007
+ field public static final int FORMAT_ASF = 12300; // 0x300c
+ field public static final int FORMAT_ASSOCIATION = 12289; // 0x3001
+ field public static final int FORMAT_ASX_PLAYLIST = 47635; // 0xba13
+ field public static final int FORMAT_AUDIBLE = 47364; // 0xb904
+ field public static final int FORMAT_AVI = 12298; // 0x300a
+ field public static final int FORMAT_BMP = 14340; // 0x3804
+ field public static final int FORMAT_DPOF = 12294; // 0x3006
+ field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003
+ field public static final int FORMAT_EXIF_JPEG = 14337; // 0x3801
+ field public static final int FORMAT_FLAC = 47366; // 0xb906
+ field public static final int FORMAT_GIF = 14343; // 0x3807
+ field public static final int FORMAT_HTML = 12293; // 0x3005
+ field public static final int FORMAT_JFIF = 14344; // 0x3808
+ field public static final int FORMAT_JP2 = 14351; // 0x380f
+ field public static final int FORMAT_JPX = 14352; // 0x3810
+ field public static final int FORMAT_M3U_PLAYLIST = 47633; // 0xba11
+ field public static final int FORMAT_MP2 = 47491; // 0xb983
+ field public static final int FORMAT_MP3 = 12297; // 0x3009
+ field public static final int FORMAT_MP4_CONTAINER = 47490; // 0xb982
+ field public static final int FORMAT_MPEG = 12299; // 0x300b
+ field public static final int FORMAT_MPL_PLAYLIST = 47634; // 0xba12
+ field public static final int FORMAT_MS_EXCEL_SPREADSHEET = 47749; // 0xba85
+ field public static final int FORMAT_MS_POWERPOINT_PRESENTATION = 47750; // 0xba86
+ field public static final int FORMAT_MS_WORD_DOCUMENT = 47747; // 0xba83
+ field public static final int FORMAT_OGG = 47362; // 0xb902
+ field public static final int FORMAT_PICT = 14346; // 0x380a
+ field public static final int FORMAT_PLS_PLAYLIST = 47636; // 0xba14
+ field public static final int FORMAT_PNG = 14347; // 0x380b
+ field public static final int FORMAT_SCRIPT = 12290; // 0x3002
+ field public static final int FORMAT_TEXT = 12292; // 0x3004
+ field public static final int FORMAT_TIFF = 14349; // 0x380d
+ field public static final int FORMAT_TIFF_EP = 14338; // 0x3802
+ field public static final int FORMAT_UNDEFINED = 12288; // 0x3000
+ field public static final int FORMAT_UNDEFINED_AUDIO = 47360; // 0xb900
+ field public static final int FORMAT_UNDEFINED_COLLECTION = 47616; // 0xba00
+ field public static final int FORMAT_UNDEFINED_DOCUMENT = 47744; // 0xba80
+ field public static final int FORMAT_UNDEFINED_FIRMWARE = 47106; // 0xb802
+ field public static final int FORMAT_UNDEFINED_VIDEO = 47488; // 0xb980
+ field public static final int FORMAT_WAV = 12296; // 0x3008
+ field public static final int FORMAT_WINDOWS_IMAGE_FORMAT = 47233; // 0xb881
+ field public static final int FORMAT_WMA = 47361; // 0xb901
+ field public static final int FORMAT_WMV = 47489; // 0xb981
+ field public static final int FORMAT_WPL_PLAYLIST = 47632; // 0xba10
+ field public static final int FORMAT_XML_DOCUMENT = 47746; // 0xba82
+ field public static final int PROTECTION_STATUS_NONE = 0; // 0x0
+ field public static final int PROTECTION_STATUS_NON_TRANSFERABLE_DATA = 32771; // 0x8003
+ field public static final int PROTECTION_STATUS_READ_ONLY = 32769; // 0x8001
+ field public static final int PROTECTION_STATUS_READ_ONLY_DATA = 32770; // 0x8002
+ }
+
+ public final class MtpDevice {
+ ctor public MtpDevice(android.hardware.usb.UsbDevice);
+ method public void close();
+ method public boolean deleteObject(int);
+ method public int getDeviceId();
+ method public android.mtp.MtpDeviceInfo getDeviceInfo();
+ method public java.lang.String getDeviceName();
+ method public byte[] getObject(int, int);
+ method public int[] getObjectHandles(int, int, int);
+ method public android.mtp.MtpObjectInfo getObjectInfo(int);
+ method public long getParent(int);
+ method public long getStorageId(int);
+ method public int[] getStorageIds();
+ method public android.mtp.MtpStorageInfo getStorageInfo(int);
+ method public byte[] getThumbnail(int);
+ method public boolean importFile(int, java.lang.String);
+ method public boolean importFile(int, android.os.ParcelFileDescriptor);
+ method public boolean open(android.hardware.usb.UsbDeviceConnection);
+ method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal);
+ method public boolean sendObject(int, int, android.os.ParcelFileDescriptor);
+ method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo);
+ }
+
+ public class MtpDeviceInfo {
+ method public final java.lang.String getManufacturer();
+ method public final java.lang.String getModel();
+ method public final java.lang.String getSerialNumber();
+ method public final java.lang.String getVersion();
+ }
+
+ public class MtpEvent {
+ ctor public MtpEvent();
+ method public int getEventCode();
+ field public static final int EVENT_CANCEL_TRANSACTION = 16385; // 0x4001
+ field public static final int EVENT_CAPTURE_COMPLETE = 16397; // 0x400d
+ field public static final int EVENT_DEVICE_INFO_CHANGED = 16392; // 0x4008
+ field public static final int EVENT_DEVICE_PROP_CHANGED = 16390; // 0x4006
+ field public static final int EVENT_DEVICE_RESET = 16395; // 0x400b
+ field public static final int EVENT_OBJECT_ADDED = 16386; // 0x4002
+ field public static final int EVENT_OBJECT_INFO_CHANGED = 16391; // 0x4007
+ field public static final int EVENT_OBJECT_PROP_CHANGED = 51201; // 0xc801
+ field public static final int EVENT_OBJECT_PROP_DESC_CHANGED = 51202; // 0xc802
+ field public static final int EVENT_OBJECT_REFERENCES_CHANGED = 51203; // 0xc803
+ field public static final int EVENT_OBJECT_REMOVED = 16387; // 0x4003
+ field public static final int EVENT_REQUEST_OBJECT_TRANSFER = 16393; // 0x4009
+ field public static final int EVENT_STORAGE_INFO_CHANGED = 16396; // 0x400c
+ field public static final int EVENT_STORE_ADDED = 16388; // 0x4004
+ field public static final int EVENT_STORE_FULL = 16394; // 0x400a
+ field public static final int EVENT_STORE_REMOVED = 16389; // 0x4005
+ field public static final int EVENT_UNDEFINED = 16384; // 0x4000
+ field public static final int EVENT_UNREPORTED_STATUS = 16398; // 0x400e
+ }
+
+ public final class MtpObjectInfo {
+ method public final int getAssociationDesc();
+ method public final int getAssociationType();
+ method public final int getCompressedSize();
+ method public final long getDateCreated();
+ method public final long getDateModified();
+ method public final int getFormat();
+ method public final int getImagePixDepth();
+ method public final int getImagePixHeight();
+ method public final int getImagePixWidth();
+ method public final java.lang.String getKeywords();
+ method public final java.lang.String getName();
+ method public final int getObjectHandle();
+ method public final int getParent();
+ method public final int getProtectionStatus();
+ method public final int getSequenceNumber();
+ method public final int getStorageId();
+ method public final int getThumbCompressedSize();
+ method public final int getThumbFormat();
+ method public final int getThumbPixHeight();
+ method public final int getThumbPixWidth();
+ }
+
+ public static class MtpObjectInfo.Builder {
+ ctor public MtpObjectInfo.Builder();
+ ctor public MtpObjectInfo.Builder(android.mtp.MtpObjectInfo);
+ method public android.mtp.MtpObjectInfo build();
+ method public android.mtp.MtpObjectInfo.Builder setAssociationDesc(int);
+ method public android.mtp.MtpObjectInfo.Builder setAssociationType(int);
+ method public android.mtp.MtpObjectInfo.Builder setCompressedSize(int);
+ method public android.mtp.MtpObjectInfo.Builder setDateCreated(long);
+ method public android.mtp.MtpObjectInfo.Builder setDateModified(long);
+ method public android.mtp.MtpObjectInfo.Builder setFormat(int);
+ method public android.mtp.MtpObjectInfo.Builder setImagePixDepth(int);
+ method public android.mtp.MtpObjectInfo.Builder setImagePixHeight(int);
+ method public android.mtp.MtpObjectInfo.Builder setImagePixWidth(int);
+ method public android.mtp.MtpObjectInfo.Builder setKeywords(java.lang.String);
+ method public android.mtp.MtpObjectInfo.Builder setName(java.lang.String);
+ method public android.mtp.MtpObjectInfo.Builder setObjectHandle(int);
+ method public android.mtp.MtpObjectInfo.Builder setParent(int);
+ method public android.mtp.MtpObjectInfo.Builder setProtectionStatus(int);
+ method public android.mtp.MtpObjectInfo.Builder setSequenceNumber(int);
+ method public android.mtp.MtpObjectInfo.Builder setStorageId(int);
+ method public android.mtp.MtpObjectInfo.Builder setThumbCompressedSize(int);
+ method public android.mtp.MtpObjectInfo.Builder setThumbFormat(int);
+ method public android.mtp.MtpObjectInfo.Builder setThumbPixHeight(int);
+ method public android.mtp.MtpObjectInfo.Builder setThumbPixWidth(int);
+ }
+
+ public final class MtpStorageInfo {
+ method public final java.lang.String getDescription();
+ method public final long getFreeSpace();
+ method public final long getMaxCapacity();
+ method public final int getStorageId();
+ method public final java.lang.String getVolumeIdentifier();
+ }
+
+}
+
+package android.net {
+
+ public class CaptivePortal implements android.os.Parcelable {
+ method public int describeContents();
+ method public void ignoreNetwork();
+ method public void reportCaptivePortalDismissed();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.CaptivePortal> CREATOR;
+ }
+
+ public class ConnectivityManager {
+ method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
+ method public boolean bindProcessToNetwork(android.net.Network);
+ method public android.net.Network getActiveNetwork();
+ method public android.net.NetworkInfo getActiveNetworkInfo();
+ method public deprecated android.net.NetworkInfo[] getAllNetworkInfo();
+ method public android.net.Network[] getAllNetworks();
+ method public deprecated boolean getBackgroundDataSetting();
+ method public android.net.Network getBoundNetworkForProcess();
+ method public android.net.ProxyInfo getDefaultProxy();
+ method public android.net.LinkProperties getLinkProperties(android.net.Network);
+ method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network);
+ method public deprecated android.net.NetworkInfo getNetworkInfo(int);
+ method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
+ method public deprecated int getNetworkPreference();
+ method public static deprecated android.net.Network getProcessDefaultNetwork();
+ method public boolean isActiveNetworkMetered();
+ method public boolean isDefaultNetworkActive();
+ method public static deprecated boolean isNetworkTypeValid(int);
+ method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
+ method public void registerNetworkCallback(android.net.NetworkRequest, android.app.PendingIntent);
+ method public void releaseNetworkRequest(android.app.PendingIntent);
+ method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
+ method public deprecated void reportBadNetwork(android.net.Network);
+ method public void reportNetworkConnectivity(android.net.Network, boolean);
+ method public boolean requestBandwidthUpdate(android.net.Network);
+ method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
+ method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);
+ method public deprecated boolean requestRouteToHost(int, int);
+ method public deprecated void setNetworkPreference(int);
+ method public static deprecated boolean setProcessDefaultNetwork(android.net.Network);
+ method public deprecated int startUsingNetworkFeature(int, java.lang.String);
+ method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
+ method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
+ method public void unregisterNetworkCallback(android.app.PendingIntent);
+ field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
+ field public static final java.lang.String ACTION_CAPTIVE_PORTAL_SIGN_IN = "android.net.conn.CAPTIVE_PORTAL";
+ field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
+ field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
+ field public static final java.lang.String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL";
+ field public static final java.lang.String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";
+ field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
+ field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
+ field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";
+ field public static final deprecated java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
+ field public static final java.lang.String EXTRA_NETWORK_REQUEST = "android.net.extra.NETWORK_REQUEST";
+ field public static final java.lang.String EXTRA_NETWORK_TYPE = "networkType";
+ field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";
+ field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";
+ field public static final java.lang.String EXTRA_REASON = "reason";
+ field public static final int TYPE_BLUETOOTH = 7; // 0x7
+ field public static final int TYPE_DUMMY = 8; // 0x8
+ field public static final int TYPE_ETHERNET = 9; // 0x9
+ field public static final int TYPE_MOBILE = 0; // 0x0
+ field public static final int TYPE_MOBILE_DUN = 4; // 0x4
+ field public static final deprecated int TYPE_MOBILE_HIPRI = 5; // 0x5
+ field public static final deprecated int TYPE_MOBILE_MMS = 2; // 0x2
+ field public static final deprecated int TYPE_MOBILE_SUPL = 3; // 0x3
+ field public static final int TYPE_VPN = 17; // 0x11
+ field public static final int TYPE_WIFI = 1; // 0x1
+ field public static final int TYPE_WIMAX = 6; // 0x6
+ }
+
+ public static class ConnectivityManager.NetworkCallback {
+ ctor public ConnectivityManager.NetworkCallback();
+ method public void onAvailable(android.net.Network);
+ method public void onCapabilitiesChanged(android.net.Network, android.net.NetworkCapabilities);
+ method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties);
+ method public void onLosing(android.net.Network, int);
+ method public void onLost(android.net.Network);
+ }
+
+ public static abstract interface ConnectivityManager.OnNetworkActiveListener {
+ method public abstract void onNetworkActive();
+ }
+
+ public class Credentials {
+ ctor public Credentials(int, int, int);
+ method public int getGid();
+ method public int getPid();
+ method public int getUid();
+ }
+
+ public class DhcpInfo implements android.os.Parcelable {
+ ctor public DhcpInfo();
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public int dns1;
+ field public int dns2;
+ field public int gateway;
+ field public int ipAddress;
+ field public int leaseDuration;
+ field public int netmask;
+ field public int serverAddress;
+ }
+
+ public final class IpPrefix implements android.os.Parcelable {
+ method public boolean contains(java.net.InetAddress);
+ method public int describeContents();
+ method public java.net.InetAddress getAddress();
+ method public int getPrefixLength();
+ method public byte[] getRawAddress();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.IpPrefix> CREATOR;
+ }
+
+ public class LinkAddress implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.net.InetAddress getAddress();
+ method public int getFlags();
+ method public int getPrefixLength();
+ method public int getScope();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.LinkAddress> CREATOR;
+ }
+
+ public final class LinkProperties implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.util.List<java.net.InetAddress> getDnsServers();
+ method public java.lang.String getDomains();
+ method public android.net.ProxyInfo getHttpProxy();
+ method public java.lang.String getInterfaceName();
+ method public java.util.List<android.net.LinkAddress> getLinkAddresses();
+ method public java.util.List<android.net.RouteInfo> getRoutes();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;
+ }
+
+ public class LocalServerSocket {
+ ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;
+ ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;
+ method public android.net.LocalSocket accept() throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public java.io.FileDescriptor getFileDescriptor();
+ method public android.net.LocalSocketAddress getLocalSocketAddress();
+ }
+
+ public class LocalSocket implements java.io.Closeable {
+ ctor public LocalSocket();
+ ctor public LocalSocket(int);
+ method public void bind(android.net.LocalSocketAddress) throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public void connect(android.net.LocalSocketAddress) throws java.io.IOException;
+ method public void connect(android.net.LocalSocketAddress, int) throws java.io.IOException;
+ method public java.io.FileDescriptor[] getAncillaryFileDescriptors() throws java.io.IOException;
+ method public java.io.FileDescriptor getFileDescriptor();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public android.net.LocalSocketAddress getLocalSocketAddress();
+ method public java.io.OutputStream getOutputStream() throws java.io.IOException;
+ method public android.net.Credentials getPeerCredentials() throws java.io.IOException;
+ method public int getReceiveBufferSize() throws java.io.IOException;
+ method public android.net.LocalSocketAddress getRemoteSocketAddress();
+ method public int getSendBufferSize() throws java.io.IOException;
+ method public int getSoTimeout() throws java.io.IOException;
+ method public synchronized boolean isBound();
+ method public boolean isClosed();
+ method public synchronized boolean isConnected();
+ method public boolean isInputShutdown();
+ method public boolean isOutputShutdown();
+ method public void setFileDescriptorsForSend(java.io.FileDescriptor[]);
+ method public void setReceiveBufferSize(int) throws java.io.IOException;
+ method public void setSendBufferSize(int) throws java.io.IOException;
+ method public void setSoTimeout(int) throws java.io.IOException;
+ method public void shutdownInput() throws java.io.IOException;
+ method public void shutdownOutput() throws java.io.IOException;
+ field public static final int SOCKET_DGRAM = 1; // 0x1
+ field public static final int SOCKET_SEQPACKET = 3; // 0x3
+ field public static final int SOCKET_STREAM = 2; // 0x2
+ }
+
+ public class LocalSocketAddress {
+ ctor public LocalSocketAddress(java.lang.String, android.net.LocalSocketAddress.Namespace);
+ ctor public LocalSocketAddress(java.lang.String);
+ method public java.lang.String getName();
+ method public android.net.LocalSocketAddress.Namespace getNamespace();
+ }
+
+ public static final class LocalSocketAddress.Namespace extends java.lang.Enum {
+ method public static android.net.LocalSocketAddress.Namespace valueOf(java.lang.String);
+ method public static final android.net.LocalSocketAddress.Namespace[] values();
+ enum_constant public static final android.net.LocalSocketAddress.Namespace ABSTRACT;
+ enum_constant public static final android.net.LocalSocketAddress.Namespace FILESYSTEM;
+ enum_constant public static final android.net.LocalSocketAddress.Namespace RESERVED;
+ }
+
+ public class MailTo {
+ method public java.lang.String getBody();
+ method public java.lang.String getCc();
+ method public java.util.Map<java.lang.String, java.lang.String> getHeaders();
+ method public java.lang.String getSubject();
+ method public java.lang.String getTo();
+ method public static boolean isMailTo(java.lang.String);
+ method public static android.net.MailTo parse(java.lang.String) throws android.net.ParseException;
+ field public static final java.lang.String MAILTO_SCHEME = "mailto:";
+ }
+
+ public class Network implements android.os.Parcelable {
+ method public void bindSocket(java.net.DatagramSocket) throws java.io.IOException;
+ method public void bindSocket(java.net.Socket) throws java.io.IOException;
+ method public void bindSocket(java.io.FileDescriptor) throws java.io.IOException;
+ method public int describeContents();
+ method public java.net.InetAddress[] getAllByName(java.lang.String) throws java.net.UnknownHostException;
+ method public java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException;
+ method public long getNetworkHandle();
+ method public javax.net.SocketFactory getSocketFactory();
+ method public java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException;
+ method public java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException;
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR;
+ }
+
+ public final class NetworkCapabilities implements android.os.Parcelable {
+ ctor public NetworkCapabilities(android.net.NetworkCapabilities);
+ method public int describeContents();
+ method public int getLinkDownstreamBandwidthKbps();
+ method public int getLinkUpstreamBandwidthKbps();
+ method public boolean hasCapability(int);
+ method public boolean hasTransport(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.NetworkCapabilities> CREATOR;
+ field public static final int NET_CAPABILITY_CAPTIVE_PORTAL = 17; // 0x11
+ field public static final int NET_CAPABILITY_CBS = 5; // 0x5
+ field public static final int NET_CAPABILITY_DUN = 2; // 0x2
+ field public static final int NET_CAPABILITY_EIMS = 10; // 0xa
+ field public static final int NET_CAPABILITY_FOTA = 3; // 0x3
+ field public static final int NET_CAPABILITY_IA = 7; // 0x7
+ field public static final int NET_CAPABILITY_IMS = 4; // 0x4
+ field public static final int NET_CAPABILITY_INTERNET = 12; // 0xc
+ field public static final int NET_CAPABILITY_MMS = 0; // 0x0
+ field public static final int NET_CAPABILITY_NOT_METERED = 11; // 0xb
+ field public static final int NET_CAPABILITY_NOT_RESTRICTED = 13; // 0xd
+ field public static final int NET_CAPABILITY_NOT_VPN = 15; // 0xf
+ field public static final int NET_CAPABILITY_RCS = 8; // 0x8
+ field public static final int NET_CAPABILITY_SUPL = 1; // 0x1
+ field public static final int NET_CAPABILITY_TRUSTED = 14; // 0xe
+ field public static final int NET_CAPABILITY_VALIDATED = 16; // 0x10
+ field public static final int NET_CAPABILITY_WIFI_P2P = 6; // 0x6
+ field public static final int NET_CAPABILITY_XCAP = 9; // 0x9
+ field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2
+ field public static final int TRANSPORT_CELLULAR = 0; // 0x0
+ field public static final int TRANSPORT_ETHERNET = 3; // 0x3
+ field public static final int TRANSPORT_VPN = 4; // 0x4
+ field public static final int TRANSPORT_WIFI = 1; // 0x1
+ }
+
+ public class NetworkInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.net.NetworkInfo.DetailedState getDetailedState();
+ method public java.lang.String getExtraInfo();
+ method public java.lang.String getReason();
+ method public android.net.NetworkInfo.State getState();
+ method public int getSubtype();
+ method public java.lang.String getSubtypeName();
+ method public int getType();
+ method public java.lang.String getTypeName();
+ method public boolean isAvailable();
+ method public boolean isConnected();
+ method public boolean isConnectedOrConnecting();
+ method public boolean isFailover();
+ method public boolean isRoaming();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public static final class NetworkInfo.DetailedState extends java.lang.Enum {
+ method public static android.net.NetworkInfo.DetailedState valueOf(java.lang.String);
+ method public static final android.net.NetworkInfo.DetailedState[] values();
+ enum_constant public static final android.net.NetworkInfo.DetailedState AUTHENTICATING;
+ enum_constant public static final android.net.NetworkInfo.DetailedState BLOCKED;
+ enum_constant public static final android.net.NetworkInfo.DetailedState CAPTIVE_PORTAL_CHECK;
+ enum_constant public static final android.net.NetworkInfo.DetailedState CONNECTED;
+ enum_constant public static final android.net.NetworkInfo.DetailedState CONNECTING;
+ enum_constant public static final android.net.NetworkInfo.DetailedState DISCONNECTED;
+ enum_constant public static final android.net.NetworkInfo.DetailedState DISCONNECTING;
+ enum_constant public static final android.net.NetworkInfo.DetailedState FAILED;
+ enum_constant public static final android.net.NetworkInfo.DetailedState IDLE;
+ enum_constant public static final android.net.NetworkInfo.DetailedState OBTAINING_IPADDR;
+ enum_constant public static final android.net.NetworkInfo.DetailedState SCANNING;
+ enum_constant public static final android.net.NetworkInfo.DetailedState SUSPENDED;
+ enum_constant public static final android.net.NetworkInfo.DetailedState VERIFYING_POOR_LINK;
+ }
+
+ public static final class NetworkInfo.State extends java.lang.Enum {
+ method public static android.net.NetworkInfo.State valueOf(java.lang.String);
+ method public static final android.net.NetworkInfo.State[] values();
+ enum_constant public static final android.net.NetworkInfo.State CONNECTED;
+ enum_constant public static final android.net.NetworkInfo.State CONNECTING;
+ enum_constant public static final android.net.NetworkInfo.State DISCONNECTED;
+ enum_constant public static final android.net.NetworkInfo.State DISCONNECTING;
+ enum_constant public static final android.net.NetworkInfo.State SUSPENDED;
+ enum_constant public static final android.net.NetworkInfo.State UNKNOWN;
+ }
+
+ public class NetworkRequest implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;
+ }
+
+ public static class NetworkRequest.Builder {
+ ctor public NetworkRequest.Builder();
+ method public android.net.NetworkRequest.Builder addCapability(int);
+ method public android.net.NetworkRequest.Builder addTransportType(int);
+ method public android.net.NetworkRequest build();
+ method public android.net.NetworkRequest.Builder removeCapability(int);
+ method public android.net.NetworkRequest.Builder removeTransportType(int);
+ method public android.net.NetworkRequest.Builder setNetworkSpecifier(java.lang.String);
+ }
+
+ public class ParseException extends java.lang.RuntimeException {
+ field public java.lang.String response;
+ }
+
+ public final class Proxy {
+ ctor public Proxy();
+ method public static final deprecated java.lang.String getDefaultHost();
+ method public static final deprecated int getDefaultPort();
+ method public static final deprecated java.lang.String getHost(android.content.Context);
+ method public static final deprecated int getPort(android.content.Context);
+ field public static final deprecated java.lang.String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";
+ field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";
+ }
+
+ public class ProxyInfo implements android.os.Parcelable {
+ method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int);
+ method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int, java.util.List<java.lang.String>);
+ method public static android.net.ProxyInfo buildPacProxy(android.net.Uri);
+ method public int describeContents();
+ method public java.lang.String[] getExclusionList();
+ method public java.lang.String getHost();
+ method public android.net.Uri getPacFileUrl();
+ method public int getPort();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
+ }
+
+ public abstract class PskKeyManager {
+ ctor public PskKeyManager();
+ method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
+ method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
+ method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
+ method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
+ method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
+ method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
+ field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
+ field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
+ field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
+ }
+
+ public final class RouteInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.net.IpPrefix getDestination();
+ method public java.net.InetAddress getGateway();
+ method public java.lang.String getInterface();
+ method public boolean isDefaultRoute();
+ method public boolean matches(java.net.InetAddress);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.RouteInfo> CREATOR;
+ }
+
+ public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
+ ctor public deprecated SSLCertificateSocketFactory(int);
+ method public java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException;
+ method public java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
+ method public java.net.Socket createSocket(java.net.InetAddress, int) throws java.io.IOException;
+ method public java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException;
+ method public java.net.Socket createSocket(java.lang.String, int) throws java.io.IOException;
+ method public static javax.net.SocketFactory getDefault(int);
+ method public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache);
+ method public java.lang.String[] getDefaultCipherSuites();
+ method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache);
+ method public byte[] getNpnSelectedProtocol(java.net.Socket);
+ method public java.lang.String[] getSupportedCipherSuites();
+ method public void setHostname(java.net.Socket, java.lang.String);
+ method public void setKeyManagers(javax.net.ssl.KeyManager[]);
+ method public void setNpnProtocols(byte[][]);
+ method public void setTrustManagers(javax.net.ssl.TrustManager[]);
+ method public void setUseSessionTickets(java.net.Socket, boolean);
+ }
+
+ public final class SSLSessionCache {
+ ctor public SSLSessionCache(java.io.File) throws java.io.IOException;
+ ctor public SSLSessionCache(android.content.Context);
+ }
+
+ public class TrafficStats {
+ ctor public TrafficStats();
+ method public static void clearThreadStatsTag();
+ method public static long getMobileRxBytes();
+ method public static long getMobileRxPackets();
+ method public static long getMobileTxBytes();
+ method public static long getMobileTxPackets();
+ method public static int getThreadStatsTag();
+ method public static long getTotalRxBytes();
+ method public static long getTotalRxPackets();
+ method public static long getTotalTxBytes();
+ method public static long getTotalTxPackets();
+ method public static long getUidRxBytes(int);
+ method public static long getUidRxPackets(int);
+ method public static deprecated long getUidTcpRxBytes(int);
+ method public static deprecated long getUidTcpRxSegments(int);
+ method public static deprecated long getUidTcpTxBytes(int);
+ method public static deprecated long getUidTcpTxSegments(int);
+ method public static long getUidTxBytes(int);
+ method public static long getUidTxPackets(int);
+ method public static deprecated long getUidUdpRxBytes(int);
+ method public static deprecated long getUidUdpRxPackets(int);
+ method public static deprecated long getUidUdpTxBytes(int);
+ method public static deprecated long getUidUdpTxPackets(int);
+ method public static void incrementOperationCount(int);
+ method public static void incrementOperationCount(int, int);
+ method public static void setThreadStatsTag(int);
+ method public static void tagSocket(java.net.Socket) throws java.net.SocketException;
+ method public static void untagSocket(java.net.Socket) throws java.net.SocketException;
+ field public static final int UNSUPPORTED = -1; // 0xffffffff
+ }
+
+ public abstract class Uri implements java.lang.Comparable android.os.Parcelable {
+ method public abstract android.net.Uri.Builder buildUpon();
+ method public int compareTo(android.net.Uri);
+ method public static java.lang.String decode(java.lang.String);
+ method public static java.lang.String encode(java.lang.String);
+ method public static java.lang.String encode(java.lang.String, java.lang.String);
+ method public static android.net.Uri fromFile(java.io.File);
+ method public static android.net.Uri fromParts(java.lang.String, java.lang.String, java.lang.String);
+ method public abstract java.lang.String getAuthority();
+ method public boolean getBooleanQueryParameter(java.lang.String, boolean);
+ method public abstract java.lang.String getEncodedAuthority();
+ method public abstract java.lang.String getEncodedFragment();
+ method public abstract java.lang.String getEncodedPath();
+ method public abstract java.lang.String getEncodedQuery();
+ method public abstract java.lang.String getEncodedSchemeSpecificPart();
+ method public abstract java.lang.String getEncodedUserInfo();
+ method public abstract java.lang.String getFragment();
+ method public abstract java.lang.String getHost();
+ method public abstract java.lang.String getLastPathSegment();
+ method public abstract java.lang.String getPath();
+ method public abstract java.util.List<java.lang.String> getPathSegments();
+ method public abstract int getPort();
+ method public abstract java.lang.String getQuery();
+ method public java.lang.String getQueryParameter(java.lang.String);
+ method public java.util.Set<java.lang.String> getQueryParameterNames();
+ method public java.util.List<java.lang.String> getQueryParameters(java.lang.String);
+ method public abstract java.lang.String getScheme();
+ method public abstract java.lang.String getSchemeSpecificPart();
+ method public abstract java.lang.String getUserInfo();
+ method public boolean isAbsolute();
+ method public abstract boolean isHierarchical();
+ method public boolean isOpaque();
+ method public abstract boolean isRelative();
+ method public android.net.Uri normalizeScheme();
+ method public static android.net.Uri parse(java.lang.String);
+ method public abstract java.lang.String toString();
+ method public static android.net.Uri withAppendedPath(android.net.Uri, java.lang.String);
+ method public static void writeToParcel(android.os.Parcel, android.net.Uri);
+ field public static final android.os.Parcelable.Creator<android.net.Uri> CREATOR;
+ field public static final android.net.Uri EMPTY;
+ }
+
+ public static final class Uri.Builder {
+ ctor public Uri.Builder();
+ method public android.net.Uri.Builder appendEncodedPath(java.lang.String);
+ method public android.net.Uri.Builder appendPath(java.lang.String);
+ method public android.net.Uri.Builder appendQueryParameter(java.lang.String, java.lang.String);
+ method public android.net.Uri.Builder authority(java.lang.String);
+ method public android.net.Uri build();
+ method public android.net.Uri.Builder clearQuery();
+ method public android.net.Uri.Builder encodedAuthority(java.lang.String);
+ method public android.net.Uri.Builder encodedFragment(java.lang.String);
+ method public android.net.Uri.Builder encodedOpaquePart(java.lang.String);
+ method public android.net.Uri.Builder encodedPath(java.lang.String);
+ method public android.net.Uri.Builder encodedQuery(java.lang.String);
+ method public android.net.Uri.Builder fragment(java.lang.String);
+ method public android.net.Uri.Builder opaquePart(java.lang.String);
+ method public android.net.Uri.Builder path(java.lang.String);
+ method public android.net.Uri.Builder query(java.lang.String);
+ method public android.net.Uri.Builder scheme(java.lang.String);
+ }
+
+ public class UrlQuerySanitizer {
+ ctor public UrlQuerySanitizer();
+ ctor public UrlQuerySanitizer(java.lang.String);
+ method protected void addSanitizedEntry(java.lang.String, java.lang.String);
+ method protected void clear();
+ method protected int decodeHexDigit(char);
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getAllButNulAndAngleBracketsLegal();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getAllButNulLegal();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getAllButWhitespaceLegal();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getAllIllegal();
+ method public boolean getAllowUnregisteredParamaters();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getAmpAndSpaceLegal();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getAmpLegal();
+ method public android.net.UrlQuerySanitizer.ValueSanitizer getEffectiveValueSanitizer(java.lang.String);
+ method public java.util.List<android.net.UrlQuerySanitizer.ParameterValuePair> getParameterList();
+ method public java.util.Set<java.lang.String> getParameterSet();
+ method public boolean getPreferFirstRepeatedParameter();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getSpaceLegal();
+ method public android.net.UrlQuerySanitizer.ValueSanitizer getUnregisteredParameterValueSanitizer();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getUrlAndSpaceLegal();
+ method public static final android.net.UrlQuerySanitizer.ValueSanitizer getUrlLegal();
+ method public java.lang.String getValue(java.lang.String);
+ method public android.net.UrlQuerySanitizer.ValueSanitizer getValueSanitizer(java.lang.String);
+ method public boolean hasParameter(java.lang.String);
+ method protected boolean isHexDigit(char);
+ method protected void parseEntry(java.lang.String, java.lang.String);
+ method public void parseQuery(java.lang.String);
+ method public void parseUrl(java.lang.String);
+ method public void registerParameter(java.lang.String, android.net.UrlQuerySanitizer.ValueSanitizer);
+ method public void registerParameters(java.lang.String[], android.net.UrlQuerySanitizer.ValueSanitizer);
+ method public void setAllowUnregisteredParamaters(boolean);
+ method public void setPreferFirstRepeatedParameter(boolean);
+ method public void setUnregisteredParameterValueSanitizer(android.net.UrlQuerySanitizer.ValueSanitizer);
+ method public java.lang.String unescape(java.lang.String);
+ }
+
+ public static class UrlQuerySanitizer.IllegalCharacterValueSanitizer implements android.net.UrlQuerySanitizer.ValueSanitizer {
+ ctor public UrlQuerySanitizer.IllegalCharacterValueSanitizer(int);
+ method public java.lang.String sanitize(java.lang.String);
+ field public static final int ALL_BUT_NUL_AND_ANGLE_BRACKETS_LEGAL = 1439; // 0x59f
+ field public static final int ALL_BUT_NUL_LEGAL = 1535; // 0x5ff
+ field public static final int ALL_BUT_WHITESPACE_LEGAL = 1532; // 0x5fc
+ field public static final int ALL_ILLEGAL = 0; // 0x0
+ field public static final int ALL_OK = 2047; // 0x7ff
+ field public static final int ALL_WHITESPACE_OK = 3; // 0x3
+ field public static final int AMP_AND_SPACE_LEGAL = 129; // 0x81
+ field public static final int AMP_LEGAL = 128; // 0x80
+ field public static final int AMP_OK = 128; // 0x80
+ field public static final int DQUOTE_OK = 8; // 0x8
+ field public static final int GT_OK = 64; // 0x40
+ field public static final int LT_OK = 32; // 0x20
+ field public static final int NON_7_BIT_ASCII_OK = 4; // 0x4
+ field public static final int NUL_OK = 512; // 0x200
+ field public static final int OTHER_WHITESPACE_OK = 2; // 0x2
+ field public static final int PCT_OK = 256; // 0x100
+ field public static final int SCRIPT_URL_OK = 1024; // 0x400
+ field public static final int SPACE_LEGAL = 1; // 0x1
+ field public static final int SPACE_OK = 1; // 0x1
+ field public static final int SQUOTE_OK = 16; // 0x10
+ field public static final int URL_AND_SPACE_LEGAL = 405; // 0x195
+ field public static final int URL_LEGAL = 404; // 0x194
+ }
+
+ public class UrlQuerySanitizer.ParameterValuePair {
+ ctor public UrlQuerySanitizer.ParameterValuePair(java.lang.String, java.lang.String);
+ field public java.lang.String mParameter;
+ field public java.lang.String mValue;
+ }
+
+ public static abstract interface UrlQuerySanitizer.ValueSanitizer {
+ method public abstract java.lang.String sanitize(java.lang.String);
+ }
+
+ public class VpnService extends android.app.Service {
+ ctor public VpnService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onRevoke();
+ method public static android.content.Intent prepare(android.content.Context);
+ method public boolean protect(int);
+ method public boolean protect(java.net.Socket);
+ method public boolean protect(java.net.DatagramSocket);
+ method public boolean setUnderlyingNetworks(android.net.Network[]);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";
+ }
+
+ public class VpnService.Builder {
+ ctor public VpnService.Builder();
+ method public android.net.VpnService.Builder addAddress(java.net.InetAddress, int);
+ method public android.net.VpnService.Builder addAddress(java.lang.String, int);
+ method public android.net.VpnService.Builder addAllowedApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.net.VpnService.Builder addDisallowedApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.net.VpnService.Builder addDnsServer(java.net.InetAddress);
+ method public android.net.VpnService.Builder addDnsServer(java.lang.String);
+ method public android.net.VpnService.Builder addRoute(java.net.InetAddress, int);
+ method public android.net.VpnService.Builder addRoute(java.lang.String, int);
+ method public android.net.VpnService.Builder addSearchDomain(java.lang.String);
+ method public android.net.VpnService.Builder allowBypass();
+ method public android.net.VpnService.Builder allowFamily(int);
+ method public android.os.ParcelFileDescriptor establish();
+ method public android.net.VpnService.Builder setBlocking(boolean);
+ method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent);
+ method public android.net.VpnService.Builder setMtu(int);
+ method public android.net.VpnService.Builder setSession(java.lang.String);
+ method public android.net.VpnService.Builder setUnderlyingNetworks(android.net.Network[]);
+ }
+
+}
+
+package android.net.http {
+
+ public final class HttpResponseCache extends java.net.ResponseCache implements java.io.Closeable {
+ method public void close() throws java.io.IOException;
+ method public void delete() throws java.io.IOException;
+ method public void flush();
+ method public java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public int getHitCount();
+ method public static android.net.http.HttpResponseCache getInstalled();
+ method public int getNetworkCount();
+ method public int getRequestCount();
+ method public static synchronized android.net.http.HttpResponseCache install(java.io.File, long) throws java.io.IOException;
+ method public long maxSize();
+ method public java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
+ method public long size();
+ }
+
+ public class SslCertificate {
+ ctor public deprecated SslCertificate(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ ctor public deprecated SslCertificate(java.lang.String, java.lang.String, java.util.Date, java.util.Date);
+ ctor public SslCertificate(java.security.cert.X509Certificate);
+ method public android.net.http.SslCertificate.DName getIssuedBy();
+ method public android.net.http.SslCertificate.DName getIssuedTo();
+ method public deprecated java.lang.String getValidNotAfter();
+ method public java.util.Date getValidNotAfterDate();
+ method public deprecated java.lang.String getValidNotBefore();
+ method public java.util.Date getValidNotBeforeDate();
+ method public static android.net.http.SslCertificate restoreState(android.os.Bundle);
+ method public static android.os.Bundle saveState(android.net.http.SslCertificate);
+ }
+
+ public class SslCertificate.DName {
+ ctor public SslCertificate.DName(java.lang.String);
+ method public java.lang.String getCName();
+ method public java.lang.String getDName();
+ method public java.lang.String getOName();
+ method public java.lang.String getUName();
+ }
+
+ public class SslError {
+ ctor public deprecated SslError(int, android.net.http.SslCertificate);
+ ctor public deprecated SslError(int, java.security.cert.X509Certificate);
+ ctor public SslError(int, android.net.http.SslCertificate, java.lang.String);
+ ctor public SslError(int, java.security.cert.X509Certificate, java.lang.String);
+ method public boolean addError(int);
+ method public android.net.http.SslCertificate getCertificate();
+ method public int getPrimaryError();
+ method public java.lang.String getUrl();
+ method public boolean hasError(int);
+ field public static final int SSL_DATE_INVALID = 4; // 0x4
+ field public static final int SSL_EXPIRED = 1; // 0x1
+ field public static final int SSL_IDMISMATCH = 2; // 0x2
+ field public static final int SSL_INVALID = 5; // 0x5
+ field public static final deprecated int SSL_MAX_ERROR = 6; // 0x6
+ field public static final int SSL_NOTYETVALID = 0; // 0x0
+ field public static final int SSL_UNTRUSTED = 3; // 0x3
+ }
+
+ public class X509TrustManagerExtensions {
+ ctor public X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) throws java.lang.IllegalArgumentException;
+ method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String) throws java.security.cert.CertificateException;
+ method public boolean isUserAddedCertificate(java.security.cert.X509Certificate);
+ }
+
+}
+
+package android.net.nsd {
+
+ public final class NsdManager {
+ method public void discoverServices(java.lang.String, int, android.net.nsd.NsdManager.DiscoveryListener);
+ method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener);
+ method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener);
+ method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener);
+ method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener);
+ field public static final java.lang.String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED";
+ field public static final java.lang.String EXTRA_NSD_STATE = "nsd_state";
+ field public static final int FAILURE_ALREADY_ACTIVE = 3; // 0x3
+ field public static final int FAILURE_INTERNAL_ERROR = 0; // 0x0
+ field public static final int FAILURE_MAX_LIMIT = 4; // 0x4
+ field public static final int NSD_STATE_DISABLED = 1; // 0x1
+ field public static final int NSD_STATE_ENABLED = 2; // 0x2
+ field public static final int PROTOCOL_DNS_SD = 1; // 0x1
+ }
+
+ public static abstract interface NsdManager.DiscoveryListener {
+ method public abstract void onDiscoveryStarted(java.lang.String);
+ method public abstract void onDiscoveryStopped(java.lang.String);
+ method public abstract void onServiceFound(android.net.nsd.NsdServiceInfo);
+ method public abstract void onServiceLost(android.net.nsd.NsdServiceInfo);
+ method public abstract void onStartDiscoveryFailed(java.lang.String, int);
+ method public abstract void onStopDiscoveryFailed(java.lang.String, int);
+ }
+
+ public static abstract interface NsdManager.RegistrationListener {
+ method public abstract void onRegistrationFailed(android.net.nsd.NsdServiceInfo, int);
+ method public abstract void onServiceRegistered(android.net.nsd.NsdServiceInfo);
+ method public abstract void onServiceUnregistered(android.net.nsd.NsdServiceInfo);
+ method public abstract void onUnregistrationFailed(android.net.nsd.NsdServiceInfo, int);
+ }
+
+ public static abstract interface NsdManager.ResolveListener {
+ method public abstract void onResolveFailed(android.net.nsd.NsdServiceInfo, int);
+ method public abstract void onServiceResolved(android.net.nsd.NsdServiceInfo);
+ }
+
+ public final class NsdServiceInfo implements android.os.Parcelable {
+ ctor public NsdServiceInfo();
+ method public int describeContents();
+ method public java.util.Map<java.lang.String, byte[]> getAttributes();
+ method public java.net.InetAddress getHost();
+ method public int getPort();
+ method public java.lang.String getServiceName();
+ method public java.lang.String getServiceType();
+ method public void removeAttribute(java.lang.String);
+ method public void setAttribute(java.lang.String, java.lang.String);
+ method public void setHost(java.net.InetAddress);
+ method public void setPort(int);
+ method public void setServiceName(java.lang.String);
+ method public void setServiceType(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.nsd.NsdServiceInfo> CREATOR;
+ }
+
+}
+
+package android.net.rtp {
+
+ public class AudioCodec {
+ method public static android.net.rtp.AudioCodec getCodec(int, java.lang.String, java.lang.String);
+ method public static android.net.rtp.AudioCodec[] getCodecs();
+ field public static final android.net.rtp.AudioCodec AMR;
+ field public static final android.net.rtp.AudioCodec GSM;
+ field public static final android.net.rtp.AudioCodec GSM_EFR;
+ field public static final android.net.rtp.AudioCodec PCMA;
+ field public static final android.net.rtp.AudioCodec PCMU;
+ field public final java.lang.String fmtp;
+ field public final java.lang.String rtpmap;
+ field public final int type;
+ }
+
+ public class AudioGroup {
+ ctor public AudioGroup();
+ method public void clear();
+ method public int getMode();
+ method public android.net.rtp.AudioStream[] getStreams();
+ method public void sendDtmf(int);
+ method public void setMode(int);
+ field public static final int MODE_ECHO_SUPPRESSION = 3; // 0x3
+ field public static final int MODE_MUTED = 1; // 0x1
+ field public static final int MODE_NORMAL = 2; // 0x2
+ field public static final int MODE_ON_HOLD = 0; // 0x0
+ }
+
+ public class AudioStream extends android.net.rtp.RtpStream {
+ ctor public AudioStream(java.net.InetAddress) throws java.net.SocketException;
+ method public android.net.rtp.AudioCodec getCodec();
+ method public int getDtmfType();
+ method public android.net.rtp.AudioGroup getGroup();
+ method public final boolean isBusy();
+ method public void join(android.net.rtp.AudioGroup);
+ method public void setCodec(android.net.rtp.AudioCodec);
+ method public void setDtmfType(int);
+ }
+
+ public class RtpStream {
+ method public void associate(java.net.InetAddress, int);
+ method public java.net.InetAddress getLocalAddress();
+ method public int getLocalPort();
+ method public int getMode();
+ method public java.net.InetAddress getRemoteAddress();
+ method public int getRemotePort();
+ method public boolean isBusy();
+ method public void release();
+ method public void setMode(int);
+ field public static final int MODE_NORMAL = 0; // 0x0
+ field public static final int MODE_RECEIVE_ONLY = 2; // 0x2
+ field public static final int MODE_SEND_ONLY = 1; // 0x1
+ }
+
+}
+
+package android.net.sip {
+
+ public class SipAudioCall {
+ ctor public SipAudioCall(android.content.Context, android.net.sip.SipProfile);
+ method public void answerCall(int) throws android.net.sip.SipException;
+ method public void attachCall(android.net.sip.SipSession, java.lang.String) throws android.net.sip.SipException;
+ method public void close();
+ method public void continueCall(int) throws android.net.sip.SipException;
+ method public void endCall() throws android.net.sip.SipException;
+ method public android.net.sip.SipProfile getLocalProfile();
+ method public android.net.sip.SipProfile getPeerProfile();
+ method public int getState();
+ method public void holdCall(int) throws android.net.sip.SipException;
+ method public boolean isInCall();
+ method public boolean isMuted();
+ method public boolean isOnHold();
+ method public void makeCall(android.net.sip.SipProfile, android.net.sip.SipSession, int) throws android.net.sip.SipException;
+ method public void sendDtmf(int);
+ method public void sendDtmf(int, android.os.Message);
+ method public void setListener(android.net.sip.SipAudioCall.Listener);
+ method public void setListener(android.net.sip.SipAudioCall.Listener, boolean);
+ method public void setSpeakerMode(boolean);
+ method public void startAudio();
+ method public void toggleMute();
+ }
+
+ public static class SipAudioCall.Listener {
+ ctor public SipAudioCall.Listener();
+ method public void onCallBusy(android.net.sip.SipAudioCall);
+ method public void onCallEnded(android.net.sip.SipAudioCall);
+ method public void onCallEstablished(android.net.sip.SipAudioCall);
+ method public void onCallHeld(android.net.sip.SipAudioCall);
+ method public void onCalling(android.net.sip.SipAudioCall);
+ method public void onChanged(android.net.sip.SipAudioCall);
+ method public void onError(android.net.sip.SipAudioCall, int, java.lang.String);
+ method public void onReadyToCall(android.net.sip.SipAudioCall);
+ method public void onRinging(android.net.sip.SipAudioCall, android.net.sip.SipProfile);
+ method public void onRingingBack(android.net.sip.SipAudioCall);
+ }
+
+ public class SipErrorCode {
+ method public static java.lang.String toString(int);
+ field public static final int CLIENT_ERROR = -4; // 0xfffffffc
+ field public static final int CROSS_DOMAIN_AUTHENTICATION = -11; // 0xfffffff5
+ field public static final int DATA_CONNECTION_LOST = -10; // 0xfffffff6
+ field public static final int INVALID_CREDENTIALS = -8; // 0xfffffff8
+ field public static final int INVALID_REMOTE_URI = -6; // 0xfffffffa
+ field public static final int IN_PROGRESS = -9; // 0xfffffff7
+ field public static final int NO_ERROR = 0; // 0x0
+ field public static final int PEER_NOT_REACHABLE = -7; // 0xfffffff9
+ field public static final int SERVER_ERROR = -2; // 0xfffffffe
+ field public static final int SERVER_UNREACHABLE = -12; // 0xfffffff4
+ field public static final int SOCKET_ERROR = -1; // 0xffffffff
+ field public static final int TIME_OUT = -5; // 0xfffffffb
+ field public static final int TRANSACTION_TERMINTED = -3; // 0xfffffffd
+ }
+
+ public class SipException extends java.lang.Exception {
+ ctor public SipException();
+ ctor public SipException(java.lang.String);
+ ctor public SipException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class SipManager {
+ method public void close(java.lang.String) throws android.net.sip.SipException;
+ method public android.net.sip.SipSession createSipSession(android.net.sip.SipProfile, android.net.sip.SipSession.Listener) throws android.net.sip.SipException;
+ method public static java.lang.String getCallId(android.content.Intent);
+ method public static java.lang.String getOfferSessionDescription(android.content.Intent);
+ method public android.net.sip.SipSession getSessionFor(android.content.Intent) throws android.net.sip.SipException;
+ method public static boolean isApiSupported(android.content.Context);
+ method public static boolean isIncomingCallIntent(android.content.Intent);
+ method public boolean isOpened(java.lang.String) throws android.net.sip.SipException;
+ method public boolean isRegistered(java.lang.String) throws android.net.sip.SipException;
+ method public static boolean isSipWifiOnly(android.content.Context);
+ method public static boolean isVoipSupported(android.content.Context);
+ method public android.net.sip.SipAudioCall makeAudioCall(android.net.sip.SipProfile, android.net.sip.SipProfile, android.net.sip.SipAudioCall.Listener, int) throws android.net.sip.SipException;
+ method public android.net.sip.SipAudioCall makeAudioCall(java.lang.String, java.lang.String, android.net.sip.SipAudioCall.Listener, int) throws android.net.sip.SipException;
+ method public static android.net.sip.SipManager newInstance(android.content.Context);
+ method public void open(android.net.sip.SipProfile) throws android.net.sip.SipException;
+ method public void open(android.net.sip.SipProfile, android.app.PendingIntent, android.net.sip.SipRegistrationListener) throws android.net.sip.SipException;
+ method public void register(android.net.sip.SipProfile, int, android.net.sip.SipRegistrationListener) throws android.net.sip.SipException;
+ method public void setRegistrationListener(java.lang.String, android.net.sip.SipRegistrationListener) throws android.net.sip.SipException;
+ method public android.net.sip.SipAudioCall takeAudioCall(android.content.Intent, android.net.sip.SipAudioCall.Listener) throws android.net.sip.SipException;
+ method public void unregister(android.net.sip.SipProfile, android.net.sip.SipRegistrationListener) throws android.net.sip.SipException;
+ field public static final java.lang.String EXTRA_CALL_ID = "android:sipCallID";
+ field public static final java.lang.String EXTRA_OFFER_SD = "android:sipOfferSD";
+ field public static final int INCOMING_CALL_RESULT_CODE = 101; // 0x65
+ }
+
+ public class SipProfile implements java.lang.Cloneable android.os.Parcelable java.io.Serializable {
+ method public int describeContents();
+ method public java.lang.String getAuthUserName();
+ method public boolean getAutoRegistration();
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getPassword();
+ method public int getPort();
+ method public java.lang.String getProfileName();
+ method public java.lang.String getProtocol();
+ method public java.lang.String getProxyAddress();
+ method public boolean getSendKeepAlive();
+ method public java.lang.String getSipDomain();
+ method public java.lang.String getUriString();
+ method public java.lang.String getUserName();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.sip.SipProfile> CREATOR;
+ }
+
+ public static class SipProfile.Builder {
+ ctor public SipProfile.Builder(android.net.sip.SipProfile);
+ ctor public SipProfile.Builder(java.lang.String) throws java.text.ParseException;
+ ctor public SipProfile.Builder(java.lang.String, java.lang.String) throws java.text.ParseException;
+ method public android.net.sip.SipProfile build();
+ method public android.net.sip.SipProfile.Builder setAuthUserName(java.lang.String);
+ method public android.net.sip.SipProfile.Builder setAutoRegistration(boolean);
+ method public android.net.sip.SipProfile.Builder setDisplayName(java.lang.String);
+ method public android.net.sip.SipProfile.Builder setOutboundProxy(java.lang.String);
+ method public android.net.sip.SipProfile.Builder setPassword(java.lang.String);
+ method public android.net.sip.SipProfile.Builder setPort(int) throws java.lang.IllegalArgumentException;
+ method public android.net.sip.SipProfile.Builder setProfileName(java.lang.String);
+ method public android.net.sip.SipProfile.Builder setProtocol(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public android.net.sip.SipProfile.Builder setSendKeepAlive(boolean);
+ }
+
+ public abstract interface SipRegistrationListener {
+ method public abstract void onRegistering(java.lang.String);
+ method public abstract void onRegistrationDone(java.lang.String, long);
+ method public abstract void onRegistrationFailed(java.lang.String, int, java.lang.String);
+ }
+
+ public final class SipSession {
+ method public void answerCall(java.lang.String, int);
+ method public void changeCall(java.lang.String, int);
+ method public void endCall();
+ method public java.lang.String getCallId();
+ method public java.lang.String getLocalIp();
+ method public android.net.sip.SipProfile getLocalProfile();
+ method public android.net.sip.SipProfile getPeerProfile();
+ method public int getState();
+ method public boolean isInCall();
+ method public void makeCall(android.net.sip.SipProfile, java.lang.String, int);
+ method public void register(int);
+ method public void setListener(android.net.sip.SipSession.Listener);
+ method public void unregister();
+ }
+
+ public static class SipSession.Listener {
+ ctor public SipSession.Listener();
+ method public void onCallBusy(android.net.sip.SipSession);
+ method public void onCallChangeFailed(android.net.sip.SipSession, int, java.lang.String);
+ method public void onCallEnded(android.net.sip.SipSession);
+ method public void onCallEstablished(android.net.sip.SipSession, java.lang.String);
+ method public void onCalling(android.net.sip.SipSession);
+ method public void onError(android.net.sip.SipSession, int, java.lang.String);
+ method public void onRegistering(android.net.sip.SipSession);
+ method public void onRegistrationDone(android.net.sip.SipSession, int);
+ method public void onRegistrationFailed(android.net.sip.SipSession, int, java.lang.String);
+ method public void onRegistrationTimeout(android.net.sip.SipSession);
+ method public void onRinging(android.net.sip.SipSession, android.net.sip.SipProfile, java.lang.String);
+ method public void onRingingBack(android.net.sip.SipSession);
+ }
+
+ public static class SipSession.State {
+ method public static java.lang.String toString(int);
+ field public static final int DEREGISTERING = 2; // 0x2
+ field public static final int INCOMING_CALL = 3; // 0x3
+ field public static final int INCOMING_CALL_ANSWERING = 4; // 0x4
+ field public static final int IN_CALL = 8; // 0x8
+ field public static final int NOT_DEFINED = 101; // 0x65
+ field public static final int OUTGOING_CALL = 5; // 0x5
+ field public static final int OUTGOING_CALL_CANCELING = 7; // 0x7
+ field public static final int OUTGOING_CALL_RING_BACK = 6; // 0x6
+ field public static final int PINGING = 9; // 0x9
+ field public static final int READY_TO_CALL = 0; // 0x0
+ field public static final int REGISTERING = 1; // 0x1
+ }
+
+}
+
+package android.net.wifi {
+
+ public class ScanInfo implements android.os.Parcelable {
+ ctor public ScanInfo(android.net.wifi.ScanResult);
+ ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int);
+ method public int describeContents();
+ method public long getBssid();
+ method public byte[] getIconData();
+ method public java.lang.String getIconType();
+ method public java.lang.String getName();
+ method public int getOsuIdentity();
+ method public int getRssi();
+ method public android.net.wifi.ScanResult getScanResult();
+ method public java.lang.String getServiceDescription();
+ method public java.lang.String getSsid();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class ScanResult implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean is80211mcResponder();
+ method public boolean isPasspointNetwork();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public java.lang.String BSSID;
+ field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3
+ field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0
+ field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1
+ field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2
+ field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4
+ field public java.lang.String SSID;
+ field public java.lang.String capabilities;
+ field public int centerFreq0;
+ field public int centerFreq1;
+ field public int channelWidth;
+ field public int frequency;
+ field public int level;
+ field public java.lang.CharSequence operatorFriendlyName;
+ field public long timestamp;
+ field public java.lang.CharSequence venueName;
+ }
+
+ public final class SupplicantState extends java.lang.Enum implements android.os.Parcelable {
+ method public int describeContents();
+ method public static boolean isValidState(android.net.wifi.SupplicantState);
+ method public static android.net.wifi.SupplicantState valueOf(java.lang.String);
+ method public static final android.net.wifi.SupplicantState[] values();
+ method public void writeToParcel(android.os.Parcel, int);
+ enum_constant public static final android.net.wifi.SupplicantState ASSOCIATED;
+ enum_constant public static final android.net.wifi.SupplicantState ASSOCIATING;
+ enum_constant public static final android.net.wifi.SupplicantState AUTHENTICATING;
+ enum_constant public static final android.net.wifi.SupplicantState COMPLETED;
+ enum_constant public static final android.net.wifi.SupplicantState DISCONNECTED;
+ enum_constant public static final android.net.wifi.SupplicantState DORMANT;
+ enum_constant public static final android.net.wifi.SupplicantState FOUR_WAY_HANDSHAKE;
+ enum_constant public static final android.net.wifi.SupplicantState GROUP_HANDSHAKE;
+ enum_constant public static final android.net.wifi.SupplicantState INACTIVE;
+ enum_constant public static final android.net.wifi.SupplicantState INTERFACE_DISABLED;
+ enum_constant public static final android.net.wifi.SupplicantState INVALID;
+ enum_constant public static final android.net.wifi.SupplicantState SCANNING;
+ enum_constant public static final android.net.wifi.SupplicantState UNINITIALIZED;
+ }
+
+ public class WifiConfiguration implements android.os.Parcelable {
+ ctor public WifiConfiguration();
+ method public int describeContents();
+ method public boolean isPasspoint();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public java.lang.String BSSID;
+ field public java.lang.String FQDN;
+ field public java.lang.String SSID;
+ field public java.util.BitSet allowedAuthAlgorithms;
+ field public java.util.BitSet allowedGroupCiphers;
+ field public java.util.BitSet allowedKeyManagement;
+ field public java.util.BitSet allowedPairwiseCiphers;
+ field public java.util.BitSet allowedProtocols;
+ field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
+ field public boolean hiddenSSID;
+ field public int networkId;
+ field public java.lang.String preSharedKey;
+ field public int priority;
+ field public java.lang.String providerFriendlyName;
+ field public long[] roamingConsortiumIds;
+ field public int status;
+ field public java.lang.String[] wepKeys;
+ field public int wepTxKeyIndex;
+ }
+
+ public static class WifiConfiguration.AuthAlgorithm {
+ field public static final int LEAP = 2; // 0x2
+ field public static final int OPEN = 0; // 0x0
+ field public static final int SHARED = 1; // 0x1
+ field public static final java.lang.String[] strings;
+ field public static final java.lang.String varName = "auth_alg";
+ }
+
+ public static class WifiConfiguration.GroupCipher {
+ field public static final int CCMP = 3; // 0x3
+ field public static final int TKIP = 2; // 0x2
+ field public static final int WEP104 = 1; // 0x1
+ field public static final int WEP40 = 0; // 0x0
+ field public static final java.lang.String[] strings;
+ field public static final java.lang.String varName = "group";
+ }
+
+ public static class WifiConfiguration.KeyMgmt {
+ field public static final int IEEE8021X = 3; // 0x3
+ field public static final int NONE = 0; // 0x0
+ field public static final int WPA_EAP = 2; // 0x2
+ field public static final int WPA_PSK = 1; // 0x1
+ field public static final java.lang.String[] strings;
+ field public static final java.lang.String varName = "key_mgmt";
+ }
+
+ public static class WifiConfiguration.PairwiseCipher {
+ field public static final int CCMP = 2; // 0x2
+ field public static final int NONE = 0; // 0x0
+ field public static final int TKIP = 1; // 0x1
+ field public static final java.lang.String[] strings;
+ field public static final java.lang.String varName = "pairwise";
+ }
+
+ public static class WifiConfiguration.Protocol {
+ field public static final int RSN = 1; // 0x1
+ field public static final int WPA = 0; // 0x0
+ field public static final java.lang.String[] strings;
+ field public static final java.lang.String varName = "proto";
+ }
+
+ public static class WifiConfiguration.Status {
+ field public static final int CURRENT = 0; // 0x0
+ field public static final int DISABLED = 1; // 0x1
+ field public static final int ENABLED = 2; // 0x2
+ field public static final java.lang.String[] strings;
+ }
+
+ public class WifiEnterpriseConfig implements android.os.Parcelable {
+ ctor public WifiEnterpriseConfig();
+ ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
+ method public int describeContents();
+ method public java.lang.String getAltSubjectMatch();
+ method public java.lang.String getAnonymousIdentity();
+ method public java.security.cert.X509Certificate getCaCertificate();
+ method public java.security.cert.X509Certificate getClientCertificate();
+ method public java.lang.String getDomainSuffixMatch();
+ method public int getEapMethod();
+ method public java.lang.String getIdentity();
+ method public java.lang.String getPassword();
+ method public int getPhase2Method();
+ method public java.lang.String getPlmn();
+ method public java.lang.String getRealm();
+ method public deprecated java.lang.String getSubjectMatch();
+ method public void setAltSubjectMatch(java.lang.String);
+ method public void setAnonymousIdentity(java.lang.String);
+ method public void setCaCertificate(java.security.cert.X509Certificate);
+ method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);
+ method public void setDomainSuffixMatch(java.lang.String);
+ method public void setEapMethod(int);
+ method public void setIdentity(java.lang.String);
+ method public void setPassword(java.lang.String);
+ method public void setPhase2Method(int);
+ method public void setPlmn(java.lang.String);
+ method public void setRealm(java.lang.String);
+ method public deprecated void setSubjectMatch(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.wifi.WifiEnterpriseConfig> CREATOR;
+ }
+
+ public static final class WifiEnterpriseConfig.Eap {
+ field public static final int AKA = 5; // 0x5
+ field public static final int AKA_PRIME = 6; // 0x6
+ field public static final int NONE = -1; // 0xffffffff
+ field public static final int PEAP = 0; // 0x0
+ field public static final int PWD = 3; // 0x3
+ field public static final int SIM = 4; // 0x4
+ field public static final int TLS = 1; // 0x1
+ field public static final int TTLS = 2; // 0x2
+ }
+
+ public static final class WifiEnterpriseConfig.Phase2 {
+ field public static final int GTC = 4; // 0x4
+ field public static final int MSCHAP = 2; // 0x2
+ field public static final int MSCHAPV2 = 3; // 0x3
+ field public static final int NONE = 0; // 0x0
+ field public static final int PAP = 1; // 0x1
+ }
+
+ public class WifiInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String getBSSID();
+ method public static android.net.NetworkInfo.DetailedState getDetailedStateOf(android.net.wifi.SupplicantState);
+ method public int getFrequency();
+ method public boolean getHiddenSSID();
+ method public int getIpAddress();
+ method public int getLinkSpeed();
+ method public java.lang.String getMacAddress();
+ method public int getNetworkId();
+ method public int getRssi();
+ method public java.lang.String getSSID();
+ method public android.net.wifi.SupplicantState getSupplicantState();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final java.lang.String FREQUENCY_UNITS = "MHz";
+ field public static final java.lang.String LINK_SPEED_UNITS = "Mbps";
+ }
+
+ public class WifiManager {
+ method public int addNetwork(android.net.wifi.WifiConfiguration);
+ method public static int calculateSignalLevel(int, int);
+ method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
+ method public static int compareSignalLevel(int, int);
+ method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String);
+ method public android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String);
+ method public android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String);
+ method public boolean disableNetwork(int);
+ method public boolean disconnect();
+ method public boolean enableNetwork(int, boolean);
+ method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
+ method public android.net.wifi.WifiInfo getConnectionInfo();
+ method public android.net.DhcpInfo getDhcpInfo();
+ method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();
+ method public java.util.List<android.net.wifi.ScanResult> getScanResults();
+ method public int getWifiState();
+ method public boolean is5GHzBandSupported();
+ method public boolean isDeviceToApRttSupported();
+ method public boolean isEnhancedPowerReportingSupported();
+ method public boolean isP2pSupported();
+ method public boolean isPreferredNetworkOffloadSupported();
+ method public boolean isScanAlwaysAvailable();
+ method public boolean isTdlsSupported();
+ method public boolean isWifiEnabled();
+ method public boolean pingSupplicant();
+ method public boolean reassociate();
+ method public boolean reconnect();
+ method public boolean removeNetwork(int);
+ method public boolean saveConfiguration();
+ method public void setOsuSelection(int);
+ method public void setTdlsEnabled(java.net.InetAddress, boolean);
+ method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
+ method public boolean setWifiEnabled(boolean);
+ method public boolean startScan();
+ method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
+ method public int updateNetwork(android.net.wifi.WifiConfiguration);
+ field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
+ field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
+ field public static final int ERROR_AUTHENTICATING = 1; // 0x1
+ field public static final java.lang.String EXTRA_BSSID = "bssid";
+ field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
+ field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
+ field public static final java.lang.String EXTRA_NEW_STATE = "newState";
+ field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
+ field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
+ field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
+ field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
+ field public static final java.lang.String EXTRA_WIFI_INFO = "wifiInfo";
+ field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_state";
+ field public static final java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";
+ field public static final java.lang.String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";
+ field public static final java.lang.String RSSI_CHANGED_ACTION = "android.net.wifi.RSSI_CHANGED";
+ field public static final java.lang.String SCAN_RESULTS_AVAILABLE_ACTION = "android.net.wifi.SCAN_RESULTS";
+ field public static final java.lang.String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";
+ field public static final java.lang.String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";
+ field public static final int WIFI_MODE_FULL = 1; // 0x1
+ field public static final int WIFI_MODE_FULL_HIGH_PERF = 3; // 0x3
+ field public static final int WIFI_MODE_SCAN_ONLY = 2; // 0x2
+ field public static final java.lang.String WIFI_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_STATE_CHANGED";
+ field public static final int WIFI_STATE_DISABLED = 1; // 0x1
+ field public static final int WIFI_STATE_DISABLING = 0; // 0x0
+ field public static final int WIFI_STATE_ENABLED = 3; // 0x3
+ field public static final int WIFI_STATE_ENABLING = 2; // 0x2
+ field public static final int WIFI_STATE_UNKNOWN = 4; // 0x4
+ field public static final int WPS_AUTH_FAILURE = 6; // 0x6
+ field public static final int WPS_OVERLAP_ERROR = 3; // 0x3
+ field public static final int WPS_TIMED_OUT = 7; // 0x7
+ field public static final int WPS_TKIP_ONLY_PROHIBITED = 5; // 0x5
+ field public static final int WPS_WEP_PROHIBITED = 4; // 0x4
+ }
+
+ public class WifiManager.MulticastLock {
+ method public void acquire();
+ method public boolean isHeld();
+ method public void release();
+ method public void setReferenceCounted(boolean);
+ }
+
+ public class WifiManager.WifiLock {
+ method public void acquire();
+ method public boolean isHeld();
+ method public void release();
+ method public void setReferenceCounted(boolean);
+ method public void setWorkSource(android.os.WorkSource);
+ }
+
+ public static abstract class WifiManager.WpsCallback {
+ ctor public WifiManager.WpsCallback();
+ method public abstract void onFailed(int);
+ method public abstract void onStarted(java.lang.String);
+ method public abstract void onSucceeded();
+ }
+
+ public class WpsInfo implements android.os.Parcelable {
+ ctor public WpsInfo();
+ ctor public WpsInfo(android.net.wifi.WpsInfo);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public java.lang.String BSSID;
+ field public static final android.os.Parcelable.Creator<android.net.wifi.WpsInfo> CREATOR;
+ field public static final int DISPLAY = 1; // 0x1
+ field public static final int INVALID = 4; // 0x4
+ field public static final int KEYPAD = 2; // 0x2
+ field public static final int LABEL = 3; // 0x3
+ field public static final int PBC = 0; // 0x0
+ field public java.lang.String pin;
+ field public int setup;
+ }
+
+}
+
+package android.net.wifi.p2p {
+
+ public class WifiP2pConfig implements android.os.Parcelable {
+ ctor public WifiP2pConfig();
+ ctor public WifiP2pConfig(android.net.wifi.p2p.WifiP2pConfig);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pConfig> CREATOR;
+ field public java.lang.String deviceAddress;
+ field public int groupOwnerIntent;
+ field public android.net.wifi.WpsInfo wps;
+ }
+
+ public class WifiP2pDevice implements android.os.Parcelable {
+ ctor public WifiP2pDevice();
+ ctor public WifiP2pDevice(android.net.wifi.p2p.WifiP2pDevice);
+ method public int describeContents();
+ method public boolean isGroupOwner();
+ method public boolean isServiceDiscoveryCapable();
+ method public boolean wpsDisplaySupported();
+ method public boolean wpsKeypadSupported();
+ method public boolean wpsPbcSupported();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int AVAILABLE = 3; // 0x3
+ field public static final int CONNECTED = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pDevice> CREATOR;
+ field public static final int FAILED = 2; // 0x2
+ field public static final int INVITED = 1; // 0x1
+ field public static final int UNAVAILABLE = 4; // 0x4
+ field public java.lang.String deviceAddress;
+ field public java.lang.String deviceName;
+ field public java.lang.String primaryDeviceType;
+ field public java.lang.String secondaryDeviceType;
+ field public int status;
+ }
+
+ public class WifiP2pDeviceList implements android.os.Parcelable {
+ ctor public WifiP2pDeviceList();
+ ctor public WifiP2pDeviceList(android.net.wifi.p2p.WifiP2pDeviceList);
+ method public int describeContents();
+ method public android.net.wifi.p2p.WifiP2pDevice get(java.lang.String);
+ method public java.util.Collection<android.net.wifi.p2p.WifiP2pDevice> getDeviceList();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pDeviceList> CREATOR;
+ }
+
+ public class WifiP2pGroup implements android.os.Parcelable {
+ ctor public WifiP2pGroup();
+ ctor public WifiP2pGroup(android.net.wifi.p2p.WifiP2pGroup);
+ method public int describeContents();
+ method public java.util.Collection<android.net.wifi.p2p.WifiP2pDevice> getClientList();
+ method public java.lang.String getInterface();
+ method public java.lang.String getNetworkName();
+ method public android.net.wifi.p2p.WifiP2pDevice getOwner();
+ method public java.lang.String getPassphrase();
+ method public boolean isGroupOwner();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pGroup> CREATOR;
+ }
+
+ public class WifiP2pInfo implements android.os.Parcelable {
+ ctor public WifiP2pInfo();
+ ctor public WifiP2pInfo(android.net.wifi.p2p.WifiP2pInfo);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.net.wifi.p2p.WifiP2pInfo> CREATOR;
+ field public boolean groupFormed;
+ field public java.net.InetAddress groupOwnerAddress;
+ field public boolean isGroupOwner;
+ }
+
+ public class WifiP2pManager {
+ method public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void addServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void cancelConnect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void clearLocalServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void clearServiceRequests(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public android.net.wifi.p2p.WifiP2pManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.p2p.WifiP2pManager.ChannelListener);
+ method public void removeGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ method public void requestConnectionInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener);
+ method public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
+ method public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);
+ method public void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener);
+ method public void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener);
+ method public void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener);
+ method public void stopPeerDiscovery(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+ field public static final int BUSY = 2; // 0x2
+ field public static final int ERROR = 0; // 0x0
+ field public static final java.lang.String EXTRA_DISCOVERY_STATE = "discoveryState";
+ field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
+ field public static final java.lang.String EXTRA_P2P_DEVICE_LIST = "wifiP2pDeviceList";
+ field public static final java.lang.String EXTRA_WIFI_P2P_DEVICE = "wifiP2pDevice";
+ field public static final java.lang.String EXTRA_WIFI_P2P_GROUP = "p2pGroupInfo";
+ 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";
+ field public static final int WIFI_P2P_DISCOVERY_STARTED = 2; // 0x2
+ field public static final int WIFI_P2P_DISCOVERY_STOPPED = 1; // 0x1
+ field public static final java.lang.String WIFI_P2P_PEERS_CHANGED_ACTION = "android.net.wifi.p2p.PEERS_CHANGED";
+ field public static final java.lang.String WIFI_P2P_STATE_CHANGED_ACTION = "android.net.wifi.p2p.STATE_CHANGED";
+ field public static final int WIFI_P2P_STATE_DISABLED = 1; // 0x1
+ field public static final int WIFI_P2P_STATE_ENABLED = 2; // 0x2
+ field public static final java.lang.String WIFI_P2P_THIS_DEVICE_CHANGED_ACTION = "android.net.wifi.p2p.THIS_DEVICE_CHANGED";
+ }
+
+ public static abstract interface WifiP2pManager.ActionListener {
+ method public abstract void onFailure(int);
+ method public abstract void onSuccess();
+ }
+
+ public static class WifiP2pManager.Channel {
+ }
+
+ public static abstract interface WifiP2pManager.ChannelListener {
+ method public abstract void onChannelDisconnected();
+ }
+
+ public static abstract interface WifiP2pManager.ConnectionInfoListener {
+ method public abstract void onConnectionInfoAvailable(android.net.wifi.p2p.WifiP2pInfo);
+ }
+
+ public static abstract interface WifiP2pManager.DnsSdServiceResponseListener {
+ method public abstract void onDnsSdServiceAvailable(java.lang.String, java.lang.String, android.net.wifi.p2p.WifiP2pDevice);
+ }
+
+ public static abstract interface WifiP2pManager.DnsSdTxtRecordListener {
+ method public abstract void onDnsSdTxtRecordAvailable(java.lang.String, java.util.Map<java.lang.String, java.lang.String>, android.net.wifi.p2p.WifiP2pDevice);
+ }
+
+ public static abstract interface WifiP2pManager.GroupInfoListener {
+ method public abstract void onGroupInfoAvailable(android.net.wifi.p2p.WifiP2pGroup);
+ }
+
+ public static abstract interface WifiP2pManager.PeerListListener {
+ method public abstract void onPeersAvailable(android.net.wifi.p2p.WifiP2pDeviceList);
+ }
+
+ public static abstract interface WifiP2pManager.ServiceResponseListener {
+ method public abstract void onServiceAvailable(int, byte[], android.net.wifi.p2p.WifiP2pDevice);
+ }
+
+ public static abstract interface WifiP2pManager.UpnpServiceResponseListener {
+ method public abstract void onUpnpServiceAvailable(java.util.List<java.lang.String>, android.net.wifi.p2p.WifiP2pDevice);
+ }
+
+}
+
+package android.net.wifi.p2p.nsd {
+
+ public class WifiP2pDnsSdServiceInfo extends android.net.wifi.p2p.nsd.WifiP2pServiceInfo {
+ method public static android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo newInstance(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
+ }
+
+ public class WifiP2pDnsSdServiceRequest extends android.net.wifi.p2p.nsd.WifiP2pServiceRequest {
+ method public static android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance();
+ method public static android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String);
+ method public static android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceRequest newInstance(java.lang.String, java.lang.String);
+ }
+
+ public class WifiP2pServiceInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int SERVICE_TYPE_ALL = 0; // 0x0
+ field public static final int SERVICE_TYPE_BONJOUR = 1; // 0x1
+ field public static final int SERVICE_TYPE_UPNP = 2; // 0x2
+ field public static final int SERVICE_TYPE_VENDOR_SPECIFIC = 255; // 0xff
+ }
+
+ public class WifiP2pServiceRequest implements android.os.Parcelable {
+ method public int describeContents();
+ method public static android.net.wifi.p2p.nsd.WifiP2pServiceRequest newInstance(int, java.lang.String);
+ method public static android.net.wifi.p2p.nsd.WifiP2pServiceRequest newInstance(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class WifiP2pUpnpServiceInfo extends android.net.wifi.p2p.nsd.WifiP2pServiceInfo {
+ method public static android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo newInstance(java.lang.String, java.lang.String, java.util.List<java.lang.String>);
+ }
+
+ public class WifiP2pUpnpServiceRequest extends android.net.wifi.p2p.nsd.WifiP2pServiceRequest {
+ method public static android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance();
+ method public static android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest newInstance(java.lang.String);
+ }
+
+}
+
+package android.nfc {
+
+ public class FormatException extends java.lang.Exception {
+ ctor public FormatException();
+ ctor public FormatException(java.lang.String);
+ ctor public FormatException(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class NdefMessage implements android.os.Parcelable {
+ ctor public NdefMessage(byte[]) throws android.nfc.FormatException;
+ ctor public NdefMessage(android.nfc.NdefRecord, android.nfc.NdefRecord...);
+ ctor public NdefMessage(android.nfc.NdefRecord[]);
+ method public int describeContents();
+ method public int getByteArrayLength();
+ method public android.nfc.NdefRecord[] getRecords();
+ method public byte[] toByteArray();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.nfc.NdefMessage> CREATOR;
+ }
+
+ public final class NdefRecord implements android.os.Parcelable {
+ ctor public NdefRecord(short, byte[], byte[], byte[]);
+ ctor public deprecated NdefRecord(byte[]) throws android.nfc.FormatException;
+ method public static android.nfc.NdefRecord createApplicationRecord(java.lang.String);
+ method public static android.nfc.NdefRecord createExternal(java.lang.String, java.lang.String, byte[]);
+ method public static android.nfc.NdefRecord createMime(java.lang.String, byte[]);
+ method public static android.nfc.NdefRecord createTextRecord(java.lang.String, java.lang.String);
+ method public static android.nfc.NdefRecord createUri(android.net.Uri);
+ method public static android.nfc.NdefRecord createUri(java.lang.String);
+ method public int describeContents();
+ method public byte[] getId();
+ method public byte[] getPayload();
+ method public short getTnf();
+ method public byte[] getType();
+ method public deprecated byte[] toByteArray();
+ method public java.lang.String toMimeType();
+ method public android.net.Uri toUri();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.nfc.NdefRecord> CREATOR;
+ field public static final byte[] RTD_ALTERNATIVE_CARRIER;
+ field public static final byte[] RTD_HANDOVER_CARRIER;
+ field public static final byte[] RTD_HANDOVER_REQUEST;
+ field public static final byte[] RTD_HANDOVER_SELECT;
+ field public static final byte[] RTD_SMART_POSTER;
+ field public static final byte[] RTD_TEXT;
+ field public static final byte[] RTD_URI;
+ field public static final short TNF_ABSOLUTE_URI = 3; // 0x3
+ field public static final short TNF_EMPTY = 0; // 0x0
+ field public static final short TNF_EXTERNAL_TYPE = 4; // 0x4
+ field public static final short TNF_MIME_MEDIA = 2; // 0x2
+ field public static final short TNF_UNCHANGED = 6; // 0x6
+ field public static final short TNF_UNKNOWN = 5; // 0x5
+ field public static final short TNF_WELL_KNOWN = 1; // 0x1
+ }
+
+ public final class NfcAdapter {
+ method public void disableForegroundDispatch(android.app.Activity);
+ method public deprecated void disableForegroundNdefPush(android.app.Activity);
+ method public void disableReaderMode(android.app.Activity);
+ method public void enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], java.lang.String[][]);
+ method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
+ method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
+ method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
+ method public boolean invokeBeam(android.app.Activity);
+ method public boolean isEnabled();
+ method public boolean isNdefPushEnabled();
+ method public void setBeamPushUris(android.net.Uri[], android.app.Activity);
+ method public void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity);
+ method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...);
+ method public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...);
+ method public void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...);
+ field public static final java.lang.String ACTION_ADAPTER_STATE_CHANGED = "android.nfc.action.ADAPTER_STATE_CHANGED";
+ field public static final java.lang.String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED";
+ field public static final java.lang.String ACTION_TAG_DISCOVERED = "android.nfc.action.TAG_DISCOVERED";
+ field public static final java.lang.String ACTION_TECH_DISCOVERED = "android.nfc.action.TECH_DISCOVERED";
+ field public static final java.lang.String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE";
+ field public static final java.lang.String EXTRA_ID = "android.nfc.extra.ID";
+ field public static final java.lang.String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES";
+ field public static final java.lang.String EXTRA_READER_PRESENCE_CHECK_DELAY = "presence";
+ field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG";
+ field public static final int FLAG_READER_NFC_A = 1; // 0x1
+ field public static final int FLAG_READER_NFC_B = 2; // 0x2
+ field public static final int FLAG_READER_NFC_BARCODE = 16; // 0x10
+ field public static final int FLAG_READER_NFC_F = 4; // 0x4
+ field public static final int FLAG_READER_NFC_V = 8; // 0x8
+ field public static final int FLAG_READER_NO_PLATFORM_SOUNDS = 256; // 0x100
+ field public static final int FLAG_READER_SKIP_NDEF_CHECK = 128; // 0x80
+ field public static final int STATE_OFF = 1; // 0x1
+ field public static final int STATE_ON = 3; // 0x3
+ field public static final int STATE_TURNING_OFF = 4; // 0x4
+ field public static final int STATE_TURNING_ON = 2; // 0x2
+ }
+
+ public static abstract interface NfcAdapter.CreateBeamUrisCallback {
+ method public abstract android.net.Uri[] createBeamUris(android.nfc.NfcEvent);
+ }
+
+ public static abstract interface NfcAdapter.CreateNdefMessageCallback {
+ method public abstract android.nfc.NdefMessage createNdefMessage(android.nfc.NfcEvent);
+ }
+
+ public static abstract interface NfcAdapter.OnNdefPushCompleteCallback {
+ method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
+ }
+
+ public static abstract interface NfcAdapter.ReaderCallback {
+ method public abstract void onTagDiscovered(android.nfc.Tag);
+ }
+
+ public final class NfcEvent {
+ field public final android.nfc.NfcAdapter nfcAdapter;
+ field public final int peerLlcpMajorVersion;
+ field public final int peerLlcpMinorVersion;
+ }
+
+ public final class NfcManager {
+ method public android.nfc.NfcAdapter getDefaultAdapter();
+ }
+
+ public final class Tag implements android.os.Parcelable {
+ method public int describeContents();
+ method public byte[] getId();
+ method public java.lang.String[] getTechList();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.nfc.Tag> CREATOR;
+ }
+
+ public class TagLostException extends java.io.IOException {
+ ctor public TagLostException();
+ ctor public TagLostException(java.lang.String);
+ }
+
+}
+
+package android.nfc.cardemulation {
+
+ public final class CardEmulation {
+ method public boolean categoryAllowsForegroundPreference(java.lang.String);
+ method public java.util.List<java.lang.String> getAidsForService(android.content.ComponentName, java.lang.String);
+ method public static synchronized android.nfc.cardemulation.CardEmulation getInstance(android.nfc.NfcAdapter);
+ method public int getSelectionModeForCategory(java.lang.String);
+ method public boolean isDefaultServiceForAid(android.content.ComponentName, java.lang.String);
+ method public boolean isDefaultServiceForCategory(android.content.ComponentName, java.lang.String);
+ method public boolean registerAidsForService(android.content.ComponentName, java.lang.String, java.util.List<java.lang.String>);
+ method public boolean removeAidsForService(android.content.ComponentName, java.lang.String);
+ method public boolean setPreferredService(android.app.Activity, android.content.ComponentName);
+ method public boolean supportsAidPrefixRegistration();
+ method public boolean unsetPreferredService(android.app.Activity);
+ field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT";
+ field public static final java.lang.String CATEGORY_OTHER = "other";
+ field public static final java.lang.String CATEGORY_PAYMENT = "payment";
+ field public static final java.lang.String EXTRA_CATEGORY = "category";
+ field public static final java.lang.String EXTRA_SERVICE_COMPONENT = "component";
+ field public static final int SELECTION_MODE_ALWAYS_ASK = 1; // 0x1
+ field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2
+ field public static final int SELECTION_MODE_PREFER_DEFAULT = 0; // 0x0
+ }
+
+ public abstract class HostApduService extends android.app.Service {
+ ctor public HostApduService();
+ method public final void notifyUnhandled();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public abstract void onDeactivated(int);
+ method public abstract byte[] processCommandApdu(byte[], android.os.Bundle);
+ method public final void sendResponseApdu(byte[]);
+ field public static final int DEACTIVATION_DESELECTED = 1; // 0x1
+ field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0
+ field public static final java.lang.String SERVICE_INTERFACE = "android.nfc.cardemulation.action.HOST_APDU_SERVICE";
+ field public static final java.lang.String SERVICE_META_DATA = "android.nfc.cardemulation.host_apdu_service";
+ }
+
+ public abstract class OffHostApduService extends android.app.Service {
+ ctor public OffHostApduService();
+ method public abstract android.os.IBinder onBind(android.content.Intent);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.nfc.cardemulation.action.OFF_HOST_APDU_SERVICE";
+ field public static final java.lang.String SERVICE_META_DATA = "android.nfc.cardemulation.off_host_apdu_service";
+ }
+
+}
+
+package android.nfc.tech {
+
+ abstract class BasicTagTechnology implements android.nfc.tech.TagTechnology {
+ method public void close() throws java.io.IOException;
+ method public void connect() throws java.io.IOException;
+ method public android.nfc.Tag getTag();
+ method public boolean isConnected();
+ }
+
+ public final class IsoDep extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.IsoDep get(android.nfc.Tag);
+ method public byte[] getHiLayerResponse();
+ method public byte[] getHistoricalBytes();
+ method public int getMaxTransceiveLength();
+ method public int getTimeout();
+ method public boolean isExtendedLengthApduSupported();
+ method public void setTimeout(int);
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ }
+
+ public final class MifareClassic extends android.nfc.tech.BasicTagTechnology {
+ method public boolean authenticateSectorWithKeyA(int, byte[]) throws java.io.IOException;
+ method public boolean authenticateSectorWithKeyB(int, byte[]) throws java.io.IOException;
+ method public int blockToSector(int);
+ method public void decrement(int, int) throws java.io.IOException;
+ method public static android.nfc.tech.MifareClassic get(android.nfc.Tag);
+ method public int getBlockCount();
+ method public int getBlockCountInSector(int);
+ method public int getMaxTransceiveLength();
+ method public int getSectorCount();
+ method public int getSize();
+ method public int getTimeout();
+ method public int getType();
+ method public void increment(int, int) throws java.io.IOException;
+ method public byte[] readBlock(int) throws java.io.IOException;
+ method public void restore(int) throws java.io.IOException;
+ method public int sectorToBlock(int);
+ method public void setTimeout(int);
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ method public void transfer(int) throws java.io.IOException;
+ method public void writeBlock(int, byte[]) throws java.io.IOException;
+ field public static final int BLOCK_SIZE = 16; // 0x10
+ field public static final byte[] KEY_DEFAULT;
+ field public static final byte[] KEY_MIFARE_APPLICATION_DIRECTORY;
+ field public static final byte[] KEY_NFC_FORUM;
+ field public static final int SIZE_1K = 1024; // 0x400
+ field public static final int SIZE_2K = 2048; // 0x800
+ field public static final int SIZE_4K = 4096; // 0x1000
+ field public static final int SIZE_MINI = 320; // 0x140
+ field public static final int TYPE_CLASSIC = 0; // 0x0
+ field public static final int TYPE_PLUS = 1; // 0x1
+ field public static final int TYPE_PRO = 2; // 0x2
+ field public static final int TYPE_UNKNOWN = -1; // 0xffffffff
+ }
+
+ public final class MifareUltralight extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.MifareUltralight get(android.nfc.Tag);
+ method public int getMaxTransceiveLength();
+ method public int getTimeout();
+ method public int getType();
+ method public byte[] readPages(int) throws java.io.IOException;
+ method public void setTimeout(int);
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ method public void writePage(int, byte[]) throws java.io.IOException;
+ field public static final int PAGE_SIZE = 4; // 0x4
+ field public static final int TYPE_ULTRALIGHT = 1; // 0x1
+ field public static final int TYPE_ULTRALIGHT_C = 2; // 0x2
+ field public static final int TYPE_UNKNOWN = -1; // 0xffffffff
+ }
+
+ public final class Ndef extends android.nfc.tech.BasicTagTechnology {
+ method public boolean canMakeReadOnly();
+ method public static android.nfc.tech.Ndef get(android.nfc.Tag);
+ method public android.nfc.NdefMessage getCachedNdefMessage();
+ method public int getMaxSize();
+ method public android.nfc.NdefMessage getNdefMessage() throws android.nfc.FormatException, java.io.IOException;
+ method public java.lang.String getType();
+ method public boolean isWritable();
+ method public boolean makeReadOnly() throws java.io.IOException;
+ method public void writeNdefMessage(android.nfc.NdefMessage) throws android.nfc.FormatException, java.io.IOException;
+ field public static final java.lang.String MIFARE_CLASSIC = "com.nxp.ndef.mifareclassic";
+ field public static final java.lang.String NFC_FORUM_TYPE_1 = "org.nfcforum.ndef.type1";
+ field public static final java.lang.String NFC_FORUM_TYPE_2 = "org.nfcforum.ndef.type2";
+ field public static final java.lang.String NFC_FORUM_TYPE_3 = "org.nfcforum.ndef.type3";
+ field public static final java.lang.String NFC_FORUM_TYPE_4 = "org.nfcforum.ndef.type4";
+ }
+
+ public final class NdefFormatable extends android.nfc.tech.BasicTagTechnology {
+ method public void format(android.nfc.NdefMessage) throws android.nfc.FormatException, java.io.IOException;
+ method public void formatReadOnly(android.nfc.NdefMessage) throws android.nfc.FormatException, java.io.IOException;
+ method public static android.nfc.tech.NdefFormatable get(android.nfc.Tag);
+ }
+
+ public final class NfcA extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.NfcA get(android.nfc.Tag);
+ method public byte[] getAtqa();
+ method public int getMaxTransceiveLength();
+ method public short getSak();
+ method public int getTimeout();
+ method public void setTimeout(int);
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ }
+
+ public final class NfcB extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.NfcB get(android.nfc.Tag);
+ method public byte[] getApplicationData();
+ method public int getMaxTransceiveLength();
+ method public byte[] getProtocolInfo();
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ }
+
+ public final class NfcBarcode extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.NfcBarcode get(android.nfc.Tag);
+ method public byte[] getBarcode();
+ method public int getType();
+ field public static final int TYPE_KOVIO = 1; // 0x1
+ field public static final int TYPE_UNKNOWN = -1; // 0xffffffff
+ }
+
+ public final class NfcF extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.NfcF get(android.nfc.Tag);
+ method public byte[] getManufacturer();
+ method public int getMaxTransceiveLength();
+ method public byte[] getSystemCode();
+ method public int getTimeout();
+ method public void setTimeout(int);
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ }
+
+ public final class NfcV extends android.nfc.tech.BasicTagTechnology {
+ method public static android.nfc.tech.NfcV get(android.nfc.Tag);
+ method public byte getDsfId();
+ method public int getMaxTransceiveLength();
+ method public byte getResponseFlags();
+ method public byte[] transceive(byte[]) throws java.io.IOException;
+ }
+
+ public abstract interface TagTechnology implements java.io.Closeable {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract void connect() throws java.io.IOException;
+ method public abstract android.nfc.Tag getTag();
+ method public abstract boolean isConnected();
+ }
+
+}
+
+package android.opengl {
+
+ public class EGL14 {
+ ctor public EGL14();
+ method public static boolean eglBindAPI(int);
+ method public static boolean eglBindTexImage(android.opengl.EGLDisplay, android.opengl.EGLSurface, int);
+ method public static boolean eglChooseConfig(android.opengl.EGLDisplay, int[], int, android.opengl.EGLConfig[], int, int, int[], int);
+ method public static boolean eglCopyBuffers(android.opengl.EGLDisplay, android.opengl.EGLSurface, int);
+ method public static android.opengl.EGLContext eglCreateContext(android.opengl.EGLDisplay, android.opengl.EGLConfig, android.opengl.EGLContext, int[], int);
+ method public static android.opengl.EGLSurface eglCreatePbufferFromClientBuffer(android.opengl.EGLDisplay, int, int, android.opengl.EGLConfig, int[], int);
+ method public static android.opengl.EGLSurface eglCreatePbufferSurface(android.opengl.EGLDisplay, android.opengl.EGLConfig, int[], int);
+ method public static android.opengl.EGLSurface eglCreatePixmapSurface(android.opengl.EGLDisplay, android.opengl.EGLConfig, int, int[], int);
+ method public static android.opengl.EGLSurface eglCreateWindowSurface(android.opengl.EGLDisplay, android.opengl.EGLConfig, java.lang.Object, int[], int);
+ method public static boolean eglDestroyContext(android.opengl.EGLDisplay, android.opengl.EGLContext);
+ method public static boolean eglDestroySurface(android.opengl.EGLDisplay, android.opengl.EGLSurface);
+ method public static boolean eglGetConfigAttrib(android.opengl.EGLDisplay, android.opengl.EGLConfig, int, int[], int);
+ method public static boolean eglGetConfigs(android.opengl.EGLDisplay, android.opengl.EGLConfig[], int, int, int[], int);
+ method public static android.opengl.EGLContext eglGetCurrentContext();
+ method public static android.opengl.EGLDisplay eglGetCurrentDisplay();
+ method public static android.opengl.EGLSurface eglGetCurrentSurface(int);
+ method public static android.opengl.EGLDisplay eglGetDisplay(int);
+ method public static int eglGetError();
+ method public static boolean eglInitialize(android.opengl.EGLDisplay, int[], int, int[], int);
+ method public static boolean eglMakeCurrent(android.opengl.EGLDisplay, android.opengl.EGLSurface, android.opengl.EGLSurface, android.opengl.EGLContext);
+ method public static int eglQueryAPI();
+ method public static boolean eglQueryContext(android.opengl.EGLDisplay, android.opengl.EGLContext, int, int[], int);
+ method public static java.lang.String eglQueryString(android.opengl.EGLDisplay, int);
+ method public static boolean eglQuerySurface(android.opengl.EGLDisplay, android.opengl.EGLSurface, int, int[], int);
+ method public static boolean eglReleaseTexImage(android.opengl.EGLDisplay, android.opengl.EGLSurface, int);
+ method public static boolean eglReleaseThread();
+ method public static boolean eglSurfaceAttrib(android.opengl.EGLDisplay, android.opengl.EGLSurface, int, int);
+ method public static boolean eglSwapBuffers(android.opengl.EGLDisplay, android.opengl.EGLSurface);
+ method public static boolean eglSwapInterval(android.opengl.EGLDisplay, int);
+ method public static boolean eglTerminate(android.opengl.EGLDisplay);
+ method public static boolean eglWaitClient();
+ method public static boolean eglWaitGL();
+ method public static boolean eglWaitNative(int);
+ field public static final int EGL_ALPHA_MASK_SIZE = 12350; // 0x303e
+ field public static final int EGL_ALPHA_SIZE = 12321; // 0x3021
+ field public static final int EGL_BACK_BUFFER = 12420; // 0x3084
+ field public static final int EGL_BAD_ACCESS = 12290; // 0x3002
+ field public static final int EGL_BAD_ALLOC = 12291; // 0x3003
+ field public static final int EGL_BAD_ATTRIBUTE = 12292; // 0x3004
+ field public static final int EGL_BAD_CONFIG = 12293; // 0x3005
+ field public static final int EGL_BAD_CONTEXT = 12294; // 0x3006
+ field public static final int EGL_BAD_CURRENT_SURFACE = 12295; // 0x3007
+ field public static final int EGL_BAD_DISPLAY = 12296; // 0x3008
+ field public static final int EGL_BAD_MATCH = 12297; // 0x3009
+ field public static final int EGL_BAD_NATIVE_PIXMAP = 12298; // 0x300a
+ field public static final int EGL_BAD_NATIVE_WINDOW = 12299; // 0x300b
+ field public static final int EGL_BAD_PARAMETER = 12300; // 0x300c
+ field public static final int EGL_BAD_SURFACE = 12301; // 0x300d
+ field public static final int EGL_BIND_TO_TEXTURE_RGB = 12345; // 0x3039
+ field public static final int EGL_BIND_TO_TEXTURE_RGBA = 12346; // 0x303a
+ field public static final int EGL_BLUE_SIZE = 12322; // 0x3022
+ field public static final int EGL_BUFFER_DESTROYED = 12437; // 0x3095
+ field public static final int EGL_BUFFER_PRESERVED = 12436; // 0x3094
+ field public static final int EGL_BUFFER_SIZE = 12320; // 0x3020
+ field public static final int EGL_CLIENT_APIS = 12429; // 0x308d
+ field public static final int EGL_COLOR_BUFFER_TYPE = 12351; // 0x303f
+ field public static final int EGL_CONFIG_CAVEAT = 12327; // 0x3027
+ field public static final int EGL_CONFIG_ID = 12328; // 0x3028
+ field public static final int EGL_CONFORMANT = 12354; // 0x3042
+ field public static final int EGL_CONTEXT_CLIENT_TYPE = 12439; // 0x3097
+ field public static final int EGL_CONTEXT_CLIENT_VERSION = 12440; // 0x3098
+ field public static final int EGL_CONTEXT_LOST = 12302; // 0x300e
+ field public static final int EGL_CORE_NATIVE_ENGINE = 12379; // 0x305b
+ field public static final int EGL_DEFAULT_DISPLAY = 0; // 0x0
+ field public static final int EGL_DEPTH_SIZE = 12325; // 0x3025
+ field public static final int EGL_DISPLAY_SCALING = 10000; // 0x2710
+ field public static final int EGL_DRAW = 12377; // 0x3059
+ field public static final int EGL_EXTENSIONS = 12373; // 0x3055
+ field public static final int EGL_FALSE = 0; // 0x0
+ field public static final int EGL_GREEN_SIZE = 12323; // 0x3023
+ field public static final int EGL_HEIGHT = 12374; // 0x3056
+ field public static final int EGL_HORIZONTAL_RESOLUTION = 12432; // 0x3090
+ field public static final int EGL_LARGEST_PBUFFER = 12376; // 0x3058
+ field public static final int EGL_LEVEL = 12329; // 0x3029
+ field public static final int EGL_LUMINANCE_BUFFER = 12431; // 0x308f
+ field public static final int EGL_LUMINANCE_SIZE = 12349; // 0x303d
+ field public static final int EGL_MATCH_NATIVE_PIXMAP = 12353; // 0x3041
+ field public static final int EGL_MAX_PBUFFER_HEIGHT = 12330; // 0x302a
+ field public static final int EGL_MAX_PBUFFER_PIXELS = 12331; // 0x302b
+ field public static final int EGL_MAX_PBUFFER_WIDTH = 12332; // 0x302c
+ field public static final int EGL_MAX_SWAP_INTERVAL = 12348; // 0x303c
+ field public static final int EGL_MIN_SWAP_INTERVAL = 12347; // 0x303b
+ field public static final int EGL_MIPMAP_LEVEL = 12419; // 0x3083
+ field public static final int EGL_MIPMAP_TEXTURE = 12418; // 0x3082
+ field public static final int EGL_MULTISAMPLE_RESOLVE = 12441; // 0x3099
+ field public static final int EGL_MULTISAMPLE_RESOLVE_BOX = 12443; // 0x309b
+ field public static final int EGL_MULTISAMPLE_RESOLVE_BOX_BIT = 512; // 0x200
+ field public static final int EGL_MULTISAMPLE_RESOLVE_DEFAULT = 12442; // 0x309a
+ field public static final int EGL_NATIVE_RENDERABLE = 12333; // 0x302d
+ field public static final int EGL_NATIVE_VISUAL_ID = 12334; // 0x302e
+ field public static final int EGL_NATIVE_VISUAL_TYPE = 12335; // 0x302f
+ field public static final int EGL_NONE = 12344; // 0x3038
+ field public static final int EGL_NON_CONFORMANT_CONFIG = 12369; // 0x3051
+ field public static final int EGL_NOT_INITIALIZED = 12289; // 0x3001
+ field public static android.opengl.EGLContext EGL_NO_CONTEXT;
+ field public static android.opengl.EGLDisplay EGL_NO_DISPLAY;
+ field public static android.opengl.EGLSurface EGL_NO_SURFACE;
+ field public static final int EGL_NO_TEXTURE = 12380; // 0x305c
+ field public static final int EGL_OPENGL_API = 12450; // 0x30a2
+ field public static final int EGL_OPENGL_BIT = 8; // 0x8
+ field public static final int EGL_OPENGL_ES2_BIT = 4; // 0x4
+ field public static final int EGL_OPENGL_ES_API = 12448; // 0x30a0
+ field public static final int EGL_OPENGL_ES_BIT = 1; // 0x1
+ field public static final int EGL_OPENVG_API = 12449; // 0x30a1
+ field public static final int EGL_OPENVG_BIT = 2; // 0x2
+ field public static final int EGL_OPENVG_IMAGE = 12438; // 0x3096
+ field public static final int EGL_PBUFFER_BIT = 1; // 0x1
+ field public static final int EGL_PIXEL_ASPECT_RATIO = 12434; // 0x3092
+ field public static final int EGL_PIXMAP_BIT = 2; // 0x2
+ field public static final int EGL_READ = 12378; // 0x305a
+ field public static final int EGL_RED_SIZE = 12324; // 0x3024
+ field public static final int EGL_RENDERABLE_TYPE = 12352; // 0x3040
+ field public static final int EGL_RENDER_BUFFER = 12422; // 0x3086
+ field public static final int EGL_RGB_BUFFER = 12430; // 0x308e
+ field public static final int EGL_SAMPLES = 12337; // 0x3031
+ field public static final int EGL_SAMPLE_BUFFERS = 12338; // 0x3032
+ field public static final int EGL_SINGLE_BUFFER = 12421; // 0x3085
+ field public static final int EGL_SLOW_CONFIG = 12368; // 0x3050
+ field public static final int EGL_STENCIL_SIZE = 12326; // 0x3026
+ field public static final int EGL_SUCCESS = 12288; // 0x3000
+ field public static final int EGL_SURFACE_TYPE = 12339; // 0x3033
+ field public static final int EGL_SWAP_BEHAVIOR = 12435; // 0x3093
+ field public static final int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 1024; // 0x400
+ field public static final int EGL_TEXTURE_2D = 12383; // 0x305f
+ field public static final int EGL_TEXTURE_FORMAT = 12416; // 0x3080
+ field public static final int EGL_TEXTURE_RGB = 12381; // 0x305d
+ field public static final int EGL_TEXTURE_RGBA = 12382; // 0x305e
+ field public static final int EGL_TEXTURE_TARGET = 12417; // 0x3081
+ field public static final int EGL_TRANSPARENT_BLUE_VALUE = 12341; // 0x3035
+ field public static final int EGL_TRANSPARENT_GREEN_VALUE = 12342; // 0x3036
+ field public static final int EGL_TRANSPARENT_RED_VALUE = 12343; // 0x3037
+ field public static final int EGL_TRANSPARENT_RGB = 12370; // 0x3052
+ field public static final int EGL_TRANSPARENT_TYPE = 12340; // 0x3034
+ field public static final int EGL_TRUE = 1; // 0x1
+ field public static final int EGL_VENDOR = 12371; // 0x3053
+ field public static final int EGL_VERSION = 12372; // 0x3054
+ field public static final int EGL_VERTICAL_RESOLUTION = 12433; // 0x3091
+ field public static final int EGL_VG_ALPHA_FORMAT = 12424; // 0x3088
+ field public static final int EGL_VG_ALPHA_FORMAT_NONPRE = 12427; // 0x308b
+ field public static final int EGL_VG_ALPHA_FORMAT_PRE = 12428; // 0x308c
+ field public static final int EGL_VG_ALPHA_FORMAT_PRE_BIT = 64; // 0x40
+ field public static final int EGL_VG_COLORSPACE = 12423; // 0x3087
+ field public static final int EGL_VG_COLORSPACE_LINEAR = 12426; // 0x308a
+ field public static final int EGL_VG_COLORSPACE_LINEAR_BIT = 32; // 0x20
+ field public static final int EGL_VG_COLORSPACE_sRGB = 12425; // 0x3089
+ field public static final int EGL_WIDTH = 12375; // 0x3057
+ field public static final int EGL_WINDOW_BIT = 4; // 0x4
+ }
+
+ public class EGLConfig extends android.opengl.EGLObjectHandle {
+ }
+
+ public class EGLContext extends android.opengl.EGLObjectHandle {
+ }
+
+ public class EGLDisplay extends android.opengl.EGLObjectHandle {
+ }
+
+ public class EGLExt {
+ ctor public EGLExt();
+ method public static boolean eglPresentationTimeANDROID(android.opengl.EGLDisplay, android.opengl.EGLSurface, long);
+ field public static final int EGL_CONTEXT_FLAGS_KHR = 12540; // 0x30fc
+ field public static final int EGL_CONTEXT_MAJOR_VERSION_KHR = 12440; // 0x3098
+ field public static final int EGL_CONTEXT_MINOR_VERSION_KHR = 12539; // 0x30fb
+ field public static final int EGL_OPENGL_ES3_BIT_KHR = 64; // 0x40
+ }
+
+ public abstract class EGLObjectHandle {
+ ctor protected deprecated EGLObjectHandle(int);
+ ctor protected EGLObjectHandle(long);
+ method public deprecated int getHandle();
+ method public long getNativeHandle();
+ }
+
+ public class EGLSurface extends android.opengl.EGLObjectHandle {
+ }
+
+ public class ETC1 {
+ ctor public ETC1();
+ method public static void decodeBlock(java.nio.Buffer, java.nio.Buffer);
+ method public static void decodeImage(java.nio.Buffer, java.nio.Buffer, int, int, int, int);
+ method public static void encodeBlock(java.nio.Buffer, int, java.nio.Buffer);
+ method public static void encodeImage(java.nio.Buffer, int, int, int, int, java.nio.Buffer);
+ method public static void formatHeader(java.nio.Buffer, int, int);
+ method public static int getEncodedDataSize(int, int);
+ method public static int getHeight(java.nio.Buffer);
+ method public static int getWidth(java.nio.Buffer);
+ method public static boolean isValid(java.nio.Buffer);
+ field public static final int DECODED_BLOCK_SIZE = 48; // 0x30
+ field public static final int ENCODED_BLOCK_SIZE = 8; // 0x8
+ field public static final int ETC1_RGB8_OES = 36196; // 0x8d64
+ field public static final int ETC_PKM_HEADER_SIZE = 16; // 0x10
+ }
+
+ public class ETC1Util {
+ ctor public ETC1Util();
+ method public static android.opengl.ETC1Util.ETC1Texture compressTexture(java.nio.Buffer, int, int, int, int);
+ method public static android.opengl.ETC1Util.ETC1Texture createTexture(java.io.InputStream) throws java.io.IOException;
+ method public static boolean isETC1Supported();
+ method public static void loadTexture(int, int, int, int, int, java.io.InputStream) throws java.io.IOException;
+ method public static void loadTexture(int, int, int, int, int, android.opengl.ETC1Util.ETC1Texture);
+ method public static void writeTexture(android.opengl.ETC1Util.ETC1Texture, java.io.OutputStream) throws java.io.IOException;
+ }
+
+ public static class ETC1Util.ETC1Texture {
+ ctor public ETC1Util.ETC1Texture(int, int, java.nio.ByteBuffer);
+ method public java.nio.ByteBuffer getData();
+ method public int getHeight();
+ method public int getWidth();
+ }
+
+ public class GLDebugHelper {
+ ctor public GLDebugHelper();
+ method public static javax.microedition.khronos.opengles.GL wrap(javax.microedition.khronos.opengles.GL, int, java.io.Writer);
+ method public static javax.microedition.khronos.egl.EGL wrap(javax.microedition.khronos.egl.EGL, int, java.io.Writer);
+ field public static final int CONFIG_CHECK_GL_ERROR = 1; // 0x1
+ field public static final int CONFIG_CHECK_THREAD = 2; // 0x2
+ field public static final int CONFIG_LOG_ARGUMENT_NAMES = 4; // 0x4
+ field public static final int ERROR_WRONG_THREAD = 28672; // 0x7000
+ }
+
+ public class GLES10 {
+ ctor public GLES10();
+ method public static void glActiveTexture(int);
+ method public static void glAlphaFunc(int, float);
+ method public static void glAlphaFuncx(int, int);
+ method public static void glBindTexture(int, int);
+ method public static void glBlendFunc(int, int);
+ method public static void glClear(int);
+ method public static void glClearColor(float, float, float, float);
+ method public static void glClearColorx(int, int, int, int);
+ method public static void glClearDepthf(float);
+ method public static void glClearDepthx(int);
+ method public static void glClearStencil(int);
+ method public static void glClientActiveTexture(int);
+ method public static void glColor4f(float, float, float, float);
+ method public static void glColor4x(int, int, int, int);
+ method public static void glColorMask(boolean, boolean, boolean, boolean);
+ method public static void glColorPointer(int, int, int, java.nio.Buffer);
+ method public static void glCompressedTexImage2D(int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glCompressedTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glCopyTexImage2D(int, int, int, int, int, int, int, int);
+ method public static void glCopyTexSubImage2D(int, int, int, int, int, int, int, int);
+ method public static void glCullFace(int);
+ method public static void glDeleteTextures(int, int[], int);
+ method public static void glDeleteTextures(int, java.nio.IntBuffer);
+ method public static void glDepthFunc(int);
+ method public static void glDepthMask(boolean);
+ method public static void glDepthRangef(float, float);
+ method public static void glDepthRangex(int, int);
+ method public static void glDisable(int);
+ method public static void glDisableClientState(int);
+ method public static void glDrawArrays(int, int, int);
+ method public static void glDrawElements(int, int, int, java.nio.Buffer);
+ method public static void glEnable(int);
+ method public static void glEnableClientState(int);
+ method public static void glFinish();
+ method public static void glFlush();
+ method public static void glFogf(int, float);
+ method public static void glFogfv(int, float[], int);
+ method public static void glFogfv(int, java.nio.FloatBuffer);
+ method public static void glFogx(int, int);
+ method public static void glFogxv(int, int[], int);
+ method public static void glFogxv(int, java.nio.IntBuffer);
+ method public static void glFrontFace(int);
+ method public static void glFrustumf(float, float, float, float, float, float);
+ method public static void glFrustumx(int, int, int, int, int, int);
+ method public static void glGenTextures(int, int[], int);
+ method public static void glGenTextures(int, java.nio.IntBuffer);
+ method public static int glGetError();
+ method public static void glGetIntegerv(int, int[], int);
+ method public static void glGetIntegerv(int, java.nio.IntBuffer);
+ method public static java.lang.String glGetString(int);
+ method public static void glHint(int, int);
+ method public static void glLightModelf(int, float);
+ method public static void glLightModelfv(int, float[], int);
+ method public static void glLightModelfv(int, java.nio.FloatBuffer);
+ method public static void glLightModelx(int, int);
+ method public static void glLightModelxv(int, int[], int);
+ method public static void glLightModelxv(int, java.nio.IntBuffer);
+ method public static void glLightf(int, int, float);
+ method public static void glLightfv(int, int, float[], int);
+ method public static void glLightfv(int, int, java.nio.FloatBuffer);
+ method public static void glLightx(int, int, int);
+ method public static void glLightxv(int, int, int[], int);
+ method public static void glLightxv(int, int, java.nio.IntBuffer);
+ method public static void glLineWidth(float);
+ method public static void glLineWidthx(int);
+ method public static void glLoadIdentity();
+ method public static void glLoadMatrixf(float[], int);
+ method public static void glLoadMatrixf(java.nio.FloatBuffer);
+ method public static void glLoadMatrixx(int[], int);
+ method public static void glLoadMatrixx(java.nio.IntBuffer);
+ method public static void glLogicOp(int);
+ method public static void glMaterialf(int, int, float);
+ method public static void glMaterialfv(int, int, float[], int);
+ method public static void glMaterialfv(int, int, java.nio.FloatBuffer);
+ method public static void glMaterialx(int, int, int);
+ method public static void glMaterialxv(int, int, int[], int);
+ method public static void glMaterialxv(int, int, java.nio.IntBuffer);
+ method public static void glMatrixMode(int);
+ method public static void glMultMatrixf(float[], int);
+ method public static void glMultMatrixf(java.nio.FloatBuffer);
+ method public static void glMultMatrixx(int[], int);
+ method public static void glMultMatrixx(java.nio.IntBuffer);
+ method public static void glMultiTexCoord4f(int, float, float, float, float);
+ method public static void glMultiTexCoord4x(int, int, int, int, int);
+ method public static void glNormal3f(float, float, float);
+ method public static void glNormal3x(int, int, int);
+ method public static void glNormalPointer(int, int, java.nio.Buffer);
+ method public static void glOrthof(float, float, float, float, float, float);
+ method public static void glOrthox(int, int, int, int, int, int);
+ method public static void glPixelStorei(int, int);
+ method public static void glPointSize(float);
+ method public static void glPointSizex(int);
+ method public static void glPolygonOffset(float, float);
+ method public static void glPolygonOffsetx(int, int);
+ method public static void glPopMatrix();
+ method public static void glPushMatrix();
+ method public static void glReadPixels(int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glRotatef(float, float, float, float);
+ method public static void glRotatex(int, int, int, int);
+ method public static void glSampleCoverage(float, boolean);
+ method public static void glSampleCoveragex(int, boolean);
+ method public static void glScalef(float, float, float);
+ method public static void glScalex(int, int, int);
+ method public static void glScissor(int, int, int, int);
+ method public static void glShadeModel(int);
+ method public static void glStencilFunc(int, int, int);
+ method public static void glStencilMask(int);
+ method public static void glStencilOp(int, int, int);
+ method public static void glTexCoordPointer(int, int, int, java.nio.Buffer);
+ method public static void glTexEnvf(int, int, float);
+ method public static void glTexEnvfv(int, int, float[], int);
+ method public static void glTexEnvfv(int, int, java.nio.FloatBuffer);
+ method public static void glTexEnvx(int, int, int);
+ method public static void glTexEnvxv(int, int, int[], int);
+ method public static void glTexEnvxv(int, int, java.nio.IntBuffer);
+ method public static void glTexImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glTexParameterf(int, int, float);
+ method public static void glTexParameterx(int, int, int);
+ method public static void glTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glTranslatef(float, float, float);
+ method public static void glTranslatex(int, int, int);
+ method public static void glVertexPointer(int, int, int, java.nio.Buffer);
+ method public static void glViewport(int, int, int, int);
+ field public static final int GL_ADD = 260; // 0x104
+ field public static final int GL_ALIASED_LINE_WIDTH_RANGE = 33902; // 0x846e
+ field public static final int GL_ALIASED_POINT_SIZE_RANGE = 33901; // 0x846d
+ field public static final int GL_ALPHA = 6406; // 0x1906
+ field public static final int GL_ALPHA_BITS = 3413; // 0xd55
+ field public static final int GL_ALPHA_TEST = 3008; // 0xbc0
+ field public static final int GL_ALWAYS = 519; // 0x207
+ field public static final int GL_AMBIENT = 4608; // 0x1200
+ field public static final int GL_AMBIENT_AND_DIFFUSE = 5634; // 0x1602
+ field public static final int GL_AND = 5377; // 0x1501
+ field public static final int GL_AND_INVERTED = 5380; // 0x1504
+ field public static final int GL_AND_REVERSE = 5378; // 0x1502
+ field public static final int GL_BACK = 1029; // 0x405
+ field public static final int GL_BLEND = 3042; // 0xbe2
+ field public static final int GL_BLUE_BITS = 3412; // 0xd54
+ field public static final int GL_BYTE = 5120; // 0x1400
+ field public static final int GL_CCW = 2305; // 0x901
+ field public static final int GL_CLAMP_TO_EDGE = 33071; // 0x812f
+ field public static final int GL_CLEAR = 5376; // 0x1500
+ field public static final int GL_COLOR_ARRAY = 32886; // 0x8076
+ field public static final int GL_COLOR_BUFFER_BIT = 16384; // 0x4000
+ field public static final int GL_COLOR_LOGIC_OP = 3058; // 0xbf2
+ field public static final int GL_COLOR_MATERIAL = 2903; // 0xb57
+ field public static final int GL_COMPRESSED_TEXTURE_FORMATS = 34467; // 0x86a3
+ field public static final int GL_CONSTANT_ATTENUATION = 4615; // 0x1207
+ field public static final int GL_COPY = 5379; // 0x1503
+ field public static final int GL_COPY_INVERTED = 5388; // 0x150c
+ field public static final int GL_CULL_FACE = 2884; // 0xb44
+ field public static final int GL_CW = 2304; // 0x900
+ field public static final int GL_DECAL = 8449; // 0x2101
+ field public static final int GL_DECR = 7683; // 0x1e03
+ field public static final int GL_DEPTH_BITS = 3414; // 0xd56
+ field public static final int GL_DEPTH_BUFFER_BIT = 256; // 0x100
+ field public static final int GL_DEPTH_TEST = 2929; // 0xb71
+ field public static final int GL_DIFFUSE = 4609; // 0x1201
+ field public static final int GL_DITHER = 3024; // 0xbd0
+ field public static final int GL_DONT_CARE = 4352; // 0x1100
+ field public static final int GL_DST_ALPHA = 772; // 0x304
+ field public static final int GL_DST_COLOR = 774; // 0x306
+ field public static final int GL_EMISSION = 5632; // 0x1600
+ field public static final int GL_EQUAL = 514; // 0x202
+ field public static final int GL_EQUIV = 5385; // 0x1509
+ field public static final int GL_EXP = 2048; // 0x800
+ field public static final int GL_EXP2 = 2049; // 0x801
+ field public static final int GL_EXTENSIONS = 7939; // 0x1f03
+ field public static final int GL_FALSE = 0; // 0x0
+ field public static final int GL_FASTEST = 4353; // 0x1101
+ field public static final int GL_FIXED = 5132; // 0x140c
+ field public static final int GL_FLAT = 7424; // 0x1d00
+ field public static final int GL_FLOAT = 5126; // 0x1406
+ field public static final int GL_FOG = 2912; // 0xb60
+ field public static final int GL_FOG_COLOR = 2918; // 0xb66
+ field public static final int GL_FOG_DENSITY = 2914; // 0xb62
+ field public static final int GL_FOG_END = 2916; // 0xb64
+ field public static final int GL_FOG_HINT = 3156; // 0xc54
+ field public static final int GL_FOG_MODE = 2917; // 0xb65
+ field public static final int GL_FOG_START = 2915; // 0xb63
+ field public static final int GL_FRONT = 1028; // 0x404
+ field public static final int GL_FRONT_AND_BACK = 1032; // 0x408
+ field public static final int GL_GEQUAL = 518; // 0x206
+ field public static final int GL_GREATER = 516; // 0x204
+ field public static final int GL_GREEN_BITS = 3411; // 0xd53
+ field public static final int GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES = 35739; // 0x8b9b
+ field public static final int GL_IMPLEMENTATION_COLOR_READ_TYPE_OES = 35738; // 0x8b9a
+ field public static final int GL_INCR = 7682; // 0x1e02
+ field public static final int GL_INVALID_ENUM = 1280; // 0x500
+ field public static final int GL_INVALID_OPERATION = 1282; // 0x502
+ field public static final int GL_INVALID_VALUE = 1281; // 0x501
+ field public static final int GL_INVERT = 5386; // 0x150a
+ field public static final int GL_KEEP = 7680; // 0x1e00
+ field public static final int GL_LEQUAL = 515; // 0x203
+ field public static final int GL_LESS = 513; // 0x201
+ field public static final int GL_LIGHT0 = 16384; // 0x4000
+ field public static final int GL_LIGHT1 = 16385; // 0x4001
+ field public static final int GL_LIGHT2 = 16386; // 0x4002
+ field public static final int GL_LIGHT3 = 16387; // 0x4003
+ field public static final int GL_LIGHT4 = 16388; // 0x4004
+ field public static final int GL_LIGHT5 = 16389; // 0x4005
+ field public static final int GL_LIGHT6 = 16390; // 0x4006
+ field public static final int GL_LIGHT7 = 16391; // 0x4007
+ field public static final int GL_LIGHTING = 2896; // 0xb50
+ field public static final int GL_LIGHT_MODEL_AMBIENT = 2899; // 0xb53
+ field public static final int GL_LIGHT_MODEL_TWO_SIDE = 2898; // 0xb52
+ field public static final int GL_LINEAR = 9729; // 0x2601
+ field public static final int GL_LINEAR_ATTENUATION = 4616; // 0x1208
+ field public static final int GL_LINEAR_MIPMAP_LINEAR = 9987; // 0x2703
+ field public static final int GL_LINEAR_MIPMAP_NEAREST = 9985; // 0x2701
+ field public static final int GL_LINES = 1; // 0x1
+ field public static final int GL_LINE_LOOP = 2; // 0x2
+ field public static final int GL_LINE_SMOOTH = 2848; // 0xb20
+ field public static final int GL_LINE_SMOOTH_HINT = 3154; // 0xc52
+ field public static final int GL_LINE_STRIP = 3; // 0x3
+ field public static final int GL_LUMINANCE = 6409; // 0x1909
+ field public static final int GL_LUMINANCE_ALPHA = 6410; // 0x190a
+ field public static final int GL_MAX_ELEMENTS_INDICES = 33001; // 0x80e9
+ field public static final int GL_MAX_ELEMENTS_VERTICES = 33000; // 0x80e8
+ field public static final int GL_MAX_LIGHTS = 3377; // 0xd31
+ field public static final int GL_MAX_MODELVIEW_STACK_DEPTH = 3382; // 0xd36
+ field public static final int GL_MAX_PROJECTION_STACK_DEPTH = 3384; // 0xd38
+ field public static final int GL_MAX_TEXTURE_SIZE = 3379; // 0xd33
+ field public static final int GL_MAX_TEXTURE_STACK_DEPTH = 3385; // 0xd39
+ field public static final int GL_MAX_TEXTURE_UNITS = 34018; // 0x84e2
+ field public static final int GL_MAX_VIEWPORT_DIMS = 3386; // 0xd3a
+ field public static final int GL_MODELVIEW = 5888; // 0x1700
+ field public static final int GL_MODULATE = 8448; // 0x2100
+ field public static final int GL_MULTISAMPLE = 32925; // 0x809d
+ field public static final int GL_NAND = 5390; // 0x150e
+ field public static final int GL_NEAREST = 9728; // 0x2600
+ field public static final int GL_NEAREST_MIPMAP_LINEAR = 9986; // 0x2702
+ field public static final int GL_NEAREST_MIPMAP_NEAREST = 9984; // 0x2700
+ field public static final int GL_NEVER = 512; // 0x200
+ field public static final int GL_NICEST = 4354; // 0x1102
+ field public static final int GL_NOOP = 5381; // 0x1505
+ field public static final int GL_NOR = 5384; // 0x1508
+ field public static final int GL_NORMALIZE = 2977; // 0xba1
+ field public static final int GL_NORMAL_ARRAY = 32885; // 0x8075
+ field public static final int GL_NOTEQUAL = 517; // 0x205
+ field public static final int GL_NO_ERROR = 0; // 0x0
+ field public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 34466; // 0x86a2
+ field public static final int GL_ONE = 1; // 0x1
+ field public static final int GL_ONE_MINUS_DST_ALPHA = 773; // 0x305
+ field public static final int GL_ONE_MINUS_DST_COLOR = 775; // 0x307
+ field public static final int GL_ONE_MINUS_SRC_ALPHA = 771; // 0x303
+ field public static final int GL_ONE_MINUS_SRC_COLOR = 769; // 0x301
+ field public static final int GL_OR = 5383; // 0x1507
+ field public static final int GL_OR_INVERTED = 5389; // 0x150d
+ field public static final int GL_OR_REVERSE = 5387; // 0x150b
+ field public static final int GL_OUT_OF_MEMORY = 1285; // 0x505
+ field public static final int GL_PACK_ALIGNMENT = 3333; // 0xd05
+ field public static final int GL_PALETTE4_R5_G6_B5_OES = 35730; // 0x8b92
+ field public static final int GL_PALETTE4_RGB5_A1_OES = 35732; // 0x8b94
+ field public static final int GL_PALETTE4_RGB8_OES = 35728; // 0x8b90
+ field public static final int GL_PALETTE4_RGBA4_OES = 35731; // 0x8b93
+ field public static final int GL_PALETTE4_RGBA8_OES = 35729; // 0x8b91
+ field public static final int GL_PALETTE8_R5_G6_B5_OES = 35735; // 0x8b97
+ field public static final int GL_PALETTE8_RGB5_A1_OES = 35737; // 0x8b99
+ field public static final int GL_PALETTE8_RGB8_OES = 35733; // 0x8b95
+ field public static final int GL_PALETTE8_RGBA4_OES = 35736; // 0x8b98
+ field public static final int GL_PALETTE8_RGBA8_OES = 35734; // 0x8b96
+ field public static final int GL_PERSPECTIVE_CORRECTION_HINT = 3152; // 0xc50
+ field public static final int GL_POINTS = 0; // 0x0
+ field public static final int GL_POINT_FADE_THRESHOLD_SIZE = 33064; // 0x8128
+ field public static final int GL_POINT_SIZE = 2833; // 0xb11
+ field public static final int GL_POINT_SMOOTH = 2832; // 0xb10
+ field public static final int GL_POINT_SMOOTH_HINT = 3153; // 0xc51
+ field public static final int GL_POLYGON_OFFSET_FILL = 32823; // 0x8037
+ field public static final int GL_POLYGON_SMOOTH_HINT = 3155; // 0xc53
+ field public static final int GL_POSITION = 4611; // 0x1203
+ field public static final int GL_PROJECTION = 5889; // 0x1701
+ field public static final int GL_QUADRATIC_ATTENUATION = 4617; // 0x1209
+ field public static final int GL_RED_BITS = 3410; // 0xd52
+ field public static final int GL_RENDERER = 7937; // 0x1f01
+ field public static final int GL_REPEAT = 10497; // 0x2901
+ field public static final int GL_REPLACE = 7681; // 0x1e01
+ field public static final int GL_RESCALE_NORMAL = 32826; // 0x803a
+ field public static final int GL_RGB = 6407; // 0x1907
+ field public static final int GL_RGBA = 6408; // 0x1908
+ field public static final int GL_SAMPLE_ALPHA_TO_COVERAGE = 32926; // 0x809e
+ field public static final int GL_SAMPLE_ALPHA_TO_ONE = 32927; // 0x809f
+ field public static final int GL_SAMPLE_COVERAGE = 32928; // 0x80a0
+ field public static final int GL_SCISSOR_TEST = 3089; // 0xc11
+ field public static final int GL_SET = 5391; // 0x150f
+ field public static final int GL_SHININESS = 5633; // 0x1601
+ field public static final int GL_SHORT = 5122; // 0x1402
+ field public static final int GL_SMOOTH = 7425; // 0x1d01
+ field public static final int GL_SMOOTH_LINE_WIDTH_RANGE = 2850; // 0xb22
+ field public static final int GL_SMOOTH_POINT_SIZE_RANGE = 2834; // 0xb12
+ field public static final int GL_SPECULAR = 4610; // 0x1202
+ field public static final int GL_SPOT_CUTOFF = 4614; // 0x1206
+ field public static final int GL_SPOT_DIRECTION = 4612; // 0x1204
+ field public static final int GL_SPOT_EXPONENT = 4613; // 0x1205
+ field public static final int GL_SRC_ALPHA = 770; // 0x302
+ field public static final int GL_SRC_ALPHA_SATURATE = 776; // 0x308
+ field public static final int GL_SRC_COLOR = 768; // 0x300
+ field public static final int GL_STACK_OVERFLOW = 1283; // 0x503
+ field public static final int GL_STACK_UNDERFLOW = 1284; // 0x504
+ field public static final int GL_STENCIL_BITS = 3415; // 0xd57
+ field public static final int GL_STENCIL_BUFFER_BIT = 1024; // 0x400
+ field public static final int GL_STENCIL_TEST = 2960; // 0xb90
+ field public static final int GL_SUBPIXEL_BITS = 3408; // 0xd50
+ field public static final int GL_TEXTURE = 5890; // 0x1702
+ field public static final int GL_TEXTURE0 = 33984; // 0x84c0
+ field public static final int GL_TEXTURE1 = 33985; // 0x84c1
+ field public static final int GL_TEXTURE10 = 33994; // 0x84ca
+ field public static final int GL_TEXTURE11 = 33995; // 0x84cb
+ field public static final int GL_TEXTURE12 = 33996; // 0x84cc
+ field public static final int GL_TEXTURE13 = 33997; // 0x84cd
+ field public static final int GL_TEXTURE14 = 33998; // 0x84ce
+ field public static final int GL_TEXTURE15 = 33999; // 0x84cf
+ field public static final int GL_TEXTURE16 = 34000; // 0x84d0
+ field public static final int GL_TEXTURE17 = 34001; // 0x84d1
+ field public static final int GL_TEXTURE18 = 34002; // 0x84d2
+ field public static final int GL_TEXTURE19 = 34003; // 0x84d3
+ field public static final int GL_TEXTURE2 = 33986; // 0x84c2
+ field public static final int GL_TEXTURE20 = 34004; // 0x84d4
+ field public static final int GL_TEXTURE21 = 34005; // 0x84d5
+ field public static final int GL_TEXTURE22 = 34006; // 0x84d6
+ field public static final int GL_TEXTURE23 = 34007; // 0x84d7
+ field public static final int GL_TEXTURE24 = 34008; // 0x84d8
+ field public static final int GL_TEXTURE25 = 34009; // 0x84d9
+ field public static final int GL_TEXTURE26 = 34010; // 0x84da
+ field public static final int GL_TEXTURE27 = 34011; // 0x84db
+ field public static final int GL_TEXTURE28 = 34012; // 0x84dc
+ field public static final int GL_TEXTURE29 = 34013; // 0x84dd
+ field public static final int GL_TEXTURE3 = 33987; // 0x84c3
+ field public static final int GL_TEXTURE30 = 34014; // 0x84de
+ field public static final int GL_TEXTURE31 = 34015; // 0x84df
+ field public static final int GL_TEXTURE4 = 33988; // 0x84c4
+ field public static final int GL_TEXTURE5 = 33989; // 0x84c5
+ field public static final int GL_TEXTURE6 = 33990; // 0x84c6
+ field public static final int GL_TEXTURE7 = 33991; // 0x84c7
+ field public static final int GL_TEXTURE8 = 33992; // 0x84c8
+ field public static final int GL_TEXTURE9 = 33993; // 0x84c9
+ field public static final int GL_TEXTURE_2D = 3553; // 0xde1
+ field public static final int GL_TEXTURE_COORD_ARRAY = 32888; // 0x8078
+ field public static final int GL_TEXTURE_ENV = 8960; // 0x2300
+ field public static final int GL_TEXTURE_ENV_COLOR = 8705; // 0x2201
+ field public static final int GL_TEXTURE_ENV_MODE = 8704; // 0x2200
+ field public static final int GL_TEXTURE_MAG_FILTER = 10240; // 0x2800
+ field public static final int GL_TEXTURE_MIN_FILTER = 10241; // 0x2801
+ field public static final int GL_TEXTURE_WRAP_S = 10242; // 0x2802
+ field public static final int GL_TEXTURE_WRAP_T = 10243; // 0x2803
+ field public static final int GL_TRIANGLES = 4; // 0x4
+ field public static final int GL_TRIANGLE_FAN = 6; // 0x6
+ field public static final int GL_TRIANGLE_STRIP = 5; // 0x5
+ field public static final int GL_TRUE = 1; // 0x1
+ field public static final int GL_UNPACK_ALIGNMENT = 3317; // 0xcf5
+ field public static final int GL_UNSIGNED_BYTE = 5121; // 0x1401
+ field public static final int GL_UNSIGNED_SHORT = 5123; // 0x1403
+ field public static final int GL_UNSIGNED_SHORT_4_4_4_4 = 32819; // 0x8033
+ field public static final int GL_UNSIGNED_SHORT_5_5_5_1 = 32820; // 0x8034
+ field public static final int GL_UNSIGNED_SHORT_5_6_5 = 33635; // 0x8363
+ field public static final int GL_VENDOR = 7936; // 0x1f00
+ field public static final int GL_VERSION = 7938; // 0x1f02
+ field public static final int GL_VERTEX_ARRAY = 32884; // 0x8074
+ field public static final int GL_XOR = 5382; // 0x1506
+ field public static final int GL_ZERO = 0; // 0x0
+ }
+
+ public class GLES10Ext {
+ ctor public GLES10Ext();
+ method public static int glQueryMatrixxOES(int[], int, int[], int);
+ method public static int glQueryMatrixxOES(java.nio.IntBuffer, java.nio.IntBuffer);
+ }
+
+ public class GLES11 extends android.opengl.GLES10 {
+ ctor public GLES11();
+ method public static void glBindBuffer(int, int);
+ method public static void glBufferData(int, int, java.nio.Buffer, int);
+ method public static void glBufferSubData(int, int, int, java.nio.Buffer);
+ method public static void glClipPlanef(int, float[], int);
+ method public static void glClipPlanef(int, java.nio.FloatBuffer);
+ method public static void glClipPlanex(int, int[], int);
+ method public static void glClipPlanex(int, java.nio.IntBuffer);
+ method public static void glColor4ub(byte, byte, byte, byte);
+ method public static void glColorPointer(int, int, int, int);
+ method public static void glDeleteBuffers(int, int[], int);
+ method public static void glDeleteBuffers(int, java.nio.IntBuffer);
+ method public static void glDrawElements(int, int, int, int);
+ method public static void glGenBuffers(int, int[], int);
+ method public static void glGenBuffers(int, java.nio.IntBuffer);
+ method public static void glGetBooleanv(int, boolean[], int);
+ method public static void glGetBooleanv(int, java.nio.IntBuffer);
+ method public static void glGetBufferParameteriv(int, int, int[], int);
+ method public static void glGetBufferParameteriv(int, int, java.nio.IntBuffer);
+ method public static void glGetClipPlanef(int, float[], int);
+ method public static void glGetClipPlanef(int, java.nio.FloatBuffer);
+ method public static void glGetClipPlanex(int, int[], int);
+ method public static void glGetClipPlanex(int, java.nio.IntBuffer);
+ method public static void glGetFixedv(int, int[], int);
+ method public static void glGetFixedv(int, java.nio.IntBuffer);
+ method public static void glGetFloatv(int, float[], int);
+ method public static void glGetFloatv(int, java.nio.FloatBuffer);
+ method public static void glGetLightfv(int, int, float[], int);
+ method public static void glGetLightfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetLightxv(int, int, int[], int);
+ method public static void glGetLightxv(int, int, java.nio.IntBuffer);
+ method public static void glGetMaterialfv(int, int, float[], int);
+ method public static void glGetMaterialfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetMaterialxv(int, int, int[], int);
+ method public static void glGetMaterialxv(int, int, java.nio.IntBuffer);
+ method public static void glGetTexEnvfv(int, int, float[], int);
+ method public static void glGetTexEnvfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetTexEnviv(int, int, int[], int);
+ method public static void glGetTexEnviv(int, int, java.nio.IntBuffer);
+ method public static void glGetTexEnvxv(int, int, int[], int);
+ method public static void glGetTexEnvxv(int, int, java.nio.IntBuffer);
+ method public static void glGetTexParameterfv(int, int, float[], int);
+ method public static void glGetTexParameterfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetTexParameteriv(int, int, int[], int);
+ method public static void glGetTexParameteriv(int, int, java.nio.IntBuffer);
+ method public static void glGetTexParameterxv(int, int, int[], int);
+ method public static void glGetTexParameterxv(int, int, java.nio.IntBuffer);
+ method public static boolean glIsBuffer(int);
+ method public static boolean glIsEnabled(int);
+ method public static boolean glIsTexture(int);
+ method public static void glNormalPointer(int, int, int);
+ method public static void glPointParameterf(int, float);
+ method public static void glPointParameterfv(int, float[], int);
+ method public static void glPointParameterfv(int, java.nio.FloatBuffer);
+ method public static void glPointParameterx(int, int);
+ method public static void glPointParameterxv(int, int[], int);
+ method public static void glPointParameterxv(int, java.nio.IntBuffer);
+ method public static void glPointSizePointerOES(int, int, java.nio.Buffer);
+ method public static void glTexCoordPointer(int, int, int, int);
+ method public static void glTexEnvi(int, int, int);
+ method public static void glTexEnviv(int, int, int[], int);
+ method public static void glTexEnviv(int, int, java.nio.IntBuffer);
+ method public static void glTexParameterfv(int, int, float[], int);
+ method public static void glTexParameterfv(int, int, java.nio.FloatBuffer);
+ method public static void glTexParameteri(int, int, int);
+ method public static void glTexParameteriv(int, int, int[], int);
+ method public static void glTexParameteriv(int, int, java.nio.IntBuffer);
+ method public static void glTexParameterxv(int, int, int[], int);
+ method public static void glTexParameterxv(int, int, java.nio.IntBuffer);
+ method public static void glVertexPointer(int, int, int, int);
+ field public static final int GL_ACTIVE_TEXTURE = 34016; // 0x84e0
+ field public static final int GL_ADD_SIGNED = 34164; // 0x8574
+ field public static final int GL_ALPHA_SCALE = 3356; // 0xd1c
+ field public static final int GL_ALPHA_TEST_FUNC = 3009; // 0xbc1
+ field public static final int GL_ALPHA_TEST_REF = 3010; // 0xbc2
+ field public static final int GL_ARRAY_BUFFER = 34962; // 0x8892
+ field public static final int GL_ARRAY_BUFFER_BINDING = 34964; // 0x8894
+ field public static final int GL_BLEND_DST = 3040; // 0xbe0
+ field public static final int GL_BLEND_SRC = 3041; // 0xbe1
+ field public static final int GL_BUFFER_ACCESS = 35003; // 0x88bb
+ field public static final int GL_BUFFER_SIZE = 34660; // 0x8764
+ field public static final int GL_BUFFER_USAGE = 34661; // 0x8765
+ field public static final int GL_CLIENT_ACTIVE_TEXTURE = 34017; // 0x84e1
+ field public static final int GL_CLIP_PLANE0 = 12288; // 0x3000
+ field public static final int GL_CLIP_PLANE1 = 12289; // 0x3001
+ field public static final int GL_CLIP_PLANE2 = 12290; // 0x3002
+ field public static final int GL_CLIP_PLANE3 = 12291; // 0x3003
+ field public static final int GL_CLIP_PLANE4 = 12292; // 0x3004
+ field public static final int GL_CLIP_PLANE5 = 12293; // 0x3005
+ field public static final int GL_COLOR_ARRAY_BUFFER_BINDING = 34968; // 0x8898
+ field public static final int GL_COLOR_ARRAY_POINTER = 32912; // 0x8090
+ field public static final int GL_COLOR_ARRAY_SIZE = 32897; // 0x8081
+ field public static final int GL_COLOR_ARRAY_STRIDE = 32899; // 0x8083
+ field public static final int GL_COLOR_ARRAY_TYPE = 32898; // 0x8082
+ field public static final int GL_COLOR_CLEAR_VALUE = 3106; // 0xc22
+ field public static final int GL_COLOR_WRITEMASK = 3107; // 0xc23
+ field public static final int GL_COMBINE = 34160; // 0x8570
+ field public static final int GL_COMBINE_ALPHA = 34162; // 0x8572
+ field public static final int GL_COMBINE_RGB = 34161; // 0x8571
+ field public static final int GL_CONSTANT = 34166; // 0x8576
+ field public static final int GL_COORD_REPLACE_OES = 34914; // 0x8862
+ field public static final int GL_CULL_FACE_MODE = 2885; // 0xb45
+ field public static final int GL_CURRENT_COLOR = 2816; // 0xb00
+ field public static final int GL_CURRENT_NORMAL = 2818; // 0xb02
+ field public static final int GL_CURRENT_TEXTURE_COORDS = 2819; // 0xb03
+ field public static final int GL_DEPTH_CLEAR_VALUE = 2931; // 0xb73
+ field public static final int GL_DEPTH_FUNC = 2932; // 0xb74
+ field public static final int GL_DEPTH_RANGE = 2928; // 0xb70
+ field public static final int GL_DEPTH_WRITEMASK = 2930; // 0xb72
+ field public static final int GL_DOT3_RGB = 34478; // 0x86ae
+ field public static final int GL_DOT3_RGBA = 34479; // 0x86af
+ field public static final int GL_DYNAMIC_DRAW = 35048; // 0x88e8
+ field public static final int GL_ELEMENT_ARRAY_BUFFER = 34963; // 0x8893
+ field public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING = 34965; // 0x8895
+ field public static final int GL_FRONT_FACE = 2886; // 0xb46
+ field public static final int GL_GENERATE_MIPMAP = 33169; // 0x8191
+ field public static final int GL_GENERATE_MIPMAP_HINT = 33170; // 0x8192
+ field public static final int GL_INTERPOLATE = 34165; // 0x8575
+ field public static final int GL_LINE_WIDTH = 2849; // 0xb21
+ field public static final int GL_LOGIC_OP_MODE = 3056; // 0xbf0
+ field public static final int GL_MATRIX_MODE = 2976; // 0xba0
+ field public static final int GL_MAX_CLIP_PLANES = 3378; // 0xd32
+ field public static final int GL_MODELVIEW_MATRIX = 2982; // 0xba6
+ field public static final int GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES = 35213; // 0x898d
+ field public static final int GL_MODELVIEW_STACK_DEPTH = 2979; // 0xba3
+ field public static final int GL_NORMAL_ARRAY_BUFFER_BINDING = 34967; // 0x8897
+ field public static final int GL_NORMAL_ARRAY_POINTER = 32911; // 0x808f
+ field public static final int GL_NORMAL_ARRAY_STRIDE = 32895; // 0x807f
+ field public static final int GL_NORMAL_ARRAY_TYPE = 32894; // 0x807e
+ field public static final int GL_OPERAND0_ALPHA = 34200; // 0x8598
+ field public static final int GL_OPERAND0_RGB = 34192; // 0x8590
+ field public static final int GL_OPERAND1_ALPHA = 34201; // 0x8599
+ field public static final int GL_OPERAND1_RGB = 34193; // 0x8591
+ field public static final int GL_OPERAND2_ALPHA = 34202; // 0x859a
+ field public static final int GL_OPERAND2_RGB = 34194; // 0x8592
+ field public static final int GL_POINT_DISTANCE_ATTENUATION = 33065; // 0x8129
+ field public static final int GL_POINT_FADE_THRESHOLD_SIZE = 33064; // 0x8128
+ field public static final int GL_POINT_SIZE = 2833; // 0xb11
+ field public static final int GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES = 35743; // 0x8b9f
+ field public static final int GL_POINT_SIZE_ARRAY_OES = 35740; // 0x8b9c
+ field public static final int GL_POINT_SIZE_ARRAY_POINTER_OES = 35212; // 0x898c
+ field public static final int GL_POINT_SIZE_ARRAY_STRIDE_OES = 35211; // 0x898b
+ field public static final int GL_POINT_SIZE_ARRAY_TYPE_OES = 35210; // 0x898a
+ field public static final int GL_POINT_SIZE_MAX = 33063; // 0x8127
+ field public static final int GL_POINT_SIZE_MIN = 33062; // 0x8126
+ field public static final int GL_POINT_SPRITE_OES = 34913; // 0x8861
+ field public static final int GL_POLYGON_OFFSET_FACTOR = 32824; // 0x8038
+ field public static final int GL_POLYGON_OFFSET_UNITS = 10752; // 0x2a00
+ field public static final int GL_PREVIOUS = 34168; // 0x8578
+ field public static final int GL_PRIMARY_COLOR = 34167; // 0x8577
+ field public static final int GL_PROJECTION_MATRIX = 2983; // 0xba7
+ field public static final int GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES = 35214; // 0x898e
+ field public static final int GL_PROJECTION_STACK_DEPTH = 2980; // 0xba4
+ field public static final int GL_RGB_SCALE = 34163; // 0x8573
+ field public static final int GL_SAMPLES = 32937; // 0x80a9
+ field public static final int GL_SAMPLE_BUFFERS = 32936; // 0x80a8
+ field public static final int GL_SAMPLE_COVERAGE_INVERT = 32939; // 0x80ab
+ field public static final int GL_SAMPLE_COVERAGE_VALUE = 32938; // 0x80aa
+ field public static final int GL_SCISSOR_BOX = 3088; // 0xc10
+ field public static final int GL_SHADE_MODEL = 2900; // 0xb54
+ field public static final int GL_SRC0_ALPHA = 34184; // 0x8588
+ field public static final int GL_SRC0_RGB = 34176; // 0x8580
+ field public static final int GL_SRC1_ALPHA = 34185; // 0x8589
+ field public static final int GL_SRC1_RGB = 34177; // 0x8581
+ field public static final int GL_SRC2_ALPHA = 34186; // 0x858a
+ field public static final int GL_SRC2_RGB = 34178; // 0x8582
+ field public static final int GL_STATIC_DRAW = 35044; // 0x88e4
+ field public static final int GL_STENCIL_CLEAR_VALUE = 2961; // 0xb91
+ field public static final int GL_STENCIL_FAIL = 2964; // 0xb94
+ field public static final int GL_STENCIL_FUNC = 2962; // 0xb92
+ field public static final int GL_STENCIL_PASS_DEPTH_FAIL = 2965; // 0xb95
+ field public static final int GL_STENCIL_PASS_DEPTH_PASS = 2966; // 0xb96
+ field public static final int GL_STENCIL_REF = 2967; // 0xb97
+ field public static final int GL_STENCIL_VALUE_MASK = 2963; // 0xb93
+ field public static final int GL_STENCIL_WRITEMASK = 2968; // 0xb98
+ field public static final int GL_SUBTRACT = 34023; // 0x84e7
+ field public static final int GL_TEXTURE_BINDING_2D = 32873; // 0x8069
+ field public static final int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 34970; // 0x889a
+ field public static final int GL_TEXTURE_COORD_ARRAY_POINTER = 32914; // 0x8092
+ field public static final int GL_TEXTURE_COORD_ARRAY_SIZE = 32904; // 0x8088
+ field public static final int GL_TEXTURE_COORD_ARRAY_STRIDE = 32906; // 0x808a
+ field public static final int GL_TEXTURE_COORD_ARRAY_TYPE = 32905; // 0x8089
+ field public static final int GL_TEXTURE_MATRIX = 2984; // 0xba8
+ field public static final int GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES = 35215; // 0x898f
+ field public static final int GL_TEXTURE_STACK_DEPTH = 2981; // 0xba5
+ field public static final int GL_VERTEX_ARRAY_BUFFER_BINDING = 34966; // 0x8896
+ field public static final int GL_VERTEX_ARRAY_POINTER = 32910; // 0x808e
+ field public static final int GL_VERTEX_ARRAY_SIZE = 32890; // 0x807a
+ field public static final int GL_VERTEX_ARRAY_STRIDE = 32892; // 0x807c
+ field public static final int GL_VERTEX_ARRAY_TYPE = 32891; // 0x807b
+ field public static final int GL_VIEWPORT = 2978; // 0xba2
+ field public static final int GL_WRITE_ONLY = 35001; // 0x88b9
+ }
+
+ public class GLES11Ext {
+ ctor public GLES11Ext();
+ method public static void glAlphaFuncxOES(int, int);
+ method public static void glBindFramebufferOES(int, int);
+ method public static void glBindRenderbufferOES(int, int);
+ method public static void glBlendEquationOES(int);
+ method public static void glBlendEquationSeparateOES(int, int);
+ method public static void glBlendFuncSeparateOES(int, int, int, int);
+ method public static int glCheckFramebufferStatusOES(int);
+ method public static void glClearColorxOES(int, int, int, int);
+ method public static void glClearDepthfOES(float);
+ method public static void glClearDepthxOES(int);
+ method public static void glClipPlanefOES(int, float[], int);
+ method public static void glClipPlanefOES(int, java.nio.FloatBuffer);
+ method public static void glClipPlanexOES(int, int[], int);
+ method public static void glClipPlanexOES(int, java.nio.IntBuffer);
+ method public static void glColor4xOES(int, int, int, int);
+ method public static void glCurrentPaletteMatrixOES(int);
+ method public static void glDeleteFramebuffersOES(int, int[], int);
+ method public static void glDeleteFramebuffersOES(int, java.nio.IntBuffer);
+ method public static void glDeleteRenderbuffersOES(int, int[], int);
+ method public static void glDeleteRenderbuffersOES(int, java.nio.IntBuffer);
+ method public static void glDepthRangefOES(float, float);
+ method public static void glDepthRangexOES(int, int);
+ method public static void glDrawTexfOES(float, float, float, float, float);
+ method public static void glDrawTexfvOES(float[], int);
+ method public static void glDrawTexfvOES(java.nio.FloatBuffer);
+ method public static void glDrawTexiOES(int, int, int, int, int);
+ method public static void glDrawTexivOES(int[], int);
+ method public static void glDrawTexivOES(java.nio.IntBuffer);
+ method public static void glDrawTexsOES(short, short, short, short, short);
+ method public static void glDrawTexsvOES(short[], int);
+ method public static void glDrawTexsvOES(java.nio.ShortBuffer);
+ method public static void glDrawTexxOES(int, int, int, int, int);
+ method public static void glDrawTexxvOES(int[], int);
+ method public static void glDrawTexxvOES(java.nio.IntBuffer);
+ method public static void glEGLImageTargetRenderbufferStorageOES(int, java.nio.Buffer);
+ method public static void glEGLImageTargetTexture2DOES(int, java.nio.Buffer);
+ method public static void glFogxOES(int, int);
+ method public static void glFogxvOES(int, int[], int);
+ method public static void glFogxvOES(int, java.nio.IntBuffer);
+ method public static void glFramebufferRenderbufferOES(int, int, int, int);
+ method public static void glFramebufferTexture2DOES(int, int, int, int, int);
+ method public static void glFrustumfOES(float, float, float, float, float, float);
+ method public static void glFrustumxOES(int, int, int, int, int, int);
+ method public static void glGenFramebuffersOES(int, int[], int);
+ method public static void glGenFramebuffersOES(int, java.nio.IntBuffer);
+ method public static void glGenRenderbuffersOES(int, int[], int);
+ method public static void glGenRenderbuffersOES(int, java.nio.IntBuffer);
+ method public static void glGenerateMipmapOES(int);
+ method public static void glGetClipPlanefOES(int, float[], int);
+ method public static void glGetClipPlanefOES(int, java.nio.FloatBuffer);
+ method public static void glGetClipPlanexOES(int, int[], int);
+ method public static void glGetClipPlanexOES(int, java.nio.IntBuffer);
+ method public static void glGetFixedvOES(int, int[], int);
+ method public static void glGetFixedvOES(int, java.nio.IntBuffer);
+ method public static void glGetFramebufferAttachmentParameterivOES(int, int, int, int[], int);
+ method public static void glGetFramebufferAttachmentParameterivOES(int, int, int, java.nio.IntBuffer);
+ method public static void glGetLightxvOES(int, int, int[], int);
+ method public static void glGetLightxvOES(int, int, java.nio.IntBuffer);
+ method public static void glGetMaterialxvOES(int, int, int[], int);
+ method public static void glGetMaterialxvOES(int, int, java.nio.IntBuffer);
+ method public static void glGetRenderbufferParameterivOES(int, int, int[], int);
+ method public static void glGetRenderbufferParameterivOES(int, int, java.nio.IntBuffer);
+ method public static void glGetTexEnvxvOES(int, int, int[], int);
+ method public static void glGetTexEnvxvOES(int, int, java.nio.IntBuffer);
+ method public static void glGetTexGenfvOES(int, int, float[], int);
+ method public static void glGetTexGenfvOES(int, int, java.nio.FloatBuffer);
+ method public static void glGetTexGenivOES(int, int, int[], int);
+ method public static void glGetTexGenivOES(int, int, java.nio.IntBuffer);
+ method public static void glGetTexGenxvOES(int, int, int[], int);
+ method public static void glGetTexGenxvOES(int, int, java.nio.IntBuffer);
+ method public static void glGetTexParameterxvOES(int, int, int[], int);
+ method public static void glGetTexParameterxvOES(int, int, java.nio.IntBuffer);
+ method public static boolean glIsFramebufferOES(int);
+ method public static boolean glIsRenderbufferOES(int);
+ method public static void glLightModelxOES(int, int);
+ method public static void glLightModelxvOES(int, int[], int);
+ method public static void glLightModelxvOES(int, java.nio.IntBuffer);
+ method public static void glLightxOES(int, int, int);
+ method public static void glLightxvOES(int, int, int[], int);
+ method public static void glLightxvOES(int, int, java.nio.IntBuffer);
+ method public static void glLineWidthxOES(int);
+ method public static void glLoadMatrixxOES(int[], int);
+ method public static void glLoadMatrixxOES(java.nio.IntBuffer);
+ method public static void glLoadPaletteFromModelViewMatrixOES();
+ method public static void glMaterialxOES(int, int, int);
+ method public static void glMaterialxvOES(int, int, int[], int);
+ method public static void glMaterialxvOES(int, int, java.nio.IntBuffer);
+ method public static void glMatrixIndexPointerOES(int, int, int, java.nio.Buffer);
+ method public static void glMultMatrixxOES(int[], int);
+ method public static void glMultMatrixxOES(java.nio.IntBuffer);
+ method public static void glMultiTexCoord4xOES(int, int, int, int, int);
+ method public static void glNormal3xOES(int, int, int);
+ method public static void glOrthofOES(float, float, float, float, float, float);
+ method public static void glOrthoxOES(int, int, int, int, int, int);
+ method public static void glPointParameterxOES(int, int);
+ method public static void glPointParameterxvOES(int, int[], int);
+ method public static void glPointParameterxvOES(int, java.nio.IntBuffer);
+ method public static void glPointSizexOES(int);
+ method public static void glPolygonOffsetxOES(int, int);
+ method public static void glRenderbufferStorageOES(int, int, int, int);
+ method public static void glRotatexOES(int, int, int, int);
+ method public static void glSampleCoveragexOES(int, boolean);
+ method public static void glScalexOES(int, int, int);
+ method public static void glTexEnvxOES(int, int, int);
+ method public static void glTexEnvxvOES(int, int, int[], int);
+ method public static void glTexEnvxvOES(int, int, java.nio.IntBuffer);
+ method public static void glTexGenfOES(int, int, float);
+ method public static void glTexGenfvOES(int, int, float[], int);
+ method public static void glTexGenfvOES(int, int, java.nio.FloatBuffer);
+ method public static void glTexGeniOES(int, int, int);
+ method public static void glTexGenivOES(int, int, int[], int);
+ method public static void glTexGenivOES(int, int, java.nio.IntBuffer);
+ method public static void glTexGenxOES(int, int, int);
+ method public static void glTexGenxvOES(int, int, int[], int);
+ method public static void glTexGenxvOES(int, int, java.nio.IntBuffer);
+ method public static void glTexParameterxOES(int, int, int);
+ method public static void glTexParameterxvOES(int, int, int[], int);
+ method public static void glTexParameterxvOES(int, int, java.nio.IntBuffer);
+ method public static void glTranslatexOES(int, int, int);
+ method public static void glWeightPointerOES(int, int, int, java.nio.Buffer);
+ field public static final int GL_3DC_XY_AMD = 34810; // 0x87fa
+ field public static final int GL_3DC_X_AMD = 34809; // 0x87f9
+ field public static final int GL_ATC_RGBA_EXPLICIT_ALPHA_AMD = 35987; // 0x8c93
+ field public static final int GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD = 34798; // 0x87ee
+ field public static final int GL_ATC_RGB_AMD = 35986; // 0x8c92
+ field public static final int GL_BGRA = 32993; // 0x80e1
+ field public static final int GL_BLEND_DST_ALPHA_OES = 32970; // 0x80ca
+ field public static final int GL_BLEND_DST_RGB_OES = 32968; // 0x80c8
+ field public static final int GL_BLEND_EQUATION_ALPHA_OES = 34877; // 0x883d
+ field public static final int GL_BLEND_EQUATION_OES = 32777; // 0x8009
+ field public static final int GL_BLEND_EQUATION_RGB_OES = 32777; // 0x8009
+ field public static final int GL_BLEND_SRC_ALPHA_OES = 32971; // 0x80cb
+ field public static final int GL_BLEND_SRC_RGB_OES = 32969; // 0x80c9
+ field public static final int GL_BUFFER_ACCESS_OES = 35003; // 0x88bb
+ field public static final int GL_BUFFER_MAPPED_OES = 35004; // 0x88bc
+ field public static final int GL_BUFFER_MAP_POINTER_OES = 35005; // 0x88bd
+ field public static final int GL_COLOR_ATTACHMENT0_OES = 36064; // 0x8ce0
+ field public static final int GL_CURRENT_PALETTE_MATRIX_OES = 34883; // 0x8843
+ field public static final int GL_DECR_WRAP_OES = 34056; // 0x8508
+ field public static final int GL_DEPTH24_STENCIL8_OES = 35056; // 0x88f0
+ field public static final int GL_DEPTH_ATTACHMENT_OES = 36096; // 0x8d00
+ field public static final int GL_DEPTH_COMPONENT16_OES = 33189; // 0x81a5
+ field public static final int GL_DEPTH_COMPONENT24_OES = 33190; // 0x81a6
+ field public static final int GL_DEPTH_COMPONENT32_OES = 33191; // 0x81a7
+ field public static final int GL_DEPTH_STENCIL_OES = 34041; // 0x84f9
+ field public static final int GL_ETC1_RGB8_OES = 36196; // 0x8d64
+ field public static final int GL_FIXED_OES = 5132; // 0x140c
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES = 36049; // 0x8cd1
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES = 36048; // 0x8cd0
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES = 36051; // 0x8cd3
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES = 36050; // 0x8cd2
+ field public static final int GL_FRAMEBUFFER_BINDING_OES = 36006; // 0x8ca6
+ field public static final int GL_FRAMEBUFFER_COMPLETE_OES = 36053; // 0x8cd5
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES = 36054; // 0x8cd6
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES = 36057; // 0x8cd9
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES = 36058; // 0x8cda
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES = 36055; // 0x8cd7
+ field public static final int GL_FRAMEBUFFER_OES = 36160; // 0x8d40
+ field public static final int GL_FRAMEBUFFER_UNSUPPORTED_OES = 36061; // 0x8cdd
+ field public static final int GL_FUNC_ADD_OES = 32774; // 0x8006
+ field public static final int GL_FUNC_REVERSE_SUBTRACT_OES = 32779; // 0x800b
+ field public static final int GL_FUNC_SUBTRACT_OES = 32778; // 0x800a
+ field public static final int GL_INCR_WRAP_OES = 34055; // 0x8507
+ field public static final int GL_INVALID_FRAMEBUFFER_OPERATION_OES = 1286; // 0x506
+ field public static final int GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES = 35742; // 0x8b9e
+ field public static final int GL_MATRIX_INDEX_ARRAY_OES = 34884; // 0x8844
+ field public static final int GL_MATRIX_INDEX_ARRAY_POINTER_OES = 34889; // 0x8849
+ field public static final int GL_MATRIX_INDEX_ARRAY_SIZE_OES = 34886; // 0x8846
+ field public static final int GL_MATRIX_INDEX_ARRAY_STRIDE_OES = 34888; // 0x8848
+ field public static final int GL_MATRIX_INDEX_ARRAY_TYPE_OES = 34887; // 0x8847
+ field public static final int GL_MATRIX_PALETTE_OES = 34880; // 0x8840
+ field public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES = 34076; // 0x851c
+ field public static final int GL_MAX_PALETTE_MATRICES_OES = 34882; // 0x8842
+ field public static final int GL_MAX_RENDERBUFFER_SIZE_OES = 34024; // 0x84e8
+ field public static final int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 34047; // 0x84ff
+ field public static final int GL_MAX_VERTEX_UNITS_OES = 34468; // 0x86a4
+ field public static final int GL_MIRRORED_REPEAT_OES = 33648; // 0x8370
+ field public static final int GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES = 35213; // 0x898d
+ field public static final int GL_NONE_OES = 0; // 0x0
+ field public static final int GL_NORMAL_MAP_OES = 34065; // 0x8511
+ field public static final int GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES = 35214; // 0x898e
+ field public static final int GL_REFLECTION_MAP_OES = 34066; // 0x8512
+ field public static final int GL_RENDERBUFFER_ALPHA_SIZE_OES = 36179; // 0x8d53
+ field public static final int GL_RENDERBUFFER_BINDING_OES = 36007; // 0x8ca7
+ field public static final int GL_RENDERBUFFER_BLUE_SIZE_OES = 36178; // 0x8d52
+ field public static final int GL_RENDERBUFFER_DEPTH_SIZE_OES = 36180; // 0x8d54
+ field public static final int GL_RENDERBUFFER_GREEN_SIZE_OES = 36177; // 0x8d51
+ field public static final int GL_RENDERBUFFER_HEIGHT_OES = 36163; // 0x8d43
+ field public static final int GL_RENDERBUFFER_INTERNAL_FORMAT_OES = 36164; // 0x8d44
+ field public static final int GL_RENDERBUFFER_OES = 36161; // 0x8d41
+ field public static final int GL_RENDERBUFFER_RED_SIZE_OES = 36176; // 0x8d50
+ field public static final int GL_RENDERBUFFER_STENCIL_SIZE_OES = 36181; // 0x8d55
+ field public static final int GL_RENDERBUFFER_WIDTH_OES = 36162; // 0x8d42
+ field public static final int GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES = 36200; // 0x8d68
+ field public static final int GL_RGB565_OES = 36194; // 0x8d62
+ field public static final int GL_RGB5_A1_OES = 32855; // 0x8057
+ field public static final int GL_RGB8_OES = 32849; // 0x8051
+ field public static final int GL_RGBA4_OES = 32854; // 0x8056
+ field public static final int GL_RGBA8_OES = 32856; // 0x8058
+ field public static final int GL_SAMPLER_EXTERNAL_OES = 36198; // 0x8d66
+ field public static final int GL_STENCIL_ATTACHMENT_OES = 36128; // 0x8d20
+ field public static final int GL_STENCIL_INDEX1_OES = 36166; // 0x8d46
+ field public static final int GL_STENCIL_INDEX4_OES = 36167; // 0x8d47
+ field public static final int GL_STENCIL_INDEX8_OES = 36168; // 0x8d48
+ field public static final int GL_TEXTURE_BINDING_CUBE_MAP_OES = 34068; // 0x8514
+ field public static final int GL_TEXTURE_BINDING_EXTERNAL_OES = 36199; // 0x8d67
+ field public static final int GL_TEXTURE_CROP_RECT_OES = 35741; // 0x8b9d
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES = 34070; // 0x8516
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES = 34072; // 0x8518
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES = 34074; // 0x851a
+ field public static final int GL_TEXTURE_CUBE_MAP_OES = 34067; // 0x8513
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES = 34069; // 0x8515
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES = 34071; // 0x8517
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES = 34073; // 0x8519
+ field public static final int GL_TEXTURE_EXTERNAL_OES = 36197; // 0x8d65
+ field public static final int GL_TEXTURE_GEN_MODE_OES = 9472; // 0x2500
+ field public static final int GL_TEXTURE_GEN_STR_OES = 36192; // 0x8d60
+ field public static final int GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES = 35215; // 0x898f
+ field public static final int GL_TEXTURE_MAX_ANISOTROPY_EXT = 34046; // 0x84fe
+ field public static final int GL_UNSIGNED_INT_24_8_OES = 34042; // 0x84fa
+ field public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_OES = 34974; // 0x889e
+ field public static final int GL_WEIGHT_ARRAY_OES = 34477; // 0x86ad
+ field public static final int GL_WEIGHT_ARRAY_POINTER_OES = 34476; // 0x86ac
+ field public static final int GL_WEIGHT_ARRAY_SIZE_OES = 34475; // 0x86ab
+ field public static final int GL_WEIGHT_ARRAY_STRIDE_OES = 34474; // 0x86aa
+ field public static final int GL_WEIGHT_ARRAY_TYPE_OES = 34473; // 0x86a9
+ field public static final int GL_WRITE_ONLY_OES = 35001; // 0x88b9
+ }
+
+ public class GLES20 {
+ ctor public GLES20();
+ method public static void glActiveTexture(int);
+ method public static void glAttachShader(int, int);
+ method public static void glBindAttribLocation(int, int, java.lang.String);
+ method public static void glBindBuffer(int, int);
+ method public static void glBindFramebuffer(int, int);
+ method public static void glBindRenderbuffer(int, int);
+ method public static void glBindTexture(int, int);
+ method public static void glBlendColor(float, float, float, float);
+ method public static void glBlendEquation(int);
+ method public static void glBlendEquationSeparate(int, int);
+ method public static void glBlendFunc(int, int);
+ method public static void glBlendFuncSeparate(int, int, int, int);
+ method public static void glBufferData(int, int, java.nio.Buffer, int);
+ method public static void glBufferSubData(int, int, int, java.nio.Buffer);
+ method public static int glCheckFramebufferStatus(int);
+ method public static void glClear(int);
+ method public static void glClearColor(float, float, float, float);
+ method public static void glClearDepthf(float);
+ method public static void glClearStencil(int);
+ method public static void glColorMask(boolean, boolean, boolean, boolean);
+ method public static void glCompileShader(int);
+ method public static void glCompressedTexImage2D(int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glCompressedTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glCopyTexImage2D(int, int, int, int, int, int, int, int);
+ method public static void glCopyTexSubImage2D(int, int, int, int, int, int, int, int);
+ method public static int glCreateProgram();
+ method public static int glCreateShader(int);
+ method public static void glCullFace(int);
+ method public static void glDeleteBuffers(int, int[], int);
+ method public static void glDeleteBuffers(int, java.nio.IntBuffer);
+ method public static void glDeleteFramebuffers(int, int[], int);
+ method public static void glDeleteFramebuffers(int, java.nio.IntBuffer);
+ method public static void glDeleteProgram(int);
+ method public static void glDeleteRenderbuffers(int, int[], int);
+ method public static void glDeleteRenderbuffers(int, java.nio.IntBuffer);
+ method public static void glDeleteShader(int);
+ method public static void glDeleteTextures(int, int[], int);
+ method public static void glDeleteTextures(int, java.nio.IntBuffer);
+ method public static void glDepthFunc(int);
+ method public static void glDepthMask(boolean);
+ method public static void glDepthRangef(float, float);
+ method public static void glDetachShader(int, int);
+ method public static void glDisable(int);
+ method public static void glDisableVertexAttribArray(int);
+ method public static void glDrawArrays(int, int, int);
+ method public static void glDrawElements(int, int, int, int);
+ method public static void glDrawElements(int, int, int, java.nio.Buffer);
+ method public static void glEnable(int);
+ method public static void glEnableVertexAttribArray(int);
+ method public static void glFinish();
+ method public static void glFlush();
+ method public static void glFramebufferRenderbuffer(int, int, int, int);
+ method public static void glFramebufferTexture2D(int, int, int, int, int);
+ method public static void glFrontFace(int);
+ method public static void glGenBuffers(int, int[], int);
+ method public static void glGenBuffers(int, java.nio.IntBuffer);
+ method public static void glGenFramebuffers(int, int[], int);
+ method public static void glGenFramebuffers(int, java.nio.IntBuffer);
+ method public static void glGenRenderbuffers(int, int[], int);
+ method public static void glGenRenderbuffers(int, java.nio.IntBuffer);
+ method public static void glGenTextures(int, int[], int);
+ method public static void glGenTextures(int, java.nio.IntBuffer);
+ method public static void glGenerateMipmap(int);
+ method public static void glGetActiveAttrib(int, int, int, int[], int, int[], int, int[], int, byte[], int);
+ method public static java.lang.String glGetActiveAttrib(int, int, int[], int, int[], int);
+ method public static java.lang.String glGetActiveAttrib(int, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static void glGetActiveUniform(int, int, int, int[], int, int[], int, int[], int, byte[], int);
+ method public static java.lang.String glGetActiveUniform(int, int, int[], int, int[], int);
+ method public static java.lang.String glGetActiveUniform(int, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static void glGetAttachedShaders(int, int, int[], int, int[], int);
+ method public static void glGetAttachedShaders(int, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static int glGetAttribLocation(int, java.lang.String);
+ method public static void glGetBooleanv(int, boolean[], int);
+ method public static void glGetBooleanv(int, java.nio.IntBuffer);
+ method public static void glGetBufferParameteriv(int, int, int[], int);
+ method public static void glGetBufferParameteriv(int, int, java.nio.IntBuffer);
+ method public static int glGetError();
+ method public static void glGetFloatv(int, float[], int);
+ method public static void glGetFloatv(int, java.nio.FloatBuffer);
+ method public static void glGetFramebufferAttachmentParameteriv(int, int, int, int[], int);
+ method public static void glGetFramebufferAttachmentParameteriv(int, int, int, java.nio.IntBuffer);
+ method public static void glGetIntegerv(int, int[], int);
+ method public static void glGetIntegerv(int, java.nio.IntBuffer);
+ method public static java.lang.String glGetProgramInfoLog(int);
+ method public static void glGetProgramiv(int, int, int[], int);
+ method public static void glGetProgramiv(int, int, java.nio.IntBuffer);
+ method public static void glGetRenderbufferParameteriv(int, int, int[], int);
+ method public static void glGetRenderbufferParameteriv(int, int, java.nio.IntBuffer);
+ method public static java.lang.String glGetShaderInfoLog(int);
+ method public static void glGetShaderPrecisionFormat(int, int, int[], int, int[], int);
+ method public static void glGetShaderPrecisionFormat(int, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static void glGetShaderSource(int, int, int[], int, byte[], int);
+ method public static java.lang.String glGetShaderSource(int);
+ method public static void glGetShaderiv(int, int, int[], int);
+ method public static void glGetShaderiv(int, int, java.nio.IntBuffer);
+ method public static java.lang.String glGetString(int);
+ method public static void glGetTexParameterfv(int, int, float[], int);
+ method public static void glGetTexParameterfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetTexParameteriv(int, int, int[], int);
+ method public static void glGetTexParameteriv(int, int, java.nio.IntBuffer);
+ method public static int glGetUniformLocation(int, java.lang.String);
+ method public static void glGetUniformfv(int, int, float[], int);
+ method public static void glGetUniformfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetUniformiv(int, int, int[], int);
+ method public static void glGetUniformiv(int, int, java.nio.IntBuffer);
+ method public static void glGetVertexAttribfv(int, int, float[], int);
+ method public static void glGetVertexAttribfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetVertexAttribiv(int, int, int[], int);
+ method public static void glGetVertexAttribiv(int, int, java.nio.IntBuffer);
+ method public static void glHint(int, int);
+ method public static boolean glIsBuffer(int);
+ method public static boolean glIsEnabled(int);
+ method public static boolean glIsFramebuffer(int);
+ method public static boolean glIsProgram(int);
+ method public static boolean glIsRenderbuffer(int);
+ method public static boolean glIsShader(int);
+ method public static boolean glIsTexture(int);
+ method public static void glLineWidth(float);
+ method public static void glLinkProgram(int);
+ method public static void glPixelStorei(int, int);
+ method public static void glPolygonOffset(float, float);
+ method public static void glReadPixels(int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glReleaseShaderCompiler();
+ method public static void glRenderbufferStorage(int, int, int, int);
+ method public static void glSampleCoverage(float, boolean);
+ method public static void glScissor(int, int, int, int);
+ method public static void glShaderBinary(int, int[], int, int, java.nio.Buffer, int);
+ method public static void glShaderBinary(int, java.nio.IntBuffer, int, java.nio.Buffer, int);
+ method public static void glShaderSource(int, java.lang.String);
+ method public static void glStencilFunc(int, int, int);
+ method public static void glStencilFuncSeparate(int, int, int, int);
+ method public static void glStencilMask(int);
+ method public static void glStencilMaskSeparate(int, int);
+ method public static void glStencilOp(int, int, int);
+ method public static void glStencilOpSeparate(int, int, int, int);
+ method public static void glTexImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glTexParameterf(int, int, float);
+ method public static void glTexParameterfv(int, int, float[], int);
+ method public static void glTexParameterfv(int, int, java.nio.FloatBuffer);
+ method public static void glTexParameteri(int, int, int);
+ method public static void glTexParameteriv(int, int, int[], int);
+ method public static void glTexParameteriv(int, int, java.nio.IntBuffer);
+ method public static void glTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glUniform1f(int, float);
+ method public static void glUniform1fv(int, int, float[], int);
+ method public static void glUniform1fv(int, int, java.nio.FloatBuffer);
+ method public static void glUniform1i(int, int);
+ method public static void glUniform1iv(int, int, int[], int);
+ method public static void glUniform1iv(int, int, java.nio.IntBuffer);
+ method public static void glUniform2f(int, float, float);
+ method public static void glUniform2fv(int, int, float[], int);
+ method public static void glUniform2fv(int, int, java.nio.FloatBuffer);
+ method public static void glUniform2i(int, int, int);
+ method public static void glUniform2iv(int, int, int[], int);
+ method public static void glUniform2iv(int, int, java.nio.IntBuffer);
+ method public static void glUniform3f(int, float, float, float);
+ method public static void glUniform3fv(int, int, float[], int);
+ method public static void glUniform3fv(int, int, java.nio.FloatBuffer);
+ method public static void glUniform3i(int, int, int, int);
+ method public static void glUniform3iv(int, int, int[], int);
+ method public static void glUniform3iv(int, int, java.nio.IntBuffer);
+ method public static void glUniform4f(int, float, float, float, float);
+ method public static void glUniform4fv(int, int, float[], int);
+ method public static void glUniform4fv(int, int, java.nio.FloatBuffer);
+ method public static void glUniform4i(int, int, int, int, int);
+ method public static void glUniform4iv(int, int, int[], int);
+ method public static void glUniform4iv(int, int, java.nio.IntBuffer);
+ method public static void glUniformMatrix2fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix2fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix3fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix3fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix4fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix4fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUseProgram(int);
+ method public static void glValidateProgram(int);
+ method public static void glVertexAttrib1f(int, float);
+ method public static void glVertexAttrib1fv(int, float[], int);
+ method public static void glVertexAttrib1fv(int, java.nio.FloatBuffer);
+ method public static void glVertexAttrib2f(int, float, float);
+ method public static void glVertexAttrib2fv(int, float[], int);
+ method public static void glVertexAttrib2fv(int, java.nio.FloatBuffer);
+ method public static void glVertexAttrib3f(int, float, float, float);
+ method public static void glVertexAttrib3fv(int, float[], int);
+ method public static void glVertexAttrib3fv(int, java.nio.FloatBuffer);
+ method public static void glVertexAttrib4f(int, float, float, float, float);
+ method public static void glVertexAttrib4fv(int, float[], int);
+ method public static void glVertexAttrib4fv(int, java.nio.FloatBuffer);
+ method public static void glVertexAttribPointer(int, int, int, boolean, int, int);
+ method public static void glVertexAttribPointer(int, int, int, boolean, int, java.nio.Buffer);
+ method public static void glViewport(int, int, int, int);
+ field public static final int GL_ACTIVE_ATTRIBUTES = 35721; // 0x8b89
+ field public static final int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 35722; // 0x8b8a
+ field public static final int GL_ACTIVE_TEXTURE = 34016; // 0x84e0
+ field public static final int GL_ACTIVE_UNIFORMS = 35718; // 0x8b86
+ field public static final int GL_ACTIVE_UNIFORM_MAX_LENGTH = 35719; // 0x8b87
+ field public static final int GL_ALIASED_LINE_WIDTH_RANGE = 33902; // 0x846e
+ field public static final int GL_ALIASED_POINT_SIZE_RANGE = 33901; // 0x846d
+ field public static final int GL_ALPHA = 6406; // 0x1906
+ field public static final int GL_ALPHA_BITS = 3413; // 0xd55
+ field public static final int GL_ALWAYS = 519; // 0x207
+ field public static final int GL_ARRAY_BUFFER = 34962; // 0x8892
+ field public static final int GL_ARRAY_BUFFER_BINDING = 34964; // 0x8894
+ field public static final int GL_ATTACHED_SHADERS = 35717; // 0x8b85
+ field public static final int GL_BACK = 1029; // 0x405
+ field public static final int GL_BLEND = 3042; // 0xbe2
+ field public static final int GL_BLEND_COLOR = 32773; // 0x8005
+ field public static final int GL_BLEND_DST_ALPHA = 32970; // 0x80ca
+ field public static final int GL_BLEND_DST_RGB = 32968; // 0x80c8
+ field public static final int GL_BLEND_EQUATION = 32777; // 0x8009
+ field public static final int GL_BLEND_EQUATION_ALPHA = 34877; // 0x883d
+ field public static final int GL_BLEND_EQUATION_RGB = 32777; // 0x8009
+ field public static final int GL_BLEND_SRC_ALPHA = 32971; // 0x80cb
+ field public static final int GL_BLEND_SRC_RGB = 32969; // 0x80c9
+ field public static final int GL_BLUE_BITS = 3412; // 0xd54
+ field public static final int GL_BOOL = 35670; // 0x8b56
+ field public static final int GL_BOOL_VEC2 = 35671; // 0x8b57
+ field public static final int GL_BOOL_VEC3 = 35672; // 0x8b58
+ field public static final int GL_BOOL_VEC4 = 35673; // 0x8b59
+ field public static final int GL_BUFFER_SIZE = 34660; // 0x8764
+ field public static final int GL_BUFFER_USAGE = 34661; // 0x8765
+ field public static final int GL_BYTE = 5120; // 0x1400
+ field public static final int GL_CCW = 2305; // 0x901
+ field public static final int GL_CLAMP_TO_EDGE = 33071; // 0x812f
+ field public static final int GL_COLOR_ATTACHMENT0 = 36064; // 0x8ce0
+ field public static final int GL_COLOR_BUFFER_BIT = 16384; // 0x4000
+ field public static final int GL_COLOR_CLEAR_VALUE = 3106; // 0xc22
+ field public static final int GL_COLOR_WRITEMASK = 3107; // 0xc23
+ field public static final int GL_COMPILE_STATUS = 35713; // 0x8b81
+ field public static final int GL_COMPRESSED_TEXTURE_FORMATS = 34467; // 0x86a3
+ field public static final int GL_CONSTANT_ALPHA = 32771; // 0x8003
+ field public static final int GL_CONSTANT_COLOR = 32769; // 0x8001
+ field public static final int GL_CULL_FACE = 2884; // 0xb44
+ field public static final int GL_CULL_FACE_MODE = 2885; // 0xb45
+ field public static final int GL_CURRENT_PROGRAM = 35725; // 0x8b8d
+ field public static final int GL_CURRENT_VERTEX_ATTRIB = 34342; // 0x8626
+ field public static final int GL_CW = 2304; // 0x900
+ field public static final int GL_DECR = 7683; // 0x1e03
+ field public static final int GL_DECR_WRAP = 34056; // 0x8508
+ field public static final int GL_DELETE_STATUS = 35712; // 0x8b80
+ field public static final int GL_DEPTH_ATTACHMENT = 36096; // 0x8d00
+ field public static final int GL_DEPTH_BITS = 3414; // 0xd56
+ field public static final int GL_DEPTH_BUFFER_BIT = 256; // 0x100
+ field public static final int GL_DEPTH_CLEAR_VALUE = 2931; // 0xb73
+ field public static final int GL_DEPTH_COMPONENT = 6402; // 0x1902
+ field public static final int GL_DEPTH_COMPONENT16 = 33189; // 0x81a5
+ field public static final int GL_DEPTH_FUNC = 2932; // 0xb74
+ field public static final int GL_DEPTH_RANGE = 2928; // 0xb70
+ field public static final int GL_DEPTH_TEST = 2929; // 0xb71
+ field public static final int GL_DEPTH_WRITEMASK = 2930; // 0xb72
+ field public static final int GL_DITHER = 3024; // 0xbd0
+ field public static final int GL_DONT_CARE = 4352; // 0x1100
+ field public static final int GL_DST_ALPHA = 772; // 0x304
+ field public static final int GL_DST_COLOR = 774; // 0x306
+ field public static final int GL_DYNAMIC_DRAW = 35048; // 0x88e8
+ field public static final int GL_ELEMENT_ARRAY_BUFFER = 34963; // 0x8893
+ field public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING = 34965; // 0x8895
+ field public static final int GL_EQUAL = 514; // 0x202
+ field public static final int GL_EXTENSIONS = 7939; // 0x1f03
+ field public static final int GL_FALSE = 0; // 0x0
+ field public static final int GL_FASTEST = 4353; // 0x1101
+ field public static final int GL_FIXED = 5132; // 0x140c
+ field public static final int GL_FLOAT = 5126; // 0x1406
+ field public static final int GL_FLOAT_MAT2 = 35674; // 0x8b5a
+ field public static final int GL_FLOAT_MAT3 = 35675; // 0x8b5b
+ field public static final int GL_FLOAT_MAT4 = 35676; // 0x8b5c
+ field public static final int GL_FLOAT_VEC2 = 35664; // 0x8b50
+ field public static final int GL_FLOAT_VEC3 = 35665; // 0x8b51
+ field public static final int GL_FLOAT_VEC4 = 35666; // 0x8b52
+ field public static final int GL_FRAGMENT_SHADER = 35632; // 0x8b30
+ field public static final int GL_FRAMEBUFFER = 36160; // 0x8d40
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 36049; // 0x8cd1
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 36048; // 0x8cd0
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 36051; // 0x8cd3
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 36050; // 0x8cd2
+ field public static final int GL_FRAMEBUFFER_BINDING = 36006; // 0x8ca6
+ field public static final int GL_FRAMEBUFFER_COMPLETE = 36053; // 0x8cd5
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 36054; // 0x8cd6
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS = 36057; // 0x8cd9
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 36055; // 0x8cd7
+ field public static final int GL_FRAMEBUFFER_UNSUPPORTED = 36061; // 0x8cdd
+ field public static final int GL_FRONT = 1028; // 0x404
+ field public static final int GL_FRONT_AND_BACK = 1032; // 0x408
+ field public static final int GL_FRONT_FACE = 2886; // 0xb46
+ field public static final int GL_FUNC_ADD = 32774; // 0x8006
+ field public static final int GL_FUNC_REVERSE_SUBTRACT = 32779; // 0x800b
+ field public static final int GL_FUNC_SUBTRACT = 32778; // 0x800a
+ field public static final int GL_GENERATE_MIPMAP_HINT = 33170; // 0x8192
+ field public static final int GL_GEQUAL = 518; // 0x206
+ field public static final int GL_GREATER = 516; // 0x204
+ field public static final int GL_GREEN_BITS = 3411; // 0xd53
+ field public static final int GL_HIGH_FLOAT = 36338; // 0x8df2
+ field public static final int GL_HIGH_INT = 36341; // 0x8df5
+ field public static final int GL_IMPLEMENTATION_COLOR_READ_FORMAT = 35739; // 0x8b9b
+ field public static final int GL_IMPLEMENTATION_COLOR_READ_TYPE = 35738; // 0x8b9a
+ field public static final int GL_INCR = 7682; // 0x1e02
+ field public static final int GL_INCR_WRAP = 34055; // 0x8507
+ field public static final int GL_INFO_LOG_LENGTH = 35716; // 0x8b84
+ field public static final int GL_INT = 5124; // 0x1404
+ field public static final int GL_INT_VEC2 = 35667; // 0x8b53
+ field public static final int GL_INT_VEC3 = 35668; // 0x8b54
+ field public static final int GL_INT_VEC4 = 35669; // 0x8b55
+ field public static final int GL_INVALID_ENUM = 1280; // 0x500
+ field public static final int GL_INVALID_FRAMEBUFFER_OPERATION = 1286; // 0x506
+ field public static final int GL_INVALID_OPERATION = 1282; // 0x502
+ field public static final int GL_INVALID_VALUE = 1281; // 0x501
+ field public static final int GL_INVERT = 5386; // 0x150a
+ field public static final int GL_KEEP = 7680; // 0x1e00
+ field public static final int GL_LEQUAL = 515; // 0x203
+ field public static final int GL_LESS = 513; // 0x201
+ field public static final int GL_LINEAR = 9729; // 0x2601
+ field public static final int GL_LINEAR_MIPMAP_LINEAR = 9987; // 0x2703
+ field public static final int GL_LINEAR_MIPMAP_NEAREST = 9985; // 0x2701
+ field public static final int GL_LINES = 1; // 0x1
+ field public static final int GL_LINE_LOOP = 2; // 0x2
+ field public static final int GL_LINE_STRIP = 3; // 0x3
+ field public static final int GL_LINE_WIDTH = 2849; // 0xb21
+ field public static final int GL_LINK_STATUS = 35714; // 0x8b82
+ field public static final int GL_LOW_FLOAT = 36336; // 0x8df0
+ field public static final int GL_LOW_INT = 36339; // 0x8df3
+ field public static final int GL_LUMINANCE = 6409; // 0x1909
+ field public static final int GL_LUMINANCE_ALPHA = 6410; // 0x190a
+ field public static final int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 35661; // 0x8b4d
+ field public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 34076; // 0x851c
+ field public static final int GL_MAX_FRAGMENT_UNIFORM_VECTORS = 36349; // 0x8dfd
+ field public static final int GL_MAX_RENDERBUFFER_SIZE = 34024; // 0x84e8
+ field public static final int GL_MAX_TEXTURE_IMAGE_UNITS = 34930; // 0x8872
+ field public static final int GL_MAX_TEXTURE_SIZE = 3379; // 0xd33
+ field public static final int GL_MAX_VARYING_VECTORS = 36348; // 0x8dfc
+ field public static final int GL_MAX_VERTEX_ATTRIBS = 34921; // 0x8869
+ field public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 35660; // 0x8b4c
+ field public static final int GL_MAX_VERTEX_UNIFORM_VECTORS = 36347; // 0x8dfb
+ field public static final int GL_MAX_VIEWPORT_DIMS = 3386; // 0xd3a
+ field public static final int GL_MEDIUM_FLOAT = 36337; // 0x8df1
+ field public static final int GL_MEDIUM_INT = 36340; // 0x8df4
+ field public static final int GL_MIRRORED_REPEAT = 33648; // 0x8370
+ field public static final int GL_NEAREST = 9728; // 0x2600
+ field public static final int GL_NEAREST_MIPMAP_LINEAR = 9986; // 0x2702
+ field public static final int GL_NEAREST_MIPMAP_NEAREST = 9984; // 0x2700
+ field public static final int GL_NEVER = 512; // 0x200
+ field public static final int GL_NICEST = 4354; // 0x1102
+ field public static final int GL_NONE = 0; // 0x0
+ field public static final int GL_NOTEQUAL = 517; // 0x205
+ field public static final int GL_NO_ERROR = 0; // 0x0
+ field public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 34466; // 0x86a2
+ field public static final int GL_NUM_SHADER_BINARY_FORMATS = 36345; // 0x8df9
+ field public static final int GL_ONE = 1; // 0x1
+ field public static final int GL_ONE_MINUS_CONSTANT_ALPHA = 32772; // 0x8004
+ field public static final int GL_ONE_MINUS_CONSTANT_COLOR = 32770; // 0x8002
+ field public static final int GL_ONE_MINUS_DST_ALPHA = 773; // 0x305
+ field public static final int GL_ONE_MINUS_DST_COLOR = 775; // 0x307
+ field public static final int GL_ONE_MINUS_SRC_ALPHA = 771; // 0x303
+ field public static final int GL_ONE_MINUS_SRC_COLOR = 769; // 0x301
+ field public static final int GL_OUT_OF_MEMORY = 1285; // 0x505
+ field public static final int GL_PACK_ALIGNMENT = 3333; // 0xd05
+ field public static final int GL_POINTS = 0; // 0x0
+ field public static final int GL_POLYGON_OFFSET_FACTOR = 32824; // 0x8038
+ field public static final int GL_POLYGON_OFFSET_FILL = 32823; // 0x8037
+ field public static final int GL_POLYGON_OFFSET_UNITS = 10752; // 0x2a00
+ field public static final int GL_RED_BITS = 3410; // 0xd52
+ field public static final int GL_RENDERBUFFER = 36161; // 0x8d41
+ field public static final int GL_RENDERBUFFER_ALPHA_SIZE = 36179; // 0x8d53
+ field public static final int GL_RENDERBUFFER_BINDING = 36007; // 0x8ca7
+ field public static final int GL_RENDERBUFFER_BLUE_SIZE = 36178; // 0x8d52
+ field public static final int GL_RENDERBUFFER_DEPTH_SIZE = 36180; // 0x8d54
+ field public static final int GL_RENDERBUFFER_GREEN_SIZE = 36177; // 0x8d51
+ field public static final int GL_RENDERBUFFER_HEIGHT = 36163; // 0x8d43
+ field public static final int GL_RENDERBUFFER_INTERNAL_FORMAT = 36164; // 0x8d44
+ field public static final int GL_RENDERBUFFER_RED_SIZE = 36176; // 0x8d50
+ field public static final int GL_RENDERBUFFER_STENCIL_SIZE = 36181; // 0x8d55
+ field public static final int GL_RENDERBUFFER_WIDTH = 36162; // 0x8d42
+ field public static final int GL_RENDERER = 7937; // 0x1f01
+ field public static final int GL_REPEAT = 10497; // 0x2901
+ field public static final int GL_REPLACE = 7681; // 0x1e01
+ field public static final int GL_RGB = 6407; // 0x1907
+ field public static final int GL_RGB565 = 36194; // 0x8d62
+ field public static final int GL_RGB5_A1 = 32855; // 0x8057
+ field public static final int GL_RGBA = 6408; // 0x1908
+ field public static final int GL_RGBA4 = 32854; // 0x8056
+ field public static final int GL_SAMPLER_2D = 35678; // 0x8b5e
+ field public static final int GL_SAMPLER_CUBE = 35680; // 0x8b60
+ field public static final int GL_SAMPLES = 32937; // 0x80a9
+ field public static final int GL_SAMPLE_ALPHA_TO_COVERAGE = 32926; // 0x809e
+ field public static final int GL_SAMPLE_BUFFERS = 32936; // 0x80a8
+ field public static final int GL_SAMPLE_COVERAGE = 32928; // 0x80a0
+ field public static final int GL_SAMPLE_COVERAGE_INVERT = 32939; // 0x80ab
+ field public static final int GL_SAMPLE_COVERAGE_VALUE = 32938; // 0x80aa
+ field public static final int GL_SCISSOR_BOX = 3088; // 0xc10
+ field public static final int GL_SCISSOR_TEST = 3089; // 0xc11
+ field public static final int GL_SHADER_BINARY_FORMATS = 36344; // 0x8df8
+ field public static final int GL_SHADER_COMPILER = 36346; // 0x8dfa
+ field public static final int GL_SHADER_SOURCE_LENGTH = 35720; // 0x8b88
+ field public static final int GL_SHADER_TYPE = 35663; // 0x8b4f
+ field public static final int GL_SHADING_LANGUAGE_VERSION = 35724; // 0x8b8c
+ field public static final int GL_SHORT = 5122; // 0x1402
+ field public static final int GL_SRC_ALPHA = 770; // 0x302
+ field public static final int GL_SRC_ALPHA_SATURATE = 776; // 0x308
+ field public static final int GL_SRC_COLOR = 768; // 0x300
+ field public static final int GL_STATIC_DRAW = 35044; // 0x88e4
+ field public static final int GL_STENCIL_ATTACHMENT = 36128; // 0x8d20
+ field public static final int GL_STENCIL_BACK_FAIL = 34817; // 0x8801
+ field public static final int GL_STENCIL_BACK_FUNC = 34816; // 0x8800
+ field public static final int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 34818; // 0x8802
+ field public static final int GL_STENCIL_BACK_PASS_DEPTH_PASS = 34819; // 0x8803
+ field public static final int GL_STENCIL_BACK_REF = 36003; // 0x8ca3
+ field public static final int GL_STENCIL_BACK_VALUE_MASK = 36004; // 0x8ca4
+ field public static final int GL_STENCIL_BACK_WRITEMASK = 36005; // 0x8ca5
+ field public static final int GL_STENCIL_BITS = 3415; // 0xd57
+ field public static final int GL_STENCIL_BUFFER_BIT = 1024; // 0x400
+ field public static final int GL_STENCIL_CLEAR_VALUE = 2961; // 0xb91
+ field public static final int GL_STENCIL_FAIL = 2964; // 0xb94
+ field public static final int GL_STENCIL_FUNC = 2962; // 0xb92
+ field public static final deprecated int GL_STENCIL_INDEX = 6401; // 0x1901
+ field public static final int GL_STENCIL_INDEX8 = 36168; // 0x8d48
+ field public static final int GL_STENCIL_PASS_DEPTH_FAIL = 2965; // 0xb95
+ field public static final int GL_STENCIL_PASS_DEPTH_PASS = 2966; // 0xb96
+ field public static final int GL_STENCIL_REF = 2967; // 0xb97
+ field public static final int GL_STENCIL_TEST = 2960; // 0xb90
+ field public static final int GL_STENCIL_VALUE_MASK = 2963; // 0xb93
+ field public static final int GL_STENCIL_WRITEMASK = 2968; // 0xb98
+ field public static final int GL_STREAM_DRAW = 35040; // 0x88e0
+ field public static final int GL_SUBPIXEL_BITS = 3408; // 0xd50
+ field public static final int GL_TEXTURE = 5890; // 0x1702
+ field public static final int GL_TEXTURE0 = 33984; // 0x84c0
+ field public static final int GL_TEXTURE1 = 33985; // 0x84c1
+ field public static final int GL_TEXTURE10 = 33994; // 0x84ca
+ field public static final int GL_TEXTURE11 = 33995; // 0x84cb
+ field public static final int GL_TEXTURE12 = 33996; // 0x84cc
+ field public static final int GL_TEXTURE13 = 33997; // 0x84cd
+ field public static final int GL_TEXTURE14 = 33998; // 0x84ce
+ field public static final int GL_TEXTURE15 = 33999; // 0x84cf
+ field public static final int GL_TEXTURE16 = 34000; // 0x84d0
+ field public static final int GL_TEXTURE17 = 34001; // 0x84d1
+ field public static final int GL_TEXTURE18 = 34002; // 0x84d2
+ field public static final int GL_TEXTURE19 = 34003; // 0x84d3
+ field public static final int GL_TEXTURE2 = 33986; // 0x84c2
+ field public static final int GL_TEXTURE20 = 34004; // 0x84d4
+ field public static final int GL_TEXTURE21 = 34005; // 0x84d5
+ field public static final int GL_TEXTURE22 = 34006; // 0x84d6
+ field public static final int GL_TEXTURE23 = 34007; // 0x84d7
+ field public static final int GL_TEXTURE24 = 34008; // 0x84d8
+ field public static final int GL_TEXTURE25 = 34009; // 0x84d9
+ field public static final int GL_TEXTURE26 = 34010; // 0x84da
+ field public static final int GL_TEXTURE27 = 34011; // 0x84db
+ field public static final int GL_TEXTURE28 = 34012; // 0x84dc
+ field public static final int GL_TEXTURE29 = 34013; // 0x84dd
+ field public static final int GL_TEXTURE3 = 33987; // 0x84c3
+ field public static final int GL_TEXTURE30 = 34014; // 0x84de
+ field public static final int GL_TEXTURE31 = 34015; // 0x84df
+ field public static final int GL_TEXTURE4 = 33988; // 0x84c4
+ field public static final int GL_TEXTURE5 = 33989; // 0x84c5
+ field public static final int GL_TEXTURE6 = 33990; // 0x84c6
+ field public static final int GL_TEXTURE7 = 33991; // 0x84c7
+ field public static final int GL_TEXTURE8 = 33992; // 0x84c8
+ field public static final int GL_TEXTURE9 = 33993; // 0x84c9
+ field public static final int GL_TEXTURE_2D = 3553; // 0xde1
+ field public static final int GL_TEXTURE_BINDING_2D = 32873; // 0x8069
+ field public static final int GL_TEXTURE_BINDING_CUBE_MAP = 34068; // 0x8514
+ field public static final int GL_TEXTURE_CUBE_MAP = 34067; // 0x8513
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 34070; // 0x8516
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 34072; // 0x8518
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 34074; // 0x851a
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 34069; // 0x8515
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 34071; // 0x8517
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 34073; // 0x8519
+ field public static final int GL_TEXTURE_MAG_FILTER = 10240; // 0x2800
+ field public static final int GL_TEXTURE_MIN_FILTER = 10241; // 0x2801
+ field public static final int GL_TEXTURE_WRAP_S = 10242; // 0x2802
+ field public static final int GL_TEXTURE_WRAP_T = 10243; // 0x2803
+ field public static final int GL_TRIANGLES = 4; // 0x4
+ field public static final int GL_TRIANGLE_FAN = 6; // 0x6
+ field public static final int GL_TRIANGLE_STRIP = 5; // 0x5
+ field public static final int GL_TRUE = 1; // 0x1
+ field public static final int GL_UNPACK_ALIGNMENT = 3317; // 0xcf5
+ field public static final int GL_UNSIGNED_BYTE = 5121; // 0x1401
+ field public static final int GL_UNSIGNED_INT = 5125; // 0x1405
+ field public static final int GL_UNSIGNED_SHORT = 5123; // 0x1403
+ field public static final int GL_UNSIGNED_SHORT_4_4_4_4 = 32819; // 0x8033
+ field public static final int GL_UNSIGNED_SHORT_5_5_5_1 = 32820; // 0x8034
+ field public static final int GL_UNSIGNED_SHORT_5_6_5 = 33635; // 0x8363
+ field public static final int GL_VALIDATE_STATUS = 35715; // 0x8b83
+ field public static final int GL_VENDOR = 7936; // 0x1f00
+ field public static final int GL_VERSION = 7938; // 0x1f02
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 34975; // 0x889f
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 34338; // 0x8622
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 34922; // 0x886a
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER = 34373; // 0x8645
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE = 34339; // 0x8623
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 34340; // 0x8624
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE = 34341; // 0x8625
+ field public static final int GL_VERTEX_SHADER = 35633; // 0x8b31
+ field public static final int GL_VIEWPORT = 2978; // 0xba2
+ field public static final int GL_ZERO = 0; // 0x0
+ }
+
+ public class GLES30 extends android.opengl.GLES20 {
+ ctor public GLES30();
+ method public static void glBeginQuery(int, int);
+ method public static void glBeginTransformFeedback(int);
+ method public static void glBindBufferBase(int, int, int);
+ method public static void glBindBufferRange(int, int, int, int, int);
+ method public static void glBindSampler(int, int);
+ method public static void glBindTransformFeedback(int, int);
+ method public static void glBindVertexArray(int);
+ method public static void glBlitFramebuffer(int, int, int, int, int, int, int, int, int, int);
+ method public static void glClearBufferfi(int, int, float, int);
+ method public static void glClearBufferfv(int, int, float[], int);
+ method public static void glClearBufferfv(int, int, java.nio.FloatBuffer);
+ method public static void glClearBufferiv(int, int, int[], int);
+ method public static void glClearBufferiv(int, int, java.nio.IntBuffer);
+ method public static void glClearBufferuiv(int, int, int[], int);
+ method public static void glClearBufferuiv(int, int, java.nio.IntBuffer);
+ method public static int glClientWaitSync(long, int, long);
+ method public static void glCompressedTexImage3D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glCompressedTexImage3D(int, int, int, int, int, int, int, int, int);
+ method public static void glCompressedTexSubImage3D(int, int, int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glCompressedTexSubImage3D(int, int, int, int, int, int, int, int, int, int, int);
+ method public static void glCopyBufferSubData(int, int, int, int, int);
+ method public static void glCopyTexSubImage3D(int, int, int, int, int, int, int, int, int);
+ method public static void glDeleteQueries(int, int[], int);
+ method public static void glDeleteQueries(int, java.nio.IntBuffer);
+ method public static void glDeleteSamplers(int, int[], int);
+ method public static void glDeleteSamplers(int, java.nio.IntBuffer);
+ method public static void glDeleteSync(long);
+ method public static void glDeleteTransformFeedbacks(int, int[], int);
+ method public static void glDeleteTransformFeedbacks(int, java.nio.IntBuffer);
+ method public static void glDeleteVertexArrays(int, int[], int);
+ method public static void glDeleteVertexArrays(int, java.nio.IntBuffer);
+ method public static void glDrawArraysInstanced(int, int, int, int);
+ method public static void glDrawBuffers(int, int[], int);
+ method public static void glDrawBuffers(int, java.nio.IntBuffer);
+ method public static void glDrawElementsInstanced(int, int, int, java.nio.Buffer, int);
+ method public static void glDrawElementsInstanced(int, int, int, int, int);
+ method public static void glDrawRangeElements(int, int, int, int, int, java.nio.Buffer);
+ method public static void glDrawRangeElements(int, int, int, int, int, int);
+ method public static void glEndQuery(int);
+ method public static void glEndTransformFeedback();
+ method public static long glFenceSync(int, int);
+ method public static void glFlushMappedBufferRange(int, int, int);
+ method public static void glFramebufferTextureLayer(int, int, int, int, int);
+ method public static void glGenQueries(int, int[], int);
+ method public static void glGenQueries(int, java.nio.IntBuffer);
+ method public static void glGenSamplers(int, int[], int);
+ method public static void glGenSamplers(int, java.nio.IntBuffer);
+ method public static void glGenTransformFeedbacks(int, int[], int);
+ method public static void glGenTransformFeedbacks(int, java.nio.IntBuffer);
+ method public static void glGenVertexArrays(int, int[], int);
+ method public static void glGenVertexArrays(int, java.nio.IntBuffer);
+ method public static void glGetActiveUniformBlockName(int, int, int, int[], int, byte[], int);
+ method public static void glGetActiveUniformBlockName(int, int, java.nio.Buffer, java.nio.Buffer);
+ method public static java.lang.String glGetActiveUniformBlockName(int, int);
+ method public static void glGetActiveUniformBlockiv(int, int, int, int[], int);
+ method public static void glGetActiveUniformBlockiv(int, int, int, java.nio.IntBuffer);
+ method public static void glGetActiveUniformsiv(int, int, int[], int, int, int[], int);
+ method public static void glGetActiveUniformsiv(int, int, java.nio.IntBuffer, int, java.nio.IntBuffer);
+ method public static void glGetBufferParameteri64v(int, int, long[], int);
+ method public static void glGetBufferParameteri64v(int, int, java.nio.LongBuffer);
+ method public static java.nio.Buffer glGetBufferPointerv(int, int);
+ method public static int glGetFragDataLocation(int, java.lang.String);
+ method public static void glGetInteger64i_v(int, int, long[], int);
+ method public static void glGetInteger64i_v(int, int, java.nio.LongBuffer);
+ method public static void glGetInteger64v(int, long[], int);
+ method public static void glGetInteger64v(int, java.nio.LongBuffer);
+ method public static void glGetIntegeri_v(int, int, int[], int);
+ method public static void glGetIntegeri_v(int, int, java.nio.IntBuffer);
+ method public static void glGetInternalformativ(int, int, int, int, int[], int);
+ method public static void glGetInternalformativ(int, int, int, int, java.nio.IntBuffer);
+ method public static void glGetProgramBinary(int, int, int[], int, int[], int, java.nio.Buffer);
+ method public static void glGetProgramBinary(int, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.Buffer);
+ method public static void glGetQueryObjectuiv(int, int, int[], int);
+ method public static void glGetQueryObjectuiv(int, int, java.nio.IntBuffer);
+ method public static void glGetQueryiv(int, int, int[], int);
+ method public static void glGetQueryiv(int, int, java.nio.IntBuffer);
+ method public static void glGetSamplerParameterfv(int, int, float[], int);
+ method public static void glGetSamplerParameterfv(int, int, java.nio.FloatBuffer);
+ method public static void glGetSamplerParameteriv(int, int, int[], int);
+ method public static void glGetSamplerParameteriv(int, int, java.nio.IntBuffer);
+ method public static java.lang.String glGetStringi(int, int);
+ method public static void glGetSynciv(long, int, int, int[], int, int[], int);
+ method public static void glGetSynciv(long, int, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static void glGetTransformFeedbackVarying(int, int, int, int[], int, int[], int, int[], int, byte[], int);
+ method public static void glGetTransformFeedbackVarying(int, int, int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, byte);
+ method public static java.lang.String glGetTransformFeedbackVarying(int, int, int[], int, int[], int);
+ method public static java.lang.String glGetTransformFeedbackVarying(int, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static int glGetUniformBlockIndex(int, java.lang.String);
+ method public static void glGetUniformIndices(int, java.lang.String[], int[], int);
+ method public static void glGetUniformIndices(int, java.lang.String[], java.nio.IntBuffer);
+ method public static void glGetUniformuiv(int, int, int[], int);
+ method public static void glGetUniformuiv(int, int, java.nio.IntBuffer);
+ method public static void glGetVertexAttribIiv(int, int, int[], int);
+ method public static void glGetVertexAttribIiv(int, int, java.nio.IntBuffer);
+ method public static void glGetVertexAttribIuiv(int, int, int[], int);
+ method public static void glGetVertexAttribIuiv(int, int, java.nio.IntBuffer);
+ method public static void glInvalidateFramebuffer(int, int, int[], int);
+ method public static void glInvalidateFramebuffer(int, int, java.nio.IntBuffer);
+ method public static void glInvalidateSubFramebuffer(int, int, int[], int, int, int, int, int);
+ method public static void glInvalidateSubFramebuffer(int, int, java.nio.IntBuffer, int, int, int, int);
+ method public static boolean glIsQuery(int);
+ method public static boolean glIsSampler(int);
+ method public static boolean glIsSync(long);
+ method public static boolean glIsTransformFeedback(int);
+ method public static boolean glIsVertexArray(int);
+ method public static java.nio.Buffer glMapBufferRange(int, int, int, int);
+ method public static void glPauseTransformFeedback();
+ method public static void glProgramBinary(int, int, java.nio.Buffer, int);
+ method public static void glProgramParameteri(int, int, int);
+ method public static void glReadBuffer(int);
+ method public static void glRenderbufferStorageMultisample(int, int, int, int, int);
+ method public static void glResumeTransformFeedback();
+ method public static void glSamplerParameterf(int, int, float);
+ method public static void glSamplerParameterfv(int, int, float[], int);
+ method public static void glSamplerParameterfv(int, int, java.nio.FloatBuffer);
+ method public static void glSamplerParameteri(int, int, int);
+ method public static void glSamplerParameteriv(int, int, int[], int);
+ method public static void glSamplerParameteriv(int, int, java.nio.IntBuffer);
+ method public static void glTexImage3D(int, int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glTexImage3D(int, int, int, int, int, int, int, int, int, int);
+ method public static void glTexStorage2D(int, int, int, int, int);
+ method public static void glTexStorage3D(int, int, int, int, int, int);
+ method public static void glTexSubImage3D(int, int, int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public static void glTexSubImage3D(int, int, int, int, int, int, int, int, int, int, int);
+ method public static void glTransformFeedbackVaryings(int, java.lang.String[], int);
+ method public static void glUniform1ui(int, int);
+ method public static void glUniform1uiv(int, int, int[], int);
+ method public static void glUniform1uiv(int, int, java.nio.IntBuffer);
+ method public static void glUniform2ui(int, int, int);
+ method public static void glUniform2uiv(int, int, int[], int);
+ method public static void glUniform2uiv(int, int, java.nio.IntBuffer);
+ method public static void glUniform3ui(int, int, int, int);
+ method public static void glUniform3uiv(int, int, int[], int);
+ method public static void glUniform3uiv(int, int, java.nio.IntBuffer);
+ method public static void glUniform4ui(int, int, int, int, int);
+ method public static void glUniform4uiv(int, int, int[], int);
+ method public static void glUniform4uiv(int, int, java.nio.IntBuffer);
+ method public static void glUniformBlockBinding(int, int, int);
+ method public static void glUniformMatrix2x3fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix2x3fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix2x4fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix2x4fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix3x2fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix3x2fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix3x4fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix3x4fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix4x2fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix4x2fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static void glUniformMatrix4x3fv(int, int, boolean, float[], int);
+ method public static void glUniformMatrix4x3fv(int, int, boolean, java.nio.FloatBuffer);
+ method public static boolean glUnmapBuffer(int);
+ method public static void glVertexAttribDivisor(int, int);
+ method public static void glVertexAttribI4i(int, int, int, int, int);
+ method public static void glVertexAttribI4iv(int, int[], int);
+ method public static void glVertexAttribI4iv(int, java.nio.IntBuffer);
+ method public static void glVertexAttribI4ui(int, int, int, int, int);
+ method public static void glVertexAttribI4uiv(int, int[], int);
+ method public static void glVertexAttribI4uiv(int, java.nio.IntBuffer);
+ method public static void glVertexAttribIPointer(int, int, int, int, java.nio.Buffer);
+ method public static void glVertexAttribIPointer(int, int, int, int, int);
+ method public static void glWaitSync(long, int, long);
+ field public static final int GL_ACTIVE_UNIFORM_BLOCKS = 35382; // 0x8a36
+ field public static final int GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH = 35381; // 0x8a35
+ field public static final int GL_ALREADY_SIGNALED = 37146; // 0x911a
+ field public static final int GL_ANY_SAMPLES_PASSED = 35887; // 0x8c2f
+ field public static final int GL_ANY_SAMPLES_PASSED_CONSERVATIVE = 36202; // 0x8d6a
+ field public static final int GL_BLUE = 6405; // 0x1905
+ field public static final int GL_BUFFER_ACCESS_FLAGS = 37151; // 0x911f
+ field public static final int GL_BUFFER_MAPPED = 35004; // 0x88bc
+ field public static final int GL_BUFFER_MAP_LENGTH = 37152; // 0x9120
+ field public static final int GL_BUFFER_MAP_OFFSET = 37153; // 0x9121
+ field public static final int GL_BUFFER_MAP_POINTER = 35005; // 0x88bd
+ field public static final int GL_COLOR = 6144; // 0x1800
+ field public static final int GL_COLOR_ATTACHMENT1 = 36065; // 0x8ce1
+ field public static final int GL_COLOR_ATTACHMENT10 = 36074; // 0x8cea
+ field public static final int GL_COLOR_ATTACHMENT11 = 36075; // 0x8ceb
+ field public static final int GL_COLOR_ATTACHMENT12 = 36076; // 0x8cec
+ field public static final int GL_COLOR_ATTACHMENT13 = 36077; // 0x8ced
+ field public static final int GL_COLOR_ATTACHMENT14 = 36078; // 0x8cee
+ field public static final int GL_COLOR_ATTACHMENT15 = 36079; // 0x8cef
+ field public static final int GL_COLOR_ATTACHMENT2 = 36066; // 0x8ce2
+ field public static final int GL_COLOR_ATTACHMENT3 = 36067; // 0x8ce3
+ field public static final int GL_COLOR_ATTACHMENT4 = 36068; // 0x8ce4
+ field public static final int GL_COLOR_ATTACHMENT5 = 36069; // 0x8ce5
+ field public static final int GL_COLOR_ATTACHMENT6 = 36070; // 0x8ce6
+ field public static final int GL_COLOR_ATTACHMENT7 = 36071; // 0x8ce7
+ field public static final int GL_COLOR_ATTACHMENT8 = 36072; // 0x8ce8
+ field public static final int GL_COLOR_ATTACHMENT9 = 36073; // 0x8ce9
+ field public static final int GL_COMPARE_REF_TO_TEXTURE = 34894; // 0x884e
+ field public static final int GL_COMPRESSED_R11_EAC = 37488; // 0x9270
+ field public static final int GL_COMPRESSED_RG11_EAC = 37490; // 0x9272
+ field public static final int GL_COMPRESSED_RGB8_ETC2 = 37492; // 0x9274
+ field public static final int GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 37494; // 0x9276
+ field public static final int GL_COMPRESSED_RGBA8_ETC2_EAC = 37496; // 0x9278
+ field public static final int GL_COMPRESSED_SIGNED_R11_EAC = 37489; // 0x9271
+ field public static final int GL_COMPRESSED_SIGNED_RG11_EAC = 37491; // 0x9273
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC = 37497; // 0x9279
+ field public static final int GL_COMPRESSED_SRGB8_ETC2 = 37493; // 0x9275
+ field public static final int GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 = 37495; // 0x9277
+ field public static final int GL_CONDITION_SATISFIED = 37148; // 0x911c
+ field public static final int GL_COPY_READ_BUFFER = 36662; // 0x8f36
+ field public static final int GL_COPY_READ_BUFFER_BINDING = 36662; // 0x8f36
+ field public static final int GL_COPY_WRITE_BUFFER = 36663; // 0x8f37
+ field public static final int GL_COPY_WRITE_BUFFER_BINDING = 36663; // 0x8f37
+ field public static final int GL_CURRENT_QUERY = 34917; // 0x8865
+ field public static final int GL_DEPTH = 6145; // 0x1801
+ field public static final int GL_DEPTH24_STENCIL8 = 35056; // 0x88f0
+ field public static final int GL_DEPTH32F_STENCIL8 = 36013; // 0x8cad
+ field public static final int GL_DEPTH_COMPONENT24 = 33190; // 0x81a6
+ field public static final int GL_DEPTH_COMPONENT32F = 36012; // 0x8cac
+ field public static final int GL_DEPTH_STENCIL = 34041; // 0x84f9
+ field public static final int GL_DEPTH_STENCIL_ATTACHMENT = 33306; // 0x821a
+ field public static final int GL_DRAW_BUFFER0 = 34853; // 0x8825
+ field public static final int GL_DRAW_BUFFER1 = 34854; // 0x8826
+ field public static final int GL_DRAW_BUFFER10 = 34863; // 0x882f
+ field public static final int GL_DRAW_BUFFER11 = 34864; // 0x8830
+ field public static final int GL_DRAW_BUFFER12 = 34865; // 0x8831
+ field public static final int GL_DRAW_BUFFER13 = 34866; // 0x8832
+ field public static final int GL_DRAW_BUFFER14 = 34867; // 0x8833
+ field public static final int GL_DRAW_BUFFER15 = 34868; // 0x8834
+ field public static final int GL_DRAW_BUFFER2 = 34855; // 0x8827
+ field public static final int GL_DRAW_BUFFER3 = 34856; // 0x8828
+ field public static final int GL_DRAW_BUFFER4 = 34857; // 0x8829
+ field public static final int GL_DRAW_BUFFER5 = 34858; // 0x882a
+ field public static final int GL_DRAW_BUFFER6 = 34859; // 0x882b
+ field public static final int GL_DRAW_BUFFER7 = 34860; // 0x882c
+ field public static final int GL_DRAW_BUFFER8 = 34861; // 0x882d
+ field public static final int GL_DRAW_BUFFER9 = 34862; // 0x882e
+ field public static final int GL_DRAW_FRAMEBUFFER = 36009; // 0x8ca9
+ field public static final int GL_DRAW_FRAMEBUFFER_BINDING = 36006; // 0x8ca6
+ field public static final int GL_DYNAMIC_COPY = 35050; // 0x88ea
+ field public static final int GL_DYNAMIC_READ = 35049; // 0x88e9
+ field public static final int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 36269; // 0x8dad
+ field public static final int GL_FLOAT_MAT2x3 = 35685; // 0x8b65
+ field public static final int GL_FLOAT_MAT2x4 = 35686; // 0x8b66
+ field public static final int GL_FLOAT_MAT3x2 = 35687; // 0x8b67
+ field public static final int GL_FLOAT_MAT3x4 = 35688; // 0x8b68
+ field public static final int GL_FLOAT_MAT4x2 = 35689; // 0x8b69
+ field public static final int GL_FLOAT_MAT4x3 = 35690; // 0x8b6a
+ field public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 35723; // 0x8b8b
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE = 33301; // 0x8215
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE = 33300; // 0x8214
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING = 33296; // 0x8210
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE = 33297; // 0x8211
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE = 33302; // 0x8216
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE = 33299; // 0x8213
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE = 33298; // 0x8212
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE = 33303; // 0x8217
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER = 36052; // 0x8cd4
+ field public static final int GL_FRAMEBUFFER_DEFAULT = 33304; // 0x8218
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 36182; // 0x8d56
+ field public static final int GL_FRAMEBUFFER_UNDEFINED = 33305; // 0x8219
+ field public static final int GL_GREEN = 6404; // 0x1904
+ field public static final int GL_HALF_FLOAT = 5131; // 0x140b
+ field public static final int GL_INTERLEAVED_ATTRIBS = 35980; // 0x8c8c
+ field public static final int GL_INT_2_10_10_10_REV = 36255; // 0x8d9f
+ field public static final int GL_INT_SAMPLER_2D = 36298; // 0x8dca
+ field public static final int GL_INT_SAMPLER_2D_ARRAY = 36303; // 0x8dcf
+ field public static final int GL_INT_SAMPLER_3D = 36299; // 0x8dcb
+ field public static final int GL_INT_SAMPLER_CUBE = 36300; // 0x8dcc
+ field public static final int GL_INVALID_INDEX = -1; // 0xffffffff
+ field public static final int GL_MAJOR_VERSION = 33307; // 0x821b
+ field public static final int GL_MAP_FLUSH_EXPLICIT_BIT = 16; // 0x10
+ field public static final int GL_MAP_INVALIDATE_BUFFER_BIT = 8; // 0x8
+ field public static final int GL_MAP_INVALIDATE_RANGE_BIT = 4; // 0x4
+ field public static final int GL_MAP_READ_BIT = 1; // 0x1
+ field public static final int GL_MAP_UNSYNCHRONIZED_BIT = 32; // 0x20
+ field public static final int GL_MAP_WRITE_BIT = 2; // 0x2
+ field public static final int GL_MAX = 32776; // 0x8008
+ field public static final int GL_MAX_3D_TEXTURE_SIZE = 32883; // 0x8073
+ field public static final int GL_MAX_ARRAY_TEXTURE_LAYERS = 35071; // 0x88ff
+ field public static final int GL_MAX_COLOR_ATTACHMENTS = 36063; // 0x8cdf
+ field public static final int GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS = 35379; // 0x8a33
+ field public static final int GL_MAX_COMBINED_UNIFORM_BLOCKS = 35374; // 0x8a2e
+ field public static final int GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS = 35377; // 0x8a31
+ field public static final int GL_MAX_DRAW_BUFFERS = 34852; // 0x8824
+ field public static final int GL_MAX_ELEMENTS_INDICES = 33001; // 0x80e9
+ field public static final int GL_MAX_ELEMENTS_VERTICES = 33000; // 0x80e8
+ field public static final int GL_MAX_ELEMENT_INDEX = 36203; // 0x8d6b
+ field public static final int GL_MAX_FRAGMENT_INPUT_COMPONENTS = 37157; // 0x9125
+ field public static final int GL_MAX_FRAGMENT_UNIFORM_BLOCKS = 35373; // 0x8a2d
+ field public static final int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 35657; // 0x8b49
+ field public static final int GL_MAX_PROGRAM_TEXEL_OFFSET = 35077; // 0x8905
+ field public static final int GL_MAX_SAMPLES = 36183; // 0x8d57
+ field public static final int GL_MAX_SERVER_WAIT_TIMEOUT = 37137; // 0x9111
+ field public static final int GL_MAX_TEXTURE_LOD_BIAS = 34045; // 0x84fd
+ field public static final int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 35978; // 0x8c8a
+ field public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 35979; // 0x8c8b
+ field public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS = 35968; // 0x8c80
+ field public static final int GL_MAX_UNIFORM_BLOCK_SIZE = 35376; // 0x8a30
+ field public static final int GL_MAX_UNIFORM_BUFFER_BINDINGS = 35375; // 0x8a2f
+ field public static final int GL_MAX_VARYING_COMPONENTS = 35659; // 0x8b4b
+ field public static final int GL_MAX_VERTEX_OUTPUT_COMPONENTS = 37154; // 0x9122
+ field public static final int GL_MAX_VERTEX_UNIFORM_BLOCKS = 35371; // 0x8a2b
+ field public static final int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 35658; // 0x8b4a
+ field public static final int GL_MIN = 32775; // 0x8007
+ field public static final int GL_MINOR_VERSION = 33308; // 0x821c
+ field public static final int GL_MIN_PROGRAM_TEXEL_OFFSET = 35076; // 0x8904
+ field public static final int GL_NUM_EXTENSIONS = 33309; // 0x821d
+ field public static final int GL_NUM_PROGRAM_BINARY_FORMATS = 34814; // 0x87fe
+ field public static final int GL_NUM_SAMPLE_COUNTS = 37760; // 0x9380
+ field public static final int GL_OBJECT_TYPE = 37138; // 0x9112
+ field public static final int GL_PACK_ROW_LENGTH = 3330; // 0xd02
+ field public static final int GL_PACK_SKIP_PIXELS = 3332; // 0xd04
+ field public static final int GL_PACK_SKIP_ROWS = 3331; // 0xd03
+ field public static final int GL_PIXEL_PACK_BUFFER = 35051; // 0x88eb
+ field public static final int GL_PIXEL_PACK_BUFFER_BINDING = 35053; // 0x88ed
+ field public static final int GL_PIXEL_UNPACK_BUFFER = 35052; // 0x88ec
+ field public static final int GL_PIXEL_UNPACK_BUFFER_BINDING = 35055; // 0x88ef
+ field public static final int GL_PRIMITIVE_RESTART_FIXED_INDEX = 36201; // 0x8d69
+ field public static final int GL_PROGRAM_BINARY_FORMATS = 34815; // 0x87ff
+ field public static final int GL_PROGRAM_BINARY_LENGTH = 34625; // 0x8741
+ field public static final int GL_PROGRAM_BINARY_RETRIEVABLE_HINT = 33367; // 0x8257
+ field public static final int GL_QUERY_RESULT = 34918; // 0x8866
+ field public static final int GL_QUERY_RESULT_AVAILABLE = 34919; // 0x8867
+ field public static final int GL_R11F_G11F_B10F = 35898; // 0x8c3a
+ field public static final int GL_R16F = 33325; // 0x822d
+ field public static final int GL_R16I = 33331; // 0x8233
+ field public static final int GL_R16UI = 33332; // 0x8234
+ field public static final int GL_R32F = 33326; // 0x822e
+ field public static final int GL_R32I = 33333; // 0x8235
+ field public static final int GL_R32UI = 33334; // 0x8236
+ field public static final int GL_R8 = 33321; // 0x8229
+ field public static final int GL_R8I = 33329; // 0x8231
+ field public static final int GL_R8UI = 33330; // 0x8232
+ field public static final int GL_R8_SNORM = 36756; // 0x8f94
+ field public static final int GL_RASTERIZER_DISCARD = 35977; // 0x8c89
+ field public static final int GL_READ_BUFFER = 3074; // 0xc02
+ field public static final int GL_READ_FRAMEBUFFER = 36008; // 0x8ca8
+ field public static final int GL_READ_FRAMEBUFFER_BINDING = 36010; // 0x8caa
+ field public static final int GL_RED = 6403; // 0x1903
+ field public static final int GL_RED_INTEGER = 36244; // 0x8d94
+ field public static final int GL_RENDERBUFFER_SAMPLES = 36011; // 0x8cab
+ field public static final int GL_RG = 33319; // 0x8227
+ field public static final int GL_RG16F = 33327; // 0x822f
+ field public static final int GL_RG16I = 33337; // 0x8239
+ field public static final int GL_RG16UI = 33338; // 0x823a
+ field public static final int GL_RG32F = 33328; // 0x8230
+ field public static final int GL_RG32I = 33339; // 0x823b
+ field public static final int GL_RG32UI = 33340; // 0x823c
+ field public static final int GL_RG8 = 33323; // 0x822b
+ field public static final int GL_RG8I = 33335; // 0x8237
+ field public static final int GL_RG8UI = 33336; // 0x8238
+ field public static final int GL_RG8_SNORM = 36757; // 0x8f95
+ field public static final int GL_RGB10_A2 = 32857; // 0x8059
+ field public static final int GL_RGB10_A2UI = 36975; // 0x906f
+ field public static final int GL_RGB16F = 34843; // 0x881b
+ field public static final int GL_RGB16I = 36233; // 0x8d89
+ field public static final int GL_RGB16UI = 36215; // 0x8d77
+ field public static final int GL_RGB32F = 34837; // 0x8815
+ field public static final int GL_RGB32I = 36227; // 0x8d83
+ field public static final int GL_RGB32UI = 36209; // 0x8d71
+ field public static final int GL_RGB8 = 32849; // 0x8051
+ field public static final int GL_RGB8I = 36239; // 0x8d8f
+ field public static final int GL_RGB8UI = 36221; // 0x8d7d
+ field public static final int GL_RGB8_SNORM = 36758; // 0x8f96
+ field public static final int GL_RGB9_E5 = 35901; // 0x8c3d
+ field public static final int GL_RGBA16F = 34842; // 0x881a
+ field public static final int GL_RGBA16I = 36232; // 0x8d88
+ field public static final int GL_RGBA16UI = 36214; // 0x8d76
+ field public static final int GL_RGBA32F = 34836; // 0x8814
+ field public static final int GL_RGBA32I = 36226; // 0x8d82
+ field public static final int GL_RGBA32UI = 36208; // 0x8d70
+ field public static final int GL_RGBA8 = 32856; // 0x8058
+ field public static final int GL_RGBA8I = 36238; // 0x8d8e
+ field public static final int GL_RGBA8UI = 36220; // 0x8d7c
+ field public static final int GL_RGBA8_SNORM = 36759; // 0x8f97
+ field public static final int GL_RGBA_INTEGER = 36249; // 0x8d99
+ field public static final int GL_RGB_INTEGER = 36248; // 0x8d98
+ field public static final int GL_RG_INTEGER = 33320; // 0x8228
+ field public static final int GL_SAMPLER_2D_ARRAY = 36289; // 0x8dc1
+ field public static final int GL_SAMPLER_2D_ARRAY_SHADOW = 36292; // 0x8dc4
+ field public static final int GL_SAMPLER_2D_SHADOW = 35682; // 0x8b62
+ field public static final int GL_SAMPLER_3D = 35679; // 0x8b5f
+ field public static final int GL_SAMPLER_BINDING = 35097; // 0x8919
+ field public static final int GL_SAMPLER_CUBE_SHADOW = 36293; // 0x8dc5
+ field public static final int GL_SEPARATE_ATTRIBS = 35981; // 0x8c8d
+ field public static final int GL_SIGNALED = 37145; // 0x9119
+ field public static final int GL_SIGNED_NORMALIZED = 36764; // 0x8f9c
+ field public static final int GL_SRGB = 35904; // 0x8c40
+ field public static final int GL_SRGB8 = 35905; // 0x8c41
+ field public static final int GL_SRGB8_ALPHA8 = 35907; // 0x8c43
+ field public static final int GL_STATIC_COPY = 35046; // 0x88e6
+ field public static final int GL_STATIC_READ = 35045; // 0x88e5
+ field public static final int GL_STENCIL = 6146; // 0x1802
+ field public static final int GL_STREAM_COPY = 35042; // 0x88e2
+ field public static final int GL_STREAM_READ = 35041; // 0x88e1
+ field public static final int GL_SYNC_CONDITION = 37139; // 0x9113
+ field public static final int GL_SYNC_FENCE = 37142; // 0x9116
+ field public static final int GL_SYNC_FLAGS = 37141; // 0x9115
+ field public static final int GL_SYNC_FLUSH_COMMANDS_BIT = 1; // 0x1
+ field public static final int GL_SYNC_GPU_COMMANDS_COMPLETE = 37143; // 0x9117
+ field public static final int GL_SYNC_STATUS = 37140; // 0x9114
+ field public static final int GL_TEXTURE_2D_ARRAY = 35866; // 0x8c1a
+ field public static final int GL_TEXTURE_3D = 32879; // 0x806f
+ field public static final int GL_TEXTURE_BASE_LEVEL = 33084; // 0x813c
+ field public static final int GL_TEXTURE_BINDING_2D_ARRAY = 35869; // 0x8c1d
+ field public static final int GL_TEXTURE_BINDING_3D = 32874; // 0x806a
+ field public static final int GL_TEXTURE_COMPARE_FUNC = 34893; // 0x884d
+ field public static final int GL_TEXTURE_COMPARE_MODE = 34892; // 0x884c
+ field public static final int GL_TEXTURE_IMMUTABLE_FORMAT = 37167; // 0x912f
+ field public static final int GL_TEXTURE_IMMUTABLE_LEVELS = 33503; // 0x82df
+ field public static final int GL_TEXTURE_MAX_LEVEL = 33085; // 0x813d
+ field public static final int GL_TEXTURE_MAX_LOD = 33083; // 0x813b
+ field public static final int GL_TEXTURE_MIN_LOD = 33082; // 0x813a
+ field public static final int GL_TEXTURE_SWIZZLE_A = 36421; // 0x8e45
+ field public static final int GL_TEXTURE_SWIZZLE_B = 36420; // 0x8e44
+ field public static final int GL_TEXTURE_SWIZZLE_G = 36419; // 0x8e43
+ field public static final int GL_TEXTURE_SWIZZLE_R = 36418; // 0x8e42
+ field public static final int GL_TEXTURE_WRAP_R = 32882; // 0x8072
+ field public static final int GL_TIMEOUT_EXPIRED = 37147; // 0x911b
+ field public static final long GL_TIMEOUT_IGNORED = -1L; // 0xffffffffffffffffL
+ field public static final int GL_TRANSFORM_FEEDBACK = 36386; // 0x8e22
+ field public static final int GL_TRANSFORM_FEEDBACK_ACTIVE = 36388; // 0x8e24
+ field public static final int GL_TRANSFORM_FEEDBACK_BINDING = 36389; // 0x8e25
+ field public static final int GL_TRANSFORM_FEEDBACK_BUFFER = 35982; // 0x8c8e
+ field public static final int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING = 35983; // 0x8c8f
+ field public static final int GL_TRANSFORM_FEEDBACK_BUFFER_MODE = 35967; // 0x8c7f
+ field public static final int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE = 35973; // 0x8c85
+ field public static final int GL_TRANSFORM_FEEDBACK_BUFFER_START = 35972; // 0x8c84
+ field public static final int GL_TRANSFORM_FEEDBACK_PAUSED = 36387; // 0x8e23
+ field public static final int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 35976; // 0x8c88
+ field public static final int GL_TRANSFORM_FEEDBACK_VARYINGS = 35971; // 0x8c83
+ field public static final int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH = 35958; // 0x8c76
+ field public static final int GL_UNIFORM_ARRAY_STRIDE = 35388; // 0x8a3c
+ field public static final int GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 35394; // 0x8a42
+ field public static final int GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 35395; // 0x8a43
+ field public static final int GL_UNIFORM_BLOCK_BINDING = 35391; // 0x8a3f
+ field public static final int GL_UNIFORM_BLOCK_DATA_SIZE = 35392; // 0x8a40
+ field public static final int GL_UNIFORM_BLOCK_INDEX = 35386; // 0x8a3a
+ field public static final int GL_UNIFORM_BLOCK_NAME_LENGTH = 35393; // 0x8a41
+ field public static final int GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 35398; // 0x8a46
+ field public static final int GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 35396; // 0x8a44
+ field public static final int GL_UNIFORM_BUFFER = 35345; // 0x8a11
+ field public static final int GL_UNIFORM_BUFFER_BINDING = 35368; // 0x8a28
+ field public static final int GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT = 35380; // 0x8a34
+ field public static final int GL_UNIFORM_BUFFER_SIZE = 35370; // 0x8a2a
+ field public static final int GL_UNIFORM_BUFFER_START = 35369; // 0x8a29
+ field public static final int GL_UNIFORM_IS_ROW_MAJOR = 35390; // 0x8a3e
+ field public static final int GL_UNIFORM_MATRIX_STRIDE = 35389; // 0x8a3d
+ field public static final int GL_UNIFORM_NAME_LENGTH = 35385; // 0x8a39
+ field public static final int GL_UNIFORM_OFFSET = 35387; // 0x8a3b
+ field public static final int GL_UNIFORM_SIZE = 35384; // 0x8a38
+ field public static final int GL_UNIFORM_TYPE = 35383; // 0x8a37
+ field public static final int GL_UNPACK_IMAGE_HEIGHT = 32878; // 0x806e
+ field public static final int GL_UNPACK_ROW_LENGTH = 3314; // 0xcf2
+ field public static final int GL_UNPACK_SKIP_IMAGES = 32877; // 0x806d
+ field public static final int GL_UNPACK_SKIP_PIXELS = 3316; // 0xcf4
+ field public static final int GL_UNPACK_SKIP_ROWS = 3315; // 0xcf3
+ field public static final int GL_UNSIGNALED = 37144; // 0x9118
+ field public static final int GL_UNSIGNED_INT_10F_11F_11F_REV = 35899; // 0x8c3b
+ field public static final int GL_UNSIGNED_INT_24_8 = 34042; // 0x84fa
+ field public static final int GL_UNSIGNED_INT_2_10_10_10_REV = 33640; // 0x8368
+ field public static final int GL_UNSIGNED_INT_5_9_9_9_REV = 35902; // 0x8c3e
+ field public static final int GL_UNSIGNED_INT_SAMPLER_2D = 36306; // 0x8dd2
+ field public static final int GL_UNSIGNED_INT_SAMPLER_2D_ARRAY = 36311; // 0x8dd7
+ field public static final int GL_UNSIGNED_INT_SAMPLER_3D = 36307; // 0x8dd3
+ field public static final int GL_UNSIGNED_INT_SAMPLER_CUBE = 36308; // 0x8dd4
+ field public static final int GL_UNSIGNED_INT_VEC2 = 36294; // 0x8dc6
+ field public static final int GL_UNSIGNED_INT_VEC3 = 36295; // 0x8dc7
+ field public static final int GL_UNSIGNED_INT_VEC4 = 36296; // 0x8dc8
+ field public static final int GL_UNSIGNED_NORMALIZED = 35863; // 0x8c17
+ field public static final int GL_VERTEX_ARRAY_BINDING = 34229; // 0x85b5
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 35070; // 0x88fe
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_INTEGER = 35069; // 0x88fd
+ field public static final int GL_WAIT_FAILED = 37149; // 0x911d
+ }
+
+ public class GLES31 extends android.opengl.GLES30 {
+ method public static void glActiveShaderProgram(int, int);
+ method public static void glBindImageTexture(int, int, int, boolean, int, int, int);
+ method public static void glBindProgramPipeline(int);
+ method public static void glBindVertexBuffer(int, int, long, int);
+ method public static int glCreateShaderProgramv(int, java.lang.String[]);
+ method public static void glDeleteProgramPipelines(int, int[], int);
+ method public static void glDeleteProgramPipelines(int, java.nio.IntBuffer);
+ method public static void glDispatchCompute(int, int, int);
+ method public static void glDispatchComputeIndirect(long);
+ method public static void glDrawArraysIndirect(int, long);
+ method public static void glDrawElementsIndirect(int, int, long);
+ method public static void glFramebufferParameteri(int, int, int);
+ method public static void glGenProgramPipelines(int, int[], int);
+ method public static void glGenProgramPipelines(int, java.nio.IntBuffer);
+ method public static void glGetBooleani_v(int, int, boolean[], int);
+ method public static void glGetBooleani_v(int, int, java.nio.IntBuffer);
+ method public static void glGetFramebufferParameteriv(int, int, int[], int);
+ method public static void glGetFramebufferParameteriv(int, int, java.nio.IntBuffer);
+ method public static void glGetMultisamplefv(int, int, float[], int);
+ method public static void glGetMultisamplefv(int, int, java.nio.FloatBuffer);
+ method public static void glGetProgramInterfaceiv(int, int, int, int[], int);
+ method public static void glGetProgramInterfaceiv(int, int, int, java.nio.IntBuffer);
+ method public static java.lang.String glGetProgramPipelineInfoLog(int);
+ method public static void glGetProgramPipelineiv(int, int, int[], int);
+ method public static void glGetProgramPipelineiv(int, int, java.nio.IntBuffer);
+ method public static int glGetProgramResourceIndex(int, int, java.lang.String);
+ method public static int glGetProgramResourceLocation(int, int, java.lang.String);
+ method public static java.lang.String glGetProgramResourceName(int, int, int);
+ method public static void glGetProgramResourceiv(int, int, int, int, int[], int, int, int[], int, int[], int);
+ method public static void glGetProgramResourceiv(int, int, int, int, java.nio.IntBuffer, int, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static void glGetTexLevelParameterfv(int, int, int, float[], int);
+ method public static void glGetTexLevelParameterfv(int, int, int, java.nio.FloatBuffer);
+ method public static void glGetTexLevelParameteriv(int, int, int, int[], int);
+ method public static void glGetTexLevelParameteriv(int, int, int, java.nio.IntBuffer);
+ method public static boolean glIsProgramPipeline(int);
+ method public static void glMemoryBarrier(int);
+ method public static void glMemoryBarrierByRegion(int);
+ method public static void glProgramUniform1f(int, int, float);
+ method public static void glProgramUniform1fv(int, int, int, float[], int);
+ method public static void glProgramUniform1fv(int, int, int, java.nio.FloatBuffer);
+ method public static void glProgramUniform1i(int, int, int);
+ method public static void glProgramUniform1iv(int, int, int, int[], int);
+ method public static void glProgramUniform1iv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform1ui(int, int, int);
+ method public static void glProgramUniform1uiv(int, int, int, int[], int);
+ method public static void glProgramUniform1uiv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform2f(int, int, float, float);
+ method public static void glProgramUniform2fv(int, int, int, float[], int);
+ method public static void glProgramUniform2fv(int, int, int, java.nio.FloatBuffer);
+ method public static void glProgramUniform2i(int, int, int, int);
+ method public static void glProgramUniform2iv(int, int, int, int[], int);
+ method public static void glProgramUniform2iv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform2ui(int, int, int, int);
+ method public static void glProgramUniform2uiv(int, int, int, int[], int);
+ method public static void glProgramUniform2uiv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform3f(int, int, float, float, float);
+ method public static void glProgramUniform3fv(int, int, int, float[], int);
+ method public static void glProgramUniform3fv(int, int, int, java.nio.FloatBuffer);
+ method public static void glProgramUniform3i(int, int, int, int, int);
+ method public static void glProgramUniform3iv(int, int, int, int[], int);
+ method public static void glProgramUniform3iv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform3ui(int, int, int, int, int);
+ method public static void glProgramUniform3uiv(int, int, int, int[], int);
+ method public static void glProgramUniform3uiv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform4f(int, int, float, float, float, float);
+ method public static void glProgramUniform4fv(int, int, int, float[], int);
+ method public static void glProgramUniform4fv(int, int, int, java.nio.FloatBuffer);
+ method public static void glProgramUniform4i(int, int, int, int, int, int);
+ method public static void glProgramUniform4iv(int, int, int, int[], int);
+ method public static void glProgramUniform4iv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniform4ui(int, int, int, int, int, int);
+ method public static void glProgramUniform4uiv(int, int, int, int[], int);
+ method public static void glProgramUniform4uiv(int, int, int, java.nio.IntBuffer);
+ method public static void glProgramUniformMatrix2fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix2fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix2x3fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix2x3fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix2x4fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix2x4fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix3fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix3fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix3x2fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix3x2fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix3x4fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix3x4fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix4fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix4fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix4x2fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix4x2fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glProgramUniformMatrix4x3fv(int, int, int, boolean, float[], int);
+ method public static void glProgramUniformMatrix4x3fv(int, int, int, boolean, java.nio.FloatBuffer);
+ method public static void glSampleMaski(int, int);
+ method public static void glTexStorage2DMultisample(int, int, int, int, int, boolean);
+ method public static void glUseProgramStages(int, int, int);
+ method public static void glValidateProgramPipeline(int);
+ method public static void glVertexAttribBinding(int, int);
+ method public static void glVertexAttribFormat(int, int, int, boolean, int);
+ method public static void glVertexAttribIFormat(int, int, int, int);
+ method public static void glVertexBindingDivisor(int, int);
+ field public static final int GL_ACTIVE_ATOMIC_COUNTER_BUFFERS = 37593; // 0x92d9
+ field public static final int GL_ACTIVE_PROGRAM = 33369; // 0x8259
+ field public static final int GL_ACTIVE_RESOURCES = 37621; // 0x92f5
+ field public static final int GL_ACTIVE_VARIABLES = 37637; // 0x9305
+ field public static final int GL_ALL_BARRIER_BITS = -1; // 0xffffffff
+ field public static final int GL_ALL_SHADER_BITS = -1; // 0xffffffff
+ field public static final int GL_ARRAY_SIZE = 37627; // 0x92fb
+ field public static final int GL_ARRAY_STRIDE = 37630; // 0x92fe
+ field public static final int GL_ATOMIC_COUNTER_BARRIER_BIT = 4096; // 0x1000
+ field public static final int GL_ATOMIC_COUNTER_BUFFER = 37568; // 0x92c0
+ field public static final int GL_ATOMIC_COUNTER_BUFFER_BINDING = 37569; // 0x92c1
+ field public static final int GL_ATOMIC_COUNTER_BUFFER_INDEX = 37633; // 0x9301
+ field public static final int GL_ATOMIC_COUNTER_BUFFER_SIZE = 37571; // 0x92c3
+ field public static final int GL_ATOMIC_COUNTER_BUFFER_START = 37570; // 0x92c2
+ field public static final int GL_BLOCK_INDEX = 37629; // 0x92fd
+ field public static final int GL_BUFFER_BINDING = 37634; // 0x9302
+ field public static final int GL_BUFFER_DATA_SIZE = 37635; // 0x9303
+ field public static final int GL_BUFFER_UPDATE_BARRIER_BIT = 512; // 0x200
+ field public static final int GL_BUFFER_VARIABLE = 37605; // 0x92e5
+ field public static final int GL_COMMAND_BARRIER_BIT = 64; // 0x40
+ field public static final int GL_COMPUTE_SHADER = 37305; // 0x91b9
+ field public static final int GL_COMPUTE_SHADER_BIT = 32; // 0x20
+ field public static final int GL_COMPUTE_WORK_GROUP_SIZE = 33383; // 0x8267
+ field public static final int GL_DEPTH_STENCIL_TEXTURE_MODE = 37098; // 0x90ea
+ field public static final int GL_DISPATCH_INDIRECT_BUFFER = 37102; // 0x90ee
+ field public static final int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 37103; // 0x90ef
+ field public static final int GL_DRAW_INDIRECT_BUFFER = 36671; // 0x8f3f
+ field public static final int GL_DRAW_INDIRECT_BUFFER_BINDING = 36675; // 0x8f43
+ field public static final int GL_ELEMENT_ARRAY_BARRIER_BIT = 2; // 0x2
+ field public static final int GL_FRAGMENT_SHADER_BIT = 2; // 0x2
+ field public static final int GL_FRAMEBUFFER_BARRIER_BIT = 1024; // 0x400
+ field public static final int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 37652; // 0x9314
+ field public static final int GL_FRAMEBUFFER_DEFAULT_HEIGHT = 37649; // 0x9311
+ field public static final int GL_FRAMEBUFFER_DEFAULT_SAMPLES = 37651; // 0x9313
+ field public static final int GL_FRAMEBUFFER_DEFAULT_WIDTH = 37648; // 0x9310
+ field public static final int GL_IMAGE_2D = 36941; // 0x904d
+ field public static final int GL_IMAGE_2D_ARRAY = 36947; // 0x9053
+ field public static final int GL_IMAGE_3D = 36942; // 0x904e
+ field public static final int GL_IMAGE_BINDING_ACCESS = 36670; // 0x8f3e
+ field public static final int GL_IMAGE_BINDING_FORMAT = 36974; // 0x906e
+ field public static final int GL_IMAGE_BINDING_LAYER = 36669; // 0x8f3d
+ field public static final int GL_IMAGE_BINDING_LAYERED = 36668; // 0x8f3c
+ field public static final int GL_IMAGE_BINDING_LEVEL = 36667; // 0x8f3b
+ field public static final int GL_IMAGE_BINDING_NAME = 36666; // 0x8f3a
+ field public static final int GL_IMAGE_CUBE = 36944; // 0x9050
+ field public static final int GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS = 37065; // 0x90c9
+ field public static final int GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE = 37064; // 0x90c8
+ field public static final int GL_IMAGE_FORMAT_COMPATIBILITY_TYPE = 37063; // 0x90c7
+ field public static final int GL_INT_IMAGE_2D = 36952; // 0x9058
+ field public static final int GL_INT_IMAGE_2D_ARRAY = 36958; // 0x905e
+ field public static final int GL_INT_IMAGE_3D = 36953; // 0x9059
+ field public static final int GL_INT_IMAGE_CUBE = 36955; // 0x905b
+ field public static final int GL_INT_SAMPLER_2D_MULTISAMPLE = 37129; // 0x9109
+ field public static final int GL_IS_ROW_MAJOR = 37632; // 0x9300
+ field public static final int GL_LOCATION = 37646; // 0x930e
+ field public static final int GL_MATRIX_STRIDE = 37631; // 0x92ff
+ field public static final int GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS = 37596; // 0x92dc
+ field public static final int GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE = 37592; // 0x92d8
+ field public static final int GL_MAX_COLOR_TEXTURE_SAMPLES = 37134; // 0x910e
+ field public static final int GL_MAX_COMBINED_ATOMIC_COUNTERS = 37591; // 0x92d7
+ field public static final int GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS = 37585; // 0x92d1
+ field public static final int GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS = 33382; // 0x8266
+ field public static final int GL_MAX_COMBINED_IMAGE_UNIFORMS = 37071; // 0x90cf
+ field public static final int GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES = 36665; // 0x8f39
+ field public static final int GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS = 37084; // 0x90dc
+ field public static final int GL_MAX_COMPUTE_ATOMIC_COUNTERS = 33381; // 0x8265
+ field public static final int GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS = 33380; // 0x8264
+ field public static final int GL_MAX_COMPUTE_IMAGE_UNIFORMS = 37309; // 0x91bd
+ field public static final int GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS = 37083; // 0x90db
+ field public static final int GL_MAX_COMPUTE_SHARED_MEMORY_SIZE = 33378; // 0x8262
+ field public static final int GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS = 37308; // 0x91bc
+ field public static final int GL_MAX_COMPUTE_UNIFORM_BLOCKS = 37307; // 0x91bb
+ field public static final int GL_MAX_COMPUTE_UNIFORM_COMPONENTS = 33379; // 0x8263
+ field public static final int GL_MAX_COMPUTE_WORK_GROUP_COUNT = 37310; // 0x91be
+ field public static final int GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS = 37099; // 0x90eb
+ field public static final int GL_MAX_COMPUTE_WORK_GROUP_SIZE = 37311; // 0x91bf
+ field public static final int GL_MAX_DEPTH_TEXTURE_SAMPLES = 37135; // 0x910f
+ field public static final int GL_MAX_FRAGMENT_ATOMIC_COUNTERS = 37590; // 0x92d6
+ field public static final int GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS = 37584; // 0x92d0
+ field public static final int GL_MAX_FRAGMENT_IMAGE_UNIFORMS = 37070; // 0x90ce
+ field public static final int GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS = 37082; // 0x90da
+ field public static final int GL_MAX_FRAMEBUFFER_HEIGHT = 37654; // 0x9316
+ field public static final int GL_MAX_FRAMEBUFFER_SAMPLES = 37656; // 0x9318
+ field public static final int GL_MAX_FRAMEBUFFER_WIDTH = 37653; // 0x9315
+ field public static final int GL_MAX_IMAGE_UNITS = 36664; // 0x8f38
+ field public static final int GL_MAX_INTEGER_SAMPLES = 37136; // 0x9110
+ field public static final int GL_MAX_NAME_LENGTH = 37622; // 0x92f6
+ field public static final int GL_MAX_NUM_ACTIVE_VARIABLES = 37623; // 0x92f7
+ field public static final int GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 36447; // 0x8e5f
+ field public static final int GL_MAX_SAMPLE_MASK_WORDS = 36441; // 0x8e59
+ field public static final int GL_MAX_SHADER_STORAGE_BLOCK_SIZE = 37086; // 0x90de
+ field public static final int GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS = 37085; // 0x90dd
+ field public static final int GL_MAX_UNIFORM_LOCATIONS = 33390; // 0x826e
+ field public static final int GL_MAX_VERTEX_ATOMIC_COUNTERS = 37586; // 0x92d2
+ field public static final int GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS = 37580; // 0x92cc
+ field public static final int GL_MAX_VERTEX_ATTRIB_BINDINGS = 33498; // 0x82da
+ field public static final int GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET = 33497; // 0x82d9
+ field public static final int GL_MAX_VERTEX_ATTRIB_STRIDE = 33509; // 0x82e5
+ field public static final int GL_MAX_VERTEX_IMAGE_UNIFORMS = 37066; // 0x90ca
+ field public static final int GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS = 37078; // 0x90d6
+ field public static final int GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 36446; // 0x8e5e
+ field public static final int GL_NAME_LENGTH = 37625; // 0x92f9
+ field public static final int GL_NUM_ACTIVE_VARIABLES = 37636; // 0x9304
+ field public static final int GL_OFFSET = 37628; // 0x92fc
+ field public static final int GL_PIXEL_BUFFER_BARRIER_BIT = 128; // 0x80
+ field public static final int GL_PROGRAM_INPUT = 37603; // 0x92e3
+ field public static final int GL_PROGRAM_OUTPUT = 37604; // 0x92e4
+ field public static final int GL_PROGRAM_PIPELINE_BINDING = 33370; // 0x825a
+ field public static final int GL_PROGRAM_SEPARABLE = 33368; // 0x8258
+ field public static final int GL_READ_ONLY = 35000; // 0x88b8
+ field public static final int GL_READ_WRITE = 35002; // 0x88ba
+ field public static final int GL_REFERENCED_BY_COMPUTE_SHADER = 37643; // 0x930b
+ field public static final int GL_REFERENCED_BY_FRAGMENT_SHADER = 37642; // 0x930a
+ field public static final int GL_REFERENCED_BY_VERTEX_SHADER = 37638; // 0x9306
+ field public static final int GL_SAMPLER_2D_MULTISAMPLE = 37128; // 0x9108
+ field public static final int GL_SAMPLE_MASK = 36433; // 0x8e51
+ field public static final int GL_SAMPLE_MASK_VALUE = 36434; // 0x8e52
+ field public static final int GL_SAMPLE_POSITION = 36432; // 0x8e50
+ field public static final int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 32; // 0x20
+ field public static final int GL_SHADER_STORAGE_BARRIER_BIT = 8192; // 0x2000
+ field public static final int GL_SHADER_STORAGE_BLOCK = 37606; // 0x92e6
+ field public static final int GL_SHADER_STORAGE_BUFFER = 37074; // 0x90d2
+ field public static final int GL_SHADER_STORAGE_BUFFER_BINDING = 37075; // 0x90d3
+ field public static final int GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT = 37087; // 0x90df
+ field public static final int GL_SHADER_STORAGE_BUFFER_SIZE = 37077; // 0x90d5
+ field public static final int GL_SHADER_STORAGE_BUFFER_START = 37076; // 0x90d4
+ field public static final int GL_STENCIL_INDEX = 6401; // 0x1901
+ field public static final int GL_TEXTURE_2D_MULTISAMPLE = 37120; // 0x9100
+ field public static final int GL_TEXTURE_ALPHA_SIZE = 32863; // 0x805f
+ field public static final int GL_TEXTURE_ALPHA_TYPE = 35859; // 0x8c13
+ field public static final int GL_TEXTURE_BINDING_2D_MULTISAMPLE = 37124; // 0x9104
+ field public static final int GL_TEXTURE_BLUE_SIZE = 32862; // 0x805e
+ field public static final int GL_TEXTURE_BLUE_TYPE = 35858; // 0x8c12
+ field public static final int GL_TEXTURE_COMPRESSED = 34465; // 0x86a1
+ field public static final int GL_TEXTURE_DEPTH = 32881; // 0x8071
+ field public static final int GL_TEXTURE_DEPTH_SIZE = 34890; // 0x884a
+ field public static final int GL_TEXTURE_DEPTH_TYPE = 35862; // 0x8c16
+ field public static final int GL_TEXTURE_FETCH_BARRIER_BIT = 8; // 0x8
+ field public static final int GL_TEXTURE_FIXED_SAMPLE_LOCATIONS = 37127; // 0x9107
+ field public static final int GL_TEXTURE_GREEN_SIZE = 32861; // 0x805d
+ field public static final int GL_TEXTURE_GREEN_TYPE = 35857; // 0x8c11
+ field public static final int GL_TEXTURE_HEIGHT = 4097; // 0x1001
+ field public static final int GL_TEXTURE_INTERNAL_FORMAT = 4099; // 0x1003
+ field public static final int GL_TEXTURE_RED_SIZE = 32860; // 0x805c
+ field public static final int GL_TEXTURE_RED_TYPE = 35856; // 0x8c10
+ field public static final int GL_TEXTURE_SAMPLES = 37126; // 0x9106
+ field public static final int GL_TEXTURE_SHARED_SIZE = 35903; // 0x8c3f
+ field public static final int GL_TEXTURE_STENCIL_SIZE = 35057; // 0x88f1
+ field public static final int GL_TEXTURE_UPDATE_BARRIER_BIT = 256; // 0x100
+ field public static final int GL_TEXTURE_WIDTH = 4096; // 0x1000
+ field public static final int GL_TOP_LEVEL_ARRAY_SIZE = 37644; // 0x930c
+ field public static final int GL_TOP_LEVEL_ARRAY_STRIDE = 37645; // 0x930d
+ field public static final int GL_TRANSFORM_FEEDBACK_BARRIER_BIT = 2048; // 0x800
+ field public static final int GL_TRANSFORM_FEEDBACK_VARYING = 37620; // 0x92f4
+ field public static final int GL_TYPE = 37626; // 0x92fa
+ field public static final int GL_UNIFORM = 37601; // 0x92e1
+ field public static final int GL_UNIFORM_BARRIER_BIT = 4; // 0x4
+ field public static final int GL_UNIFORM_BLOCK = 37602; // 0x92e2
+ field public static final int GL_UNSIGNED_INT_ATOMIC_COUNTER = 37595; // 0x92db
+ field public static final int GL_UNSIGNED_INT_IMAGE_2D = 36963; // 0x9063
+ field public static final int GL_UNSIGNED_INT_IMAGE_2D_ARRAY = 36969; // 0x9069
+ field public static final int GL_UNSIGNED_INT_IMAGE_3D = 36964; // 0x9064
+ field public static final int GL_UNSIGNED_INT_IMAGE_CUBE = 36966; // 0x9066
+ field public static final int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 37130; // 0x910a
+ field public static final int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 1; // 0x1
+ field public static final int GL_VERTEX_ATTRIB_BINDING = 33492; // 0x82d4
+ field public static final int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 33493; // 0x82d5
+ field public static final int GL_VERTEX_BINDING_BUFFER = 36687; // 0x8f4f
+ field public static final int GL_VERTEX_BINDING_DIVISOR = 33494; // 0x82d6
+ field public static final int GL_VERTEX_BINDING_OFFSET = 33495; // 0x82d7
+ field public static final int GL_VERTEX_BINDING_STRIDE = 33496; // 0x82d8
+ field public static final int GL_VERTEX_SHADER_BIT = 1; // 0x1
+ field public static final int GL_WRITE_ONLY = 35001; // 0x88b9
+ }
+
+ public class GLES31Ext {
+ method public static void glBlendBarrierKHR();
+ method public static void glBlendEquationSeparateiEXT(int, int, int);
+ method public static void glBlendEquationiEXT(int, int);
+ method public static void glBlendFuncSeparateiEXT(int, int, int, int, int);
+ method public static void glBlendFunciEXT(int, int, int);
+ method public static void glColorMaskiEXT(int, boolean, boolean, boolean, boolean);
+ method public static void glCopyImageSubDataEXT(int, int, int, int, int, int, int, int, int, int, int, int, int, int, int);
+ method public static void glDebugMessageCallbackKHR(android.opengl.GLES31Ext.DebugProcKHR);
+ method public static void glDebugMessageControlKHR(int, int, int, int, int[], int, boolean);
+ method public static void glDebugMessageControlKHR(int, int, int, int, java.nio.IntBuffer, boolean);
+ method public static void glDebugMessageInsertKHR(int, int, int, int, java.lang.String);
+ method public static void glDisableiEXT(int, int);
+ method public static void glEnableiEXT(int, int);
+ method public static void glFramebufferTextureEXT(int, int, int, int);
+ method public static android.opengl.GLES31Ext.DebugProcKHR glGetDebugMessageCallbackKHR();
+ method public static int glGetDebugMessageLogKHR(int, int, int[], int, int[], int, int[], int, int[], int, int[], int, byte[], int);
+ method public static int glGetDebugMessageLogKHR(int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.ByteBuffer);
+ method public static java.lang.String[] glGetDebugMessageLogKHR(int, int[], int, int[], int, int[], int, int[], int);
+ method public static java.lang.String[] glGetDebugMessageLogKHR(int, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer, java.nio.IntBuffer);
+ method public static java.lang.String glGetObjectLabelKHR(int, int);
+ method public static java.lang.String glGetObjectPtrLabelKHR(long);
+ method public static void glGetSamplerParameterIivEXT(int, int, int[], int);
+ method public static void glGetSamplerParameterIivEXT(int, int, java.nio.IntBuffer);
+ method public static void glGetSamplerParameterIuivEXT(int, int, int[], int);
+ method public static void glGetSamplerParameterIuivEXT(int, int, java.nio.IntBuffer);
+ method public static void glGetTexParameterIivEXT(int, int, int[], int);
+ method public static void glGetTexParameterIivEXT(int, int, java.nio.IntBuffer);
+ method public static void glGetTexParameterIuivEXT(int, int, int[], int);
+ method public static void glGetTexParameterIuivEXT(int, int, java.nio.IntBuffer);
+ method public static boolean glIsEnablediEXT(int, int);
+ method public static void glMinSampleShadingOES(float);
+ method public static void glObjectLabelKHR(int, int, int, java.lang.String);
+ method public static void glObjectPtrLabelKHR(long, java.lang.String);
+ method public static void glPatchParameteriEXT(int, int);
+ method public static void glPopDebugGroupKHR();
+ method public static void glPrimitiveBoundingBoxEXT(float, float, float, float, float, float, float, float);
+ method public static void glPushDebugGroupKHR(int, int, int, java.lang.String);
+ method public static void glSamplerParameterIivEXT(int, int, int[], int);
+ method public static void glSamplerParameterIivEXT(int, int, java.nio.IntBuffer);
+ method public static void glSamplerParameterIuivEXT(int, int, int[], int);
+ method public static void glSamplerParameterIuivEXT(int, int, java.nio.IntBuffer);
+ method public static void glTexBufferEXT(int, int, int);
+ method public static void glTexBufferRangeEXT(int, int, int, int, int);
+ method public static void glTexParameterIivEXT(int, int, int[], int);
+ method public static void glTexParameterIivEXT(int, int, java.nio.IntBuffer);
+ method public static void glTexParameterIuivEXT(int, int, int[], int);
+ method public static void glTexParameterIuivEXT(int, int, java.nio.IntBuffer);
+ method public static void glTexStorage3DMultisampleOES(int, int, int, int, int, int, boolean);
+ field public static final int GL_BLEND_ADVANCED_COHERENT_KHR = 37509; // 0x9285
+ field public static final int GL_BUFFER_KHR = 33504; // 0x82e0
+ field public static final int GL_CLAMP_TO_BORDER_EXT = 33069; // 0x812d
+ field public static final int GL_COLORBURN_KHR = 37530; // 0x929a
+ field public static final int GL_COLORDODGE_KHR = 37529; // 0x9299
+ field public static final int GL_COMPRESSED_RGBA_ASTC_10x10_KHR = 37819; // 0x93bb
+ field public static final int GL_COMPRESSED_RGBA_ASTC_10x5_KHR = 37816; // 0x93b8
+ field public static final int GL_COMPRESSED_RGBA_ASTC_10x6_KHR = 37817; // 0x93b9
+ field public static final int GL_COMPRESSED_RGBA_ASTC_10x8_KHR = 37818; // 0x93ba
+ field public static final int GL_COMPRESSED_RGBA_ASTC_12x10_KHR = 37820; // 0x93bc
+ field public static final int GL_COMPRESSED_RGBA_ASTC_12x12_KHR = 37821; // 0x93bd
+ field public static final int GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 37808; // 0x93b0
+ field public static final int GL_COMPRESSED_RGBA_ASTC_5x4_KHR = 37809; // 0x93b1
+ field public static final int GL_COMPRESSED_RGBA_ASTC_5x5_KHR = 37810; // 0x93b2
+ field public static final int GL_COMPRESSED_RGBA_ASTC_6x5_KHR = 37811; // 0x93b3
+ field public static final int GL_COMPRESSED_RGBA_ASTC_6x6_KHR = 37812; // 0x93b4
+ field public static final int GL_COMPRESSED_RGBA_ASTC_8x5_KHR = 37813; // 0x93b5
+ field public static final int GL_COMPRESSED_RGBA_ASTC_8x6_KHR = 37814; // 0x93b6
+ field public static final int GL_COMPRESSED_RGBA_ASTC_8x8_KHR = 37815; // 0x93b7
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR = 37851; // 0x93db
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR = 37848; // 0x93d8
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR = 37849; // 0x93d9
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR = 37850; // 0x93da
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR = 37852; // 0x93dc
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR = 37853; // 0x93dd
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR = 37840; // 0x93d0
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR = 37841; // 0x93d1
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR = 37842; // 0x93d2
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR = 37843; // 0x93d3
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR = 37844; // 0x93d4
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR = 37845; // 0x93d5
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR = 37846; // 0x93d6
+ field public static final int GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR = 37847; // 0x93d7
+ field public static final int GL_CONTEXT_FLAG_DEBUG_BIT_KHR = 2; // 0x2
+ field public static final int GL_DARKEN_KHR = 37527; // 0x9297
+ field public static final int GL_DEBUG_CALLBACK_FUNCTION_KHR = 33348; // 0x8244
+ field public static final int GL_DEBUG_CALLBACK_USER_PARAM_KHR = 33349; // 0x8245
+ field public static final int GL_DEBUG_GROUP_STACK_DEPTH_KHR = 33389; // 0x826d
+ field public static final int GL_DEBUG_LOGGED_MESSAGES_KHR = 37189; // 0x9145
+ field public static final int GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR = 33347; // 0x8243
+ field public static final int GL_DEBUG_OUTPUT_KHR = 37600; // 0x92e0
+ field public static final int GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR = 33346; // 0x8242
+ field public static final int GL_DEBUG_SEVERITY_HIGH_KHR = 37190; // 0x9146
+ field public static final int GL_DEBUG_SEVERITY_LOW_KHR = 37192; // 0x9148
+ field public static final int GL_DEBUG_SEVERITY_MEDIUM_KHR = 37191; // 0x9147
+ field public static final int GL_DEBUG_SEVERITY_NOTIFICATION_KHR = 33387; // 0x826b
+ field public static final int GL_DEBUG_SOURCE_API_KHR = 33350; // 0x8246
+ field public static final int GL_DEBUG_SOURCE_APPLICATION_KHR = 33354; // 0x824a
+ field public static final int GL_DEBUG_SOURCE_OTHER_KHR = 33355; // 0x824b
+ field public static final int GL_DEBUG_SOURCE_SHADER_COMPILER_KHR = 33352; // 0x8248
+ field public static final int GL_DEBUG_SOURCE_THIRD_PARTY_KHR = 33353; // 0x8249
+ field public static final int GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR = 33351; // 0x8247
+ field public static final int GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR = 33357; // 0x824d
+ field public static final int GL_DEBUG_TYPE_ERROR_KHR = 33356; // 0x824c
+ field public static final int GL_DEBUG_TYPE_MARKER_KHR = 33384; // 0x8268
+ field public static final int GL_DEBUG_TYPE_OTHER_KHR = 33361; // 0x8251
+ field public static final int GL_DEBUG_TYPE_PERFORMANCE_KHR = 33360; // 0x8250
+ field public static final int GL_DEBUG_TYPE_POP_GROUP_KHR = 33386; // 0x826a
+ field public static final int GL_DEBUG_TYPE_PORTABILITY_KHR = 33359; // 0x824f
+ field public static final int GL_DEBUG_TYPE_PUSH_GROUP_KHR = 33385; // 0x8269
+ field public static final int GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR = 33358; // 0x824e
+ field public static final int GL_DECODE_EXT = 35401; // 0x8a49
+ field public static final int GL_DIFFERENCE_KHR = 37534; // 0x929e
+ field public static final int GL_EXCLUSION_KHR = 37536; // 0x92a0
+ field public static final int GL_FIRST_VERTEX_CONVENTION_EXT = 36429; // 0x8e4d
+ field public static final int GL_FRACTIONAL_EVEN_EXT = 36476; // 0x8e7c
+ field public static final int GL_FRACTIONAL_ODD_EXT = 36475; // 0x8e7b
+ field public static final int GL_FRAGMENT_INTERPOLATION_OFFSET_BITS_OES = 36445; // 0x8e5d
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT = 36263; // 0x8da7
+ field public static final int GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT = 37650; // 0x9312
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT = 36264; // 0x8da8
+ field public static final int GL_GEOMETRY_LINKED_INPUT_TYPE_EXT = 35095; // 0x8917
+ field public static final int GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT = 35096; // 0x8918
+ field public static final int GL_GEOMETRY_LINKED_VERTICES_OUT_EXT = 35094; // 0x8916
+ field public static final int GL_GEOMETRY_SHADER_BIT_EXT = 4; // 0x4
+ field public static final int GL_GEOMETRY_SHADER_EXT = 36313; // 0x8dd9
+ field public static final int GL_GEOMETRY_SHADER_INVOCATIONS_EXT = 34943; // 0x887f
+ field public static final int GL_HARDLIGHT_KHR = 37531; // 0x929b
+ field public static final int GL_HSL_COLOR_KHR = 37551; // 0x92af
+ field public static final int GL_HSL_HUE_KHR = 37549; // 0x92ad
+ field public static final int GL_HSL_LUMINOSITY_KHR = 37552; // 0x92b0
+ field public static final int GL_HSL_SATURATION_KHR = 37550; // 0x92ae
+ field public static final int GL_IMAGE_BUFFER_EXT = 36945; // 0x9051
+ field public static final int GL_IMAGE_CUBE_MAP_ARRAY_EXT = 36948; // 0x9054
+ field public static final int GL_INT_IMAGE_BUFFER_EXT = 36956; // 0x905c
+ field public static final int GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 36959; // 0x905f
+ field public static final int GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES = 37132; // 0x910c
+ field public static final int GL_INT_SAMPLER_BUFFER_EXT = 36304; // 0x8dd0
+ field public static final int GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT = 36878; // 0x900e
+ field public static final int GL_ISOLINES_EXT = 36474; // 0x8e7a
+ field public static final int GL_IS_PER_PATCH_EXT = 37607; // 0x92e7
+ field public static final int GL_LAST_VERTEX_CONVENTION_EXT = 36430; // 0x8e4e
+ field public static final int GL_LAYER_PROVOKING_VERTEX_EXT = 33374; // 0x825e
+ field public static final int GL_LIGHTEN_KHR = 37528; // 0x9298
+ field public static final int GL_LINES_ADJACENCY_EXT = 10; // 0xa
+ field public static final int GL_LINE_STRIP_ADJACENCY_EXT = 11; // 0xb
+ field public static final int GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT = 35378; // 0x8a32
+ field public static final int GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT = 36382; // 0x8e1e
+ field public static final int GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT = 36383; // 0x8e1f
+ field public static final int GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR = 33388; // 0x826c
+ field public static final int GL_MAX_DEBUG_LOGGED_MESSAGES_KHR = 37188; // 0x9144
+ field public static final int GL_MAX_DEBUG_MESSAGE_LENGTH_KHR = 37187; // 0x9143
+ field public static final int GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_OES = 36444; // 0x8e5c
+ field public static final int GL_MAX_FRAMEBUFFER_LAYERS_EXT = 37655; // 0x9317
+ field public static final int GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT = 37589; // 0x92d5
+ field public static final int GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT = 37583; // 0x92cf
+ field public static final int GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT = 37069; // 0x90cd
+ field public static final int GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT = 37155; // 0x9123
+ field public static final int GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT = 37156; // 0x9124
+ field public static final int GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT = 36320; // 0x8de0
+ field public static final int GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT = 36442; // 0x8e5a
+ field public static final int GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT = 37079; // 0x90d7
+ field public static final int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT = 35881; // 0x8c29
+ field public static final int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT = 36321; // 0x8de1
+ field public static final int GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT = 35372; // 0x8a2c
+ field public static final int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT = 36319; // 0x8ddf
+ field public static final int GL_MAX_LABEL_LENGTH_KHR = 33512; // 0x82e8
+ field public static final int GL_MAX_PATCH_VERTICES_EXT = 36477; // 0x8e7d
+ field public static final int GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT = 37587; // 0x92d3
+ field public static final int GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT = 37581; // 0x92cd
+ field public static final int GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT = 37067; // 0x90cb
+ field public static final int GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT = 34924; // 0x886c
+ field public static final int GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT = 36483; // 0x8e83
+ field public static final int GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT = 37080; // 0x90d8
+ field public static final int GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT = 36481; // 0x8e81
+ field public static final int GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT = 36485; // 0x8e85
+ field public static final int GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT = 36489; // 0x8e89
+ field public static final int GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT = 36479; // 0x8e7f
+ field public static final int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT = 37588; // 0x92d4
+ field public static final int GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT = 37582; // 0x92ce
+ field public static final int GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT = 37068; // 0x90cc
+ field public static final int GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT = 34925; // 0x886d
+ field public static final int GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT = 36486; // 0x8e86
+ field public static final int GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT = 37081; // 0x90d9
+ field public static final int GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT = 36482; // 0x8e82
+ field public static final int GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT = 36490; // 0x8e8a
+ field public static final int GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT = 36480; // 0x8e80
+ field public static final int GL_MAX_TESS_GEN_LEVEL_EXT = 36478; // 0x8e7e
+ field public static final int GL_MAX_TESS_PATCH_COMPONENTS_EXT = 36484; // 0x8e84
+ field public static final int GL_MAX_TEXTURE_BUFFER_SIZE_EXT = 35883; // 0x8c2b
+ field public static final int GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_OES = 36443; // 0x8e5b
+ field public static final int GL_MIN_SAMPLE_SHADING_VALUE_OES = 35895; // 0x8c37
+ field public static final int GL_MULTIPLY_KHR = 37524; // 0x9294
+ field public static final int GL_OVERLAY_KHR = 37526; // 0x9296
+ field public static final int GL_PATCHES_EXT = 14; // 0xe
+ field public static final int GL_PATCH_VERTICES_EXT = 36466; // 0x8e72
+ field public static final int GL_PRIMITIVES_GENERATED_EXT = 35975; // 0x8c87
+ field public static final int GL_PRIMITIVE_BOUNDING_BOX_EXT = 37566; // 0x92be
+ field public static final int GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 33313; // 0x8221
+ field public static final int GL_PROGRAM_KHR = 33506; // 0x82e2
+ field public static final int GL_QUADS_EXT = 7; // 0x7
+ field public static final int GL_QUERY_KHR = 33507; // 0x82e3
+ field public static final int GL_REFERENCED_BY_GEOMETRY_SHADER_EXT = 37641; // 0x9309
+ field public static final int GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT = 37639; // 0x9307
+ field public static final int GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT = 37640; // 0x9308
+ field public static final int GL_SAMPLER_2D_MULTISAMPLE_ARRAY_OES = 37131; // 0x910b
+ field public static final int GL_SAMPLER_BUFFER_EXT = 36290; // 0x8dc2
+ field public static final int GL_SAMPLER_CUBE_MAP_ARRAY_EXT = 36876; // 0x900c
+ field public static final int GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT = 36877; // 0x900d
+ field public static final int GL_SAMPLER_KHR = 33510; // 0x82e6
+ field public static final int GL_SAMPLE_SHADING_OES = 35894; // 0x8c36
+ field public static final int GL_SCREEN_KHR = 37525; // 0x9295
+ field public static final int GL_SHADER_KHR = 33505; // 0x82e1
+ field public static final int GL_SKIP_DECODE_EXT = 35402; // 0x8a4a
+ field public static final int GL_SOFTLIGHT_KHR = 37532; // 0x929c
+ field public static final int GL_STACK_OVERFLOW_KHR = 1283; // 0x503
+ field public static final int GL_STACK_UNDERFLOW_KHR = 1284; // 0x504
+ field public static final int GL_STENCIL_INDEX8_OES = 36168; // 0x8d48
+ field public static final int GL_STENCIL_INDEX_OES = 6401; // 0x1901
+ field public static final int GL_TESS_CONTROL_OUTPUT_VERTICES_EXT = 36469; // 0x8e75
+ field public static final int GL_TESS_CONTROL_SHADER_BIT_EXT = 8; // 0x8
+ field public static final int GL_TESS_CONTROL_SHADER_EXT = 36488; // 0x8e88
+ field public static final int GL_TESS_EVALUATION_SHADER_BIT_EXT = 16; // 0x10
+ field public static final int GL_TESS_EVALUATION_SHADER_EXT = 36487; // 0x8e87
+ field public static final int GL_TESS_GEN_MODE_EXT = 36470; // 0x8e76
+ field public static final int GL_TESS_GEN_POINT_MODE_EXT = 36473; // 0x8e79
+ field public static final int GL_TESS_GEN_SPACING_EXT = 36471; // 0x8e77
+ field public static final int GL_TESS_GEN_VERTEX_ORDER_EXT = 36472; // 0x8e78
+ field public static final int GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES = 37122; // 0x9102
+ field public static final int GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY_OES = 37125; // 0x9105
+ field public static final int GL_TEXTURE_BINDING_BUFFER_EXT = 35884; // 0x8c2c
+ field public static final int GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT = 36874; // 0x900a
+ field public static final int GL_TEXTURE_BORDER_COLOR_EXT = 4100; // 0x1004
+ field public static final int GL_TEXTURE_BUFFER_BINDING_EXT = 35882; // 0x8c2a
+ field public static final int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT = 35885; // 0x8c2d
+ field public static final int GL_TEXTURE_BUFFER_EXT = 35882; // 0x8c2a
+ field public static final int GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT = 37279; // 0x919f
+ field public static final int GL_TEXTURE_BUFFER_OFFSET_EXT = 37277; // 0x919d
+ field public static final int GL_TEXTURE_BUFFER_SIZE_EXT = 37278; // 0x919e
+ field public static final int GL_TEXTURE_CUBE_MAP_ARRAY_EXT = 36873; // 0x9009
+ field public static final int GL_TEXTURE_SRGB_DECODE_EXT = 35400; // 0x8a48
+ field public static final int GL_TRIANGLES_ADJACENCY_EXT = 12; // 0xc
+ field public static final int GL_TRIANGLE_STRIP_ADJACENCY_EXT = 13; // 0xd
+ field public static final int GL_UNDEFINED_VERTEX_EXT = 33376; // 0x8260
+ field public static final int GL_UNSIGNED_INT_IMAGE_BUFFER_EXT = 36967; // 0x9067
+ field public static final int GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT = 36970; // 0x906a
+ field public static final int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES = 37133; // 0x910d
+ field public static final int GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT = 36312; // 0x8dd8
+ field public static final int GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT = 36879; // 0x900f
+ field public static final int GL_VERTEX_ARRAY_KHR = 32884; // 0x8074
+ }
+
+ public static abstract interface GLES31Ext.DebugProcKHR {
+ method public abstract void onMessage(int, int, int, int, java.lang.String);
+ }
+
+ public class GLException extends java.lang.RuntimeException {
+ ctor public GLException(int);
+ ctor public GLException(int, java.lang.String);
+ }
+
+ public class GLSurfaceView extends android.view.SurfaceView implements android.view.SurfaceHolder.Callback {
+ ctor public GLSurfaceView(android.content.Context);
+ ctor public GLSurfaceView(android.content.Context, android.util.AttributeSet);
+ method public int getDebugFlags();
+ method public boolean getPreserveEGLContextOnPause();
+ method public int getRenderMode();
+ method public void onPause();
+ method public void onResume();
+ method public void queueEvent(java.lang.Runnable);
+ method public void requestRender();
+ method public void setDebugFlags(int);
+ method public void setEGLConfigChooser(android.opengl.GLSurfaceView.EGLConfigChooser);
+ method public void setEGLConfigChooser(boolean);
+ method public void setEGLConfigChooser(int, int, int, int, int, int);
+ method public void setEGLContextClientVersion(int);
+ method public void setEGLContextFactory(android.opengl.GLSurfaceView.EGLContextFactory);
+ method public void setEGLWindowSurfaceFactory(android.opengl.GLSurfaceView.EGLWindowSurfaceFactory);
+ method public void setGLWrapper(android.opengl.GLSurfaceView.GLWrapper);
+ method public void setPreserveEGLContextOnPause(boolean);
+ method public void setRenderMode(int);
+ method public void setRenderer(android.opengl.GLSurfaceView.Renderer);
+ method public void surfaceChanged(android.view.SurfaceHolder, int, int, int);
+ method public void surfaceCreated(android.view.SurfaceHolder);
+ method public void surfaceDestroyed(android.view.SurfaceHolder);
+ field public static final int DEBUG_CHECK_GL_ERROR = 1; // 0x1
+ field public static final int DEBUG_LOG_GL_CALLS = 2; // 0x2
+ field public static final int RENDERMODE_CONTINUOUSLY = 1; // 0x1
+ field public static final int RENDERMODE_WHEN_DIRTY = 0; // 0x0
+ }
+
+ public static abstract interface GLSurfaceView.EGLConfigChooser {
+ method public abstract javax.microedition.khronos.egl.EGLConfig chooseConfig(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay);
+ }
+
+ public static abstract interface GLSurfaceView.EGLContextFactory {
+ method public abstract javax.microedition.khronos.egl.EGLContext createContext(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig);
+ method public abstract void destroyContext(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLContext);
+ }
+
+ public static abstract interface GLSurfaceView.EGLWindowSurfaceFactory {
+ method public abstract javax.microedition.khronos.egl.EGLSurface createWindowSurface(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, java.lang.Object);
+ method public abstract void destroySurface(javax.microedition.khronos.egl.EGL10, javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface);
+ }
+
+ public static abstract interface GLSurfaceView.GLWrapper {
+ method public abstract javax.microedition.khronos.opengles.GL wrap(javax.microedition.khronos.opengles.GL);
+ }
+
+ public static abstract interface GLSurfaceView.Renderer {
+ method public abstract void onDrawFrame(javax.microedition.khronos.opengles.GL10);
+ method public abstract void onSurfaceChanged(javax.microedition.khronos.opengles.GL10, int, int);
+ method public abstract void onSurfaceCreated(javax.microedition.khronos.opengles.GL10, javax.microedition.khronos.egl.EGLConfig);
+ }
+
+ public class GLU {
+ ctor public GLU();
+ method public static java.lang.String gluErrorString(int);
+ method public static void gluLookAt(javax.microedition.khronos.opengles.GL10, float, float, float, float, float, float, float, float, float);
+ method public static void gluOrtho2D(javax.microedition.khronos.opengles.GL10, float, float, float, float);
+ method public static void gluPerspective(javax.microedition.khronos.opengles.GL10, float, float, float, float);
+ method public static int gluProject(float, float, float, float[], int, float[], int, int[], int, float[], int);
+ method public static int gluUnProject(float, float, float, float[], int, float[], int, int[], int, float[], int);
+ }
+
+ public final class GLUtils {
+ method public static java.lang.String getEGLErrorString(int);
+ method public static int getInternalFormat(android.graphics.Bitmap);
+ method public static int getType(android.graphics.Bitmap);
+ method public static void texImage2D(int, int, int, android.graphics.Bitmap, int);
+ method public static void texImage2D(int, int, int, android.graphics.Bitmap, int, int);
+ method public static void texImage2D(int, int, android.graphics.Bitmap, int);
+ method public static void texSubImage2D(int, int, int, int, android.graphics.Bitmap);
+ method public static void texSubImage2D(int, int, int, int, android.graphics.Bitmap, int, int);
+ }
+
+ public class Matrix {
+ ctor public deprecated Matrix();
+ method public static void frustumM(float[], int, float, float, float, float, float, float);
+ method public static boolean invertM(float[], int, float[], int);
+ method public static float length(float, float, float);
+ method public static void multiplyMM(float[], int, float[], int, float[], int);
+ method public static void multiplyMV(float[], int, float[], int, float[], int);
+ method public static void orthoM(float[], int, float, float, float, float, float, float);
+ method public static void perspectiveM(float[], int, float, float, float, float);
+ method public static void rotateM(float[], int, float[], int, float, float, float, float);
+ method public static void rotateM(float[], int, float, float, float, float);
+ method public static void scaleM(float[], int, float[], int, float, float, float);
+ method public static void scaleM(float[], int, float, float, float);
+ method public static void setIdentityM(float[], int);
+ method public static void setLookAtM(float[], int, float, float, float, float, float, float, float, float, float);
+ method public static void setRotateEulerM(float[], int, float, float, float);
+ method public static void setRotateM(float[], int, float, float, float, float);
+ method public static void translateM(float[], int, float[], int, float, float, float);
+ method public static void translateM(float[], int, float, float, float);
+ method public static void transposeM(float[], int, float[], int);
+ }
+
+ public class Visibility {
+ ctor public Visibility();
+ method public static void computeBoundingSphere(float[], int, int, float[], int);
+ method public static int frustumCullSpheres(float[], int, float[], int, int, int[], int, int);
+ method public static int visibilityTest(float[], int, float[], int, char[], int, int);
+ }
+
+}
+
+package android.os {
+
+ public abstract class AsyncTask {
+ ctor public AsyncTask();
+ method public final boolean cancel(boolean);
+ method protected abstract Result doInBackground(Params...);
+ method public final android.os.AsyncTask<Params, Progress, Result> execute(Params...);
+ method public static void execute(java.lang.Runnable);
+ method public final android.os.AsyncTask<Params, Progress, Result> executeOnExecutor(java.util.concurrent.Executor, Params...);
+ method public final Result get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+ method public final Result get(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public final android.os.AsyncTask.Status getStatus();
+ method public final boolean isCancelled();
+ method protected void onCancelled(Result);
+ method protected void onCancelled();
+ method protected void onPostExecute(Result);
+ method protected void onPreExecute();
+ method protected void onProgressUpdate(Progress...);
+ method protected final void publishProgress(Progress...);
+ field public static final java.util.concurrent.Executor SERIAL_EXECUTOR;
+ field public static final java.util.concurrent.Executor THREAD_POOL_EXECUTOR;
+ }
+
+ public static final class AsyncTask.Status extends java.lang.Enum {
+ method public static android.os.AsyncTask.Status valueOf(java.lang.String);
+ method public static final android.os.AsyncTask.Status[] values();
+ enum_constant public static final android.os.AsyncTask.Status FINISHED;
+ enum_constant public static final android.os.AsyncTask.Status PENDING;
+ enum_constant public static final android.os.AsyncTask.Status RUNNING;
+ }
+
+ public class BadParcelableException extends android.util.AndroidRuntimeException {
+ ctor public BadParcelableException(java.lang.String);
+ ctor public BadParcelableException(java.lang.Exception);
+ }
+
+ public class BaseBundle {
+ method public void clear();
+ method public boolean containsKey(java.lang.String);
+ method public java.lang.Object get(java.lang.String);
+ method public boolean getBoolean(java.lang.String);
+ method public boolean getBoolean(java.lang.String, boolean);
+ method public boolean[] getBooleanArray(java.lang.String);
+ method public double getDouble(java.lang.String);
+ method public double getDouble(java.lang.String, double);
+ method public double[] getDoubleArray(java.lang.String);
+ method public int getInt(java.lang.String);
+ method public int getInt(java.lang.String, int);
+ method public int[] getIntArray(java.lang.String);
+ method public long getLong(java.lang.String);
+ method public long getLong(java.lang.String, long);
+ method public long[] getLongArray(java.lang.String);
+ method public java.lang.String getString(java.lang.String);
+ method public java.lang.String getString(java.lang.String, java.lang.String);
+ method public java.lang.String[] getStringArray(java.lang.String);
+ method public boolean isEmpty();
+ method public java.util.Set<java.lang.String> keySet();
+ method public void putAll(android.os.PersistableBundle);
+ method public void putBoolean(java.lang.String, boolean);
+ method public void putBooleanArray(java.lang.String, boolean[]);
+ method public void putDouble(java.lang.String, double);
+ method public void putDoubleArray(java.lang.String, double[]);
+ method public void putInt(java.lang.String, int);
+ method public void putIntArray(java.lang.String, int[]);
+ method public void putLong(java.lang.String, long);
+ method public void putLongArray(java.lang.String, long[]);
+ method public void putString(java.lang.String, java.lang.String);
+ method public void putStringArray(java.lang.String, java.lang.String[]);
+ method public void remove(java.lang.String);
+ method public int size();
+ }
+
+ public class BatteryManager {
+ method public int getIntProperty(int);
+ method public long getLongProperty(int);
+ method public boolean isCharging();
+ field public static final java.lang.String ACTION_CHARGING = "android.os.action.CHARGING";
+ field public static final java.lang.String ACTION_DISCHARGING = "android.os.action.DISCHARGING";
+ field public static final int BATTERY_HEALTH_COLD = 7; // 0x7
+ field public static final int BATTERY_HEALTH_DEAD = 4; // 0x4
+ field public static final int BATTERY_HEALTH_GOOD = 2; // 0x2
+ field public static final int BATTERY_HEALTH_OVERHEAT = 3; // 0x3
+ field public static final int BATTERY_HEALTH_OVER_VOLTAGE = 5; // 0x5
+ field public static final int BATTERY_HEALTH_UNKNOWN = 1; // 0x1
+ field public static final int BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6; // 0x6
+ field public static final int BATTERY_PLUGGED_AC = 1; // 0x1
+ field public static final int BATTERY_PLUGGED_USB = 2; // 0x2
+ field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4
+ field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4
+ field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1
+ field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3
+ field public static final int BATTERY_PROPERTY_CURRENT_NOW = 2; // 0x2
+ field public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; // 0x5
+ field public static final int BATTERY_STATUS_CHARGING = 2; // 0x2
+ field public static final int BATTERY_STATUS_DISCHARGING = 3; // 0x3
+ field public static final int BATTERY_STATUS_FULL = 5; // 0x5
+ field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4
+ field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1
+ field public static final java.lang.String EXTRA_HEALTH = "health";
+ field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small";
+ field public static final java.lang.String EXTRA_LEVEL = "level";
+ field public static final java.lang.String EXTRA_PLUGGED = "plugged";
+ field public static final java.lang.String EXTRA_PRESENT = "present";
+ field public static final java.lang.String EXTRA_SCALE = "scale";
+ field public static final java.lang.String EXTRA_STATUS = "status";
+ field public static final java.lang.String EXTRA_TECHNOLOGY = "technology";
+ field public static final java.lang.String EXTRA_TEMPERATURE = "temperature";
+ field public static final java.lang.String EXTRA_VOLTAGE = "voltage";
+ }
+
+ public class Binder implements android.os.IBinder {
+ ctor public Binder();
+ method public void attachInterface(android.os.IInterface, java.lang.String);
+ method public static final long clearCallingIdentity();
+ method public void dump(java.io.FileDescriptor, java.lang.String[]);
+ method protected void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public void dumpAsync(java.io.FileDescriptor, java.lang.String[]);
+ method public static final void flushPendingCommands();
+ method public static final int getCallingPid();
+ method public static final int getCallingUid();
+ method public static final android.os.UserHandle getCallingUserHandle();
+ method public java.lang.String getInterfaceDescriptor();
+ method public boolean isBinderAlive();
+ method public static final void joinThreadPool();
+ method public void linkToDeath(android.os.IBinder.DeathRecipient, int);
+ method protected boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+ method public boolean pingBinder();
+ method public android.os.IInterface queryLocalInterface(java.lang.String);
+ method public static final void restoreCallingIdentity(long);
+ method public final boolean transact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+ method public boolean unlinkToDeath(android.os.IBinder.DeathRecipient, int);
+ }
+
+ public class Build {
+ ctor public Build();
+ method public static java.lang.String getRadioVersion();
+ field public static final java.lang.String BOARD;
+ field public static final java.lang.String BOOTLOADER;
+ field public static final java.lang.String BRAND;
+ field public static final deprecated java.lang.String CPU_ABI;
+ field public static final deprecated java.lang.String CPU_ABI2;
+ field public static final java.lang.String DEVICE;
+ field public static final java.lang.String DISPLAY;
+ field public static final java.lang.String FINGERPRINT;
+ field public static final java.lang.String HARDWARE;
+ field public static final java.lang.String HOST;
+ field public static final java.lang.String ID;
+ field public static final java.lang.String MANUFACTURER;
+ field public static final java.lang.String MODEL;
+ field public static final java.lang.String PRODUCT;
+ field public static final deprecated java.lang.String RADIO;
+ field public static final java.lang.String SERIAL;
+ field public static final java.lang.String[] SUPPORTED_32_BIT_ABIS;
+ field public static final java.lang.String[] SUPPORTED_64_BIT_ABIS;
+ field public static final java.lang.String[] SUPPORTED_ABIS;
+ field public static final java.lang.String TAGS;
+ field public static final long TIME;
+ field public static final java.lang.String TYPE;
+ field public static final java.lang.String UNKNOWN = "unknown";
+ field public static final java.lang.String USER;
+ }
+
+ public static class Build.VERSION {
+ ctor public Build.VERSION();
+ field public static final java.lang.String BASE_OS;
+ field public static final java.lang.String CODENAME;
+ field public static final java.lang.String INCREMENTAL;
+ field public static final int PREVIEW_SDK_INT;
+ field public static final java.lang.String RELEASE;
+ field public static final deprecated java.lang.String SDK;
+ field public static final int SDK_INT;
+ field public static final java.lang.String SECURITY_PATCH;
+ }
+
+ public static class Build.VERSION_CODES {
+ ctor public Build.VERSION_CODES();
+ field public static final int BASE = 1; // 0x1
+ field public static final int BASE_1_1 = 2; // 0x2
+ field public static final int CUPCAKE = 3; // 0x3
+ field public static final int CUR_DEVELOPMENT = 10000; // 0x2710
+ field public static final int DONUT = 4; // 0x4
+ field public static final int ECLAIR = 5; // 0x5
+ field public static final int ECLAIR_0_1 = 6; // 0x6
+ field public static final int ECLAIR_MR1 = 7; // 0x7
+ field public static final int FROYO = 8; // 0x8
+ field public static final int GINGERBREAD = 9; // 0x9
+ field public static final int GINGERBREAD_MR1 = 10; // 0xa
+ field public static final int HONEYCOMB = 11; // 0xb
+ field public static final int HONEYCOMB_MR1 = 12; // 0xc
+ field public static final int HONEYCOMB_MR2 = 13; // 0xd
+ field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
+ field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf
+ field public static final int JELLY_BEAN = 16; // 0x10
+ field public static final int JELLY_BEAN_MR1 = 17; // 0x11
+ field public static final int JELLY_BEAN_MR2 = 18; // 0x12
+ field public static final int KITKAT = 19; // 0x13
+ field public static final int KITKAT_WATCH = 20; // 0x14
+ field public static final int LOLLIPOP = 21; // 0x15
+ field public static final int LOLLIPOP_MR1 = 22; // 0x16
+ field public static final int M = 23; // 0x17
+ field public static final int N = 10000; // 0x2710
+ }
+
+ public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
+ ctor public Bundle();
+ ctor public Bundle(java.lang.ClassLoader);
+ ctor public Bundle(int);
+ ctor public Bundle(android.os.Bundle);
+ ctor public Bundle(android.os.PersistableBundle);
+ method public java.lang.Object clone();
+ method public int describeContents();
+ method public android.os.IBinder getBinder(java.lang.String);
+ method public android.os.Bundle getBundle(java.lang.String);
+ method public byte getByte(java.lang.String);
+ method public java.lang.Byte getByte(java.lang.String, byte);
+ method public byte[] getByteArray(java.lang.String);
+ method public char getChar(java.lang.String);
+ method public char getChar(java.lang.String, char);
+ method public char[] getCharArray(java.lang.String);
+ method public java.lang.CharSequence getCharSequence(java.lang.String);
+ method public java.lang.CharSequence getCharSequence(java.lang.String, java.lang.CharSequence);
+ method public java.lang.CharSequence[] getCharSequenceArray(java.lang.String);
+ method public java.util.ArrayList<java.lang.CharSequence> getCharSequenceArrayList(java.lang.String);
+ method public java.lang.ClassLoader getClassLoader();
+ method public float getFloat(java.lang.String);
+ method public float getFloat(java.lang.String, float);
+ method public float[] getFloatArray(java.lang.String);
+ method public java.util.ArrayList<java.lang.Integer> getIntegerArrayList(java.lang.String);
+ method public T getParcelable(java.lang.String);
+ method public android.os.Parcelable[] getParcelableArray(java.lang.String);
+ method public java.util.ArrayList<T> getParcelableArrayList(java.lang.String);
+ method public java.io.Serializable getSerializable(java.lang.String);
+ method public short getShort(java.lang.String);
+ method public short getShort(java.lang.String, short);
+ method public short[] getShortArray(java.lang.String);
+ method public android.util.Size getSize(java.lang.String);
+ method public android.util.SizeF getSizeF(java.lang.String);
+ method public android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);
+ method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);
+ method public boolean hasFileDescriptors();
+ method public void putAll(android.os.Bundle);
+ method public void putBinder(java.lang.String, android.os.IBinder);
+ method public void putBundle(java.lang.String, android.os.Bundle);
+ method public void putByte(java.lang.String, byte);
+ method public void putByteArray(java.lang.String, byte[]);
+ method public void putChar(java.lang.String, char);
+ method public void putCharArray(java.lang.String, char[]);
+ method public void putCharSequence(java.lang.String, java.lang.CharSequence);
+ method public void putCharSequenceArray(java.lang.String, java.lang.CharSequence[]);
+ method public void putCharSequenceArrayList(java.lang.String, java.util.ArrayList<java.lang.CharSequence>);
+ method public void putFloat(java.lang.String, float);
+ method public void putFloatArray(java.lang.String, float[]);
+ method public void putIntegerArrayList(java.lang.String, java.util.ArrayList<java.lang.Integer>);
+ method public void putParcelable(java.lang.String, android.os.Parcelable);
+ method public void putParcelableArray(java.lang.String, android.os.Parcelable[]);
+ method public void putParcelableArrayList(java.lang.String, java.util.ArrayList<? extends android.os.Parcelable>);
+ method public void putSerializable(java.lang.String, java.io.Serializable);
+ method public void putShort(java.lang.String, short);
+ method public void putShortArray(java.lang.String, short[]);
+ method public void putSize(java.lang.String, android.util.Size);
+ method public void putSizeF(java.lang.String, android.util.SizeF);
+ method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);
+ method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);
+ method public void readFromParcel(android.os.Parcel);
+ method public void setClassLoader(java.lang.ClassLoader);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.Bundle> CREATOR;
+ field public static final android.os.Bundle EMPTY;
+ }
+
+ public final class CancellationSignal {
+ ctor public CancellationSignal();
+ method public void cancel();
+ method public boolean isCanceled();
+ method public void setOnCancelListener(android.os.CancellationSignal.OnCancelListener);
+ method public void throwIfCanceled();
+ }
+
+ public static abstract interface CancellationSignal.OnCancelListener {
+ method public abstract void onCancel();
+ }
+
+ public class ConditionVariable {
+ ctor public ConditionVariable();
+ ctor public ConditionVariable(boolean);
+ method public void block();
+ method public boolean block(long);
+ method public void close();
+ method public void open();
+ }
+
+ public abstract class CountDownTimer {
+ ctor public CountDownTimer(long, long);
+ method public final synchronized void cancel();
+ method public abstract void onFinish();
+ method public abstract void onTick(long);
+ method public final synchronized android.os.CountDownTimer start();
+ }
+
+ public class DeadObjectException extends android.os.RemoteException {
+ ctor public DeadObjectException();
+ ctor public DeadObjectException(java.lang.String);
+ }
+
+ public final class Debug {
+ method public static deprecated void changeDebugPort(int);
+ method public static void dumpHprofData(java.lang.String) throws java.io.IOException;
+ method public static boolean dumpService(java.lang.String, java.io.FileDescriptor, java.lang.String[]);
+ method public static void enableEmulatorTraceOutput();
+ method public static final int getBinderDeathObjectCount();
+ method public static final int getBinderLocalObjectCount();
+ method public static final int getBinderProxyObjectCount();
+ method public static int getBinderReceivedTransactions();
+ method public static int getBinderSentTransactions();
+ method public static deprecated int getGlobalAllocCount();
+ method public static deprecated int getGlobalAllocSize();
+ method public static deprecated int getGlobalClassInitCount();
+ method public static deprecated int getGlobalClassInitTime();
+ method public static deprecated int getGlobalExternalAllocCount();
+ method public static deprecated int getGlobalExternalAllocSize();
+ method public static deprecated int getGlobalExternalFreedCount();
+ method public static deprecated int getGlobalExternalFreedSize();
+ method public static deprecated int getGlobalFreedCount();
+ method public static deprecated int getGlobalFreedSize();
+ method public static deprecated int getGlobalGcInvocationCount();
+ method public static int getLoadedClassCount();
+ method public static void getMemoryInfo(android.os.Debug.MemoryInfo);
+ method public static long getNativeHeapAllocatedSize();
+ method public static long getNativeHeapFreeSize();
+ method public static long getNativeHeapSize();
+ method public static long getPss();
+ method public static java.lang.String getRuntimeStat(java.lang.String);
+ method public static java.util.Map<java.lang.String, java.lang.String> getRuntimeStats();
+ method public static deprecated int getThreadAllocCount();
+ method public static deprecated int getThreadAllocSize();
+ method public static deprecated int getThreadExternalAllocCount();
+ method public static deprecated int getThreadExternalAllocSize();
+ method public static deprecated int getThreadGcInvocationCount();
+ method public static boolean isDebuggerConnected();
+ method public static void printLoadedClasses(int);
+ method public static deprecated void resetAllCounts();
+ method public static deprecated void resetGlobalAllocCount();
+ method public static deprecated void resetGlobalAllocSize();
+ method public static deprecated void resetGlobalClassInitCount();
+ method public static deprecated void resetGlobalClassInitTime();
+ method public static deprecated void resetGlobalExternalAllocCount();
+ method public static deprecated void resetGlobalExternalAllocSize();
+ method public static deprecated void resetGlobalExternalFreedCount();
+ method public static deprecated void resetGlobalExternalFreedSize();
+ method public static deprecated void resetGlobalFreedCount();
+ method public static deprecated void resetGlobalFreedSize();
+ method public static deprecated void resetGlobalGcInvocationCount();
+ method public static deprecated void resetThreadAllocCount();
+ method public static deprecated void resetThreadAllocSize();
+ method public static deprecated void resetThreadExternalAllocCount();
+ method public static deprecated void resetThreadExternalAllocSize();
+ method public static deprecated void resetThreadGcInvocationCount();
+ method public static deprecated int setAllocationLimit(int);
+ method public static deprecated int setGlobalAllocationLimit(int);
+ method public static deprecated void startAllocCounting();
+ method public static void startMethodTracing();
+ method public static void startMethodTracing(java.lang.String);
+ method public static void startMethodTracing(java.lang.String, int);
+ method public static void startMethodTracing(java.lang.String, int, int);
+ method public static void startMethodTracingSampling(java.lang.String, int, int);
+ method public static void startNativeTracing();
+ method public static deprecated void stopAllocCounting();
+ method public static void stopMethodTracing();
+ method public static void stopNativeTracing();
+ method public static long threadCpuTimeNanos();
+ method public static void waitForDebugger();
+ method public static boolean waitingForDebugger();
+ field public static final int SHOW_CLASSLOADER = 2; // 0x2
+ field public static final int SHOW_FULL_DETAIL = 1; // 0x1
+ field public static final int SHOW_INITIALIZED = 4; // 0x4
+ field public static final deprecated int TRACE_COUNT_ALLOCS = 1; // 0x1
+ }
+
+ public static deprecated class Debug.InstructionCount {
+ ctor public Debug.InstructionCount();
+ method public boolean collect();
+ method public int globalMethodInvocations();
+ method public int globalTotal();
+ method public boolean resetAndStart();
+ }
+
+ public static class Debug.MemoryInfo implements android.os.Parcelable {
+ ctor public Debug.MemoryInfo();
+ method public int describeContents();
+ method public java.lang.String getMemoryStat(java.lang.String);
+ method public java.util.Map<java.lang.String, java.lang.String> getMemoryStats();
+ method public int getTotalPrivateClean();
+ method public int getTotalPrivateDirty();
+ method public int getTotalPss();
+ method public int getTotalSharedClean();
+ method public int getTotalSharedDirty();
+ method public int getTotalSwappablePss();
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.Debug.MemoryInfo> CREATOR;
+ field public int dalvikPrivateDirty;
+ field public int dalvikPss;
+ field public int dalvikSharedDirty;
+ field public int nativePrivateDirty;
+ field public int nativePss;
+ field public int nativeSharedDirty;
+ field public int otherPrivateDirty;
+ field public int otherPss;
+ field public int otherSharedDirty;
+ }
+
+ public class DropBoxManager {
+ ctor protected DropBoxManager();
+ method public void addData(java.lang.String, byte[], int);
+ method public void addFile(java.lang.String, java.io.File, int) throws java.io.IOException;
+ method public void addText(java.lang.String, java.lang.String);
+ method public android.os.DropBoxManager.Entry getNextEntry(java.lang.String, long);
+ method public boolean isTagEnabled(java.lang.String);
+ field public static final java.lang.String ACTION_DROPBOX_ENTRY_ADDED = "android.intent.action.DROPBOX_ENTRY_ADDED";
+ field public static final java.lang.String EXTRA_TAG = "tag";
+ field public static final java.lang.String EXTRA_TIME = "time";
+ field public static final int IS_EMPTY = 1; // 0x1
+ field public static final int IS_GZIPPED = 4; // 0x4
+ field public static final int IS_TEXT = 2; // 0x2
+ }
+
+ public static class DropBoxManager.Entry implements java.io.Closeable android.os.Parcelable {
+ ctor public DropBoxManager.Entry(java.lang.String, long);
+ ctor public DropBoxManager.Entry(java.lang.String, long, java.lang.String);
+ ctor public DropBoxManager.Entry(java.lang.String, long, byte[], int);
+ ctor public DropBoxManager.Entry(java.lang.String, long, android.os.ParcelFileDescriptor, int);
+ ctor public DropBoxManager.Entry(java.lang.String, long, java.io.File, int) throws java.io.IOException;
+ method public void close();
+ method public int describeContents();
+ method public int getFlags();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public java.lang.String getTag();
+ method public java.lang.String getText(int);
+ method public long getTimeMillis();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.DropBoxManager.Entry> CREATOR;
+ }
+
+ public class Environment {
+ ctor public Environment();
+ method public static java.io.File getDataDirectory();
+ method public static java.io.File getDownloadCacheDirectory();
+ method public static java.io.File getExternalStorageDirectory();
+ method public static java.io.File getExternalStoragePublicDirectory(java.lang.String);
+ method public static java.lang.String getExternalStorageState();
+ method public static java.lang.String getExternalStorageState(java.io.File);
+ method public static java.io.File getRootDirectory();
+ method public static deprecated java.lang.String getStorageState(java.io.File);
+ method public static boolean isExternalStorageEmulated();
+ method public static boolean isExternalStorageEmulated(java.io.File);
+ method public static boolean isExternalStorageRemovable();
+ method public static boolean isExternalStorageRemovable(java.io.File);
+ field public static java.lang.String DIRECTORY_ALARMS;
+ field public static java.lang.String DIRECTORY_DCIM;
+ field public static java.lang.String DIRECTORY_DOCUMENTS;
+ field public static java.lang.String DIRECTORY_DOWNLOADS;
+ field public static java.lang.String DIRECTORY_MOVIES;
+ field public static java.lang.String DIRECTORY_MUSIC;
+ field public static java.lang.String DIRECTORY_NOTIFICATIONS;
+ field public static java.lang.String DIRECTORY_PICTURES;
+ field public static java.lang.String DIRECTORY_PODCASTS;
+ field public static java.lang.String DIRECTORY_RINGTONES;
+ field public static final java.lang.String MEDIA_BAD_REMOVAL = "bad_removal";
+ field public static final java.lang.String MEDIA_CHECKING = "checking";
+ field public static final java.lang.String MEDIA_EJECTING = "ejecting";
+ field public static final java.lang.String MEDIA_MOUNTED = "mounted";
+ field public static final java.lang.String MEDIA_MOUNTED_READ_ONLY = "mounted_ro";
+ field public static final java.lang.String MEDIA_NOFS = "nofs";
+ field public static final java.lang.String MEDIA_REMOVED = "removed";
+ field public static final java.lang.String MEDIA_SHARED = "shared";
+ field public static final java.lang.String MEDIA_UNKNOWN = "unknown";
+ field public static final java.lang.String MEDIA_UNMOUNTABLE = "unmountable";
+ field public static final java.lang.String MEDIA_UNMOUNTED = "unmounted";
+ }
+
+ public abstract class FileObserver {
+ ctor public FileObserver(java.lang.String);
+ ctor public FileObserver(java.lang.String, int);
+ method public abstract void onEvent(int, java.lang.String);
+ method public void startWatching();
+ method public void stopWatching();
+ field public static final int ACCESS = 1; // 0x1
+ field public static final int ALL_EVENTS = 4095; // 0xfff
+ field public static final int ATTRIB = 4; // 0x4
+ field public static final int CLOSE_NOWRITE = 16; // 0x10
+ field public static final int CLOSE_WRITE = 8; // 0x8
+ field public static final int CREATE = 256; // 0x100
+ field public static final int DELETE = 512; // 0x200
+ field public static final int DELETE_SELF = 1024; // 0x400
+ field public static final int MODIFY = 2; // 0x2
+ field public static final int MOVED_FROM = 64; // 0x40
+ field public static final int MOVED_TO = 128; // 0x80
+ field public static final int MOVE_SELF = 2048; // 0x800
+ field public static final int OPEN = 32; // 0x20
+ }
+
+ public class Handler {
+ ctor public Handler();
+ ctor public Handler(android.os.Handler.Callback);
+ ctor public Handler(android.os.Looper);
+ ctor public Handler(android.os.Looper, android.os.Handler.Callback);
+ method public void dispatchMessage(android.os.Message);
+ method public final void dump(android.util.Printer, java.lang.String);
+ method public final android.os.Looper getLooper();
+ method public java.lang.String getMessageName(android.os.Message);
+ method public void handleMessage(android.os.Message);
+ method public final boolean hasMessages(int);
+ method public final boolean hasMessages(int, java.lang.Object);
+ method public final android.os.Message obtainMessage();
+ method public final android.os.Message obtainMessage(int);
+ method public final android.os.Message obtainMessage(int, java.lang.Object);
+ method public final android.os.Message obtainMessage(int, int, int);
+ method public final android.os.Message obtainMessage(int, int, int, java.lang.Object);
+ method public final boolean post(java.lang.Runnable);
+ method public final boolean postAtFrontOfQueue(java.lang.Runnable);
+ method public final boolean postAtTime(java.lang.Runnable, long);
+ method public final boolean postAtTime(java.lang.Runnable, java.lang.Object, long);
+ method public final boolean postDelayed(java.lang.Runnable, long);
+ method public final void removeCallbacks(java.lang.Runnable);
+ method public final void removeCallbacks(java.lang.Runnable, java.lang.Object);
+ method public final void removeCallbacksAndMessages(java.lang.Object);
+ method public final void removeMessages(int);
+ method public final void removeMessages(int, java.lang.Object);
+ method public final boolean sendEmptyMessage(int);
+ method public final boolean sendEmptyMessageAtTime(int, long);
+ method public final boolean sendEmptyMessageDelayed(int, long);
+ method public final boolean sendMessage(android.os.Message);
+ method public final boolean sendMessageAtFrontOfQueue(android.os.Message);
+ method public boolean sendMessageAtTime(android.os.Message, long);
+ method public final boolean sendMessageDelayed(android.os.Message, long);
+ }
+
+ public static abstract interface Handler.Callback {
+ method public abstract boolean handleMessage(android.os.Message);
+ }
+
+ public class HandlerThread extends java.lang.Thread {
+ ctor public HandlerThread(java.lang.String);
+ ctor public HandlerThread(java.lang.String, int);
+ method public android.os.Looper getLooper();
+ method public int getThreadId();
+ method protected void onLooperPrepared();
+ method public boolean quit();
+ method public boolean quitSafely();
+ }
+
+ public abstract interface IBinder {
+ method public abstract void dump(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;
+ method public abstract void dumpAsync(java.io.FileDescriptor, java.lang.String[]) throws android.os.RemoteException;
+ method public abstract java.lang.String getInterfaceDescriptor() throws android.os.RemoteException;
+ method public abstract boolean isBinderAlive();
+ method public abstract void linkToDeath(android.os.IBinder.DeathRecipient, int) throws android.os.RemoteException;
+ method public abstract boolean pingBinder();
+ method public abstract android.os.IInterface queryLocalInterface(java.lang.String);
+ method public abstract boolean transact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+ method public abstract boolean unlinkToDeath(android.os.IBinder.DeathRecipient, int);
+ field public static final int DUMP_TRANSACTION = 1598311760; // 0x5f444d50
+ field public static final int FIRST_CALL_TRANSACTION = 1; // 0x1
+ field public static final int FLAG_ONEWAY = 1; // 0x1
+ field public static final int INTERFACE_TRANSACTION = 1598968902; // 0x5f4e5446
+ field public static final int LAST_CALL_TRANSACTION = 16777215; // 0xffffff
+ field public static final int LIKE_TRANSACTION = 1598835019; // 0x5f4c494b
+ field public static final int PING_TRANSACTION = 1599098439; // 0x5f504e47
+ field public static final int TWEET_TRANSACTION = 1599362900; // 0x5f545754
+ }
+
+ public static abstract interface IBinder.DeathRecipient {
+ method public abstract void binderDied();
+ }
+
+ public abstract interface IInterface {
+ method public abstract android.os.IBinder asBinder();
+ }
+
+ public final class Looper {
+ method public void dump(android.util.Printer, java.lang.String);
+ method public static android.os.Looper getMainLooper();
+ method public android.os.MessageQueue getQueue();
+ method public java.lang.Thread getThread();
+ method public boolean isCurrentThread();
+ method public static void loop();
+ method public static android.os.Looper myLooper();
+ method public static android.os.MessageQueue myQueue();
+ method public static void prepare();
+ method public static void prepareMainLooper();
+ method public void quit();
+ method public void quitSafely();
+ method public void setMessageLogging(android.util.Printer);
+ }
+
+ public class MemoryFile {
+ ctor public MemoryFile(java.lang.String, int) throws java.io.IOException;
+ method public synchronized boolean allowPurging(boolean) throws java.io.IOException;
+ method public void close();
+ method public java.io.InputStream getInputStream();
+ method public java.io.OutputStream getOutputStream();
+ method public boolean isPurgingAllowed();
+ method public int length();
+ method public int readBytes(byte[], int, int, int) throws java.io.IOException;
+ method public void writeBytes(byte[], int, int, int) throws java.io.IOException;
+ }
+
+ public final class Message implements android.os.Parcelable {
+ ctor public Message();
+ method public void copyFrom(android.os.Message);
+ method public int describeContents();
+ method public java.lang.Runnable getCallback();
+ method public android.os.Bundle getData();
+ method public android.os.Handler getTarget();
+ method public long getWhen();
+ method public boolean isAsynchronous();
+ method public static android.os.Message obtain();
+ method public static android.os.Message obtain(android.os.Message);
+ method public static android.os.Message obtain(android.os.Handler);
+ method public static android.os.Message obtain(android.os.Handler, java.lang.Runnable);
+ method public static android.os.Message obtain(android.os.Handler, int);
+ method public static android.os.Message obtain(android.os.Handler, int, java.lang.Object);
+ method public static android.os.Message obtain(android.os.Handler, int, int, int);
+ method public static android.os.Message obtain(android.os.Handler, int, int, int, java.lang.Object);
+ method public android.os.Bundle peekData();
+ method public void recycle();
+ method public void sendToTarget();
+ method public void setAsynchronous(boolean);
+ method public void setData(android.os.Bundle);
+ method public void setTarget(android.os.Handler);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.Message> CREATOR;
+ field public int arg1;
+ field public int arg2;
+ field public java.lang.Object obj;
+ field public android.os.Messenger replyTo;
+ field public int sendingUid;
+ field public int what;
+ }
+
+ public final class MessageQueue {
+ method public void addIdleHandler(android.os.MessageQueue.IdleHandler);
+ method public void addOnFileDescriptorEventListener(java.io.FileDescriptor, int, android.os.MessageQueue.OnFileDescriptorEventListener);
+ method public boolean isIdle();
+ method public void removeIdleHandler(android.os.MessageQueue.IdleHandler);
+ method public void removeOnFileDescriptorEventListener(java.io.FileDescriptor);
+ }
+
+ public static abstract interface MessageQueue.IdleHandler {
+ method public abstract boolean queueIdle();
+ }
+
+ public static abstract interface MessageQueue.OnFileDescriptorEventListener {
+ method public abstract int onFileDescriptorEvents(java.io.FileDescriptor, int);
+ field public static final int EVENT_ERROR = 4; // 0x4
+ field public static final int EVENT_INPUT = 1; // 0x1
+ field public static final int EVENT_OUTPUT = 2; // 0x2
+ }
+
+ public final class Messenger implements android.os.Parcelable {
+ ctor public Messenger(android.os.Handler);
+ ctor public Messenger(android.os.IBinder);
+ method public int describeContents();
+ method public android.os.IBinder getBinder();
+ method public static android.os.Messenger readMessengerOrNullFromParcel(android.os.Parcel);
+ method public void send(android.os.Message) throws android.os.RemoteException;
+ method public static void writeMessengerOrNullToParcel(android.os.Messenger, android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.Messenger> CREATOR;
+ }
+
+ public class NetworkOnMainThreadException extends java.lang.RuntimeException {
+ ctor public NetworkOnMainThreadException();
+ }
+
+ public class OperationCanceledException extends java.lang.RuntimeException {
+ ctor public OperationCanceledException();
+ ctor public OperationCanceledException(java.lang.String);
+ }
+
+ public final class Parcel {
+ method public final void appendFrom(android.os.Parcel, int, int);
+ method public final android.os.IBinder[] createBinderArray();
+ method public final java.util.ArrayList<android.os.IBinder> createBinderArrayList();
+ method public final boolean[] createBooleanArray();
+ method public final byte[] createByteArray();
+ method public final char[] createCharArray();
+ method public final double[] createDoubleArray();
+ method public final float[] createFloatArray();
+ method public final int[] createIntArray();
+ method public final long[] createLongArray();
+ method public final java.lang.String[] createStringArray();
+ method public final java.util.ArrayList<java.lang.String> createStringArrayList();
+ method public final T[] createTypedArray(android.os.Parcelable.Creator<T>);
+ method public final java.util.ArrayList<T> createTypedArrayList(android.os.Parcelable.Creator<T>);
+ method public final int dataAvail();
+ method public final int dataCapacity();
+ method public final int dataPosition();
+ method public final int dataSize();
+ method public final void enforceInterface(java.lang.String);
+ method public final boolean hasFileDescriptors();
+ method public final byte[] marshall();
+ method public static android.os.Parcel obtain();
+ method public final java.lang.Object[] readArray(java.lang.ClassLoader);
+ method public final java.util.ArrayList readArrayList(java.lang.ClassLoader);
+ method public final void readBinderArray(android.os.IBinder[]);
+ method public final void readBinderList(java.util.List<android.os.IBinder>);
+ method public final void readBooleanArray(boolean[]);
+ method public final android.os.Bundle readBundle();
+ method public final android.os.Bundle readBundle(java.lang.ClassLoader);
+ method public final byte readByte();
+ method public final void readByteArray(byte[]);
+ method public final void readCharArray(char[]);
+ method public final double readDouble();
+ method public final void readDoubleArray(double[]);
+ method public final void readException();
+ method public final void readException(int, java.lang.String);
+ method public final android.os.ParcelFileDescriptor readFileDescriptor();
+ method public final float readFloat();
+ method public final void readFloatArray(float[]);
+ method public final java.util.HashMap readHashMap(java.lang.ClassLoader);
+ method public final int readInt();
+ method public final void readIntArray(int[]);
+ method public final void readList(java.util.List, java.lang.ClassLoader);
+ method public final long readLong();
+ method public final void readLongArray(long[]);
+ method public final void readMap(java.util.Map, java.lang.ClassLoader);
+ method public final T readParcelable(java.lang.ClassLoader);
+ method public final android.os.Parcelable[] readParcelableArray(java.lang.ClassLoader);
+ method public final android.os.PersistableBundle readPersistableBundle();
+ method public final android.os.PersistableBundle readPersistableBundle(java.lang.ClassLoader);
+ method public final java.io.Serializable readSerializable();
+ method public final android.util.Size readSize();
+ method public final android.util.SizeF readSizeF();
+ method public final android.util.SparseArray readSparseArray(java.lang.ClassLoader);
+ method public final android.util.SparseBooleanArray readSparseBooleanArray();
+ method public final java.lang.String readString();
+ method public final void readStringArray(java.lang.String[]);
+ method public final void readStringList(java.util.List<java.lang.String>);
+ method public final android.os.IBinder readStrongBinder();
+ method public final void readTypedArray(T[], android.os.Parcelable.Creator<T>);
+ method public final void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);
+ method public final T readTypedObject(android.os.Parcelable.Creator<T>);
+ method public final java.lang.Object readValue(java.lang.ClassLoader);
+ method public final void recycle();
+ method public final void setDataCapacity(int);
+ method public final void setDataPosition(int);
+ method public final void setDataSize(int);
+ method public final void unmarshall(byte[], int, int);
+ method public final void writeArray(java.lang.Object[]);
+ method public final void writeBinderArray(android.os.IBinder[]);
+ method public final void writeBinderList(java.util.List<android.os.IBinder>);
+ method public final void writeBooleanArray(boolean[]);
+ method public final void writeBundle(android.os.Bundle);
+ method public final void writeByte(byte);
+ method public final void writeByteArray(byte[]);
+ method public final void writeByteArray(byte[], int, int);
+ method public final void writeCharArray(char[]);
+ method public final void writeDouble(double);
+ method public final void writeDoubleArray(double[]);
+ method public final void writeException(java.lang.Exception);
+ method public final void writeFileDescriptor(java.io.FileDescriptor);
+ method public final void writeFloat(float);
+ method public final void writeFloatArray(float[]);
+ method public final void writeInt(int);
+ method public final void writeIntArray(int[]);
+ method public final void writeInterfaceToken(java.lang.String);
+ method public final void writeList(java.util.List);
+ method public final void writeLong(long);
+ method public final void writeLongArray(long[]);
+ method public final void writeMap(java.util.Map);
+ method public final void writeNoException();
+ method public final void writeParcelable(android.os.Parcelable, int);
+ method public final void writeParcelableArray(T[], int);
+ method public final void writePersistableBundle(android.os.PersistableBundle);
+ method public final void writeSerializable(java.io.Serializable);
+ method public final void writeSize(android.util.Size);
+ method public final void writeSizeF(android.util.SizeF);
+ method public final void writeSparseArray(android.util.SparseArray<java.lang.Object>);
+ method public final void writeSparseBooleanArray(android.util.SparseBooleanArray);
+ method public final void writeString(java.lang.String);
+ method public final void writeStringArray(java.lang.String[]);
+ method public final void writeStringList(java.util.List<java.lang.String>);
+ method public final void writeStrongBinder(android.os.IBinder);
+ method public final void writeStrongInterface(android.os.IInterface);
+ method public final void writeTypedArray(T[], int);
+ method public final void writeTypedList(java.util.List<T>);
+ method public final void writeTypedObject(T, int);
+ method public final void writeValue(java.lang.Object);
+ field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;
+ }
+
+ public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable {
+ ctor public ParcelFileDescriptor(android.os.ParcelFileDescriptor);
+ method public static android.os.ParcelFileDescriptor adoptFd(int);
+ method public boolean canDetectErrors();
+ method public void checkError() throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public void closeWithError(java.lang.String) throws java.io.IOException;
+ method public static android.os.ParcelFileDescriptor[] createPipe() throws java.io.IOException;
+ method public static android.os.ParcelFileDescriptor[] createReliablePipe() throws java.io.IOException;
+ method public static android.os.ParcelFileDescriptor[] createReliableSocketPair() throws java.io.IOException;
+ method public static android.os.ParcelFileDescriptor[] createSocketPair() throws java.io.IOException;
+ method public int describeContents();
+ method public int detachFd();
+ method public static android.os.ParcelFileDescriptor dup(java.io.FileDescriptor) throws java.io.IOException;
+ method public android.os.ParcelFileDescriptor dup() throws java.io.IOException;
+ method public static android.os.ParcelFileDescriptor fromDatagramSocket(java.net.DatagramSocket);
+ method public static android.os.ParcelFileDescriptor fromFd(int) throws java.io.IOException;
+ method public static android.os.ParcelFileDescriptor fromSocket(java.net.Socket);
+ method public int getFd();
+ method public java.io.FileDescriptor getFileDescriptor();
+ method public long getStatSize();
+ method public static android.os.ParcelFileDescriptor open(java.io.File, int) throws java.io.FileNotFoundException;
+ method public static android.os.ParcelFileDescriptor open(java.io.File, int, android.os.Handler, android.os.ParcelFileDescriptor.OnCloseListener) throws java.io.IOException;
+ method public static int parseMode(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.ParcelFileDescriptor> CREATOR;
+ field public static final int MODE_APPEND = 33554432; // 0x2000000
+ field public static final int MODE_CREATE = 134217728; // 0x8000000
+ field public static final int MODE_READ_ONLY = 268435456; // 0x10000000
+ field public static final int MODE_READ_WRITE = 805306368; // 0x30000000
+ field public static final int MODE_TRUNCATE = 67108864; // 0x4000000
+ field public static final deprecated int MODE_WORLD_READABLE = 1; // 0x1
+ field public static final deprecated int MODE_WORLD_WRITEABLE = 2; // 0x2
+ field public static final int MODE_WRITE_ONLY = 536870912; // 0x20000000
+ }
+
+ public static class ParcelFileDescriptor.AutoCloseInputStream extends java.io.FileInputStream {
+ ctor public ParcelFileDescriptor.AutoCloseInputStream(android.os.ParcelFileDescriptor);
+ }
+
+ public static class ParcelFileDescriptor.AutoCloseOutputStream extends java.io.FileOutputStream {
+ ctor public ParcelFileDescriptor.AutoCloseOutputStream(android.os.ParcelFileDescriptor);
+ }
+
+ public static class ParcelFileDescriptor.FileDescriptorDetachedException extends java.io.IOException {
+ ctor public ParcelFileDescriptor.FileDescriptorDetachedException();
+ }
+
+ public static abstract interface ParcelFileDescriptor.OnCloseListener {
+ method public abstract void onClose(java.io.IOException);
+ }
+
+ public class ParcelFormatException extends java.lang.RuntimeException {
+ ctor public ParcelFormatException();
+ ctor public ParcelFormatException(java.lang.String);
+ }
+
+ public final class ParcelUuid implements android.os.Parcelable {
+ ctor public ParcelUuid(java.util.UUID);
+ method public int describeContents();
+ method public static android.os.ParcelUuid fromString(java.lang.String);
+ method public java.util.UUID getUuid();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.ParcelUuid> CREATOR;
+ }
+
+ public abstract interface Parcelable {
+ method public abstract int describeContents();
+ method public abstract void writeToParcel(android.os.Parcel, int);
+ field public static final int CONTENTS_FILE_DESCRIPTOR = 1; // 0x1
+ field public static final int PARCELABLE_WRITE_RETURN_VALUE = 1; // 0x1
+ }
+
+ public static abstract interface Parcelable.ClassLoaderCreator implements android.os.Parcelable.Creator {
+ method public abstract T createFromParcel(android.os.Parcel, java.lang.ClassLoader);
+ }
+
+ public static abstract interface Parcelable.Creator {
+ method public abstract T createFromParcel(android.os.Parcel);
+ method public abstract T[] newArray(int);
+ }
+
+ public class PatternMatcher implements android.os.Parcelable {
+ ctor public PatternMatcher(java.lang.String, int);
+ ctor public PatternMatcher(android.os.Parcel);
+ method public int describeContents();
+ method public final java.lang.String getPath();
+ method public final int getType();
+ method public boolean match(java.lang.String);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.PatternMatcher> CREATOR;
+ field public static final int PATTERN_LITERAL = 0; // 0x0
+ field public static final int PATTERN_PREFIX = 1; // 0x1
+ field public static final int PATTERN_SIMPLE_GLOB = 2; // 0x2
+ }
+
+ public final class PersistableBundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
+ ctor public PersistableBundle();
+ ctor public PersistableBundle(int);
+ ctor public PersistableBundle(android.os.PersistableBundle);
+ method public java.lang.Object clone();
+ method public int describeContents();
+ method public android.os.PersistableBundle getPersistableBundle(java.lang.String);
+ method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.PersistableBundle> CREATOR;
+ field public static final android.os.PersistableBundle EMPTY;
+ }
+
+ public final class PowerManager {
+ method public boolean isDeviceIdleMode();
+ method public boolean isIgnoringBatteryOptimizations(java.lang.String);
+ method public boolean isInteractive();
+ method public boolean isPowerSaveMode();
+ method public deprecated boolean isScreenOn();
+ method public boolean isWakeLockLevelSupported(int);
+ method public android.os.PowerManager.WakeLock newWakeLock(int, java.lang.String);
+ method public void reboot(java.lang.String);
+ field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000
+ field public static final java.lang.String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";
+ field public static final java.lang.String ACTION_POWER_SAVE_MODE_CHANGED = "android.os.action.POWER_SAVE_MODE_CHANGED";
+ field public static final deprecated int FULL_WAKE_LOCK = 26; // 0x1a
+ field public static final int ON_AFTER_RELEASE = 536870912; // 0x20000000
+ field public static final int PARTIAL_WAKE_LOCK = 1; // 0x1
+ field public static final int PROXIMITY_SCREEN_OFF_WAKE_LOCK = 32; // 0x20
+ field public static final int RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY = 1; // 0x1
+ field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa
+ field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6
+ }
+
+ public final class PowerManager.WakeLock {
+ method public void acquire();
+ method public void acquire(long);
+ method public boolean isHeld();
+ method public void release();
+ method public void release(int);
+ method public void setReferenceCounted(boolean);
+ method public void setWorkSource(android.os.WorkSource);
+ }
+
+ public class Process {
+ ctor public Process();
+ method public static final long getElapsedCpuTime();
+ method public static final int getGidForName(java.lang.String);
+ method public static final int getThreadPriority(int) throws java.lang.IllegalArgumentException;
+ method public static final int getUidForName(java.lang.String);
+ method public static final boolean is64Bit();
+ method public static final void killProcess(int);
+ method public static final int myPid();
+ method public static final int myTid();
+ method public static final int myUid();
+ method public static android.os.UserHandle myUserHandle();
+ method public static final void sendSignal(int, int);
+ method public static final void setThreadPriority(int, int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;
+ method public static final void setThreadPriority(int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;
+ method public static final deprecated boolean supportsProcesses();
+ field public static final int FIRST_APPLICATION_UID = 10000; // 0x2710
+ field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f
+ field public static final int PHONE_UID = 1001; // 0x3e9
+ field public static final int SIGNAL_KILL = 9; // 0x9
+ field public static final int SIGNAL_QUIT = 3; // 0x3
+ field public static final int SIGNAL_USR1 = 10; // 0xa
+ field public static final int SYSTEM_UID = 1000; // 0x3e8
+ field public static final int THREAD_PRIORITY_AUDIO = -16; // 0xfffffff0
+ field public static final int THREAD_PRIORITY_BACKGROUND = 10; // 0xa
+ field public static final int THREAD_PRIORITY_DEFAULT = 0; // 0x0
+ field public static final int THREAD_PRIORITY_DISPLAY = -4; // 0xfffffffc
+ field public static final int THREAD_PRIORITY_FOREGROUND = -2; // 0xfffffffe
+ field public static final int THREAD_PRIORITY_LESS_FAVORABLE = 1; // 0x1
+ field public static final int THREAD_PRIORITY_LOWEST = 19; // 0x13
+ field public static final int THREAD_PRIORITY_MORE_FAVORABLE = -1; // 0xffffffff
+ field public static final int THREAD_PRIORITY_URGENT_AUDIO = -19; // 0xffffffed
+ field public static final int THREAD_PRIORITY_URGENT_DISPLAY = -8; // 0xfffffff8
+ }
+
+ public class RecoverySystem {
+ method public static void installPackage(android.content.Context, java.io.File) throws java.io.IOException;
+ method public static void rebootWipeCache(android.content.Context) throws java.io.IOException;
+ method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;
+ method public static void verifyPackage(java.io.File, android.os.RecoverySystem.ProgressListener, java.io.File) throws java.security.GeneralSecurityException, java.io.IOException;
+ }
+
+ public static abstract interface RecoverySystem.ProgressListener {
+ method public abstract void onProgress(int);
+ }
+
+ public class RemoteCallbackList {
+ ctor public RemoteCallbackList();
+ method public int beginBroadcast();
+ method public void finishBroadcast();
+ method public java.lang.Object getBroadcastCookie(int);
+ method public E getBroadcastItem(int);
+ method public int getRegisteredCallbackCount();
+ method public void kill();
+ method public void onCallbackDied(E);
+ method public void onCallbackDied(E, java.lang.Object);
+ method public boolean register(E);
+ method public boolean register(E, java.lang.Object);
+ method public boolean unregister(E);
+ }
+
+ public class RemoteException extends android.util.AndroidException {
+ ctor public RemoteException();
+ ctor public RemoteException(java.lang.String);
+ }
+
+ public class ResultReceiver implements android.os.Parcelable {
+ ctor public ResultReceiver(android.os.Handler);
+ method public int describeContents();
+ method protected void onReceiveResult(int, android.os.Bundle);
+ method public void send(int, android.os.Bundle);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.ResultReceiver> CREATOR;
+ }
+
+ public class StatFs {
+ ctor public StatFs(java.lang.String);
+ method public deprecated int getAvailableBlocks();
+ method public long getAvailableBlocksLong();
+ method public long getAvailableBytes();
+ method public deprecated int getBlockCount();
+ method public long getBlockCountLong();
+ method public deprecated int getBlockSize();
+ method public long getBlockSizeLong();
+ method public deprecated int getFreeBlocks();
+ method public long getFreeBlocksLong();
+ method public long getFreeBytes();
+ method public long getTotalBytes();
+ method public void restat(java.lang.String);
+ }
+
+ public final class StrictMode {
+ method public static android.os.StrictMode.ThreadPolicy allowThreadDiskReads();
+ method public static android.os.StrictMode.ThreadPolicy allowThreadDiskWrites();
+ method public static void enableDefaults();
+ method public static android.os.StrictMode.ThreadPolicy getThreadPolicy();
+ method public static android.os.StrictMode.VmPolicy getVmPolicy();
+ method public static void noteSlowCall(java.lang.String);
+ method public static void setThreadPolicy(android.os.StrictMode.ThreadPolicy);
+ method public static void setVmPolicy(android.os.StrictMode.VmPolicy);
+ }
+
+ public static final class StrictMode.ThreadPolicy {
+ field public static final android.os.StrictMode.ThreadPolicy LAX;
+ }
+
+ public static final class StrictMode.ThreadPolicy.Builder {
+ ctor public StrictMode.ThreadPolicy.Builder();
+ ctor public StrictMode.ThreadPolicy.Builder(android.os.StrictMode.ThreadPolicy);
+ method public android.os.StrictMode.ThreadPolicy build();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectAll();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectCustomSlowCalls();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectDiskReads();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectNetwork();
+ method public android.os.StrictMode.ThreadPolicy.Builder detectResourceMismatches();
+ method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeath();
+ method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork();
+ method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();
+ method public android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox();
+ method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();
+ method public android.os.StrictMode.ThreadPolicy.Builder penaltyLog();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitAll();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitDiskReads();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitNetwork();
+ method public android.os.StrictMode.ThreadPolicy.Builder permitResourceMismatches();
+ }
+
+ public static final class StrictMode.VmPolicy {
+ field public static final android.os.StrictMode.VmPolicy LAX;
+ }
+
+ public static final class StrictMode.VmPolicy.Builder {
+ ctor public StrictMode.VmPolicy.Builder();
+ ctor public StrictMode.VmPolicy.Builder(android.os.StrictMode.VmPolicy);
+ method public android.os.StrictMode.VmPolicy build();
+ method public android.os.StrictMode.VmPolicy.Builder detectActivityLeaks();
+ method public android.os.StrictMode.VmPolicy.Builder detectAll();
+ method public android.os.StrictMode.VmPolicy.Builder detectCleartextNetwork();
+ method public android.os.StrictMode.VmPolicy.Builder detectFileUriExposure();
+ method public android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects();
+ method public android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects();
+ method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();
+ method public android.os.StrictMode.VmPolicy.Builder penaltyLog();
+ method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);
+ }
+
+ public final class SystemClock {
+ method public static long currentThreadTimeMillis();
+ method public static long elapsedRealtime();
+ method public static long elapsedRealtimeNanos();
+ method public static boolean setCurrentTimeMillis(long);
+ method public static void sleep(long);
+ method public static long uptimeMillis();
+ }
+
+ public abstract class TokenWatcher {
+ ctor public TokenWatcher(android.os.Handler, java.lang.String);
+ method public void acquire(android.os.IBinder, java.lang.String);
+ method public abstract void acquired();
+ method public void cleanup(android.os.IBinder, boolean);
+ method public void dump();
+ method public void dump(java.io.PrintWriter);
+ method public boolean isAcquired();
+ method public void release(android.os.IBinder);
+ method public abstract void released();
+ }
+
+ public final class Trace {
+ method public static void beginSection(java.lang.String);
+ method public static void endSection();
+ }
+
+ public class TransactionTooLargeException extends android.os.RemoteException {
+ ctor public TransactionTooLargeException();
+ ctor public TransactionTooLargeException(java.lang.String);
+ }
+
+ public final class UserHandle implements android.os.Parcelable {
+ ctor public UserHandle(android.os.Parcel);
+ method public int describeContents();
+ method public static android.os.UserHandle readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ method public static void writeToParcel(android.os.UserHandle, android.os.Parcel);
+ field public static final android.os.Parcelable.Creator<android.os.UserHandle> CREATOR;
+ }
+
+ public class UserManager {
+ method public android.os.Bundle getApplicationRestrictions(java.lang.String);
+ method public long getSerialNumberForUser(android.os.UserHandle);
+ method public int getUserCount();
+ method public long getUserCreationTime(android.os.UserHandle);
+ method public android.os.UserHandle getUserForSerialNumber(long);
+ method public java.lang.String getUserName();
+ method public java.util.List<android.os.UserHandle> getUserProfiles();
+ method public android.os.Bundle getUserRestrictions();
+ method public android.os.Bundle getUserRestrictions(android.os.UserHandle);
+ method public boolean hasUserRestriction(java.lang.String);
+ method public boolean isSystemUser();
+ method public boolean isUserAGoat();
+ method public boolean isUserRunning(android.os.UserHandle);
+ method public boolean isUserRunningOrStopping(android.os.UserHandle);
+ method public boolean isUserRunningUnlocked(android.os.UserHandle);
+ method public deprecated boolean setRestrictionsChallenge(java.lang.String);
+ method public deprecated void setUserRestriction(java.lang.String, boolean);
+ method public deprecated void setUserRestrictions(android.os.Bundle);
+ method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
+ field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";
+ field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";
+ field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
+ field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";
+ field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
+ field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts";
+ field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";
+ field public static final java.lang.String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks";
+ field public static final java.lang.String DISALLOW_CONFIG_TETHERING = "no_config_tethering";
+ field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn";
+ field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";
+ field public static final java.lang.String DISALLOW_CREATE_WINDOWS = "no_create_windows";
+ field public static final java.lang.String DISALLOW_CROSS_PROFILE_COPY_PASTE = "no_cross_profile_copy_paste";
+ field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";
+ field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset";
+ field public static final java.lang.String DISALLOW_FUN = "no_fun";
+ field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps";
+ field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";
+ field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
+ field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";
+ field public static final java.lang.String DISALLOW_NETWORK_RESET = "no_network_reset";
+ field public static final java.lang.String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";
+ field public static final java.lang.String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";
+ field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
+ field public static final java.lang.String DISALLOW_SAFE_BOOT = "no_safe_boot";
+ field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";
+ field public static final java.lang.String DISALLOW_SMS = "no_sms";
+ field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps";
+ field public static final java.lang.String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";
+ field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";
+ field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps";
+ field public static final java.lang.String KEY_RESTRICTIONS_PENDING = "restrictions_pending";
+ }
+
+ public abstract class Vibrator {
+ method public abstract void cancel();
+ method public abstract boolean hasVibrator();
+ method public void vibrate(long);
+ method public void vibrate(long, android.media.AudioAttributes);
+ method public void vibrate(long[], int);
+ method public void vibrate(long[], int, android.media.AudioAttributes);
+ }
+
+ public class WorkSource implements android.os.Parcelable {
+ ctor public WorkSource();
+ ctor public WorkSource(android.os.WorkSource);
+ method public boolean add(android.os.WorkSource);
+ method public void clear();
+ method public int describeContents();
+ method public boolean diff(android.os.WorkSource);
+ method public boolean remove(android.os.WorkSource);
+ method public void set(android.os.WorkSource);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.os.WorkSource> CREATOR;
+ }
+
+}
+
+package android.os.storage {
+
+ public abstract class OnObbStateChangeListener {
+ ctor public OnObbStateChangeListener();
+ method public void onObbStateChange(java.lang.String, int);
+ field public static final int ERROR_ALREADY_MOUNTED = 24; // 0x18
+ field public static final int ERROR_COULD_NOT_MOUNT = 21; // 0x15
+ field public static final int ERROR_COULD_NOT_UNMOUNT = 22; // 0x16
+ field public static final int ERROR_INTERNAL = 20; // 0x14
+ field public static final int ERROR_NOT_MOUNTED = 23; // 0x17
+ field public static final int ERROR_PERMISSION_DENIED = 25; // 0x19
+ field public static final int MOUNTED = 1; // 0x1
+ field public static final int UNMOUNTED = 2; // 0x2
+ }
+
+ public class StorageManager {
+ method public java.lang.String getMountedObbPath(java.lang.String);
+ method public boolean isObbMounted(java.lang.String);
+ method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);
+ method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
+ }
+
+}
+
+package android.preference {
+
+ public class CheckBoxPreference extends android.preference.TwoStatePreference {
+ ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet);
+ ctor public CheckBoxPreference(android.content.Context);
+ }
+
+ public abstract class DialogPreference extends android.preference.Preference implements android.content.DialogInterface.OnClickListener android.content.DialogInterface.OnDismissListener android.preference.PreferenceManager.OnActivityDestroyListener {
+ ctor public DialogPreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public DialogPreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public DialogPreference(android.content.Context, android.util.AttributeSet);
+ ctor public DialogPreference(android.content.Context);
+ method public android.app.Dialog getDialog();
+ method public android.graphics.drawable.Drawable getDialogIcon();
+ method public int getDialogLayoutResource();
+ method public java.lang.CharSequence getDialogMessage();
+ method public java.lang.CharSequence getDialogTitle();
+ method public java.lang.CharSequence getNegativeButtonText();
+ method public java.lang.CharSequence getPositiveButtonText();
+ method public void onActivityDestroy();
+ method protected void onBindDialogView(android.view.View);
+ method public void onClick(android.content.DialogInterface, int);
+ method protected android.view.View onCreateDialogView();
+ method protected void onDialogClosed(boolean);
+ method public void onDismiss(android.content.DialogInterface);
+ method protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder);
+ method public void setDialogIcon(android.graphics.drawable.Drawable);
+ method public void setDialogIcon(int);
+ method public void setDialogLayoutResource(int);
+ method public void setDialogMessage(java.lang.CharSequence);
+ method public void setDialogMessage(int);
+ method public void setDialogTitle(java.lang.CharSequence);
+ method public void setDialogTitle(int);
+ method public void setNegativeButtonText(java.lang.CharSequence);
+ method public void setNegativeButtonText(int);
+ method public void setPositiveButtonText(java.lang.CharSequence);
+ method public void setPositiveButtonText(int);
+ method protected void showDialog(android.os.Bundle);
+ }
+
+ public class EditTextPreference extends android.preference.DialogPreference {
+ ctor public EditTextPreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public EditTextPreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public EditTextPreference(android.content.Context, android.util.AttributeSet);
+ ctor public EditTextPreference(android.content.Context);
+ method public android.widget.EditText getEditText();
+ method public java.lang.String getText();
+ method protected void onAddEditTextToDialogView(android.view.View, android.widget.EditText);
+ method public void setText(java.lang.String);
+ }
+
+ public class ListPreference extends android.preference.DialogPreference {
+ ctor public ListPreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public ListPreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public ListPreference(android.content.Context, android.util.AttributeSet);
+ ctor public ListPreference(android.content.Context);
+ method public int findIndexOfValue(java.lang.String);
+ method public java.lang.CharSequence[] getEntries();
+ method public java.lang.CharSequence getEntry();
+ method public java.lang.CharSequence[] getEntryValues();
+ method public java.lang.String getValue();
+ method public void setEntries(java.lang.CharSequence[]);
+ method public void setEntries(int);
+ method public void setEntryValues(java.lang.CharSequence[]);
+ method public void setEntryValues(int);
+ method public void setValue(java.lang.String);
+ method public void setValueIndex(int);
+ }
+
+ public class MultiSelectListPreference extends android.preference.DialogPreference {
+ ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet);
+ ctor public MultiSelectListPreference(android.content.Context);
+ method public int findIndexOfValue(java.lang.String);
+ method public java.lang.CharSequence[] getEntries();
+ method public java.lang.CharSequence[] getEntryValues();
+ method public java.util.Set<java.lang.String> getValues();
+ method public void setEntries(java.lang.CharSequence[]);
+ method public void setEntries(int);
+ method public void setEntryValues(java.lang.CharSequence[]);
+ method public void setEntryValues(int);
+ method public void setValues(java.util.Set<java.lang.String>);
+ }
+
+ public class Preference implements java.lang.Comparable {
+ ctor public Preference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public Preference(android.content.Context, android.util.AttributeSet, int);
+ ctor public Preference(android.content.Context, android.util.AttributeSet);
+ ctor public Preference(android.content.Context);
+ method protected boolean callChangeListener(java.lang.Object);
+ method public int compareTo(android.preference.Preference);
+ method protected android.preference.Preference findPreferenceInHierarchy(java.lang.String);
+ method public android.content.Context getContext();
+ method public java.lang.String getDependency();
+ method public android.content.SharedPreferences.Editor getEditor();
+ method public android.os.Bundle getExtras();
+ method public java.lang.String getFragment();
+ method public android.graphics.drawable.Drawable getIcon();
+ method public android.content.Intent getIntent();
+ method public java.lang.String getKey();
+ method public int getLayoutResource();
+ method public android.preference.Preference.OnPreferenceChangeListener getOnPreferenceChangeListener();
+ method public android.preference.Preference.OnPreferenceClickListener getOnPreferenceClickListener();
+ method public int getOrder();
+ method protected boolean getPersistedBoolean(boolean);
+ method protected float getPersistedFloat(float);
+ method protected int getPersistedInt(int);
+ method protected long getPersistedLong(long);
+ method protected java.lang.String getPersistedString(java.lang.String);
+ method public android.preference.PreferenceManager getPreferenceManager();
+ method public android.content.SharedPreferences getSharedPreferences();
+ method public boolean getShouldDisableView();
+ method public java.lang.CharSequence getSummary();
+ method public java.lang.CharSequence getTitle();
+ method public int getTitleRes();
+ method public android.view.View getView(android.view.View, android.view.ViewGroup);
+ method public int getWidgetLayoutResource();
+ method public boolean hasKey();
+ method public boolean isEnabled();
+ method public boolean isPersistent();
+ method public boolean isSelectable();
+ method protected void notifyChanged();
+ method public void notifyDependencyChange(boolean);
+ method protected void notifyHierarchyChanged();
+ method protected void onAttachedToActivity();
+ method protected void onAttachedToHierarchy(android.preference.PreferenceManager);
+ method protected void onBindView(android.view.View);
+ method protected void onClick();
+ method protected android.view.View onCreateView(android.view.ViewGroup);
+ method public void onDependencyChanged(android.preference.Preference, boolean);
+ method protected void onDetachedFromActivity();
+ method protected java.lang.Object onGetDefaultValue(android.content.res.TypedArray, int);
+ method public void onParentChanged(android.preference.Preference, boolean);
+ method protected void onPrepareForRemoval();
+ method protected void onRestoreInstanceState(android.os.Parcelable);
+ method protected android.os.Parcelable onSaveInstanceState();
+ method protected void onSetInitialValue(boolean, java.lang.Object);
+ method public android.os.Bundle peekExtras();
+ method protected boolean persistBoolean(boolean);
+ method protected boolean persistFloat(float);
+ method protected boolean persistInt(int);
+ method protected boolean persistLong(long);
+ method protected boolean persistString(java.lang.String);
+ method public void restoreHierarchyState(android.os.Bundle);
+ method public void saveHierarchyState(android.os.Bundle);
+ method public void setDefaultValue(java.lang.Object);
+ method public void setDependency(java.lang.String);
+ method public void setEnabled(boolean);
+ method public void setFragment(java.lang.String);
+ method public void setIcon(android.graphics.drawable.Drawable);
+ method public void setIcon(int);
+ method public void setIntent(android.content.Intent);
+ method public void setKey(java.lang.String);
+ method public void setLayoutResource(int);
+ method public void setOnPreferenceChangeListener(android.preference.Preference.OnPreferenceChangeListener);
+ method public void setOnPreferenceClickListener(android.preference.Preference.OnPreferenceClickListener);
+ method public void setOrder(int);
+ method public void setPersistent(boolean);
+ method public void setSelectable(boolean);
+ method public void setShouldDisableView(boolean);
+ method public void setSummary(java.lang.CharSequence);
+ method public void setSummary(int);
+ method public void setTitle(java.lang.CharSequence);
+ method public void setTitle(int);
+ method public void setWidgetLayoutResource(int);
+ method public boolean shouldCommit();
+ method public boolean shouldDisableDependents();
+ method protected boolean shouldPersist();
+ field public static final int DEFAULT_ORDER = 2147483647; // 0x7fffffff
+ }
+
+ public static class Preference.BaseSavedState extends android.view.AbsSavedState {
+ ctor public Preference.BaseSavedState(android.os.Parcel);
+ ctor public Preference.BaseSavedState(android.os.Parcelable);
+ field public static final android.os.Parcelable.Creator<android.preference.Preference.BaseSavedState> CREATOR;
+ }
+
+ public static abstract interface Preference.OnPreferenceChangeListener {
+ method public abstract boolean onPreferenceChange(android.preference.Preference, java.lang.Object);
+ }
+
+ public static abstract interface Preference.OnPreferenceClickListener {
+ method public abstract boolean onPreferenceClick(android.preference.Preference);
+ }
+
+ public abstract class PreferenceActivity extends android.app.ListActivity implements android.preference.PreferenceFragment.OnPreferenceStartFragmentCallback {
+ ctor public PreferenceActivity();
+ method public deprecated void addPreferencesFromIntent(android.content.Intent);
+ method public deprecated void addPreferencesFromResource(int);
+ method public deprecated android.preference.Preference findPreference(java.lang.CharSequence);
+ method public void finishPreferencePanel(android.app.Fragment, int, android.content.Intent);
+ method public deprecated android.preference.PreferenceManager getPreferenceManager();
+ method public deprecated android.preference.PreferenceScreen getPreferenceScreen();
+ method public boolean hasHeaders();
+ method public void invalidateHeaders();
+ method public boolean isMultiPane();
+ method protected boolean isValidFragment(java.lang.String);
+ method public void loadHeadersFromResource(int, java.util.List<android.preference.PreferenceActivity.Header>);
+ method public void onBuildHeaders(java.util.List<android.preference.PreferenceActivity.Header>);
+ method public android.content.Intent onBuildStartFragmentIntent(java.lang.String, android.os.Bundle, int, int);
+ method public android.preference.PreferenceActivity.Header onGetInitialHeader();
+ method public android.preference.PreferenceActivity.Header onGetNewHeader();
+ method public void onHeaderClick(android.preference.PreferenceActivity.Header, int);
+ method public boolean onIsHidingHeaders();
+ method public boolean onIsMultiPane();
+ method public boolean onPreferenceStartFragment(android.preference.PreferenceFragment, android.preference.Preference);
+ method public deprecated boolean onPreferenceTreeClick(android.preference.PreferenceScreen, android.preference.Preference);
+ method public void setListFooter(android.view.View);
+ method public void setParentTitle(java.lang.CharSequence, java.lang.CharSequence, android.view.View.OnClickListener);
+ method public deprecated void setPreferenceScreen(android.preference.PreferenceScreen);
+ method public void showBreadCrumbs(java.lang.CharSequence, java.lang.CharSequence);
+ method public void startPreferenceFragment(android.app.Fragment, boolean);
+ method public void startPreferencePanel(java.lang.String, android.os.Bundle, int, java.lang.CharSequence, android.app.Fragment, int);
+ method public void startWithFragment(java.lang.String, android.os.Bundle, android.app.Fragment, int);
+ method public void startWithFragment(java.lang.String, android.os.Bundle, android.app.Fragment, int, int, int);
+ method public void switchToHeader(java.lang.String, android.os.Bundle);
+ method public void switchToHeader(android.preference.PreferenceActivity.Header);
+ field public static final java.lang.String EXTRA_NO_HEADERS = ":android:no_headers";
+ field public static final java.lang.String EXTRA_SHOW_FRAGMENT = ":android:show_fragment";
+ field public static final java.lang.String EXTRA_SHOW_FRAGMENT_ARGUMENTS = ":android:show_fragment_args";
+ field public static final java.lang.String EXTRA_SHOW_FRAGMENT_SHORT_TITLE = ":android:show_fragment_short_title";
+ field public static final java.lang.String EXTRA_SHOW_FRAGMENT_TITLE = ":android:show_fragment_title";
+ field public static final long HEADER_ID_UNDEFINED = -1L; // 0xffffffffffffffffL
+ }
+
+ public static final class PreferenceActivity.Header implements android.os.Parcelable {
+ ctor public PreferenceActivity.Header();
+ method public int describeContents();
+ method public java.lang.CharSequence getBreadCrumbShortTitle(android.content.res.Resources);
+ method public java.lang.CharSequence getBreadCrumbTitle(android.content.res.Resources);
+ method public java.lang.CharSequence getSummary(android.content.res.Resources);
+ method public java.lang.CharSequence getTitle(android.content.res.Resources);
+ method public void readFromParcel(android.os.Parcel);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.preference.PreferenceActivity.Header> CREATOR;
+ field public java.lang.CharSequence breadCrumbShortTitle;
+ field public int breadCrumbShortTitleRes;
+ field public java.lang.CharSequence breadCrumbTitle;
+ field public int breadCrumbTitleRes;
+ field public android.os.Bundle extras;
+ field public java.lang.String fragment;
+ field public android.os.Bundle fragmentArguments;
+ field public int iconRes;
+ field public long id;
+ field public android.content.Intent intent;
+ field public java.lang.CharSequence summary;
+ field public int summaryRes;
+ field public java.lang.CharSequence title;
+ field public int titleRes;
+ }
+
+ public class PreferenceCategory extends android.preference.PreferenceGroup {
+ ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet, int);
+ ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet);
+ ctor public PreferenceCategory(android.content.Context);
+ }
+
+ public abstract class PreferenceFragment extends android.app.Fragment {
+ ctor public PreferenceFragment();
+ method public void addPreferencesFromIntent(android.content.Intent);
+ method public void addPreferencesFromResource(int);
+ method public android.preference.Preference findPreference(java.lang.CharSequence);
+ method public android.preference.PreferenceManager getPreferenceManager();
+ method public android.preference.PreferenceScreen getPreferenceScreen();
+ method public boolean onPreferenceTreeClick(android.preference.PreferenceScreen, android.preference.Preference);
+ method public void setPreferenceScreen(android.preference.PreferenceScreen);
+ }
+
+ public static abstract interface PreferenceFragment.OnPreferenceStartFragmentCallback {
+ method public abstract boolean onPreferenceStartFragment(android.preference.PreferenceFragment, android.preference.Preference);
+ }
+
+ public abstract class PreferenceGroup extends android.preference.Preference {
+ ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet, int);
+ ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet);
+ method public void addItemFromInflater(android.preference.Preference);
+ method public boolean addPreference(android.preference.Preference);
+ method protected void dispatchRestoreInstanceState(android.os.Bundle);
+ method protected void dispatchSaveInstanceState(android.os.Bundle);
+ method public android.preference.Preference findPreference(java.lang.CharSequence);
+ method public android.preference.Preference getPreference(int);
+ method public int getPreferenceCount();
+ method protected boolean isOnSameScreenAsChildren();
+ method public boolean isOrderingAsAdded();
+ method protected boolean onPrepareAddPreference(android.preference.Preference);
+ method public void removeAll();
+ method public boolean removePreference(android.preference.Preference);
+ method public void setOrderingAsAdded(boolean);
+ }
+
+ public class PreferenceManager {
+ method public android.preference.PreferenceScreen createPreferenceScreen(android.content.Context);
+ method public android.preference.Preference findPreference(java.lang.CharSequence);
+ method public static android.content.SharedPreferences getDefaultSharedPreferences(android.content.Context);
+ method public android.content.SharedPreferences getSharedPreferences();
+ method public int getSharedPreferencesMode();
+ method public java.lang.String getSharedPreferencesName();
+ method public static void setDefaultValues(android.content.Context, int, boolean);
+ method public static void setDefaultValues(android.content.Context, java.lang.String, int, int, boolean);
+ method public void setSharedPreferencesMode(int);
+ method public void setSharedPreferencesName(java.lang.String);
+ field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
+ field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
+ }
+
+ public static abstract interface PreferenceManager.OnActivityDestroyListener {
+ method public abstract void onActivityDestroy();
+ }
+
+ public static abstract interface PreferenceManager.OnActivityResultListener {
+ method public abstract boolean onActivityResult(int, int, android.content.Intent);
+ }
+
+ public static abstract interface PreferenceManager.OnActivityStopListener {
+ method public abstract void onActivityStop();
+ }
+
+ public final class PreferenceScreen extends android.preference.PreferenceGroup implements android.widget.AdapterView.OnItemClickListener android.content.DialogInterface.OnDismissListener {
+ method public void bind(android.widget.ListView);
+ method public android.app.Dialog getDialog();
+ method public android.widget.ListAdapter getRootAdapter();
+ method protected android.widget.ListAdapter onCreateRootAdapter();
+ method public void onDismiss(android.content.DialogInterface);
+ method public void onItemClick(android.widget.AdapterView, android.view.View, int, long);
+ }
+
+ public class RingtonePreference extends android.preference.Preference implements android.preference.PreferenceManager.OnActivityResultListener {
+ ctor public RingtonePreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public RingtonePreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public RingtonePreference(android.content.Context, android.util.AttributeSet);
+ ctor public RingtonePreference(android.content.Context);
+ method public int getRingtoneType();
+ method public boolean getShowDefault();
+ method public boolean getShowSilent();
+ method public boolean onActivityResult(int, int, android.content.Intent);
+ method protected void onPrepareRingtonePickerIntent(android.content.Intent);
+ method protected android.net.Uri onRestoreRingtone();
+ method protected void onSaveRingtone(android.net.Uri);
+ method public void setRingtoneType(int);
+ method public void setShowDefault(boolean);
+ method public void setShowSilent(boolean);
+ }
+
+ public class SwitchPreference extends android.preference.TwoStatePreference {
+ ctor public SwitchPreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public SwitchPreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public SwitchPreference(android.content.Context, android.util.AttributeSet);
+ ctor public SwitchPreference(android.content.Context);
+ method public java.lang.CharSequence getSwitchTextOff();
+ method public java.lang.CharSequence getSwitchTextOn();
+ method public void setSwitchTextOff(java.lang.CharSequence);
+ method public void setSwitchTextOff(int);
+ method public void setSwitchTextOn(java.lang.CharSequence);
+ method public void setSwitchTextOn(int);
+ }
+
+ public abstract class TwoStatePreference extends android.preference.Preference {
+ ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet, int);
+ ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet);
+ ctor public TwoStatePreference(android.content.Context);
+ method public boolean getDisableDependentsState();
+ method public java.lang.CharSequence getSummaryOff();
+ method public java.lang.CharSequence getSummaryOn();
+ method public boolean isChecked();
+ method public void setChecked(boolean);
+ method public void setDisableDependentsState(boolean);
+ method public void setSummaryOff(java.lang.CharSequence);
+ method public void setSummaryOff(int);
+ method public void setSummaryOn(java.lang.CharSequence);
+ method public void setSummaryOn(int);
+ }
+
+}
+
+package android.print {
+
+ public final class PageRange implements android.os.Parcelable {
+ ctor public PageRange(int, int);
+ method public int describeContents();
+ method public int getEnd();
+ method public int getStart();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.print.PageRange ALL_PAGES;
+ field public static final android.os.Parcelable.Creator<android.print.PageRange> CREATOR;
+ }
+
+ public final class PrintAttributes implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getColorMode();
+ method public int getDuplexMode();
+ method public android.print.PrintAttributes.MediaSize getMediaSize();
+ method public android.print.PrintAttributes.Margins getMinMargins();
+ method public android.print.PrintAttributes.Resolution getResolution();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int COLOR_MODE_COLOR = 2; // 0x2
+ field public static final int COLOR_MODE_MONOCHROME = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.print.PrintAttributes> CREATOR;
+ field public static final int DUPLEX_MODE_LONG_EDGE = 2; // 0x2
+ field public static final int DUPLEX_MODE_NONE = 1; // 0x1
+ field public static final int DUPLEX_MODE_SHORT_EDGE = 4; // 0x4
+ }
+
+ public static final class PrintAttributes.Builder {
+ ctor public PrintAttributes.Builder();
+ method public android.print.PrintAttributes build();
+ method public android.print.PrintAttributes.Builder setColorMode(int);
+ method public android.print.PrintAttributes.Builder setDuplexMode(int);
+ method public android.print.PrintAttributes.Builder setMediaSize(android.print.PrintAttributes.MediaSize);
+ method public android.print.PrintAttributes.Builder setMinMargins(android.print.PrintAttributes.Margins);
+ method public android.print.PrintAttributes.Builder setResolution(android.print.PrintAttributes.Resolution);
+ }
+
+ public static final class PrintAttributes.Margins {
+ ctor public PrintAttributes.Margins(int, int, int, int);
+ method public int getBottomMils();
+ method public int getLeftMils();
+ method public int getRightMils();
+ method public int getTopMils();
+ field public static final android.print.PrintAttributes.Margins NO_MARGINS;
+ }
+
+ public static final class PrintAttributes.MediaSize {
+ ctor public PrintAttributes.MediaSize(java.lang.String, java.lang.String, int, int);
+ method public android.print.PrintAttributes.MediaSize asLandscape();
+ method public android.print.PrintAttributes.MediaSize asPortrait();
+ method public int getHeightMils();
+ method public java.lang.String getId();
+ method public java.lang.String getLabel(android.content.pm.PackageManager);
+ method public int getWidthMils();
+ method public boolean isPortrait();
+ field public static final android.print.PrintAttributes.MediaSize ISO_A0;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A1;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A10;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A2;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A3;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A4;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A5;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A6;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A7;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A8;
+ field public static final android.print.PrintAttributes.MediaSize ISO_A9;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B0;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B1;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B10;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B2;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B3;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B4;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B5;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B6;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B7;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B8;
+ field public static final android.print.PrintAttributes.MediaSize ISO_B9;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C0;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C1;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C10;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C2;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C3;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C4;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C5;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C6;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C7;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C8;
+ field public static final android.print.PrintAttributes.MediaSize ISO_C9;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B0;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B1;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B10;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B2;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B3;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B4;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B5;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B6;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B7;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B8;
+ field public static final android.print.PrintAttributes.MediaSize JIS_B9;
+ field public static final android.print.PrintAttributes.MediaSize JIS_EXEC;
+ field public static final android.print.PrintAttributes.MediaSize JPN_CHOU2;
+ field public static final android.print.PrintAttributes.MediaSize JPN_CHOU3;
+ field public static final android.print.PrintAttributes.MediaSize JPN_CHOU4;
+ field public static final android.print.PrintAttributes.MediaSize JPN_HAGAKI;
+ field public static final android.print.PrintAttributes.MediaSize JPN_KAHU;
+ field public static final android.print.PrintAttributes.MediaSize JPN_KAKU2;
+ field public static final android.print.PrintAttributes.MediaSize JPN_OUFUKU;
+ field public static final android.print.PrintAttributes.MediaSize JPN_YOU4;
+ field public static final android.print.PrintAttributes.MediaSize NA_FOOLSCAP;
+ field public static final android.print.PrintAttributes.MediaSize NA_GOVT_LETTER;
+ field public static final android.print.PrintAttributes.MediaSize NA_INDEX_3X5;
+ field public static final android.print.PrintAttributes.MediaSize NA_INDEX_4X6;
+ field public static final android.print.PrintAttributes.MediaSize NA_INDEX_5X8;
+ field public static final android.print.PrintAttributes.MediaSize NA_JUNIOR_LEGAL;
+ field public static final android.print.PrintAttributes.MediaSize NA_LEDGER;
+ field public static final android.print.PrintAttributes.MediaSize NA_LEGAL;
+ field public static final android.print.PrintAttributes.MediaSize NA_LETTER;
+ field public static final android.print.PrintAttributes.MediaSize NA_MONARCH;
+ field public static final android.print.PrintAttributes.MediaSize NA_QUARTO;
+ field public static final android.print.PrintAttributes.MediaSize NA_TABLOID;
+ field public static final android.print.PrintAttributes.MediaSize OM_DAI_PA_KAI;
+ field public static final android.print.PrintAttributes.MediaSize OM_JUURO_KU_KAI;
+ field public static final android.print.PrintAttributes.MediaSize OM_PA_KAI;
+ field public static final android.print.PrintAttributes.MediaSize PRC_1;
+ field public static final android.print.PrintAttributes.MediaSize PRC_10;
+ field public static final android.print.PrintAttributes.MediaSize PRC_16K;
+ field public static final android.print.PrintAttributes.MediaSize PRC_2;
+ field public static final android.print.PrintAttributes.MediaSize PRC_3;
+ field public static final android.print.PrintAttributes.MediaSize PRC_4;
+ field public static final android.print.PrintAttributes.MediaSize PRC_5;
+ field public static final android.print.PrintAttributes.MediaSize PRC_6;
+ field public static final android.print.PrintAttributes.MediaSize PRC_7;
+ field public static final android.print.PrintAttributes.MediaSize PRC_8;
+ field public static final android.print.PrintAttributes.MediaSize PRC_9;
+ field public static final android.print.PrintAttributes.MediaSize ROC_16K;
+ field public static final android.print.PrintAttributes.MediaSize ROC_8K;
+ field public static final android.print.PrintAttributes.MediaSize UNKNOWN_LANDSCAPE;
+ field public static final android.print.PrintAttributes.MediaSize UNKNOWN_PORTRAIT;
+ }
+
+ public static final class PrintAttributes.Resolution {
+ ctor public PrintAttributes.Resolution(java.lang.String, java.lang.String, int, int);
+ method public int getHorizontalDpi();
+ method public java.lang.String getId();
+ method public java.lang.String getLabel();
+ method public int getVerticalDpi();
+ }
+
+ public abstract class PrintDocumentAdapter {
+ ctor public PrintDocumentAdapter();
+ method public void onFinish();
+ method public abstract void onLayout(android.print.PrintAttributes, android.print.PrintAttributes, android.os.CancellationSignal, android.print.PrintDocumentAdapter.LayoutResultCallback, android.os.Bundle);
+ method public void onStart();
+ method public abstract void onWrite(android.print.PageRange[], android.os.ParcelFileDescriptor, android.os.CancellationSignal, android.print.PrintDocumentAdapter.WriteResultCallback);
+ field public static final java.lang.String EXTRA_PRINT_PREVIEW = "EXTRA_PRINT_PREVIEW";
+ }
+
+ public static abstract class PrintDocumentAdapter.LayoutResultCallback {
+ method public void onLayoutCancelled();
+ method public void onLayoutFailed(java.lang.CharSequence);
+ method public void onLayoutFinished(android.print.PrintDocumentInfo, boolean);
+ }
+
+ public static abstract class PrintDocumentAdapter.WriteResultCallback {
+ method public void onWriteCancelled();
+ method public void onWriteFailed(java.lang.CharSequence);
+ method public void onWriteFinished(android.print.PageRange[]);
+ }
+
+ public final class PrintDocumentInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getContentType();
+ method public long getDataSize();
+ method public java.lang.String getName();
+ method public int getPageCount();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CONTENT_TYPE_DOCUMENT = 0; // 0x0
+ field public static final int CONTENT_TYPE_PHOTO = 1; // 0x1
+ field public static final int CONTENT_TYPE_UNKNOWN = -1; // 0xffffffff
+ field public static final android.os.Parcelable.Creator<android.print.PrintDocumentInfo> CREATOR;
+ field public static final int PAGE_COUNT_UNKNOWN = -1; // 0xffffffff
+ }
+
+ public static final class PrintDocumentInfo.Builder {
+ ctor public PrintDocumentInfo.Builder(java.lang.String);
+ method public android.print.PrintDocumentInfo build();
+ method public android.print.PrintDocumentInfo.Builder setContentType(int);
+ method public android.print.PrintDocumentInfo.Builder setPageCount(int);
+ }
+
+ public final class PrintJob {
+ method public void cancel();
+ method public android.print.PrintJobId getId();
+ method public android.print.PrintJobInfo getInfo();
+ method public boolean isBlocked();
+ method public boolean isCancelled();
+ method public boolean isCompleted();
+ method public boolean isFailed();
+ method public boolean isQueued();
+ method public boolean isStarted();
+ method public void restart();
+ }
+
+ public final class PrintJobId implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.print.PrintJobId> CREATOR;
+ }
+
+ public final class PrintJobInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.print.PrintAttributes getAttributes();
+ method public int getCopies();
+ method public long getCreationTime();
+ method public android.print.PrintJobId getId();
+ method public java.lang.String getLabel();
+ method public android.print.PageRange[] getPages();
+ method public android.print.PrinterId getPrinterId();
+ method public float getProgress();
+ method public int getState();
+ method public java.lang.CharSequence getStatus();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.print.PrintJobInfo> CREATOR;
+ field public static final int STATE_BLOCKED = 4; // 0x4
+ field public static final int STATE_CANCELED = 7; // 0x7
+ field public static final int STATE_COMPLETED = 5; // 0x5
+ field public static final int STATE_CREATED = 1; // 0x1
+ field public static final int STATE_FAILED = 6; // 0x6
+ field public static final int STATE_QUEUED = 2; // 0x2
+ field public static final int STATE_STARTED = 3; // 0x3
+ }
+
+ public static final class PrintJobInfo.Builder {
+ ctor public PrintJobInfo.Builder(android.print.PrintJobInfo);
+ method public android.print.PrintJobInfo build();
+ method public void putAdvancedOption(java.lang.String, java.lang.String);
+ method public void putAdvancedOption(java.lang.String, int);
+ method public void setAttributes(android.print.PrintAttributes);
+ method public void setCopies(int);
+ method public void setPages(android.print.PageRange[]);
+ }
+
+ public final class PrintManager {
+ method public java.util.List<android.print.PrintJob> getPrintJobs();
+ method public android.print.PrintJob print(java.lang.String, android.print.PrintDocumentAdapter, android.print.PrintAttributes);
+ }
+
+ public final class PrinterCapabilitiesInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getColorModes();
+ method public android.print.PrintAttributes getDefaults();
+ method public int getDuplexModes();
+ method public java.util.List<android.print.PrintAttributes.MediaSize> getMediaSizes();
+ method public android.print.PrintAttributes.Margins getMinMargins();
+ method public java.util.List<android.print.PrintAttributes.Resolution> getResolutions();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.print.PrinterCapabilitiesInfo> CREATOR;
+ }
+
+ public static final class PrinterCapabilitiesInfo.Builder {
+ ctor public PrinterCapabilitiesInfo.Builder(android.print.PrinterId);
+ method public android.print.PrinterCapabilitiesInfo.Builder addMediaSize(android.print.PrintAttributes.MediaSize, boolean);
+ method public android.print.PrinterCapabilitiesInfo.Builder addResolution(android.print.PrintAttributes.Resolution, boolean);
+ method public android.print.PrinterCapabilitiesInfo build();
+ method public android.print.PrinterCapabilitiesInfo.Builder setColorModes(int, int);
+ method public android.print.PrinterCapabilitiesInfo.Builder setDuplexModes(int, int);
+ method public android.print.PrinterCapabilitiesInfo.Builder setMinMargins(android.print.PrintAttributes.Margins);
+ }
+
+ public final class PrinterId implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String getLocalId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.print.PrinterId> CREATOR;
+ }
+
+ public final class PrinterInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.print.PrinterCapabilitiesInfo getCapabilities();
+ method public java.lang.String getDescription();
+ method public android.print.PrinterId getId();
+ method public java.lang.String getName();
+ method public int getStatus();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.print.PrinterInfo> CREATOR;
+ field public static final int STATUS_BUSY = 2; // 0x2
+ field public static final int STATUS_IDLE = 1; // 0x1
+ field public static final int STATUS_UNAVAILABLE = 3; // 0x3
+ }
+
+ public static final class PrinterInfo.Builder {
+ ctor public PrinterInfo.Builder(android.print.PrinterId, java.lang.String, int);
+ ctor public PrinterInfo.Builder(android.print.PrinterInfo);
+ method public android.print.PrinterInfo build();
+ method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);
+ method public android.print.PrinterInfo.Builder setDescription(java.lang.String);
+ method public android.print.PrinterInfo.Builder setName(java.lang.String);
+ method public android.print.PrinterInfo.Builder setStatus(int);
+ }
+
+}
+
+package android.print.pdf {
+
+ public class PrintedPdfDocument extends android.graphics.pdf.PdfDocument {
+ ctor public PrintedPdfDocument(android.content.Context, android.print.PrintAttributes);
+ method public android.graphics.Rect getPageContentRect();
+ method public int getPageHeight();
+ method public int getPageWidth();
+ method public android.graphics.pdf.PdfDocument.Page startPage(int);
+ }
+
+}
+
+package android.printservice {
+
+ public final class PrintDocument {
+ method public android.os.ParcelFileDescriptor getData();
+ method public android.print.PrintDocumentInfo getInfo();
+ }
+
+ public final class PrintJob {
+ method public boolean block(java.lang.String);
+ method public boolean cancel();
+ method public boolean complete();
+ method public boolean fail(java.lang.String);
+ method public int getAdvancedIntOption(java.lang.String);
+ method public java.lang.String getAdvancedStringOption(java.lang.String);
+ method public android.printservice.PrintDocument getDocument();
+ method public android.print.PrintJobId getId();
+ method public android.print.PrintJobInfo getInfo();
+ method public java.lang.String getTag();
+ method public boolean hasAdvancedOption(java.lang.String);
+ method public boolean isBlocked();
+ method public boolean isCancelled();
+ method public boolean isCompleted();
+ method public boolean isFailed();
+ method public boolean isQueued();
+ method public boolean isStarted();
+ method public void setProgress(float);
+ method public void setStatus(java.lang.CharSequence);
+ method public boolean setTag(java.lang.String);
+ method public boolean start();
+ }
+
+ public abstract class PrintService extends android.app.Service {
+ ctor public PrintService();
+ method protected final void attachBaseContext(android.content.Context);
+ method public final android.print.PrinterId generatePrinterId(java.lang.String);
+ method public final java.util.List<android.printservice.PrintJob> getActivePrintJobs();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method protected void onConnected();
+ method protected abstract android.printservice.PrinterDiscoverySession onCreatePrinterDiscoverySession();
+ method protected void onDisconnected();
+ method protected abstract void onPrintJobQueued(android.printservice.PrintJob);
+ method protected abstract void onRequestCancelPrintJob(android.printservice.PrintJob);
+ field public static final java.lang.String EXTRA_PRINTER_INFO = "android.intent.extra.print.EXTRA_PRINTER_INFO";
+ field public static final java.lang.String EXTRA_PRINT_DOCUMENT_INFO = "android.printservice.extra.PRINT_DOCUMENT_INFO";
+ field public static final java.lang.String EXTRA_PRINT_JOB_INFO = "android.intent.extra.print.PRINT_JOB_INFO";
+ field public static final java.lang.String SERVICE_INTERFACE = "android.printservice.PrintService";
+ field public static final java.lang.String SERVICE_META_DATA = "android.printservice";
+ }
+
+ public abstract class PrinterDiscoverySession {
+ ctor public PrinterDiscoverySession();
+ method public final void addPrinters(java.util.List<android.print.PrinterInfo>);
+ method public final java.util.List<android.print.PrinterInfo> getPrinters();
+ method public final java.util.List<android.print.PrinterId> getTrackedPrinters();
+ method public final boolean isDestroyed();
+ method public final boolean isPrinterDiscoveryStarted();
+ method public abstract void onDestroy();
+ method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);
+ method public abstract void onStartPrinterStateTracking(android.print.PrinterId);
+ method public abstract void onStopPrinterDiscovery();
+ method public abstract void onStopPrinterStateTracking(android.print.PrinterId);
+ method public abstract void onValidatePrinters(java.util.List<android.print.PrinterId>);
+ method public final void removePrinters(java.util.List<android.print.PrinterId>);
+ }
+
+}
+
+package android.provider {
+
+ public final class AlarmClock {
+ ctor public AlarmClock();
+ field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM";
+ field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";
+ field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";
+ field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS";
+ field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM";
+ field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all";
+ field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label";
+ field public static final java.lang.String ALARM_SEARCH_MODE_NEXT = "android.next";
+ field public static final java.lang.String ALARM_SEARCH_MODE_TIME = "android.time";
+ field public static final java.lang.String EXTRA_ALARM_SEARCH_MODE = "android.intent.extra.alarm.SEARCH_MODE";
+ field public static final java.lang.String EXTRA_ALARM_SNOOZE_DURATION = "android.intent.extra.alarm.SNOOZE_DURATION";
+ field public static final java.lang.String EXTRA_DAYS = "android.intent.extra.alarm.DAYS";
+ field public static final java.lang.String EXTRA_HOUR = "android.intent.extra.alarm.HOUR";
+ field public static final java.lang.String EXTRA_IS_PM = "android.intent.extra.alarm.IS_PM";
+ field public static final java.lang.String EXTRA_LENGTH = "android.intent.extra.alarm.LENGTH";
+ field public static final java.lang.String EXTRA_MESSAGE = "android.intent.extra.alarm.MESSAGE";
+ field public static final java.lang.String EXTRA_MINUTES = "android.intent.extra.alarm.MINUTES";
+ field public static final java.lang.String EXTRA_RINGTONE = "android.intent.extra.alarm.RINGTONE";
+ field public static final java.lang.String EXTRA_SKIP_UI = "android.intent.extra.alarm.SKIP_UI";
+ field public static final java.lang.String EXTRA_VIBRATE = "android.intent.extra.alarm.VIBRATE";
+ field public static final java.lang.String VALUE_RINGTONE_SILENT = "silent";
+ }
+
+ public abstract interface BaseColumns {
+ field public static final java.lang.String _COUNT = "_count";
+ field public static final java.lang.String _ID = "_id";
+ }
+
+ public class Browser {
+ ctor public Browser();
+ method public static final void sendString(android.content.Context, java.lang.String);
+ field public static final java.lang.String EXTRA_APPLICATION_ID = "com.android.browser.application_id";
+ field public static final java.lang.String EXTRA_CREATE_NEW_TAB = "create_new_tab";
+ field public static final java.lang.String EXTRA_HEADERS = "com.android.browser.headers";
+ field public static final java.lang.String INITIAL_ZOOM_LEVEL = "browser.initialZoomLevel";
+ }
+
+ 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";
+ }
+
+ public static final class CalendarContract.Attendees implements android.provider.BaseColumns android.provider.CalendarContract.AttendeesColumns android.provider.CalendarContract.EventsColumns {
+ method public static final android.database.Cursor query(android.content.ContentResolver, long, java.lang.String[]);
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.AttendeesColumns {
+ field public static final java.lang.String ATTENDEE_EMAIL = "attendeeEmail";
+ field public static final java.lang.String ATTENDEE_IDENTITY = "attendeeIdentity";
+ field public static final java.lang.String ATTENDEE_ID_NAMESPACE = "attendeeIdNamespace";
+ field public static final java.lang.String ATTENDEE_NAME = "attendeeName";
+ field public static final java.lang.String ATTENDEE_RELATIONSHIP = "attendeeRelationship";
+ field public static final java.lang.String ATTENDEE_STATUS = "attendeeStatus";
+ field public static final int ATTENDEE_STATUS_ACCEPTED = 1; // 0x1
+ field public static final int ATTENDEE_STATUS_DECLINED = 2; // 0x2
+ field public static final int ATTENDEE_STATUS_INVITED = 3; // 0x3
+ field public static final int ATTENDEE_STATUS_NONE = 0; // 0x0
+ field public static final int ATTENDEE_STATUS_TENTATIVE = 4; // 0x4
+ field public static final java.lang.String ATTENDEE_TYPE = "attendeeType";
+ field public static final java.lang.String EVENT_ID = "event_id";
+ field public static final int RELATIONSHIP_ATTENDEE = 1; // 0x1
+ field public static final int RELATIONSHIP_NONE = 0; // 0x0
+ field public static final int RELATIONSHIP_ORGANIZER = 2; // 0x2
+ field public static final int RELATIONSHIP_PERFORMER = 3; // 0x3
+ field public static final int RELATIONSHIP_SPEAKER = 4; // 0x4
+ field public static final int TYPE_NONE = 0; // 0x0
+ field public static final int TYPE_OPTIONAL = 2; // 0x2
+ field public static final int TYPE_REQUIRED = 1; // 0x1
+ field public static final int TYPE_RESOURCE = 3; // 0x3
+ }
+
+ public static final class CalendarContract.CalendarAlerts implements android.provider.BaseColumns android.provider.CalendarContract.CalendarAlertsColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.EventsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri CONTENT_URI_BY_INSTANCE;
+ }
+
+ protected static abstract interface CalendarContract.CalendarAlertsColumns {
+ field public static final java.lang.String ALARM_TIME = "alarmTime";
+ field public static final java.lang.String BEGIN = "begin";
+ field public static final java.lang.String CREATION_TIME = "creationTime";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "begin ASC,title ASC";
+ field public static final java.lang.String END = "end";
+ field public static final java.lang.String EVENT_ID = "event_id";
+ field public static final java.lang.String MINUTES = "minutes";
+ field public static final java.lang.String NOTIFY_TIME = "notifyTime";
+ field public static final java.lang.String RECEIVED_TIME = "receivedTime";
+ field public static final java.lang.String STATE = "state";
+ field public static final int STATE_DISMISSED = 2; // 0x2
+ field public static final int STATE_FIRED = 1; // 0x1
+ field public static final int STATE_SCHEDULED = 0; // 0x0
+ }
+
+ public static final class CalendarContract.CalendarCache implements android.provider.CalendarContract.CalendarCacheColumns {
+ field public static final java.lang.String KEY_TIMEZONE_INSTANCES = "timezoneInstances";
+ field public static final java.lang.String KEY_TIMEZONE_INSTANCES_PREVIOUS = "timezoneInstancesPrevious";
+ field public static final java.lang.String KEY_TIMEZONE_TYPE = "timezoneType";
+ field public static final java.lang.String TIMEZONE_TYPE_AUTO = "auto";
+ field public static final java.lang.String TIMEZONE_TYPE_HOME = "home";
+ field public static final android.net.Uri URI;
+ }
+
+ protected static abstract interface CalendarContract.CalendarCacheColumns {
+ field public static final java.lang.String KEY = "key";
+ field public static final java.lang.String VALUE = "value";
+ }
+
+ protected static abstract interface CalendarContract.CalendarColumns {
+ field public static final java.lang.String ALLOWED_ATTENDEE_TYPES = "allowedAttendeeTypes";
+ field public static final java.lang.String ALLOWED_AVAILABILITY = "allowedAvailability";
+ field public static final java.lang.String ALLOWED_REMINDERS = "allowedReminders";
+ field public static final java.lang.String CALENDAR_ACCESS_LEVEL = "calendar_access_level";
+ field public static final java.lang.String CALENDAR_COLOR = "calendar_color";
+ field public static final java.lang.String CALENDAR_COLOR_KEY = "calendar_color_index";
+ field public static final java.lang.String CALENDAR_DISPLAY_NAME = "calendar_displayName";
+ field public static final java.lang.String CALENDAR_TIME_ZONE = "calendar_timezone";
+ field public static final int CAL_ACCESS_CONTRIBUTOR = 500; // 0x1f4
+ field public static final int CAL_ACCESS_EDITOR = 600; // 0x258
+ field public static final int CAL_ACCESS_FREEBUSY = 100; // 0x64
+ field public static final int CAL_ACCESS_NONE = 0; // 0x0
+ field public static final int CAL_ACCESS_OVERRIDE = 400; // 0x190
+ field public static final int CAL_ACCESS_OWNER = 700; // 0x2bc
+ field public static final int CAL_ACCESS_READ = 200; // 0xc8
+ field public static final int CAL_ACCESS_RESPOND = 300; // 0x12c
+ field public static final int CAL_ACCESS_ROOT = 800; // 0x320
+ field public static final java.lang.String CAN_MODIFY_TIME_ZONE = "canModifyTimeZone";
+ field public static final java.lang.String CAN_ORGANIZER_RESPOND = "canOrganizerRespond";
+ field public static final java.lang.String IS_PRIMARY = "isPrimary";
+ field public static final java.lang.String MAX_REMINDERS = "maxReminders";
+ field public static final java.lang.String OWNER_ACCOUNT = "ownerAccount";
+ field public static final java.lang.String SYNC_EVENTS = "sync_events";
+ field public static final java.lang.String VISIBLE = "visible";
+ }
+
+ public static final class CalendarContract.CalendarEntity implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.SyncColumns {
+ method public static android.content.EntityIterator newEntityIterator(android.database.Cursor);
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.CalendarSyncColumns {
+ field public static final java.lang.String CAL_SYNC1 = "cal_sync1";
+ field public static final java.lang.String CAL_SYNC10 = "cal_sync10";
+ field public static final java.lang.String CAL_SYNC2 = "cal_sync2";
+ field public static final java.lang.String CAL_SYNC3 = "cal_sync3";
+ field public static final java.lang.String CAL_SYNC4 = "cal_sync4";
+ field public static final java.lang.String CAL_SYNC5 = "cal_sync5";
+ field public static final java.lang.String CAL_SYNC6 = "cal_sync6";
+ field public static final java.lang.String CAL_SYNC7 = "cal_sync7";
+ field public static final java.lang.String CAL_SYNC8 = "cal_sync8";
+ field public static final java.lang.String CAL_SYNC9 = "cal_sync9";
+ }
+
+ public static final class CalendarContract.Calendars implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.SyncColumns {
+ field public static final java.lang.String CALENDAR_LOCATION = "calendar_location";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "calendar_displayName";
+ field public static final java.lang.String NAME = "name";
+ }
+
+ public static final class CalendarContract.Colors implements android.provider.CalendarContract.ColorsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.ColorsColumns implements android.provider.SyncStateContract.Columns {
+ field public static final java.lang.String COLOR = "color";
+ field public static final java.lang.String COLOR_KEY = "color_index";
+ field public static final java.lang.String COLOR_TYPE = "color_type";
+ field public static final int TYPE_CALENDAR = 0; // 0x0
+ field public static final int TYPE_EVENT = 1; // 0x1
+ }
+
+ public static final class CalendarContract.EventDays implements android.provider.CalendarContract.EventDaysColumns {
+ method public static final android.database.Cursor query(android.content.ContentResolver, int, int, java.lang.String[]);
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.EventDaysColumns {
+ field public static final java.lang.String ENDDAY = "endDay";
+ field public static final java.lang.String STARTDAY = "startDay";
+ }
+
+ public static final class CalendarContract.Events implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.SyncColumns {
+ field public static final android.net.Uri CONTENT_EXCEPTION_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.EventsColumns {
+ field public static final int ACCESS_CONFIDENTIAL = 1; // 0x1
+ field public static final int ACCESS_DEFAULT = 0; // 0x0
+ field public static final java.lang.String ACCESS_LEVEL = "accessLevel";
+ field public static final int ACCESS_PRIVATE = 2; // 0x2
+ field public static final int ACCESS_PUBLIC = 3; // 0x3
+ field public static final java.lang.String ALL_DAY = "allDay";
+ field public static final java.lang.String AVAILABILITY = "availability";
+ field public static final int AVAILABILITY_BUSY = 0; // 0x0
+ field public static final int AVAILABILITY_FREE = 1; // 0x1
+ 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";
+ field public static final java.lang.String DTSTART = "dtstart";
+ field public static final java.lang.String DURATION = "duration";
+ field public static final java.lang.String EVENT_COLOR = "eventColor";
+ field public static final java.lang.String EVENT_COLOR_KEY = "eventColor_index";
+ field public static final java.lang.String EVENT_END_TIMEZONE = "eventEndTimezone";
+ field public static final java.lang.String EVENT_LOCATION = "eventLocation";
+ field public static final java.lang.String EVENT_TIMEZONE = "eventTimezone";
+ field public static final java.lang.String EXDATE = "exdate";
+ field public static final java.lang.String EXRULE = "exrule";
+ field public static final java.lang.String GUESTS_CAN_INVITE_OTHERS = "guestsCanInviteOthers";
+ field public static final java.lang.String GUESTS_CAN_MODIFY = "guestsCanModify";
+ field public static final java.lang.String GUESTS_CAN_SEE_GUESTS = "guestsCanSeeGuests";
+ field public static final java.lang.String HAS_ALARM = "hasAlarm";
+ field public static final java.lang.String HAS_ATTENDEE_DATA = "hasAttendeeData";
+ field public static final java.lang.String HAS_EXTENDED_PROPERTIES = "hasExtendedProperties";
+ field public static final java.lang.String IS_ORGANIZER = "isOrganizer";
+ field public static final java.lang.String LAST_DATE = "lastDate";
+ field public static final java.lang.String LAST_SYNCED = "lastSynced";
+ field public static final java.lang.String ORGANIZER = "organizer";
+ field public static final java.lang.String ORIGINAL_ALL_DAY = "originalAllDay";
+ field public static final java.lang.String ORIGINAL_ID = "original_id";
+ field public static final java.lang.String ORIGINAL_INSTANCE_TIME = "originalInstanceTime";
+ field public static final java.lang.String ORIGINAL_SYNC_ID = "original_sync_id";
+ field public static final java.lang.String RDATE = "rdate";
+ field public static final java.lang.String RRULE = "rrule";
+ field public static final java.lang.String SELF_ATTENDEE_STATUS = "selfAttendeeStatus";
+ field public static final java.lang.String STATUS = "eventStatus";
+ field public static final int STATUS_CANCELED = 2; // 0x2
+ field public static final int STATUS_CONFIRMED = 1; // 0x1
+ field public static final int STATUS_TENTATIVE = 0; // 0x0
+ field public static final java.lang.String SYNC_DATA1 = "sync_data1";
+ field public static final java.lang.String SYNC_DATA10 = "sync_data10";
+ field public static final java.lang.String SYNC_DATA2 = "sync_data2";
+ field public static final java.lang.String SYNC_DATA3 = "sync_data3";
+ field public static final java.lang.String SYNC_DATA4 = "sync_data4";
+ field public static final java.lang.String SYNC_DATA5 = "sync_data5";
+ field public static final java.lang.String SYNC_DATA6 = "sync_data6";
+ field public static final java.lang.String SYNC_DATA7 = "sync_data7";
+ field public static final java.lang.String SYNC_DATA8 = "sync_data8";
+ field public static final java.lang.String SYNC_DATA9 = "sync_data9";
+ field public static final java.lang.String TITLE = "title";
+ field public static final java.lang.String UID_2445 = "uid2445";
+ }
+
+ public static final class CalendarContract.EventsEntity implements android.provider.BaseColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.SyncColumns {
+ method public static android.content.EntityIterator newEntityIterator(android.database.Cursor, android.content.ContentResolver);
+ method public static android.content.EntityIterator newEntityIterator(android.database.Cursor, android.content.ContentProviderClient);
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public static final class CalendarContract.ExtendedProperties implements android.provider.BaseColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.ExtendedPropertiesColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.ExtendedPropertiesColumns {
+ field public static final java.lang.String EVENT_ID = "event_id";
+ field public static final java.lang.String NAME = "name";
+ field public static final java.lang.String VALUE = "value";
+ }
+
+ public static final class CalendarContract.Instances implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.EventsColumns {
+ method public static final android.database.Cursor query(android.content.ContentResolver, java.lang.String[], long, long);
+ method public static final android.database.Cursor query(android.content.ContentResolver, java.lang.String[], long, long, java.lang.String);
+ field public static final java.lang.String BEGIN = "begin";
+ field public static final android.net.Uri CONTENT_BY_DAY_URI;
+ field public static final android.net.Uri CONTENT_SEARCH_BY_DAY_URI;
+ field public static final android.net.Uri CONTENT_SEARCH_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String END = "end";
+ field public static final java.lang.String END_DAY = "endDay";
+ field public static final java.lang.String END_MINUTE = "endMinute";
+ field public static final java.lang.String EVENT_ID = "event_id";
+ field public static final java.lang.String START_DAY = "startDay";
+ field public static final java.lang.String START_MINUTE = "startMinute";
+ }
+
+ public static final class CalendarContract.Reminders implements android.provider.BaseColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.RemindersColumns {
+ method public static final android.database.Cursor query(android.content.ContentResolver, long, java.lang.String[]);
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface CalendarContract.RemindersColumns {
+ field public static final java.lang.String EVENT_ID = "event_id";
+ field public static final java.lang.String METHOD = "method";
+ field public static final int METHOD_ALARM = 4; // 0x4
+ field public static final int METHOD_ALERT = 1; // 0x1
+ field public static final int METHOD_DEFAULT = 0; // 0x0
+ field public static final int METHOD_EMAIL = 2; // 0x2
+ field public static final int METHOD_SMS = 3; // 0x3
+ field public static final java.lang.String MINUTES = "minutes";
+ field public static final int MINUTES_DEFAULT = -1; // 0xffffffff
+ }
+
+ protected static abstract interface CalendarContract.SyncColumns implements android.provider.CalendarContract.CalendarSyncColumns {
+ field public static final java.lang.String ACCOUNT_NAME = "account_name";
+ field public static final java.lang.String ACCOUNT_TYPE = "account_type";
+ field public static final java.lang.String CAN_PARTIALLY_UPDATE = "canPartiallyUpdate";
+ field public static final java.lang.String DELETED = "deleted";
+ field public static final java.lang.String DIRTY = "dirty";
+ field public static final java.lang.String MUTATORS = "mutators";
+ field public static final java.lang.String _SYNC_ID = "_sync_id";
+ }
+
+ public static final class CalendarContract.SyncState implements android.provider.SyncStateContract.Columns {
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public class CallLog {
+ ctor public CallLog();
+ field public static final java.lang.String AUTHORITY = "call_log";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public static class CallLog.Calls implements android.provider.BaseColumns {
+ ctor public CallLog.Calls();
+ method public static java.lang.String getLastOutgoingCall(android.content.Context);
+ field public static final int BLOCKED_TYPE = 6; // 0x6
+ field public static final java.lang.String CACHED_FORMATTED_NUMBER = "formatted_number";
+ field public static final java.lang.String CACHED_LOOKUP_URI = "lookup_uri";
+ field public static final java.lang.String CACHED_MATCHED_NUMBER = "matched_number";
+ field public static final java.lang.String CACHED_NAME = "name";
+ field public static final java.lang.String CACHED_NORMALIZED_NUMBER = "normalized_number";
+ field public static final java.lang.String CACHED_NUMBER_LABEL = "numberlabel";
+ field public static final java.lang.String CACHED_NUMBER_TYPE = "numbertype";
+ field public static final java.lang.String CACHED_PHOTO_ID = "photo_id";
+ field public static final java.lang.String CACHED_PHOTO_URI = "photo_uri";
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/calls";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/calls";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri CONTENT_URI_WITH_VOICEMAIL;
+ field public static final java.lang.String COUNTRY_ISO = "countryiso";
+ field public static final java.lang.String DATA_USAGE = "data_usage";
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ field public static final java.lang.String DURATION = "duration";
+ field public static final java.lang.String EXTRA_CALL_TYPE_FILTER = "android.provider.extra.CALL_TYPE_FILTER";
+ field public static final java.lang.String FEATURES = "features";
+ field public static final int FEATURES_VIDEO = 1; // 0x1
+ field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";
+ field public static final int INCOMING_TYPE = 1; // 0x1
+ field public static final java.lang.String IS_READ = "is_read";
+ field public static final java.lang.String LIMIT_PARAM_KEY = "limit";
+ field public static final int MISSED_TYPE = 3; // 0x3
+ field public static final java.lang.String NEW = "new";
+ field public static final java.lang.String NUMBER = "number";
+ field public static final java.lang.String NUMBER_PRESENTATION = "presentation";
+ field public static final java.lang.String OFFSET_PARAM_KEY = "offset";
+ field public static final int OUTGOING_TYPE = 2; // 0x2
+ field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
+ field public static final java.lang.String PHONE_ACCOUNT_ID = "subscription_id";
+ field public static final java.lang.String POST_DIAL_DIGITS = "post_dial_digits";
+ field public static final int PRESENTATION_ALLOWED = 1; // 0x1
+ field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
+ field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
+ field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
+ field public static final int REJECTED_TYPE = 5; // 0x5
+ field public static final java.lang.String TRANSCRIPTION = "transcription";
+ field public static final java.lang.String TYPE = "type";
+ field public static final int VOICEMAIL_TYPE = 4; // 0x4
+ field public static final java.lang.String VOICEMAIL_URI = "voicemail_uri";
+ }
+
+ public deprecated class Contacts {
+ field public static final deprecated java.lang.String AUTHORITY = "contacts";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated int KIND_EMAIL = 1; // 0x1
+ field public static final deprecated int KIND_IM = 3; // 0x3
+ field public static final deprecated int KIND_ORGANIZATION = 4; // 0x4
+ field public static final deprecated int KIND_PHONE = 5; // 0x5
+ field public static final deprecated int KIND_POSTAL = 2; // 0x2
+ }
+
+ public static final deprecated class Contacts.ContactMethods implements android.provider.BaseColumns android.provider.Contacts.ContactMethodsColumns android.provider.Contacts.PeopleColumns {
+ method public deprecated void addPostalLocation(android.content.Context, long, double, double);
+ method public static deprecated java.lang.Object decodeImProtocol(java.lang.String);
+ method public static deprecated java.lang.String encodeCustomImProtocol(java.lang.String);
+ method public static deprecated java.lang.String encodePredefinedImProtocol(int);
+ method public static final deprecated java.lang.CharSequence getDisplayLabel(android.content.Context, int, int, java.lang.CharSequence);
+ field public static final deprecated java.lang.String CONTENT_EMAIL_ITEM_TYPE = "vnd.android.cursor.item/email";
+ field public static final deprecated java.lang.String CONTENT_EMAIL_TYPE = "vnd.android.cursor.dir/email";
+ field public static final deprecated android.net.Uri CONTENT_EMAIL_URI;
+ field public static final deprecated java.lang.String CONTENT_IM_ITEM_TYPE = "vnd.android.cursor.item/jabber-im";
+ field public static final deprecated java.lang.String CONTENT_POSTAL_ITEM_TYPE = "vnd.android.cursor.item/postal-address";
+ field public static final deprecated java.lang.String CONTENT_POSTAL_TYPE = "vnd.android.cursor.dir/postal-address";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact-methods";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "name ASC";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ field public static final deprecated java.lang.String POSTAL_LOCATION_LATITUDE = "data";
+ field public static final deprecated java.lang.String POSTAL_LOCATION_LONGITUDE = "aux_data";
+ field public static final deprecated int PROTOCOL_AIM = 0; // 0x0
+ field public static final deprecated int PROTOCOL_GOOGLE_TALK = 5; // 0x5
+ field public static final deprecated int PROTOCOL_ICQ = 6; // 0x6
+ field public static final deprecated int PROTOCOL_JABBER = 7; // 0x7
+ field public static final deprecated int PROTOCOL_MSN = 1; // 0x1
+ field public static final deprecated int PROTOCOL_QQ = 4; // 0x4
+ field public static final deprecated int PROTOCOL_SKYPE = 3; // 0x3
+ field public static final deprecated int PROTOCOL_YAHOO = 2; // 0x2
+ }
+
+ public static abstract deprecated interface Contacts.ContactMethodsColumns {
+ field public static final deprecated java.lang.String AUX_DATA = "aux_data";
+ field public static final deprecated java.lang.String DATA = "data";
+ field public static final deprecated java.lang.String ISPRIMARY = "isprimary";
+ field public static final deprecated java.lang.String KIND = "kind";
+ field public static final deprecated java.lang.String LABEL = "label";
+ field public static final deprecated java.lang.String TYPE = "type";
+ field public static final deprecated int TYPE_CUSTOM = 0; // 0x0
+ field public static final deprecated int TYPE_HOME = 1; // 0x1
+ field public static final deprecated int TYPE_OTHER = 3; // 0x3
+ field public static final deprecated int TYPE_WORK = 2; // 0x2
+ }
+
+ public static final deprecated class Contacts.Extensions implements android.provider.BaseColumns android.provider.Contacts.ExtensionsColumns {
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_extensions";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_extensions";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "person, name ASC";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ }
+
+ public static abstract deprecated interface Contacts.ExtensionsColumns {
+ field public static final deprecated java.lang.String NAME = "name";
+ field public static final deprecated java.lang.String VALUE = "value";
+ }
+
+ public static final deprecated class Contacts.GroupMembership implements android.provider.BaseColumns android.provider.Contacts.GroupsColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "groupmembership";
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contactsgroupmembership";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contactsgroupmembership";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "group_id ASC";
+ field public static final deprecated java.lang.String GROUP_ID = "group_id";
+ field public static final deprecated java.lang.String GROUP_SYNC_ACCOUNT = "group_sync_account";
+ field public static final deprecated java.lang.String GROUP_SYNC_ACCOUNT_TYPE = "group_sync_account_type";
+ field public static final deprecated java.lang.String GROUP_SYNC_ID = "group_sync_id";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ field public static final deprecated android.net.Uri RAW_CONTENT_URI;
+ }
+
+ public static final deprecated class Contacts.Groups implements android.provider.BaseColumns android.provider.Contacts.GroupsColumns {
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contactsgroup";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contactsgroup";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "name ASC";
+ field public static final deprecated android.net.Uri DELETED_CONTENT_URI;
+ field public static final deprecated java.lang.String GROUP_ANDROID_STARRED = "Starred in Android";
+ field public static final deprecated java.lang.String GROUP_MY_CONTACTS = "Contacts";
+ }
+
+ public static abstract deprecated interface Contacts.GroupsColumns {
+ field public static final deprecated java.lang.String NAME = "name";
+ field public static final deprecated java.lang.String NOTES = "notes";
+ field public static final deprecated java.lang.String SHOULD_SYNC = "should_sync";
+ field public static final deprecated java.lang.String SYSTEM_ID = "system_id";
+ }
+
+ public static final deprecated class Contacts.Intents {
+ ctor public deprecated Contacts.Intents();
+ field public static final deprecated java.lang.String ATTACH_IMAGE = "com.android.contacts.action.ATTACH_IMAGE";
+ field public static final deprecated java.lang.String EXTRA_CREATE_DESCRIPTION = "com.android.contacts.action.CREATE_DESCRIPTION";
+ field public static final deprecated java.lang.String EXTRA_FORCE_CREATE = "com.android.contacts.action.FORCE_CREATE";
+ field public static final deprecated java.lang.String SEARCH_SUGGESTION_CLICKED = "android.provider.Contacts.SEARCH_SUGGESTION_CLICKED";
+ field public static final deprecated java.lang.String SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED = "android.provider.Contacts.SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED";
+ field public static final deprecated java.lang.String SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED = "android.provider.Contacts.SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED";
+ field public static final deprecated java.lang.String SHOW_OR_CREATE_CONTACT = "com.android.contacts.action.SHOW_OR_CREATE_CONTACT";
+ }
+
+ public static final deprecated class Contacts.Intents.Insert {
+ ctor public deprecated Contacts.Intents.Insert();
+ field public static final deprecated java.lang.String ACTION = "android.intent.action.INSERT";
+ field public static final deprecated java.lang.String COMPANY = "company";
+ field public static final deprecated java.lang.String EMAIL = "email";
+ field public static final deprecated java.lang.String EMAIL_ISPRIMARY = "email_isprimary";
+ field public static final deprecated java.lang.String EMAIL_TYPE = "email_type";
+ field public static final deprecated java.lang.String FULL_MODE = "full_mode";
+ field public static final deprecated java.lang.String IM_HANDLE = "im_handle";
+ field public static final deprecated java.lang.String IM_ISPRIMARY = "im_isprimary";
+ field public static final deprecated java.lang.String IM_PROTOCOL = "im_protocol";
+ field public static final deprecated java.lang.String JOB_TITLE = "job_title";
+ field public static final deprecated java.lang.String NAME = "name";
+ field public static final deprecated java.lang.String NOTES = "notes";
+ field public static final deprecated java.lang.String PHONE = "phone";
+ field public static final deprecated java.lang.String PHONETIC_NAME = "phonetic_name";
+ field public static final deprecated java.lang.String PHONE_ISPRIMARY = "phone_isprimary";
+ field public static final deprecated java.lang.String PHONE_TYPE = "phone_type";
+ field public static final deprecated java.lang.String POSTAL = "postal";
+ field public static final deprecated java.lang.String POSTAL_ISPRIMARY = "postal_isprimary";
+ field public static final deprecated java.lang.String POSTAL_TYPE = "postal_type";
+ field public static final deprecated java.lang.String SECONDARY_EMAIL = "secondary_email";
+ field public static final deprecated java.lang.String SECONDARY_EMAIL_TYPE = "secondary_email_type";
+ field public static final deprecated java.lang.String SECONDARY_PHONE = "secondary_phone";
+ field public static final deprecated java.lang.String SECONDARY_PHONE_TYPE = "secondary_phone_type";
+ field public static final deprecated java.lang.String TERTIARY_EMAIL = "tertiary_email";
+ field public static final deprecated java.lang.String TERTIARY_EMAIL_TYPE = "tertiary_email_type";
+ field public static final deprecated java.lang.String TERTIARY_PHONE = "tertiary_phone";
+ field public static final deprecated java.lang.String TERTIARY_PHONE_TYPE = "tertiary_phone_type";
+ }
+
+ public static final deprecated class Contacts.Intents.UI {
+ ctor public deprecated Contacts.Intents.UI();
+ field public static final deprecated java.lang.String FILTER_CONTACTS_ACTION = "com.android.contacts.action.FILTER_CONTACTS";
+ field public static final deprecated java.lang.String FILTER_TEXT_EXTRA_KEY = "com.android.contacts.extra.FILTER_TEXT";
+ field public static final deprecated java.lang.String GROUP_NAME_EXTRA_KEY = "com.android.contacts.extra.GROUP";
+ field public static final deprecated java.lang.String LIST_ALL_CONTACTS_ACTION = "com.android.contacts.action.LIST_ALL_CONTACTS";
+ field public static final deprecated java.lang.String LIST_CONTACTS_WITH_PHONES_ACTION = "com.android.contacts.action.LIST_CONTACTS_WITH_PHONES";
+ field public static final deprecated java.lang.String LIST_DEFAULT = "com.android.contacts.action.LIST_DEFAULT";
+ field public static final deprecated java.lang.String LIST_FREQUENT_ACTION = "com.android.contacts.action.LIST_FREQUENT";
+ field public static final deprecated java.lang.String LIST_GROUP_ACTION = "com.android.contacts.action.LIST_GROUP";
+ field public static final deprecated java.lang.String LIST_STARRED_ACTION = "com.android.contacts.action.LIST_STARRED";
+ field public static final deprecated java.lang.String LIST_STREQUENT_ACTION = "com.android.contacts.action.LIST_STREQUENT";
+ field public static final deprecated java.lang.String TITLE_EXTRA_KEY = "com.android.contacts.extra.TITLE_EXTRA";
+ }
+
+ public static abstract deprecated interface Contacts.OrganizationColumns {
+ field public static final deprecated java.lang.String COMPANY = "company";
+ field public static final deprecated java.lang.String ISPRIMARY = "isprimary";
+ field public static final deprecated java.lang.String LABEL = "label";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ field public static final deprecated java.lang.String TITLE = "title";
+ field public static final deprecated java.lang.String TYPE = "type";
+ field public static final deprecated int TYPE_CUSTOM = 0; // 0x0
+ field public static final deprecated int TYPE_OTHER = 2; // 0x2
+ field public static final deprecated int TYPE_WORK = 1; // 0x1
+ }
+
+ public static final deprecated class Contacts.Organizations implements android.provider.BaseColumns android.provider.Contacts.OrganizationColumns {
+ method public static final deprecated java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence);
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "organizations";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "company, title, isprimary ASC";
+ }
+
+ public static final deprecated class Contacts.People implements android.provider.BaseColumns android.provider.Contacts.PeopleColumns android.provider.Contacts.PhonesColumns android.provider.Contacts.PresenceColumns {
+ method public static deprecated android.net.Uri addToGroup(android.content.ContentResolver, long, java.lang.String);
+ method public static deprecated android.net.Uri addToGroup(android.content.ContentResolver, long, long);
+ method public static deprecated android.net.Uri addToMyContactsGroup(android.content.ContentResolver, long);
+ method public static deprecated android.net.Uri createPersonInMyContactsGroup(android.content.ContentResolver, android.content.ContentValues);
+ method public static deprecated android.graphics.Bitmap loadContactPhoto(android.content.Context, android.net.Uri, int, android.graphics.BitmapFactory.Options);
+ method public static deprecated void markAsContacted(android.content.ContentResolver, long);
+ method public static deprecated java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri);
+ method public static deprecated android.database.Cursor queryGroups(android.content.ContentResolver, long);
+ method public static deprecated void setPhotoData(android.content.ContentResolver, android.net.Uri, byte[]);
+ field public static final deprecated android.net.Uri CONTENT_FILTER_URI;
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/person";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/person";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "name ASC";
+ field public static final deprecated android.net.Uri DELETED_CONTENT_URI;
+ field public static final deprecated java.lang.String PRIMARY_EMAIL_ID = "primary_email";
+ field public static final deprecated java.lang.String PRIMARY_ORGANIZATION_ID = "primary_organization";
+ field public static final deprecated java.lang.String PRIMARY_PHONE_ID = "primary_phone";
+ }
+
+ public static final deprecated class Contacts.People.ContactMethods implements android.provider.BaseColumns android.provider.Contacts.ContactMethodsColumns android.provider.Contacts.PeopleColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "contact_methods";
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "data ASC";
+ }
+
+ public static deprecated class Contacts.People.Extensions implements android.provider.BaseColumns android.provider.Contacts.ExtensionsColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "extensions";
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "name ASC";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ }
+
+ public static final deprecated class Contacts.People.Phones implements android.provider.BaseColumns android.provider.Contacts.PeopleColumns android.provider.Contacts.PhonesColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "phones";
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "number ASC";
+ }
+
+ public static abstract deprecated interface Contacts.PeopleColumns {
+ field public static final deprecated java.lang.String CUSTOM_RINGTONE = "custom_ringtone";
+ field public static final deprecated java.lang.String DISPLAY_NAME = "display_name";
+ field public static final deprecated java.lang.String LAST_TIME_CONTACTED = "last_time_contacted";
+ field public static final deprecated java.lang.String NAME = "name";
+ field public static final deprecated java.lang.String NOTES = "notes";
+ field public static final deprecated java.lang.String PHONETIC_NAME = "phonetic_name";
+ field public static final deprecated java.lang.String PHOTO_VERSION = "photo_version";
+ field public static final deprecated java.lang.String SEND_TO_VOICEMAIL = "send_to_voicemail";
+ field public static final deprecated java.lang.String STARRED = "starred";
+ field public static final deprecated java.lang.String TIMES_CONTACTED = "times_contacted";
+ }
+
+ public static final deprecated class Contacts.Phones implements android.provider.BaseColumns android.provider.Contacts.PeopleColumns android.provider.Contacts.PhonesColumns {
+ method public static final deprecated java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence, java.lang.CharSequence[]);
+ method public static final deprecated java.lang.CharSequence getDisplayLabel(android.content.Context, int, java.lang.CharSequence);
+ field public static final deprecated android.net.Uri CONTENT_FILTER_URL;
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/phone";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "name ASC";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ }
+
+ public static abstract deprecated interface Contacts.PhonesColumns {
+ field public static final deprecated java.lang.String ISPRIMARY = "isprimary";
+ field public static final deprecated java.lang.String LABEL = "label";
+ field public static final deprecated java.lang.String NUMBER = "number";
+ field public static final deprecated java.lang.String NUMBER_KEY = "number_key";
+ field public static final deprecated java.lang.String TYPE = "type";
+ field public static final deprecated int TYPE_CUSTOM = 0; // 0x0
+ field public static final deprecated int TYPE_FAX_HOME = 5; // 0x5
+ field public static final deprecated int TYPE_FAX_WORK = 4; // 0x4
+ field public static final deprecated int TYPE_HOME = 1; // 0x1
+ field public static final deprecated int TYPE_MOBILE = 2; // 0x2
+ field public static final deprecated int TYPE_OTHER = 7; // 0x7
+ field public static final deprecated int TYPE_PAGER = 6; // 0x6
+ field public static final deprecated int TYPE_WORK = 3; // 0x3
+ }
+
+ public static final deprecated class Contacts.Photos implements android.provider.BaseColumns android.provider.Contacts.PhotosColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "person ASC";
+ }
+
+ public static abstract deprecated interface Contacts.PhotosColumns {
+ field public static final deprecated java.lang.String DATA = "data";
+ field public static final deprecated java.lang.String DOWNLOAD_REQUIRED = "download_required";
+ field public static final deprecated java.lang.String EXISTS_ON_SERVER = "exists_on_server";
+ field public static final deprecated java.lang.String LOCAL_VERSION = "local_version";
+ field public static final deprecated java.lang.String PERSON_ID = "person";
+ field public static final deprecated java.lang.String SYNC_ERROR = "sync_error";
+ }
+
+ public static abstract deprecated interface Contacts.PresenceColumns {
+ field public static final int AVAILABLE = 5; // 0x5
+ field public static final int AWAY = 2; // 0x2
+ field public static final int DO_NOT_DISTURB = 4; // 0x4
+ field public static final int IDLE = 3; // 0x3
+ field public static final deprecated java.lang.String IM_ACCOUNT = "im_account";
+ field public static final deprecated java.lang.String IM_HANDLE = "im_handle";
+ field public static final deprecated java.lang.String IM_PROTOCOL = "im_protocol";
+ field public static final int INVISIBLE = 1; // 0x1
+ field public static final int OFFLINE = 0; // 0x0
+ field public static final java.lang.String PRESENCE_CUSTOM_STATUS = "status";
+ field public static final java.lang.String PRESENCE_STATUS = "mode";
+ field public static final java.lang.String PRIORITY = "priority";
+ }
+
+ public static final deprecated class Contacts.Settings implements android.provider.BaseColumns android.provider.Contacts.SettingsColumns {
+ method public static deprecated java.lang.String getSetting(android.content.ContentResolver, java.lang.String, java.lang.String);
+ method public static deprecated void setSetting(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String);
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "settings";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "key ASC";
+ field public static final deprecated java.lang.String SYNC_EVERYTHING = "syncEverything";
+ }
+
+ public static abstract deprecated interface Contacts.SettingsColumns {
+ field public static final deprecated java.lang.String KEY = "key";
+ field public static final deprecated java.lang.String VALUE = "value";
+ field public static final deprecated java.lang.String _SYNC_ACCOUNT = "_sync_account";
+ field public static final deprecated java.lang.String _SYNC_ACCOUNT_TYPE = "_sync_account_type";
+ }
+
+ public final class ContactsContract {
+ ctor public ContactsContract();
+ method public static boolean isProfileId(long);
+ field public static final java.lang.String AUTHORITY = "com.android.contacts";
+ field public static final android.net.Uri AUTHORITY_URI;
+ field public static final java.lang.String CALLER_IS_SYNCADAPTER = "caller_is_syncadapter";
+ field public static final java.lang.String DEFERRED_SNIPPETING = "deferred_snippeting";
+ field public static final java.lang.String DEFERRED_SNIPPETING_QUERY = "deferred_snippeting_query";
+ field public static final java.lang.String DIRECTORY_PARAM_KEY = "directory";
+ field public static final java.lang.String LIMIT_PARAM_KEY = "limit";
+ field public static final java.lang.String PRIMARY_ACCOUNT_NAME = "name_for_primary_account";
+ field public static final java.lang.String PRIMARY_ACCOUNT_TYPE = "type_for_primary_account";
+ field public static final java.lang.String REMOVE_DUPLICATE_ENTRIES = "remove_duplicate_entries";
+ field public static final java.lang.String STREQUENT_PHONE_ONLY = "strequent_phone_only";
+ }
+
+ public static final class ContactsContract.AggregationExceptions implements android.provider.BaseColumns {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/aggregation_exception";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/aggregation_exception";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String RAW_CONTACT_ID1 = "raw_contact_id1";
+ field public static final java.lang.String RAW_CONTACT_ID2 = "raw_contact_id2";
+ field public static final java.lang.String TYPE = "type";
+ field public static final int TYPE_AUTOMATIC = 0; // 0x0
+ field public static final int TYPE_KEEP_SEPARATE = 2; // 0x2
+ field public static final int TYPE_KEEP_TOGETHER = 1; // 0x1
+ }
+
+ protected static abstract interface ContactsContract.BaseSyncColumns {
+ field public static final java.lang.String SYNC1 = "sync1";
+ field public static final java.lang.String SYNC2 = "sync2";
+ field public static final java.lang.String SYNC3 = "sync3";
+ field public static final java.lang.String SYNC4 = "sync4";
+ }
+
+ public static final class ContactsContract.CommonDataKinds {
+ }
+
+ public static abstract interface ContactsContract.CommonDataKinds.BaseTypes {
+ field public static final int TYPE_CUSTOM = 0; // 0x0
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Callable implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ ctor public ContactsContract.CommonDataKinds.Callable();
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ }
+
+ protected static abstract interface ContactsContract.CommonDataKinds.CommonColumns implements android.provider.ContactsContract.CommonDataKinds.BaseTypes {
+ field public static final java.lang.String DATA = "data1";
+ field public static final java.lang.String LABEL = "data3";
+ field public static final java.lang.String TYPE = "data2";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Contactables implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ ctor public ContactsContract.CommonDataKinds.Contactables();
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Email implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final java.lang.String ADDRESS = "data1";
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2";
+ field public static final android.net.Uri CONTENT_LOOKUP_URI;
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DISPLAY_NAME = "data4";
+ field public static final android.net.Uri ENTERPRISE_CONTENT_LOOKUP_URI;
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final int TYPE_HOME = 1; // 0x1
+ field public static final int TYPE_MOBILE = 4; // 0x4
+ field public static final int TYPE_OTHER = 3; // 0x3
+ field public static final int TYPE_WORK = 2; // 0x2
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Event implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static int getTypeResource(java.lang.Integer);
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_event";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String START_DATE = "data1";
+ field public static final int TYPE_ANNIVERSARY = 1; // 0x1
+ field public static final int TYPE_BIRTHDAY = 3; // 0x3
+ field public static final int TYPE_OTHER = 2; // 0x2
+ }
+
+ public static final class ContactsContract.CommonDataKinds.GroupMembership implements android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/group_membership";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String GROUP_ROW_ID = "data1";
+ field public static final java.lang.String GROUP_SOURCE_ID = "group_sourceid";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Identity implements android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/identity";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String IDENTITY = "data1";
+ field public static final java.lang.String NAMESPACE = "data2";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Im implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getProtocolLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getProtocolLabelResource(int);
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im";
+ field public static final java.lang.String CUSTOM_PROTOCOL = "data6";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String PROTOCOL = "data5";
+ field public static final int PROTOCOL_AIM = 0; // 0x0
+ field public static final int PROTOCOL_CUSTOM = -1; // 0xffffffff
+ field public static final int PROTOCOL_GOOGLE_TALK = 5; // 0x5
+ field public static final int PROTOCOL_ICQ = 6; // 0x6
+ field public static final int PROTOCOL_JABBER = 7; // 0x7
+ field public static final int PROTOCOL_MSN = 1; // 0x1
+ field public static final int PROTOCOL_NETMEETING = 8; // 0x8
+ field public static final int PROTOCOL_QQ = 4; // 0x4
+ field public static final int PROTOCOL_SKYPE = 3; // 0x3
+ field public static final int PROTOCOL_YAHOO = 2; // 0x2
+ field public static final int TYPE_HOME = 1; // 0x1
+ field public static final int TYPE_OTHER = 3; // 0x3
+ field public static final int TYPE_WORK = 2; // 0x2
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Nickname implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/nickname";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String NAME = "data1";
+ field public static final int TYPE_DEFAULT = 1; // 0x1
+ field public static final int TYPE_INITIALS = 5; // 0x5
+ field public static final int TYPE_MAIDEN_NAME = 3; // 0x3
+ field public static final deprecated int TYPE_MAINDEN_NAME = 3; // 0x3
+ field public static final int TYPE_OTHER_NAME = 2; // 0x2
+ field public static final int TYPE_SHORT_NAME = 4; // 0x4
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Note implements android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/note";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String NOTE = "data1";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Organization implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final java.lang.String COMPANY = "data1";
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/organization";
+ field public static final java.lang.String DEPARTMENT = "data5";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String JOB_DESCRIPTION = "data6";
+ field public static final java.lang.String OFFICE_LOCATION = "data9";
+ field public static final java.lang.String PHONETIC_NAME = "data8";
+ field public static final java.lang.String PHONETIC_NAME_STYLE = "data10";
+ field public static final java.lang.String SYMBOL = "data7";
+ field public static final java.lang.String TITLE = "data4";
+ field public static final int TYPE_OTHER = 2; // 0x2
+ field public static final int TYPE_WORK = 1; // 0x1
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone_v2";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/phone_v2";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String NORMALIZED_NUMBER = "data4";
+ field public static final java.lang.String NUMBER = "data1";
+ field public static final java.lang.String SEARCH_DISPLAY_NAME_KEY = "search_display_name";
+ field public static final java.lang.String SEARCH_PHONE_NUMBER_KEY = "search_phone_number";
+ field public static final int TYPE_ASSISTANT = 19; // 0x13
+ field public static final int TYPE_CALLBACK = 8; // 0x8
+ field public static final int TYPE_CAR = 9; // 0x9
+ field public static final int TYPE_COMPANY_MAIN = 10; // 0xa
+ field public static final int TYPE_FAX_HOME = 5; // 0x5
+ field public static final int TYPE_FAX_WORK = 4; // 0x4
+ field public static final int TYPE_HOME = 1; // 0x1
+ field public static final int TYPE_ISDN = 11; // 0xb
+ field public static final int TYPE_MAIN = 12; // 0xc
+ field public static final int TYPE_MMS = 20; // 0x14
+ field public static final int TYPE_MOBILE = 2; // 0x2
+ field public static final int TYPE_OTHER = 7; // 0x7
+ field public static final int TYPE_OTHER_FAX = 13; // 0xd
+ field public static final int TYPE_PAGER = 6; // 0x6
+ field public static final int TYPE_RADIO = 14; // 0xe
+ field public static final int TYPE_TELEX = 15; // 0xf
+ field public static final int TYPE_TTY_TDD = 16; // 0x10
+ field public static final int TYPE_WORK = 3; // 0x3
+ field public static final int TYPE_WORK_MOBILE = 17; // 0x11
+ field public static final int TYPE_WORK_PAGER = 18; // 0x12
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Photo implements android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/photo";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String PHOTO = "data15";
+ field public static final java.lang.String PHOTO_FILE_ID = "data14";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Relation implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/relation";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String NAME = "data1";
+ field public static final int TYPE_ASSISTANT = 1; // 0x1
+ field public static final int TYPE_BROTHER = 2; // 0x2
+ field public static final int TYPE_CHILD = 3; // 0x3
+ field public static final int TYPE_DOMESTIC_PARTNER = 4; // 0x4
+ field public static final int TYPE_FATHER = 5; // 0x5
+ field public static final int TYPE_FRIEND = 6; // 0x6
+ field public static final int TYPE_MANAGER = 7; // 0x7
+ field public static final int TYPE_MOTHER = 8; // 0x8
+ field public static final int TYPE_PARENT = 9; // 0x9
+ field public static final int TYPE_PARTNER = 10; // 0xa
+ field public static final int TYPE_REFERRED_BY = 11; // 0xb
+ field public static final int TYPE_RELATIVE = 12; // 0xc
+ field public static final int TYPE_SISTER = 13; // 0xd
+ field public static final int TYPE_SPOUSE = 14; // 0xe
+ }
+
+ public static final class ContactsContract.CommonDataKinds.SipAddress implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String SIP_ADDRESS = "data1";
+ field public static final int TYPE_HOME = 1; // 0x1
+ field public static final int TYPE_OTHER = 3; // 0x3
+ field public static final int TYPE_WORK = 2; // 0x2
+ }
+
+ public static final class ContactsContract.CommonDataKinds.StructuredName implements android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/name";
+ field public static final java.lang.String DISPLAY_NAME = "data1";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String FAMILY_NAME = "data3";
+ field public static final java.lang.String FULL_NAME_STYLE = "data10";
+ field public static final java.lang.String GIVEN_NAME = "data2";
+ field public static final java.lang.String MIDDLE_NAME = "data5";
+ field public static final java.lang.String PHONETIC_FAMILY_NAME = "data9";
+ field public static final java.lang.String PHONETIC_GIVEN_NAME = "data7";
+ field public static final java.lang.String PHONETIC_MIDDLE_NAME = "data8";
+ field public static final java.lang.String PHONETIC_NAME_STYLE = "data11";
+ field public static final java.lang.String PREFIX = "data4";
+ field public static final java.lang.String SUFFIX = "data6";
+ }
+
+ public static final class ContactsContract.CommonDataKinds.StructuredPostal implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
+ method public static final int getTypeLabelResource(int);
+ field public static final java.lang.String CITY = "data7";
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/postal-address_v2";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/postal-address_v2";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String COUNTRY = "data10";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String FORMATTED_ADDRESS = "data1";
+ field public static final java.lang.String NEIGHBORHOOD = "data6";
+ field public static final java.lang.String POBOX = "data5";
+ field public static final java.lang.String POSTCODE = "data9";
+ field public static final java.lang.String REGION = "data8";
+ field public static final java.lang.String STREET = "data4";
+ field public static final int TYPE_HOME = 1; // 0x1
+ field public static final int TYPE_OTHER = 3; // 0x3
+ field public static final int TYPE_WORK = 2; // 0x2
+ }
+
+ public static final class ContactsContract.CommonDataKinds.Website implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/website";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final int TYPE_BLOG = 2; // 0x2
+ field public static final int TYPE_FTP = 6; // 0x6
+ field public static final int TYPE_HOME = 4; // 0x4
+ field public static final int TYPE_HOMEPAGE = 1; // 0x1
+ field public static final int TYPE_OTHER = 7; // 0x7
+ field public static final int TYPE_PROFILE = 3; // 0x3
+ field public static final int TYPE_WORK = 5; // 0x5
+ field public static final java.lang.String URL = "data1";
+ }
+
+ protected static abstract interface ContactsContract.ContactNameColumns {
+ field public static final java.lang.String DISPLAY_NAME_ALTERNATIVE = "display_name_alt";
+ field public static final java.lang.String DISPLAY_NAME_PRIMARY = "display_name";
+ field public static final java.lang.String DISPLAY_NAME_SOURCE = "display_name_source";
+ field public static final java.lang.String PHONETIC_NAME = "phonetic_name";
+ field public static final java.lang.String PHONETIC_NAME_STYLE = "phonetic_name_style";
+ field public static final java.lang.String SORT_KEY_ALTERNATIVE = "sort_key_alt";
+ field public static final java.lang.String SORT_KEY_PRIMARY = "sort_key";
+ }
+
+ protected static abstract interface ContactsContract.ContactOptionsColumns {
+ field public static final java.lang.String CUSTOM_RINGTONE = "custom_ringtone";
+ field public static final java.lang.String LAST_TIME_CONTACTED = "last_time_contacted";
+ field public static final java.lang.String PINNED = "pinned";
+ field public static final java.lang.String SEND_TO_VOICEMAIL = "send_to_voicemail";
+ field public static final java.lang.String STARRED = "starred";
+ field public static final java.lang.String TIMES_CONTACTED = "times_contacted";
+ }
+
+ protected static abstract interface ContactsContract.ContactStatusColumns {
+ field public static final java.lang.String CONTACT_CHAT_CAPABILITY = "contact_chat_capability";
+ field public static final java.lang.String CONTACT_PRESENCE = "contact_presence";
+ field public static final java.lang.String CONTACT_STATUS = "contact_status";
+ field public static final java.lang.String CONTACT_STATUS_ICON = "contact_status_icon";
+ field public static final java.lang.String CONTACT_STATUS_LABEL = "contact_status_label";
+ field public static final java.lang.String CONTACT_STATUS_RES_PACKAGE = "contact_status_res_package";
+ field public static final java.lang.String CONTACT_STATUS_TIMESTAMP = "contact_status_ts";
+ }
+
+ public static class ContactsContract.Contacts implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns {
+ method public static android.net.Uri getLookupUri(android.content.ContentResolver, android.net.Uri);
+ method public static android.net.Uri getLookupUri(long, java.lang.String);
+ method public static boolean isEnterpriseContactId(long);
+ method public static android.net.Uri lookupContact(android.content.ContentResolver, android.net.Uri);
+ method public static deprecated void markAsContacted(android.content.ContentResolver, long);
+ method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri, boolean);
+ method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri);
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final android.net.Uri CONTENT_FREQUENT_URI;
+ field public static final android.net.Uri CONTENT_GROUP_URI;
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact";
+ field public static final android.net.Uri CONTENT_LOOKUP_URI;
+ field public static final android.net.Uri CONTENT_MULTI_VCARD_URI;
+ field public static final android.net.Uri CONTENT_STREQUENT_FILTER_URI;
+ field public static final android.net.Uri CONTENT_STREQUENT_URI;
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";
+ field public static final android.net.Uri CONTENT_VCARD_URI;
+ field public static final android.net.Uri CORP_CONTENT_FILTER_URI;
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String QUERY_PARAMETER_VCARD_NO_PHOTO = "no_photo";
+ }
+
+ public static final class ContactsContract.Contacts.AggregationSuggestions implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns {
+ field public static final java.lang.String CONTENT_DIRECTORY = "suggestions";
+ }
+
+ public static final class ContactsContract.Contacts.AggregationSuggestions.Builder {
+ ctor public ContactsContract.Contacts.AggregationSuggestions.Builder();
+ method public android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder addNameParameter(java.lang.String);
+ method public android.net.Uri build();
+ method public android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder setContactId(long);
+ method public android.provider.ContactsContract.Contacts.AggregationSuggestions.Builder setLimit(int);
+ }
+
+ public static final class ContactsContract.Contacts.Data implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns {
+ field public static final java.lang.String CONTENT_DIRECTORY = "data";
+ }
+
+ public static final class ContactsContract.Contacts.Entity implements android.provider.BaseColumns android.provider.ContactsContract.BaseSyncColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.DataUsageStatColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.StatusColumns android.provider.ContactsContract.SyncColumns {
+ field public static final java.lang.String CONTENT_DIRECTORY = "entities";
+ field public static final java.lang.String DATA_ID = "data_id";
+ field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";
+ }
+
+ public static final class ContactsContract.Contacts.Photo implements android.provider.BaseColumns android.provider.ContactsContract.DataColumnsWithJoins {
+ field public static final java.lang.String CONTENT_DIRECTORY = "photo";
+ field public static final java.lang.String DISPLAY_PHOTO = "display_photo";
+ field public static final java.lang.String PHOTO = "data15";
+ field public static final java.lang.String PHOTO_FILE_ID = "data14";
+ }
+
+ protected static abstract interface ContactsContract.ContactsColumns {
+ field public static final java.lang.String CONTACT_LAST_UPDATED_TIMESTAMP = "contact_last_updated_timestamp";
+ field public static final java.lang.String DISPLAY_NAME = "display_name";
+ field public static final java.lang.String HAS_PHONE_NUMBER = "has_phone_number";
+ field public static final java.lang.String IN_DEFAULT_DIRECTORY = "in_default_directory";
+ field public static final java.lang.String IN_VISIBLE_GROUP = "in_visible_group";
+ field public static final java.lang.String IS_USER_PROFILE = "is_user_profile";
+ field public static final java.lang.String LOOKUP_KEY = "lookup";
+ field public static final java.lang.String NAME_RAW_CONTACT_ID = "name_raw_contact_id";
+ field public static final java.lang.String PHOTO_FILE_ID = "photo_file_id";
+ field public static final java.lang.String PHOTO_ID = "photo_id";
+ field public static final java.lang.String PHOTO_THUMBNAIL_URI = "photo_thumb_uri";
+ field public static final java.lang.String PHOTO_URI = "photo_uri";
+ }
+
+ public static final class ContactsContract.Data implements android.provider.ContactsContract.DataColumnsWithJoins {
+ method public static android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/data";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
+ field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
+ field public static final java.lang.String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
+ }
+
+ protected static abstract interface ContactsContract.DataColumns {
+ field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence";
+ field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
+ field public static final java.lang.String DATA1 = "data1";
+ field public static final java.lang.String DATA10 = "data10";
+ field public static final java.lang.String DATA11 = "data11";
+ field public static final java.lang.String DATA12 = "data12";
+ field public static final java.lang.String DATA13 = "data13";
+ field public static final java.lang.String DATA14 = "data14";
+ field public static final java.lang.String DATA15 = "data15";
+ field public static final java.lang.String DATA2 = "data2";
+ field public static final java.lang.String DATA3 = "data3";
+ field public static final java.lang.String DATA4 = "data4";
+ field public static final java.lang.String DATA5 = "data5";
+ field public static final java.lang.String DATA6 = "data6";
+ field public static final java.lang.String DATA7 = "data7";
+ field public static final java.lang.String DATA8 = "data8";
+ field public static final java.lang.String DATA9 = "data9";
+ field public static final java.lang.String DATA_VERSION = "data_version";
+ field public static final java.lang.String IS_PRIMARY = "is_primary";
+ field public static final java.lang.String IS_READ_ONLY = "is_read_only";
+ field public static final java.lang.String IS_SUPER_PRIMARY = "is_super_primary";
+ field public static final java.lang.String MIMETYPE = "mimetype";
+ field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";
+ field public static final java.lang.String RES_PACKAGE = "res_package";
+ field public static final java.lang.String SYNC1 = "data_sync1";
+ field public static final java.lang.String SYNC2 = "data_sync2";
+ field public static final java.lang.String SYNC3 = "data_sync3";
+ field public static final java.lang.String SYNC4 = "data_sync4";
+ }
+
+ protected static abstract interface ContactsContract.DataColumnsWithJoins implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.DataUsageStatColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.StatusColumns {
+ }
+
+ public static final class ContactsContract.DataUsageFeedback {
+ ctor public ContactsContract.DataUsageFeedback();
+ field public static final android.net.Uri DELETE_USAGE_URI;
+ field public static final android.net.Uri FEEDBACK_URI;
+ field public static final java.lang.String USAGE_TYPE = "type";
+ field public static final java.lang.String USAGE_TYPE_CALL = "call";
+ field public static final java.lang.String USAGE_TYPE_LONG_TEXT = "long_text";
+ field public static final java.lang.String USAGE_TYPE_SHORT_TEXT = "short_text";
+ }
+
+ protected static abstract interface ContactsContract.DataUsageStatColumns {
+ field public static final java.lang.String LAST_TIME_USED = "last_time_used";
+ field public static final java.lang.String TIMES_USED = "times_used";
+ }
+
+ public static final class ContactsContract.DeletedContacts implements android.provider.ContactsContract.DeletedContactsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final long DAYS_KEPT_MILLISECONDS = 2592000000L; // 0x9a7ec800L
+ }
+
+ protected static abstract interface ContactsContract.DeletedContactsColumns {
+ field public static final java.lang.String CONTACT_DELETED_TIMESTAMP = "contact_deleted_timestamp";
+ field public static final java.lang.String CONTACT_ID = "contact_id";
+ }
+
+ public static final class ContactsContract.Directory implements android.provider.BaseColumns {
+ method public static boolean isEnterpriseDirectoryId(long);
+ method public static boolean isRemoteDirectory(long);
+ method public static void notifyDirectoryChange(android.content.ContentResolver);
+ field public static final java.lang.String ACCOUNT_NAME = "accountName";
+ field public static final java.lang.String ACCOUNT_TYPE = "accountType";
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_directory";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_directories";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri CORP_CONTENT_URI;
+ field public static final long DEFAULT = 0L; // 0x0L
+ field public static final java.lang.String DIRECTORY_AUTHORITY = "authority";
+ field public static final java.lang.String DISPLAY_NAME = "displayName";
+ field public static final java.lang.String EXPORT_SUPPORT = "exportSupport";
+ field public static final int EXPORT_SUPPORT_ANY_ACCOUNT = 2; // 0x2
+ field public static final int EXPORT_SUPPORT_NONE = 0; // 0x0
+ field public static final int EXPORT_SUPPORT_SAME_ACCOUNT_ONLY = 1; // 0x1
+ field public static final long LOCAL_INVISIBLE = 1L; // 0x1L
+ field public static final java.lang.String PACKAGE_NAME = "packageName";
+ field public static final java.lang.String PHOTO_SUPPORT = "photoSupport";
+ field public static final int PHOTO_SUPPORT_FULL = 3; // 0x3
+ field public static final int PHOTO_SUPPORT_FULL_SIZE_ONLY = 2; // 0x2
+ field public static final int PHOTO_SUPPORT_NONE = 0; // 0x0
+ field public static final int PHOTO_SUPPORT_THUMBNAIL_ONLY = 1; // 0x1
+ field public static final java.lang.String SHORTCUT_SUPPORT = "shortcutSupport";
+ field public static final int SHORTCUT_SUPPORT_DATA_ITEMS_ONLY = 1; // 0x1
+ field public static final int SHORTCUT_SUPPORT_FULL = 2; // 0x2
+ field public static final int SHORTCUT_SUPPORT_NONE = 0; // 0x0
+ field public static final java.lang.String TYPE_RESOURCE_ID = "typeResourceId";
+ }
+
+ public static abstract interface ContactsContract.DisplayNameSources {
+ field public static final int EMAIL = 10; // 0xa
+ field public static final int NICKNAME = 35; // 0x23
+ field public static final int ORGANIZATION = 30; // 0x1e
+ field public static final int PHONE = 20; // 0x14
+ field public static final int STRUCTURED_NAME = 40; // 0x28
+ field public static final int STRUCTURED_PHONETIC_NAME = 37; // 0x25
+ field public static final int UNDEFINED = 0; // 0x0
+ }
+
+ public static final class ContactsContract.DisplayPhoto {
+ field public static final android.net.Uri CONTENT_MAX_DIMENSIONS_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DISPLAY_MAX_DIM = "display_max_dim";
+ field public static final java.lang.String THUMBNAIL_MAX_DIM = "thumbnail_max_dim";
+ }
+
+ public static abstract interface ContactsContract.FullNameStyle {
+ field public static final int CHINESE = 3; // 0x3
+ field public static final int CJK = 2; // 0x2
+ field public static final int JAPANESE = 4; // 0x4
+ field public static final int KOREAN = 5; // 0x5
+ field public static final int UNDEFINED = 0; // 0x0
+ field public static final int WESTERN = 1; // 0x1
+ }
+
+ public static final class ContactsContract.Groups implements android.provider.BaseColumns android.provider.ContactsContract.GroupsColumns android.provider.ContactsContract.SyncColumns {
+ method public static android.content.EntityIterator newEntityIterator(android.database.Cursor);
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/group";
+ field public static final android.net.Uri CONTENT_SUMMARY_URI;
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/group";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface ContactsContract.GroupsColumns {
+ field public static final java.lang.String AUTO_ADD = "auto_add";
+ field public static final java.lang.String DATA_SET = "data_set";
+ field public static final java.lang.String DELETED = "deleted";
+ field public static final java.lang.String FAVORITES = "favorites";
+ field public static final java.lang.String GROUP_IS_READ_ONLY = "group_is_read_only";
+ field public static final java.lang.String GROUP_VISIBLE = "group_visible";
+ field public static final java.lang.String NOTES = "notes";
+ field public static final java.lang.String RES_PACKAGE = "res_package";
+ field public static final java.lang.String SHOULD_SYNC = "should_sync";
+ field public static final java.lang.String SUMMARY_COUNT = "summ_count";
+ field public static final java.lang.String SUMMARY_WITH_PHONES = "summ_phones";
+ field public static final java.lang.String SYSTEM_ID = "system_id";
+ field public static final java.lang.String TITLE = "title";
+ field public static final java.lang.String TITLE_RES = "title_res";
+ }
+
+ public static final class ContactsContract.Intents {
+ ctor public ContactsContract.Intents();
+ field public static final java.lang.String ATTACH_IMAGE = "com.android.contacts.action.ATTACH_IMAGE";
+ field public static final java.lang.String CONTACTS_DATABASE_CREATED = "android.provider.Contacts.DATABASE_CREATED";
+ field public static final java.lang.String EXTRA_CREATE_DESCRIPTION = "com.android.contacts.action.CREATE_DESCRIPTION";
+ field public static final java.lang.String EXTRA_FORCE_CREATE = "com.android.contacts.action.FORCE_CREATE";
+ field public static final java.lang.String INVITE_CONTACT = "com.android.contacts.action.INVITE_CONTACT";
+ field public static final java.lang.String SEARCH_SUGGESTION_CLICKED = "android.provider.Contacts.SEARCH_SUGGESTION_CLICKED";
+ field public static final java.lang.String SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED = "android.provider.Contacts.SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED";
+ field public static final java.lang.String SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED = "android.provider.Contacts.SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED";
+ field public static final java.lang.String SHOW_OR_CREATE_CONTACT = "com.android.contacts.action.SHOW_OR_CREATE_CONTACT";
+ }
+
+ public static final class ContactsContract.Intents.Insert {
+ ctor public ContactsContract.Intents.Insert();
+ field public static final java.lang.String ACTION = "android.intent.action.INSERT";
+ field public static final java.lang.String COMPANY = "company";
+ field public static final java.lang.String DATA = "data";
+ field public static final java.lang.String EMAIL = "email";
+ field public static final java.lang.String EMAIL_ISPRIMARY = "email_isprimary";
+ field public static final java.lang.String EMAIL_TYPE = "email_type";
+ field public static final java.lang.String EXTRA_ACCOUNT = "android.provider.extra.ACCOUNT";
+ field public static final java.lang.String EXTRA_DATA_SET = "android.provider.extra.DATA_SET";
+ field public static final java.lang.String FULL_MODE = "full_mode";
+ field public static final java.lang.String IM_HANDLE = "im_handle";
+ field public static final java.lang.String IM_ISPRIMARY = "im_isprimary";
+ field public static final java.lang.String IM_PROTOCOL = "im_protocol";
+ field public static final java.lang.String JOB_TITLE = "job_title";
+ field public static final java.lang.String NAME = "name";
+ field public static final java.lang.String NOTES = "notes";
+ field public static final java.lang.String PHONE = "phone";
+ field public static final java.lang.String PHONETIC_NAME = "phonetic_name";
+ field public static final java.lang.String PHONE_ISPRIMARY = "phone_isprimary";
+ field public static final java.lang.String PHONE_TYPE = "phone_type";
+ field public static final java.lang.String POSTAL = "postal";
+ field public static final java.lang.String POSTAL_ISPRIMARY = "postal_isprimary";
+ field public static final java.lang.String POSTAL_TYPE = "postal_type";
+ field public static final java.lang.String SECONDARY_EMAIL = "secondary_email";
+ field public static final java.lang.String SECONDARY_EMAIL_TYPE = "secondary_email_type";
+ field public static final java.lang.String SECONDARY_PHONE = "secondary_phone";
+ field public static final java.lang.String SECONDARY_PHONE_TYPE = "secondary_phone_type";
+ field public static final java.lang.String TERTIARY_EMAIL = "tertiary_email";
+ field public static final java.lang.String TERTIARY_EMAIL_TYPE = "tertiary_email_type";
+ field public static final java.lang.String TERTIARY_PHONE = "tertiary_phone";
+ field public static final java.lang.String TERTIARY_PHONE_TYPE = "tertiary_phone_type";
+ }
+
+ public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {
+ field public static final android.net.Uri CONTENT_FILTER_URI;
+ field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;
+ field public static final java.lang.String QUERY_PARAMETER_SIP_ADDRESS = "sip";
+ }
+
+ protected static abstract interface ContactsContract.PhoneLookupColumns {
+ field public static final java.lang.String LABEL = "label";
+ field public static final java.lang.String NORMALIZED_NUMBER = "normalized_number";
+ field public static final java.lang.String NUMBER = "number";
+ field public static final java.lang.String TYPE = "type";
+ }
+
+ public static abstract interface ContactsContract.PhoneticNameStyle {
+ field public static final int JAPANESE = 4; // 0x4
+ field public static final int KOREAN = 5; // 0x5
+ field public static final int PINYIN = 3; // 0x3
+ field public static final int UNDEFINED = 0; // 0x0
+ }
+
+ public static final class ContactsContract.PinnedPositions {
+ ctor public ContactsContract.PinnedPositions();
+ method public static void pin(android.content.ContentResolver, long, int);
+ method public static void undemote(android.content.ContentResolver, long);
+ field public static final int DEMOTED = -1; // 0xffffffff
+ field public static final int UNPINNED = 0; // 0x0
+ }
+
+ public static final deprecated class ContactsContract.Presence extends android.provider.ContactsContract.StatusUpdates {
+ ctor public ContactsContract.Presence();
+ }
+
+ protected static abstract interface ContactsContract.PresenceColumns {
+ field public static final java.lang.String CUSTOM_PROTOCOL = "custom_protocol";
+ field public static final java.lang.String DATA_ID = "presence_data_id";
+ field public static final java.lang.String IM_ACCOUNT = "im_account";
+ field public static final java.lang.String IM_HANDLE = "im_handle";
+ field public static final java.lang.String PROTOCOL = "protocol";
+ }
+
+ public static final class ContactsContract.Profile implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns {
+ field public static final android.net.Uri CONTENT_RAW_CONTACTS_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri CONTENT_VCARD_URI;
+ field public static final long MIN_ID = 9223372034707292160L; // 0x7fffffff80000000L
+ }
+
+ public static final class ContactsContract.ProfileSyncState implements android.provider.SyncStateContract.Columns {
+ method public static byte[] get(android.content.ContentProviderClient, android.accounts.Account) throws android.os.RemoteException;
+ method public static android.util.Pair<android.net.Uri, byte[]> getWithUri(android.content.ContentProviderClient, android.accounts.Account) throws android.os.RemoteException;
+ method public static android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[]);
+ method public static void set(android.content.ContentProviderClient, android.accounts.Account, byte[]) throws android.os.RemoteException;
+ field public static final java.lang.String CONTENT_DIRECTORY = "syncstate";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public static final class ContactsContract.ProviderStatus {
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/provider_status";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String STATUS = "status";
+ field public static final int STATUS_BUSY = 1; // 0x1
+ field public static final int STATUS_EMPTY = 2; // 0x2
+ field public static final int STATUS_NORMAL = 0; // 0x0
+ }
+
+ public static final class ContactsContract.QuickContact {
+ ctor public ContactsContract.QuickContact();
+ method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]);
+ method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[]);
+ method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, java.lang.String[], java.lang.String);
+ method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, java.lang.String[], java.lang.String);
+ field public static final java.lang.String ACTION_QUICK_CONTACT = "android.provider.action.QUICK_CONTACT";
+ field public static final java.lang.String EXTRA_EXCLUDE_MIMES = "android.provider.extra.EXCLUDE_MIMES";
+ field public static final java.lang.String EXTRA_MODE = "android.provider.extra.MODE";
+ field public static final java.lang.String EXTRA_PRIORITIZED_MIMETYPE = "android.provider.extra.PRIORITIZED_MIMETYPE";
+ field public static final int MODE_LARGE = 3; // 0x3
+ field public static final int MODE_MEDIUM = 2; // 0x2
+ field public static final int MODE_SMALL = 1; // 0x1
+ }
+
+ public static final class ContactsContract.RawContacts implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.SyncColumns {
+ method public static android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri);
+ method public static android.content.EntityIterator newEntityIterator(android.database.Cursor);
+ field public static final int AGGREGATION_MODE_DEFAULT = 0; // 0x0
+ field public static final int AGGREGATION_MODE_DISABLED = 3; // 0x3
+ field public static final deprecated int AGGREGATION_MODE_IMMEDIATE = 1; // 0x1
+ field public static final int AGGREGATION_MODE_SUSPENDED = 2; // 0x2
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/raw_contact";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/raw_contact";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public static final class ContactsContract.RawContacts.Data implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns {
+ field public static final java.lang.String CONTENT_DIRECTORY = "data";
+ }
+
+ public static final class ContactsContract.RawContacts.DisplayPhoto {
+ field public static final java.lang.String CONTENT_DIRECTORY = "display_photo";
+ }
+
+ public static final class ContactsContract.RawContacts.Entity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns {
+ field public static final java.lang.String CONTENT_DIRECTORY = "entity";
+ field public static final java.lang.String DATA_ID = "data_id";
+ }
+
+ protected static abstract interface ContactsContract.RawContactsColumns {
+ field public static final java.lang.String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set";
+ field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode";
+ field public static final java.lang.String BACKUP_ID = "backup_id";
+ field public static final java.lang.String CONTACT_ID = "contact_id";
+ field public static final java.lang.String DATA_SET = "data_set";
+ field public static final java.lang.String DELETED = "deleted";
+ field public static final java.lang.String METADATA_DIRTY = "metadata_dirty";
+ field public static final java.lang.String RAW_CONTACT_IS_READ_ONLY = "raw_contact_is_read_only";
+ field public static final java.lang.String RAW_CONTACT_IS_USER_PROFILE = "raw_contact_is_user_profile";
+ }
+
+ public static final class ContactsContract.RawContactsEntity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns {
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/raw_contact_entity";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DATA_ID = "data_id";
+ field public static final android.net.Uri PROFILE_CONTENT_URI;
+ }
+
+ public static class ContactsContract.SearchSnippets {
+ ctor public ContactsContract.SearchSnippets();
+ field public static final java.lang.String DEFERRED_SNIPPETING_KEY = "deferred_snippeting";
+ field public static final java.lang.String SNIPPET = "snippet";
+ }
+
+ public static final class ContactsContract.Settings implements android.provider.ContactsContract.SettingsColumns {
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/setting";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/setting";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ protected static abstract interface ContactsContract.SettingsColumns {
+ field public static final java.lang.String ACCOUNT_NAME = "account_name";
+ field public static final java.lang.String ACCOUNT_TYPE = "account_type";
+ field public static final java.lang.String ANY_UNSYNCED = "any_unsynced";
+ field public static final java.lang.String DATA_SET = "data_set";
+ field public static final java.lang.String SHOULD_SYNC = "should_sync";
+ field public static final java.lang.String UNGROUPED_COUNT = "summ_count";
+ field public static final java.lang.String UNGROUPED_VISIBLE = "ungrouped_visible";
+ field public static final java.lang.String UNGROUPED_WITH_PHONES = "summ_phones";
+ }
+
+ protected static abstract interface ContactsContract.StatusColumns {
+ field public static final int AVAILABLE = 5; // 0x5
+ field public static final int AWAY = 2; // 0x2
+ field public static final int CAPABILITY_HAS_CAMERA = 4; // 0x4
+ field public static final int CAPABILITY_HAS_VIDEO = 2; // 0x2
+ field public static final int CAPABILITY_HAS_VOICE = 1; // 0x1
+ field public static final java.lang.String CHAT_CAPABILITY = "chat_capability";
+ field public static final int DO_NOT_DISTURB = 4; // 0x4
+ field public static final int IDLE = 3; // 0x3
+ field public static final int INVISIBLE = 1; // 0x1
+ field public static final int OFFLINE = 0; // 0x0
+ field public static final java.lang.String PRESENCE = "mode";
+ field public static final deprecated java.lang.String PRESENCE_CUSTOM_STATUS = "status";
+ field public static final deprecated java.lang.String PRESENCE_STATUS = "mode";
+ field public static final java.lang.String STATUS = "status";
+ field public static final java.lang.String STATUS_ICON = "status_icon";
+ field public static final java.lang.String STATUS_LABEL = "status_label";
+ field public static final java.lang.String STATUS_RES_PACKAGE = "status_res_package";
+ field public static final java.lang.String STATUS_TIMESTAMP = "status_ts";
+ }
+
+ public static class ContactsContract.StatusUpdates implements android.provider.ContactsContract.PresenceColumns android.provider.ContactsContract.StatusColumns {
+ method public static final int getPresenceIconResourceId(int);
+ method public static final int getPresencePrecedence(int);
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/status-update";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/status-update";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri PROFILE_CONTENT_URI;
+ }
+
+ protected static abstract interface ContactsContract.SyncColumns implements android.provider.ContactsContract.BaseSyncColumns {
+ field public static final java.lang.String ACCOUNT_NAME = "account_name";
+ field public static final java.lang.String ACCOUNT_TYPE = "account_type";
+ field public static final java.lang.String DIRTY = "dirty";
+ field public static final java.lang.String SOURCE_ID = "sourceid";
+ field public static final java.lang.String VERSION = "version";
+ }
+
+ public static final class ContactsContract.SyncState implements android.provider.SyncStateContract.Columns {
+ method public static byte[] get(android.content.ContentProviderClient, android.accounts.Account) throws android.os.RemoteException;
+ method public static android.util.Pair<android.net.Uri, byte[]> getWithUri(android.content.ContentProviderClient, android.accounts.Account) throws android.os.RemoteException;
+ method public static android.content.ContentProviderOperation newSetOperation(android.accounts.Account, byte[]);
+ method public static void set(android.content.ContentProviderClient, android.accounts.Account, byte[]) throws android.os.RemoteException;
+ field public static final java.lang.String CONTENT_DIRECTORY = "syncstate";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public final class DocumentsContract {
+ method public static android.net.Uri buildChildDocumentsUri(java.lang.String, java.lang.String);
+ method public static android.net.Uri buildChildDocumentsUriUsingTree(android.net.Uri, java.lang.String);
+ method public static android.net.Uri buildDocumentUri(java.lang.String, java.lang.String);
+ method public static android.net.Uri buildDocumentUriUsingTree(android.net.Uri, java.lang.String);
+ method public static android.net.Uri buildRecentDocumentsUri(java.lang.String, java.lang.String);
+ method public static android.net.Uri buildRootUri(java.lang.String, java.lang.String);
+ method public static android.net.Uri buildRootsUri(java.lang.String);
+ method public static android.net.Uri buildSearchDocumentsUri(java.lang.String, java.lang.String, java.lang.String);
+ method public static android.net.Uri buildTreeDocumentUri(java.lang.String, java.lang.String);
+ method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);
+ method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri);
+ method public static java.lang.String getDocumentId(android.net.Uri);
+ method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal);
+ method public static java.lang.String getRootId(android.net.Uri);
+ method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);
+ method public static java.lang.String getTreeDocumentId(android.net.Uri);
+ method public static boolean isDocumentUri(android.content.Context, android.net.Uri);
+ method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);
+ field public static final java.lang.String EXTRA_ERROR = "error";
+ field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";
+ field public static final java.lang.String EXTRA_INFO = "info";
+ field public static final java.lang.String EXTRA_LOADING = "loading";
+ field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
+ field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
+ }
+
+ public static final class DocumentsContract.Document {
+ field public static final java.lang.String COLUMN_DISPLAY_NAME = "_display_name";
+ field public static final java.lang.String COLUMN_DOCUMENT_ID = "document_id";
+ field public static final java.lang.String COLUMN_FLAGS = "flags";
+ field public static final java.lang.String COLUMN_ICON = "icon";
+ field public static final java.lang.String COLUMN_LAST_MODIFIED = "last_modified";
+ field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
+ field public static final java.lang.String COLUMN_SIZE = "_size";
+ field public static final java.lang.String COLUMN_SUMMARY = "summary";
+ field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10
+ field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20
+ field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8
+ field public static final int FLAG_SUPPORTS_COPY = 128; // 0x80
+ field public static final int FLAG_SUPPORTS_DELETE = 4; // 0x4
+ field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
+ field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
+ field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
+ field public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 512; // 0x200
+ field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
+ field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
+ field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
+ }
+
+ public static final class DocumentsContract.Root {
+ field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
+ field public static final java.lang.String COLUMN_DOCUMENT_ID = "document_id";
+ field public static final java.lang.String COLUMN_FLAGS = "flags";
+ field public static final java.lang.String COLUMN_ICON = "icon";
+ field public static final java.lang.String COLUMN_MIME_TYPES = "mime_types";
+ field public static final java.lang.String COLUMN_ROOT_ID = "root_id";
+ field public static final java.lang.String COLUMN_SUMMARY = "summary";
+ field public static final java.lang.String COLUMN_TITLE = "title";
+ field public static final int FLAG_LOCAL_ONLY = 2; // 0x2
+ field public static final int FLAG_SUPPORTS_CREATE = 1; // 0x1
+ field public static final int FLAG_SUPPORTS_IS_CHILD = 16; // 0x10
+ field public static final int FLAG_SUPPORTS_RECENTS = 4; // 0x4
+ field public static final int FLAG_SUPPORTS_SEARCH = 8; // 0x8
+ }
+
+ public abstract class DocumentsProvider extends android.content.ContentProvider {
+ ctor public DocumentsProvider();
+ method public java.lang.String createDocument(java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+ method public final int delete(android.net.Uri, java.lang.String, java.lang.String[]);
+ method public void deleteDocument(java.lang.String) throws java.io.FileNotFoundException;
+ method public java.lang.String getDocumentType(java.lang.String) throws java.io.FileNotFoundException;
+ method public final java.lang.String getType(android.net.Uri);
+ method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
+ method public boolean isChildDocument(java.lang.String, java.lang.String);
+ method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public final android.content.res.AssetFileDescriptor openAssetFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public abstract android.os.ParcelFileDescriptor openDocument(java.lang.String, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public android.content.res.AssetFileDescriptor openDocumentThumbnail(java.lang.String, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public final android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String) throws java.io.FileNotFoundException;
+ method public final android.os.ParcelFileDescriptor openFile(android.net.Uri, java.lang.String, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public final android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle) throws java.io.FileNotFoundException;
+ method public final android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public android.content.res.AssetFileDescriptor openTypedDocument(java.lang.String, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;
+ method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public abstract android.database.Cursor queryChildDocuments(java.lang.String, java.lang.String[], java.lang.String) throws java.io.FileNotFoundException;
+ method public abstract android.database.Cursor queryDocument(java.lang.String, java.lang.String[]) throws java.io.FileNotFoundException;
+ method public android.database.Cursor queryRecentDocuments(java.lang.String, java.lang.String[]) throws java.io.FileNotFoundException;
+ method public abstract android.database.Cursor queryRoots(java.lang.String[]) throws java.io.FileNotFoundException;
+ method public android.database.Cursor querySearchDocuments(java.lang.String, java.lang.String, java.lang.String[]) throws java.io.FileNotFoundException;
+ method public java.lang.String renameDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+ method public final void revokeDocumentPermission(java.lang.String);
+ method public final int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ }
+
+ public final deprecated class LiveFolders implements android.provider.BaseColumns {
+ field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";
+ field public static final java.lang.String DESCRIPTION = "description";
+ field public static final int DISPLAY_MODE_GRID = 1; // 0x1
+ field public static final int DISPLAY_MODE_LIST = 2; // 0x2
+ field public static final java.lang.String EXTRA_LIVE_FOLDER_BASE_INTENT = "android.intent.extra.livefolder.BASE_INTENT";
+ field public static final java.lang.String EXTRA_LIVE_FOLDER_DISPLAY_MODE = "android.intent.extra.livefolder.DISPLAY_MODE";
+ field public static final java.lang.String EXTRA_LIVE_FOLDER_ICON = "android.intent.extra.livefolder.ICON";
+ field public static final java.lang.String EXTRA_LIVE_FOLDER_NAME = "android.intent.extra.livefolder.NAME";
+ field public static final java.lang.String ICON_BITMAP = "icon_bitmap";
+ field public static final java.lang.String ICON_PACKAGE = "icon_package";
+ field public static final java.lang.String ICON_RESOURCE = "icon_resource";
+ field public static final java.lang.String INTENT = "intent";
+ field public static final java.lang.String NAME = "name";
+ }
+
+ public final class MediaStore {
+ ctor public MediaStore();
+ method public static android.net.Uri getMediaScannerUri();
+ method public static java.lang.String getVersion(android.content.Context);
+ field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
+ field public static final java.lang.String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE";
+ field public static final java.lang.String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";
+ field public static final java.lang.String AUTHORITY = "media";
+ field public static final java.lang.String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
+ field public static final java.lang.String EXTRA_FINISH_ON_COMPLETION = "android.intent.extra.finishOnCompletion";
+ field public static final java.lang.String EXTRA_FULL_SCREEN = "android.intent.extra.fullScreen";
+ field public static final java.lang.String EXTRA_MEDIA_ALBUM = "android.intent.extra.album";
+ field public static final java.lang.String EXTRA_MEDIA_ARTIST = "android.intent.extra.artist";
+ field public static final java.lang.String EXTRA_MEDIA_FOCUS = "android.intent.extra.focus";
+ field public static final java.lang.String EXTRA_MEDIA_GENRE = "android.intent.extra.genre";
+ field public static final java.lang.String EXTRA_MEDIA_PLAYLIST = "android.intent.extra.playlist";
+ field public static final java.lang.String EXTRA_MEDIA_RADIO_CHANNEL = "android.intent.extra.radio_channel";
+ field public static final java.lang.String EXTRA_MEDIA_TITLE = "android.intent.extra.title";
+ field public static final java.lang.String EXTRA_OUTPUT = "output";
+ field public static final java.lang.String EXTRA_SCREEN_ORIENTATION = "android.intent.extra.screenOrientation";
+ field public static final java.lang.String EXTRA_SHOW_ACTION_ICONS = "android.intent.extra.showActionIcons";
+ field public static final java.lang.String EXTRA_SIZE_LIMIT = "android.intent.extra.sizeLimit";
+ field public static final java.lang.String EXTRA_VIDEO_QUALITY = "android.intent.extra.videoQuality";
+ field public static final java.lang.String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH = "android.media.action.MEDIA_PLAY_FROM_SEARCH";
+ field public static final java.lang.String INTENT_ACTION_MEDIA_SEARCH = "android.intent.action.MEDIA_SEARCH";
+ field public static final deprecated java.lang.String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";
+ field public static final java.lang.String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA";
+ field public static final java.lang.String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE";
+ field public static final java.lang.String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH = "android.media.action.TEXT_OPEN_FROM_SEARCH";
+ field public static final java.lang.String INTENT_ACTION_VIDEO_CAMERA = "android.media.action.VIDEO_CAMERA";
+ field public static final java.lang.String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH = "android.media.action.VIDEO_PLAY_FROM_SEARCH";
+ field public static final java.lang.String MEDIA_IGNORE_FILENAME = ".nomedia";
+ field public static final java.lang.String MEDIA_SCANNER_VOLUME = "volume";
+ field public static final java.lang.String META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE = "android.media.still_image_camera_preview_service";
+ field public static final java.lang.String UNKNOWN_STRING = "<unknown>";
+ }
+
+ public static final class MediaStore.Audio {
+ ctor public MediaStore.Audio();
+ method public static java.lang.String keyFor(java.lang.String);
+ }
+
+ public static abstract interface MediaStore.Audio.AlbumColumns {
+ field public static final java.lang.String ALBUM = "album";
+ field public static final java.lang.String ALBUM_ART = "album_art";
+ field public static final java.lang.String ALBUM_ID = "album_id";
+ field public static final java.lang.String ALBUM_KEY = "album_key";
+ field public static final java.lang.String ARTIST = "artist";
+ field public static final java.lang.String FIRST_YEAR = "minyear";
+ field public static final java.lang.String LAST_YEAR = "maxyear";
+ field public static final java.lang.String NUMBER_OF_SONGS = "numsongs";
+ field public static final java.lang.String NUMBER_OF_SONGS_FOR_ARTIST = "numsongs_by_artist";
+ }
+
+ public static final class MediaStore.Audio.Albums implements android.provider.BaseColumns android.provider.MediaStore.Audio.AlbumColumns {
+ ctor public MediaStore.Audio.Albums();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/albums";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "album_key";
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/album";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ }
+
+ public static abstract interface MediaStore.Audio.ArtistColumns {
+ field public static final java.lang.String ARTIST = "artist";
+ field public static final java.lang.String ARTIST_KEY = "artist_key";
+ field public static final java.lang.String NUMBER_OF_ALBUMS = "number_of_albums";
+ field public static final java.lang.String NUMBER_OF_TRACKS = "number_of_tracks";
+ }
+
+ public static final class MediaStore.Audio.Artists implements android.provider.BaseColumns android.provider.MediaStore.Audio.ArtistColumns {
+ ctor public MediaStore.Audio.Artists();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/artists";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "artist_key";
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/artist";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ }
+
+ public static final class MediaStore.Audio.Artists.Albums implements android.provider.MediaStore.Audio.AlbumColumns {
+ ctor public MediaStore.Audio.Artists.Albums();
+ method public static final android.net.Uri getContentUri(java.lang.String, long);
+ }
+
+ public static abstract interface MediaStore.Audio.AudioColumns implements android.provider.MediaStore.MediaColumns {
+ field public static final java.lang.String ALBUM = "album";
+ field public static final java.lang.String ALBUM_ID = "album_id";
+ field public static final java.lang.String ALBUM_KEY = "album_key";
+ field public static final java.lang.String ARTIST = "artist";
+ field public static final java.lang.String ARTIST_ID = "artist_id";
+ field public static final java.lang.String ARTIST_KEY = "artist_key";
+ field public static final java.lang.String BOOKMARK = "bookmark";
+ field public static final java.lang.String COMPOSER = "composer";
+ field public static final java.lang.String DURATION = "duration";
+ field public static final java.lang.String IS_ALARM = "is_alarm";
+ field public static final java.lang.String IS_MUSIC = "is_music";
+ field public static final java.lang.String IS_NOTIFICATION = "is_notification";
+ field public static final java.lang.String IS_PODCAST = "is_podcast";
+ field public static final java.lang.String IS_RINGTONE = "is_ringtone";
+ field public static final java.lang.String TITLE_KEY = "title_key";
+ field public static final java.lang.String TRACK = "track";
+ field public static final java.lang.String YEAR = "year";
+ }
+
+ public static final class MediaStore.Audio.Genres implements android.provider.BaseColumns android.provider.MediaStore.Audio.GenresColumns {
+ ctor public MediaStore.Audio.Genres();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ method public static android.net.Uri getContentUriForAudioId(java.lang.String, int);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/genre";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "name";
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/genre";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ }
+
+ public static final class MediaStore.Audio.Genres.Members implements android.provider.MediaStore.Audio.AudioColumns {
+ ctor public MediaStore.Audio.Genres.Members();
+ method public static final android.net.Uri getContentUri(java.lang.String, long);
+ field public static final java.lang.String AUDIO_ID = "audio_id";
+ field public static final java.lang.String CONTENT_DIRECTORY = "members";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "title_key";
+ field public static final java.lang.String GENRE_ID = "genre_id";
+ }
+
+ public static abstract interface MediaStore.Audio.GenresColumns {
+ field public static final java.lang.String NAME = "name";
+ }
+
+ public static final class MediaStore.Audio.Media implements android.provider.MediaStore.Audio.AudioColumns {
+ ctor public MediaStore.Audio.Media();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ method public static android.net.Uri getContentUriForPath(java.lang.String);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "title_key";
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/audio";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final java.lang.String EXTRA_MAX_BYTES = "android.provider.MediaStore.extra.MAX_BYTES";
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ field public static final java.lang.String RECORD_SOUND_ACTION = "android.provider.MediaStore.RECORD_SOUND";
+ }
+
+ public static final class MediaStore.Audio.Playlists implements android.provider.BaseColumns android.provider.MediaStore.Audio.PlaylistsColumns {
+ ctor public MediaStore.Audio.Playlists();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/playlist";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "name";
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/playlist";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ }
+
+ public static final class MediaStore.Audio.Playlists.Members implements android.provider.MediaStore.Audio.AudioColumns {
+ ctor public MediaStore.Audio.Playlists.Members();
+ method public static final android.net.Uri getContentUri(java.lang.String, long);
+ method public static final boolean moveItem(android.content.ContentResolver, long, int, int);
+ field public static final java.lang.String AUDIO_ID = "audio_id";
+ field public static final java.lang.String CONTENT_DIRECTORY = "members";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "play_order";
+ field public static final java.lang.String PLAYLIST_ID = "playlist_id";
+ field public static final java.lang.String PLAY_ORDER = "play_order";
+ field public static final java.lang.String _ID = "_id";
+ }
+
+ public static abstract interface MediaStore.Audio.PlaylistsColumns {
+ field public static final java.lang.String DATA = "_data";
+ field public static final java.lang.String DATE_ADDED = "date_added";
+ field public static final java.lang.String DATE_MODIFIED = "date_modified";
+ field public static final java.lang.String NAME = "name";
+ }
+
+ public static final class MediaStore.Audio.Radio {
+ field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/radio";
+ }
+
+ public static final class MediaStore.Files {
+ ctor public MediaStore.Files();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ method public static final android.net.Uri getContentUri(java.lang.String, long);
+ }
+
+ public static abstract interface MediaStore.Files.FileColumns implements android.provider.MediaStore.MediaColumns {
+ field public static final java.lang.String MEDIA_TYPE = "media_type";
+ field public static final int MEDIA_TYPE_AUDIO = 2; // 0x2
+ field public static final int MEDIA_TYPE_IMAGE = 1; // 0x1
+ field public static final int MEDIA_TYPE_NONE = 0; // 0x0
+ field public static final int MEDIA_TYPE_PLAYLIST = 4; // 0x4
+ field public static final int MEDIA_TYPE_VIDEO = 3; // 0x3
+ field public static final java.lang.String MIME_TYPE = "mime_type";
+ field public static final java.lang.String PARENT = "parent";
+ field public static final java.lang.String TITLE = "title";
+ }
+
+ public static final class MediaStore.Images {
+ ctor public MediaStore.Images();
+ }
+
+ public static abstract interface MediaStore.Images.ImageColumns implements android.provider.MediaStore.MediaColumns {
+ field public static final java.lang.String BUCKET_DISPLAY_NAME = "bucket_display_name";
+ field public static final java.lang.String BUCKET_ID = "bucket_id";
+ field public static final java.lang.String DATE_TAKEN = "datetaken";
+ field public static final java.lang.String DESCRIPTION = "description";
+ field public static final java.lang.String IS_PRIVATE = "isprivate";
+ field public static final java.lang.String LATITUDE = "latitude";
+ field public static final java.lang.String LONGITUDE = "longitude";
+ field public static final java.lang.String MINI_THUMB_MAGIC = "mini_thumb_magic";
+ field public static final java.lang.String ORIENTATION = "orientation";
+ field public static final java.lang.String PICASA_ID = "picasa_id";
+ }
+
+ public static final class MediaStore.Images.Media implements android.provider.MediaStore.Images.ImageColumns {
+ ctor public MediaStore.Images.Media();
+ method public static final android.graphics.Bitmap getBitmap(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException, java.io.IOException;
+ method public static android.net.Uri getContentUri(java.lang.String);
+ method public static final java.lang.String insertImage(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+ method public static final java.lang.String insertImage(android.content.ContentResolver, android.graphics.Bitmap, java.lang.String, java.lang.String);
+ method public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]);
+ method public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String);
+ method public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/image";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "bucket_display_name";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ }
+
+ public static class MediaStore.Images.Thumbnails implements android.provider.BaseColumns {
+ ctor public MediaStore.Images.Thumbnails();
+ method public static void cancelThumbnailRequest(android.content.ContentResolver, long);
+ method public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);
+ method public static android.net.Uri getContentUri(java.lang.String);
+ method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);
+ method public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]);
+ method public static final android.database.Cursor queryMiniThumbnail(android.content.ContentResolver, long, int, java.lang.String[]);
+ method public static final android.database.Cursor queryMiniThumbnails(android.content.ContentResolver, android.net.Uri, int, java.lang.String[]);
+ field public static final java.lang.String DATA = "_data";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "image_id ASC";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final int FULL_SCREEN_KIND = 2; // 0x2
+ field public static final java.lang.String HEIGHT = "height";
+ field public static final java.lang.String IMAGE_ID = "image_id";
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ field public static final java.lang.String KIND = "kind";
+ field public static final int MICRO_KIND = 3; // 0x3
+ field public static final int MINI_KIND = 1; // 0x1
+ field public static final java.lang.String THUMB_DATA = "thumb_data";
+ field public static final java.lang.String WIDTH = "width";
+ }
+
+ public static abstract interface MediaStore.MediaColumns implements android.provider.BaseColumns {
+ field public static final java.lang.String DATA = "_data";
+ field public static final java.lang.String DATE_ADDED = "date_added";
+ field public static final java.lang.String DATE_MODIFIED = "date_modified";
+ field public static final java.lang.String DISPLAY_NAME = "_display_name";
+ field public static final java.lang.String HEIGHT = "height";
+ field public static final java.lang.String MIME_TYPE = "mime_type";
+ field public static final java.lang.String SIZE = "_size";
+ field public static final java.lang.String TITLE = "title";
+ field public static final java.lang.String WIDTH = "width";
+ }
+
+ public static final class MediaStore.Video {
+ ctor public MediaStore.Video();
+ method public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, java.lang.String[]);
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "_display_name";
+ }
+
+ public static final class MediaStore.Video.Media implements android.provider.MediaStore.Video.VideoColumns {
+ ctor public MediaStore.Video.Media();
+ method public static android.net.Uri getContentUri(java.lang.String);
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/video";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "title";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ }
+
+ public static class MediaStore.Video.Thumbnails implements android.provider.BaseColumns {
+ ctor public MediaStore.Video.Thumbnails();
+ method public static void cancelThumbnailRequest(android.content.ContentResolver, long);
+ method public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);
+ method public static android.net.Uri getContentUri(java.lang.String);
+ method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);
+ method public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);
+ field public static final java.lang.String DATA = "_data";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "video_id ASC";
+ field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+ field public static final int FULL_SCREEN_KIND = 2; // 0x2
+ field public static final java.lang.String HEIGHT = "height";
+ field public static final android.net.Uri INTERNAL_CONTENT_URI;
+ field public static final java.lang.String KIND = "kind";
+ field public static final int MICRO_KIND = 3; // 0x3
+ field public static final int MINI_KIND = 1; // 0x1
+ field public static final java.lang.String VIDEO_ID = "video_id";
+ field public static final java.lang.String WIDTH = "width";
+ }
+
+ public static abstract interface MediaStore.Video.VideoColumns implements android.provider.MediaStore.MediaColumns {
+ field public static final java.lang.String ALBUM = "album";
+ field public static final java.lang.String ARTIST = "artist";
+ field public static final java.lang.String BOOKMARK = "bookmark";
+ field public static final java.lang.String BUCKET_DISPLAY_NAME = "bucket_display_name";
+ field public static final java.lang.String BUCKET_ID = "bucket_id";
+ field public static final java.lang.String CATEGORY = "category";
+ field public static final java.lang.String DATE_TAKEN = "datetaken";
+ field public static final java.lang.String DESCRIPTION = "description";
+ field public static final java.lang.String DURATION = "duration";
+ field public static final java.lang.String IS_PRIVATE = "isprivate";
+ field public static final java.lang.String LANGUAGE = "language";
+ field public static final java.lang.String LATITUDE = "latitude";
+ field public static final java.lang.String LONGITUDE = "longitude";
+ field public static final java.lang.String MINI_THUMB_MAGIC = "mini_thumb_magic";
+ field public static final java.lang.String RESOLUTION = "resolution";
+ field public static final java.lang.String TAGS = "tags";
+ }
+
+ public abstract interface OpenableColumns {
+ field public static final java.lang.String DISPLAY_NAME = "_display_name";
+ field public static final java.lang.String SIZE = "_size";
+ }
+
+ public class SearchRecentSuggestions {
+ ctor public SearchRecentSuggestions(android.content.Context, java.lang.String, int);
+ method public void clearHistory();
+ method public void saveRecentQuery(java.lang.String, java.lang.String);
+ method protected void truncateHistory(android.content.ContentResolver, int);
+ field public static final java.lang.String[] QUERIES_PROJECTION_1LINE;
+ field public static final java.lang.String[] QUERIES_PROJECTION_2LINE;
+ field public static final int QUERIES_PROJECTION_DATE_INDEX = 1; // 0x1
+ field public static final int QUERIES_PROJECTION_DISPLAY1_INDEX = 3; // 0x3
+ field public static final int QUERIES_PROJECTION_DISPLAY2_INDEX = 4; // 0x4
+ field public static final int QUERIES_PROJECTION_QUERY_INDEX = 2; // 0x2
+ }
+
+ public final class Settings {
+ ctor public Settings();
+ method public static boolean canDrawOverlays(android.content.Context);
+ field public static final java.lang.String ACTION_ACCESSIBILITY_SETTINGS = "android.settings.ACCESSIBILITY_SETTINGS";
+ field public static final java.lang.String ACTION_ADD_ACCOUNT = "android.settings.ADD_ACCOUNT_SETTINGS";
+ field public static final java.lang.String ACTION_AIRPLANE_MODE_SETTINGS = "android.settings.AIRPLANE_MODE_SETTINGS";
+ field public static final java.lang.String ACTION_APN_SETTINGS = "android.settings.APN_SETTINGS";
+ field public static final java.lang.String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";
+ field public static final java.lang.String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";
+ field public static final java.lang.String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
+ field public static final java.lang.String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";
+ field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";
+ field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";
+ field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
+ field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
+ field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
+ field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
+ field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
+ field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";
+ field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";
+ field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS";
+ field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";
+ field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
+ field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";
+ field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS";
+ field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
+ field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
+ field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
+ field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
+ field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
+ field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
+ field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";
+ field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";
+ field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS";
+ field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";
+ field public static final java.lang.String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
+ field public static final java.lang.String ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS";
+ field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS";
+ field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
+ field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS";
+ field public static final java.lang.String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
+ field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
+ field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
+ field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";
+ field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
+ field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
+ field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";
+ field public static final java.lang.String ACTION_USAGE_ACCESS_SETTINGS = "android.settings.USAGE_ACCESS_SETTINGS";
+ field public static final java.lang.String ACTION_USER_DICTIONARY_SETTINGS = "android.settings.USER_DICTIONARY_SETTINGS";
+ field public static final java.lang.String ACTION_VOICE_CONTROL_AIRPLANE_MODE = "android.settings.VOICE_CONTROL_AIRPLANE_MODE";
+ field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE";
+ field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";
+ field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS";
+ field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
+ field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
+ field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
+ field public static final java.lang.String AUTHORITY = "settings";
+ field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";
+ field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";
+ field public static final java.lang.String EXTRA_AUTHORITIES = "authorities";
+ field public static final java.lang.String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";
+ field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";
+ field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";
+ field public static final java.lang.String EXTRA_INPUT_METHOD_ID = "input_method_id";
+ field public static final java.lang.String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";
+ field public static final java.lang.String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";
+ }
+
+ public static final class Settings.Global extends android.provider.Settings.NameValueTable {
+ ctor public Settings.Global();
+ method public static float getFloat(android.content.ContentResolver, java.lang.String, float);
+ method public static float getFloat(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static int getInt(android.content.ContentResolver, java.lang.String, int);
+ method public static int getInt(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static long getLong(android.content.ContentResolver, java.lang.String, long);
+ method public static long getLong(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static java.lang.String getString(android.content.ContentResolver, java.lang.String);
+ method public static android.net.Uri getUriFor(java.lang.String);
+ method public static boolean putFloat(android.content.ContentResolver, java.lang.String, float);
+ method public static boolean putInt(android.content.ContentResolver, java.lang.String, int);
+ method public static boolean putLong(android.content.ContentResolver, java.lang.String, long);
+ method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String);
+ field public static final java.lang.String ADB_ENABLED = "adb_enabled";
+ field public static final java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
+ field public static final java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
+ field public static final java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
+ field public static final java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
+ field public static final java.lang.String AUTO_TIME = "auto_time";
+ field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
+ field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DATA_ROAMING = "data_roaming";
+ field public static final java.lang.String DEBUG_APP = "debug_app";
+ field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
+ field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";
+ field public static final java.lang.String HTTP_PROXY = "http_proxy";
+ field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
+ field public static final java.lang.String MODE_RINGER = "mode_ringer";
+ field public static final java.lang.String NETWORK_PREFERENCE = "network_preference";
+ field public static final java.lang.String RADIO_BLUETOOTH = "bluetooth";
+ field public static final java.lang.String RADIO_CELL = "cell";
+ field public static final java.lang.String RADIO_NFC = "nfc";
+ field public static final java.lang.String RADIO_WIFI = "wifi";
+ field public static final java.lang.String SHOW_PROCESSES = "show_processes";
+ field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
+ field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version";
+ field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
+ field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
+ field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
+ field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
+ field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown";
+ field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
+ field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
+ field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
+ field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY = "wifi_networks_available_repeat_delay";
+ field public static final java.lang.String WIFI_NUM_OPEN_NETWORKS_KEPT = "wifi_num_open_networks_kept";
+ field public static final java.lang.String WIFI_ON = "wifi_on";
+ field public static final java.lang.String WIFI_SLEEP_POLICY = "wifi_sleep_policy";
+ field public static final int WIFI_SLEEP_POLICY_DEFAULT = 0; // 0x0
+ field public static final int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2
+ field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1
+ field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
+ field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
+ }
+
+ public static class Settings.NameValueTable implements android.provider.BaseColumns {
+ ctor public Settings.NameValueTable();
+ method public static android.net.Uri getUriFor(android.net.Uri, java.lang.String);
+ method protected static boolean putString(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String);
+ field public static final java.lang.String NAME = "name";
+ field public static final java.lang.String VALUE = "value";
+ }
+
+ public static final class Settings.Secure extends android.provider.Settings.NameValueTable {
+ ctor public Settings.Secure();
+ method public static float getFloat(android.content.ContentResolver, java.lang.String, float);
+ method public static float getFloat(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static int getInt(android.content.ContentResolver, java.lang.String, int);
+ method public static int getInt(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static long getLong(android.content.ContentResolver, java.lang.String, long);
+ method public static long getLong(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static java.lang.String getString(android.content.ContentResolver, java.lang.String);
+ method public static android.net.Uri getUriFor(java.lang.String);
+ method public static final deprecated boolean isLocationProviderEnabled(android.content.ContentResolver, java.lang.String);
+ method public static boolean putFloat(android.content.ContentResolver, java.lang.String, float);
+ method public static boolean putInt(android.content.ContentResolver, java.lang.String, int);
+ method public static boolean putLong(android.content.ContentResolver, java.lang.String, long);
+ method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String);
+ method public static final deprecated void setLocationProviderEnabled(android.content.ContentResolver, java.lang.String, boolean);
+ field public static final java.lang.String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED = "accessibility_display_inversion_enabled";
+ field public static final java.lang.String ACCESSIBILITY_ENABLED = "accessibility_enabled";
+ field public static final java.lang.String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password";
+ field public static final deprecated java.lang.String ADB_ENABLED = "adb_enabled";
+ field public static final java.lang.String ALLOWED_GEOLOCATION_ORIGINS = "allowed_geolocation_origins";
+ field public static final deprecated java.lang.String ALLOW_MOCK_LOCATION = "mock_location";
+ field public static final java.lang.String ANDROID_ID = "android_id";
+ field public static final deprecated java.lang.String BACKGROUND_DATA = "background_data";
+ field public static final deprecated java.lang.String BLUETOOTH_ON = "bluetooth_on";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DATA_ROAMING = "data_roaming";
+ field public static final java.lang.String DEFAULT_INPUT_METHOD = "default_input_method";
+ field public static final deprecated java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
+ field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";
+ field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";
+ field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";
+ field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";
+ field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";
+ field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";
+ field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
+ field public static final java.lang.String LOCATION_MODE = "location_mode";
+ field public static final int LOCATION_MODE_BATTERY_SAVING = 2; // 0x2
+ field public static final int LOCATION_MODE_HIGH_ACCURACY = 3; // 0x3
+ field public static final int LOCATION_MODE_OFF = 0; // 0x0
+ field public static final int LOCATION_MODE_SENSORS_ONLY = 1; // 0x1
+ field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
+ field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
+ field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+ field public static final deprecated java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
+ field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
+ field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
+ field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
+ field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";
+ field public static final java.lang.String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";
+ field public static final java.lang.String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";
+ field public static final java.lang.String SETTINGS_CLASSNAME = "settings_classname";
+ field public static final java.lang.String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
+ field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_secure_version";
+ field public static final java.lang.String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";
+ field public static final deprecated java.lang.String TTS_DEFAULT_COUNTRY = "tts_default_country";
+ field public static final deprecated java.lang.String TTS_DEFAULT_LANG = "tts_default_lang";
+ field public static final java.lang.String TTS_DEFAULT_PITCH = "tts_default_pitch";
+ field public static final java.lang.String TTS_DEFAULT_RATE = "tts_default_rate";
+ field public static final java.lang.String TTS_DEFAULT_SYNTH = "tts_default_synth";
+ field public static final deprecated java.lang.String TTS_DEFAULT_VARIANT = "tts_default_variant";
+ field public static final java.lang.String TTS_ENABLED_PLUGINS = "tts_enabled_plugins";
+ field public static final deprecated java.lang.String TTS_USE_DEFAULTS = "tts_use_defaults";
+ field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
+ field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
+ field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
+ field public static final deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
+ field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
+ field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY = "wifi_networks_available_repeat_delay";
+ field public static final deprecated java.lang.String WIFI_NUM_OPEN_NETWORKS_KEPT = "wifi_num_open_networks_kept";
+ field public static final deprecated java.lang.String WIFI_ON = "wifi_on";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE = "wifi_watchdog_acceptable_packet_loss_percentage";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_AP_COUNT = "wifi_watchdog_ap_count";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS = "wifi_watchdog_background_check_delay_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED = "wifi_watchdog_background_check_enabled";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS = "wifi_watchdog_background_check_timeout_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT = "wifi_watchdog_initial_ignored_ping_count";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_WATCH_LIST = "wifi_watchdog_watch_list";
+ }
+
+ public static class Settings.SettingNotFoundException extends android.util.AndroidException {
+ ctor public Settings.SettingNotFoundException(java.lang.String);
+ }
+
+ public static final class Settings.System extends android.provider.Settings.NameValueTable {
+ ctor public Settings.System();
+ method public static boolean canWrite(android.content.Context);
+ method public static void getConfiguration(android.content.ContentResolver, android.content.res.Configuration);
+ method public static float getFloat(android.content.ContentResolver, java.lang.String, float);
+ method public static float getFloat(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static int getInt(android.content.ContentResolver, java.lang.String, int);
+ method public static int getInt(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static long getLong(android.content.ContentResolver, java.lang.String, long);
+ method public static long getLong(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException;
+ method public static deprecated boolean getShowGTalkServiceStatus(android.content.ContentResolver);
+ method public static java.lang.String getString(android.content.ContentResolver, java.lang.String);
+ method public static android.net.Uri getUriFor(java.lang.String);
+ method public static boolean putConfiguration(android.content.ContentResolver, android.content.res.Configuration);
+ method public static boolean putFloat(android.content.ContentResolver, java.lang.String, float);
+ method public static boolean putInt(android.content.ContentResolver, java.lang.String, int);
+ method public static boolean putLong(android.content.ContentResolver, java.lang.String, long);
+ method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String);
+ method public static deprecated void setShowGTalkServiceStatus(android.content.ContentResolver, boolean);
+ field public static final java.lang.String ACCELEROMETER_ROTATION = "accelerometer_rotation";
+ field public static final deprecated java.lang.String ADB_ENABLED = "adb_enabled";
+ field public static final deprecated java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";
+ field public static final deprecated java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
+ field public static final java.lang.String ALARM_ALERT = "alarm_alert";
+ field public static final deprecated java.lang.String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
+ field public static final deprecated java.lang.String ANDROID_ID = "android_id";
+ field public static final deprecated java.lang.String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
+ field public static final deprecated java.lang.String AUTO_TIME = "auto_time";
+ field public static final deprecated java.lang.String AUTO_TIME_ZONE = "auto_time_zone";
+ field public static final java.lang.String BLUETOOTH_DISCOVERABILITY = "bluetooth_discoverability";
+ field public static final java.lang.String BLUETOOTH_DISCOVERABILITY_TIMEOUT = "bluetooth_discoverability_timeout";
+ field public static final deprecated java.lang.String BLUETOOTH_ON = "bluetooth_on";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String DATA_ROAMING = "data_roaming";
+ field public static final java.lang.String DATE_FORMAT = "date_format";
+ field public static final deprecated java.lang.String DEBUG_APP = "debug_app";
+ field public static final android.net.Uri DEFAULT_ALARM_ALERT_URI;
+ field public static final android.net.Uri DEFAULT_NOTIFICATION_URI;
+ field public static final android.net.Uri DEFAULT_RINGTONE_URI;
+ field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";
+ field public static final deprecated java.lang.String DIM_SCREEN = "dim_screen";
+ field public static final java.lang.String DTMF_TONE_TYPE_WHEN_DIALING = "dtmf_tone_type";
+ field public static final java.lang.String DTMF_TONE_WHEN_DIALING = "dtmf_tone";
+ field public static final java.lang.String END_BUTTON_BEHAVIOR = "end_button_behavior";
+ field public static final java.lang.String FONT_SCALE = "font_scale";
+ field public static final java.lang.String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
+ field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";
+ field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
+ field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
+ field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
+ field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+ field public static final deprecated java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
+ field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
+ field public static final deprecated java.lang.String MODE_RINGER = "mode_ringer";
+ field public static final java.lang.String MODE_RINGER_STREAMS_AFFECTED = "mode_ringer_streams_affected";
+ field public static final java.lang.String MUTE_STREAMS_AFFECTED = "mute_streams_affected";
+ field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
+ field public static final deprecated java.lang.String NEXT_ALARM_FORMATTED = "next_alarm_formatted";
+ field public static final java.lang.String NOTIFICATION_SOUND = "notification_sound";
+ field public static final deprecated java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
+ field public static final deprecated java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";
+ field public static final deprecated java.lang.String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";
+ field public static final deprecated java.lang.String RADIO_BLUETOOTH = "bluetooth";
+ field public static final deprecated java.lang.String RADIO_CELL = "cell";
+ field public static final deprecated java.lang.String RADIO_NFC = "nfc";
+ field public static final deprecated java.lang.String RADIO_WIFI = "wifi";
+ field public static final java.lang.String RINGTONE = "ringtone";
+ field public static final java.lang.String SCREEN_BRIGHTNESS = "screen_brightness";
+ field public static final java.lang.String SCREEN_BRIGHTNESS_MODE = "screen_brightness_mode";
+ field public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1; // 0x1
+ field public static final int SCREEN_BRIGHTNESS_MODE_MANUAL = 0; // 0x0
+ field public static final java.lang.String SCREEN_OFF_TIMEOUT = "screen_off_timeout";
+ field public static final deprecated java.lang.String SETTINGS_CLASSNAME = "settings_classname";
+ field public static final java.lang.String SETUP_WIZARD_HAS_RUN = "setup_wizard_has_run";
+ field public static final java.lang.String SHOW_GTALK_SERVICE_STATUS = "SHOW_GTALK_SERVICE_STATUS";
+ field public static final deprecated java.lang.String SHOW_PROCESSES = "show_processes";
+ field public static final deprecated java.lang.String SHOW_WEB_SUGGESTIONS = "show_web_suggestions";
+ field public static final java.lang.String SOUND_EFFECTS_ENABLED = "sound_effects_enabled";
+ field public static final deprecated java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";
+ field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";
+ field public static final java.lang.String TEXT_AUTO_CAPS = "auto_caps";
+ field public static final java.lang.String TEXT_AUTO_PUNCTUATE = "auto_punctuate";
+ field public static final java.lang.String TEXT_AUTO_REPLACE = "auto_replace";
+ field public static final java.lang.String TEXT_SHOW_PASSWORD = "show_password";
+ field public static final java.lang.String TIME_12_24 = "time_12_24";
+ field public static final deprecated java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";
+ field public static final deprecated java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";
+ field public static final java.lang.String USER_ROTATION = "user_rotation";
+ field public static final deprecated java.lang.String USE_GOOGLE_MAIL = "use_google_mail";
+ field public static final java.lang.String VIBRATE_ON = "vibrate_on";
+ field public static final java.lang.String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
+ field public static final deprecated java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";
+ field public static final deprecated java.lang.String WALLPAPER_ACTIVITY = "wallpaper_activity";
+ field public static final deprecated java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
+ field public static final deprecated java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";
+ field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";
+ field public static final deprecated java.lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY = "wifi_networks_available_repeat_delay";
+ field public static final deprecated java.lang.String WIFI_NUM_OPEN_NETWORKS_KEPT = "wifi_num_open_networks_kept";
+ field public static final deprecated java.lang.String WIFI_ON = "wifi_on";
+ field public static final deprecated java.lang.String WIFI_SLEEP_POLICY = "wifi_sleep_policy";
+ field public static final deprecated int WIFI_SLEEP_POLICY_DEFAULT = 0; // 0x0
+ field public static final deprecated int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2
+ field public static final deprecated int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1
+ field public static final deprecated java.lang.String WIFI_STATIC_DNS1 = "wifi_static_dns1";
+ field public static final deprecated java.lang.String WIFI_STATIC_DNS2 = "wifi_static_dns2";
+ field public static final deprecated java.lang.String WIFI_STATIC_GATEWAY = "wifi_static_gateway";
+ field public static final deprecated java.lang.String WIFI_STATIC_IP = "wifi_static_ip";
+ field public static final deprecated java.lang.String WIFI_STATIC_NETMASK = "wifi_static_netmask";
+ field public static final deprecated java.lang.String WIFI_USE_STATIC_IP = "wifi_use_static_ip";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE = "wifi_watchdog_acceptable_packet_loss_percentage";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_AP_COUNT = "wifi_watchdog_ap_count";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS = "wifi_watchdog_background_check_delay_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED = "wifi_watchdog_background_check_enabled";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS = "wifi_watchdog_background_check_timeout_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT = "wifi_watchdog_initial_ignored_ping_count";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";
+ field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";
+ field public static final deprecated java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
+ }
+
+ public class SyncStateContract {
+ ctor public SyncStateContract();
+ }
+
+ public static abstract interface SyncStateContract.Columns implements android.provider.BaseColumns {
+ field public static final java.lang.String ACCOUNT_NAME = "account_name";
+ field public static final java.lang.String ACCOUNT_TYPE = "account_type";
+ field public static final java.lang.String DATA = "data";
+ }
+
+ public static class SyncStateContract.Constants implements android.provider.SyncStateContract.Columns {
+ ctor public SyncStateContract.Constants();
+ field public static final java.lang.String CONTENT_DIRECTORY = "syncstate";
+ }
+
+ public static final class SyncStateContract.Helpers {
+ ctor public SyncStateContract.Helpers();
+ method public static byte[] get(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account) throws android.os.RemoteException;
+ method public static android.util.Pair<android.net.Uri, byte[]> getWithUri(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account) throws android.os.RemoteException;
+ method public static android.net.Uri insert(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account, byte[]) throws android.os.RemoteException;
+ method public static android.content.ContentProviderOperation newSetOperation(android.net.Uri, android.accounts.Account, byte[]);
+ method public static android.content.ContentProviderOperation newUpdateOperation(android.net.Uri, byte[]);
+ method public static void set(android.content.ContentProviderClient, android.net.Uri, android.accounts.Account, byte[]) throws android.os.RemoteException;
+ method public static void update(android.content.ContentProviderClient, android.net.Uri, byte[]) throws android.os.RemoteException;
+ }
+
+ public final class Telephony {
+ }
+
+ public static abstract interface Telephony.BaseMmsColumns implements android.provider.BaseColumns {
+ field public static final java.lang.String CONTENT_CLASS = "ct_cls";
+ field public static final java.lang.String CONTENT_LOCATION = "ct_l";
+ field public static final java.lang.String CONTENT_TYPE = "ct_t";
+ field public static final java.lang.String CREATOR = "creator";
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String DATE_SENT = "date_sent";
+ field public static final java.lang.String DELIVERY_REPORT = "d_rpt";
+ field public static final java.lang.String DELIVERY_TIME = "d_tm";
+ field public static final java.lang.String EXPIRY = "exp";
+ field public static final java.lang.String LOCKED = "locked";
+ field public static final java.lang.String MESSAGE_BOX = "msg_box";
+ field public static final int MESSAGE_BOX_ALL = 0; // 0x0
+ field public static final int MESSAGE_BOX_DRAFTS = 3; // 0x3
+ field public static final int MESSAGE_BOX_FAILED = 5; // 0x5
+ field public static final int MESSAGE_BOX_INBOX = 1; // 0x1
+ field public static final int MESSAGE_BOX_OUTBOX = 4; // 0x4
+ field public static final int MESSAGE_BOX_SENT = 2; // 0x2
+ field public static final java.lang.String MESSAGE_CLASS = "m_cls";
+ field public static final java.lang.String MESSAGE_ID = "m_id";
+ field public static final java.lang.String MESSAGE_SIZE = "m_size";
+ field public static final java.lang.String MESSAGE_TYPE = "m_type";
+ field public static final java.lang.String MMS_VERSION = "v";
+ field public static final java.lang.String PRIORITY = "pri";
+ field public static final java.lang.String READ = "read";
+ field public static final java.lang.String READ_REPORT = "rr";
+ field public static final java.lang.String READ_STATUS = "read_status";
+ field public static final java.lang.String REPORT_ALLOWED = "rpt_a";
+ field public static final java.lang.String RESPONSE_STATUS = "resp_st";
+ field public static final java.lang.String RESPONSE_TEXT = "resp_txt";
+ field public static final java.lang.String RETRIEVE_STATUS = "retr_st";
+ field public static final java.lang.String RETRIEVE_TEXT = "retr_txt";
+ field public static final java.lang.String RETRIEVE_TEXT_CHARSET = "retr_txt_cs";
+ field public static final java.lang.String SEEN = "seen";
+ field public static final java.lang.String STATUS = "st";
+ field public static final java.lang.String SUBJECT = "sub";
+ field public static final java.lang.String SUBJECT_CHARSET = "sub_cs";
+ field public static final java.lang.String SUBSCRIPTION_ID = "sub_id";
+ field public static final java.lang.String TEXT_ONLY = "text_only";
+ field public static final java.lang.String THREAD_ID = "thread_id";
+ field public static final java.lang.String TRANSACTION_ID = "tr_id";
+ }
+
+ public static abstract interface Telephony.CanonicalAddressesColumns implements android.provider.BaseColumns {
+ field public static final java.lang.String ADDRESS = "address";
+ }
+
+ public static final class Telephony.Carriers implements android.provider.BaseColumns {
+ field public static final java.lang.String APN = "apn";
+ field public static final java.lang.String AUTH_TYPE = "authtype";
+ field public static final java.lang.String BEARER = "bearer";
+ field public static final java.lang.String CARRIER_ENABLED = "carrier_enabled";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String CURRENT = "current";
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "name ASC";
+ field public static final java.lang.String MCC = "mcc";
+ field public static final java.lang.String MMSC = "mmsc";
+ field public static final java.lang.String MMSPORT = "mmsport";
+ field public static final java.lang.String MMSPROXY = "mmsproxy";
+ field public static final java.lang.String MNC = "mnc";
+ field public static final java.lang.String MVNO_MATCH_DATA = "mvno_match_data";
+ field public static final java.lang.String MVNO_TYPE = "mvno_type";
+ field public static final java.lang.String NAME = "name";
+ field public static final java.lang.String NUMERIC = "numeric";
+ field public static final java.lang.String PASSWORD = "password";
+ field public static final java.lang.String PORT = "port";
+ field public static final java.lang.String PROTOCOL = "protocol";
+ field public static final java.lang.String PROXY = "proxy";
+ field public static final java.lang.String ROAMING_PROTOCOL = "roaming_protocol";
+ field public static final java.lang.String SERVER = "server";
+ field public static final java.lang.String SUBSCRIPTION_ID = "sub_id";
+ field public static final java.lang.String TYPE = "type";
+ field public static final java.lang.String USER = "user";
+ }
+
+ public static final class Telephony.Mms implements android.provider.Telephony.BaseMmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ field public static final android.net.Uri REPORT_REQUEST_URI;
+ field public static final android.net.Uri REPORT_STATUS_URI;
+ }
+
+ public static final class Telephony.Mms.Addr implements android.provider.BaseColumns {
+ field public static final java.lang.String ADDRESS = "address";
+ field public static final java.lang.String CHARSET = "charset";
+ field public static final java.lang.String CONTACT_ID = "contact_id";
+ field public static final java.lang.String MSG_ID = "msg_id";
+ field public static final java.lang.String TYPE = "type";
+ }
+
+ public static final class Telephony.Mms.Draft implements android.provider.Telephony.BaseMmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Mms.Inbox implements android.provider.Telephony.BaseMmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Mms.Intents {
+ field public static final java.lang.String CONTENT_CHANGED_ACTION = "android.intent.action.CONTENT_CHANGED";
+ field public static final java.lang.String DELETED_CONTENTS = "deleted_contents";
+ }
+
+ public static final class Telephony.Mms.Outbox implements android.provider.Telephony.BaseMmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Mms.Part implements android.provider.BaseColumns {
+ field public static final java.lang.String CHARSET = "chset";
+ field public static final java.lang.String CONTENT_DISPOSITION = "cd";
+ field public static final java.lang.String CONTENT_ID = "cid";
+ field public static final java.lang.String CONTENT_LOCATION = "cl";
+ field public static final java.lang.String CONTENT_TYPE = "ct";
+ field public static final java.lang.String CT_START = "ctt_s";
+ field public static final java.lang.String CT_TYPE = "ctt_t";
+ field public static final java.lang.String FILENAME = "fn";
+ field public static final java.lang.String MSG_ID = "mid";
+ field public static final java.lang.String NAME = "name";
+ field public static final java.lang.String SEQ = "seq";
+ field public static final java.lang.String TEXT = "text";
+ field public static final java.lang.String _DATA = "_data";
+ }
+
+ public static final class Telephony.Mms.Rate {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String SENT_TIME = "sent_time";
+ }
+
+ public static final class Telephony.Mms.Sent implements android.provider.Telephony.BaseMmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.MmsSms implements android.provider.BaseColumns {
+ field public static final android.net.Uri CONTENT_CONVERSATIONS_URI;
+ field public static final android.net.Uri CONTENT_DRAFT_URI;
+ field public static final android.net.Uri CONTENT_FILTER_BYPHONE_URI;
+ field public static final android.net.Uri CONTENT_LOCKED_URI;
+ field public static final android.net.Uri CONTENT_UNDELIVERED_URI;
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final int ERR_TYPE_GENERIC = 1; // 0x1
+ field public static final int ERR_TYPE_GENERIC_PERMANENT = 10; // 0xa
+ field public static final int ERR_TYPE_MMS_PROTO_PERMANENT = 12; // 0xc
+ field public static final int ERR_TYPE_MMS_PROTO_TRANSIENT = 3; // 0x3
+ field public static final int ERR_TYPE_SMS_PROTO_PERMANENT = 11; // 0xb
+ field public static final int ERR_TYPE_SMS_PROTO_TRANSIENT = 2; // 0x2
+ field public static final int ERR_TYPE_TRANSPORT_FAILURE = 4; // 0x4
+ field public static final int MMS_PROTO = 1; // 0x1
+ field public static final int NO_ERROR = 0; // 0x0
+ field public static final android.net.Uri SEARCH_URI;
+ field public static final int SMS_PROTO = 0; // 0x0
+ field public static final java.lang.String TYPE_DISCRIMINATOR_COLUMN = "transport_type";
+ }
+
+ public static final class Telephony.MmsSms.PendingMessages implements android.provider.BaseColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DUE_TIME = "due_time";
+ field public static final java.lang.String ERROR_CODE = "err_code";
+ field public static final java.lang.String ERROR_TYPE = "err_type";
+ field public static final java.lang.String LAST_TRY = "last_try";
+ field public static final java.lang.String MSG_ID = "msg_id";
+ field public static final java.lang.String MSG_TYPE = "msg_type";
+ field public static final java.lang.String PROTO_TYPE = "proto_type";
+ field public static final java.lang.String RETRY_INDEX = "retry_index";
+ field public static final java.lang.String SUBSCRIPTION_ID = "pending_sub_id";
+ }
+
+ public static final class Telephony.Sms implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
+ method public static java.lang.String getDefaultSmsPackage(android.content.Context);
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Sms.Conversations implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ field public static final java.lang.String MESSAGE_COUNT = "msg_count";
+ field public static final java.lang.String SNIPPET = "snippet";
+ }
+
+ public static final class Telephony.Sms.Draft implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Sms.Inbox implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Sms.Intents {
+ method public static android.telephony.SmsMessage[] getMessagesFromIntent(android.content.Intent);
+ field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.provider.Telephony.ACTION_CHANGE_DEFAULT";
+ field public static final java.lang.String ACTION_DEFAULT_SMS_PACKAGE_CHANGED = "android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED";
+ field public static final java.lang.String ACTION_EXTERNAL_PROVIDER_CHANGE = "android.provider.action.EXTERNAL_PROVIDER_CHANGE";
+ field public static final java.lang.String DATA_SMS_RECEIVED_ACTION = "android.intent.action.DATA_SMS_RECEIVED";
+ field public static final java.lang.String EXTRA_IS_DEFAULT_SMS_APP = "android.provider.extra.IS_DEFAULT_SMS_APP";
+ field public static final java.lang.String EXTRA_PACKAGE_NAME = "package";
+ field public static final int RESULT_SMS_DUPLICATED = 5; // 0x5
+ field public static final int RESULT_SMS_GENERIC_ERROR = 2; // 0x2
+ field public static final int RESULT_SMS_HANDLED = 1; // 0x1
+ field public static final int RESULT_SMS_OUT_OF_MEMORY = 3; // 0x3
+ field public static final int RESULT_SMS_UNSUPPORTED = 4; // 0x4
+ field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";
+ field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";
+ field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
+ field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED";
+ field public static final java.lang.String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";
+ field public static final java.lang.String SMS_REJECTED_ACTION = "android.provider.Telephony.SMS_REJECTED";
+ field public static final java.lang.String SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION = "android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED";
+ field public static final java.lang.String WAP_PUSH_DELIVER_ACTION = "android.provider.Telephony.WAP_PUSH_DELIVER";
+ field public static final java.lang.String WAP_PUSH_RECEIVED_ACTION = "android.provider.Telephony.WAP_PUSH_RECEIVED";
+ }
+
+ public static final class Telephony.Sms.Outbox implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static final class Telephony.Sms.Sent implements android.provider.BaseColumns android.provider.Telephony.TextBasedSmsColumns {
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
+ }
+
+ public static abstract interface Telephony.TextBasedSmsColumns {
+ field public static final java.lang.String ADDRESS = "address";
+ field public static final java.lang.String BODY = "body";
+ field public static final java.lang.String CREATOR = "creator";
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String DATE_SENT = "date_sent";
+ field public static final java.lang.String ERROR_CODE = "error_code";
+ field public static final java.lang.String LOCKED = "locked";
+ field public static final int MESSAGE_TYPE_ALL = 0; // 0x0
+ field public static final int MESSAGE_TYPE_DRAFT = 3; // 0x3
+ field public static final int MESSAGE_TYPE_FAILED = 5; // 0x5
+ field public static final int MESSAGE_TYPE_INBOX = 1; // 0x1
+ field public static final int MESSAGE_TYPE_OUTBOX = 4; // 0x4
+ field public static final int MESSAGE_TYPE_QUEUED = 6; // 0x6
+ field public static final int MESSAGE_TYPE_SENT = 2; // 0x2
+ field public static final java.lang.String PERSON = "person";
+ field public static final java.lang.String PROTOCOL = "protocol";
+ field public static final java.lang.String READ = "read";
+ field public static final java.lang.String REPLY_PATH_PRESENT = "reply_path_present";
+ field public static final java.lang.String SEEN = "seen";
+ field public static final java.lang.String SERVICE_CENTER = "service_center";
+ field public static final java.lang.String STATUS = "status";
+ field public static final int STATUS_COMPLETE = 0; // 0x0
+ field public static final int STATUS_FAILED = 64; // 0x40
+ field public static final int STATUS_NONE = -1; // 0xffffffff
+ field public static final int STATUS_PENDING = 32; // 0x20
+ field public static final java.lang.String SUBJECT = "subject";
+ field public static final java.lang.String SUBSCRIPTION_ID = "sub_id";
+ field public static final java.lang.String THREAD_ID = "thread_id";
+ field public static final java.lang.String TYPE = "type";
+ }
+
+ public static final class Telephony.Threads implements android.provider.Telephony.ThreadsColumns {
+ method public static long getOrCreateThreadId(android.content.Context, java.lang.String);
+ method public static long getOrCreateThreadId(android.content.Context, java.util.Set<java.lang.String>);
+ field public static final int BROADCAST_THREAD = 1; // 0x1
+ field public static final int COMMON_THREAD = 0; // 0x0
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final android.net.Uri OBSOLETE_THREADS_URI;
+ }
+
+ public static abstract interface Telephony.ThreadsColumns implements android.provider.BaseColumns {
+ field public static final java.lang.String ARCHIVED = "archived";
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String ERROR = "error";
+ field public static final java.lang.String HAS_ATTACHMENT = "has_attachment";
+ field public static final java.lang.String MESSAGE_COUNT = "message_count";
+ field public static final java.lang.String READ = "read";
+ field public static final java.lang.String RECIPIENT_IDS = "recipient_ids";
+ field public static final java.lang.String SNIPPET = "snippet";
+ field public static final java.lang.String SNIPPET_CHARSET = "snippet_cs";
+ field public static final java.lang.String TYPE = "type";
+ }
+
+ public class UserDictionary {
+ ctor public UserDictionary();
+ field public static final java.lang.String AUTHORITY = "user_dictionary";
+ field public static final android.net.Uri CONTENT_URI;
+ }
+
+ public static class UserDictionary.Words implements android.provider.BaseColumns {
+ ctor public UserDictionary.Words();
+ method public static deprecated void addWord(android.content.Context, java.lang.String, int, int);
+ method public static void addWord(android.content.Context, java.lang.String, int, java.lang.String, java.util.Locale);
+ field public static final java.lang.String APP_ID = "appid";
+ field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.google.userword";
+ field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.userword";
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DEFAULT_SORT_ORDER = "frequency DESC";
+ field public static final java.lang.String FREQUENCY = "frequency";
+ field public static final java.lang.String LOCALE = "locale";
+ field public static final deprecated int LOCALE_TYPE_ALL = 0; // 0x0
+ field public static final deprecated int LOCALE_TYPE_CURRENT = 1; // 0x1
+ field public static final java.lang.String SHORTCUT = "shortcut";
+ field public static final java.lang.String WORD = "word";
+ field public static final java.lang.String _ID = "_id";
+ }
+
+ public class VoicemailContract {
+ field public static final java.lang.String ACTION_FETCH_VOICEMAIL = "android.intent.action.FETCH_VOICEMAIL";
+ field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL";
+ field public static final java.lang.String AUTHORITY = "com.android.voicemail";
+ field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE";
+ field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package";
+ }
+
+ public static final class VoicemailContract.Status implements android.provider.BaseColumns {
+ method public static android.net.Uri buildSourceUri(java.lang.String);
+ field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";
+ field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2
+ field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1
+ field public static final int CONFIGURATION_STATE_OK = 0; // 0x0
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DATA_CHANNEL_STATE = "data_channel_state";
+ field public static final int DATA_CHANNEL_STATE_NO_CONNECTION = 1; // 0x1
+ field public static final int DATA_CHANNEL_STATE_OK = 0; // 0x0
+ field public static final java.lang.String DIR_TYPE = "vnd.android.cursor.dir/voicemail.source.status";
+ field public static final java.lang.String ITEM_TYPE = "vnd.android.cursor.item/voicemail.source.status";
+ field public static final java.lang.String NOTIFICATION_CHANNEL_STATE = "notification_channel_state";
+ field public static final int NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING = 2; // 0x2
+ field public static final int NOTIFICATION_CHANNEL_STATE_NO_CONNECTION = 1; // 0x1
+ field public static final int NOTIFICATION_CHANNEL_STATE_OK = 0; // 0x0
+ field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name";
+ field public static final java.lang.String PHONE_ACCOUNT_ID = "phone_account_id";
+ field public static final java.lang.String SETTINGS_URI = "settings_uri";
+ field public static final java.lang.String SOURCE_PACKAGE = "source_package";
+ field public static final java.lang.String VOICEMAIL_ACCESS_URI = "voicemail_access_uri";
+ }
+
+ public static final class VoicemailContract.Voicemails implements android.provider.BaseColumns android.provider.OpenableColumns {
+ method public static android.net.Uri buildSourceUri(java.lang.String);
+ field public static final android.net.Uri CONTENT_URI;
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String DELETED = "deleted";
+ field public static final java.lang.String DIRTY = "dirty";
+ field public static final java.lang.String DIR_TYPE = "vnd.android.cursor.dir/voicemails";
+ field public static final java.lang.String DURATION = "duration";
+ field public static final java.lang.String HAS_CONTENT = "has_content";
+ field public static final java.lang.String IS_READ = "is_read";
+ field public static final java.lang.String ITEM_TYPE = "vnd.android.cursor.item/voicemail";
+ field public static final java.lang.String MIME_TYPE = "mime_type";
+ field public static final java.lang.String NUMBER = "number";
+ field public static final java.lang.String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
+ field public static final java.lang.String PHONE_ACCOUNT_ID = "subscription_id";
+ field public static final java.lang.String SOURCE_DATA = "source_data";
+ field public static final java.lang.String SOURCE_PACKAGE = "source_package";
+ field public static final java.lang.String TRANSCRIPTION = "transcription";
+ }
+
+}
+
+package android.renderscript {
+
+ public class Allocation extends android.renderscript.BaseObj {
+ method public void copy1DRangeFrom(int, int, java.lang.Object);
+ 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, java.lang.Object);
+ 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 copy1DRangeTo(int, int, java.lang.Object);
+ method public void copy1DRangeTo(int, int, int[]);
+ method public void copy1DRangeTo(int, int, short[]);
+ method public void copy1DRangeTo(int, int, byte[]);
+ method public void copy1DRangeTo(int, int, float[]);
+ method public void copy1DRangeToUnchecked(int, int, java.lang.Object);
+ method public void copy1DRangeToUnchecked(int, int, int[]);
+ method public void copy1DRangeToUnchecked(int, int, short[]);
+ method public void copy1DRangeToUnchecked(int, int, byte[]);
+ method public void copy1DRangeToUnchecked(int, int, float[]);
+ method public void copy2DRangeFrom(int, int, int, int, java.lang.Object);
+ 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 copy2DRangeTo(int, int, int, int, java.lang.Object);
+ method public void copy2DRangeTo(int, int, int, int, byte[]);
+ method public void copy2DRangeTo(int, int, int, int, short[]);
+ method public void copy2DRangeTo(int, int, int, int, int[]);
+ method public void copy2DRangeTo(int, int, int, int, float[]);
+ method public void copy3DRangeFrom(int, int, int, int, int, int, java.lang.Object);
+ method public void copy3DRangeFrom(int, int, int, int, int, int, android.renderscript.Allocation, int, int, int);
+ method public void copy3DRangeTo(int, int, int, int, int, int, java.lang.Object);
+ method public void copyFrom(android.renderscript.BaseObj[]);
+ method public void copyFrom(java.lang.Object);
+ 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 copyFrom(android.renderscript.Allocation);
+ method public void copyFromUnchecked(java.lang.Object);
+ 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(java.lang.Object);
+ 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 deprecated synchronized void resize(int);
+ method public void setAutoPadding(boolean);
+ method public void setFromFieldPacker(int, android.renderscript.FieldPacker);
+ method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker);
+ method public void setFromFieldPacker(int, int, int, int, android.renderscript.FieldPacker);
+ method public void setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener);
+ 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
+ field public static final int USAGE_SHARED = 128; // 0x80
+ }
+
+ public static final 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;
+ }
+
+ public static abstract interface Allocation.OnBufferAvailableListener {
+ method public abstract void onBufferAvailable(android.renderscript.Allocation);
+ }
+
+ 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 static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type);
+ method public void setFace(android.renderscript.Type.CubemapFace);
+ method public void setLOD(int);
+ method public void setX(int);
+ method public void setY(int);
+ method public void setZ(int);
+ }
+
+ public class BaseObj {
+ method public void destroy();
+ method public java.lang.String getName();
+ method public void setName(java.lang.String);
+ }
+
+ public class Byte2 {
+ ctor public Byte2();
+ ctor public Byte2(byte, byte);
+ field public byte x;
+ field public byte y;
+ }
+
+ public class Byte3 {
+ ctor public Byte3();
+ ctor public Byte3(byte, byte, byte);
+ field public byte x;
+ field public byte y;
+ field public byte z;
+ }
+
+ public class Byte4 {
+ ctor public Byte4();
+ ctor public Byte4(byte, byte, byte, byte);
+ field public byte w;
+ field public byte x;
+ field public byte y;
+ field public byte z;
+ }
+
+ public class Double2 {
+ ctor public Double2();
+ ctor public Double2(double, double);
+ field public double x;
+ field public double y;
+ }
+
+ public class Double3 {
+ ctor public Double3();
+ ctor public Double3(double, double, double);
+ field public double x;
+ field public double y;
+ field public double z;
+ }
+
+ public class Double4 {
+ ctor public Double4();
+ ctor public Double4(double, double, double, double);
+ field public double w;
+ field public double x;
+ field public double y;
+ 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 F16(android.renderscript.RenderScript);
+ method public static android.renderscript.Element F16_2(android.renderscript.RenderScript);
+ method public static android.renderscript.Element F16_3(android.renderscript.RenderScript);
+ method public static android.renderscript.Element F16_4(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 deprecated 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 YUV(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 {
+ 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;
+ enum_constant public static final android.renderscript.Element.DataKind PIXEL_DEPTH;
+ enum_constant public static final android.renderscript.Element.DataKind PIXEL_L;
+ enum_constant public static final android.renderscript.Element.DataKind PIXEL_LA;
+ enum_constant public static final android.renderscript.Element.DataKind PIXEL_RGB;
+ enum_constant public static final android.renderscript.Element.DataKind PIXEL_RGBA;
+ enum_constant public static final android.renderscript.Element.DataKind PIXEL_YUV;
+ enum_constant public static final android.renderscript.Element.DataKind USER;
+ }
+
+ public static final 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;
+ enum_constant public static final android.renderscript.Element.DataType FLOAT_16;
+ enum_constant public static final android.renderscript.Element.DataType FLOAT_32;
+ enum_constant public static final android.renderscript.Element.DataType FLOAT_64;
+ 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;
+ enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_STORE;
+ enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_VERTEX;
+ enum_constant public static final android.renderscript.Element.DataType RS_SAMPLER;
+ enum_constant public static final android.renderscript.Element.DataType RS_SCRIPT;
+ enum_constant public static final android.renderscript.Element.DataType RS_TYPE;
+ enum_constant public static final android.renderscript.Element.DataType SIGNED_16;
+ enum_constant public static final android.renderscript.Element.DataType SIGNED_32;
+ enum_constant public static final android.renderscript.Element.DataType SIGNED_64;
+ enum_constant public static final android.renderscript.Element.DataType SIGNED_8;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_16;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_32;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_4_4_4_4;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_5_5_5_1;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_5_6_5;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_64;
+ enum_constant public static final android.renderscript.Element.DataType UNSIGNED_8;
+ }
+
+ public class FieldPacker {
+ ctor public FieldPacker(int);
+ ctor public FieldPacker(byte[]);
+ method public void addBoolean(boolean);
+ method public void addF32(float);
+ method public void addF32(android.renderscript.Float2);
+ method public void addF32(android.renderscript.Float3);
+ method public void addF32(android.renderscript.Float4);
+ method public void addF64(double);
+ method public void addF64(android.renderscript.Double2);
+ method public void addF64(android.renderscript.Double3);
+ method public void addF64(android.renderscript.Double4);
+ method public void addI16(short);
+ method public void addI16(android.renderscript.Short2);
+ method public void addI16(android.renderscript.Short3);
+ method public void addI16(android.renderscript.Short4);
+ method public void addI32(int);
+ method public void addI32(android.renderscript.Int2);
+ method public void addI32(android.renderscript.Int3);
+ method public void addI32(android.renderscript.Int4);
+ method public void addI64(long);
+ method public void addI64(android.renderscript.Long2);
+ method public void addI64(android.renderscript.Long3);
+ method public void addI64(android.renderscript.Long4);
+ method public void addI8(byte);
+ method public void addI8(android.renderscript.Byte2);
+ method public void addI8(android.renderscript.Byte3);
+ method public void addI8(android.renderscript.Byte4);
+ method public void addMatrix(android.renderscript.Matrix4f);
+ method public void addMatrix(android.renderscript.Matrix3f);
+ method public void addMatrix(android.renderscript.Matrix2f);
+ method public void addObj(android.renderscript.BaseObj);
+ method public void addU16(int);
+ method public void addU16(android.renderscript.Int2);
+ method public void addU16(android.renderscript.Int3);
+ method public void addU16(android.renderscript.Int4);
+ method public void addU32(long);
+ method public void addU32(android.renderscript.Long2);
+ method public void addU32(android.renderscript.Long3);
+ method public void addU32(android.renderscript.Long4);
+ method public void addU64(long);
+ method public void addU64(android.renderscript.Long2);
+ method public void addU64(android.renderscript.Long3);
+ method public void addU64(android.renderscript.Long4);
+ method public void addU8(short);
+ method public void addU8(android.renderscript.Short2);
+ method public void addU8(android.renderscript.Short3);
+ method public void addU8(android.renderscript.Short4);
+ method public void align(int);
+ method public final byte[] getData();
+ method public void reset();
+ method public void reset(int);
+ method public void skip(int);
+ method public boolean subBoolean();
+ method public android.renderscript.Byte2 subByte2();
+ method public android.renderscript.Byte3 subByte3();
+ method public android.renderscript.Byte4 subByte4();
+ method public android.renderscript.Double2 subDouble2();
+ method public android.renderscript.Double3 subDouble3();
+ method public android.renderscript.Double4 subDouble4();
+ method public float subF32();
+ method public double subF64();
+ method public android.renderscript.Float2 subFloat2();
+ method public android.renderscript.Float3 subFloat3();
+ method public android.renderscript.Float4 subFloat4();
+ method public short subI16();
+ method public int subI32();
+ method public long subI64();
+ method public byte subI8();
+ method public android.renderscript.Int2 subInt2();
+ method public android.renderscript.Int3 subInt3();
+ method public android.renderscript.Int4 subInt4();
+ method public android.renderscript.Long2 subLong2();
+ method public android.renderscript.Long3 subLong3();
+ method public android.renderscript.Long4 subLong4();
+ method public android.renderscript.Matrix2f subMatrix2f();
+ method public android.renderscript.Matrix3f subMatrix3f();
+ method public android.renderscript.Matrix4f subMatrix4f();
+ method public android.renderscript.Short2 subShort2();
+ method public android.renderscript.Short3 subShort3();
+ method public android.renderscript.Short4 subShort4();
+ method public void subalign(int);
+ }
+
+ public class Float2 {
+ ctor public Float2();
+ ctor public Float2(float, float);
+ field public float x;
+ field public float y;
+ }
+
+ public class Float3 {
+ ctor public Float3();
+ ctor public Float3(float, float, float);
+ field public float x;
+ field public float y;
+ field public float z;
+ }
+
+ public class Float4 {
+ ctor public Float4();
+ ctor public Float4(float, float, float, float);
+ field public float w;
+ field public float x;
+ field public float y;
+ field public float z;
+ }
+
+ public class Int2 {
+ ctor public Int2();
+ ctor public Int2(int, int);
+ field public int x;
+ field public int y;
+ }
+
+ public class Int3 {
+ ctor public Int3();
+ ctor public Int3(int, int, int);
+ field public int x;
+ field public int y;
+ field public int z;
+ }
+
+ public class Int4 {
+ ctor public Int4();
+ ctor public Int4(int, int, int, int);
+ field public int w;
+ field public int x;
+ field public int y;
+ field public int z;
+ }
+
+ public class Long2 {
+ ctor public Long2();
+ ctor public Long2(long, long);
+ field public long x;
+ field public long y;
+ }
+
+ public class Long3 {
+ ctor public Long3();
+ ctor public Long3(long, long, long);
+ field public long x;
+ field public long y;
+ field public long z;
+ }
+
+ public class Long4 {
+ ctor public Long4();
+ ctor public Long4(long, long, long, long);
+ field public long w;
+ field public long x;
+ field public long y;
+ 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 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 class RSInvalidStateException extends android.renderscript.RSRuntimeException {
+ ctor public RSInvalidStateException(java.lang.String);
+ }
+
+ public class RSRuntimeException extends java.lang.RuntimeException {
+ ctor public RSRuntimeException(java.lang.String);
+ }
+
+ public class RenderScript {
+ method public void contextDump();
+ method public static android.renderscript.RenderScript create(android.content.Context);
+ method public static android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType);
+ method public static android.renderscript.RenderScript create(android.content.Context, android.renderscript.RenderScript.ContextType, int);
+ method public static android.renderscript.RenderScript createMultiContext(android.content.Context, android.renderscript.RenderScript.ContextType, int, int);
+ method public void destroy();
+ method public void finish();
+ method public final android.content.Context getApplicationContext();
+ method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler();
+ method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler();
+ method public static long getMinorVersion();
+ method public static void releaseAllContexts();
+ method public void sendMessage(int, int[]);
+ method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler);
+ method public void setMessageHandler(android.renderscript.RenderScript.RSMessageHandler);
+ method public void setPriority(android.renderscript.RenderScript.Priority);
+ field public static final int CREATE_FLAG_LOW_LATENCY = 2; // 0x2
+ field public static final int CREATE_FLAG_LOW_POWER = 4; // 0x4
+ field public static final int CREATE_FLAG_NONE = 0; // 0x0
+ }
+
+ public static final class RenderScript.ContextType extends java.lang.Enum {
+ method public static android.renderscript.RenderScript.ContextType valueOf(java.lang.String);
+ method public static final android.renderscript.RenderScript.ContextType[] values();
+ enum_constant public static final android.renderscript.RenderScript.ContextType DEBUG;
+ enum_constant public static final android.renderscript.RenderScript.ContextType NORMAL;
+ enum_constant public static final android.renderscript.RenderScript.ContextType PROFILE;
+ }
+
+ public static final 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 {
+ 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 {
+ ctor public RenderScript.RSMessageHandler();
+ method public void run();
+ field protected int[] mData;
+ field protected int mID;
+ field protected int mLength;
+ }
+
+ 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 MIRRORED_REPEAT_LINEAR(android.renderscript.RenderScript);
+ method public static android.renderscript.Sampler MIRRORED_REPEAT_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
+ method public static android.renderscript.Sampler MIRRORED_REPEAT_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 {
+ ctor public Sampler.Builder(android.renderscript.RenderScript);
+ method public android.renderscript.Sampler create();
+ method public void setAnisotropy(float);
+ method public void setMagnification(android.renderscript.Sampler.Value);
+ method public void setMinification(android.renderscript.Sampler.Value);
+ method public void setWrapS(android.renderscript.Sampler.Value);
+ method public void setWrapT(android.renderscript.Sampler.Value);
+ }
+
+ public static final 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 MIRRORED_REPEAT;
+ 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 android.renderscript.Script.FieldID createFieldID(int, android.renderscript.Element);
+ method protected android.renderscript.Script.InvokeID createInvokeID(int);
+ method protected android.renderscript.Script.KernelID createKernelID(int, int, android.renderscript.Element, android.renderscript.Element);
+ method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);
+ method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker, android.renderscript.Script.LaunchOptions);
+ method protected void forEach(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.FieldPacker);
+ method protected void forEach(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.FieldPacker, android.renderscript.Script.LaunchOptions);
+ method public boolean getVarB(int);
+ method public double getVarD(int);
+ method public float getVarF(int);
+ method public int getVarI(int);
+ method public long getVarJ(int);
+ method public void getVarV(int, 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);
+ method public void setVar(int, android.renderscript.FieldPacker, android.renderscript.Element, int[]);
+ }
+
+ public static class Script.Builder {
+ }
+
+ public static class Script.FieldBase {
+ ctor protected Script.FieldBase();
+ method public android.renderscript.Allocation getAllocation();
+ method public android.renderscript.Element getElement();
+ method public android.renderscript.Type getType();
+ method protected void init(android.renderscript.RenderScript, int);
+ method protected void init(android.renderscript.RenderScript, int, int);
+ method public void updateAllocation();
+ field protected android.renderscript.Allocation mAllocation;
+ field protected android.renderscript.Element mElement;
+ }
+
+ public static final class Script.FieldID extends android.renderscript.BaseObj {
+ }
+
+ public static final class Script.InvokeID extends android.renderscript.BaseObj {
+ }
+
+ public static final class Script.KernelID extends android.renderscript.BaseObj {
+ }
+
+ public static final class Script.LaunchOptions {
+ ctor public Script.LaunchOptions();
+ method public int getXEnd();
+ method public int getXStart();
+ method public int getYEnd();
+ method public int getYStart();
+ method public int getZEnd();
+ method public int getZStart();
+ method public android.renderscript.Script.LaunchOptions setX(int, int);
+ method public android.renderscript.Script.LaunchOptions setY(int, int);
+ method public android.renderscript.Script.LaunchOptions setZ(int, int);
+ }
+
+ public class ScriptC extends android.renderscript.Script {
+ ctor protected ScriptC(int, android.renderscript.RenderScript);
+ ctor protected ScriptC(long, android.renderscript.RenderScript);
+ ctor protected ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int);
+ ctor protected ScriptC(android.renderscript.RenderScript, java.lang.String, byte[], byte[]);
+ }
+
+ public final class ScriptGroup extends android.renderscript.BaseObj {
+ method public java.lang.Object[] execute(java.lang.Object...);
+ method public deprecated void execute();
+ method public deprecated void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);
+ method public deprecated void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);
+ }
+
+ public static final class ScriptGroup.Binding {
+ ctor public ScriptGroup.Binding(android.renderscript.Script.FieldID, java.lang.Object);
+ }
+
+ public static final deprecated class ScriptGroup.Builder {
+ ctor public ScriptGroup.Builder(android.renderscript.RenderScript);
+ method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID);
+ method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID);
+ method public android.renderscript.ScriptGroup.Builder addKernel(android.renderscript.Script.KernelID);
+ method public android.renderscript.ScriptGroup create();
+ }
+
+ public static final class ScriptGroup.Builder2 {
+ ctor public ScriptGroup.Builder2(android.renderscript.RenderScript);
+ method public android.renderscript.ScriptGroup.Input addInput();
+ method public android.renderscript.ScriptGroup.Closure addInvoke(android.renderscript.Script.InvokeID, java.lang.Object...);
+ method public android.renderscript.ScriptGroup.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object...);
+ method public android.renderscript.ScriptGroup create(java.lang.String, android.renderscript.ScriptGroup.Future...);
+ }
+
+ public static final class ScriptGroup.Closure extends android.renderscript.BaseObj {
+ method public android.renderscript.ScriptGroup.Future getGlobal(android.renderscript.Script.FieldID);
+ method public android.renderscript.ScriptGroup.Future getReturn();
+ }
+
+ public static final class ScriptGroup.Future {
+ }
+
+ public static final class ScriptGroup.Input {
+ }
+
+ public abstract class ScriptIntrinsic extends android.renderscript.Script {
+ }
+
+ public final class ScriptIntrinsic3DLUT extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsic3DLUT create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setLUT(android.renderscript.Allocation);
+ }
+
+ public final class ScriptIntrinsicBLAS extends android.renderscript.ScriptIntrinsic {
+ method public void BNNM(android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation, int, int);
+ method public void CGBMV(int, int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Float2, android.renderscript.Allocation, int);
+ method public void CGEMM(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Float2, android.renderscript.Allocation);
+ method public void CGEMV(int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Float2, android.renderscript.Allocation, int);
+ method public void CGERC(android.renderscript.Float2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void CGERU(android.renderscript.Float2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void CHBMV(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Float2, android.renderscript.Allocation, int);
+ method public void CHEMM(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Float2, android.renderscript.Allocation);
+ method public void CHEMV(int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Float2, android.renderscript.Allocation, int);
+ method public void CHER(int, float, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void CHER2(int, android.renderscript.Float2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void CHER2K(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, float, android.renderscript.Allocation);
+ method public void CHERK(int, int, float, android.renderscript.Allocation, float, android.renderscript.Allocation);
+ method public void CHPMV(int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Float2, android.renderscript.Allocation, int);
+ method public void CHPR(int, float, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void CHPR2(int, android.renderscript.Float2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void CSYMM(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Float2, android.renderscript.Allocation);
+ method public void CSYR2K(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Float2, android.renderscript.Allocation);
+ method public void CSYRK(int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Float2, android.renderscript.Allocation);
+ method public void CTBMV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void CTBSV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void CTPMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void CTPSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void CTRMM(int, int, int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void CTRMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void CTRSM(int, int, int, int, android.renderscript.Float2, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void CTRSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void DGBMV(int, int, int, double, android.renderscript.Allocation, android.renderscript.Allocation, int, double, android.renderscript.Allocation, int);
+ method public void DGEMM(int, int, double, android.renderscript.Allocation, android.renderscript.Allocation, double, android.renderscript.Allocation);
+ method public void DGEMV(int, double, android.renderscript.Allocation, android.renderscript.Allocation, int, double, android.renderscript.Allocation, int);
+ method public void DGER(double, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void DSBMV(int, int, double, android.renderscript.Allocation, android.renderscript.Allocation, int, double, android.renderscript.Allocation, int);
+ method public void DSPMV(int, double, android.renderscript.Allocation, android.renderscript.Allocation, int, double, android.renderscript.Allocation, int);
+ method public void DSPR(int, double, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void DSPR2(int, double, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void DSYMM(int, int, double, android.renderscript.Allocation, android.renderscript.Allocation, double, android.renderscript.Allocation);
+ method public void DSYMV(int, double, android.renderscript.Allocation, android.renderscript.Allocation, int, double, android.renderscript.Allocation, int);
+ method public void DSYR(int, double, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void DSYR2(int, double, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void DSYR2K(int, int, double, android.renderscript.Allocation, android.renderscript.Allocation, double, android.renderscript.Allocation);
+ method public void DSYRK(int, int, double, android.renderscript.Allocation, double, android.renderscript.Allocation);
+ method public void DTBMV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void DTBSV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void DTPMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void DTPSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void DTRMM(int, int, int, int, double, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void DTRMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void DTRSM(int, int, int, int, double, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void DTRSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void SGBMV(int, int, int, float, android.renderscript.Allocation, android.renderscript.Allocation, int, float, android.renderscript.Allocation, int);
+ method public void SGEMM(int, int, float, android.renderscript.Allocation, android.renderscript.Allocation, float, android.renderscript.Allocation);
+ method public void SGEMV(int, float, android.renderscript.Allocation, android.renderscript.Allocation, int, float, android.renderscript.Allocation, int);
+ method public void SGER(float, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void SSBMV(int, int, float, android.renderscript.Allocation, android.renderscript.Allocation, int, float, android.renderscript.Allocation, int);
+ method public void SSPMV(int, float, android.renderscript.Allocation, android.renderscript.Allocation, int, float, android.renderscript.Allocation, int);
+ method public void SSPR(int, float, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void SSPR2(int, float, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void SSYMM(int, int, float, android.renderscript.Allocation, android.renderscript.Allocation, float, android.renderscript.Allocation);
+ method public void SSYMV(int, float, android.renderscript.Allocation, android.renderscript.Allocation, int, float, android.renderscript.Allocation, int);
+ method public void SSYR(int, float, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void SSYR2(int, float, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void SSYR2K(int, int, float, android.renderscript.Allocation, android.renderscript.Allocation, float, android.renderscript.Allocation);
+ method public void SSYRK(int, int, float, android.renderscript.Allocation, float, android.renderscript.Allocation);
+ method public void STBMV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void STBSV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void STPMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void STPSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void STRMM(int, int, int, int, float, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void STRMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void STRSM(int, int, int, int, float, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void STRSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void ZGBMV(int, int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Double2, android.renderscript.Allocation, int);
+ method public void ZGEMM(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Double2, android.renderscript.Allocation);
+ method public void ZGEMV(int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Double2, android.renderscript.Allocation, int);
+ method public void ZGERC(android.renderscript.Double2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void ZGERU(android.renderscript.Double2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void ZHBMV(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Double2, android.renderscript.Allocation, int);
+ method public void ZHEMM(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Double2, android.renderscript.Allocation);
+ method public void ZHEMV(int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Double2, android.renderscript.Allocation, int);
+ method public void ZHER(int, double, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void ZHER2(int, android.renderscript.Double2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void ZHER2K(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, double, android.renderscript.Allocation);
+ method public void ZHERK(int, int, double, android.renderscript.Allocation, double, android.renderscript.Allocation);
+ method public void ZHPMV(int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, int, android.renderscript.Double2, android.renderscript.Allocation, int);
+ method public void ZHPR(int, double, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void ZHPR2(int, android.renderscript.Double2, android.renderscript.Allocation, int, android.renderscript.Allocation, int, android.renderscript.Allocation);
+ method public void ZSYMM(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Double2, android.renderscript.Allocation);
+ method public void ZSYR2K(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Double2, android.renderscript.Allocation);
+ method public void ZSYRK(int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Double2, android.renderscript.Allocation);
+ method public void ZTBMV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void ZTBSV(int, int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void ZTPMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void ZTPSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void ZTRMM(int, int, int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void ZTRMV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public void ZTRSM(int, int, int, int, android.renderscript.Double2, android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void ZTRSV(int, int, int, android.renderscript.Allocation, android.renderscript.Allocation, int);
+ method public static android.renderscript.ScriptIntrinsicBLAS create(android.renderscript.RenderScript);
+ field public static final int CONJ_TRANSPOSE = 113; // 0x71
+ field public static final int LEFT = 141; // 0x8d
+ field public static final int LOWER = 122; // 0x7a
+ field public static final int NON_UNIT = 131; // 0x83
+ field public static final int NO_TRANSPOSE = 111; // 0x6f
+ field public static final int RIGHT = 142; // 0x8e
+ field public static final int TRANSPOSE = 112; // 0x70
+ field public static final int UNIT = 132; // 0x84
+ field public static final int UPPER = 121; // 0x79
+ }
+
+ public class ScriptIntrinsicBlend extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicBlend create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEachAdd(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachAdd(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachClear(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachClear(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachDst(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachDst(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachDstAtop(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachDstAtop(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachDstIn(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachDstIn(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachDstOut(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachDstOut(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachDstOver(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachDstOver(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachMultiply(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachMultiply(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachSrc(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachSrc(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachSrcAtop(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachSrcAtop(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachSrcIn(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachSrcIn(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachSrcOut(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachSrcOut(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachSrcOver(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachSrcOver(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachSubtract(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachSubtract(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEachXor(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEachXor(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.KernelID getKernelIDAdd();
+ method public android.renderscript.Script.KernelID getKernelIDClear();
+ method public android.renderscript.Script.KernelID getKernelIDDst();
+ method public android.renderscript.Script.KernelID getKernelIDDstAtop();
+ method public android.renderscript.Script.KernelID getKernelIDDstIn();
+ method public android.renderscript.Script.KernelID getKernelIDDstOut();
+ method public android.renderscript.Script.KernelID getKernelIDDstOver();
+ method public android.renderscript.Script.KernelID getKernelIDMultiply();
+ method public android.renderscript.Script.KernelID getKernelIDSrc();
+ method public android.renderscript.Script.KernelID getKernelIDSrcAtop();
+ method public android.renderscript.Script.KernelID getKernelIDSrcIn();
+ method public android.renderscript.Script.KernelID getKernelIDSrcOut();
+ method public android.renderscript.Script.KernelID getKernelIDSrcOver();
+ method public android.renderscript.Script.KernelID getKernelIDSubtract();
+ method public android.renderscript.Script.KernelID getKernelIDXor();
+ }
+
+ public final class ScriptIntrinsicBlur extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicBlur create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.FieldID getFieldID_Input();
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setInput(android.renderscript.Allocation);
+ method public void setRadius(float);
+ }
+
+ public final class ScriptIntrinsicColorMatrix extends android.renderscript.ScriptIntrinsic {
+ method public static deprecated android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public static android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setAdd(android.renderscript.Float4);
+ method public void setAdd(float, float, float, float);
+ method public void setColorMatrix(android.renderscript.Matrix4f);
+ method public void setColorMatrix(android.renderscript.Matrix3f);
+ method public void setGreyscale();
+ method public void setRGBtoYUV();
+ method public void setYUVtoRGB();
+ }
+
+ public final class ScriptIntrinsicConvolve3x3 extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicConvolve3x3 create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.FieldID getFieldID_Input();
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setCoefficients(float[]);
+ method public void setInput(android.renderscript.Allocation);
+ }
+
+ public final class ScriptIntrinsicConvolve5x5 extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicConvolve5x5 create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.FieldID getFieldID_Input();
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setCoefficients(float[]);
+ method public void setInput(android.renderscript.Allocation);
+ }
+
+ public final class ScriptIntrinsicHistogram extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicHistogram create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public void forEach_Dot(android.renderscript.Allocation);
+ method public void forEach_Dot(android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.FieldID getFieldID_Input();
+ method public android.renderscript.Script.KernelID getKernelID_Separate();
+ method public void setDotCoefficients(float, float, float, float);
+ method public void setOutput(android.renderscript.Allocation);
+ }
+
+ public final class ScriptIntrinsicLUT extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicLUT create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation);
+ method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setAlpha(int, int);
+ method public void setBlue(int, int);
+ method public void setGreen(int, int);
+ method public void setRed(int, int);
+ }
+
+ public final class ScriptIntrinsicResize extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicResize create(android.renderscript.RenderScript);
+ method public void forEach_bicubic(android.renderscript.Allocation);
+ method public void forEach_bicubic(android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
+ method public android.renderscript.Script.FieldID getFieldID_Input();
+ method public android.renderscript.Script.KernelID getKernelID_bicubic();
+ method public void setInput(android.renderscript.Allocation);
+ }
+
+ public final class ScriptIntrinsicYuvToRGB extends android.renderscript.ScriptIntrinsic {
+ method public static android.renderscript.ScriptIntrinsicYuvToRGB create(android.renderscript.RenderScript, android.renderscript.Element);
+ method public void forEach(android.renderscript.Allocation);
+ method public android.renderscript.Script.FieldID getFieldID_Input();
+ method public android.renderscript.Script.KernelID getKernelID();
+ method public void setInput(android.renderscript.Allocation);
+ }
+
+ public class Short2 {
+ ctor public Short2();
+ ctor public Short2(short, short);
+ field public short x;
+ field public short y;
+ }
+
+ public class Short3 {
+ ctor public Short3();
+ ctor public Short3(short, short, short);
+ field public short x;
+ field public short y;
+ field public short z;
+ }
+
+ public class Short4 {
+ ctor public Short4();
+ ctor public Short4(short, short, short, short);
+ field public short w;
+ field public short x;
+ field public short y;
+ field public short z;
+ }
+
+ public class Type extends android.renderscript.BaseObj {
+ method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int);
+ method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int);
+ method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int);
+ method public int getCount();
+ method public android.renderscript.Element getElement();
+ method public int getX();
+ method public int getY();
+ method public int getYuv();
+ method public int getZ();
+ method public boolean hasFaces();
+ method public boolean hasMipmaps();
+ }
+
+ public static class Type.Builder {
+ ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element);
+ method public 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 android.renderscript.Type.Builder setY(int);
+ method public android.renderscript.Type.Builder setYuvFormat(int);
+ method public android.renderscript.Type.Builder setZ(int);
+ }
+
+ public static final class Type.CubemapFace extends java.lang.Enum {
+ method public static android.renderscript.Type.CubemapFace valueOf(java.lang.String);
+ method public static final android.renderscript.Type.CubemapFace[] values();
+ enum_constant public static final android.renderscript.Type.CubemapFace NEGATIVE_X;
+ enum_constant public static final android.renderscript.Type.CubemapFace NEGATIVE_Y;
+ enum_constant public static final android.renderscript.Type.CubemapFace NEGATIVE_Z;
+ enum_constant public static final android.renderscript.Type.CubemapFace POSITIVE_X;
+ enum_constant public static final android.renderscript.Type.CubemapFace POSITIVE_Y;
+ enum_constant public static final android.renderscript.Type.CubemapFace POSITIVE_Z;
+ enum_constant public static final deprecated android.renderscript.Type.CubemapFace POSITVE_X;
+ enum_constant public static final deprecated android.renderscript.Type.CubemapFace POSITVE_Y;
+ enum_constant public static final deprecated android.renderscript.Type.CubemapFace POSITVE_Z;
+ }
+
+}
+
+package android.sax {
+
+ public class Element {
+ method public android.sax.Element getChild(java.lang.String);
+ method public android.sax.Element getChild(java.lang.String, java.lang.String);
+ method public android.sax.Element requireChild(java.lang.String);
+ method public android.sax.Element requireChild(java.lang.String, java.lang.String);
+ method public void setElementListener(android.sax.ElementListener);
+ method public void setEndElementListener(android.sax.EndElementListener);
+ method public void setEndTextElementListener(android.sax.EndTextElementListener);
+ method public void setStartElementListener(android.sax.StartElementListener);
+ method public void setTextElementListener(android.sax.TextElementListener);
+ }
+
+ public abstract interface ElementListener implements android.sax.EndElementListener android.sax.StartElementListener {
+ }
+
+ public abstract interface EndElementListener {
+ method public abstract void end();
+ }
+
+ public abstract interface EndTextElementListener {
+ method public abstract void end(java.lang.String);
+ }
+
+ public class RootElement extends android.sax.Element {
+ ctor public RootElement(java.lang.String, java.lang.String);
+ ctor public RootElement(java.lang.String);
+ method public org.xml.sax.ContentHandler getContentHandler();
+ }
+
+ public abstract interface StartElementListener {
+ method public abstract void start(org.xml.sax.Attributes);
+ }
+
+ public abstract interface TextElementListener implements android.sax.EndTextElementListener android.sax.StartElementListener {
+ }
+
+}
+
+package android.security {
+
+ public final class KeyChain {
+ ctor public KeyChain();
+ method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String);
+ method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], android.net.Uri, java.lang.String);
+ method public static android.content.Intent createInstallIntent();
+ method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
+ method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException;
+ method public static deprecated boolean isBoundKeyAlgorithm(java.lang.String);
+ method public static boolean isKeyAlgorithmSupported(java.lang.String);
+ field public static final java.lang.String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
+ field public static final java.lang.String EXTRA_CERTIFICATE = "CERT";
+ field public static final java.lang.String EXTRA_NAME = "name";
+ field public static final java.lang.String EXTRA_PKCS12 = "PKCS12";
+ }
+
+ public abstract interface KeyChainAliasCallback {
+ method public abstract void alias(java.lang.String);
+ }
+
+ public class KeyChainException extends java.lang.Exception {
+ ctor public KeyChainException();
+ ctor public KeyChainException(java.lang.String);
+ ctor public KeyChainException(java.lang.String, java.lang.Throwable);
+ ctor public KeyChainException(java.lang.Throwable);
+ }
+
+ public final deprecated class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec {
+ method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();
+ method public android.content.Context getContext();
+ method public java.util.Date getEndDate();
+ method public int getKeySize();
+ method public java.lang.String getKeyType();
+ method public java.lang.String getKeystoreAlias();
+ method public java.math.BigInteger getSerialNumber();
+ method public java.util.Date getStartDate();
+ method public javax.security.auth.x500.X500Principal getSubjectDN();
+ method public boolean isEncryptionRequired();
+ }
+
+ public static final deprecated class KeyPairGeneratorSpec.Builder {
+ ctor public KeyPairGeneratorSpec.Builder(android.content.Context);
+ method public android.security.KeyPairGeneratorSpec build();
+ method public android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);
+ method public android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String);
+ method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired();
+ method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date);
+ method public android.security.KeyPairGeneratorSpec.Builder setKeySize(int);
+ method public android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger);
+ method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date);
+ method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal);
+ }
+
+ public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {
+ method public boolean isEncryptionRequired();
+ }
+
+ public static final deprecated class KeyStoreParameter.Builder {
+ ctor public KeyStoreParameter.Builder(android.content.Context);
+ method public android.security.KeyStoreParameter build();
+ method public android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean);
+ }
+
+ public class NetworkSecurityPolicy {
+ method public static android.security.NetworkSecurityPolicy getInstance();
+ method public boolean isCleartextTrafficPermitted();
+ }
+
+}
+
+package android.security.keystore {
+
+ public class KeyExpiredException extends java.security.InvalidKeyException {
+ ctor public KeyExpiredException();
+ ctor public KeyExpiredException(java.lang.String);
+ ctor public KeyExpiredException(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();
+ method public java.lang.String[] getBlockModes();
+ method public java.util.Date getCertificateNotAfter();
+ method public java.util.Date getCertificateNotBefore();
+ method public java.math.BigInteger getCertificateSerialNumber();
+ method public javax.security.auth.x500.X500Principal getCertificateSubject();
+ method public java.lang.String[] getDigests();
+ method public java.lang.String[] getEncryptionPaddings();
+ method public int getKeySize();
+ method public java.util.Date getKeyValidityForConsumptionEnd();
+ method public java.util.Date getKeyValidityForOriginationEnd();
+ method public java.util.Date getKeyValidityStart();
+ method public java.lang.String getKeystoreAlias();
+ method public int getPurposes();
+ method public java.lang.String[] getSignaturePaddings();
+ method public int getUserAuthenticationValidityDurationSeconds();
+ method public boolean isDigestsSpecified();
+ method public boolean isRandomizedEncryptionRequired();
+ method public boolean isUserAuthenticationRequired();
+ }
+
+ public static final class KeyGenParameterSpec.Builder {
+ ctor public KeyGenParameterSpec.Builder(java.lang.String, int);
+ method public android.security.keystore.KeyGenParameterSpec build();
+ method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSerialNumber(java.math.BigInteger);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForOriginationEnd(java.util.Date);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationRequired(boolean);
+ method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidityDurationSeconds(int);
+ }
+
+ public class KeyInfo implements java.security.spec.KeySpec {
+ method public java.lang.String[] getBlockModes();
+ method public java.lang.String[] getDigests();
+ method public java.lang.String[] getEncryptionPaddings();
+ method public int getKeySize();
+ method public java.util.Date getKeyValidityForConsumptionEnd();
+ method public java.util.Date getKeyValidityForOriginationEnd();
+ method public java.util.Date getKeyValidityStart();
+ method public java.lang.String getKeystoreAlias();
+ method public int getOrigin();
+ method public int getPurposes();
+ method public java.lang.String[] getSignaturePaddings();
+ method public int getUserAuthenticationValidityDurationSeconds();
+ method public boolean isInsideSecureHardware();
+ method public boolean isUserAuthenticationRequired();
+ method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();
+ }
+
+ public class KeyNotYetValidException extends java.security.InvalidKeyException {
+ ctor public KeyNotYetValidException();
+ ctor public KeyNotYetValidException(java.lang.String);
+ ctor public KeyNotYetValidException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class KeyPermanentlyInvalidatedException extends java.security.InvalidKeyException {
+ ctor public KeyPermanentlyInvalidatedException();
+ ctor public KeyPermanentlyInvalidatedException(java.lang.String);
+ ctor public KeyPermanentlyInvalidatedException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract class KeyProperties {
+ field public static final java.lang.String BLOCK_MODE_CBC = "CBC";
+ field public static final java.lang.String BLOCK_MODE_CTR = "CTR";
+ field public static final java.lang.String BLOCK_MODE_ECB = "ECB";
+ field public static final java.lang.String BLOCK_MODE_GCM = "GCM";
+ field public static final java.lang.String DIGEST_MD5 = "MD5";
+ field public static final java.lang.String DIGEST_NONE = "NONE";
+ field public static final java.lang.String DIGEST_SHA1 = "SHA-1";
+ field public static final java.lang.String DIGEST_SHA224 = "SHA-224";
+ field public static final java.lang.String DIGEST_SHA256 = "SHA-256";
+ field public static final java.lang.String DIGEST_SHA384 = "SHA-384";
+ field public static final java.lang.String DIGEST_SHA512 = "SHA-512";
+ field public static final java.lang.String ENCRYPTION_PADDING_NONE = "NoPadding";
+ field public static final java.lang.String ENCRYPTION_PADDING_PKCS7 = "PKCS7Padding";
+ field public static final java.lang.String ENCRYPTION_PADDING_RSA_OAEP = "OAEPPadding";
+ field public static final java.lang.String ENCRYPTION_PADDING_RSA_PKCS1 = "PKCS1Padding";
+ field public static final java.lang.String KEY_ALGORITHM_AES = "AES";
+ field public static final java.lang.String KEY_ALGORITHM_EC = "EC";
+ field public static final java.lang.String KEY_ALGORITHM_HMAC_SHA1 = "HmacSHA1";
+ field public static final java.lang.String KEY_ALGORITHM_HMAC_SHA224 = "HmacSHA224";
+ field public static final java.lang.String KEY_ALGORITHM_HMAC_SHA256 = "HmacSHA256";
+ field public static final java.lang.String KEY_ALGORITHM_HMAC_SHA384 = "HmacSHA384";
+ field public static final java.lang.String KEY_ALGORITHM_HMAC_SHA512 = "HmacSHA512";
+ field public static final java.lang.String KEY_ALGORITHM_RSA = "RSA";
+ field public static final int ORIGIN_GENERATED = 1; // 0x1
+ field public static final int ORIGIN_IMPORTED = 2; // 0x2
+ field public static final int ORIGIN_UNKNOWN = 4; // 0x4
+ field public static final int PURPOSE_DECRYPT = 2; // 0x2
+ field public static final int PURPOSE_ENCRYPT = 1; // 0x1
+ field public static final int PURPOSE_SIGN = 4; // 0x4
+ field public static final int PURPOSE_VERIFY = 8; // 0x8
+ field public static final java.lang.String SIGNATURE_PADDING_RSA_PKCS1 = "PKCS1";
+ field public static final java.lang.String SIGNATURE_PADDING_RSA_PSS = "PSS";
+ }
+
+ public final class KeyProtection implements java.security.KeyStore.ProtectionParameter {
+ method public java.lang.String[] getBlockModes();
+ method public java.lang.String[] getDigests();
+ method public java.lang.String[] getEncryptionPaddings();
+ method public java.util.Date getKeyValidityForConsumptionEnd();
+ method public java.util.Date getKeyValidityForOriginationEnd();
+ method public java.util.Date getKeyValidityStart();
+ method public int getPurposes();
+ method public java.lang.String[] getSignaturePaddings();
+ method public int getUserAuthenticationValidityDurationSeconds();
+ method public boolean isDigestsSpecified();
+ method public boolean isRandomizedEncryptionRequired();
+ method public boolean isUserAuthenticationRequired();
+ }
+
+ public static final class KeyProtection.Builder {
+ ctor public KeyProtection.Builder(int);
+ method public android.security.keystore.KeyProtection build();
+ method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);
+ method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);
+ method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);
+ method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);
+ method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);
+ method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);
+ method public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date);
+ method public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean);
+ method public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...);
+ method public android.security.keystore.KeyProtection.Builder setUserAuthenticationRequired(boolean);
+ method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidityDurationSeconds(int);
+ }
+
+ public class UserNotAuthenticatedException extends java.security.InvalidKeyException {
+ ctor public UserNotAuthenticatedException();
+ ctor public UserNotAuthenticatedException(java.lang.String);
+ ctor public UserNotAuthenticatedException(java.lang.String, java.lang.Throwable);
+ }
+
+}
+
+package android.service.carrier {
+
+ public class CarrierIdentifier implements android.os.Parcelable {
+ ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public int describeContents();
+ method public java.lang.String getGid1();
+ method public java.lang.String getGid2();
+ method public java.lang.String getImsi();
+ method public java.lang.String getMcc();
+ method public java.lang.String getMnc();
+ method public java.lang.String getSpn();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.carrier.CarrierIdentifier> CREATOR;
+ }
+
+ public abstract class CarrierMessagingService extends android.app.Service {
+ ctor public CarrierMessagingService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onDownloadMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Integer>);
+ method public void onFilterSms(android.service.carrier.MessagePdu, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Boolean>);
+ method public deprecated void onSendDataSms(byte[], int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);
+ method public void onSendDataSms(byte[], int, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);
+ method public void onSendMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMmsResult>);
+ method public deprecated void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);
+ method public void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);
+ method public deprecated void onSendTextSms(java.lang.String, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);
+ method public void onSendTextSms(java.lang.String, int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);
+ field public static final int DOWNLOAD_STATUS_ERROR = 2; // 0x2
+ field public static final int DOWNLOAD_STATUS_OK = 0; // 0x0
+ field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1
+ field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1
+ field public static final int SEND_STATUS_ERROR = 2; // 0x2
+ field public static final int SEND_STATUS_OK = 0; // 0x0
+ field public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierMessagingService";
+ }
+
+ public static abstract interface CarrierMessagingService.ResultCallback {
+ method public abstract void onReceiveResult(T) throws android.os.RemoteException;
+ }
+
+ public static final class CarrierMessagingService.SendMmsResult {
+ ctor public CarrierMessagingService.SendMmsResult(int, byte[]);
+ method public byte[] getSendConfPdu();
+ method public int getSendStatus();
+ }
+
+ public static final class CarrierMessagingService.SendMultipartSmsResult {
+ ctor public CarrierMessagingService.SendMultipartSmsResult(int, int[]);
+ method public int[] getMessageRefs();
+ method public int getSendStatus();
+ }
+
+ public static final class CarrierMessagingService.SendSmsResult {
+ ctor public CarrierMessagingService.SendSmsResult(int, int);
+ method public int getMessageRef();
+ method public int getSendStatus();
+ }
+
+ public abstract class CarrierService extends android.app.Service {
+ ctor public CarrierService();
+ method public final void notifyCarrierNetworkChange(boolean);
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
+ field public static final java.lang.String CARRIER_SERVICE_INTERFACE = "android.service.carrier.CarrierService";
+ }
+
+ public final class MessagePdu implements android.os.Parcelable {
+ ctor public MessagePdu(java.util.List<byte[]>);
+ method public int describeContents();
+ method public java.util.List<byte[]> getPdus();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.carrier.MessagePdu> CREATOR;
+ }
+
+}
+
+package android.service.chooser {
+
+ public final class ChooserTarget implements android.os.Parcelable {
+ ctor public ChooserTarget(java.lang.CharSequence, android.graphics.drawable.Icon, float, android.content.ComponentName, android.os.Bundle);
+ method public int describeContents();
+ method public android.content.ComponentName getComponentName();
+ method public android.graphics.drawable.Icon getIcon();
+ method public android.os.Bundle getIntentExtras();
+ method public float getScore();
+ method public java.lang.CharSequence getTitle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.chooser.ChooserTarget> CREATOR;
+ }
+
+ public abstract class ChooserTargetService extends android.app.Service {
+ ctor public ChooserTargetService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract java.util.List<android.service.chooser.ChooserTarget> onGetChooserTargets(android.content.ComponentName, android.content.IntentFilter);
+ field public static final java.lang.String BIND_PERMISSION = "android.permission.BIND_CHOOSER_TARGET_SERVICE";
+ field public static final java.lang.String META_DATA_NAME = "android.service.chooser.chooser_target_service";
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.chooser.ChooserTargetService";
+ }
+
+}
+
+package android.service.dreams {
+
+ public class DreamService extends android.app.Service implements android.view.Window.Callback {
+ ctor public DreamService();
+ method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);
+ method public boolean dispatchKeyEvent(android.view.KeyEvent);
+ method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);
+ method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public boolean dispatchTouchEvent(android.view.MotionEvent);
+ method public boolean dispatchTrackballEvent(android.view.MotionEvent);
+ method public android.view.View findViewById(int);
+ method public final void finish();
+ method public android.view.Window getWindow();
+ method public android.view.WindowManager getWindowManager();
+ method public boolean isFullscreen();
+ method public boolean isInteractive();
+ method public boolean isScreenBright();
+ method public void onActionModeFinished(android.view.ActionMode);
+ method public void onActionModeStarted(android.view.ActionMode);
+ method public void onAttachedToWindow();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public void onContentChanged();
+ method public boolean onCreatePanelMenu(int, android.view.Menu);
+ method public android.view.View onCreatePanelView(int);
+ method public void onDetachedFromWindow();
+ method public void onDreamingStarted();
+ method public void onDreamingStopped();
+ method public boolean onMenuItemSelected(int, android.view.MenuItem);
+ method public boolean onMenuOpened(int, android.view.Menu);
+ method public void onPanelClosed(int, android.view.Menu);
+ method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
+ method public boolean onSearchRequested(android.view.SearchEvent);
+ method public boolean onSearchRequested();
+ method public void onWakeUp();
+ method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
+ method public void onWindowFocusChanged(boolean);
+ method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
+ method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);
+ method public void setContentView(int);
+ method public void setContentView(android.view.View);
+ method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public void setFullscreen(boolean);
+ method public void setInteractive(boolean);
+ method public void setScreenBright(boolean);
+ method public final void wakeUp();
+ field public static final java.lang.String DREAM_META_DATA = "android.service.dream";
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.dreams.DreamService";
+ }
+
+}
+
+package android.service.media {
+
+ public abstract class CameraPrewarmService extends android.app.Service {
+ ctor public CameraPrewarmService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract void onCooldown(boolean);
+ method public abstract void onPrewarm();
+ }
+
+ public abstract class MediaBrowserService extends android.app.Service {
+ ctor public MediaBrowserService();
+ method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public android.media.session.MediaSession.Token getSessionToken();
+ method public void notifyChildrenChanged(java.lang.String);
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.service.media.MediaBrowserService.BrowserRoot onGetRoot(java.lang.String, int, android.os.Bundle);
+ method public abstract void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>);
+ method public void onLoadItem(java.lang.String, android.service.media.MediaBrowserService.Result<android.media.browse.MediaBrowser.MediaItem>);
+ method public void setSessionToken(android.media.session.MediaSession.Token);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService";
+ }
+
+ public static final class MediaBrowserService.BrowserRoot {
+ ctor public MediaBrowserService.BrowserRoot(java.lang.String, android.os.Bundle);
+ method public android.os.Bundle getExtras();
+ method public java.lang.String getRootId();
+ }
+
+ public class MediaBrowserService.Result {
+ method public void detach();
+ method public void sendResult(T);
+ }
+
+}
+
+package android.service.notification {
+
+ public class Condition implements android.os.Parcelable {
+ ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
+ method public android.service.notification.Condition copy();
+ method public int describeContents();
+ method public static boolean isValidId(android.net.Uri, java.lang.String);
+ method public static android.net.Uri.Builder newId(android.content.Context);
+ method public static java.lang.String relevanceToString(int);
+ method public static java.lang.String stateToString(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.notification.Condition> CREATOR;
+ field public static final int FLAG_RELEVANT_ALWAYS = 2; // 0x2
+ field public static final int FLAG_RELEVANT_NOW = 1; // 0x1
+ field public static final java.lang.String SCHEME = "condition";
+ field public static final int STATE_ERROR = 3; // 0x3
+ field public static final int STATE_FALSE = 0; // 0x0
+ field public static final int STATE_TRUE = 1; // 0x1
+ field public static final int STATE_UNKNOWN = 2; // 0x2
+ field public final int flags;
+ field public final int icon;
+ field public final android.net.Uri id;
+ field public final java.lang.String line1;
+ field public final java.lang.String line2;
+ field public final int state;
+ field public final java.lang.String summary;
+ }
+
+ public abstract class ConditionProviderService extends android.app.Service {
+ ctor public ConditionProviderService();
+ method public final void notifyCondition(android.service.notification.Condition);
+ method public final void notifyConditions(android.service.notification.Condition...);
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract void onConnected();
+ method public abstract void onRequestConditions(int);
+ method public abstract void onSubscribe(android.net.Uri);
+ method public abstract void onUnsubscribe(android.net.Uri);
+ field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
+ field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
+ field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
+ }
+
+ public abstract class NotificationListenerService extends android.app.Service {
+ ctor public NotificationListenerService();
+ method public final void cancelAllNotifications();
+ method public final deprecated void cancelNotification(java.lang.String, java.lang.String, int);
+ method public final void cancelNotification(java.lang.String);
+ method public final void cancelNotifications(java.lang.String[]);
+ method public android.service.notification.StatusBarNotification[] getActiveNotifications();
+ method public android.service.notification.StatusBarNotification[] getActiveNotifications(java.lang.String[]);
+ method public final int getCurrentInterruptionFilter();
+ method public final int getCurrentListenerHints();
+ method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onInterruptionFilterChanged(int);
+ method public void onListenerConnected();
+ method public void onListenerHintsChanged(int);
+ method public void onNotificationPosted(android.service.notification.StatusBarNotification);
+ method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
+ method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
+ method public void onNotificationRemoved(android.service.notification.StatusBarNotification);
+ method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
+ method public final void requestInterruptionFilter(int);
+ method public final void requestListenerHints(int);
+ method public final void setNotificationsShown(java.lang.String[]);
+ field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1
+ field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4
+ field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1
+ field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
+ field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
+ field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationListenerService";
+ field public static final int SUPPRESSED_EFFECT_LIGHTS = 1; // 0x1
+ field public static final int SUPPRESSED_EFFECT_PEEK = 2; // 0x2
+ }
+
+ public static class NotificationListenerService.Ranking {
+ ctor public NotificationListenerService.Ranking();
+ method public java.lang.String getKey();
+ method public int getRank();
+ method public int getSuppressedVisualEffects();
+ method public boolean isAmbient();
+ method public boolean matchesInterruptionFilter();
+ }
+
+ public static class NotificationListenerService.RankingMap implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.String[] getOrderedKeys();
+ method public boolean getRanking(java.lang.String, android.service.notification.NotificationListenerService.Ranking);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.notification.NotificationListenerService.RankingMap> CREATOR;
+ }
+
+ public class StatusBarNotification implements android.os.Parcelable {
+ ctor public StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle, long);
+ ctor public StatusBarNotification(android.os.Parcel);
+ method public android.service.notification.StatusBarNotification clone();
+ method public int describeContents();
+ method public java.lang.String getGroupKey();
+ method public int getId();
+ method public java.lang.String getKey();
+ method public android.app.Notification getNotification();
+ method public java.lang.String getPackageName();
+ method public long getPostTime();
+ method public java.lang.String getTag();
+ method public android.os.UserHandle getUser();
+ method public deprecated int getUserId();
+ method public boolean isClearable();
+ method public boolean isOngoing();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.notification.StatusBarNotification> CREATOR;
+ }
+
+}
+
+package android.service.quicksettings {
+
+ public final class Tile implements android.os.Parcelable {
+ method public int describeContents();
+ method public java.lang.CharSequence getContentDescription();
+ method public android.graphics.drawable.Icon getIcon();
+ method public java.lang.CharSequence getLabel();
+ method public void setContentDescription(java.lang.CharSequence);
+ method public void setIcon(android.graphics.drawable.Icon);
+ method public void setLabel(java.lang.CharSequence);
+ method public void updateTile();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.service.quicksettings.Tile> CREATOR;
+ }
+
+ public class TileService extends android.app.Service {
+ ctor public TileService();
+ method public final android.service.quicksettings.Tile getQsTile();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onClick();
+ method public void onStartListening();
+ method public void onStopListening();
+ method public void onTileAdded();
+ method public void onTileRemoved();
+ field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
+ }
+
+}
+
+package android.service.restrictions {
+
+ public abstract class RestrictionsReceiver extends android.content.BroadcastReceiver {
+ ctor public RestrictionsReceiver();
+ method public void onReceive(android.content.Context, android.content.Intent);
+ method public abstract void onRequestPermission(android.content.Context, java.lang.String, java.lang.String, java.lang.String, android.os.PersistableBundle);
+ }
+
+}
+
+package android.service.textservice {
+
+ public abstract class SpellCheckerService extends android.app.Service {
+ ctor public SpellCheckerService();
+ method public abstract android.service.textservice.SpellCheckerService.Session createSession();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.textservice.SpellCheckerService";
+ }
+
+ public static abstract class SpellCheckerService.Session {
+ ctor public SpellCheckerService.Session();
+ method public android.os.Bundle getBundle();
+ method public java.lang.String getLocale();
+ method public void onCancel();
+ method public void onClose();
+ method public abstract void onCreate();
+ method public android.view.textservice.SentenceSuggestionsInfo[] onGetSentenceSuggestionsMultiple(android.view.textservice.TextInfo[], int);
+ method public abstract android.view.textservice.SuggestionsInfo onGetSuggestions(android.view.textservice.TextInfo, int);
+ method public android.view.textservice.SuggestionsInfo[] onGetSuggestionsMultiple(android.view.textservice.TextInfo[], int, boolean);
+ }
+
+}
+
+package android.service.voice {
+
+ public class AlwaysOnHotwordDetector {
+ method public android.content.Intent createEnrollIntent();
+ method public android.content.Intent createReEnrollIntent();
+ method public android.content.Intent createUnEnrollIntent();
+ method public int getSupportedRecognitionModes();
+ method public boolean startRecognition(int);
+ method public boolean stopRecognition();
+ field public static final int RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS = 2; // 0x2
+ field public static final int RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO = 1; // 0x1
+ field public static final int RECOGNITION_MODE_USER_IDENTIFICATION = 2; // 0x2
+ field public static final int RECOGNITION_MODE_VOICE_TRIGGER = 1; // 0x1
+ field public static final int STATE_HARDWARE_UNAVAILABLE = -2; // 0xfffffffe
+ field public static final int STATE_KEYPHRASE_ENROLLED = 2; // 0x2
+ field public static final int STATE_KEYPHRASE_UNENROLLED = 1; // 0x1
+ field public static final int STATE_KEYPHRASE_UNSUPPORTED = -1; // 0xffffffff
+ }
+
+ public static abstract class AlwaysOnHotwordDetector.Callback {
+ ctor public AlwaysOnHotwordDetector.Callback();
+ method public abstract void onAvailabilityChanged(int);
+ method public abstract void onDetected(android.service.voice.AlwaysOnHotwordDetector.EventPayload);
+ method public abstract void onError();
+ method public abstract void onRecognitionPaused();
+ method public abstract void onRecognitionResumed();
+ }
+
+ public static class AlwaysOnHotwordDetector.EventPayload {
+ method public android.media.AudioFormat getCaptureAudioFormat();
+ method public byte[] getTriggerAudio();
+ }
+
+ public class VoiceInteractionService extends android.app.Service {
+ ctor public VoiceInteractionService();
+ method public final android.service.voice.AlwaysOnHotwordDetector createAlwaysOnHotwordDetector(java.lang.String, java.util.Locale, android.service.voice.AlwaysOnHotwordDetector.Callback);
+ method public int getDisabledShowContext();
+ method public static boolean isActiveService(android.content.Context, android.content.ComponentName);
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onLaunchVoiceAssistFromKeyguard();
+ method public void onReady();
+ method public void onShutdown();
+ method public void setDisabledShowContext(int);
+ method public void showSession(android.os.Bundle, int);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.voice.VoiceInteractionService";
+ field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction";
+ }
+
+ public class VoiceInteractionSession implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback {
+ ctor public VoiceInteractionSession(android.content.Context);
+ ctor public VoiceInteractionSession(android.content.Context, android.os.Handler);
+ method public void closeSystemDialogs();
+ method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public void finish();
+ method public android.content.Context getContext();
+ method public int getDisabledShowContext();
+ method public android.view.LayoutInflater getLayoutInflater();
+ method public int getUserDisabledShowContext();
+ method public android.app.Dialog getWindow();
+ method public void hide();
+ method public void onAssistStructureFailure(java.lang.Throwable);
+ method public void onBackPressed();
+ method public void onCancelRequest(android.service.voice.VoiceInteractionSession.Request);
+ method public void onCloseSystemDialogs();
+ method public void onComputeInsets(android.service.voice.VoiceInteractionSession.Insets);
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public void onCreate();
+ method public android.view.View onCreateContentView();
+ method public void onDestroy();
+ method public boolean[] onGetSupportedCommands(java.lang.String[]);
+ method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);
+ method public void onHandleScreenshot(android.graphics.Bitmap);
+ method public void onHide();
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method public void onLockscreenShown();
+ method public void onLowMemory();
+ method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest);
+ method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest);
+ method public void onRequestCompleteVoice(android.service.voice.VoiceInteractionSession.CompleteVoiceRequest);
+ method public void onRequestConfirmation(android.service.voice.VoiceInteractionSession.ConfirmationRequest);
+ method public void onRequestPickOption(android.service.voice.VoiceInteractionSession.PickOptionRequest);
+ method public void onShow(android.os.Bundle, int);
+ method public void onTaskFinished(android.content.Intent, int);
+ method public void onTaskStarted(android.content.Intent, int);
+ method public void onTrimMemory(int);
+ method public void setContentView(android.view.View);
+ method public void setDisabledShowContext(int);
+ method public void setKeepAwake(boolean);
+ method public void setTheme(int);
+ method public void show(android.os.Bundle, int);
+ method public void startVoiceActivity(android.content.Intent);
+ field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8
+ field public static final int SHOW_SOURCE_ASSIST_GESTURE = 4; // 0x4
+ field public static final int SHOW_WITH_ASSIST = 1; // 0x1
+ field public static final int SHOW_WITH_SCREENSHOT = 2; // 0x2
+ }
+
+ public static final class VoiceInteractionSession.AbortVoiceRequest extends android.service.voice.VoiceInteractionSession.Request {
+ method public deprecated java.lang.CharSequence getMessage();
+ method public android.app.VoiceInteractor.Prompt getVoicePrompt();
+ method public void sendAbortResult(android.os.Bundle);
+ }
+
+ public static final class VoiceInteractionSession.CommandRequest extends android.service.voice.VoiceInteractionSession.Request {
+ method public java.lang.String getCommand();
+ method public void sendIntermediateResult(android.os.Bundle);
+ method public void sendResult(android.os.Bundle);
+ }
+
+ public static final class VoiceInteractionSession.CompleteVoiceRequest extends android.service.voice.VoiceInteractionSession.Request {
+ method public deprecated java.lang.CharSequence getMessage();
+ method public android.app.VoiceInteractor.Prompt getVoicePrompt();
+ method public void sendCompleteResult(android.os.Bundle);
+ }
+
+ public static final class VoiceInteractionSession.ConfirmationRequest extends android.service.voice.VoiceInteractionSession.Request {
+ method public deprecated java.lang.CharSequence getPrompt();
+ method public android.app.VoiceInteractor.Prompt getVoicePrompt();
+ method public void sendConfirmationResult(boolean, android.os.Bundle);
+ }
+
+ public static final class VoiceInteractionSession.Insets {
+ ctor public VoiceInteractionSession.Insets();
+ field public static final int TOUCHABLE_INSETS_CONTENT = 1; // 0x1
+ field public static final int TOUCHABLE_INSETS_FRAME = 0; // 0x0
+ field public static final int TOUCHABLE_INSETS_REGION = 3; // 0x3
+ field public final android.graphics.Rect contentInsets;
+ field public int touchableInsets;
+ field public final android.graphics.Region touchableRegion;
+ }
+
+ public static final class VoiceInteractionSession.PickOptionRequest extends android.service.voice.VoiceInteractionSession.Request {
+ method public android.app.VoiceInteractor.PickOptionRequest.Option[] getOptions();
+ method public deprecated java.lang.CharSequence getPrompt();
+ method public android.app.VoiceInteractor.Prompt getVoicePrompt();
+ method public void sendIntermediatePickOptionResult(android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle);
+ method public void sendPickOptionResult(android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle);
+ }
+
+ public static class VoiceInteractionSession.Request {
+ method public void cancel();
+ method public java.lang.String getCallingPackage();
+ method public int getCallingUid();
+ method public android.os.Bundle getExtras();
+ method public boolean isActive();
+ }
+
+ public abstract class VoiceInteractionSessionService extends android.app.Service {
+ ctor public VoiceInteractionSessionService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.service.voice.VoiceInteractionSession onNewSession(android.os.Bundle);
+ }
+
+}
+
+package android.service.wallpaper {
+
+ public abstract class WallpaperService extends android.app.Service {
+ ctor public WallpaperService();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.service.wallpaper.WallpaperService.Engine onCreateEngine();
+ field public static final java.lang.String SERVICE_INTERFACE = "android.service.wallpaper.WallpaperService";
+ field public static final java.lang.String SERVICE_META_DATA = "android.service.wallpaper";
+ }
+
+ public class WallpaperService.Engine {
+ ctor public WallpaperService.Engine();
+ method protected void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
+ method public int getDesiredMinimumHeight();
+ method public int getDesiredMinimumWidth();
+ method public android.view.SurfaceHolder getSurfaceHolder();
+ method public boolean isPreview();
+ method public boolean isVisible();
+ method public void onApplyWindowInsets(android.view.WindowInsets);
+ method public android.os.Bundle onCommand(java.lang.String, int, int, int, android.os.Bundle, boolean);
+ method public void onCreate(android.view.SurfaceHolder);
+ method public void onDesiredSizeChanged(int, int);
+ method public void onDestroy();
+ method public void onOffsetsChanged(float, float, float, float, int, int);
+ method public void onSurfaceChanged(android.view.SurfaceHolder, int, int, int);
+ method public void onSurfaceCreated(android.view.SurfaceHolder);
+ method public void onSurfaceDestroyed(android.view.SurfaceHolder);
+ method public void onSurfaceRedrawNeeded(android.view.SurfaceHolder);
+ method public void onTouchEvent(android.view.MotionEvent);
+ method public void onVisibilityChanged(boolean);
+ method public void setOffsetNotificationsEnabled(boolean);
+ method public void setTouchEventsEnabled(boolean);
+ }
+
+}
+
+package android.speech {
+
+ public abstract interface RecognitionListener {
+ method public abstract void onBeginningOfSpeech();
+ method public abstract void onBufferReceived(byte[]);
+ method public abstract void onEndOfSpeech();
+ method public abstract void onError(int);
+ method public abstract void onEvent(int, android.os.Bundle);
+ method public abstract void onPartialResults(android.os.Bundle);
+ method public abstract void onReadyForSpeech(android.os.Bundle);
+ method public abstract void onResults(android.os.Bundle);
+ method public abstract void onRmsChanged(float);
+ }
+
+ public abstract class RecognitionService extends android.app.Service {
+ ctor public RecognitionService();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method protected abstract void onCancel(android.speech.RecognitionService.Callback);
+ method protected abstract void onStartListening(android.content.Intent, android.speech.RecognitionService.Callback);
+ method protected abstract void onStopListening(android.speech.RecognitionService.Callback);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.speech.RecognitionService";
+ field public static final java.lang.String SERVICE_META_DATA = "android.speech";
+ }
+
+ public class RecognitionService.Callback {
+ method public void beginningOfSpeech() throws android.os.RemoteException;
+ method public void bufferReceived(byte[]) throws android.os.RemoteException;
+ method public void endOfSpeech() throws android.os.RemoteException;
+ method public void error(int) throws android.os.RemoteException;
+ method public int getCallingUid();
+ method public void partialResults(android.os.Bundle) throws android.os.RemoteException;
+ method public void readyForSpeech(android.os.Bundle) throws android.os.RemoteException;
+ method public void results(android.os.Bundle) throws android.os.RemoteException;
+ method public void rmsChanged(float) throws android.os.RemoteException;
+ }
+
+ public class RecognizerIntent {
+ method public static final android.content.Intent getVoiceDetailsIntent(android.content.Context);
+ field public static final java.lang.String ACTION_GET_LANGUAGE_DETAILS = "android.speech.action.GET_LANGUAGE_DETAILS";
+ field public static final java.lang.String ACTION_RECOGNIZE_SPEECH = "android.speech.action.RECOGNIZE_SPEECH";
+ field public static final java.lang.String ACTION_VOICE_SEARCH_HANDS_FREE = "android.speech.action.VOICE_SEARCH_HANDS_FREE";
+ field public static final java.lang.String ACTION_WEB_SEARCH = "android.speech.action.WEB_SEARCH";
+ field public static final java.lang.String DETAILS_META_DATA = "android.speech.DETAILS";
+ field public static final java.lang.String EXTRA_CALLING_PACKAGE = "calling_package";
+ field public static final java.lang.String EXTRA_CONFIDENCE_SCORES = "android.speech.extra.CONFIDENCE_SCORES";
+ field public static final java.lang.String EXTRA_LANGUAGE = "android.speech.extra.LANGUAGE";
+ field public static final java.lang.String EXTRA_LANGUAGE_MODEL = "android.speech.extra.LANGUAGE_MODEL";
+ field public static final java.lang.String EXTRA_LANGUAGE_PREFERENCE = "android.speech.extra.LANGUAGE_PREFERENCE";
+ field public static final java.lang.String EXTRA_MAX_RESULTS = "android.speech.extra.MAX_RESULTS";
+ field public static final java.lang.String EXTRA_ONLY_RETURN_LANGUAGE_PREFERENCE = "android.speech.extra.ONLY_RETURN_LANGUAGE_PREFERENCE";
+ field public static final java.lang.String EXTRA_ORIGIN = "android.speech.extra.ORIGIN";
+ field public static final java.lang.String EXTRA_PARTIAL_RESULTS = "android.speech.extra.PARTIAL_RESULTS";
+ field public static final java.lang.String EXTRA_PREFER_OFFLINE = "android.speech.extra.PREFER_OFFLINE";
+ field public static final java.lang.String EXTRA_PROMPT = "android.speech.extra.PROMPT";
+ field public static final java.lang.String EXTRA_RESULTS = "android.speech.extra.RESULTS";
+ field public static final java.lang.String EXTRA_RESULTS_PENDINGINTENT = "android.speech.extra.RESULTS_PENDINGINTENT";
+ field public static final java.lang.String EXTRA_RESULTS_PENDINGINTENT_BUNDLE = "android.speech.extra.RESULTS_PENDINGINTENT_BUNDLE";
+ field public static final java.lang.String EXTRA_SECURE = "android.speech.extras.EXTRA_SECURE";
+ field public static final java.lang.String EXTRA_SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS = "android.speech.extras.SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS";
+ field public static final java.lang.String EXTRA_SPEECH_INPUT_MINIMUM_LENGTH_MILLIS = "android.speech.extras.SPEECH_INPUT_MINIMUM_LENGTH_MILLIS";
+ field public static final java.lang.String EXTRA_SPEECH_INPUT_POSSIBLY_COMPLETE_SILENCE_LENGTH_MILLIS = "android.speech.extras.SPEECH_INPUT_POSSIBLY_COMPLETE_SILENCE_LENGTH_MILLIS";
+ field public static final java.lang.String EXTRA_SUPPORTED_LANGUAGES = "android.speech.extra.SUPPORTED_LANGUAGES";
+ field public static final java.lang.String EXTRA_WEB_SEARCH_ONLY = "android.speech.extra.WEB_SEARCH_ONLY";
+ field public static final java.lang.String LANGUAGE_MODEL_FREE_FORM = "free_form";
+ field public static final java.lang.String LANGUAGE_MODEL_WEB_SEARCH = "web_search";
+ field public static final int RESULT_AUDIO_ERROR = 5; // 0x5
+ field public static final int RESULT_CLIENT_ERROR = 2; // 0x2
+ field public static final int RESULT_NETWORK_ERROR = 4; // 0x4
+ field public static final int RESULT_NO_MATCH = 1; // 0x1
+ field public static final int RESULT_SERVER_ERROR = 3; // 0x3
+ }
+
+ public class RecognizerResultsIntent {
+ field public static final java.lang.String ACTION_VOICE_SEARCH_RESULTS = "android.speech.action.VOICE_SEARCH_RESULTS";
+ field public static final java.lang.String EXTRA_VOICE_SEARCH_RESULT_HTML = "android.speech.extras.VOICE_SEARCH_RESULT_HTML";
+ field public static final java.lang.String EXTRA_VOICE_SEARCH_RESULT_HTML_BASE_URLS = "android.speech.extras.VOICE_SEARCH_RESULT_HTML_BASE_URLS";
+ field public static final java.lang.String EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS = "android.speech.extras.EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS";
+ field public static final java.lang.String EXTRA_VOICE_SEARCH_RESULT_STRINGS = "android.speech.extras.VOICE_SEARCH_RESULT_STRINGS";
+ field public static final java.lang.String EXTRA_VOICE_SEARCH_RESULT_URLS = "android.speech.extras.VOICE_SEARCH_RESULT_URLS";
+ field public static final java.lang.String URI_SCHEME_INLINE = "inline";
+ }
+
+ public class SpeechRecognizer {
+ method public void cancel();
+ method public static android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context);
+ method public static android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context, android.content.ComponentName);
+ method public void destroy();
+ method public static boolean isRecognitionAvailable(android.content.Context);
+ method public void setRecognitionListener(android.speech.RecognitionListener);
+ method public void startListening(android.content.Intent);
+ method public void stopListening();
+ field public static final java.lang.String CONFIDENCE_SCORES = "confidence_scores";
+ field public static final int ERROR_AUDIO = 3; // 0x3
+ field public static final int ERROR_CLIENT = 5; // 0x5
+ field public static final int ERROR_INSUFFICIENT_PERMISSIONS = 9; // 0x9
+ field public static final int ERROR_NETWORK = 2; // 0x2
+ field public static final int ERROR_NETWORK_TIMEOUT = 1; // 0x1
+ field public static final int ERROR_NO_MATCH = 7; // 0x7
+ field public static final int ERROR_RECOGNIZER_BUSY = 8; // 0x8
+ field public static final int ERROR_SERVER = 4; // 0x4
+ field public static final int ERROR_SPEECH_TIMEOUT = 6; // 0x6
+ field public static final java.lang.String RESULTS_RECOGNITION = "results_recognition";
+ }
+
+}
+
+package android.speech.tts {
+
+ public abstract interface SynthesisCallback {
+ method public abstract int audioAvailable(byte[], int, int);
+ method public abstract int done();
+ method public abstract void error();
+ method public abstract void error(int);
+ method public abstract int getMaxBufferSize();
+ method public abstract boolean hasFinished();
+ method public abstract boolean hasStarted();
+ method public abstract int start(int, int, int);
+ }
+
+ public final class SynthesisRequest {
+ ctor public SynthesisRequest(java.lang.String, android.os.Bundle);
+ ctor public SynthesisRequest(java.lang.CharSequence, android.os.Bundle);
+ method public int getCallerUid();
+ method public java.lang.CharSequence getCharSequenceText();
+ method public java.lang.String getCountry();
+ method public java.lang.String getLanguage();
+ method public android.os.Bundle getParams();
+ method public int getPitch();
+ method public int getSpeechRate();
+ method public deprecated java.lang.String getText();
+ method public java.lang.String getVariant();
+ method public java.lang.String getVoiceName();
+ }
+
+ public class TextToSpeech {
+ ctor public TextToSpeech(android.content.Context, android.speech.tts.TextToSpeech.OnInitListener);
+ ctor public TextToSpeech(android.content.Context, android.speech.tts.TextToSpeech.OnInitListener, java.lang.String);
+ method public int addEarcon(java.lang.String, java.lang.String, int);
+ method public deprecated int addEarcon(java.lang.String, java.lang.String);
+ method public int addEarcon(java.lang.String, java.io.File);
+ method public int addSpeech(java.lang.String, java.lang.String, int);
+ method public int addSpeech(java.lang.CharSequence, java.lang.String, int);
+ method public int addSpeech(java.lang.String, java.lang.String);
+ method public int addSpeech(java.lang.CharSequence, java.io.File);
+ method public deprecated boolean areDefaultsEnforced();
+ method public java.util.Set<java.util.Locale> getAvailableLanguages();
+ method public java.lang.String getDefaultEngine();
+ method public deprecated java.util.Locale getDefaultLanguage();
+ method public android.speech.tts.Voice getDefaultVoice();
+ method public java.util.List<android.speech.tts.TextToSpeech.EngineInfo> getEngines();
+ method public deprecated java.util.Set<java.lang.String> getFeatures(java.util.Locale);
+ method public deprecated java.util.Locale getLanguage();
+ method public static int getMaxSpeechInputLength();
+ method public android.speech.tts.Voice getVoice();
+ method public java.util.Set<android.speech.tts.Voice> getVoices();
+ method public int isLanguageAvailable(java.util.Locale);
+ method public boolean isSpeaking();
+ method public int playEarcon(java.lang.String, int, android.os.Bundle, java.lang.String);
+ method public deprecated int playEarcon(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>);
+ method public deprecated int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>);
+ method public int playSilentUtterance(long, int, java.lang.String);
+ method public int setAudioAttributes(android.media.AudioAttributes);
+ method public deprecated int setEngineByPackageName(java.lang.String);
+ method public int setLanguage(java.util.Locale);
+ method public deprecated int setOnUtteranceCompletedListener(android.speech.tts.TextToSpeech.OnUtteranceCompletedListener);
+ method public int setOnUtteranceProgressListener(android.speech.tts.UtteranceProgressListener);
+ method public int setPitch(float);
+ method public int setSpeechRate(float);
+ method public int setVoice(android.speech.tts.Voice);
+ method public void shutdown();
+ method public int speak(java.lang.CharSequence, int, android.os.Bundle, java.lang.String);
+ method public deprecated int speak(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>);
+ method public int stop();
+ method public int synthesizeToFile(java.lang.CharSequence, android.os.Bundle, java.io.File, java.lang.String);
+ method public deprecated int synthesizeToFile(java.lang.String, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String);
+ field public static final java.lang.String ACTION_TTS_QUEUE_PROCESSING_COMPLETED = "android.speech.tts.TTS_QUEUE_PROCESSING_COMPLETED";
+ field public static final int ERROR = -1; // 0xffffffff
+ field public static final int ERROR_INVALID_REQUEST = -8; // 0xfffffff8
+ field public static final int ERROR_NETWORK = -6; // 0xfffffffa
+ field public static final int ERROR_NETWORK_TIMEOUT = -7; // 0xfffffff9
+ field public static final int ERROR_NOT_INSTALLED_YET = -9; // 0xfffffff7
+ field public static final int ERROR_OUTPUT = -5; // 0xfffffffb
+ field public static final int ERROR_SERVICE = -4; // 0xfffffffc
+ field public static final int ERROR_SYNTHESIS = -3; // 0xfffffffd
+ field public static final int LANG_AVAILABLE = 0; // 0x0
+ field public static final int LANG_COUNTRY_AVAILABLE = 1; // 0x1
+ field public static final int LANG_COUNTRY_VAR_AVAILABLE = 2; // 0x2
+ field public static final int LANG_MISSING_DATA = -1; // 0xffffffff
+ field public static final int LANG_NOT_SUPPORTED = -2; // 0xfffffffe
+ field public static final int QUEUE_ADD = 1; // 0x1
+ field public static final int QUEUE_FLUSH = 0; // 0x0
+ field public static final int STOPPED = -2; // 0xfffffffe
+ field public static final int SUCCESS = 0; // 0x0
+ }
+
+ public class TextToSpeech.Engine {
+ ctor public TextToSpeech.Engine();
+ field public static final java.lang.String ACTION_CHECK_TTS_DATA = "android.speech.tts.engine.CHECK_TTS_DATA";
+ field public static final java.lang.String ACTION_GET_SAMPLE_TEXT = "android.speech.tts.engine.GET_SAMPLE_TEXT";
+ field public static final java.lang.String ACTION_INSTALL_TTS_DATA = "android.speech.tts.engine.INSTALL_TTS_DATA";
+ field public static final java.lang.String ACTION_TTS_DATA_INSTALLED = "android.speech.tts.engine.TTS_DATA_INSTALLED";
+ field public static final deprecated int CHECK_VOICE_DATA_BAD_DATA = -1; // 0xffffffff
+ field public static final int CHECK_VOICE_DATA_FAIL = 0; // 0x0
+ field public static final deprecated int CHECK_VOICE_DATA_MISSING_DATA = -2; // 0xfffffffe
+ field public static final deprecated int CHECK_VOICE_DATA_MISSING_VOLUME = -3; // 0xfffffffd
+ field public static final int CHECK_VOICE_DATA_PASS = 1; // 0x1
+ field public static final int DEFAULT_STREAM = 3; // 0x3
+ field public static final java.lang.String EXTRA_AVAILABLE_VOICES = "availableVoices";
+ field public static final deprecated java.lang.String EXTRA_CHECK_VOICE_DATA_FOR = "checkVoiceDataFor";
+ field public static final java.lang.String EXTRA_SAMPLE_TEXT = "sampleText";
+ field public static final deprecated java.lang.String EXTRA_TTS_DATA_INSTALLED = "dataInstalled";
+ field public static final java.lang.String EXTRA_UNAVAILABLE_VOICES = "unavailableVoices";
+ field public static final deprecated java.lang.String EXTRA_VOICE_DATA_FILES = "dataFiles";
+ field public static final deprecated java.lang.String EXTRA_VOICE_DATA_FILES_INFO = "dataFilesInfo";
+ field public static final deprecated java.lang.String EXTRA_VOICE_DATA_ROOT_DIRECTORY = "dataRoot";
+ field public static final java.lang.String INTENT_ACTION_TTS_SERVICE = "android.intent.action.TTS_SERVICE";
+ field public static final deprecated java.lang.String KEY_FEATURE_EMBEDDED_SYNTHESIS = "embeddedTts";
+ field public static final java.lang.String KEY_FEATURE_NETWORK_RETRIES_COUNT = "networkRetriesCount";
+ field public static final deprecated java.lang.String KEY_FEATURE_NETWORK_SYNTHESIS = "networkTts";
+ field public static final java.lang.String KEY_FEATURE_NETWORK_TIMEOUT_MS = "networkTimeoutMs";
+ field public static final java.lang.String KEY_FEATURE_NOT_INSTALLED = "notInstalled";
+ field public static final java.lang.String KEY_PARAM_PAN = "pan";
+ field public static final java.lang.String KEY_PARAM_SESSION_ID = "sessionId";
+ field public static final java.lang.String KEY_PARAM_STREAM = "streamType";
+ field public static final java.lang.String KEY_PARAM_UTTERANCE_ID = "utteranceId";
+ field public static final java.lang.String KEY_PARAM_VOLUME = "volume";
+ field public static final java.lang.String SERVICE_META_DATA = "android.speech.tts";
+ }
+
+ public static class TextToSpeech.EngineInfo {
+ ctor public TextToSpeech.EngineInfo();
+ field public int icon;
+ field public java.lang.String label;
+ field public java.lang.String name;
+ }
+
+ public static abstract interface TextToSpeech.OnInitListener {
+ method public abstract void onInit(int);
+ }
+
+ public static abstract deprecated interface TextToSpeech.OnUtteranceCompletedListener {
+ method public abstract void onUtteranceCompleted(java.lang.String);
+ }
+
+ public abstract class TextToSpeechService extends android.app.Service {
+ ctor public TextToSpeechService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public java.lang.String onGetDefaultVoiceNameFor(java.lang.String, java.lang.String, java.lang.String);
+ method protected java.util.Set<java.lang.String> onGetFeaturesForLanguage(java.lang.String, java.lang.String, java.lang.String);
+ method protected abstract java.lang.String[] onGetLanguage();
+ method public java.util.List<android.speech.tts.Voice> onGetVoices();
+ method protected abstract int onIsLanguageAvailable(java.lang.String, java.lang.String, java.lang.String);
+ method public int onIsValidVoiceName(java.lang.String);
+ method protected abstract int onLoadLanguage(java.lang.String, java.lang.String, java.lang.String);
+ method public int onLoadVoice(java.lang.String);
+ method protected abstract void onStop();
+ method protected abstract void onSynthesizeText(android.speech.tts.SynthesisRequest, android.speech.tts.SynthesisCallback);
+ }
+
+ public abstract class UtteranceProgressListener {
+ ctor public UtteranceProgressListener();
+ method public abstract void onDone(java.lang.String);
+ method public abstract deprecated void onError(java.lang.String);
+ method public void onError(java.lang.String, int);
+ method public abstract void onStart(java.lang.String);
+ method public void onStop(java.lang.String, boolean);
+ }
+
+ public class Voice implements android.os.Parcelable {
+ ctor public Voice(java.lang.String, java.util.Locale, int, int, boolean, java.util.Set<java.lang.String>);
+ method public int describeContents();
+ method public java.util.Set<java.lang.String> getFeatures();
+ method public int getLatency();
+ method public java.util.Locale getLocale();
+ method public java.lang.String getName();
+ method public int getQuality();
+ method public boolean isNetworkConnectionRequired();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.speech.tts.Voice> CREATOR;
+ field public static final int LATENCY_HIGH = 400; // 0x190
+ field public static final int LATENCY_LOW = 200; // 0xc8
+ field public static final int LATENCY_NORMAL = 300; // 0x12c
+ field public static final int LATENCY_VERY_HIGH = 500; // 0x1f4
+ field public static final int LATENCY_VERY_LOW = 100; // 0x64
+ field public static final int QUALITY_HIGH = 400; // 0x190
+ field public static final int QUALITY_LOW = 200; // 0xc8
+ field public static final int QUALITY_NORMAL = 300; // 0x12c
+ field public static final int QUALITY_VERY_HIGH = 500; // 0x1f4
+ field public static final int QUALITY_VERY_LOW = 100; // 0x64
+ }
+
+}
+
+package android.system {
+
+ public final class ErrnoException extends java.lang.Exception {
+ ctor public ErrnoException(java.lang.String, int);
+ ctor public ErrnoException(java.lang.String, int, java.lang.Throwable);
+ field public final int errno;
+ }
+
+ public final class Os {
+ method public static java.io.FileDescriptor accept(java.io.FileDescriptor, java.net.InetSocketAddress) throws android.system.ErrnoException, java.net.SocketException;
+ method public static boolean access(java.lang.String, int) throws android.system.ErrnoException;
+ method public static void bind(java.io.FileDescriptor, java.net.InetAddress, int) throws android.system.ErrnoException, java.net.SocketException;
+ method public static void chmod(java.lang.String, int) throws android.system.ErrnoException;
+ method public static void chown(java.lang.String, int, int) throws android.system.ErrnoException;
+ method public static void close(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static void connect(java.io.FileDescriptor, java.net.InetAddress, int) throws android.system.ErrnoException, java.net.SocketException;
+ method public static java.io.FileDescriptor dup(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static java.io.FileDescriptor dup2(java.io.FileDescriptor, int) throws android.system.ErrnoException;
+ method public static java.lang.String[] environ();
+ method public static void execv(java.lang.String, java.lang.String[]) throws android.system.ErrnoException;
+ method public static void execve(java.lang.String, java.lang.String[], java.lang.String[]) throws android.system.ErrnoException;
+ method public static void fchmod(java.io.FileDescriptor, int) throws android.system.ErrnoException;
+ method public static void fchown(java.io.FileDescriptor, int, int) throws android.system.ErrnoException;
+ method public static void fdatasync(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static android.system.StructStat fstat(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static android.system.StructStatVfs fstatvfs(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static void fsync(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static void ftruncate(java.io.FileDescriptor, long) throws android.system.ErrnoException;
+ method public static java.lang.String gai_strerror(int);
+ method public static int getegid();
+ method public static java.lang.String getenv(java.lang.String);
+ method public static int geteuid();
+ method public static int getgid();
+ method public static java.net.SocketAddress getpeername(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static int getpid();
+ method public static int getppid();
+ method public static java.net.SocketAddress getsockname(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static int gettid();
+ method public static int getuid();
+ method public static java.lang.String if_indextoname(int);
+ method public static java.net.InetAddress inet_pton(int, java.lang.String);
+ method public static boolean isatty(java.io.FileDescriptor);
+ method public static void kill(int, int) throws android.system.ErrnoException;
+ method public static void lchown(java.lang.String, int, int) throws android.system.ErrnoException;
+ method public static void link(java.lang.String, java.lang.String) throws android.system.ErrnoException;
+ method public static void listen(java.io.FileDescriptor, int) throws android.system.ErrnoException;
+ method public static long lseek(java.io.FileDescriptor, long, int) throws android.system.ErrnoException;
+ method public static android.system.StructStat lstat(java.lang.String) throws android.system.ErrnoException;
+ method public static void mincore(long, long, byte[]) throws android.system.ErrnoException;
+ method public static void mkdir(java.lang.String, int) throws android.system.ErrnoException;
+ method public static void mkfifo(java.lang.String, int) throws android.system.ErrnoException;
+ method public static void mlock(long, long) throws android.system.ErrnoException;
+ method public static long mmap(long, long, int, int, java.io.FileDescriptor, long) throws android.system.ErrnoException;
+ method public static void msync(long, long, int) throws android.system.ErrnoException;
+ method public static void munlock(long, long) throws android.system.ErrnoException;
+ method public static void munmap(long, long) throws android.system.ErrnoException;
+ method public static java.io.FileDescriptor open(java.lang.String, int, int) throws android.system.ErrnoException;
+ method public static java.io.FileDescriptor[] pipe() throws android.system.ErrnoException;
+ method public static int poll(android.system.StructPollfd[], int) throws android.system.ErrnoException;
+ method public static void posix_fallocate(java.io.FileDescriptor, long, long) throws android.system.ErrnoException;
+ method public static int prctl(int, long, long, long, long) throws android.system.ErrnoException;
+ method public static int pread(java.io.FileDescriptor, java.nio.ByteBuffer, long) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int pread(java.io.FileDescriptor, byte[], int, int, long) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int pwrite(java.io.FileDescriptor, java.nio.ByteBuffer, long) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int pwrite(java.io.FileDescriptor, byte[], int, int, long) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int read(java.io.FileDescriptor, java.nio.ByteBuffer) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int read(java.io.FileDescriptor, byte[], int, int) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static java.lang.String readlink(java.lang.String) throws android.system.ErrnoException;
+ method public static int readv(java.io.FileDescriptor, java.lang.Object[], int[], int[]) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int recvfrom(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetSocketAddress) throws android.system.ErrnoException, java.net.SocketException;
+ method public static int recvfrom(java.io.FileDescriptor, byte[], int, int, int, java.net.InetSocketAddress) throws android.system.ErrnoException, java.net.SocketException;
+ method public static void remove(java.lang.String) throws android.system.ErrnoException;
+ method public static void rename(java.lang.String, java.lang.String) throws android.system.ErrnoException;
+ method public static long sendfile(java.io.FileDescriptor, java.io.FileDescriptor, android.util.MutableLong, long) throws android.system.ErrnoException;
+ method public static int sendto(java.io.FileDescriptor, java.nio.ByteBuffer, int, java.net.InetAddress, int) throws android.system.ErrnoException, java.net.SocketException;
+ method public static int sendto(java.io.FileDescriptor, byte[], int, int, int, java.net.InetAddress, int) throws android.system.ErrnoException, java.net.SocketException;
+ method public static void setegid(int) throws android.system.ErrnoException;
+ method public static void setenv(java.lang.String, java.lang.String, boolean) throws android.system.ErrnoException;
+ method public static void seteuid(int) throws android.system.ErrnoException;
+ method public static void setgid(int) throws android.system.ErrnoException;
+ method public static int setsid() throws android.system.ErrnoException;
+ method public static void setuid(int) throws android.system.ErrnoException;
+ method public static void shutdown(java.io.FileDescriptor, int) throws android.system.ErrnoException;
+ method public static java.io.FileDescriptor socket(int, int, int) throws android.system.ErrnoException;
+ method public static void socketpair(int, int, int, java.io.FileDescriptor, java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static android.system.StructStat stat(java.lang.String) throws android.system.ErrnoException;
+ method public static android.system.StructStatVfs statvfs(java.lang.String) throws android.system.ErrnoException;
+ method public static java.lang.String strerror(int);
+ method public static java.lang.String strsignal(int);
+ method public static void symlink(java.lang.String, java.lang.String) throws android.system.ErrnoException;
+ method public static long sysconf(int);
+ method public static void tcdrain(java.io.FileDescriptor) throws android.system.ErrnoException;
+ method public static void tcsendbreak(java.io.FileDescriptor, int) throws android.system.ErrnoException;
+ method public static int umask(int);
+ method public static android.system.StructUtsname uname();
+ method public static void unsetenv(java.lang.String) throws android.system.ErrnoException;
+ method public static int waitpid(int, android.util.MutableInt, int) throws android.system.ErrnoException;
+ method public static int write(java.io.FileDescriptor, java.nio.ByteBuffer) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int write(java.io.FileDescriptor, byte[], int, int) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ method public static int writev(java.io.FileDescriptor, java.lang.Object[], int[], int[]) throws android.system.ErrnoException, java.io.InterruptedIOException;
+ }
+
+ public final class OsConstants {
+ method public static boolean S_ISBLK(int);
+ method public static boolean S_ISCHR(int);
+ method public static boolean S_ISDIR(int);
+ method public static boolean S_ISFIFO(int);
+ method public static boolean S_ISLNK(int);
+ method public static boolean S_ISREG(int);
+ method public static boolean S_ISSOCK(int);
+ method public static boolean WCOREDUMP(int);
+ method public static int WEXITSTATUS(int);
+ method public static boolean WIFEXITED(int);
+ method public static boolean WIFSIGNALED(int);
+ method public static boolean WIFSTOPPED(int);
+ method public static int WSTOPSIG(int);
+ method public static int WTERMSIG(int);
+ method public static java.lang.String errnoName(int);
+ method public static java.lang.String gaiName(int);
+ field public static final int AF_INET;
+ field public static final int AF_INET6;
+ field public static final int AF_UNIX;
+ field public static final int AF_UNSPEC;
+ field public static final int AI_ADDRCONFIG;
+ field public static final int AI_ALL;
+ field public static final int AI_CANONNAME;
+ field public static final int AI_NUMERICHOST;
+ field public static final int AI_NUMERICSERV;
+ field public static final int AI_PASSIVE;
+ field public static final int AI_V4MAPPED;
+ field public static final int CAP_AUDIT_CONTROL;
+ field public static final int CAP_AUDIT_WRITE;
+ field public static final int CAP_BLOCK_SUSPEND;
+ field public static final int CAP_CHOWN;
+ field public static final int CAP_DAC_OVERRIDE;
+ field public static final int CAP_DAC_READ_SEARCH;
+ field public static final int CAP_FOWNER;
+ field public static final int CAP_FSETID;
+ field public static final int CAP_IPC_LOCK;
+ field public static final int CAP_IPC_OWNER;
+ field public static final int CAP_KILL;
+ field public static final int CAP_LAST_CAP;
+ field public static final int CAP_LEASE;
+ field public static final int CAP_LINUX_IMMUTABLE;
+ field public static final int CAP_MAC_ADMIN;
+ field public static final int CAP_MAC_OVERRIDE;
+ field public static final int CAP_MKNOD;
+ field public static final int CAP_NET_ADMIN;
+ field public static final int CAP_NET_BIND_SERVICE;
+ field public static final int CAP_NET_BROADCAST;
+ field public static final int CAP_NET_RAW;
+ field public static final int CAP_SETFCAP;
+ field public static final int CAP_SETGID;
+ field public static final int CAP_SETPCAP;
+ field public static final int CAP_SETUID;
+ field public static final int CAP_SYSLOG;
+ field public static final int CAP_SYS_ADMIN;
+ field public static final int CAP_SYS_BOOT;
+ field public static final int CAP_SYS_CHROOT;
+ field public static final int CAP_SYS_MODULE;
+ field public static final int CAP_SYS_NICE;
+ field public static final int CAP_SYS_PACCT;
+ field public static final int CAP_SYS_PTRACE;
+ field public static final int CAP_SYS_RAWIO;
+ field public static final int CAP_SYS_RESOURCE;
+ field public static final int CAP_SYS_TIME;
+ field public static final int CAP_SYS_TTY_CONFIG;
+ field public static final int CAP_WAKE_ALARM;
+ field public static final int E2BIG;
+ field public static final int EACCES;
+ field public static final int EADDRINUSE;
+ field public static final int EADDRNOTAVAIL;
+ field public static final int EAFNOSUPPORT;
+ field public static final int EAGAIN;
+ field public static final int EAI_AGAIN;
+ field public static final int EAI_BADFLAGS;
+ field public static final int EAI_FAIL;
+ field public static final int EAI_FAMILY;
+ field public static final int EAI_MEMORY;
+ field public static final int EAI_NODATA;
+ field public static final int EAI_NONAME;
+ field public static final int EAI_OVERFLOW;
+ field public static final int EAI_SERVICE;
+ field public static final int EAI_SOCKTYPE;
+ field public static final int EAI_SYSTEM;
+ field public static final int EALREADY;
+ field public static final int EBADF;
+ field public static final int EBADMSG;
+ field public static final int EBUSY;
+ field public static final int ECANCELED;
+ field public static final int ECHILD;
+ field public static final int ECONNABORTED;
+ field public static final int ECONNREFUSED;
+ field public static final int ECONNRESET;
+ field public static final int EDEADLK;
+ field public static final int EDESTADDRREQ;
+ field public static final int EDOM;
+ field public static final int EDQUOT;
+ field public static final int EEXIST;
+ field public static final int EFAULT;
+ field public static final int EFBIG;
+ field public static final int EHOSTUNREACH;
+ field public static final int EIDRM;
+ field public static final int EILSEQ;
+ field public static final int EINPROGRESS;
+ field public static final int EINTR;
+ field public static final int EINVAL;
+ field public static final int EIO;
+ field public static final int EISCONN;
+ field public static final int EISDIR;
+ field public static final int ELOOP;
+ field public static final int EMFILE;
+ field public static final int EMLINK;
+ field public static final int EMSGSIZE;
+ field public static final int EMULTIHOP;
+ field public static final int ENAMETOOLONG;
+ field public static final int ENETDOWN;
+ field public static final int ENETRESET;
+ field public static final int ENETUNREACH;
+ field public static final int ENFILE;
+ field public static final int ENOBUFS;
+ field public static final int ENODATA;
+ field public static final int ENODEV;
+ field public static final int ENOENT;
+ field public static final int ENOEXEC;
+ field public static final int ENOLCK;
+ field public static final int ENOLINK;
+ field public static final int ENOMEM;
+ field public static final int ENOMSG;
+ field public static final int ENOPROTOOPT;
+ field public static final int ENOSPC;
+ field public static final int ENOSR;
+ field public static final int ENOSTR;
+ field public static final int ENOSYS;
+ field public static final int ENOTCONN;
+ field public static final int ENOTDIR;
+ field public static final int ENOTEMPTY;
+ field public static final int ENOTSOCK;
+ field public static final int ENOTSUP;
+ field public static final int ENOTTY;
+ field public static final int ENXIO;
+ field public static final int EOPNOTSUPP;
+ field public static final int EOVERFLOW;
+ field public static final int EPERM;
+ field public static final int EPIPE;
+ field public static final int EPROTO;
+ field public static final int EPROTONOSUPPORT;
+ field public static final int EPROTOTYPE;
+ field public static final int ERANGE;
+ field public static final int EROFS;
+ field public static final int ESPIPE;
+ field public static final int ESRCH;
+ field public static final int ESTALE;
+ field public static final int ETIME;
+ field public static final int ETIMEDOUT;
+ field public static final int ETXTBSY;
+ field public static final int EXDEV;
+ field public static final int EXIT_FAILURE;
+ field public static final int EXIT_SUCCESS;
+ field public static final int FD_CLOEXEC;
+ field public static final int FIONREAD;
+ field public static final int F_DUPFD;
+ field public static final int F_GETFD;
+ field public static final int F_GETFL;
+ field public static final int F_GETLK;
+ field public static final int F_GETLK64;
+ field public static final int F_GETOWN;
+ field public static final int F_OK;
+ field public static final int F_RDLCK;
+ field public static final int F_SETFD;
+ field public static final int F_SETFL;
+ field public static final int F_SETLK;
+ field public static final int F_SETLK64;
+ field public static final int F_SETLKW;
+ field public static final int F_SETLKW64;
+ field public static final int F_SETOWN;
+ field public static final int F_UNLCK;
+ field public static final int F_WRLCK;
+ field public static final int IFA_F_DADFAILED;
+ field public static final int IFA_F_DEPRECATED;
+ field public static final int IFA_F_HOMEADDRESS;
+ field public static final int IFA_F_NODAD;
+ field public static final int IFA_F_OPTIMISTIC;
+ field public static final int IFA_F_PERMANENT;
+ field public static final int IFA_F_SECONDARY;
+ field public static final int IFA_F_TEMPORARY;
+ field public static final int IFA_F_TENTATIVE;
+ field public static final int IFF_ALLMULTI;
+ field public static final int IFF_AUTOMEDIA;
+ field public static final int IFF_BROADCAST;
+ field public static final int IFF_DEBUG;
+ field public static final int IFF_DYNAMIC;
+ field public static final int IFF_LOOPBACK;
+ field public static final int IFF_MASTER;
+ field public static final int IFF_MULTICAST;
+ field public static final int IFF_NOARP;
+ field public static final int IFF_NOTRAILERS;
+ field public static final int IFF_POINTOPOINT;
+ field public static final int IFF_PORTSEL;
+ field public static final int IFF_PROMISC;
+ field public static final int IFF_RUNNING;
+ field public static final int IFF_SLAVE;
+ field public static final int IFF_UP;
+ field public static final int IPPROTO_ICMP;
+ field public static final int IPPROTO_ICMPV6;
+ field public static final int IPPROTO_IP;
+ field public static final int IPPROTO_IPV6;
+ field public static final int IPPROTO_RAW;
+ field public static final int IPPROTO_TCP;
+ field public static final int IPPROTO_UDP;
+ field public static final int IPV6_CHECKSUM;
+ field public static final int IPV6_MULTICAST_HOPS;
+ field public static final int IPV6_MULTICAST_IF;
+ field public static final int IPV6_MULTICAST_LOOP;
+ field public static final int IPV6_RECVDSTOPTS;
+ field public static final int IPV6_RECVHOPLIMIT;
+ field public static final int IPV6_RECVHOPOPTS;
+ field public static final int IPV6_RECVPKTINFO;
+ field public static final int IPV6_RECVRTHDR;
+ field public static final int IPV6_RECVTCLASS;
+ field public static final int IPV6_TCLASS;
+ field public static final int IPV6_UNICAST_HOPS;
+ field public static final int IPV6_V6ONLY;
+ field public static final int IP_MULTICAST_IF;
+ field public static final int IP_MULTICAST_LOOP;
+ field public static final int IP_MULTICAST_TTL;
+ field public static final int IP_TOS;
+ field public static final int IP_TTL;
+ field public static final int MAP_FIXED;
+ field public static final int MAP_PRIVATE;
+ field public static final int MAP_SHARED;
+ field public static final int MCAST_BLOCK_SOURCE;
+ field public static final int MCAST_JOIN_GROUP;
+ field public static final int MCAST_JOIN_SOURCE_GROUP;
+ field public static final int MCAST_LEAVE_GROUP;
+ field public static final int MCAST_LEAVE_SOURCE_GROUP;
+ field public static final int MCAST_UNBLOCK_SOURCE;
+ field public static final int MCL_CURRENT;
+ field public static final int MCL_FUTURE;
+ field public static final int MSG_CTRUNC;
+ field public static final int MSG_DONTROUTE;
+ field public static final int MSG_EOR;
+ field public static final int MSG_OOB;
+ field public static final int MSG_PEEK;
+ field public static final int MSG_TRUNC;
+ field public static final int MSG_WAITALL;
+ field public static final int MS_ASYNC;
+ field public static final int MS_INVALIDATE;
+ field public static final int MS_SYNC;
+ field public static final int NI_DGRAM;
+ field public static final int NI_NAMEREQD;
+ field public static final int NI_NOFQDN;
+ field public static final int NI_NUMERICHOST;
+ field public static final int NI_NUMERICSERV;
+ field public static final int O_ACCMODE;
+ field public static final int O_APPEND;
+ field public static final int O_CREAT;
+ field public static final int O_EXCL;
+ field public static final int O_NOCTTY;
+ field public static final int O_NOFOLLOW;
+ field public static final int O_NONBLOCK;
+ field public static final int O_RDONLY;
+ field public static final int O_RDWR;
+ field public static final int O_SYNC;
+ field public static final int O_TRUNC;
+ field public static final int O_WRONLY;
+ field public static final int POLLERR;
+ field public static final int POLLHUP;
+ field public static final int POLLIN;
+ field public static final int POLLNVAL;
+ field public static final int POLLOUT;
+ field public static final int POLLPRI;
+ field public static final int POLLRDBAND;
+ field public static final int POLLRDNORM;
+ field public static final int POLLWRBAND;
+ field public static final int POLLWRNORM;
+ field public static final int PROT_EXEC;
+ field public static final int PROT_NONE;
+ field public static final int PROT_READ;
+ field public static final int PROT_WRITE;
+ field public static final int PR_GET_DUMPABLE;
+ field public static final int PR_SET_DUMPABLE;
+ field public static final int PR_SET_NO_NEW_PRIVS;
+ field public static final int RT_SCOPE_HOST;
+ field public static final int RT_SCOPE_LINK;
+ field public static final int RT_SCOPE_NOWHERE;
+ field public static final int RT_SCOPE_SITE;
+ field public static final int RT_SCOPE_UNIVERSE;
+ field public static final int R_OK;
+ field public static final int SEEK_CUR;
+ field public static final int SEEK_END;
+ field public static final int SEEK_SET;
+ field public static final int SHUT_RD;
+ field public static final int SHUT_RDWR;
+ field public static final int SHUT_WR;
+ field public static final int SIGABRT;
+ field public static final int SIGALRM;
+ field public static final int SIGBUS;
+ field public static final int SIGCHLD;
+ field public static final int SIGCONT;
+ field public static final int SIGFPE;
+ field public static final int SIGHUP;
+ field public static final int SIGILL;
+ field public static final int SIGINT;
+ field public static final int SIGIO;
+ field public static final int SIGKILL;
+ field public static final int SIGPIPE;
+ field public static final int SIGPROF;
+ field public static final int SIGPWR;
+ field public static final int SIGQUIT;
+ field public static final int SIGRTMAX;
+ field public static final int SIGRTMIN;
+ field public static final int SIGSEGV;
+ field public static final int SIGSTKFLT;
+ field public static final int SIGSTOP;
+ field public static final int SIGSYS;
+ field public static final int SIGTERM;
+ field public static final int SIGTRAP;
+ field public static final int SIGTSTP;
+ field public static final int SIGTTIN;
+ field public static final int SIGTTOU;
+ field public static final int SIGURG;
+ field public static final int SIGUSR1;
+ field public static final int SIGUSR2;
+ field public static final int SIGVTALRM;
+ field public static final int SIGWINCH;
+ field public static final int SIGXCPU;
+ field public static final int SIGXFSZ;
+ field public static final int SIOCGIFADDR;
+ field public static final int SIOCGIFBRDADDR;
+ field public static final int SIOCGIFDSTADDR;
+ field public static final int SIOCGIFNETMASK;
+ field public static final int SOCK_DGRAM;
+ field public static final int SOCK_RAW;
+ field public static final int SOCK_SEQPACKET;
+ field public static final int SOCK_STREAM;
+ field public static final int SOL_SOCKET;
+ field public static final int SO_BINDTODEVICE;
+ field public static final int SO_BROADCAST;
+ field public static final int SO_DEBUG;
+ field public static final int SO_DONTROUTE;
+ field public static final int SO_ERROR;
+ field public static final int SO_KEEPALIVE;
+ field public static final int SO_LINGER;
+ field public static final int SO_OOBINLINE;
+ field public static final int SO_PASSCRED;
+ field public static final int SO_PEERCRED;
+ field public static final int SO_RCVBUF;
+ field public static final int SO_RCVLOWAT;
+ field public static final int SO_RCVTIMEO;
+ field public static final int SO_REUSEADDR;
+ field public static final int SO_SNDBUF;
+ field public static final int SO_SNDLOWAT;
+ field public static final int SO_SNDTIMEO;
+ field public static final int SO_TYPE;
+ field public static final int STDERR_FILENO;
+ field public static final int STDIN_FILENO;
+ field public static final int STDOUT_FILENO;
+ field public static final int ST_MANDLOCK;
+ field public static final int ST_NOATIME;
+ field public static final int ST_NODEV;
+ field public static final int ST_NODIRATIME;
+ field public static final int ST_NOEXEC;
+ field public static final int ST_NOSUID;
+ field public static final int ST_RDONLY;
+ field public static final int ST_RELATIME;
+ field public static final int ST_SYNCHRONOUS;
+ field public static final int S_IFBLK;
+ field public static final int S_IFCHR;
+ field public static final int S_IFDIR;
+ field public static final int S_IFIFO;
+ field public static final int S_IFLNK;
+ field public static final int S_IFMT;
+ field public static final int S_IFREG;
+ field public static final int S_IFSOCK;
+ field public static final int S_IRGRP;
+ field public static final int S_IROTH;
+ field public static final int S_IRUSR;
+ field public static final int S_IRWXG;
+ field public static final int S_IRWXO;
+ field public static final int S_IRWXU;
+ field public static final int S_ISGID;
+ field public static final int S_ISUID;
+ field public static final int S_ISVTX;
+ field public static final int S_IWGRP;
+ field public static final int S_IWOTH;
+ field public static final int S_IWUSR;
+ field public static final int S_IXGRP;
+ field public static final int S_IXOTH;
+ field public static final int S_IXUSR;
+ field public static final int TCP_NODELAY;
+ field public static final int WCONTINUED;
+ field public static final int WEXITED;
+ field public static final int WNOHANG;
+ field public static final int WNOWAIT;
+ field public static final int WSTOPPED;
+ field public static final int WUNTRACED;
+ field public static final int W_OK;
+ field public static final int X_OK;
+ field public static final int _SC_2_CHAR_TERM;
+ field public static final int _SC_2_C_BIND;
+ field public static final int _SC_2_C_DEV;
+ field public static final int _SC_2_C_VERSION;
+ field public static final int _SC_2_FORT_DEV;
+ field public static final int _SC_2_FORT_RUN;
+ field public static final int _SC_2_LOCALEDEF;
+ field public static final int _SC_2_SW_DEV;
+ field public static final int _SC_2_UPE;
+ field public static final int _SC_2_VERSION;
+ field public static final int _SC_AIO_LISTIO_MAX;
+ field public static final int _SC_AIO_MAX;
+ field public static final int _SC_AIO_PRIO_DELTA_MAX;
+ field public static final int _SC_ARG_MAX;
+ field public static final int _SC_ASYNCHRONOUS_IO;
+ field public static final int _SC_ATEXIT_MAX;
+ field public static final int _SC_AVPHYS_PAGES;
+ field public static final int _SC_BC_BASE_MAX;
+ field public static final int _SC_BC_DIM_MAX;
+ field public static final int _SC_BC_SCALE_MAX;
+ field public static final int _SC_BC_STRING_MAX;
+ field public static final int _SC_CHILD_MAX;
+ field public static final int _SC_CLK_TCK;
+ field public static final int _SC_COLL_WEIGHTS_MAX;
+ field public static final int _SC_DELAYTIMER_MAX;
+ field public static final int _SC_EXPR_NEST_MAX;
+ field public static final int _SC_FSYNC;
+ field public static final int _SC_GETGR_R_SIZE_MAX;
+ field public static final int _SC_GETPW_R_SIZE_MAX;
+ field public static final int _SC_IOV_MAX;
+ field public static final int _SC_JOB_CONTROL;
+ field public static final int _SC_LINE_MAX;
+ field public static final int _SC_LOGIN_NAME_MAX;
+ field public static final int _SC_MAPPED_FILES;
+ field public static final int _SC_MEMLOCK;
+ field public static final int _SC_MEMLOCK_RANGE;
+ field public static final int _SC_MEMORY_PROTECTION;
+ field public static final int _SC_MESSAGE_PASSING;
+ field public static final int _SC_MQ_OPEN_MAX;
+ field public static final int _SC_MQ_PRIO_MAX;
+ field public static final int _SC_NGROUPS_MAX;
+ field public static final int _SC_NPROCESSORS_CONF;
+ field public static final int _SC_NPROCESSORS_ONLN;
+ field public static final int _SC_OPEN_MAX;
+ field public static final int _SC_PAGESIZE;
+ field public static final int _SC_PAGE_SIZE;
+ field public static final int _SC_PASS_MAX;
+ field public static final int _SC_PHYS_PAGES;
+ field public static final int _SC_PRIORITIZED_IO;
+ field public static final int _SC_PRIORITY_SCHEDULING;
+ field public static final int _SC_REALTIME_SIGNALS;
+ field public static final int _SC_RE_DUP_MAX;
+ field public static final int _SC_RTSIG_MAX;
+ field public static final int _SC_SAVED_IDS;
+ field public static final int _SC_SEMAPHORES;
+ field public static final int _SC_SEM_NSEMS_MAX;
+ field public static final int _SC_SEM_VALUE_MAX;
+ field public static final int _SC_SHARED_MEMORY_OBJECTS;
+ field public static final int _SC_SIGQUEUE_MAX;
+ field public static final int _SC_STREAM_MAX;
+ field public static final int _SC_SYNCHRONIZED_IO;
+ field public static final int _SC_THREADS;
+ field public static final int _SC_THREAD_ATTR_STACKADDR;
+ field public static final int _SC_THREAD_ATTR_STACKSIZE;
+ field public static final int _SC_THREAD_DESTRUCTOR_ITERATIONS;
+ field public static final int _SC_THREAD_KEYS_MAX;
+ field public static final int _SC_THREAD_PRIORITY_SCHEDULING;
+ field public static final int _SC_THREAD_PRIO_INHERIT;
+ field public static final int _SC_THREAD_PRIO_PROTECT;
+ field public static final int _SC_THREAD_SAFE_FUNCTIONS;
+ field public static final int _SC_THREAD_STACK_MIN;
+ field public static final int _SC_THREAD_THREADS_MAX;
+ field public static final int _SC_TIMERS;
+ field public static final int _SC_TIMER_MAX;
+ field public static final int _SC_TTY_NAME_MAX;
+ field public static final int _SC_TZNAME_MAX;
+ field public static final int _SC_VERSION;
+ field public static final int _SC_XBS5_ILP32_OFF32;
+ field public static final int _SC_XBS5_ILP32_OFFBIG;
+ field public static final int _SC_XBS5_LP64_OFF64;
+ field public static final int _SC_XBS5_LPBIG_OFFBIG;
+ field public static final int _SC_XOPEN_CRYPT;
+ field public static final int _SC_XOPEN_ENH_I18N;
+ field public static final int _SC_XOPEN_LEGACY;
+ field public static final int _SC_XOPEN_REALTIME;
+ field public static final int _SC_XOPEN_REALTIME_THREADS;
+ field public static final int _SC_XOPEN_SHM;
+ field public static final int _SC_XOPEN_UNIX;
+ field public static final int _SC_XOPEN_VERSION;
+ field public static final int _SC_XOPEN_XCU_VERSION;
+ }
+
+ public final class StructPollfd {
+ ctor public StructPollfd();
+ field public short events;
+ field public java.io.FileDescriptor fd;
+ field public short revents;
+ field public java.lang.Object userData;
+ }
+
+ public final class StructStat {
+ ctor public StructStat(long, long, int, long, int, int, long, long, long, long, long, long, long);
+ field public final long st_atime;
+ field public final long st_blksize;
+ field public final long st_blocks;
+ field public final long st_ctime;
+ field public final long st_dev;
+ field public final int st_gid;
+ field public final long st_ino;
+ field public final int st_mode;
+ field public final long st_mtime;
+ field public final long st_nlink;
+ field public final long st_rdev;
+ field public final long st_size;
+ field public final int st_uid;
+ }
+
+ public final class StructStatVfs {
+ ctor public StructStatVfs(long, long, long, long, long, long, long, long, long, long, long);
+ field public final long f_bavail;
+ field public final long f_bfree;
+ field public final long f_blocks;
+ field public final long f_bsize;
+ field public final long f_favail;
+ field public final long f_ffree;
+ field public final long f_files;
+ field public final long f_flag;
+ field public final long f_frsize;
+ field public final long f_fsid;
+ field public final long f_namemax;
+ }
+
+ public final class StructUtsname {
+ ctor public StructUtsname(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ field public final java.lang.String machine;
+ field public final java.lang.String nodename;
+ field public final java.lang.String release;
+ field public final java.lang.String sysname;
+ field public final java.lang.String version;
+ }
+
+}
+
+package android.telecom {
+
+ public final class Call {
+ method public void answer(int);
+ method public void conference(android.telecom.Call);
+ method public void disconnect();
+ method public java.util.List<java.lang.String> getCannedTextResponses();
+ method public java.util.List<android.telecom.Call> getChildren();
+ method public java.util.List<android.telecom.Call> getConferenceableCalls();
+ method public android.telecom.Call.Details getDetails();
+ method public android.telecom.Call getParent();
+ method public java.lang.String getRemainingPostDialSequence();
+ method public int getState();
+ method public android.telecom.InCallService.VideoCall getVideoCall();
+ method public void hold();
+ method public void mergeConference();
+ method public void phoneAccountSelected(android.telecom.PhoneAccountHandle, boolean);
+ method public void playDtmfTone(char);
+ method public void postDialContinue(boolean);
+ method public void registerCallback(android.telecom.Call.Callback);
+ method public void registerCallback(android.telecom.Call.Callback, android.os.Handler);
+ method public void reject(boolean, java.lang.String);
+ method public void splitFromConference();
+ method public void stopDtmfTone();
+ method public void swapConference();
+ method public void unhold();
+ method public void unregisterCallback(android.telecom.Call.Callback);
+ field public static final java.lang.String AVAILABLE_PHONE_ACCOUNTS = "selectPhoneAccountAccounts";
+ field public static final int STATE_ACTIVE = 4; // 0x4
+ field public static final int STATE_CONNECTING = 9; // 0x9
+ field public static final int STATE_DIALING = 1; // 0x1
+ field public static final int STATE_DISCONNECTED = 7; // 0x7
+ field public static final int STATE_DISCONNECTING = 10; // 0xa
+ field public static final int STATE_HOLDING = 3; // 0x3
+ field public static final int STATE_NEW = 0; // 0x0
+ field public static final int STATE_RINGING = 2; // 0x2
+ field public static final int STATE_SELECT_PHONE_ACCOUNT = 8; // 0x8
+ }
+
+ public static abstract class Call.Callback {
+ ctor public Call.Callback();
+ method public void onCallDestroyed(android.telecom.Call);
+ method public void onCannedTextResponsesLoaded(android.telecom.Call, java.util.List<java.lang.String>);
+ method public void onChildrenChanged(android.telecom.Call, java.util.List<android.telecom.Call>);
+ method public void onConferenceableCallsChanged(android.telecom.Call, java.util.List<android.telecom.Call>);
+ method public void onDetailsChanged(android.telecom.Call, android.telecom.Call.Details);
+ method public void onParentChanged(android.telecom.Call, android.telecom.Call);
+ method public void onPostDialWait(android.telecom.Call, java.lang.String);
+ method public void onStateChanged(android.telecom.Call, int);
+ method public void onVideoCallChanged(android.telecom.Call, android.telecom.InCallService.VideoCall);
+ }
+
+ public static class Call.Details {
+ method public static boolean can(int, int);
+ method public boolean can(int);
+ method public static java.lang.String capabilitiesToString(int);
+ method public android.telecom.PhoneAccountHandle getAccountHandle();
+ method public int getCallCapabilities();
+ method public int getCallProperties();
+ method public java.lang.String getCallerDisplayName();
+ method public int getCallerDisplayNamePresentation();
+ method public final long getConnectTimeMillis();
+ method public android.telecom.DisconnectCause getDisconnectCause();
+ method public android.os.Bundle getExtras();
+ method public android.telecom.GatewayInfo getGatewayInfo();
+ method public android.net.Uri getHandle();
+ method public int getHandlePresentation();
+ method public android.os.Bundle getIntentExtras();
+ method public android.telecom.StatusHints getStatusHints();
+ method public int getVideoState();
+ method public static boolean hasProperty(int, int);
+ method public boolean hasProperty(int);
+ method public static java.lang.String propertiesToString(int);
+ field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
+ field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
+ field public static final int CAPABILITY_HOLD = 1; // 0x1
+ field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
+ field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
+ field public static final int CAPABILITY_MUTE = 64; // 0x40
+ field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
+ field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
+ field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
+ field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
+ field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
+ field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
+ field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
+ field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
+ field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
+ field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
+ field public static final int PROPERTY_CONFERENCE = 1; // 0x1
+ field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
+ field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
+ field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
+ field public static final int PROPERTY_WIFI = 8; // 0x8
+ }
+
+ public final class CallAudioState implements android.os.Parcelable {
+ ctor public CallAudioState(boolean, int, int);
+ method public static java.lang.String audioRouteToString(int);
+ method public int describeContents();
+ method public int getRoute();
+ method public int getSupportedRouteMask();
+ method public boolean isMuted();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.CallAudioState> CREATOR;
+ field public static final int ROUTE_BLUETOOTH = 2; // 0x2
+ field public static final int ROUTE_EARPIECE = 1; // 0x1
+ field public static final int ROUTE_SPEAKER = 8; // 0x8
+ field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4
+ field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
+ }
+
+ public abstract class Conference extends android.telecom.Conferenceable {
+ ctor public Conference(android.telecom.PhoneAccountHandle);
+ method public final boolean addConnection(android.telecom.Connection);
+ method public final void destroy();
+ method public final android.telecom.CallAudioState getCallAudioState();
+ method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
+ method public final int getConnectionCapabilities();
+ method public final long getConnectionTime();
+ method public final java.util.List<android.telecom.Connection> getConnections();
+ method public final android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
+ method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
+ method public final int getState();
+ method public final android.telecom.StatusHints getStatusHints();
+ method public android.telecom.Connection.VideoProvider getVideoProvider();
+ method public int getVideoState();
+ method public void onCallAudioStateChanged(android.telecom.CallAudioState);
+ method public void onConnectionAdded(android.telecom.Connection);
+ method public void onDisconnect();
+ method public void onHold();
+ method public void onMerge(android.telecom.Connection);
+ method public void onMerge();
+ method public void onPlayDtmfTone(char);
+ method public void onSeparate(android.telecom.Connection);
+ method public void onStopDtmfTone();
+ method public void onSwap();
+ method public void onUnhold();
+ method public final void removeConnection(android.telecom.Connection);
+ method public final void setActive();
+ method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
+ method public final void setConnectionCapabilities(int);
+ method public final void setConnectionTime(long);
+ method public final void setDialing();
+ method public final void setDisconnected(android.telecom.DisconnectCause);
+ method public final void setExtras(android.os.Bundle);
+ method public final void setOnHold();
+ method public final void setStatusHints(android.telecom.StatusHints);
+ method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
+ method public final void setVideoState(android.telecom.Connection, int);
+ field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
+ }
+
+ public abstract class Conferenceable {
+ }
+
+ public abstract class Connection extends android.telecom.Conferenceable {
+ ctor public Connection();
+ method public static java.lang.String capabilitiesToString(int);
+ method public static android.telecom.Connection createCanceledConnection();
+ method public static android.telecom.Connection createFailedConnection(android.telecom.DisconnectCause);
+ method public final void destroy();
+ method public final android.net.Uri getAddress();
+ method public final int getAddressPresentation();
+ method public final boolean getAudioModeIsVoip();
+ method public final android.telecom.CallAudioState getCallAudioState();
+ method public final java.lang.String getCallerDisplayName();
+ method public final int getCallerDisplayNamePresentation();
+ method public final android.telecom.Conference getConference();
+ method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
+ method public final int getConnectionCapabilities();
+ method public final android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
+ method public final int getState();
+ method public final android.telecom.StatusHints getStatusHints();
+ method public final android.telecom.Connection.VideoProvider getVideoProvider();
+ method public final boolean isRingbackRequested();
+ method public void onAbort();
+ method public void onAnswer(int);
+ method public void onAnswer();
+ method public void onCallAudioStateChanged(android.telecom.CallAudioState);
+ method public void onDisconnect();
+ method public void onHold();
+ method public void onPlayDtmfTone(char);
+ method public void onPostDialContinue(boolean);
+ method public void onReject();
+ method public void onSeparate();
+ method public void onStateChanged(int);
+ method public void onStopDtmfTone();
+ method public void onUnhold();
+ method public final void setActive();
+ method public final void setAddress(android.net.Uri, int);
+ method public final void setAudioModeIsVoip(boolean);
+ method public final void setCallerDisplayName(java.lang.String, int);
+ method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
+ method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);
+ method public final void setConnectionCapabilities(int);
+ method public final void setDialing();
+ method public final void setDisconnected(android.telecom.DisconnectCause);
+ method public final void setExtras(android.os.Bundle);
+ method public final void setInitialized();
+ method public final void setInitializing();
+ method public final void setNextPostDialChar(char);
+ method public final void setOnHold();
+ method public final void setPostDialWait(java.lang.String);
+ method public final void setRingbackRequested(boolean);
+ method public final void setRinging();
+ method public final void setStatusHints(android.telecom.StatusHints);
+ method public final void setVideoProvider(android.telecom.Connection.VideoProvider);
+ method public final void setVideoState(int);
+ method public static java.lang.String stateToString(int);
+ field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
+ field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000
+ field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
+ field public static final int CAPABILITY_HOLD = 1; // 0x1
+ field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
+ field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
+ field public static final int CAPABILITY_MUTE = 64; // 0x40
+ field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
+ field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
+ field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
+ field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_RX = 256; // 0x100
+ field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_TX = 512; // 0x200
+ field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = 3072; // 0xc00
+ field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_RX = 1024; // 0x400
+ field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
+ field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
+ field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
+ field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
+ field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";
+ field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
+ field public static final int STATE_ACTIVE = 4; // 0x4
+ field public static final int STATE_DIALING = 3; // 0x3
+ field public static final int STATE_DISCONNECTED = 6; // 0x6
+ field public static final int STATE_HOLDING = 5; // 0x5
+ field public static final int STATE_INITIALIZING = 0; // 0x0
+ field public static final int STATE_NEW = 1; // 0x1
+ field public static final int STATE_RINGING = 2; // 0x2
+ }
+
+ public static abstract class Connection.VideoProvider {
+ ctor public Connection.VideoProvider();
+ method public void changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities);
+ method public void changePeerDimensions(int, int);
+ method public void changeVideoQuality(int);
+ method public void handleCallSessionEvent(int);
+ method public abstract void onRequestCameraCapabilities();
+ method public abstract void onRequestConnectionDataUsage();
+ method public abstract void onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public abstract void onSendSessionModifyResponse(android.telecom.VideoProfile);
+ method public abstract void onSetCamera(java.lang.String);
+ method public abstract void onSetDeviceOrientation(int);
+ method public abstract void onSetDisplaySurface(android.view.Surface);
+ method public abstract void onSetPauseImage(android.net.Uri);
+ method public abstract void onSetPreviewSurface(android.view.Surface);
+ method public abstract void onSetZoom(float);
+ method public void receiveSessionModifyRequest(android.telecom.VideoProfile);
+ method public void receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public void setCallDataUsage(long);
+ field public static final int SESSION_EVENT_CAMERA_FAILURE = 5; // 0x5
+ field public static final int SESSION_EVENT_CAMERA_READY = 6; // 0x6
+ field public static final int SESSION_EVENT_RX_PAUSE = 1; // 0x1
+ field public static final int SESSION_EVENT_RX_RESUME = 2; // 0x2
+ field public static final int SESSION_EVENT_TX_START = 3; // 0x3
+ field public static final int SESSION_EVENT_TX_STOP = 4; // 0x4
+ field public static final int SESSION_MODIFY_REQUEST_FAIL = 2; // 0x2
+ field public static final int SESSION_MODIFY_REQUEST_INVALID = 3; // 0x3
+ field public static final int SESSION_MODIFY_REQUEST_REJECTED_BY_REMOTE = 5; // 0x5
+ field public static final int SESSION_MODIFY_REQUEST_SUCCESS = 1; // 0x1
+ field public static final int SESSION_MODIFY_REQUEST_TIMED_OUT = 4; // 0x4
+ }
+
+ public final class ConnectionRequest implements android.os.Parcelable {
+ ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);
+ ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle, int);
+ method public int describeContents();
+ method public android.telecom.PhoneAccountHandle getAccountHandle();
+ method public android.net.Uri getAddress();
+ method public android.os.Bundle getExtras();
+ method public int getVideoState();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.ConnectionRequest> CREATOR;
+ }
+
+ public abstract class ConnectionService extends android.app.Service {
+ ctor public ConnectionService();
+ method public final void addConference(android.telecom.Conference);
+ method public final void addExistingConnection(android.telecom.PhoneAccountHandle, android.telecom.Connection);
+ method public final void conferenceRemoteConnections(android.telecom.RemoteConnection, android.telecom.RemoteConnection);
+ method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
+ method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
+ method public final java.util.Collection<android.telecom.Connection> getAllConnections();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public void onConference(android.telecom.Connection, android.telecom.Connection);
+ method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
+ method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
+ method public void onRemoteConferenceAdded(android.telecom.RemoteConference);
+ method public void onRemoteExistingConnectionAdded(android.telecom.RemoteConnection);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService";
+ }
+
+ public final class DisconnectCause implements android.os.Parcelable {
+ ctor public DisconnectCause(int);
+ ctor public DisconnectCause(int, java.lang.String);
+ ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String);
+ ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String, int);
+ method public int describeContents();
+ method public int getCode();
+ method public java.lang.CharSequence getDescription();
+ method public java.lang.CharSequence getLabel();
+ method public java.lang.String getReason();
+ method public int getTone();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int BUSY = 7; // 0x7
+ field public static final int CANCELED = 4; // 0x4
+ field public static final int CONNECTION_MANAGER_NOT_SUPPORTED = 10; // 0xa
+ field public static final android.os.Parcelable.Creator<android.telecom.DisconnectCause> CREATOR;
+ field public static final int ERROR = 1; // 0x1
+ field public static final int LOCAL = 2; // 0x2
+ field public static final int MISSED = 5; // 0x5
+ field public static final int OTHER = 9; // 0x9
+ field public static final int REJECTED = 6; // 0x6
+ field public static final int REMOTE = 3; // 0x3
+ field public static final int RESTRICTED = 8; // 0x8
+ field public static final int UNKNOWN = 0; // 0x0
+ }
+
+ public class GatewayInfo implements android.os.Parcelable {
+ ctor public GatewayInfo(java.lang.String, android.net.Uri, android.net.Uri);
+ method public int describeContents();
+ method public android.net.Uri getGatewayAddress();
+ method public java.lang.String getGatewayProviderPackageName();
+ method public android.net.Uri getOriginalAddress();
+ method public boolean isEmpty();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.GatewayInfo> CREATOR;
+ }
+
+ public abstract class InCallService extends android.app.Service {
+ ctor public InCallService();
+ method public final boolean canAddCall();
+ method public final android.telecom.CallAudioState getCallAudioState();
+ method public final java.util.List<android.telecom.Call> getCalls();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public void onBringToForeground(boolean);
+ method public void onCallAdded(android.telecom.Call);
+ method public void onCallAudioStateChanged(android.telecom.CallAudioState);
+ method public void onCallRemoved(android.telecom.Call);
+ method public void onCanAddCallChanged(boolean);
+ method public final void setAudioRoute(int);
+ method public final void setMuted(boolean);
+ field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.InCallService";
+ }
+
+ public static abstract class InCallService.VideoCall {
+ ctor public InCallService.VideoCall();
+ method public abstract void registerCallback(android.telecom.InCallService.VideoCall.Callback);
+ method public abstract void registerCallback(android.telecom.InCallService.VideoCall.Callback, android.os.Handler);
+ method public abstract void requestCallDataUsage();
+ method public abstract void requestCameraCapabilities();
+ method public abstract void sendSessionModifyRequest(android.telecom.VideoProfile);
+ method public abstract void sendSessionModifyResponse(android.telecom.VideoProfile);
+ method public abstract void setCamera(java.lang.String);
+ method public abstract void setDeviceOrientation(int);
+ method public abstract void setDisplaySurface(android.view.Surface);
+ method public abstract void setPauseImage(android.net.Uri);
+ method public abstract void setPreviewSurface(android.view.Surface);
+ method public abstract void setZoom(float);
+ method public abstract void unregisterCallback(android.telecom.InCallService.VideoCall.Callback);
+ }
+
+ public static abstract class InCallService.VideoCall.Callback {
+ ctor public InCallService.VideoCall.Callback();
+ method public abstract void onCallDataUsageChanged(long);
+ method public abstract void onCallSessionEvent(int);
+ method public abstract void onCameraCapabilitiesChanged(android.telecom.VideoProfile.CameraCapabilities);
+ method public abstract void onPeerDimensionsChanged(int, int);
+ method public abstract void onSessionModifyRequestReceived(android.telecom.VideoProfile);
+ method public abstract void onSessionModifyResponseReceived(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public abstract void onVideoQualityChanged(int);
+ }
+
+ public final class PhoneAccount implements android.os.Parcelable {
+ method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
+ method public int describeContents();
+ method public android.telecom.PhoneAccountHandle getAccountHandle();
+ method public android.net.Uri getAddress();
+ method public int getCapabilities();
+ method public android.os.Bundle getExtras();
+ method public int getHighlightColor();
+ method public android.graphics.drawable.Icon getIcon();
+ method public java.lang.CharSequence getLabel();
+ method public java.lang.CharSequence getShortDescription();
+ method public android.net.Uri getSubscriptionAddress();
+ method public java.util.List<java.lang.String> getSupportedUriSchemes();
+ method public boolean hasCapabilities(int);
+ method public boolean isEnabled();
+ method public boolean supportsUriScheme(java.lang.String);
+ method public android.telecom.PhoneAccount.Builder toBuilder();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2
+ field public static final int CAPABILITY_CALL_SUBJECT = 64; // 0x40
+ field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1
+ field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
+ field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
+ field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
+ field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
+ field public static final java.lang.String EXTRA_CALL_SUBJECT_CHARACTER_ENCODING = "android.telecom.extra.CALL_SUBJECT_CHARACTER_ENCODING";
+ field public static final java.lang.String EXTRA_CALL_SUBJECT_MAX_LENGTH = "android.telecom.extra.CALL_SUBJECT_MAX_LENGTH";
+ field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0
+ field public static final int NO_RESOURCE_ID = -1; // 0xffffffff
+ field public static final java.lang.String SCHEME_SIP = "sip";
+ field public static final java.lang.String SCHEME_TEL = "tel";
+ field public static final java.lang.String SCHEME_VOICEMAIL = "voicemail";
+ }
+
+ public static class PhoneAccount.Builder {
+ ctor public PhoneAccount.Builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
+ ctor public PhoneAccount.Builder(android.telecom.PhoneAccount);
+ method public android.telecom.PhoneAccount.Builder addSupportedUriScheme(java.lang.String);
+ method public android.telecom.PhoneAccount build();
+ method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);
+ method public android.telecom.PhoneAccount.Builder setCapabilities(int);
+ method public android.telecom.PhoneAccount.Builder setExtras(android.os.Bundle);
+ method public android.telecom.PhoneAccount.Builder setHighlightColor(int);
+ method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.drawable.Icon);
+ method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence);
+ method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri);
+ method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);
+ }
+
+ public final class PhoneAccountHandle implements android.os.Parcelable {
+ ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
+ ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String, android.os.UserHandle);
+ method public int describeContents();
+ method public android.content.ComponentName getComponentName();
+ method public java.lang.String getId();
+ method public android.os.UserHandle getUserHandle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccountHandle> CREATOR;
+ }
+
+ public final class RemoteConference {
+ method public void disconnect();
+ method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
+ method public final int getConnectionCapabilities();
+ method public final java.util.List<android.telecom.RemoteConnection> getConnections();
+ method public android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
+ method public final int getState();
+ method public void hold();
+ method public void merge();
+ method public void playDtmfTone(char);
+ method public final void registerCallback(android.telecom.RemoteConference.Callback);
+ method public final void registerCallback(android.telecom.RemoteConference.Callback, android.os.Handler);
+ method public void separate(android.telecom.RemoteConnection);
+ method public void setCallAudioState(android.telecom.CallAudioState);
+ method public void stopDtmfTone();
+ method public void swap();
+ method public void unhold();
+ method public final void unregisterCallback(android.telecom.RemoteConference.Callback);
+ }
+
+ public static abstract class RemoteConference.Callback {
+ ctor public RemoteConference.Callback();
+ method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);
+ method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection);
+ method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConference, int);
+ method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);
+ method public void onDestroyed(android.telecom.RemoteConference);
+ method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);
+ method public void onExtrasChanged(android.telecom.RemoteConference, android.os.Bundle);
+ method public void onStateChanged(android.telecom.RemoteConference, int, int);
+ }
+
+ public final class RemoteConnection {
+ method public void abort();
+ method public void answer();
+ method public void disconnect();
+ method public android.net.Uri getAddress();
+ method public int getAddressPresentation();
+ method public java.lang.CharSequence getCallerDisplayName();
+ method public int getCallerDisplayNamePresentation();
+ method public android.telecom.RemoteConference getConference();
+ method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
+ method public int getConnectionCapabilities();
+ method public android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
+ method public int getState();
+ method public android.telecom.StatusHints getStatusHints();
+ method public final android.telecom.RemoteConnection.VideoProvider getVideoProvider();
+ method public int getVideoState();
+ method public void hold();
+ method public boolean isRingbackRequested();
+ method public boolean isVoipAudioMode();
+ method public void playDtmfTone(char);
+ method public void postDialContinue(boolean);
+ method public void registerCallback(android.telecom.RemoteConnection.Callback);
+ method public void registerCallback(android.telecom.RemoteConnection.Callback, android.os.Handler);
+ method public void reject();
+ method public void setCallAudioState(android.telecom.CallAudioState);
+ method public void stopDtmfTone();
+ method public void unhold();
+ method public void unregisterCallback(android.telecom.RemoteConnection.Callback);
+ }
+
+ public static abstract class RemoteConnection.Callback {
+ ctor public RemoteConnection.Callback();
+ method public void onAddressChanged(android.telecom.RemoteConnection, android.net.Uri, int);
+ method public void onCallerDisplayNameChanged(android.telecom.RemoteConnection, java.lang.String, int);
+ method public void onConferenceChanged(android.telecom.RemoteConnection, android.telecom.RemoteConference);
+ method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);
+ method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConnection, int);
+ method public void onDestroyed(android.telecom.RemoteConnection);
+ method public void onDisconnected(android.telecom.RemoteConnection, android.telecom.DisconnectCause);
+ method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);
+ method public void onPostDialChar(android.telecom.RemoteConnection, char);
+ method public void onPostDialWait(android.telecom.RemoteConnection, java.lang.String);
+ method public void onRingbackRequested(android.telecom.RemoteConnection, boolean);
+ method public void onStateChanged(android.telecom.RemoteConnection, int);
+ method public void onStatusHintsChanged(android.telecom.RemoteConnection, android.telecom.StatusHints);
+ method public void onVideoProviderChanged(android.telecom.RemoteConnection, android.telecom.RemoteConnection.VideoProvider);
+ method public void onVideoStateChanged(android.telecom.RemoteConnection, int);
+ method public void onVoipAudioChanged(android.telecom.RemoteConnection, boolean);
+ }
+
+ public static class RemoteConnection.VideoProvider {
+ method public void registerCallback(android.telecom.RemoteConnection.VideoProvider.Callback);
+ method public void requestCallDataUsage();
+ method public void requestCameraCapabilities();
+ method public void sendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public void sendSessionModifyResponse(android.telecom.VideoProfile);
+ method public void setCamera(java.lang.String);
+ method public void setDeviceOrientation(int);
+ method public void setDisplaySurface(android.view.Surface);
+ method public void setPauseImage(android.net.Uri);
+ method public void setPreviewSurface(android.view.Surface);
+ method public void setZoom(float);
+ method public void unregisterCallback(android.telecom.RemoteConnection.VideoProvider.Callback);
+ }
+
+ public static abstract class RemoteConnection.VideoProvider.Callback {
+ ctor public RemoteConnection.VideoProvider.Callback();
+ method public void onCallDataUsageChanged(android.telecom.RemoteConnection.VideoProvider, long);
+ method public void onCallSessionEvent(android.telecom.RemoteConnection.VideoProvider, int);
+ method public void onCameraCapabilitiesChanged(android.telecom.RemoteConnection.VideoProvider, android.telecom.VideoProfile.CameraCapabilities);
+ method public void onPeerDimensionsChanged(android.telecom.RemoteConnection.VideoProvider, int, int);
+ method public void onSessionModifyRequestReceived(android.telecom.RemoteConnection.VideoProvider, android.telecom.VideoProfile);
+ method public void onSessionModifyResponseReceived(android.telecom.RemoteConnection.VideoProvider, int, android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public void onVideoQualityChanged(android.telecom.RemoteConnection.VideoProvider, int);
+ }
+
+ public final class StatusHints implements android.os.Parcelable {
+ ctor public StatusHints(java.lang.CharSequence, android.graphics.drawable.Icon, android.os.Bundle);
+ method public int describeContents();
+ method public android.os.Bundle getExtras();
+ method public android.graphics.drawable.Icon getIcon();
+ method public java.lang.CharSequence getLabel();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.StatusHints> CREATOR;
+ }
+
+ public class TelecomManager {
+ method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
+ method public void cancelMissedCallsNotification();
+ method public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle);
+ method public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts();
+ method public java.lang.String getDefaultDialerPackage();
+ method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String);
+ method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle);
+ method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
+ method public android.telecom.PhoneAccountHandle getSimCallManager();
+ method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);
+ method public boolean handleMmi(java.lang.String);
+ method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
+ method public boolean isInCall();
+ method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
+ method public void placeCall(android.net.Uri, android.os.Bundle);
+ method public void registerPhoneAccount(android.telecom.PhoneAccount);
+ method public void showInCallScreen(boolean);
+ method public void silenceRinger();
+ method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
+ field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
+ field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
+ field public static final java.lang.String ACTION_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT";
+ field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED";
+ field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
+ field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
+ field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
+ field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";
+ field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
+ field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
+ field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
+ field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
+ field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
+ field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
+ field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
+ field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
+ field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
+ field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
+ field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
+ field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
+ field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
+ field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
+ field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
+ field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";
+ field public static final int PRESENTATION_ALLOWED = 1; // 0x1
+ field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
+ field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
+ field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
+ }
+
+ public class VideoProfile implements android.os.Parcelable {
+ ctor public VideoProfile(int);
+ ctor public VideoProfile(int, int);
+ method public int describeContents();
+ method public int getQuality();
+ method public int getVideoState();
+ method public static boolean isAudioOnly(int);
+ method public static boolean isBidirectional(int);
+ method public static boolean isPaused(int);
+ method public static boolean isReceptionEnabled(int);
+ method public static boolean isTransmissionEnabled(int);
+ method public static boolean isVideo(int);
+ method public static java.lang.String videoStateToString(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile> CREATOR;
+ field public static final int QUALITY_DEFAULT = 4; // 0x4
+ field public static final int QUALITY_HIGH = 1; // 0x1
+ field public static final int QUALITY_LOW = 3; // 0x3
+ field public static final int QUALITY_MEDIUM = 2; // 0x2
+ field public static final int STATE_AUDIO_ONLY = 0; // 0x0
+ field public static final int STATE_BIDIRECTIONAL = 3; // 0x3
+ field public static final int STATE_PAUSED = 4; // 0x4
+ field public static final int STATE_RX_ENABLED = 2; // 0x2
+ field public static final int STATE_TX_ENABLED = 1; // 0x1
+ }
+
+ public static final class VideoProfile.CameraCapabilities implements android.os.Parcelable {
+ ctor public VideoProfile.CameraCapabilities(int, int);
+ method public int describeContents();
+ method public int getHeight();
+ method public int getWidth();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile.CameraCapabilities> CREATOR;
+ }
+
+}
+
+package android.telephony {
+
+ public class CarrierConfigManager {
+ method public android.os.PersistableBundle getConfig();
+ method public android.os.PersistableBundle getConfigForSubId(int);
+ method public void notifyConfigChangedForSubId(int);
+ field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
+ field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
+ field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
+ field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
+ field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
+ field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
+ field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";
+ field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
+ field public static final java.lang.String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";
+ field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
+ field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
+ field public static final java.lang.String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";
+ field public static final java.lang.String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
+ field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
+ field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
+ field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
+ field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";
+ field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";
+ field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";
+ field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";
+ field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";
+ field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";
+ field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";
+ field public static final java.lang.String KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY = "gsm_nonroaming_networks_string_array";
+ field public static final java.lang.String KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY = "gsm_roaming_networks_string_array";
+ field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool";
+ field public static final java.lang.String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";
+ field public static final java.lang.String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";
+ field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool";
+ field public static final java.lang.String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";
+ field public static final java.lang.String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars";
+ field public static final java.lang.String KEY_MMS_ALIAS_MIN_CHARS_INT = "aliasMinChars";
+ field public static final java.lang.String KEY_MMS_ALLOW_ATTACH_AUDIO_BOOL = "allowAttachAudio";
+ field public static final java.lang.String KEY_MMS_APPEND_TRANSACTION_ID_BOOL = "enabledTransID";
+ field public static final java.lang.String KEY_MMS_EMAIL_GATEWAY_NUMBER_STRING = "emailGatewayNumber";
+ field public static final java.lang.String KEY_MMS_GROUP_MMS_ENABLED_BOOL = "enableGroupMms";
+ field public static final java.lang.String KEY_MMS_HTTP_PARAMS_STRING = "httpParams";
+ field public static final java.lang.String KEY_MMS_HTTP_SOCKET_TIMEOUT_INT = "httpSocketTimeout";
+ field public static final java.lang.String KEY_MMS_MAX_IMAGE_HEIGHT_INT = "maxImageHeight";
+ field public static final java.lang.String KEY_MMS_MAX_IMAGE_WIDTH_INT = "maxImageWidth";
+ field public static final java.lang.String KEY_MMS_MAX_MESSAGE_SIZE_INT = "maxMessageSize";
+ field public static final java.lang.String KEY_MMS_MESSAGE_TEXT_MAX_SIZE_INT = "maxMessageTextSize";
+ field public static final java.lang.String KEY_MMS_MMS_DELIVERY_REPORT_ENABLED_BOOL = "enableMMSDeliveryReports";
+ field public static final java.lang.String KEY_MMS_MMS_ENABLED_BOOL = "enabledMMS";
+ field public static final java.lang.String KEY_MMS_MMS_READ_REPORT_ENABLED_BOOL = "enableMMSReadReports";
+ field public static final java.lang.String KEY_MMS_MULTIPART_SMS_ENABLED_BOOL = "enableMultipartSMS";
+ field public static final java.lang.String KEY_MMS_NAI_SUFFIX_STRING = "naiSuffix";
+ field public static final java.lang.String KEY_MMS_NOTIFY_WAP_MMSC_ENABLED_BOOL = "enabledNotifyWapMMSC";
+ field public static final java.lang.String KEY_MMS_RECIPIENT_LIMIT_INT = "recipientLimit";
+ field public static final java.lang.String KEY_MMS_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES_BOOL = "sendMultipartSmsAsSeparateMessages";
+ field public static final java.lang.String KEY_MMS_SHOW_CELL_BROADCAST_APP_LINKS_BOOL = "config_cellBroadcastAppLinks";
+ field public static final java.lang.String KEY_MMS_SMS_DELIVERY_REPORT_ENABLED_BOOL = "enableSMSDeliveryReports";
+ field public static final java.lang.String KEY_MMS_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD_INT = "smsToMmsTextLengthThreshold";
+ field public static final java.lang.String KEY_MMS_SMS_TO_MMS_TEXT_THRESHOLD_INT = "smsToMmsTextThreshold";
+ field public static final java.lang.String KEY_MMS_SUBJECT_MAX_LENGTH_INT = "maxSubjectLength";
+ field public static final java.lang.String KEY_MMS_SUPPORT_HTTP_CHARSET_HEADER_BOOL = "supportHttpCharsetHeader";
+ field public static final java.lang.String KEY_MMS_SUPPORT_MMS_CONTENT_DISPOSITION_BOOL = "supportMmsContentDisposition";
+ field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";
+ field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
+ field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";
+ field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";
+ field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";
+ field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";
+ field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";
+ field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool";
+ field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
+ field public static final java.lang.String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";
+ field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";
+ field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";
+ field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";
+ field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
+ field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
+ field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";
+ field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string";
+ field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int";
+ field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string";
+ field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
+ }
+
+ public final class CellIdentityCdma implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getBasestationId();
+ method public int getLatitude();
+ method public int getLongitude();
+ method public int getNetworkId();
+ method public int getSystemId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityCdma> CREATOR;
+ }
+
+ public final class CellIdentityGsm implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getCid();
+ method public int getLac();
+ method public int getMcc();
+ method public int getMnc();
+ method public deprecated int getPsc();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityGsm> CREATOR;
+ }
+
+ public final class CellIdentityLte implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getCi();
+ method public int getMcc();
+ method public int getMnc();
+ method public int getPci();
+ method public int getTac();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityLte> CREATOR;
+ }
+
+ public final class CellIdentityWcdma implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getCid();
+ method public int getLac();
+ method public int getMcc();
+ method public int getMnc();
+ method public int getPsc();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityWcdma> CREATOR;
+ }
+
+ public abstract class CellInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public long getTimeStamp();
+ method public boolean isRegistered();
+ method public abstract void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellInfo> CREATOR;
+ }
+
+ public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {
+ method public android.telephony.CellIdentityCdma getCellIdentity();
+ method public android.telephony.CellSignalStrengthCdma getCellSignalStrength();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellInfoCdma> CREATOR;
+ }
+
+ public final class CellInfoGsm extends android.telephony.CellInfo implements android.os.Parcelable {
+ method public android.telephony.CellIdentityGsm getCellIdentity();
+ method public android.telephony.CellSignalStrengthGsm getCellSignalStrength();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellInfoGsm> CREATOR;
+ }
+
+ public final class CellInfoLte extends android.telephony.CellInfo implements android.os.Parcelable {
+ method public android.telephony.CellIdentityLte getCellIdentity();
+ method public android.telephony.CellSignalStrengthLte getCellSignalStrength();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellInfoLte> CREATOR;
+ }
+
+ public final class CellInfoWcdma extends android.telephony.CellInfo implements android.os.Parcelable {
+ method public android.telephony.CellIdentityWcdma getCellIdentity();
+ method public android.telephony.CellSignalStrengthWcdma getCellSignalStrength();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR;
+ }
+
+ public abstract class CellLocation {
+ ctor public CellLocation();
+ method public static android.telephony.CellLocation getEmpty();
+ method public static void requestLocationUpdate();
+ }
+
+ public abstract class CellSignalStrength {
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract int getAsuLevel();
+ method public abstract int getDbm();
+ method public abstract int getLevel();
+ method public abstract int hashCode();
+ field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3
+ field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4
+ field public static final int SIGNAL_STRENGTH_MODERATE = 2; // 0x2
+ field public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; // 0x0
+ field public static final int SIGNAL_STRENGTH_POOR = 1; // 0x1
+ }
+
+ public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean equals(java.lang.Object);
+ method public int getAsuLevel();
+ method public int getCdmaDbm();
+ method public int getCdmaEcio();
+ method public int getCdmaLevel();
+ method public int getDbm();
+ method public int getEvdoDbm();
+ method public int getEvdoEcio();
+ method public int getEvdoLevel();
+ method public int getEvdoSnr();
+ method public int getLevel();
+ method public int hashCode();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthCdma> CREATOR;
+ }
+
+ public final class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean equals(java.lang.Object);
+ method public int getAsuLevel();
+ method public int getDbm();
+ method public int getLevel();
+ method public int hashCode();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthGsm> CREATOR;
+ }
+
+ public final class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean equals(java.lang.Object);
+ method public int getAsuLevel();
+ method public int getDbm();
+ method public int getLevel();
+ method public int getTimingAdvance();
+ method public int hashCode();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthLte> CREATOR;
+ }
+
+ public final class CellSignalStrengthWcdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean equals(java.lang.Object);
+ method public int getAsuLevel();
+ method public int getDbm();
+ method public int getLevel();
+ method public int hashCode();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthWcdma> CREATOR;
+ }
+
+ public class IccOpenLogicalChannelResponse implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getChannel();
+ method public byte[] getSelectResponse();
+ method public int getStatus();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.IccOpenLogicalChannelResponse> CREATOR;
+ field public static final int INVALID_CHANNEL = -1; // 0xffffffff
+ field public static final int STATUS_MISSING_RESOURCE = 2; // 0x2
+ field public static final int STATUS_NO_ERROR = 1; // 0x1
+ field public static final int STATUS_NO_SUCH_ELEMENT = 3; // 0x3
+ field public static final int STATUS_UNKNOWN_ERROR = 4; // 0x4
+ }
+
+ public class NeighboringCellInfo implements android.os.Parcelable {
+ ctor public deprecated NeighboringCellInfo();
+ ctor public deprecated NeighboringCellInfo(int, int);
+ ctor public NeighboringCellInfo(int, java.lang.String, int);
+ ctor public NeighboringCellInfo(android.os.Parcel);
+ method public int describeContents();
+ method public int getCid();
+ method public int getLac();
+ method public int getNetworkType();
+ method public int getPsc();
+ method public int getRssi();
+ method public deprecated void setCid(int);
+ method public deprecated void setRssi(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.NeighboringCellInfo> CREATOR;
+ field public static final int UNKNOWN_CID = -1; // 0xffffffff
+ field public static final int UNKNOWN_RSSI = 99; // 0x63
+ }
+
+ public class PhoneNumberFormattingTextWatcher implements android.text.TextWatcher {
+ ctor public PhoneNumberFormattingTextWatcher();
+ ctor public PhoneNumberFormattingTextWatcher(java.lang.String);
+ method public synchronized void afterTextChanged(android.text.Editable);
+ method public void beforeTextChanged(java.lang.CharSequence, int, int, int);
+ method public void onTextChanged(java.lang.CharSequence, int, int, int);
+ }
+
+ public class PhoneNumberUtils {
+ ctor public PhoneNumberUtils();
+ method public static void addTtsSpan(android.text.Spannable, int, int);
+ method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int);
+ method public static java.lang.String calledPartyBCDToString(byte[], int, int);
+ method public static boolean compare(java.lang.String, java.lang.String);
+ method public static boolean compare(android.content.Context, java.lang.String, java.lang.String);
+ method public static java.lang.String convertKeypadLettersToDigits(java.lang.String);
+ method public static android.text.style.TtsSpan createTtsSpan(java.lang.String);
+ method public static java.lang.CharSequence createTtsSpannable(java.lang.CharSequence);
+ method public static java.lang.String extractNetworkPortion(java.lang.String);
+ method public static java.lang.String extractPostDialPortion(java.lang.String);
+ method public static deprecated void formatJapaneseNumber(android.text.Editable);
+ method public static deprecated void formatNanpNumber(android.text.Editable);
+ method public static deprecated java.lang.String formatNumber(java.lang.String);
+ method public static deprecated void formatNumber(android.text.Editable, int);
+ method public static java.lang.String formatNumber(java.lang.String, java.lang.String);
+ method public static java.lang.String formatNumber(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.lang.String formatNumberToE164(java.lang.String, java.lang.String);
+ method public static java.lang.String formatNumberToRFC3966(java.lang.String, java.lang.String);
+ method public static deprecated int getFormatTypeForLocale(java.util.Locale);
+ method public static java.lang.String getNumberFromIntent(android.content.Intent, android.content.Context);
+ method public static java.lang.String getStrippedReversed(java.lang.String);
+ method public static final boolean is12Key(char);
+ method public static final boolean isDialable(char);
+ method public static boolean isEmergencyNumber(java.lang.String);
+ method public static boolean isGlobalPhoneNumber(java.lang.String);
+ method public static boolean isISODigit(char);
+ method public static boolean isLocalEmergencyNumber(android.content.Context, java.lang.String);
+ method public static final boolean isNonSeparator(char);
+ method public static final boolean isReallyDialable(char);
+ method public static final boolean isStartsPostDial(char);
+ method public static boolean isVoiceMailNumber(java.lang.String);
+ method public static boolean isWellFormedSmsAddress(java.lang.String);
+ method public static byte[] networkPortionToCalledPartyBCD(java.lang.String);
+ method public static byte[] networkPortionToCalledPartyBCDWithLength(java.lang.String);
+ method public static java.lang.String normalizeNumber(java.lang.String);
+ method public static byte[] numberToCalledPartyBCD(java.lang.String);
+ method public static java.lang.String replaceUnicodeDigits(java.lang.String);
+ method public static java.lang.String stringFromStringAndTOA(java.lang.String, int);
+ method public static java.lang.String stripSeparators(java.lang.String);
+ method public static java.lang.String toCallerIDMinMatch(java.lang.String);
+ method public static int toaFromString(java.lang.String);
+ field public static final int FORMAT_JAPAN = 2; // 0x2
+ field public static final int FORMAT_NANP = 1; // 0x1
+ field public static final int FORMAT_UNKNOWN = 0; // 0x0
+ field public static final char PAUSE = 44; // 0x002c ','
+ field public static final int TOA_International = 145; // 0x91
+ field public static final int TOA_Unknown = 129; // 0x81
+ field public static final char WAIT = 59; // 0x003b ';'
+ field public static final char WILD = 78; // 0x004e 'N'
+ }
+
+ public class PhoneStateListener {
+ ctor public PhoneStateListener();
+ method public void onCallForwardingIndicatorChanged(boolean);
+ method public void onCallStateChanged(int, java.lang.String);
+ method public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);
+ method public void onCellLocationChanged(android.telephony.CellLocation);
+ method public void onDataActivity(int);
+ method public void onDataConnectionStateChanged(int);
+ method public void onDataConnectionStateChanged(int, int);
+ method public void onMessageWaitingIndicatorChanged(boolean);
+ method public void onServiceStateChanged(android.telephony.ServiceState);
+ method public deprecated void onSignalStrengthChanged(int);
+ method public void onSignalStrengthsChanged(android.telephony.SignalStrength);
+ field public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8
+ field public static final int LISTEN_CALL_STATE = 32; // 0x20
+ field public static final int LISTEN_CELL_INFO = 1024; // 0x400
+ field public static final int LISTEN_CELL_LOCATION = 16; // 0x10
+ field public static final int LISTEN_DATA_ACTIVITY = 128; // 0x80
+ field public static final int LISTEN_DATA_CONNECTION_STATE = 64; // 0x40
+ field public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4
+ field public static final int LISTEN_NONE = 0; // 0x0
+ field public static final int LISTEN_SERVICE_STATE = 1; // 0x1
+ field public static final deprecated int LISTEN_SIGNAL_STRENGTH = 2; // 0x2
+ field public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100
+ }
+
+ public class ServiceState implements android.os.Parcelable {
+ ctor public ServiceState();
+ ctor public ServiceState(android.telephony.ServiceState);
+ ctor public ServiceState(android.os.Parcel);
+ method protected void copyFrom(android.telephony.ServiceState);
+ method public int describeContents();
+ method public boolean getIsManualSelection();
+ method public java.lang.String getOperatorAlphaLong();
+ method public java.lang.String getOperatorAlphaShort();
+ method public java.lang.String getOperatorNumeric();
+ method public boolean getRoaming();
+ method public int getState();
+ method public void setIsManualSelection(boolean);
+ method public void setOperatorName(java.lang.String, java.lang.String, java.lang.String);
+ method public void setRoaming(boolean);
+ method public void setState(int);
+ method public void setStateOff();
+ method public void setStateOutOfService();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.ServiceState> CREATOR;
+ field public static final int STATE_EMERGENCY_ONLY = 2; // 0x2
+ field public static final int STATE_IN_SERVICE = 0; // 0x0
+ field public static final int STATE_OUT_OF_SERVICE = 1; // 0x1
+ field public static final int STATE_POWER_OFF = 3; // 0x3
+ }
+
+ public class SignalStrength implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getCdmaDbm();
+ method public int getCdmaEcio();
+ method public int getEvdoDbm();
+ method public int getEvdoEcio();
+ method public int getEvdoSnr();
+ method public int getGsmBitErrorRate();
+ method public int getGsmSignalStrength();
+ method public int getLevel();
+ method public boolean isGsm();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public final class SmsManager {
+ method public java.util.ArrayList<java.lang.String> divideMessage(java.lang.String);
+ method public void downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent);
+ method public android.os.Bundle getCarrierConfigValues();
+ method public static android.telephony.SmsManager getDefault();
+ method public static int getDefaultSmsSubscriptionId();
+ method public static android.telephony.SmsManager getSmsManagerForSubscriptionId(int);
+ method public int getSubscriptionId();
+ method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent);
+ method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
+ method public void sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent);
+ method public void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);
+ method public void sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);
+ field public static final java.lang.String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA";
+ field public static final java.lang.String EXTRA_MMS_HTTP_STATUS = "android.telephony.extra.MMS_HTTP_STATUS";
+ field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled";
+ field public static final java.lang.String MMS_CONFIG_ALIAS_MAX_CHARS = "aliasMaxChars";
+ field public static final java.lang.String MMS_CONFIG_ALIAS_MIN_CHARS = "aliasMinChars";
+ field public static final java.lang.String MMS_CONFIG_ALLOW_ATTACH_AUDIO = "allowAttachAudio";
+ field public static final java.lang.String MMS_CONFIG_APPEND_TRANSACTION_ID = "enabledTransID";
+ field public static final java.lang.String MMS_CONFIG_EMAIL_GATEWAY_NUMBER = "emailGatewayNumber";
+ field public static final java.lang.String MMS_CONFIG_GROUP_MMS_ENABLED = "enableGroupMms";
+ field public static final java.lang.String MMS_CONFIG_HTTP_PARAMS = "httpParams";
+ field public static final java.lang.String MMS_CONFIG_HTTP_SOCKET_TIMEOUT = "httpSocketTimeout";
+ field public static final java.lang.String MMS_CONFIG_MAX_IMAGE_HEIGHT = "maxImageHeight";
+ field public static final java.lang.String MMS_CONFIG_MAX_IMAGE_WIDTH = "maxImageWidth";
+ field public static final java.lang.String MMS_CONFIG_MAX_MESSAGE_SIZE = "maxMessageSize";
+ field public static final java.lang.String MMS_CONFIG_MESSAGE_TEXT_MAX_SIZE = "maxMessageTextSize";
+ field public static final java.lang.String MMS_CONFIG_MMS_DELIVERY_REPORT_ENABLED = "enableMMSDeliveryReports";
+ field public static final java.lang.String MMS_CONFIG_MMS_ENABLED = "enabledMMS";
+ field public static final java.lang.String MMS_CONFIG_MMS_READ_REPORT_ENABLED = "enableMMSReadReports";
+ field public static final java.lang.String MMS_CONFIG_MULTIPART_SMS_ENABLED = "enableMultipartSMS";
+ field public static final java.lang.String MMS_CONFIG_NAI_SUFFIX = "naiSuffix";
+ field public static final java.lang.String MMS_CONFIG_NOTIFY_WAP_MMSC_ENABLED = "enabledNotifyWapMMSC";
+ field public static final java.lang.String MMS_CONFIG_RECIPIENT_LIMIT = "recipientLimit";
+ field public static final java.lang.String MMS_CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES = "sendMultipartSmsAsSeparateMessages";
+ field public static final java.lang.String MMS_CONFIG_SHOW_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks";
+ field public static final java.lang.String MMS_CONFIG_SMS_DELIVERY_REPORT_ENABLED = "enableSMSDeliveryReports";
+ field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold";
+ field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
+ field public static final java.lang.String MMS_CONFIG_SUBJECT_MAX_LENGTH = "maxSubjectLength";
+ field public static final java.lang.String MMS_CONFIG_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
+ field public static final java.lang.String MMS_CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION = "supportMmsContentDisposition";
+ field public static final java.lang.String MMS_CONFIG_UA_PROF_TAG_NAME = "uaProfTagName";
+ field public static final java.lang.String MMS_CONFIG_UA_PROF_URL = "uaProfUrl";
+ field public static final java.lang.String MMS_CONFIG_USER_AGENT = "userAgent";
+ field public static final int MMS_ERROR_CONFIGURATION_ERROR = 7; // 0x7
+ field public static final int MMS_ERROR_HTTP_FAILURE = 4; // 0x4
+ field public static final int MMS_ERROR_INVALID_APN = 2; // 0x2
+ field public static final int MMS_ERROR_IO_ERROR = 5; // 0x5
+ field public static final int MMS_ERROR_NO_DATA_NETWORK = 8; // 0x8
+ field public static final int MMS_ERROR_RETRY = 6; // 0x6
+ field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3
+ field public static final int MMS_ERROR_UNSPECIFIED = 1; // 0x1
+ field public static final int RESULT_ERROR_GENERIC_FAILURE = 1; // 0x1
+ field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4
+ field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3
+ field public static final int RESULT_ERROR_RADIO_OFF = 2; // 0x2
+ field public static final int STATUS_ON_ICC_FREE = 0; // 0x0
+ field public static final int STATUS_ON_ICC_READ = 1; // 0x1
+ field public static final int STATUS_ON_ICC_SENT = 5; // 0x5
+ field public static final int STATUS_ON_ICC_UNREAD = 3; // 0x3
+ field public static final int STATUS_ON_ICC_UNSENT = 7; // 0x7
+ }
+
+ public class SmsMessage {
+ method public static int[] calculateLength(java.lang.CharSequence, boolean);
+ method public static int[] calculateLength(java.lang.String, boolean);
+ method public static deprecated android.telephony.SmsMessage createFromPdu(byte[]);
+ method public static android.telephony.SmsMessage createFromPdu(byte[], java.lang.String);
+ method public java.lang.String getDisplayMessageBody();
+ method public java.lang.String getDisplayOriginatingAddress();
+ method public java.lang.String getEmailBody();
+ method public java.lang.String getEmailFrom();
+ method public int getIndexOnIcc();
+ method public deprecated int getIndexOnSim();
+ method public java.lang.String getMessageBody();
+ method public android.telephony.SmsMessage.MessageClass getMessageClass();
+ method public java.lang.String getOriginatingAddress();
+ method public byte[] getPdu();
+ method public int getProtocolIdentifier();
+ method public java.lang.String getPseudoSubject();
+ method public java.lang.String getServiceCenterAddress();
+ method public int getStatus();
+ method public int getStatusOnIcc();
+ method public deprecated int getStatusOnSim();
+ method public static android.telephony.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean);
+ method public static android.telephony.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, short, byte[], boolean);
+ method public static int getTPLayerLengthForPDU(java.lang.String);
+ method public long getTimestampMillis();
+ method public byte[] getUserData();
+ method public boolean isCphsMwiMessage();
+ method public boolean isEmail();
+ method public boolean isMWIClearMessage();
+ method public boolean isMWISetMessage();
+ method public boolean isMwiDontStore();
+ method public boolean isReplace();
+ method public boolean isReplyPathPresent();
+ method public boolean isStatusReportMessage();
+ field public static final int ENCODING_16BIT = 3; // 0x3
+ field public static final int ENCODING_7BIT = 1; // 0x1
+ field public static final int ENCODING_8BIT = 2; // 0x2
+ field public static final int ENCODING_UNKNOWN = 0; // 0x0
+ field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c
+ field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86
+ field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0
+ field public static final int MAX_USER_DATA_SEPTETS_WITH_HEADER = 153; // 0x99
+ }
+
+ public static final class SmsMessage.MessageClass extends java.lang.Enum {
+ method public static android.telephony.SmsMessage.MessageClass valueOf(java.lang.String);
+ method public static final android.telephony.SmsMessage.MessageClass[] values();
+ enum_constant public static final android.telephony.SmsMessage.MessageClass CLASS_0;
+ enum_constant public static final android.telephony.SmsMessage.MessageClass CLASS_1;
+ enum_constant public static final android.telephony.SmsMessage.MessageClass CLASS_2;
+ enum_constant public static final android.telephony.SmsMessage.MessageClass CLASS_3;
+ enum_constant public static final android.telephony.SmsMessage.MessageClass UNKNOWN;
+ }
+
+ public static class SmsMessage.SubmitPdu {
+ field public byte[] encodedMessage;
+ field public byte[] encodedScAddress;
+ }
+
+ public class SubscriptionInfo implements android.os.Parcelable {
+ method public android.graphics.Bitmap createIconBitmap(android.content.Context);
+ method public int describeContents();
+ method public java.lang.CharSequence getCarrierName();
+ method public java.lang.String getCountryIso();
+ method public int getDataRoaming();
+ method public java.lang.CharSequence getDisplayName();
+ method public java.lang.String getIccId();
+ method public int getIconTint();
+ method public int getMcc();
+ method public int getMnc();
+ method public java.lang.String getNumber();
+ method public int getSimSlotIndex();
+ method public int getSubscriptionId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;
+ }
+
+ public class SubscriptionManager {
+ method public void addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
+ method public static android.telephony.SubscriptionManager from(android.content.Context);
+ method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
+ method public int getActiveSubscriptionInfoCount();
+ method public int getActiveSubscriptionInfoCountMax();
+ method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
+ method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
+ method public boolean isNetworkRoaming(int);
+ method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
+ field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
+ field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
+ }
+
+ public static class SubscriptionManager.OnSubscriptionsChangedListener {
+ ctor public SubscriptionManager.OnSubscriptionsChangedListener();
+ method public void onSubscriptionsChanged();
+ }
+
+ public class TelephonyManager {
+ method public boolean canChangeDtmfToneLength();
+ method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
+ method public int getCallState();
+ method public android.telephony.CellLocation getCellLocation();
+ method public int getDataActivity();
+ method public int getDataState();
+ method public java.lang.String getDeviceId();
+ method public java.lang.String getDeviceId(int);
+ method public java.lang.String getDeviceSoftwareVersion();
+ method public java.lang.String getGroupIdLevel1();
+ method public java.lang.String getLine1Number();
+ method public java.lang.String getMmsUAProfUrl();
+ method public java.lang.String getMmsUserAgent();
+ method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
+ method public java.lang.String getNetworkCountryIso();
+ method public java.lang.String getNetworkOperator();
+ method public java.lang.String getNetworkOperatorName();
+ method public int getNetworkType();
+ method public int getPhoneCount();
+ method public int getPhoneType();
+ method public java.lang.String getSimCountryIso();
+ method public java.lang.String getSimOperator();
+ method public java.lang.String getSimOperatorName();
+ method public java.lang.String getSimSerialNumber();
+ method public int getSimState();
+ method public java.lang.String getSubscriberId();
+ method public java.lang.String getVoiceMailAlphaTag();
+ method public java.lang.String getVoiceMailNumber();
+ method public boolean hasCarrierPrivileges();
+ method public boolean hasIccCard();
+ method public boolean iccCloseLogicalChannel(int);
+ method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
+ method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
+ method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
+ method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
+ method public boolean isHearingAidCompatibilitySupported();
+ method public boolean isNetworkRoaming();
+ method public boolean isSmsCapable();
+ method public boolean isTtyModeSupported();
+ method public boolean isVoiceCapable();
+ method public boolean isWorldPhone();
+ method public void listen(android.telephony.PhoneStateListener, int);
+ method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
+ method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
+ method public boolean setOperatorBrandOverride(java.lang.String);
+ method public boolean setPreferredNetworkTypeToGlobal();
+ method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
+ field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
+ field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
+ field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
+ field public static final int CALL_STATE_IDLE = 0; // 0x0
+ field public static final int CALL_STATE_OFFHOOK = 2; // 0x2
+ field public static final int CALL_STATE_RINGING = 1; // 0x1
+ field public static final int DATA_ACTIVITY_DORMANT = 4; // 0x4
+ field public static final int DATA_ACTIVITY_IN = 1; // 0x1
+ field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3
+ field public static final int DATA_ACTIVITY_NONE = 0; // 0x0
+ field public static final int DATA_ACTIVITY_OUT = 2; // 0x2
+ field public static final int DATA_CONNECTED = 2; // 0x2
+ field public static final int DATA_CONNECTING = 1; // 0x1
+ field public static final int DATA_DISCONNECTED = 0; // 0x0
+ field public static final int DATA_SUSPENDED = 3; // 0x3
+ field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
+ field public static final java.lang.String EXTRA_STATE = "state";
+ field public static final java.lang.String EXTRA_STATE_IDLE;
+ field public static final java.lang.String EXTRA_STATE_OFFHOOK;
+ field public static final java.lang.String EXTRA_STATE_RINGING;
+ field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7
+ field public static final int NETWORK_TYPE_CDMA = 4; // 0x4
+ field public static final int NETWORK_TYPE_EDGE = 2; // 0x2
+ field public static final int NETWORK_TYPE_EHRPD = 14; // 0xe
+ field public static final int NETWORK_TYPE_EVDO_0 = 5; // 0x5
+ field public static final int NETWORK_TYPE_EVDO_A = 6; // 0x6
+ field public static final int NETWORK_TYPE_EVDO_B = 12; // 0xc
+ field public static final int NETWORK_TYPE_GPRS = 1; // 0x1
+ field public static final int NETWORK_TYPE_HSDPA = 8; // 0x8
+ field public static final int NETWORK_TYPE_HSPA = 10; // 0xa
+ field public static final int NETWORK_TYPE_HSPAP = 15; // 0xf
+ field public static final int NETWORK_TYPE_HSUPA = 9; // 0x9
+ field public static final int NETWORK_TYPE_IDEN = 11; // 0xb
+ field public static final int NETWORK_TYPE_LTE = 13; // 0xd
+ field public static final int NETWORK_TYPE_UMTS = 3; // 0x3
+ field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0
+ field public static final int PHONE_TYPE_CDMA = 2; // 0x2
+ field public static final int PHONE_TYPE_GSM = 1; // 0x1
+ field public static final int PHONE_TYPE_NONE = 0; // 0x0
+ field public static final int PHONE_TYPE_SIP = 3; // 0x3
+ field public static final int SIM_STATE_ABSENT = 1; // 0x1
+ field public static final int SIM_STATE_NETWORK_LOCKED = 4; // 0x4
+ field public static final int SIM_STATE_PIN_REQUIRED = 2; // 0x2
+ field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3
+ field public static final int SIM_STATE_READY = 5; // 0x5
+ field public static final int SIM_STATE_UNKNOWN = 0; // 0x0
+ field public static final java.lang.String VVM_TYPE_CVVM = "vvm_type_cvvm";
+ field public static final java.lang.String VVM_TYPE_OMTP = "vvm_type_omtp";
+ }
+
+}
+
+package android.telephony.cdma {
+
+ public class CdmaCellLocation extends android.telephony.CellLocation {
+ ctor public CdmaCellLocation();
+ ctor public CdmaCellLocation(android.os.Bundle);
+ method public static double convertQuartSecToDecDegrees(int);
+ method public void fillInNotifierBundle(android.os.Bundle);
+ method public int getBaseStationId();
+ method public int getBaseStationLatitude();
+ method public int getBaseStationLongitude();
+ method public int getNetworkId();
+ method public int getSystemId();
+ method public void setCellLocationData(int, int, int);
+ method public void setCellLocationData(int, int, int, int, int);
+ method public void setStateInvalid();
+ }
+
+}
+
+package android.telephony.gsm {
+
+ public class GsmCellLocation extends android.telephony.CellLocation {
+ ctor public GsmCellLocation();
+ ctor public GsmCellLocation(android.os.Bundle);
+ method public void fillInNotifierBundle(android.os.Bundle);
+ method public int getCid();
+ method public int getLac();
+ method public int getPsc();
+ method public void setLacAndCid(int, int);
+ method public void setStateInvalid();
+ }
+
+ public final deprecated class SmsManager {
+ method public final deprecated java.util.ArrayList<java.lang.String> divideMessage(java.lang.String);
+ method public static final deprecated android.telephony.gsm.SmsManager getDefault();
+ method public final deprecated void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
+ method public final deprecated void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);
+ method public final deprecated void sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);
+ field public static final deprecated int RESULT_ERROR_GENERIC_FAILURE = 1; // 0x1
+ field public static final deprecated int RESULT_ERROR_NO_SERVICE = 4; // 0x4
+ field public static final deprecated int RESULT_ERROR_NULL_PDU = 3; // 0x3
+ field public static final deprecated int RESULT_ERROR_RADIO_OFF = 2; // 0x2
+ field public static final deprecated int STATUS_ON_SIM_FREE = 0; // 0x0
+ field public static final deprecated int STATUS_ON_SIM_READ = 1; // 0x1
+ field public static final deprecated int STATUS_ON_SIM_SENT = 5; // 0x5
+ field public static final deprecated int STATUS_ON_SIM_UNREAD = 3; // 0x3
+ field public static final deprecated int STATUS_ON_SIM_UNSENT = 7; // 0x7
+ }
+
+ public deprecated class SmsMessage {
+ ctor public deprecated SmsMessage();
+ method public static deprecated int[] calculateLength(java.lang.CharSequence, boolean);
+ method public static deprecated int[] calculateLength(java.lang.String, boolean);
+ method public static deprecated android.telephony.gsm.SmsMessage createFromPdu(byte[]);
+ method public deprecated java.lang.String getDisplayMessageBody();
+ method public deprecated java.lang.String getDisplayOriginatingAddress();
+ method public deprecated java.lang.String getEmailBody();
+ method public deprecated java.lang.String getEmailFrom();
+ method public deprecated int getIndexOnSim();
+ method public deprecated java.lang.String getMessageBody();
+ method public deprecated android.telephony.gsm.SmsMessage.MessageClass getMessageClass();
+ method public deprecated java.lang.String getOriginatingAddress();
+ method public deprecated byte[] getPdu();
+ method public deprecated int getProtocolIdentifier();
+ method public deprecated java.lang.String getPseudoSubject();
+ method public deprecated java.lang.String getServiceCenterAddress();
+ method public deprecated int getStatus();
+ method public deprecated int getStatusOnSim();
+ method public static deprecated android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, java.lang.String, boolean);
+ method public static deprecated android.telephony.gsm.SmsMessage.SubmitPdu getSubmitPdu(java.lang.String, java.lang.String, short, byte[], boolean);
+ method public static deprecated int getTPLayerLengthForPDU(java.lang.String);
+ method public deprecated long getTimestampMillis();
+ method public deprecated byte[] getUserData();
+ method public deprecated boolean isCphsMwiMessage();
+ method public deprecated boolean isEmail();
+ method public deprecated boolean isMWIClearMessage();
+ method public deprecated boolean isMWISetMessage();
+ method public deprecated boolean isMwiDontStore();
+ method public deprecated boolean isReplace();
+ method public deprecated boolean isReplyPathPresent();
+ method public deprecated boolean isStatusReportMessage();
+ field public static final deprecated int ENCODING_16BIT = 3; // 0x3
+ field public static final deprecated int ENCODING_7BIT = 1; // 0x1
+ field public static final deprecated int ENCODING_8BIT = 2; // 0x2
+ field public static final deprecated int ENCODING_UNKNOWN = 0; // 0x0
+ field public static final deprecated int MAX_USER_DATA_BYTES = 140; // 0x8c
+ field public static final deprecated int MAX_USER_DATA_SEPTETS = 160; // 0xa0
+ field public static final deprecated int MAX_USER_DATA_SEPTETS_WITH_HEADER = 153; // 0x99
+ }
+
+ public static final deprecated class SmsMessage.MessageClass extends java.lang.Enum {
+ method public static android.telephony.gsm.SmsMessage.MessageClass valueOf(java.lang.String);
+ method public static final android.telephony.gsm.SmsMessage.MessageClass[] values();
+ enum_constant public static final android.telephony.gsm.SmsMessage.MessageClass CLASS_0;
+ enum_constant public static final android.telephony.gsm.SmsMessage.MessageClass CLASS_1;
+ enum_constant public static final android.telephony.gsm.SmsMessage.MessageClass CLASS_2;
+ enum_constant public static final android.telephony.gsm.SmsMessage.MessageClass CLASS_3;
+ enum_constant public static final android.telephony.gsm.SmsMessage.MessageClass UNKNOWN;
+ }
+
+ public static deprecated class SmsMessage.SubmitPdu {
+ ctor public deprecated SmsMessage.SubmitPdu();
+ field public deprecated byte[] encodedMessage;
+ field public deprecated byte[] encodedScAddress;
+ }
+
+}
+
+package android.test {
+
+ public abstract deprecated class ActivityInstrumentationTestCase extends android.test.ActivityTestCase {
+ ctor public ActivityInstrumentationTestCase(java.lang.String, java.lang.Class<T>);
+ ctor public ActivityInstrumentationTestCase(java.lang.String, java.lang.Class<T>, boolean);
+ method public T getActivity();
+ method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
+ }
+
+ public abstract class ActivityInstrumentationTestCase2 extends android.test.ActivityTestCase {
+ ctor public deprecated ActivityInstrumentationTestCase2(java.lang.String, java.lang.Class<T>);
+ ctor public ActivityInstrumentationTestCase2(java.lang.Class<T>);
+ method public T getActivity();
+ method public void setActivityInitialTouchMode(boolean);
+ method public void setActivityIntent(android.content.Intent);
+ }
+
+ public abstract class ActivityTestCase extends android.test.InstrumentationTestCase {
+ ctor public ActivityTestCase();
+ method protected android.app.Activity getActivity();
+ method protected void scrubClass(java.lang.Class<?>) throws java.lang.IllegalAccessException;
+ method protected void setActivity(android.app.Activity);
+ }
+
+ public abstract class ActivityUnitTestCase extends android.test.ActivityTestCase {
+ ctor public ActivityUnitTestCase(java.lang.Class<T>);
+ method public T getActivity();
+ method public int getFinishedActivityRequest();
+ method public int getRequestedOrientation();
+ method public android.content.Intent getStartedActivityIntent();
+ method public int getStartedActivityRequest();
+ method public boolean isFinishCalled();
+ method public void setActivityContext(android.content.Context);
+ method public void setApplication(android.app.Application);
+ method protected T startActivity(android.content.Intent, android.os.Bundle, java.lang.Object);
+ }
+
+ public class AndroidTestCase extends junit.framework.TestCase {
+ ctor public AndroidTestCase();
+ method public void assertActivityRequiresPermission(java.lang.String, java.lang.String, java.lang.String);
+ method public void assertReadingContentUriRequiresPermission(android.net.Uri, java.lang.String);
+ method public void assertWritingContentUriRequiresPermission(android.net.Uri, java.lang.String);
+ method public android.content.Context getContext();
+ method protected void scrubClass(java.lang.Class<?>) throws java.lang.IllegalAccessException;
+ method public void setContext(android.content.Context);
+ method public void testAndroidTestCaseSetupProperly();
+ field protected android.content.Context mContext;
+ }
+
+ public class AndroidTestRunner extends junit.runner.BaseTestRunner {
+ ctor public AndroidTestRunner();
+ method public void addTestListener(junit.framework.TestListener);
+ method public void clearTestListeners();
+ method protected junit.framework.TestResult createTestResult();
+ method public java.util.List<junit.framework.TestCase> getTestCases();
+ method public java.lang.String getTestClassName();
+ method public junit.framework.TestResult getTestResult();
+ method protected void runFailed(java.lang.String);
+ method public void runTest();
+ method public void runTest(junit.framework.TestResult);
+ method public void setContext(android.content.Context);
+ method public deprecated void setInstrumentaiton(android.app.Instrumentation);
+ method public void setInstrumentation(android.app.Instrumentation);
+ method public void setTest(junit.framework.Test);
+ method public void setTestClassName(java.lang.String, java.lang.String);
+ method public void testEnded(java.lang.String);
+ method public void testFailed(int, junit.framework.Test, java.lang.Throwable);
+ method public void testStarted(java.lang.String);
+ }
+
+ public abstract class ApplicationTestCase extends android.test.AndroidTestCase {
+ ctor public ApplicationTestCase(java.lang.Class<T>);
+ method protected final void createApplication();
+ method public T getApplication();
+ method public android.content.Context getSystemContext();
+ method protected final void terminateApplication();
+ method public final void testApplicationTestCaseSetUpProperly() throws java.lang.Exception;
+ }
+
+ public deprecated class AssertionFailedError extends java.lang.Error {
+ ctor public AssertionFailedError();
+ ctor public AssertionFailedError(java.lang.String);
+ }
+
+ public deprecated class ComparisonFailure extends android.test.AssertionFailedError {
+ ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract class FlakyTest implements java.lang.annotation.Annotation {
+ }
+
+ public class InstrumentationTestCase extends junit.framework.TestCase {
+ ctor public InstrumentationTestCase();
+ method public android.app.Instrumentation getInstrumentation();
+ method public deprecated void injectInsrumentation(android.app.Instrumentation);
+ method public void injectInstrumentation(android.app.Instrumentation);
+ method public final T launchActivity(java.lang.String, java.lang.Class<T>, android.os.Bundle);
+ method public final T launchActivityWithIntent(java.lang.String, java.lang.Class<T>, android.content.Intent);
+ method public void runTestOnUiThread(java.lang.Runnable) throws java.lang.Throwable;
+ method public void sendKeys(java.lang.String);
+ method public void sendKeys(int...);
+ method public void sendRepeatedKeys(int...);
+ }
+
+ public class InstrumentationTestRunner extends android.app.Instrumentation implements android.test.TestSuiteProvider {
+ ctor public InstrumentationTestRunner();
+ method public junit.framework.TestSuite getAllTests();
+ method protected android.test.AndroidTestRunner getAndroidTestRunner();
+ method public android.os.Bundle getArguments();
+ method public java.lang.ClassLoader getLoader();
+ method public junit.framework.TestSuite getTestSuite();
+ field public static final java.lang.String REPORT_KEY_NAME_CLASS = "class";
+ field public static final java.lang.String REPORT_KEY_NAME_TEST = "test";
+ field public static final java.lang.String REPORT_KEY_NUM_CURRENT = "current";
+ field public static final java.lang.String REPORT_KEY_NUM_TOTAL = "numtests";
+ field public static final java.lang.String REPORT_KEY_STACK = "stack";
+ field public static final java.lang.String REPORT_VALUE_ID = "InstrumentationTestRunner";
+ field public static final int REPORT_VALUE_RESULT_ERROR = -1; // 0xffffffff
+ field public static final int REPORT_VALUE_RESULT_FAILURE = -2; // 0xfffffffe
+ field public static final int REPORT_VALUE_RESULT_OK = 0; // 0x0
+ field public static final int REPORT_VALUE_RESULT_START = 1; // 0x1
+ }
+
+ public class InstrumentationTestSuite extends junit.framework.TestSuite {
+ ctor public InstrumentationTestSuite(android.app.Instrumentation);
+ ctor public InstrumentationTestSuite(java.lang.String, android.app.Instrumentation);
+ ctor public InstrumentationTestSuite(java.lang.Class, android.app.Instrumentation);
+ method public void addTestSuite(java.lang.Class);
+ }
+
+ public class IsolatedContext extends android.content.ContextWrapper {
+ ctor public IsolatedContext(android.content.ContentResolver, android.content.Context);
+ method public java.util.List<android.content.Intent> getAndClearBroadcastIntents();
+ }
+
+ public class LoaderTestCase extends android.test.AndroidTestCase {
+ ctor public LoaderTestCase();
+ method public T getLoaderResultSynchronously(android.content.Loader<T>);
+ }
+
+ public final class MoreAsserts {
+ method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Object);
+ method public static void assertAssignableFrom(java.lang.Class<?>, java.lang.Class<?>);
+ method public static java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.util.regex.MatchResult assertContainsRegex(java.lang.String, java.lang.String);
+ method public static void assertContentsInAnyOrder(java.lang.String, java.lang.Iterable<?>, java.lang.Object...);
+ method public static void assertContentsInAnyOrder(java.lang.Iterable<?>, java.lang.Object...);
+ method public static void assertContentsInOrder(java.lang.String, java.lang.Iterable<?>, java.lang.Object...);
+ method public static void assertContentsInOrder(java.lang.Iterable<?>, java.lang.Object...);
+ method public static void assertEmpty(java.lang.String, java.lang.Iterable<?>);
+ method public static void assertEmpty(java.lang.Iterable<?>);
+ method public static void assertEmpty(java.lang.String, java.util.Map<?, ?>);
+ method public static void assertEmpty(java.util.Map<?, ?>);
+ method public static void assertEquals(java.lang.String, byte[], byte[]);
+ method public static void assertEquals(byte[], byte[]);
+ method public static void assertEquals(java.lang.String, int[], int[]);
+ method public static void assertEquals(int[], int[]);
+ method public static void assertEquals(java.lang.String, double[], double[]);
+ method public static void assertEquals(double[], double[]);
+ method public static void assertEquals(java.lang.String, java.lang.Object[], java.lang.Object[]);
+ method public static void assertEquals(java.lang.Object[], java.lang.Object[]);
+ method public static void assertEquals(java.lang.String, java.util.Set<? extends java.lang.Object>, java.util.Set<? extends java.lang.Object>);
+ method public static void assertEquals(java.util.Set<? extends java.lang.Object>, java.util.Set<? extends java.lang.Object>);
+ method public static java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String);
+ method public static void assertNotContainsRegex(java.lang.String, java.lang.String, java.lang.String);
+ method public static void assertNotContainsRegex(java.lang.String, java.lang.String);
+ method public static void assertNotEmpty(java.lang.String, java.lang.Iterable<?>);
+ method public static void assertNotEmpty(java.lang.Iterable<?>);
+ method public static void assertNotEmpty(java.lang.String, java.util.Map<?, ?>);
+ method public static void assertNotEmpty(java.util.Map<?, ?>);
+ method public static void assertNotEqual(java.lang.String, java.lang.Object, java.lang.Object);
+ method public static void assertNotEqual(java.lang.Object, java.lang.Object);
+ method public static void assertNotMatchesRegex(java.lang.String, java.lang.String, java.lang.String);
+ method public static void assertNotMatchesRegex(java.lang.String, java.lang.String);
+ method public static void checkEqualsAndHashCodeMethods(java.lang.String, java.lang.Object, java.lang.Object, boolean);
+ method public static void checkEqualsAndHashCodeMethods(java.lang.Object, java.lang.Object, boolean);
+ }
+
+ public abstract interface PerformanceTestCase {
+ method public abstract boolean isPerformanceOnly();
+ method public abstract int startPerformance(android.test.PerformanceTestCase.Intermediates);
+ }
+
+ public static abstract interface PerformanceTestCase.Intermediates {
+ method public abstract void addIntermediate(java.lang.String);
+ method public abstract void addIntermediate(java.lang.String, long);
+ method public abstract void finishTiming(boolean);
+ method public abstract void setInternalIterations(int);
+ method public abstract void startTiming(boolean);
+ }
+
+ public abstract deprecated class ProviderTestCase extends android.test.InstrumentationTestCase {
+ ctor public ProviderTestCase(java.lang.Class<T>, java.lang.String);
+ method public android.test.mock.MockContentResolver getMockContentResolver();
+ method public android.test.IsolatedContext getMockContext();
+ method public T getProvider();
+ method public static android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.Class<T>, java.lang.String, java.lang.String, int, java.lang.String) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ }
+
+ public abstract class ProviderTestCase2 extends android.test.AndroidTestCase {
+ ctor public ProviderTestCase2(java.lang.Class<T>, java.lang.String);
+ method public android.test.mock.MockContentResolver getMockContentResolver();
+ method public android.test.IsolatedContext getMockContext();
+ method public T getProvider();
+ method public static android.content.ContentResolver newResolverWithContentProviderFromSql(android.content.Context, java.lang.String, java.lang.Class<T>, java.lang.String, java.lang.String, int, java.lang.String) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ }
+
+ public class RenamingDelegatingContext extends android.content.ContextWrapper {
+ ctor public RenamingDelegatingContext(android.content.Context, java.lang.String);
+ ctor public RenamingDelegatingContext(android.content.Context, android.content.Context, java.lang.String);
+ method public java.lang.String getDatabasePrefix();
+ method public void makeExistingFilesAndDbsAccessible();
+ method public static T providerWithRenamedContext(java.lang.Class<T>, android.content.Context, java.lang.String) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public static T providerWithRenamedContext(java.lang.Class<T>, android.content.Context, java.lang.String, boolean) throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ }
+
+ public abstract class ServiceTestCase extends android.test.AndroidTestCase {
+ ctor public ServiceTestCase(java.lang.Class<T>);
+ method protected android.os.IBinder bindService(android.content.Intent);
+ method public android.app.Application getApplication();
+ method public T getService();
+ method public android.content.Context getSystemContext();
+ method public void setApplication(android.app.Application);
+ method protected void setupService();
+ method protected void shutdownService();
+ method protected void startService(android.content.Intent);
+ method public void testServiceTestCaseSetUpProperly() throws java.lang.Exception;
+ }
+
+ public abstract class SingleLaunchActivityTestCase extends android.test.InstrumentationTestCase {
+ ctor public SingleLaunchActivityTestCase(java.lang.String, java.lang.Class<T>);
+ method public T getActivity();
+ method public void testActivityTestCaseSetUpProperly() throws java.lang.Exception;
+ }
+
+ public class SyncBaseInstrumentation extends android.test.InstrumentationTestCase {
+ ctor public SyncBaseInstrumentation();
+ method protected void cancelSyncsandDisableAutoSync();
+ method protected void syncProvider(android.net.Uri, java.lang.String, java.lang.String) throws java.lang.Exception;
+ }
+
+ public abstract interface TestSuiteProvider {
+ method public abstract junit.framework.TestSuite getTestSuite();
+ }
+
+ public class TouchUtils {
+ ctor public TouchUtils();
+ method public static void clickView(android.test.InstrumentationTestCase, android.view.View);
+ method public static deprecated void drag(android.test.ActivityInstrumentationTestCase, float, float, float, float, int);
+ method public static void drag(android.test.InstrumentationTestCase, float, float, float, float, int);
+ method public static deprecated void dragQuarterScreenDown(android.test.ActivityInstrumentationTestCase);
+ method public static void dragQuarterScreenDown(android.test.InstrumentationTestCase, android.app.Activity);
+ method public static deprecated void dragQuarterScreenUp(android.test.ActivityInstrumentationTestCase);
+ method public static void dragQuarterScreenUp(android.test.InstrumentationTestCase, android.app.Activity);
+ method public static deprecated int dragViewBy(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int);
+ method public static deprecated int dragViewBy(android.test.InstrumentationTestCase, android.view.View, int, int, int);
+ method public static deprecated int dragViewTo(android.test.ActivityInstrumentationTestCase, android.view.View, int, int, int);
+ method public static int dragViewTo(android.test.InstrumentationTestCase, android.view.View, int, int, int);
+ method public static deprecated void dragViewToBottom(android.test.ActivityInstrumentationTestCase, android.view.View);
+ method public static void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View);
+ method public static deprecated void dragViewToBottom(android.test.ActivityInstrumentationTestCase, android.view.View, int);
+ method public static void dragViewToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.View, int);
+ method public static deprecated void dragViewToTop(android.test.ActivityInstrumentationTestCase, android.view.View);
+ method public static deprecated void dragViewToTop(android.test.ActivityInstrumentationTestCase, android.view.View, int);
+ method public static void dragViewToTop(android.test.InstrumentationTestCase, android.view.View);
+ method public static void dragViewToTop(android.test.InstrumentationTestCase, android.view.View, int);
+ method public static deprecated int dragViewToX(android.test.ActivityInstrumentationTestCase, android.view.View, int, int);
+ method public static int dragViewToX(android.test.InstrumentationTestCase, android.view.View, int, int);
+ method public static deprecated int dragViewToY(android.test.ActivityInstrumentationTestCase, android.view.View, int, int);
+ method public static int dragViewToY(android.test.InstrumentationTestCase, android.view.View, int, int);
+ method public static deprecated void longClickView(android.test.ActivityInstrumentationTestCase, android.view.View);
+ method public static void longClickView(android.test.InstrumentationTestCase, android.view.View);
+ method public static deprecated void scrollToBottom(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup);
+ method public static void scrollToBottom(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup);
+ method public static deprecated void scrollToTop(android.test.ActivityInstrumentationTestCase, android.view.ViewGroup);
+ method public static void scrollToTop(android.test.InstrumentationTestCase, android.app.Activity, android.view.ViewGroup);
+ method public static void tapView(android.test.InstrumentationTestCase, android.view.View);
+ method public static void touchAndCancelView(android.test.InstrumentationTestCase, android.view.View);
+ }
+
+ public abstract class UiThreadTest implements java.lang.annotation.Annotation {
+ }
+
+ public class ViewAsserts {
+ method public static void assertBaselineAligned(android.view.View, android.view.View);
+ method public static void assertBottomAligned(android.view.View, android.view.View);
+ method public static void assertBottomAligned(android.view.View, android.view.View, int);
+ method public static void assertGroupContains(android.view.ViewGroup, android.view.View);
+ method public static void assertGroupIntegrity(android.view.ViewGroup);
+ method public static void assertGroupNotContains(android.view.ViewGroup, android.view.View);
+ method public static void assertHasScreenCoordinates(android.view.View, android.view.View, int, int);
+ method public static void assertHorizontalCenterAligned(android.view.View, android.view.View);
+ method public static void assertLeftAligned(android.view.View, android.view.View);
+ method public static void assertLeftAligned(android.view.View, android.view.View, int);
+ method public static void assertOffScreenAbove(android.view.View, android.view.View);
+ method public static void assertOffScreenBelow(android.view.View, android.view.View);
+ method public static void assertOnScreen(android.view.View, android.view.View);
+ method public static void assertRightAligned(android.view.View, android.view.View);
+ method public static void assertRightAligned(android.view.View, android.view.View, int);
+ method public static void assertTopAligned(android.view.View, android.view.View);
+ method public static void assertTopAligned(android.view.View, android.view.View, int);
+ method public static void assertVerticalCenterAligned(android.view.View, android.view.View);
+ }
+
+}
+
+package android.test.mock {
+
+ public class MockApplication extends android.app.Application {
+ ctor public MockApplication();
+ }
+
+ public class MockContentProvider extends android.content.ContentProvider {
+ ctor protected MockContentProvider();
+ ctor public MockContentProvider(android.content.Context);
+ ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
+ method public int delete(android.net.Uri, java.lang.String, java.lang.String[]);
+ method public java.lang.String getType(android.net.Uri);
+ method public android.net.Uri insert(android.net.Uri, android.content.ContentValues);
+ method public boolean onCreate();
+ method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
+ method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
+ }
+
+ public class MockContentResolver extends android.content.ContentResolver {
+ ctor public MockContentResolver();
+ ctor public MockContentResolver(android.content.Context);
+ method public void addProvider(java.lang.String, android.content.ContentProvider);
+ }
+
+ public class MockContext extends android.content.Context {
+ ctor public MockContext();
+ method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
+ method public int checkCallingOrSelfPermission(java.lang.String);
+ method public int checkCallingOrSelfUriPermission(android.net.Uri, int);
+ method public int checkCallingPermission(java.lang.String);
+ method public int checkCallingUriPermission(android.net.Uri, int);
+ method public int checkPermission(java.lang.String, int, int);
+ method public int checkSelfPermission(java.lang.String);
+ method public int checkUriPermission(android.net.Uri, int, int, int);
+ method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
+ method public void clearWallpaper();
+ method public android.content.Context createConfigurationContext(android.content.res.Configuration);
+ method public android.content.Context createDisplayContext(android.view.Display);
+ method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public java.lang.String[] databaseList();
+ method public boolean deleteDatabase(java.lang.String);
+ method public boolean deleteFile(java.lang.String);
+ method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
+ method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
+ method public void enforceCallingPermission(java.lang.String, java.lang.String);
+ method public void enforceCallingUriPermission(android.net.Uri, int, java.lang.String);
+ method public void enforcePermission(java.lang.String, int, int, java.lang.String);
+ method public void enforceUriPermission(android.net.Uri, int, int, int, java.lang.String);
+ method public void enforceUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int, java.lang.String);
+ method public java.lang.String[] fileList();
+ method public android.content.Context getApplicationContext();
+ method public android.content.pm.ApplicationInfo getApplicationInfo();
+ method public android.content.res.AssetManager getAssets();
+ method public java.io.File getCacheDir();
+ method public java.lang.ClassLoader getClassLoader();
+ method public java.io.File getCodeCacheDir();
+ method public android.content.ContentResolver getContentResolver();
+ method public java.io.File getDatabasePath(java.lang.String);
+ method public java.io.File getDeviceEncryptedFilesDir();
+ method public java.io.File getDir(java.lang.String, int);
+ method public java.io.File getExternalCacheDir();
+ method public java.io.File[] getExternalCacheDirs();
+ method public java.io.File getExternalFilesDir(java.lang.String);
+ method public java.io.File[] getExternalFilesDirs(java.lang.String);
+ method public java.io.File[] getExternalMediaDirs();
+ method public java.io.File getFileStreamPath(java.lang.String);
+ method public java.io.File getFilesDir();
+ method public android.os.Looper getMainLooper();
+ method public java.io.File getNoBackupFilesDir();
+ method public java.io.File getObbDir();
+ method public java.io.File[] getObbDirs();
+ method public java.lang.String getPackageCodePath();
+ method public android.content.pm.PackageManager getPackageManager();
+ method public java.lang.String getPackageName();
+ method public java.lang.String getPackageResourcePath();
+ method public android.content.res.Resources getResources();
+ method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
+ method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
+ method public java.lang.Object getSystemService(java.lang.String);
+ method public java.lang.String getSystemServiceName(java.lang.Class<?>);
+ method public android.content.res.Resources.Theme getTheme();
+ method public android.graphics.drawable.Drawable getWallpaper();
+ method public int getWallpaperDesiredMinimumHeight();
+ method public int getWallpaperDesiredMinimumWidth();
+ method public void grantUriPermission(java.lang.String, android.net.Uri, int);
+ method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
+ method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
+ method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
+ method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
+ method public android.graphics.drawable.Drawable peekWallpaper();
+ method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);
+ method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);
+ method public void removeStickyBroadcast(android.content.Intent);
+ method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public void revokeUriPermission(android.net.Uri, int);
+ method public void sendBroadcast(android.content.Intent);
+ method public void sendBroadcast(android.content.Intent, java.lang.String);
+ method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
+ method public void sendOrderedBroadcast(android.content.Intent, java.lang.String);
+ method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public void sendStickyBroadcast(android.content.Intent);
+ method public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
+ method public void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
+ method public void setTheme(int);
+ method public void setWallpaper(android.graphics.Bitmap) throws java.io.IOException;
+ method public void setWallpaper(java.io.InputStream) throws java.io.IOException;
+ method public void startActivities(android.content.Intent[]);
+ method public void startActivities(android.content.Intent[], android.os.Bundle);
+ method public void startActivity(android.content.Intent);
+ method public void startActivity(android.content.Intent, android.os.Bundle);
+ method public boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle);
+ method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
+ method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
+ method public android.content.ComponentName startService(android.content.Intent);
+ method public boolean stopService(android.content.Intent);
+ method public void unbindService(android.content.ServiceConnection);
+ method public void unregisterReceiver(android.content.BroadcastReceiver);
+ }
+
+ public class MockCursor implements android.database.Cursor {
+ ctor public MockCursor();
+ method public void close();
+ method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
+ method public deprecated void deactivate();
+ method public byte[] getBlob(int);
+ method public int getColumnCount();
+ method public int getColumnIndex(java.lang.String);
+ method public int getColumnIndexOrThrow(java.lang.String);
+ method public java.lang.String getColumnName(int);
+ method public java.lang.String[] getColumnNames();
+ method public int getCount();
+ method public double getDouble(int);
+ method public android.os.Bundle getExtras();
+ method public float getFloat(int);
+ method public int getInt(int);
+ method public long getLong(int);
+ method public android.net.Uri getNotificationUri();
+ method public int getPosition();
+ method public short getShort(int);
+ method public java.lang.String getString(int);
+ method public int getType(int);
+ method public boolean getWantsAllOnMoveCalls();
+ method public boolean isAfterLast();
+ method public boolean isBeforeFirst();
+ method public boolean isClosed();
+ method public boolean isFirst();
+ method public boolean isLast();
+ method public boolean isNull(int);
+ method public boolean move(int);
+ method public boolean moveToFirst();
+ method public boolean moveToLast();
+ method public boolean moveToNext();
+ method public boolean moveToPosition(int);
+ method public boolean moveToPrevious();
+ method public void registerContentObserver(android.database.ContentObserver);
+ method public void registerDataSetObserver(android.database.DataSetObserver);
+ method public deprecated boolean requery();
+ method public android.os.Bundle respond(android.os.Bundle);
+ method public void setExtras(android.os.Bundle);
+ method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
+ method public void unregisterContentObserver(android.database.ContentObserver);
+ method public void unregisterDataSetObserver(android.database.DataSetObserver);
+ }
+
+ public class MockDialogInterface implements android.content.DialogInterface {
+ ctor public MockDialogInterface();
+ method public void cancel();
+ method public void dismiss();
+ }
+
+ public class MockPackageManager extends android.content.pm.PackageManager {
+ ctor public MockPackageManager();
+ method public void addPackageToPreferred(java.lang.String);
+ method public boolean addPermission(android.content.pm.PermissionInfo);
+ method public boolean addPermissionAsync(android.content.pm.PermissionInfo);
+ method public void addPreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName);
+ method public java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]);
+ method public int checkPermission(java.lang.String, java.lang.String);
+ method public int checkSignatures(java.lang.String, java.lang.String);
+ method public int checkSignatures(int, int);
+ method public void clearPackagePreferredActivities(java.lang.String);
+ method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
+ method public void extendVerificationTimeout(int, int, long);
+ method public android.graphics.drawable.Drawable getActivityBanner(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.graphics.drawable.Drawable getActivityBanner(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.graphics.drawable.Drawable getActivityLogo(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String);
+ method public java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);
+ method public android.graphics.drawable.Drawable getApplicationBanner(android.content.pm.ApplicationInfo);
+ method public android.graphics.drawable.Drawable getApplicationBanner(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public int getApplicationEnabledSetting(java.lang.String);
+ method public android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo);
+ method public android.graphics.drawable.Drawable getApplicationIcon(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.ApplicationInfo getApplicationInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public java.lang.CharSequence getApplicationLabel(android.content.pm.ApplicationInfo);
+ method public android.graphics.drawable.Drawable getApplicationLogo(android.content.pm.ApplicationInfo);
+ method public android.graphics.drawable.Drawable getApplicationLogo(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public int getComponentEnabledSetting(android.content.ComponentName);
+ method public android.graphics.drawable.Drawable getDefaultActivityIcon();
+ method public java.lang.String getDefaultBrowserPackageName(int);
+ method public android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);
+ method public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
+ method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
+ method public java.lang.String getInstallerPackageName(java.lang.String);
+ method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.Intent getLaunchIntentForPackage(java.lang.String);
+ method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
+ method public java.lang.String getNameForUid(int);
+ method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.PackageInstaller getPackageInstaller();
+ method public java.lang.String[] getPackagesForUid(int);
+ method public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);
+ method public android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);
+ method public java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int);
+ method public android.content.pm.ProviderInfo getProviderInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.ActivityInfo getReceiverInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.res.Resources getResourcesForActivity(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.res.Resources getResourcesForApplication(android.content.pm.ApplicationInfo);
+ method public android.content.res.Resources getResourcesForApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.ServiceInfo getServiceInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public android.content.pm.FeatureInfo[] getSystemAvailableFeatures();
+ method public java.lang.String[] getSystemSharedLibraryNames();
+ method public java.lang.CharSequence getText(java.lang.String, int, android.content.pm.ApplicationInfo);
+ method public android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
+ method public android.graphics.drawable.Drawable getUserBadgedIcon(android.graphics.drawable.Drawable, android.os.UserHandle);
+ method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
+ method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
+ method public boolean hasSystemFeature(java.lang.String);
+ method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
+ method public boolean isSafeMode();
+ method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
+ method public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);
+ method public java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(java.lang.String, int);
+ method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(android.content.Intent, int);
+ method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int);
+ method public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);
+ method public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);
+ method public java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+ method public void removePackageFromPreferred(java.lang.String);
+ method public void removePermission(java.lang.String);
+ method public android.content.pm.ResolveInfo resolveActivity(android.content.Intent, int);
+ method public android.content.pm.ProviderInfo resolveContentProvider(java.lang.String, int);
+ method public android.content.pm.ResolveInfo resolveService(android.content.Intent, int);
+ method public void setApplicationEnabledSetting(java.lang.String, int, int);
+ method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
+ method public boolean setDefaultBrowserPackageName(java.lang.String, int);
+ method public void setInstallerPackageName(java.lang.String, java.lang.String);
+ method public void verifyPendingInstall(int, int);
+ }
+
+ public class MockResources extends android.content.res.Resources {
+ ctor public MockResources();
+ }
+
+}
+
+package android.test.suitebuilder {
+
+ public class TestMethod {
+ ctor public TestMethod(java.lang.reflect.Method, java.lang.Class<? extends junit.framework.TestCase>);
+ ctor public TestMethod(java.lang.String, java.lang.Class<? extends junit.framework.TestCase>);
+ ctor public TestMethod(junit.framework.TestCase);
+ method public junit.framework.TestCase createTest() throws java.lang.IllegalAccessException, java.lang.InstantiationException, java.lang.reflect.InvocationTargetException;
+ method public T getAnnotation(java.lang.Class<T>);
+ method public java.lang.Class<? extends junit.framework.TestCase> getEnclosingClass();
+ method public java.lang.String getEnclosingClassname();
+ method public java.lang.String getName();
+ }
+
+ public class TestSuiteBuilder {
+ ctor public TestSuiteBuilder(java.lang.Class);
+ ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader);
+ method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);
+ method public final android.test.suitebuilder.TestSuiteBuilder addRequirements(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...);
+ method public final junit.framework.TestSuite build();
+ method public android.test.suitebuilder.TestSuiteBuilder excludePackages(java.lang.String...);
+ method protected java.lang.String getSuiteName();
+ method public final android.test.suitebuilder.TestSuiteBuilder includeAllPackagesUnderHere();
+ method public android.test.suitebuilder.TestSuiteBuilder includePackages(java.lang.String...);
+ method public android.test.suitebuilder.TestSuiteBuilder named(java.lang.String);
+ }
+
+ public static class TestSuiteBuilder.FailedToCreateTests extends junit.framework.TestCase {
+ ctor public TestSuiteBuilder.FailedToCreateTests(java.lang.Exception);
+ method public void testSuiteConstructionFailed();
+ }
+
+}
+
+package android.test.suitebuilder.annotation {
+
+ public abstract class LargeTest implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class MediumTest implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class SmallTest implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class Smoke implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class Suppress implements java.lang.annotation.Annotation {
+ }
+
+}
+
+package android.text {
+
+ public class AlteredCharSequence implements java.lang.CharSequence android.text.GetChars {
+ method public char charAt(int);
+ method public void getChars(int, int, char[], int);
+ method public int length();
+ method public static android.text.AlteredCharSequence make(java.lang.CharSequence, char[], int, int);
+ method public java.lang.CharSequence subSequence(int, int);
+ }
+
+ public class AndroidCharacter {
+ ctor public AndroidCharacter();
+ method public static void getDirectionalities(char[], byte[], int);
+ method public static int getEastAsianWidth(char);
+ method public static void getEastAsianWidths(char[], int, int, byte[]);
+ method public static char getMirror(char);
+ method public static boolean mirror(char[], int, int);
+ field public static final int EAST_ASIAN_WIDTH_AMBIGUOUS = 1; // 0x1
+ field public static final int EAST_ASIAN_WIDTH_FULL_WIDTH = 3; // 0x3
+ field public static final int EAST_ASIAN_WIDTH_HALF_WIDTH = 2; // 0x2
+ field public static final int EAST_ASIAN_WIDTH_NARROW = 4; // 0x4
+ field public static final int EAST_ASIAN_WIDTH_NEUTRAL = 0; // 0x0
+ field public static final int EAST_ASIAN_WIDTH_WIDE = 5; // 0x5
+ }
+
+ public class Annotation implements android.text.ParcelableSpan {
+ ctor public Annotation(java.lang.String, java.lang.String);
+ ctor public Annotation(android.os.Parcel);
+ method public int describeContents();
+ method public java.lang.String getKey();
+ method public int getSpanTypeId();
+ method public java.lang.String getValue();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class AutoText {
+ method public static java.lang.String get(java.lang.CharSequence, int, int, android.view.View);
+ method public static int getSize(android.view.View);
+ }
+
+ public final class BidiFormatter {
+ method public static android.text.BidiFormatter getInstance();
+ method public static android.text.BidiFormatter getInstance(boolean);
+ method public static android.text.BidiFormatter getInstance(java.util.Locale);
+ method public boolean getStereoReset();
+ method public boolean isRtl(java.lang.String);
+ method public boolean isRtlContext();
+ method public java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic, boolean);
+ method public java.lang.String unicodeWrap(java.lang.String, android.text.TextDirectionHeuristic);
+ method public java.lang.String unicodeWrap(java.lang.String, boolean);
+ method public java.lang.String unicodeWrap(java.lang.String);
+ }
+
+ public static final class BidiFormatter.Builder {
+ ctor public BidiFormatter.Builder();
+ ctor public BidiFormatter.Builder(boolean);
+ ctor public BidiFormatter.Builder(java.util.Locale);
+ method public android.text.BidiFormatter build();
+ method public android.text.BidiFormatter.Builder setTextDirectionHeuristic(android.text.TextDirectionHeuristic);
+ method public android.text.BidiFormatter.Builder stereoReset(boolean);
+ }
+
+ public class BoringLayout extends android.text.Layout implements android.text.TextUtils.EllipsizeCallback {
+ ctor public BoringLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);
+ ctor public BoringLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);
+ method public void ellipsized(int, int);
+ method public int getBottomPadding();
+ method public int getEllipsisCount(int);
+ method public int getEllipsisStart(int);
+ method public boolean getLineContainsTab(int);
+ method public int getLineCount();
+ method public int getLineDescent(int);
+ method public final android.text.Layout.Directions getLineDirections(int);
+ method public int getLineStart(int);
+ method public int getLineTop(int);
+ method public int getParagraphDirection(int);
+ method public int getTopPadding();
+ method public static android.text.BoringLayout.Metrics isBoring(java.lang.CharSequence, android.text.TextPaint);
+ method public static android.text.BoringLayout.Metrics isBoring(java.lang.CharSequence, android.text.TextPaint, android.text.BoringLayout.Metrics);
+ method public static android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);
+ method public static android.text.BoringLayout make(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);
+ method public android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);
+ method public android.text.BoringLayout replaceOrMake(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);
+ }
+
+ public static class BoringLayout.Metrics extends android.graphics.Paint.FontMetricsInt {
+ ctor public BoringLayout.Metrics();
+ field public int width;
+ }
+
+ public abstract deprecated class ClipboardManager {
+ ctor public ClipboardManager();
+ method public abstract java.lang.CharSequence getText();
+ method public abstract boolean hasText();
+ method public abstract void setText(java.lang.CharSequence);
+ }
+
+ public class DynamicLayout extends android.text.Layout {
+ ctor public DynamicLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
+ ctor public DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
+ ctor public DynamicLayout(java.lang.CharSequence, java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int);
+ method public int getBottomPadding();
+ method public int getEllipsisCount(int);
+ method public int getEllipsisStart(int);
+ method public boolean getLineContainsTab(int);
+ method public int getLineCount();
+ method public int getLineDescent(int);
+ method public final android.text.Layout.Directions getLineDirections(int);
+ method public int getLineStart(int);
+ method public int getLineTop(int);
+ method public int getParagraphDirection(int);
+ method public int getTopPadding();
+ }
+
+ public abstract interface Editable implements java.lang.Appendable java.lang.CharSequence android.text.GetChars android.text.Spannable {
+ method public abstract android.text.Editable append(java.lang.CharSequence);
+ method public abstract android.text.Editable append(java.lang.CharSequence, int, int);
+ method public abstract android.text.Editable append(char);
+ method public abstract void clear();
+ method public abstract void clearSpans();
+ method public abstract android.text.Editable delete(int, int);
+ method public abstract android.text.InputFilter[] getFilters();
+ method public abstract android.text.Editable insert(int, java.lang.CharSequence, int, int);
+ method public abstract android.text.Editable insert(int, java.lang.CharSequence);
+ method public abstract android.text.Editable replace(int, int, java.lang.CharSequence, int, int);
+ method public abstract android.text.Editable replace(int, int, java.lang.CharSequence);
+ method public abstract void setFilters(android.text.InputFilter[]);
+ }
+
+ public static class Editable.Factory {
+ ctor public Editable.Factory();
+ method public static android.text.Editable.Factory getInstance();
+ method public android.text.Editable newEditable(java.lang.CharSequence);
+ }
+
+ public abstract interface GetChars implements java.lang.CharSequence {
+ method public abstract void getChars(int, int, char[], int);
+ }
+
+ public class Html {
+ method public static java.lang.String escapeHtml(java.lang.CharSequence);
+ method public static android.text.Spanned fromHtml(java.lang.String);
+ method public static android.text.Spanned fromHtml(java.lang.String, android.text.Html.ImageGetter, android.text.Html.TagHandler);
+ method public static java.lang.String toHtml(android.text.Spanned);
+ }
+
+ public static abstract interface Html.ImageGetter {
+ method public abstract android.graphics.drawable.Drawable getDrawable(java.lang.String);
+ }
+
+ public static abstract interface Html.TagHandler {
+ method public abstract void handleTag(boolean, java.lang.String, android.text.Editable, org.xml.sax.XMLReader);
+ }
+
+ public abstract interface InputFilter {
+ method public abstract java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int);
+ }
+
+ public static class InputFilter.AllCaps implements android.text.InputFilter {
+ ctor public InputFilter.AllCaps();
+ method public java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int);
+ }
+
+ public static class InputFilter.LengthFilter implements android.text.InputFilter {
+ ctor public InputFilter.LengthFilter(int);
+ method public java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int);
+ method public int getMax();
+ }
+
+ public abstract interface InputType {
+ field public static final int TYPE_CLASS_DATETIME = 4; // 0x4
+ field public static final int TYPE_CLASS_NUMBER = 2; // 0x2
+ field public static final int TYPE_CLASS_PHONE = 3; // 0x3
+ field public static final int TYPE_CLASS_TEXT = 1; // 0x1
+ field public static final int TYPE_DATETIME_VARIATION_DATE = 16; // 0x10
+ field public static final int TYPE_DATETIME_VARIATION_NORMAL = 0; // 0x0
+ field public static final int TYPE_DATETIME_VARIATION_TIME = 32; // 0x20
+ field public static final int TYPE_MASK_CLASS = 15; // 0xf
+ field public static final int TYPE_MASK_FLAGS = 16773120; // 0xfff000
+ field public static final int TYPE_MASK_VARIATION = 4080; // 0xff0
+ field public static final int TYPE_NULL = 0; // 0x0
+ field public static final int TYPE_NUMBER_FLAG_DECIMAL = 8192; // 0x2000
+ field public static final int TYPE_NUMBER_FLAG_SIGNED = 4096; // 0x1000
+ field public static final int TYPE_NUMBER_VARIATION_NORMAL = 0; // 0x0
+ field public static final int TYPE_NUMBER_VARIATION_PASSWORD = 16; // 0x10
+ field public static final int TYPE_TEXT_FLAG_AUTO_COMPLETE = 65536; // 0x10000
+ field public static final int TYPE_TEXT_FLAG_AUTO_CORRECT = 32768; // 0x8000
+ field public static final int TYPE_TEXT_FLAG_CAP_CHARACTERS = 4096; // 0x1000
+ field public static final int TYPE_TEXT_FLAG_CAP_SENTENCES = 16384; // 0x4000
+ field public static final int TYPE_TEXT_FLAG_CAP_WORDS = 8192; // 0x2000
+ field public static final int TYPE_TEXT_FLAG_IME_MULTI_LINE = 262144; // 0x40000
+ field public static final int TYPE_TEXT_FLAG_MULTI_LINE = 131072; // 0x20000
+ field public static final int TYPE_TEXT_FLAG_NO_SUGGESTIONS = 524288; // 0x80000
+ field public static final int TYPE_TEXT_VARIATION_EMAIL_ADDRESS = 32; // 0x20
+ field public static final int TYPE_TEXT_VARIATION_EMAIL_SUBJECT = 48; // 0x30
+ field public static final int TYPE_TEXT_VARIATION_FILTER = 176; // 0xb0
+ field public static final int TYPE_TEXT_VARIATION_LONG_MESSAGE = 80; // 0x50
+ field public static final int TYPE_TEXT_VARIATION_NORMAL = 0; // 0x0
+ field public static final int TYPE_TEXT_VARIATION_PASSWORD = 128; // 0x80
+ field public static final int TYPE_TEXT_VARIATION_PERSON_NAME = 96; // 0x60
+ field public static final int TYPE_TEXT_VARIATION_PHONETIC = 192; // 0xc0
+ field public static final int TYPE_TEXT_VARIATION_POSTAL_ADDRESS = 112; // 0x70
+ field public static final int TYPE_TEXT_VARIATION_SHORT_MESSAGE = 64; // 0x40
+ field public static final int TYPE_TEXT_VARIATION_URI = 16; // 0x10
+ field public static final int TYPE_TEXT_VARIATION_VISIBLE_PASSWORD = 144; // 0x90
+ field public static final int TYPE_TEXT_VARIATION_WEB_EDIT_TEXT = 160; // 0xa0
+ field public static final int TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS = 208; // 0xd0
+ field public static final int TYPE_TEXT_VARIATION_WEB_PASSWORD = 224; // 0xe0
+ }
+
+ public abstract class Layout {
+ ctor protected Layout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float);
+ method public void draw(android.graphics.Canvas);
+ method public void draw(android.graphics.Canvas, android.graphics.Path, android.graphics.Paint, int);
+ method public final android.text.Layout.Alignment getAlignment();
+ method public abstract int getBottomPadding();
+ method public void getCursorPath(int, android.graphics.Path, java.lang.CharSequence);
+ method public static float getDesiredWidth(java.lang.CharSequence, android.text.TextPaint);
+ method public static float getDesiredWidth(java.lang.CharSequence, int, int, android.text.TextPaint);
+ method public abstract int getEllipsisCount(int);
+ method public abstract int getEllipsisStart(int);
+ method public int getEllipsizedWidth();
+ method public int getHeight();
+ method public final int getLineAscent(int);
+ method public final int getLineBaseline(int);
+ method public final int getLineBottom(int);
+ method public int getLineBounds(int, android.graphics.Rect);
+ method public abstract boolean getLineContainsTab(int);
+ method public abstract int getLineCount();
+ method public abstract int getLineDescent(int);
+ method public abstract android.text.Layout.Directions getLineDirections(int);
+ method public final int getLineEnd(int);
+ method public int getLineForOffset(int);
+ method public int getLineForVertical(int);
+ method public float getLineLeft(int);
+ method public float getLineMax(int);
+ method public float getLineRight(int);
+ method public abstract int getLineStart(int);
+ method public abstract int getLineTop(int);
+ method public int getLineVisibleEnd(int);
+ method public float getLineWidth(int);
+ method public int getOffsetForHorizontal(int, float);
+ method public int getOffsetToLeftOf(int);
+ method public int getOffsetToRightOf(int);
+ method public final android.text.TextPaint getPaint();
+ method public final android.text.Layout.Alignment getParagraphAlignment(int);
+ method public abstract int getParagraphDirection(int);
+ method public final int getParagraphLeft(int);
+ method public final int getParagraphRight(int);
+ method public float getPrimaryHorizontal(int);
+ method public float getSecondaryHorizontal(int);
+ method public void getSelectionPath(int, int, android.graphics.Path);
+ method public final float getSpacingAdd();
+ method public final float getSpacingMultiplier();
+ method public final java.lang.CharSequence getText();
+ method public abstract int getTopPadding();
+ method public final int getWidth();
+ method public final void increaseWidthTo(int);
+ method public boolean isRtlCharAt(int);
+ method protected final boolean isSpanned();
+ field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
+ field public static final int BREAK_STRATEGY_HIGH_QUALITY = 1; // 0x1
+ field public static final int BREAK_STRATEGY_SIMPLE = 0; // 0x0
+ field public static final int DIR_LEFT_TO_RIGHT = 1; // 0x1
+ field public static final int DIR_RIGHT_TO_LEFT = -1; // 0xffffffff
+ field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2
+ field public static final int HYPHENATION_FREQUENCY_NONE = 0; // 0x0
+ field public static final int HYPHENATION_FREQUENCY_NORMAL = 1; // 0x1
+ }
+
+ public static final class Layout.Alignment extends java.lang.Enum {
+ method public static android.text.Layout.Alignment valueOf(java.lang.String);
+ method public static final android.text.Layout.Alignment[] values();
+ enum_constant public static final android.text.Layout.Alignment ALIGN_CENTER;
+ enum_constant public static final android.text.Layout.Alignment ALIGN_NORMAL;
+ enum_constant public static final android.text.Layout.Alignment ALIGN_OPPOSITE;
+ }
+
+ public static class Layout.Directions {
+ }
+
+ public abstract class LoginFilter implements android.text.InputFilter {
+ method public java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int);
+ method public abstract boolean isAllowed(char);
+ method public void onInvalidCharacter(char);
+ method public void onStart();
+ method public void onStop();
+ }
+
+ public static class LoginFilter.PasswordFilterGMail extends android.text.LoginFilter {
+ ctor public LoginFilter.PasswordFilterGMail();
+ ctor public LoginFilter.PasswordFilterGMail(boolean);
+ method public boolean isAllowed(char);
+ }
+
+ public static class LoginFilter.UsernameFilterGMail extends android.text.LoginFilter {
+ ctor public LoginFilter.UsernameFilterGMail();
+ ctor public LoginFilter.UsernameFilterGMail(boolean);
+ method public boolean isAllowed(char);
+ }
+
+ public static class LoginFilter.UsernameFilterGeneric extends android.text.LoginFilter {
+ ctor public LoginFilter.UsernameFilterGeneric();
+ ctor public LoginFilter.UsernameFilterGeneric(boolean);
+ method public boolean isAllowed(char);
+ }
+
+ public abstract interface NoCopySpan {
+ }
+
+ public static class NoCopySpan.Concrete implements android.text.NoCopySpan {
+ ctor public NoCopySpan.Concrete();
+ }
+
+ public abstract interface ParcelableSpan implements android.os.Parcelable {
+ method public abstract int getSpanTypeId();
+ }
+
+ public class Selection {
+ method public static boolean extendDown(android.text.Spannable, android.text.Layout);
+ method public static boolean extendLeft(android.text.Spannable, android.text.Layout);
+ method public static boolean extendRight(android.text.Spannable, android.text.Layout);
+ method public static final void extendSelection(android.text.Spannable, int);
+ method public static boolean extendToLeftEdge(android.text.Spannable, android.text.Layout);
+ method public static boolean extendToRightEdge(android.text.Spannable, android.text.Layout);
+ method public static boolean extendUp(android.text.Spannable, android.text.Layout);
+ method public static final int getSelectionEnd(java.lang.CharSequence);
+ method public static final int getSelectionStart(java.lang.CharSequence);
+ method public static boolean moveDown(android.text.Spannable, android.text.Layout);
+ method public static boolean moveLeft(android.text.Spannable, android.text.Layout);
+ method public static boolean moveRight(android.text.Spannable, android.text.Layout);
+ method public static boolean moveToLeftEdge(android.text.Spannable, android.text.Layout);
+ method public static boolean moveToRightEdge(android.text.Spannable, android.text.Layout);
+ method public static boolean moveUp(android.text.Spannable, android.text.Layout);
+ method public static final void removeSelection(android.text.Spannable);
+ method public static final void selectAll(android.text.Spannable);
+ method public static void setSelection(android.text.Spannable, int, int);
+ method public static final void setSelection(android.text.Spannable, int);
+ field public static final java.lang.Object SELECTION_END;
+ field public static final java.lang.Object SELECTION_START;
+ }
+
+ public abstract interface SpanWatcher implements android.text.NoCopySpan {
+ method public abstract void onSpanAdded(android.text.Spannable, java.lang.Object, int, int);
+ method public abstract void onSpanChanged(android.text.Spannable, java.lang.Object, int, int, int, int);
+ method public abstract void onSpanRemoved(android.text.Spannable, java.lang.Object, int, int);
+ }
+
+ public abstract interface Spannable implements android.text.Spanned {
+ method public abstract void removeSpan(java.lang.Object);
+ method public abstract void setSpan(java.lang.Object, int, int, int);
+ }
+
+ public static class Spannable.Factory {
+ ctor public Spannable.Factory();
+ method public static android.text.Spannable.Factory getInstance();
+ method public android.text.Spannable newSpannable(java.lang.CharSequence);
+ }
+
+ public class SpannableString extends android.text.SpannableStringInternal implements java.lang.CharSequence android.text.GetChars android.text.Spannable {
+ ctor public SpannableString(java.lang.CharSequence);
+ method public void removeSpan(java.lang.Object);
+ method public void setSpan(java.lang.Object, int, int, int);
+ method public final java.lang.CharSequence subSequence(int, int);
+ method public static android.text.SpannableString valueOf(java.lang.CharSequence);
+ }
+
+ public class SpannableStringBuilder implements java.lang.Appendable java.lang.CharSequence android.text.Editable android.text.GetChars android.text.Spannable {
+ ctor public SpannableStringBuilder();
+ ctor public SpannableStringBuilder(java.lang.CharSequence);
+ ctor public SpannableStringBuilder(java.lang.CharSequence, int, int);
+ method public android.text.SpannableStringBuilder append(java.lang.CharSequence);
+ method public android.text.SpannableStringBuilder append(java.lang.CharSequence, java.lang.Object, int);
+ method public android.text.SpannableStringBuilder append(java.lang.CharSequence, int, int);
+ method public android.text.SpannableStringBuilder append(char);
+ method public char charAt(int);
+ method public void clear();
+ method public void clearSpans();
+ method public android.text.SpannableStringBuilder delete(int, int);
+ method public void getChars(int, int, char[], int);
+ method public android.text.InputFilter[] getFilters();
+ method public int getSpanEnd(java.lang.Object);
+ method public int getSpanFlags(java.lang.Object);
+ method public int getSpanStart(java.lang.Object);
+ method public T[] getSpans(int, int, java.lang.Class<T>);
+ method public deprecated int getTextRunCursor(int, int, int, int, int, android.graphics.Paint);
+ method public int getTextWatcherDepth();
+ method public android.text.SpannableStringBuilder insert(int, java.lang.CharSequence, int, int);
+ method public android.text.SpannableStringBuilder insert(int, java.lang.CharSequence);
+ method public int length();
+ method public int nextSpanTransition(int, int, java.lang.Class);
+ method public void removeSpan(java.lang.Object);
+ method public android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence);
+ method public android.text.SpannableStringBuilder replace(int, int, java.lang.CharSequence, int, int);
+ method public void setFilters(android.text.InputFilter[]);
+ method public void setSpan(java.lang.Object, int, int, int);
+ method public java.lang.CharSequence subSequence(int, int);
+ method public static android.text.SpannableStringBuilder valueOf(java.lang.CharSequence);
+ }
+
+ abstract class SpannableStringInternal {
+ method public final char charAt(int);
+ method public final void getChars(int, int, char[], int);
+ method public int getSpanEnd(java.lang.Object);
+ method public int getSpanFlags(java.lang.Object);
+ method public int getSpanStart(java.lang.Object);
+ method public T[] getSpans(int, int, java.lang.Class<T>);
+ method public final int length();
+ method public int nextSpanTransition(int, int, java.lang.Class);
+ method public final java.lang.String toString();
+ }
+
+ public abstract interface Spanned implements java.lang.CharSequence {
+ method public abstract int getSpanEnd(java.lang.Object);
+ method public abstract int getSpanFlags(java.lang.Object);
+ method public abstract int getSpanStart(java.lang.Object);
+ method public abstract T[] getSpans(int, int, java.lang.Class<T>);
+ method public abstract int nextSpanTransition(int, int, java.lang.Class);
+ field public static final int SPAN_COMPOSING = 256; // 0x100
+ field public static final int SPAN_EXCLUSIVE_EXCLUSIVE = 33; // 0x21
+ field public static final int SPAN_EXCLUSIVE_INCLUSIVE = 34; // 0x22
+ field public static final int SPAN_INCLUSIVE_EXCLUSIVE = 17; // 0x11
+ field public static final int SPAN_INCLUSIVE_INCLUSIVE = 18; // 0x12
+ field public static final int SPAN_INTERMEDIATE = 512; // 0x200
+ field public static final int SPAN_MARK_MARK = 17; // 0x11
+ field public static final int SPAN_MARK_POINT = 18; // 0x12
+ field public static final int SPAN_PARAGRAPH = 51; // 0x33
+ field public static final int SPAN_POINT_MARK = 33; // 0x21
+ field public static final int SPAN_POINT_MARK_MASK = 51; // 0x33
+ field public static final int SPAN_POINT_POINT = 34; // 0x22
+ field public static final int SPAN_PRIORITY = 16711680; // 0xff0000
+ field public static final int SPAN_PRIORITY_SHIFT = 16; // 0x10
+ field public static final int SPAN_USER = -16777216; // 0xff000000
+ field public static final int SPAN_USER_SHIFT = 24; // 0x18
+ }
+
+ public final class SpannedString extends android.text.SpannableStringInternal implements java.lang.CharSequence android.text.GetChars android.text.Spanned {
+ ctor public SpannedString(java.lang.CharSequence);
+ method public java.lang.CharSequence subSequence(int, int);
+ method public static android.text.SpannedString valueOf(java.lang.CharSequence);
+ }
+
+ public class StaticLayout extends android.text.Layout {
+ ctor public StaticLayout(java.lang.CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
+ ctor public StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean);
+ ctor public StaticLayout(java.lang.CharSequence, int, int, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, boolean, android.text.TextUtils.TruncateAt, int);
+ method public int getBottomPadding();
+ method public int getEllipsisCount(int);
+ method public int getEllipsisStart(int);
+ method public boolean getLineContainsTab(int);
+ method public int getLineCount();
+ method public int getLineDescent(int);
+ method public final android.text.Layout.Directions getLineDirections(int);
+ method public int getLineStart(int);
+ method public int getLineTop(int);
+ method public int getParagraphDirection(int);
+ method public int getTopPadding();
+ }
+
+ public static final class StaticLayout.Builder {
+ method public android.text.StaticLayout build();
+ method public static android.text.StaticLayout.Builder obtain(java.lang.CharSequence, int, int, android.text.TextPaint, int);
+ method public android.text.StaticLayout.Builder setAlignment(android.text.Layout.Alignment);
+ method public android.text.StaticLayout.Builder setBreakStrategy(int);
+ method public android.text.StaticLayout.Builder setEllipsize(android.text.TextUtils.TruncateAt);
+ method public android.text.StaticLayout.Builder setEllipsizedWidth(int);
+ method public android.text.StaticLayout.Builder setHyphenationFrequency(int);
+ method public android.text.StaticLayout.Builder setIncludePad(boolean);
+ method public android.text.StaticLayout.Builder setIndents(int[], int[]);
+ method public android.text.StaticLayout.Builder setLineSpacing(float, float);
+ method public android.text.StaticLayout.Builder setMaxLines(int);
+ method public android.text.StaticLayout.Builder setText(java.lang.CharSequence);
+ method public android.text.StaticLayout.Builder setTextDirection(android.text.TextDirectionHeuristic);
+ }
+
+ public abstract interface TextDirectionHeuristic {
+ method public abstract boolean isRtl(char[], int, int);
+ method public abstract boolean isRtl(java.lang.CharSequence, int, int);
+ }
+
+ public class TextDirectionHeuristics {
+ ctor public TextDirectionHeuristics();
+ field public static final android.text.TextDirectionHeuristic ANYRTL_LTR;
+ field public static final android.text.TextDirectionHeuristic FIRSTSTRONG_LTR;
+ field public static final android.text.TextDirectionHeuristic FIRSTSTRONG_RTL;
+ field public static final android.text.TextDirectionHeuristic LOCALE;
+ field public static final android.text.TextDirectionHeuristic LTR;
+ field public static final android.text.TextDirectionHeuristic RTL;
+ }
+
+ public class TextPaint extends android.graphics.Paint {
+ ctor public TextPaint();
+ ctor public TextPaint(int);
+ ctor public TextPaint(android.graphics.Paint);
+ method public void set(android.text.TextPaint);
+ field public int baselineShift;
+ field public int bgColor;
+ field public float density;
+ field public int[] drawableState;
+ field public int linkColor;
+ }
+
+ public class TextUtils {
+ method public static java.lang.CharSequence commaEllipsize(java.lang.CharSequence, android.text.TextPaint, float, java.lang.String, java.lang.String);
+ method public static java.lang.CharSequence concat(java.lang.CharSequence...);
+ method public static void copySpansFrom(android.text.Spanned, int, int, java.lang.Class, android.text.Spannable, int);
+ method public static void dumpSpans(java.lang.CharSequence, android.util.Printer, java.lang.String);
+ method public static java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt);
+ method public static java.lang.CharSequence ellipsize(java.lang.CharSequence, android.text.TextPaint, float, android.text.TextUtils.TruncateAt, boolean, android.text.TextUtils.EllipsizeCallback);
+ method public static boolean equals(java.lang.CharSequence, java.lang.CharSequence);
+ method public static java.lang.CharSequence expandTemplate(java.lang.CharSequence, java.lang.CharSequence...);
+ method public static int getCapsMode(java.lang.CharSequence, int, int);
+ method public static void getChars(java.lang.CharSequence, int, int, char[], int);
+ method public static int getLayoutDirectionFromLocale(java.util.Locale);
+ method public static int getOffsetAfter(java.lang.CharSequence, int);
+ method public static int getOffsetBefore(java.lang.CharSequence, int);
+ method public static deprecated java.lang.CharSequence getReverse(java.lang.CharSequence, int, int);
+ method public static int getTrimmedLength(java.lang.CharSequence);
+ method public static java.lang.String htmlEncode(java.lang.String);
+ method public static int indexOf(java.lang.CharSequence, char);
+ method public static int indexOf(java.lang.CharSequence, char, int);
+ method public static int indexOf(java.lang.CharSequence, char, int, int);
+ method public static int indexOf(java.lang.CharSequence, java.lang.CharSequence);
+ method public static int indexOf(java.lang.CharSequence, java.lang.CharSequence, int);
+ method public static int indexOf(java.lang.CharSequence, java.lang.CharSequence, int, int);
+ method public static boolean isDigitsOnly(java.lang.CharSequence);
+ method public static boolean isEmpty(java.lang.CharSequence);
+ method public static boolean isGraphic(java.lang.CharSequence);
+ method public static deprecated boolean isGraphic(char);
+ method public static java.lang.String join(java.lang.CharSequence, java.lang.Object[]);
+ method public static java.lang.String join(java.lang.CharSequence, java.lang.Iterable);
+ method public static int lastIndexOf(java.lang.CharSequence, char);
+ method public static int lastIndexOf(java.lang.CharSequence, char, int);
+ method public static int lastIndexOf(java.lang.CharSequence, char, int, int);
+ method public static boolean regionMatches(java.lang.CharSequence, int, java.lang.CharSequence, int, int);
+ method public static java.lang.CharSequence replace(java.lang.CharSequence, java.lang.String[], java.lang.CharSequence[]);
+ method public static java.lang.String[] split(java.lang.String, java.lang.String);
+ method public static java.lang.String[] split(java.lang.String, java.util.regex.Pattern);
+ method public static java.lang.CharSequence stringOrSpannedString(java.lang.CharSequence);
+ method public static java.lang.String substring(java.lang.CharSequence, int, int);
+ method public static void writeToParcel(java.lang.CharSequence, android.os.Parcel, int);
+ field public static final int CAP_MODE_CHARACTERS = 4096; // 0x1000
+ field public static final int CAP_MODE_SENTENCES = 16384; // 0x4000
+ field public static final int CAP_MODE_WORDS = 8192; // 0x2000
+ field public static final android.os.Parcelable.Creator<java.lang.CharSequence> CHAR_SEQUENCE_CREATOR;
+ }
+
+ public static abstract interface TextUtils.EllipsizeCallback {
+ method public abstract void ellipsized(int, int);
+ }
+
+ public static class TextUtils.SimpleStringSplitter implements java.util.Iterator android.text.TextUtils.StringSplitter {
+ ctor public TextUtils.SimpleStringSplitter(char);
+ method public boolean hasNext();
+ method public java.util.Iterator<java.lang.String> iterator();
+ method public java.lang.String next();
+ method public void remove();
+ method public void setString(java.lang.String);
+ }
+
+ public static abstract interface TextUtils.StringSplitter implements java.lang.Iterable {
+ method public abstract void setString(java.lang.String);
+ }
+
+ public static final class TextUtils.TruncateAt extends java.lang.Enum {
+ method public static android.text.TextUtils.TruncateAt valueOf(java.lang.String);
+ method public static final android.text.TextUtils.TruncateAt[] values();
+ enum_constant public static final android.text.TextUtils.TruncateAt END;
+ enum_constant public static final android.text.TextUtils.TruncateAt MARQUEE;
+ enum_constant public static final android.text.TextUtils.TruncateAt MIDDLE;
+ enum_constant public static final android.text.TextUtils.TruncateAt START;
+ }
+
+ public abstract interface TextWatcher implements android.text.NoCopySpan {
+ method public abstract void afterTextChanged(android.text.Editable);
+ method public abstract void beforeTextChanged(java.lang.CharSequence, int, int, int);
+ method public abstract void onTextChanged(java.lang.CharSequence, int, int, int);
+ }
+
+}
+
+package android.text.format {
+
+ public class DateFormat {
+ ctor public DateFormat();
+ method public static java.lang.CharSequence format(java.lang.CharSequence, long);
+ method public static java.lang.CharSequence format(java.lang.CharSequence, java.util.Date);
+ method public static java.lang.CharSequence format(java.lang.CharSequence, java.util.Calendar);
+ method public static java.lang.String getBestDateTimePattern(java.util.Locale, java.lang.String);
+ method public static java.text.DateFormat getDateFormat(android.content.Context);
+ method public static char[] getDateFormatOrder(android.content.Context);
+ method public static java.text.DateFormat getLongDateFormat(android.content.Context);
+ method public static java.text.DateFormat getMediumDateFormat(android.content.Context);
+ method public static java.text.DateFormat getTimeFormat(android.content.Context);
+ method public static boolean is24HourFormat(android.content.Context);
+ }
+
+ public class DateUtils {
+ ctor public DateUtils();
+ method public static java.lang.String formatDateRange(android.content.Context, long, long, int);
+ method public static java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int);
+ method public static java.util.Formatter formatDateRange(android.content.Context, java.util.Formatter, long, long, int, java.lang.String);
+ method public static java.lang.String formatDateTime(android.content.Context, long, int);
+ method public static java.lang.String formatElapsedTime(long);
+ method public static java.lang.String formatElapsedTime(java.lang.StringBuilder, long);
+ method public static final java.lang.CharSequence formatSameDayTime(long, long, int, int);
+ method public static deprecated java.lang.String getAMPMString(int);
+ method public static deprecated java.lang.String getDayOfWeekString(int, int);
+ method public static deprecated java.lang.String getMonthString(int, int);
+ method public static java.lang.CharSequence getRelativeDateTimeString(android.content.Context, long, long, long, int);
+ method public static java.lang.CharSequence getRelativeTimeSpanString(long);
+ method public static java.lang.CharSequence getRelativeTimeSpanString(long, long, long);
+ method public static java.lang.CharSequence getRelativeTimeSpanString(long, long, long, int);
+ method public static java.lang.CharSequence getRelativeTimeSpanString(android.content.Context, long, boolean);
+ method public static java.lang.CharSequence getRelativeTimeSpanString(android.content.Context, long);
+ method public static boolean isToday(long);
+ field public static final deprecated java.lang.String ABBREV_MONTH_FORMAT = "%b";
+ field public static final java.lang.String ABBREV_WEEKDAY_FORMAT = "%a";
+ field public static final long DAY_IN_MILLIS = 86400000L; // 0x5265c00L
+ field public static final deprecated int FORMAT_12HOUR = 64; // 0x40
+ field public static final deprecated int FORMAT_24HOUR = 128; // 0x80
+ field public static final int FORMAT_ABBREV_ALL = 524288; // 0x80000
+ field public static final int FORMAT_ABBREV_MONTH = 65536; // 0x10000
+ field public static final int FORMAT_ABBREV_RELATIVE = 262144; // 0x40000
+ field public static final int FORMAT_ABBREV_TIME = 16384; // 0x4000
+ field public static final int FORMAT_ABBREV_WEEKDAY = 32768; // 0x8000
+ field public static final deprecated int FORMAT_CAP_AMPM = 256; // 0x100
+ field public static final deprecated int FORMAT_CAP_MIDNIGHT = 4096; // 0x1000
+ field public static final deprecated int FORMAT_CAP_NOON = 1024; // 0x400
+ field public static final deprecated int FORMAT_CAP_NOON_MIDNIGHT = 5120; // 0x1400
+ field public static final int FORMAT_NO_MIDNIGHT = 2048; // 0x800
+ field public static final int FORMAT_NO_MONTH_DAY = 32; // 0x20
+ field public static final int FORMAT_NO_NOON = 512; // 0x200
+ field public static final deprecated int FORMAT_NO_NOON_MIDNIGHT = 2560; // 0xa00
+ field public static final int FORMAT_NO_YEAR = 8; // 0x8
+ field public static final int FORMAT_NUMERIC_DATE = 131072; // 0x20000
+ field public static final int FORMAT_SHOW_DATE = 16; // 0x10
+ field public static final int FORMAT_SHOW_TIME = 1; // 0x1
+ field public static final int FORMAT_SHOW_WEEKDAY = 2; // 0x2
+ field public static final int FORMAT_SHOW_YEAR = 4; // 0x4
+ field public static final deprecated int FORMAT_UTC = 8192; // 0x2000
+ field public static final long HOUR_IN_MILLIS = 3600000L; // 0x36ee80L
+ field public static final deprecated java.lang.String HOUR_MINUTE_24 = "%H:%M";
+ field public static final deprecated int LENGTH_LONG = 10; // 0xa
+ field public static final deprecated int LENGTH_MEDIUM = 20; // 0x14
+ field public static final deprecated int LENGTH_SHORT = 30; // 0x1e
+ field public static final deprecated int LENGTH_SHORTER = 40; // 0x28
+ field public static final deprecated int LENGTH_SHORTEST = 50; // 0x32
+ field public static final long MINUTE_IN_MILLIS = 60000L; // 0xea60L
+ field public static final java.lang.String MONTH_DAY_FORMAT = "%-d";
+ field public static final java.lang.String MONTH_FORMAT = "%B";
+ field public static final java.lang.String NUMERIC_MONTH_FORMAT = "%m";
+ field public static final long SECOND_IN_MILLIS = 1000L; // 0x3e8L
+ field public static final java.lang.String WEEKDAY_FORMAT = "%A";
+ field public static final long WEEK_IN_MILLIS = 604800000L; // 0x240c8400L
+ field public static final java.lang.String YEAR_FORMAT = "%Y";
+ field public static final java.lang.String YEAR_FORMAT_TWO_DIGITS = "%g";
+ field public static final long YEAR_IN_MILLIS = 31449600000L; // 0x7528ad000L
+ field public static final deprecated int[] sameMonthTable;
+ field public static final deprecated int[] sameYearTable;
+ }
+
+ public final class Formatter {
+ ctor public Formatter();
+ method public static java.lang.String formatFileSize(android.content.Context, long);
+ method public static deprecated java.lang.String formatIpAddress(int);
+ method public static java.lang.String formatShortFileSize(android.content.Context, long);
+ }
+
+ public deprecated class Time {
+ ctor public Time(java.lang.String);
+ ctor public Time();
+ ctor public Time(android.text.format.Time);
+ method public boolean after(android.text.format.Time);
+ method public boolean before(android.text.format.Time);
+ method public void clear(java.lang.String);
+ method public static int compare(android.text.format.Time, android.text.format.Time);
+ method public java.lang.String format(java.lang.String);
+ method public java.lang.String format2445();
+ method public java.lang.String format3339(boolean);
+ method public int getActualMaximum(int);
+ method public static java.lang.String getCurrentTimezone();
+ method public static int getJulianDay(long, long);
+ method public static int getJulianMondayFromWeeksSinceEpoch(int);
+ method public int getWeekNumber();
+ method public static int getWeeksSinceEpochFromJulianDay(int, int);
+ method public static boolean isEpoch(android.text.format.Time);
+ method public long normalize(boolean);
+ method public boolean parse(java.lang.String);
+ method public boolean parse3339(java.lang.String);
+ method public void set(long);
+ method public void set(android.text.format.Time);
+ method public void set(int, int, int, int, int, int);
+ method public void set(int, int, int);
+ method public long setJulianDay(int);
+ method public void setToNow();
+ method public void switchTimezone(java.lang.String);
+ method public long toMillis(boolean);
+ field public static final int EPOCH_JULIAN_DAY = 2440588; // 0x253d8c
+ field public static final int FRIDAY = 5; // 0x5
+ field public static final int HOUR = 3; // 0x3
+ field public static final int MINUTE = 2; // 0x2
+ field public static final int MONDAY = 1; // 0x1
+ field public static final int MONDAY_BEFORE_JULIAN_EPOCH = 2440585; // 0x253d89
+ field public static final int MONTH = 5; // 0x5
+ field public static final int MONTH_DAY = 4; // 0x4
+ field public static final int SATURDAY = 6; // 0x6
+ field public static final int SECOND = 1; // 0x1
+ field public static final int SUNDAY = 0; // 0x0
+ field public static final int THURSDAY = 4; // 0x4
+ field public static final java.lang.String TIMEZONE_UTC = "UTC";
+ field public static final int TUESDAY = 2; // 0x2
+ field public static final int WEDNESDAY = 3; // 0x3
+ field public static final int WEEK_DAY = 7; // 0x7
+ field public static final int WEEK_NUM = 9; // 0x9
+ field public static final int YEAR = 6; // 0x6
+ field public static final int YEAR_DAY = 8; // 0x8
+ field public boolean allDay;
+ field public long gmtoff;
+ field public int hour;
+ field public int isDst;
+ field public int minute;
+ field public int month;
+ field public int monthDay;
+ field public int second;
+ field public java.lang.String timezone;
+ field public int weekDay;
+ field public int year;
+ field public int yearDay;
+ }
+
+}
+
+package android.text.method {
+
+ public class ArrowKeyMovementMethod extends android.text.method.BaseMovementMethod implements android.text.method.MovementMethod {
+ ctor public ArrowKeyMovementMethod();
+ method public static android.text.method.MovementMethod getInstance();
+ }
+
+ public abstract class BaseKeyListener extends android.text.method.MetaKeyKeyListener implements android.text.method.KeyListener {
+ ctor public BaseKeyListener();
+ method public boolean backspace(android.view.View, android.text.Editable, int, android.view.KeyEvent);
+ method public boolean forwardDelete(android.view.View, android.text.Editable, int, android.view.KeyEvent);
+ method public boolean onKeyOther(android.view.View, android.text.Editable, android.view.KeyEvent);
+ }
+
+ public class BaseMovementMethod implements android.text.method.MovementMethod {
+ ctor public BaseMovementMethod();
+ method protected boolean bottom(android.widget.TextView, android.text.Spannable);
+ method public boolean canSelectArbitrarily();
+ method protected boolean down(android.widget.TextView, android.text.Spannable);
+ method protected boolean end(android.widget.TextView, android.text.Spannable);
+ method protected int getMovementMetaState(android.text.Spannable, android.view.KeyEvent);
+ method protected boolean handleMovementKey(android.widget.TextView, android.text.Spannable, int, int, android.view.KeyEvent);
+ method protected boolean home(android.widget.TextView, android.text.Spannable);
+ method public void initialize(android.widget.TextView, android.text.Spannable);
+ method protected boolean left(android.widget.TextView, android.text.Spannable);
+ method protected boolean lineEnd(android.widget.TextView, android.text.Spannable);
+ method protected boolean lineStart(android.widget.TextView, android.text.Spannable);
+ method public boolean onGenericMotionEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ method public boolean onKeyDown(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent);
+ method public boolean onKeyOther(android.widget.TextView, android.text.Spannable, android.view.KeyEvent);
+ method public boolean onKeyUp(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent);
+ method public void onTakeFocus(android.widget.TextView, android.text.Spannable, int);
+ method public boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ method public boolean onTrackballEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ method protected boolean pageDown(android.widget.TextView, android.text.Spannable);
+ method protected boolean pageUp(android.widget.TextView, android.text.Spannable);
+ method protected boolean right(android.widget.TextView, android.text.Spannable);
+ method protected boolean top(android.widget.TextView, android.text.Spannable);
+ method protected boolean up(android.widget.TextView, android.text.Spannable);
+ }
+
+ public class CharacterPickerDialog extends android.app.Dialog implements android.widget.AdapterView.OnItemClickListener android.view.View.OnClickListener {
+ ctor public CharacterPickerDialog(android.content.Context, android.view.View, android.text.Editable, java.lang.String, boolean);
+ method public void onClick(android.view.View);
+ method public void onItemClick(android.widget.AdapterView, android.view.View, int, long);
+ }
+
+ public class DateKeyListener extends android.text.method.NumberKeyListener {
+ ctor public DateKeyListener();
+ method protected char[] getAcceptedChars();
+ method public int getInputType();
+ method public static android.text.method.DateKeyListener getInstance();
+ field public static final char[] CHARACTERS;
+ }
+
+ public class DateTimeKeyListener extends android.text.method.NumberKeyListener {
+ ctor public DateTimeKeyListener();
+ method protected char[] getAcceptedChars();
+ method public int getInputType();
+ method public static android.text.method.DateTimeKeyListener getInstance();
+ field public static final char[] CHARACTERS;
+ }
+
+ public class DialerKeyListener extends android.text.method.NumberKeyListener {
+ ctor public DialerKeyListener();
+ method protected char[] getAcceptedChars();
+ method public int getInputType();
+ method public static android.text.method.DialerKeyListener getInstance();
+ field public static final char[] CHARACTERS;
+ }
+
+ public class DigitsKeyListener extends android.text.method.NumberKeyListener {
+ ctor public DigitsKeyListener();
+ ctor public DigitsKeyListener(boolean, boolean);
+ method protected char[] getAcceptedChars();
+ method public int getInputType();
+ method public static android.text.method.DigitsKeyListener getInstance();
+ method public static android.text.method.DigitsKeyListener getInstance(boolean, boolean);
+ method public static android.text.method.DigitsKeyListener getInstance(java.lang.String);
+ }
+
+ public class HideReturnsTransformationMethod extends android.text.method.ReplacementTransformationMethod {
+ ctor public HideReturnsTransformationMethod();
+ method public static android.text.method.HideReturnsTransformationMethod getInstance();
+ method protected char[] getOriginal();
+ method protected char[] getReplacement();
+ }
+
+ public abstract interface KeyListener {
+ method public abstract void clearMetaKeyState(android.view.View, android.text.Editable, int);
+ method public abstract int getInputType();
+ method public abstract boolean onKeyDown(android.view.View, android.text.Editable, int, android.view.KeyEvent);
+ method public abstract boolean onKeyOther(android.view.View, android.text.Editable, android.view.KeyEvent);
+ method public abstract boolean onKeyUp(android.view.View, android.text.Editable, int, android.view.KeyEvent);
+ }
+
+ public class LinkMovementMethod extends android.text.method.ScrollingMovementMethod {
+ ctor public LinkMovementMethod();
+ method public static android.text.method.MovementMethod getInstance();
+ }
+
+ public abstract class MetaKeyKeyListener {
+ ctor public MetaKeyKeyListener();
+ method public static void adjustMetaAfterKeypress(android.text.Spannable);
+ method public static long adjustMetaAfterKeypress(long);
+ method public void clearMetaKeyState(android.view.View, android.text.Editable, int);
+ method public static void clearMetaKeyState(android.text.Editable, int);
+ method public long clearMetaKeyState(long, int);
+ method public static final int getMetaState(java.lang.CharSequence);
+ method public static final int getMetaState(java.lang.CharSequence, android.view.KeyEvent);
+ method public static final int getMetaState(java.lang.CharSequence, int);
+ method public static final int getMetaState(java.lang.CharSequence, int, android.view.KeyEvent);
+ method public static final int getMetaState(long);
+ method public static final int getMetaState(long, int);
+ method public static long handleKeyDown(long, int, android.view.KeyEvent);
+ method public static long handleKeyUp(long, int, android.view.KeyEvent);
+ method public static boolean isMetaTracker(java.lang.CharSequence, java.lang.Object);
+ method public static boolean isSelectingMetaTracker(java.lang.CharSequence, java.lang.Object);
+ method public boolean onKeyDown(android.view.View, android.text.Editable, int, android.view.KeyEvent);
+ method public boolean onKeyUp(android.view.View, android.text.Editable, int, android.view.KeyEvent);
+ method protected static void resetLockedMeta(android.text.Spannable);
+ method public static long resetLockedMeta(long);
+ method public static void resetMetaState(android.text.Spannable);
+ field public static final int META_ALT_LOCKED = 512; // 0x200
+ field public static final int META_ALT_ON = 2; // 0x2
+ field public static final int META_CAP_LOCKED = 256; // 0x100
+ field public static final int META_SHIFT_ON = 1; // 0x1
+ field public static final int META_SYM_LOCKED = 1024; // 0x400
+ field public static final int META_SYM_ON = 4; // 0x4
+ }
+
+ public abstract interface MovementMethod {
+ method public abstract boolean canSelectArbitrarily();
+ method public abstract void initialize(android.widget.TextView, android.text.Spannable);
+ method public abstract boolean onGenericMotionEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ method public abstract boolean onKeyDown(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent);
+ method public abstract boolean onKeyOther(android.widget.TextView, android.text.Spannable, android.view.KeyEvent);
+ method public abstract boolean onKeyUp(android.widget.TextView, android.text.Spannable, int, android.view.KeyEvent);
+ method public abstract void onTakeFocus(android.widget.TextView, android.text.Spannable, int);
+ method public abstract boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ method public abstract boolean onTrackballEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ }
+
+ public class MultiTapKeyListener extends android.text.method.BaseKeyListener implements android.text.SpanWatcher {
+ ctor public MultiTapKeyListener(android.text.method.TextKeyListener.Capitalize, boolean);
+ method public int getInputType();
+ method public static android.text.method.MultiTapKeyListener getInstance(boolean, android.text.method.TextKeyListener.Capitalize);
+ method public void onSpanAdded(android.text.Spannable, java.lang.Object, int, int);
+ method public void onSpanChanged(android.text.Spannable, java.lang.Object, int, int, int, int);
+ method public void onSpanRemoved(android.text.Spannable, java.lang.Object, int, int);
+ }
+
+ public abstract class NumberKeyListener extends android.text.method.BaseKeyListener implements android.text.InputFilter {
+ ctor public NumberKeyListener();
+ method public java.lang.CharSequence filter(java.lang.CharSequence, int, int, android.text.Spanned, int, int);
+ method protected abstract char[] getAcceptedChars();
+ method protected int lookup(android.view.KeyEvent, android.text.Spannable);
+ method protected static boolean ok(char[], char);
+ }
+
+ public class PasswordTransformationMethod implements android.text.TextWatcher android.text.method.TransformationMethod {
+ ctor public PasswordTransformationMethod();
+ method public void afterTextChanged(android.text.Editable);
+ method public void beforeTextChanged(java.lang.CharSequence, int, int, int);
+ method public static android.text.method.PasswordTransformationMethod getInstance();
+ method public java.lang.CharSequence getTransformation(java.lang.CharSequence, android.view.View);
+ method public void onFocusChanged(android.view.View, java.lang.CharSequence, boolean, int, android.graphics.Rect);
+ method public void onTextChanged(java.lang.CharSequence, int, int, int);
+ }
+
+ public class QwertyKeyListener extends android.text.method.BaseKeyListener {
+ ctor public QwertyKeyListener(android.text.method.TextKeyListener.Capitalize, boolean);
+ method public int getInputType();
+ method public static android.text.method.QwertyKeyListener getInstance(boolean, android.text.method.TextKeyListener.Capitalize);
+ method public static android.text.method.QwertyKeyListener getInstanceForFullKeyboard();
+ method public static void markAsReplaced(android.text.Spannable, int, int, java.lang.String);
+ }
+
+ public abstract class ReplacementTransformationMethod implements android.text.method.TransformationMethod {
+ ctor public ReplacementTransformationMethod();
+ method protected abstract char[] getOriginal();
+ method protected abstract char[] getReplacement();
+ method public java.lang.CharSequence getTransformation(java.lang.CharSequence, android.view.View);
+ method public void onFocusChanged(android.view.View, java.lang.CharSequence, boolean, int, android.graphics.Rect);
+ }
+
+ public class ScrollingMovementMethod extends android.text.method.BaseMovementMethod implements android.text.method.MovementMethod {
+ ctor public ScrollingMovementMethod();
+ method public static android.text.method.MovementMethod getInstance();
+ }
+
+ public class SingleLineTransformationMethod extends android.text.method.ReplacementTransformationMethod {
+ ctor public SingleLineTransformationMethod();
+ method public static android.text.method.SingleLineTransformationMethod getInstance();
+ method protected char[] getOriginal();
+ method protected char[] getReplacement();
+ }
+
+ public class TextKeyListener extends android.text.method.BaseKeyListener implements android.text.SpanWatcher {
+ ctor public TextKeyListener(android.text.method.TextKeyListener.Capitalize, boolean);
+ method public static void clear(android.text.Editable);
+ method public int getInputType();
+ method public static android.text.method.TextKeyListener getInstance(boolean, android.text.method.TextKeyListener.Capitalize);
+ method public static android.text.method.TextKeyListener getInstance();
+ method public void onSpanAdded(android.text.Spannable, java.lang.Object, int, int);
+ method public void onSpanChanged(android.text.Spannable, java.lang.Object, int, int, int, int);
+ method public void onSpanRemoved(android.text.Spannable, java.lang.Object, int, int);
+ method public void release();
+ method public static boolean shouldCap(android.text.method.TextKeyListener.Capitalize, java.lang.CharSequence, int);
+ }
+
+ public static final class TextKeyListener.Capitalize extends java.lang.Enum {
+ method public static android.text.method.TextKeyListener.Capitalize valueOf(java.lang.String);
+ method public static final android.text.method.TextKeyListener.Capitalize[] values();
+ enum_constant public static final android.text.method.TextKeyListener.Capitalize CHARACTERS;
+ enum_constant public static final android.text.method.TextKeyListener.Capitalize NONE;
+ enum_constant public static final android.text.method.TextKeyListener.Capitalize SENTENCES;
+ enum_constant public static final android.text.method.TextKeyListener.Capitalize WORDS;
+ }
+
+ public class TimeKeyListener extends android.text.method.NumberKeyListener {
+ ctor public TimeKeyListener();
+ method protected char[] getAcceptedChars();
+ method public int getInputType();
+ method public static android.text.method.TimeKeyListener getInstance();
+ field public static final char[] CHARACTERS;
+ }
+
+ public class Touch {
+ method public static int getInitialScrollX(android.widget.TextView, android.text.Spannable);
+ method public static int getInitialScrollY(android.widget.TextView, android.text.Spannable);
+ method public static boolean onTouchEvent(android.widget.TextView, android.text.Spannable, android.view.MotionEvent);
+ method public static void scrollTo(android.widget.TextView, android.text.Layout, int, int);
+ }
+
+ public abstract interface TransformationMethod {
+ method public abstract java.lang.CharSequence getTransformation(java.lang.CharSequence, android.view.View);
+ method public abstract void onFocusChanged(android.view.View, java.lang.CharSequence, boolean, int, android.graphics.Rect);
+ }
+
+}
+
+package android.text.style {
+
+ public class AbsoluteSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public AbsoluteSizeSpan(int);
+ ctor public AbsoluteSizeSpan(int, boolean);
+ ctor public AbsoluteSizeSpan(android.os.Parcel);
+ method public int describeContents();
+ method public boolean getDip();
+ method public int getSize();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public abstract interface AlignmentSpan implements android.text.style.ParagraphStyle {
+ method public abstract android.text.Layout.Alignment getAlignment();
+ }
+
+ public static class AlignmentSpan.Standard implements android.text.style.AlignmentSpan android.text.ParcelableSpan {
+ ctor public AlignmentSpan.Standard(android.text.Layout.Alignment);
+ ctor public AlignmentSpan.Standard(android.os.Parcel);
+ method public int describeContents();
+ method public android.text.Layout.Alignment getAlignment();
+ method public int getSpanTypeId();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class BackgroundColorSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan android.text.style.UpdateAppearance {
+ ctor public BackgroundColorSpan(int);
+ ctor public BackgroundColorSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getBackgroundColor();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class BulletSpan implements android.text.style.LeadingMarginSpan android.text.ParcelableSpan {
+ ctor public BulletSpan();
+ ctor public BulletSpan(int);
+ ctor public BulletSpan(int, int);
+ ctor public BulletSpan(android.os.Parcel);
+ method public int describeContents();
+ method public void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout);
+ method public int getLeadingMargin(boolean);
+ method public int getSpanTypeId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int STANDARD_GAP_WIDTH = 2; // 0x2
+ }
+
+ public abstract class CharacterStyle {
+ ctor public CharacterStyle();
+ method public android.text.style.CharacterStyle getUnderlying();
+ method public abstract void updateDrawState(android.text.TextPaint);
+ method public static android.text.style.CharacterStyle wrap(android.text.style.CharacterStyle);
+ }
+
+ public abstract class ClickableSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
+ ctor public ClickableSpan();
+ method public abstract void onClick(android.view.View);
+ method public void updateDrawState(android.text.TextPaint);
+ }
+
+ public class DrawableMarginSpan implements android.text.style.LeadingMarginSpan android.text.style.LineHeightSpan {
+ ctor public DrawableMarginSpan(android.graphics.drawable.Drawable);
+ ctor public DrawableMarginSpan(android.graphics.drawable.Drawable, int);
+ method public void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt);
+ method public void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout);
+ method public int getLeadingMargin(boolean);
+ }
+
+ public abstract class DynamicDrawableSpan extends android.text.style.ReplacementSpan {
+ ctor public DynamicDrawableSpan();
+ ctor protected DynamicDrawableSpan(int);
+ method public void draw(android.graphics.Canvas, java.lang.CharSequence, int, int, float, int, int, int, android.graphics.Paint);
+ method public abstract android.graphics.drawable.Drawable getDrawable();
+ method public int getSize(android.graphics.Paint, java.lang.CharSequence, int, int, android.graphics.Paint.FontMetricsInt);
+ method public int getVerticalAlignment();
+ field public static final int ALIGN_BASELINE = 1; // 0x1
+ field public static final int ALIGN_BOTTOM = 0; // 0x0
+ field protected final int mVerticalAlignment;
+ }
+
+ public class EasyEditSpan implements android.text.ParcelableSpan {
+ ctor public EasyEditSpan();
+ ctor public EasyEditSpan(android.app.PendingIntent);
+ ctor public EasyEditSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final java.lang.String EXTRA_TEXT_CHANGED_TYPE = "android.text.style.EXTRA_TEXT_CHANGED_TYPE";
+ field public static final int TEXT_DELETED = 1; // 0x1
+ field public static final int TEXT_MODIFIED = 2; // 0x2
+ }
+
+ public class ForegroundColorSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan android.text.style.UpdateAppearance {
+ ctor public ForegroundColorSpan(int);
+ ctor public ForegroundColorSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getForegroundColor();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class IconMarginSpan implements android.text.style.LeadingMarginSpan android.text.style.LineHeightSpan {
+ ctor public IconMarginSpan(android.graphics.Bitmap);
+ ctor public IconMarginSpan(android.graphics.Bitmap, int);
+ method public void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt);
+ method public void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout);
+ method public int getLeadingMargin(boolean);
+ }
+
+ public class ImageSpan extends android.text.style.DynamicDrawableSpan {
+ ctor public deprecated ImageSpan(android.graphics.Bitmap);
+ ctor public deprecated ImageSpan(android.graphics.Bitmap, int);
+ ctor public ImageSpan(android.content.Context, android.graphics.Bitmap);
+ ctor public ImageSpan(android.content.Context, android.graphics.Bitmap, int);
+ ctor public ImageSpan(android.graphics.drawable.Drawable);
+ ctor public ImageSpan(android.graphics.drawable.Drawable, int);
+ ctor public ImageSpan(android.graphics.drawable.Drawable, java.lang.String);
+ ctor public ImageSpan(android.graphics.drawable.Drawable, java.lang.String, int);
+ ctor public ImageSpan(android.content.Context, android.net.Uri);
+ ctor public ImageSpan(android.content.Context, android.net.Uri, int);
+ ctor public ImageSpan(android.content.Context, int);
+ ctor public ImageSpan(android.content.Context, int, int);
+ method public android.graphics.drawable.Drawable getDrawable();
+ method public java.lang.String getSource();
+ }
+
+ public abstract interface LeadingMarginSpan implements android.text.style.ParagraphStyle {
+ method public abstract void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout);
+ method public abstract int getLeadingMargin(boolean);
+ }
+
+ public static abstract interface LeadingMarginSpan.LeadingMarginSpan2 implements android.text.style.LeadingMarginSpan android.text.style.WrapTogetherSpan {
+ method public abstract int getLeadingMarginLineCount();
+ }
+
+ public static class LeadingMarginSpan.Standard implements android.text.style.LeadingMarginSpan android.text.ParcelableSpan {
+ ctor public LeadingMarginSpan.Standard(int, int);
+ ctor public LeadingMarginSpan.Standard(int);
+ ctor public LeadingMarginSpan.Standard(android.os.Parcel);
+ method public int describeContents();
+ method public void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout);
+ method public int getLeadingMargin(boolean);
+ method public int getSpanTypeId();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public abstract interface LineBackgroundSpan implements android.text.style.ParagraphStyle {
+ method public abstract void drawBackground(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, int);
+ }
+
+ public abstract interface LineHeightSpan implements android.text.style.ParagraphStyle android.text.style.WrapTogetherSpan {
+ method public abstract void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt);
+ }
+
+ public static abstract interface LineHeightSpan.WithDensity implements android.text.style.LineHeightSpan {
+ method public abstract void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt, android.text.TextPaint);
+ }
+
+ public class LocaleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public LocaleSpan(java.util.Locale);
+ ctor public LocaleSpan(android.os.Parcel);
+ method public int describeContents();
+ method public java.util.Locale getLocale();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class MaskFilterSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
+ ctor public MaskFilterSpan(android.graphics.MaskFilter);
+ method public android.graphics.MaskFilter getMaskFilter();
+ method public void updateDrawState(android.text.TextPaint);
+ }
+
+ public abstract class MetricAffectingSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateLayout {
+ ctor public MetricAffectingSpan();
+ method public abstract void updateMeasureState(android.text.TextPaint);
+ }
+
+ public abstract interface ParagraphStyle {
+ }
+
+ public class QuoteSpan implements android.text.style.LeadingMarginSpan android.text.ParcelableSpan {
+ ctor public QuoteSpan();
+ ctor public QuoteSpan(int);
+ ctor public QuoteSpan(android.os.Parcel);
+ method public int describeContents();
+ method public void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, java.lang.CharSequence, int, int, boolean, android.text.Layout);
+ method public int getColor();
+ method public int getLeadingMargin(boolean);
+ method public int getSpanTypeId();
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
+ ctor public RasterizerSpan(android.graphics.Rasterizer);
+ method public android.graphics.Rasterizer getRasterizer();
+ method public void updateDrawState(android.text.TextPaint);
+ }
+
+ public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public RelativeSizeSpan(float);
+ ctor public RelativeSizeSpan(android.os.Parcel);
+ method public int describeContents();
+ method public float getSizeChange();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public abstract class ReplacementSpan extends android.text.style.MetricAffectingSpan {
+ ctor public ReplacementSpan();
+ method public abstract void draw(android.graphics.Canvas, java.lang.CharSequence, int, int, float, int, int, int, android.graphics.Paint);
+ method public abstract int getSize(android.graphics.Paint, java.lang.CharSequence, int, int, android.graphics.Paint.FontMetricsInt);
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ }
+
+ public class ScaleXSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public ScaleXSpan(float);
+ ctor public ScaleXSpan(android.os.Parcel);
+ method public int describeContents();
+ method public float getScaleX();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class StrikethroughSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan android.text.style.UpdateAppearance {
+ ctor public StrikethroughSpan();
+ ctor public StrikethroughSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class StyleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public StyleSpan(int);
+ ctor public StyleSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public int getStyle();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class SubscriptSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public SubscriptSpan();
+ ctor public SubscriptSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class SuggestionSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan {
+ ctor public SuggestionSpan(android.content.Context, java.lang.String[], int);
+ ctor public SuggestionSpan(java.util.Locale, java.lang.String[], int);
+ ctor public SuggestionSpan(android.content.Context, java.util.Locale, java.lang.String[], int, java.lang.Class<?>);
+ ctor public SuggestionSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getFlags();
+ method public java.lang.String getLocale();
+ method public int getSpanTypeId();
+ method public java.lang.String[] getSuggestions();
+ method public void setFlags(int);
+ method public void updateDrawState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final java.lang.String ACTION_SUGGESTION_PICKED = "android.text.style.SUGGESTION_PICKED";
+ field public static final android.os.Parcelable.Creator<android.text.style.SuggestionSpan> CREATOR;
+ field public static final int FLAG_AUTO_CORRECTION = 4; // 0x4
+ field public static final int FLAG_EASY_CORRECT = 1; // 0x1
+ field public static final int FLAG_MISSPELLED = 2; // 0x2
+ field public static final int SUGGESTIONS_MAX_SIZE = 5; // 0x5
+ field public static final java.lang.String SUGGESTION_SPAN_PICKED_AFTER = "after";
+ field public static final java.lang.String SUGGESTION_SPAN_PICKED_BEFORE = "before";
+ field public static final java.lang.String SUGGESTION_SPAN_PICKED_HASHCODE = "hashcode";
+ }
+
+ public class SuperscriptSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public SuperscriptSpan();
+ ctor public SuperscriptSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public abstract interface TabStopSpan implements android.text.style.ParagraphStyle {
+ method public abstract int getTabStop();
+ }
+
+ public static class TabStopSpan.Standard implements android.text.style.TabStopSpan {
+ ctor public TabStopSpan.Standard(int);
+ method public int getTabStop();
+ }
+
+ public class TextAppearanceSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public TextAppearanceSpan(android.content.Context, int);
+ ctor public TextAppearanceSpan(android.content.Context, int, int);
+ ctor public TextAppearanceSpan(java.lang.String, int, int, android.content.res.ColorStateList, android.content.res.ColorStateList);
+ ctor public TextAppearanceSpan(android.os.Parcel);
+ method public int describeContents();
+ method public java.lang.String getFamily();
+ method public android.content.res.ColorStateList getLinkTextColor();
+ method public int getSpanTypeId();
+ method public android.content.res.ColorStateList getTextColor();
+ method public int getTextSize();
+ method public int getTextStyle();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class TtsSpan implements android.text.ParcelableSpan {
+ ctor public TtsSpan(java.lang.String, android.os.PersistableBundle);
+ ctor public TtsSpan(android.os.Parcel);
+ method public int describeContents();
+ method public android.os.PersistableBundle getArgs();
+ method public int getSpanTypeId();
+ method public java.lang.String getType();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final java.lang.String ANIMACY_ANIMATE = "android.animate";
+ field public static final java.lang.String ANIMACY_INANIMATE = "android.inanimate";
+ field public static final java.lang.String ARG_ANIMACY = "android.arg.animacy";
+ field public static final java.lang.String ARG_CASE = "android.arg.case";
+ field public static final java.lang.String ARG_COUNTRY_CODE = "android.arg.country_code";
+ field public static final java.lang.String ARG_CURRENCY = "android.arg.money";
+ field public static final java.lang.String ARG_DAY = "android.arg.day";
+ field public static final java.lang.String ARG_DENOMINATOR = "android.arg.denominator";
+ field public static final java.lang.String ARG_DIGITS = "android.arg.digits";
+ field public static final java.lang.String ARG_DOMAIN = "android.arg.domain";
+ field public static final java.lang.String ARG_EXTENSION = "android.arg.extension";
+ field public static final java.lang.String ARG_FRACTIONAL_PART = "android.arg.fractional_part";
+ field public static final java.lang.String ARG_FRAGMENT_ID = "android.arg.fragment_id";
+ field public static final java.lang.String ARG_GENDER = "android.arg.gender";
+ field public static final java.lang.String ARG_HOURS = "android.arg.hours";
+ field public static final java.lang.String ARG_INTEGER_PART = "android.arg.integer_part";
+ field public static final java.lang.String ARG_MINUTES = "android.arg.minutes";
+ field public static final java.lang.String ARG_MONTH = "android.arg.month";
+ field public static final java.lang.String ARG_MULTIPLICITY = "android.arg.multiplicity";
+ field public static final java.lang.String ARG_NUMBER = "android.arg.number";
+ field public static final java.lang.String ARG_NUMBER_PARTS = "android.arg.number_parts";
+ field public static final java.lang.String ARG_NUMERATOR = "android.arg.numerator";
+ field public static final java.lang.String ARG_PASSWORD = "android.arg.password";
+ field public static final java.lang.String ARG_PATH = "android.arg.path";
+ field public static final java.lang.String ARG_PORT = "android.arg.port";
+ field public static final java.lang.String ARG_PROTOCOL = "android.arg.protocol";
+ field public static final java.lang.String ARG_QUANTITY = "android.arg.quantity";
+ field public static final java.lang.String ARG_QUERY_STRING = "android.arg.query_string";
+ field public static final java.lang.String ARG_TEXT = "android.arg.text";
+ field public static final java.lang.String ARG_UNIT = "android.arg.unit";
+ field public static final java.lang.String ARG_USERNAME = "android.arg.username";
+ field public static final java.lang.String ARG_VERBATIM = "android.arg.verbatim";
+ field public static final java.lang.String ARG_WEEKDAY = "android.arg.weekday";
+ field public static final java.lang.String ARG_YEAR = "android.arg.year";
+ field public static final java.lang.String CASE_ABLATIVE = "android.ablative";
+ field public static final java.lang.String CASE_ACCUSATIVE = "android.accusative";
+ field public static final java.lang.String CASE_DATIVE = "android.dative";
+ field public static final java.lang.String CASE_GENITIVE = "android.genitive";
+ field public static final java.lang.String CASE_INSTRUMENTAL = "android.instrumental";
+ field public static final java.lang.String CASE_LOCATIVE = "android.locative";
+ field public static final java.lang.String CASE_NOMINATIVE = "android.nominative";
+ field public static final java.lang.String CASE_VOCATIVE = "android.vocative";
+ field public static final java.lang.String GENDER_FEMALE = "android.female";
+ field public static final java.lang.String GENDER_MALE = "android.male";
+ field public static final java.lang.String GENDER_NEUTRAL = "android.neutral";
+ field public static final int MONTH_APRIL = 3; // 0x3
+ field public static final int MONTH_AUGUST = 7; // 0x7
+ field public static final int MONTH_DECEMBER = 11; // 0xb
+ field public static final int MONTH_FEBRUARY = 1; // 0x1
+ field public static final int MONTH_JANUARY = 0; // 0x0
+ field public static final int MONTH_JULY = 6; // 0x6
+ field public static final int MONTH_JUNE = 5; // 0x5
+ field public static final int MONTH_MARCH = 2; // 0x2
+ field public static final int MONTH_MAY = 4; // 0x4
+ field public static final int MONTH_NOVEMBER = 10; // 0xa
+ field public static final int MONTH_OCTOBER = 9; // 0x9
+ field public static final int MONTH_SEPTEMBER = 8; // 0x8
+ field public static final java.lang.String MULTIPLICITY_DUAL = "android.dual";
+ field public static final java.lang.String MULTIPLICITY_PLURAL = "android.plural";
+ field public static final java.lang.String MULTIPLICITY_SINGLE = "android.single";
+ field public static final java.lang.String TYPE_CARDINAL = "android.type.cardinal";
+ field public static final java.lang.String TYPE_DATE = "android.type.date";
+ field public static final java.lang.String TYPE_DECIMAL = "android.type.decimal";
+ field public static final java.lang.String TYPE_DIGITS = "android.type.digits";
+ field public static final java.lang.String TYPE_ELECTRONIC = "android.type.electronic";
+ field public static final java.lang.String TYPE_FRACTION = "android.type.fraction";
+ field public static final java.lang.String TYPE_MEASURE = "android.type.measure";
+ field public static final java.lang.String TYPE_MONEY = "android.type.money";
+ field public static final java.lang.String TYPE_ORDINAL = "android.type.ordinal";
+ field public static final java.lang.String TYPE_TELEPHONE = "android.type.telephone";
+ field public static final java.lang.String TYPE_TEXT = "android.type.text";
+ field public static final java.lang.String TYPE_TIME = "android.type.time";
+ field public static final java.lang.String TYPE_VERBATIM = "android.type.verbatim";
+ field public static final int WEEKDAY_FRIDAY = 6; // 0x6
+ field public static final int WEEKDAY_MONDAY = 2; // 0x2
+ field public static final int WEEKDAY_SATURDAY = 7; // 0x7
+ field public static final int WEEKDAY_SUNDAY = 1; // 0x1
+ field public static final int WEEKDAY_THURSDAY = 5; // 0x5
+ field public static final int WEEKDAY_TUESDAY = 3; // 0x3
+ field public static final int WEEKDAY_WEDNESDAY = 4; // 0x4
+ }
+
+ public static class TtsSpan.Builder {
+ ctor public TtsSpan.Builder(java.lang.String);
+ method public android.text.style.TtsSpan build();
+ method public C setIntArgument(java.lang.String, int);
+ method public C setLongArgument(java.lang.String, long);
+ method public C setStringArgument(java.lang.String, java.lang.String);
+ }
+
+ public static class TtsSpan.CardinalBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.CardinalBuilder();
+ ctor public TtsSpan.CardinalBuilder(long);
+ ctor public TtsSpan.CardinalBuilder(java.lang.String);
+ method public android.text.style.TtsSpan.CardinalBuilder setNumber(long);
+ method public android.text.style.TtsSpan.CardinalBuilder setNumber(java.lang.String);
+ }
+
+ public static class TtsSpan.DateBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.DateBuilder();
+ ctor public TtsSpan.DateBuilder(java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer);
+ method public android.text.style.TtsSpan.DateBuilder setDay(int);
+ method public android.text.style.TtsSpan.DateBuilder setMonth(int);
+ method public android.text.style.TtsSpan.DateBuilder setWeekday(int);
+ method public android.text.style.TtsSpan.DateBuilder setYear(int);
+ }
+
+ public static class TtsSpan.DecimalBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.DecimalBuilder();
+ ctor public TtsSpan.DecimalBuilder(double, int, int);
+ ctor public TtsSpan.DecimalBuilder(java.lang.String, java.lang.String);
+ method public android.text.style.TtsSpan.DecimalBuilder setArgumentsFromDouble(double, int, int);
+ method public android.text.style.TtsSpan.DecimalBuilder setFractionalPart(java.lang.String);
+ method public android.text.style.TtsSpan.DecimalBuilder setIntegerPart(long);
+ method public android.text.style.TtsSpan.DecimalBuilder setIntegerPart(java.lang.String);
+ }
+
+ public static class TtsSpan.DigitsBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.DigitsBuilder();
+ ctor public TtsSpan.DigitsBuilder(java.lang.String);
+ method public android.text.style.TtsSpan.DigitsBuilder setDigits(java.lang.String);
+ }
+
+ public static class TtsSpan.ElectronicBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.ElectronicBuilder();
+ method public android.text.style.TtsSpan.ElectronicBuilder setDomain(java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setEmailArguments(java.lang.String, java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setFragmentId(java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setPassword(java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setPath(java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setPort(int);
+ method public android.text.style.TtsSpan.ElectronicBuilder setProtocol(java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setQueryString(java.lang.String);
+ method public android.text.style.TtsSpan.ElectronicBuilder setUsername(java.lang.String);
+ }
+
+ public static class TtsSpan.FractionBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.FractionBuilder();
+ ctor public TtsSpan.FractionBuilder(long, long, long);
+ method public android.text.style.TtsSpan.FractionBuilder setDenominator(long);
+ method public android.text.style.TtsSpan.FractionBuilder setDenominator(java.lang.String);
+ method public android.text.style.TtsSpan.FractionBuilder setIntegerPart(long);
+ method public android.text.style.TtsSpan.FractionBuilder setIntegerPart(java.lang.String);
+ method public android.text.style.TtsSpan.FractionBuilder setNumerator(long);
+ method public android.text.style.TtsSpan.FractionBuilder setNumerator(java.lang.String);
+ }
+
+ public static class TtsSpan.MeasureBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.MeasureBuilder();
+ method public android.text.style.TtsSpan.MeasureBuilder setDenominator(long);
+ method public android.text.style.TtsSpan.MeasureBuilder setDenominator(java.lang.String);
+ method public android.text.style.TtsSpan.MeasureBuilder setFractionalPart(java.lang.String);
+ method public android.text.style.TtsSpan.MeasureBuilder setIntegerPart(long);
+ method public android.text.style.TtsSpan.MeasureBuilder setIntegerPart(java.lang.String);
+ method public android.text.style.TtsSpan.MeasureBuilder setNumber(long);
+ method public android.text.style.TtsSpan.MeasureBuilder setNumber(java.lang.String);
+ method public android.text.style.TtsSpan.MeasureBuilder setNumerator(long);
+ method public android.text.style.TtsSpan.MeasureBuilder setNumerator(java.lang.String);
+ method public android.text.style.TtsSpan.MeasureBuilder setUnit(java.lang.String);
+ }
+
+ public static class TtsSpan.MoneyBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.MoneyBuilder();
+ method public android.text.style.TtsSpan.MoneyBuilder setCurrency(java.lang.String);
+ method public android.text.style.TtsSpan.MoneyBuilder setFractionalPart(java.lang.String);
+ method public android.text.style.TtsSpan.MoneyBuilder setIntegerPart(long);
+ method public android.text.style.TtsSpan.MoneyBuilder setIntegerPart(java.lang.String);
+ method public android.text.style.TtsSpan.MoneyBuilder setQuantity(java.lang.String);
+ }
+
+ public static class TtsSpan.OrdinalBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.OrdinalBuilder();
+ ctor public TtsSpan.OrdinalBuilder(long);
+ ctor public TtsSpan.OrdinalBuilder(java.lang.String);
+ method public android.text.style.TtsSpan.OrdinalBuilder setNumber(long);
+ method public android.text.style.TtsSpan.OrdinalBuilder setNumber(java.lang.String);
+ }
+
+ public static class TtsSpan.SemioticClassBuilder extends android.text.style.TtsSpan.Builder {
+ ctor public TtsSpan.SemioticClassBuilder(java.lang.String);
+ method public C setAnimacy(java.lang.String);
+ method public C setCase(java.lang.String);
+ method public C setGender(java.lang.String);
+ method public C setMultiplicity(java.lang.String);
+ }
+
+ public static class TtsSpan.TelephoneBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.TelephoneBuilder();
+ ctor public TtsSpan.TelephoneBuilder(java.lang.String);
+ method public android.text.style.TtsSpan.TelephoneBuilder setCountryCode(java.lang.String);
+ method public android.text.style.TtsSpan.TelephoneBuilder setExtension(java.lang.String);
+ method public android.text.style.TtsSpan.TelephoneBuilder setNumberParts(java.lang.String);
+ }
+
+ public static class TtsSpan.TextBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.TextBuilder();
+ ctor public TtsSpan.TextBuilder(java.lang.String);
+ method public android.text.style.TtsSpan.TextBuilder setText(java.lang.String);
+ }
+
+ public static class TtsSpan.TimeBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.TimeBuilder();
+ ctor public TtsSpan.TimeBuilder(int, int);
+ method public android.text.style.TtsSpan.TimeBuilder setHours(int);
+ method public android.text.style.TtsSpan.TimeBuilder setMinutes(int);
+ }
+
+ public static class TtsSpan.VerbatimBuilder extends android.text.style.TtsSpan.SemioticClassBuilder {
+ ctor public TtsSpan.VerbatimBuilder();
+ ctor public TtsSpan.VerbatimBuilder(java.lang.String);
+ method public android.text.style.TtsSpan.VerbatimBuilder setVerbatim(java.lang.String);
+ }
+
+ public class TypefaceSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
+ ctor public TypefaceSpan(java.lang.String);
+ ctor public TypefaceSpan(android.os.Parcel);
+ method public int describeContents();
+ method public java.lang.String getFamily();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void updateMeasureState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class URLSpan extends android.text.style.ClickableSpan implements android.text.ParcelableSpan {
+ ctor public URLSpan(java.lang.String);
+ ctor public URLSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public java.lang.String getURL();
+ method public void onClick(android.view.View);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public class UnderlineSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan android.text.style.UpdateAppearance {
+ ctor public UnderlineSpan();
+ ctor public UnderlineSpan(android.os.Parcel);
+ method public int describeContents();
+ method public int getSpanTypeId();
+ method public void updateDrawState(android.text.TextPaint);
+ method public void writeToParcel(android.os.Parcel, int);
+ }
+
+ public abstract interface UpdateAppearance {
+ }
+
+ public abstract interface UpdateLayout implements android.text.style.UpdateAppearance {
+ }
+
+ public abstract interface WrapTogetherSpan implements android.text.style.ParagraphStyle {
+ }
+
+}
+
+package android.text.util {
+
+ public class Linkify {
+ ctor public Linkify();
+ method public static final boolean addLinks(android.text.Spannable, int);
+ method public static final boolean addLinks(android.widget.TextView, int);
+ method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String);
+ method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter);
+ method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String);
+ method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter);
+ field public static final int ALL = 15; // 0xf
+ field public static final int EMAIL_ADDRESSES = 2; // 0x2
+ field public static final int MAP_ADDRESSES = 8; // 0x8
+ field public static final int PHONE_NUMBERS = 4; // 0x4
+ field public static final int WEB_URLS = 1; // 0x1
+ field public static final android.text.util.Linkify.MatchFilter sPhoneNumberMatchFilter;
+ field public static final android.text.util.Linkify.TransformFilter sPhoneNumberTransformFilter;
+ field public static final android.text.util.Linkify.MatchFilter sUrlMatchFilter;
+ }
+
+ public static abstract interface Linkify.MatchFilter {
+ method public abstract boolean acceptMatch(java.lang.CharSequence, int, int);
+ }
+
+ public static abstract interface Linkify.TransformFilter {
+ method public abstract java.lang.String transformUrl(java.util.regex.Matcher, java.lang.String);
+ }
+
+ public class Rfc822Token {
+ ctor public Rfc822Token(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String getAddress();
+ method public java.lang.String getComment();
+ method public java.lang.String getName();
+ method public static java.lang.String quoteComment(java.lang.String);
+ method public static java.lang.String quoteName(java.lang.String);
+ method public static java.lang.String quoteNameIfNecessary(java.lang.String);
+ method public void setAddress(java.lang.String);
+ method public void setComment(java.lang.String);
+ method public void setName(java.lang.String);
+ }
+
+ public class Rfc822Tokenizer implements android.widget.MultiAutoCompleteTextView.Tokenizer {
+ ctor public Rfc822Tokenizer();
+ method public int findTokenEnd(java.lang.CharSequence, int);
+ method public int findTokenStart(java.lang.CharSequence, int);
+ method public java.lang.CharSequence terminateToken(java.lang.CharSequence);
+ method public static void tokenize(java.lang.CharSequence, java.util.Collection<android.text.util.Rfc822Token>);
+ method public static android.text.util.Rfc822Token[] tokenize(java.lang.CharSequence);
+ }
+
+}
+
+package android.transition {
+
+ public class ArcMotion extends android.transition.PathMotion {
+ ctor public ArcMotion();
+ ctor public ArcMotion(android.content.Context, android.util.AttributeSet);
+ method public float getMaximumAngle();
+ method public float getMinimumHorizontalAngle();
+ method public float getMinimumVerticalAngle();
+ method public android.graphics.Path getPath(float, float, float, float);
+ method public void setMaximumAngle(float);
+ method public void setMinimumHorizontalAngle(float);
+ method public void setMinimumVerticalAngle(float);
+ }
+
+ public class AutoTransition extends android.transition.TransitionSet {
+ ctor public AutoTransition();
+ ctor public AutoTransition(android.content.Context, android.util.AttributeSet);
+ }
+
+ public class ChangeBounds extends android.transition.Transition {
+ ctor public ChangeBounds();
+ ctor public ChangeBounds(android.content.Context, android.util.AttributeSet);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ method public boolean getResizeClip();
+ method public deprecated void setReparent(boolean);
+ method public void setResizeClip(boolean);
+ }
+
+ public class ChangeClipBounds extends android.transition.Transition {
+ ctor public ChangeClipBounds();
+ ctor public ChangeClipBounds(android.content.Context, android.util.AttributeSet);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ }
+
+ public class ChangeImageTransform extends android.transition.Transition {
+ ctor public ChangeImageTransform();
+ ctor public ChangeImageTransform(android.content.Context, android.util.AttributeSet);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ }
+
+ public class ChangeScroll extends android.transition.Transition {
+ ctor public ChangeScroll();
+ ctor public ChangeScroll(android.content.Context, android.util.AttributeSet);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ }
+
+ public class ChangeTransform extends android.transition.Transition {
+ ctor public ChangeTransform();
+ ctor public ChangeTransform(android.content.Context, android.util.AttributeSet);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ method public boolean getReparent();
+ method public boolean getReparentWithOverlay();
+ method public void setReparent(boolean);
+ method public void setReparentWithOverlay(boolean);
+ }
+
+ public class CircularPropagation extends android.transition.VisibilityPropagation {
+ ctor public CircularPropagation();
+ method public long getStartDelay(android.view.ViewGroup, android.transition.Transition, android.transition.TransitionValues, android.transition.TransitionValues);
+ method public void setPropagationSpeed(float);
+ }
+
+ public class Explode extends android.transition.Visibility {
+ ctor public Explode();
+ ctor public Explode(android.content.Context, android.util.AttributeSet);
+ }
+
+ public class Fade extends android.transition.Visibility {
+ ctor public Fade();
+ ctor public Fade(int);
+ ctor public Fade(android.content.Context, android.util.AttributeSet);
+ field public static final int IN = 1; // 0x1
+ field public static final int OUT = 2; // 0x2
+ }
+
+ public abstract class PathMotion {
+ ctor public PathMotion();
+ ctor public PathMotion(android.content.Context, android.util.AttributeSet);
+ method public abstract android.graphics.Path getPath(float, float, float, float);
+ }
+
+ public class PatternPathMotion extends android.transition.PathMotion {
+ ctor public PatternPathMotion();
+ ctor public PatternPathMotion(android.content.Context, android.util.AttributeSet);
+ ctor public PatternPathMotion(android.graphics.Path);
+ method public android.graphics.Path getPath(float, float, float, float);
+ method public android.graphics.Path getPatternPath();
+ method public void setPatternPath(android.graphics.Path);
+ }
+
+ public final class Scene {
+ ctor public Scene(android.view.ViewGroup);
+ ctor public Scene(android.view.ViewGroup, android.view.View);
+ ctor public deprecated Scene(android.view.ViewGroup, android.view.ViewGroup);
+ method public void enter();
+ method public void exit();
+ method public static android.transition.Scene getSceneForLayout(android.view.ViewGroup, int, android.content.Context);
+ method public android.view.ViewGroup getSceneRoot();
+ method public void setEnterAction(java.lang.Runnable);
+ method public void setExitAction(java.lang.Runnable);
+ }
+
+ public class SidePropagation extends android.transition.VisibilityPropagation {
+ ctor public SidePropagation();
+ method public long getStartDelay(android.view.ViewGroup, android.transition.Transition, android.transition.TransitionValues, android.transition.TransitionValues);
+ method public void setPropagationSpeed(float);
+ method public void setSide(int);
+ }
+
+ public class Slide extends android.transition.Visibility {
+ ctor public Slide();
+ ctor public Slide(int);
+ ctor public Slide(android.content.Context, android.util.AttributeSet);
+ method public int getSlideEdge();
+ method public void setSlideEdge(int);
+ }
+
+ public abstract class Transition implements java.lang.Cloneable {
+ ctor public Transition();
+ ctor public Transition(android.content.Context, android.util.AttributeSet);
+ method public android.transition.Transition addListener(android.transition.Transition.TransitionListener);
+ method public android.transition.Transition addTarget(int);
+ method public android.transition.Transition addTarget(java.lang.String);
+ method public android.transition.Transition addTarget(java.lang.Class);
+ method public android.transition.Transition addTarget(android.view.View);
+ method public boolean canRemoveViews();
+ method public abstract void captureEndValues(android.transition.TransitionValues);
+ method public abstract void captureStartValues(android.transition.TransitionValues);
+ method public android.transition.Transition clone();
+ method public android.animation.Animator createAnimator(android.view.ViewGroup, android.transition.TransitionValues, android.transition.TransitionValues);
+ method public android.transition.Transition excludeChildren(int, boolean);
+ method public android.transition.Transition excludeChildren(android.view.View, boolean);
+ method public android.transition.Transition excludeChildren(java.lang.Class, boolean);
+ method public android.transition.Transition excludeTarget(int, boolean);
+ method public android.transition.Transition excludeTarget(java.lang.String, boolean);
+ method public android.transition.Transition excludeTarget(android.view.View, boolean);
+ method public android.transition.Transition excludeTarget(java.lang.Class, boolean);
+ method public long getDuration();
+ method public android.graphics.Rect getEpicenter();
+ method public android.transition.Transition.EpicenterCallback getEpicenterCallback();
+ method public android.animation.TimeInterpolator getInterpolator();
+ method public java.lang.String getName();
+ method public android.transition.PathMotion getPathMotion();
+ method public android.transition.TransitionPropagation getPropagation();
+ method public long getStartDelay();
+ method public java.util.List<java.lang.Integer> getTargetIds();
+ method public java.util.List<java.lang.String> getTargetNames();
+ method public java.util.List<java.lang.Class> getTargetTypes();
+ method public java.util.List<android.view.View> getTargets();
+ method public java.lang.String[] getTransitionProperties();
+ method public android.transition.TransitionValues getTransitionValues(android.view.View, boolean);
+ method public boolean isTransitionRequired(android.transition.TransitionValues, android.transition.TransitionValues);
+ method public android.transition.Transition removeListener(android.transition.Transition.TransitionListener);
+ method public android.transition.Transition removeTarget(int);
+ method public android.transition.Transition removeTarget(java.lang.String);
+ method public android.transition.Transition removeTarget(android.view.View);
+ method public android.transition.Transition removeTarget(java.lang.Class);
+ method public android.transition.Transition setDuration(long);
+ method public void setEpicenterCallback(android.transition.Transition.EpicenterCallback);
+ method public android.transition.Transition setInterpolator(android.animation.TimeInterpolator);
+ method public void setMatchOrder(int...);
+ method public void setPathMotion(android.transition.PathMotion);
+ method public void setPropagation(android.transition.TransitionPropagation);
+ method public android.transition.Transition setStartDelay(long);
+ field public static final int MATCH_ID = 3; // 0x3
+ field public static final int MATCH_INSTANCE = 1; // 0x1
+ field public static final int MATCH_ITEM_ID = 4; // 0x4
+ field public static final int MATCH_NAME = 2; // 0x2
+ }
+
+ public static abstract class Transition.EpicenterCallback {
+ ctor public Transition.EpicenterCallback();
+ method public abstract android.graphics.Rect onGetEpicenter(android.transition.Transition);
+ }
+
+ public static abstract interface Transition.TransitionListener {
+ method public abstract void onTransitionCancel(android.transition.Transition);
+ method public abstract void onTransitionEnd(android.transition.Transition);
+ method public abstract void onTransitionPause(android.transition.Transition);
+ method public abstract void onTransitionResume(android.transition.Transition);
+ method public abstract void onTransitionStart(android.transition.Transition);
+ }
+
+ public class TransitionInflater {
+ method public static android.transition.TransitionInflater from(android.content.Context);
+ method public android.transition.Transition inflateTransition(int);
+ method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);
+ }
+
+ public class TransitionManager {
+ ctor public TransitionManager();
+ method public static void beginDelayedTransition(android.view.ViewGroup);
+ method public static void beginDelayedTransition(android.view.ViewGroup, android.transition.Transition);
+ method public static void endTransitions(android.view.ViewGroup);
+ method public static void go(android.transition.Scene);
+ method public static void go(android.transition.Scene, android.transition.Transition);
+ method public void setTransition(android.transition.Scene, android.transition.Transition);
+ method public void setTransition(android.transition.Scene, android.transition.Scene, android.transition.Transition);
+ method public void transitionTo(android.transition.Scene);
+ }
+
+ public abstract class TransitionPropagation {
+ ctor public TransitionPropagation();
+ method public abstract void captureValues(android.transition.TransitionValues);
+ method public abstract java.lang.String[] getPropagationProperties();
+ method public abstract long getStartDelay(android.view.ViewGroup, android.transition.Transition, android.transition.TransitionValues, android.transition.TransitionValues);
+ }
+
+ public class TransitionSet extends android.transition.Transition {
+ ctor public TransitionSet();
+ ctor public TransitionSet(android.content.Context, android.util.AttributeSet);
+ method public android.transition.TransitionSet addTransition(android.transition.Transition);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ method public int getOrdering();
+ method public android.transition.Transition getTransitionAt(int);
+ method public int getTransitionCount();
+ method public android.transition.TransitionSet removeTransition(android.transition.Transition);
+ method public android.transition.TransitionSet setOrdering(int);
+ field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
+ field public static final int ORDERING_TOGETHER = 0; // 0x0
+ }
+
+ public class TransitionValues {
+ ctor public TransitionValues();
+ field public final java.util.Map<java.lang.String, java.lang.Object> values;
+ field public android.view.View view;
+ }
+
+ public abstract class Visibility extends android.transition.Transition {
+ ctor public Visibility();
+ ctor public Visibility(android.content.Context, android.util.AttributeSet);
+ method public void captureEndValues(android.transition.TransitionValues);
+ method public void captureStartValues(android.transition.TransitionValues);
+ method public int getMode();
+ method public boolean isVisible(android.transition.TransitionValues);
+ method public android.animation.Animator onAppear(android.view.ViewGroup, android.transition.TransitionValues, int, android.transition.TransitionValues, int);
+ method public android.animation.Animator onAppear(android.view.ViewGroup, android.view.View, android.transition.TransitionValues, android.transition.TransitionValues);
+ method public android.animation.Animator onDisappear(android.view.ViewGroup, android.transition.TransitionValues, int, android.transition.TransitionValues, int);
+ method public android.animation.Animator onDisappear(android.view.ViewGroup, android.view.View, android.transition.TransitionValues, android.transition.TransitionValues);
+ method public void setMode(int);
+ field public static final int MODE_IN = 1; // 0x1
+ field public static final int MODE_OUT = 2; // 0x2
+ }
+
+ public abstract class VisibilityPropagation extends android.transition.TransitionPropagation {
+ ctor public VisibilityPropagation();
+ method public void captureValues(android.transition.TransitionValues);
+ method public java.lang.String[] getPropagationProperties();
+ method public int getViewVisibility(android.transition.TransitionValues);
+ method public int getViewX(android.transition.TransitionValues);
+ method public int getViewY(android.transition.TransitionValues);
+ }
+
+}
+
+package android.util {
+
+ public class AndroidException extends java.lang.Exception {
+ ctor public AndroidException();
+ ctor public AndroidException(java.lang.String);
+ ctor public AndroidException(java.lang.String, java.lang.Throwable);
+ ctor public AndroidException(java.lang.Exception);
+ }
+
+ public class AndroidRuntimeException extends java.lang.RuntimeException {
+ ctor public AndroidRuntimeException();
+ ctor public AndroidRuntimeException(java.lang.String);
+ ctor public AndroidRuntimeException(java.lang.String, java.lang.Throwable);
+ ctor public AndroidRuntimeException(java.lang.Exception);
+ }
+
+ public final class ArrayMap implements java.util.Map {
+ ctor public ArrayMap();
+ ctor public ArrayMap(int);
+ ctor public ArrayMap(android.util.ArrayMap<K, V>);
+ method public void clear();
+ method public boolean containsAll(java.util.Collection<?>);
+ method public boolean containsKey(java.lang.Object);
+ method public boolean containsValue(java.lang.Object);
+ method public void ensureCapacity(int);
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public V get(java.lang.Object);
+ method public int indexOfKey(java.lang.Object);
+ method public boolean isEmpty();
+ method public K keyAt(int);
+ method public java.util.Set<K> keySet();
+ method public V put(K, V);
+ method public void putAll(android.util.ArrayMap<? extends K, ? extends V>);
+ method public void putAll(java.util.Map<? extends K, ? extends V>);
+ method public V remove(java.lang.Object);
+ method public boolean removeAll(java.util.Collection<?>);
+ method public V removeAt(int);
+ method public boolean retainAll(java.util.Collection<?>);
+ method public V setValueAt(int, V);
+ method public int size();
+ method public V valueAt(int);
+ method public java.util.Collection<V> values();
+ }
+
+ public final class ArraySet implements java.util.Collection java.util.Set {
+ ctor public ArraySet();
+ ctor public ArraySet(int);
+ ctor public ArraySet(android.util.ArraySet<E>);
+ method public boolean add(E);
+ method public void addAll(android.util.ArraySet<? extends E>);
+ method public boolean addAll(java.util.Collection<? extends E>);
+ method public void clear();
+ method public boolean contains(java.lang.Object);
+ method public boolean containsAll(java.util.Collection<?>);
+ method public void ensureCapacity(int);
+ method public int indexOf(java.lang.Object);
+ method public boolean isEmpty();
+ method public java.util.Iterator<E> iterator();
+ method public boolean remove(java.lang.Object);
+ method public boolean removeAll(android.util.ArraySet<? extends E>);
+ method public boolean removeAll(java.util.Collection<?>);
+ method public E removeAt(int);
+ method public boolean retainAll(java.util.Collection<?>);
+ method public int size();
+ method public java.lang.Object[] toArray();
+ method public T[] toArray(T[]);
+ method public E valueAt(int);
+ }
+
+ public class AtomicFile {
+ ctor public AtomicFile(java.io.File);
+ method public void delete();
+ method public void failWrite(java.io.FileOutputStream);
+ method public void finishWrite(java.io.FileOutputStream);
+ method public java.io.File getBaseFile();
+ method public java.io.FileInputStream openRead() throws java.io.FileNotFoundException;
+ method public byte[] readFully() throws java.io.IOException;
+ method public java.io.FileOutputStream startWrite() throws java.io.IOException;
+ }
+
+ public abstract interface AttributeSet {
+ method public abstract boolean getAttributeBooleanValue(java.lang.String, java.lang.String, boolean);
+ method public abstract boolean getAttributeBooleanValue(int, boolean);
+ method public abstract int getAttributeCount();
+ method public abstract float getAttributeFloatValue(java.lang.String, java.lang.String, float);
+ method public abstract float getAttributeFloatValue(int, float);
+ method public abstract int getAttributeIntValue(java.lang.String, java.lang.String, int);
+ method public abstract int getAttributeIntValue(int, int);
+ method public abstract int getAttributeListValue(java.lang.String, java.lang.String, java.lang.String[], int);
+ method public abstract int getAttributeListValue(int, java.lang.String[], int);
+ method public abstract java.lang.String getAttributeName(int);
+ method public abstract int getAttributeNameResource(int);
+ method public abstract int getAttributeResourceValue(java.lang.String, java.lang.String, int);
+ method public abstract int getAttributeResourceValue(int, int);
+ method public abstract int getAttributeUnsignedIntValue(java.lang.String, java.lang.String, int);
+ method public abstract int getAttributeUnsignedIntValue(int, int);
+ method public abstract java.lang.String getAttributeValue(int);
+ method public abstract java.lang.String getAttributeValue(java.lang.String, java.lang.String);
+ method public abstract java.lang.String getClassAttribute();
+ method public abstract java.lang.String getIdAttribute();
+ method public abstract int getIdAttributeResourceValue(int);
+ method public abstract java.lang.String getPositionDescription();
+ method public abstract int getStyleAttribute();
+ }
+
+ public class Base64 {
+ method public static byte[] decode(java.lang.String, int);
+ method public static byte[] decode(byte[], int);
+ method public static byte[] decode(byte[], int, int, int);
+ method public static byte[] encode(byte[], int);
+ method public static byte[] encode(byte[], int, int, int);
+ method public static java.lang.String encodeToString(byte[], int);
+ method public static java.lang.String encodeToString(byte[], int, int, int);
+ field public static final int CRLF = 4; // 0x4
+ field public static final int DEFAULT = 0; // 0x0
+ field public static final int NO_CLOSE = 16; // 0x10
+ field public static final int NO_PADDING = 1; // 0x1
+ field public static final int NO_WRAP = 2; // 0x2
+ field public static final int URL_SAFE = 8; // 0x8
+ }
+
+ public class Base64DataException extends java.io.IOException {
+ ctor public Base64DataException(java.lang.String);
+ }
+
+ public class Base64InputStream extends java.io.FilterInputStream {
+ ctor public Base64InputStream(java.io.InputStream, int);
+ }
+
+ public class Base64OutputStream extends java.io.FilterOutputStream {
+ ctor public Base64OutputStream(java.io.OutputStream, int);
+ }
+
+ public final deprecated class Config {
+ field public static final deprecated boolean DEBUG = false;
+ field public static final deprecated boolean LOGD = true;
+ field public static final deprecated boolean LOGV = false;
+ field public static final deprecated boolean PROFILE = false;
+ field public static final deprecated boolean RELEASE = true;
+ }
+
+ public class DebugUtils {
+ method public static boolean isObjectSelected(java.lang.Object);
+ }
+
+ public class DisplayMetrics {
+ ctor public DisplayMetrics();
+ method public boolean equals(android.util.DisplayMetrics);
+ method public void setTo(android.util.DisplayMetrics);
+ method public void setToDefaults();
+ field public static final int DENSITY_280 = 280; // 0x118
+ field public static final int DENSITY_360 = 360; // 0x168
+ field public static final int DENSITY_400 = 400; // 0x190
+ field public static final int DENSITY_420 = 420; // 0x1a4
+ field public static final int DENSITY_560 = 560; // 0x230
+ field public static final int DENSITY_DEFAULT = 160; // 0xa0
+ field public static final int DENSITY_HIGH = 240; // 0xf0
+ field public static final int DENSITY_LOW = 120; // 0x78
+ field public static final int DENSITY_MEDIUM = 160; // 0xa0
+ field public static final int DENSITY_TV = 213; // 0xd5
+ field public static final int DENSITY_XHIGH = 320; // 0x140
+ field public static final int DENSITY_XXHIGH = 480; // 0x1e0
+ field public static final int DENSITY_XXXHIGH = 640; // 0x280
+ field public float density;
+ field public int densityDpi;
+ field public int heightPixels;
+ field public float scaledDensity;
+ field public int widthPixels;
+ field public float xdpi;
+ field public float ydpi;
+ }
+
+ public class EventLog {
+ method public static int getTagCode(java.lang.String);
+ method public static java.lang.String getTagName(int);
+ method public static void readEvents(int[], java.util.Collection<android.util.EventLog.Event>) throws java.io.IOException;
+ method public static int writeEvent(int, int);
+ method public static int writeEvent(int, long);
+ method public static int writeEvent(int, float);
+ method public static int writeEvent(int, java.lang.String);
+ method public static int writeEvent(int, java.lang.Object...);
+ }
+
+ public static final class EventLog.Event {
+ method public synchronized java.lang.Object getData();
+ method public int getProcessId();
+ method public int getTag();
+ method public int getThreadId();
+ method public long getTimeNanos();
+ }
+
+ public deprecated class EventLogTags {
+ ctor public EventLogTags() throws java.io.IOException;
+ ctor public EventLogTags(java.io.BufferedReader) throws java.io.IOException;
+ method public android.util.EventLogTags.Description get(java.lang.String);
+ method public android.util.EventLogTags.Description get(int);
+ }
+
+ public static class EventLogTags.Description {
+ field public final java.lang.String mName;
+ field public final int mTag;
+ }
+
+ public deprecated class FloatMath {
+ }
+
+ public abstract class FloatProperty extends android.util.Property {
+ ctor public FloatProperty(java.lang.String);
+ method public final void set(T, java.lang.Float);
+ method public abstract void setValue(T, float);
+ }
+
+ public abstract class IntProperty extends android.util.Property {
+ ctor public IntProperty(java.lang.String);
+ method public final void set(T, java.lang.Integer);
+ method public abstract void setValue(T, int);
+ }
+
+ public final class JsonReader implements java.io.Closeable {
+ ctor public JsonReader(java.io.Reader);
+ method public void beginArray() throws java.io.IOException;
+ method public void beginObject() throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public void endArray() throws java.io.IOException;
+ method public void endObject() throws java.io.IOException;
+ method public boolean hasNext() throws java.io.IOException;
+ method public boolean isLenient();
+ method public boolean nextBoolean() throws java.io.IOException;
+ method public double nextDouble() throws java.io.IOException;
+ method public int nextInt() throws java.io.IOException;
+ method public long nextLong() throws java.io.IOException;
+ method public java.lang.String nextName() throws java.io.IOException;
+ method public void nextNull() throws java.io.IOException;
+ method public java.lang.String nextString() throws java.io.IOException;
+ method public android.util.JsonToken peek() throws java.io.IOException;
+ method public void setLenient(boolean);
+ method public void skipValue() throws java.io.IOException;
+ }
+
+ public final class JsonToken extends java.lang.Enum {
+ method public static android.util.JsonToken valueOf(java.lang.String);
+ method public static final android.util.JsonToken[] values();
+ enum_constant public static final android.util.JsonToken BEGIN_ARRAY;
+ enum_constant public static final android.util.JsonToken BEGIN_OBJECT;
+ enum_constant public static final android.util.JsonToken BOOLEAN;
+ enum_constant public static final android.util.JsonToken END_ARRAY;
+ enum_constant public static final android.util.JsonToken END_DOCUMENT;
+ enum_constant public static final android.util.JsonToken END_OBJECT;
+ enum_constant public static final android.util.JsonToken NAME;
+ enum_constant public static final android.util.JsonToken NULL;
+ enum_constant public static final android.util.JsonToken NUMBER;
+ enum_constant public static final android.util.JsonToken STRING;
+ }
+
+ public final class JsonWriter implements java.io.Closeable {
+ ctor public JsonWriter(java.io.Writer);
+ method public android.util.JsonWriter beginArray() throws java.io.IOException;
+ method public android.util.JsonWriter beginObject() throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public android.util.JsonWriter endArray() throws java.io.IOException;
+ method public android.util.JsonWriter endObject() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public boolean isLenient();
+ method public android.util.JsonWriter name(java.lang.String) throws java.io.IOException;
+ method public android.util.JsonWriter nullValue() throws java.io.IOException;
+ method public void setIndent(java.lang.String);
+ method public void setLenient(boolean);
+ method public android.util.JsonWriter value(java.lang.String) throws java.io.IOException;
+ method public android.util.JsonWriter value(boolean) throws java.io.IOException;
+ method public android.util.JsonWriter value(double) throws java.io.IOException;
+ method public android.util.JsonWriter value(long) throws java.io.IOException;
+ method public android.util.JsonWriter value(java.lang.Number) throws java.io.IOException;
+ }
+
+ public final class LayoutDirection {
+ field public static final int INHERIT = 2; // 0x2
+ field public static final int LOCALE = 3; // 0x3
+ field public static final int LTR = 0; // 0x0
+ field public static final int RTL = 1; // 0x1
+ }
+
+ public final class LocaleList {
+ ctor public LocaleList();
+ ctor public LocaleList(java.util.Locale);
+ ctor public LocaleList(java.util.Locale[]);
+ method public static android.util.LocaleList forLanguageTags(java.lang.String);
+ method public java.util.Locale get(int);
+ method public java.util.Locale getBestMatch(java.lang.String[]);
+ method public static android.util.LocaleList getDefault();
+ method public static android.util.LocaleList getEmptyLocaleList();
+ method public java.util.Locale getPrimary();
+ method public boolean isEmpty();
+ method public int size();
+ method public java.lang.String toLanguageTags();
+ }
+
+ public final class Log {
+ method public static int d(java.lang.String, java.lang.String);
+ method public static int d(java.lang.String, java.lang.String, java.lang.Throwable);
+ method public static int e(java.lang.String, java.lang.String);
+ method public static int e(java.lang.String, java.lang.String, java.lang.Throwable);
+ method public static java.lang.String getStackTraceString(java.lang.Throwable);
+ method public static int i(java.lang.String, java.lang.String);
+ method public static int i(java.lang.String, java.lang.String, java.lang.Throwable);
+ method public static boolean isLoggable(java.lang.String, int);
+ method public static int println(int, java.lang.String, java.lang.String);
+ method public static int v(java.lang.String, java.lang.String);
+ method public static int v(java.lang.String, java.lang.String, java.lang.Throwable);
+ method public static int w(java.lang.String, java.lang.String);
+ method public static int w(java.lang.String, java.lang.String, java.lang.Throwable);
+ method public static int w(java.lang.String, java.lang.Throwable);
+ method public static int wtf(java.lang.String, java.lang.String);
+ method public static int wtf(java.lang.String, java.lang.Throwable);
+ method public static int wtf(java.lang.String, java.lang.String, java.lang.Throwable);
+ field public static final int ASSERT = 7; // 0x7
+ field public static final int DEBUG = 3; // 0x3
+ field public static final int ERROR = 6; // 0x6
+ field public static final int INFO = 4; // 0x4
+ field public static final int VERBOSE = 2; // 0x2
+ field public static final int WARN = 5; // 0x5
+ }
+
+ public class LogPrinter implements android.util.Printer {
+ ctor public LogPrinter(int, java.lang.String);
+ method public void println(java.lang.String);
+ }
+
+ public class LongSparseArray implements java.lang.Cloneable {
+ ctor public LongSparseArray();
+ ctor public LongSparseArray(int);
+ method public void append(long, E);
+ method public void clear();
+ method public android.util.LongSparseArray<E> clone();
+ method public void delete(long);
+ method public E get(long);
+ method public E get(long, E);
+ method public int indexOfKey(long);
+ method public int indexOfValue(E);
+ method public long keyAt(int);
+ method public void put(long, E);
+ method public void remove(long);
+ method public void removeAt(int);
+ method public void setValueAt(int, E);
+ method public int size();
+ method public E valueAt(int);
+ }
+
+ public class LruCache {
+ ctor public LruCache(int);
+ method protected V create(K);
+ method public final synchronized int createCount();
+ method protected void entryRemoved(boolean, K, V, V);
+ method public final void evictAll();
+ method public final synchronized int evictionCount();
+ method public final V get(K);
+ method public final synchronized int hitCount();
+ method public final synchronized int maxSize();
+ method public final synchronized int missCount();
+ method public final V put(K, V);
+ method public final synchronized int putCount();
+ method public final V remove(K);
+ method public void resize(int);
+ method public final synchronized int size();
+ method protected int sizeOf(K, V);
+ method public final synchronized java.util.Map<K, V> snapshot();
+ method public final synchronized java.lang.String toString();
+ method public void trimToSize(int);
+ }
+
+ public final class MalformedJsonException extends java.io.IOException {
+ ctor public MalformedJsonException(java.lang.String);
+ }
+
+ public class MonthDisplayHelper {
+ ctor public MonthDisplayHelper(int, int, int);
+ ctor public MonthDisplayHelper(int, int);
+ method public int getColumnOf(int);
+ method public int getDayAt(int, int);
+ method public int[] getDigitsForRow(int);
+ method public int getFirstDayOfMonth();
+ method public int getMonth();
+ method public int getNumberOfDaysInMonth();
+ method public int getOffset();
+ method public int getRowOf(int);
+ method public int getWeekStartDay();
+ method public int getYear();
+ method public boolean isWithinCurrentMonth(int, int);
+ method public void nextMonth();
+ method public void previousMonth();
+ }
+
+ public final class MutableBoolean {
+ ctor public MutableBoolean(boolean);
+ field public boolean value;
+ }
+
+ public final class MutableByte {
+ ctor public MutableByte(byte);
+ field public byte value;
+ }
+
+ public final class MutableChar {
+ ctor public MutableChar(char);
+ field public char value;
+ }
+
+ public final class MutableDouble {
+ ctor public MutableDouble(double);
+ field public double value;
+ }
+
+ public final class MutableFloat {
+ ctor public MutableFloat(float);
+ field public float value;
+ }
+
+ public final class MutableInt {
+ ctor public MutableInt(int);
+ field public int value;
+ }
+
+ public final class MutableLong {
+ ctor public MutableLong(long);
+ field public long value;
+ }
+
+ public final class MutableShort {
+ ctor public MutableShort(short);
+ field public short value;
+ }
+
+ public class NoSuchPropertyException extends java.lang.RuntimeException {
+ ctor public NoSuchPropertyException(java.lang.String);
+ }
+
+ public class Pair {
+ ctor public Pair(F, S);
+ method public static android.util.Pair<A, B> create(A, B);
+ field public final F first;
+ field public final S second;
+ }
+
+ public class Patterns {
+ method public static final java.lang.String concatGroups(java.util.regex.Matcher);
+ method public static final java.lang.String digitsAndPlusOnly(java.util.regex.Matcher);
+ field public static final java.util.regex.Pattern DOMAIN_NAME;
+ field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+ field public static final java.lang.String GOOD_IRI_CHAR = "a-zA-Z0-9\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef";
+ field public static final java.util.regex.Pattern IP_ADDRESS;
+ field public static final java.util.regex.Pattern PHONE;
+ field public static final deprecated java.util.regex.Pattern TOP_LEVEL_DOMAIN;
+ field public static final deprecated java.lang.String TOP_LEVEL_DOMAIN_STR = "((aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(biz|b[abdefghijmnorstvwyz])|(cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(edu|e[cegrstu])|f[ijkmor]|(gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(info|int|i[delmnoqrst])|(jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(name|net|n[acefgilopruz])|(org|om)|(pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(\u03b4\u03bf\u03ba\u03b9\u03bc\u03ae|\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435|\u0440\u0444|\u0441\u0440\u0431|\u05d8\u05e2\u05e1\u05d8|\u0622\u0632\u0645\u0627\u06cc\u0634\u06cc|\u0625\u062e\u062a\u0628\u0627\u0631|\u0627\u0644\u0627\u0631\u062f\u0646|\u0627\u0644\u062c\u0632\u0627\u0626\u0631|\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629|\u0627\u0644\u0645\u063a\u0631\u0628|\u0627\u0645\u0627\u0631\u0627\u062a|\u0628\u06be\u0627\u0631\u062a|\u062a\u0648\u0646\u0633|\u0633\u0648\u0631\u064a\u0629|\u0641\u0644\u0633\u0637\u064a\u0646|\u0642\u0637\u0631|\u0645\u0635\u0631|\u092a\u0930\u0940\u0915\u094d\u0937\u093e|\u092d\u093e\u0930\u0924|\u09ad\u09be\u09b0\u09a4|\u0a2d\u0a3e\u0a30\u0a24|\u0aad\u0abe\u0ab0\u0aa4|\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe|\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8|\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd|\u0baa\u0bb0\u0bbf\u0b9f\u0bcd\u0b9a\u0bc8|\u0c2d\u0c3e\u0c30\u0c24\u0c4d|\u0dbd\u0d82\u0d9a\u0dcf|\u0e44\u0e17\u0e22|\u30c6\u30b9\u30c8|\u4e2d\u56fd|\u4e2d\u570b|\u53f0\u6e7e|\u53f0\u7063|\u65b0\u52a0\u5761|\u6d4b\u8bd5|\u6e2c\u8a66|\u9999\u6e2f|\ud14c\uc2a4\ud2b8|\ud55c\uad6d|xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-3e0b707e|xn\\-\\-45brj9c|xn\\-\\-80akhbyknj4f|xn\\-\\-90a3ac|xn\\-\\-9t4b11yi5a|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-deba0ad|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-g6w251d|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-j6w193g|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-s9brj9c|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zckzah|xxx)|y[et]|z[amw])";
+ field public static final deprecated java.lang.String TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL = "(?:(?:aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(?:biz|b[abdefghijmnorstvwyz])|(?:cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(?:edu|e[cegrstu])|f[ijkmor]|(?:gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(?:info|int|i[delmnoqrst])|(?:jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(?:mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(?:name|net|n[acefgilopruz])|(?:org|om)|(?:pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(?:tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(?:\u03b4\u03bf\u03ba\u03b9\u03bc\u03ae|\u0438\u0441\u043f\u044b\u0442\u0430\u043d\u0438\u0435|\u0440\u0444|\u0441\u0440\u0431|\u05d8\u05e2\u05e1\u05d8|\u0622\u0632\u0645\u0627\u06cc\u0634\u06cc|\u0625\u062e\u062a\u0628\u0627\u0631|\u0627\u0644\u0627\u0631\u062f\u0646|\u0627\u0644\u062c\u0632\u0627\u0626\u0631|\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629|\u0627\u0644\u0645\u063a\u0631\u0628|\u0627\u0645\u0627\u0631\u0627\u062a|\u0628\u06be\u0627\u0631\u062a|\u062a\u0648\u0646\u0633|\u0633\u0648\u0631\u064a\u0629|\u0641\u0644\u0633\u0637\u064a\u0646|\u0642\u0637\u0631|\u0645\u0635\u0631|\u092a\u0930\u0940\u0915\u094d\u0937\u093e|\u092d\u093e\u0930\u0924|\u09ad\u09be\u09b0\u09a4|\u0a2d\u0a3e\u0a30\u0a24|\u0aad\u0abe\u0ab0\u0aa4|\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe|\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8|\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd|\u0baa\u0bb0\u0bbf\u0b9f\u0bcd\u0b9a\u0bc8|\u0c2d\u0c3e\u0c30\u0c24\u0c4d|\u0dbd\u0d82\u0d9a\u0dcf|\u0e44\u0e17\u0e22|\u30c6\u30b9\u30c8|\u4e2d\u56fd|\u4e2d\u570b|\u53f0\u6e7e|\u53f0\u7063|\u65b0\u52a0\u5761|\u6d4b\u8bd5|\u6e2c\u8a66|\u9999\u6e2f|\ud14c\uc2a4\ud2b8|\ud55c\uad6d|xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-3e0b707e|xn\\-\\-45brj9c|xn\\-\\-80akhbyknj4f|xn\\-\\-90a3ac|xn\\-\\-9t4b11yi5a|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-deba0ad|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-g6w251d|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-j6w193g|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-s9brj9c|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zckzah|xxx)|y[et]|z[amw]))";
+ field public static final java.util.regex.Pattern WEB_URL;
+ }
+
+ public class PrintStreamPrinter implements android.util.Printer {
+ ctor public PrintStreamPrinter(java.io.PrintStream);
+ method public void println(java.lang.String);
+ }
+
+ public class PrintWriterPrinter implements android.util.Printer {
+ ctor public PrintWriterPrinter(java.io.PrintWriter);
+ method public void println(java.lang.String);
+ }
+
+ public abstract interface Printer {
+ method public abstract void println(java.lang.String);
+ }
+
+ public abstract class Property {
+ ctor public Property(java.lang.Class<V>, java.lang.String);
+ method public abstract V get(T);
+ method public java.lang.String getName();
+ method public java.lang.Class<V> getType();
+ method public boolean isReadOnly();
+ method public static android.util.Property<T, V> of(java.lang.Class<T>, java.lang.Class<V>, java.lang.String);
+ method public void set(T, V);
+ }
+
+ public final class Range {
+ ctor public Range(T, T);
+ method public T clamp(T);
+ method public boolean contains(T);
+ method public boolean contains(android.util.Range<T>);
+ method public static android.util.Range<T> create(T, T);
+ method public android.util.Range<T> extend(android.util.Range<T>);
+ method public android.util.Range<T> extend(T, T);
+ method public android.util.Range<T> extend(T);
+ method public T getLower();
+ method public T getUpper();
+ method public android.util.Range<T> intersect(android.util.Range<T>);
+ method public android.util.Range<T> intersect(T, T);
+ }
+
+ public final class Rational extends java.lang.Number implements java.lang.Comparable {
+ ctor public Rational(int, int);
+ method public int compareTo(android.util.Rational);
+ method public double doubleValue();
+ method public float floatValue();
+ method public int getDenominator();
+ method public int getNumerator();
+ method public int intValue();
+ method public boolean isFinite();
+ method public boolean isInfinite();
+ method public boolean isNaN();
+ method public boolean isZero();
+ method public long longValue();
+ method public static android.util.Rational parseRational(java.lang.String) throws java.lang.NumberFormatException;
+ field public static final android.util.Rational NEGATIVE_INFINITY;
+ field public static final android.util.Rational NaN;
+ field public static final android.util.Rational POSITIVE_INFINITY;
+ field public static final android.util.Rational ZERO;
+ }
+
+ public final class Size {
+ ctor public Size(int, int);
+ method public int getHeight();
+ method public int getWidth();
+ method public static android.util.Size parseSize(java.lang.String) throws java.lang.NumberFormatException;
+ }
+
+ public final class SizeF {
+ ctor public SizeF(float, float);
+ method public float getHeight();
+ method public float getWidth();
+ method public static android.util.SizeF parseSizeF(java.lang.String) throws java.lang.NumberFormatException;
+ }
+
+ public class SparseArray implements java.lang.Cloneable {
+ ctor public SparseArray();
+ ctor public SparseArray(int);
+ method public void append(int, E);
+ method public void clear();
+ method public android.util.SparseArray<E> clone();
+ method public void delete(int);
+ method public E get(int);
+ method public E get(int, E);
+ method public int indexOfKey(int);
+ method public int indexOfValue(E);
+ method public int keyAt(int);
+ method public void put(int, E);
+ method public void remove(int);
+ method public void removeAt(int);
+ method public void removeAtRange(int, int);
+ method public void setValueAt(int, E);
+ method public int size();
+ method public E valueAt(int);
+ }
+
+ public class SparseBooleanArray implements java.lang.Cloneable {
+ ctor public SparseBooleanArray();
+ ctor public SparseBooleanArray(int);
+ method public void append(int, boolean);
+ method public void clear();
+ method public android.util.SparseBooleanArray clone();
+ method public void delete(int);
+ method public boolean get(int);
+ method public boolean get(int, boolean);
+ method public int indexOfKey(int);
+ method public int indexOfValue(boolean);
+ method public int keyAt(int);
+ method public void put(int, boolean);
+ method public int size();
+ method public boolean valueAt(int);
+ }
+
+ public class SparseIntArray implements java.lang.Cloneable {
+ ctor public SparseIntArray();
+ ctor public SparseIntArray(int);
+ method public void append(int, int);
+ method public void clear();
+ method public android.util.SparseIntArray clone();
+ method public void delete(int);
+ method public int get(int);
+ method public int get(int, int);
+ method public int indexOfKey(int);
+ method public int indexOfValue(int);
+ method public int keyAt(int);
+ method public void put(int, int);
+ method public void removeAt(int);
+ method public int size();
+ method public int valueAt(int);
+ }
+
+ public class SparseLongArray implements java.lang.Cloneable {
+ ctor public SparseLongArray();
+ ctor public SparseLongArray(int);
+ method public void append(int, long);
+ method public void clear();
+ method public android.util.SparseLongArray clone();
+ method public void delete(int);
+ method public long get(int);
+ method public long get(int, long);
+ method public int indexOfKey(int);
+ method public int indexOfValue(long);
+ method public int keyAt(int);
+ method public void put(int, long);
+ method public void removeAt(int);
+ method public int size();
+ method public long valueAt(int);
+ }
+
+ public class StateSet {
+ method public static java.lang.String dump(int[]);
+ method public static boolean isWildCard(int[]);
+ method public static boolean stateSetMatches(int[], int[]);
+ method public static boolean stateSetMatches(int[], int);
+ method public static int[] trimStateSet(int[], int);
+ field public static final int[] NOTHING;
+ field public static final int[] WILD_CARD;
+ }
+
+ public class StringBuilderPrinter implements android.util.Printer {
+ ctor public StringBuilderPrinter(java.lang.StringBuilder);
+ method public void println(java.lang.String);
+ }
+
+ public class TimeFormatException extends java.lang.RuntimeException {
+ }
+
+ public class TimeUtils {
+ method public static java.util.TimeZone getTimeZone(int, boolean, long, java.lang.String);
+ method public static java.lang.String getTimeZoneDatabaseVersion();
+ }
+
+ public class TimingLogger {
+ ctor public TimingLogger(java.lang.String, java.lang.String);
+ method public void addSplit(java.lang.String);
+ method public void dumpToLog();
+ method public void reset(java.lang.String, java.lang.String);
+ method public void reset();
+ }
+
+ public class TypedValue {
+ ctor public TypedValue();
+ method public static float applyDimension(int, float, android.util.DisplayMetrics);
+ method public final java.lang.CharSequence coerceToString();
+ method public static final java.lang.String coerceToString(int, int);
+ method public static float complexToDimension(int, android.util.DisplayMetrics);
+ method public static int complexToDimensionPixelOffset(int, android.util.DisplayMetrics);
+ method public static int complexToDimensionPixelSize(int, android.util.DisplayMetrics);
+ method public static float complexToFloat(int);
+ method public static float complexToFraction(int, float, float);
+ method public int getComplexUnit();
+ method public float getDimension(android.util.DisplayMetrics);
+ method public final float getFloat();
+ method public float getFraction(float, float);
+ method public void setTo(android.util.TypedValue);
+ field public static final int COMPLEX_MANTISSA_MASK = 16777215; // 0xffffff
+ field public static final int COMPLEX_MANTISSA_SHIFT = 8; // 0x8
+ field public static final int COMPLEX_RADIX_0p23 = 3; // 0x3
+ field public static final int COMPLEX_RADIX_16p7 = 1; // 0x1
+ field public static final int COMPLEX_RADIX_23p0 = 0; // 0x0
+ field public static final int COMPLEX_RADIX_8p15 = 2; // 0x2
+ field public static final int COMPLEX_RADIX_MASK = 3; // 0x3
+ field public static final int COMPLEX_RADIX_SHIFT = 4; // 0x4
+ field public static final int COMPLEX_UNIT_DIP = 1; // 0x1
+ field public static final int COMPLEX_UNIT_FRACTION = 0; // 0x0
+ field public static final int COMPLEX_UNIT_FRACTION_PARENT = 1; // 0x1
+ field public static final int COMPLEX_UNIT_IN = 4; // 0x4
+ field public static final int COMPLEX_UNIT_MASK = 15; // 0xf
+ field public static final int COMPLEX_UNIT_MM = 5; // 0x5
+ field public static final int COMPLEX_UNIT_PT = 3; // 0x3
+ field public static final int COMPLEX_UNIT_PX = 0; // 0x0
+ field public static final int COMPLEX_UNIT_SHIFT = 0; // 0x0
+ field public static final int COMPLEX_UNIT_SP = 2; // 0x2
+ field public static final int DATA_NULL_EMPTY = 1; // 0x1
+ field public static final int DATA_NULL_UNDEFINED = 0; // 0x0
+ field public static final int DENSITY_DEFAULT = 0; // 0x0
+ field public static final int DENSITY_NONE = 65535; // 0xffff
+ field public static final int TYPE_ATTRIBUTE = 2; // 0x2
+ field public static final int TYPE_DIMENSION = 5; // 0x5
+ field public static final int TYPE_FIRST_COLOR_INT = 28; // 0x1c
+ field public static final int TYPE_FIRST_INT = 16; // 0x10
+ field public static final int TYPE_FLOAT = 4; // 0x4
+ field public static final int TYPE_FRACTION = 6; // 0x6
+ field public static final int TYPE_INT_BOOLEAN = 18; // 0x12
+ field public static final int TYPE_INT_COLOR_ARGB4 = 30; // 0x1e
+ field public static final int TYPE_INT_COLOR_ARGB8 = 28; // 0x1c
+ field public static final int TYPE_INT_COLOR_RGB4 = 31; // 0x1f
+ field public static final int TYPE_INT_COLOR_RGB8 = 29; // 0x1d
+ field public static final int TYPE_INT_DEC = 16; // 0x10
+ field public static final int TYPE_INT_HEX = 17; // 0x11
+ field public static final int TYPE_LAST_COLOR_INT = 31; // 0x1f
+ field public static final int TYPE_LAST_INT = 31; // 0x1f
+ field public static final int TYPE_NULL = 0; // 0x0
+ field public static final int TYPE_REFERENCE = 1; // 0x1
+ field public static final int TYPE_STRING = 3; // 0x3
+ field public int assetCookie;
+ field public int changingConfigurations;
+ field public int data;
+ field public int density;
+ field public int resourceId;
+ field public java.lang.CharSequence string;
+ field public int type;
+ }
+
+ public class Xml {
+ method public static android.util.AttributeSet asAttributeSet(org.xmlpull.v1.XmlPullParser);
+ method public static android.util.Xml.Encoding findEncodingByName(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public static org.xmlpull.v1.XmlPullParser newPullParser();
+ method public static org.xmlpull.v1.XmlSerializer newSerializer();
+ method public static void parse(java.lang.String, org.xml.sax.ContentHandler) throws org.xml.sax.SAXException;
+ method public static void parse(java.io.Reader, org.xml.sax.ContentHandler) throws java.io.IOException, org.xml.sax.SAXException;
+ method public static void parse(java.io.InputStream, android.util.Xml.Encoding, org.xml.sax.ContentHandler) throws java.io.IOException, org.xml.sax.SAXException;
+ field public static java.lang.String FEATURE_RELAXED;
+ }
+
+ public static final class Xml.Encoding extends java.lang.Enum {
+ method public static android.util.Xml.Encoding valueOf(java.lang.String);
+ method public static final android.util.Xml.Encoding[] values();
+ enum_constant public static final android.util.Xml.Encoding ISO_8859_1;
+ enum_constant public static final android.util.Xml.Encoding US_ASCII;
+ enum_constant public static final android.util.Xml.Encoding UTF_16;
+ enum_constant public static final android.util.Xml.Encoding UTF_8;
+ }
+
+}
+
+package android.view {
+
+ public abstract class AbsSavedState implements android.os.Parcelable {
+ ctor protected AbsSavedState(android.os.Parcelable);
+ ctor protected AbsSavedState(android.os.Parcel);
+ method public int describeContents();
+ method public final android.os.Parcelable getSuperState();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.AbsSavedState> CREATOR;
+ field public static final android.view.AbsSavedState EMPTY_STATE;
+ }
+
+ public abstract class ActionMode {
+ ctor public ActionMode();
+ method public abstract void finish();
+ method public abstract android.view.View getCustomView();
+ method public abstract android.view.Menu getMenu();
+ method public abstract android.view.MenuInflater getMenuInflater();
+ method public abstract java.lang.CharSequence getSubtitle();
+ method public java.lang.Object getTag();
+ method public abstract java.lang.CharSequence getTitle();
+ method public boolean getTitleOptionalHint();
+ method public int getType();
+ method public void hide(long);
+ method public abstract void invalidate();
+ method public void invalidateContentRect();
+ method public boolean isTitleOptional();
+ method public void onWindowFocusChanged(boolean);
+ method public abstract void setCustomView(android.view.View);
+ method public abstract void setSubtitle(java.lang.CharSequence);
+ method public abstract void setSubtitle(int);
+ method public void setTag(java.lang.Object);
+ method public abstract void setTitle(java.lang.CharSequence);
+ method public abstract void setTitle(int);
+ method public void setTitleOptionalHint(boolean);
+ method public void setType(int);
+ field public static final int DEFAULT_HIDE_DURATION = -1; // 0xffffffff
+ field public static final int TYPE_FLOATING = 1; // 0x1
+ field public static final int TYPE_PRIMARY = 0; // 0x0
+ }
+
+ public static abstract interface ActionMode.Callback {
+ method public abstract boolean onActionItemClicked(android.view.ActionMode, android.view.MenuItem);
+ method public abstract boolean onCreateActionMode(android.view.ActionMode, android.view.Menu);
+ method public abstract void onDestroyActionMode(android.view.ActionMode);
+ method public abstract boolean onPrepareActionMode(android.view.ActionMode, android.view.Menu);
+ }
+
+ public static abstract class ActionMode.Callback2 implements android.view.ActionMode.Callback {
+ ctor public ActionMode.Callback2();
+ method public void onGetContentRect(android.view.ActionMode, android.view.View, android.graphics.Rect);
+ }
+
+ public abstract class ActionProvider {
+ ctor public ActionProvider(android.content.Context);
+ method public boolean hasSubMenu();
+ method public boolean isVisible();
+ method public abstract deprecated android.view.View onCreateActionView();
+ method public android.view.View onCreateActionView(android.view.MenuItem);
+ method public boolean onPerformDefaultAction();
+ method public void onPrepareSubMenu(android.view.SubMenu);
+ method public boolean overridesItemVisibility();
+ method public void refreshVisibility();
+ method public void setVisibilityListener(android.view.ActionProvider.VisibilityListener);
+ }
+
+ public static abstract interface ActionProvider.VisibilityListener {
+ method public abstract void onActionProviderVisibilityChanged(boolean);
+ }
+
+ public final class Choreographer {
+ method public static android.view.Choreographer getInstance();
+ method public void postFrameCallback(android.view.Choreographer.FrameCallback);
+ method public void postFrameCallbackDelayed(android.view.Choreographer.FrameCallback, long);
+ method public void removeFrameCallback(android.view.Choreographer.FrameCallback);
+ }
+
+ public static abstract interface Choreographer.FrameCallback {
+ method public abstract void doFrame(long);
+ }
+
+ public abstract interface CollapsibleActionView {
+ method public abstract void onActionViewCollapsed();
+ method public abstract void onActionViewExpanded();
+ }
+
+ public abstract interface ContextMenu implements android.view.Menu {
+ method public abstract void clearHeader();
+ method public abstract android.view.ContextMenu setHeaderIcon(int);
+ method public abstract android.view.ContextMenu setHeaderIcon(android.graphics.drawable.Drawable);
+ method public abstract android.view.ContextMenu setHeaderTitle(int);
+ method public abstract android.view.ContextMenu setHeaderTitle(java.lang.CharSequence);
+ method public abstract android.view.ContextMenu setHeaderView(android.view.View);
+ }
+
+ public static abstract interface ContextMenu.ContextMenuInfo {
+ }
+
+ public class ContextThemeWrapper extends android.content.ContextWrapper {
+ ctor public ContextThemeWrapper();
+ ctor public ContextThemeWrapper(android.content.Context, int);
+ ctor public ContextThemeWrapper(android.content.Context, android.content.res.Resources.Theme);
+ method public void applyOverrideConfiguration(android.content.res.Configuration);
+ method protected void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean);
+ }
+
+ public final class Display {
+ method public long getAppVsyncOffsetNanos();
+ method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
+ method public int getDisplayId();
+ method public int getFlags();
+ method public deprecated int getHeight();
+ method public void getMetrics(android.util.DisplayMetrics);
+ method public android.view.Display.Mode getMode();
+ method public java.lang.String getName();
+ method public deprecated int getOrientation();
+ method public deprecated int getPixelFormat();
+ method public long getPresentationDeadlineNanos();
+ method public void getRealMetrics(android.util.DisplayMetrics);
+ method public void getRealSize(android.graphics.Point);
+ method public void getRectSize(android.graphics.Rect);
+ method public float getRefreshRate();
+ method public int getRotation();
+ method public void getSize(android.graphics.Point);
+ method public int getState();
+ method public android.view.Display.Mode[] getSupportedModes();
+ method public deprecated float[] getSupportedRefreshRates();
+ method public deprecated int getWidth();
+ method public boolean isValid();
+ field public static final int DEFAULT_DISPLAY = 0; // 0x0
+ field public static final int FLAG_PRESENTATION = 8; // 0x8
+ field public static final int FLAG_PRIVATE = 4; // 0x4
+ field public static final int FLAG_ROUND = 16; // 0x10
+ field public static final int FLAG_SECURE = 2; // 0x2
+ field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
+ field public static final int INVALID_DISPLAY = -1; // 0xffffffff
+ field public static final int STATE_DOZE = 3; // 0x3
+ field public static final int STATE_DOZE_SUSPEND = 4; // 0x4
+ field public static final int STATE_OFF = 1; // 0x1
+ field public static final int STATE_ON = 2; // 0x2
+ field public static final int STATE_UNKNOWN = 0; // 0x0
+ }
+
+ public static final class Display.Mode implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getModeId();
+ method public int getPhysicalHeight();
+ method public int getPhysicalWidth();
+ method public float getRefreshRate();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.Display.Mode> CREATOR;
+ }
+
+ public class DragEvent implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getAction();
+ method public android.content.ClipData getClipData();
+ method public android.content.ClipDescription getClipDescription();
+ method public android.view.DropPermissionHolder getDropPermissionHolder();
+ method public java.lang.Object getLocalState();
+ method public boolean getResult();
+ method public float getX();
+ method public float getY();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ACTION_DRAG_ENDED = 4; // 0x4
+ field public static final int ACTION_DRAG_ENTERED = 5; // 0x5
+ field public static final int ACTION_DRAG_EXITED = 6; // 0x6
+ field public static final int ACTION_DRAG_LOCATION = 2; // 0x2
+ field public static final int ACTION_DRAG_STARTED = 1; // 0x1
+ field public static final int ACTION_DROP = 3; // 0x3
+ field public static final android.os.Parcelable.Creator<android.view.DragEvent> CREATOR;
+ }
+
+ public class DropPermissionHolder implements android.os.Parcelable {
+ method public int describeContents();
+ method public void grant();
+ method public void revoke();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.DropPermissionHolder> CREATOR;
+ }
+
+ public class FocusFinder {
+ method public android.view.View findNearestTouchable(android.view.ViewGroup, int, int, int, int[]);
+ method public final android.view.View findNextFocus(android.view.ViewGroup, android.view.View, int);
+ method public android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int);
+ method public static android.view.FocusFinder getInstance();
+ }
+
+ public abstract class FrameStats {
+ ctor public FrameStats();
+ method public final long getEndTimeNano();
+ method public final int getFrameCount();
+ method public final long getFramePresentedTimeNano(int);
+ method public final long getRefreshPeriodNano();
+ method public final long getStartTimeNano();
+ field public static final long UNDEFINED_TIME_NANO = -1L; // 0xffffffffffffffffL
+ }
+
+ public class GestureDetector {
+ ctor public deprecated GestureDetector(android.view.GestureDetector.OnGestureListener, android.os.Handler);
+ ctor public deprecated GestureDetector(android.view.GestureDetector.OnGestureListener);
+ ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener);
+ ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler);
+ ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler, boolean);
+ method public boolean isLongpressEnabled();
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ method public void setContextClickListener(android.view.GestureDetector.OnContextClickListener);
+ method public void setIsLongpressEnabled(boolean);
+ method public void setOnDoubleTapListener(android.view.GestureDetector.OnDoubleTapListener);
+ }
+
+ public static abstract interface GestureDetector.OnContextClickListener {
+ method public abstract boolean onContextClick(android.view.MotionEvent);
+ }
+
+ public static abstract interface GestureDetector.OnDoubleTapListener {
+ method public abstract boolean onDoubleTap(android.view.MotionEvent);
+ method public abstract boolean onDoubleTapEvent(android.view.MotionEvent);
+ method public abstract boolean onSingleTapConfirmed(android.view.MotionEvent);
+ }
+
+ public static abstract interface GestureDetector.OnGestureListener {
+ method public abstract boolean onDown(android.view.MotionEvent);
+ method public abstract boolean onFling(android.view.MotionEvent, android.view.MotionEvent, float, float);
+ method public abstract void onLongPress(android.view.MotionEvent);
+ method public abstract boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float);
+ method public abstract void onShowPress(android.view.MotionEvent);
+ method public abstract boolean onSingleTapUp(android.view.MotionEvent);
+ }
+
+ public static class GestureDetector.SimpleOnGestureListener implements android.view.GestureDetector.OnContextClickListener android.view.GestureDetector.OnDoubleTapListener android.view.GestureDetector.OnGestureListener {
+ ctor public GestureDetector.SimpleOnGestureListener();
+ method public boolean onContextClick(android.view.MotionEvent);
+ method public boolean onDoubleTap(android.view.MotionEvent);
+ method public boolean onDoubleTapEvent(android.view.MotionEvent);
+ method public boolean onDown(android.view.MotionEvent);
+ method public boolean onFling(android.view.MotionEvent, android.view.MotionEvent, float, float);
+ method public void onLongPress(android.view.MotionEvent);
+ method public boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float);
+ method public void onShowPress(android.view.MotionEvent);
+ method public boolean onSingleTapConfirmed(android.view.MotionEvent);
+ method public boolean onSingleTapUp(android.view.MotionEvent);
+ }
+
+ public class Gravity {
+ ctor public Gravity();
+ method public static void apply(int, int, int, android.graphics.Rect, android.graphics.Rect);
+ method public static void apply(int, int, int, android.graphics.Rect, android.graphics.Rect, int);
+ method public static void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect);
+ method public static void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect, int);
+ method public static void applyDisplay(int, android.graphics.Rect, android.graphics.Rect);
+ method public static void applyDisplay(int, android.graphics.Rect, android.graphics.Rect, int);
+ method public static int getAbsoluteGravity(int, int);
+ method public static boolean isHorizontal(int);
+ method public static boolean isVertical(int);
+ field public static final int AXIS_CLIP = 8; // 0x8
+ field public static final int AXIS_PULL_AFTER = 4; // 0x4
+ field public static final int AXIS_PULL_BEFORE = 2; // 0x2
+ field public static final int AXIS_SPECIFIED = 1; // 0x1
+ field public static final int AXIS_X_SHIFT = 0; // 0x0
+ field public static final int AXIS_Y_SHIFT = 4; // 0x4
+ field public static final int BOTTOM = 80; // 0x50
+ field public static final int CENTER = 17; // 0x11
+ field public static final int CENTER_HORIZONTAL = 1; // 0x1
+ field public static final int CENTER_VERTICAL = 16; // 0x10
+ field public static final int CLIP_HORIZONTAL = 8; // 0x8
+ field public static final int CLIP_VERTICAL = 128; // 0x80
+ field public static final int DISPLAY_CLIP_HORIZONTAL = 16777216; // 0x1000000
+ field public static final int DISPLAY_CLIP_VERTICAL = 268435456; // 0x10000000
+ field public static final int END = 8388613; // 0x800005
+ field public static final int FILL = 119; // 0x77
+ field public static final int FILL_HORIZONTAL = 7; // 0x7
+ field public static final int FILL_VERTICAL = 112; // 0x70
+ field public static final int HORIZONTAL_GRAVITY_MASK = 7; // 0x7
+ field public static final int LEFT = 3; // 0x3
+ field public static final int NO_GRAVITY = 0; // 0x0
+ field public static final int RELATIVE_HORIZONTAL_GRAVITY_MASK = 8388615; // 0x800007
+ field public static final int RELATIVE_LAYOUT_DIRECTION = 8388608; // 0x800000
+ field public static final int RIGHT = 5; // 0x5
+ field public static final int START = 8388611; // 0x800003
+ field public static final int TOP = 48; // 0x30
+ field public static final int VERTICAL_GRAVITY_MASK = 112; // 0x70
+ }
+
+ public class HapticFeedbackConstants {
+ field public static final int CLOCK_TICK = 4; // 0x4
+ field public static final int CONTEXT_CLICK = 6; // 0x6
+ field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2
+ field public static final int FLAG_IGNORE_VIEW_SETTING = 1; // 0x1
+ field public static final int KEYBOARD_TAP = 3; // 0x3
+ field public static final int LONG_PRESS = 0; // 0x0
+ field public static final int VIRTUAL_KEY = 1; // 0x1
+ }
+
+ public class InflateException extends java.lang.RuntimeException {
+ ctor public InflateException();
+ ctor public InflateException(java.lang.String, java.lang.Throwable);
+ ctor public InflateException(java.lang.String);
+ ctor public InflateException(java.lang.Throwable);
+ }
+
+ public final class InputDevice implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getControllerNumber();
+ method public java.lang.String getDescriptor();
+ method public static android.view.InputDevice getDevice(int);
+ method public static int[] getDeviceIds();
+ method public int getId();
+ method public android.view.KeyCharacterMap getKeyCharacterMap();
+ method public int getKeyboardType();
+ method public android.view.InputDevice.MotionRange getMotionRange(int);
+ method public android.view.InputDevice.MotionRange getMotionRange(int, int);
+ method public java.util.List<android.view.InputDevice.MotionRange> getMotionRanges();
+ method public java.lang.String getName();
+ method public int getProductId();
+ method public int getSources();
+ method public int getVendorId();
+ method public android.os.Vibrator getVibrator();
+ method public boolean[] hasKeys(int...);
+ method public boolean hasMicrophone();
+ method public boolean isVirtual();
+ method public boolean supportsSource(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.InputDevice> CREATOR;
+ field public static final int KEYBOARD_TYPE_ALPHABETIC = 2; // 0x2
+ field public static final int KEYBOARD_TYPE_NONE = 0; // 0x0
+ field public static final int KEYBOARD_TYPE_NON_ALPHABETIC = 1; // 0x1
+ field public static final deprecated int MOTION_RANGE_ORIENTATION = 8; // 0x8
+ field public static final deprecated int MOTION_RANGE_PRESSURE = 2; // 0x2
+ field public static final deprecated int MOTION_RANGE_SIZE = 3; // 0x3
+ field public static final deprecated int MOTION_RANGE_TOOL_MAJOR = 6; // 0x6
+ field public static final deprecated int MOTION_RANGE_TOOL_MINOR = 7; // 0x7
+ field public static final deprecated int MOTION_RANGE_TOUCH_MAJOR = 4; // 0x4
+ field public static final deprecated int MOTION_RANGE_TOUCH_MINOR = 5; // 0x5
+ field public static final deprecated int MOTION_RANGE_X = 0; // 0x0
+ field public static final deprecated int MOTION_RANGE_Y = 1; // 0x1
+ field public static final int SOURCE_ANY = -256; // 0xffffff00
+ field public static final int SOURCE_BLUETOOTH_STYLUS = 49154; // 0xc002
+ field public static final int SOURCE_CLASS_BUTTON = 1; // 0x1
+ field public static final int SOURCE_CLASS_JOYSTICK = 16; // 0x10
+ field public static final int SOURCE_CLASS_MASK = 255; // 0xff
+ field public static final int SOURCE_CLASS_NONE = 0; // 0x0
+ field public static final int SOURCE_CLASS_POINTER = 2; // 0x2
+ field public static final int SOURCE_CLASS_POSITION = 8; // 0x8
+ field public static final int SOURCE_CLASS_TRACKBALL = 4; // 0x4
+ field public static final int SOURCE_DPAD = 513; // 0x201
+ field public static final int SOURCE_GAMEPAD = 1025; // 0x401
+ field public static final int SOURCE_HDMI = 33554433; // 0x2000001
+ field public static final int SOURCE_JOYSTICK = 16777232; // 0x1000010
+ field public static final int SOURCE_KEYBOARD = 257; // 0x101
+ field public static final int SOURCE_MOUSE = 8194; // 0x2002
+ field public static final int SOURCE_STYLUS = 16386; // 0x4002
+ field public static final int SOURCE_TOUCHPAD = 1048584; // 0x100008
+ field public static final int SOURCE_TOUCHSCREEN = 4098; // 0x1002
+ field public static final int SOURCE_TOUCH_NAVIGATION = 2097152; // 0x200000
+ field public static final int SOURCE_TRACKBALL = 65540; // 0x10004
+ field public static final int SOURCE_UNKNOWN = 0; // 0x0
+ }
+
+ public static final class InputDevice.MotionRange {
+ method public int getAxis();
+ method public float getFlat();
+ method public float getFuzz();
+ method public float getMax();
+ method public float getMin();
+ method public float getRange();
+ method public float getResolution();
+ method public int getSource();
+ method public boolean isFromSource(int);
+ }
+
+ public abstract class InputEvent implements android.os.Parcelable {
+ 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();
+ method public boolean isFromSource(int);
+ field public static final android.os.Parcelable.Creator<android.view.InputEvent> CREATOR;
+ }
+
+ public final class InputQueue {
+ }
+
+ public static abstract interface InputQueue.Callback {
+ method public abstract void onInputQueueCreated(android.view.InputQueue);
+ method public abstract void onInputQueueDestroyed(android.view.InputQueue);
+ }
+
+ public class KeyCharacterMap implements android.os.Parcelable {
+ method public int describeContents();
+ method public static boolean deviceHasKey(int);
+ method public static boolean[] deviceHasKeys(int[]);
+ method public int get(int, int);
+ method public static int getDeadChar(int, int);
+ method public char getDisplayLabel(int);
+ method public android.view.KeyEvent[] getEvents(char[]);
+ method public deprecated boolean getKeyData(int, android.view.KeyCharacterMap.KeyData);
+ method public int getKeyboardType();
+ method public char getMatch(int, char[]);
+ method public char getMatch(int, char[], int);
+ method public int getModifierBehavior();
+ method public char getNumber(int);
+ method public boolean isPrintingKey(int);
+ method public static android.view.KeyCharacterMap load(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ALPHA = 3; // 0x3
+ field public static final deprecated int BUILT_IN_KEYBOARD = 0; // 0x0
+ field public static final int COMBINING_ACCENT = -2147483648; // 0x80000000
+ field public static final int COMBINING_ACCENT_MASK = 2147483647; // 0x7fffffff
+ field public static final android.os.Parcelable.Creator<android.view.KeyCharacterMap> CREATOR;
+ field public static final int FULL = 4; // 0x4
+ field public static final char HEX_INPUT = 61184; // 0xef00 '\uef00'
+ field public static final int MODIFIER_BEHAVIOR_CHORDED = 0; // 0x0
+ field public static final int MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED = 1; // 0x1
+ field public static final int NUMERIC = 1; // 0x1
+ field public static final char PICKER_DIALOG_INPUT = 61185; // 0xef01 '\uef01'
+ field public static final int PREDICTIVE = 2; // 0x2
+ field public static final int SPECIAL_FUNCTION = 5; // 0x5
+ field public static final int VIRTUAL_KEYBOARD = -1; // 0xffffffff
+ }
+
+ public static deprecated class KeyCharacterMap.KeyData {
+ ctor public KeyCharacterMap.KeyData();
+ field public static final int META_LENGTH = 4; // 0x4
+ field public char displayLabel;
+ field public char[] meta;
+ field public char number;
+ }
+
+ public static class KeyCharacterMap.UnavailableException extends android.util.AndroidRuntimeException {
+ ctor public KeyCharacterMap.UnavailableException(java.lang.String);
+ }
+
+ public class KeyEvent extends android.view.InputEvent implements android.os.Parcelable {
+ ctor public KeyEvent(int, int);
+ ctor public KeyEvent(long, long, int, int, int);
+ ctor public KeyEvent(long, long, int, int, int, int);
+ ctor public KeyEvent(long, long, int, int, int, int, int, int);
+ ctor public KeyEvent(long, long, int, int, int, int, int, int, int);
+ ctor public KeyEvent(long, long, int, int, int, int, int, int, int, int);
+ ctor public KeyEvent(long, java.lang.String, int, int);
+ ctor public KeyEvent(android.view.KeyEvent);
+ ctor public deprecated KeyEvent(android.view.KeyEvent, long, int);
+ method public static android.view.KeyEvent changeAction(android.view.KeyEvent, int);
+ method public static android.view.KeyEvent changeFlags(android.view.KeyEvent, int);
+ method public static android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int);
+ method public static android.view.KeyEvent changeTimeRepeat(android.view.KeyEvent, long, int, int);
+ method public final deprecated boolean dispatch(android.view.KeyEvent.Callback);
+ method public final boolean dispatch(android.view.KeyEvent.Callback, android.view.KeyEvent.DispatcherState, java.lang.Object);
+ method public final int getAction();
+ method public final java.lang.String getCharacters();
+ method public static int getDeadChar(int, int);
+ method public final int getDeviceId();
+ method public char getDisplayLabel();
+ method public final long getDownTime();
+ method public final long getEventTime();
+ method public final int getFlags();
+ method public final android.view.KeyCharacterMap getKeyCharacterMap();
+ method public final int getKeyCode();
+ method public deprecated boolean getKeyData(android.view.KeyCharacterMap.KeyData);
+ method public char getMatch(char[]);
+ method public char getMatch(char[], int);
+ method public static int getMaxKeyCode();
+ method public final int getMetaState();
+ method public static int getModifierMetaStateMask();
+ method public final int getModifiers();
+ method public char getNumber();
+ method public final int getRepeatCount();
+ method public final int getScanCode();
+ method public final int getSource();
+ method public int getUnicodeChar();
+ method public int getUnicodeChar(int);
+ method public final boolean hasModifiers(int);
+ method public final boolean hasNoModifiers();
+ method public final boolean isAltPressed();
+ method public final boolean isCanceled();
+ method public final boolean isCapsLockOn();
+ method public final boolean isCtrlPressed();
+ method public final boolean isFunctionPressed();
+ method public static final boolean isGamepadButton(int);
+ method public final boolean isLongPress();
+ method public final boolean isMetaPressed();
+ method public static boolean isModifierKey(int);
+ method public final boolean isNumLockOn();
+ method public boolean isPrintingKey();
+ method public final boolean isScrollLockOn();
+ method public final boolean isShiftPressed();
+ method public final boolean isSymPressed();
+ method public final boolean isSystem();
+ method public final boolean isTracking();
+ method public static int keyCodeFromString(java.lang.String);
+ method public static java.lang.String keyCodeToString(int);
+ method public static boolean metaStateHasModifiers(int, int);
+ method public static boolean metaStateHasNoModifiers(int);
+ method public static int normalizeMetaState(int);
+ method public final void setSource(int);
+ method public final void startTracking();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ACTION_DOWN = 0; // 0x0
+ field public static final int ACTION_MULTIPLE = 2; // 0x2
+ field public static final int ACTION_UP = 1; // 0x1
+ field public static final android.os.Parcelable.Creator<android.view.KeyEvent> CREATOR;
+ field public static final int FLAG_CANCELED = 32; // 0x20
+ field public static final int FLAG_CANCELED_LONG_PRESS = 256; // 0x100
+ field public static final int FLAG_EDITOR_ACTION = 16; // 0x10
+ field public static final int FLAG_FALLBACK = 1024; // 0x400
+ field public static final int FLAG_FROM_SYSTEM = 8; // 0x8
+ field public static final int FLAG_KEEP_TOUCH_MODE = 4; // 0x4
+ field public static final int FLAG_LONG_PRESS = 128; // 0x80
+ field public static final int FLAG_SOFT_KEYBOARD = 2; // 0x2
+ field public static final int FLAG_TRACKING = 512; // 0x200
+ field public static final int FLAG_VIRTUAL_HARD_KEY = 64; // 0x40
+ field public static final deprecated int FLAG_WOKE_HERE = 1; // 0x1
+ field public static final int KEYCODE_0 = 7; // 0x7
+ field public static final int KEYCODE_1 = 8; // 0x8
+ field public static final int KEYCODE_11 = 227; // 0xe3
+ field public static final int KEYCODE_12 = 228; // 0xe4
+ field public static final int KEYCODE_2 = 9; // 0x9
+ field public static final int KEYCODE_3 = 10; // 0xa
+ field public static final int KEYCODE_3D_MODE = 206; // 0xce
+ field public static final int KEYCODE_4 = 11; // 0xb
+ field public static final int KEYCODE_5 = 12; // 0xc
+ field public static final int KEYCODE_6 = 13; // 0xd
+ field public static final int KEYCODE_7 = 14; // 0xe
+ field public static final int KEYCODE_8 = 15; // 0xf
+ field public static final int KEYCODE_9 = 16; // 0x10
+ field public static final int KEYCODE_A = 29; // 0x1d
+ field public static final int KEYCODE_ALT_LEFT = 57; // 0x39
+ field public static final int KEYCODE_ALT_RIGHT = 58; // 0x3a
+ field public static final int KEYCODE_APOSTROPHE = 75; // 0x4b
+ field public static final int KEYCODE_APP_SWITCH = 187; // 0xbb
+ field public static final int KEYCODE_ASSIST = 219; // 0xdb
+ field public static final int KEYCODE_AT = 77; // 0x4d
+ field public static final int KEYCODE_AVR_INPUT = 182; // 0xb6
+ field public static final int KEYCODE_AVR_POWER = 181; // 0xb5
+ field public static final int KEYCODE_B = 30; // 0x1e
+ field public static final int KEYCODE_BACK = 4; // 0x4
+ field public static final int KEYCODE_BACKSLASH = 73; // 0x49
+ field public static final int KEYCODE_BOOKMARK = 174; // 0xae
+ field public static final int KEYCODE_BREAK = 121; // 0x79
+ field public static final int KEYCODE_BRIGHTNESS_DOWN = 220; // 0xdc
+ field public static final int KEYCODE_BRIGHTNESS_UP = 221; // 0xdd
+ field public static final int KEYCODE_BUTTON_1 = 188; // 0xbc
+ field public static final int KEYCODE_BUTTON_10 = 197; // 0xc5
+ field public static final int KEYCODE_BUTTON_11 = 198; // 0xc6
+ field public static final int KEYCODE_BUTTON_12 = 199; // 0xc7
+ field public static final int KEYCODE_BUTTON_13 = 200; // 0xc8
+ field public static final int KEYCODE_BUTTON_14 = 201; // 0xc9
+ field public static final int KEYCODE_BUTTON_15 = 202; // 0xca
+ field public static final int KEYCODE_BUTTON_16 = 203; // 0xcb
+ field public static final int KEYCODE_BUTTON_2 = 189; // 0xbd
+ field public static final int KEYCODE_BUTTON_3 = 190; // 0xbe
+ field public static final int KEYCODE_BUTTON_4 = 191; // 0xbf
+ field public static final int KEYCODE_BUTTON_5 = 192; // 0xc0
+ field public static final int KEYCODE_BUTTON_6 = 193; // 0xc1
+ field public static final int KEYCODE_BUTTON_7 = 194; // 0xc2
+ field public static final int KEYCODE_BUTTON_8 = 195; // 0xc3
+ field public static final int KEYCODE_BUTTON_9 = 196; // 0xc4
+ field public static final int KEYCODE_BUTTON_A = 96; // 0x60
+ field public static final int KEYCODE_BUTTON_B = 97; // 0x61
+ field public static final int KEYCODE_BUTTON_C = 98; // 0x62
+ field public static final int KEYCODE_BUTTON_L1 = 102; // 0x66
+ field public static final int KEYCODE_BUTTON_L2 = 104; // 0x68
+ field public static final int KEYCODE_BUTTON_MODE = 110; // 0x6e
+ field public static final int KEYCODE_BUTTON_R1 = 103; // 0x67
+ field public static final int KEYCODE_BUTTON_R2 = 105; // 0x69
+ field public static final int KEYCODE_BUTTON_SELECT = 109; // 0x6d
+ field public static final int KEYCODE_BUTTON_START = 108; // 0x6c
+ field public static final int KEYCODE_BUTTON_THUMBL = 106; // 0x6a
+ field public static final int KEYCODE_BUTTON_THUMBR = 107; // 0x6b
+ field public static final int KEYCODE_BUTTON_X = 99; // 0x63
+ field public static final int KEYCODE_BUTTON_Y = 100; // 0x64
+ field public static final int KEYCODE_BUTTON_Z = 101; // 0x65
+ field public static final int KEYCODE_C = 31; // 0x1f
+ field public static final int KEYCODE_CALCULATOR = 210; // 0xd2
+ field public static final int KEYCODE_CALENDAR = 208; // 0xd0
+ field public static final int KEYCODE_CALL = 5; // 0x5
+ field public static final int KEYCODE_CAMERA = 27; // 0x1b
+ field public static final int KEYCODE_CAPS_LOCK = 115; // 0x73
+ field public static final int KEYCODE_CAPTIONS = 175; // 0xaf
+ field public static final int KEYCODE_CHANNEL_DOWN = 167; // 0xa7
+ field public static final int KEYCODE_CHANNEL_UP = 166; // 0xa6
+ field public static final int KEYCODE_CLEAR = 28; // 0x1c
+ field public static final int KEYCODE_COMMA = 55; // 0x37
+ field public static final int KEYCODE_CONTACTS = 207; // 0xcf
+ field public static final int KEYCODE_COPY = 278; // 0x116
+ field public static final int KEYCODE_CTRL_LEFT = 113; // 0x71
+ field public static final int KEYCODE_CTRL_RIGHT = 114; // 0x72
+ field public static final int KEYCODE_CUT = 277; // 0x115
+ field public static final int KEYCODE_D = 32; // 0x20
+ field public static final int KEYCODE_DEL = 67; // 0x43
+ field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17
+ field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14
+ field public static final int KEYCODE_DPAD_DOWN_LEFT = 269; // 0x10d
+ field public static final int KEYCODE_DPAD_DOWN_RIGHT = 271; // 0x10f
+ field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15
+ field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16
+ field public static final int KEYCODE_DPAD_UP = 19; // 0x13
+ field public static final int KEYCODE_DPAD_UP_LEFT = 268; // 0x10c
+ field public static final int KEYCODE_DPAD_UP_RIGHT = 270; // 0x10e
+ field public static final int KEYCODE_DVR = 173; // 0xad
+ field public static final int KEYCODE_E = 33; // 0x21
+ field public static final int KEYCODE_EISU = 212; // 0xd4
+ field public static final int KEYCODE_ENDCALL = 6; // 0x6
+ field public static final int KEYCODE_ENTER = 66; // 0x42
+ field public static final int KEYCODE_ENVELOPE = 65; // 0x41
+ field public static final int KEYCODE_EQUALS = 70; // 0x46
+ field public static final int KEYCODE_ESCAPE = 111; // 0x6f
+ field public static final int KEYCODE_EXPLORER = 64; // 0x40
+ field public static final int KEYCODE_F = 34; // 0x22
+ field public static final int KEYCODE_F1 = 131; // 0x83
+ field public static final int KEYCODE_F10 = 140; // 0x8c
+ field public static final int KEYCODE_F11 = 141; // 0x8d
+ field public static final int KEYCODE_F12 = 142; // 0x8e
+ field public static final int KEYCODE_F2 = 132; // 0x84
+ field public static final int KEYCODE_F3 = 133; // 0x85
+ field public static final int KEYCODE_F4 = 134; // 0x86
+ field public static final int KEYCODE_F5 = 135; // 0x87
+ field public static final int KEYCODE_F6 = 136; // 0x88
+ field public static final int KEYCODE_F7 = 137; // 0x89
+ field public static final int KEYCODE_F8 = 138; // 0x8a
+ field public static final int KEYCODE_F9 = 139; // 0x8b
+ field public static final int KEYCODE_FOCUS = 80; // 0x50
+ field public static final int KEYCODE_FORWARD = 125; // 0x7d
+ field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70
+ field public static final int KEYCODE_FUNCTION = 119; // 0x77
+ field public static final int KEYCODE_G = 35; // 0x23
+ field public static final int KEYCODE_GRAVE = 68; // 0x44
+ field public static final int KEYCODE_GUIDE = 172; // 0xac
+ field public static final int KEYCODE_H = 36; // 0x24
+ field public static final int KEYCODE_HEADSETHOOK = 79; // 0x4f
+ field public static final int KEYCODE_HELP = 259; // 0x103
+ field public static final int KEYCODE_HENKAN = 214; // 0xd6
+ field public static final int KEYCODE_HOME = 3; // 0x3
+ field public static final int KEYCODE_I = 37; // 0x25
+ field public static final int KEYCODE_INFO = 165; // 0xa5
+ field public static final int KEYCODE_INSERT = 124; // 0x7c
+ field public static final int KEYCODE_J = 38; // 0x26
+ field public static final int KEYCODE_K = 39; // 0x27
+ field public static final int KEYCODE_KANA = 218; // 0xda
+ field public static final int KEYCODE_KATAKANA_HIRAGANA = 215; // 0xd7
+ field public static final int KEYCODE_L = 40; // 0x28
+ field public static final int KEYCODE_LANGUAGE_SWITCH = 204; // 0xcc
+ field public static final int KEYCODE_LAST_CHANNEL = 229; // 0xe5
+ field public static final int KEYCODE_LEFT_BRACKET = 71; // 0x47
+ field public static final int KEYCODE_M = 41; // 0x29
+ field public static final int KEYCODE_MANNER_MODE = 205; // 0xcd
+ field public static final int KEYCODE_MEDIA_AUDIO_TRACK = 222; // 0xde
+ field public static final int KEYCODE_MEDIA_CLOSE = 128; // 0x80
+ field public static final int KEYCODE_MEDIA_EJECT = 129; // 0x81
+ field public static final int KEYCODE_MEDIA_FAST_FORWARD = 90; // 0x5a
+ field public static final int KEYCODE_MEDIA_NEXT = 87; // 0x57
+ field public static final int KEYCODE_MEDIA_PAUSE = 127; // 0x7f
+ field public static final int KEYCODE_MEDIA_PLAY = 126; // 0x7e
+ field public static final int KEYCODE_MEDIA_PLAY_PAUSE = 85; // 0x55
+ field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58
+ field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82
+ field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59
+ field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111
+ field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110
+ field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113
+ field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112
+ field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56
+ field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2
+ field public static final int KEYCODE_MENU = 82; // 0x52
+ field public static final int KEYCODE_META_LEFT = 117; // 0x75
+ field public static final int KEYCODE_META_RIGHT = 118; // 0x76
+ field public static final int KEYCODE_MINUS = 69; // 0x45
+ field public static final int KEYCODE_MOVE_END = 123; // 0x7b
+ field public static final int KEYCODE_MOVE_HOME = 122; // 0x7a
+ field public static final int KEYCODE_MUHENKAN = 213; // 0xd5
+ field public static final int KEYCODE_MUSIC = 209; // 0xd1
+ field public static final int KEYCODE_MUTE = 91; // 0x5b
+ field public static final int KEYCODE_N = 42; // 0x2a
+ field public static final int KEYCODE_NAVIGATE_IN = 262; // 0x106
+ field public static final int KEYCODE_NAVIGATE_NEXT = 261; // 0x105
+ field public static final int KEYCODE_NAVIGATE_OUT = 263; // 0x107
+ field public static final int KEYCODE_NAVIGATE_PREVIOUS = 260; // 0x104
+ field public static final int KEYCODE_NOTIFICATION = 83; // 0x53
+ field public static final int KEYCODE_NUM = 78; // 0x4e
+ field public static final int KEYCODE_NUMPAD_0 = 144; // 0x90
+ field public static final int KEYCODE_NUMPAD_1 = 145; // 0x91
+ field public static final int KEYCODE_NUMPAD_2 = 146; // 0x92
+ field public static final int KEYCODE_NUMPAD_3 = 147; // 0x93
+ field public static final int KEYCODE_NUMPAD_4 = 148; // 0x94
+ field public static final int KEYCODE_NUMPAD_5 = 149; // 0x95
+ field public static final int KEYCODE_NUMPAD_6 = 150; // 0x96
+ field public static final int KEYCODE_NUMPAD_7 = 151; // 0x97
+ field public static final int KEYCODE_NUMPAD_8 = 152; // 0x98
+ field public static final int KEYCODE_NUMPAD_9 = 153; // 0x99
+ field public static final int KEYCODE_NUMPAD_ADD = 157; // 0x9d
+ field public static final int KEYCODE_NUMPAD_COMMA = 159; // 0x9f
+ field public static final int KEYCODE_NUMPAD_DIVIDE = 154; // 0x9a
+ field public static final int KEYCODE_NUMPAD_DOT = 158; // 0x9e
+ field public static final int KEYCODE_NUMPAD_ENTER = 160; // 0xa0
+ field public static final int KEYCODE_NUMPAD_EQUALS = 161; // 0xa1
+ field public static final int KEYCODE_NUMPAD_LEFT_PAREN = 162; // 0xa2
+ field public static final int KEYCODE_NUMPAD_MULTIPLY = 155; // 0x9b
+ field public static final int KEYCODE_NUMPAD_RIGHT_PAREN = 163; // 0xa3
+ field public static final int KEYCODE_NUMPAD_SUBTRACT = 156; // 0x9c
+ field public static final int KEYCODE_NUM_LOCK = 143; // 0x8f
+ field public static final int KEYCODE_O = 43; // 0x2b
+ field public static final int KEYCODE_P = 44; // 0x2c
+ field public static final int KEYCODE_PAGE_DOWN = 93; // 0x5d
+ field public static final int KEYCODE_PAGE_UP = 92; // 0x5c
+ field public static final int KEYCODE_PAIRING = 225; // 0xe1
+ field public static final int KEYCODE_PASTE = 279; // 0x117
+ field public static final int KEYCODE_PERIOD = 56; // 0x38
+ field public static final int KEYCODE_PICTSYMBOLS = 94; // 0x5e
+ field public static final int KEYCODE_PLUS = 81; // 0x51
+ field public static final int KEYCODE_POUND = 18; // 0x12
+ field public static final int KEYCODE_POWER = 26; // 0x1a
+ field public static final int KEYCODE_PROG_BLUE = 186; // 0xba
+ field public static final int KEYCODE_PROG_GREEN = 184; // 0xb8
+ field public static final int KEYCODE_PROG_RED = 183; // 0xb7
+ field public static final int KEYCODE_PROG_YELLOW = 185; // 0xb9
+ field public static final int KEYCODE_Q = 45; // 0x2d
+ field public static final int KEYCODE_R = 46; // 0x2e
+ field public static final int KEYCODE_RIGHT_BRACKET = 72; // 0x48
+ field public static final int KEYCODE_RO = 217; // 0xd9
+ field public static final int KEYCODE_S = 47; // 0x2f
+ field public static final int KEYCODE_SCROLL_LOCK = 116; // 0x74
+ field public static final int KEYCODE_SEARCH = 84; // 0x54
+ field public static final int KEYCODE_SEMICOLON = 74; // 0x4a
+ field public static final int KEYCODE_SETTINGS = 176; // 0xb0
+ field public static final int KEYCODE_SHIFT_LEFT = 59; // 0x3b
+ field public static final int KEYCODE_SHIFT_RIGHT = 60; // 0x3c
+ field public static final int KEYCODE_SLASH = 76; // 0x4c
+ field public static final int KEYCODE_SLEEP = 223; // 0xdf
+ field public static final int KEYCODE_SOFT_LEFT = 1; // 0x1
+ field public static final int KEYCODE_SOFT_RIGHT = 2; // 0x2
+ field public static final int KEYCODE_SOFT_SLEEP = 276; // 0x114
+ field public static final int KEYCODE_SPACE = 62; // 0x3e
+ field public static final int KEYCODE_STAR = 17; // 0x11
+ field public static final int KEYCODE_STB_INPUT = 180; // 0xb4
+ field public static final int KEYCODE_STB_POWER = 179; // 0xb3
+ field public static final int KEYCODE_STEM_1 = 265; // 0x109
+ field public static final int KEYCODE_STEM_2 = 266; // 0x10a
+ field public static final int KEYCODE_STEM_3 = 267; // 0x10b
+ field public static final int KEYCODE_STEM_PRIMARY = 264; // 0x108
+ field public static final int KEYCODE_SWITCH_CHARSET = 95; // 0x5f
+ field public static final int KEYCODE_SYM = 63; // 0x3f
+ field public static final int KEYCODE_SYSRQ = 120; // 0x78
+ field public static final int KEYCODE_T = 48; // 0x30
+ field public static final int KEYCODE_TAB = 61; // 0x3d
+ field public static final int KEYCODE_TV = 170; // 0xaa
+ field public static final int KEYCODE_TV_ANTENNA_CABLE = 242; // 0xf2
+ field public static final int KEYCODE_TV_AUDIO_DESCRIPTION = 252; // 0xfc
+ field public static final int KEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN = 254; // 0xfe
+ field public static final int KEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP = 253; // 0xfd
+ field public static final int KEYCODE_TV_CONTENTS_MENU = 256; // 0x100
+ field public static final int KEYCODE_TV_DATA_SERVICE = 230; // 0xe6
+ field public static final int KEYCODE_TV_INPUT = 178; // 0xb2
+ field public static final int KEYCODE_TV_INPUT_COMPONENT_1 = 249; // 0xf9
+ field public static final int KEYCODE_TV_INPUT_COMPONENT_2 = 250; // 0xfa
+ field public static final int KEYCODE_TV_INPUT_COMPOSITE_1 = 247; // 0xf7
+ field public static final int KEYCODE_TV_INPUT_COMPOSITE_2 = 248; // 0xf8
+ field public static final int KEYCODE_TV_INPUT_HDMI_1 = 243; // 0xf3
+ field public static final int KEYCODE_TV_INPUT_HDMI_2 = 244; // 0xf4
+ field public static final int KEYCODE_TV_INPUT_HDMI_3 = 245; // 0xf5
+ field public static final int KEYCODE_TV_INPUT_HDMI_4 = 246; // 0xf6
+ field public static final int KEYCODE_TV_INPUT_VGA_1 = 251; // 0xfb
+ field public static final int KEYCODE_TV_MEDIA_CONTEXT_MENU = 257; // 0x101
+ field public static final int KEYCODE_TV_NETWORK = 241; // 0xf1
+ field public static final int KEYCODE_TV_NUMBER_ENTRY = 234; // 0xea
+ field public static final int KEYCODE_TV_POWER = 177; // 0xb1
+ field public static final int KEYCODE_TV_RADIO_SERVICE = 232; // 0xe8
+ field public static final int KEYCODE_TV_SATELLITE = 237; // 0xed
+ field public static final int KEYCODE_TV_SATELLITE_BS = 238; // 0xee
+ field public static final int KEYCODE_TV_SATELLITE_CS = 239; // 0xef
+ field public static final int KEYCODE_TV_SATELLITE_SERVICE = 240; // 0xf0
+ field public static final int KEYCODE_TV_TELETEXT = 233; // 0xe9
+ field public static final int KEYCODE_TV_TERRESTRIAL_ANALOG = 235; // 0xeb
+ field public static final int KEYCODE_TV_TERRESTRIAL_DIGITAL = 236; // 0xec
+ field public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258; // 0x102
+ field public static final int KEYCODE_TV_ZOOM_MODE = 255; // 0xff
+ field public static final int KEYCODE_U = 49; // 0x31
+ field public static final int KEYCODE_UNKNOWN = 0; // 0x0
+ field public static final int KEYCODE_V = 50; // 0x32
+ field public static final int KEYCODE_VOICE_ASSIST = 231; // 0xe7
+ field public static final int KEYCODE_VOLUME_DOWN = 25; // 0x19
+ field public static final int KEYCODE_VOLUME_MUTE = 164; // 0xa4
+ field public static final int KEYCODE_VOLUME_UP = 24; // 0x18
+ field public static final int KEYCODE_W = 51; // 0x33
+ field public static final int KEYCODE_WAKEUP = 224; // 0xe0
+ field public static final int KEYCODE_WINDOW = 171; // 0xab
+ field public static final int KEYCODE_X = 52; // 0x34
+ field public static final int KEYCODE_Y = 53; // 0x35
+ field public static final int KEYCODE_YEN = 216; // 0xd8
+ field public static final int KEYCODE_Z = 54; // 0x36
+ field public static final int KEYCODE_ZENKAKU_HANKAKU = 211; // 0xd3
+ field public static final int KEYCODE_ZOOM_IN = 168; // 0xa8
+ field public static final int KEYCODE_ZOOM_OUT = 169; // 0xa9
+ field public static final deprecated int MAX_KEYCODE = 84; // 0x54
+ field public static final int META_ALT_LEFT_ON = 16; // 0x10
+ field public static final int META_ALT_MASK = 50; // 0x32
+ field public static final int META_ALT_ON = 2; // 0x2
+ field public static final int META_ALT_RIGHT_ON = 32; // 0x20
+ field public static final int META_CAPS_LOCK_ON = 1048576; // 0x100000
+ field public static final int META_CTRL_LEFT_ON = 8192; // 0x2000
+ field public static final int META_CTRL_MASK = 28672; // 0x7000
+ field public static final int META_CTRL_ON = 4096; // 0x1000
+ field public static final int META_CTRL_RIGHT_ON = 16384; // 0x4000
+ field public static final int META_FUNCTION_ON = 8; // 0x8
+ field public static final int META_META_LEFT_ON = 131072; // 0x20000
+ field public static final int META_META_MASK = 458752; // 0x70000
+ field public static final int META_META_ON = 65536; // 0x10000
+ field public static final int META_META_RIGHT_ON = 262144; // 0x40000
+ field public static final int META_NUM_LOCK_ON = 2097152; // 0x200000
+ field public static final int META_SCROLL_LOCK_ON = 4194304; // 0x400000
+ field public static final int META_SHIFT_LEFT_ON = 64; // 0x40
+ field public static final int META_SHIFT_MASK = 193; // 0xc1
+ field public static final int META_SHIFT_ON = 1; // 0x1
+ field public static final int META_SHIFT_RIGHT_ON = 128; // 0x80
+ field public static final int META_SYM_ON = 4; // 0x4
+ }
+
+ public static abstract interface KeyEvent.Callback {
+ method public abstract boolean onKeyDown(int, android.view.KeyEvent);
+ method public abstract boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public abstract boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public abstract boolean onKeyUp(int, android.view.KeyEvent);
+ }
+
+ public static class KeyEvent.DispatcherState {
+ ctor public KeyEvent.DispatcherState();
+ method public void handleUpEvent(android.view.KeyEvent);
+ method public boolean isTracking(android.view.KeyEvent);
+ method public void performedLongPress(android.view.KeyEvent);
+ method public void reset();
+ method public void reset(java.lang.Object);
+ method public void startTracking(android.view.KeyEvent, java.lang.Object);
+ }
+
+ public abstract class LayoutInflater {
+ ctor protected LayoutInflater(android.content.Context);
+ ctor protected LayoutInflater(android.view.LayoutInflater, android.content.Context);
+ method public abstract android.view.LayoutInflater cloneInContext(android.content.Context);
+ method public final android.view.View createView(java.lang.String, java.lang.String, android.util.AttributeSet) throws java.lang.ClassNotFoundException, android.view.InflateException;
+ method public static android.view.LayoutInflater from(android.content.Context);
+ method public android.content.Context getContext();
+ method public final android.view.LayoutInflater.Factory getFactory();
+ method public final android.view.LayoutInflater.Factory2 getFactory2();
+ method public android.view.LayoutInflater.Filter getFilter();
+ method public android.view.View inflate(int, android.view.ViewGroup);
+ method public android.view.View inflate(org.xmlpull.v1.XmlPullParser, android.view.ViewGroup);
+ method public android.view.View inflate(int, android.view.ViewGroup, boolean);
+ method public android.view.View inflate(org.xmlpull.v1.XmlPullParser, android.view.ViewGroup, boolean);
+ method protected android.view.View onCreateView(java.lang.String, android.util.AttributeSet) throws java.lang.ClassNotFoundException;
+ method protected android.view.View onCreateView(android.view.View, java.lang.String, android.util.AttributeSet) throws java.lang.ClassNotFoundException;
+ method public void setFactory(android.view.LayoutInflater.Factory);
+ method public void setFactory2(android.view.LayoutInflater.Factory2);
+ method public void setFilter(android.view.LayoutInflater.Filter);
+ }
+
+ public static abstract interface LayoutInflater.Factory {
+ method public abstract android.view.View onCreateView(java.lang.String, android.content.Context, android.util.AttributeSet);
+ }
+
+ public static abstract interface LayoutInflater.Factory2 implements android.view.LayoutInflater.Factory {
+ method public abstract android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);
+ }
+
+ public static abstract interface LayoutInflater.Filter {
+ method public abstract boolean onLoadClass(java.lang.Class);
+ }
+
+ public abstract interface Menu {
+ method public abstract android.view.MenuItem add(java.lang.CharSequence);
+ method public abstract android.view.MenuItem add(int);
+ method public abstract android.view.MenuItem add(int, int, int, java.lang.CharSequence);
+ method public abstract android.view.MenuItem add(int, int, int, int);
+ method public abstract int addIntentOptions(int, int, int, android.content.ComponentName, android.content.Intent[], android.content.Intent, int, android.view.MenuItem[]);
+ method public abstract android.view.SubMenu addSubMenu(java.lang.CharSequence);
+ method public abstract android.view.SubMenu addSubMenu(int);
+ method public abstract android.view.SubMenu addSubMenu(int, int, int, java.lang.CharSequence);
+ method public abstract android.view.SubMenu addSubMenu(int, int, int, int);
+ method public abstract void clear();
+ method public abstract void close();
+ method public abstract android.view.MenuItem findItem(int);
+ method public abstract android.view.MenuItem getItem(int);
+ method public abstract boolean hasVisibleItems();
+ method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
+ method public abstract boolean performIdentifierAction(int, int);
+ method public abstract boolean performShortcut(int, android.view.KeyEvent, int);
+ method public abstract void removeGroup(int);
+ method public abstract void removeItem(int);
+ method public abstract void setGroupCheckable(int, boolean, boolean);
+ method public abstract void setGroupEnabled(int, boolean);
+ method public abstract void setGroupVisible(int, boolean);
+ method public abstract void setQwertyMode(boolean);
+ method public abstract int size();
+ field public static final int CATEGORY_ALTERNATIVE = 262144; // 0x40000
+ field public static final int CATEGORY_CONTAINER = 65536; // 0x10000
+ field public static final int CATEGORY_SECONDARY = 196608; // 0x30000
+ field public static final int CATEGORY_SYSTEM = 131072; // 0x20000
+ field public static final int FIRST = 1; // 0x1
+ field public static final int FLAG_ALWAYS_PERFORM_CLOSE = 2; // 0x2
+ field public static final int FLAG_APPEND_TO_GROUP = 1; // 0x1
+ field public static final int FLAG_PERFORM_NO_CLOSE = 1; // 0x1
+ field public static final int NONE = 0; // 0x0
+ }
+
+ public class MenuInflater {
+ ctor public MenuInflater(android.content.Context);
+ method public void inflate(int, android.view.Menu);
+ }
+
+ public abstract interface MenuItem {
+ method public abstract boolean collapseActionView();
+ method public abstract boolean expandActionView();
+ method public abstract android.view.ActionProvider getActionProvider();
+ method public abstract android.view.View getActionView();
+ method public abstract char getAlphabeticShortcut();
+ method public abstract int getGroupId();
+ method public abstract android.graphics.drawable.Drawable getIcon();
+ method public abstract android.content.Intent getIntent();
+ method public abstract int getItemId();
+ method public abstract android.view.ContextMenu.ContextMenuInfo getMenuInfo();
+ method public abstract char getNumericShortcut();
+ method public abstract int getOrder();
+ method public abstract android.view.SubMenu getSubMenu();
+ method public abstract java.lang.CharSequence getTitle();
+ method public abstract java.lang.CharSequence getTitleCondensed();
+ method public abstract boolean hasSubMenu();
+ method public abstract boolean isActionViewExpanded();
+ method public abstract boolean isCheckable();
+ method public abstract boolean isChecked();
+ method public abstract boolean isEnabled();
+ method public abstract boolean isVisible();
+ method public abstract android.view.MenuItem setActionProvider(android.view.ActionProvider);
+ method public abstract android.view.MenuItem setActionView(android.view.View);
+ method public abstract android.view.MenuItem setActionView(int);
+ method public abstract android.view.MenuItem setAlphabeticShortcut(char);
+ method public abstract android.view.MenuItem setCheckable(boolean);
+ method public abstract android.view.MenuItem setChecked(boolean);
+ method public abstract android.view.MenuItem setEnabled(boolean);
+ method public abstract android.view.MenuItem setIcon(android.graphics.drawable.Drawable);
+ method public abstract android.view.MenuItem setIcon(int);
+ method public abstract android.view.MenuItem setIntent(android.content.Intent);
+ method public abstract android.view.MenuItem setNumericShortcut(char);
+ method public abstract android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);
+ method public abstract android.view.MenuItem setOnMenuItemClickListener(android.view.MenuItem.OnMenuItemClickListener);
+ method public abstract android.view.MenuItem setShortcut(char, char);
+ method public abstract void setShowAsAction(int);
+ method public abstract android.view.MenuItem setShowAsActionFlags(int);
+ method public abstract android.view.MenuItem setTitle(java.lang.CharSequence);
+ method public abstract android.view.MenuItem setTitle(int);
+ method public abstract android.view.MenuItem setTitleCondensed(java.lang.CharSequence);
+ method public abstract android.view.MenuItem setVisible(boolean);
+ field public static final int SHOW_AS_ACTION_ALWAYS = 2; // 0x2
+ field public static final int SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW = 8; // 0x8
+ field public static final int SHOW_AS_ACTION_IF_ROOM = 1; // 0x1
+ field public static final int SHOW_AS_ACTION_NEVER = 0; // 0x0
+ field public static final int SHOW_AS_ACTION_WITH_TEXT = 4; // 0x4
+ }
+
+ public static abstract interface MenuItem.OnActionExpandListener {
+ method public abstract boolean onMenuItemActionCollapse(android.view.MenuItem);
+ method public abstract boolean onMenuItemActionExpand(android.view.MenuItem);
+ }
+
+ public static abstract interface MenuItem.OnMenuItemClickListener {
+ method public abstract boolean onMenuItemClick(android.view.MenuItem);
+ }
+
+ public final class MotionEvent extends android.view.InputEvent implements android.os.Parcelable {
+ method public static java.lang.String actionToString(int);
+ method public final void addBatch(long, float, float, float, float, int);
+ method public final void addBatch(long, android.view.MotionEvent.PointerCoords[], int);
+ method public static int axisFromString(java.lang.String);
+ method public static java.lang.String axisToString(int);
+ method public final int findPointerIndex(int);
+ method public final int getAction();
+ method public final int getActionButton();
+ method public final int getActionIndex();
+ method public final int getActionMasked();
+ method public final float getAxisValue(int);
+ method public final float getAxisValue(int, int);
+ method public final int getButtonState();
+ method public final int getDeviceId();
+ method public final long getDownTime();
+ method public final int getEdgeFlags();
+ method public final long getEventTime();
+ method public final int getFlags();
+ method public final float getHistoricalAxisValue(int, int);
+ method public final float getHistoricalAxisValue(int, int, int);
+ method public final long getHistoricalEventTime(int);
+ method public final float getHistoricalOrientation(int);
+ method public final float getHistoricalOrientation(int, int);
+ method public final void getHistoricalPointerCoords(int, int, android.view.MotionEvent.PointerCoords);
+ method public final float getHistoricalPressure(int);
+ method public final float getHistoricalPressure(int, int);
+ method public final float getHistoricalSize(int);
+ method public final float getHistoricalSize(int, int);
+ method public final float getHistoricalToolMajor(int);
+ method public final float getHistoricalToolMajor(int, int);
+ method public final float getHistoricalToolMinor(int);
+ method public final float getHistoricalToolMinor(int, int);
+ method public final float getHistoricalTouchMajor(int);
+ method public final float getHistoricalTouchMajor(int, int);
+ method public final float getHistoricalTouchMinor(int);
+ method public final float getHistoricalTouchMinor(int, int);
+ method public final float getHistoricalX(int);
+ method public final float getHistoricalX(int, int);
+ method public final float getHistoricalY(int);
+ method public final float getHistoricalY(int, int);
+ method public final int getHistorySize();
+ method public final int getMetaState();
+ method public final float getOrientation();
+ method public final float getOrientation(int);
+ method public final void getPointerCoords(int, android.view.MotionEvent.PointerCoords);
+ method public final int getPointerCount();
+ method public final int getPointerId(int);
+ method public final void getPointerProperties(int, android.view.MotionEvent.PointerProperties);
+ method public final float getPressure();
+ method public final float getPressure(int);
+ method public final float getRawX();
+ method public final float getRawY();
+ method public final float getSize();
+ method public final float getSize(int);
+ method public final int getSource();
+ method public final float getToolMajor();
+ method public final float getToolMajor(int);
+ method public final float getToolMinor();
+ method public final float getToolMinor(int);
+ method public final int getToolType(int);
+ method public final float getTouchMajor();
+ method public final float getTouchMajor(int);
+ method public final float getTouchMinor();
+ method public final float getTouchMinor(int);
+ method public final float getX();
+ method public final float getX(int);
+ method public final float getXPrecision();
+ method public final float getY();
+ method public final float getY(int);
+ method public final float getYPrecision();
+ method public final boolean isButtonPressed(int);
+ method public static android.view.MotionEvent obtain(long, long, int, int, android.view.MotionEvent.PointerProperties[], android.view.MotionEvent.PointerCoords[], int, int, float, float, int, int, int, int);
+ method public static deprecated android.view.MotionEvent obtain(long, long, int, int, int[], android.view.MotionEvent.PointerCoords[], int, float, float, int, int, int, int);
+ method public static android.view.MotionEvent obtain(long, long, int, float, float, float, float, int, float, float, int, int);
+ method public static deprecated android.view.MotionEvent obtain(long, long, int, int, float, float, float, float, int, float, float, int, int);
+ method public static android.view.MotionEvent obtain(long, long, int, float, float, int);
+ method public static android.view.MotionEvent obtain(android.view.MotionEvent);
+ method public static android.view.MotionEvent obtainNoHistory(android.view.MotionEvent);
+ method public final void offsetLocation(float, float);
+ method public final void recycle();
+ method public final void setAction(int);
+ method public final void setEdgeFlags(int);
+ method public final void setLocation(float, float);
+ method public final void setSource(int);
+ method public final void transform(android.graphics.Matrix);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ACTION_BUTTON_PRESS = 11; // 0xb
+ field public static final int ACTION_BUTTON_RELEASE = 12; // 0xc
+ field public static final int ACTION_CANCEL = 3; // 0x3
+ field public static final int ACTION_DOWN = 0; // 0x0
+ field public static final int ACTION_HOVER_ENTER = 9; // 0x9
+ field public static final int ACTION_HOVER_EXIT = 10; // 0xa
+ field public static final int ACTION_HOVER_MOVE = 7; // 0x7
+ field public static final int ACTION_MASK = 255; // 0xff
+ field public static final int ACTION_MOVE = 2; // 0x2
+ field public static final int ACTION_OUTSIDE = 4; // 0x4
+ field public static final deprecated int ACTION_POINTER_1_DOWN = 5; // 0x5
+ field public static final deprecated int ACTION_POINTER_1_UP = 6; // 0x6
+ field public static final deprecated int ACTION_POINTER_2_DOWN = 261; // 0x105
+ field public static final deprecated int ACTION_POINTER_2_UP = 262; // 0x106
+ field public static final deprecated int ACTION_POINTER_3_DOWN = 517; // 0x205
+ field public static final deprecated int ACTION_POINTER_3_UP = 518; // 0x206
+ field public static final int ACTION_POINTER_DOWN = 5; // 0x5
+ field public static final deprecated int ACTION_POINTER_ID_MASK = 65280; // 0xff00
+ field public static final deprecated int ACTION_POINTER_ID_SHIFT = 8; // 0x8
+ field public static final int ACTION_POINTER_INDEX_MASK = 65280; // 0xff00
+ field public static final int ACTION_POINTER_INDEX_SHIFT = 8; // 0x8
+ field public static final int ACTION_POINTER_UP = 6; // 0x6
+ field public static final int ACTION_SCROLL = 8; // 0x8
+ field public static final int ACTION_UP = 1; // 0x1
+ field public static final int AXIS_BRAKE = 23; // 0x17
+ field public static final int AXIS_DISTANCE = 24; // 0x18
+ field public static final int AXIS_GAS = 22; // 0x16
+ field public static final int AXIS_GENERIC_1 = 32; // 0x20
+ field public static final int AXIS_GENERIC_10 = 41; // 0x29
+ field public static final int AXIS_GENERIC_11 = 42; // 0x2a
+ field public static final int AXIS_GENERIC_12 = 43; // 0x2b
+ field public static final int AXIS_GENERIC_13 = 44; // 0x2c
+ field public static final int AXIS_GENERIC_14 = 45; // 0x2d
+ field public static final int AXIS_GENERIC_15 = 46; // 0x2e
+ field public static final int AXIS_GENERIC_16 = 47; // 0x2f
+ field public static final int AXIS_GENERIC_2 = 33; // 0x21
+ field public static final int AXIS_GENERIC_3 = 34; // 0x22
+ field public static final int AXIS_GENERIC_4 = 35; // 0x23
+ field public static final int AXIS_GENERIC_5 = 36; // 0x24
+ field public static final int AXIS_GENERIC_6 = 37; // 0x25
+ field public static final int AXIS_GENERIC_7 = 38; // 0x26
+ field public static final int AXIS_GENERIC_8 = 39; // 0x27
+ field public static final int AXIS_GENERIC_9 = 40; // 0x28
+ field public static final int AXIS_HAT_X = 15; // 0xf
+ field public static final int AXIS_HAT_Y = 16; // 0x10
+ field public static final int AXIS_HSCROLL = 10; // 0xa
+ field public static final int AXIS_LTRIGGER = 17; // 0x11
+ field public static final int AXIS_ORIENTATION = 8; // 0x8
+ field public static final int AXIS_PRESSURE = 2; // 0x2
+ field public static final int AXIS_RTRIGGER = 18; // 0x12
+ field public static final int AXIS_RUDDER = 20; // 0x14
+ field public static final int AXIS_RX = 12; // 0xc
+ field public static final int AXIS_RY = 13; // 0xd
+ field public static final int AXIS_RZ = 14; // 0xe
+ field public static final int AXIS_SIZE = 3; // 0x3
+ field public static final int AXIS_THROTTLE = 19; // 0x13
+ field public static final int AXIS_TILT = 25; // 0x19
+ field public static final int AXIS_TOOL_MAJOR = 6; // 0x6
+ field public static final int AXIS_TOOL_MINOR = 7; // 0x7
+ field public static final int AXIS_TOUCH_MAJOR = 4; // 0x4
+ field public static final int AXIS_TOUCH_MINOR = 5; // 0x5
+ field public static final int AXIS_VSCROLL = 9; // 0x9
+ field public static final int AXIS_WHEEL = 21; // 0x15
+ field public static final int AXIS_X = 0; // 0x0
+ field public static final int AXIS_Y = 1; // 0x1
+ field public static final int AXIS_Z = 11; // 0xb
+ field public static final int BUTTON_BACK = 8; // 0x8
+ field public static final int BUTTON_FORWARD = 16; // 0x10
+ field public static final int BUTTON_PRIMARY = 1; // 0x1
+ field public static final int BUTTON_SECONDARY = 2; // 0x2
+ field public static final int BUTTON_STYLUS_PRIMARY = 32; // 0x20
+ field public static final int BUTTON_STYLUS_SECONDARY = 64; // 0x40
+ field public static final int BUTTON_TERTIARY = 4; // 0x4
+ field public static final android.os.Parcelable.Creator<android.view.MotionEvent> CREATOR;
+ field public static final int EDGE_BOTTOM = 2; // 0x2
+ field public static final int EDGE_LEFT = 4; // 0x4
+ field public static final int EDGE_RIGHT = 8; // 0x8
+ field public static final int EDGE_TOP = 1; // 0x1
+ field public static final int FLAG_WINDOW_IS_OBSCURED = 1; // 0x1
+ field public static final int INVALID_POINTER_ID = -1; // 0xffffffff
+ field public static final int TOOL_TYPE_ERASER = 4; // 0x4
+ field public static final int TOOL_TYPE_FINGER = 1; // 0x1
+ field public static final int TOOL_TYPE_MOUSE = 3; // 0x3
+ field public static final int TOOL_TYPE_STYLUS = 2; // 0x2
+ field public static final int TOOL_TYPE_UNKNOWN = 0; // 0x0
+ }
+
+ public static final class MotionEvent.PointerCoords {
+ ctor public MotionEvent.PointerCoords();
+ ctor public MotionEvent.PointerCoords(android.view.MotionEvent.PointerCoords);
+ method public void clear();
+ method public void copyFrom(android.view.MotionEvent.PointerCoords);
+ method public float getAxisValue(int);
+ method public void setAxisValue(int, float);
+ field public float orientation;
+ field public float pressure;
+ field public float size;
+ field public float toolMajor;
+ field public float toolMinor;
+ field public float touchMajor;
+ field public float touchMinor;
+ field public float x;
+ field public float y;
+ }
+
+ public static final class MotionEvent.PointerProperties {
+ ctor public MotionEvent.PointerProperties();
+ ctor public MotionEvent.PointerProperties(android.view.MotionEvent.PointerProperties);
+ method public void clear();
+ method public void copyFrom(android.view.MotionEvent.PointerProperties);
+ field public int id;
+ field public int toolType;
+ }
+
+ public abstract class OrientationEventListener {
+ ctor public OrientationEventListener(android.content.Context);
+ ctor public OrientationEventListener(android.content.Context, int);
+ method public boolean canDetectOrientation();
+ method public void disable();
+ method public void enable();
+ method public abstract void onOrientationChanged(int);
+ field public static final int ORIENTATION_UNKNOWN = -1; // 0xffffffff
+ }
+
+ public abstract deprecated class OrientationListener implements android.hardware.SensorListener {
+ ctor public OrientationListener(android.content.Context);
+ ctor public OrientationListener(android.content.Context, int);
+ method public void disable();
+ method public void enable();
+ method public void onAccuracyChanged(int, int);
+ method public abstract void onOrientationChanged(int);
+ method public void onSensorChanged(int, float[]);
+ field public static final int ORIENTATION_UNKNOWN = -1; // 0xffffffff
+ }
+
+ public class ScaleGestureDetector {
+ ctor public ScaleGestureDetector(android.content.Context, android.view.ScaleGestureDetector.OnScaleGestureListener);
+ ctor public ScaleGestureDetector(android.content.Context, android.view.ScaleGestureDetector.OnScaleGestureListener, android.os.Handler);
+ method public float getCurrentSpan();
+ method public float getCurrentSpanX();
+ method public float getCurrentSpanY();
+ method public long getEventTime();
+ method public float getFocusX();
+ method public float getFocusY();
+ method public float getPreviousSpan();
+ method public float getPreviousSpanX();
+ method public float getPreviousSpanY();
+ method public float getScaleFactor();
+ method public long getTimeDelta();
+ method public boolean isInProgress();
+ method public boolean isQuickScaleEnabled();
+ method public boolean isStylusScaleEnabled();
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ method public void setQuickScaleEnabled(boolean);
+ method public void setStylusScaleEnabled(boolean);
+ }
+
+ public static abstract interface ScaleGestureDetector.OnScaleGestureListener {
+ method public abstract boolean onScale(android.view.ScaleGestureDetector);
+ method public abstract boolean onScaleBegin(android.view.ScaleGestureDetector);
+ method public abstract void onScaleEnd(android.view.ScaleGestureDetector);
+ }
+
+ public static class ScaleGestureDetector.SimpleOnScaleGestureListener implements android.view.ScaleGestureDetector.OnScaleGestureListener {
+ ctor public ScaleGestureDetector.SimpleOnScaleGestureListener();
+ method public boolean onScale(android.view.ScaleGestureDetector);
+ method public boolean onScaleBegin(android.view.ScaleGestureDetector);
+ method public void onScaleEnd(android.view.ScaleGestureDetector);
+ }
+
+ public class SearchEvent {
+ ctor public SearchEvent(android.view.InputDevice);
+ method public android.view.InputDevice getInputDevice();
+ }
+
+ public class SoundEffectConstants {
+ method public static int getContantForFocusDirection(int);
+ field public static final int CLICK = 0; // 0x0
+ field public static final int NAVIGATION_DOWN = 4; // 0x4
+ field public static final int NAVIGATION_LEFT = 1; // 0x1
+ field public static final int NAVIGATION_RIGHT = 3; // 0x3
+ field public static final int NAVIGATION_UP = 2; // 0x2
+ }
+
+ public abstract interface SubMenu implements android.view.Menu {
+ method public abstract void clearHeader();
+ method public abstract android.view.MenuItem getItem();
+ method public abstract android.view.SubMenu setHeaderIcon(int);
+ method public abstract android.view.SubMenu setHeaderIcon(android.graphics.drawable.Drawable);
+ method public abstract android.view.SubMenu setHeaderTitle(int);
+ method public abstract android.view.SubMenu setHeaderTitle(java.lang.CharSequence);
+ method public abstract android.view.SubMenu setHeaderView(android.view.View);
+ method public abstract android.view.SubMenu setIcon(int);
+ method public abstract android.view.SubMenu setIcon(android.graphics.drawable.Drawable);
+ }
+
+ public class Surface implements android.os.Parcelable {
+ ctor public Surface(android.graphics.SurfaceTexture);
+ method public int describeContents();
+ method public boolean isValid();
+ method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;
+ method public android.graphics.Canvas lockHardwareCanvas();
+ method public void readFromParcel(android.os.Parcel);
+ method public void release();
+ method public deprecated void unlockCanvas(android.graphics.Canvas);
+ method public void unlockCanvasAndPost(android.graphics.Canvas);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.Surface> CREATOR;
+ field public static final int ROTATION_0 = 0; // 0x0
+ field public static final int ROTATION_180 = 2; // 0x2
+ field public static final int ROTATION_270 = 3; // 0x3
+ field public static final int ROTATION_90 = 1; // 0x1
+ }
+
+ public static class Surface.OutOfResourcesException extends java.lang.RuntimeException {
+ ctor public Surface.OutOfResourcesException();
+ ctor public Surface.OutOfResourcesException(java.lang.String);
+ }
+
+ public abstract interface SurfaceHolder {
+ method public abstract void addCallback(android.view.SurfaceHolder.Callback);
+ method public abstract android.view.Surface getSurface();
+ method public abstract android.graphics.Rect getSurfaceFrame();
+ method public abstract boolean isCreating();
+ method public abstract android.graphics.Canvas lockCanvas();
+ method public abstract android.graphics.Canvas lockCanvas(android.graphics.Rect);
+ method public abstract void removeCallback(android.view.SurfaceHolder.Callback);
+ method public abstract void setFixedSize(int, int);
+ method public abstract void setFormat(int);
+ method public abstract void setKeepScreenOn(boolean);
+ method public abstract void setSizeFromLayout();
+ method public abstract deprecated void setType(int);
+ method public abstract void unlockCanvasAndPost(android.graphics.Canvas);
+ field public static final deprecated int SURFACE_TYPE_GPU = 2; // 0x2
+ field public static final deprecated int SURFACE_TYPE_HARDWARE = 1; // 0x1
+ field public static final deprecated int SURFACE_TYPE_NORMAL = 0; // 0x0
+ field public static final deprecated int SURFACE_TYPE_PUSH_BUFFERS = 3; // 0x3
+ }
+
+ public static class SurfaceHolder.BadSurfaceTypeException extends java.lang.RuntimeException {
+ ctor public SurfaceHolder.BadSurfaceTypeException();
+ ctor public SurfaceHolder.BadSurfaceTypeException(java.lang.String);
+ }
+
+ public static abstract interface SurfaceHolder.Callback {
+ method public abstract void surfaceChanged(android.view.SurfaceHolder, int, int, int);
+ method public abstract void surfaceCreated(android.view.SurfaceHolder);
+ method public abstract void surfaceDestroyed(android.view.SurfaceHolder);
+ }
+
+ public static abstract interface SurfaceHolder.Callback2 implements android.view.SurfaceHolder.Callback {
+ method public abstract void surfaceRedrawNeeded(android.view.SurfaceHolder);
+ }
+
+ public class SurfaceView extends android.view.View {
+ ctor public SurfaceView(android.content.Context);
+ ctor public SurfaceView(android.content.Context, android.util.AttributeSet);
+ ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int);
+ ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean gatherTransparentRegion(android.graphics.Region);
+ method public android.view.SurfaceHolder getHolder();
+ method public void setSecure(boolean);
+ method public void setZOrderMediaOverlay(boolean);
+ method public void setZOrderOnTop(boolean);
+ }
+
+ public class TextureView extends android.view.View {
+ ctor public TextureView(android.content.Context);
+ ctor public TextureView(android.content.Context, android.util.AttributeSet);
+ ctor public TextureView(android.content.Context, android.util.AttributeSet, int);
+ ctor public TextureView(android.content.Context, android.util.AttributeSet, int, int);
+ method public final void draw(android.graphics.Canvas);
+ method public android.graphics.Bitmap getBitmap();
+ method public android.graphics.Bitmap getBitmap(int, int);
+ method public android.graphics.Bitmap getBitmap(android.graphics.Bitmap);
+ method public android.graphics.SurfaceTexture getSurfaceTexture();
+ method public android.view.TextureView.SurfaceTextureListener getSurfaceTextureListener();
+ method public android.graphics.Matrix getTransform(android.graphics.Matrix);
+ method public boolean isAvailable();
+ method public android.graphics.Canvas lockCanvas();
+ method public android.graphics.Canvas lockCanvas(android.graphics.Rect);
+ method protected final void onDraw(android.graphics.Canvas);
+ method public void setOpaque(boolean);
+ method public void setSurfaceTexture(android.graphics.SurfaceTexture);
+ method public void setSurfaceTextureListener(android.view.TextureView.SurfaceTextureListener);
+ method public void setTransform(android.graphics.Matrix);
+ method public void unlockCanvasAndPost(android.graphics.Canvas);
+ }
+
+ public static abstract interface TextureView.SurfaceTextureListener {
+ method public abstract void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int);
+ method public abstract boolean onSurfaceTextureDestroyed(android.graphics.SurfaceTexture);
+ method public abstract void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int);
+ method public abstract void onSurfaceTextureUpdated(android.graphics.SurfaceTexture);
+ }
+
+ public class TouchDelegate {
+ ctor public TouchDelegate(android.graphics.Rect, android.view.View);
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ field public static final int ABOVE = 1; // 0x1
+ field public static final int BELOW = 2; // 0x2
+ field public static final int TO_LEFT = 4; // 0x4
+ field public static final int TO_RIGHT = 8; // 0x8
+ }
+
+ public final class VelocityTracker {
+ method public void addMovement(android.view.MotionEvent);
+ method public void clear();
+ method public void computeCurrentVelocity(int);
+ method public void computeCurrentVelocity(int, float);
+ method public float getXVelocity();
+ method public float getXVelocity(int);
+ method public float getYVelocity();
+ method public float getYVelocity(int);
+ method public static android.view.VelocityTracker obtain();
+ method public void recycle();
+ }
+
+ public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
+ ctor public View(android.content.Context);
+ ctor public View(android.content.Context, android.util.AttributeSet);
+ ctor public View(android.content.Context, android.util.AttributeSet, int);
+ ctor public View(android.content.Context, android.util.AttributeSet, int, int);
+ method public void addChildrenForAccessibility(java.util.ArrayList<android.view.View>);
+ method public void addFocusables(java.util.ArrayList<android.view.View>, int);
+ method public void addFocusables(java.util.ArrayList<android.view.View>, int, int);
+ method public void addOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);
+ method public void addOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);
+ method public void addTouchables(java.util.ArrayList<android.view.View>);
+ method public android.view.ViewPropertyAnimator animate();
+ method public void announceForAccessibility(java.lang.CharSequence);
+ method protected boolean awakenScrollBars();
+ method protected boolean awakenScrollBars(int);
+ method protected boolean awakenScrollBars(int, boolean);
+ method public void bringToFront();
+ method public void buildDrawingCache();
+ method public void buildDrawingCache(boolean);
+ method public void buildLayer();
+ method public boolean callOnClick();
+ method public boolean canResolveLayoutDirection();
+ method public boolean canResolveTextAlignment();
+ method public boolean canResolveTextDirection();
+ method public boolean canScrollHorizontally(int);
+ method public boolean canScrollVertically(int);
+ method public final void cancelDragAndDrop();
+ method public void cancelLongPress();
+ method public final void cancelPendingInputEvents();
+ method public boolean checkInputConnectionProxy(android.view.View);
+ method public void clearAnimation();
+ method public void clearFocus();
+ method public static int combineMeasuredStates(int, int);
+ method protected int computeHorizontalScrollExtent();
+ method protected int computeHorizontalScrollOffset();
+ method protected int computeHorizontalScrollRange();
+ method public void computeScroll();
+ method public android.view.WindowInsets computeSystemWindowInsets(android.view.WindowInsets, android.graphics.Rect);
+ method protected int computeVerticalScrollExtent();
+ method protected int computeVerticalScrollOffset();
+ method protected int computeVerticalScrollRange();
+ method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo();
+ method public void createContextMenu(android.view.ContextMenu);
+ method public void destroyDrawingCache();
+ method public final boolean didLayoutParamsChange();
+ method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets);
+ method public void dispatchConfigurationChanged(android.content.res.Configuration);
+ method public void dispatchDisplayHint(int);
+ method public boolean dispatchDragEvent(android.view.DragEvent);
+ method protected void dispatchDraw(android.graphics.Canvas);
+ method public void dispatchDrawableHotspotChanged(float, float);
+ method protected boolean dispatchGenericFocusedEvent(android.view.MotionEvent);
+ method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);
+ method protected boolean dispatchGenericPointerEvent(android.view.MotionEvent);
+ method protected boolean dispatchHoverEvent(android.view.MotionEvent);
+ method public boolean dispatchKeyEvent(android.view.KeyEvent);
+ method public boolean dispatchKeyEventPreIme(android.view.KeyEvent);
+ method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);
+ method public boolean dispatchNestedFling(float, float, boolean);
+ method public boolean dispatchNestedPreFling(float, float);
+ method public boolean dispatchNestedPrePerformAccessibilityAction(int, android.os.Bundle);
+ method public boolean dispatchNestedPreScroll(int, int, int[], int[]);
+ method public boolean dispatchNestedScroll(int, int, int, int, int[]);
+ method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public void dispatchProvideStructure(android.view.ViewStructure);
+ method protected void dispatchRestoreInstanceState(android.util.SparseArray<android.os.Parcelable>);
+ method protected void dispatchSaveInstanceState(android.util.SparseArray<android.os.Parcelable>);
+ method protected void dispatchSetActivated(boolean);
+ method protected void dispatchSetPressed(boolean);
+ method protected void dispatchSetSelected(boolean);
+ method public void dispatchSystemUiVisibilityChanged(int);
+ method public boolean dispatchTouchEvent(android.view.MotionEvent);
+ method public boolean dispatchTrackballEvent(android.view.MotionEvent);
+ method public boolean dispatchUnhandledMove(android.view.View, int);
+ method protected void dispatchVisibilityChanged(android.view.View, int);
+ method public void dispatchWindowFocusChanged(boolean);
+ method public void dispatchWindowSystemUiVisiblityChanged(int);
+ method public void dispatchWindowVisibilityChanged(int);
+ method public void draw(android.graphics.Canvas);
+ method public void drawableHotspotChanged(float, float);
+ method protected void drawableStateChanged();
+ method public android.view.View findFocus();
+ method public final android.view.View findViewById(int);
+ method public final android.view.View findViewWithTag(java.lang.Object);
+ method public void findViewsWithText(java.util.ArrayList<android.view.View>, java.lang.CharSequence, int);
+ method protected deprecated boolean fitSystemWindows(android.graphics.Rect);
+ method public android.view.View focusSearch(int);
+ method public void forceLayout();
+ method public static int generateViewId();
+ method public java.lang.CharSequence getAccessibilityClassName();
+ method public int getAccessibilityLiveRegion();
+ method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider();
+ method public int getAccessibilityTraversalAfter();
+ method public int getAccessibilityTraversalBefore();
+ method public float getAlpha();
+ method public android.view.animation.Animation getAnimation();
+ method public android.os.IBinder getApplicationWindowToken();
+ method public android.graphics.drawable.Drawable getBackground();
+ method public android.content.res.ColorStateList getBackgroundTintList();
+ method public android.graphics.PorterDuff.Mode getBackgroundTintMode();
+ method public int getBaseline();
+ method public final int getBottom();
+ method protected float getBottomFadingEdgeStrength();
+ method protected int getBottomPaddingOffset();
+ method public float getCameraDistance();
+ method public android.graphics.Rect getClipBounds();
+ method public boolean getClipBounds(android.graphics.Rect);
+ method public final boolean getClipToOutline();
+ method public java.lang.CharSequence getContentDescription();
+ method public final android.content.Context getContext();
+ method protected android.view.ContextMenu.ContextMenuInfo getContextMenuInfo();
+ method public static int getDefaultSize(int, int);
+ method public android.view.Display getDisplay();
+ method public final int[] getDrawableState();
+ method public android.graphics.Bitmap getDrawingCache();
+ method public android.graphics.Bitmap getDrawingCache(boolean);
+ method public int getDrawingCacheBackgroundColor();
+ method public int getDrawingCacheQuality();
+ method public void getDrawingRect(android.graphics.Rect);
+ method public long getDrawingTime();
+ method public float getElevation();
+ method public boolean getFilterTouchesWhenObscured();
+ method public boolean getFitsSystemWindows();
+ method public java.util.ArrayList<android.view.View> getFocusables(int);
+ method public void getFocusedRect(android.graphics.Rect);
+ method public android.graphics.drawable.Drawable getForeground();
+ method public int getForegroundGravity();
+ method public android.content.res.ColorStateList getForegroundTintList();
+ method public android.graphics.PorterDuff.Mode getForegroundTintMode();
+ method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point);
+ method public final boolean getGlobalVisibleRect(android.graphics.Rect);
+ method public android.os.Handler getHandler();
+ method public final int getHeight();
+ method public void getHitRect(android.graphics.Rect);
+ method public int getHorizontalFadingEdgeLength();
+ method protected int getHorizontalScrollbarHeight();
+ method public int getId();
+ method public int getImportantForAccessibility();
+ method public boolean getKeepScreenOn();
+ method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();
+ method public int getLabelFor();
+ method public int getLayerType();
+ method public int getLayoutDirection();
+ method public android.view.ViewGroup.LayoutParams getLayoutParams();
+ method public final int getLeft();
+ method protected float getLeftFadingEdgeStrength();
+ method protected int getLeftPaddingOffset();
+ method public final boolean getLocalVisibleRect(android.graphics.Rect);
+ method public void getLocationInWindow(int[]);
+ method public void getLocationOnScreen(int[]);
+ method public android.graphics.Matrix getMatrix();
+ method public final int getMeasuredHeight();
+ method public final int getMeasuredHeightAndState();
+ method public final int getMeasuredState();
+ method public final int getMeasuredWidth();
+ method public final int getMeasuredWidthAndState();
+ method public int getMinimumHeight();
+ method public int getMinimumWidth();
+ method public int getNextFocusDownId();
+ method public int getNextFocusForwardId();
+ method public int getNextFocusLeftId();
+ method public int getNextFocusRightId();
+ method public int getNextFocusUpId();
+ method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();
+ method public android.view.ViewOutlineProvider getOutlineProvider();
+ method public int getOverScrollMode();
+ method public android.view.ViewOverlay getOverlay();
+ method public int getPaddingBottom();
+ method public int getPaddingEnd();
+ method public int getPaddingLeft();
+ method public int getPaddingRight();
+ method public int getPaddingStart();
+ method public int getPaddingTop();
+ method public final android.view.ViewParent getParent();
+ method public android.view.ViewParent getParentForAccessibility();
+ method public float getPivotX();
+ method public float getPivotY();
+ method public android.content.res.Resources getResources();
+ method public final int getRight();
+ method protected float getRightFadingEdgeStrength();
+ method protected int getRightPaddingOffset();
+ method public android.view.View getRootView();
+ method public android.view.WindowInsets getRootWindowInsets();
+ method public float getRotation();
+ method public float getRotationX();
+ method public float getRotationY();
+ method public float getScaleX();
+ method public float getScaleY();
+ method public int getScrollBarDefaultDelayBeforeFade();
+ method public int getScrollBarFadeDuration();
+ method public int getScrollBarSize();
+ method public int getScrollBarStyle();
+ method public int getScrollIndicators();
+ method public final int getScrollX();
+ method public final int getScrollY();
+ method public int getSolidColor();
+ method public android.animation.StateListAnimator getStateListAnimator();
+ method protected int getSuggestedMinimumHeight();
+ method protected int getSuggestedMinimumWidth();
+ method public int getSystemUiVisibility();
+ method public java.lang.Object getTag();
+ method public java.lang.Object getTag(int);
+ method public int getTextAlignment();
+ method public int getTextDirection();
+ method public final int getTop();
+ method protected float getTopFadingEdgeStrength();
+ method protected int getTopPaddingOffset();
+ method public android.view.TouchDelegate getTouchDelegate();
+ method public java.util.ArrayList<android.view.View> getTouchables();
+ method public java.lang.String getTransitionName();
+ method public float getTranslationX();
+ method public float getTranslationY();
+ method public float getTranslationZ();
+ method public int getVerticalFadingEdgeLength();
+ method public int getVerticalScrollbarPosition();
+ method public int getVerticalScrollbarWidth();
+ method public android.view.ViewTreeObserver getViewTreeObserver();
+ method public int getVisibility();
+ method public final int getWidth();
+ method protected int getWindowAttachCount();
+ method public android.view.WindowId getWindowId();
+ method public int getWindowSystemUiVisibility();
+ method public android.os.IBinder getWindowToken();
+ method public int getWindowVisibility();
+ method public void getWindowVisibleDisplayFrame(android.graphics.Rect);
+ method public float getX();
+ method public float getY();
+ method public float getZ();
+ method public boolean hasFocus();
+ method public boolean hasFocusable();
+ method public boolean hasNestedScrollingParent();
+ method public boolean hasOnClickListeners();
+ method public boolean hasOverlappingRendering();
+ method public boolean hasTransientState();
+ method public boolean hasWindowFocus();
+ method public static android.view.View inflate(android.content.Context, int, android.view.ViewGroup);
+ method public void invalidate(android.graphics.Rect);
+ method public void invalidate(int, int, int, int);
+ method public void invalidate();
+ method public void invalidateDrawable(android.graphics.drawable.Drawable);
+ method public void invalidateOutline();
+ method public boolean isAccessibilityFocused();
+ method public boolean isActivated();
+ method public boolean isAttachedToWindow();
+ method public boolean isClickable();
+ method public boolean isContextClickable();
+ method public boolean isDirty();
+ method public boolean isDrawingCacheEnabled();
+ method public boolean isDuplicateParentStateEnabled();
+ method public boolean isEnabled();
+ method public final boolean isFocusable();
+ method public final boolean isFocusableInTouchMode();
+ method public boolean isFocused();
+ method public boolean isHapticFeedbackEnabled();
+ method public boolean isHardwareAccelerated();
+ method public boolean isHorizontalFadingEdgeEnabled();
+ method public boolean isHorizontalScrollBarEnabled();
+ method public boolean isHovered();
+ method public boolean isImportantForAccessibility();
+ method public boolean isInEditMode();
+ method public boolean isInLayout();
+ method public boolean isInTouchMode();
+ method public boolean isLaidOut();
+ method public boolean isLayoutDirectionResolved();
+ method public boolean isLayoutRequested();
+ method public boolean isLongClickable();
+ method public boolean isNestedScrollingEnabled();
+ method public boolean isOpaque();
+ method protected boolean isPaddingOffsetRequired();
+ method public boolean isPaddingRelative();
+ method public final boolean isPartialLayoutRequested();
+ method public boolean isPressed();
+ method public boolean isSaveEnabled();
+ method public boolean isSaveFromParentEnabled();
+ method public boolean isScrollContainer();
+ method public boolean isScrollbarFadingEnabled();
+ method public boolean isSelected();
+ method public boolean isShown();
+ method public boolean isSoundEffectsEnabled();
+ method public boolean isTextAlignmentResolved();
+ method public boolean isTextDirectionResolved();
+ method public boolean isVerticalFadingEdgeEnabled();
+ method public boolean isVerticalScrollBarEnabled();
+ method public void jumpDrawablesToCurrentState();
+ method public void layout(int, int, int, int);
+ method public final void measure(int, int);
+ method protected static int[] mergeDrawableStates(int[], int[]);
+ method public void offsetLeftAndRight(int);
+ method public void offsetTopAndBottom(int);
+ method protected void onAnimationEnd();
+ method protected void onAnimationStart();
+ method public android.view.WindowInsets onApplyWindowInsets(android.view.WindowInsets);
+ method protected void onAttachedToWindow();
+ method public void onCancelPendingInputEvents();
+ method public boolean onCheckIsTextEditor();
+ method protected void onConfigurationChanged(android.content.res.Configuration);
+ method protected void onCreateContextMenu(android.view.ContextMenu);
+ method protected int[] onCreateDrawableState(int);
+ method public android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo);
+ method protected void onDetachedFromWindow();
+ method protected void onDisplayHint(int);
+ method public boolean onDragEvent(android.view.DragEvent);
+ method protected void onDraw(android.graphics.Canvas);
+ method public void onDrawForeground(android.graphics.Canvas);
+ method protected final void onDrawScrollBars(android.graphics.Canvas);
+ method public boolean onFilterTouchEventForSecurity(android.view.MotionEvent);
+ method protected void onFinishInflate();
+ method public void onFinishTemporaryDetach();
+ method protected void onFocusChanged(boolean, int, android.graphics.Rect);
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public void onHoverChanged(boolean);
+ method public boolean onHoverEvent(android.view.MotionEvent);
+ method public void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public void onInitializeAccessibilityNodeInfo(android.view.accessibility.AccessibilityNodeInfo);
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyLongPress(int, android.view.KeyEvent);
+ method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
+ method public boolean onKeyPreIme(int, android.view.KeyEvent);
+ method public boolean onKeyShortcut(int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method protected void onLayout(boolean, int, int, int, int);
+ method protected void onMeasure(int, int);
+ method protected void onOverScrolled(int, int, boolean, boolean);
+ method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public void onProvideStructure(android.view.ViewStructure);
+ method public void onProvideVirtualStructure(android.view.ViewStructure);
+ method protected void onRestoreInstanceState(android.os.Parcelable);
+ method public void onRtlPropertiesChanged(int);
+ method protected android.os.Parcelable onSaveInstanceState();
+ method public void onScreenStateChanged(int);
+ method protected void onScrollChanged(int, int, int, int);
+ method protected boolean onSetAlpha(int);
+ method protected void onSizeChanged(int, int, int, int);
+ method public void onStartTemporaryDetach();
+ method public boolean onTouchEvent(android.view.MotionEvent);
+ method public boolean onTrackballEvent(android.view.MotionEvent);
+ method protected void onVisibilityChanged(android.view.View, int);
+ method public void onWindowFocusChanged(boolean);
+ 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, android.os.Bundle);
+ method public boolean performClick();
+ method public boolean performContextClick();
+ method public boolean performHapticFeedback(int);
+ method public boolean performHapticFeedback(int, int);
+ method public boolean performLongClick();
+ method public boolean performLongClick(float, float);
+ method public void playSoundEffect(int);
+ method public boolean post(java.lang.Runnable);
+ method public boolean postDelayed(java.lang.Runnable, long);
+ method public void postInvalidate();
+ method public void postInvalidate(int, int, int, int);
+ method public void postInvalidateDelayed(long);
+ method public void postInvalidateDelayed(long, int, int, int, int);
+ method public void postInvalidateOnAnimation();
+ method public void postInvalidateOnAnimation(int, int, int, int);
+ method public void postOnAnimation(java.lang.Runnable);
+ method public void postOnAnimationDelayed(java.lang.Runnable, long);
+ method public void refreshDrawableState();
+ method public boolean removeCallbacks(java.lang.Runnable);
+ method public void removeOnAttachStateChangeListener(android.view.View.OnAttachStateChangeListener);
+ method public void removeOnLayoutChangeListener(android.view.View.OnLayoutChangeListener);
+ method public void requestApplyInsets();
+ method public deprecated void requestFitSystemWindows();
+ method public final boolean requestFocus();
+ method public final boolean requestFocus(int);
+ method public boolean requestFocus(int, android.graphics.Rect);
+ method public final boolean requestFocusFromTouch();
+ method public void requestLayout();
+ method public boolean requestRectangleOnScreen(android.graphics.Rect);
+ method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);
+ method public final void requestUnbufferedDispatch(android.view.MotionEvent);
+ method public static int resolveSize(int, int);
+ method public static int resolveSizeAndState(int, int, int);
+ method public void restoreHierarchyState(android.util.SparseArray<android.os.Parcelable>);
+ method public void saveHierarchyState(android.util.SparseArray<android.os.Parcelable>);
+ method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
+ method public void scrollBy(int, int);
+ method public void scrollTo(int, int);
+ method public void sendAccessibilityEvent(int);
+ method public void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent);
+ method public void setAccessibilityDelegate(android.view.View.AccessibilityDelegate);
+ method public void setAccessibilityLiveRegion(int);
+ method public void setAccessibilityTraversalAfter(int);
+ method public void setAccessibilityTraversalBefore(int);
+ method public void setActivated(boolean);
+ method public void setAlpha(float);
+ method public void setAnimation(android.view.animation.Animation);
+ method public void setBackground(android.graphics.drawable.Drawable);
+ method public void setBackgroundColor(int);
+ method public deprecated void setBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setBackgroundResource(int);
+ method public void setBackgroundTintList(android.content.res.ColorStateList);
+ method public void setBackgroundTintMode(android.graphics.PorterDuff.Mode);
+ method public final void setBottom(int);
+ method public void setCameraDistance(float);
+ method public void setClickable(boolean);
+ method public void setClipBounds(android.graphics.Rect);
+ method public void setClipToOutline(boolean);
+ method public void setContentDescription(java.lang.CharSequence);
+ method public void setContextClickable(boolean);
+ method public void setDrawingCacheBackgroundColor(int);
+ method public void setDrawingCacheEnabled(boolean);
+ method public void setDrawingCacheQuality(int);
+ method public void setDuplicateParentStateEnabled(boolean);
+ method public void setElevation(float);
+ method public void setEnabled(boolean);
+ method public void setFadingEdgeLength(int);
+ method public void setFilterTouchesWhenObscured(boolean);
+ method public void setFitsSystemWindows(boolean);
+ method public void setFocusable(boolean);
+ method public void setFocusableInTouchMode(boolean);
+ method public void setForeground(android.graphics.drawable.Drawable);
+ method public void setForegroundGravity(int);
+ method public void setForegroundTintList(android.content.res.ColorStateList);
+ method public void setForegroundTintMode(android.graphics.PorterDuff.Mode);
+ method public void setHapticFeedbackEnabled(boolean);
+ method public void setHasTransientState(boolean);
+ method public void setHorizontalFadingEdgeEnabled(boolean);
+ method public void setHorizontalScrollBarEnabled(boolean);
+ method public void setHovered(boolean);
+ method public void setId(int);
+ method public void setImportantForAccessibility(int);
+ method public void setKeepScreenOn(boolean);
+ method public void setLabelFor(int);
+ method public void setLayerPaint(android.graphics.Paint);
+ method public void setLayerType(int, android.graphics.Paint);
+ method public void setLayoutDirection(int);
+ method public void setLayoutParams(android.view.ViewGroup.LayoutParams);
+ method public final void setLeft(int);
+ method public void setLongClickable(boolean);
+ method protected final void setMeasuredDimension(int, int);
+ method public void setMinimumHeight(int);
+ method public void setMinimumWidth(int);
+ method public void setNestedScrollingEnabled(boolean);
+ method public void setNextFocusDownId(int);
+ method public void setNextFocusForwardId(int);
+ method public void setNextFocusLeftId(int);
+ method public void setNextFocusRightId(int);
+ method public void setNextFocusUpId(int);
+ method public void setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener);
+ method public void setOnClickListener(android.view.View.OnClickListener);
+ method public void setOnContextClickListener(android.view.View.OnContextClickListener);
+ method public void setOnCreateContextMenuListener(android.view.View.OnCreateContextMenuListener);
+ method public void setOnDragListener(android.view.View.OnDragListener);
+ method public void setOnFocusChangeListener(android.view.View.OnFocusChangeListener);
+ method public void setOnGenericMotionListener(android.view.View.OnGenericMotionListener);
+ method public void setOnHoverListener(android.view.View.OnHoverListener);
+ method public void setOnKeyListener(android.view.View.OnKeyListener);
+ method public void setOnLongClickListener(android.view.View.OnLongClickListener);
+ method public void setOnScrollChangeListener(android.view.View.OnScrollChangeListener);
+ method public void setOnSystemUiVisibilityChangeListener(android.view.View.OnSystemUiVisibilityChangeListener);
+ method public void setOnTouchListener(android.view.View.OnTouchListener);
+ method public void setOutlineProvider(android.view.ViewOutlineProvider);
+ method public void setOverScrollMode(int);
+ method public void setPadding(int, int, int, int);
+ method public void setPaddingRelative(int, int, int, int);
+ method public void setPivotX(float);
+ method public void setPivotY(float);
+ method public void setPressed(boolean);
+ method public final void setRight(int);
+ method public void setRotation(float);
+ method public void setRotationX(float);
+ method public void setRotationY(float);
+ method public void setSaveEnabled(boolean);
+ method public void setSaveFromParentEnabled(boolean);
+ method public void setScaleX(float);
+ method public void setScaleY(float);
+ method public void setScrollBarDefaultDelayBeforeFade(int);
+ method public void setScrollBarFadeDuration(int);
+ method public void setScrollBarSize(int);
+ method public void setScrollBarStyle(int);
+ method public void setScrollContainer(boolean);
+ method public void setScrollIndicators(int);
+ method public void setScrollIndicators(int, int);
+ method public void setScrollX(int);
+ method public void setScrollY(int);
+ method public void setScrollbarFadingEnabled(boolean);
+ method public void setSelected(boolean);
+ method public void setSoundEffectsEnabled(boolean);
+ method public void setStateListAnimator(android.animation.StateListAnimator);
+ method public void setSystemUiVisibility(int);
+ method public void setTag(java.lang.Object);
+ method public void setTag(int, java.lang.Object);
+ method public void setTextAlignment(int);
+ method public void setTextDirection(int);
+ method public final void setTop(int);
+ method public void setTouchDelegate(android.view.TouchDelegate);
+ method public final void setTransitionName(java.lang.String);
+ method public void setTranslationX(float);
+ method public void setTranslationY(float);
+ method public void setTranslationZ(float);
+ method public void setVerticalFadingEdgeEnabled(boolean);
+ method public void setVerticalScrollBarEnabled(boolean);
+ method public void setVerticalScrollbarPosition(int);
+ method public void setVisibility(int);
+ method public void setWillNotCacheDrawing(boolean);
+ method public void setWillNotDraw(boolean);
+ method public void setX(float);
+ method public void setY(float);
+ method public void setZ(float);
+ method public boolean showContextMenu();
+ method public boolean showContextMenu(float, float);
+ method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback);
+ method public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int);
+ method public void startAnimation(android.view.animation.Animation);
+ method public final deprecated boolean startDrag(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
+ method public final boolean startDragAndDrop(android.content.ClipData, android.view.View.DragShadowBuilder, java.lang.Object, int);
+ method public boolean startNestedScroll(int);
+ method public void stopNestedScroll();
+ method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
+ method public void unscheduleDrawable(android.graphics.drawable.Drawable);
+ method public final void updateDragShadow(android.view.View.DragShadowBuilder);
+ method protected boolean verifyDrawable(android.graphics.drawable.Drawable);
+ method public boolean willNotCacheDrawing();
+ method public boolean willNotDraw();
+ field public static final int ACCESSIBILITY_LIVE_REGION_ASSERTIVE = 2; // 0x2
+ field public static final int ACCESSIBILITY_LIVE_REGION_NONE = 0; // 0x0
+ field public static final int ACCESSIBILITY_LIVE_REGION_POLITE = 1; // 0x1
+ field public static final android.util.Property<android.view.View, java.lang.Float> ALPHA;
+ field public static final int DRAG_FLAG_GLOBAL = 256; // 0x100
+ field public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION = 64; // 0x40
+ field public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION = 128; // 0x80
+ field public static final int DRAG_FLAG_GLOBAL_URI_READ = 1; // 0x1
+ field public static final int DRAG_FLAG_GLOBAL_URI_WRITE = 2; // 0x2
+ field public static final int DRAG_FLAG_OPAQUE = 512; // 0x200
+ field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0
+ field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000
+ field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000
+ field protected static final int[] EMPTY_STATE_SET;
+ field protected static final int[] ENABLED_FOCUSED_SELECTED_STATE_SET;
+ field protected static final int[] ENABLED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] ENABLED_FOCUSED_STATE_SET;
+ field protected static final int[] ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] ENABLED_SELECTED_STATE_SET;
+ field protected static final int[] ENABLED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] ENABLED_STATE_SET;
+ field protected static final int[] ENABLED_WINDOW_FOCUSED_STATE_SET;
+ field public static final int FIND_VIEWS_WITH_CONTENT_DESCRIPTION = 2; // 0x2
+ field public static final int FIND_VIEWS_WITH_TEXT = 1; // 0x1
+ field public static final int FOCUSABLES_ALL = 0; // 0x0
+ field public static final int FOCUSABLES_TOUCH_MODE = 1; // 0x1
+ field protected static final int[] FOCUSED_SELECTED_STATE_SET;
+ field protected static final int[] FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] FOCUSED_STATE_SET;
+ field protected static final int[] FOCUSED_WINDOW_FOCUSED_STATE_SET;
+ field public static final int FOCUS_BACKWARD = 1; // 0x1
+ field public static final int FOCUS_DOWN = 130; // 0x82
+ field public static final int FOCUS_FORWARD = 2; // 0x2
+ field public static final int FOCUS_LEFT = 17; // 0x11
+ field public static final int FOCUS_RIGHT = 66; // 0x42
+ field public static final int FOCUS_UP = 33; // 0x21
+ field public static final int GONE = 8; // 0x8
+ field public static final int HAPTIC_FEEDBACK_ENABLED = 268435456; // 0x10000000
+ field public static final int IMPORTANT_FOR_ACCESSIBILITY_AUTO = 0; // 0x0
+ field public static final int IMPORTANT_FOR_ACCESSIBILITY_NO = 2; // 0x2
+ field public static final int IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS = 4; // 0x4
+ field public static final int IMPORTANT_FOR_ACCESSIBILITY_YES = 1; // 0x1
+ field public static final int INVISIBLE = 4; // 0x4
+ field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000
+ field public static final int LAYER_TYPE_HARDWARE = 2; // 0x2
+ field public static final int LAYER_TYPE_NONE = 0; // 0x0
+ field public static final int LAYER_TYPE_SOFTWARE = 1; // 0x1
+ field public static final int LAYOUT_DIRECTION_INHERIT = 2; // 0x2
+ field public static final int LAYOUT_DIRECTION_LOCALE = 3; // 0x3
+ field public static final int LAYOUT_DIRECTION_LTR = 0; // 0x0
+ field public static final int LAYOUT_DIRECTION_RTL = 1; // 0x1
+ field public static final int MEASURED_HEIGHT_STATE_SHIFT = 16; // 0x10
+ field public static final int MEASURED_SIZE_MASK = 16777215; // 0xffffff
+ field public static final int MEASURED_STATE_MASK = -16777216; // 0xff000000
+ field public static final int MEASURED_STATE_TOO_SMALL = 16777216; // 0x1000000
+ field public static final int NO_ID = -1; // 0xffffffff
+ field public static final int OVER_SCROLL_ALWAYS = 0; // 0x0
+ field public static final int OVER_SCROLL_IF_CONTENT_SCROLLS = 1; // 0x1
+ field public static final int OVER_SCROLL_NEVER = 2; // 0x2
+ field protected static final int[] PRESSED_ENABLED_FOCUSED_SELECTED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_SELECTED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_STATE_SET;
+ field protected static final int[] PRESSED_ENABLED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_FOCUSED_SELECTED_STATE_SET;
+ field protected static final int[] PRESSED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_FOCUSED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_SELECTED_STATE_SET;
+ field protected static final int[] PRESSED_SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field protected static final int[] PRESSED_STATE_SET;
+ field protected static final int[] PRESSED_WINDOW_FOCUSED_STATE_SET;
+ field public static final android.util.Property<android.view.View, java.lang.Float> ROTATION;
+ field public static final android.util.Property<android.view.View, java.lang.Float> ROTATION_X;
+ field public static final android.util.Property<android.view.View, java.lang.Float> ROTATION_Y;
+ field public static final android.util.Property<android.view.View, java.lang.Float> SCALE_X;
+ field public static final android.util.Property<android.view.View, java.lang.Float> SCALE_Y;
+ field public static final int SCREEN_STATE_OFF = 0; // 0x0
+ field public static final int SCREEN_STATE_ON = 1; // 0x1
+ field public static final int SCROLLBARS_INSIDE_INSET = 16777216; // 0x1000000
+ field public static final int SCROLLBARS_INSIDE_OVERLAY = 0; // 0x0
+ field public static final int SCROLLBARS_OUTSIDE_INSET = 50331648; // 0x3000000
+ field public static final int SCROLLBARS_OUTSIDE_OVERLAY = 33554432; // 0x2000000
+ field public static final int SCROLLBAR_POSITION_DEFAULT = 0; // 0x0
+ field public static final int SCROLLBAR_POSITION_LEFT = 1; // 0x1
+ field public static final int SCROLLBAR_POSITION_RIGHT = 2; // 0x2
+ field public static final int SCROLL_AXIS_HORIZONTAL = 1; // 0x1
+ field public static final int SCROLL_AXIS_NONE = 0; // 0x0
+ field public static final int SCROLL_AXIS_VERTICAL = 2; // 0x2
+ field public static final int SCROLL_INDICATOR_BOTTOM = 2; // 0x2
+ field public static final int SCROLL_INDICATOR_END = 32; // 0x20
+ field public static final int SCROLL_INDICATOR_LEFT = 4; // 0x4
+ field public static final int SCROLL_INDICATOR_RIGHT = 8; // 0x8
+ field public static final int SCROLL_INDICATOR_START = 16; // 0x10
+ field public static final int SCROLL_INDICATOR_TOP = 1; // 0x1
+ field protected static final int[] SELECTED_STATE_SET;
+ field protected static final int[] SELECTED_WINDOW_FOCUSED_STATE_SET;
+ field public static final int SOUND_EFFECTS_ENABLED = 134217728; // 0x8000000
+ field public static final deprecated int STATUS_BAR_HIDDEN = 1; // 0x1
+ field public static final deprecated int STATUS_BAR_VISIBLE = 0; // 0x0
+ field public static final int SYSTEM_UI_FLAG_FULLSCREEN = 4; // 0x4
+ field public static final int SYSTEM_UI_FLAG_HIDE_NAVIGATION = 2; // 0x2
+ field public static final int SYSTEM_UI_FLAG_IMMERSIVE = 2048; // 0x800
+ field public static final int SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 4096; // 0x1000
+ field public static final int SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN = 1024; // 0x400
+ field public static final int SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION = 512; // 0x200
+ field public static final int SYSTEM_UI_FLAG_LAYOUT_STABLE = 256; // 0x100
+ field public static final int SYSTEM_UI_FLAG_LIGHT_STATUS_BAR = 8192; // 0x2000
+ field public static final int SYSTEM_UI_FLAG_LOW_PROFILE = 1; // 0x1
+ field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0
+ field public static final int SYSTEM_UI_LAYOUT_FLAGS = 1536; // 0x600
+ field public static final int TEXT_ALIGNMENT_CENTER = 4; // 0x4
+ field public static final int TEXT_ALIGNMENT_GRAVITY = 1; // 0x1
+ field public static final int TEXT_ALIGNMENT_INHERIT = 0; // 0x0
+ field public static final int TEXT_ALIGNMENT_TEXT_END = 3; // 0x3
+ field public static final int TEXT_ALIGNMENT_TEXT_START = 2; // 0x2
+ field public static final int TEXT_ALIGNMENT_VIEW_END = 6; // 0x6
+ field public static final int TEXT_ALIGNMENT_VIEW_START = 5; // 0x5
+ field public static final int TEXT_DIRECTION_ANY_RTL = 2; // 0x2
+ field public static final int TEXT_DIRECTION_FIRST_STRONG = 1; // 0x1
+ field public static final int TEXT_DIRECTION_FIRST_STRONG_LTR = 6; // 0x6
+ field public static final int TEXT_DIRECTION_FIRST_STRONG_RTL = 7; // 0x7
+ field public static final int TEXT_DIRECTION_INHERIT = 0; // 0x0
+ field public static final int TEXT_DIRECTION_LOCALE = 5; // 0x5
+ field public static final int TEXT_DIRECTION_LTR = 3; // 0x3
+ field public static final int TEXT_DIRECTION_RTL = 4; // 0x4
+ field public static final android.util.Property<android.view.View, java.lang.Float> TRANSLATION_X;
+ field public static final android.util.Property<android.view.View, java.lang.Float> TRANSLATION_Y;
+ field public static final android.util.Property<android.view.View, java.lang.Float> TRANSLATION_Z;
+ field protected static final java.lang.String VIEW_LOG_TAG = "View";
+ field public static final int VISIBLE = 0; // 0x0
+ field protected static final int[] WINDOW_FOCUSED_STATE_SET;
+ field public static final android.util.Property<android.view.View, java.lang.Float> X;
+ field public static final android.util.Property<android.view.View, java.lang.Float> Y;
+ field public static final android.util.Property<android.view.View, java.lang.Float> Z;
+ }
+
+ public static class View.AccessibilityDelegate {
+ ctor public View.AccessibilityDelegate();
+ method public boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(android.view.View);
+ method public void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public void onInitializeAccessibilityNodeInfo(android.view.View, android.view.accessibility.AccessibilityNodeInfo);
+ method public void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public boolean performAccessibilityAction(android.view.View, int, android.os.Bundle);
+ method public void sendAccessibilityEvent(android.view.View, int);
+ method public void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent);
+ }
+
+ public static class View.BaseSavedState extends android.view.AbsSavedState {
+ ctor public View.BaseSavedState(android.os.Parcel);
+ ctor public View.BaseSavedState(android.os.Parcelable);
+ field public static final android.os.Parcelable.Creator<android.view.View.BaseSavedState> CREATOR;
+ }
+
+ public static class View.DragShadowBuilder {
+ ctor public View.DragShadowBuilder(android.view.View);
+ ctor public View.DragShadowBuilder();
+ method public final android.view.View getView();
+ method public void onDrawShadow(android.graphics.Canvas);
+ method public void onProvideShadowMetrics(android.graphics.Point, android.graphics.Point);
+ }
+
+ public static class View.MeasureSpec {
+ ctor public View.MeasureSpec();
+ method public static int getMode(int);
+ method public static int getSize(int);
+ method public static int makeMeasureSpec(int, int);
+ method public static java.lang.String toString(int);
+ field public static final int AT_MOST = -2147483648; // 0x80000000
+ field public static final int EXACTLY = 1073741824; // 0x40000000
+ field public static final int UNSPECIFIED = 0; // 0x0
+ }
+
+ public static abstract interface View.OnApplyWindowInsetsListener {
+ method public abstract android.view.WindowInsets onApplyWindowInsets(android.view.View, android.view.WindowInsets);
+ }
+
+ public static abstract interface View.OnAttachStateChangeListener {
+ method public abstract void onViewAttachedToWindow(android.view.View);
+ method public abstract void onViewDetachedFromWindow(android.view.View);
+ }
+
+ public static abstract interface View.OnClickListener {
+ method public abstract void onClick(android.view.View);
+ }
+
+ public static abstract interface View.OnContextClickListener {
+ method public abstract boolean onContextClick(android.view.View);
+ }
+
+ public static abstract interface View.OnCreateContextMenuListener {
+ method public abstract void onCreateContextMenu(android.view.ContextMenu, android.view.View, android.view.ContextMenu.ContextMenuInfo);
+ }
+
+ public static abstract interface View.OnDragListener {
+ method public abstract boolean onDrag(android.view.View, android.view.DragEvent);
+ }
+
+ public static abstract interface View.OnFocusChangeListener {
+ method public abstract void onFocusChange(android.view.View, boolean);
+ }
+
+ public static abstract interface View.OnGenericMotionListener {
+ method public abstract boolean onGenericMotion(android.view.View, android.view.MotionEvent);
+ }
+
+ public static abstract interface View.OnHoverListener {
+ method public abstract boolean onHover(android.view.View, android.view.MotionEvent);
+ }
+
+ public static abstract interface View.OnKeyListener {
+ method public abstract boolean onKey(android.view.View, int, android.view.KeyEvent);
+ }
+
+ public static abstract interface View.OnLayoutChangeListener {
+ method public abstract void onLayoutChange(android.view.View, int, int, int, int, int, int, int, int);
+ }
+
+ public static abstract interface View.OnLongClickListener {
+ method public abstract boolean onLongClick(android.view.View);
+ }
+
+ public static abstract interface View.OnScrollChangeListener {
+ method public abstract void onScrollChange(android.view.View, int, int, int, int);
+ }
+
+ public static abstract interface View.OnSystemUiVisibilityChangeListener {
+ method public abstract void onSystemUiVisibilityChange(int);
+ }
+
+ public static abstract interface View.OnTouchListener {
+ method public abstract boolean onTouch(android.view.View, android.view.MotionEvent);
+ }
+
+ public final class ViewAnimationUtils {
+ method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
+ }
+
+ public class ViewConfiguration {
+ ctor public deprecated ViewConfiguration();
+ method public static android.view.ViewConfiguration get(android.content.Context);
+ method public static long getDefaultActionModeHideDuration();
+ method public static int getDoubleTapTimeout();
+ method public static deprecated int getEdgeSlop();
+ method public static deprecated int getFadingEdgeLength();
+ method public static deprecated long getGlobalActionKeyTimeout();
+ method public static int getJumpTapTimeout();
+ method public static int getKeyRepeatDelay();
+ method public static int getKeyRepeatTimeout();
+ method public static int getLongPressTimeout();
+ method public static deprecated int getMaximumDrawingCacheSize();
+ method public static deprecated int getMaximumFlingVelocity();
+ method public static deprecated int getMinimumFlingVelocity();
+ method public static int getPressedStateDuration();
+ method public int getScaledDoubleTapSlop();
+ method public int getScaledEdgeSlop();
+ method public int getScaledFadingEdgeLength();
+ method public int getScaledMaximumDrawingCacheSize();
+ method public int getScaledMaximumFlingVelocity();
+ method public int getScaledMinimumFlingVelocity();
+ method public int getScaledOverflingDistance();
+ method public int getScaledOverscrollDistance();
+ method public int getScaledPagingTouchSlop();
+ method public int getScaledScrollBarSize();
+ method public int getScaledTouchSlop();
+ method public int getScaledWindowTouchSlop();
+ method public static int getScrollBarFadeDuration();
+ method public static deprecated int getScrollBarSize();
+ method public static int getScrollDefaultDelay();
+ method public static float getScrollFriction();
+ method public static int getTapTimeout();
+ method public static deprecated int getTouchSlop();
+ method public static deprecated int getWindowTouchSlop();
+ method public static long getZoomControlsTimeout();
+ method public boolean hasPermanentMenuKey();
+ }
+
+ public class ViewDebug {
+ ctor public ViewDebug();
+ method public static void dumpCapturedView(java.lang.String, java.lang.Object);
+ method public static deprecated void startHierarchyTracing(java.lang.String, android.view.View);
+ method public static deprecated void startRecyclerTracing(java.lang.String, android.view.View);
+ method public static deprecated void stopHierarchyTracing();
+ method public static deprecated void stopRecyclerTracing();
+ method public static deprecated void trace(android.view.View, android.view.ViewDebug.RecyclerTraceType, int...);
+ method public static deprecated void trace(android.view.View, android.view.ViewDebug.HierarchyTraceType);
+ field public static final deprecated boolean TRACE_HIERARCHY = false;
+ field public static final deprecated boolean TRACE_RECYCLER = false;
+ }
+
+ public static abstract class ViewDebug.CapturedViewProperty implements java.lang.annotation.Annotation {
+ }
+
+ public static abstract class ViewDebug.ExportedProperty implements java.lang.annotation.Annotation {
+ }
+
+ public static abstract class ViewDebug.FlagToString implements java.lang.annotation.Annotation {
+ }
+
+ public static final deprecated class ViewDebug.HierarchyTraceType extends java.lang.Enum {
+ method public static android.view.ViewDebug.HierarchyTraceType valueOf(java.lang.String);
+ method public static final android.view.ViewDebug.HierarchyTraceType[] values();
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType BUILD_CACHE;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType DRAW;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType INVALIDATE;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType INVALIDATE_CHILD;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType INVALIDATE_CHILD_IN_PARENT;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType ON_LAYOUT;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType ON_MEASURE;
+ enum_constant public static final android.view.ViewDebug.HierarchyTraceType REQUEST_LAYOUT;
+ }
+
+ public static abstract class ViewDebug.IntToString implements java.lang.annotation.Annotation {
+ }
+
+ public static final deprecated class ViewDebug.RecyclerTraceType extends java.lang.Enum {
+ method public static android.view.ViewDebug.RecyclerTraceType valueOf(java.lang.String);
+ method public static final android.view.ViewDebug.RecyclerTraceType[] values();
+ enum_constant public static final android.view.ViewDebug.RecyclerTraceType BIND_VIEW;
+ enum_constant public static final android.view.ViewDebug.RecyclerTraceType MOVE_FROM_ACTIVE_TO_SCRAP_HEAP;
+ enum_constant public static final android.view.ViewDebug.RecyclerTraceType MOVE_TO_SCRAP_HEAP;
+ enum_constant public static final android.view.ViewDebug.RecyclerTraceType NEW_VIEW;
+ enum_constant public static final android.view.ViewDebug.RecyclerTraceType RECYCLE_FROM_ACTIVE_HEAP;
+ enum_constant public static final android.view.ViewDebug.RecyclerTraceType RECYCLE_FROM_SCRAP_HEAP;
+ }
+
+ public abstract class ViewGroup extends android.view.View implements android.view.ViewManager android.view.ViewParent {
+ ctor public ViewGroup(android.content.Context);
+ ctor public ViewGroup(android.content.Context, android.util.AttributeSet);
+ ctor public ViewGroup(android.content.Context, android.util.AttributeSet, int);
+ ctor public ViewGroup(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean addStatesFromChildren();
+ method public void addView(android.view.View);
+ method public void addView(android.view.View, int);
+ method public void addView(android.view.View, int, int);
+ method public void addView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public void addView(android.view.View, int, android.view.ViewGroup.LayoutParams);
+ method protected boolean addViewInLayout(android.view.View, int, android.view.ViewGroup.LayoutParams);
+ method protected boolean addViewInLayout(android.view.View, int, android.view.ViewGroup.LayoutParams, boolean);
+ method protected void attachLayoutAnimationParameters(android.view.View, android.view.ViewGroup.LayoutParams, int, int);
+ method protected void attachViewToParent(android.view.View, int, android.view.ViewGroup.LayoutParams);
+ method public void bringChildToFront(android.view.View);
+ method protected boolean canAnimate();
+ method protected boolean checkLayoutParams(android.view.ViewGroup.LayoutParams);
+ method public void childDrawableStateChanged(android.view.View);
+ method public void childHasTransientStateChanged(android.view.View, boolean);
+ method protected void cleanupLayoutState(android.view.View);
+ method public void clearChildFocus(android.view.View);
+ method public void clearDisappearingChildren();
+ method protected void debug(int);
+ method protected void detachAllViewsFromParent();
+ method protected void detachViewFromParent(android.view.View);
+ method protected void detachViewFromParent(int);
+ method protected void detachViewsFromParent(int, int);
+ method protected void dispatchFreezeSelfOnly(android.util.SparseArray<android.os.Parcelable>);
+ method public void dispatchSetActivated(boolean);
+ method public void dispatchSetSelected(boolean);
+ method protected void dispatchThawSelfOnly(android.util.SparseArray<android.os.Parcelable>);
+ method protected boolean drawChild(android.graphics.Canvas, android.view.View, long);
+ method public void endViewTransition(android.view.View);
+ method public int findDependentLayoutAxes(android.view.View, int);
+ method public android.view.View focusSearch(android.view.View, int);
+ method public void focusableViewAvailable(android.view.View);
+ method public boolean gatherTransparentRegion(android.graphics.Region);
+ method protected android.view.ViewGroup.LayoutParams generateDefaultLayoutParams();
+ method public android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet);
+ method protected android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams);
+ method public android.view.View getChildAt(int);
+ method public int getChildCount();
+ method protected int getChildDrawingOrder(int, int);
+ method public static int getChildMeasureSpec(int, int, int);
+ method protected boolean getChildStaticTransformation(android.view.View, android.view.animation.Transformation);
+ method public boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point);
+ method public boolean getClipChildren();
+ method public boolean getClipToPadding();
+ method public int getDescendantFocusability();
+ method public android.view.View getFocusedChild();
+ method public android.view.animation.LayoutAnimationController getLayoutAnimation();
+ method public android.view.animation.Animation.AnimationListener getLayoutAnimationListener();
+ method public int getLayoutMode();
+ method public android.animation.LayoutTransition getLayoutTransition();
+ method public int getNestedScrollAxes();
+ method public int getPersistentDrawingCache();
+ method public boolean getTouchscreenBlocksFocus();
+ method public int indexOfChild(android.view.View);
+ method public final void invalidateChild(android.view.View, android.graphics.Rect);
+ method public android.view.ViewParent invalidateChildInParent(int[], android.graphics.Rect);
+ method public deprecated boolean isAlwaysDrawnWithCacheEnabled();
+ method public deprecated boolean isAnimationCacheEnabled();
+ method protected boolean isChildrenDrawingOrderEnabled();
+ method protected deprecated boolean isChildrenDrawnWithCacheEnabled();
+ method public boolean isMotionEventSplittingEnabled();
+ method public boolean isTransitionGroup();
+ method public final void layout(int, int, int, int);
+ method protected void measureChild(android.view.View, int, int);
+ method protected void measureChildWithMargins(android.view.View, int, int, int, int);
+ method protected void measureChildren(int, int);
+ method public void notifySubtreeAccessibilityStateChanged(android.view.View, android.view.View, int);
+ method public final void offsetDescendantRectToMyCoords(android.view.View, android.graphics.Rect);
+ method public final void offsetRectIntoDescendantCoords(android.view.View, android.graphics.Rect);
+ method public boolean onInterceptHoverEvent(android.view.MotionEvent);
+ method public boolean onInterceptTouchEvent(android.view.MotionEvent);
+ method protected abstract void onLayout(boolean, int, int, int, int);
+ method public boolean onNestedFling(android.view.View, float, float, boolean);
+ method public boolean onNestedPreFling(android.view.View, float, float);
+ method public boolean onNestedPrePerformAccessibilityAction(android.view.View, int, android.os.Bundle);
+ method public void onNestedPreScroll(android.view.View, int, int, int[]);
+ method public void onNestedScroll(android.view.View, int, int, int, int);
+ method public void onNestedScrollAccepted(android.view.View, android.view.View, int);
+ method protected boolean onRequestFocusInDescendants(int, android.graphics.Rect);
+ method public boolean onRequestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public boolean onStartNestedScroll(android.view.View, android.view.View, int);
+ method public void onStopNestedScroll(android.view.View);
+ method public void onViewAdded(android.view.View);
+ method public void onViewRemoved(android.view.View);
+ method public void recomputeViewAttributes(android.view.View);
+ method public void removeAllViews();
+ method public void removeAllViewsInLayout();
+ method protected void removeDetachedView(android.view.View, boolean);
+ method public void removeView(android.view.View);
+ method public void removeViewAt(int);
+ method public void removeViewInLayout(android.view.View);
+ method public void removeViews(int, int);
+ method public void removeViewsInLayout(int, int);
+ method public void requestChildFocus(android.view.View, android.view.View);
+ method public boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean);
+ method public void requestDisallowInterceptTouchEvent(boolean);
+ method public void requestLayoutForChild(android.view.View);
+ method public void requestPartialLayoutForChild(android.view.View);
+ method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public void requestTransparentRegion(android.view.View);
+ method public void scheduleLayoutAnimation();
+ method public void setAddStatesFromChildren(boolean);
+ method public deprecated void setAlwaysDrawnWithCacheEnabled(boolean);
+ method public deprecated void setAnimationCacheEnabled(boolean);
+ method protected void setChildrenDrawingCacheEnabled(boolean);
+ method protected void setChildrenDrawingOrderEnabled(boolean);
+ method protected deprecated void setChildrenDrawnWithCacheEnabled(boolean);
+ method public void setClipChildren(boolean);
+ method public void setClipToPadding(boolean);
+ method public void setDescendantFocusability(int);
+ method public void setLayoutAnimation(android.view.animation.LayoutAnimationController);
+ method public void setLayoutAnimationListener(android.view.animation.Animation.AnimationListener);
+ method public void setLayoutMode(int);
+ method public void setLayoutTransition(android.animation.LayoutTransition);
+ method public void setMotionEventSplittingEnabled(boolean);
+ method public void setOnHierarchyChangeListener(android.view.ViewGroup.OnHierarchyChangeListener);
+ method public void setPersistentDrawingCache(int);
+ method protected void setStaticTransformationsEnabled(boolean);
+ method public void setTouchscreenBlocksFocus(boolean);
+ method public void setTransitionGroup(boolean);
+ method public boolean shouldDelayChildPressedState();
+ method public boolean showContextMenuForChild(android.view.View);
+ method public boolean showContextMenuForChild(android.view.View, float, float);
+ method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);
+ method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);
+ method public void startLayoutAnimation();
+ method public void startViewTransition(android.view.View);
+ method public void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams);
+ field protected static final int CLIP_TO_PADDING_MASK = 34; // 0x22
+ field public static final int FOCUS_AFTER_DESCENDANTS = 262144; // 0x40000
+ field public static final int FOCUS_BEFORE_DESCENDANTS = 131072; // 0x20000
+ field public static final int FOCUS_BLOCK_DESCENDANTS = 393216; // 0x60000
+ field public static final int LAYOUT_MODE_CLIP_BOUNDS = 0; // 0x0
+ field public static final int LAYOUT_MODE_OPTICAL_BOUNDS = 1; // 0x1
+ field public static final int PERSISTENT_ALL_CACHES = 3; // 0x3
+ field public static final int PERSISTENT_ANIMATION_CACHE = 1; // 0x1
+ field public static final int PERSISTENT_NO_CACHE = 0; // 0x0
+ field public static final int PERSISTENT_SCROLLING_CACHE = 2; // 0x2
+ }
+
+ public static class ViewGroup.LayoutParams {
+ ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public ViewGroup.LayoutParams(int, int);
+ ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);
+ method public void resolveLayoutDirection(int);
+ method protected void setBaseAttributes(android.content.res.TypedArray, int, int);
+ field public static final deprecated int FILL_PARENT = -1; // 0xffffffff
+ field public static final int MATCH_PARENT = -1; // 0xffffffff
+ field public static final int WRAP_CONTENT = -2; // 0xfffffffe
+ field public int height;
+ field public android.view.animation.LayoutAnimationController.AnimationParameters layoutAnimationParameters;
+ field public int width;
+ }
+
+ public static class ViewGroup.MarginLayoutParams extends android.view.ViewGroup.LayoutParams {
+ ctor public ViewGroup.MarginLayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public ViewGroup.MarginLayoutParams(int, int);
+ ctor public ViewGroup.MarginLayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public ViewGroup.MarginLayoutParams(android.view.ViewGroup.LayoutParams);
+ method public int getLayoutDirection();
+ method public int getMarginEnd();
+ method public int getMarginStart();
+ method public boolean isMarginRelative();
+ method public void setLayoutDirection(int);
+ method public void setMarginEnd(int);
+ method public void setMarginStart(int);
+ method public void setMargins(int, int, int, int);
+ field public int bottomMargin;
+ field public int leftMargin;
+ field public int rightMargin;
+ field public int topMargin;
+ }
+
+ public static abstract interface ViewGroup.OnHierarchyChangeListener {
+ method public abstract void onChildViewAdded(android.view.View, android.view.View);
+ method public abstract void onChildViewRemoved(android.view.View, android.view.View);
+ }
+
+ public class ViewGroupOverlay extends android.view.ViewOverlay {
+ method public void add(android.view.View);
+ method public void remove(android.view.View);
+ }
+
+ public abstract interface ViewManager {
+ method public abstract void addView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public abstract void removeView(android.view.View);
+ method public abstract void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams);
+ }
+
+ public abstract class ViewOutlineProvider {
+ ctor public ViewOutlineProvider();
+ method public abstract void getOutline(android.view.View, android.graphics.Outline);
+ field public static final android.view.ViewOutlineProvider BACKGROUND;
+ field public static final android.view.ViewOutlineProvider BOUNDS;
+ field public static final android.view.ViewOutlineProvider PADDED_BOUNDS;
+ }
+
+ public class ViewOverlay {
+ method public void add(android.graphics.drawable.Drawable);
+ method public void clear();
+ method public void remove(android.graphics.drawable.Drawable);
+ }
+
+ public abstract interface ViewParent {
+ method public abstract void bringChildToFront(android.view.View);
+ method public abstract boolean canResolveLayoutDirection();
+ method public abstract boolean canResolveTextAlignment();
+ method public abstract boolean canResolveTextDirection();
+ method public abstract void childDrawableStateChanged(android.view.View);
+ method public abstract void childHasTransientStateChanged(android.view.View, boolean);
+ method public abstract void clearChildFocus(android.view.View);
+ method public abstract void createContextMenu(android.view.ContextMenu);
+ method public abstract int findDependentLayoutAxes(android.view.View, int);
+ method public abstract android.view.View focusSearch(android.view.View, int);
+ method public abstract void focusableViewAvailable(android.view.View);
+ method public abstract boolean getChildVisibleRect(android.view.View, android.graphics.Rect, android.graphics.Point);
+ method public abstract int getLayoutDirection();
+ method public abstract android.view.ViewParent getParent();
+ method public abstract android.view.ViewParent getParentForAccessibility();
+ method public abstract int getTextAlignment();
+ method public abstract int getTextDirection();
+ method public abstract void invalidateChild(android.view.View, android.graphics.Rect);
+ method public abstract android.view.ViewParent invalidateChildInParent(int[], android.graphics.Rect);
+ method public abstract boolean isLayoutDirectionResolved();
+ method public abstract boolean isLayoutRequested();
+ method public abstract boolean isTextAlignmentResolved();
+ method public abstract boolean isTextDirectionResolved();
+ method public abstract void notifySubtreeAccessibilityStateChanged(android.view.View, android.view.View, int);
+ method public abstract boolean onNestedFling(android.view.View, float, float, boolean);
+ method public abstract boolean onNestedPreFling(android.view.View, float, float);
+ method public abstract boolean onNestedPrePerformAccessibilityAction(android.view.View, int, android.os.Bundle);
+ method public abstract void onNestedPreScroll(android.view.View, int, int, int[]);
+ method public abstract void onNestedScroll(android.view.View, int, int, int, int);
+ method public abstract void onNestedScrollAccepted(android.view.View, android.view.View, int);
+ method public abstract boolean onStartNestedScroll(android.view.View, android.view.View, int);
+ method public abstract void onStopNestedScroll(android.view.View);
+ method public abstract void recomputeViewAttributes(android.view.View);
+ method public abstract void requestChildFocus(android.view.View, android.view.View);
+ method public abstract boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean);
+ method public abstract void requestDisallowInterceptTouchEvent(boolean);
+ method public abstract void requestFitSystemWindows();
+ method public abstract void requestLayout();
+ method public abstract void requestLayoutForChild(android.view.View);
+ method public abstract boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+ method public abstract void requestTransparentRegion(android.view.View);
+ method public abstract boolean showContextMenuForChild(android.view.View);
+ method public abstract boolean showContextMenuForChild(android.view.View, float, float);
+ method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback);
+ method public abstract android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);
+ field public static final int FLAG_LAYOUT_AXIS_ANY = 3; // 0x3
+ field public static final int FLAG_LAYOUT_AXIS_HORIZONTAL = 1; // 0x1
+ field public static final int FLAG_LAYOUT_AXIS_VERTICAL = 2; // 0x2
+ }
+
+ public class ViewPropertyAnimator {
+ method public android.view.ViewPropertyAnimator alpha(float);
+ method public android.view.ViewPropertyAnimator alphaBy(float);
+ method public void cancel();
+ method public long getDuration();
+ method public android.animation.TimeInterpolator getInterpolator();
+ method public long getStartDelay();
+ method public android.view.ViewPropertyAnimator rotation(float);
+ method public android.view.ViewPropertyAnimator rotationBy(float);
+ method public android.view.ViewPropertyAnimator rotationX(float);
+ method public android.view.ViewPropertyAnimator rotationXBy(float);
+ method public android.view.ViewPropertyAnimator rotationY(float);
+ method public android.view.ViewPropertyAnimator rotationYBy(float);
+ method public android.view.ViewPropertyAnimator scaleX(float);
+ method public android.view.ViewPropertyAnimator scaleXBy(float);
+ method public android.view.ViewPropertyAnimator scaleY(float);
+ method public android.view.ViewPropertyAnimator scaleYBy(float);
+ method public android.view.ViewPropertyAnimator setDuration(long);
+ method public android.view.ViewPropertyAnimator setInterpolator(android.animation.TimeInterpolator);
+ method public android.view.ViewPropertyAnimator setListener(android.animation.Animator.AnimatorListener);
+ method public android.view.ViewPropertyAnimator setStartDelay(long);
+ method public android.view.ViewPropertyAnimator setUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener);
+ method public void start();
+ method public android.view.ViewPropertyAnimator translationX(float);
+ method public android.view.ViewPropertyAnimator translationXBy(float);
+ method public android.view.ViewPropertyAnimator translationY(float);
+ method public android.view.ViewPropertyAnimator translationYBy(float);
+ method public android.view.ViewPropertyAnimator translationZ(float);
+ method public android.view.ViewPropertyAnimator translationZBy(float);
+ method public android.view.ViewPropertyAnimator withEndAction(java.lang.Runnable);
+ method public android.view.ViewPropertyAnimator withLayer();
+ method public android.view.ViewPropertyAnimator withStartAction(java.lang.Runnable);
+ method public android.view.ViewPropertyAnimator x(float);
+ method public android.view.ViewPropertyAnimator xBy(float);
+ method public android.view.ViewPropertyAnimator y(float);
+ method public android.view.ViewPropertyAnimator yBy(float);
+ method public android.view.ViewPropertyAnimator z(float);
+ method public android.view.ViewPropertyAnimator zBy(float);
+ }
+
+ public abstract class ViewStructure {
+ ctor public ViewStructure();
+ method public abstract int addChildCount(int);
+ method public abstract void asyncCommit();
+ method public abstract android.view.ViewStructure asyncNewChild(int);
+ method public abstract int getChildCount();
+ method public abstract android.os.Bundle getExtras();
+ method public abstract java.lang.CharSequence getHint();
+ method public abstract java.lang.CharSequence getText();
+ method public abstract int getTextSelectionEnd();
+ method public abstract int getTextSelectionStart();
+ method public abstract boolean hasExtras();
+ method public abstract android.view.ViewStructure newChild(int);
+ method public abstract void setAccessibilityFocused(boolean);
+ method public abstract void setActivated(boolean);
+ method public abstract void setAlpha(float);
+ method public abstract void setCheckable(boolean);
+ method public abstract void setChecked(boolean);
+ method public abstract void setChildCount(int);
+ method public abstract void setClassName(java.lang.String);
+ method public abstract void setClickable(boolean);
+ method public abstract void setContentDescription(java.lang.CharSequence);
+ method public abstract void setContextClickable(boolean);
+ method public abstract void setDimens(int, int, int, int, int, int);
+ method public abstract void setElevation(float);
+ method public abstract void setEnabled(boolean);
+ method public abstract void setFocusable(boolean);
+ method public abstract void setFocused(boolean);
+ method public abstract void setHint(java.lang.CharSequence);
+ method public abstract void setId(int, java.lang.String, java.lang.String, java.lang.String);
+ method public abstract void setLongClickable(boolean);
+ method public abstract void setSelected(boolean);
+ method public abstract void setText(java.lang.CharSequence);
+ method public abstract void setText(java.lang.CharSequence, int, int);
+ method public abstract void setTextLines(int[], int[]);
+ method public abstract void setTextStyle(float, int, int, int);
+ method public abstract void setTransformation(android.graphics.Matrix);
+ method public abstract void setVisibility(int);
+ }
+
+ public final class ViewStub extends android.view.View {
+ ctor public ViewStub(android.content.Context);
+ ctor public ViewStub(android.content.Context, int);
+ ctor public ViewStub(android.content.Context, android.util.AttributeSet);
+ ctor public ViewStub(android.content.Context, android.util.AttributeSet, int);
+ ctor public ViewStub(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getInflatedId();
+ method public android.view.LayoutInflater getLayoutInflater();
+ method public int getLayoutResource();
+ method public android.view.View inflate();
+ method public void setInflatedId(int);
+ method public void setLayoutInflater(android.view.LayoutInflater);
+ method public void setLayoutResource(int);
+ method public void setOnInflateListener(android.view.ViewStub.OnInflateListener);
+ }
+
+ public static abstract interface ViewStub.OnInflateListener {
+ method public abstract void onInflate(android.view.ViewStub, android.view.View);
+ }
+
+ public final class ViewTreeObserver {
+ method public void addOnDrawListener(android.view.ViewTreeObserver.OnDrawListener);
+ method public void addOnGlobalFocusChangeListener(android.view.ViewTreeObserver.OnGlobalFocusChangeListener);
+ method public void addOnGlobalLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener);
+ method public void addOnPreDrawListener(android.view.ViewTreeObserver.OnPreDrawListener);
+ method public void addOnScrollChangedListener(android.view.ViewTreeObserver.OnScrollChangedListener);
+ method public void addOnTouchModeChangeListener(android.view.ViewTreeObserver.OnTouchModeChangeListener);
+ method public void addOnWindowAttachListener(android.view.ViewTreeObserver.OnWindowAttachListener);
+ method public void addOnWindowFocusChangeListener(android.view.ViewTreeObserver.OnWindowFocusChangeListener);
+ method public final void dispatchOnDraw();
+ method public final void dispatchOnGlobalLayout();
+ method public final boolean dispatchOnPreDraw();
+ method public boolean isAlive();
+ method public deprecated void removeGlobalOnLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener);
+ method public void removeOnDrawListener(android.view.ViewTreeObserver.OnDrawListener);
+ method public void removeOnGlobalFocusChangeListener(android.view.ViewTreeObserver.OnGlobalFocusChangeListener);
+ method public void removeOnGlobalLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener);
+ method public void removeOnPreDrawListener(android.view.ViewTreeObserver.OnPreDrawListener);
+ method public void removeOnScrollChangedListener(android.view.ViewTreeObserver.OnScrollChangedListener);
+ method public void removeOnTouchModeChangeListener(android.view.ViewTreeObserver.OnTouchModeChangeListener);
+ method public void removeOnWindowAttachListener(android.view.ViewTreeObserver.OnWindowAttachListener);
+ method public void removeOnWindowFocusChangeListener(android.view.ViewTreeObserver.OnWindowFocusChangeListener);
+ }
+
+ public static abstract interface ViewTreeObserver.OnDrawListener {
+ method public abstract void onDraw();
+ }
+
+ public static abstract interface ViewTreeObserver.OnGlobalFocusChangeListener {
+ method public abstract void onGlobalFocusChanged(android.view.View, android.view.View);
+ }
+
+ public static abstract interface ViewTreeObserver.OnGlobalLayoutListener {
+ method public abstract void onGlobalLayout();
+ }
+
+ public static abstract interface ViewTreeObserver.OnPreDrawListener {
+ method public abstract boolean onPreDraw();
+ }
+
+ public static abstract interface ViewTreeObserver.OnScrollChangedListener {
+ method public abstract void onScrollChanged();
+ }
+
+ public static abstract interface ViewTreeObserver.OnTouchModeChangeListener {
+ method public abstract void onTouchModeChanged(boolean);
+ }
+
+ public static abstract interface ViewTreeObserver.OnWindowAttachListener {
+ method public abstract void onWindowAttached();
+ method public abstract void onWindowDetached();
+ }
+
+ public static abstract interface ViewTreeObserver.OnWindowFocusChangeListener {
+ method public abstract void onWindowFocusChanged(boolean);
+ }
+
+ public abstract class Window {
+ ctor public Window(android.content.Context);
+ method public abstract void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public void addFlags(int);
+ method public void clearFlags(int);
+ method public abstract void closeAllPanels();
+ method public abstract void closePanel(int);
+ method public android.view.View findViewById(int);
+ method public boolean getAllowEnterTransitionOverlap();
+ method public boolean getAllowReturnTransitionOverlap();
+ method public final android.view.WindowManager.LayoutParams getAttributes();
+ method public final android.view.Window.Callback getCallback();
+ method public final android.view.Window getContainer();
+ method public android.transition.Scene getContentScene();
+ method public final android.content.Context getContext();
+ method public abstract android.view.View getCurrentFocus();
+ method public abstract android.view.View getDecorView();
+ method public static int getDefaultFeatures(android.content.Context);
+ method public android.transition.Transition getEnterTransition();
+ method public android.transition.Transition getExitTransition();
+ method protected final int getFeatures();
+ method protected final int getForcedWindowFlags();
+ method public abstract android.view.LayoutInflater getLayoutInflater();
+ method protected final int getLocalFeatures();
+ method public android.media.session.MediaController getMediaController();
+ method public abstract int getNavigationBarColor();
+ method public android.transition.Transition getReenterTransition();
+ method public android.transition.Transition getReturnTransition();
+ method public android.transition.Transition getSharedElementEnterTransition();
+ method public android.transition.Transition getSharedElementExitTransition();
+ method public android.transition.Transition getSharedElementReenterTransition();
+ method public android.transition.Transition getSharedElementReturnTransition();
+ method public boolean getSharedElementsUseOverlay();
+ method public abstract int getStatusBarColor();
+ method public long getTransitionBackgroundFadeDuration();
+ method public android.transition.TransitionManager getTransitionManager();
+ method public abstract int getVolumeControlStream();
+ method public android.view.WindowManager getWindowManager();
+ method public final android.content.res.TypedArray getWindowStyle();
+ method public final boolean hasChildren();
+ method public boolean hasFeature(int);
+ method protected final boolean hasSoftInputMode();
+ method public void injectInputEvent(android.view.InputEvent);
+ method public abstract void invalidatePanelMenu(int);
+ method public final boolean isActive();
+ method public abstract boolean isFloating();
+ method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
+ method public final void makeActive();
+ method protected abstract void onActive();
+ method public abstract void onConfigurationChanged(android.content.res.Configuration);
+ method public abstract void openPanel(int, android.view.KeyEvent);
+ method public abstract android.view.View peekDecorView();
+ method public abstract boolean performContextMenuIdentifierAction(int, int);
+ method public abstract boolean performPanelIdentifierAction(int, int, int);
+ method public abstract boolean performPanelShortcut(int, int, android.view.KeyEvent, int);
+ method public boolean requestFeature(int);
+ method public abstract void restoreHierarchyState(android.os.Bundle);
+ method public abstract android.os.Bundle saveHierarchyState();
+ method public void setAllowEnterTransitionOverlap(boolean);
+ method public void setAllowReturnTransitionOverlap(boolean);
+ method public void setAttributes(android.view.WindowManager.LayoutParams);
+ method public abstract void setBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setBackgroundDrawableResource(int);
+ method public void setCallback(android.view.Window.Callback);
+ method public abstract void setChildDrawable(int, android.graphics.drawable.Drawable);
+ method public abstract void setChildInt(int, int);
+ method public void setClipToOutline(boolean);
+ method public void setContainer(android.view.Window);
+ method public abstract void setContentView(int);
+ method public abstract void setContentView(android.view.View);
+ method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
+ method public abstract void setDecorView(android.view.View);
+ method public abstract void setDecorView(int);
+ method protected void setDefaultWindowFormat(int);
+ method public void setDimAmount(float);
+ method public void setElevation(float);
+ method public void setEnterTransition(android.transition.Transition);
+ method public void setExitTransition(android.transition.Transition);
+ method public abstract void setFeatureDrawable(int, android.graphics.drawable.Drawable);
+ method public abstract void setFeatureDrawableAlpha(int, int);
+ method public abstract void setFeatureDrawableResource(int, int);
+ method public abstract void setFeatureDrawableUri(int, android.net.Uri);
+ method public abstract void setFeatureInt(int, int);
+ method public void setFlags(int, int);
+ method public void setFormat(int);
+ method public void setGravity(int);
+ method public void setIcon(int);
+ method public void setLayout(int, int);
+ method public void setLocalFocus(boolean, boolean);
+ method public void setLogo(int);
+ method public void setMediaController(android.media.session.MediaController);
+ method public abstract void setNavigationBarColor(int);
+ method public void setReenterTransition(android.transition.Transition);
+ method public void setReturnTransition(android.transition.Transition);
+ method public void setSharedElementEnterTransition(android.transition.Transition);
+ method public void setSharedElementExitTransition(android.transition.Transition);
+ method public void setSharedElementReenterTransition(android.transition.Transition);
+ method public void setSharedElementReturnTransition(android.transition.Transition);
+ method public void setSharedElementsUseOverlay(boolean);
+ method public void setSoftInputMode(int);
+ method public abstract void setStatusBarColor(int);
+ method public abstract void setTitle(java.lang.CharSequence);
+ method public abstract deprecated void setTitleColor(int);
+ method public void setTransitionBackgroundFadeDuration(long);
+ method public void setTransitionManager(android.transition.TransitionManager);
+ method public void setType(int);
+ method public void setUiOptions(int);
+ method public void setUiOptions(int, int);
+ method public abstract void setVolumeControlStream(int);
+ method public void setWindowAnimations(int);
+ method public void setWindowManager(android.view.WindowManager, android.os.IBinder, java.lang.String);
+ method public void setWindowManager(android.view.WindowManager, android.os.IBinder, java.lang.String, boolean);
+ method public abstract boolean superDispatchGenericMotionEvent(android.view.MotionEvent);
+ method public abstract boolean superDispatchKeyEvent(android.view.KeyEvent);
+ method public abstract boolean superDispatchKeyShortcutEvent(android.view.KeyEvent);
+ method public abstract boolean superDispatchTouchEvent(android.view.MotionEvent);
+ method public abstract boolean superDispatchTrackballEvent(android.view.MotionEvent);
+ method public abstract void takeInputQueue(android.view.InputQueue.Callback);
+ method public abstract void takeKeyEvents(boolean);
+ method public abstract void takeSurface(android.view.SurfaceHolder.Callback2);
+ method public abstract void togglePanel(int, android.view.KeyEvent);
+ field protected static final deprecated int DEFAULT_FEATURES = 65; // 0x41
+ field public static final int FEATURE_ACTION_BAR = 8; // 0x8
+ field public static final int FEATURE_ACTION_BAR_OVERLAY = 9; // 0x9
+ field public static final int FEATURE_ACTION_MODE_OVERLAY = 10; // 0xa
+ field public static final int FEATURE_ACTIVITY_TRANSITIONS = 13; // 0xd
+ field public static final int FEATURE_CONTENT_TRANSITIONS = 12; // 0xc
+ field public static final int FEATURE_CONTEXT_MENU = 6; // 0x6
+ field public static final int FEATURE_CUSTOM_TITLE = 7; // 0x7
+ field public static final deprecated int FEATURE_INDETERMINATE_PROGRESS = 5; // 0x5
+ field public static final int FEATURE_LEFT_ICON = 3; // 0x3
+ field public static final int FEATURE_NO_TITLE = 1; // 0x1
+ field public static final int FEATURE_OPTIONS_PANEL = 0; // 0x0
+ field public static final deprecated int FEATURE_PROGRESS = 2; // 0x2
+ field public static final int FEATURE_RIGHT_ICON = 4; // 0x4
+ field public static final int FEATURE_SWIPE_TO_DISMISS = 11; // 0xb
+ field public static final int ID_ANDROID_CONTENT = 16908290; // 0x1020002
+ field public static final java.lang.String NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME = "android:navigation:background";
+ field public static final deprecated int PROGRESS_END = 10000; // 0x2710
+ field public static final deprecated int PROGRESS_INDETERMINATE_OFF = -4; // 0xfffffffc
+ field public static final deprecated int PROGRESS_INDETERMINATE_ON = -3; // 0xfffffffd
+ field public static final deprecated int PROGRESS_SECONDARY_END = 30000; // 0x7530
+ field public static final deprecated int PROGRESS_SECONDARY_START = 20000; // 0x4e20
+ field public static final deprecated int PROGRESS_START = 0; // 0x0
+ field public static final deprecated int PROGRESS_VISIBILITY_OFF = -2; // 0xfffffffe
+ field public static final deprecated int PROGRESS_VISIBILITY_ON = -1; // 0xffffffff
+ field public static final java.lang.String STATUS_BAR_BACKGROUND_TRANSITION_NAME = "android:status:background";
+ }
+
+ public static abstract interface Window.Callback {
+ method public abstract boolean dispatchGenericMotionEvent(android.view.MotionEvent);
+ method public abstract boolean dispatchKeyEvent(android.view.KeyEvent);
+ method public abstract boolean dispatchKeyShortcutEvent(android.view.KeyEvent);
+ method public abstract boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ method public abstract boolean dispatchTouchEvent(android.view.MotionEvent);
+ method public abstract boolean dispatchTrackballEvent(android.view.MotionEvent);
+ method public abstract void onActionModeFinished(android.view.ActionMode);
+ method public abstract void onActionModeStarted(android.view.ActionMode);
+ method public abstract void onAttachedToWindow();
+ method public abstract void onContentChanged();
+ method public abstract boolean onCreatePanelMenu(int, android.view.Menu);
+ method public abstract android.view.View onCreatePanelView(int);
+ method public abstract void onDetachedFromWindow();
+ method public abstract boolean onMenuItemSelected(int, android.view.MenuItem);
+ method public abstract boolean onMenuOpened(int, android.view.Menu);
+ method public abstract void onPanelClosed(int, android.view.Menu);
+ method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);
+ method public abstract boolean onSearchRequested();
+ method public abstract boolean onSearchRequested(android.view.SearchEvent);
+ method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
+ method public abstract void onWindowFocusChanged(boolean);
+ method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
+ method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);
+ }
+
+ public final class WindowAnimationFrameStats extends android.view.FrameStats implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.WindowAnimationFrameStats> CREATOR;
+ }
+
+ public final class WindowContentFrameStats extends android.view.FrameStats implements android.os.Parcelable {
+ method public int describeContents();
+ method public long getFramePostedTimeNano(int);
+ method public long getFrameReadyTimeNano(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.WindowContentFrameStats> CREATOR;
+ }
+
+ public class WindowId implements android.os.Parcelable {
+ method public int describeContents();
+ method public boolean isFocused();
+ method public void registerFocusObserver(android.view.WindowId.FocusObserver);
+ method public void unregisterFocusObserver(android.view.WindowId.FocusObserver);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.WindowId> CREATOR;
+ }
+
+ public static abstract class WindowId.FocusObserver {
+ ctor public WindowId.FocusObserver();
+ method public abstract void onFocusGained(android.view.WindowId);
+ method public abstract void onFocusLost(android.view.WindowId);
+ }
+
+ public final class WindowInsets {
+ ctor public WindowInsets(android.view.WindowInsets);
+ method public android.view.WindowInsets consumeStableInsets();
+ method public android.view.WindowInsets consumeSystemWindowInsets();
+ method public int getStableInsetBottom();
+ method public int getStableInsetLeft();
+ method public int getStableInsetRight();
+ method public int getStableInsetTop();
+ method public int getSystemWindowInsetBottom();
+ method public int getSystemWindowInsetLeft();
+ method public int getSystemWindowInsetRight();
+ method public int getSystemWindowInsetTop();
+ method public boolean hasInsets();
+ method public boolean hasStableInsets();
+ method public boolean hasSystemWindowInsets();
+ method public boolean isConsumed();
+ method public boolean isRound();
+ method public android.view.WindowInsets replaceSystemWindowInsets(int, int, int, int);
+ method public android.view.WindowInsets replaceSystemWindowInsets(android.graphics.Rect);
+ }
+
+ public abstract interface WindowManager implements android.view.ViewManager {
+ method public abstract android.view.Display getDefaultDisplay();
+ method public abstract void removeViewImmediate(android.view.View);
+ }
+
+ public static class WindowManager.BadTokenException extends java.lang.RuntimeException {
+ ctor public WindowManager.BadTokenException();
+ ctor public WindowManager.BadTokenException(java.lang.String);
+ }
+
+ public static class WindowManager.InvalidDisplayException extends java.lang.RuntimeException {
+ ctor public WindowManager.InvalidDisplayException();
+ ctor public WindowManager.InvalidDisplayException(java.lang.String);
+ }
+
+ public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
+ ctor public WindowManager.LayoutParams();
+ ctor public WindowManager.LayoutParams(int);
+ ctor public WindowManager.LayoutParams(int, int);
+ ctor public WindowManager.LayoutParams(int, int, int);
+ ctor public WindowManager.LayoutParams(int, int, int, int, int);
+ ctor public WindowManager.LayoutParams(int, int, int, int, int, int, int);
+ ctor public WindowManager.LayoutParams(android.os.Parcel);
+ method public final int copyFrom(android.view.WindowManager.LayoutParams);
+ method public java.lang.String debug(java.lang.String);
+ method public int describeContents();
+ method public final java.lang.CharSequence getTitle();
+ method public static boolean mayUseInputMethod(int);
+ method public final void setTitle(java.lang.CharSequence);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ALPHA_CHANGED = 128; // 0x80
+ field public static final int ANIMATION_CHANGED = 16; // 0x10
+ field public static final float BRIGHTNESS_OVERRIDE_FULL = 1.0f;
+ field public static final float BRIGHTNESS_OVERRIDE_NONE = -1.0f;
+ field public static final float BRIGHTNESS_OVERRIDE_OFF = 0.0f;
+ field public static final android.os.Parcelable.Creator<android.view.WindowManager.LayoutParams> CREATOR;
+ field public static final int DIM_AMOUNT_CHANGED = 32; // 0x20
+ field public static final int FIRST_APPLICATION_WINDOW = 1; // 0x1
+ field public static final int FIRST_SUB_WINDOW = 1000; // 0x3e8
+ field public static final int FIRST_SYSTEM_WINDOW = 2000; // 0x7d0
+ field public static final int FLAGS_CHANGED = 4; // 0x4
+ field public static final int FLAG_ALLOW_LOCK_WHILE_SCREEN_ON = 1; // 0x1
+ field public static final int FLAG_ALT_FOCUSABLE_IM = 131072; // 0x20000
+ field public static final deprecated int FLAG_BLUR_BEHIND = 4; // 0x4
+ field public static final int FLAG_DIM_BEHIND = 2; // 0x2
+ field public static final int FLAG_DISMISS_KEYGUARD = 4194304; // 0x400000
+ field public static final deprecated int FLAG_DITHER = 4096; // 0x1000
+ field public static final int FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS = -2147483648; // 0x80000000
+ field public static final int FLAG_FORCE_NOT_FULLSCREEN = 2048; // 0x800
+ field public static final int FLAG_FULLSCREEN = 1024; // 0x400
+ field public static final int FLAG_HARDWARE_ACCELERATED = 16777216; // 0x1000000
+ field public static final int FLAG_IGNORE_CHEEK_PRESSES = 32768; // 0x8000
+ field public static final int FLAG_KEEP_SCREEN_ON = 128; // 0x80
+ field public static final int FLAG_LAYOUT_ATTACHED_IN_DECOR = 1073741824; // 0x40000000
+ field public static final int FLAG_LAYOUT_INSET_DECOR = 65536; // 0x10000
+ field public static final int FLAG_LAYOUT_IN_OVERSCAN = 33554432; // 0x2000000
+ field public static final int FLAG_LAYOUT_IN_SCREEN = 256; // 0x100
+ field public static final int FLAG_LAYOUT_NO_LIMITS = 512; // 0x200
+ field public static final int FLAG_LOCAL_FOCUS_MODE = 268435456; // 0x10000000
+ field public static final int FLAG_NOT_FOCUSABLE = 8; // 0x8
+ field public static final int FLAG_NOT_TOUCHABLE = 16; // 0x10
+ field public static final int FLAG_NOT_TOUCH_MODAL = 32; // 0x20
+ field public static final int FLAG_SCALED = 16384; // 0x4000
+ field public static final int FLAG_SECURE = 8192; // 0x2000
+ field public static final int FLAG_SHOW_WALLPAPER = 1048576; // 0x100000
+ field public static final int FLAG_SHOW_WHEN_LOCKED = 524288; // 0x80000
+ field public static final int FLAG_SPLIT_TOUCH = 8388608; // 0x800000
+ field public static final deprecated int FLAG_TOUCHABLE_WHEN_WAKING = 64; // 0x40
+ field public static final int FLAG_TRANSLUCENT_NAVIGATION = 134217728; // 0x8000000
+ field public static final int FLAG_TRANSLUCENT_STATUS = 67108864; // 0x4000000
+ field public static final int FLAG_TURN_SCREEN_ON = 2097152; // 0x200000
+ field public static final int FLAG_WATCH_OUTSIDE_TOUCH = 262144; // 0x40000
+ field public static final int FORMAT_CHANGED = 8; // 0x8
+ field public static final int LAST_APPLICATION_WINDOW = 99; // 0x63
+ field public static final int LAST_SUB_WINDOW = 1999; // 0x7cf
+ field public static final int LAST_SYSTEM_WINDOW = 2999; // 0xbb7
+ field public static final int LAYOUT_CHANGED = 1; // 0x1
+ field public static final int MEMORY_TYPE_CHANGED = 256; // 0x100
+ field public static final deprecated int MEMORY_TYPE_GPU = 2; // 0x2
+ field public static final deprecated int MEMORY_TYPE_HARDWARE = 1; // 0x1
+ field public static final deprecated int MEMORY_TYPE_NORMAL = 0; // 0x0
+ field public static final deprecated int MEMORY_TYPE_PUSH_BUFFERS = 3; // 0x3
+ field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000
+ field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1
+ field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2
+ field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0
+ field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800
+ field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400
+ field public static final int SOFT_INPUT_ADJUST_NOTHING = 48; // 0x30
+ field public static final int SOFT_INPUT_ADJUST_PAN = 32; // 0x20
+ field public static final int SOFT_INPUT_ADJUST_RESIZE = 16; // 0x10
+ field public static final int SOFT_INPUT_ADJUST_UNSPECIFIED = 0; // 0x0
+ field public static final int SOFT_INPUT_IS_FORWARD_NAVIGATION = 256; // 0x100
+ field public static final int SOFT_INPUT_MASK_ADJUST = 240; // 0xf0
+ field public static final int SOFT_INPUT_MASK_STATE = 15; // 0xf
+ field public static final int SOFT_INPUT_MODE_CHANGED = 512; // 0x200
+ field public static final int SOFT_INPUT_STATE_ALWAYS_HIDDEN = 3; // 0x3
+ field public static final int SOFT_INPUT_STATE_ALWAYS_VISIBLE = 5; // 0x5
+ field public static final int SOFT_INPUT_STATE_HIDDEN = 2; // 0x2
+ field public static final int SOFT_INPUT_STATE_UNCHANGED = 1; // 0x1
+ field public static final int SOFT_INPUT_STATE_UNSPECIFIED = 0; // 0x0
+ field public static final int SOFT_INPUT_STATE_VISIBLE = 4; // 0x4
+ field public static final int TITLE_CHANGED = 64; // 0x40
+ field public static final int TYPE_ACCESSIBILITY_OVERLAY = 2032; // 0x7f0
+ field public static final int TYPE_APPLICATION = 2; // 0x2
+ field public static final int TYPE_APPLICATION_ATTACHED_DIALOG = 1003; // 0x3eb
+ field public static final int TYPE_APPLICATION_MEDIA = 1001; // 0x3e9
+ field public static final int TYPE_APPLICATION_PANEL = 1000; // 0x3e8
+ field public static final int TYPE_APPLICATION_STARTING = 3; // 0x3
+ field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea
+ field public static final int TYPE_BASE_APPLICATION = 1; // 0x1
+ field public static final int TYPE_CHANGED = 2; // 0x2
+ field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db
+ field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc
+ field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9
+ field public static final int TYPE_PHONE = 2002; // 0x7d2
+ field public static final int TYPE_PRIORITY_PHONE = 2007; // 0x7d7
+ field public static final int TYPE_PRIVATE_PRESENTATION = 2030; // 0x7ee
+ field public static final int TYPE_SEARCH_BAR = 2001; // 0x7d1
+ field public static final int TYPE_STATUS_BAR = 2000; // 0x7d0
+ field public static final int TYPE_STATUS_BAR_PANEL = 2014; // 0x7de
+ field public static final int TYPE_SYSTEM_ALERT = 2003; // 0x7d3
+ field public static final int TYPE_SYSTEM_DIALOG = 2008; // 0x7d8
+ field public static final int TYPE_SYSTEM_ERROR = 2010; // 0x7da
+ field public static final int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6
+ field public static final int TYPE_TOAST = 2005; // 0x7d5
+ field public static final int TYPE_WALLPAPER = 2013; // 0x7dd
+ field public float alpha;
+ field public float buttonBrightness;
+ field public float dimAmount;
+ field public int flags;
+ field public int format;
+ field public int gravity;
+ field public float horizontalMargin;
+ field public float horizontalWeight;
+ field public deprecated int memoryType;
+ field public java.lang.String packageName;
+ field public int preferredDisplayModeId;
+ field public deprecated float preferredRefreshRate;
+ field public int rotationAnimation;
+ field public float screenBrightness;
+ field public int screenOrientation;
+ field public int softInputMode;
+ field public int systemUiVisibility;
+ field public android.os.IBinder token;
+ field public int type;
+ field public float verticalMargin;
+ field public float verticalWeight;
+ field public int windowAnimations;
+ field public int x;
+ field public int y;
+ }
+
+}
+
+package android.view.accessibility {
+
+ public final class AccessibilityEvent extends android.view.accessibility.AccessibilityRecord implements android.os.Parcelable {
+ method public void appendRecord(android.view.accessibility.AccessibilityRecord);
+ method public int describeContents();
+ method public static java.lang.String eventTypeToString(int);
+ method public int getAction();
+ method public int getContentChangeTypes();
+ method public long getEventTime();
+ method public int getEventType();
+ method public int getMovementGranularity();
+ method public java.lang.CharSequence getPackageName();
+ method public android.view.accessibility.AccessibilityRecord getRecord(int);
+ method public int getRecordCount();
+ method public void initFromParcel(android.os.Parcel);
+ method public static android.view.accessibility.AccessibilityEvent obtain(int);
+ method public static android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent);
+ method public static android.view.accessibility.AccessibilityEvent obtain();
+ method public void setAction(int);
+ method public void setContentChangeTypes(int);
+ method public void setEventTime(long);
+ method public void setEventType(int);
+ method public void setMovementGranularity(int);
+ method public void setPackageName(java.lang.CharSequence);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION = 4; // 0x4
+ field public static final int CONTENT_CHANGE_TYPE_SUBTREE = 1; // 0x1
+ field public static final int CONTENT_CHANGE_TYPE_TEXT = 2; // 0x2
+ field public static final int CONTENT_CHANGE_TYPE_UNDEFINED = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityEvent> CREATOR;
+ field public static final int INVALID_POSITION = -1; // 0xffffffff
+ field public static final deprecated int MAX_TEXT_LENGTH = 500; // 0x1f4
+ field public static final int TYPES_ALL_MASK = -1; // 0xffffffff
+ field public static final int TYPE_ANNOUNCEMENT = 16384; // 0x4000
+ field public static final int TYPE_ASSIST_READING_CONTEXT = 16777216; // 0x1000000
+ field public static final int TYPE_GESTURE_DETECTION_END = 524288; // 0x80000
+ field public static final int TYPE_GESTURE_DETECTION_START = 262144; // 0x40000
+ field public static final int TYPE_NOTIFICATION_STATE_CHANGED = 64; // 0x40
+ field public static final int TYPE_TOUCH_EXPLORATION_GESTURE_END = 1024; // 0x400
+ field public static final int TYPE_TOUCH_EXPLORATION_GESTURE_START = 512; // 0x200
+ field public static final int TYPE_TOUCH_INTERACTION_END = 2097152; // 0x200000
+ field public static final int TYPE_TOUCH_INTERACTION_START = 1048576; // 0x100000
+ field public static final int TYPE_VIEW_ACCESSIBILITY_FOCUSED = 32768; // 0x8000
+ field public static final int TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED = 65536; // 0x10000
+ field public static final int TYPE_VIEW_CLICKED = 1; // 0x1
+ field public static final int TYPE_VIEW_CONTEXT_CLICKED = 8388608; // 0x800000
+ field public static final int TYPE_VIEW_FOCUSED = 8; // 0x8
+ field public static final int TYPE_VIEW_HOVER_ENTER = 128; // 0x80
+ field public static final int TYPE_VIEW_HOVER_EXIT = 256; // 0x100
+ field public static final int TYPE_VIEW_LONG_CLICKED = 2; // 0x2
+ field public static final int TYPE_VIEW_SCROLLED = 4096; // 0x1000
+ field public static final int TYPE_VIEW_SELECTED = 4; // 0x4
+ field public static final int TYPE_VIEW_TEXT_CHANGED = 16; // 0x10
+ field public static final int TYPE_VIEW_TEXT_SELECTION_CHANGED = 8192; // 0x2000
+ field public static final int TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY = 131072; // 0x20000
+ field public static final int TYPE_WINDOWS_CHANGED = 4194304; // 0x400000
+ field public static final int TYPE_WINDOW_CONTENT_CHANGED = 2048; // 0x800
+ field public static final int TYPE_WINDOW_STATE_CHANGED = 32; // 0x20
+ }
+
+ public abstract interface AccessibilityEventSource {
+ method public abstract void sendAccessibilityEvent(int);
+ method public abstract void sendAccessibilityEventUnchecked(android.view.accessibility.AccessibilityEvent);
+ }
+
+ public final class AccessibilityManager {
+ method public boolean addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);
+ method public boolean addTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);
+ method public deprecated java.util.List<android.content.pm.ServiceInfo> getAccessibilityServiceList();
+ method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int);
+ method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getInstalledAccessibilityServiceList();
+ method public void interrupt();
+ method public boolean isEnabled();
+ method public boolean isTouchExplorationEnabled();
+ method public boolean removeAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);
+ method public boolean removeTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);
+ method public void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+ }
+
+ public static abstract interface AccessibilityManager.AccessibilityStateChangeListener {
+ method public abstract void onAccessibilityStateChanged(boolean);
+ }
+
+ public static abstract interface AccessibilityManager.TouchExplorationStateChangeListener {
+ method public abstract void onTouchExplorationStateChanged(boolean);
+ }
+
+ public class AccessibilityNodeInfo implements android.os.Parcelable {
+ method public void addAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction);
+ method public deprecated void addAction(int);
+ method public void addChild(android.view.View);
+ method public void addChild(android.view.View, int);
+ method public boolean canOpenPopup();
+ method public int describeContents();
+ method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String);
+ method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(java.lang.String);
+ method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+ method public android.view.accessibility.AccessibilityNodeInfo focusSearch(int);
+ method public java.util.List<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> getActionList();
+ method public deprecated int getActions();
+ method public void getBoundsInParent(android.graphics.Rect);
+ method public void getBoundsInScreen(android.graphics.Rect);
+ method public android.view.accessibility.AccessibilityNodeInfo getChild(int);
+ method public int getChildCount();
+ method public java.lang.CharSequence getClassName();
+ method public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo getCollectionInfo();
+ method public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo getCollectionItemInfo();
+ method public java.lang.CharSequence getContentDescription();
+ method public java.lang.CharSequence getError();
+ method public android.os.Bundle getExtras();
+ method public int getInputType();
+ method public android.view.accessibility.AccessibilityNodeInfo getLabelFor();
+ method public android.view.accessibility.AccessibilityNodeInfo getLabeledBy();
+ method public int getLiveRegion();
+ method public int getMaxTextLength();
+ method public int getMovementGranularities();
+ method public java.lang.CharSequence getPackageName();
+ method public android.view.accessibility.AccessibilityNodeInfo getParent();
+ method public android.view.accessibility.AccessibilityNodeInfo.RangeInfo getRangeInfo();
+ method public java.lang.CharSequence getText();
+ method public int getTextSelectionEnd();
+ method public int getTextSelectionStart();
+ method public android.view.accessibility.AccessibilityNodeInfo getTraversalAfter();
+ method public android.view.accessibility.AccessibilityNodeInfo getTraversalBefore();
+ method public java.lang.String getViewIdResourceName();
+ method public android.view.accessibility.AccessibilityWindowInfo getWindow();
+ method public int getWindowId();
+ method public boolean isAccessibilityFocused();
+ method public boolean isCheckable();
+ method public boolean isChecked();
+ method public boolean isClickable();
+ method public boolean isContentInvalid();
+ method public boolean isContextClickable();
+ method public boolean isDismissable();
+ method public boolean isEditable();
+ method public boolean isEnabled();
+ method public boolean isFocusable();
+ method public boolean isFocused();
+ method public boolean isLongClickable();
+ method public boolean isMultiLine();
+ method public boolean isPassword();
+ method public boolean isScrollable();
+ method public boolean isSelected();
+ method public boolean isVisibleToUser();
+ method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View);
+ method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int);
+ 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 boolean refresh();
+ method public deprecated void removeAction(int);
+ method public boolean removeAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction);
+ method public boolean removeChild(android.view.View);
+ method public boolean removeChild(android.view.View, int);
+ method public void setAccessibilityFocused(boolean);
+ method public void setBoundsInParent(android.graphics.Rect);
+ method public void setBoundsInScreen(android.graphics.Rect);
+ method public void setCanOpenPopup(boolean);
+ method public void setCheckable(boolean);
+ method public void setChecked(boolean);
+ method public void setClassName(java.lang.CharSequence);
+ method public void setClickable(boolean);
+ method public void setCollectionInfo(android.view.accessibility.AccessibilityNodeInfo.CollectionInfo);
+ method public void setCollectionItemInfo(android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo);
+ method public void setContentDescription(java.lang.CharSequence);
+ method public void setContentInvalid(boolean);
+ method public void setContextClickable(boolean);
+ method public void setDismissable(boolean);
+ method public void setEditable(boolean);
+ method public void setEnabled(boolean);
+ method public void setError(java.lang.CharSequence);
+ method public void setFocusable(boolean);
+ method public void setFocused(boolean);
+ method public void setInputType(int);
+ method public void setLabelFor(android.view.View);
+ method public void setLabelFor(android.view.View, int);
+ method public void setLabeledBy(android.view.View);
+ method public void setLabeledBy(android.view.View, int);
+ method public void setLiveRegion(int);
+ method public void setLongClickable(boolean);
+ method public void setMaxTextLength(int);
+ method public void setMovementGranularities(int);
+ method public void setMultiLine(boolean);
+ method public void setPackageName(java.lang.CharSequence);
+ method public void setParent(android.view.View);
+ method public void setParent(android.view.View, int);
+ method public void setPassword(boolean);
+ method public void setRangeInfo(android.view.accessibility.AccessibilityNodeInfo.RangeInfo);
+ method public void setScrollable(boolean);
+ method public void setSelected(boolean);
+ method public void setSource(android.view.View);
+ method public void setSource(android.view.View, int);
+ method public void setText(java.lang.CharSequence);
+ method public void setTextSelection(int, int);
+ method public void setTraversalAfter(android.view.View);
+ method public void setTraversalAfter(android.view.View, int);
+ method public void setTraversalBefore(android.view.View);
+ method public void setTraversalBefore(android.view.View, int);
+ method public void setViewIdResourceName(java.lang.String);
+ method public void setVisibleToUser(boolean);
+ 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_CLICK_CHARACTER_INDEX_INT = "android.view.accessibility.action.ARGUMENT_CLICK_CHARACTER_INDEX_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_CLICK_SPAN_INDEX_INT = "android.view.accessibility.action.ARGUMENT_CLICK_SPAN_INDEX_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_COLUMN_INT = "android.view.accessibility.action.ARGUMENT_COLUMN_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";
+ field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";
+ field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE";
+ field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_SELECTION_START_INT = "ACTION_ARGUMENT_SELECTION_START_INT";
+ field public static final java.lang.String ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE = "ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE";
+ 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_COLLAPSE = 524288; // 0x80000
+ field public static final int ACTION_COPY = 16384; // 0x4000
+ field public static final int ACTION_CUT = 65536; // 0x10000
+ field public static final int ACTION_DISMISS = 1048576; // 0x100000
+ field public static final int ACTION_EXPAND = 262144; // 0x40000
+ 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_MOVEMENT_GRANULARITY = 256; // 0x100
+ field public static final int ACTION_NEXT_HTML_ELEMENT = 1024; // 0x400
+ field public static final int ACTION_PASTE = 32768; // 0x8000
+ field public static final int ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY = 512; // 0x200
+ field public static final int ACTION_PREVIOUS_HTML_ELEMENT = 2048; // 0x800
+ field public static final int ACTION_SCROLL_BACKWARD = 8192; // 0x2000
+ field public static final int ACTION_SCROLL_FORWARD = 4096; // 0x1000
+ field public static final int ACTION_SELECT = 4; // 0x4
+ field public static final int ACTION_SET_SELECTION = 131072; // 0x20000
+ field public static final int ACTION_SET_TEXT = 2097152; // 0x200000
+ field public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo> CREATOR;
+ field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2
+ field public static final int FOCUS_INPUT = 1; // 0x1
+ field public static final int MOVEMENT_GRANULARITY_CHARACTER = 1; // 0x1
+ field public static final int MOVEMENT_GRANULARITY_LINE = 4; // 0x4
+ field public static final int MOVEMENT_GRANULARITY_PAGE = 16; // 0x10
+ field public static final int MOVEMENT_GRANULARITY_PARAGRAPH = 8; // 0x8
+ field public static final int MOVEMENT_GRANULARITY_WORD = 2; // 0x2
+ }
+
+ public static final class AccessibilityNodeInfo.AccessibilityAction {
+ ctor public AccessibilityNodeInfo.AccessibilityAction(int, java.lang.CharSequence);
+ method public int getId();
+ method public java.lang.CharSequence getLabel();
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_ACCESSIBILITY_FOCUS;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CLEAR_ACCESSIBILITY_FOCUS;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CLEAR_FOCUS;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CLEAR_SELECTION;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CLICK;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_COLLAPSE;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CONTEXT_CLICK;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_COPY;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CUT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_DISMISS;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_EXPAND;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_FOCUS;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_LONG_CLICK;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_AT_MOVEMENT_GRANULARITY;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_HTML_ELEMENT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PASTE;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PREVIOUS_HTML_ELEMENT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_BACKWARD;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_DOWN;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_FORWARD;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_LEFT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_RIGHT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_TO_POSITION;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_UP;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SELECT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_PROGRESS;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT;
+ field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_ON_SCREEN;
+ }
+
+ public static final class AccessibilityNodeInfo.CollectionInfo {
+ method public int getColumnCount();
+ method public int getRowCount();
+ method public int getSelectionMode();
+ method public boolean isHierarchical();
+ method public static android.view.accessibility.AccessibilityNodeInfo.CollectionInfo obtain(int, int, boolean);
+ method public static android.view.accessibility.AccessibilityNodeInfo.CollectionInfo obtain(int, int, boolean, int);
+ field public static final int SELECTION_MODE_MULTIPLE = 2; // 0x2
+ field public static final int SELECTION_MODE_NONE = 0; // 0x0
+ field public static final int SELECTION_MODE_SINGLE = 1; // 0x1
+ }
+
+ public static final class AccessibilityNodeInfo.CollectionItemInfo {
+ method public int getColumnIndex();
+ method public int getColumnSpan();
+ method public int getRowIndex();
+ method public int getRowSpan();
+ method public boolean isHeading();
+ method public boolean isSelected();
+ method public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
+ method public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
+ }
+
+ public static final class AccessibilityNodeInfo.RangeInfo {
+ method public float getCurrent();
+ method public float getMax();
+ method public float getMin();
+ method public int getType();
+ method public static android.view.accessibility.AccessibilityNodeInfo.RangeInfo obtain(int, float, float, float);
+ field public static final int RANGE_TYPE_FLOAT = 1; // 0x1
+ field public static final int RANGE_TYPE_INT = 0; // 0x0
+ field public static final int RANGE_TYPE_PERCENT = 2; // 0x2
+ }
+
+ public abstract class AccessibilityNodeProvider {
+ ctor public AccessibilityNodeProvider();
+ method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int);
+ method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String, int);
+ method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+ method public boolean performAction(int, int, android.os.Bundle);
+ field public static final int HOST_VIEW_ID = -1; // 0xffffffff
+ }
+
+ public class AccessibilityRecord {
+ method public int getAddedCount();
+ method public java.lang.CharSequence getBeforeText();
+ method public java.lang.CharSequence getClassName();
+ method public java.lang.CharSequence getContentDescription();
+ method public int getCurrentItemIndex();
+ method public int getFromIndex();
+ method public int getItemCount();
+ method public int getMaxScrollX();
+ method public int getMaxScrollY();
+ method public android.os.Parcelable getParcelableData();
+ method public int getRemovedCount();
+ method public int getScrollX();
+ method public int getScrollY();
+ method public android.view.accessibility.AccessibilityNodeInfo getSource();
+ method public java.util.List<java.lang.CharSequence> getText();
+ method public int getToIndex();
+ method public int getWindowId();
+ method public boolean isChecked();
+ method public boolean isEnabled();
+ method public boolean isFullScreen();
+ method public boolean isPassword();
+ method public boolean isScrollable();
+ method public static android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord);
+ method public static android.view.accessibility.AccessibilityRecord obtain();
+ method public void recycle();
+ method public void setAddedCount(int);
+ method public void setBeforeText(java.lang.CharSequence);
+ method public void setChecked(boolean);
+ method public void setClassName(java.lang.CharSequence);
+ method public void setContentDescription(java.lang.CharSequence);
+ method public void setCurrentItemIndex(int);
+ method public void setEnabled(boolean);
+ method public void setFromIndex(int);
+ method public void setFullScreen(boolean);
+ method public void setItemCount(int);
+ method public void setMaxScrollX(int);
+ method public void setMaxScrollY(int);
+ method public void setParcelableData(android.os.Parcelable);
+ method public void setPassword(boolean);
+ method public void setRemovedCount(int);
+ method public void setScrollX(int);
+ method public void setScrollY(int);
+ method public void setScrollable(boolean);
+ method public void setSource(android.view.View);
+ method public void setSource(android.view.View, int);
+ method public void setToIndex(int);
+ }
+
+ public final class AccessibilityWindowInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public void getBoundsInScreen(android.graphics.Rect);
+ method public android.view.accessibility.AccessibilityWindowInfo getChild(int);
+ method public int getChildCount();
+ method public int getId();
+ method public int getLayer();
+ method public android.view.accessibility.AccessibilityWindowInfo getParent();
+ method public android.view.accessibility.AccessibilityNodeInfo getRoot();
+ method public int getType();
+ method public boolean isAccessibilityFocused();
+ method public boolean isActive();
+ method public boolean isFocused();
+ method public static android.view.accessibility.AccessibilityWindowInfo obtain();
+ method public static android.view.accessibility.AccessibilityWindowInfo obtain(android.view.accessibility.AccessibilityWindowInfo);
+ method public void recycle();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityWindowInfo> CREATOR;
+ field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4
+ field public static final int TYPE_APPLICATION = 1; // 0x1
+ field public static final int TYPE_INPUT_METHOD = 2; // 0x2
+ field public static final int TYPE_SYSTEM = 3; // 0x3
+ }
+
+ public class CaptioningManager {
+ method public void addCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
+ method public final float getFontScale();
+ method public final java.util.Locale getLocale();
+ method public android.view.accessibility.CaptioningManager.CaptionStyle getUserStyle();
+ method public final boolean isEnabled();
+ method public void removeCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
+ }
+
+ public static final class CaptioningManager.CaptionStyle {
+ method public android.graphics.Typeface getTypeface();
+ method public boolean hasBackgroundColor();
+ method public boolean hasEdgeColor();
+ method public boolean hasEdgeType();
+ method public boolean hasForegroundColor();
+ method public boolean hasWindowColor();
+ field public static final int EDGE_TYPE_DEPRESSED = 4; // 0x4
+ field public static final int EDGE_TYPE_DROP_SHADOW = 2; // 0x2
+ field public static final int EDGE_TYPE_NONE = 0; // 0x0
+ field public static final int EDGE_TYPE_OUTLINE = 1; // 0x1
+ field public static final int EDGE_TYPE_RAISED = 3; // 0x3
+ field public static final int EDGE_TYPE_UNSPECIFIED = -1; // 0xffffffff
+ field public final int backgroundColor;
+ field public final int edgeColor;
+ field public final int edgeType;
+ field public final int foregroundColor;
+ field public final int windowColor;
+ }
+
+ public static abstract class CaptioningManager.CaptioningChangeListener {
+ ctor public CaptioningManager.CaptioningChangeListener();
+ method public void onEnabledChanged(boolean);
+ method public void onFontScaleChanged(float);
+ method public void onLocaleChanged(java.util.Locale);
+ method public void onUserStyleChanged(android.view.accessibility.CaptioningManager.CaptionStyle);
+ }
+
+}
+
+package android.view.animation {
+
+ public class AccelerateDecelerateInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public AccelerateDecelerateInterpolator();
+ ctor public AccelerateDecelerateInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class AccelerateInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public AccelerateInterpolator();
+ ctor public AccelerateInterpolator(float);
+ ctor public AccelerateInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class AlphaAnimation extends android.view.animation.Animation {
+ ctor public AlphaAnimation(android.content.Context, android.util.AttributeSet);
+ ctor public AlphaAnimation(float, float);
+ }
+
+ public abstract class Animation implements java.lang.Cloneable {
+ ctor public Animation();
+ ctor public Animation(android.content.Context, android.util.AttributeSet);
+ method protected void applyTransformation(float, android.view.animation.Transformation);
+ method public void cancel();
+ method public long computeDurationHint();
+ method protected void ensureInterpolator();
+ method public int getBackgroundColor();
+ method public boolean getDetachWallpaper();
+ method public long getDuration();
+ method public boolean getFillAfter();
+ method public boolean getFillBefore();
+ method public android.view.animation.Interpolator getInterpolator();
+ method public int getRepeatCount();
+ method public int getRepeatMode();
+ method protected float getScaleFactor();
+ method public long getStartOffset();
+ method public long getStartTime();
+ method public boolean getTransformation(long, android.view.animation.Transformation);
+ method public boolean getTransformation(long, android.view.animation.Transformation, float);
+ method public int getZAdjustment();
+ method public boolean hasEnded();
+ method public boolean hasStarted();
+ method public void initialize(int, int, int, int);
+ method public boolean isFillEnabled();
+ method public boolean isInitialized();
+ method public void reset();
+ method protected float resolveSize(int, float, int, int);
+ method public void restrictDuration(long);
+ method public void scaleCurrentDuration(float);
+ method public void setAnimationListener(android.view.animation.Animation.AnimationListener);
+ method public void setBackgroundColor(int);
+ method public void setDetachWallpaper(boolean);
+ method public void setDuration(long);
+ method public void setFillAfter(boolean);
+ method public void setFillBefore(boolean);
+ method public void setFillEnabled(boolean);
+ method public void setInterpolator(android.content.Context, int);
+ method public void setInterpolator(android.view.animation.Interpolator);
+ method public void setRepeatCount(int);
+ method public void setRepeatMode(int);
+ method public void setStartOffset(long);
+ method public void setStartTime(long);
+ method public void setZAdjustment(int);
+ method public void start();
+ method public void startNow();
+ method public boolean willChangeBounds();
+ method public boolean willChangeTransformationMatrix();
+ field public static final int ABSOLUTE = 0; // 0x0
+ field public static final int INFINITE = -1; // 0xffffffff
+ field public static final int RELATIVE_TO_PARENT = 2; // 0x2
+ field public static final int RELATIVE_TO_SELF = 1; // 0x1
+ field public static final int RESTART = 1; // 0x1
+ field public static final int REVERSE = 2; // 0x2
+ field public static final int START_ON_FIRST_FRAME = -1; // 0xffffffff
+ field public static final int ZORDER_BOTTOM = -1; // 0xffffffff
+ field public static final int ZORDER_NORMAL = 0; // 0x0
+ field public static final int ZORDER_TOP = 1; // 0x1
+ }
+
+ public static abstract interface Animation.AnimationListener {
+ method public abstract void onAnimationEnd(android.view.animation.Animation);
+ method public abstract void onAnimationRepeat(android.view.animation.Animation);
+ method public abstract void onAnimationStart(android.view.animation.Animation);
+ }
+
+ protected static class Animation.Description {
+ ctor protected Animation.Description();
+ field public int type;
+ field public float value;
+ }
+
+ public class AnimationSet extends android.view.animation.Animation {
+ ctor public AnimationSet(android.content.Context, android.util.AttributeSet);
+ ctor public AnimationSet(boolean);
+ method public void addAnimation(android.view.animation.Animation);
+ method public java.util.List<android.view.animation.Animation> getAnimations();
+ }
+
+ public class AnimationUtils {
+ ctor public AnimationUtils();
+ method public static long currentAnimationTimeMillis();
+ method public static android.view.animation.Animation loadAnimation(android.content.Context, int) throws android.content.res.Resources.NotFoundException;
+ method public static android.view.animation.Interpolator loadInterpolator(android.content.Context, int) throws android.content.res.Resources.NotFoundException;
+ method public static android.view.animation.LayoutAnimationController loadLayoutAnimation(android.content.Context, int) throws android.content.res.Resources.NotFoundException;
+ method public static android.view.animation.Animation makeInAnimation(android.content.Context, boolean);
+ method public static android.view.animation.Animation makeInChildBottomAnimation(android.content.Context);
+ method public static android.view.animation.Animation makeOutAnimation(android.content.Context, boolean);
+ }
+
+ public class AnticipateInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public AnticipateInterpolator();
+ ctor public AnticipateInterpolator(float);
+ ctor public AnticipateInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class AnticipateOvershootInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public AnticipateOvershootInterpolator();
+ ctor public AnticipateOvershootInterpolator(float);
+ ctor public AnticipateOvershootInterpolator(float, float);
+ ctor public AnticipateOvershootInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public abstract class BaseInterpolator implements android.view.animation.Interpolator {
+ ctor public BaseInterpolator();
+ }
+
+ public class BounceInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public BounceInterpolator();
+ ctor public BounceInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class CycleInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public CycleInterpolator(float);
+ ctor public CycleInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class DecelerateInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public DecelerateInterpolator();
+ ctor public DecelerateInterpolator(float);
+ ctor public DecelerateInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class GridLayoutAnimationController extends android.view.animation.LayoutAnimationController {
+ ctor public GridLayoutAnimationController(android.content.Context, android.util.AttributeSet);
+ ctor public GridLayoutAnimationController(android.view.animation.Animation);
+ ctor public GridLayoutAnimationController(android.view.animation.Animation, float, float);
+ method public float getColumnDelay();
+ method public int getDirection();
+ method public int getDirectionPriority();
+ method public float getRowDelay();
+ method public void setColumnDelay(float);
+ method public void setDirection(int);
+ method public void setDirectionPriority(int);
+ method public void setRowDelay(float);
+ field public static final int DIRECTION_BOTTOM_TO_TOP = 2; // 0x2
+ field public static final int DIRECTION_HORIZONTAL_MASK = 1; // 0x1
+ field public static final int DIRECTION_LEFT_TO_RIGHT = 0; // 0x0
+ field public static final int DIRECTION_RIGHT_TO_LEFT = 1; // 0x1
+ field public static final int DIRECTION_TOP_TO_BOTTOM = 0; // 0x0
+ field public static final int DIRECTION_VERTICAL_MASK = 2; // 0x2
+ field public static final int PRIORITY_COLUMN = 1; // 0x1
+ field public static final int PRIORITY_NONE = 0; // 0x0
+ field public static final int PRIORITY_ROW = 2; // 0x2
+ }
+
+ public static class GridLayoutAnimationController.AnimationParameters extends android.view.animation.LayoutAnimationController.AnimationParameters {
+ ctor public GridLayoutAnimationController.AnimationParameters();
+ field public int column;
+ field public int columnsCount;
+ field public int row;
+ field public int rowsCount;
+ }
+
+ public abstract interface Interpolator implements android.animation.TimeInterpolator {
+ }
+
+ public class LayoutAnimationController {
+ ctor public LayoutAnimationController(android.content.Context, android.util.AttributeSet);
+ ctor public LayoutAnimationController(android.view.animation.Animation);
+ ctor public LayoutAnimationController(android.view.animation.Animation, float);
+ method public android.view.animation.Animation getAnimation();
+ method public final android.view.animation.Animation getAnimationForView(android.view.View);
+ method public float getDelay();
+ method protected long getDelayForView(android.view.View);
+ method public android.view.animation.Interpolator getInterpolator();
+ method public int getOrder();
+ method protected int getTransformedIndex(android.view.animation.LayoutAnimationController.AnimationParameters);
+ method public boolean isDone();
+ method public void setAnimation(android.content.Context, int);
+ method public void setAnimation(android.view.animation.Animation);
+ method public void setDelay(float);
+ method public void setInterpolator(android.content.Context, int);
+ method public void setInterpolator(android.view.animation.Interpolator);
+ method public void setOrder(int);
+ method public void start();
+ method public boolean willOverlap();
+ field public static final int ORDER_NORMAL = 0; // 0x0
+ field public static final int ORDER_RANDOM = 2; // 0x2
+ field public static final int ORDER_REVERSE = 1; // 0x1
+ field protected android.view.animation.Animation mAnimation;
+ field protected android.view.animation.Interpolator mInterpolator;
+ field protected java.util.Random mRandomizer;
+ }
+
+ public static class LayoutAnimationController.AnimationParameters {
+ ctor public LayoutAnimationController.AnimationParameters();
+ field public int count;
+ field public int index;
+ }
+
+ public class LinearInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public LinearInterpolator();
+ ctor public LinearInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class OvershootInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public OvershootInterpolator();
+ ctor public OvershootInterpolator(float);
+ ctor public OvershootInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class PathInterpolator extends android.view.animation.BaseInterpolator {
+ ctor public PathInterpolator(android.graphics.Path);
+ ctor public PathInterpolator(float, float);
+ ctor public PathInterpolator(float, float, float, float);
+ ctor public PathInterpolator(android.content.Context, android.util.AttributeSet);
+ method public float getInterpolation(float);
+ }
+
+ public class RotateAnimation extends android.view.animation.Animation {
+ ctor public RotateAnimation(android.content.Context, android.util.AttributeSet);
+ ctor public RotateAnimation(float, float);
+ ctor public RotateAnimation(float, float, float, float);
+ ctor public RotateAnimation(float, float, int, float, int, float);
+ }
+
+ public class ScaleAnimation extends android.view.animation.Animation {
+ ctor public ScaleAnimation(android.content.Context, android.util.AttributeSet);
+ ctor public ScaleAnimation(float, float, float, float);
+ ctor public ScaleAnimation(float, float, float, float, float, float);
+ ctor public ScaleAnimation(float, float, float, float, int, float, int, float);
+ }
+
+ public class Transformation {
+ ctor public Transformation();
+ method public void clear();
+ method public void compose(android.view.animation.Transformation);
+ method public float getAlpha();
+ method public android.graphics.Matrix getMatrix();
+ method public int getTransformationType();
+ method public void set(android.view.animation.Transformation);
+ method public void setAlpha(float);
+ method public void setTransformationType(int);
+ method public java.lang.String toShortString();
+ field public static final int TYPE_ALPHA = 1; // 0x1
+ field public static final int TYPE_BOTH = 3; // 0x3
+ field public static final int TYPE_IDENTITY = 0; // 0x0
+ field public static final int TYPE_MATRIX = 2; // 0x2
+ field protected float mAlpha;
+ field protected android.graphics.Matrix mMatrix;
+ field protected int mTransformationType;
+ }
+
+ public class TranslateAnimation extends android.view.animation.Animation {
+ ctor public TranslateAnimation(android.content.Context, android.util.AttributeSet);
+ ctor public TranslateAnimation(float, float, float, float);
+ ctor public TranslateAnimation(int, float, int, float, int, float, int, float);
+ }
+
+}
+
+package android.view.inputmethod {
+
+ public class BaseInputConnection implements android.view.inputmethod.InputConnection {
+ ctor public BaseInputConnection(android.view.View, boolean);
+ method public boolean beginBatchEdit();
+ method public boolean clearMetaKeyStates(int);
+ method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
+ method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
+ method public boolean commitText(java.lang.CharSequence, int);
+ method public boolean deleteSurroundingText(int, int);
+ method public boolean endBatchEdit();
+ method public boolean finishComposingText();
+ method public static int getComposingSpanEnd(android.text.Spannable);
+ method public static int getComposingSpanStart(android.text.Spannable);
+ method public int getCursorCapsMode(int);
+ method public android.text.Editable getEditable();
+ method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);
+ method public java.lang.CharSequence getSelectedText(int);
+ method public java.lang.CharSequence getTextAfterCursor(int, int);
+ method public java.lang.CharSequence getTextBeforeCursor(int, int);
+ method public boolean performContextMenuAction(int);
+ method public boolean performEditorAction(int);
+ method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);
+ method public static final void removeComposingSpans(android.text.Spannable);
+ method public boolean reportFullscreenMode(boolean);
+ method public boolean requestCursorUpdates(int);
+ method public boolean sendKeyEvent(android.view.KeyEvent);
+ method public boolean setComposingRegion(int, int);
+ method public static void setComposingSpans(android.text.Spannable);
+ method public boolean setComposingText(java.lang.CharSequence, int);
+ method public boolean setSelection(int, int);
+ }
+
+ public final class CompletionInfo implements android.os.Parcelable {
+ ctor public CompletionInfo(long, int, java.lang.CharSequence);
+ ctor public CompletionInfo(long, int, java.lang.CharSequence, java.lang.CharSequence);
+ method public int describeContents();
+ method public long getId();
+ method public java.lang.CharSequence getLabel();
+ method public int getPosition();
+ method public java.lang.CharSequence getText();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.CompletionInfo> CREATOR;
+ }
+
+ public final class CorrectionInfo implements android.os.Parcelable {
+ ctor public CorrectionInfo(int, java.lang.CharSequence, java.lang.CharSequence);
+ method public int describeContents();
+ method public java.lang.CharSequence getNewText();
+ method public int getOffset();
+ method public java.lang.CharSequence getOldText();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.CorrectionInfo> CREATOR;
+ }
+
+ public final class CursorAnchorInfo implements android.os.Parcelable {
+ ctor public CursorAnchorInfo(android.os.Parcel);
+ method public int describeContents();
+ method public android.graphics.RectF getCharacterBounds(int);
+ method public int getCharacterBoundsFlags(int);
+ method public java.lang.CharSequence getComposingText();
+ method public int getComposingTextStart();
+ method public float getInsertionMarkerBaseline();
+ method public float getInsertionMarkerBottom();
+ method public int getInsertionMarkerFlags();
+ method public float getInsertionMarkerHorizontal();
+ method public float getInsertionMarkerTop();
+ method public android.graphics.Matrix getMatrix();
+ method public int getSelectionEnd();
+ method public int getSelectionStart();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.CursorAnchorInfo> CREATOR;
+ field public static final int FLAG_HAS_INVISIBLE_REGION = 2; // 0x2
+ field public static final int FLAG_HAS_VISIBLE_REGION = 1; // 0x1
+ field public static final int FLAG_IS_RTL = 4; // 0x4
+ }
+
+ public static final class CursorAnchorInfo.Builder {
+ ctor public CursorAnchorInfo.Builder();
+ method public android.view.inputmethod.CursorAnchorInfo.Builder addCharacterBounds(int, float, float, float, float, int);
+ method public android.view.inputmethod.CursorAnchorInfo build();
+ method public void reset();
+ method public android.view.inputmethod.CursorAnchorInfo.Builder setComposingText(int, java.lang.CharSequence);
+ method public android.view.inputmethod.CursorAnchorInfo.Builder setInsertionMarkerLocation(float, float, float, float, int);
+ method public android.view.inputmethod.CursorAnchorInfo.Builder setMatrix(android.graphics.Matrix);
+ method public android.view.inputmethod.CursorAnchorInfo.Builder setSelectionRange(int, int);
+ }
+
+ public class EditorInfo implements android.text.InputType android.os.Parcelable {
+ ctor public EditorInfo();
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public final void makeCompatible(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.EditorInfo> CREATOR;
+ field public static final int IME_ACTION_DONE = 6; // 0x6
+ field public static final int IME_ACTION_GO = 2; // 0x2
+ field public static final int IME_ACTION_NEXT = 5; // 0x5
+ field public static final int IME_ACTION_NONE = 1; // 0x1
+ field public static final int IME_ACTION_PREVIOUS = 7; // 0x7
+ field public static final int IME_ACTION_SEARCH = 3; // 0x3
+ field public static final int IME_ACTION_SEND = 4; // 0x4
+ field public static final int IME_ACTION_UNSPECIFIED = 0; // 0x0
+ field public static final int IME_FLAG_FORCE_ASCII = -2147483648; // 0x80000000
+ field public static final int IME_FLAG_NAVIGATE_NEXT = 134217728; // 0x8000000
+ field public static final int IME_FLAG_NAVIGATE_PREVIOUS = 67108864; // 0x4000000
+ field public static final int IME_FLAG_NO_ACCESSORY_ACTION = 536870912; // 0x20000000
+ field public static final int IME_FLAG_NO_ENTER_ACTION = 1073741824; // 0x40000000
+ field public static final int IME_FLAG_NO_EXTRACT_UI = 268435456; // 0x10000000
+ field public static final int IME_FLAG_NO_FULLSCREEN = 33554432; // 0x2000000
+ field public static final int IME_MASK_ACTION = 255; // 0xff
+ field public static final int IME_NULL = 0; // 0x0
+ field public int actionId;
+ field public java.lang.CharSequence actionLabel;
+ field public android.os.Bundle extras;
+ field public int fieldId;
+ field public java.lang.String fieldName;
+ field public java.lang.CharSequence hintText;
+ field public int imeOptions;
+ field public int initialCapsMode;
+ field public int initialSelEnd;
+ field public int initialSelStart;
+ field public int inputType;
+ field public java.lang.CharSequence label;
+ field public java.lang.String packageName;
+ field public java.lang.String privateImeOptions;
+ }
+
+ public class ExtractedText implements android.os.Parcelable {
+ ctor public ExtractedText();
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.ExtractedText> CREATOR;
+ field public static final int FLAG_SELECTING = 2; // 0x2
+ field public static final int FLAG_SINGLE_LINE = 1; // 0x1
+ field public int flags;
+ field public int partialEndOffset;
+ field public int partialStartOffset;
+ field public int selectionEnd;
+ field public int selectionStart;
+ field public int startOffset;
+ field public java.lang.CharSequence text;
+ }
+
+ public class ExtractedTextRequest implements android.os.Parcelable {
+ ctor public ExtractedTextRequest();
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.ExtractedTextRequest> CREATOR;
+ field public int flags;
+ field public int hintMaxChars;
+ field public int hintMaxLines;
+ field public int token;
+ }
+
+ public final class InputBinding implements android.os.Parcelable {
+ ctor public InputBinding(android.view.inputmethod.InputConnection, android.os.IBinder, int, int);
+ ctor public InputBinding(android.view.inputmethod.InputConnection, android.view.inputmethod.InputBinding);
+ method public int describeContents();
+ method public android.view.inputmethod.InputConnection getConnection();
+ method public android.os.IBinder getConnectionToken();
+ method public int getPid();
+ method public int getUid();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.InputBinding> CREATOR;
+ }
+
+ public abstract interface InputConnection {
+ method public abstract boolean beginBatchEdit();
+ method public abstract boolean clearMetaKeyStates(int);
+ method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
+ method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
+ method public abstract boolean commitText(java.lang.CharSequence, int);
+ method public abstract boolean deleteSurroundingText(int, int);
+ method public abstract boolean endBatchEdit();
+ method public abstract boolean finishComposingText();
+ method public abstract int getCursorCapsMode(int);
+ method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);
+ method public abstract java.lang.CharSequence getSelectedText(int);
+ method public abstract java.lang.CharSequence getTextAfterCursor(int, int);
+ method public abstract java.lang.CharSequence getTextBeforeCursor(int, int);
+ method public abstract boolean performContextMenuAction(int);
+ method public abstract boolean performEditorAction(int);
+ method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);
+ method public abstract boolean reportFullscreenMode(boolean);
+ method public abstract boolean requestCursorUpdates(int);
+ method public abstract boolean sendKeyEvent(android.view.KeyEvent);
+ method public abstract boolean setComposingRegion(int, int);
+ method public abstract boolean setComposingText(java.lang.CharSequence, int);
+ method public abstract boolean setSelection(int, int);
+ field public static final int CURSOR_UPDATE_IMMEDIATE = 1; // 0x1
+ field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
+ field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
+ field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
+ }
+
+ public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
+ ctor public InputConnectionWrapper(android.view.inputmethod.InputConnection, boolean);
+ method public boolean beginBatchEdit();
+ method public boolean clearMetaKeyStates(int);
+ method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
+ method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
+ method public boolean commitText(java.lang.CharSequence, int);
+ method public boolean deleteSurroundingText(int, int);
+ method public boolean endBatchEdit();
+ method public boolean finishComposingText();
+ method public int getCursorCapsMode(int);
+ method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);
+ method public java.lang.CharSequence getSelectedText(int);
+ method public java.lang.CharSequence getTextAfterCursor(int, int);
+ method public java.lang.CharSequence getTextBeforeCursor(int, int);
+ method public boolean performContextMenuAction(int);
+ method public boolean performEditorAction(int);
+ method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);
+ method public boolean reportFullscreenMode(boolean);
+ method public boolean requestCursorUpdates(int);
+ method public boolean sendKeyEvent(android.view.KeyEvent);
+ method public boolean setComposingRegion(int, int);
+ method public boolean setComposingText(java.lang.CharSequence, int);
+ method public boolean setSelection(int, int);
+ method public void setTarget(android.view.inputmethod.InputConnection);
+ }
+
+ public abstract interface InputMethod {
+ method public abstract void attachToken(android.os.IBinder);
+ method public abstract void bindInput(android.view.inputmethod.InputBinding);
+ method public abstract void changeInputMethodSubtype(android.view.inputmethod.InputMethodSubtype);
+ method public abstract void createSession(android.view.inputmethod.InputMethod.SessionCallback);
+ method public abstract void hideSoftInput(int, android.os.ResultReceiver);
+ method public abstract void restartInput(android.view.inputmethod.InputConnection, android.view.inputmethod.EditorInfo);
+ method public abstract void revokeSession(android.view.inputmethod.InputMethodSession);
+ method public abstract void setSessionEnabled(android.view.inputmethod.InputMethodSession, boolean);
+ method public abstract void showSoftInput(int, android.os.ResultReceiver);
+ method public abstract void startInput(android.view.inputmethod.InputConnection, android.view.inputmethod.EditorInfo);
+ method public abstract void unbindInput();
+ field public static final java.lang.String SERVICE_INTERFACE = "android.view.InputMethod";
+ field public static final java.lang.String SERVICE_META_DATA = "android.view.im";
+ field public static final int SHOW_EXPLICIT = 1; // 0x1
+ field public static final int SHOW_FORCED = 2; // 0x2
+ }
+
+ public static abstract interface InputMethod.SessionCallback {
+ method public abstract void sessionCreated(android.view.inputmethod.InputMethodSession);
+ }
+
+ public final class InputMethodInfo implements android.os.Parcelable {
+ ctor public InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ ctor public InputMethodInfo(java.lang.String, java.lang.String, java.lang.CharSequence, java.lang.String);
+ method public int describeContents();
+ method public void dump(android.util.Printer, java.lang.String);
+ method public android.content.ComponentName getComponent();
+ method public java.lang.String getId();
+ method public int getIsDefaultResourceId();
+ method public java.lang.String getPackageName();
+ method public android.content.pm.ServiceInfo getServiceInfo();
+ method public java.lang.String getServiceName();
+ method public java.lang.String getSettingsActivity();
+ method public android.view.inputmethod.InputMethodSubtype getSubtypeAt(int);
+ method public int getSubtypeCount();
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.InputMethodInfo> CREATOR;
+ }
+
+ public final class InputMethodManager {
+ method public void displayCompletions(android.view.View, android.view.inputmethod.CompletionInfo[]);
+ method public android.view.inputmethod.InputMethodSubtype getCurrentInputMethodSubtype();
+ method public java.util.List<android.view.inputmethod.InputMethodInfo> getEnabledInputMethodList();
+ method public java.util.List<android.view.inputmethod.InputMethodSubtype> getEnabledInputMethodSubtypeList(android.view.inputmethod.InputMethodInfo, boolean);
+ method public java.util.List<android.view.inputmethod.InputMethodInfo> getInputMethodList();
+ method public android.view.inputmethod.InputMethodSubtype getLastInputMethodSubtype();
+ method public java.util.Map<android.view.inputmethod.InputMethodInfo, java.util.List<android.view.inputmethod.InputMethodSubtype>> getShortcutInputMethodsAndSubtypes();
+ method public void hideSoftInputFromInputMethod(android.os.IBinder, int);
+ method public boolean hideSoftInputFromWindow(android.os.IBinder, int);
+ method public boolean hideSoftInputFromWindow(android.os.IBinder, int, android.os.ResultReceiver);
+ method public void hideStatusIcon(android.os.IBinder);
+ method public boolean isAcceptingText();
+ method public boolean isActive(android.view.View);
+ method public boolean isActive();
+ method public boolean isFullscreenMode();
+ method public deprecated boolean isWatchingCursor(android.view.View);
+ method public void restartInput(android.view.View);
+ method public void sendAppPrivateCommand(android.view.View, java.lang.String, android.os.Bundle);
+ method public void setAdditionalInputMethodSubtypes(java.lang.String, android.view.inputmethod.InputMethodSubtype[]);
+ method public boolean setCurrentInputMethodSubtype(android.view.inputmethod.InputMethodSubtype);
+ method public void setInputMethod(android.os.IBinder, java.lang.String);
+ method public void setInputMethodAndSubtype(android.os.IBinder, java.lang.String, android.view.inputmethod.InputMethodSubtype);
+ method public boolean shouldOfferSwitchingToNextInputMethod(android.os.IBinder);
+ method public void showInputMethodAndSubtypeEnabler(java.lang.String);
+ method public void showInputMethodPicker();
+ method public boolean showSoftInput(android.view.View, int);
+ method public boolean showSoftInput(android.view.View, int, android.os.ResultReceiver);
+ method public void showSoftInputFromInputMethod(android.os.IBinder, int);
+ method public void showStatusIcon(android.os.IBinder, java.lang.String, int);
+ method public boolean switchToLastInputMethod(android.os.IBinder);
+ method public boolean switchToNextInputMethod(android.os.IBinder, boolean);
+ method public void toggleSoftInput(int, int);
+ method public void toggleSoftInputFromWindow(android.os.IBinder, int, int);
+ method public deprecated void updateCursor(android.view.View, int, int, int, int);
+ method public void updateCursorAnchorInfo(android.view.View, android.view.inputmethod.CursorAnchorInfo);
+ method public void updateExtractedText(android.view.View, int, android.view.inputmethod.ExtractedText);
+ method public void updateSelection(android.view.View, int, int, int, int);
+ method public void viewClicked(android.view.View);
+ field public static final int HIDE_IMPLICIT_ONLY = 1; // 0x1
+ field public static final int HIDE_NOT_ALWAYS = 2; // 0x2
+ field public static final int RESULT_HIDDEN = 3; // 0x3
+ field public static final int RESULT_SHOWN = 2; // 0x2
+ field public static final int RESULT_UNCHANGED_HIDDEN = 1; // 0x1
+ field public static final int RESULT_UNCHANGED_SHOWN = 0; // 0x0
+ field public static final int SHOW_FORCED = 2; // 0x2
+ field public static final int SHOW_IMPLICIT = 1; // 0x1
+ }
+
+ public abstract interface InputMethodSession {
+ method public abstract void appPrivateCommand(java.lang.String, android.os.Bundle);
+ method public abstract void dispatchGenericMotionEvent(int, android.view.MotionEvent, android.view.inputmethod.InputMethodSession.EventCallback);
+ method public abstract void dispatchKeyEvent(int, android.view.KeyEvent, android.view.inputmethod.InputMethodSession.EventCallback);
+ method public abstract void dispatchTrackballEvent(int, android.view.MotionEvent, android.view.inputmethod.InputMethodSession.EventCallback);
+ method public abstract void displayCompletions(android.view.inputmethod.CompletionInfo[]);
+ method public abstract void finishInput();
+ method public abstract void toggleSoftInput(int, int);
+ method public abstract void updateCursor(android.graphics.Rect);
+ method public abstract void updateCursorAnchorInfo(android.view.inputmethod.CursorAnchorInfo);
+ method public abstract void updateExtractedText(int, android.view.inputmethod.ExtractedText);
+ method public abstract void updateSelection(int, int, int, int, int, int);
+ method public abstract void viewClicked(boolean);
+ }
+
+ public static abstract interface InputMethodSession.EventCallback {
+ method public abstract void finishedEvent(int, boolean);
+ }
+
+ public final class InputMethodSubtype implements android.os.Parcelable {
+ ctor public deprecated InputMethodSubtype(int, int, java.lang.String, java.lang.String, java.lang.String, boolean, boolean);
+ ctor public deprecated InputMethodSubtype(int, int, java.lang.String, java.lang.String, java.lang.String, boolean, boolean, int);
+ method public boolean containsExtraValueKey(java.lang.String);
+ method public int describeContents();
+ method public java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo);
+ method public java.lang.String getExtraValue();
+ method public java.lang.String getExtraValueOf(java.lang.String);
+ method public int getIconResId();
+ method public java.lang.String getLocale();
+ method public java.lang.String getMode();
+ method public int getNameResId();
+ method public boolean isAsciiCapable();
+ method public boolean isAuxiliary();
+ method public boolean overridesImplicitlyEnabledSubtype();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.inputmethod.InputMethodSubtype> CREATOR;
+ }
+
+ public static class InputMethodSubtype.InputMethodSubtypeBuilder {
+ ctor public InputMethodSubtype.InputMethodSubtypeBuilder();
+ method public android.view.inputmethod.InputMethodSubtype build();
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setIsAsciiCapable(boolean);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setIsAuxiliary(boolean);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setOverridesImplicitlyEnabledSubtype(boolean);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeExtraValue(java.lang.String);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeIconResId(int);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeId(int);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeLocale(java.lang.String);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeMode(java.lang.String);
+ method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeNameResId(int);
+ }
+
+}
+
+package android.view.textservice {
+
+ public final class SentenceSuggestionsInfo implements android.os.Parcelable {
+ ctor public SentenceSuggestionsInfo(android.view.textservice.SuggestionsInfo[], int[], int[]);
+ ctor public SentenceSuggestionsInfo(android.os.Parcel);
+ method public int describeContents();
+ method public int getLengthAt(int);
+ method public int getOffsetAt(int);
+ method public int getSuggestionsCount();
+ method public android.view.textservice.SuggestionsInfo getSuggestionsInfoAt(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.textservice.SentenceSuggestionsInfo> CREATOR;
+ }
+
+ public final class SpellCheckerInfo implements android.os.Parcelable {
+ method public int describeContents();
+ method public android.content.ComponentName getComponent();
+ method public java.lang.String getId();
+ method public java.lang.String getPackageName();
+ method public android.content.pm.ServiceInfo getServiceInfo();
+ method public java.lang.String getSettingsActivity();
+ method public android.view.textservice.SpellCheckerSubtype getSubtypeAt(int);
+ method public int getSubtypeCount();
+ method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
+ method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.textservice.SpellCheckerInfo> CREATOR;
+ }
+
+ public class SpellCheckerSession {
+ method public void cancel();
+ method public void close();
+ method public void getSentenceSuggestions(android.view.textservice.TextInfo[], int);
+ method public android.view.textservice.SpellCheckerInfo getSpellChecker();
+ method public deprecated void getSuggestions(android.view.textservice.TextInfo, int);
+ method public deprecated void getSuggestions(android.view.textservice.TextInfo[], int, boolean);
+ method public boolean isSessionDisconnected();
+ field public static final java.lang.String SERVICE_META_DATA = "android.view.textservice.scs";
+ }
+
+ public static abstract interface SpellCheckerSession.SpellCheckerSessionListener {
+ method public abstract void onGetSentenceSuggestions(android.view.textservice.SentenceSuggestionsInfo[]);
+ method public abstract void onGetSuggestions(android.view.textservice.SuggestionsInfo[]);
+ }
+
+ public final class SpellCheckerSubtype implements android.os.Parcelable {
+ ctor public SpellCheckerSubtype(int, java.lang.String, java.lang.String);
+ method public boolean containsExtraValueKey(java.lang.String);
+ method public int describeContents();
+ method public java.lang.CharSequence getDisplayName(android.content.Context, java.lang.String, android.content.pm.ApplicationInfo);
+ method public java.lang.String getExtraValue();
+ method public java.lang.String getExtraValueOf(java.lang.String);
+ method public java.lang.String getLocale();
+ method public int getNameResId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.textservice.SpellCheckerSubtype> CREATOR;
+ }
+
+ public final class SuggestionsInfo implements android.os.Parcelable {
+ ctor public SuggestionsInfo(int, java.lang.String[]);
+ ctor public SuggestionsInfo(int, java.lang.String[], int, int);
+ ctor public SuggestionsInfo(android.os.Parcel);
+ method public int describeContents();
+ method public int getCookie();
+ method public int getSequence();
+ method public java.lang.String getSuggestionAt(int);
+ method public int getSuggestionsAttributes();
+ method public int getSuggestionsCount();
+ method public void setCookieAndSequence(int, int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.textservice.SuggestionsInfo> CREATOR;
+ field public static final int RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS = 4; // 0x4
+ field public static final int RESULT_ATTR_IN_THE_DICTIONARY = 1; // 0x1
+ field public static final int RESULT_ATTR_LOOKS_LIKE_TYPO = 2; // 0x2
+ }
+
+ public final class TextInfo implements android.os.Parcelable {
+ ctor public TextInfo(java.lang.String);
+ ctor public TextInfo(java.lang.String, int, int);
+ ctor public TextInfo(java.lang.CharSequence, int, int, int, int);
+ ctor public TextInfo(android.os.Parcel);
+ method public int describeContents();
+ method public java.lang.CharSequence getCharSequence();
+ method public int getCookie();
+ method public int getSequence();
+ method public java.lang.String getText();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.textservice.TextInfo> CREATOR;
+ }
+
+ public final class TextServicesManager {
+ method public android.view.textservice.SpellCheckerSession newSpellCheckerSession(android.os.Bundle, java.util.Locale, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean);
+ }
+
+}
+
+package android.webkit {
+
+ public abstract class ClientCertRequest {
+ ctor public ClientCertRequest();
+ method public abstract void cancel();
+ method public abstract java.lang.String getHost();
+ method public abstract java.lang.String[] getKeyTypes();
+ method public abstract int getPort();
+ method public abstract java.security.Principal[] getPrincipals();
+ method public abstract void ignore();
+ method public abstract void proceed(java.security.PrivateKey, java.security.cert.X509Certificate[]);
+ }
+
+ public class ConsoleMessage {
+ ctor public ConsoleMessage(java.lang.String, java.lang.String, int, android.webkit.ConsoleMessage.MessageLevel);
+ method public int lineNumber();
+ method public java.lang.String message();
+ method public android.webkit.ConsoleMessage.MessageLevel messageLevel();
+ method public java.lang.String sourceId();
+ }
+
+ public static final class ConsoleMessage.MessageLevel extends java.lang.Enum {
+ method public static android.webkit.ConsoleMessage.MessageLevel valueOf(java.lang.String);
+ method public static final android.webkit.ConsoleMessage.MessageLevel[] values();
+ enum_constant public static final android.webkit.ConsoleMessage.MessageLevel DEBUG;
+ enum_constant public static final android.webkit.ConsoleMessage.MessageLevel ERROR;
+ enum_constant public static final android.webkit.ConsoleMessage.MessageLevel LOG;
+ enum_constant public static final android.webkit.ConsoleMessage.MessageLevel TIP;
+ enum_constant public static final android.webkit.ConsoleMessage.MessageLevel WARNING;
+ }
+
+ public abstract class CookieManager {
+ ctor public CookieManager();
+ method public abstract boolean acceptCookie();
+ method public abstract boolean acceptThirdPartyCookies(android.webkit.WebView);
+ method public static boolean allowFileSchemeCookies();
+ method public abstract void flush();
+ method public abstract java.lang.String getCookie(java.lang.String);
+ method public static synchronized android.webkit.CookieManager getInstance();
+ method public abstract boolean hasCookies();
+ method public abstract deprecated void removeAllCookie();
+ method public abstract void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>);
+ method public abstract deprecated void removeExpiredCookie();
+ method public abstract deprecated void removeSessionCookie();
+ method public abstract void removeSessionCookies(android.webkit.ValueCallback<java.lang.Boolean>);
+ method public abstract void setAcceptCookie(boolean);
+ method public static void setAcceptFileSchemeCookies(boolean);
+ method public abstract void setAcceptThirdPartyCookies(android.webkit.WebView, boolean);
+ method public abstract void setCookie(java.lang.String, java.lang.String);
+ method public abstract void setCookie(java.lang.String, java.lang.String, android.webkit.ValueCallback<java.lang.Boolean>);
+ }
+
+ public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager {
+ method public static synchronized android.webkit.CookieSyncManager createInstance(android.content.Context);
+ method public static synchronized android.webkit.CookieSyncManager getInstance();
+ method protected deprecated void syncFromRamToFlash();
+ field protected static final java.lang.String LOGTAG = "websync";
+ field protected android.webkit.WebViewDatabase mDataBase;
+ field protected android.os.Handler mHandler;
+ }
+
+ public class DateSorter {
+ ctor public DateSorter(android.content.Context);
+ method public long getBoundary(int);
+ method public int getIndex(long);
+ method public java.lang.String getLabel(int);
+ field public static final int DAY_COUNT = 5; // 0x5
+ }
+
+ public abstract interface DownloadListener {
+ method public abstract void onDownloadStart(java.lang.String, java.lang.String, java.lang.String, java.lang.String, long);
+ }
+
+ public class GeolocationPermissions {
+ method public void allow(java.lang.String);
+ method public void clear(java.lang.String);
+ method public void clearAll();
+ method public void getAllowed(java.lang.String, android.webkit.ValueCallback<java.lang.Boolean>);
+ method public static android.webkit.GeolocationPermissions getInstance();
+ method public void getOrigins(android.webkit.ValueCallback<java.util.Set<java.lang.String>>);
+ }
+
+ public static abstract interface GeolocationPermissions.Callback {
+ method public abstract void invoke(java.lang.String, boolean, boolean);
+ }
+
+ public class HttpAuthHandler extends android.os.Handler {
+ method public void cancel();
+ method public void proceed(java.lang.String, java.lang.String);
+ method public boolean useHttpAuthUsernamePassword();
+ }
+
+ public abstract class JavascriptInterface implements java.lang.annotation.Annotation {
+ }
+
+ public class JsPromptResult extends android.webkit.JsResult {
+ method public void confirm(java.lang.String);
+ }
+
+ public class JsResult {
+ method public final void cancel();
+ method public final void confirm();
+ }
+
+ public class MimeTypeMap {
+ method public java.lang.String getExtensionFromMimeType(java.lang.String);
+ method public static java.lang.String getFileExtensionFromUrl(java.lang.String);
+ method public java.lang.String getMimeTypeFromExtension(java.lang.String);
+ method public static android.webkit.MimeTypeMap getSingleton();
+ method public boolean hasExtension(java.lang.String);
+ method public boolean hasMimeType(java.lang.String);
+ }
+
+ public abstract class PermissionRequest {
+ ctor public PermissionRequest();
+ method public abstract void deny();
+ method public abstract android.net.Uri getOrigin();
+ method public abstract java.lang.String[] getResources();
+ method public abstract void grant(java.lang.String[]);
+ field public static final java.lang.String RESOURCE_AUDIO_CAPTURE = "android.webkit.resource.AUDIO_CAPTURE";
+ field public static final java.lang.String RESOURCE_MIDI_SYSEX = "android.webkit.resource.MIDI_SYSEX";
+ field public static final java.lang.String RESOURCE_PROTECTED_MEDIA_ID = "android.webkit.resource.PROTECTED_MEDIA_ID";
+ field public static final java.lang.String RESOURCE_VIDEO_CAPTURE = "android.webkit.resource.VIDEO_CAPTURE";
+ }
+
+ public abstract interface PluginStub {
+ method public abstract android.view.View getEmbeddedView(int, android.content.Context);
+ method public abstract android.view.View getFullScreenView(int, android.content.Context);
+ }
+
+ public class SslErrorHandler extends android.os.Handler {
+ method public void cancel();
+ method public void proceed();
+ }
+
+ public final class URLUtil {
+ ctor public URLUtil();
+ method public static java.lang.String composeSearchUrl(java.lang.String, java.lang.String, java.lang.String);
+ method public static byte[] decode(byte[]) throws java.lang.IllegalArgumentException;
+ method public static final java.lang.String guessFileName(java.lang.String, java.lang.String, java.lang.String);
+ method public static java.lang.String guessUrl(java.lang.String);
+ method public static boolean isAboutUrl(java.lang.String);
+ method public static boolean isAssetUrl(java.lang.String);
+ method public static boolean isContentUrl(java.lang.String);
+ method public static deprecated boolean isCookielessProxyUrl(java.lang.String);
+ method public static boolean isDataUrl(java.lang.String);
+ method public static boolean isFileUrl(java.lang.String);
+ method public static boolean isHttpUrl(java.lang.String);
+ method public static boolean isHttpsUrl(java.lang.String);
+ method public static boolean isJavaScriptUrl(java.lang.String);
+ method public static boolean isNetworkUrl(java.lang.String);
+ method public static boolean isValidUrl(java.lang.String);
+ method public static java.lang.String stripAnchor(java.lang.String);
+ }
+
+ public abstract interface ValueCallback {
+ method public abstract void onReceiveValue(T);
+ }
+
+ public abstract class WebBackForwardList implements java.lang.Cloneable java.io.Serializable {
+ ctor public WebBackForwardList();
+ method protected abstract android.webkit.WebBackForwardList clone();
+ method public abstract int getCurrentIndex();
+ method public abstract android.webkit.WebHistoryItem getCurrentItem();
+ method public abstract android.webkit.WebHistoryItem getItemAtIndex(int);
+ method public abstract int getSize();
+ }
+
+ public class WebChromeClient {
+ ctor public WebChromeClient();
+ method public android.graphics.Bitmap getDefaultVideoPoster();
+ method public android.view.View getVideoLoadingProgressView();
+ method public void getVisitedHistory(android.webkit.ValueCallback<java.lang.String[]>);
+ method public void onCloseWindow(android.webkit.WebView);
+ method public deprecated void onConsoleMessage(java.lang.String, int, java.lang.String);
+ method public boolean onConsoleMessage(android.webkit.ConsoleMessage);
+ method public boolean onCreateWindow(android.webkit.WebView, boolean, boolean, android.os.Message);
+ method public deprecated void onExceededDatabaseQuota(java.lang.String, java.lang.String, long, long, long, android.webkit.WebStorage.QuotaUpdater);
+ method public void onGeolocationPermissionsHidePrompt();
+ method public void onGeolocationPermissionsShowPrompt(java.lang.String, android.webkit.GeolocationPermissions.Callback);
+ method public void onHideCustomView();
+ method public boolean onJsAlert(android.webkit.WebView, java.lang.String, java.lang.String, android.webkit.JsResult);
+ method public boolean onJsBeforeUnload(android.webkit.WebView, java.lang.String, java.lang.String, android.webkit.JsResult);
+ method public boolean onJsConfirm(android.webkit.WebView, java.lang.String, java.lang.String, android.webkit.JsResult);
+ method public boolean onJsPrompt(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String, android.webkit.JsPromptResult);
+ method public deprecated boolean onJsTimeout();
+ method public void onPermissionRequest(android.webkit.PermissionRequest);
+ method public void onPermissionRequestCanceled(android.webkit.PermissionRequest);
+ method public void onProgressChanged(android.webkit.WebView, int);
+ method public deprecated void onReachedMaxAppCacheSize(long, long, android.webkit.WebStorage.QuotaUpdater);
+ method public void onReceivedIcon(android.webkit.WebView, android.graphics.Bitmap);
+ method public void onReceivedTitle(android.webkit.WebView, java.lang.String);
+ method public void onReceivedTouchIconUrl(android.webkit.WebView, java.lang.String, boolean);
+ method public void onRequestFocus(android.webkit.WebView);
+ method public void onShowCustomView(android.view.View, android.webkit.WebChromeClient.CustomViewCallback);
+ method public deprecated void onShowCustomView(android.view.View, int, android.webkit.WebChromeClient.CustomViewCallback);
+ method public boolean onShowFileChooser(android.webkit.WebView, android.webkit.ValueCallback<android.net.Uri[]>, android.webkit.WebChromeClient.FileChooserParams);
+ }
+
+ public static abstract interface WebChromeClient.CustomViewCallback {
+ method public abstract void onCustomViewHidden();
+ }
+
+ public static abstract class WebChromeClient.FileChooserParams {
+ ctor public WebChromeClient.FileChooserParams();
+ method public abstract android.content.Intent createIntent();
+ method public abstract java.lang.String[] getAcceptTypes();
+ method public abstract java.lang.String getFilenameHint();
+ method public abstract int getMode();
+ method public abstract java.lang.CharSequence getTitle();
+ method public abstract boolean isCaptureEnabled();
+ method public static android.net.Uri[] parseResult(int, android.content.Intent);
+ field public static final int MODE_OPEN = 0; // 0x0
+ field public static final int MODE_OPEN_MULTIPLE = 1; // 0x1
+ field public static final int MODE_SAVE = 3; // 0x3
+ }
+
+ public abstract class WebHistoryItem implements java.lang.Cloneable {
+ ctor public WebHistoryItem();
+ method protected abstract android.webkit.WebHistoryItem clone();
+ method public abstract android.graphics.Bitmap getFavicon();
+ method public abstract java.lang.String getOriginalUrl();
+ method public abstract java.lang.String getTitle();
+ method public abstract java.lang.String getUrl();
+ }
+
+ public abstract deprecated class WebIconDatabase {
+ ctor public WebIconDatabase();
+ method public abstract void close();
+ method public static android.webkit.WebIconDatabase getInstance();
+ method public abstract void open(java.lang.String);
+ method public abstract void releaseIconForPageUrl(java.lang.String);
+ method public abstract void removeAllIcons();
+ method public abstract void requestIconForPageUrl(java.lang.String, android.webkit.WebIconDatabase.IconListener);
+ method public abstract void retainIconForPageUrl(java.lang.String);
+ }
+
+ public static abstract deprecated interface WebIconDatabase.IconListener {
+ method public abstract void onReceivedIcon(java.lang.String, android.graphics.Bitmap);
+ }
+
+ public class WebMessage {
+ ctor public WebMessage(java.lang.String);
+ ctor public WebMessage(java.lang.String, android.webkit.WebMessagePort[]);
+ method public java.lang.String getData();
+ method public android.webkit.WebMessagePort[] getPorts();
+ }
+
+ public abstract class WebMessagePort {
+ method public abstract void close();
+ method public abstract void postMessage(android.webkit.WebMessage);
+ method public abstract void setWebMessageCallback(android.webkit.WebMessagePort.WebMessageCallback);
+ method public abstract void setWebMessageCallback(android.webkit.WebMessagePort.WebMessageCallback, android.os.Handler);
+ }
+
+ public static abstract class WebMessagePort.WebMessageCallback {
+ ctor public WebMessagePort.WebMessageCallback();
+ method public void onMessage(android.webkit.WebMessagePort, android.webkit.WebMessage);
+ }
+
+ public abstract class WebResourceError {
+ method public abstract java.lang.CharSequence getDescription();
+ method public abstract int getErrorCode();
+ }
+
+ public abstract interface WebResourceRequest {
+ method public abstract java.lang.String getMethod();
+ method public abstract java.util.Map<java.lang.String, java.lang.String> getRequestHeaders();
+ method public abstract android.net.Uri getUrl();
+ method public abstract boolean hasGesture();
+ method public abstract boolean isForMainFrame();
+ method public abstract boolean isRedirect();
+ }
+
+ public class WebResourceResponse {
+ ctor public WebResourceResponse(java.lang.String, java.lang.String, java.io.InputStream);
+ ctor public WebResourceResponse(java.lang.String, java.lang.String, int, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream);
+ method public java.io.InputStream getData();
+ method public java.lang.String getEncoding();
+ method public java.lang.String getMimeType();
+ method public java.lang.String getReasonPhrase();
+ method public java.util.Map<java.lang.String, java.lang.String> getResponseHeaders();
+ method public int getStatusCode();
+ method public void setData(java.io.InputStream);
+ method public void setEncoding(java.lang.String);
+ method public void setMimeType(java.lang.String);
+ method public void setResponseHeaders(java.util.Map<java.lang.String, java.lang.String>);
+ method public void setStatusCodeAndReasonPhrase(int, java.lang.String);
+ }
+
+ public abstract class WebSettings {
+ ctor public WebSettings();
+ method public abstract deprecated boolean enableSmoothTransition();
+ method public abstract boolean getAllowContentAccess();
+ method public abstract boolean getAllowFileAccess();
+ method public abstract boolean getAllowFileAccessFromFileURLs();
+ method public abstract boolean getAllowUniversalAccessFromFileURLs();
+ method public abstract boolean getBlockNetworkImage();
+ method public abstract boolean getBlockNetworkLoads();
+ method public abstract boolean getBuiltInZoomControls();
+ method public abstract int getCacheMode();
+ method public abstract java.lang.String getCursiveFontFamily();
+ method public abstract boolean getDatabaseEnabled();
+ method public abstract deprecated java.lang.String getDatabasePath();
+ method public abstract int getDefaultFixedFontSize();
+ method public abstract int getDefaultFontSize();
+ method public abstract java.lang.String getDefaultTextEncodingName();
+ method public static java.lang.String getDefaultUserAgent(android.content.Context);
+ method public abstract deprecated android.webkit.WebSettings.ZoomDensity getDefaultZoom();
+ method public abstract int getDisabledActionModeMenuItems();
+ method public abstract boolean getDisplayZoomControls();
+ method public abstract boolean getDomStorageEnabled();
+ method public abstract java.lang.String getFantasyFontFamily();
+ method public abstract java.lang.String getFixedFontFamily();
+ method public abstract boolean getJavaScriptCanOpenWindowsAutomatically();
+ method public abstract boolean getJavaScriptEnabled();
+ method public abstract android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
+ method public abstract deprecated boolean getLightTouchEnabled();
+ method public abstract boolean getLoadWithOverviewMode();
+ method public abstract boolean getLoadsImagesAutomatically();
+ method public abstract boolean getMediaPlaybackRequiresUserGesture();
+ method public abstract int getMinimumFontSize();
+ method public abstract int getMinimumLogicalFontSize();
+ method public abstract int getMixedContentMode();
+ method public abstract boolean getOffscreenPreRaster();
+ method public abstract deprecated android.webkit.WebSettings.PluginState getPluginState();
+ method public abstract java.lang.String getSansSerifFontFamily();
+ method public abstract boolean getSaveFormData();
+ method public abstract deprecated boolean getSavePassword();
+ method public abstract java.lang.String getSerifFontFamily();
+ method public abstract java.lang.String getStandardFontFamily();
+ method public deprecated synchronized android.webkit.WebSettings.TextSize getTextSize();
+ method public abstract int getTextZoom();
+ method public abstract boolean getUseWideViewPort();
+ method public abstract java.lang.String getUserAgentString();
+ method public abstract void setAllowContentAccess(boolean);
+ method public abstract void setAllowFileAccess(boolean);
+ method public abstract void setAllowFileAccessFromFileURLs(boolean);
+ method public abstract void setAllowUniversalAccessFromFileURLs(boolean);
+ method public abstract void setAppCacheEnabled(boolean);
+ method public abstract deprecated void setAppCacheMaxSize(long);
+ method public abstract void setAppCachePath(java.lang.String);
+ method public abstract void setBlockNetworkImage(boolean);
+ method public abstract void setBlockNetworkLoads(boolean);
+ method public abstract void setBuiltInZoomControls(boolean);
+ method public abstract void setCacheMode(int);
+ method public abstract void setCursiveFontFamily(java.lang.String);
+ method public abstract void setDatabaseEnabled(boolean);
+ method public abstract deprecated void setDatabasePath(java.lang.String);
+ method public abstract void setDefaultFixedFontSize(int);
+ method public abstract void setDefaultFontSize(int);
+ method public abstract void setDefaultTextEncodingName(java.lang.String);
+ method public abstract deprecated void setDefaultZoom(android.webkit.WebSettings.ZoomDensity);
+ method public abstract void setDisabledActionModeMenuItems(int);
+ method public abstract void setDisplayZoomControls(boolean);
+ method public abstract void setDomStorageEnabled(boolean);
+ method public abstract deprecated void setEnableSmoothTransition(boolean);
+ method public abstract void setFantasyFontFamily(java.lang.String);
+ method public abstract void setFixedFontFamily(java.lang.String);
+ method public abstract void setGeolocationDatabasePath(java.lang.String);
+ method public abstract void setGeolocationEnabled(boolean);
+ method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean);
+ method public abstract void setJavaScriptEnabled(boolean);
+ method public abstract void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm);
+ method public abstract deprecated void setLightTouchEnabled(boolean);
+ method public abstract void setLoadWithOverviewMode(boolean);
+ method public abstract void setLoadsImagesAutomatically(boolean);
+ method public abstract void setMediaPlaybackRequiresUserGesture(boolean);
+ method public abstract void setMinimumFontSize(int);
+ method public abstract void setMinimumLogicalFontSize(int);
+ method public abstract void setMixedContentMode(int);
+ method public abstract void setNeedInitialFocus(boolean);
+ method public abstract void setOffscreenPreRaster(boolean);
+ method public abstract deprecated void setPluginState(android.webkit.WebSettings.PluginState);
+ method public abstract deprecated void setRenderPriority(android.webkit.WebSettings.RenderPriority);
+ method public abstract void setSansSerifFontFamily(java.lang.String);
+ method public abstract void setSaveFormData(boolean);
+ method public abstract deprecated void setSavePassword(boolean);
+ method public abstract void setSerifFontFamily(java.lang.String);
+ method public abstract void setStandardFontFamily(java.lang.String);
+ method public abstract void setSupportMultipleWindows(boolean);
+ method public abstract void setSupportZoom(boolean);
+ method public deprecated synchronized void setTextSize(android.webkit.WebSettings.TextSize);
+ method public abstract void setTextZoom(int);
+ method public abstract void setUseWideViewPort(boolean);
+ method public abstract void setUserAgentString(java.lang.String);
+ method public abstract boolean supportMultipleWindows();
+ method public abstract boolean supportZoom();
+ field public static final int LOAD_CACHE_ELSE_NETWORK = 1; // 0x1
+ field public static final int LOAD_CACHE_ONLY = 3; // 0x3
+ field public static final int LOAD_DEFAULT = -1; // 0xffffffff
+ field public static final deprecated int LOAD_NORMAL = 0; // 0x0
+ field public static final int LOAD_NO_CACHE = 2; // 0x2
+ field public static final int MENU_ITEM_NONE = 0; // 0x0
+ field public static final int MENU_ITEM_PROCESS_TEXT = 4; // 0x4
+ field public static final int MENU_ITEM_SHARE = 1; // 0x1
+ field public static final int MENU_ITEM_WEB_SEARCH = 2; // 0x2
+ field public static final int MIXED_CONTENT_ALWAYS_ALLOW = 0; // 0x0
+ field public static final int MIXED_CONTENT_COMPATIBILITY_MODE = 2; // 0x2
+ field public static final int MIXED_CONTENT_NEVER_ALLOW = 1; // 0x1
+ }
+
+ public static final class WebSettings.LayoutAlgorithm extends java.lang.Enum {
+ method public static android.webkit.WebSettings.LayoutAlgorithm valueOf(java.lang.String);
+ method public static final android.webkit.WebSettings.LayoutAlgorithm[] values();
+ enum_constant public static final deprecated android.webkit.WebSettings.LayoutAlgorithm NARROW_COLUMNS;
+ enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm NORMAL;
+ enum_constant public static final deprecated android.webkit.WebSettings.LayoutAlgorithm SINGLE_COLUMN;
+ enum_constant public static final android.webkit.WebSettings.LayoutAlgorithm TEXT_AUTOSIZING;
+ }
+
+ public static final class WebSettings.PluginState extends java.lang.Enum {
+ method public static android.webkit.WebSettings.PluginState valueOf(java.lang.String);
+ method public static final android.webkit.WebSettings.PluginState[] values();
+ enum_constant public static final android.webkit.WebSettings.PluginState OFF;
+ enum_constant public static final android.webkit.WebSettings.PluginState ON;
+ enum_constant public static final android.webkit.WebSettings.PluginState ON_DEMAND;
+ }
+
+ public static final class WebSettings.RenderPriority extends java.lang.Enum {
+ method public static android.webkit.WebSettings.RenderPriority valueOf(java.lang.String);
+ method public static final android.webkit.WebSettings.RenderPriority[] values();
+ enum_constant public static final android.webkit.WebSettings.RenderPriority HIGH;
+ enum_constant public static final android.webkit.WebSettings.RenderPriority LOW;
+ enum_constant public static final android.webkit.WebSettings.RenderPriority NORMAL;
+ }
+
+ public static final deprecated class WebSettings.TextSize extends java.lang.Enum {
+ method public static android.webkit.WebSettings.TextSize valueOf(java.lang.String);
+ method public static final android.webkit.WebSettings.TextSize[] values();
+ enum_constant public static final android.webkit.WebSettings.TextSize LARGER;
+ enum_constant public static final android.webkit.WebSettings.TextSize LARGEST;
+ enum_constant public static final android.webkit.WebSettings.TextSize NORMAL;
+ enum_constant public static final android.webkit.WebSettings.TextSize SMALLER;
+ enum_constant public static final android.webkit.WebSettings.TextSize SMALLEST;
+ }
+
+ public static final class WebSettings.ZoomDensity extends java.lang.Enum {
+ method public static android.webkit.WebSettings.ZoomDensity valueOf(java.lang.String);
+ method public static final android.webkit.WebSettings.ZoomDensity[] values();
+ enum_constant public static final android.webkit.WebSettings.ZoomDensity CLOSE;
+ enum_constant public static final android.webkit.WebSettings.ZoomDensity FAR;
+ enum_constant public static final android.webkit.WebSettings.ZoomDensity MEDIUM;
+ }
+
+ public class WebStorage {
+ method public void deleteAllData();
+ method public void deleteOrigin(java.lang.String);
+ method public static android.webkit.WebStorage getInstance();
+ method public void getOrigins(android.webkit.ValueCallback<java.util.Map>);
+ method public void getQuotaForOrigin(java.lang.String, android.webkit.ValueCallback<java.lang.Long>);
+ method public void getUsageForOrigin(java.lang.String, android.webkit.ValueCallback<java.lang.Long>);
+ method public deprecated void setQuotaForOrigin(java.lang.String, long);
+ }
+
+ public static class WebStorage.Origin {
+ method public java.lang.String getOrigin();
+ method public long getQuota();
+ method public long getUsage();
+ }
+
+ public static abstract deprecated interface WebStorage.QuotaUpdater {
+ method public abstract void updateQuota(long);
+ }
+
+ abstract deprecated class WebSyncManager implements java.lang.Runnable {
+ ctor protected WebSyncManager(android.content.Context, java.lang.String);
+ method protected void onSyncInit();
+ method public void resetSync();
+ method public void run();
+ method public void startSync();
+ method public void stopSync();
+ method public void sync();
+ field protected static final java.lang.String LOGTAG = "websync";
+ field protected android.webkit.WebViewDatabase mDataBase;
+ field protected android.os.Handler mHandler;
+ }
+
+ public class WebView extends android.widget.AbsoluteLayout implements android.view.ViewGroup.OnHierarchyChangeListener android.view.ViewTreeObserver.OnGlobalFocusChangeListener {
+ ctor public WebView(android.content.Context);
+ ctor public WebView(android.content.Context, android.util.AttributeSet);
+ ctor public WebView(android.content.Context, android.util.AttributeSet, int);
+ ctor public WebView(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public deprecated WebView(android.content.Context, android.util.AttributeSet, int, boolean);
+ method public void addJavascriptInterface(java.lang.Object, java.lang.String);
+ method public boolean canGoBack();
+ method public boolean canGoBackOrForward(int);
+ method public boolean canGoForward();
+ method public deprecated boolean canZoomIn();
+ method public deprecated boolean canZoomOut();
+ method public deprecated android.graphics.Picture capturePicture();
+ method public void clearCache(boolean);
+ method public static void clearClientCertPreferences(java.lang.Runnable);
+ method public void clearFormData();
+ method public void clearHistory();
+ method public void clearMatches();
+ method public void clearSslPreferences();
+ method public deprecated void clearView();
+ method public android.webkit.WebBackForwardList copyBackForwardList();
+ method public deprecated android.print.PrintDocumentAdapter createPrintDocumentAdapter();
+ method public android.print.PrintDocumentAdapter createPrintDocumentAdapter(java.lang.String);
+ method public android.webkit.WebMessagePort[] createWebMessageChannel();
+ method public void destroy();
+ method public void documentHasImages(android.os.Message);
+ method public static void enableSlowWholeDocumentDraw();
+ method public void evaluateJavascript(java.lang.String, android.webkit.ValueCallback<java.lang.String>);
+ method public static java.lang.String findAddress(java.lang.String);
+ method public deprecated int findAll(java.lang.String);
+ method public void findAllAsync(java.lang.String);
+ method public void findNext(boolean);
+ method public void flingScroll(int, int);
+ method public deprecated void freeMemory();
+ method public android.net.http.SslCertificate getCertificate();
+ method public int getContentHeight();
+ method public android.graphics.Bitmap getFavicon();
+ method public android.webkit.WebView.HitTestResult getHitTestResult();
+ method public java.lang.String[] getHttpAuthUsernamePassword(java.lang.String, java.lang.String);
+ method public java.lang.String getOriginalUrl();
+ method public int getProgress();
+ method public deprecated float getScale();
+ method public android.webkit.WebSettings getSettings();
+ method public java.lang.String getTitle();
+ method public java.lang.String getUrl();
+ method public void goBack();
+ method public void goBackOrForward(int);
+ method public void goForward();
+ method public void invokeZoomPicker();
+ method public boolean isPrivateBrowsingEnabled();
+ method public void loadData(java.lang.String, java.lang.String, java.lang.String);
+ method public void loadDataWithBaseURL(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public void loadUrl(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
+ method public void loadUrl(java.lang.String);
+ method public deprecated void onChildViewAdded(android.view.View, android.view.View);
+ method public deprecated void onChildViewRemoved(android.view.View, android.view.View);
+ method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View);
+ method public void onPause();
+ method public void onResume();
+ method public deprecated boolean overlayHorizontalScrollbar();
+ method public deprecated boolean overlayVerticalScrollbar();
+ method public boolean pageDown(boolean);
+ method public boolean pageUp(boolean);
+ method public void pauseTimers();
+ method public void postUrl(java.lang.String, byte[]);
+ method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback);
+ method public void postWebMessage(android.webkit.WebMessage, android.net.Uri);
+ method public void reload();
+ method public void removeJavascriptInterface(java.lang.String);
+ method public void requestFocusNodeHref(android.os.Message);
+ method public void requestImageRef(android.os.Message);
+ method public android.webkit.WebBackForwardList restoreState(android.os.Bundle);
+ method public void resumeTimers();
+ method public deprecated void savePassword(java.lang.String, java.lang.String, java.lang.String);
+ method public android.webkit.WebBackForwardList saveState(android.os.Bundle);
+ method public void saveWebArchive(java.lang.String);
+ method public void saveWebArchive(java.lang.String, boolean, android.webkit.ValueCallback<java.lang.String>);
+ method public deprecated void setCertificate(android.net.http.SslCertificate);
+ method public void setDownloadListener(android.webkit.DownloadListener);
+ method public void setFindListener(android.webkit.WebView.FindListener);
+ method public deprecated void setHorizontalScrollbarOverlay(boolean);
+ method public void setHttpAuthUsernamePassword(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public void setInitialScale(int);
+ method public deprecated void setMapTrackballToArrowKeys(boolean);
+ method public void setNetworkAvailable(boolean);
+ method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
+ method public deprecated void setVerticalScrollbarOverlay(boolean);
+ method public void setWebChromeClient(android.webkit.WebChromeClient);
+ method public static void setWebContentsDebuggingEnabled(boolean);
+ method public void setWebViewClient(android.webkit.WebViewClient);
+ method public deprecated boolean showFindDialog(java.lang.String, boolean);
+ method public void stopLoading();
+ method public void zoomBy(float);
+ method public boolean zoomIn();
+ method public boolean zoomOut();
+ field public static final java.lang.String SCHEME_GEO = "geo:0,0?q=";
+ field public static final java.lang.String SCHEME_MAILTO = "mailto:";
+ field public static final java.lang.String SCHEME_TEL = "tel:";
+ }
+
+ public static abstract interface WebView.FindListener {
+ method public abstract void onFindResultReceived(int, int, boolean);
+ }
+
+ public static class WebView.HitTestResult {
+ method public java.lang.String getExtra();
+ method public int getType();
+ field public static final deprecated int ANCHOR_TYPE = 1; // 0x1
+ field public static final int EDIT_TEXT_TYPE = 9; // 0x9
+ field public static final int EMAIL_TYPE = 4; // 0x4
+ field public static final int GEO_TYPE = 3; // 0x3
+ field public static final deprecated int IMAGE_ANCHOR_TYPE = 6; // 0x6
+ field public static final int IMAGE_TYPE = 5; // 0x5
+ field public static final int PHONE_TYPE = 2; // 0x2
+ field public static final int SRC_ANCHOR_TYPE = 7; // 0x7
+ field public static final int SRC_IMAGE_ANCHOR_TYPE = 8; // 0x8
+ field public static final int UNKNOWN_TYPE = 0; // 0x0
+ }
+
+ public static abstract deprecated interface WebView.PictureListener {
+ method public abstract deprecated void onNewPicture(android.webkit.WebView, android.graphics.Picture);
+ }
+
+ public static abstract class WebView.VisualStateCallback {
+ ctor public WebView.VisualStateCallback();
+ method public abstract void onComplete(long);
+ }
+
+ public class WebView.WebViewTransport {
+ ctor public WebView.WebViewTransport();
+ method public synchronized android.webkit.WebView getWebView();
+ method public synchronized void setWebView(android.webkit.WebView);
+ }
+
+ public class WebViewClient {
+ ctor public WebViewClient();
+ method public void doUpdateVisitedHistory(android.webkit.WebView, java.lang.String, boolean);
+ method public void onFormResubmission(android.webkit.WebView, android.os.Message, android.os.Message);
+ method public void onLoadResource(android.webkit.WebView, java.lang.String);
+ method public void onPageCommitVisible(android.webkit.WebView, java.lang.String);
+ method public void onPageFinished(android.webkit.WebView, java.lang.String);
+ method public void onPageStarted(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+ method public void onReceivedClientCertRequest(android.webkit.WebView, android.webkit.ClientCertRequest);
+ method public deprecated void onReceivedError(android.webkit.WebView, int, java.lang.String, java.lang.String);
+ method public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
+ method public void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String);
+ method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse);
+ method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String);
+ method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError);
+ method public void onScaleChanged(android.webkit.WebView, float, float);
+ method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message);
+ method public void onUnhandledInputEvent(android.webkit.WebView, android.view.InputEvent);
+ method public deprecated void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent);
+ method public deprecated android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, java.lang.String);
+ method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebView, android.webkit.WebResourceRequest);
+ method public boolean shouldOverrideKeyEvent(android.webkit.WebView, android.view.KeyEvent);
+ method public deprecated boolean shouldOverrideUrlLoading(android.webkit.WebView, java.lang.String);
+ method public boolean shouldOverrideUrlLoading(android.webkit.WebView, android.webkit.WebResourceRequest);
+ field public static final int ERROR_AUTHENTICATION = -4; // 0xfffffffc
+ field public static final int ERROR_BAD_URL = -12; // 0xfffffff4
+ field public static final int ERROR_CONNECT = -6; // 0xfffffffa
+ field public static final int ERROR_FAILED_SSL_HANDSHAKE = -11; // 0xfffffff5
+ field public static final int ERROR_FILE = -13; // 0xfffffff3
+ field public static final int ERROR_FILE_NOT_FOUND = -14; // 0xfffffff2
+ field public static final int ERROR_HOST_LOOKUP = -2; // 0xfffffffe
+ field public static final int ERROR_IO = -7; // 0xfffffff9
+ field public static final int ERROR_PROXY_AUTHENTICATION = -5; // 0xfffffffb
+ field public static final int ERROR_REDIRECT_LOOP = -9; // 0xfffffff7
+ field public static final int ERROR_TIMEOUT = -8; // 0xfffffff8
+ field public static final int ERROR_TOO_MANY_REQUESTS = -15; // 0xfffffff1
+ field public static final int ERROR_UNKNOWN = -1; // 0xffffffff
+ field public static final int ERROR_UNSUPPORTED_AUTH_SCHEME = -3; // 0xfffffffd
+ field public static final int ERROR_UNSUPPORTED_SCHEME = -10; // 0xfffffff6
+ }
+
+ public abstract class WebViewDatabase {
+ ctor public WebViewDatabase();
+ method public abstract void clearFormData();
+ method public abstract void clearHttpAuthUsernamePassword();
+ method public abstract deprecated void clearUsernamePassword();
+ method public static android.webkit.WebViewDatabase getInstance(android.content.Context);
+ method public abstract boolean hasFormData();
+ method public abstract boolean hasHttpAuthUsernamePassword();
+ method public abstract deprecated boolean hasUsernamePassword();
+ }
+
+ public class WebViewFragment extends android.app.Fragment {
+ ctor public WebViewFragment();
+ method public android.webkit.WebView getWebView();
+ }
+
+}
+
+package android.widget {
+
+ public abstract class AbsListView extends android.widget.AdapterView implements android.widget.Filter.FilterListener android.text.TextWatcher android.view.ViewTreeObserver.OnGlobalLayoutListener android.view.ViewTreeObserver.OnTouchModeChangeListener {
+ ctor public AbsListView(android.content.Context);
+ ctor public AbsListView(android.content.Context, android.util.AttributeSet);
+ ctor public AbsListView(android.content.Context, android.util.AttributeSet, int);
+ ctor public AbsListView(android.content.Context, android.util.AttributeSet, int, int);
+ method public void afterTextChanged(android.text.Editable);
+ method public void beforeTextChanged(java.lang.CharSequence, int, int, int);
+ method public boolean canScrollList(int);
+ method public void clearChoices();
+ method public void clearTextFilter();
+ method public void deferNotifyDataSetChanged();
+ method public void fling(int);
+ method public int getCacheColorHint();
+ method public int getCheckedItemCount();
+ method public long[] getCheckedItemIds();
+ method public int getCheckedItemPosition();
+ method public android.util.SparseBooleanArray getCheckedItemPositions();
+ method public int getChoiceMode();
+ method public int getListPaddingBottom();
+ method public int getListPaddingLeft();
+ method public int getListPaddingRight();
+ method public int getListPaddingTop();
+ method public android.view.View getSelectedView();
+ method public android.graphics.drawable.Drawable getSelector();
+ method public java.lang.CharSequence getTextFilter();
+ method public int getTranscriptMode();
+ method protected void handleDataChanged();
+ method public boolean hasTextFilter();
+ method public void invalidateViews();
+ method public boolean isFastScrollAlwaysVisible();
+ method public boolean isFastScrollEnabled();
+ method protected boolean isInFilterMode();
+ method public boolean isItemChecked(int);
+ method public boolean isScrollingCacheEnabled();
+ method public boolean isSmoothScrollbarEnabled();
+ method public boolean isStackFromBottom();
+ method public boolean isTextFilterEnabled();
+ method protected void layoutChildren();
+ method public void onFilterComplete(int);
+ method public void onGlobalLayout();
+ method public void onInitializeAccessibilityNodeInfoForItem(android.view.View, int, android.view.accessibility.AccessibilityNodeInfo);
+ method public boolean onRemoteAdapterConnected();
+ method public void onRemoteAdapterDisconnected();
+ method public void onRestoreInstanceState(android.os.Parcelable);
+ method public android.os.Parcelable onSaveInstanceState();
+ method public void onTextChanged(java.lang.CharSequence, int, int, int);
+ method public void onTouchModeChanged(boolean);
+ method public int pointToPosition(int, int);
+ method public long pointToRowId(int, int);
+ method public void reclaimViews(java.util.List<android.view.View>);
+ method public void scrollListBy(int);
+ method public void setAdapter(android.widget.ListAdapter);
+ method public void setCacheColorHint(int);
+ method public void setChoiceMode(int);
+ method public void setDrawSelectorOnTop(boolean);
+ method public void setFastScrollAlwaysVisible(boolean);
+ method public void setFastScrollEnabled(boolean);
+ method public void setFastScrollStyle(int);
+ method public void setFilterText(java.lang.String);
+ method public void setFriction(float);
+ method public void setItemChecked(int, boolean);
+ method public void setMultiChoiceModeListener(android.widget.AbsListView.MultiChoiceModeListener);
+ method public void setOnScrollListener(android.widget.AbsListView.OnScrollListener);
+ method public void setRecyclerListener(android.widget.AbsListView.RecyclerListener);
+ method public void setRemoteViewsAdapter(android.content.Intent);
+ method public void setScrollIndicators(android.view.View, android.view.View);
+ method public void setScrollingCacheEnabled(boolean);
+ method public void setSelectionFromTop(int, int);
+ method public void setSelector(int);
+ method public void setSelector(android.graphics.drawable.Drawable);
+ method public void setSmoothScrollbarEnabled(boolean);
+ method public void setStackFromBottom(boolean);
+ method public void setTextFilterEnabled(boolean);
+ method public void setTranscriptMode(int);
+ method public void setVelocityScale(float);
+ method public void smoothScrollBy(int, int);
+ method public void smoothScrollToPosition(int);
+ method public void smoothScrollToPosition(int, int);
+ method public void smoothScrollToPositionFromTop(int, int, int);
+ method public void smoothScrollToPositionFromTop(int, int);
+ method public boolean verifyDrawable(android.graphics.drawable.Drawable);
+ field public static final int CHOICE_MODE_MULTIPLE = 2; // 0x2
+ field public static final int CHOICE_MODE_MULTIPLE_MODAL = 3; // 0x3
+ field public static final int CHOICE_MODE_NONE = 0; // 0x0
+ field public static final int CHOICE_MODE_SINGLE = 1; // 0x1
+ field public static final int TRANSCRIPT_MODE_ALWAYS_SCROLL = 2; // 0x2
+ field public static final int TRANSCRIPT_MODE_DISABLED = 0; // 0x0
+ field public static final int TRANSCRIPT_MODE_NORMAL = 1; // 0x1
+ }
+
+ public static class AbsListView.LayoutParams extends android.view.ViewGroup.LayoutParams {
+ ctor public AbsListView.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public AbsListView.LayoutParams(int, int);
+ ctor public AbsListView.LayoutParams(int, int, int);
+ ctor public AbsListView.LayoutParams(android.view.ViewGroup.LayoutParams);
+ }
+
+ public static abstract interface AbsListView.MultiChoiceModeListener implements android.view.ActionMode.Callback {
+ method public abstract void onItemCheckedStateChanged(android.view.ActionMode, int, long, boolean);
+ }
+
+ public static abstract interface AbsListView.OnScrollListener {
+ method public abstract void onScroll(android.widget.AbsListView, int, int, int);
+ method public abstract void onScrollStateChanged(android.widget.AbsListView, int);
+ field public static final int SCROLL_STATE_FLING = 2; // 0x2
+ field public static final int SCROLL_STATE_IDLE = 0; // 0x0
+ field public static final int SCROLL_STATE_TOUCH_SCROLL = 1; // 0x1
+ }
+
+ public static abstract interface AbsListView.RecyclerListener {
+ method public abstract void onMovedToScrapHeap(android.view.View);
+ }
+
+ public static abstract interface AbsListView.SelectionBoundsAdjuster {
+ method public abstract void adjustListItemSelectionBounds(android.graphics.Rect);
+ }
+
+ public abstract class AbsSeekBar extends android.widget.ProgressBar {
+ ctor public AbsSeekBar(android.content.Context);
+ ctor public AbsSeekBar(android.content.Context, android.util.AttributeSet);
+ ctor public AbsSeekBar(android.content.Context, android.util.AttributeSet, int);
+ ctor public AbsSeekBar(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getKeyProgressIncrement();
+ method public boolean getSplitTrack();
+ method public android.graphics.drawable.Drawable getThumb();
+ method public int getThumbOffset();
+ method public android.content.res.ColorStateList getThumbTintList();
+ method public android.graphics.PorterDuff.Mode getThumbTintMode();
+ method public void setKeyProgressIncrement(int);
+ method public void setSplitTrack(boolean);
+ method public void setThumb(android.graphics.drawable.Drawable);
+ method public void setThumbOffset(int);
+ method public void setThumbTintList(android.content.res.ColorStateList);
+ method public void setThumbTintMode(android.graphics.PorterDuff.Mode);
+ }
+
+ public abstract class AbsSpinner extends android.widget.AdapterView {
+ ctor public AbsSpinner(android.content.Context);
+ ctor public AbsSpinner(android.content.Context, android.util.AttributeSet);
+ ctor public AbsSpinner(android.content.Context, android.util.AttributeSet, int);
+ ctor public AbsSpinner(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.widget.SpinnerAdapter getAdapter();
+ method public android.view.View getSelectedView();
+ method public void onRestoreInstanceState(android.os.Parcelable);
+ method public android.os.Parcelable onSaveInstanceState();
+ method public int pointToPosition(int, int);
+ method public void setAdapter(android.widget.SpinnerAdapter);
+ method public void setSelection(int, boolean);
+ method public void setSelection(int);
+ }
+
+ public deprecated class AbsoluteLayout extends android.view.ViewGroup {
+ ctor public AbsoluteLayout(android.content.Context);
+ ctor public AbsoluteLayout(android.content.Context, android.util.AttributeSet);
+ ctor public AbsoluteLayout(android.content.Context, android.util.AttributeSet, int);
+ ctor public AbsoluteLayout(android.content.Context, android.util.AttributeSet, int, int);
+ method protected void onLayout(boolean, int, int, int, int);
+ }
+
+ public static class AbsoluteLayout.LayoutParams extends android.view.ViewGroup.LayoutParams {
+ ctor public AbsoluteLayout.LayoutParams(int, int, int, int);
+ ctor public AbsoluteLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public AbsoluteLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
+ method public java.lang.String debug(java.lang.String);
+ field public int x;
+ field public int y;
+ }
+
+ public class ActionMenuView extends android.widget.LinearLayout {
+ ctor public ActionMenuView(android.content.Context);
+ ctor public ActionMenuView(android.content.Context, android.util.AttributeSet);
+ method public void dismissPopupMenus();
+ method public android.view.Menu getMenu();
+ method public android.graphics.drawable.Drawable getOverflowIcon();
+ method public int getPopupTheme();
+ method public boolean hideOverflowMenu();
+ method public boolean isOverflowMenuShowing();
+ method public void onConfigurationChanged(android.content.res.Configuration);
+ method public void onDetachedFromWindow();
+ method public void setOnMenuItemClickListener(android.widget.ActionMenuView.OnMenuItemClickListener);
+ method public void setOverflowIcon(android.graphics.drawable.Drawable);
+ method public void setPopupTheme(int);
+ method public boolean showOverflowMenu();
+ }
+
+ public static class ActionMenuView.LayoutParams extends android.widget.LinearLayout.LayoutParams {
+ ctor public ActionMenuView.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public ActionMenuView.LayoutParams(android.widget.ActionMenuView.LayoutParams);
+ ctor public ActionMenuView.LayoutParams(int, int);
+ }
+
+ public static abstract interface ActionMenuView.OnMenuItemClickListener {
+ method public abstract boolean onMenuItemClick(android.view.MenuItem);
+ }
+
+ public abstract interface Adapter {
+ method public abstract int getCount();
+ method public abstract java.lang.Object getItem(int);
+ method public abstract long getItemId(int);
+ method public abstract int getItemViewType(int);
+ method public abstract android.view.View getView(int, android.view.View, android.view.ViewGroup);
+ method public abstract int getViewTypeCount();
+ method public abstract boolean hasStableIds();
+ method public abstract boolean isEmpty();
+ method public abstract void registerDataSetObserver(android.database.DataSetObserver);
+ method public abstract void unregisterDataSetObserver(android.database.DataSetObserver);
+ field public static final int IGNORE_ITEM_VIEW_TYPE = -1; // 0xffffffff
+ field public static final int NO_SELECTION = -2147483648; // 0x80000000
+ }
+
+ public abstract class AdapterView extends android.view.ViewGroup {
+ ctor public AdapterView(android.content.Context);
+ ctor public AdapterView(android.content.Context, android.util.AttributeSet);
+ ctor public AdapterView(android.content.Context, android.util.AttributeSet, int);
+ ctor public AdapterView(android.content.Context, android.util.AttributeSet, int, int);
+ method public abstract T getAdapter();
+ method public int getCount();
+ method public android.view.View getEmptyView();
+ method public int getFirstVisiblePosition();
+ method public java.lang.Object getItemAtPosition(int);
+ method public long getItemIdAtPosition(int);
+ method public int getLastVisiblePosition();
+ method public final android.widget.AdapterView.OnItemClickListener getOnItemClickListener();
+ method public final android.widget.AdapterView.OnItemLongClickListener getOnItemLongClickListener();
+ method public final android.widget.AdapterView.OnItemSelectedListener getOnItemSelectedListener();
+ method public int getPositionForView(android.view.View);
+ method public java.lang.Object getSelectedItem();
+ method public long getSelectedItemId();
+ method public int getSelectedItemPosition();
+ method public abstract android.view.View getSelectedView();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public boolean performItemClick(android.view.View, int, long);
+ method public abstract void setAdapter(T);
+ method public void setEmptyView(android.view.View);
+ method public void setOnItemClickListener(android.widget.AdapterView.OnItemClickListener);
+ method public void setOnItemLongClickListener(android.widget.AdapterView.OnItemLongClickListener);
+ method public void setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener);
+ method public abstract void setSelection(int);
+ field public static final int INVALID_POSITION = -1; // 0xffffffff
+ field public static final long INVALID_ROW_ID = -9223372036854775808L; // 0x8000000000000000L
+ field public static final int ITEM_VIEW_TYPE_HEADER_OR_FOOTER = -2; // 0xfffffffe
+ field public static final int ITEM_VIEW_TYPE_IGNORE = -1; // 0xffffffff
+ }
+
+ public static class AdapterView.AdapterContextMenuInfo implements android.view.ContextMenu.ContextMenuInfo {
+ ctor public AdapterView.AdapterContextMenuInfo(android.view.View, int, long);
+ field public long id;
+ field public int position;
+ field public android.view.View targetView;
+ }
+
+ public static abstract interface AdapterView.OnItemClickListener {
+ method public abstract void onItemClick(android.widget.AdapterView<?>, android.view.View, int, long);
+ }
+
+ public static abstract interface AdapterView.OnItemLongClickListener {
+ method public abstract boolean onItemLongClick(android.widget.AdapterView<?>, android.view.View, int, long);
+ }
+
+ public static abstract interface AdapterView.OnItemSelectedListener {
+ method public abstract void onItemSelected(android.widget.AdapterView<?>, android.view.View, int, long);
+ method public abstract void onNothingSelected(android.widget.AdapterView<?>);
+ }
+
+ public abstract class AdapterViewAnimator extends android.widget.AdapterView implements android.widget.Advanceable {
+ ctor public AdapterViewAnimator(android.content.Context);
+ ctor public AdapterViewAnimator(android.content.Context, android.util.AttributeSet);
+ ctor public AdapterViewAnimator(android.content.Context, android.util.AttributeSet, int);
+ ctor public AdapterViewAnimator(android.content.Context, android.util.AttributeSet, int, int);
+ method public void advance();
+ method public void deferNotifyDataSetChanged();
+ method public void fyiWillBeAdvancedByHostKThx();
+ method public android.widget.Adapter getAdapter();
+ method public android.view.View getCurrentView();
+ method public int getDisplayedChild();
+ method public android.animation.ObjectAnimator getInAnimation();
+ method public android.animation.ObjectAnimator getOutAnimation();
+ method public android.view.View getSelectedView();
+ method public boolean onRemoteAdapterConnected();
+ method public void onRemoteAdapterDisconnected();
+ method public void onRestoreInstanceState(android.os.Parcelable);
+ method public android.os.Parcelable onSaveInstanceState();
+ method public void setAdapter(android.widget.Adapter);
+ method public void setAnimateFirstView(boolean);
+ method public void setDisplayedChild(int);
+ method public void setInAnimation(android.animation.ObjectAnimator);
+ method public void setInAnimation(android.content.Context, int);
+ method public void setOutAnimation(android.animation.ObjectAnimator);
+ method public void setOutAnimation(android.content.Context, int);
+ method public void setRemoteViewsAdapter(android.content.Intent);
+ method public void setSelection(int);
+ method public void showNext();
+ method public void showPrevious();
+ }
+
+ public class AdapterViewFlipper extends android.widget.AdapterViewAnimator {
+ ctor public AdapterViewFlipper(android.content.Context);
+ ctor public AdapterViewFlipper(android.content.Context, android.util.AttributeSet);
+ ctor public AdapterViewFlipper(android.content.Context, android.util.AttributeSet, int);
+ ctor public AdapterViewFlipper(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getFlipInterval();
+ method public boolean isAutoStart();
+ method public boolean isFlipping();
+ method public void setAutoStart(boolean);
+ method public void setFlipInterval(int);
+ method public void startFlipping();
+ method public void stopFlipping();
+ }
+
+ public abstract interface Advanceable {
+ method public abstract void advance();
+ method public abstract void fyiWillBeAdvancedByHostKThx();
+ }
+
+ public class AlphabetIndexer extends android.database.DataSetObserver implements android.widget.SectionIndexer {
+ ctor public AlphabetIndexer(android.database.Cursor, int, java.lang.CharSequence);
+ method protected int compare(java.lang.String, java.lang.String);
+ method public int getPositionForSection(int);
+ method public int getSectionForPosition(int);
+ method public java.lang.Object[] getSections();
+ method public void setCursor(android.database.Cursor);
+ field protected java.lang.CharSequence mAlphabet;
+ field protected int mColumnIndex;
+ field protected android.database.Cursor mDataCursor;
+ }
+
+ public deprecated class AnalogClock extends android.view.View {
+ ctor public AnalogClock(android.content.Context);
+ ctor public AnalogClock(android.content.Context, android.util.AttributeSet);
+ ctor public AnalogClock(android.content.Context, android.util.AttributeSet, int);
+ ctor public AnalogClock(android.content.Context, android.util.AttributeSet, int, int);
+ }
+
+ public class ArrayAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
+ ctor public ArrayAdapter(android.content.Context, int);
+ ctor public ArrayAdapter(android.content.Context, int, int);
+ ctor public ArrayAdapter(android.content.Context, int, T[]);
+ ctor public ArrayAdapter(android.content.Context, int, int, T[]);
+ ctor public ArrayAdapter(android.content.Context, int, java.util.List<T>);
+ ctor public ArrayAdapter(android.content.Context, int, int, java.util.List<T>);
+ method public void add(T);
+ method public void addAll(java.util.Collection<? extends T>);
+ method public void addAll(T...);
+ method public void clear();
+ method public static android.widget.ArrayAdapter<java.lang.CharSequence> createFromResource(android.content.Context, int, int);
+ method public android.content.Context getContext();
+ method public int getCount();
+ method public android.content.res.Resources.Theme getDropDownViewTheme();
+ method public android.widget.Filter getFilter();
+ method public T getItem(int);
+ method public long getItemId(int);
+ method public int getPosition(T);
+ method public android.view.View getView(int, android.view.View, android.view.ViewGroup);
+ method public void insert(T, int);
+ method public void remove(T);
+ method public void setDropDownViewResource(int);
+ method public void setDropDownViewTheme(android.content.res.Resources.Theme);
+ method public void setNotifyOnChange(boolean);
+ method public void sort(java.util.Comparator<? super T>);
+ }
+
+ public class AutoCompleteTextView extends android.widget.EditText implements android.widget.Filter.FilterListener {
+ ctor public AutoCompleteTextView(android.content.Context);
+ ctor public AutoCompleteTextView(android.content.Context, android.util.AttributeSet);
+ ctor public AutoCompleteTextView(android.content.Context, android.util.AttributeSet, int);
+ ctor public AutoCompleteTextView(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public AutoCompleteTextView(android.content.Context, android.util.AttributeSet, int, int, android.content.res.Resources.Theme);
+ method public void clearListSelection();
+ method protected java.lang.CharSequence convertSelectionToString(java.lang.Object);
+ method public void dismissDropDown();
+ method public boolean enoughToFilter();
+ method public android.widget.ListAdapter getAdapter();
+ method public java.lang.CharSequence getCompletionHint();
+ method public int getDropDownAnchor();
+ method public android.graphics.drawable.Drawable getDropDownBackground();
+ method public int getDropDownHeight();
+ method public int getDropDownHorizontalOffset();
+ method public int getDropDownVerticalOffset();
+ method public int getDropDownWidth();
+ method protected android.widget.Filter getFilter();
+ method public deprecated android.widget.AdapterView.OnItemClickListener getItemClickListener();
+ method public deprecated android.widget.AdapterView.OnItemSelectedListener getItemSelectedListener();
+ method public int getListSelection();
+ method public android.widget.AdapterView.OnItemClickListener getOnItemClickListener();
+ method public android.widget.AdapterView.OnItemSelectedListener getOnItemSelectedListener();
+ method public int getThreshold();
+ method public android.widget.AutoCompleteTextView.Validator getValidator();
+ method public boolean isPerformingCompletion();
+ method public boolean isPopupShowing();
+ method public void onFilterComplete(int);
+ method public void performCompletion();
+ method protected void performFiltering(java.lang.CharSequence, int);
+ method public void performValidation();
+ method protected void replaceText(java.lang.CharSequence);
+ method public void setAdapter(T);
+ method public void setCompletionHint(java.lang.CharSequence);
+ method public void setDropDownAnchor(int);
+ method public void setDropDownBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setDropDownBackgroundResource(int);
+ method public void setDropDownHeight(int);
+ method public void setDropDownHorizontalOffset(int);
+ method public void setDropDownVerticalOffset(int);
+ method public void setDropDownWidth(int);
+ method public void setListSelection(int);
+ method public void setOnDismissListener(android.widget.AutoCompleteTextView.OnDismissListener);
+ method public void setOnItemClickListener(android.widget.AdapterView.OnItemClickListener);
+ method public void setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener);
+ method public void setText(java.lang.CharSequence, boolean);
+ method public void setThreshold(int);
+ method public void setValidator(android.widget.AutoCompleteTextView.Validator);
+ method public void showDropDown();
+ }
+
+ public static abstract interface AutoCompleteTextView.OnDismissListener {
+ method public abstract void onDismiss();
+ }
+
+ public static abstract interface AutoCompleteTextView.Validator {
+ method public abstract java.lang.CharSequence fixText(java.lang.CharSequence);
+ method public abstract boolean isValid(java.lang.CharSequence);
+ }
+
+ public abstract class BaseAdapter implements android.widget.ListAdapter android.widget.SpinnerAdapter {
+ ctor public BaseAdapter();
+ method public boolean areAllItemsEnabled();
+ method public android.view.View getDropDownView(int, android.view.View, android.view.ViewGroup);
+ method public int getItemViewType(int);
+ method public int getViewTypeCount();
+ method public boolean hasStableIds();
+ method public boolean isEmpty();
+ method public boolean isEnabled(int);
+ method public void notifyDataSetChanged();
+ method public void notifyDataSetInvalidated();
+ method public void registerDataSetObserver(android.database.DataSetObserver);
+ method public void unregisterDataSetObserver(android.database.DataSetObserver);
+ }
+
+ public abstract class BaseExpandableListAdapter implements android.widget.ExpandableListAdapter android.widget.HeterogeneousExpandableList {
+ ctor public BaseExpandableListAdapter();
+ method public boolean areAllItemsEnabled();
+ method public int getChildType(int, int);
+ method public int getChildTypeCount();
+ method public long getCombinedChildId(long, long);
+ method public long getCombinedGroupId(long);
+ method public int getGroupType(int);
+ method public int getGroupTypeCount();
+ method public boolean isEmpty();
+ method public void notifyDataSetChanged();
+ method public void notifyDataSetInvalidated();
+ method public void onGroupCollapsed(int);
+ method public void onGroupExpanded(int);
+ method public void registerDataSetObserver(android.database.DataSetObserver);
+ method public void unregisterDataSetObserver(android.database.DataSetObserver);
+ }
+
+ public class Button extends android.widget.TextView {
+ ctor public Button(android.content.Context);
+ ctor public Button(android.content.Context, android.util.AttributeSet);
+ ctor public Button(android.content.Context, android.util.AttributeSet, int);
+ ctor public Button(android.content.Context, android.util.AttributeSet, int, int);
+ }
+
+ public class CalendarView extends android.widget.FrameLayout {
+ ctor public CalendarView(android.content.Context);
+ ctor public CalendarView(android.content.Context, android.util.AttributeSet);
+ ctor public CalendarView(android.content.Context, android.util.AttributeSet, int);
+ ctor public CalendarView(android.content.Context, android.util.AttributeSet, int, int);
+ method public long getDate();
+ method public int getDateTextAppearance();
+ method public int getFirstDayOfWeek();
+ method public deprecated int getFocusedMonthDateColor();
+ method public long getMaxDate();
+ method public long getMinDate();
+ method public deprecated android.graphics.drawable.Drawable getSelectedDateVerticalBar();
+ method public deprecated int getSelectedWeekBackgroundColor();
+ method public boolean getShowWeekNumber();
+ method public deprecated int getShownWeekCount();
+ method public deprecated int getUnfocusedMonthDateColor();
+ method public int getWeekDayTextAppearance();
+ method public deprecated int getWeekNumberColor();
+ method public deprecated int getWeekSeparatorLineColor();
+ method public void setDate(long);
+ method public void setDate(long, boolean, boolean);
+ method public void setDateTextAppearance(int);
+ method public void setFirstDayOfWeek(int);
+ method public deprecated void setFocusedMonthDateColor(int);
+ method public void setMaxDate(long);
+ method public void setMinDate(long);
+ method public void setOnDateChangeListener(android.widget.CalendarView.OnDateChangeListener);
+ method public deprecated void setSelectedDateVerticalBar(int);
+ method public deprecated void setSelectedDateVerticalBar(android.graphics.drawable.Drawable);
+ method public deprecated void setSelectedWeekBackgroundColor(int);
+ method public void setShowWeekNumber(boolean);
+ method public deprecated void setShownWeekCount(int);
+ method public deprecated void setUnfocusedMonthDateColor(int);
+ method public void setWeekDayTextAppearance(int);
+ method public deprecated void setWeekNumberColor(int);
+ method public deprecated void setWeekSeparatorLineColor(int);
+ }
+
+ public static abstract interface CalendarView.OnDateChangeListener {
+ method public abstract void onSelectedDayChange(android.widget.CalendarView, int, int, int);
+ }
+
+ public class CheckBox extends android.widget.CompoundButton {
+ ctor public CheckBox(android.content.Context);
+ ctor public CheckBox(android.content.Context, android.util.AttributeSet);
+ ctor public CheckBox(android.content.Context, android.util.AttributeSet, int);
+ ctor public CheckBox(android.content.Context, android.util.AttributeSet, int, int);
+ }
+
+ public abstract interface Checkable {
+ method public abstract boolean isChecked();
+ method public abstract void setChecked(boolean);
+ method public abstract void toggle();
+ }
+
+ public class CheckedTextView extends android.widget.TextView implements android.widget.Checkable {
+ ctor public CheckedTextView(android.content.Context);
+ ctor public CheckedTextView(android.content.Context, android.util.AttributeSet);
+ ctor public CheckedTextView(android.content.Context, android.util.AttributeSet, int);
+ ctor public CheckedTextView(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.graphics.drawable.Drawable getCheckMarkDrawable();
+ method public android.content.res.ColorStateList getCheckMarkTintList();
+ method public android.graphics.PorterDuff.Mode getCheckMarkTintMode();
+ method public boolean isChecked();
+ method public void setCheckMarkDrawable(int);
+ method public void setCheckMarkDrawable(android.graphics.drawable.Drawable);
+ method public void setCheckMarkTintList(android.content.res.ColorStateList);
+ method public void setCheckMarkTintMode(android.graphics.PorterDuff.Mode);
+ method public void setChecked(boolean);
+ method public void toggle();
+ }
+
+ public class Chronometer extends android.widget.TextView {
+ ctor public Chronometer(android.content.Context);
+ ctor public Chronometer(android.content.Context, android.util.AttributeSet);
+ ctor public Chronometer(android.content.Context, android.util.AttributeSet, int);
+ ctor public Chronometer(android.content.Context, android.util.AttributeSet, int, int);
+ method public long getBase();
+ method public java.lang.String getFormat();
+ method public android.widget.Chronometer.OnChronometerTickListener getOnChronometerTickListener();
+ method public void setBase(long);
+ method public void setFormat(java.lang.String);
+ method public void setOnChronometerTickListener(android.widget.Chronometer.OnChronometerTickListener);
+ method public void start();
+ method public void stop();
+ }
+
+ public static abstract interface Chronometer.OnChronometerTickListener {
+ method public abstract void onChronometerTick(android.widget.Chronometer);
+ }
+
+ public abstract class CompoundButton extends android.widget.Button implements android.widget.Checkable {
+ ctor public CompoundButton(android.content.Context);
+ ctor public CompoundButton(android.content.Context, android.util.AttributeSet);
+ ctor public CompoundButton(android.content.Context, android.util.AttributeSet, int);
+ ctor public CompoundButton(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.graphics.drawable.Drawable getButtonDrawable();
+ method public android.content.res.ColorStateList getButtonTintList();
+ method public android.graphics.PorterDuff.Mode getButtonTintMode();
+ method public boolean isChecked();
+ method public void setButtonDrawable(int);
+ method public void setButtonDrawable(android.graphics.drawable.Drawable);
+ method public void setButtonTintList(android.content.res.ColorStateList);
+ method public void setButtonTintMode(android.graphics.PorterDuff.Mode);
+ method public void setChecked(boolean);
+ method public void setOnCheckedChangeListener(android.widget.CompoundButton.OnCheckedChangeListener);
+ method public void toggle();
+ }
+
+ public static abstract interface CompoundButton.OnCheckedChangeListener {
+ method public abstract void onCheckedChanged(android.widget.CompoundButton, boolean);
+ }
+
+ public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
+ ctor public deprecated CursorAdapter(android.content.Context, android.database.Cursor);
+ ctor public CursorAdapter(android.content.Context, android.database.Cursor, boolean);
+ ctor public CursorAdapter(android.content.Context, android.database.Cursor, int);
+ method public abstract void bindView(android.view.View, android.content.Context, android.database.Cursor);
+ method public void changeCursor(android.database.Cursor);
+ method public java.lang.CharSequence convertToString(android.database.Cursor);
+ method public int getCount();
+ method public android.database.Cursor getCursor();
+ method public android.content.res.Resources.Theme getDropDownViewTheme();
+ method public android.widget.Filter getFilter();
+ method public android.widget.FilterQueryProvider getFilterQueryProvider();
+ method public java.lang.Object getItem(int);
+ method public long getItemId(int);
+ method public android.view.View getView(int, android.view.View, android.view.ViewGroup);
+ method protected deprecated void init(android.content.Context, android.database.Cursor, boolean);
+ method public android.view.View newDropDownView(android.content.Context, android.database.Cursor, android.view.ViewGroup);
+ method public abstract android.view.View newView(android.content.Context, android.database.Cursor, android.view.ViewGroup);
+ method protected void onContentChanged();
+ method public android.database.Cursor runQueryOnBackgroundThread(java.lang.CharSequence);
+ method public void setDropDownViewTheme(android.content.res.Resources.Theme);
+ method public void setFilterQueryProvider(android.widget.FilterQueryProvider);
+ method public android.database.Cursor swapCursor(android.database.Cursor);
+ field public static final deprecated int FLAG_AUTO_REQUERY = 1; // 0x1
+ field public static final int FLAG_REGISTER_CONTENT_OBSERVER = 2; // 0x2
+ }
+
+ public abstract class CursorTreeAdapter extends android.widget.BaseExpandableListAdapter implements android.widget.Filterable {
+ ctor public CursorTreeAdapter(android.database.Cursor, android.content.Context);
+ ctor public CursorTreeAdapter(android.database.Cursor, android.content.Context, boolean);
+ method protected abstract void bindChildView(android.view.View, android.content.Context, android.database.Cursor, boolean);
+ method protected abstract void bindGroupView(android.view.View, android.content.Context, android.database.Cursor, boolean);
+ method public void changeCursor(android.database.Cursor);
+ method public java.lang.String convertToString(android.database.Cursor);
+ method public android.database.Cursor getChild(int, int);
+ method public long getChildId(int, int);
+ method public android.view.View getChildView(int, int, boolean, android.view.View, android.view.ViewGroup);
+ method public int getChildrenCount(int);
+ method protected abstract android.database.Cursor getChildrenCursor(android.database.Cursor);
+ method public android.database.Cursor getCursor();
+ method public android.widget.Filter getFilter();
+ method public android.widget.FilterQueryProvider getFilterQueryProvider();
+ method public android.database.Cursor getGroup(int);
+ method public int getGroupCount();
+ method public long getGroupId(int);
+ method public android.view.View getGroupView(int, boolean, android.view.View, android.view.ViewGroup);
+ method public boolean hasStableIds();
+ method public boolean isChildSelectable(int, int);
+ method protected abstract android.view.View newChildView(android.content.Context, android.database.Cursor, boolean, android.view.ViewGroup);
+ method protected abstract android.view.View newGroupView(android.content.Context, android.database.Cursor, boolean, android.view.ViewGroup);
+ method public void notifyDataSetChanged(boolean);
+ method public android.database.Cursor runQueryOnBackgroundThread(java.lang.CharSequence);
+ method public void setChildrenCursor(int, android.database.Cursor);
+ method public void setFilterQueryProvider(android.widget.FilterQueryProvider);
+ method public void setGroupCursor(android.database.Cursor);
+ }
+
+ public class DatePicker extends android.widget.FrameLayout {
+ ctor public DatePicker(android.content.Context);
+ ctor public DatePicker(android.content.Context, android.util.AttributeSet);
+ ctor public DatePicker(android.content.Context, android.util.AttributeSet, int);
+ ctor public DatePicker(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.widget.CalendarView getCalendarView();
+ method public boolean getCalendarViewShown();
+ method public int getDayOfMonth();
+ method public int getFirstDayOfWeek();
+ method public long getMaxDate();
+ method public long getMinDate();
+ method public int getMonth();
+ method public boolean getSpinnersShown();
+ method public int getYear();
+ method public void init(int, int, int, android.widget.DatePicker.OnDateChangedListener);
+ method public void setCalendarViewShown(boolean);
+ method public void setFirstDayOfWeek(int);
+ method public void setMaxDate(long);
+ method public void setMinDate(long);
+ method public void setSpinnersShown(boolean);
+ method public void updateDate(int, int, int);
+ }
+
+ public static abstract interface DatePicker.OnDateChangedListener {
+ method public abstract void onDateChanged(android.widget.DatePicker, int, int, int);
+ }
+
+ public class DialerFilter extends android.widget.RelativeLayout {
+ ctor public DialerFilter(android.content.Context);
+ ctor public DialerFilter(android.content.Context, android.util.AttributeSet);
+ method public void append(java.lang.String);
+ method public void clearText();
+ method public java.lang.CharSequence getDigits();
+ method public java.lang.CharSequence getFilterText();
+ method public java.lang.CharSequence getLetters();
+ method public int getMode();
+ method public boolean isQwertyKeyboard();
+ method protected void onModeChange(int, int);
+ method public void removeFilterWatcher(android.text.TextWatcher);
+ method public void setDigitsWatcher(android.text.TextWatcher);
+ method public void setFilterWatcher(android.text.TextWatcher);
+ method public void setLettersWatcher(android.text.TextWatcher);
+ method public void setMode(int);
+ field public static final int DIGITS_AND_LETTERS = 1; // 0x1
+ field public static final int DIGITS_AND_LETTERS_NO_DIGITS = 2; // 0x2
+ field public static final int DIGITS_AND_LETTERS_NO_LETTERS = 3; // 0x3
+ field public static final int DIGITS_ONLY = 4; // 0x4
+ field public static final int LETTERS_ONLY = 5; // 0x5
+ }
+
+ public deprecated class DigitalClock extends android.widget.TextView {
+ ctor public DigitalClock(android.content.Context);
+ ctor public DigitalClock(android.content.Context, android.util.AttributeSet);
+ }
+
+ public class EdgeEffect {
+ ctor public EdgeEffect(android.content.Context);
+ method public boolean draw(android.graphics.Canvas);
+ method public void finish();
+ method public int getColor();
+ method public int getMaxHeight();
+ method public boolean isFinished();
+ method public void onAbsorb(int);
+ method public void onPull(float);
+ method public void onPull(float, float);
+ method public void onRelease();
+ method public void setColor(int);
+ method public void setSize(int, int);
+ }
+
+ public class EditText extends android.widget.TextView {
+ ctor public EditText(android.content.Context);
+ ctor public EditText(android.content.Context, android.util.AttributeSet);
+ ctor public EditText(android.content.Context, android.util.AttributeSet, int);
+ ctor public EditText(android.content.Context, android.util.AttributeSet, int, int);
+ method public void extendSelection(int);
+ method public void selectAll();
+ method public void setSelection(int, int);
+ method public void setSelection(int);
+ }
+
+ public abstract interface ExpandableListAdapter {
+ method public abstract boolean areAllItemsEnabled();
+ method public abstract java.lang.Object getChild(int, int);
+ method public abstract long getChildId(int, int);
+ method public abstract android.view.View getChildView(int, int, boolean, android.view.View, android.view.ViewGroup);
+ method public abstract int getChildrenCount(int);
+ method public abstract long getCombinedChildId(long, long);
+ method public abstract long getCombinedGroupId(long);
+ method public abstract java.lang.Object getGroup(int);
+ method public abstract int getGroupCount();
+ method public abstract long getGroupId(int);
+ method public abstract android.view.View getGroupView(int, boolean, android.view.View, android.view.ViewGroup);
+ method public abstract boolean hasStableIds();
+ method public abstract boolean isChildSelectable(int, int);
+ method public abstract boolean isEmpty();
+ method public abstract void onGroupCollapsed(int);
+ method public abstract void onGroupExpanded(int);
+ method public abstract void registerDataSetObserver(android.database.DataSetObserver);
+ method public abstract void unregisterDataSetObserver(android.database.DataSetObserver);
+ }
+
+ public class ExpandableListView extends android.widget.ListView {
+ ctor public ExpandableListView(android.content.Context);
+ ctor public ExpandableListView(android.content.Context, android.util.AttributeSet);
+ ctor public ExpandableListView(android.content.Context, android.util.AttributeSet, int);
+ ctor public ExpandableListView(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean collapseGroup(int);
+ method public boolean expandGroup(int);
+ method public boolean expandGroup(int, boolean);
+ method public android.widget.ExpandableListAdapter getExpandableListAdapter();
+ method public long getExpandableListPosition(int);
+ method public int getFlatListPosition(long);
+ method public static int getPackedPositionChild(long);
+ method public static long getPackedPositionForChild(int, int);
+ method public static long getPackedPositionForGroup(int);
+ method public static int getPackedPositionGroup(long);
+ method public static int getPackedPositionType(long);
+ method public long getSelectedId();
+ method public long getSelectedPosition();
+ method public boolean isGroupExpanded(int);
+ method public void setAdapter(android.widget.ExpandableListAdapter);
+ method public void setChildDivider(android.graphics.drawable.Drawable);
+ method public void setChildIndicator(android.graphics.drawable.Drawable);
+ method public void setChildIndicatorBounds(int, int);
+ method public void setChildIndicatorBoundsRelative(int, int);
+ method public void setGroupIndicator(android.graphics.drawable.Drawable);
+ method public void setIndicatorBounds(int, int);
+ method public void setIndicatorBoundsRelative(int, int);
+ method public void setOnChildClickListener(android.widget.ExpandableListView.OnChildClickListener);
+ method public void setOnGroupClickListener(android.widget.ExpandableListView.OnGroupClickListener);
+ method public void setOnGroupCollapseListener(android.widget.ExpandableListView.OnGroupCollapseListener);
+ method public void setOnGroupExpandListener(android.widget.ExpandableListView.OnGroupExpandListener);
+ method public boolean setSelectedChild(int, int, boolean);
+ method public void setSelectedGroup(int);
+ field public static final int CHILD_INDICATOR_INHERIT = -1; // 0xffffffff
+ field public static final int PACKED_POSITION_TYPE_CHILD = 1; // 0x1
+ field public static final int PACKED_POSITION_TYPE_GROUP = 0; // 0x0
+ field public static final int PACKED_POSITION_TYPE_NULL = 2; // 0x2
+ field public static final long PACKED_POSITION_VALUE_NULL = 4294967295L; // 0xffffffffL
+ }
+
+ public static class ExpandableListView.ExpandableListContextMenuInfo implements android.view.ContextMenu.ContextMenuInfo {
+ ctor public ExpandableListView.ExpandableListContextMenuInfo(android.view.View, long, long);
+ field public long id;
+ field public long packedPosition;
+ field public android.view.View targetView;
+ }
+
+ public static abstract interface ExpandableListView.OnChildClickListener {
+ method public abstract boolean onChildClick(android.widget.ExpandableListView, android.view.View, int, int, long);
+ }
+
+ public static abstract interface ExpandableListView.OnGroupClickListener {
+ method public abstract boolean onGroupClick(android.widget.ExpandableListView, android.view.View, int, long);
+ }
+
+ public static abstract interface ExpandableListView.OnGroupCollapseListener {
+ method public abstract void onGroupCollapse(int);
+ }
+
+ public static abstract interface ExpandableListView.OnGroupExpandListener {
+ method public abstract void onGroupExpand(int);
+ }
+
+ public abstract class Filter {
+ ctor public Filter();
+ method public java.lang.CharSequence convertResultToString(java.lang.Object);
+ method public final void filter(java.lang.CharSequence);
+ method public final void filter(java.lang.CharSequence, android.widget.Filter.FilterListener);
+ method protected abstract android.widget.Filter.FilterResults performFiltering(java.lang.CharSequence);
+ method protected abstract void publishResults(java.lang.CharSequence, android.widget.Filter.FilterResults);
+ }
+
+ public static abstract interface Filter.FilterListener {
+ method public abstract void onFilterComplete(int);
+ }
+
+ protected static class Filter.FilterResults {
+ ctor public Filter.FilterResults();
+ field public int count;
+ field public java.lang.Object values;
+ }
+
+ public abstract interface FilterQueryProvider {
+ method public abstract android.database.Cursor runQuery(java.lang.CharSequence);
+ }
+
+ public abstract interface Filterable {
+ method public abstract android.widget.Filter getFilter();
+ }
+
+ public class FrameLayout extends android.view.ViewGroup {
+ ctor public FrameLayout(android.content.Context);
+ ctor public FrameLayout(android.content.Context, android.util.AttributeSet);
+ ctor public FrameLayout(android.content.Context, android.util.AttributeSet, int);
+ ctor public FrameLayout(android.content.Context, android.util.AttributeSet, int, int);
+ method public deprecated boolean getConsiderGoneChildrenWhenMeasuring();
+ method public boolean getMeasureAllChildren();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setMeasureAllChildren(boolean);
+ }
+
+ public static class FrameLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+ ctor public FrameLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public FrameLayout.LayoutParams(int, int);
+ ctor public FrameLayout.LayoutParams(int, int, int);
+ ctor public FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public FrameLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public FrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams);
+ field public int gravity;
+ }
+
+ public deprecated class Gallery extends android.widget.AbsSpinner implements android.view.GestureDetector.OnGestureListener {
+ ctor public Gallery(android.content.Context);
+ ctor public Gallery(android.content.Context, android.util.AttributeSet);
+ ctor public Gallery(android.content.Context, android.util.AttributeSet, int);
+ ctor public Gallery(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean onDown(android.view.MotionEvent);
+ method public boolean onFling(android.view.MotionEvent, android.view.MotionEvent, float, float);
+ method public void onLongPress(android.view.MotionEvent);
+ method public boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float);
+ method public void onShowPress(android.view.MotionEvent);
+ method public boolean onSingleTapUp(android.view.MotionEvent);
+ method public void setAnimationDuration(int);
+ method public void setCallbackDuringFling(boolean);
+ method public void setGravity(int);
+ method public void setSpacing(int);
+ method public void setUnselectedAlpha(float);
+ }
+
+ public static class Gallery.LayoutParams extends android.view.ViewGroup.LayoutParams {
+ ctor public Gallery.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public Gallery.LayoutParams(int, int);
+ ctor public Gallery.LayoutParams(android.view.ViewGroup.LayoutParams);
+ }
+
+ public class GridLayout extends android.view.ViewGroup {
+ ctor public GridLayout(android.content.Context);
+ ctor public GridLayout(android.content.Context, android.util.AttributeSet);
+ ctor public GridLayout(android.content.Context, android.util.AttributeSet, int);
+ ctor public GridLayout(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getAlignmentMode();
+ method public int getColumnCount();
+ method public int getOrientation();
+ method public int getRowCount();
+ method public boolean getUseDefaultMargins();
+ method public boolean isColumnOrderPreserved();
+ method public boolean isRowOrderPreserved();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setAlignmentMode(int);
+ method public void setColumnCount(int);
+ method public void setColumnOrderPreserved(boolean);
+ method public void setOrientation(int);
+ method public void setRowCount(int);
+ method public void setRowOrderPreserved(boolean);
+ method public void setUseDefaultMargins(boolean);
+ method public static android.widget.GridLayout.Spec spec(int, int, android.widget.GridLayout.Alignment, float);
+ method public static android.widget.GridLayout.Spec spec(int, android.widget.GridLayout.Alignment, float);
+ method public static android.widget.GridLayout.Spec spec(int, int, float);
+ method public static android.widget.GridLayout.Spec spec(int, float);
+ method public static android.widget.GridLayout.Spec spec(int, int, android.widget.GridLayout.Alignment);
+ method public static android.widget.GridLayout.Spec spec(int, android.widget.GridLayout.Alignment);
+ method public static android.widget.GridLayout.Spec spec(int, int);
+ method public static android.widget.GridLayout.Spec spec(int);
+ field public static final int ALIGN_BOUNDS = 0; // 0x0
+ field public static final int ALIGN_MARGINS = 1; // 0x1
+ field public static final android.widget.GridLayout.Alignment BASELINE;
+ field public static final android.widget.GridLayout.Alignment BOTTOM;
+ field public static final android.widget.GridLayout.Alignment CENTER;
+ field public static final android.widget.GridLayout.Alignment END;
+ field public static final android.widget.GridLayout.Alignment FILL;
+ field public static final int HORIZONTAL = 0; // 0x0
+ field public static final android.widget.GridLayout.Alignment LEFT;
+ field public static final android.widget.GridLayout.Alignment RIGHT;
+ field public static final android.widget.GridLayout.Alignment START;
+ field public static final android.widget.GridLayout.Alignment TOP;
+ field public static final int UNDEFINED = -2147483648; // 0x80000000
+ field public static final int VERTICAL = 1; // 0x1
+ }
+
+ public static abstract class GridLayout.Alignment {
+ }
+
+ public static class GridLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+ ctor public GridLayout.LayoutParams(android.widget.GridLayout.Spec, android.widget.GridLayout.Spec);
+ ctor public GridLayout.LayoutParams();
+ ctor public GridLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public GridLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public GridLayout.LayoutParams(android.widget.GridLayout.LayoutParams);
+ ctor public GridLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
+ method public void setGravity(int);
+ field public android.widget.GridLayout.Spec columnSpec;
+ field public android.widget.GridLayout.Spec rowSpec;
+ }
+
+ public static class GridLayout.Spec {
+ }
+
+ public class GridView extends android.widget.AbsListView {
+ ctor public GridView(android.content.Context);
+ ctor public GridView(android.content.Context, android.util.AttributeSet);
+ ctor public GridView(android.content.Context, android.util.AttributeSet, int);
+ ctor public GridView(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.widget.ListAdapter getAdapter();
+ method public int getColumnWidth();
+ method public int getGravity();
+ method public int getHorizontalSpacing();
+ method public int getNumColumns();
+ method public int getRequestedColumnWidth();
+ method public int getRequestedHorizontalSpacing();
+ method public int getStretchMode();
+ method public int getVerticalSpacing();
+ method public void setColumnWidth(int);
+ method public void setGravity(int);
+ method public void setHorizontalSpacing(int);
+ method public void setNumColumns(int);
+ method public void setSelection(int);
+ method public void setStretchMode(int);
+ method public void setVerticalSpacing(int);
+ method public void smoothScrollByOffset(int);
+ field public static final int AUTO_FIT = -1; // 0xffffffff
+ field public static final int NO_STRETCH = 0; // 0x0
+ field public static final int STRETCH_COLUMN_WIDTH = 2; // 0x2
+ field public static final int STRETCH_SPACING = 1; // 0x1
+ field public static final int STRETCH_SPACING_UNIFORM = 3; // 0x3
+ }
+
+ public class HeaderViewListAdapter implements android.widget.Filterable android.widget.WrapperListAdapter {
+ ctor public HeaderViewListAdapter(java.util.ArrayList<android.widget.ListView.FixedViewInfo>, java.util.ArrayList<android.widget.ListView.FixedViewInfo>, android.widget.ListAdapter);
+ method public boolean areAllItemsEnabled();
+ method public int getCount();
+ method public android.widget.Filter getFilter();
+ method public int getFootersCount();
+ method public int getHeadersCount();
+ method public java.lang.Object getItem(int);
+ method public long getItemId(int);
+ method public int getItemViewType(int);
+ method public android.view.View getView(int, android.view.View, android.view.ViewGroup);
+ method public int getViewTypeCount();
+ method public android.widget.ListAdapter getWrappedAdapter();
+ method public boolean hasStableIds();
+ method public boolean isEmpty();
+ method public boolean isEnabled(int);
+ method public void registerDataSetObserver(android.database.DataSetObserver);
+ method public boolean removeFooter(android.view.View);
+ method public boolean removeHeader(android.view.View);
+ method public void unregisterDataSetObserver(android.database.DataSetObserver);
+ }
+
+ public abstract interface HeterogeneousExpandableList {
+ method public abstract int getChildType(int, int);
+ method public abstract int getChildTypeCount();
+ method public abstract int getGroupType(int);
+ method public abstract int getGroupTypeCount();
+ }
+
+ public class HorizontalScrollView extends android.widget.FrameLayout {
+ ctor public HorizontalScrollView(android.content.Context);
+ ctor public HorizontalScrollView(android.content.Context, android.util.AttributeSet);
+ ctor public HorizontalScrollView(android.content.Context, android.util.AttributeSet, int);
+ ctor public HorizontalScrollView(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean arrowScroll(int);
+ method protected int computeScrollDeltaToGetChildRectOnScreen(android.graphics.Rect);
+ method public boolean executeKeyEvent(android.view.KeyEvent);
+ method public void fling(int);
+ method public boolean fullScroll(int);
+ method public int getMaxScrollAmount();
+ method public boolean isFillViewport();
+ method public boolean isSmoothScrollingEnabled();
+ method public boolean pageScroll(int);
+ method public void setFillViewport(boolean);
+ method public void setSmoothScrollingEnabled(boolean);
+ method public final void smoothScrollBy(int, int);
+ method public final void smoothScrollTo(int, int);
+ }
+
+ public class ImageButton extends android.widget.ImageView {
+ ctor public ImageButton(android.content.Context);
+ ctor public ImageButton(android.content.Context, android.util.AttributeSet);
+ ctor public ImageButton(android.content.Context, android.util.AttributeSet, int);
+ ctor public ImageButton(android.content.Context, android.util.AttributeSet, int, int);
+ }
+
+ public class ImageSwitcher extends android.widget.ViewSwitcher {
+ ctor public ImageSwitcher(android.content.Context);
+ ctor public ImageSwitcher(android.content.Context, android.util.AttributeSet);
+ method public void setImageDrawable(android.graphics.drawable.Drawable);
+ method public void setImageResource(int);
+ method public void setImageURI(android.net.Uri);
+ }
+
+ public class ImageView extends android.view.View {
+ ctor public ImageView(android.content.Context);
+ ctor public ImageView(android.content.Context, android.util.AttributeSet);
+ ctor public ImageView(android.content.Context, android.util.AttributeSet, int);
+ ctor public ImageView(android.content.Context, android.util.AttributeSet, int, int);
+ method public final void clearColorFilter();
+ method public boolean getAdjustViewBounds();
+ method public boolean getBaselineAlignBottom();
+ method public android.graphics.ColorFilter getColorFilter();
+ method public boolean getCropToPadding();
+ method public android.graphics.drawable.Drawable getDrawable();
+ method public int getImageAlpha();
+ method public android.graphics.Matrix getImageMatrix();
+ method public android.content.res.ColorStateList getImageTintList();
+ method public android.graphics.PorterDuff.Mode getImageTintMode();
+ method public int getMaxHeight();
+ method public int getMaxWidth();
+ method public android.widget.ImageView.ScaleType getScaleType();
+ method public int[] onCreateDrawableState(int);
+ method public void setAdjustViewBounds(boolean);
+ method public deprecated void setAlpha(int);
+ method public void setBaseline(int);
+ method public void setBaselineAlignBottom(boolean);
+ method public final void setColorFilter(int, android.graphics.PorterDuff.Mode);
+ method public final void setColorFilter(int);
+ method public void setColorFilter(android.graphics.ColorFilter);
+ method public void setCropToPadding(boolean);
+ method protected boolean setFrame(int, int, int, int);
+ method public void setImageAlpha(int);
+ method public void setImageBitmap(android.graphics.Bitmap);
+ method public void setImageDrawable(android.graphics.drawable.Drawable);
+ method public void setImageIcon(android.graphics.drawable.Icon);
+ method public void setImageLevel(int);
+ method public void setImageMatrix(android.graphics.Matrix);
+ method public void setImageResource(int);
+ method public void setImageState(int[], boolean);
+ method public void setImageTintList(android.content.res.ColorStateList);
+ method public void setImageTintMode(android.graphics.PorterDuff.Mode);
+ method public void setImageURI(android.net.Uri);
+ method public void setMaxHeight(int);
+ method public void setMaxWidth(int);
+ method public void setScaleType(android.widget.ImageView.ScaleType);
+ }
+
+ public static final class ImageView.ScaleType extends java.lang.Enum {
+ method public static android.widget.ImageView.ScaleType valueOf(java.lang.String);
+ method public static final android.widget.ImageView.ScaleType[] values();
+ enum_constant public static final android.widget.ImageView.ScaleType CENTER;
+ enum_constant public static final android.widget.ImageView.ScaleType CENTER_CROP;
+ enum_constant public static final android.widget.ImageView.ScaleType CENTER_INSIDE;
+ enum_constant public static final android.widget.ImageView.ScaleType FIT_CENTER;
+ enum_constant public static final android.widget.ImageView.ScaleType FIT_END;
+ enum_constant public static final android.widget.ImageView.ScaleType FIT_START;
+ enum_constant public static final android.widget.ImageView.ScaleType FIT_XY;
+ enum_constant public static final android.widget.ImageView.ScaleType MATRIX;
+ }
+
+ public class LinearLayout extends android.view.ViewGroup {
+ ctor public LinearLayout(android.content.Context);
+ ctor public LinearLayout(android.content.Context, android.util.AttributeSet);
+ ctor public LinearLayout(android.content.Context, android.util.AttributeSet, int);
+ ctor public LinearLayout(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getBaselineAlignedChildIndex();
+ method public android.graphics.drawable.Drawable getDividerDrawable();
+ method public int getDividerPadding();
+ method public int getOrientation();
+ method public int getShowDividers();
+ method public float getWeightSum();
+ method public boolean isBaselineAligned();
+ method public boolean isMeasureWithLargestChildEnabled();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setBaselineAligned(boolean);
+ method public void setBaselineAlignedChildIndex(int);
+ method public void setDividerDrawable(android.graphics.drawable.Drawable);
+ method public void setDividerPadding(int);
+ method public void setGravity(int);
+ method public void setHorizontalGravity(int);
+ method public void setMeasureWithLargestChildEnabled(boolean);
+ method public void setOrientation(int);
+ method public void setShowDividers(int);
+ method public void setVerticalGravity(int);
+ method public void setWeightSum(float);
+ field public static final int HORIZONTAL = 0; // 0x0
+ field public static final int SHOW_DIVIDER_BEGINNING = 1; // 0x1
+ field public static final int SHOW_DIVIDER_END = 4; // 0x4
+ field public static final int SHOW_DIVIDER_MIDDLE = 2; // 0x2
+ field public static final int SHOW_DIVIDER_NONE = 0; // 0x0
+ field public static final int VERTICAL = 1; // 0x1
+ }
+
+ public static class LinearLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+ ctor public LinearLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public LinearLayout.LayoutParams(int, int);
+ ctor public LinearLayout.LayoutParams(int, int, float);
+ ctor public LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public LinearLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams);
+ method public java.lang.String debug(java.lang.String);
+ field public int gravity;
+ field public float weight;
+ }
+
+ public abstract interface ListAdapter implements android.widget.Adapter {
+ method public abstract boolean areAllItemsEnabled();
+ method public abstract boolean isEnabled(int);
+ }
+
+ public class ListPopupWindow {
+ ctor public ListPopupWindow(android.content.Context);
+ ctor public ListPopupWindow(android.content.Context, android.util.AttributeSet);
+ ctor public ListPopupWindow(android.content.Context, android.util.AttributeSet, int);
+ ctor public ListPopupWindow(android.content.Context, android.util.AttributeSet, int, int);
+ method public void clearListSelection();
+ method public android.view.View.OnTouchListener createDragToOpenListener(android.view.View);
+ method public void dismiss();
+ method public android.view.View getAnchorView();
+ method public int getAnimationStyle();
+ method public android.graphics.drawable.Drawable getBackground();
+ method public int getHeight();
+ method public int getHorizontalOffset();
+ method public int getInputMethodMode();
+ method public android.widget.ListView getListView();
+ method public int getPromptPosition();
+ method public java.lang.Object getSelectedItem();
+ method public long getSelectedItemId();
+ method public int getSelectedItemPosition();
+ method public android.view.View getSelectedView();
+ method public int getSoftInputMode();
+ method public int getVerticalOffset();
+ method public int getWidth();
+ method public boolean isInputMethodNotNeeded();
+ method public boolean isModal();
+ method public boolean isShowing();
+ method public boolean onKeyDown(int, android.view.KeyEvent);
+ method public boolean onKeyPreIme(int, android.view.KeyEvent);
+ method public boolean onKeyUp(int, android.view.KeyEvent);
+ method public boolean performItemClick(int);
+ method public void postShow();
+ method public void setAdapter(android.widget.ListAdapter);
+ method public void setAnchorView(android.view.View);
+ method public void setAnimationStyle(int);
+ method public void setBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setContentWidth(int);
+ method public void setDropDownGravity(int);
+ method public void setHeight(int);
+ method public void setHorizontalOffset(int);
+ method public void setInputMethodMode(int);
+ method public void setListSelector(android.graphics.drawable.Drawable);
+ method public void setModal(boolean);
+ method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener);
+ method public void setOnItemClickListener(android.widget.AdapterView.OnItemClickListener);
+ method public void setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener);
+ method public void setPromptPosition(int);
+ method public void setPromptView(android.view.View);
+ method public void setSelection(int);
+ method public void setSoftInputMode(int);
+ method public void setVerticalOffset(int);
+ method public void setWidth(int);
+ method public void setWindowLayoutType(int);
+ method public void show();
+ field public static final int INPUT_METHOD_FROM_FOCUSABLE = 0; // 0x0
+ field public static final int INPUT_METHOD_NEEDED = 1; // 0x1
+ field public static final int INPUT_METHOD_NOT_NEEDED = 2; // 0x2
+ field public static final int MATCH_PARENT = -1; // 0xffffffff
+ field public static final int POSITION_PROMPT_ABOVE = 0; // 0x0
+ field public static final int POSITION_PROMPT_BELOW = 1; // 0x1
+ field public static final int WRAP_CONTENT = -2; // 0xfffffffe
+ }
+
+ public class ListView extends android.widget.AbsListView {
+ ctor public ListView(android.content.Context);
+ ctor public ListView(android.content.Context, android.util.AttributeSet);
+ ctor public ListView(android.content.Context, android.util.AttributeSet, int);
+ ctor public ListView(android.content.Context, android.util.AttributeSet, int, int);
+ method public void addFooterView(android.view.View, java.lang.Object, boolean);
+ method public void addFooterView(android.view.View);
+ method public void addHeaderView(android.view.View, java.lang.Object, boolean);
+ method public void addHeaderView(android.view.View);
+ method public boolean areFooterDividersEnabled();
+ method public boolean areHeaderDividersEnabled();
+ method protected android.view.View findViewTraversal(int);
+ method protected android.view.View findViewWithTagTraversal(java.lang.Object);
+ method public android.widget.ListAdapter getAdapter();
+ method public deprecated long[] getCheckItemIds();
+ method public android.graphics.drawable.Drawable getDivider();
+ method public int getDividerHeight();
+ method public int getFooterViewsCount();
+ method public int getHeaderViewsCount();
+ method public boolean getItemsCanFocus();
+ method public int getMaxScrollAmount();
+ method public android.graphics.drawable.Drawable getOverscrollFooter();
+ method public android.graphics.drawable.Drawable getOverscrollHeader();
+ method public boolean removeFooterView(android.view.View);
+ method public boolean removeHeaderView(android.view.View);
+ method public void setDivider(android.graphics.drawable.Drawable);
+ method public void setDividerHeight(int);
+ method public void setFooterDividersEnabled(boolean);
+ method public void setHeaderDividersEnabled(boolean);
+ method public void setItemsCanFocus(boolean);
+ method public void setOverscrollFooter(android.graphics.drawable.Drawable);
+ method public void setOverscrollHeader(android.graphics.drawable.Drawable);
+ method public void setSelection(int);
+ method public void setSelectionAfterHeaderView();
+ method public void smoothScrollByOffset(int);
+ }
+
+ public class ListView.FixedViewInfo {
+ ctor public ListView.FixedViewInfo();
+ field public java.lang.Object data;
+ field public boolean isSelectable;
+ field public android.view.View view;
+ }
+
+ public class MediaController extends android.widget.FrameLayout {
+ ctor public MediaController(android.content.Context, android.util.AttributeSet);
+ ctor public MediaController(android.content.Context, boolean);
+ ctor public MediaController(android.content.Context);
+ method public void hide();
+ method public boolean isShowing();
+ method public void onFinishInflate();
+ method public void setAnchorView(android.view.View);
+ method public void setMediaPlayer(android.widget.MediaController.MediaPlayerControl);
+ method public void setPrevNextListeners(android.view.View.OnClickListener, android.view.View.OnClickListener);
+ method public void show();
+ method public void show(int);
+ }
+
+ public static abstract interface MediaController.MediaPlayerControl {
+ method public abstract boolean canPause();
+ method public abstract boolean canSeekBackward();
+ method public abstract boolean canSeekForward();
+ method public abstract int getAudioSessionId();
+ method public abstract int getBufferPercentage();
+ method public abstract int getCurrentPosition();
+ method public abstract int getDuration();
+ method public abstract boolean isPlaying();
+ method public abstract void pause();
+ method public abstract void seekTo(int);
+ method public abstract void start();
+ }
+
+ public class MultiAutoCompleteTextView extends android.widget.AutoCompleteTextView {
+ ctor public MultiAutoCompleteTextView(android.content.Context);
+ ctor public MultiAutoCompleteTextView(android.content.Context, android.util.AttributeSet);
+ ctor public MultiAutoCompleteTextView(android.content.Context, android.util.AttributeSet, int);
+ ctor public MultiAutoCompleteTextView(android.content.Context, android.util.AttributeSet, int, int);
+ method protected void performFiltering(java.lang.CharSequence, int, int, int);
+ method public void setTokenizer(android.widget.MultiAutoCompleteTextView.Tokenizer);
+ }
+
+ public static class MultiAutoCompleteTextView.CommaTokenizer implements android.widget.MultiAutoCompleteTextView.Tokenizer {
+ ctor public MultiAutoCompleteTextView.CommaTokenizer();
+ method public int findTokenEnd(java.lang.CharSequence, int);
+ method public int findTokenStart(java.lang.CharSequence, int);
+ method public java.lang.CharSequence terminateToken(java.lang.CharSequence);
+ }
+
+ public static abstract interface MultiAutoCompleteTextView.Tokenizer {
+ method public abstract int findTokenEnd(java.lang.CharSequence, int);
+ method public abstract int findTokenStart(java.lang.CharSequence, int);
+ method public abstract java.lang.CharSequence terminateToken(java.lang.CharSequence);
+ }
+
+ public class NumberPicker extends android.widget.LinearLayout {
+ ctor public NumberPicker(android.content.Context);
+ ctor public NumberPicker(android.content.Context, android.util.AttributeSet);
+ ctor public NumberPicker(android.content.Context, android.util.AttributeSet, int);
+ ctor public NumberPicker(android.content.Context, android.util.AttributeSet, int, int);
+ method public java.lang.String[] getDisplayedValues();
+ method public int getMaxValue();
+ method public int getMinValue();
+ method public int getValue();
+ method public boolean getWrapSelectorWheel();
+ method public void setDisplayedValues(java.lang.String[]);
+ method public void setFormatter(android.widget.NumberPicker.Formatter);
+ method public void setMaxValue(int);
+ method public void setMinValue(int);
+ method public void setOnLongPressUpdateInterval(long);
+ method public void setOnScrollListener(android.widget.NumberPicker.OnScrollListener);
+ method public void setOnValueChangedListener(android.widget.NumberPicker.OnValueChangeListener);
+ method public void setValue(int);
+ method public void setWrapSelectorWheel(boolean);
+ }
+
+ public static abstract interface NumberPicker.Formatter {
+ method public abstract java.lang.String format(int);
+ }
+
+ public static abstract interface NumberPicker.OnScrollListener {
+ method public abstract void onScrollStateChange(android.widget.NumberPicker, int);
+ field public static final int SCROLL_STATE_FLING = 2; // 0x2
+ field public static final int SCROLL_STATE_IDLE = 0; // 0x0
+ field public static final int SCROLL_STATE_TOUCH_SCROLL = 1; // 0x1
+ }
+
+ public static abstract interface NumberPicker.OnValueChangeListener {
+ method public abstract void onValueChange(android.widget.NumberPicker, int, int);
+ }
+
+ public class OverScroller {
+ ctor public OverScroller(android.content.Context);
+ ctor public OverScroller(android.content.Context, android.view.animation.Interpolator);
+ ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
+ ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
+ method public void abortAnimation();
+ method public boolean computeScrollOffset();
+ method public void fling(int, int, int, int, int, int, int, int);
+ method public void fling(int, int, int, int, int, int, int, int, int, int);
+ method public final void forceFinished(boolean);
+ method public float getCurrVelocity();
+ method public final int getCurrX();
+ method public final int getCurrY();
+ method public final int getFinalX();
+ method public final int getFinalY();
+ method public final int getStartX();
+ method public final int getStartY();
+ method public final boolean isFinished();
+ method public boolean isOverScrolled();
+ method public void notifyHorizontalEdgeReached(int, int, int);
+ method public void notifyVerticalEdgeReached(int, int, int);
+ method public final void setFriction(float);
+ method public boolean springBack(int, int, int, int, int, int);
+ method public void startScroll(int, int, int, int);
+ method public void startScroll(int, int, int, int, int);
+ }
+
+ public class PopupMenu {
+ ctor public PopupMenu(android.content.Context, android.view.View);
+ ctor public PopupMenu(android.content.Context, android.view.View, int);
+ ctor public PopupMenu(android.content.Context, android.view.View, int, int, int);
+ method public void dismiss();
+ method public android.view.View.OnTouchListener getDragToOpenListener();
+ method public int getGravity();
+ method public android.view.Menu getMenu();
+ method public android.view.MenuInflater getMenuInflater();
+ method public void inflate(int);
+ method public void setGravity(int);
+ method public void setOnDismissListener(android.widget.PopupMenu.OnDismissListener);
+ method public void setOnMenuItemClickListener(android.widget.PopupMenu.OnMenuItemClickListener);
+ method public void show();
+ }
+
+ public static abstract interface PopupMenu.OnDismissListener {
+ method public abstract void onDismiss(android.widget.PopupMenu);
+ }
+
+ public static abstract interface PopupMenu.OnMenuItemClickListener {
+ method public abstract boolean onMenuItemClick(android.view.MenuItem);
+ }
+
+ public class PopupWindow {
+ ctor public PopupWindow(android.content.Context);
+ ctor public PopupWindow(android.content.Context, android.util.AttributeSet);
+ ctor public PopupWindow(android.content.Context, android.util.AttributeSet, int);
+ ctor public PopupWindow(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public PopupWindow();
+ ctor public PopupWindow(android.view.View);
+ ctor public PopupWindow(int, int);
+ ctor public PopupWindow(android.view.View, int, int);
+ ctor public PopupWindow(android.view.View, int, int, boolean);
+ method public void dismiss();
+ method public int getAnimationStyle();
+ method public android.graphics.drawable.Drawable getBackground();
+ method public android.view.View getContentView();
+ method public float getElevation();
+ method public int getHeight();
+ method public int getInputMethodMode();
+ method public int getMaxAvailableHeight(android.view.View);
+ method public int getMaxAvailableHeight(android.view.View, int);
+ method public int getMaxAvailableHeight(android.view.View, int, boolean);
+ method public boolean getOverlapAnchor();
+ method public int getSoftInputMode();
+ method public int getWidth();
+ method public int getWindowLayoutType();
+ method public boolean isAboveAnchor();
+ method public boolean isAttachedInDecor();
+ method public boolean isClippingEnabled();
+ method public boolean isFocusable();
+ method public boolean isOutsideTouchable();
+ method public boolean isShowing();
+ method public boolean isSplitTouchEnabled();
+ method public boolean isTouchable();
+ method public void setAnimationStyle(int);
+ method public void setAttachedInDecor(boolean);
+ method public void setBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setClippingEnabled(boolean);
+ method public void setContentView(android.view.View);
+ method public void setElevation(float);
+ method public void setEnterTransition(android.transition.Transition);
+ method public void setExitTransition(android.transition.Transition);
+ method public void setFocusable(boolean);
+ method public void setHeight(int);
+ method public void setIgnoreCheekPress();
+ method public void setInputMethodMode(int);
+ method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener);
+ method public void setOutsideTouchable(boolean);
+ method public void setOverlapAnchor(boolean);
+ method public void setSoftInputMode(int);
+ method public void setSplitTouchEnabled(boolean);
+ method public void setTouchInterceptor(android.view.View.OnTouchListener);
+ method public void setTouchable(boolean);
+ method public void setWidth(int);
+ method public deprecated void setWindowLayoutMode(int, int);
+ method public void setWindowLayoutType(int);
+ method public void showAsDropDown(android.view.View);
+ method public void showAsDropDown(android.view.View, int, int);
+ method public void showAsDropDown(android.view.View, int, int, int);
+ method public void showAtLocation(android.view.View, int, int, int);
+ method public void update();
+ method public void update(int, int);
+ method public void update(int, int, int, int);
+ method public void update(int, int, int, int, boolean);
+ method public void update(android.view.View, int, int);
+ method public void update(android.view.View, int, int, int, int);
+ field public static final int INPUT_METHOD_FROM_FOCUSABLE = 0; // 0x0
+ field public static final int INPUT_METHOD_NEEDED = 1; // 0x1
+ field public static final int INPUT_METHOD_NOT_NEEDED = 2; // 0x2
+ }
+
+ public static abstract interface PopupWindow.OnDismissListener {
+ method public abstract void onDismiss();
+ }
+
+ public class ProgressBar extends android.view.View {
+ ctor public ProgressBar(android.content.Context);
+ ctor public ProgressBar(android.content.Context, android.util.AttributeSet);
+ ctor public ProgressBar(android.content.Context, android.util.AttributeSet, int);
+ ctor public ProgressBar(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.graphics.drawable.Drawable getIndeterminateDrawable();
+ method public android.content.res.ColorStateList getIndeterminateTintList();
+ method public android.graphics.PorterDuff.Mode getIndeterminateTintMode();
+ method public android.view.animation.Interpolator getInterpolator();
+ method public synchronized int getMax();
+ method public synchronized int getProgress();
+ method public android.content.res.ColorStateList getProgressBackgroundTintList();
+ method public android.graphics.PorterDuff.Mode getProgressBackgroundTintMode();
+ method public android.graphics.drawable.Drawable getProgressDrawable();
+ method public android.content.res.ColorStateList getProgressTintList();
+ method public android.graphics.PorterDuff.Mode getProgressTintMode();
+ method public synchronized int getSecondaryProgress();
+ method public android.content.res.ColorStateList getSecondaryProgressTintList();
+ method public android.graphics.PorterDuff.Mode getSecondaryProgressTintMode();
+ method public final synchronized void incrementProgressBy(int);
+ method public final synchronized void incrementSecondaryProgressBy(int);
+ method public synchronized boolean isIndeterminate();
+ method public void onRestoreInstanceState(android.os.Parcelable);
+ method public android.os.Parcelable onSaveInstanceState();
+ method public synchronized void setIndeterminate(boolean);
+ method public void setIndeterminateDrawable(android.graphics.drawable.Drawable);
+ method public void setIndeterminateDrawableTiled(android.graphics.drawable.Drawable);
+ method public void setIndeterminateTintList(android.content.res.ColorStateList);
+ method public void setIndeterminateTintMode(android.graphics.PorterDuff.Mode);
+ method public void setInterpolator(android.content.Context, int);
+ method public void setInterpolator(android.view.animation.Interpolator);
+ method public synchronized void setMax(int);
+ method public synchronized void setProgress(int);
+ method public void setProgress(int, boolean);
+ method public void setProgressBackgroundTintList(android.content.res.ColorStateList);
+ method public void setProgressBackgroundTintMode(android.graphics.PorterDuff.Mode);
+ method public void setProgressDrawable(android.graphics.drawable.Drawable);
+ method public void setProgressDrawableTiled(android.graphics.drawable.Drawable);
+ method public void setProgressTintList(android.content.res.ColorStateList);
+ method public void setProgressTintMode(android.graphics.PorterDuff.Mode);
+ method public synchronized void setSecondaryProgress(int);
+ method public void setSecondaryProgressTintList(android.content.res.ColorStateList);
+ method public void setSecondaryProgressTintMode(android.graphics.PorterDuff.Mode);
+ }
+
+ public class QuickContactBadge extends android.widget.ImageView implements android.view.View.OnClickListener {
+ ctor public QuickContactBadge(android.content.Context);
+ ctor public QuickContactBadge(android.content.Context, android.util.AttributeSet);
+ ctor public QuickContactBadge(android.content.Context, android.util.AttributeSet, int);
+ ctor public QuickContactBadge(android.content.Context, android.util.AttributeSet, int, int);
+ method public void assignContactFromEmail(java.lang.String, boolean);
+ method public void assignContactFromEmail(java.lang.String, boolean, android.os.Bundle);
+ method public void assignContactFromPhone(java.lang.String, boolean);
+ method public void assignContactFromPhone(java.lang.String, boolean, android.os.Bundle);
+ method public void assignContactUri(android.net.Uri);
+ method public void onClick(android.view.View);
+ method public void setExcludeMimes(java.lang.String[]);
+ method public void setImageToDefault();
+ method public void setMode(int);
+ method public void setOverlay(android.graphics.drawable.Drawable);
+ method public void setPrioritizedMimeType(java.lang.String);
+ field protected java.lang.String[] mExcludeMimes;
+ }
+
+ public class RadioButton extends android.widget.CompoundButton {
+ ctor public RadioButton(android.content.Context);
+ ctor public RadioButton(android.content.Context, android.util.AttributeSet);
+ ctor public RadioButton(android.content.Context, android.util.AttributeSet, int);
+ ctor public RadioButton(android.content.Context, android.util.AttributeSet, int, int);
+ }
+
+ public class RadioGroup extends android.widget.LinearLayout {
+ ctor public RadioGroup(android.content.Context);
+ ctor public RadioGroup(android.content.Context, android.util.AttributeSet);
+ method public void check(int);
+ method public void clearCheck();
+ method public int getCheckedRadioButtonId();
+ method public void setOnCheckedChangeListener(android.widget.RadioGroup.OnCheckedChangeListener);
+ }
+
+ public static class RadioGroup.LayoutParams extends android.widget.LinearLayout.LayoutParams {
+ ctor public RadioGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public RadioGroup.LayoutParams(int, int);
+ ctor public RadioGroup.LayoutParams(int, int, float);
+ ctor public RadioGroup.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public RadioGroup.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ }
+
+ public static abstract interface RadioGroup.OnCheckedChangeListener {
+ method public abstract void onCheckedChanged(android.widget.RadioGroup, int);
+ }
+
+ public class RatingBar extends android.widget.AbsSeekBar {
+ ctor public RatingBar(android.content.Context, android.util.AttributeSet, int);
+ ctor public RatingBar(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public RatingBar(android.content.Context, android.util.AttributeSet);
+ ctor public RatingBar(android.content.Context);
+ method public int getNumStars();
+ method public android.widget.RatingBar.OnRatingBarChangeListener getOnRatingBarChangeListener();
+ method public float getRating();
+ method public float getStepSize();
+ method public boolean isIndicator();
+ method public void setIsIndicator(boolean);
+ method public void setNumStars(int);
+ method public void setOnRatingBarChangeListener(android.widget.RatingBar.OnRatingBarChangeListener);
+ method public void setRating(float);
+ method public void setStepSize(float);
+ }
+
+ public static abstract interface RatingBar.OnRatingBarChangeListener {
+ method public abstract void onRatingChanged(android.widget.RatingBar, float, boolean);
+ }
+
+ public class RelativeLayout extends android.view.ViewGroup {
+ ctor public RelativeLayout(android.content.Context);
+ ctor public RelativeLayout(android.content.Context, android.util.AttributeSet);
+ ctor public RelativeLayout(android.content.Context, android.util.AttributeSet, int);
+ ctor public RelativeLayout(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getGravity();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setGravity(int);
+ method public void setHorizontalGravity(int);
+ method public void setIgnoreGravity(int);
+ method public void setVerticalGravity(int);
+ field public static final int ABOVE = 2; // 0x2
+ field public static final int ALIGN_BASELINE = 4; // 0x4
+ field public static final int ALIGN_BOTTOM = 8; // 0x8
+ field public static final int ALIGN_END = 19; // 0x13
+ field public static final int ALIGN_LEFT = 5; // 0x5
+ field public static final int ALIGN_PARENT_BOTTOM = 12; // 0xc
+ field public static final int ALIGN_PARENT_END = 21; // 0x15
+ field public static final int ALIGN_PARENT_LEFT = 9; // 0x9
+ field public static final int ALIGN_PARENT_RIGHT = 11; // 0xb
+ field public static final int ALIGN_PARENT_START = 20; // 0x14
+ field public static final int ALIGN_PARENT_TOP = 10; // 0xa
+ field public static final int ALIGN_RIGHT = 7; // 0x7
+ field public static final int ALIGN_START = 18; // 0x12
+ field public static final int ALIGN_TOP = 6; // 0x6
+ field public static final int BELOW = 3; // 0x3
+ field public static final int CENTER_HORIZONTAL = 14; // 0xe
+ field public static final int CENTER_IN_PARENT = 13; // 0xd
+ field public static final int CENTER_VERTICAL = 15; // 0xf
+ field public static final int END_OF = 17; // 0x11
+ field public static final int LEFT_OF = 0; // 0x0
+ field public static final int RIGHT_OF = 1; // 0x1
+ field public static final int START_OF = 16; // 0x10
+ field public static final int TRUE = -1; // 0xffffffff
+ }
+
+ public static class RelativeLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+ ctor public RelativeLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public RelativeLayout.LayoutParams(int, int);
+ ctor public RelativeLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public RelativeLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public RelativeLayout.LayoutParams(android.widget.RelativeLayout.LayoutParams);
+ method public void addRule(int);
+ method public void addRule(int, int);
+ method public java.lang.String debug(java.lang.String);
+ method public int getRule(int);
+ method public int[] getRules();
+ method public void removeRule(int);
+ field public boolean alignWithParent;
+ }
+
+ public class RemoteViews implements android.view.LayoutInflater.Filter android.os.Parcelable {
+ ctor public RemoteViews(java.lang.String, int);
+ ctor public RemoteViews(android.widget.RemoteViews, android.widget.RemoteViews);
+ ctor public RemoteViews(android.os.Parcel);
+ method public void addView(int, android.widget.RemoteViews);
+ method public android.view.View apply(android.content.Context, android.view.ViewGroup);
+ method public android.widget.RemoteViews clone();
+ method public int describeContents();
+ method public int getLayoutId();
+ method public java.lang.String getPackage();
+ method public boolean onLoadClass(java.lang.Class);
+ method public void reapply(android.content.Context, android.view.View);
+ method public void removeAllViews(int);
+ method public void setAccessibilityTraversalAfter(int, int);
+ method public void setAccessibilityTraversalBefore(int, int);
+ method public void setBitmap(int, java.lang.String, android.graphics.Bitmap);
+ method public void setBoolean(int, java.lang.String, boolean);
+ method public void setBundle(int, java.lang.String, android.os.Bundle);
+ method public void setByte(int, java.lang.String, byte);
+ method public void setChar(int, java.lang.String, char);
+ method public void setCharSequence(int, java.lang.String, java.lang.CharSequence);
+ method public void setChronometer(int, long, java.lang.String, boolean);
+ method public void setContentDescription(int, java.lang.CharSequence);
+ method public void setDisplayedChild(int, int);
+ method public void setDouble(int, java.lang.String, double);
+ method public void setEmptyView(int, int);
+ method public void setFloat(int, java.lang.String, float);
+ method public void setIcon(int, java.lang.String, android.graphics.drawable.Icon);
+ method public void setImageViewBitmap(int, android.graphics.Bitmap);
+ method public void setImageViewIcon(int, android.graphics.drawable.Icon);
+ method public void setImageViewResource(int, int);
+ method public void setImageViewUri(int, android.net.Uri);
+ method public void setInt(int, java.lang.String, int);
+ method public void setIntent(int, java.lang.String, android.content.Intent);
+ method public void setLabelFor(int, int);
+ method public void setLong(int, java.lang.String, long);
+ method public void setOnClickFillInIntent(int, android.content.Intent);
+ method public void setOnClickPendingIntent(int, android.app.PendingIntent);
+ method public void setPendingIntentTemplate(int, android.app.PendingIntent);
+ method public void setProgressBar(int, int, int, boolean);
+ method public void setRelativeScrollPosition(int, int);
+ method public deprecated void setRemoteAdapter(int, int, android.content.Intent);
+ method public void setRemoteAdapter(int, android.content.Intent);
+ method public void setScrollPosition(int, int);
+ method public void setShort(int, java.lang.String, short);
+ method public void setString(int, java.lang.String, java.lang.String);
+ method public void setTextColor(int, int);
+ method public void setTextViewCompoundDrawables(int, int, int, int, int);
+ method public void setTextViewCompoundDrawablesRelative(int, int, int, int, int);
+ method public void setTextViewText(int, java.lang.CharSequence);
+ method public void setTextViewTextSize(int, int, float);
+ method public void setUri(int, java.lang.String, android.net.Uri);
+ method public void setViewPadding(int, int, int, int, int);
+ method public void setViewVisibility(int, int);
+ method public void showNext(int);
+ method public void showPrevious(int);
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.widget.RemoteViews> CREATOR;
+ }
+
+ public static class RemoteViews.ActionException extends java.lang.RuntimeException {
+ ctor public RemoteViews.ActionException(java.lang.Exception);
+ ctor public RemoteViews.ActionException(java.lang.String);
+ }
+
+ public static abstract class RemoteViews.RemoteView implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class RemoteViewsService extends android.app.Service {
+ ctor public RemoteViewsService();
+ method public android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.widget.RemoteViewsService.RemoteViewsFactory onGetViewFactory(android.content.Intent);
+ }
+
+ public static abstract interface RemoteViewsService.RemoteViewsFactory {
+ method public abstract int getCount();
+ method public abstract long getItemId(int);
+ method public abstract android.widget.RemoteViews getLoadingView();
+ method public abstract android.widget.RemoteViews getViewAt(int);
+ method public abstract int getViewTypeCount();
+ method public abstract boolean hasStableIds();
+ method public abstract void onCreate();
+ method public abstract void onDataSetChanged();
+ method public abstract void onDestroy();
+ }
+
+ public abstract class ResourceCursorAdapter extends android.widget.CursorAdapter {
+ ctor public deprecated ResourceCursorAdapter(android.content.Context, int, android.database.Cursor);
+ ctor public ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, boolean);
+ ctor public ResourceCursorAdapter(android.content.Context, int, android.database.Cursor, int);
+ method public android.view.View newView(android.content.Context, android.database.Cursor, android.view.ViewGroup);
+ method public void setDropDownViewResource(int);
+ method public void setViewResource(int);
+ }
+
+ public abstract class ResourceCursorTreeAdapter extends android.widget.CursorTreeAdapter {
+ ctor public ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, int, int);
+ ctor public ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, int);
+ ctor public ResourceCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int);
+ method public android.view.View newChildView(android.content.Context, android.database.Cursor, boolean, android.view.ViewGroup);
+ method public android.view.View newGroupView(android.content.Context, android.database.Cursor, boolean, android.view.ViewGroup);
+ }
+
+ public class ScrollView extends android.widget.FrameLayout {
+ ctor public ScrollView(android.content.Context);
+ ctor public ScrollView(android.content.Context, android.util.AttributeSet);
+ ctor public ScrollView(android.content.Context, android.util.AttributeSet, int);
+ ctor public ScrollView(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean arrowScroll(int);
+ method protected int computeScrollDeltaToGetChildRectOnScreen(android.graphics.Rect);
+ method public boolean executeKeyEvent(android.view.KeyEvent);
+ method public void fling(int);
+ method public boolean fullScroll(int);
+ method public int getMaxScrollAmount();
+ method public boolean isFillViewport();
+ method public boolean isSmoothScrollingEnabled();
+ method public boolean pageScroll(int);
+ method public void setFillViewport(boolean);
+ method public void setSmoothScrollingEnabled(boolean);
+ method public final void smoothScrollBy(int, int);
+ method public final void smoothScrollTo(int, int);
+ }
+
+ public class Scroller {
+ ctor public Scroller(android.content.Context);
+ ctor public Scroller(android.content.Context, android.view.animation.Interpolator);
+ ctor public Scroller(android.content.Context, android.view.animation.Interpolator, boolean);
+ method public void abortAnimation();
+ method public boolean computeScrollOffset();
+ method public void extendDuration(int);
+ method public void fling(int, int, int, int, int, int, int, int);
+ method public final void forceFinished(boolean);
+ method public float getCurrVelocity();
+ method public final int getCurrX();
+ method public final int getCurrY();
+ method public final int getDuration();
+ method public final int getFinalX();
+ method public final int getFinalY();
+ method public final int getStartX();
+ method public final int getStartY();
+ method public final boolean isFinished();
+ method public void setFinalX(int);
+ method public void setFinalY(int);
+ method public final void setFriction(float);
+ method public void startScroll(int, int, int, int);
+ method public void startScroll(int, int, int, int, int);
+ method public int timePassed();
+ }
+
+ public class SearchView extends android.widget.LinearLayout implements android.view.CollapsibleActionView {
+ ctor public SearchView(android.content.Context);
+ ctor public SearchView(android.content.Context, android.util.AttributeSet);
+ ctor public SearchView(android.content.Context, android.util.AttributeSet, int);
+ ctor public SearchView(android.content.Context, android.util.AttributeSet, int, int);
+ method public int getImeOptions();
+ method public int getInputType();
+ method public int getMaxWidth();
+ method public java.lang.CharSequence getQuery();
+ method public java.lang.CharSequence getQueryHint();
+ method public android.widget.CursorAdapter getSuggestionsAdapter();
+ method public boolean isIconfiedByDefault();
+ method public boolean isIconified();
+ method public boolean isQueryRefinementEnabled();
+ method public boolean isSubmitButtonEnabled();
+ method public void onActionViewCollapsed();
+ method public void onActionViewExpanded();
+ method public void setIconified(boolean);
+ method public void setIconifiedByDefault(boolean);
+ method public void setImeOptions(int);
+ method public void setInputType(int);
+ method public void setMaxWidth(int);
+ method public void setOnCloseListener(android.widget.SearchView.OnCloseListener);
+ method public void setOnQueryTextFocusChangeListener(android.view.View.OnFocusChangeListener);
+ method public void setOnQueryTextListener(android.widget.SearchView.OnQueryTextListener);
+ method public void setOnSearchClickListener(android.view.View.OnClickListener);
+ method public void setOnSuggestionListener(android.widget.SearchView.OnSuggestionListener);
+ method public void setQuery(java.lang.CharSequence, boolean);
+ method public void setQueryHint(java.lang.CharSequence);
+ method public void setQueryRefinementEnabled(boolean);
+ method public void setSearchableInfo(android.app.SearchableInfo);
+ method public void setSubmitButtonEnabled(boolean);
+ method public void setSuggestionsAdapter(android.widget.CursorAdapter);
+ }
+
+ public static abstract interface SearchView.OnCloseListener {
+ method public abstract boolean onClose();
+ }
+
+ public static abstract interface SearchView.OnQueryTextListener {
+ method public abstract boolean onQueryTextChange(java.lang.String);
+ method public abstract boolean onQueryTextSubmit(java.lang.String);
+ }
+
+ public static abstract interface SearchView.OnSuggestionListener {
+ method public abstract boolean onSuggestionClick(int);
+ method public abstract boolean onSuggestionSelect(int);
+ }
+
+ public abstract interface SectionIndexer {
+ method public abstract int getPositionForSection(int);
+ method public abstract int getSectionForPosition(int);
+ method public abstract java.lang.Object[] getSections();
+ }
+
+ public class SeekBar extends android.widget.AbsSeekBar {
+ ctor public SeekBar(android.content.Context);
+ ctor public SeekBar(android.content.Context, android.util.AttributeSet);
+ ctor public SeekBar(android.content.Context, android.util.AttributeSet, int);
+ ctor public SeekBar(android.content.Context, android.util.AttributeSet, int, int);
+ method public void setOnSeekBarChangeListener(android.widget.SeekBar.OnSeekBarChangeListener);
+ }
+
+ public static abstract interface SeekBar.OnSeekBarChangeListener {
+ method public abstract void onProgressChanged(android.widget.SeekBar, int, boolean);
+ method public abstract void onStartTrackingTouch(android.widget.SeekBar);
+ method public abstract void onStopTrackingTouch(android.widget.SeekBar);
+ }
+
+ public class ShareActionProvider extends android.view.ActionProvider {
+ ctor public ShareActionProvider(android.content.Context);
+ method public android.view.View onCreateActionView();
+ method public void setOnShareTargetSelectedListener(android.widget.ShareActionProvider.OnShareTargetSelectedListener);
+ method public void setShareHistoryFileName(java.lang.String);
+ method public void setShareIntent(android.content.Intent);
+ field public static final java.lang.String DEFAULT_SHARE_HISTORY_FILE_NAME = "share_history.xml";
+ }
+
+ public static abstract interface ShareActionProvider.OnShareTargetSelectedListener {
+ method public abstract boolean onShareTargetSelected(android.widget.ShareActionProvider, android.content.Intent);
+ }
+
+ public class SimpleAdapter extends android.widget.BaseAdapter implements android.widget.Filterable android.widget.ThemedSpinnerAdapter {
+ ctor public SimpleAdapter(android.content.Context, java.util.List<? extends java.util.Map<java.lang.String, ?>>, int, java.lang.String[], int[]);
+ method public int getCount();
+ method public android.content.res.Resources.Theme getDropDownViewTheme();
+ method public android.widget.Filter getFilter();
+ method public java.lang.Object getItem(int);
+ method public long getItemId(int);
+ method public android.view.View getView(int, android.view.View, android.view.ViewGroup);
+ method public android.widget.SimpleAdapter.ViewBinder getViewBinder();
+ method public void setDropDownViewResource(int);
+ method public void setDropDownViewTheme(android.content.res.Resources.Theme);
+ method public void setViewBinder(android.widget.SimpleAdapter.ViewBinder);
+ method public void setViewImage(android.widget.ImageView, int);
+ method public void setViewImage(android.widget.ImageView, java.lang.String);
+ method public void setViewText(android.widget.TextView, java.lang.String);
+ }
+
+ public static abstract interface SimpleAdapter.ViewBinder {
+ method public abstract boolean setViewValue(android.view.View, java.lang.Object, java.lang.String);
+ }
+
+ public class SimpleCursorAdapter extends android.widget.ResourceCursorAdapter {
+ ctor public deprecated SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[]);
+ ctor public SimpleCursorAdapter(android.content.Context, int, android.database.Cursor, java.lang.String[], int[], int);
+ method public void bindView(android.view.View, android.content.Context, android.database.Cursor);
+ method public void changeCursorAndColumns(android.database.Cursor, java.lang.String[], int[]);
+ method public android.widget.SimpleCursorAdapter.CursorToStringConverter getCursorToStringConverter();
+ method public int getStringConversionColumn();
+ method public android.widget.SimpleCursorAdapter.ViewBinder getViewBinder();
+ method public void setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter);
+ method public void setStringConversionColumn(int);
+ method public void setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder);
+ method public void setViewImage(android.widget.ImageView, java.lang.String);
+ method public void setViewText(android.widget.TextView, java.lang.String);
+ }
+
+ public static abstract interface SimpleCursorAdapter.CursorToStringConverter {
+ method public abstract java.lang.CharSequence convertToString(android.database.Cursor);
+ }
+
+ public static abstract interface SimpleCursorAdapter.ViewBinder {
+ method public abstract boolean setViewValue(android.view.View, android.database.Cursor, int);
+ }
+
+ public abstract class SimpleCursorTreeAdapter extends android.widget.ResourceCursorTreeAdapter {
+ ctor public SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, java.lang.String[], int[], int, int, java.lang.String[], int[]);
+ ctor public SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, int, java.lang.String[], int[], int, java.lang.String[], int[]);
+ ctor public SimpleCursorTreeAdapter(android.content.Context, android.database.Cursor, int, java.lang.String[], int[], int, java.lang.String[], int[]);
+ method protected void bindChildView(android.view.View, android.content.Context, android.database.Cursor, boolean);
+ method protected void bindGroupView(android.view.View, android.content.Context, android.database.Cursor, boolean);
+ method public android.widget.SimpleCursorTreeAdapter.ViewBinder getViewBinder();
+ method public void setViewBinder(android.widget.SimpleCursorTreeAdapter.ViewBinder);
+ method protected void setViewImage(android.widget.ImageView, java.lang.String);
+ method public void setViewText(android.widget.TextView, java.lang.String);
+ }
+
+ public static abstract interface SimpleCursorTreeAdapter.ViewBinder {
+ method public abstract boolean setViewValue(android.view.View, android.database.Cursor, int);
+ }
+
+ public class SimpleExpandableListAdapter extends android.widget.BaseExpandableListAdapter {
+ ctor public SimpleExpandableListAdapter(android.content.Context, java.util.List<? extends java.util.Map<java.lang.String, ?>>, int, java.lang.String[], int[], java.util.List<? extends java.util.List<? extends java.util.Map<java.lang.String, ?>>>, int, java.lang.String[], int[]);
+ ctor public SimpleExpandableListAdapter(android.content.Context, java.util.List<? extends java.util.Map<java.lang.String, ?>>, int, int, java.lang.String[], int[], java.util.List<? extends java.util.List<? extends java.util.Map<java.lang.String, ?>>>, int, java.lang.String[], int[]);
+ ctor public SimpleExpandableListAdapter(android.content.Context, java.util.List<? extends java.util.Map<java.lang.String, ?>>, int, int, java.lang.String[], int[], java.util.List<? extends java.util.List<? extends java.util.Map<java.lang.String, ?>>>, int, int, java.lang.String[], int[]);
+ method public java.lang.Object getChild(int, int);
+ method public long getChildId(int, int);
+ method public android.view.View getChildView(int, int, boolean, android.view.View, android.view.ViewGroup);
+ method public int getChildrenCount(int);
+ method public java.lang.Object getGroup(int);
+ method public int getGroupCount();
+ method public long getGroupId(int);
+ method public android.view.View getGroupView(int, boolean, android.view.View, android.view.ViewGroup);
+ method public boolean hasStableIds();
+ method public boolean isChildSelectable(int, int);
+ method public android.view.View newChildView(boolean, android.view.ViewGroup);
+ method public android.view.View newGroupView(boolean, android.view.ViewGroup);
+ }
+
+ public deprecated class SlidingDrawer extends android.view.ViewGroup {
+ ctor public SlidingDrawer(android.content.Context, android.util.AttributeSet);
+ ctor public SlidingDrawer(android.content.Context, android.util.AttributeSet, int);
+ ctor public SlidingDrawer(android.content.Context, android.util.AttributeSet, int, int);
+ method public void animateClose();
+ method public void animateOpen();
+ method public void animateToggle();
+ method public void close();
+ method public android.view.View getContent();
+ method public android.view.View getHandle();
+ method public boolean isMoving();
+ method public boolean isOpened();
+ method public void lock();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void open();
+ method public void setOnDrawerCloseListener(android.widget.SlidingDrawer.OnDrawerCloseListener);
+ method public void setOnDrawerOpenListener(android.widget.SlidingDrawer.OnDrawerOpenListener);
+ method public void setOnDrawerScrollListener(android.widget.SlidingDrawer.OnDrawerScrollListener);
+ method public void toggle();
+ method public void unlock();
+ field public static final int ORIENTATION_HORIZONTAL = 0; // 0x0
+ field public static final int ORIENTATION_VERTICAL = 1; // 0x1
+ }
+
+ public static abstract interface SlidingDrawer.OnDrawerCloseListener {
+ method public abstract void onDrawerClosed();
+ }
+
+ public static abstract interface SlidingDrawer.OnDrawerOpenListener {
+ method public abstract void onDrawerOpened();
+ }
+
+ public static abstract interface SlidingDrawer.OnDrawerScrollListener {
+ method public abstract void onScrollEnded();
+ method public abstract void onScrollStarted();
+ }
+
+ public final class Space extends android.view.View {
+ ctor public Space(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public Space(android.content.Context, android.util.AttributeSet, int);
+ ctor public Space(android.content.Context, android.util.AttributeSet);
+ ctor public Space(android.content.Context);
+ }
+
+ public class Spinner extends android.widget.AbsSpinner implements android.content.DialogInterface.OnClickListener {
+ ctor public Spinner(android.content.Context);
+ ctor public Spinner(android.content.Context, int);
+ ctor public Spinner(android.content.Context, android.util.AttributeSet);
+ ctor public Spinner(android.content.Context, android.util.AttributeSet, int);
+ ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int);
+ ctor public Spinner(android.content.Context, android.util.AttributeSet, int, int, int, android.content.res.Resources.Theme);
+ method public int getDropDownHorizontalOffset();
+ method public int getDropDownVerticalOffset();
+ method public int getDropDownWidth();
+ method public int getGravity();
+ method public android.graphics.drawable.Drawable getPopupBackground();
+ method public android.content.Context getPopupContext();
+ method public java.lang.CharSequence getPrompt();
+ method public void onClick(android.content.DialogInterface, int);
+ method public void setDropDownHorizontalOffset(int);
+ method public void setDropDownVerticalOffset(int);
+ method public void setDropDownWidth(int);
+ method public void setGravity(int);
+ method public void setPopupBackgroundDrawable(android.graphics.drawable.Drawable);
+ method public void setPopupBackgroundResource(int);
+ method public void setPrompt(java.lang.CharSequence);
+ method public void setPromptId(int);
+ field public static final int MODE_DIALOG = 0; // 0x0
+ field public static final int MODE_DROPDOWN = 1; // 0x1
+ }
+
+ public abstract interface SpinnerAdapter implements android.widget.Adapter {
+ method public abstract android.view.View getDropDownView(int, android.view.View, android.view.ViewGroup);
+ }
+
+ public class StackView extends android.widget.AdapterViewAnimator {
+ ctor public StackView(android.content.Context);
+ ctor public StackView(android.content.Context, android.util.AttributeSet);
+ ctor public StackView(android.content.Context, android.util.AttributeSet, int);
+ ctor public StackView(android.content.Context, android.util.AttributeSet, int, int);
+ }
+
+ public class Switch extends android.widget.CompoundButton {
+ ctor public Switch(android.content.Context);
+ ctor public Switch(android.content.Context, android.util.AttributeSet);
+ ctor public Switch(android.content.Context, android.util.AttributeSet, int);
+ ctor public Switch(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean getShowText();
+ method public boolean getSplitTrack();
+ method public int getSwitchMinWidth();
+ method public int getSwitchPadding();
+ method public java.lang.CharSequence getTextOff();
+ method public java.lang.CharSequence getTextOn();
+ method public android.graphics.drawable.Drawable getThumbDrawable();
+ method public int getThumbTextPadding();
+ method public android.content.res.ColorStateList getThumbTintList();
+ method public android.graphics.PorterDuff.Mode getThumbTintMode();
+ method public android.graphics.drawable.Drawable getTrackDrawable();
+ method public android.content.res.ColorStateList getTrackTintList();
+ method public android.graphics.PorterDuff.Mode getTrackTintMode();
+ method public void onMeasure(int, int);
+ method public void setShowText(boolean);
+ method public void setSplitTrack(boolean);
+ method public void setSwitchMinWidth(int);
+ method public void setSwitchPadding(int);
+ method public void setSwitchTextAppearance(android.content.Context, int);
+ method public void setSwitchTypeface(android.graphics.Typeface, int);
+ method public void setSwitchTypeface(android.graphics.Typeface);
+ method public void setTextOff(java.lang.CharSequence);
+ method public void setTextOn(java.lang.CharSequence);
+ method public void setThumbDrawable(android.graphics.drawable.Drawable);
+ method public void setThumbResource(int);
+ method public void setThumbTextPadding(int);
+ method public void setThumbTintList(android.content.res.ColorStateList);
+ method public void setThumbTintMode(android.graphics.PorterDuff.Mode);
+ method public void setTrackDrawable(android.graphics.drawable.Drawable);
+ method public void setTrackResource(int);
+ method public void setTrackTintList(android.content.res.ColorStateList);
+ method public void setTrackTintMode(android.graphics.PorterDuff.Mode);
+ }
+
+ public class TabHost extends android.widget.FrameLayout implements android.view.ViewTreeObserver.OnTouchModeChangeListener {
+ ctor public TabHost(android.content.Context);
+ ctor public TabHost(android.content.Context, android.util.AttributeSet);
+ ctor public TabHost(android.content.Context, android.util.AttributeSet, int);
+ ctor public TabHost(android.content.Context, android.util.AttributeSet, int, int);
+ method public void addTab(android.widget.TabHost.TabSpec);
+ method public void clearAllTabs();
+ method public int getCurrentTab();
+ method public java.lang.String getCurrentTabTag();
+ method public android.view.View getCurrentTabView();
+ method public android.view.View getCurrentView();
+ method public android.widget.FrameLayout getTabContentView();
+ method public android.widget.TabWidget getTabWidget();
+ method public android.widget.TabHost.TabSpec newTabSpec(java.lang.String);
+ method public void onTouchModeChanged(boolean);
+ method public void setCurrentTab(int);
+ method public void setCurrentTabByTag(java.lang.String);
+ method public void setOnTabChangedListener(android.widget.TabHost.OnTabChangeListener);
+ method public void setup();
+ method public void setup(android.app.LocalActivityManager);
+ }
+
+ public static abstract interface TabHost.OnTabChangeListener {
+ method public abstract void onTabChanged(java.lang.String);
+ }
+
+ public static abstract interface TabHost.TabContentFactory {
+ method public abstract android.view.View createTabContent(java.lang.String);
+ }
+
+ public class TabHost.TabSpec {
+ method public java.lang.String getTag();
+ method public android.widget.TabHost.TabSpec setContent(int);
+ method public android.widget.TabHost.TabSpec setContent(android.widget.TabHost.TabContentFactory);
+ method public android.widget.TabHost.TabSpec setContent(android.content.Intent);
+ method public android.widget.TabHost.TabSpec setIndicator(java.lang.CharSequence);
+ method public android.widget.TabHost.TabSpec setIndicator(java.lang.CharSequence, android.graphics.drawable.Drawable);
+ method public android.widget.TabHost.TabSpec setIndicator(android.view.View);
+ }
+
+ public class TabWidget extends android.widget.LinearLayout implements android.view.View.OnFocusChangeListener {
+ ctor public TabWidget(android.content.Context);
+ ctor public TabWidget(android.content.Context, android.util.AttributeSet);
+ ctor public TabWidget(android.content.Context, android.util.AttributeSet, int);
+ ctor public TabWidget(android.content.Context, android.util.AttributeSet, int, int);
+ method public void dispatchDraw(android.graphics.Canvas);
+ method public void focusCurrentTab(int);
+ method public android.view.View getChildTabViewAt(int);
+ method public android.graphics.drawable.Drawable getLeftStripDrawable();
+ method public android.graphics.drawable.Drawable getRightStripDrawable();
+ method public int getTabCount();
+ method public boolean isStripEnabled();
+ method public void onFocusChange(android.view.View, boolean);
+ method public void setCurrentTab(int);
+ method public void setDividerDrawable(int);
+ method public void setLeftStripDrawable(android.graphics.drawable.Drawable);
+ method public void setLeftStripDrawable(int);
+ method public void setRightStripDrawable(android.graphics.drawable.Drawable);
+ method public void setRightStripDrawable(int);
+ method public void setStripEnabled(boolean);
+ }
+
+ public class TableLayout extends android.widget.LinearLayout {
+ ctor public TableLayout(android.content.Context);
+ ctor public TableLayout(android.content.Context, android.util.AttributeSet);
+ method public boolean isColumnCollapsed(int);
+ method public boolean isColumnShrinkable(int);
+ method public boolean isColumnStretchable(int);
+ method public boolean isShrinkAllColumns();
+ method public boolean isStretchAllColumns();
+ method public void setColumnCollapsed(int, boolean);
+ method public void setColumnShrinkable(int, boolean);
+ method public void setColumnStretchable(int, boolean);
+ method public void setShrinkAllColumns(boolean);
+ method public void setStretchAllColumns(boolean);
+ }
+
+ public static class TableLayout.LayoutParams extends android.widget.LinearLayout.LayoutParams {
+ ctor public TableLayout.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public TableLayout.LayoutParams(int, int);
+ ctor public TableLayout.LayoutParams(int, int, float);
+ ctor public TableLayout.LayoutParams();
+ ctor public TableLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public TableLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ }
+
+ public class TableRow extends android.widget.LinearLayout {
+ ctor public TableRow(android.content.Context);
+ ctor public TableRow(android.content.Context, android.util.AttributeSet);
+ method public android.view.View getVirtualChildAt(int);
+ method public int getVirtualChildCount();
+ }
+
+ public static class TableRow.LayoutParams extends android.widget.LinearLayout.LayoutParams {
+ ctor public TableRow.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public TableRow.LayoutParams(int, int);
+ ctor public TableRow.LayoutParams(int, int, float);
+ ctor public TableRow.LayoutParams();
+ ctor public TableRow.LayoutParams(int);
+ ctor public TableRow.LayoutParams(android.view.ViewGroup.LayoutParams);
+ ctor public TableRow.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ field public int column;
+ field public int span;
+ }
+
+ public class TextClock extends android.widget.TextView {
+ ctor public TextClock(android.content.Context);
+ ctor public TextClock(android.content.Context, android.util.AttributeSet);
+ ctor public TextClock(android.content.Context, android.util.AttributeSet, int);
+ ctor public TextClock(android.content.Context, android.util.AttributeSet, int, int);
+ method public java.lang.CharSequence getFormat12Hour();
+ method public java.lang.CharSequence getFormat24Hour();
+ method public java.lang.String getTimeZone();
+ method public boolean is24HourModeEnabled();
+ method public void setFormat12Hour(java.lang.CharSequence);
+ method public void setFormat24Hour(java.lang.CharSequence);
+ method public void setTimeZone(java.lang.String);
+ field public static final deprecated java.lang.CharSequence DEFAULT_FORMAT_12_HOUR;
+ field public static final deprecated java.lang.CharSequence DEFAULT_FORMAT_24_HOUR;
+ }
+
+ public class TextSwitcher extends android.widget.ViewSwitcher {
+ ctor public TextSwitcher(android.content.Context);
+ ctor public TextSwitcher(android.content.Context, android.util.AttributeSet);
+ method public void setCurrentText(java.lang.CharSequence);
+ method public void setText(java.lang.CharSequence);
+ }
+
+ public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {
+ ctor public TextView(android.content.Context);
+ ctor public TextView(android.content.Context, android.util.AttributeSet);
+ ctor public TextView(android.content.Context, android.util.AttributeSet, int);
+ ctor public TextView(android.content.Context, android.util.AttributeSet, int, int);
+ method public void addTextChangedListener(android.text.TextWatcher);
+ method public final void append(java.lang.CharSequence);
+ method public void append(java.lang.CharSequence, int, int);
+ method public void beginBatchEdit();
+ method public boolean bringPointIntoView(int);
+ method public void clearComposingText();
+ method public void debug(int);
+ method public boolean didTouchFocusSelect();
+ method public void endBatchEdit();
+ method public boolean extractText(android.view.inputmethod.ExtractedTextRequest, android.view.inputmethod.ExtractedText);
+ method public final int getAutoLinkMask();
+ method public int getBreakStrategy();
+ method public int getCompoundDrawablePadding();
+ method public android.content.res.ColorStateList getCompoundDrawableTintList();
+ method public android.graphics.PorterDuff.Mode getCompoundDrawableTintMode();
+ method public android.graphics.drawable.Drawable[] getCompoundDrawables();
+ method public android.graphics.drawable.Drawable[] getCompoundDrawablesRelative();
+ method public int getCompoundPaddingBottom();
+ method public int getCompoundPaddingEnd();
+ method public int getCompoundPaddingLeft();
+ method public int getCompoundPaddingRight();
+ method public int getCompoundPaddingStart();
+ method public int getCompoundPaddingTop();
+ method public final int getCurrentHintTextColor();
+ method public final int getCurrentTextColor();
+ method public android.view.ActionMode.Callback getCustomInsertionActionModeCallback();
+ method public android.view.ActionMode.Callback getCustomSelectionActionModeCallback();
+ method protected boolean getDefaultEditable();
+ method protected android.text.method.MovementMethod getDefaultMovementMethod();
+ method public android.text.Editable getEditableText();
+ method public android.text.TextUtils.TruncateAt getEllipsize();
+ method public java.lang.CharSequence getError();
+ method public int getExtendedPaddingBottom();
+ method public int getExtendedPaddingTop();
+ method public android.text.InputFilter[] getFilters();
+ method public java.lang.String getFontFeatureSettings();
+ method public boolean getFreezesText();
+ method public int getGravity();
+ method public int getHighlightColor();
+ method public java.lang.CharSequence getHint();
+ method public final android.content.res.ColorStateList getHintTextColors();
+ method public int getHyphenationFrequency();
+ method public int getImeActionId();
+ method public java.lang.CharSequence getImeActionLabel();
+ method public int getImeOptions();
+ method public boolean getIncludeFontPadding();
+ method public android.os.Bundle getInputExtras(boolean);
+ method public int getInputType();
+ method public final android.text.method.KeyListener getKeyListener();
+ method public final android.text.Layout getLayout();
+ method public float getLetterSpacing();
+ method public int getLineBounds(int, android.graphics.Rect);
+ method public int getLineCount();
+ method public int getLineHeight();
+ method public float getLineSpacingExtra();
+ method public float getLineSpacingMultiplier();
+ method public final android.content.res.ColorStateList getLinkTextColors();
+ method public final boolean getLinksClickable();
+ method public int getMarqueeRepeatLimit();
+ method public int getMaxEms();
+ method public int getMaxHeight();
+ method public int getMaxLines();
+ method public int getMaxWidth();
+ method public int getMinEms();
+ method public int getMinHeight();
+ method public int getMinLines();
+ method public int getMinWidth();
+ method public final android.text.method.MovementMethod getMovementMethod();
+ method public int getOffsetForPosition(float, float);
+ method public android.text.TextPaint getPaint();
+ method public int getPaintFlags();
+ method public java.lang.String getPrivateImeOptions();
+ method public int getSelectionEnd();
+ method public int getSelectionStart();
+ method public int getShadowColor();
+ method public float getShadowDx();
+ method public float getShadowDy();
+ method public float getShadowRadius();
+ method public final boolean getShowSoftInputOnFocus();
+ method public java.lang.CharSequence getText();
+ method public final android.content.res.ColorStateList getTextColors();
+ method public java.util.Locale getTextLocale();
+ method public android.util.LocaleList getTextLocales();
+ method public float getTextScaleX();
+ method public float getTextSize();
+ method public int getTotalPaddingBottom();
+ method public int getTotalPaddingEnd();
+ method public int getTotalPaddingLeft();
+ method public int getTotalPaddingRight();
+ method public int getTotalPaddingStart();
+ method public int getTotalPaddingTop();
+ method public final android.text.method.TransformationMethod getTransformationMethod();
+ method public android.graphics.Typeface getTypeface();
+ method public android.text.style.URLSpan[] getUrls();
+ method public boolean hasSelection();
+ method public boolean isCursorVisible();
+ method public boolean isInputMethodTarget();
+ method public boolean isSuggestionsEnabled();
+ method public boolean isTextSelectable();
+ method public int length();
+ method public boolean moveCursorToVisibleOffset();
+ method public void onBeginBatchEdit();
+ method public void onCommitCompletion(android.view.inputmethod.CompletionInfo);
+ method public void onCommitCorrection(android.view.inputmethod.CorrectionInfo);
+ method public void onEditorAction(int);
+ method public void onEndBatchEdit();
+ method public boolean onPreDraw();
+ method public boolean onPrivateIMECommand(java.lang.String, android.os.Bundle);
+ method public void onRestoreInstanceState(android.os.Parcelable);
+ method public android.os.Parcelable onSaveInstanceState();
+ method protected void onSelectionChanged(int, int);
+ method protected void onTextChanged(java.lang.CharSequence, int, int, int);
+ method public boolean onTextContextMenuItem(int);
+ method public void removeTextChangedListener(android.text.TextWatcher);
+ method public void setAllCaps(boolean);
+ method public final void setAutoLinkMask(int);
+ method public void setBreakStrategy(int);
+ method public void setCompoundDrawablePadding(int);
+ method public void setCompoundDrawableTintList(android.content.res.ColorStateList);
+ method public void setCompoundDrawableTintMode(android.graphics.PorterDuff.Mode);
+ method public void setCompoundDrawables(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
+ method public void setCompoundDrawablesRelative(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
+ method public void setCompoundDrawablesRelativeWithIntrinsicBounds(int, int, int, int);
+ method public void setCompoundDrawablesRelativeWithIntrinsicBounds(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
+ method public void setCompoundDrawablesWithIntrinsicBounds(int, int, int, int);
+ method public void setCompoundDrawablesWithIntrinsicBounds(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
+ method public void setCursorVisible(boolean);
+ method public void setCustomInsertionActionModeCallback(android.view.ActionMode.Callback);
+ method public void setCustomSelectionActionModeCallback(android.view.ActionMode.Callback);
+ method public final void setEditableFactory(android.text.Editable.Factory);
+ method public void setElegantTextHeight(boolean);
+ method public void setEllipsize(android.text.TextUtils.TruncateAt);
+ method public void setEms(int);
+ method public void setError(java.lang.CharSequence);
+ method public void setError(java.lang.CharSequence, android.graphics.drawable.Drawable);
+ method public void setExtractedText(android.view.inputmethod.ExtractedText);
+ method public void setFilters(android.text.InputFilter[]);
+ method public void setFontFeatureSettings(java.lang.String);
+ method protected boolean setFrame(int, int, int, int);
+ method public void setFreezesText(boolean);
+ method public void setGravity(int);
+ method public void setHeight(int);
+ method public void setHighlightColor(int);
+ method public final void setHint(java.lang.CharSequence);
+ method public final void setHint(int);
+ method public final void setHintTextColor(int);
+ method public final void setHintTextColor(android.content.res.ColorStateList);
+ method public void setHorizontallyScrolling(boolean);
+ method public void setHyphenationFrequency(int);
+ method public void setImeActionLabel(java.lang.CharSequence, int);
+ method public void setImeOptions(int);
+ method public void setIncludeFontPadding(boolean);
+ method public void setInputExtras(int) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public void setInputType(int);
+ method public void setKeyListener(android.text.method.KeyListener);
+ method public void setLetterSpacing(float);
+ method public void setLineSpacing(float, float);
+ method public void setLines(int);
+ method public final void setLinkTextColor(int);
+ method public final void setLinkTextColor(android.content.res.ColorStateList);
+ method public final void setLinksClickable(boolean);
+ method public void setMarqueeRepeatLimit(int);
+ method public void setMaxEms(int);
+ method public void setMaxHeight(int);
+ method public void setMaxLines(int);
+ method public void setMaxWidth(int);
+ method public void setMinEms(int);
+ method public void setMinHeight(int);
+ method public void setMinLines(int);
+ method public void setMinWidth(int);
+ method public final void setMovementMethod(android.text.method.MovementMethod);
+ method public void setOnEditorActionListener(android.widget.TextView.OnEditorActionListener);
+ method public void setPaintFlags(int);
+ method public void setPrivateImeOptions(java.lang.String);
+ method public void setRawInputType(int);
+ method public void setScroller(android.widget.Scroller);
+ method public void setSelectAllOnFocus(boolean);
+ method public void setShadowLayer(float, float, float, int);
+ method public final void setShowSoftInputOnFocus(boolean);
+ method public void setSingleLine();
+ method public void setSingleLine(boolean);
+ method public final void setSpannableFactory(android.text.Spannable.Factory);
+ method public final void setText(java.lang.CharSequence);
+ method public void setText(java.lang.CharSequence, android.widget.TextView.BufferType);
+ method public final void setText(char[], int, int);
+ method public final void setText(int);
+ method public final void setText(int, android.widget.TextView.BufferType);
+ method public void setTextAppearance(int);
+ method public deprecated void setTextAppearance(android.content.Context, int);
+ method public void setTextColor(int);
+ method public void setTextColor(android.content.res.ColorStateList);
+ method public void setTextIsSelectable(boolean);
+ method public final void setTextKeepState(java.lang.CharSequence);
+ method public final void setTextKeepState(java.lang.CharSequence, android.widget.TextView.BufferType);
+ method public void setTextLocale(java.util.Locale);
+ method public void setTextLocales(android.util.LocaleList);
+ method public void setTextScaleX(float);
+ method public void setTextSize(float);
+ method public void setTextSize(int, float);
+ method public final void setTransformationMethod(android.text.method.TransformationMethod);
+ method public void setTypeface(android.graphics.Typeface, int);
+ method public void setTypeface(android.graphics.Typeface);
+ method public void setWidth(int);
+ }
+
+ public static final class TextView.BufferType extends java.lang.Enum {
+ method public static android.widget.TextView.BufferType valueOf(java.lang.String);
+ method public static final android.widget.TextView.BufferType[] values();
+ enum_constant public static final android.widget.TextView.BufferType EDITABLE;
+ enum_constant public static final android.widget.TextView.BufferType NORMAL;
+ enum_constant public static final android.widget.TextView.BufferType SPANNABLE;
+ }
+
+ public static abstract interface TextView.OnEditorActionListener {
+ method public abstract boolean onEditorAction(android.widget.TextView, int, android.view.KeyEvent);
+ }
+
+ public static class TextView.SavedState extends android.view.View.BaseSavedState {
+ field public static final android.os.Parcelable.Creator<android.widget.TextView.SavedState> CREATOR;
+ }
+
+ public abstract interface ThemedSpinnerAdapter implements android.widget.SpinnerAdapter {
+ method public abstract android.content.res.Resources.Theme getDropDownViewTheme();
+ method public abstract void setDropDownViewTheme(android.content.res.Resources.Theme);
+ }
+
+ public class TimePicker extends android.widget.FrameLayout {
+ ctor public TimePicker(android.content.Context);
+ ctor public TimePicker(android.content.Context, android.util.AttributeSet);
+ ctor public TimePicker(android.content.Context, android.util.AttributeSet, int);
+ ctor public TimePicker(android.content.Context, android.util.AttributeSet, int, int);
+ method public deprecated java.lang.Integer getCurrentHour();
+ method public deprecated java.lang.Integer getCurrentMinute();
+ method public int getHour();
+ method public int getMinute();
+ method public boolean is24HourView();
+ method public deprecated void setCurrentHour(java.lang.Integer);
+ method public deprecated void setCurrentMinute(java.lang.Integer);
+ method public void setHour(int);
+ method public void setIs24HourView(java.lang.Boolean);
+ method public void setMinute(int);
+ method public void setOnTimeChangedListener(android.widget.TimePicker.OnTimeChangedListener);
+ }
+
+ public static abstract interface TimePicker.OnTimeChangedListener {
+ method public abstract void onTimeChanged(android.widget.TimePicker, int, int);
+ }
+
+ public class Toast {
+ ctor public Toast(android.content.Context);
+ method public void cancel();
+ method public int getDuration();
+ method public int getGravity();
+ method public float getHorizontalMargin();
+ method public float getVerticalMargin();
+ method public android.view.View getView();
+ method public int getXOffset();
+ method public int getYOffset();
+ method public static android.widget.Toast makeText(android.content.Context, java.lang.CharSequence, int);
+ method public static android.widget.Toast makeText(android.content.Context, int, int) throws android.content.res.Resources.NotFoundException;
+ method public void setDuration(int);
+ method public void setGravity(int, int, int);
+ method public void setMargin(float, float);
+ method public void setText(int);
+ method public void setText(java.lang.CharSequence);
+ method public void setView(android.view.View);
+ method public void show();
+ field public static final int LENGTH_LONG = 1; // 0x1
+ field public static final int LENGTH_SHORT = 0; // 0x0
+ }
+
+ public class ToggleButton extends android.widget.CompoundButton {
+ ctor public ToggleButton(android.content.Context, android.util.AttributeSet, int, int);
+ ctor public ToggleButton(android.content.Context, android.util.AttributeSet, int);
+ ctor public ToggleButton(android.content.Context, android.util.AttributeSet);
+ ctor public ToggleButton(android.content.Context);
+ method public java.lang.CharSequence getTextOff();
+ method public java.lang.CharSequence getTextOn();
+ method public void setTextOff(java.lang.CharSequence);
+ method public void setTextOn(java.lang.CharSequence);
+ }
+
+ public class Toolbar extends android.view.ViewGroup {
+ ctor public Toolbar(android.content.Context);
+ ctor public Toolbar(android.content.Context, android.util.AttributeSet);
+ ctor public Toolbar(android.content.Context, android.util.AttributeSet, int);
+ ctor public Toolbar(android.content.Context, android.util.AttributeSet, int, int);
+ method public void collapseActionView();
+ method public void dismissPopupMenus();
+ method public int getContentInsetEnd();
+ method public int getContentInsetLeft();
+ method public int getContentInsetRight();
+ method public int getContentInsetStart();
+ method public android.graphics.drawable.Drawable getLogo();
+ method public java.lang.CharSequence getLogoDescription();
+ method public android.view.Menu getMenu();
+ method public java.lang.CharSequence getNavigationContentDescription();
+ method public android.graphics.drawable.Drawable getNavigationIcon();
+ method public android.graphics.drawable.Drawable getOverflowIcon();
+ method public int getPopupTheme();
+ method public java.lang.CharSequence getSubtitle();
+ method public java.lang.CharSequence getTitle();
+ method public int getTitleMarginBottom();
+ method public int getTitleMarginEnd();
+ method public int getTitleMarginStart();
+ method public int getTitleMarginTop();
+ method public boolean hasExpandedActionView();
+ method public boolean hideOverflowMenu();
+ method public void inflateMenu(int);
+ method public boolean isOverflowMenuShowing();
+ method protected void onLayout(boolean, int, int, int, int);
+ method public void setContentInsetsAbsolute(int, int);
+ method public void setContentInsetsRelative(int, int);
+ method public void setLogo(int);
+ method public void setLogo(android.graphics.drawable.Drawable);
+ method public void setLogoDescription(int);
+ method public void setLogoDescription(java.lang.CharSequence);
+ method public void setNavigationContentDescription(int);
+ method public void setNavigationContentDescription(java.lang.CharSequence);
+ method public void setNavigationIcon(int);
+ method public void setNavigationIcon(android.graphics.drawable.Drawable);
+ method public void setNavigationOnClickListener(android.view.View.OnClickListener);
+ method public void setOnMenuItemClickListener(android.widget.Toolbar.OnMenuItemClickListener);
+ method public void setOverflowIcon(android.graphics.drawable.Drawable);
+ method public void setPopupTheme(int);
+ method public void setSubtitle(int);
+ method public void setSubtitle(java.lang.CharSequence);
+ method public void setSubtitleTextAppearance(android.content.Context, int);
+ method public void setSubtitleTextColor(int);
+ method public void setTitle(int);
+ method public void setTitle(java.lang.CharSequence);
+ method public void setTitleMargin(int, int, int, int);
+ method public void setTitleMarginBottom(int);
+ method public void setTitleMarginEnd(int);
+ method public void setTitleMarginStart(int);
+ method public void setTitleMarginTop(int);
+ method public void setTitleTextAppearance(android.content.Context, int);
+ method public void setTitleTextColor(int);
+ method public boolean showOverflowMenu();
+ }
+
+ public static class Toolbar.LayoutParams extends android.app.ActionBar.LayoutParams {
+ ctor public Toolbar.LayoutParams(android.content.Context, android.util.AttributeSet);
+ ctor public Toolbar.LayoutParams(int, int);
+ ctor public Toolbar.LayoutParams(int, int, int);
+ ctor public Toolbar.LayoutParams(int);
+ ctor public Toolbar.LayoutParams(android.widget.Toolbar.LayoutParams);
+ ctor public Toolbar.LayoutParams(android.app.ActionBar.LayoutParams);
+ ctor public Toolbar.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
+ ctor public Toolbar.LayoutParams(android.view.ViewGroup.LayoutParams);
+ }
+
+ public static abstract interface Toolbar.OnMenuItemClickListener {
+ method public abstract boolean onMenuItemClick(android.view.MenuItem);
+ }
+
+ public deprecated class TwoLineListItem extends android.widget.RelativeLayout {
+ ctor public TwoLineListItem(android.content.Context);
+ ctor public TwoLineListItem(android.content.Context, android.util.AttributeSet);
+ ctor public TwoLineListItem(android.content.Context, android.util.AttributeSet, int);
+ ctor public TwoLineListItem(android.content.Context, android.util.AttributeSet, int, int);
+ method public android.widget.TextView getText1();
+ method public android.widget.TextView getText2();
+ }
+
+ public class VideoView extends android.view.SurfaceView implements android.widget.MediaController.MediaPlayerControl {
+ ctor public VideoView(android.content.Context);
+ ctor public VideoView(android.content.Context, android.util.AttributeSet);
+ ctor public VideoView(android.content.Context, android.util.AttributeSet, int);
+ ctor public VideoView(android.content.Context, android.util.AttributeSet, int, int);
+ method public void addSubtitleSource(java.io.InputStream, android.media.MediaFormat);
+ method public boolean canPause();
+ method public boolean canSeekBackward();
+ method public boolean canSeekForward();
+ method public int getAudioSessionId();
+ method public int getBufferPercentage();
+ method public int getCurrentPosition();
+ method public int getDuration();
+ method public boolean isPlaying();
+ method public void pause();
+ method public int resolveAdjustedSize(int, int);
+ method public void resume();
+ method public void seekTo(int);
+ method public void setMediaController(android.widget.MediaController);
+ method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);
+ method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);
+ method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);
+ method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);
+ method public void setVideoPath(java.lang.String);
+ method public void setVideoURI(android.net.Uri);
+ method public void setVideoURI(android.net.Uri, java.util.Map<java.lang.String, java.lang.String>);
+ method public void start();
+ method public void stopPlayback();
+ method public void suspend();
+ }
+
+ public class ViewAnimator extends android.widget.FrameLayout {
+ ctor public ViewAnimator(android.content.Context);
+ ctor public ViewAnimator(android.content.Context, android.util.AttributeSet);
+ method public boolean getAnimateFirstView();
+ method public android.view.View getCurrentView();
+ method public int getDisplayedChild();
+ method public android.view.animation.Animation getInAnimation();
+ method public android.view.animation.Animation getOutAnimation();
+ method public void setAnimateFirstView(boolean);
+ method public void setDisplayedChild(int);
+ method public void setInAnimation(android.view.animation.Animation);
+ method public void setInAnimation(android.content.Context, int);
+ method public void setOutAnimation(android.view.animation.Animation);
+ method public void setOutAnimation(android.content.Context, int);
+ method public void showNext();
+ method public void showPrevious();
+ }
+
+ public class ViewFlipper extends android.widget.ViewAnimator {
+ ctor public ViewFlipper(android.content.Context);
+ ctor public ViewFlipper(android.content.Context, android.util.AttributeSet);
+ method public boolean isAutoStart();
+ method public boolean isFlipping();
+ method public void setAutoStart(boolean);
+ method public void setFlipInterval(int);
+ method public void startFlipping();
+ method public void stopFlipping();
+ }
+
+ public class ViewSwitcher extends android.widget.ViewAnimator {
+ ctor public ViewSwitcher(android.content.Context);
+ ctor public ViewSwitcher(android.content.Context, android.util.AttributeSet);
+ method public android.view.View getNextView();
+ method public void reset();
+ method public void setFactory(android.widget.ViewSwitcher.ViewFactory);
+ }
+
+ public static abstract interface ViewSwitcher.ViewFactory {
+ method public abstract android.view.View makeView();
+ }
+
+ public abstract interface WrapperListAdapter implements android.widget.ListAdapter {
+ method public abstract android.widget.ListAdapter getWrappedAdapter();
+ }
+
+ public class ZoomButton extends android.widget.ImageButton implements android.view.View.OnLongClickListener {
+ ctor public ZoomButton(android.content.Context);
+ ctor public ZoomButton(android.content.Context, android.util.AttributeSet);
+ ctor public ZoomButton(android.content.Context, android.util.AttributeSet, int);
+ ctor public ZoomButton(android.content.Context, android.util.AttributeSet, int, int);
+ method public boolean onLongClick(android.view.View);
+ method public void setZoomSpeed(long);
+ }
+
+ public class ZoomButtonsController implements android.view.View.OnTouchListener {
+ ctor public ZoomButtonsController(android.view.View);
+ method public android.view.ViewGroup getContainer();
+ method public android.view.View getZoomControls();
+ method public boolean isAutoDismissed();
+ method public boolean isVisible();
+ method public boolean onTouch(android.view.View, android.view.MotionEvent);
+ method public void setAutoDismissed(boolean);
+ method public void setFocusable(boolean);
+ method public void setOnZoomListener(android.widget.ZoomButtonsController.OnZoomListener);
+ method public void setVisible(boolean);
+ method public void setZoomInEnabled(boolean);
+ method public void setZoomOutEnabled(boolean);
+ method public void setZoomSpeed(long);
+ }
+
+ public static abstract interface ZoomButtonsController.OnZoomListener {
+ method public abstract void onVisibilityChanged(boolean);
+ method public abstract void onZoom(boolean);
+ }
+
+ public class ZoomControls extends android.widget.LinearLayout {
+ ctor public ZoomControls(android.content.Context);
+ ctor public ZoomControls(android.content.Context, android.util.AttributeSet);
+ method public void hide();
+ method public void setIsZoomInEnabled(boolean);
+ method public void setIsZoomOutEnabled(boolean);
+ method public void setOnZoomInClickListener(android.view.View.OnClickListener);
+ method public void setOnZoomOutClickListener(android.view.View.OnClickListener);
+ method public void setZoomSpeed(long);
+ method public void show();
+ }
+
+}
+
+package com.android.internal.util {
+
+ public abstract interface Predicate {
+ method public abstract boolean apply(T);
+ }
+
+}
+
+package dalvik.annotation {
+
+ public abstract deprecated class TestTarget implements java.lang.annotation.Annotation {
+ }
+
+ public abstract deprecated class TestTargetClass implements java.lang.annotation.Annotation {
+ }
+
+}
+
+package dalvik.bytecode {
+
+ public final class OpcodeInfo {
+ field public static final int MAXIMUM_PACKED_VALUE;
+ field public static final int MAXIMUM_VALUE;
+ }
+
+ public abstract interface Opcodes {
+ field public static final int OP_ADD_DOUBLE = 171; // 0xab
+ field public static final int OP_ADD_DOUBLE_2ADDR = 203; // 0xcb
+ field public static final int OP_ADD_FLOAT = 166; // 0xa6
+ field public static final int OP_ADD_FLOAT_2ADDR = 198; // 0xc6
+ field public static final int OP_ADD_INT = 144; // 0x90
+ field public static final int OP_ADD_INT_2ADDR = 176; // 0xb0
+ field public static final int OP_ADD_INT_LIT16 = 208; // 0xd0
+ field public static final int OP_ADD_INT_LIT8 = 216; // 0xd8
+ field public static final int OP_ADD_LONG = 155; // 0x9b
+ field public static final int OP_ADD_LONG_2ADDR = 187; // 0xbb
+ field public static final int OP_AGET = 68; // 0x44
+ field public static final int OP_AGET_BOOLEAN = 71; // 0x47
+ field public static final int OP_AGET_BYTE = 72; // 0x48
+ field public static final int OP_AGET_CHAR = 73; // 0x49
+ field public static final int OP_AGET_OBJECT = 70; // 0x46
+ field public static final int OP_AGET_SHORT = 74; // 0x4a
+ field public static final int OP_AGET_WIDE = 69; // 0x45
+ field public static final int OP_AND_INT = 149; // 0x95
+ field public static final int OP_AND_INT_2ADDR = 181; // 0xb5
+ field public static final int OP_AND_INT_LIT16 = 213; // 0xd5
+ field public static final int OP_AND_INT_LIT8 = 221; // 0xdd
+ field public static final int OP_AND_LONG = 160; // 0xa0
+ field public static final int OP_AND_LONG_2ADDR = 192; // 0xc0
+ field public static final int OP_APUT = 75; // 0x4b
+ field public static final int OP_APUT_BOOLEAN = 78; // 0x4e
+ field public static final int OP_APUT_BYTE = 79; // 0x4f
+ field public static final int OP_APUT_CHAR = 80; // 0x50
+ field public static final int OP_APUT_OBJECT = 77; // 0x4d
+ field public static final int OP_APUT_SHORT = 81; // 0x51
+ field public static final int OP_APUT_WIDE = 76; // 0x4c
+ field public static final int OP_ARRAY_LENGTH = 33; // 0x21
+ field public static final deprecated int OP_BREAKPOINT = 236; // 0xec
+ field public static final int OP_CHECK_CAST = 31; // 0x1f
+ field public static final int OP_CHECK_CAST_JUMBO = 511; // 0x1ff
+ field public static final int OP_CMPG_DOUBLE = 48; // 0x30
+ field public static final int OP_CMPG_FLOAT = 46; // 0x2e
+ field public static final int OP_CMPL_DOUBLE = 47; // 0x2f
+ field public static final int OP_CMPL_FLOAT = 45; // 0x2d
+ field public static final int OP_CMP_LONG = 49; // 0x31
+ field public static final int OP_CONST = 20; // 0x14
+ field public static final int OP_CONST_16 = 19; // 0x13
+ field public static final int OP_CONST_4 = 18; // 0x12
+ field public static final int OP_CONST_CLASS = 28; // 0x1c
+ field public static final int OP_CONST_CLASS_JUMBO = 255; // 0xff
+ field public static final int OP_CONST_HIGH16 = 21; // 0x15
+ field public static final int OP_CONST_STRING = 26; // 0x1a
+ field public static final int OP_CONST_STRING_JUMBO = 27; // 0x1b
+ field public static final int OP_CONST_WIDE = 24; // 0x18
+ field public static final int OP_CONST_WIDE_16 = 22; // 0x16
+ field public static final int OP_CONST_WIDE_32 = 23; // 0x17
+ field public static final int OP_CONST_WIDE_HIGH16 = 25; // 0x19
+ field public static final int OP_DIV_DOUBLE = 174; // 0xae
+ field public static final int OP_DIV_DOUBLE_2ADDR = 206; // 0xce
+ field public static final int OP_DIV_FLOAT = 169; // 0xa9
+ field public static final int OP_DIV_FLOAT_2ADDR = 201; // 0xc9
+ field public static final int OP_DIV_INT = 147; // 0x93
+ field public static final int OP_DIV_INT_2ADDR = 179; // 0xb3
+ field public static final int OP_DIV_INT_LIT16 = 211; // 0xd3
+ field public static final int OP_DIV_INT_LIT8 = 219; // 0xdb
+ field public static final int OP_DIV_LONG = 158; // 0x9e
+ field public static final int OP_DIV_LONG_2ADDR = 190; // 0xbe
+ field public static final int OP_DOUBLE_TO_FLOAT = 140; // 0x8c
+ field public static final int OP_DOUBLE_TO_INT = 138; // 0x8a
+ field public static final int OP_DOUBLE_TO_LONG = 139; // 0x8b
+ field public static final deprecated int OP_EXECUTE_INLINE = 238; // 0xee
+ field public static final deprecated int OP_EXECUTE_INLINE_RANGE = 239; // 0xef
+ field public static final int OP_FILLED_NEW_ARRAY = 36; // 0x24
+ field public static final int OP_FILLED_NEW_ARRAY_JUMBO = 1535; // 0x5ff
+ field public static final int OP_FILLED_NEW_ARRAY_RANGE = 37; // 0x25
+ field public static final int OP_FILL_ARRAY_DATA = 38; // 0x26
+ field public static final int OP_FLOAT_TO_DOUBLE = 137; // 0x89
+ field public static final int OP_FLOAT_TO_INT = 135; // 0x87
+ field public static final int OP_FLOAT_TO_LONG = 136; // 0x88
+ field public static final int OP_GOTO = 40; // 0x28
+ field public static final int OP_GOTO_16 = 41; // 0x29
+ field public static final int OP_GOTO_32 = 42; // 0x2a
+ field public static final int OP_IF_EQ = 50; // 0x32
+ field public static final int OP_IF_EQZ = 56; // 0x38
+ field public static final int OP_IF_GE = 53; // 0x35
+ field public static final int OP_IF_GEZ = 59; // 0x3b
+ field public static final int OP_IF_GT = 54; // 0x36
+ field public static final int OP_IF_GTZ = 60; // 0x3c
+ field public static final int OP_IF_LE = 55; // 0x37
+ field public static final int OP_IF_LEZ = 61; // 0x3d
+ field public static final int OP_IF_LT = 52; // 0x34
+ field public static final int OP_IF_LTZ = 58; // 0x3a
+ field public static final int OP_IF_NE = 51; // 0x33
+ field public static final int OP_IF_NEZ = 57; // 0x39
+ field public static final int OP_IGET = 82; // 0x52
+ field public static final int OP_IGET_BOOLEAN = 85; // 0x55
+ field public static final int OP_IGET_BOOLEAN_JUMBO = 2559; // 0x9ff
+ field public static final int OP_IGET_BYTE = 86; // 0x56
+ field public static final int OP_IGET_BYTE_JUMBO = 2815; // 0xaff
+ field public static final int OP_IGET_CHAR = 87; // 0x57
+ field public static final int OP_IGET_CHAR_JUMBO = 3071; // 0xbff
+ field public static final int OP_IGET_JUMBO = 1791; // 0x6ff
+ field public static final int OP_IGET_OBJECT = 84; // 0x54
+ field public static final int OP_IGET_OBJECT_JUMBO = 2303; // 0x8ff
+ field public static final deprecated int OP_IGET_OBJECT_QUICK = 244; // 0xf4
+ field public static final deprecated int OP_IGET_QUICK = 242; // 0xf2
+ field public static final int OP_IGET_SHORT = 88; // 0x58
+ field public static final int OP_IGET_SHORT_JUMBO = 3327; // 0xcff
+ field public static final int OP_IGET_WIDE = 83; // 0x53
+ field public static final int OP_IGET_WIDE_JUMBO = 2047; // 0x7ff
+ field public static final deprecated int OP_IGET_WIDE_QUICK = 243; // 0xf3
+ field public static final deprecated int OP_IGET_WIDE_VOLATILE = 232; // 0xe8
+ field public static final int OP_INSTANCE_OF = 32; // 0x20
+ field public static final int OP_INSTANCE_OF_JUMBO = 767; // 0x2ff
+ field public static final int OP_INT_TO_BYTE = 141; // 0x8d
+ field public static final int OP_INT_TO_CHAR = 142; // 0x8e
+ field public static final int OP_INT_TO_DOUBLE = 131; // 0x83
+ field public static final int OP_INT_TO_FLOAT = 130; // 0x82
+ field public static final int OP_INT_TO_LONG = 129; // 0x81
+ field public static final int OP_INT_TO_SHORT = 143; // 0x8f
+ field public static final int OP_INVOKE_DIRECT = 112; // 0x70
+ field public static final deprecated int OP_INVOKE_DIRECT_EMPTY = 240; // 0xf0
+ field public static final int OP_INVOKE_DIRECT_JUMBO = 9471; // 0x24ff
+ field public static final int OP_INVOKE_DIRECT_RANGE = 118; // 0x76
+ field public static final int OP_INVOKE_INTERFACE = 114; // 0x72
+ field public static final int OP_INVOKE_INTERFACE_JUMBO = 9983; // 0x26ff
+ field public static final int OP_INVOKE_INTERFACE_RANGE = 120; // 0x78
+ field public static final int OP_INVOKE_STATIC = 113; // 0x71
+ field public static final int OP_INVOKE_STATIC_JUMBO = 9727; // 0x25ff
+ field public static final int OP_INVOKE_STATIC_RANGE = 119; // 0x77
+ field public static final int OP_INVOKE_SUPER = 111; // 0x6f
+ field public static final int OP_INVOKE_SUPER_JUMBO = 9215; // 0x23ff
+ field public static final deprecated int OP_INVOKE_SUPER_QUICK = 250; // 0xfa
+ field public static final deprecated int OP_INVOKE_SUPER_QUICK_RANGE = 251; // 0xfb
+ field public static final int OP_INVOKE_SUPER_RANGE = 117; // 0x75
+ field public static final int OP_INVOKE_VIRTUAL = 110; // 0x6e
+ field public static final int OP_INVOKE_VIRTUAL_JUMBO = 8959; // 0x22ff
+ field public static final deprecated int OP_INVOKE_VIRTUAL_QUICK = 248; // 0xf8
+ field public static final deprecated int OP_INVOKE_VIRTUAL_QUICK_RANGE = 249; // 0xf9
+ field public static final int OP_INVOKE_VIRTUAL_RANGE = 116; // 0x74
+ field public static final int OP_IPUT = 89; // 0x59
+ field public static final int OP_IPUT_BOOLEAN = 92; // 0x5c
+ field public static final int OP_IPUT_BOOLEAN_JUMBO = 4351; // 0x10ff
+ field public static final int OP_IPUT_BYTE = 93; // 0x5d
+ field public static final int OP_IPUT_BYTE_JUMBO = 4607; // 0x11ff
+ field public static final int OP_IPUT_CHAR = 94; // 0x5e
+ field public static final int OP_IPUT_CHAR_JUMBO = 4863; // 0x12ff
+ field public static final int OP_IPUT_JUMBO = 3583; // 0xdff
+ field public static final int OP_IPUT_OBJECT = 91; // 0x5b
+ field public static final int OP_IPUT_OBJECT_JUMBO = 4095; // 0xfff
+ field public static final deprecated int OP_IPUT_OBJECT_QUICK = 247; // 0xf7
+ field public static final deprecated int OP_IPUT_QUICK = 245; // 0xf5
+ field public static final int OP_IPUT_SHORT = 95; // 0x5f
+ field public static final int OP_IPUT_SHORT_JUMBO = 5119; // 0x13ff
+ field public static final int OP_IPUT_WIDE = 90; // 0x5a
+ field public static final int OP_IPUT_WIDE_JUMBO = 3839; // 0xeff
+ field public static final deprecated int OP_IPUT_WIDE_QUICK = 246; // 0xf6
+ field public static final deprecated int OP_IPUT_WIDE_VOLATILE = 233; // 0xe9
+ field public static final int OP_LONG_TO_DOUBLE = 134; // 0x86
+ field public static final int OP_LONG_TO_FLOAT = 133; // 0x85
+ field public static final int OP_LONG_TO_INT = 132; // 0x84
+ field public static final int OP_MONITOR_ENTER = 29; // 0x1d
+ field public static final int OP_MONITOR_EXIT = 30; // 0x1e
+ field public static final int OP_MOVE = 1; // 0x1
+ field public static final int OP_MOVE_16 = 3; // 0x3
+ field public static final int OP_MOVE_EXCEPTION = 13; // 0xd
+ field public static final int OP_MOVE_FROM16 = 2; // 0x2
+ field public static final int OP_MOVE_OBJECT = 7; // 0x7
+ field public static final int OP_MOVE_OBJECT_16 = 9; // 0x9
+ field public static final int OP_MOVE_OBJECT_FROM16 = 8; // 0x8
+ field public static final int OP_MOVE_RESULT = 10; // 0xa
+ field public static final int OP_MOVE_RESULT_OBJECT = 12; // 0xc
+ field public static final int OP_MOVE_RESULT_WIDE = 11; // 0xb
+ field public static final int OP_MOVE_WIDE = 4; // 0x4
+ field public static final int OP_MOVE_WIDE_16 = 6; // 0x6
+ field public static final int OP_MOVE_WIDE_FROM16 = 5; // 0x5
+ field public static final int OP_MUL_DOUBLE = 173; // 0xad
+ field public static final int OP_MUL_DOUBLE_2ADDR = 205; // 0xcd
+ field public static final int OP_MUL_FLOAT = 168; // 0xa8
+ field public static final int OP_MUL_FLOAT_2ADDR = 200; // 0xc8
+ field public static final int OP_MUL_INT = 146; // 0x92
+ field public static final int OP_MUL_INT_2ADDR = 178; // 0xb2
+ field public static final int OP_MUL_INT_LIT16 = 210; // 0xd2
+ field public static final int OP_MUL_INT_LIT8 = 218; // 0xda
+ field public static final int OP_MUL_LONG = 157; // 0x9d
+ field public static final int OP_MUL_LONG_2ADDR = 189; // 0xbd
+ field public static final int OP_NEG_DOUBLE = 128; // 0x80
+ field public static final int OP_NEG_FLOAT = 127; // 0x7f
+ field public static final int OP_NEG_INT = 123; // 0x7b
+ field public static final int OP_NEG_LONG = 125; // 0x7d
+ field public static final int OP_NEW_ARRAY = 35; // 0x23
+ field public static final int OP_NEW_ARRAY_JUMBO = 1279; // 0x4ff
+ field public static final int OP_NEW_INSTANCE = 34; // 0x22
+ field public static final int OP_NEW_INSTANCE_JUMBO = 1023; // 0x3ff
+ field public static final int OP_NOP = 0; // 0x0
+ field public static final int OP_NOT_INT = 124; // 0x7c
+ field public static final int OP_NOT_LONG = 126; // 0x7e
+ field public static final int OP_OR_INT = 150; // 0x96
+ field public static final int OP_OR_INT_2ADDR = 182; // 0xb6
+ field public static final int OP_OR_INT_LIT16 = 214; // 0xd6
+ field public static final int OP_OR_INT_LIT8 = 222; // 0xde
+ field public static final int OP_OR_LONG = 161; // 0xa1
+ field public static final int OP_OR_LONG_2ADDR = 193; // 0xc1
+ field public static final int OP_PACKED_SWITCH = 43; // 0x2b
+ field public static final int OP_REM_DOUBLE = 175; // 0xaf
+ field public static final int OP_REM_DOUBLE_2ADDR = 207; // 0xcf
+ field public static final int OP_REM_FLOAT = 170; // 0xaa
+ field public static final int OP_REM_FLOAT_2ADDR = 202; // 0xca
+ field public static final int OP_REM_INT = 148; // 0x94
+ field public static final int OP_REM_INT_2ADDR = 180; // 0xb4
+ field public static final int OP_REM_INT_LIT16 = 212; // 0xd4
+ field public static final int OP_REM_INT_LIT8 = 220; // 0xdc
+ field public static final int OP_REM_LONG = 159; // 0x9f
+ field public static final int OP_REM_LONG_2ADDR = 191; // 0xbf
+ field public static final int OP_RETURN = 15; // 0xf
+ field public static final int OP_RETURN_OBJECT = 17; // 0x11
+ field public static final int OP_RETURN_VOID = 14; // 0xe
+ field public static final int OP_RETURN_WIDE = 16; // 0x10
+ field public static final int OP_RSUB_INT = 209; // 0xd1
+ field public static final int OP_RSUB_INT_LIT8 = 217; // 0xd9
+ field public static final int OP_SGET = 96; // 0x60
+ field public static final int OP_SGET_BOOLEAN = 99; // 0x63
+ field public static final int OP_SGET_BOOLEAN_JUMBO = 6143; // 0x17ff
+ field public static final int OP_SGET_BYTE = 100; // 0x64
+ field public static final int OP_SGET_BYTE_JUMBO = 6399; // 0x18ff
+ field public static final int OP_SGET_CHAR = 101; // 0x65
+ field public static final int OP_SGET_CHAR_JUMBO = 6655; // 0x19ff
+ field public static final int OP_SGET_JUMBO = 5375; // 0x14ff
+ field public static final int OP_SGET_OBJECT = 98; // 0x62
+ field public static final int OP_SGET_OBJECT_JUMBO = 5887; // 0x16ff
+ field public static final int OP_SGET_SHORT = 102; // 0x66
+ field public static final int OP_SGET_SHORT_JUMBO = 6911; // 0x1aff
+ field public static final int OP_SGET_WIDE = 97; // 0x61
+ field public static final int OP_SGET_WIDE_JUMBO = 5631; // 0x15ff
+ field public static final deprecated int OP_SGET_WIDE_VOLATILE = 234; // 0xea
+ field public static final int OP_SHL_INT = 152; // 0x98
+ field public static final int OP_SHL_INT_2ADDR = 184; // 0xb8
+ field public static final int OP_SHL_INT_LIT8 = 224; // 0xe0
+ field public static final int OP_SHL_LONG = 163; // 0xa3
+ field public static final int OP_SHL_LONG_2ADDR = 195; // 0xc3
+ field public static final int OP_SHR_INT = 153; // 0x99
+ field public static final int OP_SHR_INT_2ADDR = 185; // 0xb9
+ field public static final int OP_SHR_INT_LIT8 = 225; // 0xe1
+ field public static final int OP_SHR_LONG = 164; // 0xa4
+ field public static final int OP_SHR_LONG_2ADDR = 196; // 0xc4
+ field public static final int OP_SPARSE_SWITCH = 44; // 0x2c
+ field public static final int OP_SPUT = 103; // 0x67
+ field public static final int OP_SPUT_BOOLEAN = 106; // 0x6a
+ field public static final int OP_SPUT_BOOLEAN_JUMBO = 7935; // 0x1eff
+ field public static final int OP_SPUT_BYTE = 107; // 0x6b
+ field public static final int OP_SPUT_BYTE_JUMBO = 8191; // 0x1fff
+ field public static final int OP_SPUT_CHAR = 108; // 0x6c
+ field public static final int OP_SPUT_CHAR_JUMBO = 8447; // 0x20ff
+ field public static final int OP_SPUT_JUMBO = 7167; // 0x1bff
+ field public static final int OP_SPUT_OBJECT = 105; // 0x69
+ field public static final int OP_SPUT_OBJECT_JUMBO = 7679; // 0x1dff
+ field public static final int OP_SPUT_SHORT = 109; // 0x6d
+ field public static final int OP_SPUT_SHORT_JUMBO = 8703; // 0x21ff
+ field public static final int OP_SPUT_WIDE = 104; // 0x68
+ field public static final int OP_SPUT_WIDE_JUMBO = 7423; // 0x1cff
+ field public static final deprecated int OP_SPUT_WIDE_VOLATILE = 235; // 0xeb
+ field public static final int OP_SUB_DOUBLE = 172; // 0xac
+ field public static final int OP_SUB_DOUBLE_2ADDR = 204; // 0xcc
+ field public static final int OP_SUB_FLOAT = 167; // 0xa7
+ field public static final int OP_SUB_FLOAT_2ADDR = 199; // 0xc7
+ field public static final int OP_SUB_INT = 145; // 0x91
+ field public static final int OP_SUB_INT_2ADDR = 177; // 0xb1
+ field public static final int OP_SUB_LONG = 156; // 0x9c
+ field public static final int OP_SUB_LONG_2ADDR = 188; // 0xbc
+ field public static final int OP_THROW = 39; // 0x27
+ field public static final deprecated int OP_THROW_VERIFICATION_ERROR = 237; // 0xed
+ field public static final int OP_USHR_INT = 154; // 0x9a
+ field public static final int OP_USHR_INT_2ADDR = 186; // 0xba
+ field public static final int OP_USHR_INT_LIT8 = 226; // 0xe2
+ field public static final int OP_USHR_LONG = 165; // 0xa5
+ field public static final int OP_USHR_LONG_2ADDR = 197; // 0xc5
+ field public static final int OP_XOR_INT = 151; // 0x97
+ field public static final int OP_XOR_INT_2ADDR = 183; // 0xb7
+ field public static final int OP_XOR_INT_LIT16 = 215; // 0xd7
+ field public static final int OP_XOR_INT_LIT8 = 223; // 0xdf
+ field public static final int OP_XOR_LONG = 162; // 0xa2
+ field public static final int OP_XOR_LONG_2ADDR = 194; // 0xc2
+ }
+
+}
+
+package dalvik.system {
+
+ public class BaseDexClassLoader extends java.lang.ClassLoader {
+ ctor public BaseDexClassLoader(java.lang.String, java.io.File, java.lang.String, java.lang.ClassLoader);
+ method public java.lang.String findLibrary(java.lang.String);
+ }
+
+ public class DexClassLoader extends dalvik.system.BaseDexClassLoader {
+ ctor public DexClassLoader(java.lang.String, java.lang.String, java.lang.String, java.lang.ClassLoader);
+ }
+
+ public final class DexFile {
+ ctor public DexFile(java.io.File) throws java.io.IOException;
+ ctor public DexFile(java.lang.String) throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public java.util.Enumeration<java.lang.String> entries();
+ method public java.lang.String getName();
+ method public static boolean isDexOptNeeded(java.lang.String) throws java.io.FileNotFoundException, java.io.IOException;
+ method public java.lang.Class loadClass(java.lang.String, java.lang.ClassLoader);
+ method public static dalvik.system.DexFile loadDex(java.lang.String, java.lang.String, int) throws java.io.IOException;
+ }
+
+ public class PathClassLoader extends dalvik.system.BaseDexClassLoader {
+ ctor public PathClassLoader(java.lang.String, java.lang.ClassLoader);
+ ctor public PathClassLoader(java.lang.String, java.lang.String, java.lang.ClassLoader);
+ }
+
+}
+
+package java.awt.font {
+
+ public final class NumericShaper implements java.io.Serializable {
+ method public static java.awt.font.NumericShaper getContextualShaper(int);
+ method public static java.awt.font.NumericShaper getContextualShaper(java.util.Set<java.awt.font.NumericShaper.Range>);
+ method public static java.awt.font.NumericShaper getContextualShaper(int, int);
+ method public static java.awt.font.NumericShaper getContextualShaper(java.util.Set<java.awt.font.NumericShaper.Range>, java.awt.font.NumericShaper.Range);
+ method public java.util.Set<java.awt.font.NumericShaper.Range> getRangeSet();
+ method public int getRanges();
+ method public static java.awt.font.NumericShaper getShaper(int);
+ method public static java.awt.font.NumericShaper getShaper(java.awt.font.NumericShaper.Range);
+ method public boolean isContextual();
+ method public void shape(char[], int, int);
+ method public void shape(char[], int, int, int);
+ method public void shape(char[], int, int, java.awt.font.NumericShaper.Range);
+ field public static final int ALL_RANGES = 524287; // 0x7ffff
+ field public static final int ARABIC = 2; // 0x2
+ field public static final int BENGALI = 16; // 0x10
+ field public static final int DEVANAGARI = 8; // 0x8
+ field public static final int EASTERN_ARABIC = 4; // 0x4
+ field public static final int ETHIOPIC = 65536; // 0x10000
+ field public static final int EUROPEAN = 1; // 0x1
+ field public static final int GUJARATI = 64; // 0x40
+ field public static final int GURMUKHI = 32; // 0x20
+ field public static final int KANNADA = 1024; // 0x400
+ field public static final int KHMER = 131072; // 0x20000
+ field public static final int LAO = 8192; // 0x2000
+ field public static final int MALAYALAM = 2048; // 0x800
+ field public static final int MONGOLIAN = 262144; // 0x40000
+ field public static final int MYANMAR = 32768; // 0x8000
+ field public static final int ORIYA = 128; // 0x80
+ field public static final int TAMIL = 256; // 0x100
+ field public static final int TELUGU = 512; // 0x200
+ field public static final int THAI = 4096; // 0x1000
+ field public static final int TIBETAN = 16384; // 0x4000
+ }
+
+ public static class NumericShaper.Range extends java.lang.Enum {
+ method public static java.awt.font.NumericShaper.Range valueOf(java.lang.String);
+ method public static final java.awt.font.NumericShaper.Range[] values();
+ enum_constant public static final java.awt.font.NumericShaper.Range ARABIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range BALINESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range BENGALI;
+ enum_constant public static final java.awt.font.NumericShaper.Range CHAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range DEVANAGARI;
+ enum_constant public static final java.awt.font.NumericShaper.Range EASTERN_ARABIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range ETHIOPIC;
+ enum_constant public static final java.awt.font.NumericShaper.Range EUROPEAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range GUJARATI;
+ enum_constant public static final java.awt.font.NumericShaper.Range GURMUKHI;
+ enum_constant public static final java.awt.font.NumericShaper.Range JAVANESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range KANNADA;
+ enum_constant public static final java.awt.font.NumericShaper.Range KAYAH_LI;
+ enum_constant public static final java.awt.font.NumericShaper.Range KHMER;
+ enum_constant public static final java.awt.font.NumericShaper.Range LAO;
+ enum_constant public static final java.awt.font.NumericShaper.Range LEPCHA;
+ enum_constant public static final java.awt.font.NumericShaper.Range LIMBU;
+ enum_constant public static final java.awt.font.NumericShaper.Range MALAYALAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range MEETEI_MAYEK;
+ enum_constant public static final java.awt.font.NumericShaper.Range MONGOLIAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range MYANMAR;
+ enum_constant public static final java.awt.font.NumericShaper.Range MYANMAR_SHAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range NEW_TAI_LUE;
+ enum_constant public static final java.awt.font.NumericShaper.Range NKO;
+ enum_constant public static final java.awt.font.NumericShaper.Range OL_CHIKI;
+ enum_constant public static final java.awt.font.NumericShaper.Range ORIYA;
+ enum_constant public static final java.awt.font.NumericShaper.Range SAURASHTRA;
+ enum_constant public static final java.awt.font.NumericShaper.Range SUNDANESE;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAI_THAM_HORA;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAI_THAM_THAM;
+ enum_constant public static final java.awt.font.NumericShaper.Range TAMIL;
+ enum_constant public static final java.awt.font.NumericShaper.Range TELUGU;
+ enum_constant public static final java.awt.font.NumericShaper.Range THAI;
+ enum_constant public static final java.awt.font.NumericShaper.Range TIBETAN;
+ enum_constant public static final java.awt.font.NumericShaper.Range VAI;
+ }
+
+ public final class TextAttribute extends java.text.AttributedCharacterIterator.Attribute {
+ ctor protected TextAttribute(java.lang.String);
+ field public static final java.awt.font.TextAttribute BACKGROUND;
+ field public static final java.awt.font.TextAttribute BIDI_EMBEDDING;
+ field public static final java.awt.font.TextAttribute CHAR_REPLACEMENT;
+ field public static final java.awt.font.TextAttribute FAMILY;
+ field public static final java.awt.font.TextAttribute FONT;
+ field public static final java.awt.font.TextAttribute FOREGROUND;
+ field public static final java.awt.font.TextAttribute INPUT_METHOD_HIGHLIGHT;
+ field public static final java.awt.font.TextAttribute INPUT_METHOD_UNDERLINE;
+ field public static final java.awt.font.TextAttribute JUSTIFICATION;
+ field public static final java.lang.Float JUSTIFICATION_FULL;
+ field public static final java.lang.Float JUSTIFICATION_NONE;
+ field public static final java.awt.font.TextAttribute KERNING;
+ field public static final java.lang.Integer KERNING_ON;
+ field public static final java.awt.font.TextAttribute LIGATURES;
+ field public static final java.lang.Integer LIGATURES_ON;
+ field public static final java.awt.font.TextAttribute NUMERIC_SHAPING;
+ field public static final java.awt.font.TextAttribute POSTURE;
+ field public static final java.lang.Float POSTURE_OBLIQUE;
+ field public static final java.lang.Float POSTURE_REGULAR;
+ field public static final java.awt.font.TextAttribute RUN_DIRECTION;
+ field public static final java.lang.Boolean RUN_DIRECTION_LTR;
+ field public static final java.lang.Boolean RUN_DIRECTION_RTL;
+ field public static final java.awt.font.TextAttribute SIZE;
+ field public static final java.awt.font.TextAttribute STRIKETHROUGH;
+ field public static final java.lang.Boolean STRIKETHROUGH_ON;
+ field public static final java.awt.font.TextAttribute SUPERSCRIPT;
+ field public static final java.lang.Integer SUPERSCRIPT_SUB;
+ field public static final java.lang.Integer SUPERSCRIPT_SUPER;
+ field public static final java.awt.font.TextAttribute SWAP_COLORS;
+ field public static final java.lang.Boolean SWAP_COLORS_ON;
+ field public static final java.awt.font.TextAttribute TRACKING;
+ field public static final java.lang.Float TRACKING_LOOSE;
+ field public static final java.lang.Float TRACKING_TIGHT;
+ field public static final java.awt.font.TextAttribute TRANSFORM;
+ field public static final java.awt.font.TextAttribute UNDERLINE;
+ field public static final java.lang.Integer UNDERLINE_LOW_DASHED;
+ field public static final java.lang.Integer UNDERLINE_LOW_DOTTED;
+ field public static final java.lang.Integer UNDERLINE_LOW_GRAY;
+ field public static final java.lang.Integer UNDERLINE_LOW_ONE_PIXEL;
+ field public static final java.lang.Integer UNDERLINE_LOW_TWO_PIXEL;
+ field public static final java.lang.Integer UNDERLINE_ON;
+ field public static final java.awt.font.TextAttribute WEIGHT;
+ field public static final java.lang.Float WEIGHT_BOLD;
+ field public static final java.lang.Float WEIGHT_DEMIBOLD;
+ field public static final java.lang.Float WEIGHT_DEMILIGHT;
+ field public static final java.lang.Float WEIGHT_EXTRABOLD;
+ field public static final java.lang.Float WEIGHT_EXTRA_LIGHT;
+ field public static final java.lang.Float WEIGHT_HEAVY;
+ field public static final java.lang.Float WEIGHT_LIGHT;
+ field public static final java.lang.Float WEIGHT_MEDIUM;
+ field public static final java.lang.Float WEIGHT_REGULAR;
+ field public static final java.lang.Float WEIGHT_SEMIBOLD;
+ field public static final java.lang.Float WEIGHT_ULTRABOLD;
+ field public static final java.awt.font.TextAttribute WIDTH;
+ field public static final java.lang.Float WIDTH_CONDENSED;
+ field public static final java.lang.Float WIDTH_EXTENDED;
+ field public static final java.lang.Float WIDTH_REGULAR;
+ field public static final java.lang.Float WIDTH_SEMI_CONDENSED;
+ field public static final java.lang.Float WIDTH_SEMI_EXTENDED;
+ }
+
+}
+
+package java.beans {
+
+ public class IndexedPropertyChangeEvent extends java.beans.PropertyChangeEvent {
+ ctor public IndexedPropertyChangeEvent(java.lang.Object, java.lang.String, java.lang.Object, java.lang.Object, int);
+ method public int getIndex();
+ }
+
+ public class PropertyChangeEvent extends java.util.EventObject {
+ ctor public PropertyChangeEvent(java.lang.Object, java.lang.String, java.lang.Object, java.lang.Object);
+ method public java.lang.Object getNewValue();
+ method public java.lang.Object getOldValue();
+ method public java.lang.Object getPropagationId();
+ method public java.lang.String getPropertyName();
+ method public void setPropagationId(java.lang.Object);
+ }
+
+ public abstract interface PropertyChangeListener implements java.util.EventListener {
+ method public abstract void propertyChange(java.beans.PropertyChangeEvent);
+ }
+
+ public class PropertyChangeListenerProxy extends java.util.EventListenerProxy implements java.beans.PropertyChangeListener {
+ ctor public PropertyChangeListenerProxy(java.lang.String, java.beans.PropertyChangeListener);
+ method public java.lang.String getPropertyName();
+ method public void propertyChange(java.beans.PropertyChangeEvent);
+ }
+
+ public class PropertyChangeSupport implements java.io.Serializable {
+ ctor public PropertyChangeSupport(java.lang.Object);
+ method public void addPropertyChangeListener(java.beans.PropertyChangeListener);
+ method public void addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
+ method public void fireIndexedPropertyChange(java.lang.String, int, java.lang.Object, java.lang.Object);
+ method public void fireIndexedPropertyChange(java.lang.String, int, int, int);
+ method public void fireIndexedPropertyChange(java.lang.String, int, boolean, boolean);
+ method public void firePropertyChange(java.lang.String, java.lang.Object, java.lang.Object);
+ method public void firePropertyChange(java.lang.String, int, int);
+ method public void firePropertyChange(java.lang.String, boolean, boolean);
+ method public void firePropertyChange(java.beans.PropertyChangeEvent);
+ method public java.beans.PropertyChangeListener[] getPropertyChangeListeners();
+ method public java.beans.PropertyChangeListener[] getPropertyChangeListeners(java.lang.String);
+ method public boolean hasListeners(java.lang.String);
+ method public void removePropertyChangeListener(java.beans.PropertyChangeListener);
+ method public void removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener);
+ }
+
+}
+
+package java.io {
+
+ public class BufferedInputStream extends java.io.FilterInputStream {
+ ctor public BufferedInputStream(java.io.InputStream);
+ ctor public BufferedInputStream(java.io.InputStream, int);
+ field protected volatile byte[] buf;
+ field protected int count;
+ field protected int marklimit;
+ field protected int markpos;
+ field protected int pos;
+ }
+
+ public class BufferedOutputStream extends java.io.FilterOutputStream {
+ ctor public BufferedOutputStream(java.io.OutputStream);
+ ctor public BufferedOutputStream(java.io.OutputStream, int);
+ field protected byte[] buf;
+ field protected int count;
+ }
+
+ public class BufferedReader extends java.io.Reader {
+ ctor public BufferedReader(java.io.Reader, int);
+ ctor public BufferedReader(java.io.Reader);
+ method public void close() throws java.io.IOException;
+ method public int read(char[], int, int) throws java.io.IOException;
+ method public java.lang.String readLine() throws java.io.IOException;
+ }
+
+ public class BufferedWriter extends java.io.Writer {
+ ctor public BufferedWriter(java.io.Writer);
+ ctor public BufferedWriter(java.io.Writer, int);
+ method public void close() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public void newLine() throws java.io.IOException;
+ method public void write(char[], int, int) throws java.io.IOException;
+ }
+
+ public class ByteArrayInputStream extends java.io.InputStream {
+ ctor public ByteArrayInputStream(byte[]);
+ ctor public ByteArrayInputStream(byte[], int, int);
+ method public synchronized int read();
+ field protected byte[] buf;
+ field protected int count;
+ field protected int mark;
+ field protected int pos;
+ }
+
+ public class ByteArrayOutputStream extends java.io.OutputStream {
+ ctor public ByteArrayOutputStream();
+ ctor public ByteArrayOutputStream(int);
+ method public synchronized void reset();
+ method public synchronized int size();
+ method public synchronized byte[] toByteArray();
+ method public synchronized java.lang.String toString(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public deprecated synchronized java.lang.String toString(int);
+ method public synchronized void write(int);
+ method public synchronized void writeTo(java.io.OutputStream) throws java.io.IOException;
+ field protected byte[] buf;
+ field protected int count;
+ }
+
+ public class CharArrayReader extends java.io.Reader {
+ ctor public CharArrayReader(char[]);
+ ctor public CharArrayReader(char[], int, int);
+ method public void close();
+ method public int read(char[], int, int) throws java.io.IOException;
+ field protected char[] buf;
+ field protected int count;
+ field protected int markedPos;
+ field protected int pos;
+ }
+
+ public class CharArrayWriter extends java.io.Writer {
+ ctor public CharArrayWriter();
+ ctor public CharArrayWriter(int);
+ method public void close();
+ method public void flush();
+ method public void reset();
+ method public int size();
+ method public char[] toCharArray();
+ method public void write(char[], int, int);
+ method public void writeTo(java.io.Writer) throws java.io.IOException;
+ field protected char[] buf;
+ field protected int count;
+ }
+
+ public class CharConversionException extends java.io.IOException {
+ ctor public CharConversionException();
+ ctor public CharConversionException(java.lang.String);
+ }
+
+ public abstract interface Closeable implements java.lang.AutoCloseable {
+ method public abstract void close() throws java.io.IOException;
+ }
+
+ public final class Console implements java.io.Flushable {
+ method public static java.io.Console console();
+ method public void flush();
+ method public java.io.Console format(java.lang.String, java.lang.Object...);
+ method public static synchronized java.io.Console getConsole();
+ method public java.io.Console printf(java.lang.String, java.lang.Object...);
+ method public java.lang.String readLine(java.lang.String, java.lang.Object...);
+ method public java.lang.String readLine();
+ method public char[] readPassword(java.lang.String, java.lang.Object...);
+ method public char[] readPassword();
+ method public java.io.Reader reader();
+ method public java.io.PrintWriter writer();
+ }
+
+ public abstract interface DataInput {
+ method public abstract boolean readBoolean() throws java.io.IOException;
+ method public abstract byte readByte() throws java.io.IOException;
+ method public abstract char readChar() throws java.io.IOException;
+ method public abstract double readDouble() throws java.io.IOException;
+ method public abstract float readFloat() throws java.io.IOException;
+ method public abstract void readFully(byte[]) throws java.io.IOException;
+ method public abstract void readFully(byte[], int, int) throws java.io.IOException;
+ method public abstract int readInt() throws java.io.IOException;
+ method public abstract java.lang.String readLine() throws java.io.IOException;
+ method public abstract long readLong() throws java.io.IOException;
+ method public abstract short readShort() throws java.io.IOException;
+ method public abstract java.lang.String readUTF() throws java.io.IOException;
+ method public abstract int readUnsignedByte() throws java.io.IOException;
+ method public abstract int readUnsignedShort() throws java.io.IOException;
+ method public abstract int skipBytes(int) throws java.io.IOException;
+ }
+
+ public class DataInputStream extends java.io.FilterInputStream implements java.io.DataInput {
+ ctor public DataInputStream(java.io.InputStream);
+ method public final int read(byte[]) throws java.io.IOException;
+ method public final int read(byte[], int, int) throws java.io.IOException;
+ method public final boolean readBoolean() throws java.io.IOException;
+ method public final byte readByte() throws java.io.IOException;
+ method public final char readChar() throws java.io.IOException;
+ method public final double readDouble() throws java.io.IOException;
+ method public final float readFloat() throws java.io.IOException;
+ method public final void readFully(byte[]) throws java.io.IOException;
+ method public final void readFully(byte[], int, int) throws java.io.IOException;
+ method public final int readInt() throws java.io.IOException;
+ method public final deprecated java.lang.String readLine() throws java.io.IOException;
+ method public final long readLong() throws java.io.IOException;
+ method public final short readShort() throws java.io.IOException;
+ method public final java.lang.String readUTF() throws java.io.IOException;
+ method public static final java.lang.String readUTF(java.io.DataInput) throws java.io.IOException;
+ method public final int readUnsignedByte() throws java.io.IOException;
+ method public final int readUnsignedShort() throws java.io.IOException;
+ method public final int skipBytes(int) throws java.io.IOException;
+ }
+
+ public abstract interface DataOutput {
+ method public abstract void write(int) throws java.io.IOException;
+ method public abstract void write(byte[]) throws java.io.IOException;
+ method public abstract void write(byte[], int, int) throws java.io.IOException;
+ method public abstract void writeBoolean(boolean) throws java.io.IOException;
+ method public abstract void writeByte(int) throws java.io.IOException;
+ method public abstract void writeBytes(java.lang.String) throws java.io.IOException;
+ method public abstract void writeChar(int) throws java.io.IOException;
+ method public abstract void writeChars(java.lang.String) throws java.io.IOException;
+ method public abstract void writeDouble(double) throws java.io.IOException;
+ method public abstract void writeFloat(float) throws java.io.IOException;
+ method public abstract void writeInt(int) throws java.io.IOException;
+ method public abstract void writeLong(long) throws java.io.IOException;
+ method public abstract void writeShort(int) throws java.io.IOException;
+ method public abstract void writeUTF(java.lang.String) throws java.io.IOException;
+ }
+
+ public class DataOutputStream extends java.io.FilterOutputStream implements java.io.DataOutput {
+ ctor public DataOutputStream(java.io.OutputStream);
+ method public final int size();
+ method public final void writeBoolean(boolean) throws java.io.IOException;
+ method public final void writeByte(int) throws java.io.IOException;
+ method public final void writeBytes(java.lang.String) throws java.io.IOException;
+ method public final void writeChar(int) throws java.io.IOException;
+ method public final void writeChars(java.lang.String) throws java.io.IOException;
+ method public final void writeDouble(double) throws java.io.IOException;
+ method public final void writeFloat(float) throws java.io.IOException;
+ method public final void writeInt(int) throws java.io.IOException;
+ method public final void writeLong(long) throws java.io.IOException;
+ method public final void writeShort(int) throws java.io.IOException;
+ method public final void writeUTF(java.lang.String) throws java.io.IOException;
+ field protected int written;
+ }
+
+ public class EOFException extends java.io.IOException {
+ ctor public EOFException();
+ ctor public EOFException(java.lang.String);
+ }
+
+ public abstract interface Externalizable implements java.io.Serializable {
+ method public abstract void readExternal(java.io.ObjectInput) throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public abstract void writeExternal(java.io.ObjectOutput) throws java.io.IOException;
+ }
+
+ public class File implements java.lang.Comparable java.io.Serializable {
+ ctor public File(java.lang.String);
+ ctor public File(java.lang.String, java.lang.String);
+ ctor public File(java.io.File, java.lang.String);
+ ctor public File(java.net.URI);
+ method public boolean canExecute();
+ method public boolean canRead();
+ method public boolean canWrite();
+ method public int compareTo(java.io.File);
+ method public boolean createNewFile() throws java.io.IOException;
+ method public static java.io.File createTempFile(java.lang.String, java.lang.String, java.io.File) throws java.io.IOException;
+ method public static java.io.File createTempFile(java.lang.String, java.lang.String) throws java.io.IOException;
+ method public boolean delete();
+ method public void deleteOnExit();
+ method public boolean exists();
+ method public java.io.File getAbsoluteFile();
+ method public java.lang.String getAbsolutePath();
+ method public java.io.File getCanonicalFile() throws java.io.IOException;
+ method public java.lang.String getCanonicalPath() throws java.io.IOException;
+ method public long getFreeSpace();
+ method public java.lang.String getName();
+ method public java.lang.String getParent();
+ method public java.io.File getParentFile();
+ method public java.lang.String getPath();
+ method public long getTotalSpace();
+ method public long getUsableSpace();
+ method public boolean isAbsolute();
+ method public boolean isDirectory();
+ method public boolean isFile();
+ method public boolean isHidden();
+ method public long lastModified();
+ method public long length();
+ method public java.lang.String[] list();
+ method public java.lang.String[] list(java.io.FilenameFilter);
+ method public java.io.File[] listFiles();
+ method public java.io.File[] listFiles(java.io.FilenameFilter);
+ method public java.io.File[] listFiles(java.io.FileFilter);
+ method public static java.io.File[] listRoots();
+ method public boolean mkdir();
+ method public boolean mkdirs();
+ method public boolean renameTo(java.io.File);
+ method public boolean setExecutable(boolean, boolean);
+ method public boolean setExecutable(boolean);
+ method public boolean setLastModified(long);
+ method public boolean setReadOnly();
+ method public boolean setReadable(boolean, boolean);
+ method public boolean setReadable(boolean);
+ method public boolean setWritable(boolean, boolean);
+ method public boolean setWritable(boolean);
+ method public java.nio.file.Path toPath();
+ method public java.net.URI toURI();
+ method public deprecated java.net.URL toURL() throws java.net.MalformedURLException;
+ field public static final java.lang.String pathSeparator;
+ field public static final char pathSeparatorChar;
+ field public static final java.lang.String separator;
+ field public static final char separatorChar;
+ }
+
+ public final class FileDescriptor {
+ ctor public FileDescriptor();
+ method public void sync() throws java.io.SyncFailedException;
+ method public boolean valid();
+ field public static final java.io.FileDescriptor err;
+ field public static final java.io.FileDescriptor in;
+ field public static final java.io.FileDescriptor out;
+ }
+
+ public abstract interface FileFilter {
+ method public abstract boolean accept(java.io.File);
+ }
+
+ public class FileInputStream extends java.io.InputStream {
+ ctor public FileInputStream(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public FileInputStream(java.io.File) throws java.io.FileNotFoundException;
+ ctor public FileInputStream(java.io.FileDescriptor);
+ method public java.nio.channels.FileChannel getChannel();
+ method public final java.io.FileDescriptor getFD() throws java.io.IOException;
+ method public int read() throws java.io.IOException;
+ }
+
+ public class FileNotFoundException extends java.io.IOException {
+ ctor public FileNotFoundException();
+ ctor public FileNotFoundException(java.lang.String);
+ }
+
+ public class FileOutputStream extends java.io.OutputStream {
+ ctor public FileOutputStream(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public FileOutputStream(java.lang.String, boolean) throws java.io.FileNotFoundException;
+ ctor public FileOutputStream(java.io.File) throws java.io.FileNotFoundException;
+ ctor public FileOutputStream(java.io.File, boolean) throws java.io.FileNotFoundException;
+ ctor public FileOutputStream(java.io.FileDescriptor);
+ method public java.nio.channels.FileChannel getChannel();
+ method public final java.io.FileDescriptor getFD() throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
+ }
+
+ public final class FilePermission extends java.security.Permission implements java.io.Serializable {
+ ctor public FilePermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
+ method public java.lang.String getActions();
+ method public int hashCode();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public class FileReader extends java.io.InputStreamReader {
+ ctor public FileReader(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public FileReader(java.io.File) throws java.io.FileNotFoundException;
+ ctor public FileReader(java.io.FileDescriptor);
+ }
+
+ public class FileWriter extends java.io.OutputStreamWriter {
+ ctor public FileWriter(java.lang.String) throws java.io.IOException;
+ ctor public FileWriter(java.lang.String, boolean) throws java.io.IOException;
+ ctor public FileWriter(java.io.File) throws java.io.IOException;
+ ctor public FileWriter(java.io.File, boolean) throws java.io.IOException;
+ ctor public FileWriter(java.io.FileDescriptor);
+ }
+
+ public abstract interface FilenameFilter {
+ method public abstract boolean accept(java.io.File, java.lang.String);
+ }
+
+ public class FilterInputStream extends java.io.InputStream {
+ ctor protected FilterInputStream(java.io.InputStream);
+ method public int read() throws java.io.IOException;
+ field protected volatile java.io.InputStream in;
+ }
+
+ public class FilterOutputStream extends java.io.OutputStream {
+ ctor public FilterOutputStream(java.io.OutputStream);
+ method public void write(int) throws java.io.IOException;
+ field protected java.io.OutputStream out;
+ }
+
+ public abstract class FilterReader extends java.io.Reader {
+ ctor protected FilterReader(java.io.Reader);
+ method public void close() throws java.io.IOException;
+ method public int read(char[], int, int) throws java.io.IOException;
+ field protected java.io.Reader in;
+ }
+
+ public abstract class FilterWriter extends java.io.Writer {
+ ctor protected FilterWriter(java.io.Writer);
+ method public void close() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public void write(char[], int, int) throws java.io.IOException;
+ field protected java.io.Writer out;
+ }
+
+ public abstract interface Flushable {
+ method public abstract void flush() throws java.io.IOException;
+ }
+
+ public class IOError extends java.lang.Error {
+ ctor public IOError(java.lang.Throwable);
+ }
+
+ public class IOException extends java.lang.Exception {
+ ctor public IOException();
+ ctor public IOException(java.lang.String);
+ ctor public IOException(java.lang.String, java.lang.Throwable);
+ ctor public IOException(java.lang.Throwable);
+ }
+
+ public abstract class InputStream implements java.io.Closeable {
+ ctor public InputStream();
+ method public int available() throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public synchronized void mark(int);
+ method public boolean markSupported();
+ method public abstract int read() throws java.io.IOException;
+ method public int read(byte[]) throws java.io.IOException;
+ method public int read(byte[], int, int) throws java.io.IOException;
+ method public synchronized void reset() throws java.io.IOException;
+ method public long skip(long) throws java.io.IOException;
+ }
+
+ public class InputStreamReader extends java.io.Reader {
+ ctor public InputStreamReader(java.io.InputStream);
+ ctor public InputStreamReader(java.io.InputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public InputStreamReader(java.io.InputStream, java.nio.charset.Charset);
+ ctor public InputStreamReader(java.io.InputStream, java.nio.charset.CharsetDecoder);
+ method public void close() throws java.io.IOException;
+ method public java.lang.String getEncoding();
+ method public int read(char[], int, int) throws java.io.IOException;
+ }
+
+ public class InterruptedIOException extends java.io.IOException {
+ ctor public InterruptedIOException();
+ ctor public InterruptedIOException(java.lang.String);
+ ctor public InterruptedIOException(java.lang.Throwable);
+ field public int bytesTransferred;
+ }
+
+ public class InvalidClassException extends java.io.ObjectStreamException {
+ ctor public InvalidClassException(java.lang.String);
+ ctor public InvalidClassException(java.lang.String, java.lang.String);
+ field public java.lang.String classname;
+ }
+
+ public class InvalidObjectException extends java.io.ObjectStreamException {
+ ctor public InvalidObjectException(java.lang.String);
+ }
+
+ public deprecated class LineNumberInputStream extends java.io.FilterInputStream {
+ ctor public LineNumberInputStream(java.io.InputStream);
+ method public int getLineNumber();
+ method public void setLineNumber(int);
+ }
+
+ public class LineNumberReader extends java.io.BufferedReader {
+ ctor public LineNumberReader(java.io.Reader);
+ ctor public LineNumberReader(java.io.Reader, int);
+ method public int getLineNumber();
+ method public void setLineNumber(int);
+ }
+
+ public class NotActiveException extends java.io.ObjectStreamException {
+ ctor public NotActiveException(java.lang.String);
+ ctor public NotActiveException();
+ }
+
+ public class NotSerializableException extends java.io.ObjectStreamException {
+ ctor public NotSerializableException(java.lang.String);
+ ctor public NotSerializableException();
+ }
+
+ public abstract interface ObjectInput implements java.lang.AutoCloseable java.io.DataInput {
+ method public abstract int available() throws java.io.IOException;
+ method public abstract void close() throws java.io.IOException;
+ method public abstract int read() throws java.io.IOException;
+ method public abstract int read(byte[]) throws java.io.IOException;
+ method public abstract int read(byte[], int, int) throws java.io.IOException;
+ method public abstract java.lang.Object readObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public abstract long skip(long) throws java.io.IOException;
+ }
+
+ public class ObjectInputStream extends java.io.InputStream implements java.io.ObjectInput java.io.ObjectStreamConstants {
+ ctor public ObjectInputStream(java.io.InputStream) throws java.io.IOException;
+ ctor protected ObjectInputStream() throws java.io.IOException, java.lang.SecurityException;
+ method public void defaultReadObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected boolean enableResolveObject(boolean) throws java.lang.SecurityException;
+ method public int read() throws java.io.IOException;
+ method public boolean readBoolean() throws java.io.IOException;
+ method public byte readByte() throws java.io.IOException;
+ method public char readChar() throws java.io.IOException;
+ method protected java.io.ObjectStreamClass readClassDescriptor() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public double readDouble() throws java.io.IOException;
+ method public java.io.ObjectInputStream.GetField readFields() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public float readFloat() throws java.io.IOException;
+ method public void readFully(byte[]) throws java.io.IOException;
+ method public void readFully(byte[], int, int) throws java.io.IOException;
+ method public int readInt() throws java.io.IOException;
+ method public deprecated java.lang.String readLine() throws java.io.IOException;
+ method public long readLong() throws java.io.IOException;
+ method public final java.lang.Object readObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected java.lang.Object readObjectOverride() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public short readShort() throws java.io.IOException;
+ method protected void readStreamHeader() throws java.io.IOException, java.io.StreamCorruptedException;
+ method public java.lang.String readUTF() throws java.io.IOException;
+ method public java.lang.Object readUnshared() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public int readUnsignedByte() throws java.io.IOException;
+ method public int readUnsignedShort() throws java.io.IOException;
+ method public void registerValidation(java.io.ObjectInputValidation, int) throws java.io.InvalidObjectException, java.io.NotActiveException;
+ method protected java.lang.Class<?> resolveClass(java.io.ObjectStreamClass) throws java.lang.ClassNotFoundException, java.io.IOException;
+ method protected java.lang.Object resolveObject(java.lang.Object) throws java.io.IOException;
+ method protected java.lang.Class<?> resolveProxyClass(java.lang.String[]) throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public int skipBytes(int) throws java.io.IOException;
+ }
+
+ public static abstract class ObjectInputStream.GetField {
+ ctor public ObjectInputStream.GetField();
+ method public abstract boolean defaulted(java.lang.String) throws java.io.IOException;
+ method public abstract boolean get(java.lang.String, boolean) throws java.io.IOException;
+ method public abstract byte get(java.lang.String, byte) throws java.io.IOException;
+ method public abstract char get(java.lang.String, char) throws java.io.IOException;
+ method public abstract short get(java.lang.String, short) throws java.io.IOException;
+ method public abstract int get(java.lang.String, int) throws java.io.IOException;
+ method public abstract long get(java.lang.String, long) throws java.io.IOException;
+ method public abstract float get(java.lang.String, float) throws java.io.IOException;
+ method public abstract double get(java.lang.String, double) throws java.io.IOException;
+ method public abstract java.lang.Object get(java.lang.String, java.lang.Object) throws java.io.IOException;
+ method public abstract java.io.ObjectStreamClass getObjectStreamClass();
+ }
+
+ public abstract interface ObjectInputValidation {
+ method public abstract void validateObject() throws java.io.InvalidObjectException;
+ }
+
+ public abstract interface ObjectOutput implements java.lang.AutoCloseable java.io.DataOutput {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract void flush() throws java.io.IOException;
+ method public abstract void write(int) throws java.io.IOException;
+ method public abstract void write(byte[]) throws java.io.IOException;
+ method public abstract void write(byte[], int, int) throws java.io.IOException;
+ method public abstract void writeObject(java.lang.Object) throws java.io.IOException;
+ }
+
+ public class ObjectOutputStream extends java.io.OutputStream implements java.io.ObjectOutput java.io.ObjectStreamConstants {
+ ctor public ObjectOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor protected ObjectOutputStream() throws java.io.IOException, java.lang.SecurityException;
+ method protected void annotateClass(java.lang.Class<?>) throws java.io.IOException;
+ method protected void annotateProxyClass(java.lang.Class<?>) throws java.io.IOException;
+ method public void defaultWriteObject() throws java.io.IOException;
+ method protected void drain() throws java.io.IOException;
+ method protected boolean enableReplaceObject(boolean) throws java.lang.SecurityException;
+ method public java.io.ObjectOutputStream.PutField putFields() throws java.io.IOException;
+ method protected java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException;
+ method public void reset() throws java.io.IOException;
+ method public void useProtocolVersion(int) throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
+ method public void writeBoolean(boolean) throws java.io.IOException;
+ method public void writeByte(int) throws java.io.IOException;
+ method public void writeBytes(java.lang.String) throws java.io.IOException;
+ method public void writeChar(int) throws java.io.IOException;
+ method public void writeChars(java.lang.String) throws java.io.IOException;
+ method protected void writeClassDescriptor(java.io.ObjectStreamClass) throws java.io.IOException;
+ method public void writeDouble(double) throws java.io.IOException;
+ method public void writeFields() throws java.io.IOException;
+ method public void writeFloat(float) throws java.io.IOException;
+ method public void writeInt(int) throws java.io.IOException;
+ method public void writeLong(long) throws java.io.IOException;
+ method public final void writeObject(java.lang.Object) throws java.io.IOException;
+ method protected void writeObjectOverride(java.lang.Object) throws java.io.IOException;
+ method public void writeShort(int) throws java.io.IOException;
+ method protected void writeStreamHeader() throws java.io.IOException;
+ method public void writeUTF(java.lang.String) throws java.io.IOException;
+ method public void writeUnshared(java.lang.Object) throws java.io.IOException;
+ }
+
+ public static abstract class ObjectOutputStream.PutField {
+ ctor public ObjectOutputStream.PutField();
+ method public abstract void put(java.lang.String, boolean);
+ method public abstract void put(java.lang.String, byte);
+ method public abstract void put(java.lang.String, char);
+ method public abstract void put(java.lang.String, short);
+ method public abstract void put(java.lang.String, int);
+ method public abstract void put(java.lang.String, long);
+ method public abstract void put(java.lang.String, float);
+ method public abstract void put(java.lang.String, double);
+ method public abstract void put(java.lang.String, java.lang.Object);
+ method public abstract deprecated void write(java.io.ObjectOutput) throws java.io.IOException;
+ }
+
+ public class ObjectStreamClass implements java.io.Serializable {
+ method public java.lang.Class<?> forClass();
+ method public java.io.ObjectStreamField getField(java.lang.String);
+ method public java.io.ObjectStreamField[] getFields();
+ method public java.lang.String getName();
+ method public long getSerialVersionUID();
+ method public static java.io.ObjectStreamClass lookup(java.lang.Class<?>);
+ method public static java.io.ObjectStreamClass lookupAny(java.lang.Class<?>);
+ field public static final java.io.ObjectStreamField[] NO_FIELDS;
+ }
+
+ public abstract interface ObjectStreamConstants {
+ field public static final int PROTOCOL_VERSION_1 = 1; // 0x1
+ field public static final int PROTOCOL_VERSION_2 = 2; // 0x2
+ field public static final byte SC_BLOCK_DATA = 8; // 0x8
+ field public static final byte SC_ENUM = 16; // 0x10
+ field public static final byte SC_EXTERNALIZABLE = 4; // 0x4
+ field public static final byte SC_SERIALIZABLE = 2; // 0x2
+ field public static final byte SC_WRITE_METHOD = 1; // 0x1
+ field public static final short STREAM_MAGIC = -21267; // 0xffffaced
+ field public static final short STREAM_VERSION = 5; // 0x5
+ field public static final java.io.SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION;
+ field public static final java.io.SerializablePermission SUBSTITUTION_PERMISSION;
+ field public static final byte TC_ARRAY = 117; // 0x75
+ field public static final byte TC_BASE = 112; // 0x70
+ field public static final byte TC_BLOCKDATA = 119; // 0x77
+ field public static final byte TC_BLOCKDATALONG = 122; // 0x7a
+ field public static final byte TC_CLASS = 118; // 0x76
+ field public static final byte TC_CLASSDESC = 114; // 0x72
+ field public static final byte TC_ENDBLOCKDATA = 120; // 0x78
+ field public static final byte TC_ENUM = 126; // 0x7e
+ field public static final byte TC_EXCEPTION = 123; // 0x7b
+ field public static final byte TC_LONGSTRING = 124; // 0x7c
+ field public static final byte TC_MAX = 126; // 0x7e
+ field public static final byte TC_NULL = 112; // 0x70
+ field public static final byte TC_OBJECT = 115; // 0x73
+ field public static final byte TC_PROXYCLASSDESC = 125; // 0x7d
+ field public static final byte TC_REFERENCE = 113; // 0x71
+ field public static final byte TC_RESET = 121; // 0x79
+ field public static final byte TC_STRING = 116; // 0x74
+ field public static final int baseWireHandle = 8257536; // 0x7e0000
+ }
+
+ public abstract class ObjectStreamException extends java.io.IOException {
+ ctor protected ObjectStreamException(java.lang.String);
+ ctor protected ObjectStreamException();
+ }
+
+ public class ObjectStreamField implements java.lang.Comparable {
+ ctor public ObjectStreamField(java.lang.String, java.lang.Class<?>);
+ ctor public ObjectStreamField(java.lang.String, java.lang.Class<?>, boolean);
+ method public int compareTo(java.lang.Object);
+ method public java.lang.String getName();
+ method public int getOffset();
+ method public java.lang.Class<?> getType();
+ method public char getTypeCode();
+ method public java.lang.String getTypeString();
+ method public boolean isPrimitive();
+ method public boolean isUnshared();
+ method protected void setOffset(int);
+ }
+
+ public class OptionalDataException extends java.io.ObjectStreamException {
+ field public boolean eof;
+ field public int length;
+ }
+
+ public abstract class OutputStream implements java.io.Closeable java.io.Flushable {
+ ctor public OutputStream();
+ method public void close() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public abstract void write(int) throws java.io.IOException;
+ method public void write(byte[]) throws java.io.IOException;
+ method public void write(byte[], int, int) throws java.io.IOException;
+ }
+
+ public class OutputStreamWriter extends java.io.Writer {
+ ctor public OutputStreamWriter(java.io.OutputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public OutputStreamWriter(java.io.OutputStream);
+ ctor public OutputStreamWriter(java.io.OutputStream, java.nio.charset.Charset);
+ ctor public OutputStreamWriter(java.io.OutputStream, java.nio.charset.CharsetEncoder);
+ method public void close() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public java.lang.String getEncoding();
+ method public void write(char[], int, int) throws java.io.IOException;
+ }
+
+ public class PipedInputStream extends java.io.InputStream {
+ ctor public PipedInputStream(java.io.PipedOutputStream) throws java.io.IOException;
+ ctor public PipedInputStream(java.io.PipedOutputStream, int) throws java.io.IOException;
+ ctor public PipedInputStream();
+ ctor public PipedInputStream(int);
+ method public void connect(java.io.PipedOutputStream) throws java.io.IOException;
+ method public synchronized int read() throws java.io.IOException;
+ method protected synchronized void receive(int) throws java.io.IOException;
+ field protected static final int PIPE_SIZE = 1024; // 0x400
+ field protected byte[] buffer;
+ field protected int in;
+ field protected int out;
+ }
+
+ public class PipedOutputStream extends java.io.OutputStream {
+ ctor public PipedOutputStream(java.io.PipedInputStream) throws java.io.IOException;
+ ctor public PipedOutputStream();
+ method public synchronized void connect(java.io.PipedInputStream) throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
+ }
+
+ public class PipedReader extends java.io.Reader {
+ ctor public PipedReader(java.io.PipedWriter) throws java.io.IOException;
+ ctor public PipedReader(java.io.PipedWriter, int) throws java.io.IOException;
+ ctor public PipedReader();
+ ctor public PipedReader(int);
+ method public void close() throws java.io.IOException;
+ method public void connect(java.io.PipedWriter) throws java.io.IOException;
+ method public synchronized int read(char[], int, int) throws java.io.IOException;
+ }
+
+ public class PipedWriter extends java.io.Writer {
+ ctor public PipedWriter(java.io.PipedReader) throws java.io.IOException;
+ ctor public PipedWriter();
+ method public void close() throws java.io.IOException;
+ method public synchronized void connect(java.io.PipedReader) throws java.io.IOException;
+ method public synchronized void flush() throws java.io.IOException;
+ method public void write(char[], int, int) throws java.io.IOException;
+ }
+
+ public class PrintStream extends java.io.FilterOutputStream implements java.lang.Appendable java.io.Closeable {
+ ctor public PrintStream(java.io.OutputStream);
+ ctor public PrintStream(java.io.OutputStream, boolean);
+ ctor public PrintStream(java.io.OutputStream, boolean, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public PrintStream(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public PrintStream(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public PrintStream(java.io.File) throws java.io.FileNotFoundException;
+ ctor public PrintStream(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ method public java.io.PrintStream append(java.lang.CharSequence);
+ method public java.io.PrintStream append(java.lang.CharSequence, int, int);
+ method public java.io.PrintStream append(char);
+ method public boolean checkError();
+ method protected void clearError();
+ method public java.io.PrintStream format(java.lang.String, java.lang.Object...);
+ method public java.io.PrintStream format(java.util.Locale, java.lang.String, java.lang.Object...);
+ method public void print(boolean);
+ method public void print(char);
+ method public void print(int);
+ method public void print(long);
+ method public void print(float);
+ method public void print(double);
+ method public void print(char[]);
+ method public void print(java.lang.String);
+ method public void print(java.lang.Object);
+ method public java.io.PrintStream printf(java.lang.String, java.lang.Object...);
+ method public java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...);
+ method public void println();
+ method public void println(boolean);
+ method public void println(char);
+ method public void println(int);
+ method public void println(long);
+ method public void println(float);
+ method public void println(double);
+ method public void println(char[]);
+ method public void println(java.lang.String);
+ method public void println(java.lang.Object);
+ method protected void setError();
+ }
+
+ public class PrintWriter extends java.io.Writer {
+ ctor public PrintWriter(java.io.Writer);
+ ctor public PrintWriter(java.io.Writer, boolean);
+ ctor public PrintWriter(java.io.OutputStream);
+ ctor public PrintWriter(java.io.OutputStream, boolean);
+ ctor public PrintWriter(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public PrintWriter(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public PrintWriter(java.io.File) throws java.io.FileNotFoundException;
+ ctor public PrintWriter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ method public boolean checkError();
+ method protected void clearError();
+ method public void close();
+ method public void flush();
+ method public java.io.PrintWriter format(java.lang.String, java.lang.Object...);
+ method public java.io.PrintWriter format(java.util.Locale, java.lang.String, java.lang.Object...);
+ method public void print(boolean);
+ method public void print(char);
+ method public void print(int);
+ method public void print(long);
+ method public void print(float);
+ method public void print(double);
+ method public void print(char[]);
+ method public void print(java.lang.String);
+ method public void print(java.lang.Object);
+ method public java.io.PrintWriter printf(java.lang.String, java.lang.Object...);
+ method public java.io.PrintWriter printf(java.util.Locale, java.lang.String, java.lang.Object...);
+ method public void println();
+ method public void println(boolean);
+ method public void println(char);
+ method public void println(int);
+ method public void println(long);
+ method public void println(float);
+ method public void println(double);
+ method public void println(char[]);
+ method public void println(java.lang.String);
+ method public void println(java.lang.Object);
+ method protected void setError();
+ method public void write(char[], int, int);
+ field protected java.io.Writer out;
+ }
+
+ public class PushbackInputStream extends java.io.FilterInputStream {
+ ctor public PushbackInputStream(java.io.InputStream, int);
+ ctor public PushbackInputStream(java.io.InputStream);
+ method public void unread(int) throws java.io.IOException;
+ method public void unread(byte[], int, int) throws java.io.IOException;
+ method public void unread(byte[]) throws java.io.IOException;
+ field protected byte[] buf;
+ field protected int pos;
+ }
+
+ public class PushbackReader extends java.io.FilterReader {
+ ctor public PushbackReader(java.io.Reader, int);
+ ctor public PushbackReader(java.io.Reader);
+ method public void unread(int) throws java.io.IOException;
+ method public void unread(char[], int, int) throws java.io.IOException;
+ method public void unread(char[]) throws java.io.IOException;
+ }
+
+ public class RandomAccessFile implements java.io.Closeable java.io.DataInput java.io.DataOutput {
+ ctor public RandomAccessFile(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+ ctor public RandomAccessFile(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
+ method public void close() throws java.io.IOException;
+ method public final java.nio.channels.FileChannel getChannel();
+ method public final java.io.FileDescriptor getFD() throws java.io.IOException;
+ method public long getFilePointer() throws java.io.IOException;
+ method public long length() throws java.io.IOException;
+ method public int read() throws java.io.IOException;
+ method public int read(byte[], int, int) throws java.io.IOException;
+ method public int read(byte[]) throws java.io.IOException;
+ method public final boolean readBoolean() throws java.io.IOException;
+ method public final byte readByte() throws java.io.IOException;
+ method public final char readChar() throws java.io.IOException;
+ method public final double readDouble() throws java.io.IOException;
+ method public final float readFloat() throws java.io.IOException;
+ method public final void readFully(byte[]) throws java.io.IOException;
+ method public final void readFully(byte[], int, int) throws java.io.IOException;
+ method public final int readInt() throws java.io.IOException;
+ method public final java.lang.String readLine() throws java.io.IOException;
+ method public final long readLong() throws java.io.IOException;
+ method public final short readShort() throws java.io.IOException;
+ method public final java.lang.String readUTF() throws java.io.IOException;
+ method public final int readUnsignedByte() throws java.io.IOException;
+ method public final int readUnsignedShort() throws java.io.IOException;
+ method public void seek(long) throws java.io.IOException;
+ method public void setLength(long) throws java.io.IOException;
+ method public int skipBytes(int) throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
+ method public void write(byte[]) throws java.io.IOException;
+ method public void write(byte[], int, int) throws java.io.IOException;
+ method public final void writeBoolean(boolean) throws java.io.IOException;
+ method public final void writeByte(int) throws java.io.IOException;
+ method public final void writeBytes(java.lang.String) throws java.io.IOException;
+ method public final void writeChar(int) throws java.io.IOException;
+ method public final void writeChars(java.lang.String) throws java.io.IOException;
+ method public final void writeDouble(double) throws java.io.IOException;
+ method public final void writeFloat(float) throws java.io.IOException;
+ method public final void writeInt(int) throws java.io.IOException;
+ method public final void writeLong(long) throws java.io.IOException;
+ method public final void writeShort(int) throws java.io.IOException;
+ method public final void writeUTF(java.lang.String) throws java.io.IOException;
+ }
+
+ public abstract class Reader implements java.io.Closeable java.lang.Readable {
+ ctor protected Reader();
+ ctor protected Reader(java.lang.Object);
+ method public abstract void close() throws java.io.IOException;
+ method public void mark(int) throws java.io.IOException;
+ method public boolean markSupported();
+ method public int read(java.nio.CharBuffer) throws java.io.IOException;
+ method public int read() throws java.io.IOException;
+ method public int read(char[]) throws java.io.IOException;
+ method public abstract int read(char[], int, int) throws java.io.IOException;
+ method public boolean ready() throws java.io.IOException;
+ method public void reset() throws java.io.IOException;
+ method public long skip(long) throws java.io.IOException;
+ field protected java.lang.Object lock;
+ }
+
+ public class SequenceInputStream extends java.io.InputStream {
+ ctor public SequenceInputStream(java.util.Enumeration<? extends java.io.InputStream>);
+ ctor public SequenceInputStream(java.io.InputStream, java.io.InputStream);
+ method public int read() throws java.io.IOException;
+ }
+
+ public abstract interface Serializable {
+ }
+
+ public final class SerializablePermission extends java.security.BasicPermission {
+ ctor public SerializablePermission(java.lang.String);
+ ctor public SerializablePermission(java.lang.String, java.lang.String);
+ }
+
+ public class StreamCorruptedException extends java.io.ObjectStreamException {
+ ctor public StreamCorruptedException(java.lang.String);
+ ctor public StreamCorruptedException();
+ }
+
+ public class StreamTokenizer {
+ ctor public deprecated StreamTokenizer(java.io.InputStream);
+ ctor public StreamTokenizer(java.io.Reader);
+ method public void commentChar(int);
+ method public void eolIsSignificant(boolean);
+ method public int lineno();
+ method public void lowerCaseMode(boolean);
+ method public int nextToken() throws java.io.IOException;
+ method public void ordinaryChar(int);
+ method public void ordinaryChars(int, int);
+ method public void parseNumbers();
+ method public void pushBack();
+ method public void quoteChar(int);
+ method public void resetSyntax();
+ method public void slashSlashComments(boolean);
+ method public void slashStarComments(boolean);
+ method public void whitespaceChars(int, int);
+ method public void wordChars(int, int);
+ field public static final int TT_EOF = -1; // 0xffffffff
+ field public static final int TT_EOL = 10; // 0xa
+ field public static final int TT_NUMBER = -2; // 0xfffffffe
+ field public static final int TT_WORD = -3; // 0xfffffffd
+ field public double nval;
+ field public java.lang.String sval;
+ field public int ttype;
+ }
+
+ public deprecated class StringBufferInputStream extends java.io.InputStream {
+ ctor public StringBufferInputStream(java.lang.String);
+ method public synchronized int read();
+ field protected java.lang.String buffer;
+ field protected int count;
+ field protected int pos;
+ }
+
+ public class StringReader extends java.io.Reader {
+ ctor public StringReader(java.lang.String);
+ method public void close();
+ method public int read(char[], int, int) throws java.io.IOException;
+ }
+
+ public class StringWriter extends java.io.Writer {
+ ctor public StringWriter();
+ ctor public StringWriter(int);
+ method public void close() throws java.io.IOException;
+ method public void flush();
+ method public java.lang.StringBuffer getBuffer();
+ method public void write(char[], int, int);
+ }
+
+ public class SyncFailedException extends java.io.IOException {
+ ctor public SyncFailedException(java.lang.String);
+ }
+
+ public class UTFDataFormatException extends java.io.IOException {
+ ctor public UTFDataFormatException();
+ ctor public UTFDataFormatException(java.lang.String);
+ }
+
+ public class UnsupportedEncodingException extends java.io.IOException {
+ ctor public UnsupportedEncodingException();
+ ctor public UnsupportedEncodingException(java.lang.String);
+ }
+
+ public class WriteAbortedException extends java.io.ObjectStreamException {
+ ctor public WriteAbortedException(java.lang.String, java.lang.Exception);
+ field public java.lang.Exception detail;
+ }
+
+ public abstract class Writer implements java.lang.Appendable java.io.Closeable java.io.Flushable {
+ ctor protected Writer();
+ ctor protected Writer(java.lang.Object);
+ method public java.io.Writer append(java.lang.CharSequence) throws java.io.IOException;
+ method public java.io.Writer append(java.lang.CharSequence, int, int) throws java.io.IOException;
+ method public java.io.Writer append(char) throws java.io.IOException;
+ method public abstract void close() throws java.io.IOException;
+ method public abstract void flush() throws java.io.IOException;
+ method public void write(int) throws java.io.IOException;
+ method public void write(char[]) throws java.io.IOException;
+ method public abstract void write(char[], int, int) throws java.io.IOException;
+ method public void write(java.lang.String) throws java.io.IOException;
+ method public void write(java.lang.String, int, int) throws java.io.IOException;
+ field protected java.lang.Object lock;
+ }
+
+}
+
+package java.lang {
+
+ public class AbstractMethodError extends java.lang.IncompatibleClassChangeError {
+ ctor public AbstractMethodError();
+ ctor public AbstractMethodError(java.lang.String);
+ }
+
+ abstract class AbstractStringBuilder implements java.lang.Appendable java.lang.CharSequence {
+ method public java.lang.AbstractStringBuilder append(java.lang.Object);
+ method public java.lang.AbstractStringBuilder append(java.lang.String);
+ method public java.lang.AbstractStringBuilder append(java.lang.StringBuffer);
+ method public java.lang.AbstractStringBuilder append(java.lang.CharSequence);
+ method public java.lang.AbstractStringBuilder append(java.lang.CharSequence, int, int);
+ method public java.lang.AbstractStringBuilder append(char[]);
+ method public java.lang.AbstractStringBuilder append(char[], int, int);
+ method public java.lang.AbstractStringBuilder append(boolean);
+ method public java.lang.AbstractStringBuilder append(char);
+ method public java.lang.AbstractStringBuilder append(int);
+ method public java.lang.AbstractStringBuilder append(long);
+ method public java.lang.AbstractStringBuilder append(float);
+ method public java.lang.AbstractStringBuilder append(double);
+ method public java.lang.AbstractStringBuilder appendCodePoint(int);
+ method public int capacity();
+ method public char charAt(int);
+ method public int codePointAt(int);
+ method public int codePointBefore(int);
+ method public int codePointCount(int, int);
+ method public java.lang.AbstractStringBuilder delete(int, int);
+ method public java.lang.AbstractStringBuilder deleteCharAt(int);
+ method public void ensureCapacity(int);
+ method public void getChars(int, int, char[], int);
+ method public int indexOf(java.lang.String);
+ method public int indexOf(java.lang.String, int);
+ method public java.lang.AbstractStringBuilder insert(int, char[], int, int);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.Object);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.String);
+ method public java.lang.AbstractStringBuilder insert(int, char[]);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.CharSequence);
+ method public java.lang.AbstractStringBuilder insert(int, java.lang.CharSequence, int, int);
+ method public java.lang.AbstractStringBuilder insert(int, boolean);
+ method public java.lang.AbstractStringBuilder insert(int, char);
+ method public java.lang.AbstractStringBuilder insert(int, int);
+ method public java.lang.AbstractStringBuilder insert(int, long);
+ method public java.lang.AbstractStringBuilder insert(int, float);
+ method public java.lang.AbstractStringBuilder insert(int, double);
+ method public int lastIndexOf(java.lang.String);
+ method public int lastIndexOf(java.lang.String, int);
+ method public int length();
+ method public int offsetByCodePoints(int, int);
+ method public java.lang.AbstractStringBuilder replace(int, int, java.lang.String);
+ method public java.lang.AbstractStringBuilder reverse();
+ method public void setCharAt(int, char);
+ method public void setLength(int);
+ method public java.lang.CharSequence subSequence(int, int);
+ method public java.lang.String substring(int);
+ method public java.lang.String substring(int, int);
+ method public abstract java.lang.String toString();
+ method public void trimToSize();
+ }
+
+ public abstract interface Appendable {
+ method public abstract java.lang.Appendable append(java.lang.CharSequence) throws java.io.IOException;
+ method public abstract java.lang.Appendable append(java.lang.CharSequence, int, int) throws java.io.IOException;
+ method public abstract java.lang.Appendable append(char) throws java.io.IOException;
+ }
+
+ public class ArithmeticException extends java.lang.RuntimeException {
+ ctor public ArithmeticException();
+ ctor public ArithmeticException(java.lang.String);
+ }
+
+ public class ArrayIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
+ ctor public ArrayIndexOutOfBoundsException();
+ ctor public ArrayIndexOutOfBoundsException(int);
+ ctor public ArrayIndexOutOfBoundsException(java.lang.String);
+ }
+
+ public class ArrayStoreException extends java.lang.RuntimeException {
+ ctor public ArrayStoreException();
+ ctor public ArrayStoreException(java.lang.String);
+ }
+
+ public class AssertionError extends java.lang.Error {
+ ctor public AssertionError();
+ ctor public AssertionError(java.lang.Object);
+ ctor public AssertionError(boolean);
+ ctor public AssertionError(char);
+ ctor public AssertionError(int);
+ ctor public AssertionError(long);
+ ctor public AssertionError(float);
+ ctor public AssertionError(double);
+ ctor public AssertionError(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract interface AutoCloseable {
+ method public abstract void close() throws java.lang.Exception;
+ }
+
+ public final class Boolean implements java.lang.Comparable java.io.Serializable {
+ ctor public Boolean(boolean);
+ ctor public Boolean(java.lang.String);
+ method public boolean booleanValue();
+ method public static int compare(boolean, boolean);
+ method public int compareTo(java.lang.Boolean);
+ method public static boolean getBoolean(java.lang.String);
+ method public static boolean parseBoolean(java.lang.String);
+ method public static java.lang.String toString(boolean);
+ method public static java.lang.Boolean valueOf(boolean);
+ method public static java.lang.Boolean valueOf(java.lang.String);
+ field public static final java.lang.Boolean FALSE;
+ field public static final java.lang.Boolean TRUE;
+ field public static final java.lang.Class<java.lang.Boolean> TYPE;
+ }
+
+ public final class Byte extends java.lang.Number implements java.lang.Comparable {
+ ctor public Byte(byte);
+ ctor public Byte(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int compare(byte, byte);
+ method public int compareTo(java.lang.Byte);
+ method public static java.lang.Byte decode(java.lang.String) throws java.lang.NumberFormatException;
+ method public double doubleValue();
+ method public float floatValue();
+ method public int intValue();
+ method public long longValue();
+ method public static byte parseByte(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toHexString(byte, boolean);
+ method public static java.lang.String toString(byte);
+ method public static java.lang.Byte valueOf(byte);
+ method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Byte valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ field public static final byte MAX_VALUE = 127; // 0x7f
+ field public static final byte MIN_VALUE = -128; // 0xffffff80
+ field public static final int SIZE = 8; // 0x8
+ field public static final java.lang.Class<java.lang.Byte> TYPE;
+ }
+
+ public abstract interface CharSequence {
+ method public abstract char charAt(int);
+ method public abstract int length();
+ method public abstract java.lang.CharSequence subSequence(int, int);
+ method public abstract java.lang.String toString();
+ }
+
+ public final class Character implements java.lang.Comparable java.io.Serializable {
+ ctor public Character(char);
+ method public static int charCount(int);
+ method public char charValue();
+ method public static int codePointAt(java.lang.CharSequence, int);
+ method public static int codePointAt(char[], int);
+ method public static int codePointAt(char[], int, int);
+ method public static int codePointBefore(java.lang.CharSequence, int);
+ method public static int codePointBefore(char[], int);
+ method public static int codePointBefore(char[], int, int);
+ method public static int codePointCount(java.lang.CharSequence, int, int);
+ method public static int codePointCount(char[], int, int);
+ method public static int compare(char, char);
+ method public int compareTo(java.lang.Character);
+ method public static int digit(char, int);
+ method public static int digit(int, int);
+ method public static char forDigit(int, int);
+ method public static byte getDirectionality(char);
+ method public static byte getDirectionality(int);
+ method public static java.lang.String getName(int);
+ method public static int getNumericValue(char);
+ method public static int getNumericValue(int);
+ method public static int getType(char);
+ method public static int getType(int);
+ method public static char highSurrogate(int);
+ method public static boolean isAlphabetic(int);
+ method public static boolean isBmpCodePoint(int);
+ method public static boolean isDefined(char);
+ method public static boolean isDefined(int);
+ method public static boolean isDigit(char);
+ method public static boolean isDigit(int);
+ method public static boolean isHighSurrogate(char);
+ method public static boolean isISOControl(char);
+ method public static boolean isISOControl(int);
+ method public static boolean isIdentifierIgnorable(char);
+ method public static boolean isIdentifierIgnorable(int);
+ method public static boolean isIdeographic(int);
+ method public static boolean isJavaIdentifierPart(char);
+ method public static boolean isJavaIdentifierPart(int);
+ method public static boolean isJavaIdentifierStart(char);
+ method public static boolean isJavaIdentifierStart(int);
+ method public static deprecated boolean isJavaLetter(char);
+ method public static deprecated boolean isJavaLetterOrDigit(char);
+ method public static boolean isLetter(char);
+ method public static boolean isLetter(int);
+ method public static boolean isLetterOrDigit(char);
+ method public static boolean isLetterOrDigit(int);
+ method public static boolean isLowSurrogate(char);
+ method public static boolean isLowerCase(char);
+ method public static boolean isLowerCase(int);
+ method public static boolean isMirrored(char);
+ method public static boolean isMirrored(int);
+ method public static deprecated boolean isSpace(char);
+ method public static boolean isSpaceChar(char);
+ method public static boolean isSpaceChar(int);
+ method public static boolean isSupplementaryCodePoint(int);
+ method public static boolean isSurrogate(char);
+ method public static boolean isSurrogatePair(char, char);
+ method public static boolean isTitleCase(char);
+ method public static boolean isTitleCase(int);
+ method public static boolean isUnicodeIdentifierPart(char);
+ method public static boolean isUnicodeIdentifierPart(int);
+ method public static boolean isUnicodeIdentifierStart(char);
+ method public static boolean isUnicodeIdentifierStart(int);
+ method public static boolean isUpperCase(char);
+ method public static boolean isUpperCase(int);
+ method public static boolean isValidCodePoint(int);
+ method public static boolean isWhitespace(char);
+ method public static boolean isWhitespace(int);
+ method public static char lowSurrogate(int);
+ method public static int offsetByCodePoints(java.lang.CharSequence, int, int);
+ method public static int offsetByCodePoints(char[], int, int, int, int);
+ method public static char reverseBytes(char);
+ method public static int toChars(int, char[], int);
+ method public static char[] toChars(int);
+ method public static int toCodePoint(char, char);
+ method public static char toLowerCase(char);
+ method public static int toLowerCase(int);
+ method public static java.lang.String toString(char);
+ method public static char toTitleCase(char);
+ method public static int toTitleCase(int);
+ method public static char toUpperCase(char);
+ method public static int toUpperCase(int);
+ method public static java.lang.Character valueOf(char);
+ field public static final byte COMBINING_SPACING_MARK = 8; // 0x8
+ field public static final byte CONNECTOR_PUNCTUATION = 23; // 0x17
+ field public static final byte CONTROL = 15; // 0xf
+ field public static final byte CURRENCY_SYMBOL = 26; // 0x1a
+ field public static final byte DASH_PUNCTUATION = 20; // 0x14
+ field public static final byte DECIMAL_DIGIT_NUMBER = 9; // 0x9
+ field public static final byte DIRECTIONALITY_ARABIC_NUMBER = 6; // 0x6
+ field public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 9; // 0x9
+ field public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 7; // 0x7
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 3; // 0x3
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 4; // 0x4
+ field public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 5; // 0x5
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0; // 0x0
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 14; // 0xe
+ field public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 15; // 0xf
+ field public static final byte DIRECTIONALITY_NONSPACING_MARK = 8; // 0x8
+ field public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 13; // 0xd
+ field public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 10; // 0xa
+ field public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 18; // 0x12
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1; // 0x1
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 2; // 0x2
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 16; // 0x10
+ field public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 17; // 0x11
+ field public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 11; // 0xb
+ field public static final byte DIRECTIONALITY_UNDEFINED = -1; // 0xffffffff
+ field public static final byte DIRECTIONALITY_WHITESPACE = 12; // 0xc
+ field public static final byte ENCLOSING_MARK = 7; // 0x7
+ field public static final byte END_PUNCTUATION = 22; // 0x16
+ field public static final byte FINAL_QUOTE_PUNCTUATION = 30; // 0x1e
+ field public static final byte FORMAT = 16; // 0x10
+ field public static final byte INITIAL_QUOTE_PUNCTUATION = 29; // 0x1d
+ field public static final byte LETTER_NUMBER = 10; // 0xa
+ field public static final byte LINE_SEPARATOR = 13; // 0xd
+ field public static final byte LOWERCASE_LETTER = 2; // 0x2
+ field public static final byte MATH_SYMBOL = 25; // 0x19
+ field public static final int MAX_CODE_POINT = 1114111; // 0x10ffff
+ field public static final char MAX_HIGH_SURROGATE = 56319; // 0xdbff '\udbff'
+ field public static final char MAX_LOW_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final int MAX_RADIX = 36; // 0x24
+ field public static final char MAX_SURROGATE = 57343; // 0xdfff '\udfff'
+ field public static final char MAX_VALUE = 65535; // 0xffff '\uffff'
+ field public static final int MIN_CODE_POINT = 0; // 0x0
+ field public static final char MIN_HIGH_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final char MIN_LOW_SURROGATE = 56320; // 0xdc00 '\udc00'
+ field public static final int MIN_RADIX = 2; // 0x2
+ field public static final int MIN_SUPPLEMENTARY_CODE_POINT = 65536; // 0x10000
+ field public static final char MIN_SURROGATE = 55296; // 0xd800 '\ud800'
+ field public static final char MIN_VALUE = 0; // 0x0000 '\u0000'
+ field public static final byte MODIFIER_LETTER = 4; // 0x4
+ field public static final byte MODIFIER_SYMBOL = 27; // 0x1b
+ field public static final byte NON_SPACING_MARK = 6; // 0x6
+ field public static final byte OTHER_LETTER = 5; // 0x5
+ field public static final byte OTHER_NUMBER = 11; // 0xb
+ field public static final byte OTHER_PUNCTUATION = 24; // 0x18
+ field public static final byte OTHER_SYMBOL = 28; // 0x1c
+ field public static final byte PARAGRAPH_SEPARATOR = 14; // 0xe
+ field public static final byte PRIVATE_USE = 18; // 0x12
+ field public static final int SIZE = 16; // 0x10
+ field public static final byte SPACE_SEPARATOR = 12; // 0xc
+ field public static final byte START_PUNCTUATION = 21; // 0x15
+ field public static final byte SURROGATE = 19; // 0x13
+ field public static final byte TITLECASE_LETTER = 3; // 0x3
+ field public static final java.lang.Class<java.lang.Character> TYPE;
+ field public static final byte UNASSIGNED = 0; // 0x0
+ field public static final byte UPPERCASE_LETTER = 1; // 0x1
+ }
+
+ public static class Character.Subset {
+ ctor protected Character.Subset(java.lang.String);
+ method public final boolean equals(java.lang.Object);
+ method public final int hashCode();
+ method public final java.lang.String toString();
+ }
+
+ public static final class Character.UnicodeBlock extends java.lang.Character.Subset {
+ method public static final java.lang.Character.UnicodeBlock forName(java.lang.String);
+ method public static java.lang.Character.UnicodeBlock of(char);
+ method public static java.lang.Character.UnicodeBlock of(int);
+ field public static final java.lang.Character.UnicodeBlock AEGEAN_NUMBERS;
+ field public static final java.lang.Character.UnicodeBlock ALCHEMICAL_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock ALPHABETIC_PRESENTATION_FORMS;
+ field public static final java.lang.Character.UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION;
+ field public static final java.lang.Character.UnicodeBlock ANCIENT_GREEK_NUMBERS;
+ field public static final java.lang.Character.UnicodeBlock ANCIENT_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock ARABIC;
+ field public static final java.lang.Character.UnicodeBlock ARABIC_PRESENTATION_FORMS_A;
+ field public static final java.lang.Character.UnicodeBlock ARABIC_PRESENTATION_FORMS_B;
+ field public static final java.lang.Character.UnicodeBlock ARABIC_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock ARMENIAN;
+ field public static final java.lang.Character.UnicodeBlock ARROWS;
+ field public static final java.lang.Character.UnicodeBlock AVESTAN;
+ field public static final java.lang.Character.UnicodeBlock BALINESE;
+ field public static final java.lang.Character.UnicodeBlock BAMUM;
+ field public static final java.lang.Character.UnicodeBlock BAMUM_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock BASIC_LATIN;
+ field public static final java.lang.Character.UnicodeBlock BATAK;
+ field public static final java.lang.Character.UnicodeBlock BENGALI;
+ field public static final java.lang.Character.UnicodeBlock BLOCK_ELEMENTS;
+ field public static final java.lang.Character.UnicodeBlock BOPOMOFO;
+ field public static final java.lang.Character.UnicodeBlock BOPOMOFO_EXTENDED;
+ field public static final java.lang.Character.UnicodeBlock BOX_DRAWING;
+ field public static final java.lang.Character.UnicodeBlock BRAHMI;
+ field public static final java.lang.Character.UnicodeBlock BRAILLE_PATTERNS;
+ field public static final java.lang.Character.UnicodeBlock BUGINESE;
+ field public static final java.lang.Character.UnicodeBlock BUHID;
+ field public static final java.lang.Character.UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock CARIAN;
+ field public static final java.lang.Character.UnicodeBlock CHAM;
+ field public static final java.lang.Character.UnicodeBlock CHEROKEE;
+ field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY;
+ field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY_FORMS;
+ field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS;
+ field public static final java.lang.Character.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock CJK_RADICALS_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock CJK_STROKES;
+ field public static final java.lang.Character.UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION;
+ field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS;
+ field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A;
+ field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B;
+ field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C;
+ field public static final java.lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D;
+ field public static final java.lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS;
+ field public static final java.lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock COMBINING_HALF_MARKS;
+ field public static final java.lang.Character.UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock COMMON_INDIC_NUMBER_FORMS;
+ field public static final java.lang.Character.UnicodeBlock CONTROL_PICTURES;
+ field public static final java.lang.Character.UnicodeBlock COPTIC;
+ field public static final java.lang.Character.UnicodeBlock COUNTING_ROD_NUMERALS;
+ field public static final java.lang.Character.UnicodeBlock CUNEIFORM;
+ field public static final java.lang.Character.UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION;
+ field public static final java.lang.Character.UnicodeBlock CURRENCY_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock CYPRIOT_SYLLABARY;
+ field public static final java.lang.Character.UnicodeBlock CYRILLIC;
+ field public static final java.lang.Character.UnicodeBlock CYRILLIC_EXTENDED_A;
+ field public static final java.lang.Character.UnicodeBlock CYRILLIC_EXTENDED_B;
+ field public static final java.lang.Character.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
+ field public static final java.lang.Character.UnicodeBlock DESERET;
+ field public static final java.lang.Character.UnicodeBlock DEVANAGARI;
+ field public static final java.lang.Character.UnicodeBlock DEVANAGARI_EXTENDED;
+ field public static final java.lang.Character.UnicodeBlock DINGBATS;
+ field public static final java.lang.Character.UnicodeBlock DOMINO_TILES;
+ field public static final java.lang.Character.UnicodeBlock EGYPTIAN_HIEROGLYPHS;
+ field public static final java.lang.Character.UnicodeBlock EMOTICONS;
+ field public static final java.lang.Character.UnicodeBlock ENCLOSED_ALPHANUMERICS;
+ field public static final java.lang.Character.UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS;
+ field public static final java.lang.Character.UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock ETHIOPIC;
+ field public static final java.lang.Character.UnicodeBlock ETHIOPIC_EXTENDED;
+ field public static final java.lang.Character.UnicodeBlock ETHIOPIC_EXTENDED_A;
+ field public static final java.lang.Character.UnicodeBlock ETHIOPIC_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock GENERAL_PUNCTUATION;
+ field public static final java.lang.Character.UnicodeBlock GEOMETRIC_SHAPES;
+ field public static final java.lang.Character.UnicodeBlock GEORGIAN;
+ field public static final java.lang.Character.UnicodeBlock GEORGIAN_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock GLAGOLITIC;
+ field public static final java.lang.Character.UnicodeBlock GOTHIC;
+ field public static final java.lang.Character.UnicodeBlock GREEK;
+ field public static final java.lang.Character.UnicodeBlock GREEK_EXTENDED;
+ field public static final java.lang.Character.UnicodeBlock GUJARATI;
+ field public static final java.lang.Character.UnicodeBlock GURMUKHI;
+ field public static final java.lang.Character.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS;
+ field public static final java.lang.Character.UnicodeBlock HANGUL_COMPATIBILITY_JAMO;
+ field public static final java.lang.Character.UnicodeBlock HANGUL_JAMO;
+ field public static final java.lang.Character.UnicodeBlock HANGUL_JAMO_EXTENDED_A;
+ field public static final java.lang.Character.UnicodeBlock HANGUL_JAMO_EXTENDED_B;
+ field public static final java.lang.Character.UnicodeBlock HANGUL_SYLLABLES;
+ field public static final java.lang.Character.UnicodeBlock HANUNOO;
+ field public static final java.lang.Character.UnicodeBlock HEBREW;
+ field public static final java.lang.Character.UnicodeBlock HIGH_PRIVATE_USE_SURROGATES;
+ field public static final java.lang.Character.UnicodeBlock HIGH_SURROGATES;
+ field public static final java.lang.Character.UnicodeBlock HIRAGANA;
+ field public static final java.lang.Character.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
+ field public static final java.lang.Character.UnicodeBlock IMPERIAL_ARAMAIC;
+ field public static final java.lang.Character.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
+ field public static final java.lang.Character.UnicodeBlock INSCRIPTIONAL_PARTHIAN;
+ field public static final java.lang.Character.UnicodeBlock IPA_EXTENSIONS;
+ field public static final java.lang.Character.UnicodeBlock JAVANESE;
+ field public static final java.lang.Character.UnicodeBlock KAITHI;
+ field public static final java.lang.Character.UnicodeBlock KANA_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock KANBUN;
+ field public static final java.lang.Character.UnicodeBlock KANGXI_RADICALS;
+ field public static final java.lang.Character.UnicodeBlock KANNADA;
+ field public static final java.lang.Character.UnicodeBlock KATAKANA;
+ field public static final java.lang.Character.UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS;
+ field public static final java.lang.Character.UnicodeBlock KAYAH_LI;
+ field public static final java.lang.Character.UnicodeBlock KHAROSHTHI;
+ field public static final java.lang.Character.UnicodeBlock KHMER;
+ field public static final java.lang.Character.UnicodeBlock KHMER_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock LAO;
+ field public static final java.lang.Character.UnicodeBlock LATIN_1_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_A;
+ field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_ADDITIONAL;
+ field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_B;
+ field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_C;
+ field public static final java.lang.Character.UnicodeBlock LATIN_EXTENDED_D;
+ field public static final java.lang.Character.UnicodeBlock LEPCHA;
+ field public static final java.lang.Character.UnicodeBlock LETTERLIKE_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock LIMBU;
+ field public static final java.lang.Character.UnicodeBlock LINEAR_B_IDEOGRAMS;
+ field public static final java.lang.Character.UnicodeBlock LINEAR_B_SYLLABARY;
+ field public static final java.lang.Character.UnicodeBlock LISU;
+ field public static final java.lang.Character.UnicodeBlock LOW_SURROGATES;
+ field public static final java.lang.Character.UnicodeBlock LYCIAN;
+ field public static final java.lang.Character.UnicodeBlock LYDIAN;
+ field public static final java.lang.Character.UnicodeBlock MAHJONG_TILES;
+ field public static final java.lang.Character.UnicodeBlock MALAYALAM;
+ field public static final java.lang.Character.UnicodeBlock MANDAIC;
+ field public static final java.lang.Character.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock MATHEMATICAL_OPERATORS;
+ field public static final java.lang.Character.UnicodeBlock MEETEI_MAYEK;
+ field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A;
+ field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B;
+ field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS;
+ field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS;
+ field public static final java.lang.Character.UnicodeBlock MISCELLANEOUS_TECHNICAL;
+ field public static final java.lang.Character.UnicodeBlock MODIFIER_TONE_LETTERS;
+ field public static final java.lang.Character.UnicodeBlock MONGOLIAN;
+ field public static final java.lang.Character.UnicodeBlock MUSICAL_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock MYANMAR;
+ field public static final java.lang.Character.UnicodeBlock MYANMAR_EXTENDED_A;
+ field public static final java.lang.Character.UnicodeBlock NEW_TAI_LUE;
+ field public static final java.lang.Character.UnicodeBlock NKO;
+ field public static final java.lang.Character.UnicodeBlock NUMBER_FORMS;
+ field public static final java.lang.Character.UnicodeBlock OGHAM;
+ field public static final java.lang.Character.UnicodeBlock OLD_ITALIC;
+ field public static final java.lang.Character.UnicodeBlock OLD_PERSIAN;
+ field public static final java.lang.Character.UnicodeBlock OLD_SOUTH_ARABIAN;
+ field public static final java.lang.Character.UnicodeBlock OLD_TURKIC;
+ field public static final java.lang.Character.UnicodeBlock OL_CHIKI;
+ field public static final java.lang.Character.UnicodeBlock OPTICAL_CHARACTER_RECOGNITION;
+ field public static final java.lang.Character.UnicodeBlock ORIYA;
+ field public static final java.lang.Character.UnicodeBlock OSMANYA;
+ field public static final java.lang.Character.UnicodeBlock PHAGS_PA;
+ field public static final java.lang.Character.UnicodeBlock PHAISTOS_DISC;
+ field public static final java.lang.Character.UnicodeBlock PHOENICIAN;
+ field public static final java.lang.Character.UnicodeBlock PHONETIC_EXTENSIONS;
+ field public static final java.lang.Character.UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock PLAYING_CARDS;
+ field public static final java.lang.Character.UnicodeBlock PRIVATE_USE_AREA;
+ field public static final java.lang.Character.UnicodeBlock REJANG;
+ field public static final java.lang.Character.UnicodeBlock RUMI_NUMERAL_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock RUNIC;
+ field public static final java.lang.Character.UnicodeBlock SAMARITAN;
+ field public static final java.lang.Character.UnicodeBlock SAURASHTRA;
+ field public static final java.lang.Character.UnicodeBlock SHAVIAN;
+ field public static final java.lang.Character.UnicodeBlock SINHALA;
+ field public static final java.lang.Character.UnicodeBlock SMALL_FORM_VARIANTS;
+ field public static final java.lang.Character.UnicodeBlock SPACING_MODIFIER_LETTERS;
+ field public static final java.lang.Character.UnicodeBlock SPECIALS;
+ field public static final java.lang.Character.UnicodeBlock SUNDANESE;
+ field public static final java.lang.Character.UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS;
+ field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_A;
+ field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_B;
+ field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS;
+ field public static final java.lang.Character.UnicodeBlock SUPPLEMENTAL_PUNCTUATION;
+ field public static final java.lang.Character.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A;
+ field public static final java.lang.Character.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B;
+ field public static final deprecated java.lang.Character.UnicodeBlock SURROGATES_AREA;
+ field public static final java.lang.Character.UnicodeBlock SYLOTI_NAGRI;
+ field public static final java.lang.Character.UnicodeBlock SYRIAC;
+ field public static final java.lang.Character.UnicodeBlock TAGALOG;
+ field public static final java.lang.Character.UnicodeBlock TAGBANWA;
+ field public static final java.lang.Character.UnicodeBlock TAGS;
+ field public static final java.lang.Character.UnicodeBlock TAI_LE;
+ field public static final java.lang.Character.UnicodeBlock TAI_THAM;
+ field public static final java.lang.Character.UnicodeBlock TAI_VIET;
+ field public static final java.lang.Character.UnicodeBlock TAI_XUAN_JING_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock TAMIL;
+ field public static final java.lang.Character.UnicodeBlock TELUGU;
+ field public static final java.lang.Character.UnicodeBlock THAANA;
+ field public static final java.lang.Character.UnicodeBlock THAI;
+ field public static final java.lang.Character.UnicodeBlock TIBETAN;
+ field public static final java.lang.Character.UnicodeBlock TIFINAGH;
+ field public static final java.lang.Character.UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock UGARITIC;
+ field public static final java.lang.Character.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS;
+ field public static final java.lang.Character.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED;
+ field public static final java.lang.Character.UnicodeBlock VAI;
+ field public static final java.lang.Character.UnicodeBlock VARIATION_SELECTORS;
+ field public static final java.lang.Character.UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT;
+ field public static final java.lang.Character.UnicodeBlock VEDIC_EXTENSIONS;
+ field public static final java.lang.Character.UnicodeBlock VERTICAL_FORMS;
+ field public static final java.lang.Character.UnicodeBlock YIJING_HEXAGRAM_SYMBOLS;
+ field public static final java.lang.Character.UnicodeBlock YI_RADICALS;
+ field public static final java.lang.Character.UnicodeBlock YI_SYLLABLES;
+ }
+
+ public static final class Character.UnicodeScript extends java.lang.Enum {
+ method public static final java.lang.Character.UnicodeScript forName(java.lang.String);
+ method public static java.lang.Character.UnicodeScript of(int);
+ method public static java.lang.Character.UnicodeScript valueOf(java.lang.String);
+ method public static final java.lang.Character.UnicodeScript[] values();
+ enum_constant public static final java.lang.Character.UnicodeScript ARABIC;
+ enum_constant public static final java.lang.Character.UnicodeScript ARMENIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript AVESTAN;
+ enum_constant public static final java.lang.Character.UnicodeScript BALINESE;
+ enum_constant public static final java.lang.Character.UnicodeScript BAMUM;
+ enum_constant public static final java.lang.Character.UnicodeScript BATAK;
+ enum_constant public static final java.lang.Character.UnicodeScript BENGALI;
+ enum_constant public static final java.lang.Character.UnicodeScript BOPOMOFO;
+ enum_constant public static final java.lang.Character.UnicodeScript BRAHMI;
+ enum_constant public static final java.lang.Character.UnicodeScript BRAILLE;
+ enum_constant public static final java.lang.Character.UnicodeScript BUGINESE;
+ enum_constant public static final java.lang.Character.UnicodeScript BUHID;
+ enum_constant public static final java.lang.Character.UnicodeScript CANADIAN_ABORIGINAL;
+ enum_constant public static final java.lang.Character.UnicodeScript CARIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript CHAM;
+ enum_constant public static final java.lang.Character.UnicodeScript CHEROKEE;
+ enum_constant public static final java.lang.Character.UnicodeScript COMMON;
+ enum_constant public static final java.lang.Character.UnicodeScript COPTIC;
+ enum_constant public static final java.lang.Character.UnicodeScript CUNEIFORM;
+ enum_constant public static final java.lang.Character.UnicodeScript CYPRIOT;
+ enum_constant public static final java.lang.Character.UnicodeScript CYRILLIC;
+ enum_constant public static final java.lang.Character.UnicodeScript DESERET;
+ enum_constant public static final java.lang.Character.UnicodeScript DEVANAGARI;
+ enum_constant public static final java.lang.Character.UnicodeScript EGYPTIAN_HIEROGLYPHS;
+ enum_constant public static final java.lang.Character.UnicodeScript ETHIOPIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GEORGIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript GLAGOLITIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GOTHIC;
+ enum_constant public static final java.lang.Character.UnicodeScript GREEK;
+ enum_constant public static final java.lang.Character.UnicodeScript GUJARATI;
+ enum_constant public static final java.lang.Character.UnicodeScript GURMUKHI;
+ enum_constant public static final java.lang.Character.UnicodeScript HAN;
+ enum_constant public static final java.lang.Character.UnicodeScript HANGUL;
+ enum_constant public static final java.lang.Character.UnicodeScript HANUNOO;
+ enum_constant public static final java.lang.Character.UnicodeScript HEBREW;
+ enum_constant public static final java.lang.Character.UnicodeScript HIRAGANA;
+ enum_constant public static final java.lang.Character.UnicodeScript IMPERIAL_ARAMAIC;
+ enum_constant public static final java.lang.Character.UnicodeScript INHERITED;
+ enum_constant public static final java.lang.Character.UnicodeScript INSCRIPTIONAL_PAHLAVI;
+ enum_constant public static final java.lang.Character.UnicodeScript INSCRIPTIONAL_PARTHIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript JAVANESE;
+ enum_constant public static final java.lang.Character.UnicodeScript KAITHI;
+ enum_constant public static final java.lang.Character.UnicodeScript KANNADA;
+ enum_constant public static final java.lang.Character.UnicodeScript KATAKANA;
+ enum_constant public static final java.lang.Character.UnicodeScript KAYAH_LI;
+ enum_constant public static final java.lang.Character.UnicodeScript KHAROSHTHI;
+ enum_constant public static final java.lang.Character.UnicodeScript KHMER;
+ enum_constant public static final java.lang.Character.UnicodeScript LAO;
+ enum_constant public static final java.lang.Character.UnicodeScript LATIN;
+ enum_constant public static final java.lang.Character.UnicodeScript LEPCHA;
+ enum_constant public static final java.lang.Character.UnicodeScript LIMBU;
+ enum_constant public static final java.lang.Character.UnicodeScript LINEAR_B;
+ enum_constant public static final java.lang.Character.UnicodeScript LISU;
+ enum_constant public static final java.lang.Character.UnicodeScript LYCIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript LYDIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript MALAYALAM;
+ enum_constant public static final java.lang.Character.UnicodeScript MANDAIC;
+ enum_constant public static final java.lang.Character.UnicodeScript MEETEI_MAYEK;
+ enum_constant public static final java.lang.Character.UnicodeScript MONGOLIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript MYANMAR;
+ enum_constant public static final java.lang.Character.UnicodeScript NEW_TAI_LUE;
+ enum_constant public static final java.lang.Character.UnicodeScript NKO;
+ enum_constant public static final java.lang.Character.UnicodeScript OGHAM;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_ITALIC;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_PERSIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_SOUTH_ARABIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript OLD_TURKIC;
+ enum_constant public static final java.lang.Character.UnicodeScript OL_CHIKI;
+ enum_constant public static final java.lang.Character.UnicodeScript ORIYA;
+ enum_constant public static final java.lang.Character.UnicodeScript OSMANYA;
+ enum_constant public static final java.lang.Character.UnicodeScript PHAGS_PA;
+ enum_constant public static final java.lang.Character.UnicodeScript PHOENICIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript REJANG;
+ enum_constant public static final java.lang.Character.UnicodeScript RUNIC;
+ enum_constant public static final java.lang.Character.UnicodeScript SAMARITAN;
+ enum_constant public static final java.lang.Character.UnicodeScript SAURASHTRA;
+ enum_constant public static final java.lang.Character.UnicodeScript SHAVIAN;
+ enum_constant public static final java.lang.Character.UnicodeScript SINHALA;
+ enum_constant public static final java.lang.Character.UnicodeScript SUNDANESE;
+ enum_constant public static final java.lang.Character.UnicodeScript SYLOTI_NAGRI;
+ enum_constant public static final java.lang.Character.UnicodeScript SYRIAC;
+ enum_constant public static final java.lang.Character.UnicodeScript TAGALOG;
+ enum_constant public static final java.lang.Character.UnicodeScript TAGBANWA;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_LE;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_THAM;
+ enum_constant public static final java.lang.Character.UnicodeScript TAI_VIET;
+ enum_constant public static final java.lang.Character.UnicodeScript TAMIL;
+ enum_constant public static final java.lang.Character.UnicodeScript TELUGU;
+ enum_constant public static final java.lang.Character.UnicodeScript THAANA;
+ enum_constant public static final java.lang.Character.UnicodeScript THAI;
+ enum_constant public static final java.lang.Character.UnicodeScript TIBETAN;
+ enum_constant public static final java.lang.Character.UnicodeScript TIFINAGH;
+ enum_constant public static final java.lang.Character.UnicodeScript UGARITIC;
+ enum_constant public static final java.lang.Character.UnicodeScript UNKNOWN;
+ enum_constant public static final java.lang.Character.UnicodeScript VAI;
+ enum_constant public static final java.lang.Character.UnicodeScript YI;
+ }
+
+ public final class Class implements java.lang.reflect.AnnotatedElement java.lang.reflect.GenericDeclaration java.io.Serializable java.lang.reflect.Type {
+ method public java.lang.Class<? extends U> asSubclass(java.lang.Class<U>);
+ method public T cast(java.lang.Object);
+ method public boolean desiredAssertionStatus();
+ method public static java.lang.Class<?> forName(java.lang.String) throws java.lang.ClassNotFoundException;
+ method public static java.lang.Class<?> forName(java.lang.String, boolean, java.lang.ClassLoader) throws java.lang.ClassNotFoundException;
+ method public A getAnnotation(java.lang.Class<A>);
+ method public java.lang.annotation.Annotation[] getAnnotations();
+ method public java.lang.String getCanonicalName();
+ method public java.lang.ClassLoader getClassLoader();
+ method public java.lang.Class<?>[] getClasses();
+ method public java.lang.Class<?> getComponentType();
+ method public java.lang.reflect.Constructor<T> getConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Constructor<?>[] getConstructors() throws java.lang.SecurityException;
+ method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method public java.lang.Class<?>[] getDeclaredClasses();
+ method public java.lang.reflect.Constructor<T> getDeclaredConstructor(java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Constructor<?>[] getDeclaredConstructors() throws java.lang.SecurityException;
+ method public java.lang.reflect.Field getDeclaredField(java.lang.String) throws java.lang.NoSuchFieldException;
+ method public java.lang.reflect.Field[] getDeclaredFields();
+ method public java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Method[] getDeclaredMethods() throws java.lang.SecurityException;
+ method public java.lang.Class<?> getDeclaringClass();
+ method public java.lang.Class<?> getEnclosingClass();
+ method public java.lang.reflect.Constructor<?> getEnclosingConstructor();
+ method public java.lang.reflect.Method getEnclosingMethod();
+ method public T[] getEnumConstants();
+ method public java.lang.reflect.Field getField(java.lang.String) throws java.lang.NoSuchFieldException;
+ method public java.lang.reflect.Field[] getFields() throws java.lang.SecurityException;
+ method public java.lang.reflect.Type[] getGenericInterfaces();
+ method public java.lang.reflect.Type getGenericSuperclass();
+ method public java.lang.Class<?>[] getInterfaces();
+ method public java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class<?>...) throws java.lang.NoSuchMethodException, java.lang.SecurityException;
+ method public java.lang.reflect.Method[] getMethods() throws java.lang.SecurityException;
+ method public int getModifiers();
+ method public java.lang.String getName();
+ method public java.lang.Package getPackage();
+ method public java.security.ProtectionDomain getProtectionDomain();
+ method public java.net.URL getResource(java.lang.String);
+ method public java.io.InputStream getResourceAsStream(java.lang.String);
+ method public java.lang.Object[] getSigners();
+ method public java.lang.String getSimpleName();
+ method public java.lang.Class<? super T> getSuperclass();
+ method public synchronized java.lang.reflect.TypeVariable<java.lang.Class<T>>[] getTypeParameters();
+ method public boolean isAnnotation();
+ method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
+ method public boolean isAnonymousClass();
+ method public boolean isArray();
+ method public boolean isAssignableFrom(java.lang.Class<?>);
+ method public boolean isEnum();
+ method public boolean isInstance(java.lang.Object);
+ method public boolean isInterface();
+ method public boolean isLocalClass();
+ method public boolean isMemberClass();
+ method public boolean isPrimitive();
+ method public boolean isSynthetic();
+ method public T newInstance() throws java.lang.IllegalAccessException, java.lang.InstantiationException;
+ }
+
+ public class ClassCastException extends java.lang.RuntimeException {
+ ctor public ClassCastException();
+ ctor public ClassCastException(java.lang.String);
+ }
+
+ public class ClassCircularityError extends java.lang.LinkageError {
+ ctor public ClassCircularityError();
+ ctor public ClassCircularityError(java.lang.String);
+ }
+
+ public class ClassFormatError extends java.lang.LinkageError {
+ ctor public ClassFormatError();
+ ctor public ClassFormatError(java.lang.String);
+ }
+
+ public abstract class ClassLoader {
+ ctor protected ClassLoader(java.lang.ClassLoader);
+ ctor protected ClassLoader();
+ method public void clearAssertionStatus();
+ method protected final deprecated java.lang.Class<?> defineClass(byte[], int, int) throws java.lang.ClassFormatError;
+ method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int) throws java.lang.ClassFormatError;
+ method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int, java.security.ProtectionDomain) throws java.lang.ClassFormatError;
+ method protected final java.lang.Class<?> defineClass(java.lang.String, java.nio.ByteBuffer, java.security.ProtectionDomain) throws java.lang.ClassFormatError;
+ method protected java.lang.Package definePackage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.net.URL) throws java.lang.IllegalArgumentException;
+ method protected java.lang.Class<?> findClass(java.lang.String) throws java.lang.ClassNotFoundException;
+ method protected java.lang.String findLibrary(java.lang.String);
+ method protected final java.lang.Class<?> findLoadedClass(java.lang.String);
+ method protected java.net.URL findResource(java.lang.String);
+ method protected java.util.Enumeration<java.net.URL> findResources(java.lang.String) throws java.io.IOException;
+ method protected final java.lang.Class<?> findSystemClass(java.lang.String) throws java.lang.ClassNotFoundException;
+ method protected java.lang.Package getPackage(java.lang.String);
+ method protected java.lang.Package[] getPackages();
+ method public final java.lang.ClassLoader getParent();
+ method public java.net.URL getResource(java.lang.String);
+ method public java.io.InputStream getResourceAsStream(java.lang.String);
+ method public java.util.Enumeration<java.net.URL> getResources(java.lang.String) throws java.io.IOException;
+ method public static java.lang.ClassLoader getSystemClassLoader();
+ method public static java.net.URL getSystemResource(java.lang.String);
+ method public static java.io.InputStream getSystemResourceAsStream(java.lang.String);
+ method public static java.util.Enumeration<java.net.URL> getSystemResources(java.lang.String) throws java.io.IOException;
+ method public java.lang.Class<?> loadClass(java.lang.String) throws java.lang.ClassNotFoundException;
+ method protected java.lang.Class<?> loadClass(java.lang.String, boolean) throws java.lang.ClassNotFoundException;
+ method protected static boolean registerAsParallelCapable();
+ method protected final void resolveClass(java.lang.Class<?>);
+ method public void setClassAssertionStatus(java.lang.String, boolean);
+ method public void setDefaultAssertionStatus(boolean);
+ method public void setPackageAssertionStatus(java.lang.String, boolean);
+ method protected final void setSigners(java.lang.Class<?>, java.lang.Object[]);
+ }
+
+ public class ClassNotFoundException extends java.lang.ReflectiveOperationException {
+ ctor public ClassNotFoundException();
+ ctor public ClassNotFoundException(java.lang.String);
+ ctor public ClassNotFoundException(java.lang.String, java.lang.Throwable);
+ method public java.lang.Throwable getException();
+ }
+
+ public class CloneNotSupportedException extends java.lang.Exception {
+ ctor public CloneNotSupportedException();
+ ctor public CloneNotSupportedException(java.lang.String);
+ }
+
+ public abstract interface Cloneable {
+ }
+
+ public abstract interface Comparable {
+ method public abstract int compareTo(T);
+ }
+
+ public final class Compiler {
+ method public static java.lang.Object command(java.lang.Object);
+ method public static boolean compileClass(java.lang.Class<?>);
+ method public static boolean compileClasses(java.lang.String);
+ method public static void disable();
+ method public static void enable();
+ }
+
+ public abstract class Deprecated implements java.lang.annotation.Annotation {
+ }
+
+ public final class Double extends java.lang.Number implements java.lang.Comparable {
+ ctor public Double(double);
+ ctor public Double(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int compare(double, double);
+ method public int compareTo(java.lang.Double);
+ method public static long doubleToLongBits(double);
+ method public static long doubleToRawLongBits(double);
+ method public double doubleValue();
+ method public float floatValue();
+ method public int intValue();
+ method public static boolean isInfinite(double);
+ method public boolean isInfinite();
+ method public static boolean isNaN(double);
+ method public boolean isNaN();
+ method public static double longBitsToDouble(long);
+ method public long longValue();
+ method public static double parseDouble(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toHexString(double);
+ method public static java.lang.String toString(double);
+ method public static java.lang.Double valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.Double valueOf(double);
+ field public static final int MAX_EXPONENT = 1023; // 0x3ff
+ field public static final double MAX_VALUE = 1.7976931348623157E308;
+ field public static final int MIN_EXPONENT = -1022; // 0xfffffc02
+ field public static final double MIN_NORMAL = 2.2250738585072014E-308;
+ field public static final double MIN_VALUE = 4.9E-324;
+ field public static final double NEGATIVE_INFINITY = (-1.0/0.0);
+ field public static final double NaN = (0.0/0.0);
+ field public static final double POSITIVE_INFINITY = (1.0/0.0);
+ field public static final int SIZE = 64; // 0x40
+ field public static final java.lang.Class<java.lang.Double> TYPE;
+ }
+
+ public abstract class Enum implements java.lang.Comparable java.io.Serializable {
+ ctor protected Enum(java.lang.String, int);
+ method protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public final int compareTo(E);
+ method public final boolean equals(java.lang.Object);
+ method protected final void finalize();
+ method public final java.lang.Class<E> getDeclaringClass();
+ method public final int hashCode();
+ method public final java.lang.String name();
+ method public final int ordinal();
+ method public static T valueOf(java.lang.Class<T>, java.lang.String);
+ }
+
+ public class EnumConstantNotPresentException extends java.lang.RuntimeException {
+ ctor public EnumConstantNotPresentException(java.lang.Class<? extends java.lang.Enum>, java.lang.String);
+ method public java.lang.String constantName();
+ method public java.lang.Class<? extends java.lang.Enum> enumType();
+ }
+
+ public class Error extends java.lang.Throwable {
+ ctor public Error();
+ ctor public Error(java.lang.String);
+ ctor public Error(java.lang.String, java.lang.Throwable);
+ ctor public Error(java.lang.Throwable);
+ ctor protected Error(java.lang.String, java.lang.Throwable, boolean, boolean);
+ }
+
+ public class Exception extends java.lang.Throwable {
+ ctor public Exception();
+ ctor public Exception(java.lang.String);
+ ctor public Exception(java.lang.String, java.lang.Throwable);
+ ctor public Exception(java.lang.Throwable);
+ ctor protected Exception(java.lang.String, java.lang.Throwable, boolean, boolean);
+ }
+
+ public class ExceptionInInitializerError extends java.lang.LinkageError {
+ ctor public ExceptionInInitializerError();
+ ctor public ExceptionInInitializerError(java.lang.Throwable);
+ ctor public ExceptionInInitializerError(java.lang.String);
+ method public java.lang.Throwable getException();
+ }
+
+ public final class Float extends java.lang.Number implements java.lang.Comparable {
+ ctor public Float(float);
+ ctor public Float(double);
+ ctor public Float(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int compare(float, float);
+ method public int compareTo(java.lang.Float);
+ method public double doubleValue();
+ method public static int floatToIntBits(float);
+ method public static int floatToRawIntBits(float);
+ method public float floatValue();
+ method public static float intBitsToFloat(int);
+ method public int intValue();
+ method public static boolean isInfinite(float);
+ method public boolean isInfinite();
+ method public static boolean isNaN(float);
+ method public boolean isNaN();
+ method public long longValue();
+ method public static float parseFloat(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.String toHexString(float);
+ method public static java.lang.String toString(float);
+ method public static java.lang.Float valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.Float valueOf(float);
+ field public static final int MAX_EXPONENT = 127; // 0x7f
+ field public static final float MAX_VALUE = 3.4028235E38f;
+ field public static final int MIN_EXPONENT = -126; // 0xffffff82
+ field public static final float MIN_NORMAL = 1.17549435E-38f;
+ field public static final float MIN_VALUE = 1.4E-45f;
+ field public static final float NEGATIVE_INFINITY = (-1.0f/0.0f);
+ field public static final float NaN = (0.0f/0.0f);
+ field public static final float POSITIVE_INFINITY = (1.0f/0.0f);
+ field public static final int SIZE = 32; // 0x20
+ field public static final java.lang.Class<java.lang.Float> TYPE;
+ }
+
+ public class IllegalAccessError extends java.lang.IncompatibleClassChangeError {
+ ctor public IllegalAccessError();
+ ctor public IllegalAccessError(java.lang.String);
+ }
+
+ public class IllegalAccessException extends java.lang.ReflectiveOperationException {
+ ctor public IllegalAccessException();
+ ctor public IllegalAccessException(java.lang.String);
+ }
+
+ public class IllegalArgumentException extends java.lang.RuntimeException {
+ ctor public IllegalArgumentException();
+ ctor public IllegalArgumentException(java.lang.String);
+ ctor public IllegalArgumentException(java.lang.String, java.lang.Throwable);
+ ctor public IllegalArgumentException(java.lang.Throwable);
+ }
+
+ public class IllegalMonitorStateException extends java.lang.RuntimeException {
+ ctor public IllegalMonitorStateException();
+ ctor public IllegalMonitorStateException(java.lang.String);
+ }
+
+ public class IllegalStateException extends java.lang.RuntimeException {
+ ctor public IllegalStateException();
+ ctor public IllegalStateException(java.lang.String);
+ ctor public IllegalStateException(java.lang.String, java.lang.Throwable);
+ ctor public IllegalStateException(java.lang.Throwable);
+ }
+
+ public class IllegalThreadStateException extends java.lang.IllegalArgumentException {
+ ctor public IllegalThreadStateException();
+ ctor public IllegalThreadStateException(java.lang.String);
+ }
+
+ public class IncompatibleClassChangeError extends java.lang.LinkageError {
+ ctor public IncompatibleClassChangeError();
+ ctor public IncompatibleClassChangeError(java.lang.String);
+ }
+
+ public class IndexOutOfBoundsException extends java.lang.RuntimeException {
+ ctor public IndexOutOfBoundsException();
+ ctor public IndexOutOfBoundsException(java.lang.String);
+ }
+
+ public class InheritableThreadLocal extends java.lang.ThreadLocal {
+ ctor public InheritableThreadLocal();
+ method protected T childValue(T);
+ }
+
+ public class InstantiationError extends java.lang.IncompatibleClassChangeError {
+ ctor public InstantiationError();
+ ctor public InstantiationError(java.lang.String);
+ }
+
+ public class InstantiationException extends java.lang.ReflectiveOperationException {
+ ctor public InstantiationException();
+ ctor public InstantiationException(java.lang.String);
+ }
+
+ public final class Integer extends java.lang.Number implements java.lang.Comparable {
+ ctor public Integer(int);
+ ctor public Integer(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int bitCount(int);
+ method public static int compare(int, int);
+ method public int compareTo(java.lang.Integer);
+ method public static java.lang.Integer decode(java.lang.String) throws java.lang.NumberFormatException;
+ method public double doubleValue();
+ method public float floatValue();
+ method public static java.lang.Integer getInteger(java.lang.String);
+ method public static java.lang.Integer getInteger(java.lang.String, int);
+ method public static java.lang.Integer getInteger(java.lang.String, java.lang.Integer);
+ method public static int highestOneBit(int);
+ method public int intValue();
+ method public long longValue();
+ method public static int lowestOneBit(int);
+ method public static int numberOfLeadingZeros(int);
+ method public static int numberOfTrailingZeros(int);
+ method public static int parseInt(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static int parseInt(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int reverse(int);
+ method public static int reverseBytes(int);
+ method public static int rotateLeft(int, int);
+ method public static int rotateRight(int, int);
+ method public static int signum(int);
+ method public static java.lang.String toBinaryString(int);
+ method public static java.lang.String toHexString(int);
+ method public static java.lang.String toOctalString(int);
+ method public static java.lang.String toString(int, int);
+ method public static java.lang.String toString(int);
+ method public static java.lang.Integer valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Integer valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.Integer valueOf(int);
+ field public static final int MAX_VALUE = 2147483647; // 0x7fffffff
+ field public static final int MIN_VALUE = -2147483648; // 0x80000000
+ field public static final int SIZE = 32; // 0x20
+ field public static final java.lang.Class<java.lang.Integer> TYPE;
+ }
+
+ public class InternalError extends java.lang.VirtualMachineError {
+ ctor public InternalError();
+ ctor public InternalError(java.lang.String);
+ }
+
+ public class InterruptedException extends java.lang.Exception {
+ ctor public InterruptedException();
+ ctor public InterruptedException(java.lang.String);
+ }
+
+ public abstract interface Iterable {
+ method public abstract java.util.Iterator<T> iterator();
+ }
+
+ public class LinkageError extends java.lang.Error {
+ ctor public LinkageError();
+ ctor public LinkageError(java.lang.String);
+ ctor public LinkageError(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class Long extends java.lang.Number implements java.lang.Comparable {
+ ctor public Long(long);
+ ctor public Long(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int bitCount(long);
+ method public static int compare(long, long);
+ method public int compareTo(java.lang.Long);
+ method public static java.lang.Long decode(java.lang.String) throws java.lang.NumberFormatException;
+ method public double doubleValue();
+ method public float floatValue();
+ method public static java.lang.Long getLong(java.lang.String);
+ method public static java.lang.Long getLong(java.lang.String, long);
+ method public static java.lang.Long getLong(java.lang.String, java.lang.Long);
+ method public static long highestOneBit(long);
+ method public int intValue();
+ method public long longValue();
+ method public static long lowestOneBit(long);
+ method public static int numberOfLeadingZeros(long);
+ method public static int numberOfTrailingZeros(long);
+ method public static long parseLong(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static long parseLong(java.lang.String) throws java.lang.NumberFormatException;
+ method public static long reverse(long);
+ method public static long reverseBytes(long);
+ method public static long rotateLeft(long, int);
+ method public static long rotateRight(long, int);
+ method public static int signum(long);
+ method public static java.lang.String toBinaryString(long);
+ method public static java.lang.String toHexString(long);
+ method public static java.lang.String toOctalString(long);
+ method public static java.lang.String toString(long, int);
+ method public static java.lang.String toString(long);
+ method public static java.lang.Long valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Long valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.Long valueOf(long);
+ field public static final long MAX_VALUE = 9223372036854775807L; // 0x7fffffffffffffffL
+ field public static final long MIN_VALUE = -9223372036854775808L; // 0x8000000000000000L
+ field public static final int SIZE = 64; // 0x40
+ field public static final java.lang.Class<java.lang.Long> TYPE;
+ }
+
+ public final class Math {
+ method public static double IEEEremainder(double, double);
+ method public static int abs(int);
+ method public static long abs(long);
+ method public static float abs(float);
+ method public static double abs(double);
+ method public static double acos(double);
+ method public static double asin(double);
+ method public static double atan(double);
+ method public static double atan2(double, double);
+ method public static double cbrt(double);
+ method public static double ceil(double);
+ method public static double copySign(double, double);
+ method public static float copySign(float, float);
+ method public static double cos(double);
+ method public static double cosh(double);
+ method public static double exp(double);
+ method public static double expm1(double);
+ method public static double floor(double);
+ method public static int getExponent(float);
+ method public static int getExponent(double);
+ method public static double hypot(double, double);
+ method public static double log(double);
+ method public static double log10(double);
+ method public static double log1p(double);
+ method public static int max(int, int);
+ method public static long max(long, long);
+ method public static float max(float, float);
+ method public static double max(double, double);
+ method public static int min(int, int);
+ method public static long min(long, long);
+ method public static float min(float, float);
+ method public static double min(double, double);
+ method public static double nextAfter(double, double);
+ method public static float nextAfter(float, double);
+ method public static double nextUp(double);
+ method public static float nextUp(float);
+ method public static double pow(double, double);
+ method public static double random();
+ method public static double rint(double);
+ method public static int round(float);
+ method public static long round(double);
+ method public static double scalb(double, int);
+ method public static float scalb(float, int);
+ method public static double signum(double);
+ method public static float signum(float);
+ method public static double sin(double);
+ method public static double sinh(double);
+ method public static double sqrt(double);
+ method public static double tan(double);
+ method public static double tanh(double);
+ method public static double toDegrees(double);
+ method public static double toRadians(double);
+ method public static double ulp(double);
+ method public static float ulp(float);
+ field public static final double E = 2.718281828459045;
+ field public static final double PI = 3.141592653589793;
+ }
+
+ public class NegativeArraySizeException extends java.lang.RuntimeException {
+ ctor public NegativeArraySizeException();
+ ctor public NegativeArraySizeException(java.lang.String);
+ }
+
+ public class NoClassDefFoundError extends java.lang.LinkageError {
+ ctor public NoClassDefFoundError();
+ ctor public NoClassDefFoundError(java.lang.String);
+ }
+
+ public class NoSuchFieldError extends java.lang.IncompatibleClassChangeError {
+ ctor public NoSuchFieldError();
+ ctor public NoSuchFieldError(java.lang.String);
+ }
+
+ public class NoSuchFieldException extends java.lang.ReflectiveOperationException {
+ ctor public NoSuchFieldException();
+ ctor public NoSuchFieldException(java.lang.String);
+ }
+
+ public class NoSuchMethodError extends java.lang.IncompatibleClassChangeError {
+ ctor public NoSuchMethodError();
+ ctor public NoSuchMethodError(java.lang.String);
+ }
+
+ public class NoSuchMethodException extends java.lang.ReflectiveOperationException {
+ ctor public NoSuchMethodException();
+ ctor public NoSuchMethodException(java.lang.String);
+ }
+
+ public class NullPointerException extends java.lang.RuntimeException {
+ ctor public NullPointerException();
+ ctor public NullPointerException(java.lang.String);
+ }
+
+ public abstract class Number implements java.io.Serializable {
+ ctor public Number();
+ method public byte byteValue();
+ method public abstract double doubleValue();
+ method public abstract float floatValue();
+ method public abstract int intValue();
+ method public abstract long longValue();
+ method public short shortValue();
+ }
+
+ public class NumberFormatException extends java.lang.IllegalArgumentException {
+ ctor public NumberFormatException();
+ ctor public NumberFormatException(java.lang.String);
+ }
+
+ public class Object {
+ ctor public Object();
+ method protected java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public boolean equals(java.lang.Object);
+ method protected void finalize() throws java.lang.Throwable;
+ method public final java.lang.Class<?> getClass();
+ method public int hashCode();
+ method public final void notify();
+ method public final void notifyAll();
+ method public java.lang.String toString();
+ method public final void wait(long) throws java.lang.InterruptedException;
+ method public final void wait(long, int) throws java.lang.InterruptedException;
+ method public final void wait() throws java.lang.InterruptedException;
+ }
+
+ public class OutOfMemoryError extends java.lang.VirtualMachineError {
+ ctor public OutOfMemoryError();
+ ctor public OutOfMemoryError(java.lang.String);
+ }
+
+ public abstract class Override implements java.lang.annotation.Annotation {
+ }
+
+ public class Package implements java.lang.reflect.AnnotatedElement {
+ method public A getAnnotation(java.lang.Class<A>);
+ method public java.lang.annotation.Annotation[] getAnnotations();
+ method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method public java.lang.String getImplementationTitle();
+ method public java.lang.String getImplementationVendor();
+ method public java.lang.String getImplementationVersion();
+ method public java.lang.String getName();
+ method public static java.lang.Package getPackage(java.lang.String);
+ method public static java.lang.Package[] getPackages();
+ method public java.lang.String getSpecificationTitle();
+ method public java.lang.String getSpecificationVendor();
+ method public java.lang.String getSpecificationVersion();
+ method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
+ method public boolean isCompatibleWith(java.lang.String) throws java.lang.NumberFormatException;
+ method public boolean isSealed();
+ method public boolean isSealed(java.net.URL);
+ }
+
+ public abstract class Process {
+ ctor public Process();
+ method public abstract void destroy();
+ method public abstract int exitValue();
+ method public abstract java.io.InputStream getErrorStream();
+ method public abstract java.io.InputStream getInputStream();
+ method public abstract java.io.OutputStream getOutputStream();
+ method public abstract int waitFor() throws java.lang.InterruptedException;
+ }
+
+ public final class ProcessBuilder {
+ ctor public ProcessBuilder(java.util.List<java.lang.String>);
+ ctor public ProcessBuilder(java.lang.String...);
+ method public java.lang.ProcessBuilder command(java.util.List<java.lang.String>);
+ method public java.lang.ProcessBuilder command(java.lang.String...);
+ method public java.util.List<java.lang.String> command();
+ method public java.io.File directory();
+ method public java.lang.ProcessBuilder directory(java.io.File);
+ method public java.util.Map<java.lang.String, java.lang.String> environment();
+ method public java.lang.ProcessBuilder inheritIO();
+ method public java.lang.ProcessBuilder redirectError(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectError(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectError();
+ method public boolean redirectErrorStream();
+ method public java.lang.ProcessBuilder redirectErrorStream(boolean);
+ method public java.lang.ProcessBuilder redirectInput(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectInput(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectInput();
+ method public java.lang.ProcessBuilder redirectOutput(java.lang.ProcessBuilder.Redirect);
+ method public java.lang.ProcessBuilder redirectOutput(java.io.File);
+ method public java.lang.ProcessBuilder.Redirect redirectOutput();
+ method public java.lang.Process start() throws java.io.IOException;
+ }
+
+ public static abstract class ProcessBuilder.Redirect {
+ method public static java.lang.ProcessBuilder.Redirect appendTo(java.io.File);
+ method public java.io.File file();
+ method public static java.lang.ProcessBuilder.Redirect from(java.io.File);
+ method public static java.lang.ProcessBuilder.Redirect to(java.io.File);
+ method public abstract java.lang.ProcessBuilder.Redirect.Type type();
+ field public static final java.lang.ProcessBuilder.Redirect INHERIT;
+ field public static final java.lang.ProcessBuilder.Redirect PIPE;
+ }
+
+ public static final class ProcessBuilder.Redirect.Type extends java.lang.Enum {
+ method public static java.lang.ProcessBuilder.Redirect.Type valueOf(java.lang.String);
+ method public static final java.lang.ProcessBuilder.Redirect.Type[] values();
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type APPEND;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type INHERIT;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type PIPE;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type READ;
+ enum_constant public static final java.lang.ProcessBuilder.Redirect.Type WRITE;
+ }
+
+ public abstract interface Readable {
+ method public abstract int read(java.nio.CharBuffer) throws java.io.IOException;
+ }
+
+ public class ReflectiveOperationException extends java.lang.Exception {
+ ctor public ReflectiveOperationException();
+ ctor public ReflectiveOperationException(java.lang.String);
+ ctor public ReflectiveOperationException(java.lang.String, java.lang.Throwable);
+ ctor public ReflectiveOperationException(java.lang.Throwable);
+ }
+
+ public abstract interface Runnable {
+ method public abstract void run();
+ }
+
+ public class Runtime {
+ method public void addShutdownHook(java.lang.Thread);
+ method public int availableProcessors();
+ method public java.lang.Process exec(java.lang.String) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String, java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String, java.lang.String[], java.io.File) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[], java.lang.String[]) throws java.io.IOException;
+ method public java.lang.Process exec(java.lang.String[], java.lang.String[], java.io.File) throws java.io.IOException;
+ method public void exit(int);
+ method public long freeMemory();
+ method public void gc();
+ method public deprecated java.io.InputStream getLocalizedInputStream(java.io.InputStream);
+ method public deprecated java.io.OutputStream getLocalizedOutputStream(java.io.OutputStream);
+ method public static java.lang.Runtime getRuntime();
+ method public void halt(int);
+ method public void load(java.lang.String);
+ method public void loadLibrary(java.lang.String);
+ method public long maxMemory();
+ method public boolean removeShutdownHook(java.lang.Thread);
+ method public void runFinalization();
+ method public static deprecated void runFinalizersOnExit(boolean);
+ method public long totalMemory();
+ method public void traceInstructions(boolean);
+ method public void traceMethodCalls(boolean);
+ }
+
+ public class RuntimeException extends java.lang.Exception {
+ ctor public RuntimeException();
+ ctor public RuntimeException(java.lang.String);
+ ctor public RuntimeException(java.lang.String, java.lang.Throwable);
+ ctor public RuntimeException(java.lang.Throwable);
+ ctor protected RuntimeException(java.lang.String, java.lang.Throwable, boolean, boolean);
+ }
+
+ public final class RuntimePermission extends java.security.BasicPermission {
+ ctor public RuntimePermission(java.lang.String);
+ ctor public RuntimePermission(java.lang.String, java.lang.String);
+ }
+
+ public abstract class SafeVarargs implements java.lang.annotation.Annotation {
+ }
+
+ public class SecurityException extends java.lang.RuntimeException {
+ ctor public SecurityException();
+ ctor public SecurityException(java.lang.String);
+ ctor public SecurityException(java.lang.String, java.lang.Throwable);
+ ctor public SecurityException(java.lang.Throwable);
+ }
+
+ public class SecurityManager {
+ ctor public SecurityManager();
+ method public void checkAccept(java.lang.String, int);
+ method public void checkAccess(java.lang.Thread);
+ method public void checkAccess(java.lang.ThreadGroup);
+ method public void checkAwtEventQueueAccess();
+ method public void checkConnect(java.lang.String, int);
+ method public void checkConnect(java.lang.String, int, java.lang.Object);
+ method public void checkCreateClassLoader();
+ method public void checkDelete(java.lang.String);
+ method public void checkExec(java.lang.String);
+ method public void checkExit(int);
+ method public void checkLink(java.lang.String);
+ method public void checkListen(int);
+ method public void checkMemberAccess(java.lang.Class<?>, int);
+ method public void checkMulticast(java.net.InetAddress);
+ method public deprecated void checkMulticast(java.net.InetAddress, byte);
+ method public void checkPackageAccess(java.lang.String);
+ method public void checkPackageDefinition(java.lang.String);
+ method public void checkPermission(java.security.Permission);
+ method public void checkPermission(java.security.Permission, java.lang.Object);
+ method public void checkPrintJobAccess();
+ method public void checkPropertiesAccess();
+ method public void checkPropertyAccess(java.lang.String);
+ method public void checkRead(java.io.FileDescriptor);
+ method public void checkRead(java.lang.String);
+ method public void checkRead(java.lang.String, java.lang.Object);
+ method public void checkSecurityAccess(java.lang.String);
+ method public void checkSetFactory();
+ method public void checkSystemClipboardAccess();
+ method public boolean checkTopLevelWindow(java.lang.Object);
+ method public void checkWrite(java.io.FileDescriptor);
+ method public void checkWrite(java.lang.String);
+ method protected deprecated int classDepth(java.lang.String);
+ method protected deprecated int classLoaderDepth();
+ method protected deprecated java.lang.ClassLoader currentClassLoader();
+ method protected deprecated java.lang.Class<?> currentLoadedClass();
+ method protected java.lang.Class[] getClassContext();
+ method public deprecated boolean getInCheck();
+ method public java.lang.Object getSecurityContext();
+ method public java.lang.ThreadGroup getThreadGroup();
+ method protected deprecated boolean inClass(java.lang.String);
+ method protected deprecated boolean inClassLoader();
+ field protected deprecated boolean inCheck;
+ }
+
+ public final class Short extends java.lang.Number implements java.lang.Comparable {
+ ctor public Short(short);
+ ctor public Short(java.lang.String) throws java.lang.NumberFormatException;
+ method public static int compare(short, short);
+ method public int compareTo(java.lang.Short);
+ method public static java.lang.Short decode(java.lang.String) throws java.lang.NumberFormatException;
+ method public double doubleValue();
+ method public float floatValue();
+ method public int intValue();
+ method public long longValue();
+ method public static short parseShort(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static short parseShort(java.lang.String) throws java.lang.NumberFormatException;
+ method public static short reverseBytes(short);
+ method public static java.lang.String toString(short);
+ method public static java.lang.Short valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
+ method public static java.lang.Short valueOf(java.lang.String) throws java.lang.NumberFormatException;
+ method public static java.lang.Short valueOf(short);
+ field public static final short MAX_VALUE = 32767; // 0x7fff
+ field public static final short MIN_VALUE = -32768; // 0xffff8000
+ field public static final int SIZE = 16; // 0x10
+ field public static final java.lang.Class<java.lang.Short> TYPE;
+ }
+
+ public class StackOverflowError extends java.lang.VirtualMachineError {
+ ctor public StackOverflowError();
+ ctor public StackOverflowError(java.lang.String);
+ }
+
+ public final class StackTraceElement implements java.io.Serializable {
+ ctor public StackTraceElement(java.lang.String, java.lang.String, java.lang.String, int);
+ method public java.lang.String getClassName();
+ method public java.lang.String getFileName();
+ method public int getLineNumber();
+ method public java.lang.String getMethodName();
+ method public boolean isNativeMethod();
+ }
+
+ public final class StrictMath {
+ method public static double IEEEremainder(double, double);
+ method public static int abs(int);
+ method public static long abs(long);
+ method public static float abs(float);
+ method public static double abs(double);
+ method public static double acos(double);
+ method public static double asin(double);
+ method public static double atan(double);
+ method public static double atan2(double, double);
+ method public static double cbrt(double);
+ method public static double ceil(double);
+ method public static double copySign(double, double);
+ method public static float copySign(float, float);
+ method public static double cos(double);
+ method public static double cosh(double);
+ method public static double exp(double);
+ method public static double expm1(double);
+ method public static double floor(double);
+ method public static int getExponent(float);
+ method public static int getExponent(double);
+ method public static double hypot(double, double);
+ method public static double log(double);
+ method public static double log10(double);
+ method public static double log1p(double);
+ method public static int max(int, int);
+ method public static long max(long, long);
+ method public static float max(float, float);
+ method public static double max(double, double);
+ method public static int min(int, int);
+ method public static long min(long, long);
+ method public static float min(float, float);
+ method public static double min(double, double);
+ method public static double nextAfter(double, double);
+ method public static float nextAfter(float, double);
+ method public static double nextUp(double);
+ method public static float nextUp(float);
+ method public static double pow(double, double);
+ method public static double random();
+ method public static double rint(double);
+ method public static int round(float);
+ method public static long round(double);
+ method public static double scalb(double, int);
+ method public static float scalb(float, int);
+ method public static double signum(double);
+ method public static float signum(float);
+ method public static double sin(double);
+ method public static double sinh(double);
+ method public static double sqrt(double);
+ method public static double tan(double);
+ method public static double tanh(double);
+ method public static double toDegrees(double);
+ method public static double toRadians(double);
+ method public static double ulp(double);
+ method public static float ulp(float);
+ field public static final double E = 2.718281828459045;
+ field public static final double PI = 3.141592653589793;
+ }
+
+ public final class String implements java.lang.CharSequence java.lang.Comparable java.io.Serializable {
+ ctor public String();
+ ctor public String(java.lang.String);
+ ctor public String(char[]);
+ ctor public String(char[], int, int);
+ ctor public String(int[], int, int);
+ ctor public deprecated String(byte[], int, int, int);
+ ctor public deprecated String(byte[], int);
+ ctor public String(byte[], int, int, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public String(byte[], int, int, java.nio.charset.Charset);
+ ctor public String(byte[], java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public String(byte[], java.nio.charset.Charset);
+ ctor public String(byte[], int, int);
+ ctor public String(byte[]);
+ ctor public String(java.lang.StringBuffer);
+ ctor public String(java.lang.StringBuilder);
+ method public char charAt(int);
+ method public int codePointAt(int);
+ method public int codePointBefore(int);
+ method public int codePointCount(int, int);
+ method public int compareTo(java.lang.String);
+ method public int compareToIgnoreCase(java.lang.String);
+ method public java.lang.String concat(java.lang.String);
+ method public boolean contains(java.lang.CharSequence);
+ method public boolean contentEquals(java.lang.StringBuffer);
+ method public boolean contentEquals(java.lang.CharSequence);
+ method public static java.lang.String copyValueOf(char[], int, int);
+ method public static java.lang.String copyValueOf(char[]);
+ method public boolean endsWith(java.lang.String);
+ method public boolean equalsIgnoreCase(java.lang.String);
+ method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public static java.lang.String format(java.util.Locale, java.lang.String, java.lang.Object...);
+ method public deprecated void getBytes(int, int, byte[], int);
+ method public byte[] getBytes(java.lang.String) throws java.io.UnsupportedEncodingException;
+ method public byte[] getBytes(java.nio.charset.Charset);
+ method public byte[] getBytes();
+ method public void getChars(int, int, char[], int);
+ method public int indexOf(int);
+ method public int indexOf(int, int);
+ method public int indexOf(java.lang.String);
+ method public int indexOf(java.lang.String, int);
+ method public java.lang.String intern();
+ method public boolean isEmpty();
+ method public int lastIndexOf(int);
+ method public int lastIndexOf(int, int);
+ method public int lastIndexOf(java.lang.String);
+ method public int lastIndexOf(java.lang.String, int);
+ method public int length();
+ method public boolean matches(java.lang.String);
+ method public int offsetByCodePoints(int, int);
+ method public boolean regionMatches(int, java.lang.String, int, int);
+ method public boolean regionMatches(boolean, int, java.lang.String, int, int);
+ method public java.lang.String replace(char, char);
+ method public java.lang.String replace(java.lang.CharSequence, java.lang.CharSequence);
+ method public java.lang.String replaceAll(java.lang.String, java.lang.String);
+ method public java.lang.String replaceFirst(java.lang.String, java.lang.String);
+ method public java.lang.String[] split(java.lang.String, int);
+ method public java.lang.String[] split(java.lang.String);
+ method public boolean startsWith(java.lang.String, int);
+ method public boolean startsWith(java.lang.String);
+ method public java.lang.CharSequence subSequence(int, int);
+ method public java.lang.String substring(int);
+ method public java.lang.String substring(int, int);
+ method public char[] toCharArray();
+ method public java.lang.String toLowerCase(java.util.Locale);
+ method public java.lang.String toLowerCase();
+ method public java.lang.String toUpperCase(java.util.Locale);
+ method public java.lang.String toUpperCase();
+ method public java.lang.String trim();
+ method public static java.lang.String valueOf(java.lang.Object);
+ method public static java.lang.String valueOf(char[]);
+ method public static java.lang.String valueOf(char[], int, int);
+ method public static java.lang.String valueOf(boolean);
+ method public static java.lang.String valueOf(char);
+ method public static java.lang.String valueOf(int);
+ method public static java.lang.String valueOf(long);
+ method public static java.lang.String valueOf(float);
+ method public static java.lang.String valueOf(double);
+ field public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;
+ }
+
+ public final class StringBuffer extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
+ ctor public StringBuffer();
+ ctor public StringBuffer(int);
+ ctor public StringBuffer(java.lang.String);
+ ctor public StringBuffer(java.lang.CharSequence);
+ method public synchronized java.lang.String toString();
+ }
+
+ public final class StringBuilder extends java.lang.AbstractStringBuilder implements java.lang.CharSequence java.io.Serializable {
+ ctor public StringBuilder();
+ ctor public StringBuilder(int);
+ ctor public StringBuilder(java.lang.String);
+ ctor public StringBuilder(java.lang.CharSequence);
+ method public java.lang.String toString();
+ }
+
+ public class StringIndexOutOfBoundsException extends java.lang.IndexOutOfBoundsException {
+ ctor public StringIndexOutOfBoundsException();
+ ctor public StringIndexOutOfBoundsException(java.lang.String);
+ ctor public StringIndexOutOfBoundsException(int);
+ }
+
+ public abstract class SuppressWarnings implements java.lang.annotation.Annotation {
+ }
+
+ public final class System {
+ method public static void arraycopy(java.lang.Object, int, java.lang.Object, int, int);
+ method public static java.lang.String clearProperty(java.lang.String);
+ method public static java.io.Console console();
+ method public static long currentTimeMillis();
+ method public static void exit(int);
+ method public static void gc();
+ method public static java.util.Properties getProperties();
+ method public static java.lang.String getProperty(java.lang.String);
+ method public static java.lang.String getProperty(java.lang.String, java.lang.String);
+ method public static java.lang.SecurityManager getSecurityManager();
+ method public static java.lang.String getenv(java.lang.String);
+ method public static java.util.Map<java.lang.String, java.lang.String> getenv();
+ method public static int identityHashCode(java.lang.Object);
+ method public static java.nio.channels.Channel inheritedChannel() throws java.io.IOException;
+ method public static java.lang.String lineSeparator();
+ method public static void load(java.lang.String);
+ method public static void loadLibrary(java.lang.String);
+ method public static java.lang.String mapLibraryName(java.lang.String);
+ method public static long nanoTime();
+ method public static void runFinalization();
+ method public static deprecated void runFinalizersOnExit(boolean);
+ method public static void setErr(java.io.PrintStream);
+ method public static void setIn(java.io.InputStream);
+ method public static void setOut(java.io.PrintStream);
+ method public static void setProperties(java.util.Properties);
+ method public static java.lang.String setProperty(java.lang.String, java.lang.String);
+ method public static void setSecurityManager(java.lang.SecurityManager);
+ field public static final java.io.PrintStream err;
+ field public static final java.io.InputStream in;
+ field public static final java.io.PrintStream out;
+ }
+
+ public class Thread implements java.lang.Runnable {
+ ctor public Thread();
+ ctor public Thread(java.lang.Runnable);
+ ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable);
+ ctor public Thread(java.lang.String);
+ ctor public Thread(java.lang.ThreadGroup, java.lang.String);
+ ctor public Thread(java.lang.Runnable, java.lang.String);
+ ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String);
+ ctor public Thread(java.lang.ThreadGroup, java.lang.Runnable, java.lang.String, long);
+ method public static int activeCount();
+ method public final void checkAccess();
+ method public deprecated int countStackFrames();
+ method public static java.lang.Thread currentThread();
+ method public deprecated void destroy();
+ method public static void dumpStack();
+ method public static int enumerate(java.lang.Thread[]);
+ method public static java.util.Map<java.lang.Thread, java.lang.StackTraceElement[]> getAllStackTraces();
+ method public java.lang.ClassLoader getContextClassLoader();
+ method public static java.lang.Thread.UncaughtExceptionHandler getDefaultUncaughtExceptionHandler();
+ method public long getId();
+ method public final java.lang.String getName();
+ method public final int getPriority();
+ method public java.lang.StackTraceElement[] getStackTrace();
+ method public java.lang.Thread.State getState();
+ method public final java.lang.ThreadGroup getThreadGroup();
+ method public java.lang.Thread.UncaughtExceptionHandler getUncaughtExceptionHandler();
+ method public static boolean holdsLock(java.lang.Object);
+ method public void interrupt();
+ method public static boolean interrupted();
+ method public final boolean isAlive();
+ method public final boolean isDaemon();
+ method public boolean isInterrupted();
+ method public final void join(long) throws java.lang.InterruptedException;
+ method public final void join(long, int) throws java.lang.InterruptedException;
+ method public final void join() throws java.lang.InterruptedException;
+ method public final deprecated void resume();
+ method public void run();
+ method public void setContextClassLoader(java.lang.ClassLoader);
+ method public final void setDaemon(boolean);
+ method public static void setDefaultUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler);
+ method public final void setName(java.lang.String);
+ method public final void setPriority(int);
+ method public void setUncaughtExceptionHandler(java.lang.Thread.UncaughtExceptionHandler);
+ method public static void sleep(long) throws java.lang.InterruptedException;
+ method public static void sleep(long, int) throws java.lang.InterruptedException;
+ method public synchronized void start();
+ method public final deprecated void stop();
+ method public final deprecated void stop(java.lang.Throwable);
+ method public final deprecated void suspend();
+ method public static void yield();
+ field public static final int MAX_PRIORITY = 10; // 0xa
+ field public static final int MIN_PRIORITY = 1; // 0x1
+ field public static final int NORM_PRIORITY = 5; // 0x5
+ }
+
+ public static final class Thread.State extends java.lang.Enum {
+ method public static java.lang.Thread.State valueOf(java.lang.String);
+ method public static final java.lang.Thread.State[] values();
+ enum_constant public static final java.lang.Thread.State BLOCKED;
+ enum_constant public static final java.lang.Thread.State NEW;
+ enum_constant public static final java.lang.Thread.State RUNNABLE;
+ enum_constant public static final java.lang.Thread.State TERMINATED;
+ enum_constant public static final java.lang.Thread.State TIMED_WAITING;
+ enum_constant public static final java.lang.Thread.State WAITING;
+ }
+
+ public static abstract interface Thread.UncaughtExceptionHandler {
+ method public abstract void uncaughtException(java.lang.Thread, java.lang.Throwable);
+ }
+
+ public class ThreadDeath extends java.lang.Error {
+ ctor public ThreadDeath();
+ }
+
+ public class ThreadGroup implements java.lang.Thread.UncaughtExceptionHandler {
+ ctor public ThreadGroup(java.lang.String);
+ ctor public ThreadGroup(java.lang.ThreadGroup, java.lang.String);
+ method public int activeCount();
+ method public int activeGroupCount();
+ method public deprecated boolean allowThreadSuspension(boolean);
+ method public final void checkAccess();
+ method public final void destroy();
+ method public int enumerate(java.lang.Thread[]);
+ method public int enumerate(java.lang.Thread[], boolean);
+ method public int enumerate(java.lang.ThreadGroup[]);
+ method public int enumerate(java.lang.ThreadGroup[], boolean);
+ method public final int getMaxPriority();
+ method public final java.lang.String getName();
+ method public final java.lang.ThreadGroup getParent();
+ method public final void interrupt();
+ method public final boolean isDaemon();
+ method public synchronized boolean isDestroyed();
+ method public void list();
+ method public final boolean parentOf(java.lang.ThreadGroup);
+ method public final deprecated void resume();
+ method public final void setDaemon(boolean);
+ method public final void setMaxPriority(int);
+ method public final deprecated void stop();
+ method public final deprecated void suspend();
+ method public void uncaughtException(java.lang.Thread, java.lang.Throwable);
+ }
+
+ public class ThreadLocal {
+ ctor public ThreadLocal();
+ method public T get();
+ method protected T initialValue();
+ method public void remove();
+ method public void set(T);
+ }
+
+ public class Throwable implements java.io.Serializable {
+ ctor public Throwable();
+ ctor public Throwable(java.lang.String);
+ ctor public Throwable(java.lang.String, java.lang.Throwable);
+ ctor public Throwable(java.lang.Throwable);
+ ctor protected Throwable(java.lang.String, java.lang.Throwable, boolean, boolean);
+ method public final synchronized void addSuppressed(java.lang.Throwable);
+ method public synchronized java.lang.Throwable fillInStackTrace();
+ method public synchronized java.lang.Throwable getCause();
+ method public java.lang.String getLocalizedMessage();
+ method public java.lang.String getMessage();
+ method public java.lang.StackTraceElement[] getStackTrace();
+ method public final synchronized java.lang.Throwable[] getSuppressed();
+ method public synchronized java.lang.Throwable initCause(java.lang.Throwable);
+ method public void printStackTrace();
+ method public void printStackTrace(java.io.PrintStream);
+ method public void printStackTrace(java.io.PrintWriter);
+ method public void setStackTrace(java.lang.StackTraceElement[]);
+ }
+
+ public class TypeNotPresentException extends java.lang.RuntimeException {
+ ctor public TypeNotPresentException(java.lang.String, java.lang.Throwable);
+ method public java.lang.String typeName();
+ }
+
+ public class UnknownError extends java.lang.VirtualMachineError {
+ ctor public UnknownError();
+ ctor public UnknownError(java.lang.String);
+ }
+
+ public class UnsatisfiedLinkError extends java.lang.LinkageError {
+ ctor public UnsatisfiedLinkError();
+ ctor public UnsatisfiedLinkError(java.lang.String);
+ }
+
+ public class UnsupportedClassVersionError extends java.lang.ClassFormatError {
+ ctor public UnsupportedClassVersionError();
+ ctor public UnsupportedClassVersionError(java.lang.String);
+ }
+
+ public class UnsupportedOperationException extends java.lang.RuntimeException {
+ ctor public UnsupportedOperationException();
+ ctor public UnsupportedOperationException(java.lang.String);
+ ctor public UnsupportedOperationException(java.lang.String, java.lang.Throwable);
+ ctor public UnsupportedOperationException(java.lang.Throwable);
+ }
+
+ public class VerifyError extends java.lang.LinkageError {
+ ctor public VerifyError();
+ ctor public VerifyError(java.lang.String);
+ }
+
+ public abstract class VirtualMachineError extends java.lang.Error {
+ ctor public VirtualMachineError();
+ ctor public VirtualMachineError(java.lang.String);
+ }
+
+ public final class Void {
+ field public static final java.lang.Class<java.lang.Void> TYPE;
+ }
+
+}
+
+package java.lang.annotation {
+
+ public abstract interface Annotation {
+ method public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType();
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract int hashCode();
+ method public abstract java.lang.String toString();
+ }
+
+ public class AnnotationFormatError extends java.lang.Error {
+ ctor public AnnotationFormatError(java.lang.String);
+ ctor public AnnotationFormatError(java.lang.String, java.lang.Throwable);
+ ctor public AnnotationFormatError(java.lang.Throwable);
+ }
+
+ public class AnnotationTypeMismatchException extends java.lang.RuntimeException {
+ ctor public AnnotationTypeMismatchException(java.lang.reflect.Method, java.lang.String);
+ method public java.lang.reflect.Method element();
+ method public java.lang.String foundType();
+ }
+
+ public abstract class Documented implements java.lang.annotation.Annotation {
+ }
+
+ public final class ElementType extends java.lang.Enum {
+ method public static java.lang.annotation.ElementType valueOf(java.lang.String);
+ method public static final java.lang.annotation.ElementType[] values();
+ enum_constant public static final java.lang.annotation.ElementType ANNOTATION_TYPE;
+ enum_constant public static final java.lang.annotation.ElementType CONSTRUCTOR;
+ enum_constant public static final java.lang.annotation.ElementType FIELD;
+ enum_constant public static final java.lang.annotation.ElementType LOCAL_VARIABLE;
+ enum_constant public static final java.lang.annotation.ElementType METHOD;
+ enum_constant public static final java.lang.annotation.ElementType PACKAGE;
+ enum_constant public static final java.lang.annotation.ElementType PARAMETER;
+ enum_constant public static final java.lang.annotation.ElementType TYPE;
+ }
+
+ public class IncompleteAnnotationException extends java.lang.RuntimeException {
+ ctor public IncompleteAnnotationException(java.lang.Class<? extends java.lang.annotation.Annotation>, java.lang.String);
+ method public java.lang.Class<? extends java.lang.annotation.Annotation> annotationType();
+ method public java.lang.String elementName();
+ }
+
+ public abstract class Inherited implements java.lang.annotation.Annotation {
+ }
+
+ public abstract class Retention implements java.lang.annotation.Annotation {
+ }
+
+ public final class RetentionPolicy extends java.lang.Enum {
+ method public static java.lang.annotation.RetentionPolicy valueOf(java.lang.String);
+ method public static final java.lang.annotation.RetentionPolicy[] values();
+ enum_constant public static final java.lang.annotation.RetentionPolicy CLASS;
+ enum_constant public static final java.lang.annotation.RetentionPolicy RUNTIME;
+ enum_constant public static final java.lang.annotation.RetentionPolicy SOURCE;
+ }
+
+ public abstract class Target implements java.lang.annotation.Annotation {
+ }
+
+}
+
+package java.lang.ref {
+
+ public class PhantomReference extends java.lang.ref.Reference {
+ ctor public PhantomReference(T, java.lang.ref.ReferenceQueue<? super T>);
+ }
+
+ public abstract class Reference {
+ method public void clear();
+ method public boolean enqueue();
+ method public final synchronized boolean enqueueInternal();
+ method public T get();
+ method public boolean isEnqueued();
+ }
+
+ public class ReferenceQueue {
+ ctor public ReferenceQueue();
+ method public java.lang.ref.Reference<? extends T> poll();
+ method public java.lang.ref.Reference<? extends T> remove(long) throws java.lang.IllegalArgumentException, java.lang.InterruptedException;
+ method public java.lang.ref.Reference<? extends T> remove() throws java.lang.InterruptedException;
+ }
+
+ public class SoftReference extends java.lang.ref.Reference {
+ ctor public SoftReference(T);
+ ctor public SoftReference(T, java.lang.ref.ReferenceQueue<? super T>);
+ }
+
+ public class WeakReference extends java.lang.ref.Reference {
+ ctor public WeakReference(T);
+ ctor public WeakReference(T, java.lang.ref.ReferenceQueue<? super T>);
+ }
+
+}
+
+package java.lang.reflect {
+
+ public class AccessibleObject implements java.lang.reflect.AnnotatedElement {
+ ctor protected AccessibleObject();
+ method public T getAnnotation(java.lang.Class<T>);
+ method public java.lang.annotation.Annotation[] getAnnotations();
+ method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method public boolean isAccessible();
+ method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
+ method public static void setAccessible(java.lang.reflect.AccessibleObject[], boolean) throws java.lang.SecurityException;
+ method public void setAccessible(boolean) throws java.lang.SecurityException;
+ }
+
+ public abstract interface AnnotatedElement {
+ method public abstract T getAnnotation(java.lang.Class<T>);
+ method public abstract java.lang.annotation.Annotation[] getAnnotations();
+ method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method public abstract boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
+ }
+
+ public final class Array {
+ method public static java.lang.Object get(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static boolean getBoolean(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static byte getByte(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static char getChar(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static double getDouble(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static float getFloat(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static int getInt(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static int getLength(java.lang.Object);
+ method public static long getLong(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static short getShort(java.lang.Object, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static java.lang.Object newArray(java.lang.Class<?>, int) throws java.lang.NegativeArraySizeException;
+ method public static java.lang.Object newInstance(java.lang.Class<?>, int) throws java.lang.NegativeArraySizeException;
+ method public static java.lang.Object newInstance(java.lang.Class<?>, int...) throws java.lang.IllegalArgumentException, java.lang.NegativeArraySizeException;
+ method public static void set(java.lang.Object, int, java.lang.Object) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setBoolean(java.lang.Object, int, boolean);
+ method public static void setByte(java.lang.Object, int, byte) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setChar(java.lang.Object, int, char) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setDouble(java.lang.Object, int, double) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setFloat(java.lang.Object, int, float) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setInt(java.lang.Object, int, int) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setLong(java.lang.Object, int, long) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ method public static void setShort(java.lang.Object, int, short) throws java.lang.ArrayIndexOutOfBoundsException, java.lang.IllegalArgumentException;
+ }
+
+ public final class Constructor extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
+ method public boolean equals(java.lang.Object);
+ method public A getAnnotation(java.lang.Class<A>);
+ method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method public java.lang.Class<T> getDeclaringClass();
+ method public java.lang.Class<?>[] getExceptionTypes();
+ method public java.lang.reflect.Type[] getGenericExceptionTypes();
+ method public java.lang.reflect.Type[] getGenericParameterTypes();
+ method public int getModifiers();
+ method public java.lang.String getName();
+ method public java.lang.annotation.Annotation[][] getParameterAnnotations();
+ method public java.lang.Class<?>[] getParameterTypes();
+ method public java.lang.reflect.TypeVariable<java.lang.reflect.Constructor<T>>[] getTypeParameters();
+ method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
+ method public boolean isSynthetic();
+ method public boolean isVarArgs();
+ method public T newInstance(java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.InstantiationException, java.lang.reflect.InvocationTargetException;
+ method public java.lang.String toGenericString();
+ }
+
+ public final class Field extends java.lang.reflect.AccessibleObject implements java.lang.reflect.Member {
+ method public java.lang.Object get(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public A getAnnotation(java.lang.Class<A>);
+ method public boolean getBoolean(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public byte getByte(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public char getChar(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public java.lang.Class<?> getDeclaringClass();
+ method public double getDouble(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public float getFloat(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public java.lang.reflect.Type getGenericType();
+ method public int getInt(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public long getLong(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public int getModifiers();
+ method public java.lang.String getName();
+ method public short getShort(java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public java.lang.Class<?> getType();
+ method public boolean isEnumConstant();
+ method public boolean isSynthetic();
+ method public void set(java.lang.Object, java.lang.Object) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setBoolean(java.lang.Object, boolean) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setByte(java.lang.Object, byte) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setChar(java.lang.Object, char) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setDouble(java.lang.Object, double) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setFloat(java.lang.Object, float) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setInt(java.lang.Object, int) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setLong(java.lang.Object, long) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public void setShort(java.lang.Object, short) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException;
+ method public java.lang.String toGenericString();
+ }
+
+ public abstract interface GenericArrayType implements java.lang.reflect.Type {
+ method public abstract java.lang.reflect.Type getGenericComponentType();
+ }
+
+ public abstract interface GenericDeclaration {
+ method public abstract java.lang.reflect.TypeVariable<?>[] getTypeParameters();
+ }
+
+ public class GenericSignatureFormatError extends java.lang.ClassFormatError {
+ ctor public GenericSignatureFormatError();
+ }
+
+ public abstract interface InvocationHandler {
+ method public abstract java.lang.Object invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) throws java.lang.Throwable;
+ }
+
+ public class InvocationTargetException extends java.lang.ReflectiveOperationException {
+ ctor protected InvocationTargetException();
+ ctor public InvocationTargetException(java.lang.Throwable);
+ ctor public InvocationTargetException(java.lang.Throwable, java.lang.String);
+ method public java.lang.Throwable getTargetException();
+ }
+
+ public class MalformedParameterizedTypeException extends java.lang.RuntimeException {
+ ctor public MalformedParameterizedTypeException();
+ }
+
+ public abstract interface Member {
+ method public abstract java.lang.Class<?> getDeclaringClass();
+ method public abstract int getModifiers();
+ method public abstract java.lang.String getName();
+ method public abstract boolean isSynthetic();
+ field public static final int DECLARED = 1; // 0x1
+ field public static final int PUBLIC = 0; // 0x0
+ }
+
+ public final class Method extends java.lang.reflect.AccessibleObject implements java.lang.reflect.GenericDeclaration java.lang.reflect.Member {
+ method public boolean equals(java.lang.Object);
+ method public A getAnnotation(java.lang.Class<A>);
+ method public java.lang.annotation.Annotation[] getDeclaredAnnotations();
+ method public java.lang.Class<?> getDeclaringClass();
+ method public java.lang.Object getDefaultValue();
+ method public java.lang.Class<?>[] getExceptionTypes();
+ method public java.lang.reflect.Type[] getGenericExceptionTypes();
+ method public java.lang.reflect.Type[] getGenericParameterTypes();
+ method public java.lang.reflect.Type getGenericReturnType();
+ method public int getModifiers();
+ method public java.lang.String getName();
+ method public java.lang.annotation.Annotation[][] getParameterAnnotations();
+ method public java.lang.Class<?>[] getParameterTypes();
+ method public java.lang.Class<?> getReturnType();
+ method public java.lang.reflect.TypeVariable<java.lang.reflect.Method>[] getTypeParameters();
+ method public java.lang.Object invoke(java.lang.Object, java.lang.Object...) throws java.lang.IllegalAccessException, java.lang.IllegalArgumentException, java.lang.reflect.InvocationTargetException;
+ method public boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>);
+ method public boolean isBridge();
+ method public boolean isSynthetic();
+ method public boolean isVarArgs();
+ method public java.lang.String toGenericString();
+ }
+
+ public class Modifier {
+ ctor public Modifier();
+ method public static int classModifiers();
+ method public static int constructorModifiers();
+ method public static int fieldModifiers();
+ method public static int interfaceModifiers();
+ method public static boolean isAbstract(int);
+ method public static boolean isFinal(int);
+ method public static boolean isInterface(int);
+ method public static boolean isNative(int);
+ method public static boolean isPrivate(int);
+ method public static boolean isProtected(int);
+ method public static boolean isPublic(int);
+ method public static boolean isStatic(int);
+ method public static boolean isStrict(int);
+ method public static boolean isSynchronized(int);
+ method public static boolean isTransient(int);
+ method public static boolean isVolatile(int);
+ method public static int methodModifiers();
+ method public static java.lang.String toString(int);
+ field public static final int ABSTRACT = 1024; // 0x400
+ field public static final int FINAL = 16; // 0x10
+ field public static final int INTERFACE = 512; // 0x200
+ field public static final int NATIVE = 256; // 0x100
+ field public static final int PRIVATE = 2; // 0x2
+ field public static final int PROTECTED = 4; // 0x4
+ field public static final int PUBLIC = 1; // 0x1
+ field public static final int STATIC = 8; // 0x8
+ field public static final int STRICT = 2048; // 0x800
+ field public static final int SYNCHRONIZED = 32; // 0x20
+ field public static final int TRANSIENT = 128; // 0x80
+ field public static final int VOLATILE = 64; // 0x40
+ }
+
+ public abstract interface ParameterizedType implements java.lang.reflect.Type {
+ method public abstract java.lang.reflect.Type[] getActualTypeArguments();
+ method public abstract java.lang.reflect.Type getOwnerType();
+ method public abstract java.lang.reflect.Type getRawType();
+ }
+
+ public class Proxy implements java.io.Serializable {
+ ctor protected Proxy(java.lang.reflect.InvocationHandler);
+ method public static java.lang.reflect.InvocationHandler getInvocationHandler(java.lang.Object) throws java.lang.IllegalArgumentException;
+ method public static java.lang.Class<?> getProxyClass(java.lang.ClassLoader, java.lang.Class<?>...) throws java.lang.IllegalArgumentException;
+ method public static boolean isProxyClass(java.lang.Class<?>);
+ method public static java.lang.Object newProxyInstance(java.lang.ClassLoader, java.lang.Class<?>[], java.lang.reflect.InvocationHandler) throws java.lang.IllegalArgumentException;
+ field protected java.lang.reflect.InvocationHandler h;
+ }
+
+ public final class ReflectPermission extends java.security.BasicPermission {
+ ctor public ReflectPermission(java.lang.String);
+ ctor public ReflectPermission(java.lang.String, java.lang.String);
+ }
+
+ public abstract interface Type {
+ }
+
+ public abstract interface TypeVariable implements java.lang.reflect.Type {
+ method public abstract java.lang.reflect.Type[] getBounds();
+ method public abstract D getGenericDeclaration();
+ method public abstract java.lang.String getName();
+ }
+
+ public class UndeclaredThrowableException extends java.lang.RuntimeException {
+ ctor public UndeclaredThrowableException(java.lang.Throwable);
+ ctor public UndeclaredThrowableException(java.lang.Throwable, java.lang.String);
+ method public java.lang.Throwable getUndeclaredThrowable();
+ }
+
+ public abstract interface WildcardType implements java.lang.reflect.Type {
+ method public abstract java.lang.reflect.Type[] getLowerBounds();
+ method public abstract java.lang.reflect.Type[] getUpperBounds();
+ }
+
+}
+
+package java.math {
+
+ public class BigDecimal extends java.lang.Number implements java.lang.Comparable java.io.Serializable {
+ ctor public BigDecimal(char[], int, int);
+ ctor public BigDecimal(char[], int, int, java.math.MathContext);
+ ctor public BigDecimal(char[]);
+ ctor public BigDecimal(char[], java.math.MathContext);
+ ctor public BigDecimal(java.lang.String);
+ ctor public BigDecimal(java.lang.String, java.math.MathContext);
+ ctor public BigDecimal(double);
+ ctor public BigDecimal(double, java.math.MathContext);
+ ctor public BigDecimal(java.math.BigInteger);
+ ctor public BigDecimal(java.math.BigInteger, java.math.MathContext);
+ ctor public BigDecimal(java.math.BigInteger, int);
+ ctor public BigDecimal(java.math.BigInteger, int, java.math.MathContext);
+ ctor public BigDecimal(int);
+ ctor public BigDecimal(int, java.math.MathContext);
+ ctor public BigDecimal(long);
+ ctor public BigDecimal(long, java.math.MathContext);
+ method public java.math.BigDecimal abs();
+ method public java.math.BigDecimal abs(java.math.MathContext);
+ method public java.math.BigDecimal add(java.math.BigDecimal);
+ method public java.math.BigDecimal add(java.math.BigDecimal, java.math.MathContext);
+ method public byte byteValueExact();
+ method public int compareTo(java.math.BigDecimal);
+ method public java.math.BigDecimal divide(java.math.BigDecimal, int, int);
+ method public java.math.BigDecimal divide(java.math.BigDecimal, int, java.math.RoundingMode);
+ method public java.math.BigDecimal divide(java.math.BigDecimal, int);
+ method public java.math.BigDecimal divide(java.math.BigDecimal, java.math.RoundingMode);
+ method public java.math.BigDecimal divide(java.math.BigDecimal);
+ method public java.math.BigDecimal divide(java.math.BigDecimal, java.math.MathContext);
+ method public java.math.BigDecimal[] divideAndRemainder(java.math.BigDecimal);
+ method public java.math.BigDecimal[] divideAndRemainder(java.math.BigDecimal, java.math.MathContext);
+ method public java.math.BigDecimal divideToIntegralValue(java.math.BigDecimal);
+ method public java.math.BigDecimal divideToIntegralValue(java.math.BigDecimal, java.math.MathContext);
+ method public double doubleValue();
+ method public float floatValue();
+ method public int intValue();
+ method public int intValueExact();
+ method public long longValue();
+ method public long longValueExact();
+ method public java.math.BigDecimal max(java.math.BigDecimal);
+ method public java.math.BigDecimal min(java.math.BigDecimal);
+ method public java.math.BigDecimal movePointLeft(int);
+ method public java.math.BigDecimal movePointRight(int);
+ method public java.math.BigDecimal multiply(java.math.BigDecimal);
+ method public java.math.BigDecimal multiply(java.math.BigDecimal, java.math.MathContext);
+ method public java.math.BigDecimal negate();
+ method public java.math.BigDecimal negate(java.math.MathContext);
+ method public java.math.BigDecimal plus();
+ method public java.math.BigDecimal plus(java.math.MathContext);
+ method public java.math.BigDecimal pow(int);
+ method public java.math.BigDecimal pow(int, java.math.MathContext);
+ method public int precision();
+ method public java.math.BigDecimal remainder(java.math.BigDecimal);
+ method public java.math.BigDecimal remainder(java.math.BigDecimal, java.math.MathContext);
+ method public java.math.BigDecimal round(java.math.MathContext);
+ method public int scale();
+ method public java.math.BigDecimal scaleByPowerOfTen(int);
+ method public java.math.BigDecimal setScale(int, java.math.RoundingMode);
+ method public java.math.BigDecimal setScale(int, int);
+ method public java.math.BigDecimal setScale(int);
+ method public short shortValueExact();
+ method public int signum();
+ method public java.math.BigDecimal stripTrailingZeros();
+ method public java.math.BigDecimal subtract(java.math.BigDecimal);
+ method public java.math.BigDecimal subtract(java.math.BigDecimal, java.math.MathContext);
+ method public java.math.BigInteger toBigInteger();
+ method public java.math.BigInteger toBigIntegerExact();
+ method public java.lang.String toEngineeringString();
+ method public java.lang.String toPlainString();
+ method public java.math.BigDecimal ulp();
+ method public java.math.BigInteger unscaledValue();
+ method public static java.math.BigDecimal valueOf(long, int);
+ method public static java.math.BigDecimal valueOf(long);
+ method public static java.math.BigDecimal valueOf(double);
+ field public static final java.math.BigDecimal ONE;
+ field public static final int ROUND_CEILING = 2; // 0x2
+ field public static final int ROUND_DOWN = 1; // 0x1
+ field public static final int ROUND_FLOOR = 3; // 0x3
+ field public static final int ROUND_HALF_DOWN = 5; // 0x5
+ field public static final int ROUND_HALF_EVEN = 6; // 0x6
+ field public static final int ROUND_HALF_UP = 4; // 0x4
+ field public static final int ROUND_UNNECESSARY = 7; // 0x7
+ field public static final int ROUND_UP = 0; // 0x0
+ field public static final java.math.BigDecimal TEN;
+ field public static final java.math.BigDecimal ZERO;
+ }
+
+ public class BigInteger extends java.lang.Number implements java.lang.Comparable java.io.Serializable {
+ ctor public BigInteger(int, java.util.Random);
+ ctor public BigInteger(int, int, java.util.Random);
+ ctor public BigInteger(java.lang.String);
+ ctor public BigInteger(java.lang.String, int);
+ ctor public BigInteger(int, byte[]);
+ ctor public BigInteger(byte[]);
+ method public java.math.BigInteger abs();
+ method public java.math.BigInteger add(java.math.BigInteger);
+ method public java.math.BigInteger and(java.math.BigInteger);
+ method public java.math.BigInteger andNot(java.math.BigInteger);
+ method public int bitCount();
+ method public int bitLength();
+ method public java.math.BigInteger clearBit(int);
+ method public int compareTo(java.math.BigInteger);
+ method public java.math.BigInteger divide(java.math.BigInteger);
+ method public java.math.BigInteger[] divideAndRemainder(java.math.BigInteger);
+ method public double doubleValue();
+ method public java.math.BigInteger flipBit(int);
+ method public float floatValue();
+ method public java.math.BigInteger gcd(java.math.BigInteger);
+ method public int getLowestSetBit();
+ method public int intValue();
+ method public boolean isProbablePrime(int);
+ method public long longValue();
+ method public java.math.BigInteger max(java.math.BigInteger);
+ method public java.math.BigInteger min(java.math.BigInteger);
+ method public java.math.BigInteger mod(java.math.BigInteger);
+ method public java.math.BigInteger modInverse(java.math.BigInteger);
+ method public java.math.BigInteger modPow(java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger multiply(java.math.BigInteger);
+ method public java.math.BigInteger negate();
+ method public java.math.BigInteger nextProbablePrime();
+ method public java.math.BigInteger not();
+ method public java.math.BigInteger or(java.math.BigInteger);
+ method public java.math.BigInteger pow(int);
+ method public static java.math.BigInteger probablePrime(int, java.util.Random);
+ method public java.math.BigInteger remainder(java.math.BigInteger);
+ method public java.math.BigInteger setBit(int);
+ method public java.math.BigInteger shiftLeft(int);
+ method public java.math.BigInteger shiftRight(int);
+ method public int signum();
+ method public java.math.BigInteger subtract(java.math.BigInteger);
+ method public boolean testBit(int);
+ method public byte[] toByteArray();
+ method public java.lang.String toString(int);
+ method public static java.math.BigInteger valueOf(long);
+ method public java.math.BigInteger xor(java.math.BigInteger);
+ field public static final java.math.BigInteger ONE;
+ field public static final java.math.BigInteger TEN;
+ field public static final java.math.BigInteger ZERO;
+ }
+
+ public final class MathContext implements java.io.Serializable {
+ ctor public MathContext(int);
+ ctor public MathContext(int, java.math.RoundingMode);
+ ctor public MathContext(java.lang.String);
+ method public int getPrecision();
+ method public java.math.RoundingMode getRoundingMode();
+ field public static final java.math.MathContext DECIMAL128;
+ field public static final java.math.MathContext DECIMAL32;
+ field public static final java.math.MathContext DECIMAL64;
+ field public static final java.math.MathContext UNLIMITED;
+ }
+
+ public final class RoundingMode extends java.lang.Enum {
+ method public static java.math.RoundingMode valueOf(java.lang.String);
+ method public static java.math.RoundingMode valueOf(int);
+ method public static final java.math.RoundingMode[] values();
+ enum_constant public static final java.math.RoundingMode CEILING;
+ enum_constant public static final java.math.RoundingMode DOWN;
+ enum_constant public static final java.math.RoundingMode FLOOR;
+ enum_constant public static final java.math.RoundingMode HALF_DOWN;
+ enum_constant public static final java.math.RoundingMode HALF_EVEN;
+ enum_constant public static final java.math.RoundingMode HALF_UP;
+ enum_constant public static final java.math.RoundingMode UNNECESSARY;
+ enum_constant public static final java.math.RoundingMode UP;
+ }
+
+}
+
+package java.net {
+
+ public abstract class Authenticator {
+ ctor public Authenticator();
+ method protected java.net.PasswordAuthentication getPasswordAuthentication();
+ method protected final java.lang.String getRequestingHost();
+ method protected final int getRequestingPort();
+ method protected final java.lang.String getRequestingPrompt();
+ method protected final java.lang.String getRequestingProtocol();
+ method protected final java.lang.String getRequestingScheme();
+ method protected final java.net.InetAddress getRequestingSite();
+ method protected java.net.URL getRequestingURL();
+ method protected java.net.Authenticator.RequestorType getRequestorType();
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String);
+ method public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String, java.net.InetAddress, int, java.lang.String, java.lang.String, java.lang.String, java.net.URL, java.net.Authenticator.RequestorType);
+ method public static synchronized void setDefault(java.net.Authenticator);
+ }
+
+ public static final class Authenticator.RequestorType extends java.lang.Enum {
+ method public static java.net.Authenticator.RequestorType valueOf(java.lang.String);
+ method public static final java.net.Authenticator.RequestorType[] values();
+ enum_constant public static final java.net.Authenticator.RequestorType PROXY;
+ enum_constant public static final java.net.Authenticator.RequestorType SERVER;
+ }
+
+ public class BindException extends java.net.SocketException {
+ ctor public BindException(java.lang.String);
+ ctor public BindException();
+ ctor public BindException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract class CacheRequest {
+ ctor public CacheRequest();
+ method public abstract void abort();
+ method public abstract java.io.OutputStream getBody() throws java.io.IOException;
+ }
+
+ public abstract class CacheResponse {
+ ctor public CacheResponse();
+ method public abstract java.io.InputStream getBody() throws java.io.IOException;
+ method public abstract java.util.Map<java.lang.String, java.util.List<java.lang.String>> getHeaders() throws java.io.IOException;
+ }
+
+ public class ConnectException extends java.net.SocketException {
+ ctor public ConnectException(java.lang.String);
+ ctor public ConnectException();
+ ctor public ConnectException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract class ContentHandler {
+ ctor public ContentHandler();
+ method public abstract java.lang.Object getContent(java.net.URLConnection) throws java.io.IOException;
+ method public java.lang.Object getContent(java.net.URLConnection, java.lang.Class[]) throws java.io.IOException;
+ }
+
+ public abstract interface ContentHandlerFactory {
+ method public abstract java.net.ContentHandler createContentHandler(java.lang.String);
+ }
+
+ public abstract class CookieHandler {
+ ctor public CookieHandler();
+ method public abstract java.util.Map<java.lang.String, java.util.List<java.lang.String>> get(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public static synchronized java.net.CookieHandler getDefault();
+ method public abstract void put(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public static synchronized void setDefault(java.net.CookieHandler);
+ }
+
+ public class CookieManager extends java.net.CookieHandler {
+ ctor public CookieManager();
+ ctor public CookieManager(java.net.CookieStore, java.net.CookiePolicy);
+ method public java.util.Map<java.lang.String, java.util.List<java.lang.String>> get(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public java.net.CookieStore getCookieStore();
+ method public void put(java.net.URI, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public void setCookiePolicy(java.net.CookiePolicy);
+ }
+
+ public abstract interface CookiePolicy {
+ method public abstract boolean shouldAccept(java.net.URI, java.net.HttpCookie);
+ field public static final java.net.CookiePolicy ACCEPT_ALL;
+ field public static final java.net.CookiePolicy ACCEPT_NONE;
+ field public static final java.net.CookiePolicy ACCEPT_ORIGINAL_SERVER;
+ }
+
+ public abstract interface CookieStore {
+ method public abstract void add(java.net.URI, java.net.HttpCookie);
+ method public abstract java.util.List<java.net.HttpCookie> get(java.net.URI);
+ method public abstract java.util.List<java.net.HttpCookie> getCookies();
+ method public abstract java.util.List<java.net.URI> getURIs();
+ method public abstract boolean remove(java.net.URI, java.net.HttpCookie);
+ method public abstract boolean removeAll();
+ }
+
+ public final class DatagramPacket {
+ ctor public DatagramPacket(byte[], int, int);
+ ctor public DatagramPacket(byte[], int);
+ ctor public DatagramPacket(byte[], int, int, java.net.InetAddress, int);
+ ctor public DatagramPacket(byte[], int, int, java.net.SocketAddress) throws java.net.SocketException;
+ ctor public DatagramPacket(byte[], int, java.net.InetAddress, int);
+ ctor public DatagramPacket(byte[], int, java.net.SocketAddress) throws java.net.SocketException;
+ method public synchronized java.net.InetAddress getAddress();
+ method public synchronized byte[] getData();
+ method public synchronized int getLength();
+ method public synchronized int getOffset();
+ method public synchronized int getPort();
+ method public synchronized java.net.SocketAddress getSocketAddress();
+ method public synchronized void setAddress(java.net.InetAddress);
+ method public synchronized void setData(byte[], int, int);
+ method public synchronized void setData(byte[]);
+ method public synchronized void setLength(int);
+ method public synchronized void setPort(int);
+ method public synchronized void setSocketAddress(java.net.SocketAddress);
+ }
+
+ public class DatagramSocket implements java.io.Closeable {
+ ctor public DatagramSocket() throws java.net.SocketException;
+ ctor protected DatagramSocket(java.net.DatagramSocketImpl);
+ ctor public DatagramSocket(java.net.SocketAddress) throws java.net.SocketException;
+ ctor public DatagramSocket(int) throws java.net.SocketException;
+ ctor public DatagramSocket(int, java.net.InetAddress) throws java.net.SocketException;
+ method public synchronized void bind(java.net.SocketAddress) throws java.net.SocketException;
+ method public void close();
+ method public void connect(java.net.InetAddress, int);
+ method public void connect(java.net.SocketAddress) throws java.net.SocketException;
+ method public void disconnect();
+ method public synchronized boolean getBroadcast() throws java.net.SocketException;
+ method public java.nio.channels.DatagramChannel getChannel();
+ method public final java.io.FileDescriptor getFileDescriptor$();
+ method public java.net.InetAddress getInetAddress();
+ method public java.net.InetAddress getLocalAddress();
+ method public int getLocalPort();
+ method public java.net.SocketAddress getLocalSocketAddress();
+ method public int getPort();
+ method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
+ method public java.net.SocketAddress getRemoteSocketAddress();
+ method public synchronized boolean getReuseAddress() throws java.net.SocketException;
+ method public synchronized int getSendBufferSize() throws java.net.SocketException;
+ method public synchronized int getSoTimeout() throws java.net.SocketException;
+ method public synchronized int getTrafficClass() throws java.net.SocketException;
+ method public boolean isBound();
+ method public boolean isClosed();
+ method public boolean isConnected();
+ method public synchronized void receive(java.net.DatagramPacket) throws java.io.IOException;
+ method public void send(java.net.DatagramPacket) throws java.io.IOException;
+ method public synchronized void setBroadcast(boolean) throws java.net.SocketException;
+ method public static synchronized void setDatagramSocketImplFactory(java.net.DatagramSocketImplFactory) throws java.io.IOException;
+ method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
+ method public synchronized void setReuseAddress(boolean) throws java.net.SocketException;
+ method public synchronized void setSendBufferSize(int) throws java.net.SocketException;
+ method public synchronized void setSoTimeout(int) throws java.net.SocketException;
+ method public synchronized void setTrafficClass(int) throws java.net.SocketException;
+ }
+
+ public abstract class DatagramSocketImpl implements java.net.SocketOptions {
+ ctor public DatagramSocketImpl();
+ method protected abstract void bind(int, java.net.InetAddress) throws java.net.SocketException;
+ method protected abstract void close();
+ method protected void connect(java.net.InetAddress, int) throws java.net.SocketException;
+ method protected abstract void create() throws java.net.SocketException;
+ method protected void disconnect();
+ method protected java.io.FileDescriptor getFileDescriptor();
+ method protected int getLocalPort();
+ method protected abstract deprecated byte getTTL() throws java.io.IOException;
+ method protected abstract int getTimeToLive() throws java.io.IOException;
+ method protected abstract void join(java.net.InetAddress) throws java.io.IOException;
+ method protected abstract void joinGroup(java.net.SocketAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method protected abstract void leave(java.net.InetAddress) throws java.io.IOException;
+ method protected abstract void leaveGroup(java.net.SocketAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method protected abstract int peek(java.net.InetAddress) throws java.io.IOException;
+ method protected abstract int peekData(java.net.DatagramPacket) throws java.io.IOException;
+ method protected abstract void receive(java.net.DatagramPacket) throws java.io.IOException;
+ method protected abstract void send(java.net.DatagramPacket) throws java.io.IOException;
+ method protected abstract deprecated void setTTL(byte) throws java.io.IOException;
+ method protected abstract void setTimeToLive(int) throws java.io.IOException;
+ field protected java.io.FileDescriptor fd;
+ field protected int localPort;
+ }
+
+ public abstract interface DatagramSocketImplFactory {
+ method public abstract java.net.DatagramSocketImpl createDatagramSocketImpl();
+ }
+
+ public abstract interface FileNameMap {
+ method public abstract java.lang.String getContentTypeFor(java.lang.String);
+ }
+
+ public final class HttpCookie implements java.lang.Cloneable {
+ ctor public HttpCookie(java.lang.String, java.lang.String);
+ method public java.lang.Object clone();
+ method public static boolean domainMatches(java.lang.String, java.lang.String);
+ method public java.lang.String getComment();
+ method public java.lang.String getCommentURL();
+ method public boolean getDiscard();
+ method public java.lang.String getDomain();
+ method public long getMaxAge();
+ method public java.lang.String getName();
+ method public java.lang.String getPath();
+ method public java.lang.String getPortlist();
+ method public boolean getSecure();
+ method public java.lang.String getValue();
+ method public int getVersion();
+ method public boolean hasExpired();
+ method public boolean isHttpOnly();
+ method public static java.util.List<java.net.HttpCookie> parse(java.lang.String);
+ method public static java.util.List<java.net.HttpCookie> parse(java.lang.String, boolean);
+ method public void setComment(java.lang.String);
+ method public void setCommentURL(java.lang.String);
+ method public void setDiscard(boolean);
+ method public void setDomain(java.lang.String);
+ method public void setHttpOnly(boolean);
+ method public void setMaxAge(long);
+ method public void setPath(java.lang.String);
+ method public void setPortlist(java.lang.String);
+ method public void setSecure(boolean);
+ method public void setValue(java.lang.String);
+ method public void setVersion(int);
+ }
+
+ public class HttpRetryException extends java.io.IOException {
+ ctor public HttpRetryException(java.lang.String, int);
+ ctor public HttpRetryException(java.lang.String, int, java.lang.String);
+ method public java.lang.String getLocation();
+ method public java.lang.String getReason();
+ method public int responseCode();
+ }
+
+ public abstract class HttpURLConnection extends java.net.URLConnection {
+ ctor protected HttpURLConnection(java.net.URL);
+ method public abstract void disconnect();
+ method public java.io.InputStream getErrorStream();
+ method public static boolean getFollowRedirects();
+ method public boolean getInstanceFollowRedirects();
+ method public java.lang.String getRequestMethod();
+ method public int getResponseCode() throws java.io.IOException;
+ method public java.lang.String getResponseMessage() throws java.io.IOException;
+ method public void setChunkedStreamingMode(int);
+ method public void setFixedLengthStreamingMode(int);
+ method public void setFixedLengthStreamingMode(long);
+ method public static void setFollowRedirects(boolean);
+ method public void setInstanceFollowRedirects(boolean);
+ method public void setRequestMethod(java.lang.String) throws java.net.ProtocolException;
+ method public abstract boolean usingProxy();
+ field public static final int HTTP_ACCEPTED = 202; // 0xca
+ field public static final int HTTP_BAD_GATEWAY = 502; // 0x1f6
+ field public static final int HTTP_BAD_METHOD = 405; // 0x195
+ field public static final int HTTP_BAD_REQUEST = 400; // 0x190
+ field public static final int HTTP_CLIENT_TIMEOUT = 408; // 0x198
+ field public static final int HTTP_CONFLICT = 409; // 0x199
+ field public static final int HTTP_CREATED = 201; // 0xc9
+ field public static final int HTTP_ENTITY_TOO_LARGE = 413; // 0x19d
+ field public static final int HTTP_FORBIDDEN = 403; // 0x193
+ field public static final int HTTP_GATEWAY_TIMEOUT = 504; // 0x1f8
+ field public static final int HTTP_GONE = 410; // 0x19a
+ field public static final int HTTP_INTERNAL_ERROR = 500; // 0x1f4
+ field public static final int HTTP_LENGTH_REQUIRED = 411; // 0x19b
+ field public static final int HTTP_MOVED_PERM = 301; // 0x12d
+ field public static final int HTTP_MOVED_TEMP = 302; // 0x12e
+ field public static final int HTTP_MULT_CHOICE = 300; // 0x12c
+ field public static final int HTTP_NOT_ACCEPTABLE = 406; // 0x196
+ field public static final int HTTP_NOT_AUTHORITATIVE = 203; // 0xcb
+ field public static final int HTTP_NOT_FOUND = 404; // 0x194
+ field public static final int HTTP_NOT_IMPLEMENTED = 501; // 0x1f5
+ field public static final int HTTP_NOT_MODIFIED = 304; // 0x130
+ field public static final int HTTP_NO_CONTENT = 204; // 0xcc
+ field public static final int HTTP_OK = 200; // 0xc8
+ field public static final int HTTP_PARTIAL = 206; // 0xce
+ field public static final int HTTP_PAYMENT_REQUIRED = 402; // 0x192
+ field public static final int HTTP_PRECON_FAILED = 412; // 0x19c
+ field public static final int HTTP_PROXY_AUTH = 407; // 0x197
+ field public static final int HTTP_REQ_TOO_LONG = 414; // 0x19e
+ field public static final int HTTP_RESET = 205; // 0xcd
+ field public static final int HTTP_SEE_OTHER = 303; // 0x12f
+ field public static final deprecated int HTTP_SERVER_ERROR = 500; // 0x1f4
+ field public static final int HTTP_UNAUTHORIZED = 401; // 0x191
+ field public static final int HTTP_UNAVAILABLE = 503; // 0x1f7
+ field public static final int HTTP_UNSUPPORTED_TYPE = 415; // 0x19f
+ field public static final int HTTP_USE_PROXY = 305; // 0x131
+ field public static final int HTTP_VERSION = 505; // 0x1f9
+ field protected int chunkLength;
+ field protected int fixedContentLength;
+ field protected long fixedContentLengthLong;
+ field protected boolean instanceFollowRedirects;
+ field protected java.lang.String method;
+ field protected int responseCode;
+ field protected java.lang.String responseMessage;
+ }
+
+ public final class IDN {
+ method public static java.lang.String toASCII(java.lang.String, int);
+ method public static java.lang.String toASCII(java.lang.String);
+ method public static java.lang.String toUnicode(java.lang.String, int);
+ method public static java.lang.String toUnicode(java.lang.String);
+ field public static final int ALLOW_UNASSIGNED = 1; // 0x1
+ field public static final int USE_STD3_ASCII_RULES = 2; // 0x2
+ }
+
+ public final class Inet4Address extends java.net.InetAddress {
+ field public static final java.net.InetAddress ALL;
+ field public static final java.net.InetAddress ANY;
+ field public static final java.net.InetAddress LOOPBACK;
+ }
+
+ public final class Inet6Address extends java.net.InetAddress {
+ method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], java.net.NetworkInterface) throws java.net.UnknownHostException;
+ method public static java.net.Inet6Address getByAddress(java.lang.String, byte[], int) throws java.net.UnknownHostException;
+ method public int getScopeId();
+ method public java.net.NetworkInterface getScopedInterface();
+ method public boolean isIPv4CompatibleAddress();
+ field public static final java.net.InetAddress ANY;
+ field public static final java.net.InetAddress LOOPBACK;
+ }
+
+ public class InetAddress implements java.io.Serializable {
+ method public byte[] getAddress();
+ method public byte[] getAddressInternal();
+ method public static java.net.InetAddress[] getAllByName(java.lang.String) throws java.net.UnknownHostException;
+ method public static java.net.InetAddress getByAddress(java.lang.String, byte[]) throws java.net.UnknownHostException;
+ method public static java.net.InetAddress getByAddress(byte[]) throws java.net.UnknownHostException;
+ method public static java.net.InetAddress getByName(java.lang.String) throws java.net.UnknownHostException;
+ method public java.lang.String getCanonicalHostName();
+ method public java.lang.String getHostAddress();
+ method public java.lang.String getHostName();
+ method public static java.net.InetAddress getLocalHost() throws java.net.UnknownHostException;
+ method public static java.net.InetAddress getLoopbackAddress();
+ method public boolean isAnyLocalAddress();
+ method public boolean isLinkLocalAddress();
+ method public boolean isLoopbackAddress();
+ method public boolean isMCGlobal();
+ method public boolean isMCLinkLocal();
+ method public boolean isMCNodeLocal();
+ method public boolean isMCOrgLocal();
+ method public boolean isMCSiteLocal();
+ method public boolean isMulticastAddress();
+ method public boolean isReachable(int) throws java.io.IOException;
+ method public boolean isReachable(java.net.NetworkInterface, int, int) throws java.io.IOException;
+ method public boolean isSiteLocalAddress();
+ }
+
+ public class InetSocketAddress extends java.net.SocketAddress {
+ ctor public InetSocketAddress(int);
+ ctor public InetSocketAddress(java.net.InetAddress, int);
+ ctor public InetSocketAddress(java.lang.String, int);
+ method public static java.net.InetSocketAddress createUnresolved(java.lang.String, int);
+ method public final boolean equals(java.lang.Object);
+ method public final java.net.InetAddress getAddress();
+ method public final java.lang.String getHostName();
+ method public final java.lang.String getHostString();
+ method public final int getPort();
+ method public final int hashCode();
+ method public final boolean isUnresolved();
+ }
+
+ public class InterfaceAddress {
+ method public java.net.InetAddress getAddress();
+ method public java.net.InetAddress getBroadcast();
+ method public short getNetworkPrefixLength();
+ }
+
+ public abstract class JarURLConnection extends java.net.URLConnection {
+ ctor protected JarURLConnection(java.net.URL) throws java.net.MalformedURLException;
+ method public java.util.jar.Attributes getAttributes() throws java.io.IOException;
+ method public java.security.cert.Certificate[] getCertificates() throws java.io.IOException;
+ method public java.lang.String getEntryName();
+ method public java.util.jar.JarEntry getJarEntry() throws java.io.IOException;
+ method public abstract java.util.jar.JarFile getJarFile() throws java.io.IOException;
+ method public java.net.URL getJarFileURL();
+ method public java.util.jar.Attributes getMainAttributes() throws java.io.IOException;
+ method public java.util.jar.Manifest getManifest() throws java.io.IOException;
+ field protected java.net.URLConnection jarFileURLConnection;
+ }
+
+ public class MalformedURLException extends java.io.IOException {
+ ctor public MalformedURLException();
+ ctor public MalformedURLException(java.lang.String);
+ }
+
+ public class MulticastSocket extends java.net.DatagramSocket {
+ ctor public MulticastSocket() throws java.io.IOException;
+ ctor public MulticastSocket(int) throws java.io.IOException;
+ ctor public MulticastSocket(java.net.SocketAddress) throws java.io.IOException;
+ method public java.net.InetAddress getInterface() throws java.net.SocketException;
+ method public boolean getLoopbackMode() throws java.net.SocketException;
+ method public java.net.NetworkInterface getNetworkInterface() throws java.net.SocketException;
+ method public deprecated byte getTTL() throws java.io.IOException;
+ method public int getTimeToLive() throws java.io.IOException;
+ method public void joinGroup(java.net.InetAddress) throws java.io.IOException;
+ method public void joinGroup(java.net.SocketAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method public void leaveGroup(java.net.InetAddress) throws java.io.IOException;
+ method public void leaveGroup(java.net.SocketAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method public deprecated void send(java.net.DatagramPacket, byte) throws java.io.IOException;
+ method public void setInterface(java.net.InetAddress) throws java.net.SocketException;
+ method public void setLoopbackMode(boolean) throws java.net.SocketException;
+ method public void setNetworkInterface(java.net.NetworkInterface) throws java.net.SocketException;
+ method public deprecated void setTTL(byte) throws java.io.IOException;
+ method public void setTimeToLive(int) throws java.io.IOException;
+ }
+
+ public final class NetPermission extends java.security.BasicPermission {
+ ctor public NetPermission(java.lang.String);
+ ctor public NetPermission(java.lang.String, java.lang.String);
+ }
+
+ public final class NetworkInterface {
+ method public static java.net.NetworkInterface getByIndex(int) throws java.net.SocketException;
+ method public static java.net.NetworkInterface getByInetAddress(java.net.InetAddress) throws java.net.SocketException;
+ method public static java.net.NetworkInterface getByName(java.lang.String) throws java.net.SocketException;
+ method public java.lang.String getDisplayName();
+ method public byte[] getHardwareAddress() throws java.net.SocketException;
+ method public int getIndex();
+ method public java.util.Enumeration<java.net.InetAddress> getInetAddresses();
+ method public java.util.List<java.net.InterfaceAddress> getInterfaceAddresses();
+ method public int getMTU() throws java.net.SocketException;
+ method public java.lang.String getName();
+ method public static java.util.Enumeration<java.net.NetworkInterface> getNetworkInterfaces() throws java.net.SocketException;
+ method public java.net.NetworkInterface getParent();
+ method public java.util.Enumeration<java.net.NetworkInterface> getSubInterfaces();
+ method public boolean isLoopback() throws java.net.SocketException;
+ method public boolean isPointToPoint() throws java.net.SocketException;
+ method public boolean isUp() throws java.net.SocketException;
+ method public boolean isVirtual();
+ method public boolean supportsMulticast() throws java.net.SocketException;
+ }
+
+ public class NoRouteToHostException extends java.net.SocketException {
+ ctor public NoRouteToHostException(java.lang.String);
+ ctor public NoRouteToHostException();
+ }
+
+ public final class PasswordAuthentication {
+ ctor public PasswordAuthentication(java.lang.String, char[]);
+ method public char[] getPassword();
+ method public java.lang.String getUserName();
+ }
+
+ public class PortUnreachableException extends java.net.SocketException {
+ ctor public PortUnreachableException(java.lang.String);
+ ctor public PortUnreachableException();
+ ctor public PortUnreachableException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class ProtocolException extends java.io.IOException {
+ ctor public ProtocolException(java.lang.String);
+ ctor public ProtocolException();
+ ctor public ProtocolException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract interface ProtocolFamily {
+ method public abstract java.lang.String name();
+ }
+
+ public class Proxy {
+ ctor public Proxy(java.net.Proxy.Type, java.net.SocketAddress);
+ method public java.net.SocketAddress address();
+ method public final boolean equals(java.lang.Object);
+ method public final int hashCode();
+ method public java.net.Proxy.Type type();
+ field public static final java.net.Proxy NO_PROXY;
+ }
+
+ public static final class Proxy.Type extends java.lang.Enum {
+ method public static java.net.Proxy.Type valueOf(java.lang.String);
+ method public static final java.net.Proxy.Type[] values();
+ enum_constant public static final java.net.Proxy.Type DIRECT;
+ enum_constant public static final java.net.Proxy.Type HTTP;
+ enum_constant public static final java.net.Proxy.Type SOCKS;
+ }
+
+ public abstract class ProxySelector {
+ ctor public ProxySelector();
+ method public abstract void connectFailed(java.net.URI, java.net.SocketAddress, java.io.IOException);
+ method public static java.net.ProxySelector getDefault();
+ method public abstract java.util.List<java.net.Proxy> select(java.net.URI);
+ method public static void setDefault(java.net.ProxySelector);
+ }
+
+ public abstract class ResponseCache {
+ ctor public ResponseCache();
+ method public abstract java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public static synchronized java.net.ResponseCache getDefault();
+ method public abstract java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
+ method public static synchronized void setDefault(java.net.ResponseCache);
+ }
+
+ public abstract class SecureCacheResponse extends java.net.CacheResponse {
+ ctor public SecureCacheResponse();
+ method public abstract java.lang.String getCipherSuite();
+ method public abstract java.util.List<java.security.cert.Certificate> getLocalCertificateChain();
+ method public abstract java.security.Principal getLocalPrincipal();
+ method public abstract java.security.Principal getPeerPrincipal() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public abstract java.util.List<java.security.cert.Certificate> getServerCertificateChain() throws javax.net.ssl.SSLPeerUnverifiedException;
+ }
+
+ public class ServerSocket implements java.io.Closeable {
+ ctor public ServerSocket() throws java.io.IOException;
+ ctor public ServerSocket(int) throws java.io.IOException;
+ ctor public ServerSocket(int, int) throws java.io.IOException;
+ ctor public ServerSocket(int, int, java.net.InetAddress) throws java.io.IOException;
+ method public java.net.Socket accept() throws java.io.IOException;
+ method public void bind(java.net.SocketAddress) throws java.io.IOException;
+ method public void bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public java.nio.channels.ServerSocketChannel getChannel();
+ method public java.net.InetAddress getInetAddress();
+ method public int getLocalPort();
+ method public java.net.SocketAddress getLocalSocketAddress();
+ method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
+ method public boolean getReuseAddress() throws java.net.SocketException;
+ method public synchronized int getSoTimeout() throws java.io.IOException;
+ method protected final void implAccept(java.net.Socket) throws java.io.IOException;
+ method public boolean isBound();
+ method public boolean isClosed();
+ method public void setPerformancePreferences(int, int, int);
+ method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
+ method public void setReuseAddress(boolean) throws java.net.SocketException;
+ method public synchronized void setSoTimeout(int) throws java.net.SocketException;
+ method public static synchronized void setSocketFactory(java.net.SocketImplFactory) throws java.io.IOException;
+ }
+
+ public class Socket implements java.io.Closeable {
+ ctor public Socket();
+ ctor public Socket(java.net.Proxy);
+ ctor protected Socket(java.net.SocketImpl) throws java.net.SocketException;
+ ctor public Socket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
+ ctor public Socket(java.net.InetAddress, int) throws java.io.IOException;
+ ctor public Socket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException;
+ ctor public Socket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
+ ctor public deprecated Socket(java.lang.String, int, boolean) throws java.io.IOException;
+ ctor public deprecated Socket(java.net.InetAddress, int, boolean) throws java.io.IOException;
+ method public void bind(java.net.SocketAddress) throws java.io.IOException;
+ method public synchronized void close() throws java.io.IOException;
+ method public void connect(java.net.SocketAddress) throws java.io.IOException;
+ method public void connect(java.net.SocketAddress, int) throws java.io.IOException;
+ method public java.nio.channels.SocketChannel getChannel();
+ method public java.net.InetAddress getInetAddress();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public boolean getKeepAlive() throws java.net.SocketException;
+ method public java.net.InetAddress getLocalAddress();
+ method public int getLocalPort();
+ method public java.net.SocketAddress getLocalSocketAddress();
+ method public boolean getOOBInline() throws java.net.SocketException;
+ method public java.io.OutputStream getOutputStream() throws java.io.IOException;
+ method public int getPort();
+ method public synchronized int getReceiveBufferSize() throws java.net.SocketException;
+ method public java.net.SocketAddress getRemoteSocketAddress();
+ method public boolean getReuseAddress() throws java.net.SocketException;
+ method public synchronized int getSendBufferSize() throws java.net.SocketException;
+ method public int getSoLinger() throws java.net.SocketException;
+ method public synchronized int getSoTimeout() throws java.net.SocketException;
+ method public boolean getTcpNoDelay() throws java.net.SocketException;
+ method public int getTrafficClass() throws java.net.SocketException;
+ method public boolean isBound();
+ method public boolean isClosed();
+ method public boolean isConnected();
+ method public boolean isInputShutdown();
+ method public boolean isOutputShutdown();
+ method public void sendUrgentData(int) throws java.io.IOException;
+ method public void setKeepAlive(boolean) throws java.net.SocketException;
+ method public void setOOBInline(boolean) throws java.net.SocketException;
+ method public void setPerformancePreferences(int, int, int);
+ method public synchronized void setReceiveBufferSize(int) throws java.net.SocketException;
+ method public void setReuseAddress(boolean) throws java.net.SocketException;
+ method public synchronized void setSendBufferSize(int) throws java.net.SocketException;
+ method public void setSoLinger(boolean, int) throws java.net.SocketException;
+ method public synchronized void setSoTimeout(int) throws java.net.SocketException;
+ method public static synchronized void setSocketImplFactory(java.net.SocketImplFactory) throws java.io.IOException;
+ method public void setTcpNoDelay(boolean) throws java.net.SocketException;
+ method public void setTrafficClass(int) throws java.net.SocketException;
+ method public void shutdownInput() throws java.io.IOException;
+ method public void shutdownOutput() throws java.io.IOException;
+ }
+
+ public abstract class SocketAddress implements java.io.Serializable {
+ ctor public SocketAddress();
+ }
+
+ public class SocketException extends java.io.IOException {
+ ctor public SocketException(java.lang.String);
+ ctor public SocketException();
+ ctor public SocketException(java.lang.Throwable);
+ ctor public SocketException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract class SocketImpl implements java.net.SocketOptions {
+ ctor public SocketImpl();
+ method protected abstract void accept(java.net.SocketImpl) throws java.io.IOException;
+ method protected abstract int available() throws java.io.IOException;
+ method protected abstract void bind(java.net.InetAddress, int) throws java.io.IOException;
+ method protected abstract void close() throws java.io.IOException;
+ method protected abstract void connect(java.lang.String, int) throws java.io.IOException;
+ method protected abstract void connect(java.net.InetAddress, int) throws java.io.IOException;
+ method protected abstract void connect(java.net.SocketAddress, int) throws java.io.IOException;
+ method protected abstract void create(boolean) throws java.io.IOException;
+ method public java.io.FileDescriptor getFileDescriptor();
+ method protected java.net.InetAddress getInetAddress();
+ method protected abstract java.io.InputStream getInputStream() throws java.io.IOException;
+ method protected int getLocalPort();
+ method protected abstract java.io.OutputStream getOutputStream() throws java.io.IOException;
+ method protected int getPort();
+ method protected abstract void listen(int) throws java.io.IOException;
+ method protected abstract void sendUrgentData(int) throws java.io.IOException;
+ method protected void setPerformancePreferences(int, int, int);
+ method protected void shutdownInput() throws java.io.IOException;
+ method protected void shutdownOutput() throws java.io.IOException;
+ method protected boolean supportsUrgentData();
+ field protected java.net.InetAddress address;
+ field protected java.io.FileDescriptor fd;
+ field protected int localport;
+ field protected int port;
+ }
+
+ public abstract interface SocketImplFactory {
+ method public abstract java.net.SocketImpl createSocketImpl();
+ }
+
+ public abstract interface SocketOption {
+ method public abstract java.lang.String name();
+ method public abstract java.lang.Class<T> type();
+ }
+
+ public abstract interface SocketOptions {
+ method public abstract java.lang.Object getOption(int) throws java.net.SocketException;
+ method public abstract void setOption(int, java.lang.Object) throws java.net.SocketException;
+ field public static final int IP_MULTICAST_IF = 16; // 0x10
+ field public static final int IP_MULTICAST_IF2 = 31; // 0x1f
+ field public static final int IP_MULTICAST_LOOP = 18; // 0x12
+ field public static final int IP_TOS = 3; // 0x3
+ field public static final int SO_BINDADDR = 15; // 0xf
+ field public static final int SO_BROADCAST = 32; // 0x20
+ field public static final int SO_KEEPALIVE = 8; // 0x8
+ field public static final int SO_LINGER = 128; // 0x80
+ field public static final int SO_OOBINLINE = 4099; // 0x1003
+ field public static final int SO_RCVBUF = 4098; // 0x1002
+ field public static final int SO_REUSEADDR = 4; // 0x4
+ field public static final int SO_SNDBUF = 4097; // 0x1001
+ field public static final int SO_TIMEOUT = 4102; // 0x1006
+ field public static final int TCP_NODELAY = 1; // 0x1
+ }
+
+ public final class SocketPermission extends java.security.Permission implements java.io.Serializable {
+ ctor public SocketPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
+ method public java.lang.String getActions();
+ method public int hashCode();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public class SocketTimeoutException extends java.io.InterruptedIOException {
+ ctor public SocketTimeoutException(java.lang.String);
+ ctor public SocketTimeoutException();
+ ctor public SocketTimeoutException(java.lang.Throwable);
+ ctor public SocketTimeoutException(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class StandardProtocolFamily extends java.lang.Enum implements java.net.ProtocolFamily {
+ method public static java.net.StandardProtocolFamily valueOf(java.lang.String);
+ method public static final java.net.StandardProtocolFamily[] values();
+ enum_constant public static final java.net.StandardProtocolFamily INET;
+ enum_constant public static final java.net.StandardProtocolFamily INET6;
+ }
+
+ public final class StandardSocketOptions {
+ field public static final java.net.SocketOption<java.net.NetworkInterface> IP_MULTICAST_IF;
+ field public static final java.net.SocketOption<java.lang.Boolean> IP_MULTICAST_LOOP;
+ field public static final java.net.SocketOption<java.lang.Integer> IP_MULTICAST_TTL;
+ field public static final java.net.SocketOption<java.lang.Integer> IP_TOS;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_BROADCAST;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_KEEPALIVE;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_LINGER;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_RCVBUF;
+ field public static final java.net.SocketOption<java.lang.Boolean> SO_REUSEADDR;
+ field public static final java.net.SocketOption<java.lang.Integer> SO_SNDBUF;
+ field public static final java.net.SocketOption<java.lang.Boolean> TCP_NODELAY;
+ }
+
+ public final class URI implements java.lang.Comparable java.io.Serializable {
+ ctor public URI(java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ ctor public URI(java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
+ method public int compareTo(java.net.URI);
+ method public static java.net.URI create(java.lang.String);
+ method public java.lang.String getAuthority();
+ method public java.lang.String getFragment();
+ method public java.lang.String getHost();
+ method public java.lang.String getPath();
+ method public int getPort();
+ method public java.lang.String getQuery();
+ method public java.lang.String getRawAuthority();
+ method public java.lang.String getRawFragment();
+ method public java.lang.String getRawPath();
+ method public java.lang.String getRawQuery();
+ method public java.lang.String getRawSchemeSpecificPart();
+ method public java.lang.String getRawUserInfo();
+ method public java.lang.String getScheme();
+ method public java.lang.String getSchemeSpecificPart();
+ method public java.lang.String getUserInfo();
+ method public boolean isAbsolute();
+ method public boolean isOpaque();
+ method public java.net.URI normalize();
+ method public java.net.URI parseServerAuthority() throws java.net.URISyntaxException;
+ method public java.net.URI relativize(java.net.URI);
+ method public java.net.URI resolve(java.net.URI);
+ method public java.net.URI resolve(java.lang.String);
+ method public java.lang.String toASCIIString();
+ method public java.net.URL toURL() throws java.net.MalformedURLException;
+ }
+
+ public class URISyntaxException extends java.lang.Exception {
+ ctor public URISyntaxException(java.lang.String, java.lang.String, int);
+ ctor public URISyntaxException(java.lang.String, java.lang.String);
+ method public int getIndex();
+ method public java.lang.String getInput();
+ method public java.lang.String getReason();
+ }
+
+ public final class URL implements java.io.Serializable {
+ ctor public URL(java.lang.String, java.lang.String, int, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String, java.lang.String, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String, java.lang.String, int, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
+ ctor public URL(java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.net.URL, java.lang.String) throws java.net.MalformedURLException;
+ ctor public URL(java.net.URL, java.lang.String, java.net.URLStreamHandler) throws java.net.MalformedURLException;
+ method public java.lang.String getAuthority();
+ method public final java.lang.Object getContent() throws java.io.IOException;
+ method public final java.lang.Object getContent(java.lang.Class[]) throws java.io.IOException;
+ method public int getDefaultPort();
+ method public java.lang.String getFile();
+ method public java.lang.String getHost();
+ method public java.lang.String getPath();
+ method public int getPort();
+ method public java.lang.String getProtocol();
+ method public java.lang.String getQuery();
+ method public java.lang.String getRef();
+ method public java.lang.String getUserInfo();
+ method public java.net.URLConnection openConnection() throws java.io.IOException;
+ method public java.net.URLConnection openConnection(java.net.Proxy) throws java.io.IOException;
+ method public final java.io.InputStream openStream() throws java.io.IOException;
+ method public boolean sameFile(java.net.URL);
+ method protected void set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
+ method protected void set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public static void setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory);
+ method public java.lang.String toExternalForm();
+ method public java.net.URI toURI() throws java.net.URISyntaxException;
+ method public java.net.URI toURILenient() throws java.net.URISyntaxException;
+ }
+
+ public class URLClassLoader extends java.security.SecureClassLoader implements java.io.Closeable {
+ ctor public URLClassLoader(java.net.URL[], java.lang.ClassLoader);
+ ctor public URLClassLoader(java.net.URL[]);
+ ctor public URLClassLoader(java.net.URL[], java.lang.ClassLoader, java.net.URLStreamHandlerFactory);
+ method protected void addURL(java.net.URL);
+ method public void close() throws java.io.IOException;
+ method protected java.lang.Package definePackage(java.lang.String, java.util.jar.Manifest, java.net.URL) throws java.lang.IllegalArgumentException;
+ method public java.net.URL findResource(java.lang.String);
+ method public java.util.Enumeration<java.net.URL> findResources(java.lang.String) throws java.io.IOException;
+ method public java.net.URL[] getURLs();
+ method public static java.net.URLClassLoader newInstance(java.net.URL[], java.lang.ClassLoader);
+ method public static java.net.URLClassLoader newInstance(java.net.URL[]);
+ }
+
+ public abstract class URLConnection {
+ ctor protected URLConnection(java.net.URL);
+ method public void addRequestProperty(java.lang.String, java.lang.String);
+ method public abstract void connect() throws java.io.IOException;
+ method public boolean getAllowUserInteraction();
+ method public int getConnectTimeout();
+ method public java.lang.Object getContent() throws java.io.IOException;
+ method public java.lang.Object getContent(java.lang.Class[]) throws java.io.IOException;
+ method public java.lang.String getContentEncoding();
+ method public int getContentLength();
+ method public long getContentLengthLong();
+ method public java.lang.String getContentType();
+ method public long getDate();
+ method public static boolean getDefaultAllowUserInteraction();
+ method public static deprecated java.lang.String getDefaultRequestProperty(java.lang.String);
+ method public boolean getDefaultUseCaches();
+ method public boolean getDoInput();
+ method public boolean getDoOutput();
+ method public long getExpiration();
+ method public static synchronized java.net.FileNameMap getFileNameMap();
+ method public java.lang.String getHeaderField(java.lang.String);
+ method public java.lang.String getHeaderField(int);
+ method public long getHeaderFieldDate(java.lang.String, long);
+ method public int getHeaderFieldInt(java.lang.String, int);
+ method public java.lang.String getHeaderFieldKey(int);
+ method public long getHeaderFieldLong(java.lang.String, long);
+ method public java.util.Map<java.lang.String, java.util.List<java.lang.String>> getHeaderFields();
+ method public long getIfModifiedSince();
+ method public java.io.InputStream getInputStream() throws java.io.IOException;
+ method public long getLastModified();
+ method public java.io.OutputStream getOutputStream() throws java.io.IOException;
+ method public java.security.Permission getPermission() throws java.io.IOException;
+ method public int getReadTimeout();
+ method public java.util.Map<java.lang.String, java.util.List<java.lang.String>> getRequestProperties();
+ method public java.lang.String getRequestProperty(java.lang.String);
+ method public java.net.URL getURL();
+ method public boolean getUseCaches();
+ method public static java.lang.String guessContentTypeFromName(java.lang.String);
+ method public static java.lang.String guessContentTypeFromStream(java.io.InputStream) throws java.io.IOException;
+ method public void setAllowUserInteraction(boolean);
+ method public void setConnectTimeout(int);
+ method public static synchronized void setContentHandlerFactory(java.net.ContentHandlerFactory);
+ method public static void setDefaultAllowUserInteraction(boolean);
+ method public static deprecated void setDefaultRequestProperty(java.lang.String, java.lang.String);
+ method public void setDefaultUseCaches(boolean);
+ method public void setDoInput(boolean);
+ method public void setDoOutput(boolean);
+ method public static void setFileNameMap(java.net.FileNameMap);
+ method public void setIfModifiedSince(long);
+ method public void setReadTimeout(int);
+ method public void setRequestProperty(java.lang.String, java.lang.String);
+ method public void setUseCaches(boolean);
+ field protected boolean allowUserInteraction;
+ field protected boolean connected;
+ field protected boolean doInput;
+ field protected boolean doOutput;
+ field protected long ifModifiedSince;
+ field protected java.net.URL url;
+ field protected boolean useCaches;
+ }
+
+ public class URLDecoder {
+ ctor public URLDecoder();
+ method public static deprecated java.lang.String decode(java.lang.String);
+ method public static java.lang.String decode(java.lang.String, java.lang.String) throws java.io.UnsupportedEncodingException;
+ }
+
+ public class URLEncoder {
+ method public static deprecated java.lang.String encode(java.lang.String);
+ method public static java.lang.String encode(java.lang.String, java.lang.String) throws java.io.UnsupportedEncodingException;
+ }
+
+ public abstract class URLStreamHandler {
+ ctor public URLStreamHandler();
+ method protected boolean equals(java.net.URL, java.net.URL);
+ method protected int getDefaultPort();
+ method protected synchronized java.net.InetAddress getHostAddress(java.net.URL);
+ method protected int hashCode(java.net.URL);
+ method protected boolean hostsEqual(java.net.URL, java.net.URL);
+ method protected abstract java.net.URLConnection openConnection(java.net.URL) throws java.io.IOException;
+ method protected java.net.URLConnection openConnection(java.net.URL, java.net.Proxy) throws java.io.IOException;
+ method protected void parseURL(java.net.URL, java.lang.String, int, int);
+ method protected boolean sameFile(java.net.URL, java.net.URL);
+ method protected void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method protected deprecated void setURL(java.net.URL, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String);
+ method protected java.lang.String toExternalForm(java.net.URL);
+ }
+
+ public abstract interface URLStreamHandlerFactory {
+ method public abstract java.net.URLStreamHandler createURLStreamHandler(java.lang.String);
+ }
+
+ public class UnknownHostException extends java.io.IOException {
+ ctor public UnknownHostException(java.lang.String);
+ ctor public UnknownHostException();
+ }
+
+ public class UnknownServiceException extends java.io.IOException {
+ ctor public UnknownServiceException();
+ ctor public UnknownServiceException(java.lang.String);
+ }
+
+}
+
+package java.nio {
+
+ public abstract class Buffer {
+ method public abstract java.lang.Object array();
+ method public abstract int arrayOffset();
+ method public final int capacity();
+ method public final java.nio.Buffer clear();
+ method public final java.nio.Buffer flip();
+ method public abstract boolean hasArray();
+ method public final boolean hasRemaining();
+ method public abstract boolean isDirect();
+ method public abstract boolean isReadOnly();
+ method public final int limit();
+ method public final java.nio.Buffer limit(int);
+ method public final java.nio.Buffer mark();
+ method public final int position();
+ method public final java.nio.Buffer position(int);
+ method public final int remaining();
+ method public final java.nio.Buffer reset();
+ method public final java.nio.Buffer rewind();
+ }
+
+ public class BufferOverflowException extends java.lang.RuntimeException {
+ ctor public BufferOverflowException();
+ }
+
+ public class BufferUnderflowException extends java.lang.RuntimeException {
+ ctor public BufferUnderflowException();
+ }
+
+ public abstract class ByteBuffer extends java.nio.Buffer implements java.lang.Comparable {
+ method public static java.nio.ByteBuffer allocate(int);
+ method public static java.nio.ByteBuffer allocateDirect(int);
+ method public final byte[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.CharBuffer asCharBuffer();
+ method public abstract java.nio.DoubleBuffer asDoubleBuffer();
+ method public abstract java.nio.FloatBuffer asFloatBuffer();
+ method public abstract java.nio.IntBuffer asIntBuffer();
+ method public abstract java.nio.LongBuffer asLongBuffer();
+ method public abstract java.nio.ByteBuffer asReadOnlyBuffer();
+ method public abstract java.nio.ShortBuffer asShortBuffer();
+ method public abstract java.nio.ByteBuffer compact();
+ method public int compareTo(java.nio.ByteBuffer);
+ method public abstract java.nio.ByteBuffer duplicate();
+ method public abstract byte get();
+ method public abstract byte get(int);
+ method public java.nio.ByteBuffer get(byte[], int, int);
+ method public java.nio.ByteBuffer get(byte[]);
+ method public abstract char getChar();
+ method public abstract char getChar(int);
+ method public abstract double getDouble();
+ method public abstract double getDouble(int);
+ method public abstract float getFloat();
+ method public abstract float getFloat(int);
+ method public abstract int getInt();
+ method public abstract int getInt(int);
+ method public abstract long getLong();
+ method public abstract long getLong(int);
+ method public abstract short getShort();
+ method public abstract short getShort(int);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public final java.nio.ByteOrder order();
+ method public final java.nio.ByteBuffer order(java.nio.ByteOrder);
+ method public abstract java.nio.ByteBuffer put(byte);
+ method public abstract java.nio.ByteBuffer put(int, byte);
+ method public java.nio.ByteBuffer put(java.nio.ByteBuffer);
+ method public java.nio.ByteBuffer put(byte[], int, int);
+ method public final java.nio.ByteBuffer put(byte[]);
+ method public abstract java.nio.ByteBuffer putChar(char);
+ method public abstract java.nio.ByteBuffer putChar(int, char);
+ method public abstract java.nio.ByteBuffer putDouble(double);
+ method public abstract java.nio.ByteBuffer putDouble(int, double);
+ method public abstract java.nio.ByteBuffer putFloat(float);
+ method public abstract java.nio.ByteBuffer putFloat(int, float);
+ method public abstract java.nio.ByteBuffer putInt(int);
+ method public abstract java.nio.ByteBuffer putInt(int, int);
+ method public abstract java.nio.ByteBuffer putLong(long);
+ method public abstract java.nio.ByteBuffer putLong(int, long);
+ method public abstract java.nio.ByteBuffer putShort(short);
+ method public abstract java.nio.ByteBuffer putShort(int, short);
+ method public abstract java.nio.ByteBuffer slice();
+ method public static java.nio.ByteBuffer wrap(byte[], int, int);
+ method public static java.nio.ByteBuffer wrap(byte[]);
+ }
+
+ public final class ByteOrder {
+ method public static java.nio.ByteOrder nativeOrder();
+ field public static final java.nio.ByteOrder BIG_ENDIAN;
+ field public static final java.nio.ByteOrder LITTLE_ENDIAN;
+ }
+
+ public abstract class CharBuffer extends java.nio.Buffer implements java.lang.Appendable java.lang.CharSequence java.lang.Comparable java.lang.Readable {
+ method public static java.nio.CharBuffer allocate(int);
+ method public java.nio.CharBuffer append(java.lang.CharSequence);
+ method public java.nio.CharBuffer append(java.lang.CharSequence, int, int);
+ method public java.nio.CharBuffer append(char);
+ method public final char[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.CharBuffer asReadOnlyBuffer();
+ method public final char charAt(int);
+ method public abstract java.nio.CharBuffer compact();
+ method public int compareTo(java.nio.CharBuffer);
+ method public abstract java.nio.CharBuffer duplicate();
+ method public abstract char get();
+ method public abstract char get(int);
+ method public java.nio.CharBuffer get(char[], int, int);
+ method public java.nio.CharBuffer get(char[]);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public final int length();
+ method public abstract java.nio.ByteOrder order();
+ method public abstract java.nio.CharBuffer put(char);
+ method public abstract java.nio.CharBuffer put(int, char);
+ method public java.nio.CharBuffer put(java.nio.CharBuffer);
+ method public java.nio.CharBuffer put(char[], int, int);
+ method public final java.nio.CharBuffer put(char[]);
+ method public java.nio.CharBuffer put(java.lang.String, int, int);
+ method public final java.nio.CharBuffer put(java.lang.String);
+ method public int read(java.nio.CharBuffer) throws java.io.IOException;
+ method public abstract java.nio.CharBuffer slice();
+ method public abstract java.nio.CharBuffer subSequence(int, int);
+ method public static java.nio.CharBuffer wrap(char[], int, int);
+ method public static java.nio.CharBuffer wrap(char[]);
+ method public static java.nio.CharBuffer wrap(java.lang.CharSequence, int, int);
+ method public static java.nio.CharBuffer wrap(java.lang.CharSequence);
+ }
+
+ public abstract class DoubleBuffer extends java.nio.Buffer implements java.lang.Comparable {
+ method public static java.nio.DoubleBuffer allocate(int);
+ method public final double[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.DoubleBuffer asReadOnlyBuffer();
+ method public abstract java.nio.DoubleBuffer compact();
+ method public int compareTo(java.nio.DoubleBuffer);
+ method public abstract java.nio.DoubleBuffer duplicate();
+ method public abstract double get();
+ method public abstract double get(int);
+ method public java.nio.DoubleBuffer get(double[], int, int);
+ method public java.nio.DoubleBuffer get(double[]);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public abstract java.nio.ByteOrder order();
+ method public abstract java.nio.DoubleBuffer put(double);
+ method public abstract java.nio.DoubleBuffer put(int, double);
+ method public java.nio.DoubleBuffer put(java.nio.DoubleBuffer);
+ method public java.nio.DoubleBuffer put(double[], int, int);
+ method public final java.nio.DoubleBuffer put(double[]);
+ method public abstract java.nio.DoubleBuffer slice();
+ method public static java.nio.DoubleBuffer wrap(double[], int, int);
+ method public static java.nio.DoubleBuffer wrap(double[]);
+ }
+
+ public abstract class FloatBuffer extends java.nio.Buffer implements java.lang.Comparable {
+ method public static java.nio.FloatBuffer allocate(int);
+ method public final float[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.FloatBuffer asReadOnlyBuffer();
+ method public abstract java.nio.FloatBuffer compact();
+ method public int compareTo(java.nio.FloatBuffer);
+ method public abstract java.nio.FloatBuffer duplicate();
+ method public abstract float get();
+ method public abstract float get(int);
+ method public java.nio.FloatBuffer get(float[], int, int);
+ method public java.nio.FloatBuffer get(float[]);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public abstract java.nio.ByteOrder order();
+ method public abstract java.nio.FloatBuffer put(float);
+ method public abstract java.nio.FloatBuffer put(int, float);
+ method public java.nio.FloatBuffer put(java.nio.FloatBuffer);
+ method public java.nio.FloatBuffer put(float[], int, int);
+ method public final java.nio.FloatBuffer put(float[]);
+ method public abstract java.nio.FloatBuffer slice();
+ method public static java.nio.FloatBuffer wrap(float[], int, int);
+ method public static java.nio.FloatBuffer wrap(float[]);
+ }
+
+ public abstract class IntBuffer extends java.nio.Buffer implements java.lang.Comparable {
+ method public static java.nio.IntBuffer allocate(int);
+ method public final int[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.IntBuffer asReadOnlyBuffer();
+ method public abstract java.nio.IntBuffer compact();
+ method public int compareTo(java.nio.IntBuffer);
+ method public abstract java.nio.IntBuffer duplicate();
+ method public abstract int get();
+ method public abstract int get(int);
+ method public java.nio.IntBuffer get(int[], int, int);
+ method public java.nio.IntBuffer get(int[]);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public abstract java.nio.ByteOrder order();
+ method public abstract java.nio.IntBuffer put(int);
+ method public abstract java.nio.IntBuffer put(int, int);
+ method public java.nio.IntBuffer put(java.nio.IntBuffer);
+ method public java.nio.IntBuffer put(int[], int, int);
+ method public final java.nio.IntBuffer put(int[]);
+ method public abstract java.nio.IntBuffer slice();
+ method public static java.nio.IntBuffer wrap(int[], int, int);
+ method public static java.nio.IntBuffer wrap(int[]);
+ }
+
+ public class InvalidMarkException extends java.lang.IllegalStateException {
+ ctor public InvalidMarkException();
+ }
+
+ public abstract class LongBuffer extends java.nio.Buffer implements java.lang.Comparable {
+ method public static java.nio.LongBuffer allocate(int);
+ method public final long[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.LongBuffer asReadOnlyBuffer();
+ method public abstract java.nio.LongBuffer compact();
+ method public int compareTo(java.nio.LongBuffer);
+ method public abstract java.nio.LongBuffer duplicate();
+ method public abstract long get();
+ method public abstract long get(int);
+ method public java.nio.LongBuffer get(long[], int, int);
+ method public java.nio.LongBuffer get(long[]);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public abstract java.nio.ByteOrder order();
+ method public abstract java.nio.LongBuffer put(long);
+ method public abstract java.nio.LongBuffer put(int, long);
+ method public java.nio.LongBuffer put(java.nio.LongBuffer);
+ method public java.nio.LongBuffer put(long[], int, int);
+ method public final java.nio.LongBuffer put(long[]);
+ method public abstract java.nio.LongBuffer slice();
+ method public static java.nio.LongBuffer wrap(long[], int, int);
+ method public static java.nio.LongBuffer wrap(long[]);
+ }
+
+ public abstract class MappedByteBuffer extends java.nio.ByteBuffer {
+ method public final java.nio.MappedByteBuffer force();
+ method public final boolean isLoaded();
+ method public final java.nio.MappedByteBuffer load();
+ }
+
+ public class ReadOnlyBufferException extends java.lang.UnsupportedOperationException {
+ ctor public ReadOnlyBufferException();
+ }
+
+ public abstract class ShortBuffer extends java.nio.Buffer implements java.lang.Comparable {
+ method public static java.nio.ShortBuffer allocate(int);
+ method public final short[] array();
+ method public final int arrayOffset();
+ method public abstract java.nio.ShortBuffer asReadOnlyBuffer();
+ method public abstract java.nio.ShortBuffer compact();
+ method public int compareTo(java.nio.ShortBuffer);
+ method public abstract java.nio.ShortBuffer duplicate();
+ method public abstract short get();
+ method public abstract short get(int);
+ method public java.nio.ShortBuffer get(short[], int, int);
+ method public java.nio.ShortBuffer get(short[]);
+ method public final boolean hasArray();
+ method public abstract boolean isDirect();
+ method public abstract java.nio.ByteOrder order();
+ method public abstract java.nio.ShortBuffer put(short);
+ method public abstract java.nio.ShortBuffer put(int, short);
+ method public java.nio.ShortBuffer put(java.nio.ShortBuffer);
+ method public java.nio.ShortBuffer put(short[], int, int);
+ method public final java.nio.ShortBuffer put(short[]);
+ method public abstract java.nio.ShortBuffer slice();
+ method public static java.nio.ShortBuffer wrap(short[], int, int);
+ method public static java.nio.ShortBuffer wrap(short[]);
+ }
+
+}
+
+package java.nio.channels {
+
+ public class AcceptPendingException extends java.lang.IllegalStateException {
+ ctor public AcceptPendingException();
+ }
+
+ public class AlreadyBoundException extends java.lang.IllegalStateException {
+ ctor public AlreadyBoundException();
+ }
+
+ public class AlreadyConnectedException extends java.lang.IllegalStateException {
+ ctor public AlreadyConnectedException();
+ }
+
+ public abstract interface AsynchronousByteChannel implements java.nio.channels.AsynchronousChannel {
+ method public abstract void read(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer);
+ method public abstract void write(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer);
+ }
+
+ public abstract interface AsynchronousChannel implements java.nio.channels.Channel {
+ method public abstract void close() throws java.io.IOException;
+ }
+
+ public abstract class AsynchronousChannelGroup {
+ ctor protected AsynchronousChannelGroup(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract boolean awaitTermination(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract boolean isShutdown();
+ method public abstract boolean isTerminated();
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract void shutdown();
+ method public abstract void shutdownNow() throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withCachedThreadPool(java.util.concurrent.ExecutorService, int) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withFixedThreadPool(int, java.util.concurrent.ThreadFactory) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousChannelGroup withThreadPool(java.util.concurrent.ExecutorService) throws java.io.IOException;
+ }
+
+ public class AsynchronousCloseException extends java.nio.channels.ClosedChannelException {
+ ctor public AsynchronousCloseException();
+ }
+
+ public abstract class AsynchronousFileChannel implements java.nio.channels.AsynchronousChannel {
+ ctor protected AsynchronousFileChannel();
+ method public abstract void force(boolean) throws java.io.IOException;
+ method public abstract void lock(long, long, boolean, A, java.nio.channels.CompletionHandler<java.nio.channels.FileLock, ? super A>);
+ method public final void lock(A, java.nio.channels.CompletionHandler<java.nio.channels.FileLock, ? super A>);
+ method public abstract java.util.concurrent.Future<java.nio.channels.FileLock> lock(long, long, boolean);
+ method public final java.util.concurrent.Future<java.nio.channels.FileLock> lock();
+ method public static java.nio.channels.AsynchronousFileChannel open(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.util.concurrent.ExecutorService, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousFileChannel open(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract void read(java.nio.ByteBuffer, long, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer, long);
+ method public abstract long size() throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousFileChannel truncate(long) throws java.io.IOException;
+ method public abstract java.nio.channels.FileLock tryLock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
+ method public abstract void write(java.nio.ByteBuffer, long, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer, long);
+ }
+
+ public abstract class AsynchronousServerSocketChannel implements java.nio.channels.AsynchronousChannel java.nio.channels.NetworkChannel {
+ ctor protected AsynchronousServerSocketChannel(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract void accept(A, java.nio.channels.CompletionHandler<java.nio.channels.AsynchronousSocketChannel, ? super A>);
+ method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();
+ method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ }
+
+ public abstract class AsynchronousSocketChannel implements java.nio.channels.AsynchronousByteChannel java.nio.channels.NetworkChannel {
+ ctor protected AsynchronousSocketChannel(java.nio.channels.spi.AsynchronousChannelProvider);
+ method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
+ method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
+ method public abstract void read(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public final void read(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> read(java.nio.ByteBuffer);
+ method public abstract void read(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Long, ? super A>);
+ method public abstract java.nio.channels.AsynchronousSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel shutdownInput() throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel shutdownOutput() throws java.io.IOException;
+ method public abstract void write(java.nio.ByteBuffer, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public final void write(java.nio.ByteBuffer, A, java.nio.channels.CompletionHandler<java.lang.Integer, ? super A>);
+ method public abstract java.util.concurrent.Future<java.lang.Integer> write(java.nio.ByteBuffer);
+ method public abstract void write(java.nio.ByteBuffer[], int, int, long, java.util.concurrent.TimeUnit, A, java.nio.channels.CompletionHandler<java.lang.Long, ? super A>);
+ }
+
+ public abstract interface ByteChannel implements java.nio.channels.ReadableByteChannel java.nio.channels.WritableByteChannel {
+ }
+
+ public class CancelledKeyException extends java.lang.IllegalStateException {
+ ctor public CancelledKeyException();
+ }
+
+ public abstract interface Channel implements java.io.Closeable {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract boolean isOpen();
+ }
+
+ public final class Channels {
+ method public static java.nio.channels.ReadableByteChannel newChannel(java.io.InputStream);
+ method public static java.nio.channels.WritableByteChannel newChannel(java.io.OutputStream);
+ method public static java.io.InputStream newInputStream(java.nio.channels.ReadableByteChannel);
+ method public static java.io.InputStream newInputStream(java.nio.channels.AsynchronousByteChannel);
+ method public static java.io.OutputStream newOutputStream(java.nio.channels.WritableByteChannel);
+ method public static java.io.OutputStream newOutputStream(java.nio.channels.AsynchronousByteChannel);
+ method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.nio.charset.CharsetDecoder, int);
+ method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.lang.String);
+ method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, java.nio.charset.CharsetEncoder, int);
+ method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, java.lang.String);
+ }
+
+ public class ClosedByInterruptException extends java.nio.channels.AsynchronousCloseException {
+ ctor public ClosedByInterruptException();
+ }
+
+ public class ClosedChannelException extends java.io.IOException {
+ ctor public ClosedChannelException();
+ }
+
+ public class ClosedSelectorException extends java.lang.IllegalStateException {
+ ctor public ClosedSelectorException();
+ }
+
+ public abstract interface CompletionHandler {
+ method public abstract void completed(V, A);
+ method public abstract void failed(java.lang.Throwable, A);
+ }
+
+ public class ConnectionPendingException extends java.lang.IllegalStateException {
+ ctor public ConnectionPendingException();
+ }
+
+ public abstract class DatagramChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.MulticastChannel java.nio.channels.ScatteringByteChannel {
+ ctor protected DatagramChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
+ method public abstract boolean isConnected();
+ method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
+ method public static java.nio.channels.DatagramChannel open(java.net.ProtocolFamily) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract java.net.SocketAddress receive(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract int send(java.nio.ByteBuffer, java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.net.DatagramSocket socket();
+ method public final int validOps();
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ }
+
+ public abstract class FileChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.GatheringByteChannel java.nio.channels.ScatteringByteChannel java.nio.channels.SeekableByteChannel {
+ ctor protected FileChannel();
+ method public abstract void force(boolean) throws java.io.IOException;
+ method public abstract java.nio.channels.FileLock lock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock lock() throws java.io.IOException;
+ method public abstract java.nio.MappedByteBuffer map(java.nio.channels.FileChannel.MapMode, long, long) throws java.io.IOException;
+ method public static java.nio.channels.FileChannel open(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.FileChannel open(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract long position() throws java.io.IOException;
+ method public abstract java.nio.channels.FileChannel position(long) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer, long) throws java.io.IOException;
+ method public abstract long size() throws java.io.IOException;
+ method public abstract long transferFrom(java.nio.channels.ReadableByteChannel, long, long) throws java.io.IOException;
+ method public abstract long transferTo(long, long, java.nio.channels.WritableByteChannel) throws java.io.IOException;
+ method public abstract java.nio.channels.FileChannel truncate(long) throws java.io.IOException;
+ method public abstract java.nio.channels.FileLock tryLock(long, long, boolean) throws java.io.IOException;
+ method public final java.nio.channels.FileLock tryLock() throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer, long) throws java.io.IOException;
+ }
+
+ public static class FileChannel.MapMode {
+ field public static final java.nio.channels.FileChannel.MapMode PRIVATE;
+ field public static final java.nio.channels.FileChannel.MapMode READ_ONLY;
+ field public static final java.nio.channels.FileChannel.MapMode READ_WRITE;
+ }
+
+ public abstract class FileLock implements java.lang.AutoCloseable {
+ ctor protected FileLock(java.nio.channels.FileChannel, long, long, boolean);
+ ctor protected FileLock(java.nio.channels.AsynchronousFileChannel, long, long, boolean);
+ method public java.nio.channels.Channel acquiredBy();
+ method public final java.nio.channels.FileChannel channel();
+ method public final void close() throws java.io.IOException;
+ method public final boolean isShared();
+ method public abstract boolean isValid();
+ method public final boolean overlaps(long, long);
+ method public final long position();
+ method public abstract void release() throws java.io.IOException;
+ method public final long size();
+ method public final java.lang.String toString();
+ }
+
+ public class FileLockInterruptionException extends java.io.IOException {
+ ctor public FileLockInterruptionException();
+ }
+
+ public abstract interface GatheringByteChannel implements java.nio.channels.WritableByteChannel {
+ method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public abstract long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ }
+
+ public class IllegalBlockingModeException extends java.lang.IllegalStateException {
+ ctor public IllegalBlockingModeException();
+ }
+
+ public class IllegalChannelGroupException extends java.lang.IllegalArgumentException {
+ ctor public IllegalChannelGroupException();
+ }
+
+ public class IllegalSelectorException extends java.lang.IllegalArgumentException {
+ ctor public IllegalSelectorException();
+ }
+
+ public class InterruptedByTimeoutException extends java.io.IOException {
+ ctor public InterruptedByTimeoutException();
+ }
+
+ public abstract interface InterruptibleChannel implements java.nio.channels.Channel {
+ method public abstract void close() throws java.io.IOException;
+ }
+
+ public abstract class MembershipKey {
+ ctor protected MembershipKey();
+ method public abstract java.nio.channels.MembershipKey block(java.net.InetAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.MulticastChannel channel();
+ method public abstract void drop();
+ method public abstract java.net.InetAddress group();
+ method public abstract boolean isValid();
+ method public abstract java.net.NetworkInterface networkInterface();
+ method public abstract java.net.InetAddress sourceAddress();
+ method public abstract java.nio.channels.MembershipKey unblock(java.net.InetAddress);
+ }
+
+ public abstract interface MulticastChannel implements java.nio.channels.NetworkChannel {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.nio.channels.MembershipKey join(java.net.InetAddress, java.net.NetworkInterface) throws java.io.IOException;
+ method public abstract java.nio.channels.MembershipKey join(java.net.InetAddress, java.net.NetworkInterface, java.net.InetAddress) throws java.io.IOException;
+ }
+
+ public abstract interface NetworkChannel implements java.nio.channels.Channel {
+ method public abstract java.nio.channels.NetworkChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;
+ method public abstract T getOption(java.net.SocketOption<T>) throws java.io.IOException;
+ method public abstract java.nio.channels.NetworkChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.util.Set<java.net.SocketOption<?>> supportedOptions();
+ }
+
+ public class NoConnectionPendingException extends java.lang.IllegalStateException {
+ ctor public NoConnectionPendingException();
+ }
+
+ public class NonReadableChannelException extends java.lang.IllegalStateException {
+ ctor public NonReadableChannelException();
+ }
+
+ public class NonWritableChannelException extends java.lang.IllegalStateException {
+ ctor public NonWritableChannelException();
+ }
+
+ public class NotYetBoundException extends java.lang.IllegalStateException {
+ ctor public NotYetBoundException();
+ }
+
+ public class NotYetConnectedException extends java.lang.IllegalStateException {
+ ctor public NotYetConnectedException();
+ }
+
+ public class OverlappingFileLockException extends java.lang.IllegalStateException {
+ ctor public OverlappingFileLockException();
+ }
+
+ public abstract class Pipe {
+ ctor protected Pipe();
+ method public static java.nio.channels.Pipe open() throws java.io.IOException;
+ method public abstract java.nio.channels.Pipe.SinkChannel sink();
+ method public abstract java.nio.channels.Pipe.SourceChannel source();
+ }
+
+ public static abstract class Pipe.SinkChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.GatheringByteChannel java.nio.channels.WritableByteChannel {
+ ctor protected Pipe.SinkChannel(java.nio.channels.spi.SelectorProvider);
+ method public final int validOps();
+ }
+
+ public static abstract class Pipe.SourceChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ReadableByteChannel java.nio.channels.ScatteringByteChannel {
+ ctor protected Pipe.SourceChannel(java.nio.channels.spi.SelectorProvider);
+ method public final int validOps();
+ }
+
+ public class ReadPendingException extends java.lang.IllegalStateException {
+ ctor public ReadPendingException();
+ }
+
+ public abstract interface ReadableByteChannel implements java.nio.channels.Channel {
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ }
+
+ public abstract interface ScatteringByteChannel implements java.nio.channels.ReadableByteChannel {
+ method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public abstract long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ }
+
+ public abstract interface SeekableByteChannel implements java.nio.channels.ByteChannel {
+ method public abstract long position() throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel position(long) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long size() throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel truncate(long) throws java.io.IOException;
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
+ }
+
+ public abstract class SelectableChannel extends java.nio.channels.spi.AbstractInterruptibleChannel implements java.nio.channels.Channel {
+ ctor protected SelectableChannel();
+ method public abstract java.lang.Object blockingLock();
+ method public abstract java.nio.channels.SelectableChannel configureBlocking(boolean) throws java.io.IOException;
+ method public abstract boolean isBlocking();
+ method public abstract boolean isRegistered();
+ method public abstract java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
+ method public abstract java.nio.channels.spi.SelectorProvider provider();
+ method public abstract java.nio.channels.SelectionKey register(java.nio.channels.Selector, int, java.lang.Object) throws java.nio.channels.ClosedChannelException;
+ method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int) throws java.nio.channels.ClosedChannelException;
+ method public abstract int validOps();
+ }
+
+ public abstract class SelectionKey {
+ ctor protected SelectionKey();
+ method public final java.lang.Object attach(java.lang.Object);
+ method public final java.lang.Object attachment();
+ method public abstract void cancel();
+ method public abstract java.nio.channels.SelectableChannel channel();
+ method public abstract int interestOps();
+ method public abstract java.nio.channels.SelectionKey interestOps(int);
+ method public final boolean isAcceptable();
+ method public final boolean isConnectable();
+ method public final boolean isReadable();
+ method public abstract boolean isValid();
+ method public final boolean isWritable();
+ method public abstract int readyOps();
+ method public abstract java.nio.channels.Selector selector();
+ field public static final int OP_ACCEPT = 16; // 0x10
+ field public static final int OP_CONNECT = 8; // 0x8
+ field public static final int OP_READ = 1; // 0x1
+ field public static final int OP_WRITE = 4; // 0x4
+ }
+
+ public abstract class Selector implements java.io.Closeable {
+ ctor protected Selector();
+ method public abstract void close() throws java.io.IOException;
+ method public abstract boolean isOpen();
+ method public abstract java.util.Set<java.nio.channels.SelectionKey> keys();
+ method public static java.nio.channels.Selector open() throws java.io.IOException;
+ method public abstract java.nio.channels.spi.SelectorProvider provider();
+ method public abstract int select(long) throws java.io.IOException;
+ method public abstract int select() throws java.io.IOException;
+ method public abstract int selectNow() throws java.io.IOException;
+ method public abstract java.util.Set<java.nio.channels.SelectionKey> selectedKeys();
+ method public abstract java.nio.channels.Selector wakeup();
+ }
+
+ public abstract class ServerSocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.NetworkChannel {
+ ctor protected ServerSocketChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;
+ method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;
+ method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.net.ServerSocket socket();
+ method public final int validOps();
+ }
+
+ public class ShutdownChannelGroupException extends java.lang.IllegalStateException {
+ ctor public ShutdownChannelGroupException();
+ }
+
+ public abstract class SocketChannel extends java.nio.channels.spi.AbstractSelectableChannel implements java.nio.channels.ByteChannel java.nio.channels.GatheringByteChannel java.nio.channels.NetworkChannel java.nio.channels.ScatteringByteChannel {
+ ctor protected SocketChannel(java.nio.channels.spi.SelectorProvider);
+ method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract boolean finishConnect() throws java.io.IOException;
+ method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;
+ method public abstract boolean isConnected();
+ method public abstract boolean isConnectionPending();
+ method public static java.nio.channels.SocketChannel open() throws java.io.IOException;
+ method public static java.nio.channels.SocketChannel open(java.net.SocketAddress) throws java.io.IOException;
+ method public abstract int read(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long read(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long read(java.nio.ByteBuffer[]) throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel shutdownInput() throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel shutdownOutput() throws java.io.IOException;
+ method public abstract java.net.Socket socket();
+ method public final int validOps();
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
+ method public abstract long write(java.nio.ByteBuffer[], int, int) throws java.io.IOException;
+ method public final long write(java.nio.ByteBuffer[]) throws java.io.IOException;
+ }
+
+ public class UnresolvedAddressException extends java.lang.IllegalArgumentException {
+ ctor public UnresolvedAddressException();
+ }
+
+ public class UnsupportedAddressTypeException extends java.lang.IllegalArgumentException {
+ ctor public UnsupportedAddressTypeException();
+ }
+
+ public abstract interface WritableByteChannel implements java.nio.channels.Channel {
+ method public abstract int write(java.nio.ByteBuffer) throws java.io.IOException;
+ }
+
+ public class WritePendingException extends java.lang.IllegalStateException {
+ ctor public WritePendingException();
+ }
+
+}
+
+package java.nio.channels.spi {
+
+ public abstract class AbstractInterruptibleChannel implements java.nio.channels.Channel java.nio.channels.InterruptibleChannel {
+ ctor protected AbstractInterruptibleChannel();
+ method protected final void begin();
+ method public final void close() throws java.io.IOException;
+ method protected final void end(boolean) throws java.nio.channels.AsynchronousCloseException;
+ method protected abstract void implCloseChannel() throws java.io.IOException;
+ method public final boolean isOpen();
+ }
+
+ public abstract class AbstractSelectableChannel extends java.nio.channels.SelectableChannel {
+ ctor protected AbstractSelectableChannel(java.nio.channels.spi.SelectorProvider);
+ method public final java.lang.Object blockingLock();
+ method public final java.nio.channels.SelectableChannel configureBlocking(boolean) throws java.io.IOException;
+ method protected final void implCloseChannel() throws java.io.IOException;
+ method protected abstract void implCloseSelectableChannel() throws java.io.IOException;
+ method protected abstract void implConfigureBlocking(boolean) throws java.io.IOException;
+ method public final boolean isBlocking();
+ method public final boolean isRegistered();
+ method public final java.nio.channels.SelectionKey keyFor(java.nio.channels.Selector);
+ method public final java.nio.channels.spi.SelectorProvider provider();
+ method public final java.nio.channels.SelectionKey register(java.nio.channels.Selector, int, java.lang.Object) throws java.nio.channels.ClosedChannelException;
+ }
+
+ public abstract class AbstractSelectionKey extends java.nio.channels.SelectionKey {
+ ctor protected AbstractSelectionKey();
+ method public final void cancel();
+ method public final boolean isValid();
+ }
+
+ public abstract class AbstractSelector extends java.nio.channels.Selector {
+ ctor protected AbstractSelector(java.nio.channels.spi.SelectorProvider);
+ method protected final void begin();
+ method protected final java.util.Set<java.nio.channels.SelectionKey> cancelledKeys();
+ method public final void close() throws java.io.IOException;
+ method protected final void deregister(java.nio.channels.spi.AbstractSelectionKey);
+ method protected final void end();
+ method protected abstract void implCloseSelector() throws java.io.IOException;
+ method public final boolean isOpen();
+ method public final java.nio.channels.spi.SelectorProvider provider();
+ method protected abstract java.nio.channels.SelectionKey register(java.nio.channels.spi.AbstractSelectableChannel, int, java.lang.Object);
+ }
+
+ public abstract class AsynchronousChannelProvider {
+ ctor protected AsynchronousChannelProvider();
+ method public abstract java.nio.channels.AsynchronousChannelGroup openAsynchronousChannelGroup(int, java.util.concurrent.ThreadFactory) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousChannelGroup openAsynchronousChannelGroup(java.util.concurrent.ExecutorService, int) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousServerSocketChannel openAsynchronousServerSocketChannel(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public abstract java.nio.channels.AsynchronousSocketChannel openAsynchronousSocketChannel(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;
+ method public static java.nio.channels.spi.AsynchronousChannelProvider provider();
+ }
+
+ public abstract class SelectorProvider {
+ ctor protected SelectorProvider();
+ method public java.nio.channels.Channel inheritedChannel() throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel openDatagramChannel() throws java.io.IOException;
+ method public abstract java.nio.channels.DatagramChannel openDatagramChannel(java.net.ProtocolFamily) throws java.io.IOException;
+ method public abstract java.nio.channels.Pipe openPipe() throws java.io.IOException;
+ method public abstract java.nio.channels.spi.AbstractSelector openSelector() throws java.io.IOException;
+ method public abstract java.nio.channels.ServerSocketChannel openServerSocketChannel() throws java.io.IOException;
+ method public abstract java.nio.channels.SocketChannel openSocketChannel() throws java.io.IOException;
+ method public static java.nio.channels.spi.SelectorProvider provider();
+ }
+
+}
+
+package java.nio.charset {
+
+ public class CharacterCodingException extends java.io.IOException {
+ ctor public CharacterCodingException();
+ }
+
+ public abstract class Charset implements java.lang.Comparable {
+ ctor protected Charset(java.lang.String, java.lang.String[]);
+ method public final java.util.Set<java.lang.String> aliases();
+ method public static java.util.SortedMap<java.lang.String, java.nio.charset.Charset> availableCharsets();
+ method public boolean canEncode();
+ method public final int compareTo(java.nio.charset.Charset);
+ method public abstract boolean contains(java.nio.charset.Charset);
+ method public final java.nio.CharBuffer decode(java.nio.ByteBuffer);
+ method public static java.nio.charset.Charset defaultCharset();
+ method public java.lang.String displayName();
+ method public java.lang.String displayName(java.util.Locale);
+ method public final java.nio.ByteBuffer encode(java.nio.CharBuffer);
+ method public final java.nio.ByteBuffer encode(java.lang.String);
+ method public final boolean equals(java.lang.Object);
+ method public static java.nio.charset.Charset forName(java.lang.String);
+ method public final int hashCode();
+ method public final boolean isRegistered();
+ method public static boolean isSupported(java.lang.String);
+ method public final java.lang.String name();
+ method public abstract java.nio.charset.CharsetDecoder newDecoder();
+ method public abstract java.nio.charset.CharsetEncoder newEncoder();
+ method public final java.lang.String toString();
+ }
+
+ public abstract class CharsetDecoder {
+ ctor protected CharsetDecoder(java.nio.charset.Charset, float, float);
+ method public final float averageCharsPerByte();
+ method public final java.nio.charset.Charset charset();
+ method public final java.nio.charset.CoderResult decode(java.nio.ByteBuffer, java.nio.CharBuffer, boolean);
+ method public final java.nio.CharBuffer decode(java.nio.ByteBuffer) throws java.nio.charset.CharacterCodingException;
+ method protected abstract java.nio.charset.CoderResult decodeLoop(java.nio.ByteBuffer, java.nio.CharBuffer);
+ method public java.nio.charset.Charset detectedCharset();
+ method public final java.nio.charset.CoderResult flush(java.nio.CharBuffer);
+ method protected java.nio.charset.CoderResult implFlush(java.nio.CharBuffer);
+ method protected void implOnMalformedInput(java.nio.charset.CodingErrorAction);
+ method protected void implOnUnmappableCharacter(java.nio.charset.CodingErrorAction);
+ method protected void implReplaceWith(java.lang.String);
+ method protected void implReset();
+ method public boolean isAutoDetecting();
+ method public boolean isCharsetDetected();
+ method public java.nio.charset.CodingErrorAction malformedInputAction();
+ method public final float maxCharsPerByte();
+ method public final java.nio.charset.CharsetDecoder onMalformedInput(java.nio.charset.CodingErrorAction);
+ method public final java.nio.charset.CharsetDecoder onUnmappableCharacter(java.nio.charset.CodingErrorAction);
+ method public final java.nio.charset.CharsetDecoder replaceWith(java.lang.String);
+ method public final java.lang.String replacement();
+ method public final java.nio.charset.CharsetDecoder reset();
+ method public java.nio.charset.CodingErrorAction unmappableCharacterAction();
+ }
+
+ public abstract class CharsetEncoder {
+ ctor protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[]);
+ ctor protected CharsetEncoder(java.nio.charset.Charset, float, float);
+ method public final float averageBytesPerChar();
+ method public boolean canEncode(char);
+ method public boolean canEncode(java.lang.CharSequence);
+ method public final java.nio.charset.Charset charset();
+ method public final java.nio.charset.CoderResult encode(java.nio.CharBuffer, java.nio.ByteBuffer, boolean);
+ method public final java.nio.ByteBuffer encode(java.nio.CharBuffer) throws java.nio.charset.CharacterCodingException;
+ method protected abstract java.nio.charset.CoderResult encodeLoop(java.nio.CharBuffer, java.nio.ByteBuffer);
+ method public final java.nio.charset.CoderResult flush(java.nio.ByteBuffer);
+ method protected java.nio.charset.CoderResult implFlush(java.nio.ByteBuffer);
+ method protected void implOnMalformedInput(java.nio.charset.CodingErrorAction);
+ method protected void implOnUnmappableCharacter(java.nio.charset.CodingErrorAction);
+ method protected void implReplaceWith(byte[]);
+ method protected void implReset();
+ method public boolean isLegalReplacement(byte[]);
+ method public java.nio.charset.CodingErrorAction malformedInputAction();
+ method public final float maxBytesPerChar();
+ method public final java.nio.charset.CharsetEncoder onMalformedInput(java.nio.charset.CodingErrorAction);
+ method public final java.nio.charset.CharsetEncoder onUnmappableCharacter(java.nio.charset.CodingErrorAction);
+ method public final java.nio.charset.CharsetEncoder replaceWith(byte[]);
+ method public final byte[] replacement();
+ method public final java.nio.charset.CharsetEncoder reset();
+ method public java.nio.charset.CodingErrorAction unmappableCharacterAction();
+ }
+
+ public class CoderMalfunctionError extends java.lang.Error {
+ ctor public CoderMalfunctionError(java.lang.Exception);
+ }
+
+ public class CoderResult {
+ method public boolean isError();
+ method public boolean isMalformed();
+ method public boolean isOverflow();
+ method public boolean isUnderflow();
+ method public boolean isUnmappable();
+ method public int length();
+ method public static java.nio.charset.CoderResult malformedForLength(int);
+ method public void throwException() throws java.nio.charset.CharacterCodingException;
+ method public static java.nio.charset.CoderResult unmappableForLength(int);
+ field public static final java.nio.charset.CoderResult OVERFLOW;
+ field public static final java.nio.charset.CoderResult UNDERFLOW;
+ }
+
+ public class CodingErrorAction {
+ field public static final java.nio.charset.CodingErrorAction IGNORE;
+ field public static final java.nio.charset.CodingErrorAction REPLACE;
+ field public static final java.nio.charset.CodingErrorAction REPORT;
+ }
+
+ public class IllegalCharsetNameException extends java.lang.IllegalArgumentException {
+ ctor public IllegalCharsetNameException(java.lang.String);
+ method public java.lang.String getCharsetName();
+ }
+
+ public class MalformedInputException extends java.nio.charset.CharacterCodingException {
+ ctor public MalformedInputException(int);
+ method public int getInputLength();
+ }
+
+ public final class StandardCharsets {
+ field public static final java.nio.charset.Charset ISO_8859_1;
+ field public static final java.nio.charset.Charset US_ASCII;
+ field public static final java.nio.charset.Charset UTF_16;
+ field public static final java.nio.charset.Charset UTF_16BE;
+ field public static final java.nio.charset.Charset UTF_16LE;
+ field public static final java.nio.charset.Charset UTF_8;
+ }
+
+ public class UnmappableCharacterException extends java.nio.charset.CharacterCodingException {
+ ctor public UnmappableCharacterException(int);
+ method public int getInputLength();
+ }
+
+ public class UnsupportedCharsetException extends java.lang.IllegalArgumentException {
+ ctor public UnsupportedCharsetException(java.lang.String);
+ method public java.lang.String getCharsetName();
+ }
+
+}
+
+package java.nio.charset.spi {
+
+ public abstract class CharsetProvider {
+ ctor protected CharsetProvider();
+ method public abstract java.nio.charset.Charset charsetForName(java.lang.String);
+ method public abstract java.util.Iterator<java.nio.charset.Charset> charsets();
+ }
+
+}
+
+package java.nio.file {
+
+ public class AccessDeniedException extends java.nio.file.FileSystemException {
+ ctor public AccessDeniedException(java.lang.String);
+ ctor public AccessDeniedException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public final class AccessMode extends java.lang.Enum {
+ method public static java.nio.file.AccessMode valueOf(java.lang.String);
+ method public static final java.nio.file.AccessMode[] values();
+ enum_constant public static final java.nio.file.AccessMode EXECUTE;
+ enum_constant public static final java.nio.file.AccessMode READ;
+ enum_constant public static final java.nio.file.AccessMode WRITE;
+ }
+
+ public class AtomicMoveNotSupportedException extends java.nio.file.FileSystemException {
+ ctor public AtomicMoveNotSupportedException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public class ClosedDirectoryStreamException extends java.lang.IllegalStateException {
+ ctor public ClosedDirectoryStreamException();
+ }
+
+ public class ClosedFileSystemException extends java.lang.IllegalStateException {
+ ctor public ClosedFileSystemException();
+ }
+
+ public class ClosedWatchServiceException extends java.lang.IllegalStateException {
+ ctor public ClosedWatchServiceException();
+ }
+
+ public abstract interface CopyOption {
+ }
+
+ public final class DirectoryIteratorException extends java.util.ConcurrentModificationException {
+ ctor public DirectoryIteratorException(java.io.IOException);
+ }
+
+ public class DirectoryNotEmptyException extends java.nio.file.FileSystemException {
+ ctor public DirectoryNotEmptyException(java.lang.String);
+ }
+
+ public abstract interface DirectoryStream implements java.io.Closeable java.lang.Iterable {
+ method public abstract java.util.Iterator<T> iterator();
+ }
+
+ public static abstract interface DirectoryStream.Filter {
+ method public abstract boolean accept(T) throws java.io.IOException;
+ }
+
+ public class FileAlreadyExistsException extends java.nio.file.FileSystemException {
+ ctor public FileAlreadyExistsException(java.lang.String);
+ ctor public FileAlreadyExistsException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract class FileStore {
+ ctor protected FileStore();
+ method public abstract java.lang.Object getAttribute(java.lang.String) throws java.io.IOException;
+ method public abstract V getFileStoreAttributeView(java.lang.Class<V>);
+ method public abstract long getTotalSpace() throws java.io.IOException;
+ method public abstract long getUnallocatedSpace() throws java.io.IOException;
+ method public abstract long getUsableSpace() throws java.io.IOException;
+ method public abstract boolean isReadOnly();
+ method public abstract java.lang.String name();
+ method public abstract boolean supportsFileAttributeView(java.lang.Class<? extends java.nio.file.attribute.FileAttributeView>);
+ method public abstract boolean supportsFileAttributeView(java.lang.String);
+ method public abstract java.lang.String type();
+ }
+
+ public abstract class FileSystem implements java.io.Closeable {
+ ctor protected FileSystem();
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.lang.Iterable<java.nio.file.FileStore> getFileStores();
+ method public abstract java.nio.file.Path getPath(java.lang.String, java.lang.String...);
+ method public abstract java.nio.file.PathMatcher getPathMatcher(java.lang.String);
+ method public abstract java.lang.Iterable<java.nio.file.Path> getRootDirectories();
+ method public abstract java.lang.String getSeparator();
+ method public abstract java.nio.file.attribute.UserPrincipalLookupService getUserPrincipalLookupService();
+ method public abstract boolean isOpen();
+ method public abstract boolean isReadOnly();
+ method public abstract java.nio.file.WatchService newWatchService() throws java.io.IOException;
+ method public abstract java.nio.file.spi.FileSystemProvider provider();
+ method public abstract java.util.Set<java.lang.String> supportedFileAttributeViews();
+ }
+
+ public class FileSystemAlreadyExistsException extends java.lang.RuntimeException {
+ ctor public FileSystemAlreadyExistsException();
+ ctor public FileSystemAlreadyExistsException(java.lang.String);
+ }
+
+ public class FileSystemException extends java.io.IOException {
+ ctor public FileSystemException(java.lang.String);
+ ctor public FileSystemException(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String getFile();
+ method public java.lang.String getOtherFile();
+ method public java.lang.String getReason();
+ }
+
+ public class FileSystemLoopException extends java.nio.file.FileSystemException {
+ ctor public FileSystemLoopException(java.lang.String);
+ }
+
+ public class FileSystemNotFoundException extends java.lang.RuntimeException {
+ ctor public FileSystemNotFoundException();
+ ctor public FileSystemNotFoundException(java.lang.String);
+ }
+
+ public final class FileSystems {
+ method public static java.nio.file.FileSystem getDefault();
+ method public static java.nio.file.FileSystem getFileSystem(java.net.URI);
+ method public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public static java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>, java.lang.ClassLoader) throws java.io.IOException;
+ method public static java.nio.file.FileSystem newFileSystem(java.nio.file.Path, java.lang.ClassLoader) throws java.io.IOException;
+ }
+
+ public final class FileVisitOption extends java.lang.Enum {
+ method public static java.nio.file.FileVisitOption valueOf(java.lang.String);
+ method public static final java.nio.file.FileVisitOption[] values();
+ enum_constant public static final java.nio.file.FileVisitOption FOLLOW_LINKS;
+ }
+
+ public final class FileVisitResult extends java.lang.Enum {
+ method public static java.nio.file.FileVisitResult valueOf(java.lang.String);
+ method public static final java.nio.file.FileVisitResult[] values();
+ enum_constant public static final java.nio.file.FileVisitResult CONTINUE;
+ enum_constant public static final java.nio.file.FileVisitResult SKIP_SIBLINGS;
+ enum_constant public static final java.nio.file.FileVisitResult SKIP_SUBTREE;
+ enum_constant public static final java.nio.file.FileVisitResult TERMINATE;
+ }
+
+ public abstract interface FileVisitor {
+ method public abstract java.nio.file.FileVisitResult postVisitDirectory(T, java.io.IOException) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult preVisitDirectory(T, java.nio.file.attribute.BasicFileAttributes) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult visitFile(T, java.nio.file.attribute.BasicFileAttributes) throws java.io.IOException;
+ method public abstract java.nio.file.FileVisitResult visitFileFailed(T, java.io.IOException) throws java.io.IOException;
+ }
+
+ public final class Files {
+ method public static java.nio.file.Path copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static long copy(java.io.InputStream, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static long copy(java.nio.file.Path, java.io.OutputStream) throws java.io.IOException;
+ method public static java.nio.file.Path createDirectories(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createDirectory(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createFile(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createLink(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path createSymbolicLink(java.nio.file.Path, java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempDirectory(java.nio.file.Path, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempDirectory(java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempFile(java.nio.file.Path, java.lang.String, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.file.Path createTempFile(java.lang.String, java.lang.String, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static void delete(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean deleteIfExists(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean exists(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static java.lang.Object getAttribute(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static V getFileAttributeView(java.nio.file.Path, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public static java.nio.file.FileStore getFileStore(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.attribute.FileTime getLastModifiedTime(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.attribute.UserPrincipal getOwner(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.util.Set<java.nio.file.attribute.PosixFilePermission> getPosixFilePermissions(java.nio.file.Path, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static boolean isDirectory(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static boolean isExecutable(java.nio.file.Path);
+ method public static boolean isHidden(java.nio.file.Path) throws java.io.IOException;
+ method public static boolean isReadable(java.nio.file.Path);
+ method public static boolean isRegularFile(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static boolean isSameFile(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public static boolean isSymbolicLink(java.nio.file.Path);
+ method public static boolean isWritable(java.nio.file.Path);
+ method public static java.nio.file.Path move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public static java.io.BufferedReader newBufferedReader(java.nio.file.Path, java.nio.charset.Charset) throws java.io.IOException;
+ method public static java.io.BufferedWriter newBufferedWriter(java.nio.file.Path, java.nio.charset.Charset, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public static java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.lang.String) throws java.io.IOException;
+ method public static java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.nio.file.DirectoryStream.Filter<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.io.InputStream newInputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.io.OutputStream newOutputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static boolean notExists(java.nio.file.Path, java.nio.file.LinkOption...);
+ method public static java.lang.String probeContentType(java.nio.file.Path) throws java.io.IOException;
+ method public static byte[] readAllBytes(java.nio.file.Path) throws java.io.IOException;
+ method public static java.util.List<java.lang.String> readAllLines(java.nio.file.Path, java.nio.charset.Charset) throws java.io.IOException;
+ method public static A readAttributes(java.nio.file.Path, java.lang.Class<A>, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.util.Map<java.lang.String, java.lang.Object> readAttributes(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.Path readSymbolicLink(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path setAttribute(java.nio.file.Path, java.lang.String, java.lang.Object, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public static java.nio.file.Path setLastModifiedTime(java.nio.file.Path, java.nio.file.attribute.FileTime) throws java.io.IOException;
+ method public static java.nio.file.Path setOwner(java.nio.file.Path, java.nio.file.attribute.UserPrincipal) throws java.io.IOException;
+ method public static java.nio.file.Path setPosixFilePermissions(java.nio.file.Path, java.util.Set<java.nio.file.attribute.PosixFilePermission>) throws java.io.IOException;
+ method public static long size(java.nio.file.Path) throws java.io.IOException;
+ method public static java.nio.file.Path walkFileTree(java.nio.file.Path, java.util.Set<java.nio.file.FileVisitOption>, int, java.nio.file.FileVisitor<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.nio.file.Path walkFileTree(java.nio.file.Path, java.nio.file.FileVisitor<? super java.nio.file.Path>) throws java.io.IOException;
+ method public static java.nio.file.Path write(java.nio.file.Path, byte[], java.nio.file.OpenOption...) throws java.io.IOException;
+ method public static java.nio.file.Path write(java.nio.file.Path, java.lang.Iterable<? extends java.lang.CharSequence>, java.nio.charset.Charset, java.nio.file.OpenOption...) throws java.io.IOException;
+ }
+
+ public class InvalidPathException extends java.lang.IllegalArgumentException {
+ ctor public InvalidPathException(java.lang.String, java.lang.String, int);
+ ctor public InvalidPathException(java.lang.String, java.lang.String);
+ method public int getIndex();
+ method public java.lang.String getInput();
+ method public java.lang.String getReason();
+ }
+
+ public final class LinkOption extends java.lang.Enum implements java.nio.file.CopyOption java.nio.file.OpenOption {
+ method public static java.nio.file.LinkOption valueOf(java.lang.String);
+ method public static final java.nio.file.LinkOption[] values();
+ enum_constant public static final java.nio.file.LinkOption NOFOLLOW_LINKS;
+ }
+
+ public final class LinkPermission extends java.security.BasicPermission {
+ ctor public LinkPermission(java.lang.String);
+ ctor public LinkPermission(java.lang.String, java.lang.String);
+ }
+
+ public class NoSuchFileException extends java.nio.file.FileSystemException {
+ ctor public NoSuchFileException(java.lang.String);
+ ctor public NoSuchFileException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public class NotDirectoryException extends java.nio.file.FileSystemException {
+ ctor public NotDirectoryException(java.lang.String);
+ }
+
+ public class NotLinkException extends java.nio.file.FileSystemException {
+ ctor public NotLinkException(java.lang.String);
+ ctor public NotLinkException(java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract interface OpenOption {
+ }
+
+ public abstract interface Path implements java.lang.Comparable java.lang.Iterable java.nio.file.Watchable {
+ method public abstract int compareTo(java.nio.file.Path);
+ method public abstract boolean endsWith(java.nio.file.Path);
+ method public abstract boolean endsWith(java.lang.String);
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract java.nio.file.Path getFileName();
+ method public abstract java.nio.file.FileSystem getFileSystem();
+ method public abstract java.nio.file.Path getName(int);
+ method public abstract int getNameCount();
+ method public abstract java.nio.file.Path getParent();
+ method public abstract java.nio.file.Path getRoot();
+ method public abstract int hashCode();
+ method public abstract boolean isAbsolute();
+ method public abstract java.util.Iterator<java.nio.file.Path> iterator();
+ method public abstract java.nio.file.Path normalize();
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>[], java.nio.file.WatchEvent.Modifier...) throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.Path relativize(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolve(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolve(java.lang.String);
+ method public abstract java.nio.file.Path resolveSibling(java.nio.file.Path);
+ method public abstract java.nio.file.Path resolveSibling(java.lang.String);
+ method public abstract boolean startsWith(java.nio.file.Path);
+ method public abstract boolean startsWith(java.lang.String);
+ method public abstract java.nio.file.Path subpath(int, int);
+ method public abstract java.nio.file.Path toAbsolutePath();
+ method public abstract java.io.File toFile();
+ method public abstract java.nio.file.Path toRealPath(java.nio.file.LinkOption...) throws java.io.IOException;
+ method public abstract java.lang.String toString();
+ method public abstract java.net.URI toUri();
+ }
+
+ public abstract interface PathMatcher {
+ method public abstract boolean matches(java.nio.file.Path);
+ }
+
+ public final class Paths {
+ method public static java.nio.file.Path get(java.lang.String, java.lang.String...);
+ method public static java.nio.file.Path get(java.net.URI);
+ }
+
+ public class ProviderMismatchException extends java.lang.IllegalArgumentException {
+ ctor public ProviderMismatchException();
+ ctor public ProviderMismatchException(java.lang.String);
+ }
+
+ public class ProviderNotFoundException extends java.lang.RuntimeException {
+ ctor public ProviderNotFoundException();
+ ctor public ProviderNotFoundException(java.lang.String);
+ }
+
+ public class ReadOnlyFileSystemException extends java.lang.UnsupportedOperationException {
+ ctor public ReadOnlyFileSystemException();
+ }
+
+ public abstract interface SecureDirectoryStream implements java.nio.file.DirectoryStream {
+ method public abstract void deleteDirectory(T) throws java.io.IOException;
+ method public abstract void deleteFile(T) throws java.io.IOException;
+ method public abstract V getFileAttributeView(java.lang.Class<V>);
+ method public abstract V getFileAttributeView(T, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public abstract void move(T, java.nio.file.SecureDirectoryStream<T>, T) throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel newByteChannel(T, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.SecureDirectoryStream<T> newDirectoryStream(T, java.nio.file.LinkOption...) throws java.io.IOException;
+ }
+
+ public final class StandardCopyOption extends java.lang.Enum implements java.nio.file.CopyOption {
+ method public static java.nio.file.StandardCopyOption valueOf(java.lang.String);
+ method public static final java.nio.file.StandardCopyOption[] values();
+ enum_constant public static final java.nio.file.StandardCopyOption ATOMIC_MOVE;
+ enum_constant public static final java.nio.file.StandardCopyOption COPY_ATTRIBUTES;
+ enum_constant public static final java.nio.file.StandardCopyOption REPLACE_EXISTING;
+ }
+
+ public final class StandardOpenOption extends java.lang.Enum implements java.nio.file.OpenOption {
+ method public static java.nio.file.StandardOpenOption valueOf(java.lang.String);
+ method public static final java.nio.file.StandardOpenOption[] values();
+ enum_constant public static final java.nio.file.StandardOpenOption APPEND;
+ enum_constant public static final java.nio.file.StandardOpenOption CREATE;
+ enum_constant public static final java.nio.file.StandardOpenOption CREATE_NEW;
+ enum_constant public static final java.nio.file.StandardOpenOption DELETE_ON_CLOSE;
+ enum_constant public static final java.nio.file.StandardOpenOption DSYNC;
+ enum_constant public static final java.nio.file.StandardOpenOption READ;
+ enum_constant public static final java.nio.file.StandardOpenOption SPARSE;
+ enum_constant public static final java.nio.file.StandardOpenOption SYNC;
+ enum_constant public static final java.nio.file.StandardOpenOption TRUNCATE_EXISTING;
+ enum_constant public static final java.nio.file.StandardOpenOption WRITE;
+ }
+
+ public final class StandardWatchEventKinds {
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_CREATE;
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_DELETE;
+ field public static final java.nio.file.WatchEvent.Kind<java.nio.file.Path> ENTRY_MODIFY;
+ field public static final java.nio.file.WatchEvent.Kind<java.lang.Object> OVERFLOW;
+ }
+
+ public abstract interface WatchEvent {
+ method public abstract T context();
+ method public abstract int count();
+ method public abstract java.nio.file.WatchEvent.Kind<T> kind();
+ }
+
+ public static abstract interface WatchEvent.Kind {
+ method public abstract java.lang.String name();
+ method public abstract java.lang.Class<T> type();
+ }
+
+ public static abstract interface WatchEvent.Modifier {
+ method public abstract java.lang.String name();
+ }
+
+ public abstract interface WatchKey {
+ method public abstract void cancel();
+ method public abstract boolean isValid();
+ method public abstract java.util.List<java.nio.file.WatchEvent<?>> pollEvents();
+ method public abstract boolean reset();
+ method public abstract java.nio.file.Watchable watchable();
+ }
+
+ public abstract interface WatchService implements java.io.Closeable {
+ method public abstract void close() throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey poll();
+ method public abstract java.nio.file.WatchKey poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract java.nio.file.WatchKey take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface Watchable {
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>[], java.nio.file.WatchEvent.Modifier...) throws java.io.IOException;
+ method public abstract java.nio.file.WatchKey register(java.nio.file.WatchService, java.nio.file.WatchEvent.Kind<?>...) throws java.io.IOException;
+ }
+
+}
+
+package java.nio.file.attribute {
+
+ public final class AclEntry {
+ method public java.util.Set<java.nio.file.attribute.AclEntryFlag> flags();
+ method public static java.nio.file.attribute.AclEntry.Builder newBuilder();
+ method public static java.nio.file.attribute.AclEntry.Builder newBuilder(java.nio.file.attribute.AclEntry);
+ method public java.util.Set<java.nio.file.attribute.AclEntryPermission> permissions();
+ method public java.nio.file.attribute.UserPrincipal principal();
+ method public java.nio.file.attribute.AclEntryType type();
+ }
+
+ public static final class AclEntry.Builder {
+ method public java.nio.file.attribute.AclEntry build();
+ method public java.nio.file.attribute.AclEntry.Builder setFlags(java.util.Set<java.nio.file.attribute.AclEntryFlag>);
+ method public java.nio.file.attribute.AclEntry.Builder setFlags(java.nio.file.attribute.AclEntryFlag...);
+ method public java.nio.file.attribute.AclEntry.Builder setPermissions(java.util.Set<java.nio.file.attribute.AclEntryPermission>);
+ method public java.nio.file.attribute.AclEntry.Builder setPermissions(java.nio.file.attribute.AclEntryPermission...);
+ method public java.nio.file.attribute.AclEntry.Builder setPrincipal(java.nio.file.attribute.UserPrincipal);
+ method public java.nio.file.attribute.AclEntry.Builder setType(java.nio.file.attribute.AclEntryType);
+ }
+
+ public final class AclEntryFlag extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryFlag valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryFlag[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag DIRECTORY_INHERIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag FILE_INHERIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag INHERIT_ONLY;
+ enum_constant public static final java.nio.file.attribute.AclEntryFlag NO_PROPAGATE_INHERIT;
+ }
+
+ public final class AclEntryPermission extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryPermission valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryPermission[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission APPEND_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission DELETE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission DELETE_CHILD;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission EXECUTE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_ACL;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_ATTRIBUTES;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission READ_NAMED_ATTRS;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission SYNCHRONIZE;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_ACL;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_ATTRIBUTES;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_DATA;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_NAMED_ATTRS;
+ enum_constant public static final java.nio.file.attribute.AclEntryPermission WRITE_OWNER;
+ field public static final java.nio.file.attribute.AclEntryPermission ADD_FILE;
+ field public static final java.nio.file.attribute.AclEntryPermission ADD_SUBDIRECTORY;
+ field public static final java.nio.file.attribute.AclEntryPermission LIST_DIRECTORY;
+ }
+
+ public final class AclEntryType extends java.lang.Enum {
+ method public static java.nio.file.attribute.AclEntryType valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.AclEntryType[] values();
+ enum_constant public static final java.nio.file.attribute.AclEntryType ALARM;
+ enum_constant public static final java.nio.file.attribute.AclEntryType ALLOW;
+ enum_constant public static final java.nio.file.attribute.AclEntryType AUDIT;
+ enum_constant public static final java.nio.file.attribute.AclEntryType DENY;
+ }
+
+ public abstract interface AclFileAttributeView implements java.nio.file.attribute.FileOwnerAttributeView {
+ method public abstract java.util.List<java.nio.file.attribute.AclEntry> getAcl() throws java.io.IOException;
+ method public abstract java.lang.String name();
+ method public abstract void setAcl(java.util.List<java.nio.file.attribute.AclEntry>) throws java.io.IOException;
+ }
+
+ public abstract interface AttributeView {
+ method public abstract java.lang.String name();
+ }
+
+ public abstract interface BasicFileAttributeView implements java.nio.file.attribute.FileAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.BasicFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setTimes(java.nio.file.attribute.FileTime, java.nio.file.attribute.FileTime, java.nio.file.attribute.FileTime) throws java.io.IOException;
+ }
+
+ public abstract interface BasicFileAttributes {
+ method public abstract java.nio.file.attribute.FileTime creationTime();
+ method public abstract java.lang.Object fileKey();
+ method public abstract boolean isDirectory();
+ method public abstract boolean isOther();
+ method public abstract boolean isRegularFile();
+ method public abstract boolean isSymbolicLink();
+ method public abstract java.nio.file.attribute.FileTime lastAccessTime();
+ method public abstract java.nio.file.attribute.FileTime lastModifiedTime();
+ method public abstract long size();
+ }
+
+ public abstract interface DosFileAttributeView implements java.nio.file.attribute.BasicFileAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.DosFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setArchive(boolean) throws java.io.IOException;
+ method public abstract void setHidden(boolean) throws java.io.IOException;
+ method public abstract void setReadOnly(boolean) throws java.io.IOException;
+ method public abstract void setSystem(boolean) throws java.io.IOException;
+ }
+
+ public abstract interface DosFileAttributes implements java.nio.file.attribute.BasicFileAttributes {
+ method public abstract boolean isArchive();
+ method public abstract boolean isHidden();
+ method public abstract boolean isReadOnly();
+ method public abstract boolean isSystem();
+ }
+
+ public abstract interface FileAttribute {
+ method public abstract java.lang.String name();
+ method public abstract T value();
+ }
+
+ public abstract interface FileAttributeView implements java.nio.file.attribute.AttributeView {
+ }
+
+ public abstract interface FileOwnerAttributeView implements java.nio.file.attribute.FileAttributeView {
+ method public abstract java.nio.file.attribute.UserPrincipal getOwner() throws java.io.IOException;
+ method public abstract java.lang.String name();
+ method public abstract void setOwner(java.nio.file.attribute.UserPrincipal) throws java.io.IOException;
+ }
+
+ public abstract interface FileStoreAttributeView implements java.nio.file.attribute.AttributeView {
+ }
+
+ public final class FileTime implements java.lang.Comparable {
+ method public int compareTo(java.nio.file.attribute.FileTime);
+ method public static java.nio.file.attribute.FileTime from(long, java.util.concurrent.TimeUnit);
+ method public static java.nio.file.attribute.FileTime fromMillis(long);
+ method public long to(java.util.concurrent.TimeUnit);
+ method public long toMillis();
+ }
+
+ public abstract interface GroupPrincipal implements java.nio.file.attribute.UserPrincipal {
+ }
+
+ public abstract interface PosixFileAttributeView implements java.nio.file.attribute.BasicFileAttributeView java.nio.file.attribute.FileOwnerAttributeView {
+ method public abstract java.lang.String name();
+ method public abstract java.nio.file.attribute.PosixFileAttributes readAttributes() throws java.io.IOException;
+ method public abstract void setGroup(java.nio.file.attribute.GroupPrincipal) throws java.io.IOException;
+ method public abstract void setPermissions(java.util.Set<java.nio.file.attribute.PosixFilePermission>) throws java.io.IOException;
+ }
+
+ public abstract interface PosixFileAttributes implements java.nio.file.attribute.BasicFileAttributes {
+ method public abstract java.nio.file.attribute.GroupPrincipal group();
+ method public abstract java.nio.file.attribute.UserPrincipal owner();
+ method public abstract java.util.Set<java.nio.file.attribute.PosixFilePermission> permissions();
+ }
+
+ public final class PosixFilePermission extends java.lang.Enum {
+ method public static java.nio.file.attribute.PosixFilePermission valueOf(java.lang.String);
+ method public static final java.nio.file.attribute.PosixFilePermission[] values();
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission GROUP_WRITE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OTHERS_WRITE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_EXECUTE;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_READ;
+ enum_constant public static final java.nio.file.attribute.PosixFilePermission OWNER_WRITE;
+ }
+
+ public final class PosixFilePermissions {
+ method public static java.nio.file.attribute.FileAttribute<java.util.Set<java.nio.file.attribute.PosixFilePermission>> asFileAttribute(java.util.Set<java.nio.file.attribute.PosixFilePermission>);
+ method public static java.util.Set<java.nio.file.attribute.PosixFilePermission> fromString(java.lang.String);
+ method public static java.lang.String toString(java.util.Set<java.nio.file.attribute.PosixFilePermission>);
+ }
+
+ public abstract interface UserPrincipal implements java.security.Principal {
+ }
+
+ public abstract class UserPrincipalLookupService {
+ ctor protected UserPrincipalLookupService();
+ method public abstract java.nio.file.attribute.GroupPrincipal lookupPrincipalByGroupName(java.lang.String) throws java.io.IOException;
+ method public abstract java.nio.file.attribute.UserPrincipal lookupPrincipalByName(java.lang.String) throws java.io.IOException;
+ }
+
+ public class UserPrincipalNotFoundException extends java.io.IOException {
+ ctor public UserPrincipalNotFoundException(java.lang.String);
+ method public java.lang.String getName();
+ }
+
+}
+
+package java.nio.file.spi {
+
+ public abstract class FileSystemProvider {
+ ctor protected FileSystemProvider();
+ method public abstract void checkAccess(java.nio.file.Path, java.nio.file.AccessMode...) throws java.io.IOException;
+ method public abstract void copy(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public abstract void createDirectory(java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public void createLink(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public void createSymbolicLink(java.nio.file.Path, java.nio.file.Path, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract void delete(java.nio.file.Path) throws java.io.IOException;
+ method public boolean deleteIfExists(java.nio.file.Path) throws java.io.IOException;
+ method public abstract V getFileAttributeView(java.nio.file.Path, java.lang.Class<V>, java.nio.file.LinkOption...);
+ method public abstract java.nio.file.FileStore getFileStore(java.nio.file.Path) throws java.io.IOException;
+ method public abstract java.nio.file.FileSystem getFileSystem(java.net.URI);
+ method public abstract java.nio.file.Path getPath(java.net.URI);
+ method public abstract java.lang.String getScheme();
+ method public static java.util.List<java.nio.file.spi.FileSystemProvider> installedProviders();
+ method public abstract boolean isHidden(java.nio.file.Path) throws java.io.IOException;
+ method public abstract boolean isSameFile(java.nio.file.Path, java.nio.file.Path) throws java.io.IOException;
+ method public abstract void move(java.nio.file.Path, java.nio.file.Path, java.nio.file.CopyOption...) throws java.io.IOException;
+ method public java.nio.channels.AsynchronousFileChannel newAsynchronousFileChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.util.concurrent.ExecutorService, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.channels.SeekableByteChannel newByteChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.DirectoryStream<java.nio.file.Path> newDirectoryStream(java.nio.file.Path, java.nio.file.DirectoryStream.Filter<? super java.nio.file.Path>) throws java.io.IOException;
+ method public java.nio.channels.FileChannel newFileChannel(java.nio.file.Path, java.util.Set<? extends java.nio.file.OpenOption>, java.nio.file.attribute.FileAttribute<?>...) throws java.io.IOException;
+ method public abstract java.nio.file.FileSystem newFileSystem(java.net.URI, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public java.nio.file.FileSystem newFileSystem(java.nio.file.Path, java.util.Map<java.lang.String, ?>) throws java.io.IOException;
+ method public java.io.InputStream newInputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public java.io.OutputStream newOutputStream(java.nio.file.Path, java.nio.file.OpenOption...) throws java.io.IOException;
+ method public abstract A readAttributes(java.nio.file.Path, java.lang.Class<A>, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public abstract java.util.Map<java.lang.String, java.lang.Object> readAttributes(java.nio.file.Path, java.lang.String, java.nio.file.LinkOption...) throws java.io.IOException;
+ method public java.nio.file.Path readSymbolicLink(java.nio.file.Path) throws java.io.IOException;
+ method public abstract void setAttribute(java.nio.file.Path, java.lang.String, java.lang.Object, java.nio.file.LinkOption...) throws java.io.IOException;
+ }
+
+ public abstract class FileTypeDetector {
+ ctor protected FileTypeDetector();
+ method public abstract java.lang.String probeContentType(java.nio.file.Path) throws java.io.IOException;
+ }
+
+}
+
+package java.security {
+
+ public final class AccessControlContext {
+ ctor public AccessControlContext(java.security.ProtectionDomain[]);
+ ctor public AccessControlContext(java.security.AccessControlContext, java.security.DomainCombiner);
+ method public void checkPermission(java.security.Permission) throws java.security.AccessControlException;
+ method public java.security.DomainCombiner getDomainCombiner();
+ }
+
+ public class AccessControlException extends java.lang.SecurityException {
+ ctor public AccessControlException(java.lang.String);
+ ctor public AccessControlException(java.lang.String, java.security.Permission);
+ method public java.security.Permission getPermission();
+ }
+
+ public final class AccessController {
+ method public static void checkPermission(java.security.Permission) throws java.security.AccessControlException;
+ method public static T doPrivileged(java.security.PrivilegedAction<T>);
+ method public static T doPrivileged(java.security.PrivilegedAction<T>, java.security.AccessControlContext);
+ method public static T doPrivileged(java.security.PrivilegedExceptionAction<T>) throws java.security.PrivilegedActionException;
+ method public static T doPrivileged(java.security.PrivilegedExceptionAction<T>, java.security.AccessControlContext) throws java.security.PrivilegedActionException;
+ method public static T doPrivilegedWithCombiner(java.security.PrivilegedAction<T>);
+ method public static T doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction<T>) throws java.security.PrivilegedActionException;
+ method public static java.security.AccessControlContext getContext();
+ }
+
+ public abstract interface AlgorithmConstraints {
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.lang.String, java.security.AlgorithmParameters);
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.security.Key);
+ method public abstract boolean permits(java.util.Set<java.security.CryptoPrimitive>, java.lang.String, java.security.Key, java.security.AlgorithmParameters);
+ }
+
+ public class AlgorithmParameterGenerator {
+ ctor protected AlgorithmParameterGenerator(java.security.AlgorithmParameterGeneratorSpi, java.security.Provider, java.lang.String);
+ method public final java.security.AlgorithmParameters generateParameters();
+ method public final java.lang.String getAlgorithm();
+ method public static java.security.AlgorithmParameterGenerator getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.AlgorithmParameterGenerator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.AlgorithmParameterGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public final void init(int);
+ method public final void init(int, java.security.SecureRandom);
+ method public final void init(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
+ method public final void init(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract class AlgorithmParameterGeneratorSpi {
+ ctor public AlgorithmParameterGeneratorSpi();
+ method protected abstract java.security.AlgorithmParameters engineGenerateParameters();
+ method protected abstract void engineInit(int, java.security.SecureRandom);
+ method protected abstract void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public class AlgorithmParameters {
+ ctor protected AlgorithmParameters(java.security.AlgorithmParametersSpi, java.security.Provider, java.lang.String);
+ method public final java.lang.String getAlgorithm();
+ method public final byte[] getEncoded() throws java.io.IOException;
+ method public final byte[] getEncoded(java.lang.String) throws java.io.IOException;
+ method public static java.security.AlgorithmParameters getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.AlgorithmParameters getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.AlgorithmParameters getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final T getParameterSpec(java.lang.Class<T>) throws java.security.spec.InvalidParameterSpecException;
+ method public final java.security.Provider getProvider();
+ method public final void init(java.security.spec.AlgorithmParameterSpec) throws java.security.spec.InvalidParameterSpecException;
+ method public final void init(byte[]) throws java.io.IOException;
+ method public final void init(byte[], java.lang.String) throws java.io.IOException;
+ method public final java.lang.String toString();
+ }
+
+ public abstract class AlgorithmParametersSpi {
+ ctor public AlgorithmParametersSpi();
+ method protected abstract byte[] engineGetEncoded() throws java.io.IOException;
+ method protected abstract byte[] engineGetEncoded(java.lang.String) throws java.io.IOException;
+ method protected abstract T engineGetParameterSpec(java.lang.Class<T>) throws java.security.spec.InvalidParameterSpecException;
+ method protected abstract void engineInit(java.security.spec.AlgorithmParameterSpec) throws java.security.spec.InvalidParameterSpecException;
+ method protected abstract void engineInit(byte[]) throws java.io.IOException;
+ method protected abstract void engineInit(byte[], java.lang.String) throws java.io.IOException;
+ method protected abstract java.lang.String engineToString();
+ }
+
+ public final class AllPermission extends java.security.Permission {
+ ctor public AllPermission();
+ ctor public AllPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
+ method public java.lang.String getActions();
+ method public int hashCode();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public abstract class AuthProvider extends java.security.Provider {
+ ctor protected AuthProvider(java.lang.String, double, java.lang.String);
+ method public abstract void login(javax.security.auth.Subject, javax.security.auth.callback.CallbackHandler) throws javax.security.auth.login.LoginException;
+ method public abstract void logout() throws javax.security.auth.login.LoginException;
+ method public abstract void setCallbackHandler(javax.security.auth.callback.CallbackHandler);
+ }
+
+ public abstract class BasicPermission extends java.security.Permission implements java.io.Serializable {
+ ctor public BasicPermission(java.lang.String);
+ ctor public BasicPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
+ method public java.lang.String getActions();
+ method public int hashCode();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public abstract deprecated interface Certificate {
+ method public abstract void decode(java.io.InputStream) throws java.io.IOException, java.security.KeyException;
+ method public abstract void encode(java.io.OutputStream) throws java.io.IOException, java.security.KeyException;
+ method public abstract java.lang.String getFormat();
+ method public abstract java.security.Principal getGuarantor();
+ method public abstract java.security.Principal getPrincipal();
+ method public abstract java.security.PublicKey getPublicKey();
+ method public abstract java.lang.String toString(boolean);
+ }
+
+ public final class CodeSigner implements java.io.Serializable {
+ ctor public CodeSigner(java.security.cert.CertPath, java.security.Timestamp);
+ method public java.security.cert.CertPath getSignerCertPath();
+ method public java.security.Timestamp getTimestamp();
+ }
+
+ public class CodeSource implements java.io.Serializable {
+ ctor public CodeSource(java.net.URL, java.security.cert.Certificate[]);
+ ctor public CodeSource(java.net.URL, java.security.CodeSigner[]);
+ method public final java.security.cert.Certificate[] getCertificates();
+ method public final java.security.CodeSigner[] getCodeSigners();
+ method public final java.net.URL getLocation();
+ method public boolean implies(java.security.CodeSource);
+ }
+
+ public final class CryptoPrimitive extends java.lang.Enum {
+ method public static java.security.CryptoPrimitive valueOf(java.lang.String);
+ method public static final java.security.CryptoPrimitive[] values();
+ enum_constant public static final java.security.CryptoPrimitive BLOCK_CIPHER;
+ enum_constant public static final java.security.CryptoPrimitive KEY_AGREEMENT;
+ enum_constant public static final java.security.CryptoPrimitive KEY_ENCAPSULATION;
+ enum_constant public static final java.security.CryptoPrimitive KEY_WRAP;
+ enum_constant public static final java.security.CryptoPrimitive MAC;
+ enum_constant public static final java.security.CryptoPrimitive MESSAGE_DIGEST;
+ enum_constant public static final java.security.CryptoPrimitive PUBLIC_KEY_ENCRYPTION;
+ enum_constant public static final java.security.CryptoPrimitive SECURE_RANDOM;
+ enum_constant public static final java.security.CryptoPrimitive SIGNATURE;
+ enum_constant public static final java.security.CryptoPrimitive STREAM_CIPHER;
+ }
+
+ public class DigestException extends java.security.GeneralSecurityException {
+ ctor public DigestException();
+ ctor public DigestException(java.lang.String);
+ ctor public DigestException(java.lang.String, java.lang.Throwable);
+ ctor public DigestException(java.lang.Throwable);
+ }
+
+ public class DigestInputStream extends java.io.FilterInputStream {
+ ctor public DigestInputStream(java.io.InputStream, java.security.MessageDigest);
+ method public java.security.MessageDigest getMessageDigest();
+ method public void on(boolean);
+ method public void setMessageDigest(java.security.MessageDigest);
+ field protected java.security.MessageDigest digest;
+ }
+
+ public class DigestOutputStream extends java.io.FilterOutputStream {
+ ctor public DigestOutputStream(java.io.OutputStream, java.security.MessageDigest);
+ method public java.security.MessageDigest getMessageDigest();
+ method public void on(boolean);
+ method public void setMessageDigest(java.security.MessageDigest);
+ field protected java.security.MessageDigest digest;
+ }
+
+ public abstract interface DomainCombiner {
+ method public abstract java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]);
+ }
+
+ public class GeneralSecurityException extends java.lang.Exception {
+ ctor public GeneralSecurityException();
+ ctor public GeneralSecurityException(java.lang.String);
+ ctor public GeneralSecurityException(java.lang.String, java.lang.Throwable);
+ ctor public GeneralSecurityException(java.lang.Throwable);
+ }
+
+ public abstract interface Guard {
+ method public abstract void checkGuard(java.lang.Object) throws java.lang.SecurityException;
+ }
+
+ public class GuardedObject implements java.io.Serializable {
+ ctor public GuardedObject(java.lang.Object, java.security.Guard);
+ method public java.lang.Object getObject() throws java.lang.SecurityException;
+ }
+
+ public abstract deprecated class Identity implements java.security.Principal java.io.Serializable {
+ ctor protected Identity();
+ ctor public Identity(java.lang.String, java.security.IdentityScope) throws java.security.KeyManagementException;
+ ctor public Identity(java.lang.String);
+ method public void addCertificate(java.security.Certificate) throws java.security.KeyManagementException;
+ method public java.security.Certificate[] certificates();
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.String getInfo();
+ method public final java.lang.String getName();
+ method public java.security.PublicKey getPublicKey();
+ method public final java.security.IdentityScope getScope();
+ method protected boolean identityEquals(java.security.Identity);
+ method public void removeCertificate(java.security.Certificate) throws java.security.KeyManagementException;
+ method public void setInfo(java.lang.String);
+ method public void setPublicKey(java.security.PublicKey) throws java.security.KeyManagementException;
+ method public java.lang.String toString(boolean);
+ }
+
+ public abstract deprecated class IdentityScope extends java.security.Identity {
+ ctor protected IdentityScope();
+ ctor public IdentityScope(java.lang.String);
+ ctor public IdentityScope(java.lang.String, java.security.IdentityScope) throws java.security.KeyManagementException;
+ method public abstract void addIdentity(java.security.Identity) throws java.security.KeyManagementException;
+ method public abstract java.security.Identity getIdentity(java.lang.String);
+ method public java.security.Identity getIdentity(java.security.Principal);
+ method public abstract java.security.Identity getIdentity(java.security.PublicKey);
+ method public static java.security.IdentityScope getSystemScope();
+ method public abstract java.util.Enumeration<java.security.Identity> identities();
+ method public abstract void removeIdentity(java.security.Identity) throws java.security.KeyManagementException;
+ method protected static void setSystemScope(java.security.IdentityScope);
+ method public abstract int size();
+ }
+
+ public class InvalidAlgorithmParameterException extends java.security.GeneralSecurityException {
+ ctor public InvalidAlgorithmParameterException();
+ ctor public InvalidAlgorithmParameterException(java.lang.String);
+ ctor public InvalidAlgorithmParameterException(java.lang.String, java.lang.Throwable);
+ ctor public InvalidAlgorithmParameterException(java.lang.Throwable);
+ }
+
+ public class InvalidKeyException extends java.security.KeyException {
+ ctor public InvalidKeyException();
+ ctor public InvalidKeyException(java.lang.String);
+ ctor public InvalidKeyException(java.lang.String, java.lang.Throwable);
+ ctor public InvalidKeyException(java.lang.Throwable);
+ }
+
+ public class InvalidParameterException extends java.lang.IllegalArgumentException {
+ ctor public InvalidParameterException();
+ ctor public InvalidParameterException(java.lang.String);
+ }
+
+ public abstract interface Key implements java.io.Serializable {
+ method public abstract java.lang.String getAlgorithm();
+ method public abstract byte[] getEncoded();
+ method public abstract java.lang.String getFormat();
+ field public static final long serialVersionUID = 6603384152749567654L; // 0x5ba3eee69414eea6L
+ }
+
+ public class KeyException extends java.security.GeneralSecurityException {
+ ctor public KeyException();
+ ctor public KeyException(java.lang.String);
+ ctor public KeyException(java.lang.String, java.lang.Throwable);
+ ctor public KeyException(java.lang.Throwable);
+ }
+
+ public class KeyFactory {
+ ctor protected KeyFactory(java.security.KeyFactorySpi, java.security.Provider, java.lang.String);
+ method public final java.security.PrivateKey generatePrivate(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;
+ method public final java.security.PublicKey generatePublic(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;
+ method public final java.lang.String getAlgorithm();
+ method public static java.security.KeyFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.KeyFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.KeyFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final T getKeySpec(java.security.Key, java.lang.Class<T>) throws java.security.spec.InvalidKeySpecException;
+ method public final java.security.Provider getProvider();
+ method public final java.security.Key translateKey(java.security.Key) throws java.security.InvalidKeyException;
+ }
+
+ public abstract class KeyFactorySpi {
+ ctor public KeyFactorySpi();
+ method protected abstract java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;
+ method protected abstract java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;
+ method protected abstract T engineGetKeySpec(java.security.Key, java.lang.Class<T>) throws java.security.spec.InvalidKeySpecException;
+ method protected abstract java.security.Key engineTranslateKey(java.security.Key) throws java.security.InvalidKeyException;
+ }
+
+ public class KeyManagementException extends java.security.KeyException {
+ ctor public KeyManagementException();
+ ctor public KeyManagementException(java.lang.String);
+ ctor public KeyManagementException(java.lang.String, java.lang.Throwable);
+ ctor public KeyManagementException(java.lang.Throwable);
+ }
+
+ public final class KeyPair implements java.io.Serializable {
+ ctor public KeyPair(java.security.PublicKey, java.security.PrivateKey);
+ method public java.security.PrivateKey getPrivate();
+ method public java.security.PublicKey getPublic();
+ }
+
+ public abstract class KeyPairGenerator extends java.security.KeyPairGeneratorSpi {
+ ctor protected KeyPairGenerator(java.lang.String);
+ method public final java.security.KeyPair genKeyPair();
+ method public java.security.KeyPair generateKeyPair();
+ method public java.lang.String getAlgorithm();
+ method public static java.security.KeyPairGenerator getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.KeyPairGenerator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.KeyPairGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public void initialize(int);
+ method public void initialize(int, java.security.SecureRandom);
+ method public void initialize(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract class KeyPairGeneratorSpi {
+ ctor public KeyPairGeneratorSpi();
+ method public abstract java.security.KeyPair generateKeyPair();
+ method public abstract void initialize(int, java.security.SecureRandom);
+ method public void initialize(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public class KeyRep implements java.io.Serializable {
+ ctor public KeyRep(java.security.KeyRep.Type, java.lang.String, java.lang.String, byte[]);
+ method protected java.lang.Object readResolve() throws java.io.ObjectStreamException;
+ }
+
+ public static final class KeyRep.Type extends java.lang.Enum {
+ method public static java.security.KeyRep.Type valueOf(java.lang.String);
+ method public static final java.security.KeyRep.Type[] values();
+ enum_constant public static final java.security.KeyRep.Type PRIVATE;
+ enum_constant public static final java.security.KeyRep.Type PUBLIC;
+ enum_constant public static final java.security.KeyRep.Type SECRET;
+ }
+
+ public class KeyStore {
+ ctor protected KeyStore(java.security.KeyStoreSpi, java.security.Provider, java.lang.String);
+ method public final java.util.Enumeration<java.lang.String> aliases() throws java.security.KeyStoreException;
+ method public final boolean containsAlias(java.lang.String) throws java.security.KeyStoreException;
+ method public final void deleteEntry(java.lang.String) throws java.security.KeyStoreException;
+ method public final boolean entryInstanceOf(java.lang.String, java.lang.Class<? extends java.security.KeyStore.Entry>) throws java.security.KeyStoreException;
+ method public final java.security.cert.Certificate getCertificate(java.lang.String) throws java.security.KeyStoreException;
+ method public final java.lang.String getCertificateAlias(java.security.cert.Certificate) throws java.security.KeyStoreException;
+ method public final java.security.cert.Certificate[] getCertificateChain(java.lang.String) throws java.security.KeyStoreException;
+ method public final java.util.Date getCreationDate(java.lang.String) throws java.security.KeyStoreException;
+ method public static final java.lang.String getDefaultType();
+ method public final java.security.KeyStore.Entry getEntry(java.lang.String, java.security.KeyStore.ProtectionParameter) throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableEntryException;
+ method public static java.security.KeyStore getInstance(java.lang.String) throws java.security.KeyStoreException;
+ method public static java.security.KeyStore getInstance(java.lang.String, java.lang.String) throws java.security.KeyStoreException, java.security.NoSuchProviderException;
+ method public static java.security.KeyStore getInstance(java.lang.String, java.security.Provider) throws java.security.KeyStoreException;
+ method public final java.security.Key getKey(java.lang.String, char[]) throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ method public final java.security.Provider getProvider();
+ method public final java.lang.String getType();
+ method public final boolean isCertificateEntry(java.lang.String) throws java.security.KeyStoreException;
+ method public final boolean isKeyEntry(java.lang.String) throws java.security.KeyStoreException;
+ method public final void load(java.io.InputStream, char[]) throws java.security.cert.CertificateException, java.io.IOException, java.security.NoSuchAlgorithmException;
+ method public final void load(java.security.KeyStore.LoadStoreParameter) throws java.security.cert.CertificateException, java.io.IOException, java.security.NoSuchAlgorithmException;
+ method public final void setCertificateEntry(java.lang.String, java.security.cert.Certificate) throws java.security.KeyStoreException;
+ method public final void setEntry(java.lang.String, java.security.KeyStore.Entry, java.security.KeyStore.ProtectionParameter) throws java.security.KeyStoreException;
+ method public final void setKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) throws java.security.KeyStoreException;
+ method public final void setKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[]) throws java.security.KeyStoreException;
+ method public final int size() throws java.security.KeyStoreException;
+ method public final void store(java.io.OutputStream, char[]) throws java.security.cert.CertificateException, java.io.IOException, java.security.KeyStoreException, java.security.NoSuchAlgorithmException;
+ method public final void store(java.security.KeyStore.LoadStoreParameter) throws java.security.cert.CertificateException, java.io.IOException, java.security.KeyStoreException, java.security.NoSuchAlgorithmException;
+ }
+
+ public static abstract class KeyStore.Builder {
+ ctor protected KeyStore.Builder();
+ method public abstract java.security.KeyStore getKeyStore() throws java.security.KeyStoreException;
+ method public abstract java.security.KeyStore.ProtectionParameter getProtectionParameter(java.lang.String) throws java.security.KeyStoreException;
+ method public static java.security.KeyStore.Builder newInstance(java.security.KeyStore, java.security.KeyStore.ProtectionParameter);
+ method public static java.security.KeyStore.Builder newInstance(java.lang.String, java.security.Provider, java.io.File, java.security.KeyStore.ProtectionParameter);
+ method public static java.security.KeyStore.Builder newInstance(java.lang.String, java.security.Provider, java.security.KeyStore.ProtectionParameter);
+ }
+
+ public static class KeyStore.CallbackHandlerProtection implements java.security.KeyStore.ProtectionParameter {
+ ctor public KeyStore.CallbackHandlerProtection(javax.security.auth.callback.CallbackHandler);
+ method public javax.security.auth.callback.CallbackHandler getCallbackHandler();
+ }
+
+ public static abstract interface KeyStore.Entry {
+ }
+
+ public static abstract interface KeyStore.LoadStoreParameter {
+ method public abstract java.security.KeyStore.ProtectionParameter getProtectionParameter();
+ }
+
+ public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
+ ctor public KeyStore.PasswordProtection(char[]);
+ method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
+ method public synchronized char[] getPassword();
+ method public synchronized boolean isDestroyed();
+ }
+
+ public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
+ ctor public KeyStore.PrivateKeyEntry(java.security.PrivateKey, java.security.cert.Certificate[]);
+ method public java.security.cert.Certificate getCertificate();
+ method public java.security.cert.Certificate[] getCertificateChain();
+ method public java.security.PrivateKey getPrivateKey();
+ }
+
+ public static abstract interface KeyStore.ProtectionParameter {
+ }
+
+ public static final class KeyStore.SecretKeyEntry implements java.security.KeyStore.Entry {
+ ctor public KeyStore.SecretKeyEntry(javax.crypto.SecretKey);
+ method public javax.crypto.SecretKey getSecretKey();
+ }
+
+ public static final class KeyStore.TrustedCertificateEntry implements java.security.KeyStore.Entry {
+ ctor public KeyStore.TrustedCertificateEntry(java.security.cert.Certificate);
+ method public java.security.cert.Certificate getTrustedCertificate();
+ }
+
+ public class KeyStoreException extends java.security.GeneralSecurityException {
+ ctor public KeyStoreException();
+ ctor public KeyStoreException(java.lang.String);
+ ctor public KeyStoreException(java.lang.String, java.lang.Throwable);
+ ctor public KeyStoreException(java.lang.Throwable);
+ }
+
+ public abstract class KeyStoreSpi {
+ ctor public KeyStoreSpi();
+ method public abstract java.util.Enumeration<java.lang.String> engineAliases();
+ method public abstract boolean engineContainsAlias(java.lang.String);
+ method public abstract void engineDeleteEntry(java.lang.String) throws java.security.KeyStoreException;
+ method public boolean engineEntryInstanceOf(java.lang.String, java.lang.Class<? extends java.security.KeyStore.Entry>);
+ method public abstract java.security.cert.Certificate engineGetCertificate(java.lang.String);
+ method public abstract java.lang.String engineGetCertificateAlias(java.security.cert.Certificate);
+ method public abstract java.security.cert.Certificate[] engineGetCertificateChain(java.lang.String);
+ method public abstract java.util.Date engineGetCreationDate(java.lang.String);
+ method public java.security.KeyStore.Entry engineGetEntry(java.lang.String, java.security.KeyStore.ProtectionParameter) throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableEntryException;
+ method public abstract java.security.Key engineGetKey(java.lang.String, char[]) throws java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ method public abstract boolean engineIsCertificateEntry(java.lang.String);
+ method public abstract boolean engineIsKeyEntry(java.lang.String);
+ method public abstract void engineLoad(java.io.InputStream, char[]) throws java.security.cert.CertificateException, java.io.IOException, java.security.NoSuchAlgorithmException;
+ method public void engineLoad(java.security.KeyStore.LoadStoreParameter) throws java.security.cert.CertificateException, java.io.IOException, java.security.NoSuchAlgorithmException;
+ method public abstract void engineSetCertificateEntry(java.lang.String, java.security.cert.Certificate) throws java.security.KeyStoreException;
+ method public void engineSetEntry(java.lang.String, java.security.KeyStore.Entry, java.security.KeyStore.ProtectionParameter) throws java.security.KeyStoreException;
+ method public abstract void engineSetKeyEntry(java.lang.String, java.security.Key, char[], java.security.cert.Certificate[]) throws java.security.KeyStoreException;
+ method public abstract void engineSetKeyEntry(java.lang.String, byte[], java.security.cert.Certificate[]) throws java.security.KeyStoreException;
+ method public abstract int engineSize();
+ method public abstract void engineStore(java.io.OutputStream, char[]) throws java.security.cert.CertificateException, java.io.IOException, java.security.NoSuchAlgorithmException;
+ method public void engineStore(java.security.KeyStore.LoadStoreParameter) throws java.security.cert.CertificateException, java.io.IOException, java.security.NoSuchAlgorithmException;
+ }
+
+ public abstract class MessageDigest extends java.security.MessageDigestSpi {
+ ctor protected MessageDigest(java.lang.String);
+ method public byte[] digest();
+ method public int digest(byte[], int, int) throws java.security.DigestException;
+ method public byte[] digest(byte[]);
+ method public final java.lang.String getAlgorithm();
+ method public final int getDigestLength();
+ method public static java.security.MessageDigest getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.MessageDigest getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.MessageDigest getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public static boolean isEqual(byte[], byte[]);
+ method public void reset();
+ method public void update(byte);
+ method public void update(byte[], int, int);
+ method public void update(byte[]);
+ method public final void update(java.nio.ByteBuffer);
+ }
+
+ public abstract class MessageDigestSpi {
+ ctor public MessageDigestSpi();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method protected abstract byte[] engineDigest();
+ method protected int engineDigest(byte[], int, int) throws java.security.DigestException;
+ method protected int engineGetDigestLength();
+ method protected abstract void engineReset();
+ method protected abstract void engineUpdate(byte);
+ method protected abstract void engineUpdate(byte[], int, int);
+ method protected void engineUpdate(java.nio.ByteBuffer);
+ }
+
+ public class NoSuchAlgorithmException extends java.security.GeneralSecurityException {
+ ctor public NoSuchAlgorithmException();
+ ctor public NoSuchAlgorithmException(java.lang.String);
+ ctor public NoSuchAlgorithmException(java.lang.String, java.lang.Throwable);
+ ctor public NoSuchAlgorithmException(java.lang.Throwable);
+ }
+
+ public class NoSuchProviderException extends java.security.GeneralSecurityException {
+ ctor public NoSuchProviderException();
+ ctor public NoSuchProviderException(java.lang.String);
+ }
+
+ public abstract class Permission implements java.security.Guard java.io.Serializable {
+ ctor public Permission(java.lang.String);
+ method public void checkGuard(java.lang.Object) throws java.lang.SecurityException;
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract java.lang.String getActions();
+ method public final java.lang.String getName();
+ method public abstract int hashCode();
+ method public abstract boolean implies(java.security.Permission);
+ method public java.security.PermissionCollection newPermissionCollection();
+ }
+
+ public abstract class PermissionCollection implements java.io.Serializable {
+ ctor public PermissionCollection();
+ method public abstract void add(java.security.Permission);
+ method public abstract java.util.Enumeration<java.security.Permission> elements();
+ method public abstract boolean implies(java.security.Permission);
+ method public boolean isReadOnly();
+ method public void setReadOnly();
+ }
+
+ public final class Permissions extends java.security.PermissionCollection implements java.io.Serializable {
+ ctor public Permissions();
+ method public void add(java.security.Permission);
+ method public java.util.Enumeration<java.security.Permission> elements();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public abstract class Policy {
+ ctor public Policy();
+ method public static java.security.Policy getInstance(java.lang.String, java.security.Policy.Parameters) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.Policy getInstance(java.lang.String, java.security.Policy.Parameters, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.Policy getInstance(java.lang.String, java.security.Policy.Parameters, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public java.security.Policy.Parameters getParameters();
+ method public java.security.PermissionCollection getPermissions(java.security.CodeSource);
+ method public java.security.PermissionCollection getPermissions(java.security.ProtectionDomain);
+ method public static java.security.Policy getPolicy();
+ method public java.security.Provider getProvider();
+ method public java.lang.String getType();
+ method public boolean implies(java.security.ProtectionDomain, java.security.Permission);
+ method public void refresh();
+ method public static void setPolicy(java.security.Policy);
+ field public static final java.security.PermissionCollection UNSUPPORTED_EMPTY_COLLECTION;
+ }
+
+ public static abstract interface Policy.Parameters {
+ }
+
+ public abstract class PolicySpi {
+ ctor public PolicySpi();
+ method protected java.security.PermissionCollection engineGetPermissions(java.security.CodeSource);
+ method protected java.security.PermissionCollection engineGetPermissions(java.security.ProtectionDomain);
+ method protected abstract boolean engineImplies(java.security.ProtectionDomain, java.security.Permission);
+ method protected void engineRefresh();
+ }
+
+ public abstract interface Principal {
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract java.lang.String getName();
+ method public abstract int hashCode();
+ method public abstract java.lang.String toString();
+ }
+
+ public abstract interface PrivateKey implements java.security.Key {
+ field public static final long serialVersionUID = 6034044314589513430L; // 0x53bd3b559a12c6d6L
+ }
+
+ public abstract interface PrivilegedAction {
+ method public abstract T run();
+ }
+
+ public class PrivilegedActionException extends java.lang.Exception {
+ ctor public PrivilegedActionException(java.lang.Exception);
+ method public java.lang.Exception getException();
+ }
+
+ public abstract interface PrivilegedExceptionAction {
+ method public abstract T run() throws java.lang.Exception;
+ }
+
+ public class ProtectionDomain {
+ ctor public ProtectionDomain(java.security.CodeSource, java.security.PermissionCollection);
+ ctor public ProtectionDomain(java.security.CodeSource, java.security.PermissionCollection, java.lang.ClassLoader, java.security.Principal[]);
+ method public final java.lang.ClassLoader getClassLoader();
+ method public final java.security.CodeSource getCodeSource();
+ method public final java.security.PermissionCollection getPermissions();
+ method public final java.security.Principal[] getPrincipals();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public abstract class Provider extends java.util.Properties {
+ ctor protected Provider(java.lang.String, double, java.lang.String);
+ method public java.lang.String getInfo();
+ method public java.lang.String getName();
+ method public synchronized java.security.Provider.Service getService(java.lang.String, java.lang.String);
+ method public synchronized java.util.Set<java.security.Provider.Service> getServices();
+ method public double getVersion();
+ method public synchronized java.lang.Object put(java.lang.Object, java.lang.Object);
+ method public synchronized void putAll(java.util.Map<?, ?>);
+ method protected synchronized void putService(java.security.Provider.Service);
+ method protected synchronized void removeService(java.security.Provider.Service);
+ }
+
+ public static class Provider.Service {
+ ctor public Provider.Service(java.security.Provider, java.lang.String, java.lang.String, java.lang.String, java.util.List<java.lang.String>, java.util.Map<java.lang.String, java.lang.String>);
+ method public final java.lang.String getAlgorithm();
+ method public final java.lang.String getAttribute(java.lang.String);
+ method public final java.lang.String getClassName();
+ method public final java.security.Provider getProvider();
+ method public final java.lang.String getType();
+ method public java.lang.Object newInstance(java.lang.Object) throws java.security.NoSuchAlgorithmException;
+ method public boolean supportsParameter(java.lang.Object);
+ }
+
+ public class ProviderException extends java.lang.RuntimeException {
+ ctor public ProviderException();
+ ctor public ProviderException(java.lang.String);
+ ctor public ProviderException(java.lang.String, java.lang.Throwable);
+ ctor public ProviderException(java.lang.Throwable);
+ }
+
+ public abstract interface PublicKey implements java.security.Key {
+ field public static final long serialVersionUID = 7187392471159151072L; // 0x63bebf5f40c219e0L
+ }
+
+ public class SecureClassLoader extends java.lang.ClassLoader {
+ ctor protected SecureClassLoader(java.lang.ClassLoader);
+ ctor protected SecureClassLoader();
+ method protected final java.lang.Class<?> defineClass(java.lang.String, byte[], int, int, java.security.CodeSource);
+ method protected final java.lang.Class<?> defineClass(java.lang.String, java.nio.ByteBuffer, java.security.CodeSource);
+ method protected java.security.PermissionCollection getPermissions(java.security.CodeSource);
+ }
+
+ public class SecureRandom extends java.util.Random {
+ ctor public SecureRandom();
+ ctor public SecureRandom(byte[]);
+ ctor protected SecureRandom(java.security.SecureRandomSpi, java.security.Provider);
+ method public byte[] generateSeed(int);
+ method public java.lang.String getAlgorithm();
+ method public static java.security.SecureRandom getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.SecureRandom getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.SecureRandom getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public static byte[] getSeed(int);
+ method protected final int next(int);
+ method public synchronized void setSeed(byte[]);
+ }
+
+ public abstract class SecureRandomSpi implements java.io.Serializable {
+ ctor public SecureRandomSpi();
+ method protected abstract byte[] engineGenerateSeed(int);
+ method protected abstract void engineNextBytes(byte[]);
+ method protected abstract void engineSetSeed(byte[]);
+ }
+
+ public final class Security {
+ method public static int addProvider(java.security.Provider);
+ method public static deprecated java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String);
+ method public static java.util.Set<java.lang.String> getAlgorithms(java.lang.String);
+ method public static java.lang.String getProperty(java.lang.String);
+ method public static java.security.Provider getProvider(java.lang.String);
+ method public static java.security.Provider[] getProviders();
+ method public static java.security.Provider[] getProviders(java.lang.String);
+ method public static java.security.Provider[] getProviders(java.util.Map<java.lang.String, java.lang.String>);
+ method public static synchronized int insertProviderAt(java.security.Provider, int);
+ method public static synchronized void removeProvider(java.lang.String);
+ method public static void setProperty(java.lang.String, java.lang.String);
+ }
+
+ public final class SecurityPermission extends java.security.BasicPermission {
+ ctor public SecurityPermission(java.lang.String);
+ ctor public SecurityPermission(java.lang.String, java.lang.String);
+ }
+
+ public abstract class Signature extends java.security.SignatureSpi {
+ ctor protected Signature(java.lang.String);
+ method public final java.lang.String getAlgorithm();
+ method public java.security.SignatureSpi getCurrentSpi();
+ method public static java.security.Signature getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.Signature getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.Signature getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final deprecated java.lang.Object getParameter(java.lang.String) throws java.security.InvalidParameterException;
+ method public final java.security.AlgorithmParameters getParameters();
+ method public final java.security.Provider getProvider();
+ method public final void initSign(java.security.PrivateKey) throws java.security.InvalidKeyException;
+ method public final void initSign(java.security.PrivateKey, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method public final void initVerify(java.security.PublicKey) throws java.security.InvalidKeyException;
+ method public final void initVerify(java.security.cert.Certificate) throws java.security.InvalidKeyException;
+ method public final deprecated void setParameter(java.lang.String, java.lang.Object) throws java.security.InvalidParameterException;
+ method public final void setParameter(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
+ method public final byte[] sign() throws java.security.SignatureException;
+ method public final int sign(byte[], int, int) throws java.security.SignatureException;
+ method public final void update(byte) throws java.security.SignatureException;
+ method public final void update(byte[]) throws java.security.SignatureException;
+ method public final void update(byte[], int, int) throws java.security.SignatureException;
+ method public final void update(java.nio.ByteBuffer) throws java.security.SignatureException;
+ method public final boolean verify(byte[]) throws java.security.SignatureException;
+ method public final boolean verify(byte[], int, int) throws java.security.SignatureException;
+ field protected static final int SIGN = 2; // 0x2
+ field protected static final int UNINITIALIZED = 0; // 0x0
+ field protected static final int VERIFY = 3; // 0x3
+ field protected int state;
+ }
+
+ public class SignatureException extends java.security.GeneralSecurityException {
+ ctor public SignatureException();
+ ctor public SignatureException(java.lang.String);
+ ctor public SignatureException(java.lang.String, java.lang.Throwable);
+ ctor public SignatureException(java.lang.Throwable);
+ }
+
+ public abstract class SignatureSpi {
+ ctor public SignatureSpi();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method protected abstract deprecated java.lang.Object engineGetParameter(java.lang.String) throws java.security.InvalidParameterException;
+ method protected java.security.AlgorithmParameters engineGetParameters();
+ method protected abstract void engineInitSign(java.security.PrivateKey) throws java.security.InvalidKeyException;
+ method protected void engineInitSign(java.security.PrivateKey, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method protected abstract void engineInitVerify(java.security.PublicKey) throws java.security.InvalidKeyException;
+ method protected abstract deprecated void engineSetParameter(java.lang.String, java.lang.Object) throws java.security.InvalidParameterException;
+ method protected void engineSetParameter(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
+ method protected abstract byte[] engineSign() throws java.security.SignatureException;
+ method protected int engineSign(byte[], int, int) throws java.security.SignatureException;
+ method protected abstract void engineUpdate(byte) throws java.security.SignatureException;
+ method protected abstract void engineUpdate(byte[], int, int) throws java.security.SignatureException;
+ method protected void engineUpdate(java.nio.ByteBuffer);
+ method protected abstract boolean engineVerify(byte[]) throws java.security.SignatureException;
+ method protected boolean engineVerify(byte[], int, int) throws java.security.SignatureException;
+ field protected java.security.SecureRandom appRandom;
+ }
+
+ public final class SignedObject implements java.io.Serializable {
+ ctor public SignedObject(java.io.Serializable, java.security.PrivateKey, java.security.Signature) throws java.io.IOException, java.security.InvalidKeyException, java.security.SignatureException;
+ method public java.lang.String getAlgorithm();
+ method public java.lang.Object getObject() throws java.lang.ClassNotFoundException, java.io.IOException;
+ method public byte[] getSignature();
+ method public boolean verify(java.security.PublicKey, java.security.Signature) throws java.security.InvalidKeyException, java.security.SignatureException;
+ }
+
+ public abstract deprecated class Signer extends java.security.Identity {
+ ctor protected Signer();
+ ctor public Signer(java.lang.String);
+ ctor public Signer(java.lang.String, java.security.IdentityScope) throws java.security.KeyManagementException;
+ method public java.security.PrivateKey getPrivateKey();
+ method public final void setKeyPair(java.security.KeyPair) throws java.security.InvalidParameterException, java.security.KeyException;
+ }
+
+ public final class Timestamp implements java.io.Serializable {
+ ctor public Timestamp(java.util.Date, java.security.cert.CertPath);
+ method public java.security.cert.CertPath getSignerCertPath();
+ method public java.util.Date getTimestamp();
+ }
+
+ public class UnrecoverableEntryException extends java.security.GeneralSecurityException {
+ ctor public UnrecoverableEntryException();
+ ctor public UnrecoverableEntryException(java.lang.String);
+ }
+
+ public class UnrecoverableKeyException extends java.security.UnrecoverableEntryException {
+ ctor public UnrecoverableKeyException();
+ ctor public UnrecoverableKeyException(java.lang.String);
+ }
+
+ public final class UnresolvedPermission extends java.security.Permission implements java.io.Serializable {
+ ctor public UnresolvedPermission(java.lang.String, java.lang.String, java.lang.String, java.security.cert.Certificate[]);
+ method public boolean equals(java.lang.Object);
+ method public java.lang.String getActions();
+ method public java.lang.String getUnresolvedActions();
+ method public java.security.cert.Certificate[] getUnresolvedCerts();
+ method public java.lang.String getUnresolvedName();
+ method public java.lang.String getUnresolvedType();
+ method public int hashCode();
+ method public boolean implies(java.security.Permission);
+ }
+
+}
+
+package java.security.acl {
+
+ public abstract interface Acl implements java.security.acl.Owner {
+ method public abstract boolean addEntry(java.security.Principal, java.security.acl.AclEntry) throws java.security.acl.NotOwnerException;
+ method public abstract boolean checkPermission(java.security.Principal, java.security.acl.Permission);
+ method public abstract java.util.Enumeration<java.security.acl.AclEntry> entries();
+ method public abstract java.lang.String getName();
+ method public abstract java.util.Enumeration<java.security.acl.Permission> getPermissions(java.security.Principal);
+ method public abstract boolean removeEntry(java.security.Principal, java.security.acl.AclEntry) throws java.security.acl.NotOwnerException;
+ method public abstract void setName(java.security.Principal, java.lang.String) throws java.security.acl.NotOwnerException;
+ method public abstract java.lang.String toString();
+ }
+
+ public abstract interface AclEntry implements java.lang.Cloneable {
+ method public abstract boolean addPermission(java.security.acl.Permission);
+ method public abstract boolean checkPermission(java.security.acl.Permission);
+ method public abstract java.lang.Object clone();
+ method public abstract java.security.Principal getPrincipal();
+ method public abstract boolean isNegative();
+ method public abstract java.util.Enumeration<java.security.acl.Permission> permissions();
+ method public abstract boolean removePermission(java.security.acl.Permission);
+ method public abstract void setNegativePermissions();
+ method public abstract boolean setPrincipal(java.security.Principal);
+ method public abstract java.lang.String toString();
+ }
+
+ public class AclNotFoundException extends java.lang.Exception {
+ ctor public AclNotFoundException();
+ }
+
+ public abstract interface Group implements java.security.Principal {
+ method public abstract boolean addMember(java.security.Principal);
+ method public abstract boolean isMember(java.security.Principal);
+ method public abstract java.util.Enumeration<? extends java.security.Principal> members();
+ method public abstract boolean removeMember(java.security.Principal);
+ }
+
+ public class LastOwnerException extends java.lang.Exception {
+ ctor public LastOwnerException();
+ }
+
+ public class NotOwnerException extends java.lang.Exception {
+ ctor public NotOwnerException();
+ }
+
+ public abstract interface Owner {
+ method public abstract boolean addOwner(java.security.Principal, java.security.Principal) throws java.security.acl.NotOwnerException;
+ method public abstract boolean deleteOwner(java.security.Principal, java.security.Principal) throws java.security.acl.LastOwnerException, java.security.acl.NotOwnerException;
+ method public abstract boolean isOwner(java.security.Principal);
+ }
+
+ public abstract interface Permission {
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract java.lang.String toString();
+ }
+
+}
+
+package java.security.cert {
+
+ public abstract class CRL {
+ ctor protected CRL(java.lang.String);
+ method public final java.lang.String getType();
+ method public abstract boolean isRevoked(java.security.cert.Certificate);
+ method public abstract java.lang.String toString();
+ }
+
+ public class CRLException extends java.security.GeneralSecurityException {
+ ctor public CRLException();
+ ctor public CRLException(java.lang.String);
+ ctor public CRLException(java.lang.String, java.lang.Throwable);
+ ctor public CRLException(java.lang.Throwable);
+ }
+
+ public final class CRLReason extends java.lang.Enum {
+ method public static java.security.cert.CRLReason valueOf(java.lang.String);
+ method public static final java.security.cert.CRLReason[] values();
+ enum_constant public static final java.security.cert.CRLReason AA_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason AFFILIATION_CHANGED;
+ enum_constant public static final java.security.cert.CRLReason CA_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason CERTIFICATE_HOLD;
+ enum_constant public static final java.security.cert.CRLReason CESSATION_OF_OPERATION;
+ enum_constant public static final java.security.cert.CRLReason KEY_COMPROMISE;
+ enum_constant public static final java.security.cert.CRLReason PRIVILEGE_WITHDRAWN;
+ enum_constant public static final java.security.cert.CRLReason REMOVE_FROM_CRL;
+ enum_constant public static final java.security.cert.CRLReason SUPERSEDED;
+ enum_constant public static final java.security.cert.CRLReason UNSPECIFIED;
+ enum_constant public static final java.security.cert.CRLReason UNUSED;
+ }
+
+ public abstract interface CRLSelector implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ method public abstract boolean match(java.security.cert.CRL);
+ }
+
+ public abstract class CertPath implements java.io.Serializable {
+ ctor protected CertPath(java.lang.String);
+ method public abstract java.util.List<? extends java.security.cert.Certificate> getCertificates();
+ method public abstract byte[] getEncoded() throws java.security.cert.CertificateEncodingException;
+ method public abstract byte[] getEncoded(java.lang.String) throws java.security.cert.CertificateEncodingException;
+ method public abstract java.util.Iterator<java.lang.String> getEncodings();
+ method public java.lang.String getType();
+ method protected java.lang.Object writeReplace() throws java.io.ObjectStreamException;
+ }
+
+ protected static class CertPath.CertPathRep implements java.io.Serializable {
+ ctor protected CertPath.CertPathRep(java.lang.String, byte[]);
+ method protected java.lang.Object readResolve() throws java.io.ObjectStreamException;
+ }
+
+ public class CertPathBuilder {
+ ctor protected CertPathBuilder(java.security.cert.CertPathBuilderSpi, java.security.Provider, java.lang.String);
+ method public final java.security.cert.CertPathBuilderResult build(java.security.cert.CertPathParameters) throws java.security.cert.CertPathBuilderException, java.security.InvalidAlgorithmParameterException;
+ method public final java.lang.String getAlgorithm();
+ method public static final java.lang.String getDefaultType();
+ method public static java.security.cert.CertPathBuilder getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.cert.CertPathBuilder getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ }
+
+ public class CertPathBuilderException extends java.security.GeneralSecurityException {
+ ctor public CertPathBuilderException();
+ ctor public CertPathBuilderException(java.lang.String);
+ ctor public CertPathBuilderException(java.lang.Throwable);
+ ctor public CertPathBuilderException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract interface CertPathBuilderResult implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ method public abstract java.security.cert.CertPath getCertPath();
+ }
+
+ public abstract class CertPathBuilderSpi {
+ ctor public CertPathBuilderSpi();
+ method public abstract java.security.cert.CertPathBuilderResult engineBuild(java.security.cert.CertPathParameters) throws java.security.cert.CertPathBuilderException, java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract interface CertPathParameters implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ }
+
+ public class CertPathValidator {
+ ctor protected CertPathValidator(java.security.cert.CertPathValidatorSpi, java.security.Provider, java.lang.String);
+ method public final java.lang.String getAlgorithm();
+ method public static final java.lang.String getDefaultType();
+ method public static java.security.cert.CertPathValidator getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.cert.CertPathValidator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public final java.security.cert.CertPathValidatorResult validate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException;
+ }
+
+ public class CertPathValidatorException extends java.security.GeneralSecurityException {
+ ctor public CertPathValidatorException();
+ ctor public CertPathValidatorException(java.lang.String);
+ ctor public CertPathValidatorException(java.lang.Throwable);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int);
+ ctor public CertPathValidatorException(java.lang.String, java.lang.Throwable, java.security.cert.CertPath, int, java.security.cert.CertPathValidatorException.Reason);
+ method public java.security.cert.CertPath getCertPath();
+ method public int getIndex();
+ method public java.security.cert.CertPathValidatorException.Reason getReason();
+ }
+
+ public static final class CertPathValidatorException.BasicReason extends java.lang.Enum implements java.security.cert.CertPathValidatorException.Reason {
+ method public static java.security.cert.CertPathValidatorException.BasicReason valueOf(java.lang.String);
+ method public static final java.security.cert.CertPathValidatorException.BasicReason[] values();
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason ALGORITHM_CONSTRAINED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason EXPIRED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason INVALID_SIGNATURE;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason NOT_YET_VALID;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason REVOKED;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason UNDETERMINED_REVOCATION_STATUS;
+ enum_constant public static final java.security.cert.CertPathValidatorException.BasicReason UNSPECIFIED;
+ }
+
+ public static abstract interface CertPathValidatorException.Reason implements java.io.Serializable {
+ }
+
+ public abstract interface CertPathValidatorResult implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ }
+
+ public abstract class CertPathValidatorSpi {
+ ctor public CertPathValidatorSpi();
+ method public abstract java.security.cert.CertPathValidatorResult engineValidate(java.security.cert.CertPath, java.security.cert.CertPathParameters) throws java.security.cert.CertPathValidatorException, java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract interface CertSelector implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ method public abstract boolean match(java.security.cert.Certificate);
+ }
+
+ public class CertStore {
+ ctor protected CertStore(java.security.cert.CertStoreSpi, java.security.Provider, java.lang.String, java.security.cert.CertStoreParameters);
+ method public final java.util.Collection<? extends java.security.cert.CRL> getCRLs(java.security.cert.CRLSelector) throws java.security.cert.CertStoreException;
+ method public final java.security.cert.CertStoreParameters getCertStoreParameters();
+ method public final java.util.Collection<? extends java.security.cert.Certificate> getCertificates(java.security.cert.CertSelector) throws java.security.cert.CertStoreException;
+ method public static final java.lang.String getDefaultType();
+ method public static java.security.cert.CertStore getInstance(java.lang.String, java.security.cert.CertStoreParameters) throws java.security.InvalidAlgorithmParameterException, java.security.NoSuchAlgorithmException;
+ method public static java.security.cert.CertStore getInstance(java.lang.String, java.security.cert.CertStoreParameters, java.lang.String) throws java.security.InvalidAlgorithmParameterException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static java.security.cert.CertStore getInstance(java.lang.String, java.security.cert.CertStoreParameters, java.security.Provider) throws java.security.InvalidAlgorithmParameterException, java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public final java.lang.String getType();
+ }
+
+ public class CertStoreException extends java.security.GeneralSecurityException {
+ ctor public CertStoreException();
+ ctor public CertStoreException(java.lang.String);
+ ctor public CertStoreException(java.lang.Throwable);
+ ctor public CertStoreException(java.lang.String, java.lang.Throwable);
+ }
+
+ public abstract interface CertStoreParameters implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ }
+
+ public abstract class CertStoreSpi {
+ ctor public CertStoreSpi(java.security.cert.CertStoreParameters) throws java.security.InvalidAlgorithmParameterException;
+ method public abstract java.util.Collection<? extends java.security.cert.CRL> engineGetCRLs(java.security.cert.CRLSelector) throws java.security.cert.CertStoreException;
+ method public abstract java.util.Collection<? extends java.security.cert.Certificate> engineGetCertificates(java.security.cert.CertSelector) throws java.security.cert.CertStoreException;
+ }
+
+ public abstract class Certificate implements java.io.Serializable {
+ ctor protected Certificate(java.lang.String);
+ method public abstract byte[] getEncoded() throws java.security.cert.CertificateEncodingException;
+ method public abstract java.security.PublicKey getPublicKey();
+ method public final java.lang.String getType();
+ method public abstract java.lang.String toString();
+ method public abstract void verify(java.security.PublicKey) throws java.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method public abstract void verify(java.security.PublicKey, java.lang.String) throws java.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method protected java.lang.Object writeReplace() throws java.io.ObjectStreamException;
+ }
+
+ protected static class Certificate.CertificateRep implements java.io.Serializable {
+ ctor protected Certificate.CertificateRep(java.lang.String, byte[]);
+ method protected java.lang.Object readResolve() throws java.io.ObjectStreamException;
+ }
+
+ public class CertificateEncodingException extends java.security.cert.CertificateException {
+ ctor public CertificateEncodingException();
+ ctor public CertificateEncodingException(java.lang.String);
+ ctor public CertificateEncodingException(java.lang.String, java.lang.Throwable);
+ ctor public CertificateEncodingException(java.lang.Throwable);
+ }
+
+ public class CertificateException extends java.security.GeneralSecurityException {
+ ctor public CertificateException();
+ ctor public CertificateException(java.lang.String);
+ ctor public CertificateException(java.lang.String, java.lang.Throwable);
+ ctor public CertificateException(java.lang.Throwable);
+ }
+
+ public class CertificateExpiredException extends java.security.cert.CertificateException {
+ ctor public CertificateExpiredException();
+ ctor public CertificateExpiredException(java.lang.String);
+ }
+
+ public class CertificateFactory {
+ ctor protected CertificateFactory(java.security.cert.CertificateFactorySpi, java.security.Provider, java.lang.String);
+ method public final java.security.cert.CRL generateCRL(java.io.InputStream) throws java.security.cert.CRLException;
+ method public final java.util.Collection<? extends java.security.cert.CRL> generateCRLs(java.io.InputStream) throws java.security.cert.CRLException;
+ method public final java.security.cert.CertPath generateCertPath(java.io.InputStream) throws java.security.cert.CertificateException;
+ method public final java.security.cert.CertPath generateCertPath(java.io.InputStream, java.lang.String) throws java.security.cert.CertificateException;
+ method public final java.security.cert.CertPath generateCertPath(java.util.List<? extends java.security.cert.Certificate>) throws java.security.cert.CertificateException;
+ method public final java.security.cert.Certificate generateCertificate(java.io.InputStream) throws java.security.cert.CertificateException;
+ method public final java.util.Collection<? extends java.security.cert.Certificate> generateCertificates(java.io.InputStream) throws java.security.cert.CertificateException;
+ method public final java.util.Iterator<java.lang.String> getCertPathEncodings();
+ method public static final java.security.cert.CertificateFactory getInstance(java.lang.String) throws java.security.cert.CertificateException;
+ method public static final java.security.cert.CertificateFactory getInstance(java.lang.String, java.lang.String) throws java.security.cert.CertificateException, java.security.NoSuchProviderException;
+ method public static final java.security.cert.CertificateFactory getInstance(java.lang.String, java.security.Provider) throws java.security.cert.CertificateException;
+ method public final java.security.Provider getProvider();
+ method public final java.lang.String getType();
+ }
+
+ public abstract class CertificateFactorySpi {
+ ctor public CertificateFactorySpi();
+ method public abstract java.security.cert.CRL engineGenerateCRL(java.io.InputStream) throws java.security.cert.CRLException;
+ method public abstract java.util.Collection<? extends java.security.cert.CRL> engineGenerateCRLs(java.io.InputStream) throws java.security.cert.CRLException;
+ method public java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream) throws java.security.cert.CertificateException;
+ method public java.security.cert.CertPath engineGenerateCertPath(java.io.InputStream, java.lang.String) throws java.security.cert.CertificateException;
+ method public java.security.cert.CertPath engineGenerateCertPath(java.util.List<? extends java.security.cert.Certificate>) throws java.security.cert.CertificateException;
+ method public abstract java.security.cert.Certificate engineGenerateCertificate(java.io.InputStream) throws java.security.cert.CertificateException;
+ method public abstract java.util.Collection<? extends java.security.cert.Certificate> engineGenerateCertificates(java.io.InputStream) throws java.security.cert.CertificateException;
+ method public java.util.Iterator<java.lang.String> engineGetCertPathEncodings();
+ }
+
+ public class CertificateNotYetValidException extends java.security.cert.CertificateException {
+ ctor public CertificateNotYetValidException();
+ ctor public CertificateNotYetValidException(java.lang.String);
+ }
+
+ public class CertificateParsingException extends java.security.cert.CertificateException {
+ ctor public CertificateParsingException();
+ ctor public CertificateParsingException(java.lang.String);
+ ctor public CertificateParsingException(java.lang.String, java.lang.Throwable);
+ ctor public CertificateParsingException(java.lang.Throwable);
+ }
+
+ public class CertificateRevokedException extends java.security.cert.CertificateException {
+ ctor public CertificateRevokedException(java.util.Date, java.security.cert.CRLReason, javax.security.auth.x500.X500Principal, java.util.Map<java.lang.String, java.security.cert.Extension>);
+ method public javax.security.auth.x500.X500Principal getAuthorityName();
+ method public java.util.Map<java.lang.String, java.security.cert.Extension> getExtensions();
+ method public java.util.Date getInvalidityDate();
+ method public java.util.Date getRevocationDate();
+ method public java.security.cert.CRLReason getRevocationReason();
+ }
+
+ public class CollectionCertStoreParameters implements java.security.cert.CertStoreParameters {
+ ctor public CollectionCertStoreParameters(java.util.Collection<?>);
+ ctor public CollectionCertStoreParameters();
+ method public java.lang.Object clone();
+ method public java.util.Collection<?> getCollection();
+ }
+
+ public abstract interface Extension {
+ method public abstract void encode(java.io.OutputStream) throws java.io.IOException;
+ method public abstract java.lang.String getId();
+ method public abstract byte[] getValue();
+ method public abstract boolean isCritical();
+ }
+
+ public class LDAPCertStoreParameters implements java.security.cert.CertStoreParameters {
+ ctor public LDAPCertStoreParameters(java.lang.String, int);
+ ctor public LDAPCertStoreParameters(java.lang.String);
+ ctor public LDAPCertStoreParameters();
+ method public java.lang.Object clone();
+ method public int getPort();
+ method public java.lang.String getServerName();
+ }
+
+ public class PKIXBuilderParameters extends java.security.cert.PKIXParameters {
+ ctor public PKIXBuilderParameters(java.util.Set<java.security.cert.TrustAnchor>, java.security.cert.CertSelector) throws java.security.InvalidAlgorithmParameterException;
+ ctor public PKIXBuilderParameters(java.security.KeyStore, java.security.cert.CertSelector) throws java.security.InvalidAlgorithmParameterException, java.security.KeyStoreException;
+ method public int getMaxPathLength();
+ method public void setMaxPathLength(int);
+ }
+
+ public class PKIXCertPathBuilderResult extends java.security.cert.PKIXCertPathValidatorResult implements java.security.cert.CertPathBuilderResult {
+ ctor public PKIXCertPathBuilderResult(java.security.cert.CertPath, java.security.cert.TrustAnchor, java.security.cert.PolicyNode, java.security.PublicKey);
+ method public java.security.cert.CertPath getCertPath();
+ }
+
+ public abstract class PKIXCertPathChecker implements java.lang.Cloneable {
+ ctor protected PKIXCertPathChecker();
+ method public abstract void check(java.security.cert.Certificate, java.util.Collection<java.lang.String>) throws java.security.cert.CertPathValidatorException;
+ method public java.lang.Object clone();
+ method public abstract java.util.Set<java.lang.String> getSupportedExtensions();
+ method public abstract void init(boolean) throws java.security.cert.CertPathValidatorException;
+ method public abstract boolean isForwardCheckingSupported();
+ }
+
+ public class PKIXCertPathValidatorResult implements java.security.cert.CertPathValidatorResult {
+ ctor public PKIXCertPathValidatorResult(java.security.cert.TrustAnchor, java.security.cert.PolicyNode, java.security.PublicKey);
+ method public java.lang.Object clone();
+ method public java.security.cert.PolicyNode getPolicyTree();
+ method public java.security.PublicKey getPublicKey();
+ method public java.security.cert.TrustAnchor getTrustAnchor();
+ }
+
+ public class PKIXParameters implements java.security.cert.CertPathParameters {
+ ctor public PKIXParameters(java.util.Set<java.security.cert.TrustAnchor>) throws java.security.InvalidAlgorithmParameterException;
+ ctor public PKIXParameters(java.security.KeyStore) throws java.security.InvalidAlgorithmParameterException, java.security.KeyStoreException;
+ method public void addCertPathChecker(java.security.cert.PKIXCertPathChecker);
+ method public void addCertStore(java.security.cert.CertStore);
+ method public java.lang.Object clone();
+ method public java.util.List<java.security.cert.PKIXCertPathChecker> getCertPathCheckers();
+ method public java.util.List<java.security.cert.CertStore> getCertStores();
+ method public java.util.Date getDate();
+ method public java.util.Set<java.lang.String> getInitialPolicies();
+ method public boolean getPolicyQualifiersRejected();
+ method public java.lang.String getSigProvider();
+ method public java.security.cert.CertSelector getTargetCertConstraints();
+ method public java.util.Set<java.security.cert.TrustAnchor> getTrustAnchors();
+ method public boolean isAnyPolicyInhibited();
+ method public boolean isExplicitPolicyRequired();
+ method public boolean isPolicyMappingInhibited();
+ method public boolean isRevocationEnabled();
+ method public void setAnyPolicyInhibited(boolean);
+ method public void setCertPathCheckers(java.util.List<java.security.cert.PKIXCertPathChecker>);
+ method public void setCertStores(java.util.List<java.security.cert.CertStore>);
+ method public void setDate(java.util.Date);
+ method public void setExplicitPolicyRequired(boolean);
+ method public void setInitialPolicies(java.util.Set<java.lang.String>);
+ method public void setPolicyMappingInhibited(boolean);
+ method public void setPolicyQualifiersRejected(boolean);
+ method public void setRevocationEnabled(boolean);
+ method public void setSigProvider(java.lang.String);
+ method public void setTargetCertConstraints(java.security.cert.CertSelector);
+ method public void setTrustAnchors(java.util.Set<java.security.cert.TrustAnchor>) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public final class PKIXReason extends java.lang.Enum implements java.security.cert.CertPathValidatorException.Reason {
+ method public static java.security.cert.PKIXReason valueOf(java.lang.String);
+ method public static final java.security.cert.PKIXReason[] values();
+ enum_constant public static final java.security.cert.PKIXReason INVALID_KEY_USAGE;
+ enum_constant public static final java.security.cert.PKIXReason INVALID_NAME;
+ enum_constant public static final java.security.cert.PKIXReason INVALID_POLICY;
+ enum_constant public static final java.security.cert.PKIXReason NAME_CHAINING;
+ enum_constant public static final java.security.cert.PKIXReason NOT_CA_CERT;
+ enum_constant public static final java.security.cert.PKIXReason NO_TRUST_ANCHOR;
+ enum_constant public static final java.security.cert.PKIXReason PATH_TOO_LONG;
+ enum_constant public static final java.security.cert.PKIXReason UNRECOGNIZED_CRIT_EXT;
+ }
+
+ public abstract interface PolicyNode {
+ method public abstract java.util.Iterator<? extends java.security.cert.PolicyNode> getChildren();
+ method public abstract int getDepth();
+ method public abstract java.util.Set<java.lang.String> getExpectedPolicies();
+ method public abstract java.security.cert.PolicyNode getParent();
+ method public abstract java.util.Set<? extends java.security.cert.PolicyQualifierInfo> getPolicyQualifiers();
+ method public abstract java.lang.String getValidPolicy();
+ method public abstract boolean isCritical();
+ }
+
+ public class PolicyQualifierInfo {
+ ctor public PolicyQualifierInfo(byte[]) throws java.io.IOException;
+ method public final byte[] getEncoded();
+ method public final byte[] getPolicyQualifier();
+ method public final java.lang.String getPolicyQualifierId();
+ }
+
+ public class TrustAnchor {
+ ctor public TrustAnchor(java.security.cert.X509Certificate, byte[]);
+ ctor public TrustAnchor(javax.security.auth.x500.X500Principal, java.security.PublicKey, byte[]);
+ ctor public TrustAnchor(java.lang.String, java.security.PublicKey, byte[]);
+ method public final javax.security.auth.x500.X500Principal getCA();
+ method public final java.lang.String getCAName();
+ method public final java.security.PublicKey getCAPublicKey();
+ method public final byte[] getNameConstraints();
+ method public final java.security.cert.X509Certificate getTrustedCert();
+ }
+
+ public abstract class X509CRL extends java.security.cert.CRL implements java.security.cert.X509Extension {
+ ctor protected X509CRL();
+ method public abstract byte[] getEncoded() throws java.security.cert.CRLException;
+ method public abstract java.security.Principal getIssuerDN();
+ method public javax.security.auth.x500.X500Principal getIssuerX500Principal();
+ method public abstract java.util.Date getNextUpdate();
+ method public abstract java.security.cert.X509CRLEntry getRevokedCertificate(java.math.BigInteger);
+ method public java.security.cert.X509CRLEntry getRevokedCertificate(java.security.cert.X509Certificate);
+ method public abstract java.util.Set<? extends java.security.cert.X509CRLEntry> getRevokedCertificates();
+ method public abstract java.lang.String getSigAlgName();
+ method public abstract java.lang.String getSigAlgOID();
+ method public abstract byte[] getSigAlgParams();
+ method public abstract byte[] getSignature();
+ method public abstract byte[] getTBSCertList() throws java.security.cert.CRLException;
+ method public abstract java.util.Date getThisUpdate();
+ method public abstract int getVersion();
+ method public abstract void verify(java.security.PublicKey) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method public abstract void verify(java.security.PublicKey, java.lang.String) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ }
+
+ public abstract class X509CRLEntry implements java.security.cert.X509Extension {
+ ctor public X509CRLEntry();
+ method public javax.security.auth.x500.X500Principal getCertificateIssuer();
+ method public abstract byte[] getEncoded() throws java.security.cert.CRLException;
+ method public abstract java.util.Date getRevocationDate();
+ method public java.security.cert.CRLReason getRevocationReason();
+ method public abstract java.math.BigInteger getSerialNumber();
+ method public abstract boolean hasExtensions();
+ method public abstract java.lang.String toString();
+ }
+
+ public class X509CRLSelector implements java.security.cert.CRLSelector {
+ ctor public X509CRLSelector();
+ method public void addIssuer(javax.security.auth.x500.X500Principal);
+ method public void addIssuerName(java.lang.String) throws java.io.IOException;
+ method public void addIssuerName(byte[]) throws java.io.IOException;
+ method public java.lang.Object clone();
+ method public java.security.cert.X509Certificate getCertificateChecking();
+ method public java.util.Date getDateAndTime();
+ method public java.util.Collection<java.lang.Object> getIssuerNames();
+ method public java.util.Collection<javax.security.auth.x500.X500Principal> getIssuers();
+ method public java.math.BigInteger getMaxCRL();
+ method public java.math.BigInteger getMinCRL();
+ method public boolean match(java.security.cert.CRL);
+ method public void setCertificateChecking(java.security.cert.X509Certificate);
+ method public void setDateAndTime(java.util.Date);
+ method public void setIssuerNames(java.util.Collection<?>) throws java.io.IOException;
+ method public void setIssuers(java.util.Collection<javax.security.auth.x500.X500Principal>);
+ method public void setMaxCRLNumber(java.math.BigInteger);
+ method public void setMinCRLNumber(java.math.BigInteger);
+ }
+
+ public class X509CertSelector implements java.security.cert.CertSelector {
+ ctor public X509CertSelector();
+ method public void addPathToName(int, java.lang.String) throws java.io.IOException;
+ method public void addPathToName(int, byte[]) throws java.io.IOException;
+ method public void addSubjectAlternativeName(int, java.lang.String) throws java.io.IOException;
+ method public void addSubjectAlternativeName(int, byte[]) throws java.io.IOException;
+ method public java.lang.Object clone();
+ method public byte[] getAuthorityKeyIdentifier();
+ method public int getBasicConstraints();
+ method public java.security.cert.X509Certificate getCertificate();
+ method public java.util.Date getCertificateValid();
+ method public java.util.Set<java.lang.String> getExtendedKeyUsage();
+ method public javax.security.auth.x500.X500Principal getIssuer();
+ method public byte[] getIssuerAsBytes() throws java.io.IOException;
+ method public java.lang.String getIssuerAsString();
+ method public boolean[] getKeyUsage();
+ method public boolean getMatchAllSubjectAltNames();
+ method public byte[] getNameConstraints();
+ method public java.util.Collection<java.util.List<?>> getPathToNames();
+ method public java.util.Set<java.lang.String> getPolicy();
+ method public java.util.Date getPrivateKeyValid();
+ method public java.math.BigInteger getSerialNumber();
+ method public javax.security.auth.x500.X500Principal getSubject();
+ method public java.util.Collection<java.util.List<?>> getSubjectAlternativeNames();
+ method public byte[] getSubjectAsBytes() throws java.io.IOException;
+ method public java.lang.String getSubjectAsString();
+ method public byte[] getSubjectKeyIdentifier();
+ method public java.security.PublicKey getSubjectPublicKey();
+ method public java.lang.String getSubjectPublicKeyAlgID();
+ method public boolean match(java.security.cert.Certificate);
+ method public void setAuthorityKeyIdentifier(byte[]);
+ method public void setBasicConstraints(int);
+ method public void setCertificate(java.security.cert.X509Certificate);
+ method public void setCertificateValid(java.util.Date);
+ method public void setExtendedKeyUsage(java.util.Set<java.lang.String>) throws java.io.IOException;
+ method public void setIssuer(javax.security.auth.x500.X500Principal);
+ method public void setIssuer(java.lang.String) throws java.io.IOException;
+ method public void setIssuer(byte[]) throws java.io.IOException;
+ method public void setKeyUsage(boolean[]);
+ method public void setMatchAllSubjectAltNames(boolean);
+ method public void setNameConstraints(byte[]) throws java.io.IOException;
+ method public void setPathToNames(java.util.Collection<java.util.List<?>>) throws java.io.IOException;
+ method public void setPolicy(java.util.Set<java.lang.String>) throws java.io.IOException;
+ method public void setPrivateKeyValid(java.util.Date);
+ method public void setSerialNumber(java.math.BigInteger);
+ method public void setSubject(javax.security.auth.x500.X500Principal);
+ method public void setSubject(java.lang.String) throws java.io.IOException;
+ method public void setSubject(byte[]) throws java.io.IOException;
+ method public void setSubjectAlternativeNames(java.util.Collection<java.util.List<?>>) throws java.io.IOException;
+ method public void setSubjectKeyIdentifier(byte[]);
+ method public void setSubjectPublicKey(java.security.PublicKey);
+ method public void setSubjectPublicKey(byte[]) throws java.io.IOException;
+ method public void setSubjectPublicKeyAlgID(java.lang.String) throws java.io.IOException;
+ }
+
+ public abstract class X509Certificate extends java.security.cert.Certificate implements java.security.cert.X509Extension {
+ ctor protected X509Certificate();
+ method public abstract void checkValidity() throws java.security.cert.CertificateExpiredException, java.security.cert.CertificateNotYetValidException;
+ method public abstract void checkValidity(java.util.Date) throws java.security.cert.CertificateExpiredException, java.security.cert.CertificateNotYetValidException;
+ method public abstract int getBasicConstraints();
+ method public java.util.List<java.lang.String> getExtendedKeyUsage() throws java.security.cert.CertificateParsingException;
+ method public java.util.Collection<java.util.List<?>> getIssuerAlternativeNames() throws java.security.cert.CertificateParsingException;
+ method public abstract java.security.Principal getIssuerDN();
+ method public abstract boolean[] getIssuerUniqueID();
+ method public javax.security.auth.x500.X500Principal getIssuerX500Principal();
+ method public abstract boolean[] getKeyUsage();
+ method public abstract java.util.Date getNotAfter();
+ method public abstract java.util.Date getNotBefore();
+ method public abstract java.math.BigInteger getSerialNumber();
+ method public abstract java.lang.String getSigAlgName();
+ method public abstract java.lang.String getSigAlgOID();
+ method public abstract byte[] getSigAlgParams();
+ method public abstract byte[] getSignature();
+ method public java.util.Collection<java.util.List<?>> getSubjectAlternativeNames() throws java.security.cert.CertificateParsingException;
+ method public abstract java.security.Principal getSubjectDN();
+ method public abstract boolean[] getSubjectUniqueID();
+ method public javax.security.auth.x500.X500Principal getSubjectX500Principal();
+ method public abstract byte[] getTBSCertificate() throws java.security.cert.CertificateEncodingException;
+ method public abstract int getVersion();
+ }
+
+ public abstract interface X509Extension {
+ method public abstract java.util.Set<java.lang.String> getCriticalExtensionOIDs();
+ method public abstract byte[] getExtensionValue(java.lang.String);
+ method public abstract java.util.Set<java.lang.String> getNonCriticalExtensionOIDs();
+ method public abstract boolean hasUnsupportedCriticalExtension();
+ }
+
+}
+
+package java.security.interfaces {
+
+ public abstract interface DSAKey {
+ method public abstract java.security.interfaces.DSAParams getParams();
+ }
+
+ public abstract interface DSAKeyPairGenerator {
+ method public abstract void initialize(java.security.interfaces.DSAParams, java.security.SecureRandom) throws java.security.InvalidParameterException;
+ method public abstract void initialize(int, boolean, java.security.SecureRandom) throws java.security.InvalidParameterException;
+ }
+
+ public abstract interface DSAParams {
+ method public abstract java.math.BigInteger getG();
+ method public abstract java.math.BigInteger getP();
+ method public abstract java.math.BigInteger getQ();
+ }
+
+ public abstract interface DSAPrivateKey implements java.security.interfaces.DSAKey java.security.PrivateKey {
+ method public abstract java.math.BigInteger getX();
+ field public static final long serialVersionUID = 7776497482533790279L; // 0x6bebab423b256247L
+ }
+
+ public abstract interface DSAPublicKey implements java.security.interfaces.DSAKey java.security.PublicKey {
+ method public abstract java.math.BigInteger getY();
+ field public static final long serialVersionUID = 1234526332779022332L; // 0x1121eb28ab28c7fcL
+ }
+
+ public abstract interface ECKey {
+ method public abstract java.security.spec.ECParameterSpec getParams();
+ }
+
+ public abstract interface ECPrivateKey implements java.security.interfaces.ECKey java.security.PrivateKey {
+ method public abstract java.math.BigInteger getS();
+ field public static final long serialVersionUID = -7896394956925609184L; // 0x926a5e9fa2435b20L
+ }
+
+ public abstract interface ECPublicKey implements java.security.interfaces.ECKey java.security.PublicKey {
+ method public abstract java.security.spec.ECPoint getW();
+ field public static final long serialVersionUID = -3314988629879632826L; // 0xd1fecb679990cc46L
+ }
+
+ public abstract interface RSAKey {
+ method public abstract java.math.BigInteger getModulus();
+ }
+
+ public abstract interface RSAMultiPrimePrivateCrtKey implements java.security.interfaces.RSAPrivateKey {
+ method public abstract java.math.BigInteger getCrtCoefficient();
+ method public abstract java.security.spec.RSAOtherPrimeInfo[] getOtherPrimeInfo();
+ method public abstract java.math.BigInteger getPrimeExponentP();
+ method public abstract java.math.BigInteger getPrimeExponentQ();
+ method public abstract java.math.BigInteger getPrimeP();
+ method public abstract java.math.BigInteger getPrimeQ();
+ method public abstract java.math.BigInteger getPublicExponent();
+ field public static final long serialVersionUID = 618058533534628008L; // 0x893c8f62dbaf8a8L
+ }
+
+ public abstract interface RSAPrivateCrtKey implements java.security.interfaces.RSAPrivateKey {
+ method public abstract java.math.BigInteger getCrtCoefficient();
+ method public abstract java.math.BigInteger getPrimeExponentP();
+ method public abstract java.math.BigInteger getPrimeExponentQ();
+ method public abstract java.math.BigInteger getPrimeP();
+ method public abstract java.math.BigInteger getPrimeQ();
+ method public abstract java.math.BigInteger getPublicExponent();
+ field public static final long serialVersionUID = -5682214253527700368L; // 0xb124b83df8d1ec70L
+ }
+
+ public abstract interface RSAPrivateKey implements java.security.PrivateKey java.security.interfaces.RSAKey {
+ method public abstract java.math.BigInteger getPrivateExponent();
+ field public static final long serialVersionUID = 5187144804936595022L; // 0x47fc70b7a8c2364eL
+ }
+
+ public abstract interface RSAPublicKey implements java.security.PublicKey java.security.interfaces.RSAKey {
+ method public abstract java.math.BigInteger getPublicExponent();
+ field public static final long serialVersionUID = -8727434096241101194L; // 0x86e1ecedeceab676L
+ }
+
+}
+
+package java.security.spec {
+
+ public abstract interface AlgorithmParameterSpec {
+ }
+
+ public class DSAParameterSpec implements java.security.spec.AlgorithmParameterSpec java.security.interfaces.DSAParams {
+ ctor public DSAParameterSpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getG();
+ method public java.math.BigInteger getP();
+ method public java.math.BigInteger getQ();
+ }
+
+ public class DSAPrivateKeySpec implements java.security.spec.KeySpec {
+ ctor public DSAPrivateKeySpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getG();
+ method public java.math.BigInteger getP();
+ method public java.math.BigInteger getQ();
+ method public java.math.BigInteger getX();
+ }
+
+ public class DSAPublicKeySpec implements java.security.spec.KeySpec {
+ ctor public DSAPublicKeySpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getG();
+ method public java.math.BigInteger getP();
+ method public java.math.BigInteger getQ();
+ method public java.math.BigInteger getY();
+ }
+
+ public abstract interface ECField {
+ method public abstract int getFieldSize();
+ }
+
+ public class ECFieldF2m implements java.security.spec.ECField {
+ ctor public ECFieldF2m(int);
+ ctor public ECFieldF2m(int, java.math.BigInteger);
+ ctor public ECFieldF2m(int, int[]);
+ method public int getFieldSize();
+ method public int getM();
+ method public int[] getMidTermsOfReductionPolynomial();
+ method public java.math.BigInteger getReductionPolynomial();
+ }
+
+ public class ECFieldFp implements java.security.spec.ECField {
+ ctor public ECFieldFp(java.math.BigInteger);
+ method public int getFieldSize();
+ method public java.math.BigInteger getP();
+ }
+
+ public class ECGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public ECGenParameterSpec(java.lang.String);
+ method public java.lang.String getName();
+ }
+
+ public class ECParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public ECParameterSpec(java.security.spec.EllipticCurve, java.security.spec.ECPoint, java.math.BigInteger, int);
+ method public int getCofactor();
+ method public java.security.spec.EllipticCurve getCurve();
+ method public java.security.spec.ECPoint getGenerator();
+ method public java.math.BigInteger getOrder();
+ }
+
+ public class ECPoint {
+ ctor public ECPoint(java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getAffineX();
+ method public java.math.BigInteger getAffineY();
+ field public static final java.security.spec.ECPoint POINT_INFINITY;
+ }
+
+ public class ECPrivateKeySpec implements java.security.spec.KeySpec {
+ ctor public ECPrivateKeySpec(java.math.BigInteger, java.security.spec.ECParameterSpec);
+ method public java.security.spec.ECParameterSpec getParams();
+ method public java.math.BigInteger getS();
+ }
+
+ public class ECPublicKeySpec implements java.security.spec.KeySpec {
+ ctor public ECPublicKeySpec(java.security.spec.ECPoint, java.security.spec.ECParameterSpec);
+ method public java.security.spec.ECParameterSpec getParams();
+ method public java.security.spec.ECPoint getW();
+ }
+
+ public class EllipticCurve {
+ ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger);
+ ctor public EllipticCurve(java.security.spec.ECField, java.math.BigInteger, java.math.BigInteger, byte[]);
+ method public java.math.BigInteger getA();
+ method public java.math.BigInteger getB();
+ method public java.security.spec.ECField getField();
+ method public byte[] getSeed();
+ }
+
+ public abstract class EncodedKeySpec implements java.security.spec.KeySpec {
+ ctor public EncodedKeySpec(byte[]);
+ method public byte[] getEncoded();
+ method public abstract java.lang.String getFormat();
+ }
+
+ public class InvalidKeySpecException extends java.security.GeneralSecurityException {
+ ctor public InvalidKeySpecException();
+ ctor public InvalidKeySpecException(java.lang.String);
+ ctor public InvalidKeySpecException(java.lang.String, java.lang.Throwable);
+ ctor public InvalidKeySpecException(java.lang.Throwable);
+ }
+
+ public class InvalidParameterSpecException extends java.security.GeneralSecurityException {
+ ctor public InvalidParameterSpecException();
+ ctor public InvalidParameterSpecException(java.lang.String);
+ }
+
+ public abstract interface KeySpec {
+ }
+
+ public class MGF1ParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public MGF1ParameterSpec(java.lang.String);
+ method public java.lang.String getDigestAlgorithm();
+ field public static final java.security.spec.MGF1ParameterSpec SHA1;
+ field public static final java.security.spec.MGF1ParameterSpec SHA256;
+ field public static final java.security.spec.MGF1ParameterSpec SHA384;
+ field public static final java.security.spec.MGF1ParameterSpec SHA512;
+ }
+
+ public class PKCS8EncodedKeySpec extends java.security.spec.EncodedKeySpec {
+ ctor public PKCS8EncodedKeySpec(byte[]);
+ method public final java.lang.String getFormat();
+ }
+
+ public class PSSParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public PSSParameterSpec(java.lang.String, java.lang.String, java.security.spec.AlgorithmParameterSpec, int, int);
+ ctor public PSSParameterSpec(int);
+ method public java.lang.String getDigestAlgorithm();
+ method public java.lang.String getMGFAlgorithm();
+ method public java.security.spec.AlgorithmParameterSpec getMGFParameters();
+ method public int getSaltLength();
+ method public int getTrailerField();
+ field public static final java.security.spec.PSSParameterSpec DEFAULT;
+ }
+
+ public class RSAKeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public RSAKeyGenParameterSpec(int, java.math.BigInteger);
+ method public int getKeysize();
+ method public java.math.BigInteger getPublicExponent();
+ field public static final java.math.BigInteger F0;
+ field public static final java.math.BigInteger F4;
+ }
+
+ public class RSAMultiPrimePrivateCrtKeySpec extends java.security.spec.RSAPrivateKeySpec {
+ ctor public RSAMultiPrimePrivateCrtKeySpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.security.spec.RSAOtherPrimeInfo[]);
+ method public java.math.BigInteger getCrtCoefficient();
+ method public java.security.spec.RSAOtherPrimeInfo[] getOtherPrimeInfo();
+ method public java.math.BigInteger getPrimeExponentP();
+ method public java.math.BigInteger getPrimeExponentQ();
+ method public java.math.BigInteger getPrimeP();
+ method public java.math.BigInteger getPrimeQ();
+ method public java.math.BigInteger getPublicExponent();
+ }
+
+ public class RSAOtherPrimeInfo {
+ ctor public RSAOtherPrimeInfo(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public final java.math.BigInteger getCrtCoefficient();
+ method public final java.math.BigInteger getExponent();
+ method public final java.math.BigInteger getPrime();
+ }
+
+ public class RSAPrivateCrtKeySpec extends java.security.spec.RSAPrivateKeySpec {
+ ctor public RSAPrivateCrtKeySpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getCrtCoefficient();
+ method public java.math.BigInteger getPrimeExponentP();
+ method public java.math.BigInteger getPrimeExponentQ();
+ method public java.math.BigInteger getPrimeP();
+ method public java.math.BigInteger getPrimeQ();
+ method public java.math.BigInteger getPublicExponent();
+ }
+
+ public class RSAPrivateKeySpec implements java.security.spec.KeySpec {
+ ctor public RSAPrivateKeySpec(java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getModulus();
+ method public java.math.BigInteger getPrivateExponent();
+ }
+
+ public class RSAPublicKeySpec implements java.security.spec.KeySpec {
+ ctor public RSAPublicKeySpec(java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getModulus();
+ method public java.math.BigInteger getPublicExponent();
+ }
+
+ public class X509EncodedKeySpec extends java.security.spec.EncodedKeySpec {
+ ctor public X509EncodedKeySpec(byte[]);
+ method public final java.lang.String getFormat();
+ }
+
+}
+
+package java.sql {
+
+ public abstract interface Array {
+ method public abstract void free() throws java.sql.SQLException;
+ method public abstract java.lang.Object getArray() throws java.sql.SQLException;
+ method public abstract java.lang.Object getArray(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.Object getArray(long, int) throws java.sql.SQLException;
+ method public abstract java.lang.Object getArray(long, int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract int getBaseType() throws java.sql.SQLException;
+ method public abstract java.lang.String getBaseTypeName() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet(long, int) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet(long, int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ }
+
+ public class BatchUpdateException extends java.sql.SQLException {
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[]);
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int[]);
+ ctor public BatchUpdateException(java.lang.String, int[]);
+ ctor public BatchUpdateException(int[]);
+ ctor public BatchUpdateException();
+ ctor public BatchUpdateException(java.lang.Throwable);
+ ctor public BatchUpdateException(int[], java.lang.Throwable);
+ ctor public BatchUpdateException(java.lang.String, int[], java.lang.Throwable);
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int[], java.lang.Throwable);
+ ctor public BatchUpdateException(java.lang.String, java.lang.String, int, int[], java.lang.Throwable);
+ method public int[] getUpdateCounts();
+ }
+
+ public abstract interface Blob {
+ method public abstract void free() throws java.sql.SQLException;
+ method public abstract java.io.InputStream getBinaryStream() throws java.sql.SQLException;
+ method public abstract java.io.InputStream getBinaryStream(long, long) throws java.sql.SQLException;
+ method public abstract byte[] getBytes(long, int) throws java.sql.SQLException;
+ method public abstract long length() throws java.sql.SQLException;
+ method public abstract long position(byte[], long) throws java.sql.SQLException;
+ method public abstract long position(java.sql.Blob, long) throws java.sql.SQLException;
+ method public abstract java.io.OutputStream setBinaryStream(long) throws java.sql.SQLException;
+ method public abstract int setBytes(long, byte[]) throws java.sql.SQLException;
+ method public abstract int setBytes(long, byte[], int, int) throws java.sql.SQLException;
+ method public abstract void truncate(long) throws java.sql.SQLException;
+ }
+
+ public abstract interface CallableStatement implements java.sql.PreparedStatement {
+ method public abstract java.sql.Array getArray(int) throws java.sql.SQLException;
+ method public abstract java.sql.Array getArray(java.lang.String) throws java.sql.SQLException;
+ method public abstract deprecated java.math.BigDecimal getBigDecimal(int, int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Blob getBlob(int) throws java.sql.SQLException;
+ method public abstract java.sql.Blob getBlob(java.lang.String) throws java.sql.SQLException;
+ method public abstract boolean getBoolean(int) throws java.sql.SQLException;
+ method public abstract boolean getBoolean(java.lang.String) throws java.sql.SQLException;
+ method public abstract byte getByte(int) throws java.sql.SQLException;
+ method public abstract byte getByte(java.lang.String) throws java.sql.SQLException;
+ method public abstract byte[] getBytes(int) throws java.sql.SQLException;
+ method public abstract byte[] getBytes(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream(int) throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Clob getClob(int) throws java.sql.SQLException;
+ method public abstract java.sql.Clob getClob(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(int) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(int, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract double getDouble(int) throws java.sql.SQLException;
+ method public abstract double getDouble(java.lang.String) throws java.sql.SQLException;
+ method public abstract float getFloat(int) throws java.sql.SQLException;
+ method public abstract float getFloat(java.lang.String) throws java.sql.SQLException;
+ method public abstract int getInt(int) throws java.sql.SQLException;
+ method public abstract int getInt(java.lang.String) throws java.sql.SQLException;
+ method public abstract long getLong(int) throws java.sql.SQLException;
+ method public abstract long getLong(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.io.Reader getNCharacterStream(int) throws java.sql.SQLException;
+ method public abstract java.io.Reader getNCharacterStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.NClob getNClob(int) throws java.sql.SQLException;
+ method public abstract java.sql.NClob getNClob(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getNString(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getNString(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(int) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(java.lang.String, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.sql.Ref getRef(int) throws java.sql.SQLException;
+ method public abstract java.sql.Ref getRef(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.RowId getRowId(int) throws java.sql.SQLException;
+ method public abstract java.sql.RowId getRowId(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.SQLXML getSQLXML(int) throws java.sql.SQLException;
+ method public abstract java.sql.SQLXML getSQLXML(java.lang.String) throws java.sql.SQLException;
+ method public abstract short getShort(int) throws java.sql.SQLException;
+ method public abstract short getShort(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getString(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getString(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(int) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(int, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(int) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(int, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.net.URL getURL(int) throws java.sql.SQLException;
+ method public abstract java.net.URL getURL(java.lang.String) throws java.sql.SQLException;
+ method public abstract void registerOutParameter(int, int) throws java.sql.SQLException;
+ method public abstract void registerOutParameter(int, int, int) throws java.sql.SQLException;
+ method public abstract void registerOutParameter(int, int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void registerOutParameter(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void registerOutParameter(java.lang.String, int, int) throws java.sql.SQLException;
+ method public abstract void registerOutParameter(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBigDecimal(java.lang.String, java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBoolean(java.lang.String, boolean) throws java.sql.SQLException;
+ method public abstract void setByte(java.lang.String, byte) throws java.sql.SQLException;
+ method public abstract void setBytes(java.lang.String, byte[]) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setDate(java.lang.String, java.sql.Date) throws java.sql.SQLException;
+ method public abstract void setDate(java.lang.String, java.sql.Date, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setDouble(java.lang.String, double) throws java.sql.SQLException;
+ method public abstract void setFloat(java.lang.String, float) throws java.sql.SQLException;
+ method public abstract void setInt(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void setLong(java.lang.String, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setNull(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void setNull(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void setRowId(java.lang.String, java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void setSQLXML(java.lang.String, java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void setShort(java.lang.String, short) throws java.sql.SQLException;
+ method public abstract void setString(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setTime(java.lang.String, java.sql.Time) throws java.sql.SQLException;
+ method public abstract void setTime(java.lang.String, java.sql.Time, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setURL(java.lang.String, java.net.URL) throws java.sql.SQLException;
+ method public abstract boolean wasNull() throws java.sql.SQLException;
+ }
+
+ public final class ClientInfoStatus extends java.lang.Enum {
+ method public static java.sql.ClientInfoStatus valueOf(java.lang.String);
+ method public static final java.sql.ClientInfoStatus[] values();
+ enum_constant public static final java.sql.ClientInfoStatus REASON_UNKNOWN;
+ enum_constant public static final java.sql.ClientInfoStatus REASON_UNKNOWN_PROPERTY;
+ enum_constant public static final java.sql.ClientInfoStatus REASON_VALUE_INVALID;
+ enum_constant public static final java.sql.ClientInfoStatus REASON_VALUE_TRUNCATED;
+ }
+
+ public abstract interface Clob {
+ method public abstract void free() throws java.sql.SQLException;
+ method public abstract java.io.InputStream getAsciiStream() throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream() throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream(long, long) throws java.sql.SQLException;
+ method public abstract java.lang.String getSubString(long, int) throws java.sql.SQLException;
+ method public abstract long length() throws java.sql.SQLException;
+ method public abstract long position(java.lang.String, long) throws java.sql.SQLException;
+ method public abstract long position(java.sql.Clob, long) throws java.sql.SQLException;
+ method public abstract java.io.OutputStream setAsciiStream(long) throws java.sql.SQLException;
+ method public abstract java.io.Writer setCharacterStream(long) throws java.sql.SQLException;
+ method public abstract int setString(long, java.lang.String) throws java.sql.SQLException;
+ method public abstract int setString(long, java.lang.String, int, int) throws java.sql.SQLException;
+ method public abstract void truncate(long) throws java.sql.SQLException;
+ }
+
+ public abstract interface Connection implements java.lang.AutoCloseable java.sql.Wrapper {
+ method public abstract void clearWarnings() throws java.sql.SQLException;
+ method public abstract void close() throws java.sql.SQLException;
+ method public abstract void commit() throws java.sql.SQLException;
+ method public abstract java.sql.Array createArrayOf(java.lang.String, java.lang.Object[]) throws java.sql.SQLException;
+ method public abstract java.sql.Blob createBlob() throws java.sql.SQLException;
+ method public abstract java.sql.Clob createClob() throws java.sql.SQLException;
+ method public abstract java.sql.NClob createNClob() throws java.sql.SQLException;
+ method public abstract java.sql.SQLXML createSQLXML() throws java.sql.SQLException;
+ method public abstract java.sql.Statement createStatement() throws java.sql.SQLException;
+ method public abstract java.sql.Statement createStatement(int, int) throws java.sql.SQLException;
+ method public abstract java.sql.Statement createStatement(int, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.Struct createStruct(java.lang.String, java.lang.Object[]) throws java.sql.SQLException;
+ method public abstract boolean getAutoCommit() throws java.sql.SQLException;
+ method public abstract java.lang.String getCatalog() throws java.sql.SQLException;
+ method public abstract java.lang.String getClientInfo(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.util.Properties getClientInfo() throws java.sql.SQLException;
+ method public abstract int getHoldability() throws java.sql.SQLException;
+ method public abstract java.sql.DatabaseMetaData getMetaData() throws java.sql.SQLException;
+ method public abstract int getTransactionIsolation() throws java.sql.SQLException;
+ method public abstract java.util.Map<java.lang.String, java.lang.Class<?>> getTypeMap() throws java.sql.SQLException;
+ method public abstract java.sql.SQLWarning getWarnings() throws java.sql.SQLException;
+ method public abstract boolean isClosed() throws java.sql.SQLException;
+ method public abstract boolean isReadOnly() throws java.sql.SQLException;
+ method public abstract boolean isValid(int) throws java.sql.SQLException;
+ method public abstract java.lang.String nativeSQL(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.CallableStatement prepareCall(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.CallableStatement prepareCall(java.lang.String, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.CallableStatement prepareCall(java.lang.String, int, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int, int, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, int[]) throws java.sql.SQLException;
+ method public abstract java.sql.PreparedStatement prepareStatement(java.lang.String, java.lang.String[]) throws java.sql.SQLException;
+ method public abstract void releaseSavepoint(java.sql.Savepoint) throws java.sql.SQLException;
+ method public abstract void rollback() throws java.sql.SQLException;
+ method public abstract void rollback(java.sql.Savepoint) throws java.sql.SQLException;
+ method public abstract void setAutoCommit(boolean) throws java.sql.SQLException;
+ method public abstract void setCatalog(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setClientInfo(java.lang.String, java.lang.String) throws java.sql.SQLClientInfoException;
+ method public abstract void setClientInfo(java.util.Properties) throws java.sql.SQLClientInfoException;
+ method public abstract void setHoldability(int) throws java.sql.SQLException;
+ method public abstract void setReadOnly(boolean) throws java.sql.SQLException;
+ method public abstract java.sql.Savepoint setSavepoint() throws java.sql.SQLException;
+ method public abstract java.sql.Savepoint setSavepoint(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setTransactionIsolation(int) throws java.sql.SQLException;
+ method public abstract void setTypeMap(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ field public static final int TRANSACTION_NONE = 0; // 0x0
+ field public static final int TRANSACTION_READ_COMMITTED = 2; // 0x2
+ field public static final int TRANSACTION_READ_UNCOMMITTED = 1; // 0x1
+ field public static final int TRANSACTION_REPEATABLE_READ = 4; // 0x4
+ field public static final int TRANSACTION_SERIALIZABLE = 8; // 0x8
+ }
+
+ public class DataTruncation extends java.sql.SQLWarning {
+ ctor public DataTruncation(int, boolean, boolean, int, int);
+ ctor public DataTruncation(int, boolean, boolean, int, int, java.lang.Throwable);
+ method public int getDataSize();
+ method public int getIndex();
+ method public boolean getParameter();
+ method public boolean getRead();
+ method public int getTransferSize();
+ }
+
+ public abstract interface DatabaseMetaData implements java.sql.Wrapper {
+ method public abstract boolean allProceduresAreCallable() throws java.sql.SQLException;
+ method public abstract boolean allTablesAreSelectable() throws java.sql.SQLException;
+ method public abstract boolean autoCommitFailureClosesAllResultSets() throws java.sql.SQLException;
+ method public abstract boolean dataDefinitionCausesTransactionCommit() throws java.sql.SQLException;
+ method public abstract boolean dataDefinitionIgnoredInTransactions() throws java.sql.SQLException;
+ method public abstract boolean deletesAreDetected(int) throws java.sql.SQLException;
+ method public abstract boolean doesMaxRowSizeIncludeBlobs() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getAttributes(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getBestRowIdentifier(java.lang.String, java.lang.String, java.lang.String, int, boolean) throws java.sql.SQLException;
+ method public abstract java.lang.String getCatalogSeparator() throws java.sql.SQLException;
+ method public abstract java.lang.String getCatalogTerm() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getCatalogs() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getClientInfoProperties() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getColumnPrivileges(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getColumns(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Connection getConnection() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getCrossReference(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract int getDatabaseMajorVersion() throws java.sql.SQLException;
+ method public abstract int getDatabaseMinorVersion() throws java.sql.SQLException;
+ method public abstract java.lang.String getDatabaseProductName() throws java.sql.SQLException;
+ method public abstract java.lang.String getDatabaseProductVersion() throws java.sql.SQLException;
+ method public abstract int getDefaultTransactionIsolation() throws java.sql.SQLException;
+ method public abstract int getDriverMajorVersion();
+ method public abstract int getDriverMinorVersion();
+ method public abstract java.lang.String getDriverName() throws java.sql.SQLException;
+ method public abstract java.lang.String getDriverVersion() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getExportedKeys(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getExtraNameCharacters() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getFunctionColumns(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getFunctions(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getIdentifierQuoteString() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getImportedKeys(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getIndexInfo(java.lang.String, java.lang.String, java.lang.String, boolean, boolean) throws java.sql.SQLException;
+ method public abstract int getJDBCMajorVersion() throws java.sql.SQLException;
+ method public abstract int getJDBCMinorVersion() throws java.sql.SQLException;
+ method public abstract int getMaxBinaryLiteralLength() throws java.sql.SQLException;
+ method public abstract int getMaxCatalogNameLength() throws java.sql.SQLException;
+ method public abstract int getMaxCharLiteralLength() throws java.sql.SQLException;
+ method public abstract int getMaxColumnNameLength() throws java.sql.SQLException;
+ method public abstract int getMaxColumnsInGroupBy() throws java.sql.SQLException;
+ method public abstract int getMaxColumnsInIndex() throws java.sql.SQLException;
+ method public abstract int getMaxColumnsInOrderBy() throws java.sql.SQLException;
+ method public abstract int getMaxColumnsInSelect() throws java.sql.SQLException;
+ method public abstract int getMaxColumnsInTable() throws java.sql.SQLException;
+ method public abstract int getMaxConnections() throws java.sql.SQLException;
+ method public abstract int getMaxCursorNameLength() throws java.sql.SQLException;
+ method public abstract int getMaxIndexLength() throws java.sql.SQLException;
+ method public abstract int getMaxProcedureNameLength() throws java.sql.SQLException;
+ method public abstract int getMaxRowSize() throws java.sql.SQLException;
+ method public abstract int getMaxSchemaNameLength() throws java.sql.SQLException;
+ method public abstract int getMaxStatementLength() throws java.sql.SQLException;
+ method public abstract int getMaxStatements() throws java.sql.SQLException;
+ method public abstract int getMaxTableNameLength() throws java.sql.SQLException;
+ method public abstract int getMaxTablesInSelect() throws java.sql.SQLException;
+ method public abstract int getMaxUserNameLength() throws java.sql.SQLException;
+ method public abstract java.lang.String getNumericFunctions() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getPrimaryKeys(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getProcedureColumns(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getProcedureTerm() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getProcedures(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract int getResultSetHoldability() throws java.sql.SQLException;
+ method public abstract java.sql.RowIdLifetime getRowIdLifetime() throws java.sql.SQLException;
+ method public abstract java.lang.String getSQLKeywords() throws java.sql.SQLException;
+ method public abstract int getSQLStateType() throws java.sql.SQLException;
+ method public abstract java.lang.String getSchemaTerm() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getSchemas() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getSchemas(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getSearchStringEscape() throws java.sql.SQLException;
+ method public abstract java.lang.String getStringFunctions() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getSuperTables(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getSuperTypes(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getSystemFunctions() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getTablePrivileges(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getTableTypes() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getTables(java.lang.String, java.lang.String, java.lang.String, java.lang.String[]) throws java.sql.SQLException;
+ method public abstract java.lang.String getTimeDateFunctions() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getTypeInfo() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getUDTs(java.lang.String, java.lang.String, java.lang.String, int[]) throws java.sql.SQLException;
+ method public abstract java.lang.String getURL() throws java.sql.SQLException;
+ method public abstract java.lang.String getUserName() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getVersionColumns(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract boolean insertsAreDetected(int) throws java.sql.SQLException;
+ method public abstract boolean isCatalogAtStart() throws java.sql.SQLException;
+ method public abstract boolean isReadOnly() throws java.sql.SQLException;
+ method public abstract boolean locatorsUpdateCopy() throws java.sql.SQLException;
+ method public abstract boolean nullPlusNonNullIsNull() throws java.sql.SQLException;
+ method public abstract boolean nullsAreSortedAtEnd() throws java.sql.SQLException;
+ method public abstract boolean nullsAreSortedAtStart() throws java.sql.SQLException;
+ method public abstract boolean nullsAreSortedHigh() throws java.sql.SQLException;
+ method public abstract boolean nullsAreSortedLow() throws java.sql.SQLException;
+ method public abstract boolean othersDeletesAreVisible(int) throws java.sql.SQLException;
+ method public abstract boolean othersInsertsAreVisible(int) throws java.sql.SQLException;
+ method public abstract boolean othersUpdatesAreVisible(int) throws java.sql.SQLException;
+ method public abstract boolean ownDeletesAreVisible(int) throws java.sql.SQLException;
+ method public abstract boolean ownInsertsAreVisible(int) throws java.sql.SQLException;
+ method public abstract boolean ownUpdatesAreVisible(int) throws java.sql.SQLException;
+ method public abstract boolean storesLowerCaseIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean storesLowerCaseQuotedIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean storesMixedCaseIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean storesMixedCaseQuotedIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean storesUpperCaseIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean storesUpperCaseQuotedIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean supportsANSI92EntryLevelSQL() throws java.sql.SQLException;
+ method public abstract boolean supportsANSI92FullSQL() throws java.sql.SQLException;
+ method public abstract boolean supportsANSI92IntermediateSQL() throws java.sql.SQLException;
+ method public abstract boolean supportsAlterTableWithAddColumn() throws java.sql.SQLException;
+ method public abstract boolean supportsAlterTableWithDropColumn() throws java.sql.SQLException;
+ method public abstract boolean supportsBatchUpdates() throws java.sql.SQLException;
+ method public abstract boolean supportsCatalogsInDataManipulation() throws java.sql.SQLException;
+ method public abstract boolean supportsCatalogsInIndexDefinitions() throws java.sql.SQLException;
+ method public abstract boolean supportsCatalogsInPrivilegeDefinitions() throws java.sql.SQLException;
+ method public abstract boolean supportsCatalogsInProcedureCalls() throws java.sql.SQLException;
+ method public abstract boolean supportsCatalogsInTableDefinitions() throws java.sql.SQLException;
+ method public abstract boolean supportsColumnAliasing() throws java.sql.SQLException;
+ method public abstract boolean supportsConvert() throws java.sql.SQLException;
+ method public abstract boolean supportsConvert(int, int) throws java.sql.SQLException;
+ method public abstract boolean supportsCoreSQLGrammar() throws java.sql.SQLException;
+ method public abstract boolean supportsCorrelatedSubqueries() throws java.sql.SQLException;
+ method public abstract boolean supportsDataDefinitionAndDataManipulationTransactions() throws java.sql.SQLException;
+ method public abstract boolean supportsDataManipulationTransactionsOnly() throws java.sql.SQLException;
+ method public abstract boolean supportsDifferentTableCorrelationNames() throws java.sql.SQLException;
+ method public abstract boolean supportsExpressionsInOrderBy() throws java.sql.SQLException;
+ method public abstract boolean supportsExtendedSQLGrammar() throws java.sql.SQLException;
+ method public abstract boolean supportsFullOuterJoins() throws java.sql.SQLException;
+ method public abstract boolean supportsGetGeneratedKeys() throws java.sql.SQLException;
+ method public abstract boolean supportsGroupBy() throws java.sql.SQLException;
+ method public abstract boolean supportsGroupByBeyondSelect() throws java.sql.SQLException;
+ method public abstract boolean supportsGroupByUnrelated() throws java.sql.SQLException;
+ method public abstract boolean supportsIntegrityEnhancementFacility() throws java.sql.SQLException;
+ method public abstract boolean supportsLikeEscapeClause() throws java.sql.SQLException;
+ method public abstract boolean supportsLimitedOuterJoins() throws java.sql.SQLException;
+ method public abstract boolean supportsMinimumSQLGrammar() throws java.sql.SQLException;
+ method public abstract boolean supportsMixedCaseIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean supportsMixedCaseQuotedIdentifiers() throws java.sql.SQLException;
+ method public abstract boolean supportsMultipleOpenResults() throws java.sql.SQLException;
+ method public abstract boolean supportsMultipleResultSets() throws java.sql.SQLException;
+ method public abstract boolean supportsMultipleTransactions() throws java.sql.SQLException;
+ method public abstract boolean supportsNamedParameters() throws java.sql.SQLException;
+ method public abstract boolean supportsNonNullableColumns() throws java.sql.SQLException;
+ method public abstract boolean supportsOpenCursorsAcrossCommit() throws java.sql.SQLException;
+ method public abstract boolean supportsOpenCursorsAcrossRollback() throws java.sql.SQLException;
+ method public abstract boolean supportsOpenStatementsAcrossCommit() throws java.sql.SQLException;
+ method public abstract boolean supportsOpenStatementsAcrossRollback() throws java.sql.SQLException;
+ method public abstract boolean supportsOrderByUnrelated() throws java.sql.SQLException;
+ method public abstract boolean supportsOuterJoins() throws java.sql.SQLException;
+ method public abstract boolean supportsPositionedDelete() throws java.sql.SQLException;
+ method public abstract boolean supportsPositionedUpdate() throws java.sql.SQLException;
+ method public abstract boolean supportsResultSetConcurrency(int, int) throws java.sql.SQLException;
+ method public abstract boolean supportsResultSetHoldability(int) throws java.sql.SQLException;
+ method public abstract boolean supportsResultSetType(int) throws java.sql.SQLException;
+ method public abstract boolean supportsSavepoints() throws java.sql.SQLException;
+ method public abstract boolean supportsSchemasInDataManipulation() throws java.sql.SQLException;
+ method public abstract boolean supportsSchemasInIndexDefinitions() throws java.sql.SQLException;
+ method public abstract boolean supportsSchemasInPrivilegeDefinitions() throws java.sql.SQLException;
+ method public abstract boolean supportsSchemasInProcedureCalls() throws java.sql.SQLException;
+ method public abstract boolean supportsSchemasInTableDefinitions() throws java.sql.SQLException;
+ method public abstract boolean supportsSelectForUpdate() throws java.sql.SQLException;
+ method public abstract boolean supportsStatementPooling() throws java.sql.SQLException;
+ method public abstract boolean supportsStoredFunctionsUsingCallSyntax() throws java.sql.SQLException;
+ method public abstract boolean supportsStoredProcedures() throws java.sql.SQLException;
+ method public abstract boolean supportsSubqueriesInComparisons() throws java.sql.SQLException;
+ method public abstract boolean supportsSubqueriesInExists() throws java.sql.SQLException;
+ method public abstract boolean supportsSubqueriesInIns() throws java.sql.SQLException;
+ method public abstract boolean supportsSubqueriesInQuantifieds() throws java.sql.SQLException;
+ method public abstract boolean supportsTableCorrelationNames() throws java.sql.SQLException;
+ method public abstract boolean supportsTransactionIsolationLevel(int) throws java.sql.SQLException;
+ method public abstract boolean supportsTransactions() throws java.sql.SQLException;
+ method public abstract boolean supportsUnion() throws java.sql.SQLException;
+ method public abstract boolean supportsUnionAll() throws java.sql.SQLException;
+ method public abstract boolean updatesAreDetected(int) throws java.sql.SQLException;
+ method public abstract boolean usesLocalFilePerTable() throws java.sql.SQLException;
+ method public abstract boolean usesLocalFiles() throws java.sql.SQLException;
+ field public static final short attributeNoNulls = 0; // 0x0
+ field public static final short attributeNullable = 1; // 0x1
+ field public static final short attributeNullableUnknown = 2; // 0x2
+ field public static final int bestRowNotPseudo = 1; // 0x1
+ field public static final int bestRowPseudo = 2; // 0x2
+ field public static final int bestRowSession = 2; // 0x2
+ field public static final int bestRowTemporary = 0; // 0x0
+ field public static final int bestRowTransaction = 1; // 0x1
+ field public static final int bestRowUnknown = 0; // 0x0
+ field public static final int columnNoNulls = 0; // 0x0
+ field public static final int columnNullable = 1; // 0x1
+ field public static final int columnNullableUnknown = 2; // 0x2
+ field public static final int functionColumnIn = 1; // 0x1
+ field public static final int functionColumnInOut = 2; // 0x2
+ field public static final int functionColumnOut = 3; // 0x3
+ field public static final int functionColumnResult = 5; // 0x5
+ field public static final int functionColumnUnknown = 0; // 0x0
+ field public static final int functionNoNulls = 0; // 0x0
+ field public static final int functionNoTable = 1; // 0x1
+ field public static final int functionNullable = 1; // 0x1
+ field public static final int functionNullableUnknown = 2; // 0x2
+ field public static final int functionResultUnknown = 0; // 0x0
+ field public static final int functionReturn = 4; // 0x4
+ field public static final int functionReturnsTable = 2; // 0x2
+ field public static final int importedKeyCascade = 0; // 0x0
+ field public static final int importedKeyInitiallyDeferred = 5; // 0x5
+ field public static final int importedKeyInitiallyImmediate = 6; // 0x6
+ field public static final int importedKeyNoAction = 3; // 0x3
+ field public static final int importedKeyNotDeferrable = 7; // 0x7
+ field public static final int importedKeyRestrict = 1; // 0x1
+ field public static final int importedKeySetDefault = 4; // 0x4
+ field public static final int importedKeySetNull = 2; // 0x2
+ field public static final int procedureColumnIn = 1; // 0x1
+ field public static final int procedureColumnInOut = 2; // 0x2
+ field public static final int procedureColumnOut = 4; // 0x4
+ field public static final int procedureColumnResult = 3; // 0x3
+ field public static final int procedureColumnReturn = 5; // 0x5
+ field public static final int procedureColumnUnknown = 0; // 0x0
+ field public static final int procedureNoNulls = 0; // 0x0
+ field public static final int procedureNoResult = 1; // 0x1
+ field public static final int procedureNullable = 1; // 0x1
+ field public static final int procedureNullableUnknown = 2; // 0x2
+ field public static final int procedureResultUnknown = 0; // 0x0
+ field public static final int procedureReturnsResult = 2; // 0x2
+ field public static final int sqlStateSQL = 2; // 0x2
+ field public static final int sqlStateSQL99 = 2; // 0x2
+ field public static final int sqlStateXOpen = 1; // 0x1
+ field public static final short tableIndexClustered = 1; // 0x1
+ field public static final short tableIndexHashed = 2; // 0x2
+ field public static final short tableIndexOther = 3; // 0x3
+ field public static final short tableIndexStatistic = 0; // 0x0
+ field public static final int typeNoNulls = 0; // 0x0
+ field public static final int typeNullable = 1; // 0x1
+ field public static final int typeNullableUnknown = 2; // 0x2
+ field public static final int typePredBasic = 2; // 0x2
+ field public static final int typePredChar = 1; // 0x1
+ field public static final int typePredNone = 0; // 0x0
+ field public static final int typeSearchable = 3; // 0x3
+ field public static final int versionColumnNotPseudo = 1; // 0x1
+ field public static final int versionColumnPseudo = 2; // 0x2
+ field public static final int versionColumnUnknown = 0; // 0x0
+ }
+
+ public class Date extends java.util.Date {
+ ctor public deprecated Date(int, int, int);
+ ctor public Date(long);
+ method public static java.sql.Date valueOf(java.lang.String);
+ }
+
+ public abstract interface Driver {
+ method public abstract boolean acceptsURL(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Connection connect(java.lang.String, java.util.Properties) throws java.sql.SQLException;
+ method public abstract int getMajorVersion();
+ method public abstract int getMinorVersion();
+ method public abstract java.sql.DriverPropertyInfo[] getPropertyInfo(java.lang.String, java.util.Properties) throws java.sql.SQLException;
+ method public abstract boolean jdbcCompliant();
+ }
+
+ public class DriverManager {
+ method public static synchronized void deregisterDriver(java.sql.Driver) throws java.sql.SQLException;
+ method public static java.sql.Connection getConnection(java.lang.String, java.util.Properties) throws java.sql.SQLException;
+ method public static java.sql.Connection getConnection(java.lang.String, java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public static java.sql.Connection getConnection(java.lang.String) throws java.sql.SQLException;
+ method public static java.sql.Driver getDriver(java.lang.String) throws java.sql.SQLException;
+ method public static java.util.Enumeration<java.sql.Driver> getDrivers();
+ method public static deprecated java.io.PrintStream getLogStream();
+ method public static java.io.PrintWriter getLogWriter();
+ method public static int getLoginTimeout();
+ method public static void println(java.lang.String);
+ method public static synchronized void registerDriver(java.sql.Driver) throws java.sql.SQLException;
+ method public static deprecated void setLogStream(java.io.PrintStream);
+ method public static void setLogWriter(java.io.PrintWriter);
+ method public static void setLoginTimeout(int);
+ }
+
+ public class DriverPropertyInfo {
+ ctor public DriverPropertyInfo(java.lang.String, java.lang.String);
+ field public java.lang.String[] choices;
+ field public java.lang.String description;
+ field public java.lang.String name;
+ field public boolean required;
+ field public java.lang.String value;
+ }
+
+ public abstract interface NClob implements java.sql.Clob {
+ }
+
+ public abstract interface ParameterMetaData implements java.sql.Wrapper {
+ method public abstract java.lang.String getParameterClassName(int) throws java.sql.SQLException;
+ method public abstract int getParameterCount() throws java.sql.SQLException;
+ method public abstract int getParameterMode(int) throws java.sql.SQLException;
+ method public abstract int getParameterType(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getParameterTypeName(int) throws java.sql.SQLException;
+ method public abstract int getPrecision(int) throws java.sql.SQLException;
+ method public abstract int getScale(int) throws java.sql.SQLException;
+ method public abstract int isNullable(int) throws java.sql.SQLException;
+ method public abstract boolean isSigned(int) throws java.sql.SQLException;
+ field public static final int parameterModeIn = 1; // 0x1
+ field public static final int parameterModeInOut = 2; // 0x2
+ field public static final int parameterModeOut = 4; // 0x4
+ field public static final int parameterModeUnknown = 0; // 0x0
+ field public static final int parameterNoNulls = 0; // 0x0
+ field public static final int parameterNullable = 1; // 0x1
+ field public static final int parameterNullableUnknown = 2; // 0x2
+ }
+
+ public abstract interface PreparedStatement implements java.sql.Statement {
+ method public abstract void addBatch() throws java.sql.SQLException;
+ method public abstract void clearParameters() throws java.sql.SQLException;
+ method public abstract boolean execute() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet executeQuery() throws java.sql.SQLException;
+ method public abstract int executeUpdate() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSetMetaData getMetaData() throws java.sql.SQLException;
+ method public abstract java.sql.ParameterMetaData getParameterMetaData() throws java.sql.SQLException;
+ method public abstract void setArray(int, java.sql.Array) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBigDecimal(int, java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBoolean(int, boolean) throws java.sql.SQLException;
+ method public abstract void setByte(int, byte) throws java.sql.SQLException;
+ method public abstract void setBytes(int, byte[]) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(int, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setDate(int, java.sql.Date) throws java.sql.SQLException;
+ method public abstract void setDate(int, java.sql.Date, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setDouble(int, double) throws java.sql.SQLException;
+ method public abstract void setFloat(int, float) throws java.sql.SQLException;
+ method public abstract void setInt(int, int) throws java.sql.SQLException;
+ method public abstract void setLong(int, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNString(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setNull(int, int) throws java.sql.SQLException;
+ method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setRef(int, java.sql.Ref) throws java.sql.SQLException;
+ method public abstract void setRowId(int, java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void setSQLXML(int, java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void setShort(int, short) throws java.sql.SQLException;
+ method public abstract void setString(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setTime(int, java.sql.Time) throws java.sql.SQLException;
+ method public abstract void setTime(int, java.sql.Time, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setTimestamp(int, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void setTimestamp(int, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setURL(int, java.net.URL) throws java.sql.SQLException;
+ method public abstract deprecated void setUnicodeStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ }
+
+ public abstract interface Ref {
+ method public abstract java.lang.String getBaseTypeName() throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject() throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.Object) throws java.sql.SQLException;
+ }
+
+ public abstract interface ResultSet implements java.lang.AutoCloseable java.sql.Wrapper {
+ method public abstract boolean absolute(int) throws java.sql.SQLException;
+ method public abstract void afterLast() throws java.sql.SQLException;
+ method public abstract void beforeFirst() throws java.sql.SQLException;
+ method public abstract void cancelRowUpdates() throws java.sql.SQLException;
+ method public abstract void clearWarnings() throws java.sql.SQLException;
+ method public abstract void close() throws java.sql.SQLException;
+ method public abstract void deleteRow() throws java.sql.SQLException;
+ method public abstract int findColumn(java.lang.String) throws java.sql.SQLException;
+ method public abstract boolean first() throws java.sql.SQLException;
+ method public abstract java.sql.Array getArray(int) throws java.sql.SQLException;
+ method public abstract java.sql.Array getArray(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.io.InputStream getAsciiStream(int) throws java.sql.SQLException;
+ method public abstract java.io.InputStream getAsciiStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract deprecated java.math.BigDecimal getBigDecimal(int, int) throws java.sql.SQLException;
+ method public abstract deprecated java.math.BigDecimal getBigDecimal(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(int) throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal getBigDecimal(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.io.InputStream getBinaryStream(int) throws java.sql.SQLException;
+ method public abstract java.io.InputStream getBinaryStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Blob getBlob(int) throws java.sql.SQLException;
+ method public abstract java.sql.Blob getBlob(java.lang.String) throws java.sql.SQLException;
+ method public abstract boolean getBoolean(int) throws java.sql.SQLException;
+ method public abstract boolean getBoolean(java.lang.String) throws java.sql.SQLException;
+ method public abstract byte getByte(int) throws java.sql.SQLException;
+ method public abstract byte getByte(java.lang.String) throws java.sql.SQLException;
+ method public abstract byte[] getBytes(int) throws java.sql.SQLException;
+ method public abstract byte[] getBytes(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream(int) throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Clob getClob(int) throws java.sql.SQLException;
+ method public abstract java.sql.Clob getClob(java.lang.String) throws java.sql.SQLException;
+ method public abstract int getConcurrency() throws java.sql.SQLException;
+ method public abstract java.lang.String getCursorName() throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(int) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(int, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Date getDate(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract double getDouble(int) throws java.sql.SQLException;
+ method public abstract double getDouble(java.lang.String) throws java.sql.SQLException;
+ method public abstract int getFetchDirection() throws java.sql.SQLException;
+ method public abstract int getFetchSize() throws java.sql.SQLException;
+ method public abstract float getFloat(int) throws java.sql.SQLException;
+ method public abstract float getFloat(java.lang.String) throws java.sql.SQLException;
+ method public abstract int getHoldability() throws java.sql.SQLException;
+ method public abstract int getInt(int) throws java.sql.SQLException;
+ method public abstract int getInt(java.lang.String) throws java.sql.SQLException;
+ method public abstract long getLong(int) throws java.sql.SQLException;
+ method public abstract long getLong(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.ResultSetMetaData getMetaData() throws java.sql.SQLException;
+ method public abstract java.io.Reader getNCharacterStream(int) throws java.sql.SQLException;
+ method public abstract java.io.Reader getNCharacterStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.NClob getNClob(int) throws java.sql.SQLException;
+ method public abstract java.sql.NClob getNClob(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.String getNString(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getNString(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(int) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(int, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.Object getObject(java.lang.String, java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.sql.Ref getRef(int) throws java.sql.SQLException;
+ method public abstract java.sql.Ref getRef(java.lang.String) throws java.sql.SQLException;
+ method public abstract int getRow() throws java.sql.SQLException;
+ method public abstract java.sql.RowId getRowId(int) throws java.sql.SQLException;
+ method public abstract java.sql.RowId getRowId(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.SQLXML getSQLXML(int) throws java.sql.SQLException;
+ method public abstract java.sql.SQLXML getSQLXML(java.lang.String) throws java.sql.SQLException;
+ method public abstract short getShort(int) throws java.sql.SQLException;
+ method public abstract short getShort(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Statement getStatement() throws java.sql.SQLException;
+ method public abstract java.lang.String getString(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getString(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(int) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(int, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Time getTime(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(int) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(int, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp getTimestamp(java.lang.String, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract int getType() throws java.sql.SQLException;
+ method public abstract java.net.URL getURL(int) throws java.sql.SQLException;
+ method public abstract java.net.URL getURL(java.lang.String) throws java.sql.SQLException;
+ method public abstract deprecated java.io.InputStream getUnicodeStream(int) throws java.sql.SQLException;
+ method public abstract deprecated java.io.InputStream getUnicodeStream(java.lang.String) throws java.sql.SQLException;
+ method public abstract java.sql.SQLWarning getWarnings() throws java.sql.SQLException;
+ method public abstract void insertRow() throws java.sql.SQLException;
+ method public abstract boolean isAfterLast() throws java.sql.SQLException;
+ method public abstract boolean isBeforeFirst() throws java.sql.SQLException;
+ method public abstract boolean isClosed() throws java.sql.SQLException;
+ method public abstract boolean isFirst() throws java.sql.SQLException;
+ method public abstract boolean isLast() throws java.sql.SQLException;
+ method public abstract boolean last() throws java.sql.SQLException;
+ method public abstract void moveToCurrentRow() throws java.sql.SQLException;
+ method public abstract void moveToInsertRow() throws java.sql.SQLException;
+ method public abstract boolean next() throws java.sql.SQLException;
+ method public abstract boolean previous() throws java.sql.SQLException;
+ method public abstract void refreshRow() throws java.sql.SQLException;
+ method public abstract boolean relative(int) throws java.sql.SQLException;
+ method public abstract boolean rowDeleted() throws java.sql.SQLException;
+ method public abstract boolean rowInserted() throws java.sql.SQLException;
+ method public abstract boolean rowUpdated() throws java.sql.SQLException;
+ method public abstract void setFetchDirection(int) throws java.sql.SQLException;
+ method public abstract void setFetchSize(int) throws java.sql.SQLException;
+ method public abstract void updateArray(int, java.sql.Array) throws java.sql.SQLException;
+ method public abstract void updateArray(java.lang.String, java.sql.Array) throws java.sql.SQLException;
+ method public abstract void updateAsciiStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void updateAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void updateAsciiStream(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void updateAsciiStream(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void updateAsciiStream(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void updateAsciiStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void updateBigDecimal(int, java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void updateBigDecimal(java.lang.String, java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void updateBinaryStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void updateBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void updateBinaryStream(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void updateBinaryStream(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void updateBinaryStream(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void updateBinaryStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void updateBlob(int, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void updateBlob(java.lang.String, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void updateBlob(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void updateBlob(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void updateBlob(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void updateBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void updateBoolean(int, boolean) throws java.sql.SQLException;
+ method public abstract void updateBoolean(java.lang.String, boolean) throws java.sql.SQLException;
+ method public abstract void updateByte(int, byte) throws java.sql.SQLException;
+ method public abstract void updateByte(java.lang.String, byte) throws java.sql.SQLException;
+ method public abstract void updateBytes(int, byte[]) throws java.sql.SQLException;
+ method public abstract void updateBytes(java.lang.String, byte[]) throws java.sql.SQLException;
+ method public abstract void updateCharacterStream(int, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void updateCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void updateCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateClob(int, java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void updateClob(java.lang.String, java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void updateClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateDate(int, java.sql.Date) throws java.sql.SQLException;
+ method public abstract void updateDate(java.lang.String, java.sql.Date) throws java.sql.SQLException;
+ method public abstract void updateDouble(int, double) throws java.sql.SQLException;
+ method public abstract void updateDouble(java.lang.String, double) throws java.sql.SQLException;
+ method public abstract void updateFloat(int, float) throws java.sql.SQLException;
+ method public abstract void updateFloat(java.lang.String, float) throws java.sql.SQLException;
+ method public abstract void updateInt(int, int) throws java.sql.SQLException;
+ method public abstract void updateInt(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void updateLong(int, long) throws java.sql.SQLException;
+ method public abstract void updateLong(java.lang.String, long) throws java.sql.SQLException;
+ method public abstract void updateNCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateNCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateNCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateNClob(int, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void updateNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void updateNClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void updateNClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void updateNString(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void updateNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract void updateNull(int) throws java.sql.SQLException;
+ method public abstract void updateNull(java.lang.String) throws java.sql.SQLException;
+ method public abstract void updateObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void updateObject(int, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void updateObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void updateObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void updateRef(int, java.sql.Ref) throws java.sql.SQLException;
+ method public abstract void updateRef(java.lang.String, java.sql.Ref) throws java.sql.SQLException;
+ method public abstract void updateRow() throws java.sql.SQLException;
+ method public abstract void updateRowId(int, java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void updateRowId(java.lang.String, java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void updateSQLXML(int, java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void updateSQLXML(java.lang.String, java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void updateShort(int, short) throws java.sql.SQLException;
+ method public abstract void updateShort(java.lang.String, short) throws java.sql.SQLException;
+ method public abstract void updateString(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void updateString(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract void updateTime(int, java.sql.Time) throws java.sql.SQLException;
+ method public abstract void updateTime(java.lang.String, java.sql.Time) throws java.sql.SQLException;
+ method public abstract void updateTimestamp(int, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void updateTimestamp(java.lang.String, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract boolean wasNull() throws java.sql.SQLException;
+ field public static final int CLOSE_CURSORS_AT_COMMIT = 2; // 0x2
+ field public static final int CONCUR_READ_ONLY = 1007; // 0x3ef
+ field public static final int CONCUR_UPDATABLE = 1008; // 0x3f0
+ field public static final int FETCH_FORWARD = 1000; // 0x3e8
+ field public static final int FETCH_REVERSE = 1001; // 0x3e9
+ field public static final int FETCH_UNKNOWN = 1002; // 0x3ea
+ field public static final int HOLD_CURSORS_OVER_COMMIT = 1; // 0x1
+ field public static final int TYPE_FORWARD_ONLY = 1003; // 0x3eb
+ field public static final int TYPE_SCROLL_INSENSITIVE = 1004; // 0x3ec
+ field public static final int TYPE_SCROLL_SENSITIVE = 1005; // 0x3ed
+ }
+
+ public abstract interface ResultSetMetaData implements java.sql.Wrapper {
+ method public abstract java.lang.String getCatalogName(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getColumnClassName(int) throws java.sql.SQLException;
+ method public abstract int getColumnCount() throws java.sql.SQLException;
+ method public abstract int getColumnDisplaySize(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getColumnLabel(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getColumnName(int) throws java.sql.SQLException;
+ method public abstract int getColumnType(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getColumnTypeName(int) throws java.sql.SQLException;
+ method public abstract int getPrecision(int) throws java.sql.SQLException;
+ method public abstract int getScale(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getSchemaName(int) throws java.sql.SQLException;
+ method public abstract java.lang.String getTableName(int) throws java.sql.SQLException;
+ method public abstract boolean isAutoIncrement(int) throws java.sql.SQLException;
+ method public abstract boolean isCaseSensitive(int) throws java.sql.SQLException;
+ method public abstract boolean isCurrency(int) throws java.sql.SQLException;
+ method public abstract boolean isDefinitelyWritable(int) throws java.sql.SQLException;
+ method public abstract int isNullable(int) throws java.sql.SQLException;
+ method public abstract boolean isReadOnly(int) throws java.sql.SQLException;
+ method public abstract boolean isSearchable(int) throws java.sql.SQLException;
+ method public abstract boolean isSigned(int) throws java.sql.SQLException;
+ method public abstract boolean isWritable(int) throws java.sql.SQLException;
+ field public static final int columnNoNulls = 0; // 0x0
+ field public static final int columnNullable = 1; // 0x1
+ field public static final int columnNullableUnknown = 2; // 0x2
+ }
+
+ public abstract interface RowId {
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract byte[] getBytes();
+ method public abstract int hashCode();
+ method public abstract java.lang.String toString();
+ }
+
+ public final class RowIdLifetime extends java.lang.Enum {
+ method public static java.sql.RowIdLifetime valueOf(java.lang.String);
+ method public static final java.sql.RowIdLifetime[] values();
+ enum_constant public static final java.sql.RowIdLifetime ROWID_UNSUPPORTED;
+ enum_constant public static final java.sql.RowIdLifetime ROWID_VALID_FOREVER;
+ enum_constant public static final java.sql.RowIdLifetime ROWID_VALID_OTHER;
+ enum_constant public static final java.sql.RowIdLifetime ROWID_VALID_SESSION;
+ enum_constant public static final java.sql.RowIdLifetime ROWID_VALID_TRANSACTION;
+ }
+
+ public class SQLClientInfoException extends java.sql.SQLException {
+ ctor public SQLClientInfoException();
+ ctor public SQLClientInfoException(java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
+ ctor public SQLClientInfoException(java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
+ ctor public SQLClientInfoException(java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
+ ctor public SQLClientInfoException(java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>);
+ ctor public SQLClientInfoException(java.lang.String, java.lang.String, int, java.util.Map<java.lang.String, java.sql.ClientInfoStatus>, java.lang.Throwable);
+ method public java.util.Map<java.lang.String, java.sql.ClientInfoStatus> getFailedProperties();
+ }
+
+ public abstract interface SQLData {
+ method public abstract java.lang.String getSQLTypeName() throws java.sql.SQLException;
+ method public abstract void readSQL(java.sql.SQLInput, java.lang.String) throws java.sql.SQLException;
+ method public abstract void writeSQL(java.sql.SQLOutput) throws java.sql.SQLException;
+ }
+
+ public class SQLDataException extends java.sql.SQLNonTransientException {
+ ctor public SQLDataException();
+ ctor public SQLDataException(java.lang.String);
+ ctor public SQLDataException(java.lang.String, java.lang.String);
+ ctor public SQLDataException(java.lang.String, java.lang.String, int);
+ ctor public SQLDataException(java.lang.Throwable);
+ ctor public SQLDataException(java.lang.String, java.lang.Throwable);
+ ctor public SQLDataException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLDataException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLException extends java.lang.Exception implements java.lang.Iterable {
+ ctor public SQLException(java.lang.String, java.lang.String, int);
+ ctor public SQLException(java.lang.String, java.lang.String);
+ ctor public SQLException(java.lang.String);
+ ctor public SQLException();
+ ctor public SQLException(java.lang.Throwable);
+ ctor public SQLException(java.lang.String, java.lang.Throwable);
+ ctor public SQLException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ method public int getErrorCode();
+ method public java.sql.SQLException getNextException();
+ method public java.lang.String getSQLState();
+ method public java.util.Iterator<java.lang.Throwable> iterator();
+ method public void setNextException(java.sql.SQLException);
+ }
+
+ public class SQLFeatureNotSupportedException extends java.sql.SQLNonTransientException {
+ ctor public SQLFeatureNotSupportedException();
+ ctor public SQLFeatureNotSupportedException(java.lang.String);
+ ctor public SQLFeatureNotSupportedException(java.lang.String, java.lang.String);
+ ctor public SQLFeatureNotSupportedException(java.lang.String, java.lang.String, int);
+ ctor public SQLFeatureNotSupportedException(java.lang.Throwable);
+ ctor public SQLFeatureNotSupportedException(java.lang.String, java.lang.Throwable);
+ ctor public SQLFeatureNotSupportedException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLFeatureNotSupportedException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public abstract interface SQLInput {
+ method public abstract java.sql.Array readArray() throws java.sql.SQLException;
+ method public abstract java.io.InputStream readAsciiStream() throws java.sql.SQLException;
+ method public abstract java.math.BigDecimal readBigDecimal() throws java.sql.SQLException;
+ method public abstract java.io.InputStream readBinaryStream() throws java.sql.SQLException;
+ method public abstract java.sql.Blob readBlob() throws java.sql.SQLException;
+ method public abstract boolean readBoolean() throws java.sql.SQLException;
+ method public abstract byte readByte() throws java.sql.SQLException;
+ method public abstract byte[] readBytes() throws java.sql.SQLException;
+ method public abstract java.io.Reader readCharacterStream() throws java.sql.SQLException;
+ method public abstract java.sql.Clob readClob() throws java.sql.SQLException;
+ method public abstract java.sql.Date readDate() throws java.sql.SQLException;
+ method public abstract double readDouble() throws java.sql.SQLException;
+ method public abstract float readFloat() throws java.sql.SQLException;
+ method public abstract int readInt() throws java.sql.SQLException;
+ method public abstract long readLong() throws java.sql.SQLException;
+ method public abstract java.sql.NClob readNClob() throws java.sql.SQLException;
+ method public abstract java.lang.String readNString() throws java.sql.SQLException;
+ method public abstract java.lang.Object readObject() throws java.sql.SQLException;
+ method public abstract java.sql.Ref readRef() throws java.sql.SQLException;
+ method public abstract java.sql.RowId readRowId() throws java.sql.SQLException;
+ method public abstract java.sql.SQLXML readSQLXML() throws java.sql.SQLException;
+ method public abstract short readShort() throws java.sql.SQLException;
+ method public abstract java.lang.String readString() throws java.sql.SQLException;
+ method public abstract java.sql.Time readTime() throws java.sql.SQLException;
+ method public abstract java.sql.Timestamp readTimestamp() throws java.sql.SQLException;
+ method public abstract java.net.URL readURL() throws java.sql.SQLException;
+ method public abstract boolean wasNull() throws java.sql.SQLException;
+ }
+
+ public class SQLIntegrityConstraintViolationException extends java.sql.SQLNonTransientException {
+ ctor public SQLIntegrityConstraintViolationException();
+ ctor public SQLIntegrityConstraintViolationException(java.lang.String);
+ ctor public SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String);
+ ctor public SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String, int);
+ ctor public SQLIntegrityConstraintViolationException(java.lang.Throwable);
+ ctor public SQLIntegrityConstraintViolationException(java.lang.String, java.lang.Throwable);
+ ctor public SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLIntegrityConstraintViolationException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLInvalidAuthorizationSpecException extends java.sql.SQLNonTransientException {
+ ctor public SQLInvalidAuthorizationSpecException();
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.String);
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String);
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String, int);
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.Throwable);
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.Throwable);
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLInvalidAuthorizationSpecException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLNonTransientConnectionException extends java.sql.SQLNonTransientException {
+ ctor public SQLNonTransientConnectionException();
+ ctor public SQLNonTransientConnectionException(java.lang.String);
+ ctor public SQLNonTransientConnectionException(java.lang.String, java.lang.String);
+ ctor public SQLNonTransientConnectionException(java.lang.String, java.lang.String, int);
+ ctor public SQLNonTransientConnectionException(java.lang.Throwable);
+ ctor public SQLNonTransientConnectionException(java.lang.String, java.lang.Throwable);
+ ctor public SQLNonTransientConnectionException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLNonTransientConnectionException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLNonTransientException extends java.sql.SQLException {
+ ctor public SQLNonTransientException();
+ ctor public SQLNonTransientException(java.lang.String);
+ ctor public SQLNonTransientException(java.lang.String, java.lang.String);
+ ctor public SQLNonTransientException(java.lang.String, java.lang.String, int);
+ ctor public SQLNonTransientException(java.lang.Throwable);
+ ctor public SQLNonTransientException(java.lang.String, java.lang.Throwable);
+ ctor public SQLNonTransientException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLNonTransientException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public abstract interface SQLOutput {
+ method public abstract void writeArray(java.sql.Array) throws java.sql.SQLException;
+ method public abstract void writeAsciiStream(java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void writeBigDecimal(java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void writeBinaryStream(java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void writeBlob(java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void writeBoolean(boolean) throws java.sql.SQLException;
+ method public abstract void writeByte(byte) throws java.sql.SQLException;
+ method public abstract void writeBytes(byte[]) throws java.sql.SQLException;
+ method public abstract void writeCharacterStream(java.io.Reader) throws java.sql.SQLException;
+ method public abstract void writeClob(java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void writeDate(java.sql.Date) throws java.sql.SQLException;
+ method public abstract void writeDouble(double) throws java.sql.SQLException;
+ method public abstract void writeFloat(float) throws java.sql.SQLException;
+ method public abstract void writeInt(int) throws java.sql.SQLException;
+ method public abstract void writeLong(long) throws java.sql.SQLException;
+ method public abstract void writeNClob(java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void writeNString(java.lang.String) throws java.sql.SQLException;
+ method public abstract void writeObject(java.sql.SQLData) throws java.sql.SQLException;
+ method public abstract void writeRef(java.sql.Ref) throws java.sql.SQLException;
+ method public abstract void writeRowId(java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void writeSQLXML(java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void writeShort(short) throws java.sql.SQLException;
+ method public abstract void writeString(java.lang.String) throws java.sql.SQLException;
+ method public abstract void writeStruct(java.sql.Struct) throws java.sql.SQLException;
+ method public abstract void writeTime(java.sql.Time) throws java.sql.SQLException;
+ method public abstract void writeTimestamp(java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void writeURL(java.net.URL) throws java.sql.SQLException;
+ }
+
+ public final class SQLPermission extends java.security.BasicPermission {
+ ctor public SQLPermission(java.lang.String);
+ ctor public SQLPermission(java.lang.String, java.lang.String);
+ }
+
+ public class SQLRecoverableException extends java.sql.SQLException {
+ ctor public SQLRecoverableException();
+ ctor public SQLRecoverableException(java.lang.String);
+ ctor public SQLRecoverableException(java.lang.String, java.lang.String);
+ ctor public SQLRecoverableException(java.lang.String, java.lang.String, int);
+ ctor public SQLRecoverableException(java.lang.Throwable);
+ ctor public SQLRecoverableException(java.lang.String, java.lang.Throwable);
+ ctor public SQLRecoverableException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLRecoverableException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLSyntaxErrorException extends java.sql.SQLNonTransientException {
+ ctor public SQLSyntaxErrorException();
+ ctor public SQLSyntaxErrorException(java.lang.String);
+ ctor public SQLSyntaxErrorException(java.lang.String, java.lang.String);
+ ctor public SQLSyntaxErrorException(java.lang.String, java.lang.String, int);
+ ctor public SQLSyntaxErrorException(java.lang.Throwable);
+ ctor public SQLSyntaxErrorException(java.lang.String, java.lang.Throwable);
+ ctor public SQLSyntaxErrorException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLSyntaxErrorException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLTimeoutException extends java.sql.SQLTransientException {
+ ctor public SQLTimeoutException();
+ ctor public SQLTimeoutException(java.lang.String);
+ ctor public SQLTimeoutException(java.lang.String, java.lang.String);
+ ctor public SQLTimeoutException(java.lang.String, java.lang.String, int);
+ ctor public SQLTimeoutException(java.lang.Throwable);
+ ctor public SQLTimeoutException(java.lang.String, java.lang.Throwable);
+ ctor public SQLTimeoutException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLTimeoutException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLTransactionRollbackException extends java.sql.SQLTransientException {
+ ctor public SQLTransactionRollbackException();
+ ctor public SQLTransactionRollbackException(java.lang.String);
+ ctor public SQLTransactionRollbackException(java.lang.String, java.lang.String);
+ ctor public SQLTransactionRollbackException(java.lang.String, java.lang.String, int);
+ ctor public SQLTransactionRollbackException(java.lang.Throwable);
+ ctor public SQLTransactionRollbackException(java.lang.String, java.lang.Throwable);
+ ctor public SQLTransactionRollbackException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLTransactionRollbackException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLTransientConnectionException extends java.sql.SQLTransientException {
+ ctor public SQLTransientConnectionException();
+ ctor public SQLTransientConnectionException(java.lang.String);
+ ctor public SQLTransientConnectionException(java.lang.String, java.lang.String);
+ ctor public SQLTransientConnectionException(java.lang.String, java.lang.String, int);
+ ctor public SQLTransientConnectionException(java.lang.Throwable);
+ ctor public SQLTransientConnectionException(java.lang.String, java.lang.Throwable);
+ ctor public SQLTransientConnectionException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLTransientConnectionException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLTransientException extends java.sql.SQLException {
+ ctor public SQLTransientException();
+ ctor public SQLTransientException(java.lang.String);
+ ctor public SQLTransientException(java.lang.String, java.lang.String);
+ ctor public SQLTransientException(java.lang.String, java.lang.String, int);
+ ctor public SQLTransientException(java.lang.Throwable);
+ ctor public SQLTransientException(java.lang.String, java.lang.Throwable);
+ ctor public SQLTransientException(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLTransientException(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ }
+
+ public class SQLWarning extends java.sql.SQLException {
+ ctor public SQLWarning(java.lang.String, java.lang.String, int);
+ ctor public SQLWarning(java.lang.String, java.lang.String);
+ ctor public SQLWarning(java.lang.String);
+ ctor public SQLWarning();
+ ctor public SQLWarning(java.lang.Throwable);
+ ctor public SQLWarning(java.lang.String, java.lang.Throwable);
+ ctor public SQLWarning(java.lang.String, java.lang.String, java.lang.Throwable);
+ ctor public SQLWarning(java.lang.String, java.lang.String, int, java.lang.Throwable);
+ method public java.sql.SQLWarning getNextWarning();
+ method public void setNextWarning(java.sql.SQLWarning);
+ }
+
+ public abstract interface SQLXML {
+ method public abstract void free() throws java.sql.SQLException;
+ method public abstract java.io.InputStream getBinaryStream() throws java.sql.SQLException;
+ method public abstract java.io.Reader getCharacterStream() throws java.sql.SQLException;
+ method public abstract T getSource(java.lang.Class<T>) throws java.sql.SQLException;
+ method public abstract java.lang.String getString() throws java.sql.SQLException;
+ method public abstract java.io.OutputStream setBinaryStream() throws java.sql.SQLException;
+ method public abstract java.io.Writer setCharacterStream() throws java.sql.SQLException;
+ method public abstract T setResult(java.lang.Class<T>) throws java.sql.SQLException;
+ method public abstract void setString(java.lang.String) throws java.sql.SQLException;
+ }
+
+ public abstract interface Savepoint {
+ method public abstract int getSavepointId() throws java.sql.SQLException;
+ method public abstract java.lang.String getSavepointName() throws java.sql.SQLException;
+ }
+
+ public abstract interface Statement implements java.lang.AutoCloseable java.sql.Wrapper {
+ method public abstract void addBatch(java.lang.String) throws java.sql.SQLException;
+ method public abstract void cancel() throws java.sql.SQLException;
+ method public abstract void clearBatch() throws java.sql.SQLException;
+ method public abstract void clearWarnings() throws java.sql.SQLException;
+ method public abstract void close() throws java.sql.SQLException;
+ method public abstract boolean execute(java.lang.String) throws java.sql.SQLException;
+ method public abstract boolean execute(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract boolean execute(java.lang.String, int[]) throws java.sql.SQLException;
+ method public abstract boolean execute(java.lang.String, java.lang.String[]) throws java.sql.SQLException;
+ method public abstract int[] executeBatch() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet executeQuery(java.lang.String) throws java.sql.SQLException;
+ method public abstract int executeUpdate(java.lang.String) throws java.sql.SQLException;
+ method public abstract int executeUpdate(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract int executeUpdate(java.lang.String, int[]) throws java.sql.SQLException;
+ method public abstract int executeUpdate(java.lang.String, java.lang.String[]) throws java.sql.SQLException;
+ method public abstract java.sql.Connection getConnection() throws java.sql.SQLException;
+ method public abstract int getFetchDirection() throws java.sql.SQLException;
+ method public abstract int getFetchSize() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getGeneratedKeys() throws java.sql.SQLException;
+ method public abstract int getMaxFieldSize() throws java.sql.SQLException;
+ method public abstract int getMaxRows() throws java.sql.SQLException;
+ method public abstract boolean getMoreResults() throws java.sql.SQLException;
+ method public abstract boolean getMoreResults(int) throws java.sql.SQLException;
+ method public abstract int getQueryTimeout() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getResultSet() throws java.sql.SQLException;
+ method public abstract int getResultSetConcurrency() throws java.sql.SQLException;
+ method public abstract int getResultSetHoldability() throws java.sql.SQLException;
+ method public abstract int getResultSetType() throws java.sql.SQLException;
+ method public abstract int getUpdateCount() throws java.sql.SQLException;
+ method public abstract java.sql.SQLWarning getWarnings() throws java.sql.SQLException;
+ method public abstract boolean isClosed() throws java.sql.SQLException;
+ method public abstract boolean isPoolable() throws java.sql.SQLException;
+ method public abstract void setCursorName(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setEscapeProcessing(boolean) throws java.sql.SQLException;
+ method public abstract void setFetchDirection(int) throws java.sql.SQLException;
+ method public abstract void setFetchSize(int) throws java.sql.SQLException;
+ method public abstract void setMaxFieldSize(int) throws java.sql.SQLException;
+ method public abstract void setMaxRows(int) throws java.sql.SQLException;
+ method public abstract void setPoolable(boolean) throws java.sql.SQLException;
+ method public abstract void setQueryTimeout(int) throws java.sql.SQLException;
+ field public static final int CLOSE_ALL_RESULTS = 3; // 0x3
+ field public static final int CLOSE_CURRENT_RESULT = 1; // 0x1
+ field public static final int EXECUTE_FAILED = -3; // 0xfffffffd
+ field public static final int KEEP_CURRENT_RESULT = 2; // 0x2
+ field public static final int NO_GENERATED_KEYS = 2; // 0x2
+ field public static final int RETURN_GENERATED_KEYS = 1; // 0x1
+ field public static final int SUCCESS_NO_INFO = -2; // 0xfffffffe
+ }
+
+ public abstract interface Struct {
+ method public abstract java.lang.Object[] getAttributes() throws java.sql.SQLException;
+ method public abstract java.lang.Object[] getAttributes(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract java.lang.String getSQLTypeName() throws java.sql.SQLException;
+ }
+
+ public class Time extends java.util.Date {
+ ctor public deprecated Time(int, int, int);
+ ctor public Time(long);
+ method public static java.sql.Time valueOf(java.lang.String);
+ }
+
+ public class Timestamp extends java.util.Date {
+ ctor public deprecated Timestamp(int, int, int, int, int, int, int);
+ ctor public Timestamp(long);
+ method public boolean after(java.sql.Timestamp);
+ method public boolean before(java.sql.Timestamp);
+ method public int compareTo(java.sql.Timestamp);
+ method public boolean equals(java.sql.Timestamp);
+ method public int getNanos();
+ method public void setNanos(int);
+ method public static java.sql.Timestamp valueOf(java.lang.String);
+ }
+
+ public class Types {
+ field public static final int ARRAY = 2003; // 0x7d3
+ field public static final int BIGINT = -5; // 0xfffffffb
+ field public static final int BINARY = -2; // 0xfffffffe
+ field public static final int BIT = -7; // 0xfffffff9
+ field public static final int BLOB = 2004; // 0x7d4
+ field public static final int BOOLEAN = 16; // 0x10
+ field public static final int CHAR = 1; // 0x1
+ field public static final int CLOB = 2005; // 0x7d5
+ field public static final int DATALINK = 70; // 0x46
+ field public static final int DATE = 91; // 0x5b
+ field public static final int DECIMAL = 3; // 0x3
+ field public static final int DISTINCT = 2001; // 0x7d1
+ field public static final int DOUBLE = 8; // 0x8
+ field public static final int FLOAT = 6; // 0x6
+ field public static final int INTEGER = 4; // 0x4
+ field public static final int JAVA_OBJECT = 2000; // 0x7d0
+ field public static final int LONGNVARCHAR = -16; // 0xfffffff0
+ field public static final int LONGVARBINARY = -4; // 0xfffffffc
+ field public static final int LONGVARCHAR = -1; // 0xffffffff
+ field public static final int NCHAR = -15; // 0xfffffff1
+ field public static final int NCLOB = 2011; // 0x7db
+ field public static final int NULL = 0; // 0x0
+ field public static final int NUMERIC = 2; // 0x2
+ field public static final int NVARCHAR = -9; // 0xfffffff7
+ field public static final int OTHER = 1111; // 0x457
+ field public static final int REAL = 7; // 0x7
+ field public static final int REF = 2006; // 0x7d6
+ field public static final int ROWID = -8; // 0xfffffff8
+ field public static final int SMALLINT = 5; // 0x5
+ field public static final int SQLXML = 2009; // 0x7d9
+ field public static final int STRUCT = 2002; // 0x7d2
+ field public static final int TIME = 92; // 0x5c
+ field public static final int TIMESTAMP = 93; // 0x5d
+ field public static final int TINYINT = -6; // 0xfffffffa
+ field public static final int VARBINARY = -3; // 0xfffffffd
+ field public static final int VARCHAR = 12; // 0xc
+ }
+
+ public abstract interface Wrapper {
+ method public abstract boolean isWrapperFor(java.lang.Class<?>) throws java.sql.SQLException;
+ method public abstract T unwrap(java.lang.Class<T>) throws java.sql.SQLException;
+ }
+
+}
+
+package java.text {
+
+ public class Annotation {
+ ctor public Annotation(java.lang.Object);
+ method public java.lang.Object getValue();
+ }
+
+ public abstract interface AttributedCharacterIterator implements java.text.CharacterIterator {
+ method public abstract java.util.Set<java.text.AttributedCharacterIterator.Attribute> getAllAttributeKeys();
+ method public abstract java.lang.Object getAttribute(java.text.AttributedCharacterIterator.Attribute);
+ method public abstract java.util.Map<java.text.AttributedCharacterIterator.Attribute, java.lang.Object> getAttributes();
+ method public abstract int getRunLimit();
+ method public abstract int getRunLimit(java.text.AttributedCharacterIterator.Attribute);
+ method public abstract int getRunLimit(java.util.Set<? extends java.text.AttributedCharacterIterator.Attribute>);
+ method public abstract int getRunStart();
+ method public abstract int getRunStart(java.text.AttributedCharacterIterator.Attribute);
+ method public abstract int getRunStart(java.util.Set<? extends java.text.AttributedCharacterIterator.Attribute>);
+ }
+
+ public static class AttributedCharacterIterator.Attribute implements java.io.Serializable {
+ ctor protected AttributedCharacterIterator.Attribute(java.lang.String);
+ method public final boolean equals(java.lang.Object);
+ method protected java.lang.String getName();
+ method public final int hashCode();
+ method protected java.lang.Object readResolve() throws java.io.InvalidObjectException;
+ field public static final java.text.AttributedCharacterIterator.Attribute INPUT_METHOD_SEGMENT;
+ field public static final java.text.AttributedCharacterIterator.Attribute LANGUAGE;
+ field public static final java.text.AttributedCharacterIterator.Attribute READING;
+ }
+
+ public class AttributedString {
+ ctor public AttributedString(java.lang.String);
+ ctor public AttributedString(java.lang.String, java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>);
+ ctor public AttributedString(java.text.AttributedCharacterIterator);
+ ctor public AttributedString(java.text.AttributedCharacterIterator, int, int);
+ ctor public AttributedString(java.text.AttributedCharacterIterator, int, int, java.text.AttributedCharacterIterator.Attribute[]);
+ method public void addAttribute(java.text.AttributedCharacterIterator.Attribute, java.lang.Object);
+ method public void addAttribute(java.text.AttributedCharacterIterator.Attribute, java.lang.Object, int, int);
+ method public void addAttributes(java.util.Map<? extends java.text.AttributedCharacterIterator.Attribute, ?>, int, int);
+ method public java.text.AttributedCharacterIterator getIterator();
+ method public java.text.AttributedCharacterIterator getIterator(java.text.AttributedCharacterIterator.Attribute[]);
+ method public java.text.AttributedCharacterIterator getIterator(java.text.AttributedCharacterIterator.Attribute[], int, int);
+ }
+
+ public final class Bidi {
+ ctor public Bidi(java.lang.String, int);
+ ctor public Bidi(java.text.AttributedCharacterIterator);
+ ctor public Bidi(char[], int, byte[], int, int, int);
+ method public boolean baseIsLeftToRight();
+ method public java.text.Bidi createLineBidi(int, int);
+ method public int getBaseLevel();
+ method public int getLength();
+ method public int getLevelAt(int);
+ method public int getRunCount();
+ method public int getRunLevel(int);
+ method public int getRunLimit(int);
+ method public int getRunStart(int);
+ method public boolean isLeftToRight();
+ method public boolean isMixed();
+ method public boolean isRightToLeft();
+ method public static void reorderVisually(byte[], int, java.lang.Object[], int, int);
+ method public static boolean requiresBidi(char[], int, int);
+ field public static final int DIRECTION_DEFAULT_LEFT_TO_RIGHT = -2; // 0xfffffffe
+ field public static final int DIRECTION_DEFAULT_RIGHT_TO_LEFT = -1; // 0xffffffff
+ field public static final int DIRECTION_LEFT_TO_RIGHT = 0; // 0x0
+ field public static final int DIRECTION_RIGHT_TO_LEFT = 1; // 0x1
+ }
+
+ public abstract class BreakIterator implements java.lang.Cloneable {
+ ctor protected BreakIterator();
+ method public java.lang.Object clone();
+ method public abstract int current();
+ method public abstract int first();
+ method public abstract int following(int);
+ method public static synchronized java.util.Locale[] getAvailableLocales();
+ method public static java.text.BreakIterator getCharacterInstance();
+ method public static java.text.BreakIterator getCharacterInstance(java.util.Locale);
+ method public static java.text.BreakIterator getLineInstance();
+ method public static java.text.BreakIterator getLineInstance(java.util.Locale);
+ method public static java.text.BreakIterator getSentenceInstance();
+ method public static java.text.BreakIterator getSentenceInstance(java.util.Locale);
+ method public abstract java.text.CharacterIterator getText();
+ method public static java.text.BreakIterator getWordInstance();
+ method public static java.text.BreakIterator getWordInstance(java.util.Locale);
+ method public boolean isBoundary(int);
+ method public abstract int last();
+ method public abstract int next(int);
+ method public abstract int next();
+ method public int preceding(int);
+ method public abstract int previous();
+ method public void setText(java.lang.String);
+ method public abstract void setText(java.text.CharacterIterator);
+ field public static final int DONE = -1; // 0xffffffff
+ }
+
+ public abstract interface CharacterIterator implements java.lang.Cloneable {
+ method public abstract java.lang.Object clone();
+ method public abstract char current();
+ method public abstract char first();
+ method public abstract int getBeginIndex();
+ method public abstract int getEndIndex();
+ method public abstract int getIndex();
+ method public abstract char last();
+ method public abstract char next();
+ method public abstract char previous();
+ method public abstract char setIndex(int);
+ field public static final char DONE = 65535; // 0xffff '\uffff'
+ }
+
+ public class ChoiceFormat extends java.text.NumberFormat {
+ ctor public ChoiceFormat(java.lang.String);
+ ctor public ChoiceFormat(double[], java.lang.String[]);
+ method public void applyPattern(java.lang.String);
+ method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.Object[] getFormats();
+ method public double[] getLimits();
+ method public static final double nextDouble(double);
+ method public static double nextDouble(double, boolean);
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public static final double previousDouble(double);
+ method public void setChoices(double[], java.lang.String[]);
+ method public java.lang.String toPattern();
+ }
+
+ public final class CollationElementIterator {
+ method public int getMaxExpansion(int);
+ method public int getOffset();
+ method public int next();
+ method public int previous();
+ method public static final int primaryOrder(int);
+ method public void reset();
+ method public static final short secondaryOrder(int);
+ method public void setOffset(int);
+ method public void setText(java.lang.String);
+ method public void setText(java.text.CharacterIterator);
+ method public static final short tertiaryOrder(int);
+ field public static final int NULLORDER = -1; // 0xffffffff
+ }
+
+ public abstract class CollationKey implements java.lang.Comparable {
+ ctor protected CollationKey(java.lang.String);
+ method public abstract int compareTo(java.text.CollationKey);
+ method public java.lang.String getSourceString();
+ method public abstract byte[] toByteArray();
+ }
+
+ public abstract class Collator implements java.lang.Cloneable java.util.Comparator {
+ ctor protected Collator();
+ method public java.lang.Object clone();
+ method public abstract int compare(java.lang.String, java.lang.String);
+ method public int compare(java.lang.Object, java.lang.Object);
+ method public boolean equals(java.lang.String, java.lang.String);
+ method public static synchronized java.util.Locale[] getAvailableLocales();
+ method public abstract java.text.CollationKey getCollationKey(java.lang.String);
+ method public synchronized int getDecomposition();
+ method public static synchronized java.text.Collator getInstance();
+ method public static synchronized java.text.Collator getInstance(java.util.Locale);
+ method public synchronized int getStrength();
+ method public abstract int hashCode();
+ method public synchronized void setDecomposition(int);
+ method public synchronized void setStrength(int);
+ field public static final int CANONICAL_DECOMPOSITION = 1; // 0x1
+ field public static final int FULL_DECOMPOSITION = 2; // 0x2
+ field public static final int IDENTICAL = 3; // 0x3
+ field public static final int NO_DECOMPOSITION = 0; // 0x0
+ field public static final int PRIMARY = 0; // 0x0
+ field public static final int SECONDARY = 1; // 0x1
+ field public static final int TERTIARY = 2; // 0x2
+ }
+
+ public abstract class DateFormat extends java.text.Format {
+ ctor protected DateFormat();
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(java.util.Date);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.util.Calendar getCalendar();
+ method public static final java.text.DateFormat getDateInstance();
+ method public static final java.text.DateFormat getDateInstance(int);
+ method public static final java.text.DateFormat getDateInstance(int, java.util.Locale);
+ method public static final java.text.DateFormat getDateTimeInstance();
+ method public static final java.text.DateFormat getDateTimeInstance(int, int);
+ method public static final java.text.DateFormat getDateTimeInstance(int, int, java.util.Locale);
+ method public static final java.text.DateFormat getInstance();
+ method public java.text.NumberFormat getNumberFormat();
+ method public static final java.text.DateFormat getTimeInstance();
+ method public static final java.text.DateFormat getTimeInstance(int);
+ method public static final java.text.DateFormat getTimeInstance(int, java.util.Locale);
+ method public java.util.TimeZone getTimeZone();
+ method public boolean isLenient();
+ method public java.util.Date parse(java.lang.String) throws java.text.ParseException;
+ method public abstract java.util.Date parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setCalendar(java.util.Calendar);
+ method public void setLenient(boolean);
+ method public void setNumberFormat(java.text.NumberFormat);
+ method public void setTimeZone(java.util.TimeZone);
+ field public static final int AM_PM_FIELD = 14; // 0xe
+ field public static final int DATE_FIELD = 3; // 0x3
+ field public static final int DAY_OF_WEEK_FIELD = 9; // 0x9
+ field public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11; // 0xb
+ field public static final int DAY_OF_YEAR_FIELD = 10; // 0xa
+ field public static final int DEFAULT = 2; // 0x2
+ field public static final int ERA_FIELD = 0; // 0x0
+ field public static final int FULL = 0; // 0x0
+ field public static final int HOUR0_FIELD = 16; // 0x10
+ field public static final int HOUR1_FIELD = 15; // 0xf
+ field public static final int HOUR_OF_DAY0_FIELD = 5; // 0x5
+ field public static final int HOUR_OF_DAY1_FIELD = 4; // 0x4
+ field public static final int LONG = 1; // 0x1
+ field public static final int MEDIUM = 2; // 0x2
+ field public static final int MILLISECOND_FIELD = 8; // 0x8
+ field public static final int MINUTE_FIELD = 6; // 0x6
+ field public static final int MONTH_FIELD = 2; // 0x2
+ field public static final int SECOND_FIELD = 7; // 0x7
+ field public static final int SHORT = 3; // 0x3
+ field public static final int TIMEZONE_FIELD = 17; // 0x11
+ field public static final int WEEK_OF_MONTH_FIELD = 13; // 0xd
+ field public static final int WEEK_OF_YEAR_FIELD = 12; // 0xc
+ field public static final int YEAR_FIELD = 1; // 0x1
+ field protected java.util.Calendar calendar;
+ field protected java.text.NumberFormat numberFormat;
+ }
+
+ public static class DateFormat.Field extends java.text.Format.Field {
+ ctor protected DateFormat.Field(java.lang.String, int);
+ method public int getCalendarField();
+ method public static java.text.DateFormat.Field ofCalendarField(int);
+ field public static final java.text.DateFormat.Field AM_PM;
+ field public static final java.text.DateFormat.Field DAY_OF_MONTH;
+ field public static final java.text.DateFormat.Field DAY_OF_WEEK;
+ field public static final java.text.DateFormat.Field DAY_OF_WEEK_IN_MONTH;
+ field public static final java.text.DateFormat.Field DAY_OF_YEAR;
+ field public static final java.text.DateFormat.Field ERA;
+ field public static final java.text.DateFormat.Field HOUR0;
+ field public static final java.text.DateFormat.Field HOUR1;
+ field public static final java.text.DateFormat.Field HOUR_OF_DAY0;
+ field public static final java.text.DateFormat.Field HOUR_OF_DAY1;
+ field public static final java.text.DateFormat.Field MILLISECOND;
+ field public static final java.text.DateFormat.Field MINUTE;
+ field public static final java.text.DateFormat.Field MONTH;
+ field public static final java.text.DateFormat.Field SECOND;
+ field public static final java.text.DateFormat.Field TIME_ZONE;
+ field public static final java.text.DateFormat.Field WEEK_OF_MONTH;
+ field public static final java.text.DateFormat.Field WEEK_OF_YEAR;
+ field public static final java.text.DateFormat.Field YEAR;
+ }
+
+ public class DateFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DateFormatSymbols();
+ ctor public DateFormatSymbols(java.util.Locale);
+ method public java.lang.Object clone();
+ method public java.lang.String[] getAmPmStrings();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.lang.String[] getEras();
+ method public static final java.text.DateFormatSymbols getInstance();
+ method public static final java.text.DateFormatSymbols getInstance(java.util.Locale);
+ method public java.lang.String getLocalPatternChars();
+ method public java.lang.String[] getMonths();
+ method public java.lang.String[] getShortMonths();
+ method public java.lang.String[] getShortWeekdays();
+ method public java.lang.String[] getWeekdays();
+ method public java.lang.String[][] getZoneStrings();
+ method public void setAmPmStrings(java.lang.String[]);
+ method public void setEras(java.lang.String[]);
+ method public void setLocalPatternChars(java.lang.String);
+ method public void setMonths(java.lang.String[]);
+ method public void setShortMonths(java.lang.String[]);
+ method public void setShortWeekdays(java.lang.String[]);
+ method public void setWeekdays(java.lang.String[]);
+ method public void setZoneStrings(java.lang.String[][]);
+ }
+
+ public class DecimalFormat extends java.text.NumberFormat {
+ ctor public DecimalFormat();
+ ctor public DecimalFormat(java.lang.String);
+ ctor public DecimalFormat(java.lang.String, java.text.DecimalFormatSymbols);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.text.DecimalFormatSymbols getDecimalFormatSymbols();
+ method public int getGroupingSize();
+ method public int getMultiplier();
+ method public java.lang.String getNegativePrefix();
+ method public java.lang.String getNegativeSuffix();
+ method public java.lang.String getPositivePrefix();
+ method public java.lang.String getPositiveSuffix();
+ method public boolean isDecimalSeparatorAlwaysShown();
+ method public boolean isParseBigDecimal();
+ method public java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public void setDecimalFormatSymbols(java.text.DecimalFormatSymbols);
+ method public void setDecimalSeparatorAlwaysShown(boolean);
+ method public void setGroupingSize(int);
+ method public void setMultiplier(int);
+ method public void setNegativePrefix(java.lang.String);
+ method public void setNegativeSuffix(java.lang.String);
+ method public void setParseBigDecimal(boolean);
+ method public void setPositivePrefix(java.lang.String);
+ method public void setPositiveSuffix(java.lang.String);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ }
+
+ public class DecimalFormatSymbols implements java.lang.Cloneable java.io.Serializable {
+ ctor public DecimalFormatSymbols();
+ ctor public DecimalFormatSymbols(java.util.Locale);
+ method public java.lang.Object clone();
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.util.Currency getCurrency();
+ method public java.lang.String getCurrencySymbol();
+ method public char getDecimalSeparator();
+ method public char getDigit();
+ method public java.lang.String getExponentSeparator();
+ method public char getGroupingSeparator();
+ method public java.lang.String getInfinity();
+ method public static final java.text.DecimalFormatSymbols getInstance();
+ method public static final java.text.DecimalFormatSymbols getInstance(java.util.Locale);
+ method public java.lang.String getInternationalCurrencySymbol();
+ method public char getMinusSign();
+ method public java.lang.String getMinusSignString();
+ method public char getMonetaryDecimalSeparator();
+ method public java.lang.String getNaN();
+ method public char getPatternSeparator();
+ method public char getPerMill();
+ method public char getPercent();
+ method public java.lang.String getPercentString();
+ method public char getZeroDigit();
+ method public void setCurrency(java.util.Currency);
+ method public void setCurrencySymbol(java.lang.String);
+ method public void setDecimalSeparator(char);
+ method public void setDigit(char);
+ method public void setExponentSeparator(java.lang.String);
+ method public void setGroupingSeparator(char);
+ method public void setInfinity(java.lang.String);
+ method public void setInternationalCurrencySymbol(java.lang.String);
+ method public void setMinusSign(char);
+ method public void setMonetaryDecimalSeparator(char);
+ method public void setNaN(java.lang.String);
+ method public void setPatternSeparator(char);
+ method public void setPerMill(char);
+ method public void setPercent(char);
+ method public void setZeroDigit(char);
+ }
+
+ public class FieldPosition {
+ ctor public FieldPosition(int);
+ ctor public FieldPosition(java.text.Format.Field);
+ ctor public FieldPosition(java.text.Format.Field, int);
+ method public int getBeginIndex();
+ method public int getEndIndex();
+ method public int getField();
+ method public java.text.Format.Field getFieldAttribute();
+ method public void setBeginIndex(int);
+ method public void setEndIndex(int);
+ }
+
+ public abstract class Format implements java.lang.Cloneable java.io.Serializable {
+ ctor protected Format();
+ method public java.lang.Object clone();
+ method public final java.lang.String format(java.lang.Object);
+ method public abstract java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object);
+ method public abstract java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException;
+ }
+
+ public static class Format.Field extends java.text.AttributedCharacterIterator.Attribute {
+ ctor protected Format.Field(java.lang.String);
+ }
+
+ public class MessageFormat extends java.text.Format {
+ ctor public MessageFormat(java.lang.String);
+ ctor public MessageFormat(java.lang.String, java.util.Locale);
+ method public void applyPattern(java.lang.String);
+ method public final java.lang.StringBuffer format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.lang.String format(java.lang.String, java.lang.Object...);
+ method public final java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.text.Format[] getFormats();
+ method public java.text.Format[] getFormatsByArgumentIndex();
+ method public java.util.Locale getLocale();
+ method public java.lang.Object[] parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Object[] parse(java.lang.String) throws java.text.ParseException;
+ method public java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setFormat(int, java.text.Format);
+ method public void setFormatByArgumentIndex(int, java.text.Format);
+ method public void setFormats(java.text.Format[]);
+ method public void setFormatsByArgumentIndex(java.text.Format[]);
+ method public void setLocale(java.util.Locale);
+ method public java.lang.String toPattern();
+ }
+
+ public static class MessageFormat.Field extends java.text.Format.Field {
+ ctor protected MessageFormat.Field(java.lang.String);
+ field public static final java.text.MessageFormat.Field ARGUMENT;
+ }
+
+ public final class Normalizer {
+ method public static boolean isNormalized(java.lang.CharSequence, java.text.Normalizer.Form);
+ method public static java.lang.String normalize(java.lang.CharSequence, java.text.Normalizer.Form);
+ }
+
+ public static final class Normalizer.Form extends java.lang.Enum {
+ method public static java.text.Normalizer.Form valueOf(java.lang.String);
+ method public static final java.text.Normalizer.Form[] values();
+ enum_constant public static final java.text.Normalizer.Form NFC;
+ enum_constant public static final java.text.Normalizer.Form NFD;
+ enum_constant public static final java.text.Normalizer.Form NFKC;
+ enum_constant public static final java.text.Normalizer.Form NFKD;
+ }
+
+ public abstract class NumberFormat extends java.text.Format {
+ ctor protected NumberFormat();
+ method public java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition);
+ method public final java.lang.String format(double);
+ method public final java.lang.String format(long);
+ method public abstract java.lang.StringBuffer format(double, java.lang.StringBuffer, java.text.FieldPosition);
+ method public abstract java.lang.StringBuffer format(long, java.lang.StringBuffer, java.text.FieldPosition);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.util.Currency getCurrency();
+ method public static final java.text.NumberFormat getCurrencyInstance();
+ method public static java.text.NumberFormat getCurrencyInstance(java.util.Locale);
+ method public static final java.text.NumberFormat getInstance();
+ method public static java.text.NumberFormat getInstance(java.util.Locale);
+ method public static final java.text.NumberFormat getIntegerInstance();
+ method public static java.text.NumberFormat getIntegerInstance(java.util.Locale);
+ method public int getMaximumFractionDigits();
+ method public int getMaximumIntegerDigits();
+ method public int getMinimumFractionDigits();
+ method public int getMinimumIntegerDigits();
+ method public static final java.text.NumberFormat getNumberInstance();
+ method public static java.text.NumberFormat getNumberInstance(java.util.Locale);
+ method public static final java.text.NumberFormat getPercentInstance();
+ method public static java.text.NumberFormat getPercentInstance(java.util.Locale);
+ method public java.math.RoundingMode getRoundingMode();
+ method public boolean isGroupingUsed();
+ method public boolean isParseIntegerOnly();
+ method public abstract java.lang.Number parse(java.lang.String, java.text.ParsePosition);
+ method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
+ method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
+ method public void setCurrency(java.util.Currency);
+ method public void setGroupingUsed(boolean);
+ method public void setMaximumFractionDigits(int);
+ method public void setMaximumIntegerDigits(int);
+ method public void setMinimumFractionDigits(int);
+ method public void setMinimumIntegerDigits(int);
+ method public void setParseIntegerOnly(boolean);
+ method public void setRoundingMode(java.math.RoundingMode);
+ field public static final int FRACTION_FIELD = 1; // 0x1
+ field public static final int INTEGER_FIELD = 0; // 0x0
+ }
+
+ public static class NumberFormat.Field extends java.text.Format.Field {
+ ctor protected NumberFormat.Field(java.lang.String);
+ field public static final java.text.NumberFormat.Field CURRENCY;
+ field public static final java.text.NumberFormat.Field DECIMAL_SEPARATOR;
+ field public static final java.text.NumberFormat.Field EXPONENT;
+ field public static final java.text.NumberFormat.Field EXPONENT_SIGN;
+ field public static final java.text.NumberFormat.Field EXPONENT_SYMBOL;
+ field public static final java.text.NumberFormat.Field FRACTION;
+ field public static final java.text.NumberFormat.Field GROUPING_SEPARATOR;
+ field public static final java.text.NumberFormat.Field INTEGER;
+ field public static final java.text.NumberFormat.Field PERCENT;
+ field public static final java.text.NumberFormat.Field PERMILLE;
+ field public static final java.text.NumberFormat.Field SIGN;
+ }
+
+ public class ParseException extends java.lang.Exception {
+ ctor public ParseException(java.lang.String, int);
+ method public int getErrorOffset();
+ }
+
+ public class ParsePosition {
+ ctor public ParsePosition(int);
+ method public int getErrorIndex();
+ method public int getIndex();
+ method public void setErrorIndex(int);
+ method public void setIndex(int);
+ }
+
+ public class RuleBasedCollator extends java.text.Collator {
+ ctor public RuleBasedCollator(java.lang.String) throws java.text.ParseException;
+ method public synchronized int compare(java.lang.String, java.lang.String);
+ method public java.text.CollationElementIterator getCollationElementIterator(java.lang.String);
+ method public java.text.CollationElementIterator getCollationElementIterator(java.text.CharacterIterator);
+ method public synchronized java.text.CollationKey getCollationKey(java.lang.String);
+ method public java.lang.String getRules();
+ method public int hashCode();
+ }
+
+ public class SimpleDateFormat extends java.text.DateFormat {
+ ctor public SimpleDateFormat();
+ ctor public SimpleDateFormat(java.lang.String);
+ ctor public SimpleDateFormat(java.lang.String, java.util.Locale);
+ ctor public SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols);
+ method public void applyLocalizedPattern(java.lang.String);
+ method public void applyPattern(java.lang.String);
+ method public java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition);
+ method public java.util.Date get2DigitYearStart();
+ method public java.text.DateFormatSymbols getDateFormatSymbols();
+ method public java.util.Date parse(java.lang.String, java.text.ParsePosition);
+ method public void set2DigitYearStart(java.util.Date);
+ method public void setDateFormatSymbols(java.text.DateFormatSymbols);
+ method public java.lang.String toLocalizedPattern();
+ method public java.lang.String toPattern();
+ }
+
+ public final class StringCharacterIterator implements java.text.CharacterIterator {
+ ctor public StringCharacterIterator(java.lang.String);
+ ctor public StringCharacterIterator(java.lang.String, int);
+ ctor public StringCharacterIterator(java.lang.String, int, int, int);
+ method public java.lang.Object clone();
+ method public char current();
+ method public char first();
+ method public int getBeginIndex();
+ method public int getEndIndex();
+ method public int getIndex();
+ method public char last();
+ method public char next();
+ method public char previous();
+ method public char setIndex(int);
+ method public void setText(java.lang.String);
+ }
+
+}
+
+package java.util {
+
+ public abstract class AbstractCollection implements java.util.Collection {
+ ctor protected AbstractCollection();
+ method public boolean add(E);
+ method public boolean addAll(java.util.Collection<? extends E>);
+ method public void clear();
+ method public boolean contains(java.lang.Object);
+ method public boolean containsAll(java.util.Collection<?>);
+ method public boolean isEmpty();
+ method public abstract java.util.Iterator<E> iterator();
+ method public boolean remove(java.lang.Object);
+ method public boolean removeAll(java.util.Collection<?>);
+ method public boolean retainAll(java.util.Collection<?>);
+ method public abstract int size();
+ method public java.lang.Object[] toArray();
+ method public T[] toArray(T[]);
+ }
+
+ public abstract class AbstractList extends java.util.AbstractCollection implements java.util.List {
+ ctor protected AbstractList();
+ method public void add(int, E);
+ method public boolean addAll(int, java.util.Collection<? extends E>);
+ method public abstract E get(int);
+ method public int indexOf(java.lang.Object);
+ method public java.util.Iterator<E> iterator();
+ method public int lastIndexOf(java.lang.Object);
+ method public java.util.ListIterator<E> listIterator();
+ method public java.util.ListIterator<E> listIterator(int);
+ method public E remove(int);
+ method protected void removeRange(int, int);
+ method public E set(int, E);
+ method public java.util.List<E> subList(int, int);
+ field protected transient int modCount;
+ }
+
+ public abstract class AbstractMap implements java.util.Map {
+ ctor protected AbstractMap();
+ method public void clear();
+ method public boolean containsKey(java.lang.Object);
+ method public boolean containsValue(java.lang.Object);
+ method public abstract java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public V get(java.lang.Object);
+ method public boolean isEmpty();
+ method public java.util.Set<K> keySet();
+ method public V put(K, V);
+ method public void putAll(java.util.Map<? extends K, ? extends V>);
+ method public V remove(java.lang.Object);
+ method public int size();
+ method public java.util.Collection<V> values();
+ }
+
+ public static class AbstractMap.SimpleEntry implements java.util.Map.Entry java.io.Serializable {
+ ctor public AbstractMap.SimpleEntry(K, V);
+ ctor public AbstractMap.SimpleEntry(java.util.Map.Entry<? extends K, ? extends V>);
+ method public K getKey();
+ method public V getValue();
+ method public V setValue(V);
+ }
+
+ public static class AbstractMap.SimpleImmutableEntry implements java.util.Map.Entry java.io.Serializable {
+ ctor public AbstractMap.SimpleImmutableEntry(K, V);
+ ctor public AbstractMap.SimpleImmutableEntry(java.util.Map.Entry<? extends K, ? extends V>);
+ method public K getKey();
+ method public V getValue();
+ method public V setValue(V);
+ }
+
+ public abstract class AbstractQueue extends java.util.AbstractCollection implements java.util.Queue {
+ ctor protected AbstractQueue();
+ method public E element();
+ method public E remove();
+ }
+
+ public abstract class AbstractSequentialList extends java.util.AbstractList {
+ ctor protected AbstractSequentialList();
+ method public E get(int);
+ method public abstract java.util.ListIterator<E> listIterator(int);
+ }
+
+ public abstract class AbstractSet extends java.util.AbstractCollection implements java.util.Set {
+ ctor protected AbstractSet();
+ }
+
+ public class ArrayDeque extends java.util.AbstractCollection implements java.lang.Cloneable java.util.Deque java.io.Serializable {
+ ctor public ArrayDeque();
+ ctor public ArrayDeque(int);
+ ctor public ArrayDeque(java.util.Collection<? extends E>);
+ method public void addFirst(E);
+ method public void addLast(E);
+ method public java.util.ArrayDeque<E> clone();
+ method public java.util.Iterator<E> descendingIterator();
+ method public E element();
+ method public E getFirst();
+ method public E getLast();
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public boolean offerFirst(E);
+ method public boolean offerLast(E);
+ method public E peek();
+ method public E peekFirst();
+ method public E peekLast();
+ method public E poll();
+ method public E pollFirst();
+ method public E pollLast();
+ method public E pop();
+ method public void push(E);
+ method public E remove();
+ method public E removeFirst();
+ method public boolean removeFirstOccurrence(java.lang.Object);
+ method public E removeLast();
+ method public boolean removeLastOccurrence(java.lang.Object);
+ method public int size();
+ }
+
+ public class ArrayList extends java.util.AbstractList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
+ ctor public ArrayList(int);
+ ctor public ArrayList();
+ ctor public ArrayList(java.util.Collection<? extends E>);
+ method public java.lang.Object clone();
+ method public void ensureCapacity(int);
+ method public E get(int);
+ method public int size();
+ method public void trimToSize();
+ }
+
+ public class Arrays {
+ method public static java.util.List<T> asList(T...);
+ method public static int binarySearch(long[], long);
+ method public static int binarySearch(long[], int, int, long);
+ method public static int binarySearch(int[], int);
+ method public static int binarySearch(int[], int, int, int);
+ method public static int binarySearch(short[], short);
+ method public static int binarySearch(short[], int, int, short);
+ method public static int binarySearch(char[], char);
+ method public static int binarySearch(char[], int, int, char);
+ method public static int binarySearch(byte[], byte);
+ method public static int binarySearch(byte[], int, int, byte);
+ method public static int binarySearch(double[], double);
+ method public static int binarySearch(double[], int, int, double);
+ method public static int binarySearch(float[], float);
+ method public static int binarySearch(float[], int, int, float);
+ method public static int binarySearch(java.lang.Object[], java.lang.Object);
+ method public static int binarySearch(java.lang.Object[], int, int, java.lang.Object);
+ method public static int binarySearch(T[], T, java.util.Comparator<? super T>);
+ method public static int binarySearch(T[], int, int, T, java.util.Comparator<? super T>);
+ method public static T[] copyOf(T[], int);
+ method public static T[] copyOf(U[], int, java.lang.Class<? extends T[]>);
+ method public static byte[] copyOf(byte[], int);
+ method public static short[] copyOf(short[], int);
+ method public static int[] copyOf(int[], int);
+ method public static long[] copyOf(long[], int);
+ method public static char[] copyOf(char[], int);
+ method public static float[] copyOf(float[], int);
+ method public static double[] copyOf(double[], int);
+ method public static boolean[] copyOf(boolean[], int);
+ method public static T[] copyOfRange(T[], int, int);
+ method public static T[] copyOfRange(U[], int, int, java.lang.Class<? extends T[]>);
+ method public static byte[] copyOfRange(byte[], int, int);
+ method public static short[] copyOfRange(short[], int, int);
+ method public static int[] copyOfRange(int[], int, int);
+ method public static long[] copyOfRange(long[], int, int);
+ method public static char[] copyOfRange(char[], int, int);
+ method public static float[] copyOfRange(float[], int, int);
+ method public static double[] copyOfRange(double[], int, int);
+ method public static boolean[] copyOfRange(boolean[], int, int);
+ method public static boolean deepEquals(java.lang.Object[], java.lang.Object[]);
+ method public static int deepHashCode(java.lang.Object[]);
+ method public static java.lang.String deepToString(java.lang.Object[]);
+ method public static boolean equals(long[], long[]);
+ method public static boolean equals(int[], int[]);
+ method public static boolean equals(short[], short[]);
+ method public static boolean equals(char[], char[]);
+ method public static boolean equals(byte[], byte[]);
+ method public static boolean equals(boolean[], boolean[]);
+ method public static boolean equals(double[], double[]);
+ method public static boolean equals(float[], float[]);
+ method public static boolean equals(java.lang.Object[], java.lang.Object[]);
+ method public static void fill(long[], long);
+ method public static void fill(long[], int, int, long);
+ method public static void fill(int[], int);
+ method public static void fill(int[], int, int, int);
+ method public static void fill(short[], short);
+ method public static void fill(short[], int, int, short);
+ method public static void fill(char[], char);
+ method public static void fill(char[], int, int, char);
+ method public static void fill(byte[], byte);
+ method public static void fill(byte[], int, int, byte);
+ method public static void fill(boolean[], boolean);
+ method public static void fill(boolean[], int, int, boolean);
+ method public static void fill(double[], double);
+ method public static void fill(double[], int, int, double);
+ method public static void fill(float[], float);
+ method public static void fill(float[], int, int, float);
+ method public static void fill(java.lang.Object[], java.lang.Object);
+ method public static void fill(java.lang.Object[], int, int, java.lang.Object);
+ method public static int hashCode(long[]);
+ method public static int hashCode(int[]);
+ method public static int hashCode(short[]);
+ method public static int hashCode(char[]);
+ method public static int hashCode(byte[]);
+ method public static int hashCode(boolean[]);
+ method public static int hashCode(float[]);
+ method public static int hashCode(double[]);
+ method public static int hashCode(java.lang.Object[]);
+ method public static void sort(int[]);
+ method public static void sort(int[], int, int);
+ method public static void sort(long[]);
+ method public static void sort(long[], int, int);
+ method public static void sort(short[]);
+ method public static void sort(short[], int, int);
+ method public static void sort(char[]);
+ method public static void sort(char[], int, int);
+ method public static void sort(byte[]);
+ method public static void sort(byte[], int, int);
+ method public static void sort(float[]);
+ method public static void sort(float[], int, int);
+ method public static void sort(double[]);
+ method public static void sort(double[], int, int);
+ method public static void sort(java.lang.Object[]);
+ method public static void sort(java.lang.Object[], int, int);
+ method public static void sort(T[], java.util.Comparator<? super T>);
+ method public static void sort(T[], int, int, java.util.Comparator<? super T>);
+ method public static java.lang.String toString(long[]);
+ method public static java.lang.String toString(int[]);
+ method public static java.lang.String toString(short[]);
+ method public static java.lang.String toString(char[]);
+ method public static java.lang.String toString(byte[]);
+ method public static java.lang.String toString(boolean[]);
+ method public static java.lang.String toString(float[]);
+ method public static java.lang.String toString(double[]);
+ method public static java.lang.String toString(java.lang.Object[]);
+ }
+
+ public class BitSet implements java.lang.Cloneable java.io.Serializable {
+ ctor public BitSet();
+ ctor public BitSet(int);
+ method public void and(java.util.BitSet);
+ method public void andNot(java.util.BitSet);
+ method public int cardinality();
+ method public void clear(int);
+ method public void clear(int, int);
+ method public void clear();
+ method public java.lang.Object clone();
+ method public void flip(int);
+ method public void flip(int, int);
+ method public boolean get(int);
+ method public java.util.BitSet get(int, int);
+ method public boolean intersects(java.util.BitSet);
+ method public boolean isEmpty();
+ method public int length();
+ method public int nextClearBit(int);
+ method public int nextSetBit(int);
+ method public void or(java.util.BitSet);
+ method public int previousClearBit(int);
+ method public int previousSetBit(int);
+ method public void set(int);
+ method public void set(int, boolean);
+ method public void set(int, int);
+ method public void set(int, int, boolean);
+ method public int size();
+ method public byte[] toByteArray();
+ method public long[] toLongArray();
+ method public static java.util.BitSet valueOf(long[]);
+ method public static java.util.BitSet valueOf(java.nio.LongBuffer);
+ method public static java.util.BitSet valueOf(byte[]);
+ method public static java.util.BitSet valueOf(java.nio.ByteBuffer);
+ method public void xor(java.util.BitSet);
+ }
+
+ public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
+ ctor protected Calendar();
+ ctor protected Calendar(java.util.TimeZone, java.util.Locale);
+ method public abstract void add(int, int);
+ method public boolean after(java.lang.Object);
+ method public boolean before(java.lang.Object);
+ method public final void clear();
+ method public final void clear(int);
+ method public java.lang.Object clone();
+ method public int compareTo(java.util.Calendar);
+ method protected void complete();
+ method protected abstract void computeFields();
+ method protected abstract void computeTime();
+ method public int get(int);
+ method public int getActualMaximum(int);
+ method public int getActualMinimum(int);
+ method public static synchronized java.util.Locale[] getAvailableLocales();
+ method public java.lang.String getDisplayName(int, int, java.util.Locale);
+ method public java.util.Map<java.lang.String, java.lang.Integer> getDisplayNames(int, int, java.util.Locale);
+ method public int getFirstDayOfWeek();
+ method public abstract int getGreatestMinimum(int);
+ method public static java.util.Calendar getInstance();
+ method public static java.util.Calendar getInstance(java.util.TimeZone);
+ method public static java.util.Calendar getInstance(java.util.Locale);
+ method public static java.util.Calendar getInstance(java.util.TimeZone, java.util.Locale);
+ method public abstract int getLeastMaximum(int);
+ method public abstract int getMaximum(int);
+ method public int getMinimalDaysInFirstWeek();
+ method public abstract int getMinimum(int);
+ method public final java.util.Date getTime();
+ method public long getTimeInMillis();
+ method public java.util.TimeZone getTimeZone();
+ method public int getWeekYear();
+ method public int getWeeksInWeekYear();
+ method protected final int internalGet(int);
+ method public boolean isLenient();
+ method public final boolean isSet(int);
+ method public boolean isWeekDateSupported();
+ method public abstract void roll(int, boolean);
+ method public void roll(int, int);
+ method public void set(int, int);
+ method public final void set(int, int, int);
+ method public final void set(int, int, int, int, int);
+ method public final void set(int, int, int, int, int, int);
+ method public void setFirstDayOfWeek(int);
+ method public void setLenient(boolean);
+ method public void setMinimalDaysInFirstWeek(int);
+ method public final void setTime(java.util.Date);
+ method public void setTimeInMillis(long);
+ method public void setTimeZone(java.util.TimeZone);
+ method public void setWeekDate(int, int, int);
+ field public static final int ALL_STYLES = 0; // 0x0
+ field public static final int AM = 0; // 0x0
+ field public static final int AM_PM = 9; // 0x9
+ field public static final int APRIL = 3; // 0x3
+ field public static final int AUGUST = 7; // 0x7
+ field public static final int DATE = 5; // 0x5
+ field public static final int DAY_OF_MONTH = 5; // 0x5
+ field public static final int DAY_OF_WEEK = 7; // 0x7
+ field public static final int DAY_OF_WEEK_IN_MONTH = 8; // 0x8
+ field public static final int DAY_OF_YEAR = 6; // 0x6
+ field public static final int DECEMBER = 11; // 0xb
+ field public static final int DST_OFFSET = 16; // 0x10
+ field public static final int ERA = 0; // 0x0
+ field public static final int FEBRUARY = 1; // 0x1
+ field public static final int FIELD_COUNT = 17; // 0x11
+ field public static final int FRIDAY = 6; // 0x6
+ field public static final int HOUR = 10; // 0xa
+ field public static final int HOUR_OF_DAY = 11; // 0xb
+ field public static final int JANUARY = 0; // 0x0
+ field public static final int JULY = 6; // 0x6
+ field public static final int JUNE = 5; // 0x5
+ field public static final int LONG = 2; // 0x2
+ field public static final int MARCH = 2; // 0x2
+ field public static final int MAY = 4; // 0x4
+ field public static final int MILLISECOND = 14; // 0xe
+ field public static final int MINUTE = 12; // 0xc
+ field public static final int MONDAY = 2; // 0x2
+ field public static final int MONTH = 2; // 0x2
+ field public static final int NOVEMBER = 10; // 0xa
+ field public static final int OCTOBER = 9; // 0x9
+ field public static final int PM = 1; // 0x1
+ field public static final int SATURDAY = 7; // 0x7
+ field public static final int SECOND = 13; // 0xd
+ field public static final int SEPTEMBER = 8; // 0x8
+ field public static final int SHORT = 1; // 0x1
+ field public static final int SUNDAY = 1; // 0x1
+ field public static final int THURSDAY = 5; // 0x5
+ field public static final int TUESDAY = 3; // 0x3
+ field public static final int UNDECIMBER = 12; // 0xc
+ field public static final int WEDNESDAY = 4; // 0x4
+ field public static final int WEEK_OF_MONTH = 4; // 0x4
+ field public static final int WEEK_OF_YEAR = 3; // 0x3
+ field public static final int YEAR = 1; // 0x1
+ field public static final int ZONE_OFFSET = 15; // 0xf
+ field protected boolean areFieldsSet;
+ field protected int[] fields;
+ field protected boolean[] isSet;
+ field protected boolean isTimeSet;
+ field protected long time;
+ }
+
+ public abstract interface Collection implements java.lang.Iterable {
+ method public abstract boolean add(E);
+ method public abstract boolean addAll(java.util.Collection<? extends E>);
+ method public abstract void clear();
+ method public abstract boolean contains(java.lang.Object);
+ method public abstract boolean containsAll(java.util.Collection<?>);
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract int hashCode();
+ method public abstract boolean isEmpty();
+ method public abstract java.util.Iterator<E> iterator();
+ method public abstract boolean remove(java.lang.Object);
+ method public abstract boolean removeAll(java.util.Collection<?>);
+ method public abstract boolean retainAll(java.util.Collection<?>);
+ method public abstract int size();
+ method public abstract java.lang.Object[] toArray();
+ method public abstract T[] toArray(T[]);
+ }
+
+ public class Collections {
+ method public static boolean addAll(java.util.Collection<? super T>, T...);
+ method public static java.util.Queue<T> asLifoQueue(java.util.Deque<T>);
+ method public static int binarySearch(java.util.List<? extends java.lang.Comparable<? super T>>, T);
+ method public static int binarySearch(java.util.List<? extends T>, T, java.util.Comparator<? super T>);
+ method public static java.util.Collection<E> checkedCollection(java.util.Collection<E>, java.lang.Class<E>);
+ method public static java.util.List<E> checkedList(java.util.List<E>, java.lang.Class<E>);
+ method public static java.util.Map<K, V> checkedMap(java.util.Map<K, V>, java.lang.Class<K>, java.lang.Class<V>);
+ method public static java.util.Set<E> checkedSet(java.util.Set<E>, java.lang.Class<E>);
+ method public static java.util.SortedMap<K, V> checkedSortedMap(java.util.SortedMap<K, V>, java.lang.Class<K>, java.lang.Class<V>);
+ method public static java.util.SortedSet<E> checkedSortedSet(java.util.SortedSet<E>, java.lang.Class<E>);
+ method public static void copy(java.util.List<? super T>, java.util.List<? extends T>);
+ method public static boolean disjoint(java.util.Collection<?>, java.util.Collection<?>);
+ method public static java.util.Enumeration<T> emptyEnumeration();
+ method public static java.util.Iterator<T> emptyIterator();
+ method public static final java.util.List<T> emptyList();
+ method public static java.util.ListIterator<T> emptyListIterator();
+ method public static final java.util.Map<K, V> emptyMap();
+ method public static final java.util.Set<T> emptySet();
+ method public static java.util.Enumeration<T> enumeration(java.util.Collection<T>);
+ method public static void fill(java.util.List<? super T>, T);
+ method public static int frequency(java.util.Collection<?>, java.lang.Object);
+ method public static int indexOfSubList(java.util.List<?>, java.util.List<?>);
+ method public static int lastIndexOfSubList(java.util.List<?>, java.util.List<?>);
+ method public static java.util.ArrayList<T> list(java.util.Enumeration<T>);
+ method public static T max(java.util.Collection<? extends T>);
+ method public static T max(java.util.Collection<? extends T>, java.util.Comparator<? super T>);
+ method public static T min(java.util.Collection<? extends T>);
+ method public static T min(java.util.Collection<? extends T>, java.util.Comparator<? super T>);
+ method public static java.util.List<T> nCopies(int, T);
+ method public static java.util.Set<E> newSetFromMap(java.util.Map<E, java.lang.Boolean>);
+ method public static boolean replaceAll(java.util.List<T>, T, T);
+ method public static void reverse(java.util.List<?>);
+ method public static java.util.Comparator<T> reverseOrder();
+ method public static java.util.Comparator<T> reverseOrder(java.util.Comparator<T>);
+ method public static void rotate(java.util.List<?>, int);
+ method public static void shuffle(java.util.List<?>);
+ method public static void shuffle(java.util.List<?>, java.util.Random);
+ method public static java.util.Set<E> singleton(E);
+ method public static java.util.List<E> singletonList(E);
+ method public static java.util.Map<K, V> singletonMap(K, V);
+ method public static void sort(java.util.List<T>);
+ method public static void sort(java.util.List<T>, java.util.Comparator<? super T>);
+ method public static void swap(java.util.List<?>, int, int);
+ method public static java.util.Collection<T> synchronizedCollection(java.util.Collection<T>);
+ method public static java.util.List<T> synchronizedList(java.util.List<T>);
+ method public static java.util.Map<K, V> synchronizedMap(java.util.Map<K, V>);
+ method public static java.util.Set<T> synchronizedSet(java.util.Set<T>);
+ method public static java.util.SortedMap<K, V> synchronizedSortedMap(java.util.SortedMap<K, V>);
+ method public static java.util.SortedSet<T> synchronizedSortedSet(java.util.SortedSet<T>);
+ method public static java.util.Collection<T> unmodifiableCollection(java.util.Collection<? extends T>);
+ method public static java.util.List<T> unmodifiableList(java.util.List<? extends T>);
+ method public static java.util.Map<K, V> unmodifiableMap(java.util.Map<? extends K, ? extends V>);
+ method public static java.util.Set<T> unmodifiableSet(java.util.Set<? extends T>);
+ method public static java.util.SortedMap<K, V> unmodifiableSortedMap(java.util.SortedMap<K, ? extends V>);
+ method public static java.util.SortedSet<T> unmodifiableSortedSet(java.util.SortedSet<T>);
+ field public static final java.util.List EMPTY_LIST;
+ field public static final java.util.Map EMPTY_MAP;
+ field public static final java.util.Set EMPTY_SET;
+ }
+
+ public abstract interface Comparator {
+ method public abstract int compare(T, T);
+ method public abstract boolean equals(java.lang.Object);
+ }
+
+ public class ConcurrentModificationException extends java.lang.RuntimeException {
+ ctor public ConcurrentModificationException();
+ ctor public ConcurrentModificationException(java.lang.String);
+ ctor public ConcurrentModificationException(java.lang.Throwable);
+ ctor public ConcurrentModificationException(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class Currency implements java.io.Serializable {
+ method public static java.util.Set<java.util.Currency> getAvailableCurrencies();
+ method public java.lang.String getCurrencyCode();
+ method public int getDefaultFractionDigits();
+ method public java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public static java.util.Currency getInstance(java.lang.String);
+ method public static java.util.Currency getInstance(java.util.Locale);
+ method public int getNumericCode();
+ method public java.lang.String getSymbol();
+ method public java.lang.String getSymbol(java.util.Locale);
+ }
+
+ public class Date implements java.lang.Cloneable java.lang.Comparable java.io.Serializable {
+ ctor public Date();
+ ctor public Date(long);
+ ctor public deprecated Date(int, int, int);
+ ctor public deprecated Date(int, int, int, int, int);
+ ctor public deprecated Date(int, int, int, int, int, int);
+ ctor public deprecated Date(java.lang.String);
+ method public static deprecated long UTC(int, int, int, int, int, int);
+ method public boolean after(java.util.Date);
+ method public boolean before(java.util.Date);
+ method public java.lang.Object clone();
+ method public int compareTo(java.util.Date);
+ method public deprecated int getDate();
+ method public deprecated int getDay();
+ method public deprecated int getHours();
+ method public deprecated int getMinutes();
+ method public deprecated int getMonth();
+ method public deprecated int getSeconds();
+ method public long getTime();
+ method public deprecated int getTimezoneOffset();
+ method public deprecated int getYear();
+ method public static deprecated long parse(java.lang.String);
+ method public deprecated void setDate(int);
+ method public deprecated void setHours(int);
+ method public deprecated void setMinutes(int);
+ method public deprecated void setMonth(int);
+ method public deprecated void setSeconds(int);
+ method public void setTime(long);
+ method public deprecated void setYear(int);
+ method public deprecated java.lang.String toGMTString();
+ method public deprecated java.lang.String toLocaleString();
+ }
+
+ public abstract interface Deque implements java.util.Queue {
+ method public abstract boolean add(E);
+ method public abstract void addFirst(E);
+ method public abstract void addLast(E);
+ method public abstract boolean contains(java.lang.Object);
+ method public abstract java.util.Iterator<E> descendingIterator();
+ method public abstract E element();
+ method public abstract E getFirst();
+ method public abstract E getLast();
+ method public abstract java.util.Iterator<E> iterator();
+ method public abstract boolean offer(E);
+ method public abstract boolean offerFirst(E);
+ method public abstract boolean offerLast(E);
+ method public abstract E peek();
+ method public abstract E peekFirst();
+ method public abstract E peekLast();
+ method public abstract E poll();
+ method public abstract E pollFirst();
+ method public abstract E pollLast();
+ method public abstract E pop();
+ method public abstract void push(E);
+ method public abstract E remove();
+ method public abstract boolean remove(java.lang.Object);
+ method public abstract E removeFirst();
+ method public abstract boolean removeFirstOccurrence(java.lang.Object);
+ method public abstract E removeLast();
+ method public abstract boolean removeLastOccurrence(java.lang.Object);
+ method public abstract int size();
+ }
+
+ public abstract class Dictionary {
+ ctor public Dictionary();
+ method public abstract java.util.Enumeration<V> elements();
+ method public abstract V get(java.lang.Object);
+ method public abstract boolean isEmpty();
+ method public abstract java.util.Enumeration<K> keys();
+ method public abstract V put(K, V);
+ method public abstract V remove(java.lang.Object);
+ method public abstract int size();
+ }
+
+ public class DuplicateFormatFlagsException extends java.util.IllegalFormatException {
+ ctor public DuplicateFormatFlagsException(java.lang.String);
+ method public java.lang.String getFlags();
+ }
+
+ public class EmptyStackException extends java.lang.RuntimeException {
+ ctor public EmptyStackException();
+ }
+
+ public class EnumMap extends java.util.AbstractMap implements java.lang.Cloneable java.io.Serializable {
+ ctor public EnumMap(java.lang.Class<K>);
+ ctor public EnumMap(java.util.EnumMap<K, ? extends V>);
+ ctor public EnumMap(java.util.Map<K, ? extends V>);
+ method public java.util.EnumMap<K, V> clone();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ }
+
+ public abstract class EnumSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable {
+ method public static java.util.EnumSet<E> allOf(java.lang.Class<E>);
+ method public java.util.EnumSet<E> clone();
+ method public static java.util.EnumSet<E> complementOf(java.util.EnumSet<E>);
+ method public static java.util.EnumSet<E> copyOf(java.util.EnumSet<E>);
+ method public static java.util.EnumSet<E> copyOf(java.util.Collection<E>);
+ method public static java.util.EnumSet<E> noneOf(java.lang.Class<E>);
+ method public static java.util.EnumSet<E> of(E);
+ method public static java.util.EnumSet<E> of(E, E);
+ method public static java.util.EnumSet<E> of(E, E, E);
+ method public static java.util.EnumSet<E> of(E, E, E, E);
+ method public static java.util.EnumSet<E> of(E, E, E, E, E);
+ method public static java.util.EnumSet<E> of(E, E...);
+ method public static java.util.EnumSet<E> range(E, E);
+ }
+
+ public abstract interface Enumeration {
+ method public abstract boolean hasMoreElements();
+ method public abstract E nextElement();
+ }
+
+ public abstract interface EventListener {
+ }
+
+ public abstract class EventListenerProxy implements java.util.EventListener {
+ ctor public EventListenerProxy(T);
+ method public T getListener();
+ }
+
+ public class EventObject implements java.io.Serializable {
+ ctor public EventObject(java.lang.Object);
+ method public java.lang.Object getSource();
+ field protected transient java.lang.Object source;
+ }
+
+ public class FormatFlagsConversionMismatchException extends java.util.IllegalFormatException {
+ ctor public FormatFlagsConversionMismatchException(java.lang.String, char);
+ method public char getConversion();
+ method public java.lang.String getFlags();
+ }
+
+ public abstract interface Formattable {
+ method public abstract void formatTo(java.util.Formatter, int, int, int);
+ }
+
+ public class FormattableFlags {
+ field public static final int ALTERNATE = 4; // 0x4
+ field public static final int LEFT_JUSTIFY = 1; // 0x1
+ field public static final int UPPERCASE = 2; // 0x2
+ }
+
+ public final class Formatter implements java.io.Closeable java.io.Flushable {
+ ctor public Formatter();
+ ctor public Formatter(java.lang.Appendable);
+ ctor public Formatter(java.util.Locale);
+ ctor public Formatter(java.lang.Appendable, java.util.Locale);
+ ctor public Formatter(java.lang.String) throws java.io.FileNotFoundException;
+ ctor public Formatter(java.lang.String, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.lang.String, java.lang.String, java.util.Locale) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.io.File) throws java.io.FileNotFoundException;
+ ctor public Formatter(java.io.File, java.lang.String) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.io.File, java.lang.String, java.util.Locale) throws java.io.FileNotFoundException, java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.io.PrintStream);
+ ctor public Formatter(java.io.OutputStream);
+ ctor public Formatter(java.io.OutputStream, java.lang.String) throws java.io.UnsupportedEncodingException;
+ ctor public Formatter(java.io.OutputStream, java.lang.String, java.util.Locale) throws java.io.UnsupportedEncodingException;
+ method public void close();
+ method public void flush();
+ method public java.util.Formatter format(java.lang.String, java.lang.Object...);
+ method public java.util.Formatter format(java.util.Locale, java.lang.String, java.lang.Object...);
+ method public java.io.IOException ioException();
+ method public java.util.Locale locale();
+ method public java.lang.Appendable out();
+ }
+
+ public static final class Formatter.BigDecimalLayoutForm extends java.lang.Enum {
+ method public static java.util.Formatter.BigDecimalLayoutForm valueOf(java.lang.String);
+ method public static final java.util.Formatter.BigDecimalLayoutForm[] values();
+ enum_constant public static final java.util.Formatter.BigDecimalLayoutForm DECIMAL_FLOAT;
+ enum_constant public static final java.util.Formatter.BigDecimalLayoutForm SCIENTIFIC;
+ }
+
+ public class FormatterClosedException extends java.lang.IllegalStateException {
+ ctor public FormatterClosedException();
+ }
+
+ public class GregorianCalendar extends java.util.Calendar {
+ ctor public GregorianCalendar();
+ ctor public GregorianCalendar(java.util.TimeZone);
+ ctor public GregorianCalendar(java.util.Locale);
+ ctor public GregorianCalendar(java.util.TimeZone, java.util.Locale);
+ ctor public GregorianCalendar(int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int);
+ ctor public GregorianCalendar(int, int, int, int, int, int);
+ method public void add(int, int);
+ method protected void computeFields();
+ method protected void computeTime();
+ method public int getGreatestMinimum(int);
+ method public final java.util.Date getGregorianChange();
+ method public int getLeastMaximum(int);
+ method public int getMaximum(int);
+ method public int getMinimum(int);
+ method public boolean isLeapYear(int);
+ method public final boolean isWeekDateSupported();
+ method public void roll(int, boolean);
+ method public void setGregorianChange(java.util.Date);
+ field public static final int AD = 1; // 0x1
+ field public static final int BC = 0; // 0x0
+ }
+
+ public class HashMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
+ ctor public HashMap(int, float);
+ ctor public HashMap(int);
+ ctor public HashMap();
+ ctor public HashMap(java.util.Map<? extends K, ? extends V>);
+ method public java.lang.Object clone();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ }
+
+ public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {
+ ctor public HashSet();
+ ctor public HashSet(java.util.Collection<? extends E>);
+ ctor public HashSet(int, float);
+ ctor public HashSet(int);
+ method public java.lang.Object clone();
+ method public java.util.Iterator<E> iterator();
+ method public int size();
+ }
+
+ public class Hashtable extends java.util.Dictionary implements java.lang.Cloneable java.util.Map java.io.Serializable {
+ ctor public Hashtable(int, float);
+ ctor public Hashtable(int);
+ ctor public Hashtable();
+ ctor public Hashtable(java.util.Map<? extends K, ? extends V>);
+ method public synchronized void clear();
+ method public synchronized java.lang.Object clone();
+ method public synchronized boolean contains(java.lang.Object);
+ method public synchronized boolean containsKey(java.lang.Object);
+ method public boolean containsValue(java.lang.Object);
+ method public synchronized java.util.Enumeration<V> elements();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public synchronized V get(java.lang.Object);
+ method public synchronized boolean isEmpty();
+ method public java.util.Set<K> keySet();
+ method public synchronized java.util.Enumeration<K> keys();
+ method public synchronized V put(K, V);
+ method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);
+ method protected void rehash();
+ method public synchronized V remove(java.lang.Object);
+ method public synchronized int size();
+ method public java.util.Collection<V> values();
+ }
+
+ public class IdentityHashMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.Map java.io.Serializable {
+ ctor public IdentityHashMap();
+ ctor public IdentityHashMap(int);
+ ctor public IdentityHashMap(java.util.Map<? extends K, ? extends V>);
+ method public java.lang.Object clone();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ }
+
+ public class IllegalFormatCodePointException extends java.util.IllegalFormatException {
+ ctor public IllegalFormatCodePointException(int);
+ method public int getCodePoint();
+ }
+
+ public class IllegalFormatConversionException extends java.util.IllegalFormatException {
+ ctor public IllegalFormatConversionException(char, java.lang.Class<?>);
+ method public java.lang.Class<?> getArgumentClass();
+ method public char getConversion();
+ }
+
+ public class IllegalFormatException extends java.lang.IllegalArgumentException {
+ }
+
+ public class IllegalFormatFlagsException extends java.util.IllegalFormatException {
+ ctor public IllegalFormatFlagsException(java.lang.String);
+ method public java.lang.String getFlags();
+ }
+
+ public class IllegalFormatPrecisionException extends java.util.IllegalFormatException {
+ ctor public IllegalFormatPrecisionException(int);
+ method public int getPrecision();
+ }
+
+ public class IllegalFormatWidthException extends java.util.IllegalFormatException {
+ ctor public IllegalFormatWidthException(int);
+ method public int getWidth();
+ }
+
+ public class IllformedLocaleException extends java.lang.RuntimeException {
+ ctor public IllformedLocaleException();
+ ctor public IllformedLocaleException(java.lang.String);
+ ctor public IllformedLocaleException(java.lang.String, int);
+ method public int getErrorIndex();
+ }
+
+ public class InputMismatchException extends java.util.NoSuchElementException {
+ ctor public InputMismatchException();
+ ctor public InputMismatchException(java.lang.String);
+ }
+
+ public class InvalidPropertiesFormatException extends java.io.IOException {
+ ctor public InvalidPropertiesFormatException(java.lang.Throwable);
+ ctor public InvalidPropertiesFormatException(java.lang.String);
+ }
+
+ public abstract interface Iterator {
+ method public abstract boolean hasNext();
+ method public abstract E next();
+ method public abstract void remove();
+ }
+
+ public class LinkedHashMap extends java.util.HashMap implements java.util.Map {
+ ctor public LinkedHashMap(int, float);
+ ctor public LinkedHashMap(int);
+ ctor public LinkedHashMap();
+ ctor public LinkedHashMap(java.util.Map<? extends K, ? extends V>);
+ ctor public LinkedHashMap(int, float, boolean);
+ method protected boolean removeEldestEntry(java.util.Map.Entry<K, V>);
+ }
+
+ public class LinkedHashSet extends java.util.HashSet implements java.lang.Cloneable java.io.Serializable java.util.Set {
+ ctor public LinkedHashSet(int, float);
+ ctor public LinkedHashSet(int);
+ ctor public LinkedHashSet();
+ ctor public LinkedHashSet(java.util.Collection<? extends E>);
+ }
+
+ public class LinkedList extends java.util.AbstractSequentialList implements java.lang.Cloneable java.util.Deque java.util.List java.io.Serializable {
+ ctor public LinkedList();
+ ctor public LinkedList(java.util.Collection<? extends E>);
+ method public void addFirst(E);
+ method public void addLast(E);
+ method public java.lang.Object clone();
+ method public java.util.Iterator<E> descendingIterator();
+ method public E element();
+ method public E getFirst();
+ method public E getLast();
+ method public java.util.ListIterator<E> listIterator(int);
+ method public boolean offer(E);
+ method public boolean offerFirst(E);
+ method public boolean offerLast(E);
+ method public E peek();
+ method public E peekFirst();
+ method public E peekLast();
+ method public E poll();
+ method public E pollFirst();
+ method public E pollLast();
+ method public E pop();
+ method public void push(E);
+ method public E remove();
+ method public E removeFirst();
+ method public boolean removeFirstOccurrence(java.lang.Object);
+ method public E removeLast();
+ method public boolean removeLastOccurrence(java.lang.Object);
+ method public int size();
+ }
+
+ public abstract interface List implements java.util.Collection {
+ method public abstract boolean add(E);
+ method public abstract void add(int, E);
+ method public abstract boolean addAll(java.util.Collection<? extends E>);
+ method public abstract boolean addAll(int, java.util.Collection<? extends E>);
+ method public abstract void clear();
+ method public abstract boolean contains(java.lang.Object);
+ method public abstract boolean containsAll(java.util.Collection<?>);
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract E get(int);
+ method public abstract int hashCode();
+ method public abstract int indexOf(java.lang.Object);
+ method public abstract boolean isEmpty();
+ method public abstract java.util.Iterator<E> iterator();
+ method public abstract int lastIndexOf(java.lang.Object);
+ method public abstract java.util.ListIterator<E> listIterator();
+ method public abstract java.util.ListIterator<E> listIterator(int);
+ method public abstract boolean remove(java.lang.Object);
+ method public abstract E remove(int);
+ method public abstract boolean removeAll(java.util.Collection<?>);
+ method public abstract boolean retainAll(java.util.Collection<?>);
+ method public abstract E set(int, E);
+ method public abstract int size();
+ method public abstract java.util.List<E> subList(int, int);
+ method public abstract java.lang.Object[] toArray();
+ method public abstract T[] toArray(T[]);
+ }
+
+ public abstract interface ListIterator implements java.util.Iterator {
+ method public abstract void add(E);
+ method public abstract boolean hasNext();
+ method public abstract boolean hasPrevious();
+ method public abstract E next();
+ method public abstract int nextIndex();
+ method public abstract E previous();
+ method public abstract int previousIndex();
+ method public abstract void remove();
+ method public abstract void set(E);
+ }
+
+ public abstract class ListResourceBundle extends java.util.ResourceBundle {
+ ctor public ListResourceBundle();
+ method protected abstract java.lang.Object[][] getContents();
+ method public java.util.Enumeration<java.lang.String> getKeys();
+ method public final java.lang.Object handleGetObject(java.lang.String);
+ }
+
+ public final class Locale implements java.lang.Cloneable java.io.Serializable {
+ ctor public Locale(java.lang.String, java.lang.String, java.lang.String);
+ ctor public Locale(java.lang.String, java.lang.String);
+ ctor public Locale(java.lang.String);
+ method public java.lang.Object clone();
+ method public static java.util.Locale forLanguageTag(java.lang.String);
+ method public static java.util.Locale[] getAvailableLocales();
+ method public java.lang.String getCountry();
+ method public static java.util.Locale getDefault();
+ method public static java.util.Locale getDefault(java.util.Locale.Category);
+ method public final java.lang.String getDisplayCountry();
+ method public java.lang.String getDisplayCountry(java.util.Locale);
+ method public final java.lang.String getDisplayLanguage();
+ method public java.lang.String getDisplayLanguage(java.util.Locale);
+ method public final java.lang.String getDisplayName();
+ method public java.lang.String getDisplayName(java.util.Locale);
+ method public java.lang.String getDisplayScript();
+ method public java.lang.String getDisplayScript(java.util.Locale);
+ method public final java.lang.String getDisplayVariant();
+ method public java.lang.String getDisplayVariant(java.util.Locale);
+ method public java.lang.String getExtension(char);
+ method public java.util.Set<java.lang.Character> getExtensionKeys();
+ method public java.lang.String getISO3Country() throws java.util.MissingResourceException;
+ method public java.lang.String getISO3Language() throws java.util.MissingResourceException;
+ method public static java.lang.String[] getISOCountries();
+ method public static java.lang.String[] getISOLanguages();
+ method public java.lang.String getLanguage();
+ method public java.lang.String getScript();
+ method public java.util.Set<java.lang.String> getUnicodeLocaleAttributes();
+ method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
+ method public java.lang.String getUnicodeLocaleType(java.lang.String);
+ method public java.lang.String getVariant();
+ method public static synchronized void setDefault(java.util.Locale);
+ method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale);
+ method public java.lang.String toLanguageTag();
+ method public final java.lang.String toString();
+ field public static final java.util.Locale CANADA;
+ field public static final java.util.Locale CANADA_FRENCH;
+ field public static final java.util.Locale CHINA;
+ field public static final java.util.Locale CHINESE;
+ field public static final java.util.Locale ENGLISH;
+ field public static final java.util.Locale FRANCE;
+ field public static final java.util.Locale FRENCH;
+ field public static final java.util.Locale GERMAN;
+ field public static final java.util.Locale GERMANY;
+ field public static final java.util.Locale ITALIAN;
+ field public static final java.util.Locale ITALY;
+ field public static final java.util.Locale JAPAN;
+ field public static final java.util.Locale JAPANESE;
+ field public static final java.util.Locale KOREA;
+ field public static final java.util.Locale KOREAN;
+ field public static final java.util.Locale PRC;
+ field public static final char PRIVATE_USE_EXTENSION = 120; // 0x0078 'x'
+ field public static final java.util.Locale ROOT;
+ field public static final java.util.Locale SIMPLIFIED_CHINESE;
+ field public static final java.util.Locale TAIWAN;
+ field public static final java.util.Locale TRADITIONAL_CHINESE;
+ field public static final java.util.Locale UK;
+ field public static final char UNICODE_LOCALE_EXTENSION = 117; // 0x0075 'u'
+ field public static final java.util.Locale US;
+ }
+
+ public static final class Locale.Builder {
+ ctor public Locale.Builder();
+ method public java.util.Locale.Builder addUnicodeLocaleAttribute(java.lang.String);
+ method public java.util.Locale build();
+ method public java.util.Locale.Builder clear();
+ method public java.util.Locale.Builder clearExtensions();
+ method public java.util.Locale.Builder removeUnicodeLocaleAttribute(java.lang.String);
+ method public java.util.Locale.Builder setExtension(char, java.lang.String);
+ method public java.util.Locale.Builder setLanguage(java.lang.String);
+ method public java.util.Locale.Builder setLanguageTag(java.lang.String);
+ method public java.util.Locale.Builder setLocale(java.util.Locale);
+ method public java.util.Locale.Builder setRegion(java.lang.String);
+ method public java.util.Locale.Builder setScript(java.lang.String);
+ method public java.util.Locale.Builder setUnicodeLocaleKeyword(java.lang.String, java.lang.String);
+ method public java.util.Locale.Builder setVariant(java.lang.String);
+ }
+
+ public static final class Locale.Category extends java.lang.Enum {
+ method public static java.util.Locale.Category valueOf(java.lang.String);
+ method public static final java.util.Locale.Category[] values();
+ enum_constant public static final java.util.Locale.Category DISPLAY;
+ enum_constant public static final java.util.Locale.Category FORMAT;
+ }
+
+ public abstract interface Map {
+ method public abstract void clear();
+ method public abstract boolean containsKey(java.lang.Object);
+ method public abstract boolean containsValue(java.lang.Object);
+ method public abstract java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract V get(java.lang.Object);
+ method public abstract int hashCode();
+ method public abstract boolean isEmpty();
+ method public abstract java.util.Set<K> keySet();
+ method public abstract V put(K, V);
+ method public abstract void putAll(java.util.Map<? extends K, ? extends V>);
+ method public abstract V remove(java.lang.Object);
+ method public abstract int size();
+ method public abstract java.util.Collection<V> values();
+ }
+
+ public static abstract interface Map.Entry {
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract K getKey();
+ method public abstract V getValue();
+ method public abstract int hashCode();
+ method public abstract V setValue(V);
+ }
+
+ public class MissingFormatArgumentException extends java.util.IllegalFormatException {
+ ctor public MissingFormatArgumentException(java.lang.String);
+ method public java.lang.String getFormatSpecifier();
+ }
+
+ public class MissingFormatWidthException extends java.util.IllegalFormatException {
+ ctor public MissingFormatWidthException(java.lang.String);
+ method public java.lang.String getFormatSpecifier();
+ }
+
+ public class MissingResourceException extends java.lang.RuntimeException {
+ ctor public MissingResourceException(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String getClassName();
+ method public java.lang.String getKey();
+ }
+
+ public abstract interface NavigableMap implements java.util.SortedMap {
+ method public abstract java.util.Map.Entry<K, V> ceilingEntry(K);
+ method public abstract K ceilingKey(K);
+ method public abstract java.util.NavigableSet<K> descendingKeySet();
+ method public abstract java.util.NavigableMap<K, V> descendingMap();
+ method public abstract java.util.Map.Entry<K, V> firstEntry();
+ method public abstract java.util.Map.Entry<K, V> floorEntry(K);
+ method public abstract K floorKey(K);
+ method public abstract java.util.NavigableMap<K, V> headMap(K, boolean);
+ method public abstract java.util.SortedMap<K, V> headMap(K);
+ method public abstract java.util.Map.Entry<K, V> higherEntry(K);
+ method public abstract K higherKey(K);
+ method public abstract java.util.Map.Entry<K, V> lastEntry();
+ method public abstract java.util.Map.Entry<K, V> lowerEntry(K);
+ method public abstract K lowerKey(K);
+ method public abstract java.util.NavigableSet<K> navigableKeySet();
+ method public abstract java.util.Map.Entry<K, V> pollFirstEntry();
+ method public abstract java.util.Map.Entry<K, V> pollLastEntry();
+ method public abstract java.util.NavigableMap<K, V> subMap(K, boolean, K, boolean);
+ method public abstract java.util.SortedMap<K, V> subMap(K, K);
+ method public abstract java.util.NavigableMap<K, V> tailMap(K, boolean);
+ method public abstract java.util.SortedMap<K, V> tailMap(K);
+ }
+
+ public abstract interface NavigableSet implements java.util.SortedSet {
+ method public abstract E ceiling(E);
+ method public abstract java.util.Iterator<E> descendingIterator();
+ method public abstract java.util.NavigableSet<E> descendingSet();
+ method public abstract E floor(E);
+ method public abstract java.util.NavigableSet<E> headSet(E, boolean);
+ method public abstract java.util.SortedSet<E> headSet(E);
+ method public abstract E higher(E);
+ method public abstract java.util.Iterator<E> iterator();
+ method public abstract E lower(E);
+ method public abstract E pollFirst();
+ method public abstract E pollLast();
+ method public abstract java.util.NavigableSet<E> subSet(E, boolean, E, boolean);
+ method public abstract java.util.SortedSet<E> subSet(E, E);
+ method public abstract java.util.NavigableSet<E> tailSet(E, boolean);
+ method public abstract java.util.SortedSet<E> tailSet(E);
+ }
+
+ public class NoSuchElementException extends java.lang.RuntimeException {
+ ctor public NoSuchElementException();
+ ctor public NoSuchElementException(java.lang.String);
+ }
+
+ public final class Objects {
+ method public static int compare(T, T, java.util.Comparator<? super T>);
+ method public static boolean deepEquals(java.lang.Object, java.lang.Object);
+ method public static boolean equals(java.lang.Object, java.lang.Object);
+ method public static int hash(java.lang.Object...);
+ method public static int hashCode(java.lang.Object);
+ method public static T requireNonNull(T);
+ method public static T requireNonNull(T, java.lang.String);
+ method public static java.lang.String toString(java.lang.Object);
+ method public static java.lang.String toString(java.lang.Object, java.lang.String);
+ }
+
+ public class Observable {
+ ctor public Observable();
+ method public synchronized void addObserver(java.util.Observer);
+ method protected synchronized void clearChanged();
+ method public synchronized int countObservers();
+ method public synchronized void deleteObserver(java.util.Observer);
+ method public synchronized void deleteObservers();
+ method public synchronized boolean hasChanged();
+ method public void notifyObservers();
+ method public void notifyObservers(java.lang.Object);
+ method protected synchronized void setChanged();
+ }
+
+ public abstract interface Observer {
+ method public abstract void update(java.util.Observable, java.lang.Object);
+ }
+
+ public class PriorityQueue extends java.util.AbstractQueue implements java.io.Serializable {
+ ctor public PriorityQueue();
+ ctor public PriorityQueue(int);
+ ctor public PriorityQueue(int, java.util.Comparator<? super E>);
+ ctor public PriorityQueue(java.util.Collection<? extends E>);
+ ctor public PriorityQueue(java.util.PriorityQueue<? extends E>);
+ ctor public PriorityQueue(java.util.SortedSet<? extends E>);
+ method public java.util.Comparator<? super E> comparator();
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public E peek();
+ method public E poll();
+ method public int size();
+ }
+
+ public class Properties extends java.util.Hashtable {
+ ctor public Properties();
+ ctor public Properties(java.util.Properties);
+ method public java.lang.String getProperty(java.lang.String);
+ method public java.lang.String getProperty(java.lang.String, java.lang.String);
+ method public void list(java.io.PrintStream);
+ method public void list(java.io.PrintWriter);
+ method public synchronized void load(java.io.Reader) throws java.io.IOException;
+ method public synchronized void load(java.io.InputStream) throws java.io.IOException;
+ method public synchronized void loadFromXML(java.io.InputStream) throws java.io.IOException, java.util.InvalidPropertiesFormatException;
+ method public java.util.Enumeration<?> propertyNames();
+ method public deprecated void save(java.io.OutputStream, java.lang.String);
+ method public synchronized java.lang.Object setProperty(java.lang.String, java.lang.String);
+ method public void store(java.io.Writer, java.lang.String) throws java.io.IOException;
+ method public void store(java.io.OutputStream, java.lang.String) throws java.io.IOException;
+ method public void storeToXML(java.io.OutputStream, java.lang.String) throws java.io.IOException;
+ method public void storeToXML(java.io.OutputStream, java.lang.String, java.lang.String) throws java.io.IOException;
+ method public java.util.Set<java.lang.String> stringPropertyNames();
+ field protected java.util.Properties defaults;
+ }
+
+ public final class PropertyPermission extends java.security.BasicPermission {
+ ctor public PropertyPermission(java.lang.String, java.lang.String);
+ }
+
+ public class PropertyResourceBundle extends java.util.ResourceBundle {
+ ctor public PropertyResourceBundle(java.io.InputStream) throws java.io.IOException;
+ ctor public PropertyResourceBundle(java.io.Reader) throws java.io.IOException;
+ method public java.util.Enumeration<java.lang.String> getKeys();
+ method public java.lang.Object handleGetObject(java.lang.String);
+ }
+
+ public abstract interface Queue implements java.util.Collection {
+ method public abstract boolean add(E);
+ method public abstract E element();
+ method public abstract boolean offer(E);
+ method public abstract E peek();
+ method public abstract E poll();
+ method public abstract E remove();
+ }
+
+ public class Random implements java.io.Serializable {
+ ctor public Random();
+ ctor public Random(long);
+ method protected int next(int);
+ method public boolean nextBoolean();
+ method public void nextBytes(byte[]);
+ method public double nextDouble();
+ method public float nextFloat();
+ method public synchronized double nextGaussian();
+ method public int nextInt();
+ method public int nextInt(int);
+ method public long nextLong();
+ method public synchronized void setSeed(long);
+ }
+
+ public abstract interface RandomAccess {
+ }
+
+ public abstract class ResourceBundle {
+ ctor public ResourceBundle();
+ method public static final void clearCache();
+ method public static final void clearCache(java.lang.ClassLoader);
+ method public boolean containsKey(java.lang.String);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale);
+ method public static final java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control);
+ method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader);
+ method public static java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control);
+ method public abstract java.util.Enumeration<java.lang.String> getKeys();
+ method public java.util.Locale getLocale();
+ method public final java.lang.Object getObject(java.lang.String);
+ method public final java.lang.String getString(java.lang.String);
+ method public final java.lang.String[] getStringArray(java.lang.String);
+ method protected abstract java.lang.Object handleGetObject(java.lang.String);
+ method protected java.util.Set<java.lang.String> handleKeySet();
+ method public java.util.Set<java.lang.String> keySet();
+ method protected void setParent(java.util.ResourceBundle);
+ field protected java.util.ResourceBundle parent;
+ }
+
+ public static class ResourceBundle.Control {
+ ctor protected ResourceBundle.Control();
+ method public java.util.List<java.util.Locale> getCandidateLocales(java.lang.String, java.util.Locale);
+ method public static final java.util.ResourceBundle.Control getControl(java.util.List<java.lang.String>);
+ method public java.util.Locale getFallbackLocale(java.lang.String, java.util.Locale);
+ method public java.util.List<java.lang.String> getFormats(java.lang.String);
+ method public static final java.util.ResourceBundle.Control getNoFallbackControl(java.util.List<java.lang.String>);
+ method public long getTimeToLive(java.lang.String, java.util.Locale);
+ method public boolean needsReload(java.lang.String, java.util.Locale, java.lang.String, java.lang.ClassLoader, java.util.ResourceBundle, long);
+ method public java.util.ResourceBundle newBundle(java.lang.String, java.util.Locale, java.lang.String, java.lang.ClassLoader, boolean) throws java.io.IOException, java.lang.IllegalAccessException, java.lang.InstantiationException;
+ method public java.lang.String toBundleName(java.lang.String, java.util.Locale);
+ method public final java.lang.String toResourceName(java.lang.String, java.lang.String);
+ field public static final java.util.List<java.lang.String> FORMAT_CLASS;
+ field public static final java.util.List<java.lang.String> FORMAT_DEFAULT;
+ field public static final java.util.List<java.lang.String> FORMAT_PROPERTIES;
+ field public static final long TTL_DONT_CACHE = -1L; // 0xffffffffffffffffL
+ field public static final long TTL_NO_EXPIRATION_CONTROL = -2L; // 0xfffffffffffffffeL
+ }
+
+ public final class Scanner implements java.io.Closeable java.util.Iterator {
+ ctor public Scanner(java.lang.Readable);
+ ctor public Scanner(java.io.InputStream);
+ ctor public Scanner(java.io.InputStream, java.lang.String);
+ ctor public Scanner(java.io.File) throws java.io.FileNotFoundException;
+ ctor public Scanner(java.io.File, java.lang.String) throws java.io.FileNotFoundException;
+ ctor public Scanner(java.nio.file.Path) throws java.io.IOException;
+ ctor public Scanner(java.nio.file.Path, java.lang.String) throws java.io.IOException;
+ ctor public Scanner(java.lang.String);
+ ctor public Scanner(java.nio.channels.ReadableByteChannel);
+ ctor public Scanner(java.nio.channels.ReadableByteChannel, java.lang.String);
+ method public void close();
+ method public java.util.regex.Pattern delimiter();
+ method public java.lang.String findInLine(java.lang.String);
+ method public java.lang.String findInLine(java.util.regex.Pattern);
+ method public java.lang.String findWithinHorizon(java.lang.String, int);
+ method public java.lang.String findWithinHorizon(java.util.regex.Pattern, int);
+ method public boolean hasNext();
+ method public boolean hasNext(java.lang.String);
+ method public boolean hasNext(java.util.regex.Pattern);
+ method public boolean hasNextBigDecimal();
+ method public boolean hasNextBigInteger();
+ method public boolean hasNextBigInteger(int);
+ method public boolean hasNextBoolean();
+ method public boolean hasNextByte();
+ method public boolean hasNextByte(int);
+ method public boolean hasNextDouble();
+ method public boolean hasNextFloat();
+ method public boolean hasNextInt();
+ method public boolean hasNextInt(int);
+ method public boolean hasNextLine();
+ method public boolean hasNextLong();
+ method public boolean hasNextLong(int);
+ method public boolean hasNextShort();
+ method public boolean hasNextShort(int);
+ method public java.io.IOException ioException();
+ method public java.util.Locale locale();
+ method public java.util.regex.MatchResult match();
+ method public java.lang.String next();
+ method public java.lang.String next(java.lang.String);
+ method public java.lang.String next(java.util.regex.Pattern);
+ method public java.math.BigDecimal nextBigDecimal();
+ method public java.math.BigInteger nextBigInteger();
+ method public java.math.BigInteger nextBigInteger(int);
+ method public boolean nextBoolean();
+ method public byte nextByte();
+ method public byte nextByte(int);
+ method public double nextDouble();
+ method public float nextFloat();
+ method public int nextInt();
+ method public int nextInt(int);
+ method public java.lang.String nextLine();
+ method public long nextLong();
+ method public long nextLong(int);
+ method public short nextShort();
+ method public short nextShort(int);
+ method public int radix();
+ method public void remove();
+ method public java.util.Scanner reset();
+ method public java.util.Scanner skip(java.util.regex.Pattern);
+ method public java.util.Scanner skip(java.lang.String);
+ method public java.util.Scanner useDelimiter(java.util.regex.Pattern);
+ method public java.util.Scanner useDelimiter(java.lang.String);
+ method public java.util.Scanner useLocale(java.util.Locale);
+ method public java.util.Scanner useRadix(int);
+ }
+
+ public class ServiceConfigurationError extends java.lang.Error {
+ ctor public ServiceConfigurationError(java.lang.String);
+ ctor public ServiceConfigurationError(java.lang.String, java.lang.Throwable);
+ }
+
+ public final class ServiceLoader implements java.lang.Iterable {
+ method public java.util.Iterator<S> iterator();
+ method public static java.util.ServiceLoader<S> load(java.lang.Class<S>, java.lang.ClassLoader);
+ method public static java.util.ServiceLoader<S> load(java.lang.Class<S>);
+ method public static java.util.ServiceLoader<S> loadInstalled(java.lang.Class<S>);
+ method public void reload();
+ }
+
+ public abstract interface Set implements java.util.Collection {
+ method public abstract boolean add(E);
+ method public abstract boolean addAll(java.util.Collection<? extends E>);
+ method public abstract void clear();
+ method public abstract boolean contains(java.lang.Object);
+ method public abstract boolean containsAll(java.util.Collection<?>);
+ method public abstract boolean equals(java.lang.Object);
+ method public abstract int hashCode();
+ method public abstract boolean isEmpty();
+ method public abstract java.util.Iterator<E> iterator();
+ method public abstract boolean remove(java.lang.Object);
+ method public abstract boolean removeAll(java.util.Collection<?>);
+ method public abstract boolean retainAll(java.util.Collection<?>);
+ method public abstract int size();
+ method public abstract java.lang.Object[] toArray();
+ method public abstract T[] toArray(T[]);
+ }
+
+ public class SimpleTimeZone extends java.util.TimeZone {
+ ctor public SimpleTimeZone(int, java.lang.String);
+ ctor public SimpleTimeZone(int, java.lang.String, int, int, int, int, int, int, int, int);
+ ctor public SimpleTimeZone(int, java.lang.String, int, int, int, int, int, int, int, int, int);
+ ctor public SimpleTimeZone(int, java.lang.String, int, int, int, int, int, int, int, int, int, int, int);
+ method public int getOffset(int, int, int, int, int, int);
+ method public int getRawOffset();
+ method public boolean inDaylightTime(java.util.Date);
+ method public void setDSTSavings(int);
+ method public void setEndRule(int, int, int, int);
+ method public void setEndRule(int, int, int);
+ method public void setEndRule(int, int, int, int, boolean);
+ method public void setRawOffset(int);
+ method public void setStartRule(int, int, int, int);
+ method public void setStartRule(int, int, int);
+ method public void setStartRule(int, int, int, int, boolean);
+ method public void setStartYear(int);
+ method public boolean useDaylightTime();
+ field public static final int STANDARD_TIME = 1; // 0x1
+ field public static final int UTC_TIME = 2; // 0x2
+ field public static final int WALL_TIME = 0; // 0x0
+ }
+
+ public abstract interface SortedMap implements java.util.Map {
+ method public abstract java.util.Comparator<? super K> comparator();
+ method public abstract java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public abstract K firstKey();
+ method public abstract java.util.SortedMap<K, V> headMap(K);
+ method public abstract java.util.Set<K> keySet();
+ method public abstract K lastKey();
+ method public abstract java.util.SortedMap<K, V> subMap(K, K);
+ method public abstract java.util.SortedMap<K, V> tailMap(K);
+ method public abstract java.util.Collection<V> values();
+ }
+
+ public abstract interface SortedSet implements java.util.Set {
+ method public abstract java.util.Comparator<? super E> comparator();
+ method public abstract E first();
+ method public abstract java.util.SortedSet<E> headSet(E);
+ method public abstract E last();
+ method public abstract java.util.SortedSet<E> subSet(E, E);
+ method public abstract java.util.SortedSet<E> tailSet(E);
+ }
+
+ public class Stack extends java.util.Vector {
+ ctor public Stack();
+ method public boolean empty();
+ method public synchronized E peek();
+ method public synchronized E pop();
+ method public E push(E);
+ method public synchronized int search(java.lang.Object);
+ }
+
+ public class StringTokenizer implements java.util.Enumeration {
+ ctor public StringTokenizer(java.lang.String, java.lang.String, boolean);
+ ctor public StringTokenizer(java.lang.String, java.lang.String);
+ ctor public StringTokenizer(java.lang.String);
+ method public int countTokens();
+ method public boolean hasMoreElements();
+ method public boolean hasMoreTokens();
+ method public java.lang.Object nextElement();
+ method public java.lang.String nextToken();
+ method public java.lang.String nextToken(java.lang.String);
+ }
+
+ public abstract class TimeZone implements java.lang.Cloneable java.io.Serializable {
+ ctor public TimeZone();
+ method public java.lang.Object clone();
+ method public static synchronized java.lang.String[] getAvailableIDs(int);
+ method public static synchronized java.lang.String[] getAvailableIDs();
+ method public int getDSTSavings();
+ method public static java.util.TimeZone getDefault();
+ method public final java.lang.String getDisplayName();
+ method public final java.lang.String getDisplayName(java.util.Locale);
+ method public final java.lang.String getDisplayName(boolean, int);
+ method public java.lang.String getDisplayName(boolean, int, java.util.Locale);
+ method public java.lang.String getID();
+ method public abstract int getOffset(int, int, int, int, int, int);
+ method public int getOffset(long);
+ method public abstract int getRawOffset();
+ method public static synchronized java.util.TimeZone getTimeZone(java.lang.String);
+ method public boolean hasSameRules(java.util.TimeZone);
+ method public abstract boolean inDaylightTime(java.util.Date);
+ method public boolean observesDaylightTime();
+ method public static synchronized void setDefault(java.util.TimeZone);
+ method public void setID(java.lang.String);
+ method public abstract void setRawOffset(int);
+ method public abstract boolean useDaylightTime();
+ field public static final int LONG = 1; // 0x1
+ field public static final int SHORT = 0; // 0x0
+ }
+
+ public class Timer {
+ ctor public Timer();
+ ctor public Timer(boolean);
+ ctor public Timer(java.lang.String);
+ ctor public Timer(java.lang.String, boolean);
+ method public void cancel();
+ method public int purge();
+ method public void schedule(java.util.TimerTask, long);
+ method public void schedule(java.util.TimerTask, java.util.Date);
+ method public void schedule(java.util.TimerTask, long, long);
+ method public void schedule(java.util.TimerTask, java.util.Date, long);
+ method public void scheduleAtFixedRate(java.util.TimerTask, long, long);
+ method public void scheduleAtFixedRate(java.util.TimerTask, java.util.Date, long);
+ }
+
+ public abstract class TimerTask implements java.lang.Runnable {
+ ctor protected TimerTask();
+ method public boolean cancel();
+ method public abstract void run();
+ method public long scheduledExecutionTime();
+ }
+
+ public class TooManyListenersException extends java.lang.Exception {
+ ctor public TooManyListenersException();
+ ctor public TooManyListenersException(java.lang.String);
+ }
+
+ public class TreeMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.NavigableMap java.io.Serializable {
+ ctor public TreeMap();
+ ctor public TreeMap(java.util.Comparator<? super K>);
+ ctor public TreeMap(java.util.Map<? extends K, ? extends V>);
+ ctor public TreeMap(java.util.SortedMap<K, ? extends V>);
+ method public java.util.Map.Entry<K, V> ceilingEntry(K);
+ method public K ceilingKey(K);
+ method public java.lang.Object clone();
+ method public java.util.Comparator<? super K> comparator();
+ method public java.util.NavigableSet<K> descendingKeySet();
+ method public java.util.NavigableMap<K, V> descendingMap();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public java.util.Map.Entry<K, V> firstEntry();
+ method public K firstKey();
+ method public java.util.Map.Entry<K, V> floorEntry(K);
+ method public K floorKey(K);
+ method public java.util.NavigableMap<K, V> headMap(K, boolean);
+ method public java.util.SortedMap<K, V> headMap(K);
+ method public java.util.Map.Entry<K, V> higherEntry(K);
+ method public K higherKey(K);
+ method public java.util.Map.Entry<K, V> lastEntry();
+ method public K lastKey();
+ method public java.util.Map.Entry<K, V> lowerEntry(K);
+ method public K lowerKey(K);
+ method public java.util.NavigableSet<K> navigableKeySet();
+ method public java.util.Map.Entry<K, V> pollFirstEntry();
+ method public java.util.Map.Entry<K, V> pollLastEntry();
+ method public java.util.NavigableMap<K, V> subMap(K, boolean, K, boolean);
+ method public java.util.SortedMap<K, V> subMap(K, K);
+ method public java.util.NavigableMap<K, V> tailMap(K, boolean);
+ method public java.util.SortedMap<K, V> tailMap(K);
+ }
+
+ public class TreeSet extends java.util.AbstractSet implements java.lang.Cloneable java.util.NavigableSet java.io.Serializable {
+ ctor public TreeSet();
+ ctor public TreeSet(java.util.Comparator<? super E>);
+ ctor public TreeSet(java.util.Collection<? extends E>);
+ ctor public TreeSet(java.util.SortedSet<E>);
+ method public E ceiling(E);
+ method public java.lang.Object clone();
+ method public java.util.Comparator<? super E> comparator();
+ method public java.util.Iterator<E> descendingIterator();
+ method public java.util.NavigableSet<E> descendingSet();
+ method public E first();
+ method public E floor(E);
+ method public java.util.NavigableSet<E> headSet(E, boolean);
+ method public java.util.SortedSet<E> headSet(E);
+ method public E higher(E);
+ method public java.util.Iterator<E> iterator();
+ method public E last();
+ method public E lower(E);
+ method public E pollFirst();
+ method public E pollLast();
+ method public int size();
+ method public java.util.NavigableSet<E> subSet(E, boolean, E, boolean);
+ method public java.util.SortedSet<E> subSet(E, E);
+ method public java.util.NavigableSet<E> tailSet(E, boolean);
+ method public java.util.SortedSet<E> tailSet(E);
+ }
+
+ public final class UUID implements java.lang.Comparable java.io.Serializable {
+ ctor public UUID(long, long);
+ method public int clockSequence();
+ method public int compareTo(java.util.UUID);
+ method public static java.util.UUID fromString(java.lang.String);
+ method public long getLeastSignificantBits();
+ method public long getMostSignificantBits();
+ method public static java.util.UUID nameUUIDFromBytes(byte[]);
+ method public long node();
+ method public static java.util.UUID randomUUID();
+ method public long timestamp();
+ method public int variant();
+ method public int version();
+ }
+
+ public class UnknownFormatConversionException extends java.util.IllegalFormatException {
+ ctor public UnknownFormatConversionException(java.lang.String);
+ method public java.lang.String getConversion();
+ }
+
+ public class UnknownFormatFlagsException extends java.util.IllegalFormatException {
+ ctor public UnknownFormatFlagsException(java.lang.String);
+ method public java.lang.String getFlags();
+ }
+
+ public class Vector extends java.util.AbstractList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
+ ctor public Vector(int, int);
+ ctor public Vector(int);
+ ctor public Vector();
+ ctor public Vector(java.util.Collection<? extends E>);
+ method public synchronized void addElement(E);
+ method public synchronized int capacity();
+ method public synchronized java.lang.Object clone();
+ method public synchronized void copyInto(java.lang.Object[]);
+ method public synchronized E elementAt(int);
+ method public java.util.Enumeration<E> elements();
+ method public synchronized void ensureCapacity(int);
+ method public synchronized E firstElement();
+ method public synchronized E get(int);
+ method public synchronized int indexOf(java.lang.Object, int);
+ method public synchronized void insertElementAt(E, int);
+ method public synchronized E lastElement();
+ method public synchronized int lastIndexOf(java.lang.Object, int);
+ method public synchronized void removeAllElements();
+ method public synchronized boolean removeElement(java.lang.Object);
+ method public synchronized void removeElementAt(int);
+ method public synchronized void setElementAt(E, int);
+ method public synchronized void setSize(int);
+ method public synchronized int size();
+ method public synchronized void trimToSize();
+ field protected int capacityIncrement;
+ field protected int elementCount;
+ field protected java.lang.Object[] elementData;
+ }
+
+ public class WeakHashMap extends java.util.AbstractMap implements java.util.Map {
+ ctor public WeakHashMap(int, float);
+ ctor public WeakHashMap(int);
+ ctor public WeakHashMap();
+ ctor public WeakHashMap(java.util.Map<? extends K, ? extends V>);
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ }
+
+}
+
+package java.util.concurrent {
+
+ public abstract class AbstractExecutorService implements java.util.concurrent.ExecutorService {
+ ctor public AbstractExecutorService();
+ method public java.util.List<java.util.concurrent.Future<T>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<T>>) throws java.lang.InterruptedException;
+ method public java.util.List<java.util.concurrent.Future<T>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<T>>, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public T invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<T>>) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+ method public T invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<T>>, long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method protected java.util.concurrent.RunnableFuture<T> newTaskFor(java.lang.Runnable, T);
+ method protected java.util.concurrent.RunnableFuture<T> newTaskFor(java.util.concurrent.Callable<T>);
+ method public java.util.concurrent.Future<?> submit(java.lang.Runnable);
+ method public java.util.concurrent.Future<T> submit(java.lang.Runnable, T);
+ method public java.util.concurrent.Future<T> submit(java.util.concurrent.Callable<T>);
+ }
+
+ public class ArrayBlockingQueue extends java.util.AbstractQueue implements java.util.concurrent.BlockingQueue java.io.Serializable {
+ ctor public ArrayBlockingQueue(int);
+ ctor public ArrayBlockingQueue(int, boolean);
+ ctor public ArrayBlockingQueue(int, boolean, java.util.Collection<? extends E>);
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E peek();
+ method public E poll();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void put(E) throws java.lang.InterruptedException;
+ method public int remainingCapacity();
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface BlockingDeque implements java.util.concurrent.BlockingQueue java.util.Deque {
+ method public abstract boolean add(E);
+ method public abstract void addFirst(E);
+ method public abstract void addLast(E);
+ method public abstract boolean contains(java.lang.Object);
+ method public abstract E element();
+ method public abstract java.util.Iterator<E> iterator();
+ method public abstract boolean offer(E);
+ method public abstract boolean offer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract boolean offerFirst(E);
+ method public abstract boolean offerFirst(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract boolean offerLast(E);
+ method public abstract boolean offerLast(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract E peek();
+ method public abstract E poll();
+ method public abstract E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract E pollFirst(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract E pollLast(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract void push(E);
+ method public abstract void put(E) throws java.lang.InterruptedException;
+ method public abstract void putFirst(E) throws java.lang.InterruptedException;
+ method public abstract void putLast(E) throws java.lang.InterruptedException;
+ method public abstract E remove();
+ method public abstract boolean remove(java.lang.Object);
+ method public abstract boolean removeFirstOccurrence(java.lang.Object);
+ method public abstract boolean removeLastOccurrence(java.lang.Object);
+ method public abstract int size();
+ method public abstract E take() throws java.lang.InterruptedException;
+ method public abstract E takeFirst() throws java.lang.InterruptedException;
+ method public abstract E takeLast() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface BlockingQueue implements java.util.Queue {
+ method public abstract boolean add(E);
+ method public abstract boolean contains(java.lang.Object);
+ method public abstract int drainTo(java.util.Collection<? super E>);
+ method public abstract int drainTo(java.util.Collection<? super E>, int);
+ method public abstract boolean offer(E);
+ method public abstract boolean offer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract void put(E) throws java.lang.InterruptedException;
+ method public abstract int remainingCapacity();
+ method public abstract boolean remove(java.lang.Object);
+ method public abstract E take() throws java.lang.InterruptedException;
+ }
+
+ public class BrokenBarrierException extends java.lang.Exception {
+ ctor public BrokenBarrierException();
+ ctor public BrokenBarrierException(java.lang.String);
+ }
+
+ public abstract interface Callable {
+ method public abstract V call() throws java.lang.Exception;
+ }
+
+ public class CancellationException extends java.lang.IllegalStateException {
+ ctor public CancellationException();
+ ctor public CancellationException(java.lang.String);
+ }
+
+ public abstract interface CompletionService {
+ method public abstract java.util.concurrent.Future<V> poll();
+ method public abstract java.util.concurrent.Future<V> poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract java.util.concurrent.Future<V> submit(java.util.concurrent.Callable<V>);
+ method public abstract java.util.concurrent.Future<V> submit(java.lang.Runnable, V);
+ method public abstract java.util.concurrent.Future<V> take() throws java.lang.InterruptedException;
+ }
+
+ public class ConcurrentHashMap extends java.util.AbstractMap implements java.util.concurrent.ConcurrentMap java.io.Serializable {
+ ctor public ConcurrentHashMap();
+ ctor public ConcurrentHashMap(int);
+ ctor public ConcurrentHashMap(java.util.Map<? extends K, ? extends V>);
+ ctor public ConcurrentHashMap(int, float);
+ ctor public ConcurrentHashMap(int, float, int);
+ method public boolean contains(java.lang.Object);
+ method public java.util.Enumeration<V> elements();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public java.util.Enumeration<K> keys();
+ method public V putIfAbsent(K, V);
+ method public boolean remove(java.lang.Object, java.lang.Object);
+ method public boolean replace(K, V, V);
+ method public V replace(K, V);
+ }
+
+ public class ConcurrentLinkedDeque extends java.util.AbstractCollection implements java.util.Deque java.io.Serializable {
+ ctor public ConcurrentLinkedDeque();
+ ctor public ConcurrentLinkedDeque(java.util.Collection<? extends E>);
+ method public void addFirst(E);
+ method public void addLast(E);
+ method public java.util.Iterator<E> descendingIterator();
+ method public E element();
+ method public E getFirst();
+ method public E getLast();
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public boolean offerFirst(E);
+ method public boolean offerLast(E);
+ method public E peek();
+ method public E peekFirst();
+ method public E peekLast();
+ method public E poll();
+ method public E pollFirst();
+ method public E pollLast();
+ method public E pop();
+ method public void push(E);
+ method public E remove();
+ method public E removeFirst();
+ method public boolean removeFirstOccurrence(java.lang.Object);
+ method public E removeLast();
+ method public boolean removeLastOccurrence(java.lang.Object);
+ method public int size();
+ }
+
+ public class ConcurrentLinkedQueue extends java.util.AbstractQueue implements java.util.Queue java.io.Serializable {
+ ctor public ConcurrentLinkedQueue();
+ ctor public ConcurrentLinkedQueue(java.util.Collection<? extends E>);
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public E peek();
+ method public E poll();
+ method public int size();
+ }
+
+ public abstract interface ConcurrentMap implements java.util.Map {
+ method public abstract V putIfAbsent(K, V);
+ method public abstract boolean remove(java.lang.Object, java.lang.Object);
+ method public abstract boolean replace(K, V, V);
+ method public abstract V replace(K, V);
+ }
+
+ public abstract interface ConcurrentNavigableMap implements java.util.concurrent.ConcurrentMap java.util.NavigableMap {
+ method public abstract java.util.NavigableSet<K> descendingKeySet();
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> descendingMap();
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> headMap(K, boolean);
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> headMap(K);
+ method public abstract java.util.NavigableSet<K> keySet();
+ method public abstract java.util.NavigableSet<K> navigableKeySet();
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> subMap(K, boolean, K, boolean);
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> subMap(K, K);
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> tailMap(K, boolean);
+ method public abstract java.util.concurrent.ConcurrentNavigableMap<K, V> tailMap(K);
+ }
+
+ public class ConcurrentSkipListMap extends java.util.AbstractMap implements java.lang.Cloneable java.util.concurrent.ConcurrentNavigableMap java.io.Serializable {
+ ctor public ConcurrentSkipListMap();
+ ctor public ConcurrentSkipListMap(java.util.Comparator<? super K>);
+ ctor public ConcurrentSkipListMap(java.util.Map<? extends K, ? extends V>);
+ ctor public ConcurrentSkipListMap(java.util.SortedMap<K, ? extends V>);
+ method public java.util.Map.Entry<K, V> ceilingEntry(K);
+ method public K ceilingKey(K);
+ method public java.util.concurrent.ConcurrentSkipListMap<K, V> clone();
+ method public java.util.Comparator<? super K> comparator();
+ method public java.util.NavigableSet<K> descendingKeySet();
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> descendingMap();
+ method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
+ method public java.util.Map.Entry<K, V> firstEntry();
+ method public K firstKey();
+ method public java.util.Map.Entry<K, V> floorEntry(K);
+ method public K floorKey(K);
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> headMap(K, boolean);
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> headMap(K);
+ method public java.util.Map.Entry<K, V> higherEntry(K);
+ method public K higherKey(K);
+ method public java.util.Map.Entry<K, V> lastEntry();
+ method public K lastKey();
+ method public java.util.Map.Entry<K, V> lowerEntry(K);
+ method public K lowerKey(K);
+ method public java.util.NavigableSet<K> navigableKeySet();
+ method public java.util.Map.Entry<K, V> pollFirstEntry();
+ method public java.util.Map.Entry<K, V> pollLastEntry();
+ method public V putIfAbsent(K, V);
+ method public boolean remove(java.lang.Object, java.lang.Object);
+ method public boolean replace(K, V, V);
+ method public V replace(K, V);
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> subMap(K, boolean, K, boolean);
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> subMap(K, K);
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> tailMap(K, boolean);
+ method public java.util.concurrent.ConcurrentNavigableMap<K, V> tailMap(K);
+ }
+
+ public class ConcurrentSkipListSet extends java.util.AbstractSet implements java.lang.Cloneable java.util.NavigableSet java.io.Serializable {
+ ctor public ConcurrentSkipListSet();
+ ctor public ConcurrentSkipListSet(java.util.Comparator<? super E>);
+ ctor public ConcurrentSkipListSet(java.util.Collection<? extends E>);
+ ctor public ConcurrentSkipListSet(java.util.SortedSet<E>);
+ method public E ceiling(E);
+ method public java.util.concurrent.ConcurrentSkipListSet<E> clone();
+ method public java.util.Comparator<? super E> comparator();
+ method public java.util.Iterator<E> descendingIterator();
+ method public java.util.NavigableSet<E> descendingSet();
+ method public E first();
+ method public E floor(E);
+ method public java.util.NavigableSet<E> headSet(E, boolean);
+ method public java.util.NavigableSet<E> headSet(E);
+ method public E higher(E);
+ method public java.util.Iterator<E> iterator();
+ method public E last();
+ method public E lower(E);
+ method public E pollFirst();
+ method public E pollLast();
+ method public int size();
+ method public java.util.NavigableSet<E> subSet(E, boolean, E, boolean);
+ method public java.util.NavigableSet<E> subSet(E, E);
+ method public java.util.NavigableSet<E> tailSet(E, boolean);
+ method public java.util.NavigableSet<E> tailSet(E);
+ }
+
+ public class CopyOnWriteArrayList implements java.lang.Cloneable java.util.List java.util.RandomAccess java.io.Serializable {
+ ctor public CopyOnWriteArrayList();
+ ctor public CopyOnWriteArrayList(java.util.Collection<? extends E>);
+ ctor public CopyOnWriteArrayList(E[]);
+ method public synchronized boolean add(E);
+ method public synchronized void add(int, E);
+ method public synchronized boolean addAll(java.util.Collection<? extends E>);
+ method public synchronized boolean addAll(int, java.util.Collection<? extends E>);
+ method public synchronized int addAllAbsent(java.util.Collection<? extends E>);
+ method public synchronized boolean addIfAbsent(E);
+ method public synchronized void clear();
+ method public java.lang.Object clone();
+ method public boolean contains(java.lang.Object);
+ method public boolean containsAll(java.util.Collection<?>);
+ method public E get(int);
+ method public int indexOf(E, int);
+ method public int indexOf(java.lang.Object);
+ method public boolean isEmpty();
+ method public java.util.Iterator<E> iterator();
+ method public int lastIndexOf(E, int);
+ method public int lastIndexOf(java.lang.Object);
+ method public java.util.ListIterator<E> listIterator(int);
+ method public java.util.ListIterator<E> listIterator();
+ method public synchronized E remove(int);
+ method public synchronized boolean remove(java.lang.Object);
+ method public synchronized boolean removeAll(java.util.Collection<?>);
+ method public synchronized boolean retainAll(java.util.Collection<?>);
+ method public synchronized E set(int, E);
+ method public int size();
+ method public java.util.List<E> subList(int, int);
+ method public java.lang.Object[] toArray();
+ method public T[] toArray(T[]);
+ }
+
+ public class CopyOnWriteArraySet extends java.util.AbstractSet implements java.io.Serializable {
+ ctor public CopyOnWriteArraySet();
+ ctor public CopyOnWriteArraySet(java.util.Collection<? extends E>);
+ method public java.util.Iterator<E> iterator();
+ method public int size();
+ }
+
+ public class CountDownLatch {
+ ctor public CountDownLatch(int);
+ method public void await() throws java.lang.InterruptedException;
+ method public boolean await(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void countDown();
+ method public long getCount();
+ }
+
+ public class CyclicBarrier {
+ ctor public CyclicBarrier(int, java.lang.Runnable);
+ ctor public CyclicBarrier(int);
+ method public int await() throws java.util.concurrent.BrokenBarrierException, java.lang.InterruptedException;
+ method public int await(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.BrokenBarrierException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public int getNumberWaiting();
+ method public int getParties();
+ method public boolean isBroken();
+ method public void reset();
+ }
+
+ public class DelayQueue extends java.util.AbstractQueue implements java.util.concurrent.BlockingQueue {
+ ctor public DelayQueue();
+ ctor public DelayQueue(java.util.Collection<? extends E>);
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit);
+ method public E peek();
+ method public E poll();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void put(E);
+ method public int remainingCapacity();
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface Delayed implements java.lang.Comparable {
+ method public abstract long getDelay(java.util.concurrent.TimeUnit);
+ }
+
+ public class Exchanger {
+ ctor public Exchanger();
+ method public V exchange(V) throws java.lang.InterruptedException;
+ method public V exchange(V, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ }
+
+ public class ExecutionException extends java.lang.Exception {
+ ctor protected ExecutionException();
+ ctor protected ExecutionException(java.lang.String);
+ ctor public ExecutionException(java.lang.String, java.lang.Throwable);
+ ctor public ExecutionException(java.lang.Throwable);
+ }
+
+ public abstract interface Executor {
+ method public abstract void execute(java.lang.Runnable);
+ }
+
+ public class ExecutorCompletionService implements java.util.concurrent.CompletionService {
+ ctor public ExecutorCompletionService(java.util.concurrent.Executor);
+ ctor public ExecutorCompletionService(java.util.concurrent.Executor, java.util.concurrent.BlockingQueue<java.util.concurrent.Future<V>>);
+ method public java.util.concurrent.Future<V> poll();
+ method public java.util.concurrent.Future<V> poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public java.util.concurrent.Future<V> submit(java.util.concurrent.Callable<V>);
+ method public java.util.concurrent.Future<V> submit(java.lang.Runnable, V);
+ method public java.util.concurrent.Future<V> take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface ExecutorService implements java.util.concurrent.Executor {
+ method public abstract boolean awaitTermination(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract java.util.List<java.util.concurrent.Future<T>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<T>>) throws java.lang.InterruptedException;
+ method public abstract java.util.List<java.util.concurrent.Future<T>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<T>>, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract T invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<T>>) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+ method public abstract T invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<T>>, long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public abstract boolean isShutdown();
+ method public abstract boolean isTerminated();
+ method public abstract void shutdown();
+ method public abstract java.util.List<java.lang.Runnable> shutdownNow();
+ method public abstract java.util.concurrent.Future<T> submit(java.util.concurrent.Callable<T>);
+ method public abstract java.util.concurrent.Future<T> submit(java.lang.Runnable, T);
+ method public abstract java.util.concurrent.Future<?> submit(java.lang.Runnable);
+ }
+
+ public class Executors {
+ method public static java.util.concurrent.Callable<T> callable(java.lang.Runnable, T);
+ method public static java.util.concurrent.Callable<java.lang.Object> callable(java.lang.Runnable);
+ method public static java.util.concurrent.Callable<java.lang.Object> callable(java.security.PrivilegedAction<?>);
+ method public static java.util.concurrent.Callable<java.lang.Object> callable(java.security.PrivilegedExceptionAction<?>);
+ method public static java.util.concurrent.ThreadFactory defaultThreadFactory();
+ method public static java.util.concurrent.ExecutorService newCachedThreadPool();
+ method public static java.util.concurrent.ExecutorService newCachedThreadPool(java.util.concurrent.ThreadFactory);
+ method public static java.util.concurrent.ExecutorService newFixedThreadPool(int);
+ method public static java.util.concurrent.ExecutorService newFixedThreadPool(int, java.util.concurrent.ThreadFactory);
+ method public static java.util.concurrent.ScheduledExecutorService newScheduledThreadPool(int);
+ method public static java.util.concurrent.ScheduledExecutorService newScheduledThreadPool(int, java.util.concurrent.ThreadFactory);
+ method public static java.util.concurrent.ExecutorService newSingleThreadExecutor();
+ method public static java.util.concurrent.ExecutorService newSingleThreadExecutor(java.util.concurrent.ThreadFactory);
+ method public static java.util.concurrent.ScheduledExecutorService newSingleThreadScheduledExecutor();
+ method public static java.util.concurrent.ScheduledExecutorService newSingleThreadScheduledExecutor(java.util.concurrent.ThreadFactory);
+ method public static java.util.concurrent.Callable<T> privilegedCallable(java.util.concurrent.Callable<T>);
+ method public static java.util.concurrent.Callable<T> privilegedCallableUsingCurrentClassLoader(java.util.concurrent.Callable<T>);
+ method public static java.util.concurrent.ThreadFactory privilegedThreadFactory();
+ method public static java.util.concurrent.ExecutorService unconfigurableExecutorService(java.util.concurrent.ExecutorService);
+ method public static java.util.concurrent.ScheduledExecutorService unconfigurableScheduledExecutorService(java.util.concurrent.ScheduledExecutorService);
+ }
+
+ public class ForkJoinPool extends java.util.concurrent.AbstractExecutorService {
+ ctor public ForkJoinPool();
+ ctor public ForkJoinPool(int);
+ ctor public ForkJoinPool(int, java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory, java.lang.Thread.UncaughtExceptionHandler, boolean);
+ method public boolean awaitQuiescence(long, java.util.concurrent.TimeUnit);
+ method public boolean awaitTermination(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method protected int drainTasksTo(java.util.Collection<? super java.util.concurrent.ForkJoinTask<?>>);
+ method public void execute(java.util.concurrent.ForkJoinTask<?>);
+ method public void execute(java.lang.Runnable);
+ method public int getActiveThreadCount();
+ method public boolean getAsyncMode();
+ method public java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory getFactory();
+ method public int getParallelism();
+ method public int getPoolSize();
+ method public int getQueuedSubmissionCount();
+ method public long getQueuedTaskCount();
+ method public int getRunningThreadCount();
+ method public long getStealCount();
+ method public java.lang.Thread.UncaughtExceptionHandler getUncaughtExceptionHandler();
+ method public boolean hasQueuedSubmissions();
+ method public T invoke(java.util.concurrent.ForkJoinTask<T>);
+ method public boolean isQuiescent();
+ method public boolean isShutdown();
+ method public boolean isTerminated();
+ method public boolean isTerminating();
+ method public static void managedBlock(java.util.concurrent.ForkJoinPool.ManagedBlocker) throws java.lang.InterruptedException;
+ method protected java.util.concurrent.ForkJoinTask<?> pollSubmission();
+ method public void shutdown();
+ method public java.util.List<java.lang.Runnable> shutdownNow();
+ method public java.util.concurrent.ForkJoinTask<T> submit(java.util.concurrent.ForkJoinTask<T>);
+ field public static final java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory defaultForkJoinWorkerThreadFactory;
+ }
+
+ public static abstract interface ForkJoinPool.ForkJoinWorkerThreadFactory {
+ method public abstract java.util.concurrent.ForkJoinWorkerThread newThread(java.util.concurrent.ForkJoinPool);
+ }
+
+ public static abstract interface ForkJoinPool.ManagedBlocker {
+ method public abstract boolean block() throws java.lang.InterruptedException;
+ method public abstract boolean isReleasable();
+ }
+
+ public abstract class ForkJoinTask implements java.util.concurrent.Future java.io.Serializable {
+ ctor public ForkJoinTask();
+ method public static java.util.concurrent.ForkJoinTask<?> adapt(java.lang.Runnable);
+ method public static java.util.concurrent.ForkJoinTask<T> adapt(java.lang.Runnable, T);
+ method public static java.util.concurrent.ForkJoinTask<T> adapt(java.util.concurrent.Callable<? extends T>);
+ method public boolean cancel(boolean);
+ method public void complete(V);
+ method public void completeExceptionally(java.lang.Throwable);
+ method protected abstract boolean exec();
+ method public final java.util.concurrent.ForkJoinTask<V> fork();
+ method public final V get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+ method public final V get(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public final java.lang.Throwable getException();
+ method public static java.util.concurrent.ForkJoinPool getPool();
+ method public static int getQueuedTaskCount();
+ method public abstract V getRawResult();
+ method public static int getSurplusQueuedTaskCount();
+ method public static void helpQuiesce();
+ method public static boolean inForkJoinPool();
+ method public final V invoke();
+ method public static void invokeAll(java.util.concurrent.ForkJoinTask<?>, java.util.concurrent.ForkJoinTask<?>);
+ method public static void invokeAll(java.util.concurrent.ForkJoinTask<?>...);
+ method public static java.util.Collection<T> invokeAll(java.util.Collection<T>);
+ method public final boolean isCancelled();
+ method public final boolean isCompletedAbnormally();
+ method public final boolean isCompletedNormally();
+ method public final boolean isDone();
+ method public final V join();
+ method protected static java.util.concurrent.ForkJoinTask<?> peekNextLocalTask();
+ method protected static java.util.concurrent.ForkJoinTask<?> pollNextLocalTask();
+ method protected static java.util.concurrent.ForkJoinTask<?> pollTask();
+ method public final void quietlyInvoke();
+ method public final void quietlyJoin();
+ method public void reinitialize();
+ method protected abstract void setRawResult(V);
+ method public boolean tryUnfork();
+ }
+
+ public class ForkJoinWorkerThread extends java.lang.Thread {
+ ctor protected ForkJoinWorkerThread(java.util.concurrent.ForkJoinPool);
+ method public java.util.concurrent.ForkJoinPool getPool();
+ method public int getPoolIndex();
+ method protected void onStart();
+ method protected void onTermination(java.lang.Throwable);
+ }
+
+ public abstract interface Future {
+ method public abstract boolean cancel(boolean);
+ method public abstract V get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+ method public abstract V get(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public abstract boolean isCancelled();
+ method public abstract boolean isDone();
+ }
+
+ public class FutureTask implements java.util.concurrent.RunnableFuture {
+ ctor public FutureTask(java.util.concurrent.Callable<V>);
+ ctor public FutureTask(java.lang.Runnable, V);
+ method public boolean cancel(boolean);
+ method protected void done();
+ method public V get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+ method public V get(long, java.util.concurrent.TimeUnit) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public boolean isCancelled();
+ method public boolean isDone();
+ method public void run();
+ method protected boolean runAndReset();
+ method protected void set(V);
+ method protected void setException(java.lang.Throwable);
+ }
+
+ public class LinkedBlockingDeque extends java.util.AbstractQueue implements java.util.concurrent.BlockingDeque java.io.Serializable {
+ ctor public LinkedBlockingDeque();
+ ctor public LinkedBlockingDeque(int);
+ ctor public LinkedBlockingDeque(java.util.Collection<? extends E>);
+ method public void addFirst(E);
+ method public void addLast(E);
+ method public java.util.Iterator<E> descendingIterator();
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public E getFirst();
+ method public E getLast();
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public boolean offerFirst(E);
+ method public boolean offerFirst(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public boolean offerLast(E);
+ method public boolean offerLast(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E peek();
+ method public E peekFirst();
+ method public E peekLast();
+ method public E poll();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E pollFirst();
+ method public E pollFirst(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E pollLast();
+ method public E pollLast(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E pop();
+ method public void push(E);
+ method public void put(E) throws java.lang.InterruptedException;
+ method public void putFirst(E) throws java.lang.InterruptedException;
+ method public void putLast(E) throws java.lang.InterruptedException;
+ method public int remainingCapacity();
+ method public E removeFirst();
+ method public boolean removeFirstOccurrence(java.lang.Object);
+ method public E removeLast();
+ method public boolean removeLastOccurrence(java.lang.Object);
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ method public E takeFirst() throws java.lang.InterruptedException;
+ method public E takeLast() throws java.lang.InterruptedException;
+ }
+
+ public class LinkedBlockingQueue extends java.util.AbstractQueue implements java.util.concurrent.BlockingQueue java.io.Serializable {
+ ctor public LinkedBlockingQueue();
+ ctor public LinkedBlockingQueue(int);
+ ctor public LinkedBlockingQueue(java.util.Collection<? extends E>);
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public boolean offer(E);
+ method public E peek();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E poll();
+ method public void put(E) throws java.lang.InterruptedException;
+ method public int remainingCapacity();
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ }
+
+ public class LinkedTransferQueue extends java.util.AbstractQueue implements java.io.Serializable java.util.concurrent.TransferQueue {
+ ctor public LinkedTransferQueue();
+ ctor public LinkedTransferQueue(java.util.Collection<? extends E>);
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public int getWaitingConsumerCount();
+ method public boolean hasWaitingConsumer();
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit);
+ method public boolean offer(E);
+ method public E peek();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E poll();
+ method public void put(E);
+ method public int remainingCapacity();
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ method public void transfer(E) throws java.lang.InterruptedException;
+ method public boolean tryTransfer(E);
+ method public boolean tryTransfer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ }
+
+ public class Phaser {
+ ctor public Phaser();
+ ctor public Phaser(int);
+ ctor public Phaser(java.util.concurrent.Phaser);
+ ctor public Phaser(java.util.concurrent.Phaser, int);
+ method public int arrive();
+ method public int arriveAndAwaitAdvance();
+ method public int arriveAndDeregister();
+ method public int awaitAdvance(int);
+ method public int awaitAdvanceInterruptibly(int) throws java.lang.InterruptedException;
+ method public int awaitAdvanceInterruptibly(int, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ method public int bulkRegister(int);
+ method public void forceTermination();
+ method public int getArrivedParties();
+ method public java.util.concurrent.Phaser getParent();
+ method public final int getPhase();
+ method public int getRegisteredParties();
+ method public java.util.concurrent.Phaser getRoot();
+ method public int getUnarrivedParties();
+ method public boolean isTerminated();
+ method protected boolean onAdvance(int, int);
+ method public int register();
+ }
+
+ public class PriorityBlockingQueue extends java.util.AbstractQueue implements java.util.concurrent.BlockingQueue java.io.Serializable {
+ ctor public PriorityBlockingQueue();
+ ctor public PriorityBlockingQueue(int);
+ ctor public PriorityBlockingQueue(int, java.util.Comparator<? super E>);
+ ctor public PriorityBlockingQueue(java.util.Collection<? extends E>);
+ method public java.util.Comparator<? super E> comparator();
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E);
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit);
+ method public E peek();
+ method public E poll();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void put(E);
+ method public int remainingCapacity();
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ }
+
+ public abstract class RecursiveAction extends java.util.concurrent.ForkJoinTask {
+ ctor public RecursiveAction();
+ method protected abstract void compute();
+ method protected final boolean exec();
+ method public final java.lang.Void getRawResult();
+ method protected final void setRawResult(java.lang.Void);
+ }
+
+ public abstract class RecursiveTask extends java.util.concurrent.ForkJoinTask {
+ ctor public RecursiveTask();
+ method protected abstract V compute();
+ method protected final boolean exec();
+ method public final V getRawResult();
+ method protected final void setRawResult(V);
+ }
+
+ public class RejectedExecutionException extends java.lang.RuntimeException {
+ ctor public RejectedExecutionException();
+ ctor public RejectedExecutionException(java.lang.String);
+ ctor public RejectedExecutionException(java.lang.String, java.lang.Throwable);
+ ctor public RejectedExecutionException(java.lang.Throwable);
+ }
+
+ public abstract interface RejectedExecutionHandler {
+ method public abstract void rejectedExecution(java.lang.Runnable, java.util.concurrent.ThreadPoolExecutor);
+ }
+
+ public abstract interface RunnableFuture implements java.util.concurrent.Future java.lang.Runnable {
+ method public abstract void run();
+ }
+
+ public abstract interface RunnableScheduledFuture implements java.util.concurrent.RunnableFuture java.util.concurrent.ScheduledFuture {
+ method public abstract boolean isPeriodic();
+ }
+
+ public abstract interface ScheduledExecutorService implements java.util.concurrent.ExecutorService {
+ method public abstract java.util.concurrent.ScheduledFuture<?> schedule(java.lang.Runnable, long, java.util.concurrent.TimeUnit);
+ method public abstract java.util.concurrent.ScheduledFuture<V> schedule(java.util.concurrent.Callable<V>, long, java.util.concurrent.TimeUnit);
+ method public abstract java.util.concurrent.ScheduledFuture<?> scheduleAtFixedRate(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit);
+ method public abstract java.util.concurrent.ScheduledFuture<?> scheduleWithFixedDelay(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit);
+ }
+
+ public abstract interface ScheduledFuture implements java.util.concurrent.Delayed java.util.concurrent.Future {
+ }
+
+ public class ScheduledThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor implements java.util.concurrent.ScheduledExecutorService {
+ ctor public ScheduledThreadPoolExecutor(int);
+ ctor public ScheduledThreadPoolExecutor(int, java.util.concurrent.ThreadFactory);
+ ctor public ScheduledThreadPoolExecutor(int, java.util.concurrent.RejectedExecutionHandler);
+ ctor public ScheduledThreadPoolExecutor(int, java.util.concurrent.ThreadFactory, java.util.concurrent.RejectedExecutionHandler);
+ method protected java.util.concurrent.RunnableScheduledFuture<V> decorateTask(java.lang.Runnable, java.util.concurrent.RunnableScheduledFuture<V>);
+ method protected java.util.concurrent.RunnableScheduledFuture<V> decorateTask(java.util.concurrent.Callable<V>, java.util.concurrent.RunnableScheduledFuture<V>);
+ method public boolean getContinueExistingPeriodicTasksAfterShutdownPolicy();
+ method public boolean getExecuteExistingDelayedTasksAfterShutdownPolicy();
+ method public boolean getRemoveOnCancelPolicy();
+ method public java.util.concurrent.ScheduledFuture<?> schedule(java.lang.Runnable, long, java.util.concurrent.TimeUnit);
+ method public java.util.concurrent.ScheduledFuture<V> schedule(java.util.concurrent.Callable<V>, long, java.util.concurrent.TimeUnit);
+ method public java.util.concurrent.ScheduledFuture<?> scheduleAtFixedRate(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit);
+ method public java.util.concurrent.ScheduledFuture<?> scheduleWithFixedDelay(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit);
+ method public void setContinueExistingPeriodicTasksAfterShutdownPolicy(boolean);
+ method public void setExecuteExistingDelayedTasksAfterShutdownPolicy(boolean);
+ method public void setRemoveOnCancelPolicy(boolean);
+ }
+
+ public class Semaphore implements java.io.Serializable {
+ ctor public Semaphore(int);
+ ctor public Semaphore(int, boolean);
+ method public void acquire() throws java.lang.InterruptedException;
+ method public void acquire(int) throws java.lang.InterruptedException;
+ method public void acquireUninterruptibly();
+ method public void acquireUninterruptibly(int);
+ method public int availablePermits();
+ method public int drainPermits();
+ method public final int getQueueLength();
+ method protected java.util.Collection<java.lang.Thread> getQueuedThreads();
+ method public final boolean hasQueuedThreads();
+ method public boolean isFair();
+ method protected void reducePermits(int);
+ method public void release();
+ method public void release(int);
+ method public boolean tryAcquire();
+ method public boolean tryAcquire(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public boolean tryAcquire(int);
+ method public boolean tryAcquire(int, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ }
+
+ public class SynchronousQueue extends java.util.AbstractQueue implements java.util.concurrent.BlockingQueue java.io.Serializable {
+ ctor public SynchronousQueue();
+ ctor public SynchronousQueue(boolean);
+ method public int drainTo(java.util.Collection<? super E>);
+ method public int drainTo(java.util.Collection<? super E>, int);
+ method public java.util.Iterator<E> iterator();
+ method public boolean offer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public boolean offer(E);
+ method public E peek();
+ method public E poll(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public E poll();
+ method public void put(E) throws java.lang.InterruptedException;
+ method public int remainingCapacity();
+ method public int size();
+ method public E take() throws java.lang.InterruptedException;
+ }
+
+ public abstract interface ThreadFactory {
+ method public abstract java.lang.Thread newThread(java.lang.Runnable);
+ }
+
+ public class ThreadLocalRandom extends java.util.Random {
+ method public static java.util.concurrent.ThreadLocalRandom current();
+ method public double nextDouble(double);
+ method public double nextDouble(double, double);
+ method public int nextInt(int, int);
+ method public long nextLong(long);
+ method public long nextLong(long, long);
+ }
+
+ public class ThreadPoolExecutor extends java.util.concurrent.AbstractExecutorService {
+ ctor public ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue<java.lang.Runnable>);
+ ctor public ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue<java.lang.Runnable>, java.util.concurrent.ThreadFactory);
+ ctor public ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue<java.lang.Runnable>, java.util.concurrent.RejectedExecutionHandler);
+ ctor public ThreadPoolExecutor(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue<java.lang.Runnable>, java.util.concurrent.ThreadFactory, java.util.concurrent.RejectedExecutionHandler);
+ method protected void afterExecute(java.lang.Runnable, java.lang.Throwable);
+ method public void allowCoreThreadTimeOut(boolean);
+ method public boolean allowsCoreThreadTimeOut();
+ method public boolean awaitTermination(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method protected void beforeExecute(java.lang.Thread, java.lang.Runnable);
+ method public void execute(java.lang.Runnable);
+ method public int getActiveCount();
+ method public long getCompletedTaskCount();
+ method public int getCorePoolSize();
+ method public long getKeepAliveTime(java.util.concurrent.TimeUnit);
+ method public int getLargestPoolSize();
+ method public int getMaximumPoolSize();
+ method public int getPoolSize();
+ method public java.util.concurrent.BlockingQueue<java.lang.Runnable> getQueue();
+ method public java.util.concurrent.RejectedExecutionHandler getRejectedExecutionHandler();
+ method public long getTaskCount();
+ method public java.util.concurrent.ThreadFactory getThreadFactory();
+ method public boolean isShutdown();
+ method public boolean isTerminated();
+ method public boolean isTerminating();
+ method public int prestartAllCoreThreads();
+ method public boolean prestartCoreThread();
+ method public void purge();
+ method public boolean remove(java.lang.Runnable);
+ method public void setCorePoolSize(int);
+ method public void setKeepAliveTime(long, java.util.concurrent.TimeUnit);
+ method public void setMaximumPoolSize(int);
+ method public void setRejectedExecutionHandler(java.util.concurrent.RejectedExecutionHandler);
+ method public void setThreadFactory(java.util.concurrent.ThreadFactory);
+ method public void shutdown();
+ method public java.util.List<java.lang.Runnable> shutdownNow();
+ method protected void terminated();
+ }
+
+ public static class ThreadPoolExecutor.AbortPolicy implements java.util.concurrent.RejectedExecutionHandler {
+ ctor public ThreadPoolExecutor.AbortPolicy();
+ method public void rejectedExecution(java.lang.Runnable, java.util.concurrent.ThreadPoolExecutor);
+ }
+
+ public static class ThreadPoolExecutor.CallerRunsPolicy implements java.util.concurrent.RejectedExecutionHandler {
+ ctor public ThreadPoolExecutor.CallerRunsPolicy();
+ method public void rejectedExecution(java.lang.Runnable, java.util.concurrent.ThreadPoolExecutor);
+ }
+
+ public static class ThreadPoolExecutor.DiscardOldestPolicy implements java.util.concurrent.RejectedExecutionHandler {
+ ctor public ThreadPoolExecutor.DiscardOldestPolicy();
+ method public void rejectedExecution(java.lang.Runnable, java.util.concurrent.ThreadPoolExecutor);
+ }
+
+ public static class ThreadPoolExecutor.DiscardPolicy implements java.util.concurrent.RejectedExecutionHandler {
+ ctor public ThreadPoolExecutor.DiscardPolicy();
+ method public void rejectedExecution(java.lang.Runnable, java.util.concurrent.ThreadPoolExecutor);
+ }
+
+ public class TimeUnit extends java.lang.Enum {
+ method public long convert(long, java.util.concurrent.TimeUnit);
+ method public void sleep(long) throws java.lang.InterruptedException;
+ method public void timedJoin(java.lang.Thread, long) throws java.lang.InterruptedException;
+ method public void timedWait(java.lang.Object, long) throws java.lang.InterruptedException;
+ method public long toDays(long);
+ method public long toHours(long);
+ method public long toMicros(long);
+ method public long toMillis(long);
+ method public long toMinutes(long);
+ method public long toNanos(long);
+ method public long toSeconds(long);
+ method public static java.util.concurrent.TimeUnit valueOf(java.lang.String);
+ method public static final java.util.concurrent.TimeUnit[] values();
+ enum_constant public static final java.util.concurrent.TimeUnit DAYS;
+ enum_constant public static final java.util.concurrent.TimeUnit HOURS;
+ enum_constant public static final java.util.concurrent.TimeUnit MICROSECONDS;
+ enum_constant public static final java.util.concurrent.TimeUnit MILLISECONDS;
+ enum_constant public static final java.util.concurrent.TimeUnit MINUTES;
+ enum_constant public static final java.util.concurrent.TimeUnit NANOSECONDS;
+ enum_constant public static final java.util.concurrent.TimeUnit SECONDS;
+ }
+
+ public class TimeoutException extends java.lang.Exception {
+ ctor public TimeoutException();
+ ctor public TimeoutException(java.lang.String);
+ }
+
+ public abstract interface TransferQueue implements java.util.concurrent.BlockingQueue {
+ method public abstract int getWaitingConsumerCount();
+ method public abstract boolean hasWaitingConsumer();
+ method public abstract void transfer(E) throws java.lang.InterruptedException;
+ method public abstract boolean tryTransfer(E);
+ method public abstract boolean tryTransfer(E, long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ }
+
+}
+
+package java.util.concurrent.atomic {
+
+ public class AtomicBoolean implements java.io.Serializable {
+ ctor public AtomicBoolean(boolean);
+ ctor public AtomicBoolean();
+ method public final boolean compareAndSet(boolean, boolean);
+ method public final boolean get();
+ method public final boolean getAndSet(boolean);
+ method public final void lazySet(boolean);
+ method public final void set(boolean);
+ method public boolean weakCompareAndSet(boolean, boolean);
+ }
+
+ public class AtomicInteger extends java.lang.Number implements java.io.Serializable {
+ ctor public AtomicInteger(int);
+ ctor public AtomicInteger();
+ method public final int addAndGet(int);
+ method public final boolean compareAndSet(int, int);
+ method public final int decrementAndGet();
+ method public double doubleValue();
+ method public float floatValue();
+ method public final int get();
+ method public final int getAndAdd(int);
+ method public final int getAndDecrement();
+ method public final int getAndIncrement();
+ method public final int getAndSet(int);
+ method public final int incrementAndGet();
+ method public int intValue();
+ method public final void lazySet(int);
+ method public long longValue();
+ method public final void set(int);
+ method public final boolean weakCompareAndSet(int, int);
+ }
+
+ public class AtomicIntegerArray implements java.io.Serializable {
+ ctor public AtomicIntegerArray(int);
+ ctor public AtomicIntegerArray(int[]);
+ method public final int addAndGet(int, int);
+ method public final boolean compareAndSet(int, int, int);
+ method public final int decrementAndGet(int);
+ method public final int get(int);
+ method public final int getAndAdd(int, int);
+ method public final int getAndDecrement(int);
+ method public final int getAndIncrement(int);
+ method public final int getAndSet(int, int);
+ method public final int incrementAndGet(int);
+ method public final void lazySet(int, int);
+ method public final int length();
+ method public final void set(int, int);
+ method public final boolean weakCompareAndSet(int, int, int);
+ }
+
+ public abstract class AtomicIntegerFieldUpdater {
+ ctor protected AtomicIntegerFieldUpdater();
+ method public int addAndGet(T, int);
+ method public abstract boolean compareAndSet(T, int, int);
+ method public int decrementAndGet(T);
+ method public abstract int get(T);
+ method public int getAndAdd(T, int);
+ method public int getAndDecrement(T);
+ method public int getAndIncrement(T);
+ method public int getAndSet(T, int);
+ method public int incrementAndGet(T);
+ method public abstract void lazySet(T, int);
+ method public static java.util.concurrent.atomic.AtomicIntegerFieldUpdater<U> newUpdater(java.lang.Class<U>, java.lang.String);
+ method public abstract void set(T, int);
+ method public abstract boolean weakCompareAndSet(T, int, int);
+ }
+
+ public class AtomicLong extends java.lang.Number implements java.io.Serializable {
+ ctor public AtomicLong(long);
+ ctor public AtomicLong();
+ method public final long addAndGet(long);
+ method public final boolean compareAndSet(long, long);
+ method public final long decrementAndGet();
+ method public double doubleValue();
+ method public float floatValue();
+ method public final long get();
+ method public final long getAndAdd(long);
+ method public final long getAndDecrement();
+ method public final long getAndIncrement();
+ method public final long getAndSet(long);
+ method public final long incrementAndGet();
+ method public int intValue();
+ method public final void lazySet(long);
+ method public long longValue();
+ method public final void set(long);
+ method public final boolean weakCompareAndSet(long, long);
+ }
+
+ public class AtomicLongArray implements java.io.Serializable {
+ ctor public AtomicLongArray(int);
+ ctor public AtomicLongArray(long[]);
+ method public long addAndGet(int, long);
+ method public final boolean compareAndSet(int, long, long);
+ method public final long decrementAndGet(int);
+ method public final long get(int);
+ method public final long getAndAdd(int, long);
+ method public final long getAndDecrement(int);
+ method public final long getAndIncrement(int);
+ method public final long getAndSet(int, long);
+ method public final long incrementAndGet(int);
+ method public final void lazySet(int, long);
+ method public final int length();
+ method public final void set(int, long);
+ method public final boolean weakCompareAndSet(int, long, long);
+ }
+
+ public abstract class AtomicLongFieldUpdater {
+ ctor protected AtomicLongFieldUpdater();
+ method public long addAndGet(T, long);
+ method public abstract boolean compareAndSet(T, long, long);
+ method public long decrementAndGet(T);
+ method public abstract long get(T);
+ method public long getAndAdd(T, long);
+ method public long getAndDecrement(T);
+ method public long getAndIncrement(T);
+ method public long getAndSet(T, long);
+ method public long incrementAndGet(T);
+ method public abstract void lazySet(T, long);
+ method public static java.util.concurrent.atomic.AtomicLongFieldUpdater<U> newUpdater(java.lang.Class<U>, java.lang.String);
+ method public abstract void set(T, long);
+ method public abstract boolean weakCompareAndSet(T, long, long);
+ }
+
+ public class AtomicMarkableReference {
+ ctor public AtomicMarkableReference(V, boolean);
+ method public boolean attemptMark(V, boolean);
+ method public boolean compareAndSet(V, V, boolean, boolean);
+ method public V get(boolean[]);
+ method public V getReference();
+ method public boolean isMarked();
+ method public void set(V, boolean);
+ method public boolean weakCompareAndSet(V, V, boolean, boolean);
+ }
+
+ public class AtomicReference implements java.io.Serializable {
+ ctor public AtomicReference(V);
+ ctor public AtomicReference();
+ method public final boolean compareAndSet(V, V);
+ method public final V get();
+ method public final V getAndSet(V);
+ method public final void lazySet(V);
+ method public final void set(V);
+ method public final boolean weakCompareAndSet(V, V);
+ }
+
+ public class AtomicReferenceArray implements java.io.Serializable {
+ ctor public AtomicReferenceArray(int);
+ ctor public AtomicReferenceArray(E[]);
+ method public final boolean compareAndSet(int, E, E);
+ method public final E get(int);
+ method public final E getAndSet(int, E);
+ method public final void lazySet(int, E);
+ method public final int length();
+ method public final void set(int, E);
+ method public final boolean weakCompareAndSet(int, E, E);
+ }
+
+ public abstract class AtomicReferenceFieldUpdater {
+ ctor protected AtomicReferenceFieldUpdater();
+ method public abstract boolean compareAndSet(T, V, V);
+ method public abstract V get(T);
+ method public V getAndSet(T, V);
+ method public abstract void lazySet(T, V);
+ method public static java.util.concurrent.atomic.AtomicReferenceFieldUpdater<U, W> newUpdater(java.lang.Class<U>, java.lang.Class<W>, java.lang.String);
+ method public abstract void set(T, V);
+ method public abstract boolean weakCompareAndSet(T, V, V);
+ }
+
+ public class AtomicStampedReference {
+ ctor public AtomicStampedReference(V, int);
+ method public boolean attemptStamp(V, int);
+ method public boolean compareAndSet(V, V, int, int);
+ method public V get(int[]);
+ method public V getReference();
+ method public int getStamp();
+ method public void set(V, int);
+ method public boolean weakCompareAndSet(V, V, int, int);
+ }
+
+}
+
+package java.util.concurrent.locks {
+
+ public abstract class AbstractOwnableSynchronizer implements java.io.Serializable {
+ ctor protected AbstractOwnableSynchronizer();
+ method protected final java.lang.Thread getExclusiveOwnerThread();
+ method protected final void setExclusiveOwnerThread(java.lang.Thread);
+ }
+
+ public abstract class AbstractQueuedLongSynchronizer extends java.util.concurrent.locks.AbstractOwnableSynchronizer implements java.io.Serializable {
+ ctor protected AbstractQueuedLongSynchronizer();
+ method public final void acquire(long);
+ method public final void acquireInterruptibly(long) throws java.lang.InterruptedException;
+ method public final void acquireShared(long);
+ method public final void acquireSharedInterruptibly(long) throws java.lang.InterruptedException;
+ method protected final boolean compareAndSetState(long, long);
+ method public final java.util.Collection<java.lang.Thread> getExclusiveQueuedThreads();
+ method public final java.lang.Thread getFirstQueuedThread();
+ method public final int getQueueLength();
+ method public final java.util.Collection<java.lang.Thread> getQueuedThreads();
+ method public final java.util.Collection<java.lang.Thread> getSharedQueuedThreads();
+ method protected final long getState();
+ method public final int getWaitQueueLength(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject);
+ method public final java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject);
+ method public final boolean hasContended();
+ method public final boolean hasQueuedPredecessors();
+ method public final boolean hasQueuedThreads();
+ method public final boolean hasWaiters(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject);
+ method protected boolean isHeldExclusively();
+ method public final boolean isQueued(java.lang.Thread);
+ method public final boolean owns(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject);
+ method public final boolean release(long);
+ method public final boolean releaseShared(long);
+ method protected final void setState(long);
+ method protected boolean tryAcquire(long);
+ method public final boolean tryAcquireNanos(long, long) throws java.lang.InterruptedException;
+ method protected long tryAcquireShared(long);
+ method public final boolean tryAcquireSharedNanos(long, long) throws java.lang.InterruptedException;
+ method protected boolean tryRelease(long);
+ method protected boolean tryReleaseShared(long);
+ }
+
+ public class AbstractQueuedLongSynchronizer.ConditionObject implements java.util.concurrent.locks.Condition java.io.Serializable {
+ ctor public AbstractQueuedLongSynchronizer.ConditionObject();
+ method public final void await() throws java.lang.InterruptedException;
+ method public final boolean await(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public final long awaitNanos(long) throws java.lang.InterruptedException;
+ method public final void awaitUninterruptibly();
+ method public final boolean awaitUntil(java.util.Date) throws java.lang.InterruptedException;
+ method protected final int getWaitQueueLength();
+ method protected final java.util.Collection<java.lang.Thread> getWaitingThreads();
+ method protected final boolean hasWaiters();
+ method public final void signal();
+ method public final void signalAll();
+ }
+
+ public abstract class AbstractQueuedSynchronizer extends java.util.concurrent.locks.AbstractOwnableSynchronizer implements java.io.Serializable {
+ ctor protected AbstractQueuedSynchronizer();
+ method public final void acquire(int);
+ method public final void acquireInterruptibly(int) throws java.lang.InterruptedException;
+ method public final void acquireShared(int);
+ method public final void acquireSharedInterruptibly(int) throws java.lang.InterruptedException;
+ method protected final boolean compareAndSetState(int, int);
+ method public final java.util.Collection<java.lang.Thread> getExclusiveQueuedThreads();
+ method public final java.lang.Thread getFirstQueuedThread();
+ method public final int getQueueLength();
+ method public final java.util.Collection<java.lang.Thread> getQueuedThreads();
+ method public final java.util.Collection<java.lang.Thread> getSharedQueuedThreads();
+ method protected final int getState();
+ method public final int getWaitQueueLength(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject);
+ method public final java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject);
+ method public final boolean hasContended();
+ method public final boolean hasQueuedPredecessors();
+ method public final boolean hasQueuedThreads();
+ method public final boolean hasWaiters(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject);
+ method protected boolean isHeldExclusively();
+ method public final boolean isQueued(java.lang.Thread);
+ method public final boolean owns(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject);
+ method public final boolean release(int);
+ method public final boolean releaseShared(int);
+ method protected final void setState(int);
+ method protected boolean tryAcquire(int);
+ method public final boolean tryAcquireNanos(int, long) throws java.lang.InterruptedException;
+ method protected int tryAcquireShared(int);
+ method public final boolean tryAcquireSharedNanos(int, long) throws java.lang.InterruptedException;
+ method protected boolean tryRelease(int);
+ method protected boolean tryReleaseShared(int);
+ }
+
+ public class AbstractQueuedSynchronizer.ConditionObject implements java.util.concurrent.locks.Condition java.io.Serializable {
+ ctor public AbstractQueuedSynchronizer.ConditionObject();
+ method public final void await() throws java.lang.InterruptedException;
+ method public final boolean await(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public final long awaitNanos(long) throws java.lang.InterruptedException;
+ method public final void awaitUninterruptibly();
+ method public final boolean awaitUntil(java.util.Date) throws java.lang.InterruptedException;
+ method protected final int getWaitQueueLength();
+ method protected final java.util.Collection<java.lang.Thread> getWaitingThreads();
+ method protected final boolean hasWaiters();
+ method public final void signal();
+ method public final void signalAll();
+ }
+
+ public abstract interface Condition {
+ method public abstract void await() throws java.lang.InterruptedException;
+ method public abstract boolean await(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract long awaitNanos(long) throws java.lang.InterruptedException;
+ method public abstract void awaitUninterruptibly();
+ method public abstract boolean awaitUntil(java.util.Date) throws java.lang.InterruptedException;
+ method public abstract void signal();
+ method public abstract void signalAll();
+ }
+
+ public abstract interface Lock {
+ method public abstract void lock();
+ method public abstract void lockInterruptibly() throws java.lang.InterruptedException;
+ method public abstract java.util.concurrent.locks.Condition newCondition();
+ method public abstract boolean tryLock();
+ method public abstract boolean tryLock(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public abstract void unlock();
+ }
+
+ public class LockSupport {
+ method public static java.lang.Object getBlocker(java.lang.Thread);
+ method public static void park(java.lang.Object);
+ method public static void park();
+ method public static void parkNanos(java.lang.Object, long);
+ method public static void parkNanos(long);
+ method public static void parkUntil(java.lang.Object, long);
+ method public static void parkUntil(long);
+ method public static void unpark(java.lang.Thread);
+ }
+
+ public abstract interface ReadWriteLock {
+ method public abstract java.util.concurrent.locks.Lock readLock();
+ method public abstract java.util.concurrent.locks.Lock writeLock();
+ }
+
+ public class ReentrantLock implements java.util.concurrent.locks.Lock java.io.Serializable {
+ ctor public ReentrantLock();
+ ctor public ReentrantLock(boolean);
+ method public int getHoldCount();
+ method protected java.lang.Thread getOwner();
+ method public final int getQueueLength();
+ method protected java.util.Collection<java.lang.Thread> getQueuedThreads();
+ method public int getWaitQueueLength(java.util.concurrent.locks.Condition);
+ method protected java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.Condition);
+ method public final boolean hasQueuedThread(java.lang.Thread);
+ method public final boolean hasQueuedThreads();
+ method public boolean hasWaiters(java.util.concurrent.locks.Condition);
+ method public final boolean isFair();
+ method public boolean isHeldByCurrentThread();
+ method public boolean isLocked();
+ method public void lock();
+ method public void lockInterruptibly() throws java.lang.InterruptedException;
+ method public java.util.concurrent.locks.Condition newCondition();
+ method public boolean tryLock();
+ method public boolean tryLock(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void unlock();
+ }
+
+ public class ReentrantReadWriteLock implements java.util.concurrent.locks.ReadWriteLock java.io.Serializable {
+ ctor public ReentrantReadWriteLock();
+ ctor public ReentrantReadWriteLock(boolean);
+ method protected java.lang.Thread getOwner();
+ method public final int getQueueLength();
+ method protected java.util.Collection<java.lang.Thread> getQueuedReaderThreads();
+ method protected java.util.Collection<java.lang.Thread> getQueuedThreads();
+ method protected java.util.Collection<java.lang.Thread> getQueuedWriterThreads();
+ method public int getReadHoldCount();
+ method public int getReadLockCount();
+ method public int getWaitQueueLength(java.util.concurrent.locks.Condition);
+ method protected java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.Condition);
+ method public int getWriteHoldCount();
+ method public final boolean hasQueuedThread(java.lang.Thread);
+ method public final boolean hasQueuedThreads();
+ method public boolean hasWaiters(java.util.concurrent.locks.Condition);
+ method public final boolean isFair();
+ method public boolean isWriteLocked();
+ method public boolean isWriteLockedByCurrentThread();
+ method public java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock readLock();
+ method public java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock writeLock();
+ }
+
+ public static class ReentrantReadWriteLock.ReadLock implements java.util.concurrent.locks.Lock java.io.Serializable {
+ ctor protected ReentrantReadWriteLock.ReadLock(java.util.concurrent.locks.ReentrantReadWriteLock);
+ method public void lock();
+ method public void lockInterruptibly() throws java.lang.InterruptedException;
+ method public java.util.concurrent.locks.Condition newCondition();
+ method public boolean tryLock();
+ method public boolean tryLock(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void unlock();
+ }
+
+ public static class ReentrantReadWriteLock.WriteLock implements java.util.concurrent.locks.Lock java.io.Serializable {
+ ctor protected ReentrantReadWriteLock.WriteLock(java.util.concurrent.locks.ReentrantReadWriteLock);
+ method public int getHoldCount();
+ method public boolean isHeldByCurrentThread();
+ method public void lock();
+ method public void lockInterruptibly() throws java.lang.InterruptedException;
+ method public java.util.concurrent.locks.Condition newCondition();
+ method public boolean tryLock();
+ method public boolean tryLock(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException;
+ method public void unlock();
+ }
+
+}
+
+package java.util.jar {
+
+ public class Attributes implements java.lang.Cloneable java.util.Map {
+ ctor public Attributes();
+ ctor public Attributes(int);
+ ctor public Attributes(java.util.jar.Attributes);
+ method public void clear();
+ method public java.lang.Object clone();
+ method public boolean containsKey(java.lang.Object);
+ method public boolean containsValue(java.lang.Object);
+ method public java.util.Set<java.util.Map.Entry<java.lang.Object, java.lang.Object>> entrySet();
+ method public java.lang.Object get(java.lang.Object);
+ method public java.lang.String getValue(java.lang.String);
+ method public java.lang.String getValue(java.util.jar.Attributes.Name);
+ method public boolean isEmpty();
+ method public java.util.Set<java.lang.Object> keySet();
+ method public java.lang.Object put(java.lang.Object, java.lang.Object);
+ method public void putAll(java.util.Map<?, ?>);
+ method public java.lang.String putValue(java.lang.String, java.lang.String);
+ method public java.lang.Object remove(java.lang.Object);
+ method public int size();
+ method public java.util.Collection<java.lang.Object> values();
+ field protected java.util.Map<java.lang.Object, java.lang.Object> map;
+ }
+
+ public static class Attributes.Name {
+ ctor public Attributes.Name(java.lang.String);
+ field public static final java.util.jar.Attributes.Name CLASS_PATH;
+ field public static final java.util.jar.Attributes.Name CONTENT_TYPE;
+ field public static final java.util.jar.Attributes.Name EXTENSION_INSTALLATION;
+ field public static final java.util.jar.Attributes.Name EXTENSION_LIST;
+ field public static final java.util.jar.Attributes.Name EXTENSION_NAME;
+ field public static final java.util.jar.Attributes.Name IMPLEMENTATION_TITLE;
+ field public static final java.util.jar.Attributes.Name IMPLEMENTATION_URL;
+ field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR;
+ field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;
+ field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VERSION;
+ field public static final java.util.jar.Attributes.Name MAIN_CLASS;
+ field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;
+ field public static final java.util.jar.Attributes.Name SEALED;
+ field public static final java.util.jar.Attributes.Name SIGNATURE_VERSION;
+ field public static final java.util.jar.Attributes.Name SPECIFICATION_TITLE;
+ field public static final java.util.jar.Attributes.Name SPECIFICATION_VENDOR;
+ field public static final java.util.jar.Attributes.Name SPECIFICATION_VERSION;
+ }
+
+ public class JarEntry extends java.util.zip.ZipEntry {
+ ctor public JarEntry(java.lang.String);
+ ctor public JarEntry(java.util.zip.ZipEntry);
+ ctor public JarEntry(java.util.jar.JarEntry);
+ method public java.util.jar.Attributes getAttributes() throws java.io.IOException;
+ method public java.security.cert.Certificate[] getCertificates();
+ method public java.security.CodeSigner[] getCodeSigners();
+ }
+
+ public class JarException extends java.util.zip.ZipException {
+ ctor public JarException();
+ ctor public JarException(java.lang.String);
+ }
+
+ public class JarFile extends java.util.zip.ZipFile {
+ ctor public JarFile(java.lang.String) throws java.io.IOException;
+ ctor public JarFile(java.lang.String, boolean) throws java.io.IOException;
+ ctor public JarFile(java.io.File) throws java.io.IOException;
+ ctor public JarFile(java.io.File, boolean) throws java.io.IOException;
+ ctor public JarFile(java.io.File, boolean, int) throws java.io.IOException;
+ method public java.util.jar.JarEntry getJarEntry(java.lang.String);
+ method public java.util.jar.Manifest getManifest() throws java.io.IOException;
+ method public boolean hasClassPathAttribute() throws java.io.IOException;
+ field public static final java.lang.String MANIFEST_NAME = "META-INF/MANIFEST.MF";
+ }
+
+ public class JarInputStream extends java.util.zip.ZipInputStream {
+ ctor public JarInputStream(java.io.InputStream) throws java.io.IOException;
+ ctor public JarInputStream(java.io.InputStream, boolean) throws java.io.IOException;
+ method public java.util.jar.Manifest getManifest();
+ method public java.util.jar.JarEntry getNextJarEntry() throws java.io.IOException;
+ }
+
+ public class JarOutputStream extends java.util.zip.ZipOutputStream {
+ ctor public JarOutputStream(java.io.OutputStream, java.util.jar.Manifest) throws java.io.IOException;
+ ctor public JarOutputStream(java.io.OutputStream) throws java.io.IOException;
+ }
+
+ public class Manifest implements java.lang.Cloneable {
+ ctor public Manifest();
+ ctor public Manifest(java.io.InputStream) throws java.io.IOException;
+ ctor public Manifest(java.util.jar.Manifest);
+ method public void clear();
+ method public java.lang.Object clone();
+ method public java.util.jar.Attributes getAttributes(java.lang.String);
+ method public java.util.Map<java.lang.String, java.util.jar.Attributes> getEntries();
+ method public java.util.jar.Attributes getMainAttributes();
+ method public void read(java.io.InputStream) throws java.io.IOException;
+ method public void write(java.io.OutputStream) throws java.io.IOException;
+ }
+
+ public abstract class Pack200 {
+ method public static synchronized java.util.jar.Pack200.Packer newPacker();
+ method public static java.util.jar.Pack200.Unpacker newUnpacker();
+ }
+
+ public static abstract interface Pack200.Packer {
+ method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);
+ method public abstract void pack(java.util.jar.JarFile, java.io.OutputStream) throws java.io.IOException;
+ method public abstract void pack(java.util.jar.JarInputStream, java.io.OutputStream) throws java.io.IOException;
+ method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();
+ method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);
+ field public static final java.lang.String CLASS_ATTRIBUTE_PFX = "pack.class.attribute.";
+ field public static final java.lang.String CODE_ATTRIBUTE_PFX = "pack.code.attribute.";
+ field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";
+ field public static final java.lang.String EFFORT = "pack.effort";
+ field public static final java.lang.String ERROR = "error";
+ field public static final java.lang.String FALSE = "false";
+ field public static final java.lang.String FIELD_ATTRIBUTE_PFX = "pack.field.attribute.";
+ field public static final java.lang.String KEEP = "keep";
+ field public static final java.lang.String KEEP_FILE_ORDER = "pack.keep.file.order";
+ field public static final java.lang.String LATEST = "latest";
+ field public static final java.lang.String METHOD_ATTRIBUTE_PFX = "pack.method.attribute.";
+ field public static final java.lang.String MODIFICATION_TIME = "pack.modification.time";
+ field public static final java.lang.String PASS = "pass";
+ field public static final java.lang.String PASS_FILE_PFX = "pack.pass.file.";
+ field public static final java.lang.String PROGRESS = "pack.progress";
+ field public static final java.lang.String SEGMENT_LIMIT = "pack.segment.limit";
+ field public static final java.lang.String STRIP = "strip";
+ field public static final java.lang.String TRUE = "true";
+ field public static final java.lang.String UNKNOWN_ATTRIBUTE = "pack.unknown.attribute";
+ }
+
+ public static abstract interface Pack200.Unpacker {
+ method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);
+ method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();
+ method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);
+ method public abstract void unpack(java.io.InputStream, java.util.jar.JarOutputStream) throws java.io.IOException;
+ method public abstract void unpack(java.io.File, java.util.jar.JarOutputStream) throws java.io.IOException;
+ field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";
+ field public static final java.lang.String FALSE = "false";
+ field public static final java.lang.String KEEP = "keep";
+ field public static final java.lang.String PROGRESS = "unpack.progress";
+ field public static final java.lang.String TRUE = "true";
+ }
+
+}
+
+package java.util.logging {
+
+ public class ConsoleHandler extends java.util.logging.StreamHandler {
+ ctor public ConsoleHandler();
+ }
+
+ public class ErrorManager {
+ ctor public ErrorManager();
+ method public synchronized void error(java.lang.String, java.lang.Exception, int);
+ field public static final int CLOSE_FAILURE = 3; // 0x3
+ field public static final int FLUSH_FAILURE = 2; // 0x2
+ field public static final int FORMAT_FAILURE = 5; // 0x5
+ field public static final int GENERIC_FAILURE = 0; // 0x0
+ field public static final int OPEN_FAILURE = 4; // 0x4
+ field public static final int WRITE_FAILURE = 1; // 0x1
+ }
+
+ public class FileHandler extends java.util.logging.StreamHandler {
+ ctor public FileHandler() throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, boolean) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, int, int) throws java.io.IOException, java.lang.SecurityException;
+ ctor public FileHandler(java.lang.String, int, int, boolean) throws java.io.IOException, java.lang.SecurityException;
+ }
+
+ public abstract interface Filter {
+ method public abstract boolean isLoggable(java.util.logging.LogRecord);
+ }
+
+ public abstract class Formatter {
+ ctor protected Formatter();
+ method public abstract java.lang.String format(java.util.logging.LogRecord);
+ method public synchronized java.lang.String formatMessage(java.util.logging.LogRecord);
+ method public java.lang.String getHead(java.util.logging.Handler);
+ method public java.lang.String getTail(java.util.logging.Handler);
+ }
+
+ public abstract class Handler {
+ ctor protected Handler();
+ method public abstract void close() throws java.lang.SecurityException;
+ method public abstract void flush();
+ method public java.lang.String getEncoding();
+ method public java.util.logging.ErrorManager getErrorManager();
+ method public java.util.logging.Filter getFilter();
+ method public java.util.logging.Formatter getFormatter();
+ method public synchronized java.util.logging.Level getLevel();
+ method public boolean isLoggable(java.util.logging.LogRecord);
+ method public abstract void publish(java.util.logging.LogRecord);
+ method protected void reportError(java.lang.String, java.lang.Exception, int);
+ method public void setEncoding(java.lang.String) throws java.lang.SecurityException, java.io.UnsupportedEncodingException;
+ method public void setErrorManager(java.util.logging.ErrorManager);
+ method public void setFilter(java.util.logging.Filter) throws java.lang.SecurityException;
+ method public void setFormatter(java.util.logging.Formatter) throws java.lang.SecurityException;
+ method public synchronized void setLevel(java.util.logging.Level) throws java.lang.SecurityException;
+ }
+
+ public class Level implements java.io.Serializable {
+ ctor protected Level(java.lang.String, int);
+ ctor protected Level(java.lang.String, int, java.lang.String);
+ method public java.lang.String getLocalizedName();
+ method public java.lang.String getName();
+ method public java.lang.String getResourceBundleName();
+ method public final int intValue();
+ method public static synchronized java.util.logging.Level parse(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public final java.lang.String toString();
+ field public static final java.util.logging.Level ALL;
+ field public static final java.util.logging.Level CONFIG;
+ field public static final java.util.logging.Level FINE;
+ field public static final java.util.logging.Level FINER;
+ field public static final java.util.logging.Level FINEST;
+ field public static final java.util.logging.Level INFO;
+ field public static final java.util.logging.Level OFF;
+ field public static final java.util.logging.Level SEVERE;
+ field public static final java.util.logging.Level WARNING;
+ }
+
+ public class LogManager {
+ ctor protected LogManager();
+ method public boolean addLogger(java.util.logging.Logger);
+ method public void addPropertyChangeListener(java.beans.PropertyChangeListener) throws java.lang.SecurityException;
+ method public void checkAccess() throws java.lang.SecurityException;
+ method public static java.util.logging.LogManager getLogManager();
+ method public java.util.logging.Logger getLogger(java.lang.String);
+ method public java.util.Enumeration<java.lang.String> getLoggerNames();
+ method public static synchronized java.util.logging.LoggingMXBean getLoggingMXBean();
+ method public java.lang.String getProperty(java.lang.String);
+ method public void readConfiguration() throws java.io.IOException, java.lang.SecurityException;
+ method public void readConfiguration(java.io.InputStream) throws java.io.IOException, java.lang.SecurityException;
+ method public void removePropertyChangeListener(java.beans.PropertyChangeListener) throws java.lang.SecurityException;
+ method public void reset() throws java.lang.SecurityException;
+ field public static final java.lang.String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging";
+ }
+
+ public class LogRecord implements java.io.Serializable {
+ ctor public LogRecord(java.util.logging.Level, java.lang.String);
+ method public java.util.logging.Level getLevel();
+ method public java.lang.String getLoggerName();
+ method public java.lang.String getMessage();
+ method public long getMillis();
+ method public java.lang.Object[] getParameters();
+ method public java.util.ResourceBundle getResourceBundle();
+ method public java.lang.String getResourceBundleName();
+ method public long getSequenceNumber();
+ method public java.lang.String getSourceClassName();
+ method public java.lang.String getSourceMethodName();
+ method public int getThreadID();
+ method public java.lang.Throwable getThrown();
+ method public void setLevel(java.util.logging.Level);
+ method public void setLoggerName(java.lang.String);
+ method public void setMessage(java.lang.String);
+ method public void setMillis(long);
+ method public void setParameters(java.lang.Object[]);
+ method public void setResourceBundle(java.util.ResourceBundle);
+ method public void setResourceBundleName(java.lang.String);
+ method public void setSequenceNumber(long);
+ method public void setSourceClassName(java.lang.String);
+ method public void setSourceMethodName(java.lang.String);
+ method public void setThreadID(int);
+ method public void setThrown(java.lang.Throwable);
+ }
+
+ public class Logger {
+ ctor protected Logger(java.lang.String, java.lang.String);
+ method public void addHandler(java.util.logging.Handler) throws java.lang.SecurityException;
+ method public void config(java.lang.String);
+ method public void entering(java.lang.String, java.lang.String);
+ method public void entering(java.lang.String, java.lang.String, java.lang.Object);
+ method public void entering(java.lang.String, java.lang.String, java.lang.Object[]);
+ method public void exiting(java.lang.String, java.lang.String);
+ method public void exiting(java.lang.String, java.lang.String, java.lang.Object);
+ method public void fine(java.lang.String);
+ method public void finer(java.lang.String);
+ method public void finest(java.lang.String);
+ method public static java.util.logging.Logger getAnonymousLogger();
+ method public static java.util.logging.Logger getAnonymousLogger(java.lang.String);
+ method public java.util.logging.Filter getFilter();
+ method public static final java.util.logging.Logger getGlobal();
+ method public java.util.logging.Handler[] getHandlers();
+ method public java.util.logging.Level getLevel();
+ method public static java.util.logging.Logger getLogger(java.lang.String);
+ method public static java.util.logging.Logger getLogger(java.lang.String, java.lang.String);
+ method public java.lang.String getName();
+ method public java.util.logging.Logger getParent();
+ method public java.util.ResourceBundle getResourceBundle();
+ method public java.lang.String getResourceBundleName();
+ method public boolean getUseParentHandlers();
+ method public void info(java.lang.String);
+ method public boolean isLoggable(java.util.logging.Level);
+ method public void log(java.util.logging.LogRecord);
+ method public void log(java.util.logging.Level, java.lang.String);
+ method public void log(java.util.logging.Level, java.lang.String, java.lang.Object);
+ method public void log(java.util.logging.Level, java.lang.String, java.lang.Object[]);
+ method public void log(java.util.logging.Level, java.lang.String, java.lang.Throwable);
+ method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String);
+ method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object);
+ method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[]);
+ method public void logp(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable);
+ method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object);
+ method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Object[]);
+ method public void logrb(java.util.logging.Level, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Throwable);
+ method public void removeHandler(java.util.logging.Handler) throws java.lang.SecurityException;
+ method public void setFilter(java.util.logging.Filter) throws java.lang.SecurityException;
+ method public void setLevel(java.util.logging.Level) throws java.lang.SecurityException;
+ method public void setParent(java.util.logging.Logger);
+ method public void setUseParentHandlers(boolean);
+ method public void severe(java.lang.String);
+ method public void throwing(java.lang.String, java.lang.String, java.lang.Throwable);
+ method public void warning(java.lang.String);
+ field public static final java.lang.String GLOBAL_LOGGER_NAME = "global";
+ field public static final deprecated java.util.logging.Logger global;
+ }
+
+ public abstract interface LoggingMXBean {
+ method public abstract java.lang.String getLoggerLevel(java.lang.String);
+ method public abstract java.util.List<java.lang.String> getLoggerNames();
+ method public abstract java.lang.String getParentLoggerName(java.lang.String);
+ method public abstract void setLoggerLevel(java.lang.String, java.lang.String);
+ }
+
+ public final class LoggingPermission extends java.security.BasicPermission {
+ ctor public LoggingPermission(java.lang.String, java.lang.String) throws java.lang.IllegalArgumentException;
+ }
+
+ public class MemoryHandler extends java.util.logging.Handler {
+ ctor public MemoryHandler();
+ ctor public MemoryHandler(java.util.logging.Handler, int, java.util.logging.Level);
+ method public void close() throws java.lang.SecurityException;
+ method public void flush();
+ method public synchronized java.util.logging.Level getPushLevel();
+ method public synchronized void publish(java.util.logging.LogRecord);
+ method public synchronized void push();
+ method public void setPushLevel(java.util.logging.Level) throws java.lang.SecurityException;
+ }
+
+ public class SimpleFormatter extends java.util.logging.Formatter {
+ ctor public SimpleFormatter();
+ method public synchronized java.lang.String format(java.util.logging.LogRecord);
+ }
+
+ public class SocketHandler extends java.util.logging.StreamHandler {
+ ctor public SocketHandler() throws java.io.IOException;
+ ctor public SocketHandler(java.lang.String, int) throws java.io.IOException;
+ }
+
+ public class StreamHandler extends java.util.logging.Handler {
+ ctor public StreamHandler();
+ ctor public StreamHandler(java.io.OutputStream, java.util.logging.Formatter);
+ method public synchronized void close() throws java.lang.SecurityException;
+ method public synchronized void flush();
+ method public synchronized void publish(java.util.logging.LogRecord);
+ method protected synchronized void setOutputStream(java.io.OutputStream) throws java.lang.SecurityException;
+ }
+
+ public class XMLFormatter extends java.util.logging.Formatter {
+ ctor public XMLFormatter();
+ method public java.lang.String format(java.util.logging.LogRecord);
+ }
+
+}
+
+package java.util.prefs {
+
+ public abstract class AbstractPreferences extends java.util.prefs.Preferences {
+ ctor protected AbstractPreferences(java.util.prefs.AbstractPreferences, java.lang.String);
+ method public java.lang.String absolutePath();
+ method public void addNodeChangeListener(java.util.prefs.NodeChangeListener);
+ method public void addPreferenceChangeListener(java.util.prefs.PreferenceChangeListener);
+ method protected final java.util.prefs.AbstractPreferences[] cachedChildren();
+ method protected abstract java.util.prefs.AbstractPreferences childSpi(java.lang.String);
+ method public java.lang.String[] childrenNames() throws java.util.prefs.BackingStoreException;
+ method protected abstract java.lang.String[] childrenNamesSpi() throws java.util.prefs.BackingStoreException;
+ method public void clear() throws java.util.prefs.BackingStoreException;
+ method public void exportNode(java.io.OutputStream) throws java.util.prefs.BackingStoreException, java.io.IOException;
+ method public void exportSubtree(java.io.OutputStream) throws java.util.prefs.BackingStoreException, java.io.IOException;
+ method public void flush() throws java.util.prefs.BackingStoreException;
+ method protected abstract void flushSpi() throws java.util.prefs.BackingStoreException;
+ method public java.lang.String get(java.lang.String, java.lang.String);
+ method public boolean getBoolean(java.lang.String, boolean);
+ method public byte[] getByteArray(java.lang.String, byte[]);
+ method protected java.util.prefs.AbstractPreferences getChild(java.lang.String) throws java.util.prefs.BackingStoreException;
+ method public double getDouble(java.lang.String, double);
+ method public float getFloat(java.lang.String, float);
+ method public int getInt(java.lang.String, int);
+ method public long getLong(java.lang.String, long);
+ method protected abstract java.lang.String getSpi(java.lang.String);
+ method protected boolean isRemoved();
+ method public boolean isUserNode();
+ method public java.lang.String[] keys() throws java.util.prefs.BackingStoreException;
+ method protected abstract java.lang.String[] keysSpi() throws java.util.prefs.BackingStoreException;
+ method public java.lang.String name();
+ method public java.util.prefs.Preferences node(java.lang.String);
+ method public boolean nodeExists(java.lang.String) throws java.util.prefs.BackingStoreException;
+ method public java.util.prefs.Preferences parent();
+ method public void put(java.lang.String, java.lang.String);
+ method public void putBoolean(java.lang.String, boolean);
+ method public void putByteArray(java.lang.String, byte[]);
+ method public void putDouble(java.lang.String, double);
+ method public void putFloat(java.lang.String, float);
+ method public void putInt(java.lang.String, int);
+ method public void putLong(java.lang.String, long);
+ method protected abstract void putSpi(java.lang.String, java.lang.String);
+ method public void remove(java.lang.String);
+ method public void removeNode() throws java.util.prefs.BackingStoreException;
+ method public void removeNodeChangeListener(java.util.prefs.NodeChangeListener);
+ method protected abstract void removeNodeSpi() throws java.util.prefs.BackingStoreException;
+ method public void removePreferenceChangeListener(java.util.prefs.PreferenceChangeListener);
+ method protected abstract void removeSpi(java.lang.String);
+ method public void sync() throws java.util.prefs.BackingStoreException;
+ method protected abstract void syncSpi() throws java.util.prefs.BackingStoreException;
+ method public java.lang.String toString();
+ field protected final java.lang.Object lock;
+ field protected boolean newNode;
+ }
+
+ public class BackingStoreException extends java.lang.Exception {
+ ctor public BackingStoreException(java.lang.String);
+ ctor public BackingStoreException(java.lang.Throwable);
+ }
+
+ public class InvalidPreferencesFormatException extends java.lang.Exception {
+ ctor public InvalidPreferencesFormatException(java.lang.Throwable);
+ ctor public InvalidPreferencesFormatException(java.lang.String);
+ ctor public InvalidPreferencesFormatException(java.lang.String, java.lang.Throwable);
+ }
+
+ public class NodeChangeEvent extends java.util.EventObject {
+ ctor public NodeChangeEvent(java.util.prefs.Preferences, java.util.prefs.Preferences);
+ method public java.util.prefs.Preferences getChild();
+ method public java.util.prefs.Preferences getParent();
+ }
+
+ public abstract interface NodeChangeListener implements java.util.EventListener {
+ method public abstract void childAdded(java.util.prefs.NodeChangeEvent);
+ method public abstract void childRemoved(java.util.prefs.NodeChangeEvent);
+ }
+
+ public class PreferenceChangeEvent extends java.util.EventObject {
+ ctor public PreferenceChangeEvent(java.util.prefs.Preferences, java.lang.String, java.lang.String);
+ method public java.lang.String getKey();
+ method public java.lang.String getNewValue();
+ method public java.util.prefs.Preferences getNode();
+ }
+
+ public abstract interface PreferenceChangeListener implements java.util.EventListener {
+ method public abstract void preferenceChange(java.util.prefs.PreferenceChangeEvent);
+ }
+
+ public abstract class Preferences {
+ ctor protected Preferences();
+ method public abstract java.lang.String absolutePath();
+ method public abstract void addNodeChangeListener(java.util.prefs.NodeChangeListener);
+ method public abstract void addPreferenceChangeListener(java.util.prefs.PreferenceChangeListener);
+ method public abstract java.lang.String[] childrenNames() throws java.util.prefs.BackingStoreException;
+ method public abstract void clear() throws java.util.prefs.BackingStoreException;
+ method public abstract void exportNode(java.io.OutputStream) throws java.util.prefs.BackingStoreException, java.io.IOException;
+ method public abstract void exportSubtree(java.io.OutputStream) throws java.util.prefs.BackingStoreException, java.io.IOException;
+ method public abstract void flush() throws java.util.prefs.BackingStoreException;
+ method public abstract java.lang.String get(java.lang.String, java.lang.String);
+ method public abstract boolean getBoolean(java.lang.String, boolean);
+ method public abstract byte[] getByteArray(java.lang.String, byte[]);
+ method public abstract double getDouble(java.lang.String, double);
+ method public abstract float getFloat(java.lang.String, float);
+ method public abstract int getInt(java.lang.String, int);
+ method public abstract long getLong(java.lang.String, long);
+ method public static void importPreferences(java.io.InputStream) throws java.io.IOException, java.util.prefs.InvalidPreferencesFormatException;
+ method public abstract boolean isUserNode();
+ method public abstract java.lang.String[] keys() throws java.util.prefs.BackingStoreException;
+ method public abstract java.lang.String name();
+ method public abstract java.util.prefs.Preferences node(java.lang.String);
+ method public abstract boolean nodeExists(java.lang.String) throws java.util.prefs.BackingStoreException;
+ method public abstract java.util.prefs.Preferences parent();
+ method public abstract void put(java.lang.String, java.lang.String);
+ method public abstract void putBoolean(java.lang.String, boolean);
+ method public abstract void putByteArray(java.lang.String, byte[]);
+ method public abstract void putDouble(java.lang.String, double);
+ method public abstract void putFloat(java.lang.String, float);
+ method public abstract void putInt(java.lang.String, int);
+ method public abstract void putLong(java.lang.String, long);
+ method public abstract void remove(java.lang.String);
+ method public abstract void removeNode() throws java.util.prefs.BackingStoreException;
+ method public abstract void removeNodeChangeListener(java.util.prefs.NodeChangeListener);
+ method public abstract void removePreferenceChangeListener(java.util.prefs.PreferenceChangeListener);
+ method public abstract void sync() throws java.util.prefs.BackingStoreException;
+ method public static java.util.prefs.Preferences systemNodeForPackage(java.lang.Class<?>);
+ method public static java.util.prefs.Preferences systemRoot();
+ method public abstract java.lang.String toString();
+ method public static java.util.prefs.Preferences userNodeForPackage(java.lang.Class<?>);
+ method public static java.util.prefs.Preferences userRoot();
+ field public static final int MAX_KEY_LENGTH = 80; // 0x50
+ field public static final int MAX_NAME_LENGTH = 80; // 0x50
+ field public static final int MAX_VALUE_LENGTH = 8192; // 0x2000
+ }
+
+ public abstract interface PreferencesFactory {
+ method public abstract java.util.prefs.Preferences systemRoot();
+ method public abstract java.util.prefs.Preferences userRoot();
+ }
+
+}
+
+package java.util.regex {
+
+ public abstract interface MatchResult {
+ method public abstract int end();
+ method public abstract int end(int);
+ method public abstract java.lang.String group();
+ method public abstract java.lang.String group(int);
+ method public abstract int groupCount();
+ method public abstract int start();
+ method public abstract int start(int);
+ }
+
+ public final class Matcher implements java.util.regex.MatchResult {
+ method public java.util.regex.Matcher appendReplacement(java.lang.StringBuffer, java.lang.String);
+ method public java.lang.StringBuffer appendTail(java.lang.StringBuffer);
+ method public int end();
+ method public int end(int);
+ method public boolean find(int);
+ method public boolean find();
+ method public java.lang.String group();
+ method public java.lang.String group(int);
+ method public int groupCount();
+ method public boolean hasAnchoringBounds();
+ method public boolean hasTransparentBounds();
+ method public boolean hitEnd();
+ method public boolean lookingAt();
+ method public boolean matches();
+ method public java.util.regex.Pattern pattern();
+ method public static java.lang.String quoteReplacement(java.lang.String);
+ method public java.util.regex.Matcher region(int, int);
+ method public int regionEnd();
+ method public int regionStart();
+ method public java.lang.String replaceAll(java.lang.String);
+ method public java.lang.String replaceFirst(java.lang.String);
+ method public boolean requireEnd();
+ method public java.util.regex.Matcher reset();
+ method public java.util.regex.Matcher reset(java.lang.CharSequence);
+ method public int start();
+ method public int start(int) throws java.lang.IllegalStateException;
+ method public java.util.regex.MatchResult toMatchResult();
+ method public java.util.regex.Matcher useAnchoringBounds(boolean);
+ method public java.util.regex.Matcher usePattern(java.util.regex.Pattern);
+ method public java.util.regex.Matcher useTransparentBounds(boolean);
+ }
+
+ public final class Pattern implements java.io.Serializable {
+ method public static java.util.regex.Pattern compile(java.lang.String, int) throws java.util.regex.PatternSyntaxException;
+ method public static java.util.regex.Pattern compile(java.lang.String);
+ method public int flags();
+ method public java.util.regex.Matcher matcher(java.lang.CharSequence);
+ method public static boolean matches(java.lang.String, java.lang.CharSequence);
+ method public java.lang.String pattern();
+ method public static java.lang.String quote(java.lang.String);
+ method public java.lang.String[] split(java.lang.CharSequence, int);
+ method public java.lang.String[] split(java.lang.CharSequence);
+ field public static final int CANON_EQ = 128; // 0x80
+ field public static final int CASE_INSENSITIVE = 2; // 0x2
+ field public static final int COMMENTS = 4; // 0x4
+ field public static final int DOTALL = 32; // 0x20
+ field public static final int LITERAL = 16; // 0x10
+ field public static final int MULTILINE = 8; // 0x8
+ field public static final int UNICODE_CASE = 64; // 0x40
+ field public static final int UNIX_LINES = 1; // 0x1
+ }
+
+ public class PatternSyntaxException extends java.lang.IllegalArgumentException {
+ ctor public PatternSyntaxException(java.lang.String, java.lang.String, int);
+ method public java.lang.String getDescription();
+ method public int getIndex();
+ method public java.lang.String getPattern();
+ }
+
+}
+
+package java.util.zip {
+
+ public class Adler32 implements java.util.zip.Checksum {
+ ctor public Adler32();
+ method public long getValue();
+ method public void reset();
+ method public void update(int);
+ method public void update(byte[], int, int);
+ method public void update(byte[]);
+ }
+
+ public class CRC32 implements java.util.zip.Checksum {
+ ctor public CRC32();
+ method public long getValue();
+ method public void reset();
+ method public void update(int);
+ method public void update(byte[], int, int);
+ method public void update(byte[]);
+ }
+
+ public class CheckedInputStream extends java.io.FilterInputStream {
+ ctor public CheckedInputStream(java.io.InputStream, java.util.zip.Checksum);
+ method public java.util.zip.Checksum getChecksum();
+ }
+
+ public class CheckedOutputStream extends java.io.FilterOutputStream {
+ ctor public CheckedOutputStream(java.io.OutputStream, java.util.zip.Checksum);
+ method public java.util.zip.Checksum getChecksum();
+ }
+
+ public abstract interface Checksum {
+ method public abstract long getValue();
+ method public abstract void reset();
+ method public abstract void update(int);
+ method public abstract void update(byte[], int, int);
+ }
+
+ public class DataFormatException extends java.lang.Exception {
+ ctor public DataFormatException();
+ ctor public DataFormatException(java.lang.String);
+ }
+
+ public class Deflater {
+ ctor public Deflater(int, boolean);
+ ctor public Deflater(int);
+ ctor public Deflater();
+ method public int deflate(byte[], int, int);
+ method public int deflate(byte[]);
+ method public int deflate(byte[], int, int, int);
+ method public void end();
+ method public void finish();
+ method public boolean finished();
+ method public int getAdler();
+ method public long getBytesRead();
+ method public long getBytesWritten();
+ method public int getTotalIn();
+ method public int getTotalOut();
+ method public boolean needsInput();
+ method public void reset();
+ method public void setDictionary(byte[], int, int);
+ method public void setDictionary(byte[]);
+ method public void setInput(byte[], int, int);
+ method public void setInput(byte[]);
+ method public void setLevel(int);
+ method public void setStrategy(int);
+ field public static final int BEST_COMPRESSION = 9; // 0x9
+ field public static final int BEST_SPEED = 1; // 0x1
+ field public static final int DEFAULT_COMPRESSION = -1; // 0xffffffff
+ field public static final int DEFAULT_STRATEGY = 0; // 0x0
+ field public static final int DEFLATED = 8; // 0x8
+ field public static final int FILTERED = 1; // 0x1
+ field public static final int FULL_FLUSH = 3; // 0x3
+ field public static final int HUFFMAN_ONLY = 2; // 0x2
+ field public static final int NO_COMPRESSION = 0; // 0x0
+ field public static final int NO_FLUSH = 0; // 0x0
+ field public static final int SYNC_FLUSH = 2; // 0x2
+ }
+
+ public class DeflaterInputStream extends java.io.FilterInputStream {
+ ctor public DeflaterInputStream(java.io.InputStream);
+ ctor public DeflaterInputStream(java.io.InputStream, java.util.zip.Deflater);
+ ctor public DeflaterInputStream(java.io.InputStream, java.util.zip.Deflater, int);
+ field protected final byte[] buf;
+ field protected final java.util.zip.Deflater def;
+ }
+
+ public class DeflaterOutputStream extends java.io.FilterOutputStream {
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, int);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream, java.util.zip.Deflater);
+ ctor public DeflaterOutputStream(java.io.OutputStream, boolean);
+ ctor public DeflaterOutputStream(java.io.OutputStream);
+ method protected void deflate() throws java.io.IOException;
+ method public void finish() throws java.io.IOException;
+ field protected byte[] buf;
+ field protected java.util.zip.Deflater def;
+ }
+
+ public class GZIPInputStream extends java.util.zip.InflaterInputStream {
+ ctor public GZIPInputStream(java.io.InputStream, int) throws java.io.IOException;
+ ctor public GZIPInputStream(java.io.InputStream) throws java.io.IOException;
+ field public static final int GZIP_MAGIC = 35615; // 0x8b1f
+ field protected java.util.zip.CRC32 crc;
+ field protected boolean eos;
+ }
+
+ public class GZIPOutputStream extends java.util.zip.DeflaterOutputStream {
+ ctor public GZIPOutputStream(java.io.OutputStream, int) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream, int, boolean) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream, boolean) throws java.io.IOException;
+ field protected java.util.zip.CRC32 crc;
+ }
+
+ public class Inflater {
+ ctor public Inflater(boolean);
+ ctor public Inflater();
+ method public void end();
+ method public boolean finished();
+ method public int getAdler();
+ method public long getBytesRead();
+ method public long getBytesWritten();
+ method public int getRemaining();
+ method public int getTotalIn();
+ method public int getTotalOut();
+ method public int inflate(byte[], int, int) throws java.util.zip.DataFormatException;
+ method public int inflate(byte[]) throws java.util.zip.DataFormatException;
+ method public boolean needsDictionary();
+ method public boolean needsInput();
+ method public void reset();
+ method public void setDictionary(byte[], int, int);
+ method public void setDictionary(byte[]);
+ method public void setInput(byte[], int, int);
+ method public void setInput(byte[]);
+ }
+
+ public class InflaterInputStream extends java.io.FilterInputStream {
+ ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater, int);
+ ctor public InflaterInputStream(java.io.InputStream, java.util.zip.Inflater);
+ ctor public InflaterInputStream(java.io.InputStream);
+ method protected void fill() throws java.io.IOException;
+ field protected byte[] buf;
+ field protected boolean closed;
+ field protected java.util.zip.Inflater inf;
+ field protected int len;
+ }
+
+ public class InflaterOutputStream extends java.io.FilterOutputStream {
+ ctor public InflaterOutputStream(java.io.OutputStream);
+ ctor public InflaterOutputStream(java.io.OutputStream, java.util.zip.Inflater);
+ ctor public InflaterOutputStream(java.io.OutputStream, java.util.zip.Inflater, int);
+ method public void finish() throws java.io.IOException;
+ field protected final byte[] buf;
+ field protected final java.util.zip.Inflater inf;
+ }
+
+ public class ZipEntry implements java.lang.Cloneable {
+ ctor public ZipEntry(java.lang.String);
+ ctor public ZipEntry(java.util.zip.ZipEntry);
+ method public java.lang.Object clone();
+ method public java.lang.String getComment();
+ method public long getCompressedSize();
+ method public long getCrc();
+ method public byte[] getExtra();
+ method public int getMethod();
+ method public java.lang.String getName();
+ method public long getSize();
+ method public long getTime();
+ method public boolean isDirectory();
+ method public void setComment(java.lang.String);
+ method public void setCompressedSize(long);
+ method public void setCrc(long);
+ method public void setExtra(byte[]);
+ method public void setMethod(int);
+ method public void setSize(long);
+ method public void setTime(long);
+ field public static final int CENATT = 36; // 0x24
+ field public static final int CENATX = 38; // 0x26
+ field public static final int CENCOM = 32; // 0x20
+ field public static final int CENCRC = 16; // 0x10
+ field public static final int CENDSK = 34; // 0x22
+ field public static final int CENEXT = 30; // 0x1e
+ field public static final int CENFLG = 8; // 0x8
+ field public static final int CENHDR = 46; // 0x2e
+ field public static final int CENHOW = 10; // 0xa
+ field public static final int CENLEN = 24; // 0x18
+ field public static final int CENNAM = 28; // 0x1c
+ field public static final int CENOFF = 42; // 0x2a
+ field public static final long CENSIG = 33639248L; // 0x2014b50L
+ field public static final int CENSIZ = 20; // 0x14
+ field public static final int CENTIM = 12; // 0xc
+ field public static final int CENVEM = 4; // 0x4
+ field public static final int CENVER = 6; // 0x6
+ field public static final int DEFLATED = 8; // 0x8
+ field public static final int ENDCOM = 20; // 0x14
+ field public static final int ENDHDR = 22; // 0x16
+ field public static final int ENDOFF = 16; // 0x10
+ field public static final long ENDSIG = 101010256L; // 0x6054b50L
+ field public static final int ENDSIZ = 12; // 0xc
+ field public static final int ENDSUB = 8; // 0x8
+ field public static final int ENDTOT = 10; // 0xa
+ field public static final int EXTCRC = 4; // 0x4
+ field public static final int EXTHDR = 16; // 0x10
+ field public static final int EXTLEN = 12; // 0xc
+ field public static final long EXTSIG = 134695760L; // 0x8074b50L
+ field public static final int EXTSIZ = 8; // 0x8
+ field public static final int LOCCRC = 14; // 0xe
+ field public static final int LOCEXT = 28; // 0x1c
+ field public static final int LOCFLG = 6; // 0x6
+ field public static final int LOCHDR = 30; // 0x1e
+ field public static final int LOCHOW = 8; // 0x8
+ field public static final int LOCLEN = 22; // 0x16
+ field public static final int LOCNAM = 26; // 0x1a
+ field public static final long LOCSIG = 67324752L; // 0x4034b50L
+ field public static final int LOCSIZ = 18; // 0x12
+ field public static final int LOCTIM = 10; // 0xa
+ field public static final int LOCVER = 4; // 0x4
+ field public static final int STORED = 0; // 0x0
+ }
+
+ public class ZipError extends java.lang.InternalError {
+ ctor public ZipError(java.lang.String);
+ }
+
+ public class ZipException extends java.io.IOException {
+ ctor public ZipException();
+ ctor public ZipException(java.lang.String);
+ }
+
+ public class ZipFile implements java.io.Closeable {
+ ctor public ZipFile(java.lang.String) throws java.io.IOException;
+ ctor public ZipFile(java.io.File, int) throws java.io.IOException;
+ ctor public ZipFile(java.io.File) throws java.io.IOException, java.util.zip.ZipException;
+ ctor public ZipFile(java.io.File, int, java.nio.charset.Charset) throws java.io.IOException;
+ ctor public ZipFile(java.lang.String, java.nio.charset.Charset) throws java.io.IOException;
+ ctor public ZipFile(java.io.File, java.nio.charset.Charset) throws java.io.IOException;
+ method public void close() throws java.io.IOException;
+ method public java.util.Enumeration<? extends java.util.zip.ZipEntry> entries();
+ method public java.lang.String getComment();
+ method public java.util.zip.ZipEntry getEntry(java.lang.String);
+ method public java.io.InputStream getInputStream(java.util.zip.ZipEntry) throws java.io.IOException;
+ method public java.lang.String getName();
+ method public int size();
+ field public static final int CENATT = 36; // 0x24
+ field public static final int CENATX = 38; // 0x26
+ field public static final int CENCOM = 32; // 0x20
+ field public static final int CENCRC = 16; // 0x10
+ field public static final int CENDSK = 34; // 0x22
+ field public static final int CENEXT = 30; // 0x1e
+ field public static final int CENFLG = 8; // 0x8
+ field public static final int CENHDR = 46; // 0x2e
+ field public static final int CENHOW = 10; // 0xa
+ field public static final int CENLEN = 24; // 0x18
+ field public static final int CENNAM = 28; // 0x1c
+ field public static final int CENOFF = 42; // 0x2a
+ field public static final long CENSIG = 33639248L; // 0x2014b50L
+ field public static final int CENSIZ = 20; // 0x14
+ field public static final int CENTIM = 12; // 0xc
+ field public static final int CENVEM = 4; // 0x4
+ field public static final int CENVER = 6; // 0x6
+ field public static final int ENDCOM = 20; // 0x14
+ field public static final int ENDHDR = 22; // 0x16
+ field public static final int ENDOFF = 16; // 0x10
+ field public static final long ENDSIG = 101010256L; // 0x6054b50L
+ field public static final int ENDSIZ = 12; // 0xc
+ field public static final int ENDSUB = 8; // 0x8
+ field public static final int ENDTOT = 10; // 0xa
+ field public static final int EXTCRC = 4; // 0x4
+ field public static final int EXTHDR = 16; // 0x10
+ field public static final int EXTLEN = 12; // 0xc
+ field public static final long EXTSIG = 134695760L; // 0x8074b50L
+ field public static final int EXTSIZ = 8; // 0x8
+ field public static final int LOCCRC = 14; // 0xe
+ field public static final int LOCEXT = 28; // 0x1c
+ field public static final int LOCFLG = 6; // 0x6
+ field public static final int LOCHDR = 30; // 0x1e
+ field public static final int LOCHOW = 8; // 0x8
+ field public static final int LOCLEN = 22; // 0x16
+ field public static final int LOCNAM = 26; // 0x1a
+ field public static final long LOCSIG = 67324752L; // 0x4034b50L
+ field public static final int LOCSIZ = 18; // 0x12
+ field public static final int LOCTIM = 10; // 0xa
+ field public static final int LOCVER = 4; // 0x4
+ field public static final int OPEN_DELETE = 4; // 0x4
+ field public static final int OPEN_READ = 1; // 0x1
+ }
+
+ public class ZipInputStream extends java.util.zip.InflaterInputStream {
+ ctor public ZipInputStream(java.io.InputStream);
+ ctor public ZipInputStream(java.io.InputStream, java.nio.charset.Charset);
+ method public void closeEntry() throws java.io.IOException;
+ method protected java.util.zip.ZipEntry createZipEntry(java.lang.String);
+ method public java.util.zip.ZipEntry getNextEntry() throws java.io.IOException;
+ field public static final int CENATT = 36; // 0x24
+ field public static final int CENATX = 38; // 0x26
+ field public static final int CENCOM = 32; // 0x20
+ field public static final int CENCRC = 16; // 0x10
+ field public static final int CENDSK = 34; // 0x22
+ field public static final int CENEXT = 30; // 0x1e
+ field public static final int CENFLG = 8; // 0x8
+ field public static final int CENHDR = 46; // 0x2e
+ field public static final int CENHOW = 10; // 0xa
+ field public static final int CENLEN = 24; // 0x18
+ field public static final int CENNAM = 28; // 0x1c
+ field public static final int CENOFF = 42; // 0x2a
+ field public static final long CENSIG = 33639248L; // 0x2014b50L
+ field public static final int CENSIZ = 20; // 0x14
+ field public static final int CENTIM = 12; // 0xc
+ field public static final int CENVEM = 4; // 0x4
+ field public static final int CENVER = 6; // 0x6
+ field public static final int ENDCOM = 20; // 0x14
+ field public static final int ENDHDR = 22; // 0x16
+ field public static final int ENDOFF = 16; // 0x10
+ field public static final long ENDSIG = 101010256L; // 0x6054b50L
+ field public static final int ENDSIZ = 12; // 0xc
+ field public static final int ENDSUB = 8; // 0x8
+ field public static final int ENDTOT = 10; // 0xa
+ field public static final int EXTCRC = 4; // 0x4
+ field public static final int EXTHDR = 16; // 0x10
+ field public static final int EXTLEN = 12; // 0xc
+ field public static final long EXTSIG = 134695760L; // 0x8074b50L
+ field public static final int EXTSIZ = 8; // 0x8
+ field public static final int LOCCRC = 14; // 0xe
+ field public static final int LOCEXT = 28; // 0x1c
+ field public static final int LOCFLG = 6; // 0x6
+ field public static final int LOCHDR = 30; // 0x1e
+ field public static final int LOCHOW = 8; // 0x8
+ field public static final int LOCLEN = 22; // 0x16
+ field public static final int LOCNAM = 26; // 0x1a
+ field public static final long LOCSIG = 67324752L; // 0x4034b50L
+ field public static final int LOCSIZ = 18; // 0x12
+ field public static final int LOCTIM = 10; // 0xa
+ field public static final int LOCVER = 4; // 0x4
+ }
+
+ public class ZipOutputStream extends java.util.zip.DeflaterOutputStream {
+ ctor public ZipOutputStream(java.io.OutputStream);
+ ctor public ZipOutputStream(java.io.OutputStream, java.nio.charset.Charset);
+ method public void closeEntry() throws java.io.IOException;
+ method public void putNextEntry(java.util.zip.ZipEntry) throws java.io.IOException;
+ method public void setComment(java.lang.String);
+ method public void setLevel(int);
+ method public void setMethod(int);
+ field public static final int CENATT = 36; // 0x24
+ field public static final int CENATX = 38; // 0x26
+ field public static final int CENCOM = 32; // 0x20
+ field public static final int CENCRC = 16; // 0x10
+ field public static final int CENDSK = 34; // 0x22
+ field public static final int CENEXT = 30; // 0x1e
+ field public static final int CENFLG = 8; // 0x8
+ field public static final int CENHDR = 46; // 0x2e
+ field public static final int CENHOW = 10; // 0xa
+ field public static final int CENLEN = 24; // 0x18
+ field public static final int CENNAM = 28; // 0x1c
+ field public static final int CENOFF = 42; // 0x2a
+ field public static final long CENSIG = 33639248L; // 0x2014b50L
+ field public static final int CENSIZ = 20; // 0x14
+ field public static final int CENTIM = 12; // 0xc
+ field public static final int CENVEM = 4; // 0x4
+ field public static final int CENVER = 6; // 0x6
+ field public static final int DEFLATED = 8; // 0x8
+ field public static final int ENDCOM = 20; // 0x14
+ field public static final int ENDHDR = 22; // 0x16
+ field public static final int ENDOFF = 16; // 0x10
+ field public static final long ENDSIG = 101010256L; // 0x6054b50L
+ field public static final int ENDSIZ = 12; // 0xc
+ field public static final int ENDSUB = 8; // 0x8
+ field public static final int ENDTOT = 10; // 0xa
+ field public static final int EXTCRC = 4; // 0x4
+ field public static final int EXTHDR = 16; // 0x10
+ field public static final int EXTLEN = 12; // 0xc
+ field public static final long EXTSIG = 134695760L; // 0x8074b50L
+ field public static final int EXTSIZ = 8; // 0x8
+ field public static final int LOCCRC = 14; // 0xe
+ field public static final int LOCEXT = 28; // 0x1c
+ field public static final int LOCFLG = 6; // 0x6
+ field public static final int LOCHDR = 30; // 0x1e
+ field public static final int LOCHOW = 8; // 0x8
+ field public static final int LOCLEN = 22; // 0x16
+ field public static final int LOCNAM = 26; // 0x1a
+ field public static final long LOCSIG = 67324752L; // 0x4034b50L
+ field public static final int LOCSIZ = 18; // 0x12
+ field public static final int LOCTIM = 10; // 0xa
+ field public static final int LOCVER = 4; // 0x4
+ field public static final int STORED = 0; // 0x0
+ }
+
+}
+
+package javax.crypto {
+
+ public class AEADBadTagException extends javax.crypto.BadPaddingException {
+ ctor public AEADBadTagException();
+ ctor public AEADBadTagException(java.lang.String);
+ }
+
+ public class BadPaddingException extends java.security.GeneralSecurityException {
+ ctor public BadPaddingException();
+ ctor public BadPaddingException(java.lang.String);
+ }
+
+ public class Cipher {
+ ctor protected Cipher(javax.crypto.CipherSpi, java.security.Provider, java.lang.String);
+ method public final byte[] doFinal() throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException;
+ method public final int doFinal(byte[], int) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException, javax.crypto.ShortBufferException;
+ method public final byte[] doFinal(byte[]) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException;
+ method public final byte[] doFinal(byte[], int, int) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException;
+ method public final int doFinal(byte[], int, int, byte[]) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException, javax.crypto.ShortBufferException;
+ method public final int doFinal(byte[], int, int, byte[], int) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException, javax.crypto.ShortBufferException;
+ method public final int doFinal(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException, javax.crypto.ShortBufferException;
+ method public final java.lang.String getAlgorithm();
+ method public final int getBlockSize();
+ method public final javax.crypto.ExemptionMechanism getExemptionMechanism();
+ method public final byte[] getIV();
+ method public static final javax.crypto.Cipher getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException;
+ method public static final javax.crypto.Cipher getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException, java.security.NoSuchProviderException;
+ method public static final javax.crypto.Cipher getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException, javax.crypto.NoSuchPaddingException;
+ method public static final int getMaxAllowedKeyLength(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final java.security.spec.AlgorithmParameterSpec getMaxAllowedParameterSpec(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public final int getOutputSize(int);
+ method public final java.security.AlgorithmParameters getParameters();
+ method public final java.security.Provider getProvider();
+ method public final void init(int, java.security.Key) throws java.security.InvalidKeyException;
+ method public final void init(int, java.security.Key, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method public final void init(int, java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(int, java.security.Key, java.security.AlgorithmParameters) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(int, java.security.cert.Certificate) throws java.security.InvalidKeyException;
+ method public final void init(int, java.security.cert.Certificate, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method public final java.security.Key unwrap(byte[], java.lang.String, int) throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ method public final byte[] update(byte[]);
+ method public final byte[] update(byte[], int, int);
+ method public final int update(byte[], int, int, byte[]) throws javax.crypto.ShortBufferException;
+ method public final int update(byte[], int, int, byte[], int) throws javax.crypto.ShortBufferException;
+ method public final int update(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.ShortBufferException;
+ method public final void updateAAD(byte[]);
+ method public final void updateAAD(byte[], int, int);
+ method public final void updateAAD(java.nio.ByteBuffer);
+ method public final byte[] wrap(java.security.Key) throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException;
+ field public static final int DECRYPT_MODE = 2; // 0x2
+ field public static final int ENCRYPT_MODE = 1; // 0x1
+ field public static final int PRIVATE_KEY = 2; // 0x2
+ field public static final int PUBLIC_KEY = 1; // 0x1
+ field public static final int SECRET_KEY = 3; // 0x3
+ field public static final int UNWRAP_MODE = 4; // 0x4
+ field public static final int WRAP_MODE = 3; // 0x3
+ }
+
+ public class CipherInputStream extends java.io.FilterInputStream {
+ ctor public CipherInputStream(java.io.InputStream, javax.crypto.Cipher);
+ ctor protected CipherInputStream(java.io.InputStream);
+ }
+
+ public class CipherOutputStream extends java.io.FilterOutputStream {
+ ctor public CipherOutputStream(java.io.OutputStream, javax.crypto.Cipher);
+ ctor protected CipherOutputStream(java.io.OutputStream);
+ }
+
+ public abstract class CipherSpi {
+ ctor public CipherSpi();
+ method protected abstract byte[] engineDoFinal(byte[], int, int) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException;
+ method protected abstract int engineDoFinal(byte[], int, int, byte[], int) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException, javax.crypto.ShortBufferException;
+ method protected int engineDoFinal(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.BadPaddingException, javax.crypto.IllegalBlockSizeException, javax.crypto.ShortBufferException;
+ method protected abstract int engineGetBlockSize();
+ method protected abstract byte[] engineGetIV();
+ method protected int engineGetKeySize(java.security.Key) throws java.security.InvalidKeyException;
+ method protected abstract int engineGetOutputSize(int);
+ method protected abstract java.security.AlgorithmParameters engineGetParameters();
+ method protected abstract void engineInit(int, java.security.Key, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method protected abstract void engineInit(int, java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method protected abstract void engineInit(int, java.security.Key, java.security.AlgorithmParameters, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method protected abstract void engineSetMode(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method protected abstract void engineSetPadding(java.lang.String) throws javax.crypto.NoSuchPaddingException;
+ method protected java.security.Key engineUnwrap(byte[], java.lang.String, int) throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ method protected abstract byte[] engineUpdate(byte[], int, int);
+ method protected abstract int engineUpdate(byte[], int, int, byte[], int) throws javax.crypto.ShortBufferException;
+ method protected int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.ShortBufferException;
+ method protected void engineUpdateAAD(byte[], int, int);
+ method protected void engineUpdateAAD(java.nio.ByteBuffer);
+ method protected byte[] engineWrap(java.security.Key) throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException;
+ }
+
+ public class EncryptedPrivateKeyInfo {
+ ctor public EncryptedPrivateKeyInfo(byte[]) throws java.io.IOException;
+ ctor public EncryptedPrivateKeyInfo(java.lang.String, byte[]) throws java.security.NoSuchAlgorithmException;
+ ctor public EncryptedPrivateKeyInfo(java.security.AlgorithmParameters, byte[]) throws java.security.NoSuchAlgorithmException;
+ method public java.lang.String getAlgName();
+ method public java.security.AlgorithmParameters getAlgParameters();
+ method public byte[] getEncoded() throws java.io.IOException;
+ method public byte[] getEncryptedData();
+ method public java.security.spec.PKCS8EncodedKeySpec getKeySpec(javax.crypto.Cipher) throws java.security.spec.InvalidKeySpecException;
+ method public java.security.spec.PKCS8EncodedKeySpec getKeySpec(java.security.Key) throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ method public java.security.spec.PKCS8EncodedKeySpec getKeySpec(java.security.Key, java.lang.String) throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public java.security.spec.PKCS8EncodedKeySpec getKeySpec(java.security.Key, java.security.Provider) throws java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ }
+
+ public class ExemptionMechanism {
+ ctor protected ExemptionMechanism(javax.crypto.ExemptionMechanismSpi, java.security.Provider, java.lang.String);
+ method public final byte[] genExemptionBlob() throws javax.crypto.ExemptionMechanismException, java.lang.IllegalStateException;
+ method public final int genExemptionBlob(byte[]) throws javax.crypto.ExemptionMechanismException, java.lang.IllegalStateException, javax.crypto.ShortBufferException;
+ method public final int genExemptionBlob(byte[], int) throws javax.crypto.ExemptionMechanismException, java.lang.IllegalStateException, javax.crypto.ShortBufferException;
+ method public static final javax.crypto.ExemptionMechanism getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.crypto.ExemptionMechanism getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.crypto.ExemptionMechanism getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.lang.String getName();
+ method public final int getOutputSize(int) throws java.lang.IllegalStateException;
+ method public final java.security.Provider getProvider();
+ method public final void init(java.security.Key) throws javax.crypto.ExemptionMechanismException, java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final boolean isCryptoAllowed(java.security.Key) throws javax.crypto.ExemptionMechanismException;
+ }
+
+ public class ExemptionMechanismException extends java.security.GeneralSecurityException {
+ ctor public ExemptionMechanismException();
+ ctor public ExemptionMechanismException(java.lang.String);
+ }
+
+ public abstract class ExemptionMechanismSpi {
+ ctor public ExemptionMechanismSpi();
+ method protected abstract byte[] engineGenExemptionBlob() throws javax.crypto.ExemptionMechanismException;
+ method protected abstract int engineGenExemptionBlob(byte[], int) throws javax.crypto.ExemptionMechanismException, javax.crypto.ShortBufferException;
+ method protected abstract int engineGetOutputSize(int);
+ method protected abstract void engineInit(java.security.Key) throws javax.crypto.ExemptionMechanismException, java.security.InvalidKeyException;
+ method protected abstract void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method protected abstract void engineInit(java.security.Key, java.security.AlgorithmParameters) throws javax.crypto.ExemptionMechanismException, java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ }
+
+ public class IllegalBlockSizeException extends java.security.GeneralSecurityException {
+ ctor public IllegalBlockSizeException();
+ ctor public IllegalBlockSizeException(java.lang.String);
+ }
+
+ public class KeyAgreement {
+ ctor protected KeyAgreement(javax.crypto.KeyAgreementSpi, java.security.Provider, java.lang.String);
+ method public final java.security.Key doPhase(java.security.Key, boolean) throws java.lang.IllegalStateException, java.security.InvalidKeyException;
+ method public final byte[] generateSecret() throws java.lang.IllegalStateException;
+ method public final int generateSecret(byte[], int) throws java.lang.IllegalStateException, javax.crypto.ShortBufferException;
+ method public final javax.crypto.SecretKey generateSecret(java.lang.String) throws java.lang.IllegalStateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ method public final java.lang.String getAlgorithm();
+ method public static final javax.crypto.KeyAgreement getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.crypto.KeyAgreement getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.crypto.KeyAgreement getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public final void init(java.security.Key) throws java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ }
+
+ public abstract class KeyAgreementSpi {
+ ctor public KeyAgreementSpi();
+ method protected abstract java.security.Key engineDoPhase(java.security.Key, boolean) throws java.lang.IllegalStateException, java.security.InvalidKeyException;
+ method protected abstract byte[] engineGenerateSecret() throws java.lang.IllegalStateException;
+ method protected abstract int engineGenerateSecret(byte[], int) throws java.lang.IllegalStateException, javax.crypto.ShortBufferException;
+ method protected abstract javax.crypto.SecretKey engineGenerateSecret(java.lang.String) throws java.lang.IllegalStateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ method protected abstract void engineInit(java.security.Key, java.security.SecureRandom) throws java.security.InvalidKeyException;
+ method protected abstract void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ }
+
+ public class KeyGenerator {
+ ctor protected KeyGenerator(javax.crypto.KeyGeneratorSpi, java.security.Provider, java.lang.String);
+ method public final javax.crypto.SecretKey generateKey();
+ method public final java.lang.String getAlgorithm();
+ method public static final javax.crypto.KeyGenerator getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.crypto.KeyGenerator getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.crypto.KeyGenerator getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public final void init(java.security.SecureRandom);
+ method public final void init(java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException;
+ method public final void init(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
+ method public final void init(int);
+ method public final void init(int, java.security.SecureRandom);
+ }
+
+ public abstract class KeyGeneratorSpi {
+ ctor public KeyGeneratorSpi();
+ method protected abstract javax.crypto.SecretKey engineGenerateKey();
+ method protected abstract void engineInit(java.security.SecureRandom);
+ method protected abstract void engineInit(java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom) throws java.security.InvalidAlgorithmParameterException;
+ method protected abstract void engineInit(int, java.security.SecureRandom);
+ }
+
+ public class Mac implements java.lang.Cloneable {
+ ctor protected Mac(javax.crypto.MacSpi, java.security.Provider, java.lang.String);
+ method public final java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method public final byte[] doFinal() throws java.lang.IllegalStateException;
+ method public final void doFinal(byte[], int) throws java.lang.IllegalStateException, javax.crypto.ShortBufferException;
+ method public final byte[] doFinal(byte[]) throws java.lang.IllegalStateException;
+ method public final java.lang.String getAlgorithm();
+ method public static final javax.crypto.Mac getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.crypto.Mac getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.crypto.Mac getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final int getMacLength();
+ method public final java.security.Provider getProvider();
+ method public final void init(java.security.Key) throws java.security.InvalidKeyException;
+ method public final void init(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method public final void reset();
+ method public final void update(byte) throws java.lang.IllegalStateException;
+ method public final void update(byte[]) throws java.lang.IllegalStateException;
+ method public final void update(byte[], int, int) throws java.lang.IllegalStateException;
+ method public final void update(java.nio.ByteBuffer);
+ }
+
+ public abstract class MacSpi {
+ ctor public MacSpi();
+ method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
+ method protected abstract byte[] engineDoFinal();
+ method protected abstract int engineGetMacLength();
+ method protected abstract void engineInit(java.security.Key, java.security.spec.AlgorithmParameterSpec) throws java.security.InvalidAlgorithmParameterException, java.security.InvalidKeyException;
+ method protected abstract void engineReset();
+ method protected abstract void engineUpdate(byte);
+ method protected abstract void engineUpdate(byte[], int, int);
+ method protected void engineUpdate(java.nio.ByteBuffer);
+ }
+
+ public class NoSuchPaddingException extends java.security.GeneralSecurityException {
+ ctor public NoSuchPaddingException();
+ ctor public NoSuchPaddingException(java.lang.String);
+ }
+
+ public class NullCipher extends javax.crypto.Cipher {
+ ctor public NullCipher();
+ }
+
+ public class SealedObject implements java.io.Serializable {
+ ctor public SealedObject(java.io.Serializable, javax.crypto.Cipher) throws java.io.IOException, javax.crypto.IllegalBlockSizeException;
+ ctor protected SealedObject(javax.crypto.SealedObject);
+ method public final java.lang.String getAlgorithm();
+ method public final java.lang.Object getObject(java.security.Key) throws java.lang.ClassNotFoundException, java.io.IOException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException;
+ method public final java.lang.Object getObject(javax.crypto.Cipher) throws javax.crypto.BadPaddingException, java.lang.ClassNotFoundException, java.io.IOException, javax.crypto.IllegalBlockSizeException;
+ method public final java.lang.Object getObject(java.security.Key, java.lang.String) throws java.lang.ClassNotFoundException, java.io.IOException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ field protected byte[] encodedParams;
+ }
+
+ public abstract interface SecretKey implements java.security.Key {
+ field public static final long serialVersionUID = -4795878709595146952L; // 0xbd719db928b8f538L
+ }
+
+ public class SecretKeyFactory {
+ ctor protected SecretKeyFactory(javax.crypto.SecretKeyFactorySpi, java.security.Provider, java.lang.String);
+ method public final javax.crypto.SecretKey generateSecret(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;
+ method public final java.lang.String getAlgorithm();
+ method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.crypto.SecretKeyFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.spec.KeySpec getKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;
+ method public final java.security.Provider getProvider();
+ method public final javax.crypto.SecretKey translateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;
+ }
+
+ public abstract class SecretKeyFactorySpi {
+ ctor public SecretKeyFactorySpi();
+ method protected abstract javax.crypto.SecretKey engineGenerateSecret(java.security.spec.KeySpec) throws java.security.spec.InvalidKeySpecException;
+ method protected abstract java.security.spec.KeySpec engineGetKeySpec(javax.crypto.SecretKey, java.lang.Class) throws java.security.spec.InvalidKeySpecException;
+ method protected abstract javax.crypto.SecretKey engineTranslateKey(javax.crypto.SecretKey) throws java.security.InvalidKeyException;
+ }
+
+ public class ShortBufferException extends java.security.GeneralSecurityException {
+ ctor public ShortBufferException();
+ ctor public ShortBufferException(java.lang.String);
+ }
+
+}
+
+package javax.crypto.interfaces {
+
+ public abstract interface DHKey {
+ method public abstract javax.crypto.spec.DHParameterSpec getParams();
+ }
+
+ public abstract interface DHPrivateKey implements javax.crypto.interfaces.DHKey java.security.PrivateKey {
+ method public abstract java.math.BigInteger getX();
+ field public static final long serialVersionUID = 2211791113380396553L; // 0x1eb1dc4c8e677e09L
+ }
+
+ public abstract interface DHPublicKey implements javax.crypto.interfaces.DHKey java.security.PublicKey {
+ method public abstract java.math.BigInteger getY();
+ field public static final long serialVersionUID = -6628103563352519193L; // 0xa4043eed23df4de7L
+ }
+
+ public abstract interface PBEKey implements javax.crypto.SecretKey {
+ method public abstract int getIterationCount();
+ method public abstract char[] getPassword();
+ method public abstract byte[] getSalt();
+ field public static final long serialVersionUID = -1430015993304333921L; // 0xec279007d7f7c19fL
+ }
+
+}
+
+package javax.crypto.spec {
+
+ public class DESKeySpec implements java.security.spec.KeySpec {
+ ctor public DESKeySpec(byte[]) throws java.security.InvalidKeyException;
+ ctor public DESKeySpec(byte[], int) throws java.security.InvalidKeyException;
+ method public byte[] getKey();
+ method public static boolean isParityAdjusted(byte[], int) throws java.security.InvalidKeyException;
+ method public static boolean isWeak(byte[], int) throws java.security.InvalidKeyException;
+ field public static final int DES_KEY_LEN = 8; // 0x8
+ }
+
+ public class DESedeKeySpec implements java.security.spec.KeySpec {
+ ctor public DESedeKeySpec(byte[]) throws java.security.InvalidKeyException;
+ ctor public DESedeKeySpec(byte[], int) throws java.security.InvalidKeyException;
+ method public byte[] getKey();
+ method public static boolean isParityAdjusted(byte[], int) throws java.security.InvalidKeyException;
+ field public static final int DES_EDE_KEY_LEN = 24; // 0x18
+ }
+
+ public class DHGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public DHGenParameterSpec(int, int);
+ method public int getExponentSize();
+ method public int getPrimeSize();
+ }
+
+ public class DHParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public DHParameterSpec(java.math.BigInteger, java.math.BigInteger);
+ ctor public DHParameterSpec(java.math.BigInteger, java.math.BigInteger, int);
+ method public java.math.BigInteger getG();
+ method public int getL();
+ method public java.math.BigInteger getP();
+ }
+
+ public class DHPrivateKeySpec implements java.security.spec.KeySpec {
+ ctor public DHPrivateKeySpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getG();
+ method public java.math.BigInteger getP();
+ method public java.math.BigInteger getX();
+ }
+
+ public class DHPublicKeySpec implements java.security.spec.KeySpec {
+ ctor public DHPublicKeySpec(java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public java.math.BigInteger getG();
+ method public java.math.BigInteger getP();
+ method public java.math.BigInteger getY();
+ }
+
+ public class GCMParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public GCMParameterSpec(int, byte[]);
+ ctor public GCMParameterSpec(int, byte[], int, int);
+ method public byte[] getIV();
+ method public int getTLen();
+ }
+
+ public class IvParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public IvParameterSpec(byte[]);
+ ctor public IvParameterSpec(byte[], int, int);
+ method public byte[] getIV();
+ }
+
+ public class OAEPParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public OAEPParameterSpec(java.lang.String, java.lang.String, java.security.spec.AlgorithmParameterSpec, javax.crypto.spec.PSource);
+ method public java.lang.String getDigestAlgorithm();
+ method public java.lang.String getMGFAlgorithm();
+ method public java.security.spec.AlgorithmParameterSpec getMGFParameters();
+ method public javax.crypto.spec.PSource getPSource();
+ field public static final javax.crypto.spec.OAEPParameterSpec DEFAULT;
+ }
+
+ public class PBEKeySpec implements java.security.spec.KeySpec {
+ ctor public PBEKeySpec(char[]);
+ ctor public PBEKeySpec(char[], byte[], int, int);
+ ctor public PBEKeySpec(char[], byte[], int);
+ method public final void clearPassword();
+ method public final int getIterationCount();
+ method public final int getKeyLength();
+ method public final char[] getPassword();
+ method public final byte[] getSalt();
+ }
+
+ public class PBEParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public PBEParameterSpec(byte[], int);
+ method public int getIterationCount();
+ method public byte[] getSalt();
+ }
+
+ public class PSource {
+ ctor protected PSource(java.lang.String);
+ method public java.lang.String getAlgorithm();
+ }
+
+ public static final class PSource.PSpecified extends javax.crypto.spec.PSource {
+ ctor public PSource.PSpecified(byte[]);
+ method public byte[] getValue();
+ field public static final javax.crypto.spec.PSource.PSpecified DEFAULT;
+ }
+
+ public class RC2ParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public RC2ParameterSpec(int);
+ ctor public RC2ParameterSpec(int, byte[]);
+ ctor public RC2ParameterSpec(int, byte[], int);
+ method public int getEffectiveKeyBits();
+ method public byte[] getIV();
+ }
+
+ public class RC5ParameterSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public RC5ParameterSpec(int, int, int);
+ ctor public RC5ParameterSpec(int, int, int, byte[]);
+ ctor public RC5ParameterSpec(int, int, int, byte[], int);
+ method public byte[] getIV();
+ method public int getRounds();
+ method public int getVersion();
+ method public int getWordSize();
+ }
+
+ public class SecretKeySpec implements java.security.spec.KeySpec javax.crypto.SecretKey {
+ ctor public SecretKeySpec(byte[], java.lang.String);
+ ctor public SecretKeySpec(byte[], int, int, java.lang.String);
+ method public java.lang.String getAlgorithm();
+ method public byte[] getEncoded();
+ method public java.lang.String getFormat();
+ }
+
+}
+
+package javax.microedition.khronos.egl {
+
+ public abstract interface EGL {
+ }
+
+ public abstract interface EGL10 implements javax.microedition.khronos.egl.EGL {
+ method public abstract boolean eglChooseConfig(javax.microedition.khronos.egl.EGLDisplay, int[], javax.microedition.khronos.egl.EGLConfig[], int, int[]);
+ method public abstract boolean eglCopyBuffers(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface, java.lang.Object);
+ method public abstract javax.microedition.khronos.egl.EGLContext eglCreateContext(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, javax.microedition.khronos.egl.EGLContext, int[]);
+ method public abstract javax.microedition.khronos.egl.EGLSurface eglCreatePbufferSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, int[]);
+ method public abstract javax.microedition.khronos.egl.EGLSurface eglCreatePixmapSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, java.lang.Object, int[]);
+ method public abstract javax.microedition.khronos.egl.EGLSurface eglCreateWindowSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, java.lang.Object, int[]);
+ method public abstract boolean eglDestroyContext(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLContext);
+ method public abstract boolean eglDestroySurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface);
+ method public abstract boolean eglGetConfigAttrib(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, int, int[]);
+ method public abstract boolean eglGetConfigs(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig[], int, int[]);
+ method public abstract javax.microedition.khronos.egl.EGLContext eglGetCurrentContext();
+ method public abstract javax.microedition.khronos.egl.EGLDisplay eglGetCurrentDisplay();
+ method public abstract javax.microedition.khronos.egl.EGLSurface eglGetCurrentSurface(int);
+ method public abstract javax.microedition.khronos.egl.EGLDisplay eglGetDisplay(java.lang.Object);
+ method public abstract int eglGetError();
+ method public abstract boolean eglInitialize(javax.microedition.khronos.egl.EGLDisplay, int[]);
+ method public abstract boolean eglMakeCurrent(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface, javax.microedition.khronos.egl.EGLSurface, javax.microedition.khronos.egl.EGLContext);
+ method public abstract boolean eglQueryContext(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLContext, int, int[]);
+ method public abstract java.lang.String eglQueryString(javax.microedition.khronos.egl.EGLDisplay, int);
+ method public abstract boolean eglQuerySurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface, int, int[]);
+ method public abstract boolean eglSwapBuffers(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLSurface);
+ method public abstract boolean eglTerminate(javax.microedition.khronos.egl.EGLDisplay);
+ method public abstract boolean eglWaitGL();
+ method public abstract boolean eglWaitNative(int, java.lang.Object);
+ field public static final int EGL_ALPHA_FORMAT = 12424; // 0x3088
+ field public static final int EGL_ALPHA_MASK_SIZE = 12350; // 0x303e
+ field public static final int EGL_ALPHA_SIZE = 12321; // 0x3021
+ field public static final int EGL_BAD_ACCESS = 12290; // 0x3002
+ field public static final int EGL_BAD_ALLOC = 12291; // 0x3003
+ field public static final int EGL_BAD_ATTRIBUTE = 12292; // 0x3004
+ field public static final int EGL_BAD_CONFIG = 12293; // 0x3005
+ field public static final int EGL_BAD_CONTEXT = 12294; // 0x3006
+ field public static final int EGL_BAD_CURRENT_SURFACE = 12295; // 0x3007
+ field public static final int EGL_BAD_DISPLAY = 12296; // 0x3008
+ field public static final int EGL_BAD_MATCH = 12297; // 0x3009
+ field public static final int EGL_BAD_NATIVE_PIXMAP = 12298; // 0x300a
+ field public static final int EGL_BAD_NATIVE_WINDOW = 12299; // 0x300b
+ field public static final int EGL_BAD_PARAMETER = 12300; // 0x300c
+ field public static final int EGL_BAD_SURFACE = 12301; // 0x300d
+ field public static final int EGL_BLUE_SIZE = 12322; // 0x3022
+ field public static final int EGL_BUFFER_SIZE = 12320; // 0x3020
+ field public static final int EGL_COLORSPACE = 12423; // 0x3087
+ field public static final int EGL_COLOR_BUFFER_TYPE = 12351; // 0x303f
+ field public static final int EGL_CONFIG_CAVEAT = 12327; // 0x3027
+ field public static final int EGL_CONFIG_ID = 12328; // 0x3028
+ field public static final int EGL_CORE_NATIVE_ENGINE = 12379; // 0x305b
+ field public static final java.lang.Object EGL_DEFAULT_DISPLAY;
+ field public static final int EGL_DEPTH_SIZE = 12325; // 0x3025
+ field public static final int EGL_DONT_CARE = -1; // 0xffffffff
+ field public static final int EGL_DRAW = 12377; // 0x3059
+ field public static final int EGL_EXTENSIONS = 12373; // 0x3055
+ field public static final int EGL_GREEN_SIZE = 12323; // 0x3023
+ field public static final int EGL_HEIGHT = 12374; // 0x3056
+ field public static final int EGL_HORIZONTAL_RESOLUTION = 12432; // 0x3090
+ field public static final int EGL_LARGEST_PBUFFER = 12376; // 0x3058
+ field public static final int EGL_LEVEL = 12329; // 0x3029
+ field public static final int EGL_LUMINANCE_BUFFER = 12431; // 0x308f
+ field public static final int EGL_LUMINANCE_SIZE = 12349; // 0x303d
+ field public static final int EGL_MAX_PBUFFER_HEIGHT = 12330; // 0x302a
+ field public static final int EGL_MAX_PBUFFER_PIXELS = 12331; // 0x302b
+ field public static final int EGL_MAX_PBUFFER_WIDTH = 12332; // 0x302c
+ field public static final int EGL_NATIVE_RENDERABLE = 12333; // 0x302d
+ field public static final int EGL_NATIVE_VISUAL_ID = 12334; // 0x302e
+ field public static final int EGL_NATIVE_VISUAL_TYPE = 12335; // 0x302f
+ field public static final int EGL_NONE = 12344; // 0x3038
+ field public static final int EGL_NON_CONFORMANT_CONFIG = 12369; // 0x3051
+ field public static final int EGL_NOT_INITIALIZED = 12289; // 0x3001
+ field public static final javax.microedition.khronos.egl.EGLContext EGL_NO_CONTEXT;
+ field public static final javax.microedition.khronos.egl.EGLDisplay EGL_NO_DISPLAY;
+ field public static final javax.microedition.khronos.egl.EGLSurface EGL_NO_SURFACE;
+ field public static final int EGL_PBUFFER_BIT = 1; // 0x1
+ field public static final int EGL_PIXEL_ASPECT_RATIO = 12434; // 0x3092
+ field public static final int EGL_PIXMAP_BIT = 2; // 0x2
+ field public static final int EGL_READ = 12378; // 0x305a
+ field public static final int EGL_RED_SIZE = 12324; // 0x3024
+ field public static final int EGL_RENDERABLE_TYPE = 12352; // 0x3040
+ field public static final int EGL_RENDER_BUFFER = 12422; // 0x3086
+ field public static final int EGL_RGB_BUFFER = 12430; // 0x308e
+ field public static final int EGL_SAMPLES = 12337; // 0x3031
+ field public static final int EGL_SAMPLE_BUFFERS = 12338; // 0x3032
+ field public static final int EGL_SINGLE_BUFFER = 12421; // 0x3085
+ field public static final int EGL_SLOW_CONFIG = 12368; // 0x3050
+ field public static final int EGL_STENCIL_SIZE = 12326; // 0x3026
+ field public static final int EGL_SUCCESS = 12288; // 0x3000
+ field public static final int EGL_SURFACE_TYPE = 12339; // 0x3033
+ field public static final int EGL_TRANSPARENT_BLUE_VALUE = 12341; // 0x3035
+ field public static final int EGL_TRANSPARENT_GREEN_VALUE = 12342; // 0x3036
+ field public static final int EGL_TRANSPARENT_RED_VALUE = 12343; // 0x3037
+ field public static final int EGL_TRANSPARENT_RGB = 12370; // 0x3052
+ field public static final int EGL_TRANSPARENT_TYPE = 12340; // 0x3034
+ field public static final int EGL_VENDOR = 12371; // 0x3053
+ field public static final int EGL_VERSION = 12372; // 0x3054
+ field public static final int EGL_VERTICAL_RESOLUTION = 12433; // 0x3091
+ field public static final int EGL_WIDTH = 12375; // 0x3057
+ field public static final int EGL_WINDOW_BIT = 4; // 0x4
+ }
+
+ public abstract interface EGL11 implements javax.microedition.khronos.egl.EGL10 {
+ field public static final int EGL_CONTEXT_LOST = 12302; // 0x300e
+ }
+
+ public abstract class EGLConfig {
+ ctor public EGLConfig();
+ }
+
+ public abstract class EGLContext {
+ ctor public EGLContext();
+ method public static javax.microedition.khronos.egl.EGL getEGL();
+ method public abstract javax.microedition.khronos.opengles.GL getGL();
+ }
+
+ public abstract class EGLDisplay {
+ ctor public EGLDisplay();
+ }
+
+ public abstract class EGLSurface {
+ ctor public EGLSurface();
+ }
+
+}
+
+package javax.microedition.khronos.opengles {
+
+ public abstract interface GL {
+ }
+
+ public abstract interface GL10 implements javax.microedition.khronos.opengles.GL {
+ method public abstract void glActiveTexture(int);
+ method public abstract void glAlphaFunc(int, float);
+ method public abstract void glAlphaFuncx(int, int);
+ method public abstract void glBindTexture(int, int);
+ method public abstract void glBlendFunc(int, int);
+ method public abstract void glClear(int);
+ method public abstract void glClearColor(float, float, float, float);
+ method public abstract void glClearColorx(int, int, int, int);
+ method public abstract void glClearDepthf(float);
+ method public abstract void glClearDepthx(int);
+ method public abstract void glClearStencil(int);
+ method public abstract void glClientActiveTexture(int);
+ method public abstract void glColor4f(float, float, float, float);
+ method public abstract void glColor4x(int, int, int, int);
+ method public abstract void glColorMask(boolean, boolean, boolean, boolean);
+ method public abstract void glColorPointer(int, int, int, java.nio.Buffer);
+ method public abstract void glCompressedTexImage2D(int, int, int, int, int, int, int, java.nio.Buffer);
+ method public abstract void glCompressedTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public abstract void glCopyTexImage2D(int, int, int, int, int, int, int, int);
+ method public abstract void glCopyTexSubImage2D(int, int, int, int, int, int, int, int);
+ method public abstract void glCullFace(int);
+ method public abstract void glDeleteTextures(int, int[], int);
+ method public abstract void glDeleteTextures(int, java.nio.IntBuffer);
+ method public abstract void glDepthFunc(int);
+ method public abstract void glDepthMask(boolean);
+ method public abstract void glDepthRangef(float, float);
+ method public abstract void glDepthRangex(int, int);
+ method public abstract void glDisable(int);
+ method public abstract void glDisableClientState(int);
+ method public abstract void glDrawArrays(int, int, int);
+ method public abstract void glDrawElements(int, int, int, java.nio.Buffer);
+ method public abstract void glEnable(int);
+ method public abstract void glEnableClientState(int);
+ method public abstract void glFinish();
+ method public abstract void glFlush();
+ method public abstract void glFogf(int, float);
+ method public abstract void glFogfv(int, float[], int);
+ method public abstract void glFogfv(int, java.nio.FloatBuffer);
+ method public abstract void glFogx(int, int);
+ method public abstract void glFogxv(int, int[], int);
+ method public abstract void glFogxv(int, java.nio.IntBuffer);
+ method public abstract void glFrontFace(int);
+ method public abstract void glFrustumf(float, float, float, float, float, float);
+ method public abstract void glFrustumx(int, int, int, int, int, int);
+ method public abstract void glGenTextures(int, int[], int);
+ method public abstract void glGenTextures(int, java.nio.IntBuffer);
+ method public abstract int glGetError();
+ method public abstract void glGetIntegerv(int, int[], int);
+ method public abstract void glGetIntegerv(int, java.nio.IntBuffer);
+ method public abstract java.lang.String glGetString(int);
+ method public abstract void glHint(int, int);
+ method public abstract void glLightModelf(int, float);
+ method public abstract void glLightModelfv(int, float[], int);
+ method public abstract void glLightModelfv(int, java.nio.FloatBuffer);
+ method public abstract void glLightModelx(int, int);
+ method public abstract void glLightModelxv(int, int[], int);
+ method public abstract void glLightModelxv(int, java.nio.IntBuffer);
+ method public abstract void glLightf(int, int, float);
+ method public abstract void glLightfv(int, int, float[], int);
+ method public abstract void glLightfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glLightx(int, int, int);
+ method public abstract void glLightxv(int, int, int[], int);
+ method public abstract void glLightxv(int, int, java.nio.IntBuffer);
+ method public abstract void glLineWidth(float);
+ method public abstract void glLineWidthx(int);
+ method public abstract void glLoadIdentity();
+ method public abstract void glLoadMatrixf(float[], int);
+ method public abstract void glLoadMatrixf(java.nio.FloatBuffer);
+ method public abstract void glLoadMatrixx(int[], int);
+ method public abstract void glLoadMatrixx(java.nio.IntBuffer);
+ method public abstract void glLogicOp(int);
+ method public abstract void glMaterialf(int, int, float);
+ method public abstract void glMaterialfv(int, int, float[], int);
+ method public abstract void glMaterialfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glMaterialx(int, int, int);
+ method public abstract void glMaterialxv(int, int, int[], int);
+ method public abstract void glMaterialxv(int, int, java.nio.IntBuffer);
+ method public abstract void glMatrixMode(int);
+ method public abstract void glMultMatrixf(float[], int);
+ method public abstract void glMultMatrixf(java.nio.FloatBuffer);
+ method public abstract void glMultMatrixx(int[], int);
+ method public abstract void glMultMatrixx(java.nio.IntBuffer);
+ method public abstract void glMultiTexCoord4f(int, float, float, float, float);
+ method public abstract void glMultiTexCoord4x(int, int, int, int, int);
+ method public abstract void glNormal3f(float, float, float);
+ method public abstract void glNormal3x(int, int, int);
+ method public abstract void glNormalPointer(int, int, java.nio.Buffer);
+ method public abstract void glOrthof(float, float, float, float, float, float);
+ method public abstract void glOrthox(int, int, int, int, int, int);
+ method public abstract void glPixelStorei(int, int);
+ method public abstract void glPointSize(float);
+ method public abstract void glPointSizex(int);
+ method public abstract void glPolygonOffset(float, float);
+ method public abstract void glPolygonOffsetx(int, int);
+ method public abstract void glPopMatrix();
+ method public abstract void glPushMatrix();
+ method public abstract void glReadPixels(int, int, int, int, int, int, java.nio.Buffer);
+ method public abstract void glRotatef(float, float, float, float);
+ method public abstract void glRotatex(int, int, int, int);
+ method public abstract void glSampleCoverage(float, boolean);
+ method public abstract void glSampleCoveragex(int, boolean);
+ method public abstract void glScalef(float, float, float);
+ method public abstract void glScalex(int, int, int);
+ method public abstract void glScissor(int, int, int, int);
+ method public abstract void glShadeModel(int);
+ method public abstract void glStencilFunc(int, int, int);
+ method public abstract void glStencilMask(int);
+ method public abstract void glStencilOp(int, int, int);
+ method public abstract void glTexCoordPointer(int, int, int, java.nio.Buffer);
+ method public abstract void glTexEnvf(int, int, float);
+ method public abstract void glTexEnvfv(int, int, float[], int);
+ method public abstract void glTexEnvfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glTexEnvx(int, int, int);
+ method public abstract void glTexEnvxv(int, int, int[], int);
+ method public abstract void glTexEnvxv(int, int, java.nio.IntBuffer);
+ method public abstract void glTexImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public abstract void glTexParameterf(int, int, float);
+ method public abstract void glTexParameterx(int, int, int);
+ method public abstract void glTexSubImage2D(int, int, int, int, int, int, int, int, java.nio.Buffer);
+ method public abstract void glTranslatef(float, float, float);
+ method public abstract void glTranslatex(int, int, int);
+ method public abstract void glVertexPointer(int, int, int, java.nio.Buffer);
+ method public abstract void glViewport(int, int, int, int);
+ field public static final int GL_ADD = 260; // 0x104
+ field public static final int GL_ALIASED_LINE_WIDTH_RANGE = 33902; // 0x846e
+ field public static final int GL_ALIASED_POINT_SIZE_RANGE = 33901; // 0x846d
+ field public static final int GL_ALPHA = 6406; // 0x1906
+ field public static final int GL_ALPHA_BITS = 3413; // 0xd55
+ field public static final int GL_ALPHA_TEST = 3008; // 0xbc0
+ field public static final int GL_ALWAYS = 519; // 0x207
+ field public static final int GL_AMBIENT = 4608; // 0x1200
+ field public static final int GL_AMBIENT_AND_DIFFUSE = 5634; // 0x1602
+ field public static final int GL_AND = 5377; // 0x1501
+ field public static final int GL_AND_INVERTED = 5380; // 0x1504
+ field public static final int GL_AND_REVERSE = 5378; // 0x1502
+ field public static final int GL_BACK = 1029; // 0x405
+ field public static final int GL_BLEND = 3042; // 0xbe2
+ field public static final int GL_BLUE_BITS = 3412; // 0xd54
+ field public static final int GL_BYTE = 5120; // 0x1400
+ field public static final int GL_CCW = 2305; // 0x901
+ field public static final int GL_CLAMP_TO_EDGE = 33071; // 0x812f
+ field public static final int GL_CLEAR = 5376; // 0x1500
+ field public static final int GL_COLOR_ARRAY = 32886; // 0x8076
+ field public static final int GL_COLOR_BUFFER_BIT = 16384; // 0x4000
+ field public static final int GL_COLOR_LOGIC_OP = 3058; // 0xbf2
+ field public static final int GL_COLOR_MATERIAL = 2903; // 0xb57
+ field public static final int GL_COMPRESSED_TEXTURE_FORMATS = 34467; // 0x86a3
+ field public static final int GL_CONSTANT_ATTENUATION = 4615; // 0x1207
+ field public static final int GL_COPY = 5379; // 0x1503
+ field public static final int GL_COPY_INVERTED = 5388; // 0x150c
+ field public static final int GL_CULL_FACE = 2884; // 0xb44
+ field public static final int GL_CW = 2304; // 0x900
+ field public static final int GL_DECAL = 8449; // 0x2101
+ field public static final int GL_DECR = 7683; // 0x1e03
+ field public static final int GL_DEPTH_BITS = 3414; // 0xd56
+ field public static final int GL_DEPTH_BUFFER_BIT = 256; // 0x100
+ field public static final int GL_DEPTH_TEST = 2929; // 0xb71
+ field public static final int GL_DIFFUSE = 4609; // 0x1201
+ field public static final int GL_DITHER = 3024; // 0xbd0
+ field public static final int GL_DONT_CARE = 4352; // 0x1100
+ field public static final int GL_DST_ALPHA = 772; // 0x304
+ field public static final int GL_DST_COLOR = 774; // 0x306
+ field public static final int GL_EMISSION = 5632; // 0x1600
+ field public static final int GL_EQUAL = 514; // 0x202
+ field public static final int GL_EQUIV = 5385; // 0x1509
+ field public static final int GL_EXP = 2048; // 0x800
+ field public static final int GL_EXP2 = 2049; // 0x801
+ field public static final int GL_EXTENSIONS = 7939; // 0x1f03
+ field public static final int GL_FALSE = 0; // 0x0
+ field public static final int GL_FASTEST = 4353; // 0x1101
+ field public static final int GL_FIXED = 5132; // 0x140c
+ field public static final int GL_FLAT = 7424; // 0x1d00
+ field public static final int GL_FLOAT = 5126; // 0x1406
+ field public static final int GL_FOG = 2912; // 0xb60
+ field public static final int GL_FOG_COLOR = 2918; // 0xb66
+ field public static final int GL_FOG_DENSITY = 2914; // 0xb62
+ field public static final int GL_FOG_END = 2916; // 0xb64
+ field public static final int GL_FOG_HINT = 3156; // 0xc54
+ field public static final int GL_FOG_MODE = 2917; // 0xb65
+ field public static final int GL_FOG_START = 2915; // 0xb63
+ field public static final int GL_FRONT = 1028; // 0x404
+ field public static final int GL_FRONT_AND_BACK = 1032; // 0x408
+ field public static final int GL_GEQUAL = 518; // 0x206
+ field public static final int GL_GREATER = 516; // 0x204
+ field public static final int GL_GREEN_BITS = 3411; // 0xd53
+ field public static final int GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES = 35739; // 0x8b9b
+ field public static final int GL_IMPLEMENTATION_COLOR_READ_TYPE_OES = 35738; // 0x8b9a
+ field public static final int GL_INCR = 7682; // 0x1e02
+ field public static final int GL_INVALID_ENUM = 1280; // 0x500
+ field public static final int GL_INVALID_OPERATION = 1282; // 0x502
+ field public static final int GL_INVALID_VALUE = 1281; // 0x501
+ field public static final int GL_INVERT = 5386; // 0x150a
+ field public static final int GL_KEEP = 7680; // 0x1e00
+ field public static final int GL_LEQUAL = 515; // 0x203
+ field public static final int GL_LESS = 513; // 0x201
+ field public static final int GL_LIGHT0 = 16384; // 0x4000
+ field public static final int GL_LIGHT1 = 16385; // 0x4001
+ field public static final int GL_LIGHT2 = 16386; // 0x4002
+ field public static final int GL_LIGHT3 = 16387; // 0x4003
+ field public static final int GL_LIGHT4 = 16388; // 0x4004
+ field public static final int GL_LIGHT5 = 16389; // 0x4005
+ field public static final int GL_LIGHT6 = 16390; // 0x4006
+ field public static final int GL_LIGHT7 = 16391; // 0x4007
+ field public static final int GL_LIGHTING = 2896; // 0xb50
+ field public static final int GL_LIGHT_MODEL_AMBIENT = 2899; // 0xb53
+ field public static final int GL_LIGHT_MODEL_TWO_SIDE = 2898; // 0xb52
+ field public static final int GL_LINEAR = 9729; // 0x2601
+ field public static final int GL_LINEAR_ATTENUATION = 4616; // 0x1208
+ field public static final int GL_LINEAR_MIPMAP_LINEAR = 9987; // 0x2703
+ field public static final int GL_LINEAR_MIPMAP_NEAREST = 9985; // 0x2701
+ field public static final int GL_LINES = 1; // 0x1
+ field public static final int GL_LINE_LOOP = 2; // 0x2
+ field public static final int GL_LINE_SMOOTH = 2848; // 0xb20
+ field public static final int GL_LINE_SMOOTH_HINT = 3154; // 0xc52
+ field public static final int GL_LINE_STRIP = 3; // 0x3
+ field public static final int GL_LUMINANCE = 6409; // 0x1909
+ field public static final int GL_LUMINANCE_ALPHA = 6410; // 0x190a
+ field public static final int GL_MAX_ELEMENTS_INDICES = 33001; // 0x80e9
+ field public static final int GL_MAX_ELEMENTS_VERTICES = 33000; // 0x80e8
+ field public static final int GL_MAX_LIGHTS = 3377; // 0xd31
+ field public static final int GL_MAX_MODELVIEW_STACK_DEPTH = 3382; // 0xd36
+ field public static final int GL_MAX_PROJECTION_STACK_DEPTH = 3384; // 0xd38
+ field public static final int GL_MAX_TEXTURE_SIZE = 3379; // 0xd33
+ field public static final int GL_MAX_TEXTURE_STACK_DEPTH = 3385; // 0xd39
+ field public static final int GL_MAX_TEXTURE_UNITS = 34018; // 0x84e2
+ field public static final int GL_MAX_VIEWPORT_DIMS = 3386; // 0xd3a
+ field public static final int GL_MODELVIEW = 5888; // 0x1700
+ field public static final int GL_MODULATE = 8448; // 0x2100
+ field public static final int GL_MULTISAMPLE = 32925; // 0x809d
+ field public static final int GL_NAND = 5390; // 0x150e
+ field public static final int GL_NEAREST = 9728; // 0x2600
+ field public static final int GL_NEAREST_MIPMAP_LINEAR = 9986; // 0x2702
+ field public static final int GL_NEAREST_MIPMAP_NEAREST = 9984; // 0x2700
+ field public static final int GL_NEVER = 512; // 0x200
+ field public static final int GL_NICEST = 4354; // 0x1102
+ field public static final int GL_NOOP = 5381; // 0x1505
+ field public static final int GL_NOR = 5384; // 0x1508
+ field public static final int GL_NORMALIZE = 2977; // 0xba1
+ field public static final int GL_NORMAL_ARRAY = 32885; // 0x8075
+ field public static final int GL_NOTEQUAL = 517; // 0x205
+ field public static final int GL_NO_ERROR = 0; // 0x0
+ field public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 34466; // 0x86a2
+ field public static final int GL_ONE = 1; // 0x1
+ field public static final int GL_ONE_MINUS_DST_ALPHA = 773; // 0x305
+ field public static final int GL_ONE_MINUS_DST_COLOR = 775; // 0x307
+ field public static final int GL_ONE_MINUS_SRC_ALPHA = 771; // 0x303
+ field public static final int GL_ONE_MINUS_SRC_COLOR = 769; // 0x301
+ field public static final int GL_OR = 5383; // 0x1507
+ field public static final int GL_OR_INVERTED = 5389; // 0x150d
+ field public static final int GL_OR_REVERSE = 5387; // 0x150b
+ field public static final int GL_OUT_OF_MEMORY = 1285; // 0x505
+ field public static final int GL_PACK_ALIGNMENT = 3333; // 0xd05
+ field public static final int GL_PALETTE4_R5_G6_B5_OES = 35730; // 0x8b92
+ field public static final int GL_PALETTE4_RGB5_A1_OES = 35732; // 0x8b94
+ field public static final int GL_PALETTE4_RGB8_OES = 35728; // 0x8b90
+ field public static final int GL_PALETTE4_RGBA4_OES = 35731; // 0x8b93
+ field public static final int GL_PALETTE4_RGBA8_OES = 35729; // 0x8b91
+ field public static final int GL_PALETTE8_R5_G6_B5_OES = 35735; // 0x8b97
+ field public static final int GL_PALETTE8_RGB5_A1_OES = 35737; // 0x8b99
+ field public static final int GL_PALETTE8_RGB8_OES = 35733; // 0x8b95
+ field public static final int GL_PALETTE8_RGBA4_OES = 35736; // 0x8b98
+ field public static final int GL_PALETTE8_RGBA8_OES = 35734; // 0x8b96
+ field public static final int GL_PERSPECTIVE_CORRECTION_HINT = 3152; // 0xc50
+ field public static final int GL_POINTS = 0; // 0x0
+ field public static final int GL_POINT_FADE_THRESHOLD_SIZE = 33064; // 0x8128
+ field public static final int GL_POINT_SIZE = 2833; // 0xb11
+ field public static final int GL_POINT_SMOOTH = 2832; // 0xb10
+ field public static final int GL_POINT_SMOOTH_HINT = 3153; // 0xc51
+ field public static final int GL_POLYGON_OFFSET_FILL = 32823; // 0x8037
+ field public static final int GL_POLYGON_SMOOTH_HINT = 3155; // 0xc53
+ field public static final int GL_POSITION = 4611; // 0x1203
+ field public static final int GL_PROJECTION = 5889; // 0x1701
+ field public static final int GL_QUADRATIC_ATTENUATION = 4617; // 0x1209
+ field public static final int GL_RED_BITS = 3410; // 0xd52
+ field public static final int GL_RENDERER = 7937; // 0x1f01
+ field public static final int GL_REPEAT = 10497; // 0x2901
+ field public static final int GL_REPLACE = 7681; // 0x1e01
+ field public static final int GL_RESCALE_NORMAL = 32826; // 0x803a
+ field public static final int GL_RGB = 6407; // 0x1907
+ field public static final int GL_RGBA = 6408; // 0x1908
+ field public static final int GL_SAMPLE_ALPHA_TO_COVERAGE = 32926; // 0x809e
+ field public static final int GL_SAMPLE_ALPHA_TO_ONE = 32927; // 0x809f
+ field public static final int GL_SAMPLE_COVERAGE = 32928; // 0x80a0
+ field public static final int GL_SCISSOR_TEST = 3089; // 0xc11
+ field public static final int GL_SET = 5391; // 0x150f
+ field public static final int GL_SHININESS = 5633; // 0x1601
+ field public static final int GL_SHORT = 5122; // 0x1402
+ field public static final int GL_SMOOTH = 7425; // 0x1d01
+ field public static final int GL_SMOOTH_LINE_WIDTH_RANGE = 2850; // 0xb22
+ field public static final int GL_SMOOTH_POINT_SIZE_RANGE = 2834; // 0xb12
+ field public static final int GL_SPECULAR = 4610; // 0x1202
+ field public static final int GL_SPOT_CUTOFF = 4614; // 0x1206
+ field public static final int GL_SPOT_DIRECTION = 4612; // 0x1204
+ field public static final int GL_SPOT_EXPONENT = 4613; // 0x1205
+ field public static final int GL_SRC_ALPHA = 770; // 0x302
+ field public static final int GL_SRC_ALPHA_SATURATE = 776; // 0x308
+ field public static final int GL_SRC_COLOR = 768; // 0x300
+ field public static final int GL_STACK_OVERFLOW = 1283; // 0x503
+ field public static final int GL_STACK_UNDERFLOW = 1284; // 0x504
+ field public static final int GL_STENCIL_BITS = 3415; // 0xd57
+ field public static final int GL_STENCIL_BUFFER_BIT = 1024; // 0x400
+ field public static final int GL_STENCIL_TEST = 2960; // 0xb90
+ field public static final int GL_SUBPIXEL_BITS = 3408; // 0xd50
+ field public static final int GL_TEXTURE = 5890; // 0x1702
+ field public static final int GL_TEXTURE0 = 33984; // 0x84c0
+ field public static final int GL_TEXTURE1 = 33985; // 0x84c1
+ field public static final int GL_TEXTURE10 = 33994; // 0x84ca
+ field public static final int GL_TEXTURE11 = 33995; // 0x84cb
+ field public static final int GL_TEXTURE12 = 33996; // 0x84cc
+ field public static final int GL_TEXTURE13 = 33997; // 0x84cd
+ field public static final int GL_TEXTURE14 = 33998; // 0x84ce
+ field public static final int GL_TEXTURE15 = 33999; // 0x84cf
+ field public static final int GL_TEXTURE16 = 34000; // 0x84d0
+ field public static final int GL_TEXTURE17 = 34001; // 0x84d1
+ field public static final int GL_TEXTURE18 = 34002; // 0x84d2
+ field public static final int GL_TEXTURE19 = 34003; // 0x84d3
+ field public static final int GL_TEXTURE2 = 33986; // 0x84c2
+ field public static final int GL_TEXTURE20 = 34004; // 0x84d4
+ field public static final int GL_TEXTURE21 = 34005; // 0x84d5
+ field public static final int GL_TEXTURE22 = 34006; // 0x84d6
+ field public static final int GL_TEXTURE23 = 34007; // 0x84d7
+ field public static final int GL_TEXTURE24 = 34008; // 0x84d8
+ field public static final int GL_TEXTURE25 = 34009; // 0x84d9
+ field public static final int GL_TEXTURE26 = 34010; // 0x84da
+ field public static final int GL_TEXTURE27 = 34011; // 0x84db
+ field public static final int GL_TEXTURE28 = 34012; // 0x84dc
+ field public static final int GL_TEXTURE29 = 34013; // 0x84dd
+ field public static final int GL_TEXTURE3 = 33987; // 0x84c3
+ field public static final int GL_TEXTURE30 = 34014; // 0x84de
+ field public static final int GL_TEXTURE31 = 34015; // 0x84df
+ field public static final int GL_TEXTURE4 = 33988; // 0x84c4
+ field public static final int GL_TEXTURE5 = 33989; // 0x84c5
+ field public static final int GL_TEXTURE6 = 33990; // 0x84c6
+ field public static final int GL_TEXTURE7 = 33991; // 0x84c7
+ field public static final int GL_TEXTURE8 = 33992; // 0x84c8
+ field public static final int GL_TEXTURE9 = 33993; // 0x84c9
+ field public static final int GL_TEXTURE_2D = 3553; // 0xde1
+ field public static final int GL_TEXTURE_COORD_ARRAY = 32888; // 0x8078
+ field public static final int GL_TEXTURE_ENV = 8960; // 0x2300
+ field public static final int GL_TEXTURE_ENV_COLOR = 8705; // 0x2201
+ field public static final int GL_TEXTURE_ENV_MODE = 8704; // 0x2200
+ field public static final int GL_TEXTURE_MAG_FILTER = 10240; // 0x2800
+ field public static final int GL_TEXTURE_MIN_FILTER = 10241; // 0x2801
+ field public static final int GL_TEXTURE_WRAP_S = 10242; // 0x2802
+ field public static final int GL_TEXTURE_WRAP_T = 10243; // 0x2803
+ field public static final int GL_TRIANGLES = 4; // 0x4
+ field public static final int GL_TRIANGLE_FAN = 6; // 0x6
+ field public static final int GL_TRIANGLE_STRIP = 5; // 0x5
+ field public static final int GL_TRUE = 1; // 0x1
+ field public static final int GL_UNPACK_ALIGNMENT = 3317; // 0xcf5
+ field public static final int GL_UNSIGNED_BYTE = 5121; // 0x1401
+ field public static final int GL_UNSIGNED_SHORT = 5123; // 0x1403
+ field public static final int GL_UNSIGNED_SHORT_4_4_4_4 = 32819; // 0x8033
+ field public static final int GL_UNSIGNED_SHORT_5_5_5_1 = 32820; // 0x8034
+ field public static final int GL_UNSIGNED_SHORT_5_6_5 = 33635; // 0x8363
+ field public static final int GL_VENDOR = 7936; // 0x1f00
+ field public static final int GL_VERSION = 7938; // 0x1f02
+ field public static final int GL_VERTEX_ARRAY = 32884; // 0x8074
+ field public static final int GL_XOR = 5382; // 0x1506
+ field public static final int GL_ZERO = 0; // 0x0
+ }
+
+ public abstract interface GL10Ext implements javax.microedition.khronos.opengles.GL {
+ method public abstract int glQueryMatrixxOES(int[], int, int[], int);
+ method public abstract int glQueryMatrixxOES(java.nio.IntBuffer, java.nio.IntBuffer);
+ }
+
+ public abstract interface GL11 implements javax.microedition.khronos.opengles.GL10 {
+ method public abstract void glBindBuffer(int, int);
+ method public abstract void glBufferData(int, int, java.nio.Buffer, int);
+ method public abstract void glBufferSubData(int, int, int, java.nio.Buffer);
+ method public abstract void glClipPlanef(int, float[], int);
+ method public abstract void glClipPlanef(int, java.nio.FloatBuffer);
+ method public abstract void glClipPlanex(int, int[], int);
+ method public abstract void glClipPlanex(int, java.nio.IntBuffer);
+ method public abstract void glColor4ub(byte, byte, byte, byte);
+ method public abstract void glColorPointer(int, int, int, int);
+ method public abstract void glDeleteBuffers(int, int[], int);
+ method public abstract void glDeleteBuffers(int, java.nio.IntBuffer);
+ method public abstract void glDrawElements(int, int, int, int);
+ method public abstract void glGenBuffers(int, int[], int);
+ method public abstract void glGenBuffers(int, java.nio.IntBuffer);
+ method public abstract void glGetBooleanv(int, boolean[], int);
+ method public abstract void glGetBooleanv(int, java.nio.IntBuffer);
+ method public abstract void glGetBufferParameteriv(int, int, int[], int);
+ method public abstract void glGetBufferParameteriv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetClipPlanef(int, float[], int);
+ method public abstract void glGetClipPlanef(int, java.nio.FloatBuffer);
+ method public abstract void glGetClipPlanex(int, int[], int);
+ method public abstract void glGetClipPlanex(int, java.nio.IntBuffer);
+ method public abstract void glGetFixedv(int, int[], int);
+ method public abstract void glGetFixedv(int, java.nio.IntBuffer);
+ method public abstract void glGetFloatv(int, float[], int);
+ method public abstract void glGetFloatv(int, java.nio.FloatBuffer);
+ method public abstract void glGetLightfv(int, int, float[], int);
+ method public abstract void glGetLightfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glGetLightxv(int, int, int[], int);
+ method public abstract void glGetLightxv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetMaterialfv(int, int, float[], int);
+ method public abstract void glGetMaterialfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glGetMaterialxv(int, int, int[], int);
+ method public abstract void glGetMaterialxv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetPointerv(int, java.nio.Buffer[]);
+ method public abstract void glGetTexEnviv(int, int, int[], int);
+ method public abstract void glGetTexEnviv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetTexEnvxv(int, int, int[], int);
+ method public abstract void glGetTexEnvxv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetTexParameterfv(int, int, float[], int);
+ method public abstract void glGetTexParameterfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glGetTexParameteriv(int, int, int[], int);
+ method public abstract void glGetTexParameteriv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetTexParameterxv(int, int, int[], int);
+ method public abstract void glGetTexParameterxv(int, int, java.nio.IntBuffer);
+ method public abstract boolean glIsBuffer(int);
+ method public abstract boolean glIsEnabled(int);
+ method public abstract boolean glIsTexture(int);
+ method public abstract void glNormalPointer(int, int, int);
+ method public abstract void glPointParameterf(int, float);
+ method public abstract void glPointParameterfv(int, float[], int);
+ method public abstract void glPointParameterfv(int, java.nio.FloatBuffer);
+ method public abstract void glPointParameterx(int, int);
+ method public abstract void glPointParameterxv(int, int[], int);
+ method public abstract void glPointParameterxv(int, java.nio.IntBuffer);
+ method public abstract void glPointSizePointerOES(int, int, java.nio.Buffer);
+ method public abstract void glTexCoordPointer(int, int, int, int);
+ method public abstract void glTexEnvi(int, int, int);
+ method public abstract void glTexEnviv(int, int, int[], int);
+ method public abstract void glTexEnviv(int, int, java.nio.IntBuffer);
+ method public abstract void glTexParameterfv(int, int, float[], int);
+ method public abstract void glTexParameterfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glTexParameteri(int, int, int);
+ method public abstract void glTexParameteriv(int, int, int[], int);
+ method public abstract void glTexParameteriv(int, int, java.nio.IntBuffer);
+ method public abstract void glTexParameterxv(int, int, int[], int);
+ method public abstract void glTexParameterxv(int, int, java.nio.IntBuffer);
+ method public abstract void glVertexPointer(int, int, int, int);
+ field public static final int GL_ACTIVE_TEXTURE = 34016; // 0x84e0
+ field public static final int GL_ADD_SIGNED = 34164; // 0x8574
+ field public static final int GL_ALPHA_SCALE = 3356; // 0xd1c
+ field public static final int GL_ALPHA_TEST_FUNC = 3009; // 0xbc1
+ field public static final int GL_ALPHA_TEST_REF = 3010; // 0xbc2
+ field public static final int GL_ARRAY_BUFFER = 34962; // 0x8892
+ field public static final int GL_ARRAY_BUFFER_BINDING = 34964; // 0x8894
+ field public static final int GL_BLEND_DST = 3040; // 0xbe0
+ field public static final int GL_BLEND_SRC = 3041; // 0xbe1
+ field public static final int GL_BUFFER_ACCESS = 35003; // 0x88bb
+ field public static final int GL_BUFFER_SIZE = 34660; // 0x8764
+ field public static final int GL_BUFFER_USAGE = 34661; // 0x8765
+ field public static final int GL_CLIENT_ACTIVE_TEXTURE = 34017; // 0x84e1
+ field public static final int GL_CLIP_PLANE0 = 12288; // 0x3000
+ field public static final int GL_CLIP_PLANE1 = 12289; // 0x3001
+ field public static final int GL_CLIP_PLANE2 = 12290; // 0x3002
+ field public static final int GL_CLIP_PLANE3 = 12291; // 0x3003
+ field public static final int GL_CLIP_PLANE4 = 12292; // 0x3004
+ field public static final int GL_CLIP_PLANE5 = 12293; // 0x3005
+ field public static final int GL_COLOR_ARRAY_BUFFER_BINDING = 34968; // 0x8898
+ field public static final int GL_COLOR_ARRAY_POINTER = 32912; // 0x8090
+ field public static final int GL_COLOR_ARRAY_SIZE = 32897; // 0x8081
+ field public static final int GL_COLOR_ARRAY_STRIDE = 32899; // 0x8083
+ field public static final int GL_COLOR_ARRAY_TYPE = 32898; // 0x8082
+ field public static final int GL_COLOR_CLEAR_VALUE = 3106; // 0xc22
+ field public static final int GL_COLOR_WRITEMASK = 3107; // 0xc23
+ field public static final int GL_COMBINE = 34160; // 0x8570
+ field public static final int GL_COMBINE_ALPHA = 34162; // 0x8572
+ field public static final int GL_COMBINE_RGB = 34161; // 0x8571
+ field public static final int GL_CONSTANT = 34166; // 0x8576
+ field public static final int GL_COORD_REPLACE_OES = 34914; // 0x8862
+ field public static final int GL_CULL_FACE_MODE = 2885; // 0xb45
+ field public static final int GL_CURRENT_COLOR = 2816; // 0xb00
+ field public static final int GL_CURRENT_NORMAL = 2818; // 0xb02
+ field public static final int GL_CURRENT_TEXTURE_COORDS = 2819; // 0xb03
+ field public static final int GL_DEPTH_CLEAR_VALUE = 2931; // 0xb73
+ field public static final int GL_DEPTH_FUNC = 2932; // 0xb74
+ field public static final int GL_DEPTH_RANGE = 2928; // 0xb70
+ field public static final int GL_DEPTH_WRITEMASK = 2930; // 0xb72
+ field public static final int GL_DOT3_RGB = 34478; // 0x86ae
+ field public static final int GL_DOT3_RGBA = 34479; // 0x86af
+ field public static final int GL_DYNAMIC_DRAW = 35048; // 0x88e8
+ field public static final int GL_ELEMENT_ARRAY_BUFFER = 34963; // 0x8893
+ field public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING = 34965; // 0x8895
+ field public static final int GL_FRONT_FACE = 2886; // 0xb46
+ field public static final int GL_GENERATE_MIPMAP = 33169; // 0x8191
+ field public static final int GL_GENERATE_MIPMAP_HINT = 33170; // 0x8192
+ field public static final int GL_INTERPOLATE = 34165; // 0x8575
+ field public static final int GL_LINE_WIDTH = 2849; // 0xb21
+ field public static final int GL_LOGIC_OP_MODE = 3056; // 0xbf0
+ field public static final int GL_MATRIX_MODE = 2976; // 0xba0
+ field public static final int GL_MAX_CLIP_PLANES = 3378; // 0xd32
+ field public static final int GL_MODELVIEW_MATRIX = 2982; // 0xba6
+ field public static final int GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES = 35213; // 0x898d
+ field public static final int GL_MODELVIEW_STACK_DEPTH = 2979; // 0xba3
+ field public static final int GL_NORMAL_ARRAY_BUFFER_BINDING = 34967; // 0x8897
+ field public static final int GL_NORMAL_ARRAY_POINTER = 32911; // 0x808f
+ field public static final int GL_NORMAL_ARRAY_STRIDE = 32895; // 0x807f
+ field public static final int GL_NORMAL_ARRAY_TYPE = 32894; // 0x807e
+ field public static final int GL_OPERAND0_ALPHA = 34200; // 0x8598
+ field public static final int GL_OPERAND0_RGB = 34192; // 0x8590
+ field public static final int GL_OPERAND1_ALPHA = 34201; // 0x8599
+ field public static final int GL_OPERAND1_RGB = 34193; // 0x8591
+ field public static final int GL_OPERAND2_ALPHA = 34202; // 0x859a
+ field public static final int GL_OPERAND2_RGB = 34194; // 0x8592
+ field public static final int GL_POINT_DISTANCE_ATTENUATION = 33065; // 0x8129
+ field public static final int GL_POINT_FADE_THRESHOLD_SIZE = 33064; // 0x8128
+ field public static final int GL_POINT_SIZE = 2833; // 0xb11
+ field public static final int GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES = 35743; // 0x8b9f
+ field public static final int GL_POINT_SIZE_ARRAY_OES = 35740; // 0x8b9c
+ field public static final int GL_POINT_SIZE_ARRAY_POINTER_OES = 35212; // 0x898c
+ field public static final int GL_POINT_SIZE_ARRAY_STRIDE_OES = 35211; // 0x898b
+ field public static final int GL_POINT_SIZE_ARRAY_TYPE_OES = 35210; // 0x898a
+ field public static final int GL_POINT_SIZE_MAX = 33063; // 0x8127
+ field public static final int GL_POINT_SIZE_MIN = 33062; // 0x8126
+ field public static final int GL_POINT_SPRITE_OES = 34913; // 0x8861
+ field public static final int GL_POLYGON_OFFSET_FACTOR = 32824; // 0x8038
+ field public static final int GL_POLYGON_OFFSET_UNITS = 10752; // 0x2a00
+ field public static final int GL_PREVIOUS = 34168; // 0x8578
+ field public static final int GL_PRIMARY_COLOR = 34167; // 0x8577
+ field public static final int GL_PROJECTION_MATRIX = 2983; // 0xba7
+ field public static final int GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES = 35214; // 0x898e
+ field public static final int GL_PROJECTION_STACK_DEPTH = 2980; // 0xba4
+ field public static final int GL_RGB_SCALE = 34163; // 0x8573
+ field public static final int GL_SAMPLES = 32937; // 0x80a9
+ field public static final int GL_SAMPLE_BUFFERS = 32936; // 0x80a8
+ field public static final int GL_SAMPLE_COVERAGE_INVERT = 32939; // 0x80ab
+ field public static final int GL_SAMPLE_COVERAGE_VALUE = 32938; // 0x80aa
+ field public static final int GL_SCISSOR_BOX = 3088; // 0xc10
+ field public static final int GL_SHADE_MODEL = 2900; // 0xb54
+ field public static final int GL_SRC0_ALPHA = 34184; // 0x8588
+ field public static final int GL_SRC0_RGB = 34176; // 0x8580
+ field public static final int GL_SRC1_ALPHA = 34185; // 0x8589
+ field public static final int GL_SRC1_RGB = 34177; // 0x8581
+ field public static final int GL_SRC2_ALPHA = 34186; // 0x858a
+ field public static final int GL_SRC2_RGB = 34178; // 0x8582
+ field public static final int GL_STATIC_DRAW = 35044; // 0x88e4
+ field public static final int GL_STENCIL_CLEAR_VALUE = 2961; // 0xb91
+ field public static final int GL_STENCIL_FAIL = 2964; // 0xb94
+ field public static final int GL_STENCIL_FUNC = 2962; // 0xb92
+ field public static final int GL_STENCIL_PASS_DEPTH_FAIL = 2965; // 0xb95
+ field public static final int GL_STENCIL_PASS_DEPTH_PASS = 2966; // 0xb96
+ field public static final int GL_STENCIL_REF = 2967; // 0xb97
+ field public static final int GL_STENCIL_VALUE_MASK = 2963; // 0xb93
+ field public static final int GL_STENCIL_WRITEMASK = 2968; // 0xb98
+ field public static final int GL_SUBTRACT = 34023; // 0x84e7
+ field public static final int GL_TEXTURE_BINDING_2D = 32873; // 0x8069
+ field public static final int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 34970; // 0x889a
+ field public static final int GL_TEXTURE_COORD_ARRAY_POINTER = 32914; // 0x8092
+ field public static final int GL_TEXTURE_COORD_ARRAY_SIZE = 32904; // 0x8088
+ field public static final int GL_TEXTURE_COORD_ARRAY_STRIDE = 32906; // 0x808a
+ field public static final int GL_TEXTURE_COORD_ARRAY_TYPE = 32905; // 0x8089
+ field public static final int GL_TEXTURE_MATRIX = 2984; // 0xba8
+ field public static final int GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES = 35215; // 0x898f
+ field public static final int GL_TEXTURE_STACK_DEPTH = 2981; // 0xba5
+ field public static final int GL_VERTEX_ARRAY_BUFFER_BINDING = 34966; // 0x8896
+ field public static final int GL_VERTEX_ARRAY_POINTER = 32910; // 0x808e
+ field public static final int GL_VERTEX_ARRAY_SIZE = 32890; // 0x807a
+ field public static final int GL_VERTEX_ARRAY_STRIDE = 32892; // 0x807c
+ field public static final int GL_VERTEX_ARRAY_TYPE = 32891; // 0x807b
+ field public static final int GL_VIEWPORT = 2978; // 0xba2
+ field public static final int GL_WRITE_ONLY = 35001; // 0x88b9
+ }
+
+ public abstract interface GL11Ext implements javax.microedition.khronos.opengles.GL {
+ method public abstract void glCurrentPaletteMatrixOES(int);
+ method public abstract void glDrawTexfOES(float, float, float, float, float);
+ method public abstract void glDrawTexfvOES(float[], int);
+ method public abstract void glDrawTexfvOES(java.nio.FloatBuffer);
+ method public abstract void glDrawTexiOES(int, int, int, int, int);
+ method public abstract void glDrawTexivOES(int[], int);
+ method public abstract void glDrawTexivOES(java.nio.IntBuffer);
+ method public abstract void glDrawTexsOES(short, short, short, short, short);
+ method public abstract void glDrawTexsvOES(short[], int);
+ method public abstract void glDrawTexsvOES(java.nio.ShortBuffer);
+ method public abstract void glDrawTexxOES(int, int, int, int, int);
+ method public abstract void glDrawTexxvOES(int[], int);
+ method public abstract void glDrawTexxvOES(java.nio.IntBuffer);
+ method public abstract void glEnable(int);
+ method public abstract void glEnableClientState(int);
+ method public abstract void glLoadPaletteFromModelViewMatrixOES();
+ method public abstract void glMatrixIndexPointerOES(int, int, int, java.nio.Buffer);
+ method public abstract void glMatrixIndexPointerOES(int, int, int, int);
+ method public abstract void glTexParameterfv(int, int, float[], int);
+ method public abstract void glWeightPointerOES(int, int, int, java.nio.Buffer);
+ method public abstract void glWeightPointerOES(int, int, int, int);
+ field public static final int GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES = 35742; // 0x8b9e
+ field public static final int GL_MATRIX_INDEX_ARRAY_OES = 34884; // 0x8844
+ field public static final int GL_MATRIX_INDEX_ARRAY_POINTER_OES = 34889; // 0x8849
+ field public static final int GL_MATRIX_INDEX_ARRAY_SIZE_OES = 34886; // 0x8846
+ field public static final int GL_MATRIX_INDEX_ARRAY_STRIDE_OES = 34888; // 0x8848
+ field public static final int GL_MATRIX_INDEX_ARRAY_TYPE_OES = 34887; // 0x8847
+ field public static final int GL_MATRIX_PALETTE_OES = 34880; // 0x8840
+ field public static final int GL_MAX_PALETTE_MATRICES_OES = 34882; // 0x8842
+ field public static final int GL_MAX_VERTEX_UNITS_OES = 34468; // 0x86a4
+ field public static final int GL_TEXTURE_CROP_RECT_OES = 35741; // 0x8b9d
+ field public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_OES = 34974; // 0x889e
+ field public static final int GL_WEIGHT_ARRAY_OES = 34477; // 0x86ad
+ field public static final int GL_WEIGHT_ARRAY_POINTER_OES = 34476; // 0x86ac
+ field public static final int GL_WEIGHT_ARRAY_SIZE_OES = 34475; // 0x86ab
+ field public static final int GL_WEIGHT_ARRAY_STRIDE_OES = 34474; // 0x86aa
+ field public static final int GL_WEIGHT_ARRAY_TYPE_OES = 34473; // 0x86a9
+ }
+
+ public abstract interface GL11ExtensionPack implements javax.microedition.khronos.opengles.GL {
+ method public abstract void glBindFramebufferOES(int, int);
+ method public abstract void glBindRenderbufferOES(int, int);
+ method public abstract void glBindTexture(int, int);
+ method public abstract void glBlendEquation(int);
+ method public abstract void glBlendEquationSeparate(int, int);
+ method public abstract void glBlendFuncSeparate(int, int, int, int);
+ method public abstract int glCheckFramebufferStatusOES(int);
+ method public abstract void glCompressedTexImage2D(int, int, int, int, int, int, int, java.nio.Buffer);
+ method public abstract void glCopyTexImage2D(int, int, int, int, int, int, int, int);
+ method public abstract void glDeleteFramebuffersOES(int, int[], int);
+ method public abstract void glDeleteFramebuffersOES(int, java.nio.IntBuffer);
+ method public abstract void glDeleteRenderbuffersOES(int, int[], int);
+ method public abstract void glDeleteRenderbuffersOES(int, java.nio.IntBuffer);
+ method public abstract void glEnable(int);
+ method public abstract void glFramebufferRenderbufferOES(int, int, int, int);
+ method public abstract void glFramebufferTexture2DOES(int, int, int, int, int);
+ method public abstract void glGenFramebuffersOES(int, int[], int);
+ method public abstract void glGenFramebuffersOES(int, java.nio.IntBuffer);
+ method public abstract void glGenRenderbuffersOES(int, int[], int);
+ method public abstract void glGenRenderbuffersOES(int, java.nio.IntBuffer);
+ method public abstract void glGenerateMipmapOES(int);
+ method public abstract void glGetFramebufferAttachmentParameterivOES(int, int, int, int[], int);
+ method public abstract void glGetFramebufferAttachmentParameterivOES(int, int, int, java.nio.IntBuffer);
+ method public abstract void glGetIntegerv(int, int[], int);
+ method public abstract void glGetIntegerv(int, java.nio.IntBuffer);
+ method public abstract void glGetRenderbufferParameterivOES(int, int, int[], int);
+ method public abstract void glGetRenderbufferParameterivOES(int, int, java.nio.IntBuffer);
+ method public abstract void glGetTexGenfv(int, int, float[], int);
+ method public abstract void glGetTexGenfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glGetTexGeniv(int, int, int[], int);
+ method public abstract void glGetTexGeniv(int, int, java.nio.IntBuffer);
+ method public abstract void glGetTexGenxv(int, int, int[], int);
+ method public abstract void glGetTexGenxv(int, int, java.nio.IntBuffer);
+ method public abstract boolean glIsFramebufferOES(int);
+ method public abstract boolean glIsRenderbufferOES(int);
+ method public abstract void glRenderbufferStorageOES(int, int, int, int);
+ method public abstract void glStencilOp(int, int, int);
+ method public abstract void glTexEnvf(int, int, float);
+ method public abstract void glTexEnvfv(int, int, float[], int);
+ method public abstract void glTexEnvfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glTexEnvx(int, int, int);
+ method public abstract void glTexEnvxv(int, int, int[], int);
+ method public abstract void glTexEnvxv(int, int, java.nio.IntBuffer);
+ method public abstract void glTexGenf(int, int, float);
+ method public abstract void glTexGenfv(int, int, float[], int);
+ method public abstract void glTexGenfv(int, int, java.nio.FloatBuffer);
+ method public abstract void glTexGeni(int, int, int);
+ method public abstract void glTexGeniv(int, int, int[], int);
+ method public abstract void glTexGeniv(int, int, java.nio.IntBuffer);
+ method public abstract void glTexGenx(int, int, int);
+ method public abstract void glTexGenxv(int, int, int[], int);
+ method public abstract void glTexGenxv(int, int, java.nio.IntBuffer);
+ method public abstract void glTexParameterf(int, int, float);
+ field public static final int GL_BLEND_DST_ALPHA = 32970; // 0x80ca
+ field public static final int GL_BLEND_DST_RGB = 32968; // 0x80c8
+ field public static final int GL_BLEND_EQUATION = 32777; // 0x8009
+ field public static final int GL_BLEND_EQUATION_ALPHA = 34877; // 0x883d
+ field public static final int GL_BLEND_EQUATION_RGB = 32777; // 0x8009
+ field public static final int GL_BLEND_SRC_ALPHA = 32971; // 0x80cb
+ field public static final int GL_BLEND_SRC_RGB = 32969; // 0x80c9
+ field public static final int GL_COLOR_ATTACHMENT0_OES = 36064; // 0x8ce0
+ field public static final int GL_COLOR_ATTACHMENT10_OES = 36074; // 0x8cea
+ field public static final int GL_COLOR_ATTACHMENT11_OES = 36075; // 0x8ceb
+ field public static final int GL_COLOR_ATTACHMENT12_OES = 36076; // 0x8cec
+ field public static final int GL_COLOR_ATTACHMENT13_OES = 36077; // 0x8ced
+ field public static final int GL_COLOR_ATTACHMENT14_OES = 36078; // 0x8cee
+ field public static final int GL_COLOR_ATTACHMENT15_OES = 36079; // 0x8cef
+ field public static final int GL_COLOR_ATTACHMENT1_OES = 36065; // 0x8ce1
+ field public static final int GL_COLOR_ATTACHMENT2_OES = 36066; // 0x8ce2
+ field public static final int GL_COLOR_ATTACHMENT3_OES = 36067; // 0x8ce3
+ field public static final int GL_COLOR_ATTACHMENT4_OES = 36068; // 0x8ce4
+ field public static final int GL_COLOR_ATTACHMENT5_OES = 36069; // 0x8ce5
+ field public static final int GL_COLOR_ATTACHMENT6_OES = 36070; // 0x8ce6
+ field public static final int GL_COLOR_ATTACHMENT7_OES = 36071; // 0x8ce7
+ field public static final int GL_COLOR_ATTACHMENT8_OES = 36072; // 0x8ce8
+ field public static final int GL_COLOR_ATTACHMENT9_OES = 36073; // 0x8ce9
+ field public static final int GL_DECR_WRAP = 34056; // 0x8508
+ field public static final int GL_DEPTH_ATTACHMENT_OES = 36096; // 0x8d00
+ field public static final int GL_DEPTH_COMPONENT = 6402; // 0x1902
+ field public static final int GL_DEPTH_COMPONENT16 = 33189; // 0x81a5
+ field public static final int GL_DEPTH_COMPONENT24 = 33190; // 0x81a6
+ field public static final int GL_DEPTH_COMPONENT32 = 33191; // 0x81a7
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES = 36049; // 0x8cd1
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES = 36048; // 0x8cd0
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES = 36051; // 0x8cd3
+ field public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES = 36050; // 0x8cd2
+ field public static final int GL_FRAMEBUFFER_BINDING_OES = 36006; // 0x8ca6
+ field public static final int GL_FRAMEBUFFER_COMPLETE_OES = 36053; // 0x8cd5
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES = 36054; // 0x8cd6
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES = 36057; // 0x8cd9
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES = 36059; // 0x8cdb
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES = 36058; // 0x8cda
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES = 36055; // 0x8cd7
+ field public static final int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES = 36060; // 0x8cdc
+ field public static final int GL_FRAMEBUFFER_OES = 36160; // 0x8d40
+ field public static final int GL_FRAMEBUFFER_UNSUPPORTED_OES = 36061; // 0x8cdd
+ field public static final int GL_FUNC_ADD = 32774; // 0x8006
+ field public static final int GL_FUNC_REVERSE_SUBTRACT = 32779; // 0x800b
+ field public static final int GL_FUNC_SUBTRACT = 32778; // 0x800a
+ field public static final int GL_INCR_WRAP = 34055; // 0x8507
+ field public static final int GL_INVALID_FRAMEBUFFER_OPERATION_OES = 1286; // 0x506
+ field public static final int GL_MAX_COLOR_ATTACHMENTS_OES = 36063; // 0x8cdf
+ field public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 34076; // 0x851c
+ field public static final int GL_MAX_RENDERBUFFER_SIZE_OES = 34024; // 0x84e8
+ field public static final int GL_MIRRORED_REPEAT = 33648; // 0x8370
+ field public static final int GL_NORMAL_MAP = 34065; // 0x8511
+ field public static final int GL_REFLECTION_MAP = 34066; // 0x8512
+ field public static final int GL_RENDERBUFFER_ALPHA_SIZE_OES = 36179; // 0x8d53
+ field public static final int GL_RENDERBUFFER_BINDING_OES = 36007; // 0x8ca7
+ field public static final int GL_RENDERBUFFER_BLUE_SIZE_OES = 36178; // 0x8d52
+ field public static final int GL_RENDERBUFFER_DEPTH_SIZE_OES = 36180; // 0x8d54
+ field public static final int GL_RENDERBUFFER_GREEN_SIZE_OES = 36177; // 0x8d51
+ field public static final int GL_RENDERBUFFER_HEIGHT_OES = 36163; // 0x8d43
+ field public static final int GL_RENDERBUFFER_INTERNAL_FORMAT_OES = 36164; // 0x8d44
+ field public static final int GL_RENDERBUFFER_OES = 36161; // 0x8d41
+ field public static final int GL_RENDERBUFFER_RED_SIZE_OES = 36176; // 0x8d50
+ field public static final int GL_RENDERBUFFER_STENCIL_SIZE_OES = 36181; // 0x8d55
+ field public static final int GL_RENDERBUFFER_WIDTH_OES = 36162; // 0x8d42
+ field public static final int GL_RGB565_OES = 36194; // 0x8d62
+ field public static final int GL_RGB5_A1 = 32855; // 0x8057
+ field public static final int GL_RGB8 = 32849; // 0x8051
+ field public static final int GL_RGBA4 = 32854; // 0x8056
+ field public static final int GL_RGBA8 = 32856; // 0x8058
+ field public static final int GL_STENCIL_ATTACHMENT_OES = 36128; // 0x8d20
+ field public static final int GL_STENCIL_INDEX = 6401; // 0x1901
+ field public static final int GL_STENCIL_INDEX1_OES = 36166; // 0x8d46
+ field public static final int GL_STENCIL_INDEX4_OES = 36167; // 0x8d47
+ field public static final int GL_STENCIL_INDEX8_OES = 36168; // 0x8d48
+ field public static final int GL_STR = -1; // 0xffffffff
+ field public static final int GL_TEXTURE_BINDING_CUBE_MAP = 34068; // 0x8514
+ field public static final int GL_TEXTURE_CUBE_MAP = 34067; // 0x8513
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 34070; // 0x8516
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 34072; // 0x8518
+ field public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 34074; // 0x851a
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 34069; // 0x8515
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 34071; // 0x8517
+ field public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 34073; // 0x8519
+ field public static final int GL_TEXTURE_GEN_MODE = 9472; // 0x2500
+ field public static final int GL_TEXTURE_GEN_STR = 36192; // 0x8d60
+ }
+
+}
+
+package javax.net {
+
+ public abstract class ServerSocketFactory {
+ ctor protected ServerSocketFactory();
+ method public java.net.ServerSocket createServerSocket() throws java.io.IOException;
+ method public abstract java.net.ServerSocket createServerSocket(int) throws java.io.IOException;
+ method public abstract java.net.ServerSocket createServerSocket(int, int) throws java.io.IOException;
+ method public abstract java.net.ServerSocket createServerSocket(int, int, java.net.InetAddress) throws java.io.IOException;
+ method public static javax.net.ServerSocketFactory getDefault();
+ }
+
+ public abstract class SocketFactory {
+ ctor protected SocketFactory();
+ method public java.net.Socket createSocket() throws java.io.IOException;
+ method public abstract java.net.Socket createSocket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
+ method public abstract java.net.Socket createSocket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException, java.net.UnknownHostException;
+ method public abstract java.net.Socket createSocket(java.net.InetAddress, int) throws java.io.IOException;
+ method public abstract java.net.Socket createSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
+ method public static javax.net.SocketFactory getDefault();
+ }
+
+}
+
+package javax.net.ssl {
+
+ public class CertPathTrustManagerParameters implements javax.net.ssl.ManagerFactoryParameters {
+ ctor public CertPathTrustManagerParameters(java.security.cert.CertPathParameters);
+ method public java.security.cert.CertPathParameters getParameters();
+ }
+
+ public abstract class ExtendedSSLSession implements javax.net.ssl.SSLSession {
+ ctor public ExtendedSSLSession();
+ method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms();
+ method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms();
+ }
+
+ public class HandshakeCompletedEvent extends java.util.EventObject {
+ ctor public HandshakeCompletedEvent(javax.net.ssl.SSLSocket, javax.net.ssl.SSLSession);
+ method public java.lang.String getCipherSuite();
+ method public java.security.cert.Certificate[] getLocalCertificates();
+ method public java.security.Principal getLocalPrincipal();
+ method public javax.security.cert.X509Certificate[] getPeerCertificateChain() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public java.security.cert.Certificate[] getPeerCertificates() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public java.security.Principal getPeerPrincipal() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public javax.net.ssl.SSLSession getSession();
+ method public javax.net.ssl.SSLSocket getSocket();
+ }
+
+ public abstract interface HandshakeCompletedListener implements java.util.EventListener {
+ method public abstract void handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent);
+ }
+
+ public abstract interface HostnameVerifier {
+ method public abstract boolean verify(java.lang.String, javax.net.ssl.SSLSession);
+ }
+
+ public abstract class HttpsURLConnection extends java.net.HttpURLConnection {
+ ctor protected HttpsURLConnection(java.net.URL);
+ method public abstract java.lang.String getCipherSuite();
+ method public static javax.net.ssl.HostnameVerifier getDefaultHostnameVerifier();
+ method public static javax.net.ssl.SSLSocketFactory getDefaultSSLSocketFactory();
+ method public javax.net.ssl.HostnameVerifier getHostnameVerifier();
+ method public abstract java.security.cert.Certificate[] getLocalCertificates();
+ method public java.security.Principal getLocalPrincipal();
+ method public java.security.Principal getPeerPrincipal() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public javax.net.ssl.SSLSocketFactory getSSLSocketFactory();
+ method public abstract java.security.cert.Certificate[] getServerCertificates() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public static void setDefaultHostnameVerifier(javax.net.ssl.HostnameVerifier);
+ method public static void setDefaultSSLSocketFactory(javax.net.ssl.SSLSocketFactory);
+ method public void setHostnameVerifier(javax.net.ssl.HostnameVerifier);
+ method public void setSSLSocketFactory(javax.net.ssl.SSLSocketFactory);
+ field protected javax.net.ssl.HostnameVerifier hostnameVerifier;
+ }
+
+ public abstract interface KeyManager {
+ }
+
+ public class KeyManagerFactory {
+ ctor protected KeyManagerFactory(javax.net.ssl.KeyManagerFactorySpi, java.security.Provider, java.lang.String);
+ method public final java.lang.String getAlgorithm();
+ method public static final java.lang.String getDefaultAlgorithm();
+ method public static final javax.net.ssl.KeyManagerFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.net.ssl.KeyManagerFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.net.ssl.KeyManagerFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final javax.net.ssl.KeyManager[] getKeyManagers();
+ method public final java.security.Provider getProvider();
+ method public final void init(java.security.KeyStore, char[]) throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ method public final void init(javax.net.ssl.ManagerFactoryParameters) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract class KeyManagerFactorySpi {
+ ctor public KeyManagerFactorySpi();
+ method protected abstract javax.net.ssl.KeyManager[] engineGetKeyManagers();
+ method protected abstract void engineInit(java.security.KeyStore, char[]) throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ method protected abstract void engineInit(javax.net.ssl.ManagerFactoryParameters) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public class KeyStoreBuilderParameters implements javax.net.ssl.ManagerFactoryParameters {
+ ctor public KeyStoreBuilderParameters(java.security.KeyStore.Builder);
+ ctor public KeyStoreBuilderParameters(java.util.List<java.security.KeyStore.Builder>);
+ method public java.util.List<java.security.KeyStore.Builder> getParameters();
+ }
+
+ public abstract interface ManagerFactoryParameters {
+ }
+
+ public class SSLContext {
+ ctor protected SSLContext(javax.net.ssl.SSLContextSpi, java.security.Provider, java.lang.String);
+ method public final javax.net.ssl.SSLEngine createSSLEngine();
+ method public final javax.net.ssl.SSLEngine createSSLEngine(java.lang.String, int);
+ method public final javax.net.ssl.SSLSessionContext getClientSessionContext();
+ method public static synchronized javax.net.ssl.SSLContext getDefault() throws java.security.NoSuchAlgorithmException;
+ method public final javax.net.ssl.SSLParameters getDefaultSSLParameters();
+ method public static javax.net.ssl.SSLContext getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static javax.net.ssl.SSLContext getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static javax.net.ssl.SSLContext getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.lang.String getProtocol();
+ method public final java.security.Provider getProvider();
+ method public final javax.net.ssl.SSLSessionContext getServerSessionContext();
+ method public final javax.net.ssl.SSLServerSocketFactory getServerSocketFactory();
+ method public final javax.net.ssl.SSLSocketFactory getSocketFactory();
+ method public final javax.net.ssl.SSLParameters getSupportedSSLParameters();
+ method public final void init(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[], java.security.SecureRandom) throws java.security.KeyManagementException;
+ method public static synchronized void setDefault(javax.net.ssl.SSLContext);
+ }
+
+ public abstract class SSLContextSpi {
+ ctor public SSLContextSpi();
+ method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine();
+ method protected abstract javax.net.ssl.SSLEngine engineCreateSSLEngine(java.lang.String, int);
+ method protected abstract javax.net.ssl.SSLSessionContext engineGetClientSessionContext();
+ method protected javax.net.ssl.SSLParameters engineGetDefaultSSLParameters();
+ method protected abstract javax.net.ssl.SSLSessionContext engineGetServerSessionContext();
+ method protected abstract javax.net.ssl.SSLServerSocketFactory engineGetServerSocketFactory();
+ method protected abstract javax.net.ssl.SSLSocketFactory engineGetSocketFactory();
+ method protected javax.net.ssl.SSLParameters engineGetSupportedSSLParameters();
+ method protected abstract void engineInit(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[], java.security.SecureRandom) throws java.security.KeyManagementException;
+ }
+
+ public abstract class SSLEngine {
+ ctor protected SSLEngine();
+ ctor protected SSLEngine(java.lang.String, int);
+ method public abstract void beginHandshake() throws javax.net.ssl.SSLException;
+ method public abstract void closeInbound() throws javax.net.ssl.SSLException;
+ method public abstract void closeOutbound();
+ method public abstract java.lang.Runnable getDelegatedTask();
+ method public abstract boolean getEnableSessionCreation();
+ method public abstract java.lang.String[] getEnabledCipherSuites();
+ method public abstract java.lang.String[] getEnabledProtocols();
+ method public javax.net.ssl.SSLSession getHandshakeSession();
+ method public abstract javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus();
+ method public abstract boolean getNeedClientAuth();
+ method public java.lang.String getPeerHost();
+ method public int getPeerPort();
+ method public javax.net.ssl.SSLParameters getSSLParameters();
+ method public abstract javax.net.ssl.SSLSession getSession();
+ method public abstract java.lang.String[] getSupportedCipherSuites();
+ method public abstract java.lang.String[] getSupportedProtocols();
+ method public abstract boolean getUseClientMode();
+ method public abstract boolean getWantClientAuth();
+ method public abstract boolean isInboundDone();
+ method public abstract boolean isOutboundDone();
+ method public abstract void setEnableSessionCreation(boolean);
+ method public abstract void setEnabledCipherSuites(java.lang.String[]);
+ method public abstract void setEnabledProtocols(java.lang.String[]);
+ method public abstract void setNeedClientAuth(boolean);
+ method public void setSSLParameters(javax.net.ssl.SSLParameters);
+ method public abstract void setUseClientMode(boolean);
+ method public abstract void setWantClientAuth(boolean);
+ method public javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[]) throws javax.net.ssl.SSLException;
+ method public abstract javax.net.ssl.SSLEngineResult unwrap(java.nio.ByteBuffer, java.nio.ByteBuffer[], int, int) throws javax.net.ssl.SSLException;
+ method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ method public abstract javax.net.ssl.SSLEngineResult wrap(java.nio.ByteBuffer[], int, int, java.nio.ByteBuffer) throws javax.net.ssl.SSLException;
+ }
+
+ public class SSLEngineResult {
+ ctor public SSLEngineResult(javax.net.ssl.SSLEngineResult.Status, javax.net.ssl.SSLEngineResult.HandshakeStatus, int, int);
+ method public final int bytesConsumed();
+ method public final int bytesProduced();
+ method public final javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus();
+ method public final javax.net.ssl.SSLEngineResult.Status getStatus();
+ }
+
+ public static final class SSLEngineResult.HandshakeStatus extends java.lang.Enum {
+ method public static javax.net.ssl.SSLEngineResult.HandshakeStatus valueOf(java.lang.String);
+ method public static final javax.net.ssl.SSLEngineResult.HandshakeStatus[] values();
+ enum_constant public static final javax.net.ssl.SSLEngineResult.HandshakeStatus FINISHED;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.HandshakeStatus NEED_TASK;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.HandshakeStatus NEED_UNWRAP;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.HandshakeStatus NEED_WRAP;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.HandshakeStatus NOT_HANDSHAKING;
+ }
+
+ public static final class SSLEngineResult.Status extends java.lang.Enum {
+ method public static javax.net.ssl.SSLEngineResult.Status valueOf(java.lang.String);
+ method public static final javax.net.ssl.SSLEngineResult.Status[] values();
+ enum_constant public static final javax.net.ssl.SSLEngineResult.Status BUFFER_OVERFLOW;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.Status BUFFER_UNDERFLOW;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.Status CLOSED;
+ enum_constant public static final javax.net.ssl.SSLEngineResult.Status OK;
+ }
+
+ public class SSLException extends java.io.IOException {
+ ctor public SSLException(java.lang.String);
+ ctor public SSLException(java.lang.String, java.lang.Throwable);
+ ctor public SSLException(java.lang.Throwable);
+ }
+
+ public class SSLHandshakeException extends javax.net.ssl.SSLException {
+ ctor public SSLHandshakeException(java.lang.String);
+ }
+
+ public class SSLKeyException extends javax.net.ssl.SSLException {
+ ctor public SSLKeyException(java.lang.String);
+ }
+
+ public class SSLParameters {
+ ctor public SSLParameters();
+ ctor public SSLParameters(java.lang.String[]);
+ ctor public SSLParameters(java.lang.String[], java.lang.String[]);
+ method public java.security.AlgorithmConstraints getAlgorithmConstraints();
+ method public java.lang.String[] getCipherSuites();
+ method public java.lang.String getEndpointIdentificationAlgorithm();
+ method public boolean getNeedClientAuth();
+ method public java.lang.String[] getProtocols();
+ method public boolean getWantClientAuth();
+ method public void setAlgorithmConstraints(java.security.AlgorithmConstraints);
+ method public void setCipherSuites(java.lang.String[]);
+ method public void setEndpointIdentificationAlgorithm(java.lang.String);
+ method public void setNeedClientAuth(boolean);
+ method public void setProtocols(java.lang.String[]);
+ method public void setWantClientAuth(boolean);
+ }
+
+ public class SSLPeerUnverifiedException extends javax.net.ssl.SSLException {
+ ctor public SSLPeerUnverifiedException(java.lang.String);
+ }
+
+ public final class SSLPermission extends java.security.BasicPermission {
+ ctor public SSLPermission(java.lang.String);
+ ctor public SSLPermission(java.lang.String, java.lang.String);
+ }
+
+ public class SSLProtocolException extends javax.net.ssl.SSLException {
+ ctor public SSLProtocolException(java.lang.String);
+ }
+
+ public abstract class SSLServerSocket extends java.net.ServerSocket {
+ ctor protected SSLServerSocket() throws java.io.IOException;
+ ctor protected SSLServerSocket(int) throws java.io.IOException;
+ ctor protected SSLServerSocket(int, int) throws java.io.IOException;
+ ctor protected SSLServerSocket(int, int, java.net.InetAddress) throws java.io.IOException;
+ method public abstract boolean getEnableSessionCreation();
+ method public abstract java.lang.String[] getEnabledCipherSuites();
+ method public abstract java.lang.String[] getEnabledProtocols();
+ method public abstract boolean getNeedClientAuth();
+ method public javax.net.ssl.SSLParameters getSSLParameters();
+ method public abstract java.lang.String[] getSupportedCipherSuites();
+ method public abstract java.lang.String[] getSupportedProtocols();
+ method public abstract boolean getUseClientMode();
+ method public abstract boolean getWantClientAuth();
+ method public abstract void setEnableSessionCreation(boolean);
+ method public abstract void setEnabledCipherSuites(java.lang.String[]);
+ method public abstract void setEnabledProtocols(java.lang.String[]);
+ method public abstract void setNeedClientAuth(boolean);
+ method public void setSSLParameters(javax.net.ssl.SSLParameters);
+ method public abstract void setUseClientMode(boolean);
+ method public abstract void setWantClientAuth(boolean);
+ }
+
+ public abstract class SSLServerSocketFactory extends javax.net.ServerSocketFactory {
+ ctor protected SSLServerSocketFactory();
+ method public static synchronized javax.net.ServerSocketFactory getDefault();
+ method public abstract java.lang.String[] getDefaultCipherSuites();
+ method public abstract java.lang.String[] getSupportedCipherSuites();
+ }
+
+ public abstract interface SSLSession {
+ method public abstract int getApplicationBufferSize();
+ method public abstract java.lang.String getCipherSuite();
+ method public abstract long getCreationTime();
+ method public abstract byte[] getId();
+ method public abstract long getLastAccessedTime();
+ method public abstract java.security.cert.Certificate[] getLocalCertificates();
+ method public abstract java.security.Principal getLocalPrincipal();
+ method public abstract int getPacketBufferSize();
+ method public abstract javax.security.cert.X509Certificate[] getPeerCertificateChain() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public abstract java.security.cert.Certificate[] getPeerCertificates() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public abstract java.lang.String getPeerHost();
+ method public abstract int getPeerPort();
+ method public abstract java.security.Principal getPeerPrincipal() throws javax.net.ssl.SSLPeerUnverifiedException;
+ method public abstract java.lang.String getProtocol();
+ method public abstract javax.net.ssl.SSLSessionContext getSessionContext();
+ method public abstract java.lang.Object getValue(java.lang.String);
+ method public abstract java.lang.String[] getValueNames();
+ method public abstract void invalidate();
+ method public abstract boolean isValid();
+ method public abstract void putValue(java.lang.String, java.lang.Object);
+ method public abstract void removeValue(java.lang.String);
+ }
+
+ public class SSLSessionBindingEvent extends java.util.EventObject {
+ ctor public SSLSessionBindingEvent(javax.net.ssl.SSLSession, java.lang.String);
+ method public java.lang.String getName();
+ method public javax.net.ssl.SSLSession getSession();
+ }
+
+ public abstract interface SSLSessionBindingListener implements java.util.EventListener {
+ method public abstract void valueBound(javax.net.ssl.SSLSessionBindingEvent);
+ method public abstract void valueUnbound(javax.net.ssl.SSLSessionBindingEvent);
+ }
+
+ public abstract interface SSLSessionContext {
+ method public abstract java.util.Enumeration<byte[]> getIds();
+ method public abstract javax.net.ssl.SSLSession getSession(byte[]);
+ method public abstract int getSessionCacheSize();
+ method public abstract int getSessionTimeout();
+ method public abstract void setSessionCacheSize(int) throws java.lang.IllegalArgumentException;
+ method public abstract void setSessionTimeout(int) throws java.lang.IllegalArgumentException;
+ }
+
+ public abstract class SSLSocket extends java.net.Socket {
+ ctor protected SSLSocket();
+ ctor protected SSLSocket(java.lang.String, int) throws java.io.IOException, java.net.UnknownHostException;
+ ctor protected SSLSocket(java.net.InetAddress, int) throws java.io.IOException;
+ ctor protected SSLSocket(java.lang.String, int, java.net.InetAddress, int) throws java.io.IOException, java.net.UnknownHostException;
+ ctor protected SSLSocket(java.net.InetAddress, int, java.net.InetAddress, int) throws java.io.IOException;
+ method public abstract void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener);
+ method public abstract boolean getEnableSessionCreation();
+ method public abstract java.lang.String[] getEnabledCipherSuites();
+ method public abstract java.lang.String[] getEnabledProtocols();
+ method public javax.net.ssl.SSLSession getHandshakeSession();
+ method public abstract boolean getNeedClientAuth();
+ method public javax.net.ssl.SSLParameters getSSLParameters();
+ method public abstract javax.net.ssl.SSLSession getSession();
+ method public abstract java.lang.String[] getSupportedCipherSuites();
+ method public abstract java.lang.String[] getSupportedProtocols();
+ method public abstract boolean getUseClientMode();
+ method public abstract boolean getWantClientAuth();
+ method public abstract void removeHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener);
+ method public abstract void setEnableSessionCreation(boolean);
+ method public abstract void setEnabledCipherSuites(java.lang.String[]);
+ method public abstract void setEnabledProtocols(java.lang.String[]);
+ method public abstract void setNeedClientAuth(boolean);
+ method public void setSSLParameters(javax.net.ssl.SSLParameters);
+ method public abstract void setUseClientMode(boolean);
+ method public abstract void setWantClientAuth(boolean);
+ method public abstract void startHandshake() throws java.io.IOException;
+ }
+
+ public abstract class SSLSocketFactory extends javax.net.SocketFactory {
+ ctor public SSLSocketFactory();
+ method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException;
+ method public static synchronized javax.net.SocketFactory getDefault();
+ method public abstract java.lang.String[] getDefaultCipherSuites();
+ method public abstract java.lang.String[] getSupportedCipherSuites();
+ }
+
+ public abstract interface TrustManager {
+ }
+
+ public class TrustManagerFactory {
+ ctor protected TrustManagerFactory(javax.net.ssl.TrustManagerFactorySpi, java.security.Provider, java.lang.String);
+ method public final java.lang.String getAlgorithm();
+ method public static final java.lang.String getDefaultAlgorithm();
+ method public static final javax.net.ssl.TrustManagerFactory getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
+ method public static final javax.net.ssl.TrustManagerFactory getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static final javax.net.ssl.TrustManagerFactory getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public final java.security.Provider getProvider();
+ method public final javax.net.ssl.TrustManager[] getTrustManagers();
+ method public final void init(java.security.KeyStore) throws java.security.KeyStoreException;
+ method public final void init(javax.net.ssl.ManagerFactoryParameters) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract class TrustManagerFactorySpi {
+ ctor public TrustManagerFactorySpi();
+ method protected abstract javax.net.ssl.TrustManager[] engineGetTrustManagers();
+ method protected abstract void engineInit(java.security.KeyStore) throws java.security.KeyStoreException;
+ method protected abstract void engineInit(javax.net.ssl.ManagerFactoryParameters) throws java.security.InvalidAlgorithmParameterException;
+ }
+
+ public abstract class X509ExtendedKeyManager implements javax.net.ssl.X509KeyManager {
+ ctor protected X509ExtendedKeyManager();
+ method public java.lang.String chooseEngineClientAlias(java.lang.String[], java.security.Principal[], javax.net.ssl.SSLEngine);
+ method public java.lang.String chooseEngineServerAlias(java.lang.String, java.security.Principal[], javax.net.ssl.SSLEngine);
+ }
+
+ public abstract class X509ExtendedTrustManager implements javax.net.ssl.X509TrustManager {
+ ctor public X509ExtendedTrustManager();
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException;
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+ }
+
+ public abstract interface X509KeyManager implements javax.net.ssl.KeyManager {
+ method public abstract java.lang.String chooseClientAlias(java.lang.String[], java.security.Principal[], java.net.Socket);
+ method public abstract java.lang.String chooseServerAlias(java.lang.String, java.security.Principal[], java.net.Socket);
+ method public abstract java.security.cert.X509Certificate[] getCertificateChain(java.lang.String);
+ method public abstract java.lang.String[] getClientAliases(java.lang.String, java.security.Principal[]);
+ method public abstract java.security.PrivateKey getPrivateKey(java.lang.String);
+ method public abstract java.lang.String[] getServerAliases(java.lang.String, java.security.Principal[]);
+ }
+
+ public abstract interface X509TrustManager implements javax.net.ssl.TrustManager {
+ method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String) throws java.security.cert.CertificateException;
+ method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String) throws java.security.cert.CertificateException;
+ method public abstract java.security.cert.X509Certificate[] getAcceptedIssuers();
+ }
+
+}
+
+package javax.security.auth {
+
+ public final class AuthPermission extends java.security.BasicPermission {
+ ctor public AuthPermission(java.lang.String);
+ ctor public AuthPermission(java.lang.String, java.lang.String);
+ }
+
+ public class DestroyFailedException extends java.lang.Exception {
+ ctor public DestroyFailedException();
+ ctor public DestroyFailedException(java.lang.String);
+ }
+
+ public abstract interface Destroyable {
+ method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
+ method public abstract boolean isDestroyed();
+ }
+
+ public abstract deprecated class Policy {
+ ctor protected Policy();
+ method public abstract java.security.PermissionCollection getPermissions(javax.security.auth.Subject, java.security.CodeSource);
+ method public static javax.security.auth.Policy getPolicy();
+ method public abstract void refresh();
+ method public static void setPolicy(javax.security.auth.Policy);
+ }
+
+ public final class PrivateCredentialPermission extends java.security.Permission {
+ ctor public PrivateCredentialPermission(java.lang.String, java.lang.String);
+ method public boolean equals(java.lang.Object);
+ method public java.lang.String getActions();
+ method public java.lang.String getCredentialClass();
+ method public java.lang.String[][] getPrincipals();
+ method public int hashCode();
+ method public boolean implies(java.security.Permission);
+ }
+
+ public final class Subject implements java.io.Serializable {
+ ctor public Subject();
+ ctor public Subject(boolean, java.util.Set<? extends java.security.Principal>, java.util.Set<?>, java.util.Set<?>);
+ method public static T doAs(javax.security.auth.Subject, java.security.PrivilegedAction<T>);
+ method public static T doAs(javax.security.auth.Subject, java.security.PrivilegedExceptionAction<T>) throws java.security.PrivilegedActionException;
+ method public static T doAsPrivileged(javax.security.auth.Subject, java.security.PrivilegedAction<T>, java.security.AccessControlContext);
+ method public static T doAsPrivileged(javax.security.auth.Subject, java.security.PrivilegedExceptionAction<T>, java.security.AccessControlContext) throws java.security.PrivilegedActionException;
+ method public java.util.Set<java.security.Principal> getPrincipals();
+ method public java.util.Set<T> getPrincipals(java.lang.Class<T>);
+ method public java.util.Set<java.lang.Object> getPrivateCredentials();
+ method public java.util.Set<T> getPrivateCredentials(java.lang.Class<T>);
+ method public java.util.Set<java.lang.Object> getPublicCredentials();
+ method public java.util.Set<T> getPublicCredentials(java.lang.Class<T>);
+ method public static javax.security.auth.Subject getSubject(java.security.AccessControlContext);
+ method public boolean isReadOnly();
+ method public void setReadOnly();
+ }
+
+ public class SubjectDomainCombiner implements java.security.DomainCombiner {
+ ctor public SubjectDomainCombiner(javax.security.auth.Subject);
+ method public java.security.ProtectionDomain[] combine(java.security.ProtectionDomain[], java.security.ProtectionDomain[]);
+ method public javax.security.auth.Subject getSubject();
+ }
+
+}
+
+package javax.security.auth.callback {
+
+ public abstract interface Callback {
+ }
+
+ public abstract interface CallbackHandler {
+ method public abstract void handle(javax.security.auth.callback.Callback[]) throws java.io.IOException, javax.security.auth.callback.UnsupportedCallbackException;
+ }
+
+ public class PasswordCallback implements javax.security.auth.callback.Callback java.io.Serializable {
+ ctor public PasswordCallback(java.lang.String, boolean);
+ method public void clearPassword();
+ method public char[] getPassword();
+ method public java.lang.String getPrompt();
+ method public boolean isEchoOn();
+ method public void setPassword(char[]);
+ }
+
+ public class UnsupportedCallbackException extends java.lang.Exception {
+ ctor public UnsupportedCallbackException(javax.security.auth.callback.Callback);
+ ctor public UnsupportedCallbackException(javax.security.auth.callback.Callback, java.lang.String);
+ method public javax.security.auth.callback.Callback getCallback();
+ }
+
+}
+
+package javax.security.auth.login {
+
+ public class AppConfigurationEntry {
+ ctor public AppConfigurationEntry(java.lang.String, javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag, java.util.Map<java.lang.String, ?>);
+ method public javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag getControlFlag();
+ method public java.lang.String getLoginModuleName();
+ method public java.util.Map<java.lang.String, ?> getOptions();
+ }
+
+ public static class AppConfigurationEntry.LoginModuleControlFlag {
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag OPTIONAL;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag REQUIRED;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag REQUISITE;
+ field public static final javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag SUFFICIENT;
+ }
+
+ public abstract class Configuration {
+ ctor protected Configuration();
+ method public abstract javax.security.auth.login.AppConfigurationEntry[] getAppConfigurationEntry(java.lang.String);
+ method public static javax.security.auth.login.Configuration getConfiguration();
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters) throws java.security.NoSuchAlgorithmException;
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
+ method public static javax.security.auth.login.Configuration getInstance(java.lang.String, javax.security.auth.login.Configuration.Parameters, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public javax.security.auth.login.Configuration.Parameters getParameters();
+ method public java.security.Provider getProvider();
+ method public java.lang.String getType();
+ method public void refresh();
+ method public static void setConfiguration(javax.security.auth.login.Configuration);
+ }
+
+ public static abstract interface Configuration.Parameters {
+ }
+
+ public abstract class ConfigurationSpi {
+ ctor public ConfigurationSpi();
+ method protected abstract javax.security.auth.login.AppConfigurationEntry[] engineGetAppConfigurationEntry(java.lang.String);
+ method protected void engineRefresh();
+ }
+
+ public class LoginException extends java.security.GeneralSecurityException {
+ ctor public LoginException();
+ ctor public LoginException(java.lang.String);
+ }
+
+}
+
+package javax.security.auth.x500 {
+
+ public final class X500Principal implements java.security.Principal java.io.Serializable {
+ ctor public X500Principal(java.lang.String);
+ ctor public X500Principal(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
+ ctor public X500Principal(byte[]);
+ ctor public X500Principal(java.io.InputStream);
+ method public byte[] getEncoded();
+ method public java.lang.String getName();
+ method public java.lang.String getName(java.lang.String);
+ method public java.lang.String getName(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
+ field public static final java.lang.String CANONICAL = "CANONICAL";
+ field public static final java.lang.String RFC1779 = "RFC1779";
+ field public static final java.lang.String RFC2253 = "RFC2253";
+ }
+
+}
+
+package javax.security.cert {
+
+ public abstract class Certificate {
+ ctor public Certificate();
+ method public abstract byte[] getEncoded() throws javax.security.cert.CertificateEncodingException;
+ method public abstract java.security.PublicKey getPublicKey();
+ method public abstract java.lang.String toString();
+ method public abstract void verify(java.security.PublicKey) throws javax.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method public abstract void verify(java.security.PublicKey, java.lang.String) throws javax.security.cert.CertificateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ }
+
+ public class CertificateEncodingException extends javax.security.cert.CertificateException {
+ ctor public CertificateEncodingException();
+ ctor public CertificateEncodingException(java.lang.String);
+ }
+
+ public class CertificateException extends java.lang.Exception {
+ ctor public CertificateException();
+ ctor public CertificateException(java.lang.String);
+ }
+
+ public class CertificateExpiredException extends javax.security.cert.CertificateException {
+ ctor public CertificateExpiredException();
+ ctor public CertificateExpiredException(java.lang.String);
+ }
+
+ public class CertificateNotYetValidException extends javax.security.cert.CertificateException {
+ ctor public CertificateNotYetValidException();
+ ctor public CertificateNotYetValidException(java.lang.String);
+ }
+
+ public class CertificateParsingException extends javax.security.cert.CertificateException {
+ ctor public CertificateParsingException();
+ ctor public CertificateParsingException(java.lang.String);
+ }
+
+ public abstract class X509Certificate extends javax.security.cert.Certificate {
+ ctor public X509Certificate();
+ method public abstract void checkValidity() throws javax.security.cert.CertificateExpiredException, javax.security.cert.CertificateNotYetValidException;
+ method public abstract void checkValidity(java.util.Date) throws javax.security.cert.CertificateExpiredException, javax.security.cert.CertificateNotYetValidException;
+ method public static final javax.security.cert.X509Certificate getInstance(java.io.InputStream) throws javax.security.cert.CertificateException;
+ method public static final javax.security.cert.X509Certificate getInstance(byte[]) throws javax.security.cert.CertificateException;
+ method public abstract java.security.Principal getIssuerDN();
+ method public abstract java.util.Date getNotAfter();
+ method public abstract java.util.Date getNotBefore();
+ method public abstract java.math.BigInteger getSerialNumber();
+ method public abstract java.lang.String getSigAlgName();
+ method public abstract java.lang.String getSigAlgOID();
+ method public abstract byte[] getSigAlgParams();
+ method public abstract java.security.Principal getSubjectDN();
+ method public abstract int getVersion();
+ }
+
+}
+
+package javax.sql {
+
+ public abstract interface CommonDataSource {
+ method public abstract java.io.PrintWriter getLogWriter() throws java.sql.SQLException;
+ method public abstract int getLoginTimeout() throws java.sql.SQLException;
+ method public abstract java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException;
+ method public abstract void setLogWriter(java.io.PrintWriter) throws java.sql.SQLException;
+ method public abstract void setLoginTimeout(int) throws java.sql.SQLException;
+ }
+
+ public class ConnectionEvent extends java.util.EventObject {
+ ctor public ConnectionEvent(javax.sql.PooledConnection);
+ ctor public ConnectionEvent(javax.sql.PooledConnection, java.sql.SQLException);
+ method public java.sql.SQLException getSQLException();
+ }
+
+ public abstract interface ConnectionEventListener implements java.util.EventListener {
+ method public abstract void connectionClosed(javax.sql.ConnectionEvent);
+ method public abstract void connectionErrorOccurred(javax.sql.ConnectionEvent);
+ }
+
+ public abstract interface ConnectionPoolDataSource implements javax.sql.CommonDataSource {
+ method public abstract javax.sql.PooledConnection getPooledConnection() throws java.sql.SQLException;
+ method public abstract javax.sql.PooledConnection getPooledConnection(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ }
+
+ public abstract interface DataSource implements javax.sql.CommonDataSource java.sql.Wrapper {
+ method public abstract java.sql.Connection getConnection() throws java.sql.SQLException;
+ method public abstract java.sql.Connection getConnection(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ }
+
+ public abstract interface PooledConnection {
+ method public abstract void addConnectionEventListener(javax.sql.ConnectionEventListener);
+ method public abstract void addStatementEventListener(javax.sql.StatementEventListener);
+ method public abstract void close() throws java.sql.SQLException;
+ method public abstract java.sql.Connection getConnection() throws java.sql.SQLException;
+ method public abstract void removeConnectionEventListener(javax.sql.ConnectionEventListener);
+ method public abstract void removeStatementEventListener(javax.sql.StatementEventListener);
+ }
+
+ public abstract interface RowSet implements java.sql.ResultSet {
+ method public abstract void addRowSetListener(javax.sql.RowSetListener);
+ method public abstract void clearParameters() throws java.sql.SQLException;
+ method public abstract void execute() throws java.sql.SQLException;
+ method public abstract java.lang.String getCommand();
+ method public abstract java.lang.String getDataSourceName();
+ method public abstract boolean getEscapeProcessing() throws java.sql.SQLException;
+ method public abstract int getMaxFieldSize() throws java.sql.SQLException;
+ method public abstract int getMaxRows() throws java.sql.SQLException;
+ method public abstract java.lang.String getPassword();
+ method public abstract int getQueryTimeout() throws java.sql.SQLException;
+ method public abstract int getTransactionIsolation();
+ method public abstract java.util.Map<java.lang.String, java.lang.Class<?>> getTypeMap() throws java.sql.SQLException;
+ method public abstract java.lang.String getUrl() throws java.sql.SQLException;
+ method public abstract java.lang.String getUsername();
+ method public abstract boolean isReadOnly();
+ method public abstract void removeRowSetListener(javax.sql.RowSetListener);
+ method public abstract void setArray(int, java.sql.Array) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setAsciiStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBigDecimal(int, java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void setBigDecimal(java.lang.String, java.math.BigDecimal) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(int, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream, int) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBinaryStream(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setBlob(int, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.io.InputStream, long) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.sql.Blob) throws java.sql.SQLException;
+ method public abstract void setBlob(java.lang.String, java.io.InputStream) throws java.sql.SQLException;
+ method public abstract void setBoolean(int, boolean) throws java.sql.SQLException;
+ method public abstract void setBoolean(java.lang.String, boolean) throws java.sql.SQLException;
+ method public abstract void setByte(int, byte) throws java.sql.SQLException;
+ method public abstract void setByte(java.lang.String, byte) throws java.sql.SQLException;
+ method public abstract void setBytes(int, byte[]) throws java.sql.SQLException;
+ method public abstract void setBytes(java.lang.String, byte[]) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(int, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader, int) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.sql.Clob) throws java.sql.SQLException;
+ method public abstract void setClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setCommand(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setConcurrency(int) throws java.sql.SQLException;
+ method public abstract void setDataSourceName(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setDate(int, java.sql.Date) throws java.sql.SQLException;
+ method public abstract void setDate(int, java.sql.Date, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setDate(java.lang.String, java.sql.Date) throws java.sql.SQLException;
+ method public abstract void setDate(java.lang.String, java.sql.Date, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setDouble(int, double) throws java.sql.SQLException;
+ method public abstract void setDouble(java.lang.String, double) throws java.sql.SQLException;
+ method public abstract void setEscapeProcessing(boolean) throws java.sql.SQLException;
+ method public abstract void setFloat(int, float) throws java.sql.SQLException;
+ method public abstract void setFloat(java.lang.String, float) throws java.sql.SQLException;
+ method public abstract void setInt(int, int) throws java.sql.SQLException;
+ method public abstract void setInt(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void setLong(int, long) throws java.sql.SQLException;
+ method public abstract void setLong(java.lang.String, long) throws java.sql.SQLException;
+ method public abstract void setMaxFieldSize(int) throws java.sql.SQLException;
+ method public abstract void setMaxRows(int) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNCharacterStream(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNClob(java.lang.String, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.io.Reader, long) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.sql.NClob) throws java.sql.SQLException;
+ method public abstract void setNClob(int, java.io.Reader) throws java.sql.SQLException;
+ method public abstract void setNString(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setNString(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setNull(int, int) throws java.sql.SQLException;
+ method public abstract void setNull(java.lang.String, int) throws java.sql.SQLException;
+ method public abstract void setNull(int, int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setNull(java.lang.String, int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int, int) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object, int) throws java.sql.SQLException;
+ method public abstract void setObject(java.lang.String, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void setObject(int, java.lang.Object) throws java.sql.SQLException;
+ method public abstract void setPassword(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setQueryTimeout(int) throws java.sql.SQLException;
+ method public abstract void setReadOnly(boolean) throws java.sql.SQLException;
+ method public abstract void setRef(int, java.sql.Ref) throws java.sql.SQLException;
+ method public abstract void setRowId(int, java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void setRowId(java.lang.String, java.sql.RowId) throws java.sql.SQLException;
+ method public abstract void setSQLXML(int, java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void setSQLXML(java.lang.String, java.sql.SQLXML) throws java.sql.SQLException;
+ method public abstract void setShort(int, short) throws java.sql.SQLException;
+ method public abstract void setShort(java.lang.String, short) throws java.sql.SQLException;
+ method public abstract void setString(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setString(java.lang.String, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setTime(int, java.sql.Time) throws java.sql.SQLException;
+ method public abstract void setTime(int, java.sql.Time, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setTime(java.lang.String, java.sql.Time) throws java.sql.SQLException;
+ method public abstract void setTime(java.lang.String, java.sql.Time, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setTimestamp(int, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp) throws java.sql.SQLException;
+ method public abstract void setTimestamp(int, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setTimestamp(java.lang.String, java.sql.Timestamp, java.util.Calendar) throws java.sql.SQLException;
+ method public abstract void setTransactionIsolation(int) throws java.sql.SQLException;
+ method public abstract void setType(int) throws java.sql.SQLException;
+ method public abstract void setTypeMap(java.util.Map<java.lang.String, java.lang.Class<?>>) throws java.sql.SQLException;
+ method public abstract void setURL(int, java.net.URL) throws java.sql.SQLException;
+ method public abstract void setUrl(java.lang.String) throws java.sql.SQLException;
+ method public abstract void setUsername(java.lang.String) throws java.sql.SQLException;
+ }
+
+ public class RowSetEvent extends java.util.EventObject {
+ ctor public RowSetEvent(javax.sql.RowSet);
+ }
+
+ public abstract interface RowSetInternal {
+ method public abstract java.sql.Connection getConnection() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getOriginal() throws java.sql.SQLException;
+ method public abstract java.sql.ResultSet getOriginalRow() throws java.sql.SQLException;
+ method public abstract java.lang.Object[] getParams() throws java.sql.SQLException;
+ method public abstract void setMetaData(javax.sql.RowSetMetaData) throws java.sql.SQLException;
+ }
+
+ public abstract interface RowSetListener implements java.util.EventListener {
+ method public abstract void cursorMoved(javax.sql.RowSetEvent);
+ method public abstract void rowChanged(javax.sql.RowSetEvent);
+ method public abstract void rowSetChanged(javax.sql.RowSetEvent);
+ }
+
+ public abstract interface RowSetMetaData implements java.sql.ResultSetMetaData {
+ method public abstract void setAutoIncrement(int, boolean) throws java.sql.SQLException;
+ method public abstract void setCaseSensitive(int, boolean) throws java.sql.SQLException;
+ method public abstract void setCatalogName(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setColumnCount(int) throws java.sql.SQLException;
+ method public abstract void setColumnDisplaySize(int, int) throws java.sql.SQLException;
+ method public abstract void setColumnLabel(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setColumnName(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setColumnType(int, int) throws java.sql.SQLException;
+ method public abstract void setColumnTypeName(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setCurrency(int, boolean) throws java.sql.SQLException;
+ method public abstract void setNullable(int, int) throws java.sql.SQLException;
+ method public abstract void setPrecision(int, int) throws java.sql.SQLException;
+ method public abstract void setScale(int, int) throws java.sql.SQLException;
+ method public abstract void setSchemaName(int, java.lang.String) throws java.sql.SQLException;
+ method public abstract void setSearchable(int, boolean) throws java.sql.SQLException;
+ method public abstract void setSigned(int, boolean) throws java.sql.SQLException;
+ method public abstract void setTableName(int, java.lang.String) throws java.sql.SQLException;
+ }
+
+ public abstract interface RowSetReader {
+ method public abstract void readData(javax.sql.RowSetInternal) throws java.sql.SQLException;
+ }
+
+ public abstract interface RowSetWriter {
+ method public abstract boolean writeData(javax.sql.RowSetInternal) throws java.sql.SQLException;
+ }
+
+ public class StatementEvent extends java.util.EventObject {
+ ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement);
+ ctor public StatementEvent(javax.sql.PooledConnection, java.sql.PreparedStatement, java.sql.SQLException);
+ method public java.sql.SQLException getSQLException();
+ method public java.sql.PreparedStatement getStatement();
+ }
+
+ public abstract interface StatementEventListener implements java.util.EventListener {
+ method public abstract void statementClosed(javax.sql.StatementEvent);
+ method public abstract void statementErrorOccurred(javax.sql.StatementEvent);
+ }
+
+}
+
+package javax.xml {
+
+ public final class XMLConstants {
+ field public static final java.lang.String DEFAULT_NS_PREFIX = "";
+ field public static final java.lang.String FEATURE_SECURE_PROCESSING = "http://javax.xml.XMLConstants/feature/secure-processing";
+ field public static final java.lang.String NULL_NS_URI = "";
+ field public static final java.lang.String RELAXNG_NS_URI = "http://relaxng.org/ns/structure/1.0";
+ field public static final java.lang.String W3C_XML_SCHEMA_INSTANCE_NS_URI = "http://www.w3.org/2001/XMLSchema-instance";
+ field public static final java.lang.String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
+ field public static final java.lang.String W3C_XPATH_DATATYPE_NS_URI = "http://www.w3.org/2003/11/xpath-datatypes";
+ field public static final java.lang.String XMLNS_ATTRIBUTE = "xmlns";
+ field public static final java.lang.String XMLNS_ATTRIBUTE_NS_URI = "http://www.w3.org/2000/xmlns/";
+ field public static final java.lang.String XML_DTD_NS_URI = "http://www.w3.org/TR/REC-xml";
+ field public static final java.lang.String XML_NS_PREFIX = "xml";
+ field public static final java.lang.String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
+ }
+
+}
+
+package javax.xml.datatype {
+
+ public class DatatypeConfigurationException extends java.lang.Exception {
+ ctor public DatatypeConfigurationException();
+ ctor public DatatypeConfigurationException(java.lang.String);
+ ctor public DatatypeConfigurationException(java.lang.String, java.lang.Throwable);
+ ctor public DatatypeConfigurationException(java.lang.Throwable);
+ }
+
+ public final class DatatypeConstants {
+ field public static final int APRIL = 4; // 0x4
+ field public static final int AUGUST = 8; // 0x8
+ field public static final javax.xml.namespace.QName DATE;
+ field public static final javax.xml.namespace.QName DATETIME;
+ field public static final javax.xml.datatype.DatatypeConstants.Field DAYS;
+ field public static final int DECEMBER = 12; // 0xc
+ field public static final javax.xml.namespace.QName DURATION;
+ field public static final javax.xml.namespace.QName DURATION_DAYTIME;
+ field public static final javax.xml.namespace.QName DURATION_YEARMONTH;
+ field public static final int EQUAL = 0; // 0x0
+ field public static final int FEBRUARY = 2; // 0x2
+ field public static final int FIELD_UNDEFINED = -2147483648; // 0x80000000
+ field public static final javax.xml.namespace.QName GDAY;
+ field public static final javax.xml.namespace.QName GMONTH;
+ field public static final javax.xml.namespace.QName GMONTHDAY;
+ field public static final int GREATER = 1; // 0x1
+ field public static final javax.xml.namespace.QName GYEAR;
+ field public static final javax.xml.namespace.QName GYEARMONTH;
+ field public static final javax.xml.datatype.DatatypeConstants.Field HOURS;
+ field public static final int INDETERMINATE = 2; // 0x2
+ field public static final int JANUARY = 1; // 0x1
+ field public static final int JULY = 7; // 0x7
+ field public static final int JUNE = 6; // 0x6
+ field public static final int LESSER = -1; // 0xffffffff
+ field public static final int MARCH = 3; // 0x3
+ field public static final int MAX_TIMEZONE_OFFSET = -840; // 0xfffffcb8
+ field public static final int MAY = 5; // 0x5
+ field public static final javax.xml.datatype.DatatypeConstants.Field MINUTES;
+ field public static final int MIN_TIMEZONE_OFFSET = 840; // 0x348
+ field public static final javax.xml.datatype.DatatypeConstants.Field MONTHS;
+ field public static final int NOVEMBER = 11; // 0xb
+ field public static final int OCTOBER = 10; // 0xa
+ field public static final javax.xml.datatype.DatatypeConstants.Field SECONDS;
+ field public static final int SEPTEMBER = 9; // 0x9
+ field public static final javax.xml.namespace.QName TIME;
+ field public static final javax.xml.datatype.DatatypeConstants.Field YEARS;
+ }
+
+ public static final class DatatypeConstants.Field {
+ method public int getId();
+ }
+
+ public abstract class DatatypeFactory {
+ ctor protected DatatypeFactory();
+ method public abstract javax.xml.datatype.Duration newDuration(java.lang.String);
+ method public abstract javax.xml.datatype.Duration newDuration(long);
+ method public abstract javax.xml.datatype.Duration newDuration(boolean, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigDecimal);
+ method public javax.xml.datatype.Duration newDuration(boolean, int, int, int, int, int, int);
+ method public javax.xml.datatype.Duration newDurationDayTime(java.lang.String);
+ method public javax.xml.datatype.Duration newDurationDayTime(long);
+ method public javax.xml.datatype.Duration newDurationDayTime(boolean, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger, java.math.BigInteger);
+ method public javax.xml.datatype.Duration newDurationDayTime(boolean, int, int, int, int);
+ method public javax.xml.datatype.Duration newDurationYearMonth(java.lang.String);
+ method public javax.xml.datatype.Duration newDurationYearMonth(long);
+ method public javax.xml.datatype.Duration newDurationYearMonth(boolean, java.math.BigInteger, java.math.BigInteger);
+ method public javax.xml.datatype.Duration newDurationYearMonth(boolean, int, int);
+ method public static javax.xml.datatype.DatatypeFactory newInstance() throws javax.xml.datatype.DatatypeConfigurationException;
+ method public static javax.xml.datatype.DatatypeFactory newInstance(java.lang.String, java.lang.ClassLoader) throws javax.xml.datatype.DatatypeConfigurationException;
+ method public abstract javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendar();
+ method public abstract javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendar(java.lang.String);
+ method public abstract javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendar(java.util.GregorianCalendar);
+ method public abstract javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendar(java.math.BigInteger, int, int, int, int, int, java.math.BigDecimal, int);
+ method public javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendar(int, int, int, int, int, int, int, int);
+ method public javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendarDate(int, int, int, int);
+ method public javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendarTime(int, int, int, int);
+ method public javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendarTime(int, int, int, java.math.BigDecimal, int);
+ method public javax.xml.datatype.XMLGregorianCalendar newXMLGregorianCalendarTime(int, int, int, int, int);
+ field public static final java.lang.String DATATYPEFACTORY_IMPLEMENTATION_CLASS;
+ field public static final java.lang.String DATATYPEFACTORY_PROPERTY = "javax.xml.datatype.DatatypeFactory";
+ }
+
+ public abstract class Duration {
+ ctor public Duration();
+ method public abstract javax.xml.datatype.Duration add(javax.xml.datatype.Duration);
+ method public abstract void addTo(java.util.Calendar);
+ method public void addTo(java.util.Date);
+ method public abstract int compare(javax.xml.datatype.Duration);
+ method public int getDays();
+ method public abstract java.lang.Number getField(javax.xml.datatype.DatatypeConstants.Field);
+ method public int getHours();
+ method public int getMinutes();
+ method public int getMonths();
+ method public int getSeconds();
+ method public abstract int getSign();
+ method public long getTimeInMillis(java.util.Calendar);
+ method public long getTimeInMillis(java.util.Date);
+ method public javax.xml.namespace.QName getXMLSchemaType();
+ method public int getYears();
+ method public abstract int hashCode();
+ method public boolean isLongerThan(javax.xml.datatype.Duration);
+ method public abstract boolean isSet(javax.xml.datatype.DatatypeConstants.Field);
+ method public boolean isShorterThan(javax.xml.datatype.Duration);
+ method public javax.xml.datatype.Duration multiply(int);
+ method public abstract javax.xml.datatype.Duration multiply(java.math.BigDecimal);
+ method public abstract javax.xml.datatype.Duration negate();
+ method public abstract javax.xml.datatype.Duration normalizeWith(java.util.Calendar);
+ method public javax.xml.datatype.Duration subtract(javax.xml.datatype.Duration);
+ }
+
+ public abstract class XMLGregorianCalendar implements java.lang.Cloneable {
+ ctor public XMLGregorianCalendar();
+ method public abstract void add(javax.xml.datatype.Duration);
+ method public abstract void clear();
+ method public abstract java.lang.Object clone();
+ method public abstract int compare(javax.xml.datatype.XMLGregorianCalendar);
+ method public abstract int getDay();
+ method public abstract java.math.BigInteger getEon();
+ method public abstract java.math.BigInteger getEonAndYear();
+ method public abstract java.math.BigDecimal getFractionalSecond();
+ method public abstract int getHour();
+ method public int getMillisecond();
+ method public abstract int getMinute();
+ method public abstract int getMonth();
+ method public abstract int getSecond();
+ method public abstract java.util.TimeZone getTimeZone(int);
+ method public abstract int getTimezone();
+ method public abstract javax.xml.namespace.QName getXMLSchemaType();
+ method public abstract int getYear();
+ method public abstract boolean isValid();
+ method public abstract javax.xml.datatype.XMLGregorianCalendar normalize();
+ method public abstract void reset();
+ method public abstract void setDay(int);
+ method public abstract void setFractionalSecond(java.math.BigDecimal);
+ method public abstract void setHour(int);
+ method public abstract void setMillisecond(int);
+ method public abstract void setMinute(int);
+ method public abstract void setMonth(int);
+ method public abstract void setSecond(int);
+ method public void setTime(int, int, int);
+ method public void setTime(int, int, int, java.math.BigDecimal);
+ method public void setTime(int, int, int, int);
+ method public abstract void setTimezone(int);
+ method public abstract void setYear(java.math.BigInteger);
+ method public abstract void setYear(int);
+ method public abstract java.util.GregorianCalendar toGregorianCalendar();
+ method public abstract java.util.GregorianCalendar toGregorianCalendar(java.util.TimeZone, java.util.Locale, javax.xml.datatype.XMLGregorianCalendar);
+ method public abstract java.lang.String toXMLFormat();
+ }
+
+}
+
+package javax.xml.namespace {
+
+ public abstract interface NamespaceContext {
+ method public abstract java.lang.String getNamespaceURI(java.lang.String);
+ method public abstract java.lang.String getPrefix(java.lang.String);
+ method public abstract java.util.Iterator getPrefixes(java.lang.String);
+ }
+
+ public class QName implements java.io.Serializable {
+ ctor public QName(java.lang.String, java.lang.String);
+ ctor public QName(java.lang.String, java.lang.String, java.lang.String);
+ ctor public QName(java.lang.String);
+ method public final boolean equals(java.lang.Object);
+ method public java.lang.String getLocalPart();
+ method public java.lang.String getNamespaceURI();
+ method public java.lang.String getPrefix();
+ method public final int hashCode();
+ method public static javax.xml.namespace.QName valueOf(java.lang.String);
+ }
+
+}
+
+package javax.xml.parsers {
+
+ public abstract class DocumentBuilder {
+ ctor protected DocumentBuilder();
+ method public abstract org.w3c.dom.DOMImplementation getDOMImplementation();
+ method public javax.xml.validation.Schema getSchema();
+ method public abstract boolean isNamespaceAware();
+ method public abstract boolean isValidating();
+ method public boolean isXIncludeAware();
+ method public abstract org.w3c.dom.Document newDocument();
+ method public org.w3c.dom.Document parse(java.io.InputStream) throws java.io.IOException, org.xml.sax.SAXException;
+ method public org.w3c.dom.Document parse(java.io.InputStream, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public org.w3c.dom.Document parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public org.w3c.dom.Document parse(java.io.File) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract org.w3c.dom.Document parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void reset();
+ method public abstract void setEntityResolver(org.xml.sax.EntityResolver);
+ method public abstract void setErrorHandler(org.xml.sax.ErrorHandler);
+ }
+
+ public abstract class DocumentBuilderFactory {
+ ctor protected DocumentBuilderFactory();
+ method public abstract java.lang.Object getAttribute(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public abstract boolean getFeature(java.lang.String) throws javax.xml.parsers.ParserConfigurationException;
+ method public javax.xml.validation.Schema getSchema();
+ method public boolean isCoalescing();
+ method public boolean isExpandEntityReferences();
+ method public boolean isIgnoringComments();
+ method public boolean isIgnoringElementContentWhitespace();
+ method public boolean isNamespaceAware();
+ method public boolean isValidating();
+ method public boolean isXIncludeAware();
+ method public abstract javax.xml.parsers.DocumentBuilder newDocumentBuilder() throws javax.xml.parsers.ParserConfigurationException;
+ method public static javax.xml.parsers.DocumentBuilderFactory newInstance();
+ method public static javax.xml.parsers.DocumentBuilderFactory newInstance(java.lang.String, java.lang.ClassLoader);
+ method public abstract void setAttribute(java.lang.String, java.lang.Object) throws java.lang.IllegalArgumentException;
+ method public void setCoalescing(boolean);
+ method public void setExpandEntityReferences(boolean);
+ method public abstract void setFeature(java.lang.String, boolean) throws javax.xml.parsers.ParserConfigurationException;
+ method public void setIgnoringComments(boolean);
+ method public void setIgnoringElementContentWhitespace(boolean);
+ method public void setNamespaceAware(boolean);
+ method public void setSchema(javax.xml.validation.Schema);
+ method public void setValidating(boolean);
+ method public void setXIncludeAware(boolean);
+ }
+
+ public class FactoryConfigurationError extends java.lang.Error {
+ ctor public FactoryConfigurationError();
+ ctor public FactoryConfigurationError(java.lang.String);
+ ctor public FactoryConfigurationError(java.lang.Exception);
+ ctor public FactoryConfigurationError(java.lang.Exception, java.lang.String);
+ method public java.lang.Exception getException();
+ }
+
+ public class ParserConfigurationException extends java.lang.Exception {
+ ctor public ParserConfigurationException();
+ ctor public ParserConfigurationException(java.lang.String);
+ }
+
+ public abstract class SAXParser {
+ ctor protected SAXParser();
+ method public abstract org.xml.sax.Parser getParser() throws org.xml.sax.SAXException;
+ method public abstract java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public javax.xml.validation.Schema getSchema();
+ method public abstract org.xml.sax.XMLReader getXMLReader() throws org.xml.sax.SAXException;
+ method public abstract boolean isNamespaceAware();
+ method public abstract boolean isValidating();
+ method public boolean isXIncludeAware();
+ method public void parse(java.io.InputStream, org.xml.sax.HandlerBase) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.io.InputStream, org.xml.sax.HandlerBase, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.io.InputStream, org.xml.sax.helpers.DefaultHandler) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.io.InputStream, org.xml.sax.helpers.DefaultHandler, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.lang.String, org.xml.sax.HandlerBase) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.lang.String, org.xml.sax.helpers.DefaultHandler) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.io.File, org.xml.sax.HandlerBase) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.io.File, org.xml.sax.helpers.DefaultHandler) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(org.xml.sax.InputSource, org.xml.sax.HandlerBase) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(org.xml.sax.InputSource, org.xml.sax.helpers.DefaultHandler) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void reset();
+ method public abstract void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ }
+
+ public abstract class SAXParserFactory {
+ ctor protected SAXParserFactory();
+ method public abstract boolean getFeature(java.lang.String) throws javax.xml.parsers.ParserConfigurationException, org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public javax.xml.validation.Schema getSchema();
+ method public boolean isNamespaceAware();
+ method public boolean isValidating();
+ method public boolean isXIncludeAware();
+ method public static javax.xml.parsers.SAXParserFactory newInstance();
+ method public static javax.xml.parsers.SAXParserFactory newInstance(java.lang.String, java.lang.ClassLoader);
+ method public abstract javax.xml.parsers.SAXParser newSAXParser() throws javax.xml.parsers.ParserConfigurationException, org.xml.sax.SAXException;
+ method public abstract void setFeature(java.lang.String, boolean) throws javax.xml.parsers.ParserConfigurationException, org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setNamespaceAware(boolean);
+ method public void setSchema(javax.xml.validation.Schema);
+ method public void setValidating(boolean);
+ method public void setXIncludeAware(boolean);
+ }
+
+}
+
+package javax.xml.transform {
+
+ public abstract interface ErrorListener {
+ method public abstract void error(javax.xml.transform.TransformerException) throws javax.xml.transform.TransformerException;
+ method public abstract void fatalError(javax.xml.transform.TransformerException) throws javax.xml.transform.TransformerException;
+ method public abstract void warning(javax.xml.transform.TransformerException) throws javax.xml.transform.TransformerException;
+ }
+
+ public class OutputKeys {
+ field public static final java.lang.String CDATA_SECTION_ELEMENTS = "cdata-section-elements";
+ field public static final java.lang.String DOCTYPE_PUBLIC = "doctype-public";
+ field public static final java.lang.String DOCTYPE_SYSTEM = "doctype-system";
+ field public static final java.lang.String ENCODING = "encoding";
+ field public static final java.lang.String INDENT = "indent";
+ field public static final java.lang.String MEDIA_TYPE = "media-type";
+ field public static final java.lang.String METHOD = "method";
+ field public static final java.lang.String OMIT_XML_DECLARATION = "omit-xml-declaration";
+ field public static final java.lang.String STANDALONE = "standalone";
+ field public static final java.lang.String VERSION = "version";
+ }
+
+ public abstract interface Result {
+ method public abstract java.lang.String getSystemId();
+ method public abstract void setSystemId(java.lang.String);
+ field public static final java.lang.String PI_DISABLE_OUTPUT_ESCAPING = "javax.xml.transform.disable-output-escaping";
+ field public static final java.lang.String PI_ENABLE_OUTPUT_ESCAPING = "javax.xml.transform.enable-output-escaping";
+ }
+
+ public abstract interface Source {
+ method public abstract java.lang.String getSystemId();
+ method public abstract void setSystemId(java.lang.String);
+ }
+
+ public abstract interface SourceLocator {
+ method public abstract int getColumnNumber();
+ method public abstract int getLineNumber();
+ method public abstract java.lang.String getPublicId();
+ method public abstract java.lang.String getSystemId();
+ }
+
+ public abstract interface Templates {
+ method public abstract java.util.Properties getOutputProperties();
+ method public abstract javax.xml.transform.Transformer newTransformer() throws javax.xml.transform.TransformerConfigurationException;
+ }
+
+ public abstract class Transformer {
+ ctor protected Transformer();
+ method public abstract void clearParameters();
+ method public abstract javax.xml.transform.ErrorListener getErrorListener();
+ method public abstract java.util.Properties getOutputProperties();
+ method public abstract java.lang.String getOutputProperty(java.lang.String) throws java.lang.IllegalArgumentException;
+ method public abstract java.lang.Object getParameter(java.lang.String);
+ method public abstract javax.xml.transform.URIResolver getURIResolver();
+ method public void reset();
+ method public abstract void setErrorListener(javax.xml.transform.ErrorListener) throws java.lang.IllegalArgumentException;
+ method public abstract void setOutputProperties(java.util.Properties);
+ method public abstract void setOutputProperty(java.lang.String, java.lang.String) throws java.lang.IllegalArgumentException;
+ method public abstract void setParameter(java.lang.String, java.lang.Object);
+ method public abstract void setURIResolver(javax.xml.transform.URIResolver);
+ method public abstract void transform(javax.xml.transform.Source, javax.xml.transform.Result) throws javax.xml.transform.TransformerException;
+ }
+
+ public class TransformerConfigurationException extends javax.xml.transform.TransformerException {
+ ctor public TransformerConfigurationException();
+ ctor public TransformerConfigurationException(java.lang.String);
+ ctor public TransformerConfigurationException(java.lang.Throwable);
+ ctor public TransformerConfigurationException(java.lang.String, java.lang.Throwable);
+ ctor public TransformerConfigurationException(java.lang.String, javax.xml.transform.SourceLocator);
+ ctor public TransformerConfigurationException(java.lang.String, javax.xml.transform.SourceLocator, java.lang.Throwable);
+ }
+
+ public class TransformerException extends java.lang.Exception {
+ ctor public TransformerException(java.lang.String);
+ ctor public TransformerException(java.lang.Throwable);
+ ctor public TransformerException(java.lang.String, java.lang.Throwable);
+ ctor public TransformerException(java.lang.String, javax.xml.transform.SourceLocator);
+ ctor public TransformerException(java.lang.String, javax.xml.transform.SourceLocator, java.lang.Throwable);
+ method public java.lang.Throwable getException();
+ method public java.lang.String getLocationAsString();
+ method public javax.xml.transform.SourceLocator getLocator();
+ method public java.lang.String getMessageAndLocation();
+ method public void setLocator(javax.xml.transform.SourceLocator);
+ }
+
+ public abstract class TransformerFactory {
+ ctor protected TransformerFactory();
+ method public abstract javax.xml.transform.Source getAssociatedStylesheet(javax.xml.transform.Source, java.lang.String, java.lang.String, java.lang.String) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract java.lang.Object getAttribute(java.lang.String);
+ method public abstract javax.xml.transform.ErrorListener getErrorListener();
+ method public abstract boolean getFeature(java.lang.String);
+ method public abstract javax.xml.transform.URIResolver getURIResolver();
+ method public static javax.xml.transform.TransformerFactory newInstance() throws javax.xml.transform.TransformerFactoryConfigurationError;
+ method public static javax.xml.transform.TransformerFactory newInstance(java.lang.String, java.lang.ClassLoader) throws javax.xml.transform.TransformerFactoryConfigurationError;
+ method public abstract javax.xml.transform.Templates newTemplates(javax.xml.transform.Source) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract javax.xml.transform.Transformer newTransformer(javax.xml.transform.Source) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract javax.xml.transform.Transformer newTransformer() throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract void setAttribute(java.lang.String, java.lang.Object);
+ method public abstract void setErrorListener(javax.xml.transform.ErrorListener);
+ method public abstract void setFeature(java.lang.String, boolean) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract void setURIResolver(javax.xml.transform.URIResolver);
+ }
+
+ public class TransformerFactoryConfigurationError extends java.lang.Error {
+ ctor public TransformerFactoryConfigurationError();
+ ctor public TransformerFactoryConfigurationError(java.lang.String);
+ ctor public TransformerFactoryConfigurationError(java.lang.Exception);
+ ctor public TransformerFactoryConfigurationError(java.lang.Exception, java.lang.String);
+ method public java.lang.Exception getException();
+ }
+
+ public abstract interface URIResolver {
+ method public abstract javax.xml.transform.Source resolve(java.lang.String, java.lang.String) throws javax.xml.transform.TransformerException;
+ }
+
+}
+
+package javax.xml.transform.dom {
+
+ public abstract interface DOMLocator implements javax.xml.transform.SourceLocator {
+ method public abstract org.w3c.dom.Node getOriginatingNode();
+ }
+
+ public class DOMResult implements javax.xml.transform.Result {
+ ctor public DOMResult();
+ ctor public DOMResult(org.w3c.dom.Node);
+ ctor public DOMResult(org.w3c.dom.Node, java.lang.String);
+ ctor public DOMResult(org.w3c.dom.Node, org.w3c.dom.Node);
+ ctor public DOMResult(org.w3c.dom.Node, org.w3c.dom.Node, java.lang.String);
+ method public org.w3c.dom.Node getNextSibling();
+ method public org.w3c.dom.Node getNode();
+ method public java.lang.String getSystemId();
+ method public void setNextSibling(org.w3c.dom.Node);
+ method public void setNode(org.w3c.dom.Node);
+ method public void setSystemId(java.lang.String);
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.dom.DOMResult/feature";
+ }
+
+ public class DOMSource implements javax.xml.transform.Source {
+ ctor public DOMSource();
+ ctor public DOMSource(org.w3c.dom.Node);
+ ctor public DOMSource(org.w3c.dom.Node, java.lang.String);
+ method public org.w3c.dom.Node getNode();
+ method public java.lang.String getSystemId();
+ method public void setNode(org.w3c.dom.Node);
+ method public void setSystemId(java.lang.String);
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.dom.DOMSource/feature";
+ }
+
+}
+
+package javax.xml.transform.sax {
+
+ public class SAXResult implements javax.xml.transform.Result {
+ ctor public SAXResult();
+ ctor public SAXResult(org.xml.sax.ContentHandler);
+ method public org.xml.sax.ContentHandler getHandler();
+ method public org.xml.sax.ext.LexicalHandler getLexicalHandler();
+ method public java.lang.String getSystemId();
+ method public void setHandler(org.xml.sax.ContentHandler);
+ method public void setLexicalHandler(org.xml.sax.ext.LexicalHandler);
+ method public void setSystemId(java.lang.String);
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.sax.SAXResult/feature";
+ }
+
+ public class SAXSource implements javax.xml.transform.Source {
+ ctor public SAXSource();
+ ctor public SAXSource(org.xml.sax.XMLReader, org.xml.sax.InputSource);
+ ctor public SAXSource(org.xml.sax.InputSource);
+ method public org.xml.sax.InputSource getInputSource();
+ method public java.lang.String getSystemId();
+ method public org.xml.sax.XMLReader getXMLReader();
+ method public void setInputSource(org.xml.sax.InputSource);
+ method public void setSystemId(java.lang.String);
+ method public void setXMLReader(org.xml.sax.XMLReader);
+ method public static org.xml.sax.InputSource sourceToInputSource(javax.xml.transform.Source);
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.sax.SAXSource/feature";
+ }
+
+ public abstract class SAXTransformerFactory extends javax.xml.transform.TransformerFactory {
+ ctor protected SAXTransformerFactory();
+ method public abstract javax.xml.transform.sax.TemplatesHandler newTemplatesHandler() throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract javax.xml.transform.sax.TransformerHandler newTransformerHandler(javax.xml.transform.Source) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract javax.xml.transform.sax.TransformerHandler newTransformerHandler(javax.xml.transform.Templates) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract javax.xml.transform.sax.TransformerHandler newTransformerHandler() throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract org.xml.sax.XMLFilter newXMLFilter(javax.xml.transform.Source) throws javax.xml.transform.TransformerConfigurationException;
+ method public abstract org.xml.sax.XMLFilter newXMLFilter(javax.xml.transform.Templates) throws javax.xml.transform.TransformerConfigurationException;
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.sax.SAXTransformerFactory/feature";
+ field public static final java.lang.String FEATURE_XMLFILTER = "http://javax.xml.transform.sax.SAXTransformerFactory/feature/xmlfilter";
+ }
+
+ public abstract interface TemplatesHandler implements org.xml.sax.ContentHandler {
+ method public abstract java.lang.String getSystemId();
+ method public abstract javax.xml.transform.Templates getTemplates();
+ method public abstract void setSystemId(java.lang.String);
+ }
+
+ public abstract interface TransformerHandler implements org.xml.sax.ContentHandler org.xml.sax.DTDHandler org.xml.sax.ext.LexicalHandler {
+ method public abstract java.lang.String getSystemId();
+ method public abstract javax.xml.transform.Transformer getTransformer();
+ method public abstract void setResult(javax.xml.transform.Result) throws java.lang.IllegalArgumentException;
+ method public abstract void setSystemId(java.lang.String);
+ }
+
+}
+
+package javax.xml.transform.stream {
+
+ public class StreamResult implements javax.xml.transform.Result {
+ ctor public StreamResult();
+ ctor public StreamResult(java.io.OutputStream);
+ ctor public StreamResult(java.io.Writer);
+ ctor public StreamResult(java.lang.String);
+ ctor public StreamResult(java.io.File);
+ method public java.io.OutputStream getOutputStream();
+ method public java.lang.String getSystemId();
+ method public java.io.Writer getWriter();
+ method public void setOutputStream(java.io.OutputStream);
+ method public void setSystemId(java.lang.String);
+ method public void setSystemId(java.io.File);
+ method public void setWriter(java.io.Writer);
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.stream.StreamResult/feature";
+ }
+
+ public class StreamSource implements javax.xml.transform.Source {
+ ctor public StreamSource();
+ ctor public StreamSource(java.io.InputStream);
+ ctor public StreamSource(java.io.InputStream, java.lang.String);
+ ctor public StreamSource(java.io.Reader);
+ ctor public StreamSource(java.io.Reader, java.lang.String);
+ ctor public StreamSource(java.lang.String);
+ ctor public StreamSource(java.io.File);
+ method public java.io.InputStream getInputStream();
+ method public java.lang.String getPublicId();
+ method public java.io.Reader getReader();
+ method public java.lang.String getSystemId();
+ method public void setInputStream(java.io.InputStream);
+ method public void setPublicId(java.lang.String);
+ method public void setReader(java.io.Reader);
+ method public void setSystemId(java.lang.String);
+ method public void setSystemId(java.io.File);
+ field public static final java.lang.String FEATURE = "http://javax.xml.transform.stream.StreamSource/feature";
+ }
+
+}
+
+package javax.xml.validation {
+
+ public abstract class Schema {
+ ctor protected Schema();
+ method public abstract javax.xml.validation.Validator newValidator();
+ method public abstract javax.xml.validation.ValidatorHandler newValidatorHandler();
+ }
+
+ public abstract class SchemaFactory {
+ ctor protected SchemaFactory();
+ method public abstract org.xml.sax.ErrorHandler getErrorHandler();
+ method public boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract org.w3c.dom.ls.LSResourceResolver getResourceResolver();
+ method public abstract boolean isSchemaLanguageSupported(java.lang.String);
+ method public static javax.xml.validation.SchemaFactory newInstance(java.lang.String);
+ method public static javax.xml.validation.SchemaFactory newInstance(java.lang.String, java.lang.String, java.lang.ClassLoader);
+ method public javax.xml.validation.Schema newSchema(javax.xml.transform.Source) throws org.xml.sax.SAXException;
+ method public javax.xml.validation.Schema newSchema(java.io.File) throws org.xml.sax.SAXException;
+ method public javax.xml.validation.Schema newSchema(java.net.URL) throws org.xml.sax.SAXException;
+ method public abstract javax.xml.validation.Schema newSchema(javax.xml.transform.Source[]) throws org.xml.sax.SAXException;
+ method public abstract javax.xml.validation.Schema newSchema() throws org.xml.sax.SAXException;
+ method public abstract void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract void setResourceResolver(org.w3c.dom.ls.LSResourceResolver);
+ }
+
+ public abstract class SchemaFactoryLoader {
+ ctor protected SchemaFactoryLoader();
+ method public abstract javax.xml.validation.SchemaFactory newFactory(java.lang.String);
+ }
+
+ public abstract class TypeInfoProvider {
+ ctor protected TypeInfoProvider();
+ method public abstract org.w3c.dom.TypeInfo getAttributeTypeInfo(int);
+ method public abstract org.w3c.dom.TypeInfo getElementTypeInfo();
+ method public abstract boolean isIdAttribute(int);
+ method public abstract boolean isSpecified(int);
+ }
+
+ public abstract class Validator {
+ ctor protected Validator();
+ method public abstract org.xml.sax.ErrorHandler getErrorHandler();
+ method public boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract org.w3c.dom.ls.LSResourceResolver getResourceResolver();
+ method public abstract void reset();
+ method public abstract void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract void setResourceResolver(org.w3c.dom.ls.LSResourceResolver);
+ method public void validate(javax.xml.transform.Source) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract void validate(javax.xml.transform.Source, javax.xml.transform.Result) throws java.io.IOException, org.xml.sax.SAXException;
+ }
+
+ public abstract class ValidatorHandler implements org.xml.sax.ContentHandler {
+ ctor protected ValidatorHandler();
+ method public abstract org.xml.sax.ContentHandler getContentHandler();
+ method public abstract org.xml.sax.ErrorHandler getErrorHandler();
+ method public boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract org.w3c.dom.ls.LSResourceResolver getResourceResolver();
+ method public abstract javax.xml.validation.TypeInfoProvider getTypeInfoProvider();
+ method public abstract void setContentHandler(org.xml.sax.ContentHandler);
+ method public abstract void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract void setResourceResolver(org.w3c.dom.ls.LSResourceResolver);
+ }
+
+}
+
+package javax.xml.xpath {
+
+ public abstract interface XPath {
+ method public abstract javax.xml.xpath.XPathExpression compile(java.lang.String) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.Object evaluate(java.lang.String, java.lang.Object, javax.xml.namespace.QName) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.String evaluate(java.lang.String, java.lang.Object) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.Object evaluate(java.lang.String, org.xml.sax.InputSource, javax.xml.namespace.QName) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.String evaluate(java.lang.String, org.xml.sax.InputSource) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract javax.xml.namespace.NamespaceContext getNamespaceContext();
+ method public abstract javax.xml.xpath.XPathFunctionResolver getXPathFunctionResolver();
+ method public abstract javax.xml.xpath.XPathVariableResolver getXPathVariableResolver();
+ method public abstract void reset();
+ method public abstract void setNamespaceContext(javax.xml.namespace.NamespaceContext);
+ method public abstract void setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver);
+ method public abstract void setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver);
+ }
+
+ public class XPathConstants {
+ field public static final javax.xml.namespace.QName BOOLEAN;
+ field public static final java.lang.String DOM_OBJECT_MODEL = "http://java.sun.com/jaxp/xpath/dom";
+ field public static final javax.xml.namespace.QName NODE;
+ field public static final javax.xml.namespace.QName NODESET;
+ field public static final javax.xml.namespace.QName NUMBER;
+ field public static final javax.xml.namespace.QName STRING;
+ }
+
+ public class XPathException extends java.lang.Exception {
+ ctor public XPathException(java.lang.String);
+ ctor public XPathException(java.lang.Throwable);
+ }
+
+ public abstract interface XPathExpression {
+ method public abstract java.lang.Object evaluate(java.lang.Object, javax.xml.namespace.QName) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.String evaluate(java.lang.Object) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.Object evaluate(org.xml.sax.InputSource, javax.xml.namespace.QName) throws javax.xml.xpath.XPathExpressionException;
+ method public abstract java.lang.String evaluate(org.xml.sax.InputSource) throws javax.xml.xpath.XPathExpressionException;
+ }
+
+ public class XPathExpressionException extends javax.xml.xpath.XPathException {
+ ctor public XPathExpressionException(java.lang.String);
+ ctor public XPathExpressionException(java.lang.Throwable);
+ }
+
+ public abstract class XPathFactory {
+ ctor protected XPathFactory();
+ method public abstract boolean getFeature(java.lang.String) throws javax.xml.xpath.XPathFactoryConfigurationException;
+ method public abstract boolean isObjectModelSupported(java.lang.String);
+ method public static final javax.xml.xpath.XPathFactory newInstance();
+ method public static final javax.xml.xpath.XPathFactory newInstance(java.lang.String) throws javax.xml.xpath.XPathFactoryConfigurationException;
+ method public static javax.xml.xpath.XPathFactory newInstance(java.lang.String, java.lang.String, java.lang.ClassLoader) throws javax.xml.xpath.XPathFactoryConfigurationException;
+ method public abstract javax.xml.xpath.XPath newXPath();
+ method public abstract void setFeature(java.lang.String, boolean) throws javax.xml.xpath.XPathFactoryConfigurationException;
+ method public abstract void setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver);
+ method public abstract void setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver);
+ field public static final java.lang.String DEFAULT_OBJECT_MODEL_URI = "http://java.sun.com/jaxp/xpath/dom";
+ field public static final java.lang.String DEFAULT_PROPERTY_NAME = "javax.xml.xpath.XPathFactory";
+ }
+
+ public class XPathFactoryConfigurationException extends javax.xml.xpath.XPathException {
+ ctor public XPathFactoryConfigurationException(java.lang.String);
+ ctor public XPathFactoryConfigurationException(java.lang.Throwable);
+ }
+
+ public abstract interface XPathFunction {
+ method public abstract java.lang.Object evaluate(java.util.List) throws javax.xml.xpath.XPathFunctionException;
+ }
+
+ public class XPathFunctionException extends javax.xml.xpath.XPathExpressionException {
+ ctor public XPathFunctionException(java.lang.String);
+ ctor public XPathFunctionException(java.lang.Throwable);
+ }
+
+ public abstract interface XPathFunctionResolver {
+ method public abstract javax.xml.xpath.XPathFunction resolveFunction(javax.xml.namespace.QName, int);
+ }
+
+ public abstract interface XPathVariableResolver {
+ method public abstract java.lang.Object resolveVariable(javax.xml.namespace.QName);
+ }
+
+}
+
+package junit.framework {
+
+ public class Assert {
+ ctor protected Assert();
+ method public static void assertEquals(java.lang.String, java.lang.Object, java.lang.Object);
+ method public static void assertEquals(java.lang.Object, java.lang.Object);
+ method public static void assertEquals(java.lang.String, java.lang.String, java.lang.String);
+ method public static void assertEquals(java.lang.String, java.lang.String);
+ method public static void assertEquals(java.lang.String, double, double, double);
+ method public static void assertEquals(double, double, double);
+ method public static void assertEquals(java.lang.String, float, float, float);
+ method public static void assertEquals(float, float, float);
+ method public static void assertEquals(java.lang.String, long, long);
+ method public static void assertEquals(long, long);
+ method public static void assertEquals(java.lang.String, boolean, boolean);
+ method public static void assertEquals(boolean, boolean);
+ method public static void assertEquals(java.lang.String, byte, byte);
+ method public static void assertEquals(byte, byte);
+ method public static void assertEquals(java.lang.String, char, char);
+ method public static void assertEquals(char, char);
+ method public static void assertEquals(java.lang.String, short, short);
+ method public static void assertEquals(short, short);
+ method public static void assertEquals(java.lang.String, int, int);
+ method public static void assertEquals(int, int);
+ method public static void assertFalse(java.lang.String, boolean);
+ method public static void assertFalse(boolean);
+ method public static void assertNotNull(java.lang.Object);
+ method public static void assertNotNull(java.lang.String, java.lang.Object);
+ method public static void assertNotSame(java.lang.String, java.lang.Object, java.lang.Object);
+ method public static void assertNotSame(java.lang.Object, java.lang.Object);
+ method public static void assertNull(java.lang.Object);
+ method public static void assertNull(java.lang.String, java.lang.Object);
+ method public static void assertSame(java.lang.String, java.lang.Object, java.lang.Object);
+ method public static void assertSame(java.lang.Object, java.lang.Object);
+ method public static void assertTrue(java.lang.String, boolean);
+ method public static void assertTrue(boolean);
+ method public static void fail(java.lang.String);
+ method public static void fail();
+ method public static void failNotEquals(java.lang.String, java.lang.Object, java.lang.Object);
+ method public static void failNotSame(java.lang.String, java.lang.Object, java.lang.Object);
+ method public static void failSame(java.lang.String);
+ method public static java.lang.String format(java.lang.String, java.lang.Object, java.lang.Object);
+ }
+
+ public class AssertionFailedError extends java.lang.AssertionError {
+ ctor public AssertionFailedError();
+ ctor public AssertionFailedError(java.lang.String);
+ }
+
+ public class ComparisonFailure extends junit.framework.AssertionFailedError {
+ ctor public ComparisonFailure(java.lang.String, java.lang.String, java.lang.String);
+ method public java.lang.String getActual();
+ method public java.lang.String getExpected();
+ }
+
+ public abstract interface Protectable {
+ method public abstract void protect() throws java.lang.Throwable;
+ }
+
+ public abstract interface Test {
+ method public abstract int countTestCases();
+ method public abstract void run(junit.framework.TestResult);
+ }
+
+ public abstract class TestCase extends junit.framework.Assert implements junit.framework.Test {
+ ctor public TestCase();
+ ctor public TestCase(java.lang.String);
+ method public int countTestCases();
+ method protected junit.framework.TestResult createResult();
+ method public java.lang.String getName();
+ method public junit.framework.TestResult run();
+ method public void run(junit.framework.TestResult);
+ method public void runBare() throws java.lang.Throwable;
+ method protected void runTest() throws java.lang.Throwable;
+ method public void setName(java.lang.String);
+ method protected void setUp() throws java.lang.Exception;
+ method protected void tearDown() throws java.lang.Exception;
+ }
+
+ public class TestFailure {
+ ctor public TestFailure(junit.framework.Test, java.lang.Throwable);
+ method public java.lang.String exceptionMessage();
+ method public junit.framework.Test failedTest();
+ method public boolean isFailure();
+ method public java.lang.Throwable thrownException();
+ method public java.lang.String trace();
+ field protected junit.framework.Test fFailedTest;
+ field protected java.lang.Throwable fThrownException;
+ }
+
+ public abstract interface TestListener {
+ method public abstract void addError(junit.framework.Test, java.lang.Throwable);
+ method public abstract void addFailure(junit.framework.Test, junit.framework.AssertionFailedError);
+ method public abstract void endTest(junit.framework.Test);
+ method public abstract void startTest(junit.framework.Test);
+ }
+
+ public class TestResult {
+ ctor public TestResult();
+ method public synchronized void addError(junit.framework.Test, java.lang.Throwable);
+ method public synchronized void addFailure(junit.framework.Test, junit.framework.AssertionFailedError);
+ method public synchronized void addListener(junit.framework.TestListener);
+ method public void endTest(junit.framework.Test);
+ method public synchronized int errorCount();
+ method public synchronized java.util.Enumeration<junit.framework.TestFailure> errors();
+ method public synchronized int failureCount();
+ method public synchronized java.util.Enumeration<junit.framework.TestFailure> failures();
+ method public synchronized void removeListener(junit.framework.TestListener);
+ method protected void run(junit.framework.TestCase);
+ method public synchronized int runCount();
+ method public void runProtected(junit.framework.Test, junit.framework.Protectable);
+ method public synchronized boolean shouldStop();
+ method public void startTest(junit.framework.Test);
+ method public synchronized void stop();
+ method public synchronized boolean wasSuccessful();
+ field protected java.util.Vector<junit.framework.TestFailure> fErrors;
+ field protected java.util.Vector<junit.framework.TestFailure> fFailures;
+ field protected java.util.Vector<junit.framework.TestListener> fListeners;
+ field protected int fRunTests;
+ }
+
+ public class TestSuite implements junit.framework.Test {
+ ctor public TestSuite();
+ ctor public TestSuite(java.lang.Class<?>);
+ ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>, java.lang.String);
+ ctor public TestSuite(java.lang.String);
+ ctor public TestSuite(java.lang.Class<?>...);
+ ctor public TestSuite(java.lang.Class<? extends junit.framework.TestCase>[], java.lang.String);
+ method public void addTest(junit.framework.Test);
+ method public void addTestSuite(java.lang.Class<? extends junit.framework.TestCase>);
+ method public int countTestCases();
+ method public static junit.framework.Test createTest(java.lang.Class<?>, java.lang.String);
+ method public java.lang.String getName();
+ method public static java.lang.reflect.Constructor<?> getTestConstructor(java.lang.Class<?>) throws java.lang.NoSuchMethodException;
+ method public void run(junit.framework.TestResult);
+ method public void runTest(junit.framework.Test, junit.framework.TestResult);
+ method public void setName(java.lang.String);
+ method public junit.framework.Test testAt(int);
+ method public int testCount();
+ method public java.util.Enumeration<junit.framework.Test> tests();
+ method public static junit.framework.Test warning(java.lang.String);
+ }
+
+}
+
+package junit.runner {
+
+ public abstract class BaseTestRunner implements junit.framework.TestListener {
+ ctor public BaseTestRunner();
+ method public synchronized void addError(junit.framework.Test, java.lang.Throwable);
+ method public synchronized void addFailure(junit.framework.Test, junit.framework.AssertionFailedError);
+ method protected void clearStatus();
+ method public java.lang.String elapsedTimeAsString(long);
+ method public synchronized void endTest(junit.framework.Test);
+ method public java.lang.String extractClassName(java.lang.String);
+ method public static java.lang.String getFilteredTrace(java.lang.Throwable);
+ method public static java.lang.String getFilteredTrace(java.lang.String);
+ method public deprecated junit.runner.TestSuiteLoader getLoader();
+ method public static java.lang.String getPreference(java.lang.String);
+ method public static int getPreference(java.lang.String, int);
+ method protected static java.util.Properties getPreferences();
+ method public junit.framework.Test getTest(java.lang.String);
+ method public static deprecated boolean inVAJava();
+ method protected java.lang.Class<?> loadSuiteClass(java.lang.String) throws java.lang.ClassNotFoundException;
+ method protected java.lang.String processArguments(java.lang.String[]);
+ method protected abstract void runFailed(java.lang.String);
+ method public static void savePreferences() throws java.io.IOException;
+ method public void setLoading(boolean);
+ method public void setPreference(java.lang.String, java.lang.String);
+ method protected static void setPreferences(java.util.Properties);
+ method protected static boolean showStackRaw();
+ method public synchronized void startTest(junit.framework.Test);
+ method public abstract void testEnded(java.lang.String);
+ method public abstract void testFailed(int, junit.framework.Test, java.lang.Throwable);
+ method public abstract void testStarted(java.lang.String);
+ method public static java.lang.String truncate(java.lang.String);
+ method protected boolean useReloadingTestSuiteLoader();
+ field public static final java.lang.String SUITE_METHODNAME = "suite";
+ }
+
+ public abstract interface TestSuiteLoader {
+ method public abstract java.lang.Class load(java.lang.String) throws java.lang.ClassNotFoundException;
+ method public abstract java.lang.Class reload(java.lang.Class) throws java.lang.ClassNotFoundException;
+ }
+
+ public class Version {
+ method public static java.lang.String id();
+ }
+
+}
+
+package org.apache.http.conn {
+
+ public deprecated class ConnectTimeoutException extends java.io.InterruptedIOException {
+ ctor public ConnectTimeoutException();
+ ctor public ConnectTimeoutException(java.lang.String);
+ }
+
+}
+
+package org.apache.http.conn.scheme {
+
+ public abstract deprecated interface HostNameResolver {
+ method public abstract java.net.InetAddress resolve(java.lang.String) throws java.io.IOException;
+ }
+
+ public abstract deprecated interface LayeredSocketFactory implements org.apache.http.conn.scheme.SocketFactory {
+ method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException, java.net.UnknownHostException;
+ }
+
+ public abstract deprecated interface SocketFactory {
+ method public abstract java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws org.apache.http.conn.ConnectTimeoutException, java.io.IOException, java.net.UnknownHostException;
+ method public abstract java.net.Socket createSocket() throws java.io.IOException;
+ method public abstract boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
+ }
+
+}
+
+package org.apache.http.conn.ssl {
+
+ public abstract deprecated class AbstractVerifier implements org.apache.http.conn.ssl.X509HostnameVerifier {
+ ctor public AbstractVerifier();
+ method public static boolean acceptableCountryWildcard(java.lang.String);
+ method public static int countDots(java.lang.String);
+ method public static java.lang.String[] getCNs(java.security.cert.X509Certificate);
+ method public static java.lang.String[] getDNSSubjectAlts(java.security.cert.X509Certificate);
+ method public final void verify(java.lang.String, javax.net.ssl.SSLSocket) throws java.io.IOException;
+ method public final boolean verify(java.lang.String, javax.net.ssl.SSLSession);
+ method public final void verify(java.lang.String, java.security.cert.X509Certificate) throws javax.net.ssl.SSLException;
+ method public final void verify(java.lang.String, java.lang.String[], java.lang.String[], boolean) throws javax.net.ssl.SSLException;
+ }
+
+ public deprecated class AllowAllHostnameVerifier extends org.apache.http.conn.ssl.AbstractVerifier {
+ ctor public AllowAllHostnameVerifier();
+ method public final java.lang.String toString();
+ method public final void verify(java.lang.String, java.lang.String[], java.lang.String[]);
+ }
+
+ public deprecated class BrowserCompatHostnameVerifier extends org.apache.http.conn.ssl.AbstractVerifier {
+ ctor public BrowserCompatHostnameVerifier();
+ method public final java.lang.String toString();
+ method public final void verify(java.lang.String, java.lang.String[], java.lang.String[]) throws javax.net.ssl.SSLException;
+ }
+
+ public deprecated class SSLSocketFactory implements org.apache.http.conn.scheme.LayeredSocketFactory {
+ ctor public SSLSocketFactory(java.lang.String, java.security.KeyStore, java.lang.String, java.security.KeyStore, java.security.SecureRandom, org.apache.http.conn.scheme.HostNameResolver) throws java.security.KeyManagementException, java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ ctor public SSLSocketFactory(java.security.KeyStore, java.lang.String, java.security.KeyStore) throws java.security.KeyManagementException, java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ ctor public SSLSocketFactory(java.security.KeyStore, java.lang.String) throws java.security.KeyManagementException, java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ ctor public SSLSocketFactory(java.security.KeyStore) throws java.security.KeyManagementException, java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.UnrecoverableKeyException;
+ method public java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+ method public java.net.Socket createSocket() throws java.io.IOException;
+ method public java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException, java.net.UnknownHostException;
+ method public org.apache.http.conn.ssl.X509HostnameVerifier getHostnameVerifier();
+ method public static org.apache.http.conn.ssl.SSLSocketFactory getSocketFactory();
+ method public boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
+ method public void setHostnameVerifier(org.apache.http.conn.ssl.X509HostnameVerifier);
+ field public static final org.apache.http.conn.ssl.X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER;
+ field public static final org.apache.http.conn.ssl.X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER;
+ field public static final java.lang.String SSL = "SSL";
+ field public static final java.lang.String SSLV2 = "SSLv2";
+ field public static final org.apache.http.conn.ssl.X509HostnameVerifier STRICT_HOSTNAME_VERIFIER;
+ field public static final java.lang.String TLS = "TLS";
+ }
+
+ public deprecated class StrictHostnameVerifier extends org.apache.http.conn.ssl.AbstractVerifier {
+ ctor public StrictHostnameVerifier();
+ method public final java.lang.String toString();
+ method public final void verify(java.lang.String, java.lang.String[], java.lang.String[]) throws javax.net.ssl.SSLException;
+ }
+
+ public abstract deprecated interface X509HostnameVerifier implements javax.net.ssl.HostnameVerifier {
+ method public abstract boolean verify(java.lang.String, javax.net.ssl.SSLSession);
+ method public abstract void verify(java.lang.String, javax.net.ssl.SSLSocket) throws java.io.IOException;
+ method public abstract void verify(java.lang.String, java.security.cert.X509Certificate) throws javax.net.ssl.SSLException;
+ method public abstract void verify(java.lang.String, java.lang.String[], java.lang.String[]) throws javax.net.ssl.SSLException;
+ }
+
+}
+
+package org.apache.http.params {
+
+ public abstract deprecated interface CoreConnectionPNames {
+ field public static final java.lang.String CONNECTION_TIMEOUT = "http.connection.timeout";
+ field public static final java.lang.String MAX_HEADER_COUNT = "http.connection.max-header-count";
+ field public static final java.lang.String MAX_LINE_LENGTH = "http.connection.max-line-length";
+ field public static final java.lang.String SOCKET_BUFFER_SIZE = "http.socket.buffer-size";
+ field public static final java.lang.String SO_LINGER = "http.socket.linger";
+ field public static final java.lang.String SO_TIMEOUT = "http.socket.timeout";
+ field public static final java.lang.String STALE_CONNECTION_CHECK = "http.connection.stalecheck";
+ field public static final java.lang.String TCP_NODELAY = "http.tcp.nodelay";
+ }
+
+ public final deprecated class HttpConnectionParams implements org.apache.http.params.CoreConnectionPNames {
+ method public static int getConnectionTimeout(org.apache.http.params.HttpParams);
+ method public static int getLinger(org.apache.http.params.HttpParams);
+ method public static int getSoTimeout(org.apache.http.params.HttpParams);
+ method public static int getSocketBufferSize(org.apache.http.params.HttpParams);
+ method public static boolean getTcpNoDelay(org.apache.http.params.HttpParams);
+ method public static boolean isStaleCheckingEnabled(org.apache.http.params.HttpParams);
+ method public static void setConnectionTimeout(org.apache.http.params.HttpParams, int);
+ method public static void setLinger(org.apache.http.params.HttpParams, int);
+ method public static void setSoTimeout(org.apache.http.params.HttpParams, int);
+ method public static void setSocketBufferSize(org.apache.http.params.HttpParams, int);
+ method public static void setStaleCheckingEnabled(org.apache.http.params.HttpParams, boolean);
+ method public static void setTcpNoDelay(org.apache.http.params.HttpParams, boolean);
+ }
+
+ public abstract deprecated interface HttpParams {
+ method public abstract org.apache.http.params.HttpParams copy();
+ method public abstract boolean getBooleanParameter(java.lang.String, boolean);
+ method public abstract double getDoubleParameter(java.lang.String, double);
+ method public abstract int getIntParameter(java.lang.String, int);
+ method public abstract long getLongParameter(java.lang.String, long);
+ method public abstract java.lang.Object getParameter(java.lang.String);
+ method public abstract boolean isParameterFalse(java.lang.String);
+ method public abstract boolean isParameterTrue(java.lang.String);
+ method public abstract boolean removeParameter(java.lang.String);
+ method public abstract org.apache.http.params.HttpParams setBooleanParameter(java.lang.String, boolean);
+ method public abstract org.apache.http.params.HttpParams setDoubleParameter(java.lang.String, double);
+ method public abstract org.apache.http.params.HttpParams setIntParameter(java.lang.String, int);
+ method public abstract org.apache.http.params.HttpParams setLongParameter(java.lang.String, long);
+ method public abstract org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object);
+ }
+
+}
+
+package org.json {
+
+ public class JSONArray {
+ ctor public JSONArray();
+ ctor public JSONArray(java.util.Collection);
+ ctor public JSONArray(org.json.JSONTokener) throws org.json.JSONException;
+ ctor public JSONArray(java.lang.String) throws org.json.JSONException;
+ ctor public JSONArray(java.lang.Object) throws org.json.JSONException;
+ method public java.lang.Object get(int) throws org.json.JSONException;
+ method public boolean getBoolean(int) throws org.json.JSONException;
+ method public double getDouble(int) throws org.json.JSONException;
+ method public int getInt(int) throws org.json.JSONException;
+ method public org.json.JSONArray getJSONArray(int) throws org.json.JSONException;
+ method public org.json.JSONObject getJSONObject(int) throws org.json.JSONException;
+ method public long getLong(int) throws org.json.JSONException;
+ method public java.lang.String getString(int) throws org.json.JSONException;
+ method public boolean isNull(int);
+ method public java.lang.String join(java.lang.String) throws org.json.JSONException;
+ method public int length();
+ method public java.lang.Object opt(int);
+ method public boolean optBoolean(int);
+ method public boolean optBoolean(int, boolean);
+ method public double optDouble(int);
+ method public double optDouble(int, double);
+ method public int optInt(int);
+ method public int optInt(int, int);
+ method public org.json.JSONArray optJSONArray(int);
+ method public org.json.JSONObject optJSONObject(int);
+ method public long optLong(int);
+ method public long optLong(int, long);
+ method public java.lang.String optString(int);
+ method public java.lang.String optString(int, java.lang.String);
+ method public org.json.JSONArray put(boolean);
+ method public org.json.JSONArray put(double) throws org.json.JSONException;
+ method public org.json.JSONArray put(int);
+ method public org.json.JSONArray put(long);
+ method public org.json.JSONArray put(java.lang.Object);
+ method public org.json.JSONArray put(int, boolean) throws org.json.JSONException;
+ method public org.json.JSONArray put(int, double) throws org.json.JSONException;
+ method public org.json.JSONArray put(int, int) throws org.json.JSONException;
+ method public org.json.JSONArray put(int, long) throws org.json.JSONException;
+ method public org.json.JSONArray put(int, java.lang.Object) throws org.json.JSONException;
+ method public java.lang.Object remove(int);
+ method public org.json.JSONObject toJSONObject(org.json.JSONArray) throws org.json.JSONException;
+ method public java.lang.String toString(int) throws org.json.JSONException;
+ }
+
+ public class JSONException extends java.lang.Exception {
+ ctor public JSONException(java.lang.String);
+ }
+
+ public class JSONObject {
+ ctor public JSONObject();
+ ctor public JSONObject(java.util.Map);
+ ctor public JSONObject(org.json.JSONTokener) throws org.json.JSONException;
+ ctor public JSONObject(java.lang.String) throws org.json.JSONException;
+ ctor public JSONObject(org.json.JSONObject, java.lang.String[]) throws org.json.JSONException;
+ method public org.json.JSONObject accumulate(java.lang.String, java.lang.Object) throws org.json.JSONException;
+ method public java.lang.Object get(java.lang.String) throws org.json.JSONException;
+ method public boolean getBoolean(java.lang.String) throws org.json.JSONException;
+ method public double getDouble(java.lang.String) throws org.json.JSONException;
+ method public int getInt(java.lang.String) throws org.json.JSONException;
+ method public org.json.JSONArray getJSONArray(java.lang.String) throws org.json.JSONException;
+ method public org.json.JSONObject getJSONObject(java.lang.String) throws org.json.JSONException;
+ method public long getLong(java.lang.String) throws org.json.JSONException;
+ method public java.lang.String getString(java.lang.String) throws org.json.JSONException;
+ method public boolean has(java.lang.String);
+ method public boolean isNull(java.lang.String);
+ method public java.util.Iterator<java.lang.String> keys();
+ method public int length();
+ method public org.json.JSONArray names();
+ method public static java.lang.String numberToString(java.lang.Number) throws org.json.JSONException;
+ method public java.lang.Object opt(java.lang.String);
+ method public boolean optBoolean(java.lang.String);
+ method public boolean optBoolean(java.lang.String, boolean);
+ method public double optDouble(java.lang.String);
+ method public double optDouble(java.lang.String, double);
+ method public int optInt(java.lang.String);
+ method public int optInt(java.lang.String, int);
+ method public org.json.JSONArray optJSONArray(java.lang.String);
+ method public org.json.JSONObject optJSONObject(java.lang.String);
+ method public long optLong(java.lang.String);
+ method public long optLong(java.lang.String, long);
+ method public java.lang.String optString(java.lang.String);
+ method public java.lang.String optString(java.lang.String, java.lang.String);
+ method public org.json.JSONObject put(java.lang.String, boolean) throws org.json.JSONException;
+ method public org.json.JSONObject put(java.lang.String, double) throws org.json.JSONException;
+ method public org.json.JSONObject put(java.lang.String, int) throws org.json.JSONException;
+ method public org.json.JSONObject put(java.lang.String, long) throws org.json.JSONException;
+ method public org.json.JSONObject put(java.lang.String, java.lang.Object) throws org.json.JSONException;
+ method public org.json.JSONObject putOpt(java.lang.String, java.lang.Object) throws org.json.JSONException;
+ method public static java.lang.String quote(java.lang.String);
+ method public java.lang.Object remove(java.lang.String);
+ method public org.json.JSONArray toJSONArray(org.json.JSONArray) throws org.json.JSONException;
+ method public java.lang.String toString(int) throws org.json.JSONException;
+ method public static java.lang.Object wrap(java.lang.Object);
+ field public static final java.lang.Object NULL;
+ }
+
+ public class JSONStringer {
+ ctor public JSONStringer();
+ method public org.json.JSONStringer array() throws org.json.JSONException;
+ method public org.json.JSONStringer endArray() throws org.json.JSONException;
+ method public org.json.JSONStringer endObject() throws org.json.JSONException;
+ method public org.json.JSONStringer key(java.lang.String) throws org.json.JSONException;
+ method public org.json.JSONStringer object() throws org.json.JSONException;
+ method public org.json.JSONStringer value(java.lang.Object) throws org.json.JSONException;
+ method public org.json.JSONStringer value(boolean) throws org.json.JSONException;
+ method public org.json.JSONStringer value(double) throws org.json.JSONException;
+ method public org.json.JSONStringer value(long) throws org.json.JSONException;
+ }
+
+ public class JSONTokener {
+ ctor public JSONTokener(java.lang.String);
+ method public void back();
+ method public static int dehexchar(char);
+ method public boolean more();
+ method public char next();
+ method public char next(char) throws org.json.JSONException;
+ method public java.lang.String next(int) throws org.json.JSONException;
+ method public char nextClean() throws org.json.JSONException;
+ method public java.lang.String nextString(char) throws org.json.JSONException;
+ method public java.lang.String nextTo(java.lang.String);
+ method public java.lang.String nextTo(char);
+ method public java.lang.Object nextValue() throws org.json.JSONException;
+ method public void skipPast(java.lang.String);
+ method public char skipTo(char);
+ method public org.json.JSONException syntaxError(java.lang.String);
+ }
+
+}
+
+package org.w3c.dom {
+
+ public abstract interface Attr implements org.w3c.dom.Node {
+ method public abstract java.lang.String getName();
+ method public abstract org.w3c.dom.Element getOwnerElement();
+ method public abstract org.w3c.dom.TypeInfo getSchemaTypeInfo();
+ method public abstract boolean getSpecified();
+ method public abstract java.lang.String getValue();
+ method public abstract boolean isId();
+ method public abstract void setValue(java.lang.String) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface CDATASection implements org.w3c.dom.Text {
+ }
+
+ public abstract interface CharacterData implements org.w3c.dom.Node {
+ method public abstract void appendData(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void deleteData(int, int) throws org.w3c.dom.DOMException;
+ method public abstract java.lang.String getData() throws org.w3c.dom.DOMException;
+ method public abstract int getLength();
+ method public abstract void insertData(int, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void replaceData(int, int, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void setData(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract java.lang.String substringData(int, int) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface Comment implements org.w3c.dom.CharacterData {
+ }
+
+ public abstract interface DOMConfiguration {
+ method public abstract boolean canSetParameter(java.lang.String, java.lang.Object);
+ method public abstract java.lang.Object getParameter(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.DOMStringList getParameterNames();
+ method public abstract void setParameter(java.lang.String, java.lang.Object) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface DOMError {
+ method public abstract org.w3c.dom.DOMLocator getLocation();
+ method public abstract java.lang.String getMessage();
+ method public abstract java.lang.Object getRelatedData();
+ method public abstract java.lang.Object getRelatedException();
+ method public abstract short getSeverity();
+ method public abstract java.lang.String getType();
+ field public static final short SEVERITY_ERROR = 2; // 0x2
+ field public static final short SEVERITY_FATAL_ERROR = 3; // 0x3
+ field public static final short SEVERITY_WARNING = 1; // 0x1
+ }
+
+ public abstract interface DOMErrorHandler {
+ method public abstract boolean handleError(org.w3c.dom.DOMError);
+ }
+
+ public class DOMException extends java.lang.RuntimeException {
+ ctor public DOMException(short, java.lang.String);
+ field public static final short DOMSTRING_SIZE_ERR = 2; // 0x2
+ field public static final short HIERARCHY_REQUEST_ERR = 3; // 0x3
+ field public static final short INDEX_SIZE_ERR = 1; // 0x1
+ field public static final short INUSE_ATTRIBUTE_ERR = 10; // 0xa
+ field public static final short INVALID_ACCESS_ERR = 15; // 0xf
+ field public static final short INVALID_CHARACTER_ERR = 5; // 0x5
+ field public static final short INVALID_MODIFICATION_ERR = 13; // 0xd
+ field public static final short INVALID_STATE_ERR = 11; // 0xb
+ field public static final short NAMESPACE_ERR = 14; // 0xe
+ field public static final short NOT_FOUND_ERR = 8; // 0x8
+ field public static final short NOT_SUPPORTED_ERR = 9; // 0x9
+ field public static final short NO_DATA_ALLOWED_ERR = 6; // 0x6
+ field public static final short NO_MODIFICATION_ALLOWED_ERR = 7; // 0x7
+ field public static final short SYNTAX_ERR = 12; // 0xc
+ field public static final short TYPE_MISMATCH_ERR = 17; // 0x11
+ field public static final short VALIDATION_ERR = 16; // 0x10
+ field public static final short WRONG_DOCUMENT_ERR = 4; // 0x4
+ field public short code;
+ }
+
+ public abstract interface DOMImplementation {
+ method public abstract org.w3c.dom.Document createDocument(java.lang.String, java.lang.String, org.w3c.dom.DocumentType) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.DocumentType createDocumentType(java.lang.String, java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract java.lang.Object getFeature(java.lang.String, java.lang.String);
+ method public abstract boolean hasFeature(java.lang.String, java.lang.String);
+ }
+
+ public abstract interface DOMImplementationList {
+ method public abstract int getLength();
+ method public abstract org.w3c.dom.DOMImplementation item(int);
+ }
+
+ public abstract interface DOMImplementationSource {
+ method public abstract org.w3c.dom.DOMImplementation getDOMImplementation(java.lang.String);
+ method public abstract org.w3c.dom.DOMImplementationList getDOMImplementationList(java.lang.String);
+ }
+
+ public abstract interface DOMLocator {
+ method public abstract int getByteOffset();
+ method public abstract int getColumnNumber();
+ method public abstract int getLineNumber();
+ method public abstract org.w3c.dom.Node getRelatedNode();
+ method public abstract java.lang.String getUri();
+ method public abstract int getUtf16Offset();
+ }
+
+ public abstract interface DOMStringList {
+ method public abstract boolean contains(java.lang.String);
+ method public abstract int getLength();
+ method public abstract java.lang.String item(int);
+ }
+
+ public abstract interface Document implements org.w3c.dom.Node {
+ method public abstract org.w3c.dom.Node adoptNode(org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Attr createAttribute(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Attr createAttributeNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.CDATASection createCDATASection(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Comment createComment(java.lang.String);
+ method public abstract org.w3c.dom.DocumentFragment createDocumentFragment();
+ method public abstract org.w3c.dom.Element createElement(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Element createElementNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.EntityReference createEntityReference(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.ProcessingInstruction createProcessingInstruction(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Text createTextNode(java.lang.String);
+ method public abstract org.w3c.dom.DocumentType getDoctype();
+ method public abstract org.w3c.dom.Element getDocumentElement();
+ method public abstract java.lang.String getDocumentURI();
+ method public abstract org.w3c.dom.DOMConfiguration getDomConfig();
+ method public abstract org.w3c.dom.Element getElementById(java.lang.String);
+ method public abstract org.w3c.dom.NodeList getElementsByTagName(java.lang.String);
+ method public abstract org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String);
+ method public abstract org.w3c.dom.DOMImplementation getImplementation();
+ method public abstract java.lang.String getInputEncoding();
+ method public abstract boolean getStrictErrorChecking();
+ method public abstract java.lang.String getXmlEncoding();
+ method public abstract boolean getXmlStandalone();
+ method public abstract java.lang.String getXmlVersion();
+ method public abstract org.w3c.dom.Node importNode(org.w3c.dom.Node, boolean) throws org.w3c.dom.DOMException;
+ method public abstract void normalizeDocument();
+ method public abstract org.w3c.dom.Node renameNode(org.w3c.dom.Node, java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void setDocumentURI(java.lang.String);
+ method public abstract void setStrictErrorChecking(boolean);
+ method public abstract void setXmlStandalone(boolean) throws org.w3c.dom.DOMException;
+ method public abstract void setXmlVersion(java.lang.String) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface DocumentFragment implements org.w3c.dom.Node {
+ }
+
+ public abstract interface DocumentType implements org.w3c.dom.Node {
+ method public abstract org.w3c.dom.NamedNodeMap getEntities();
+ method public abstract java.lang.String getInternalSubset();
+ method public abstract java.lang.String getName();
+ method public abstract org.w3c.dom.NamedNodeMap getNotations();
+ method public abstract java.lang.String getPublicId();
+ method public abstract java.lang.String getSystemId();
+ }
+
+ public abstract interface Element implements org.w3c.dom.Node {
+ method public abstract java.lang.String getAttribute(java.lang.String);
+ method public abstract java.lang.String getAttributeNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Attr getAttributeNode(java.lang.String);
+ method public abstract org.w3c.dom.Attr getAttributeNodeNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.NodeList getElementsByTagName(java.lang.String);
+ method public abstract org.w3c.dom.NodeList getElementsByTagNameNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.TypeInfo getSchemaTypeInfo();
+ method public abstract java.lang.String getTagName();
+ method public abstract boolean hasAttribute(java.lang.String);
+ method public abstract boolean hasAttributeNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void removeAttribute(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void removeAttributeNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Attr removeAttributeNode(org.w3c.dom.Attr) throws org.w3c.dom.DOMException;
+ method public abstract void setAttribute(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void setAttributeNS(java.lang.String, java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Attr setAttributeNode(org.w3c.dom.Attr) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Attr setAttributeNodeNS(org.w3c.dom.Attr) throws org.w3c.dom.DOMException;
+ method public abstract void setIdAttribute(java.lang.String, boolean) throws org.w3c.dom.DOMException;
+ method public abstract void setIdAttributeNS(java.lang.String, java.lang.String, boolean) throws org.w3c.dom.DOMException;
+ method public abstract void setIdAttributeNode(org.w3c.dom.Attr, boolean) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface Entity implements org.w3c.dom.Node {
+ method public abstract java.lang.String getInputEncoding();
+ method public abstract java.lang.String getNotationName();
+ method public abstract java.lang.String getPublicId();
+ method public abstract java.lang.String getSystemId();
+ method public abstract java.lang.String getXmlEncoding();
+ method public abstract java.lang.String getXmlVersion();
+ }
+
+ public abstract interface EntityReference implements org.w3c.dom.Node {
+ }
+
+ public abstract interface NameList {
+ method public abstract boolean contains(java.lang.String);
+ method public abstract boolean containsNS(java.lang.String, java.lang.String);
+ method public abstract int getLength();
+ method public abstract java.lang.String getName(int);
+ method public abstract java.lang.String getNamespaceURI(int);
+ }
+
+ public abstract interface NamedNodeMap {
+ method public abstract int getLength();
+ method public abstract org.w3c.dom.Node getNamedItem(java.lang.String);
+ method public abstract org.w3c.dom.Node getNamedItemNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Node item(int);
+ method public abstract org.w3c.dom.Node removeNamedItem(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Node removeNamedItemNS(java.lang.String, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Node setNamedItem(org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Node setNamedItemNS(org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface Node {
+ method public abstract org.w3c.dom.Node appendChild(org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Node cloneNode(boolean);
+ method public abstract short compareDocumentPosition(org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.NamedNodeMap getAttributes();
+ method public abstract java.lang.String getBaseURI();
+ method public abstract org.w3c.dom.NodeList getChildNodes();
+ method public abstract java.lang.Object getFeature(java.lang.String, java.lang.String);
+ method public abstract org.w3c.dom.Node getFirstChild();
+ method public abstract org.w3c.dom.Node getLastChild();
+ method public abstract java.lang.String getLocalName();
+ method public abstract java.lang.String getNamespaceURI();
+ method public abstract org.w3c.dom.Node getNextSibling();
+ method public abstract java.lang.String getNodeName();
+ method public abstract short getNodeType();
+ method public abstract java.lang.String getNodeValue() throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Document getOwnerDocument();
+ method public abstract org.w3c.dom.Node getParentNode();
+ method public abstract java.lang.String getPrefix();
+ method public abstract org.w3c.dom.Node getPreviousSibling();
+ method public abstract java.lang.String getTextContent() throws org.w3c.dom.DOMException;
+ method public abstract java.lang.Object getUserData(java.lang.String);
+ method public abstract boolean hasAttributes();
+ method public abstract boolean hasChildNodes();
+ method public abstract org.w3c.dom.Node insertBefore(org.w3c.dom.Node, org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract boolean isDefaultNamespace(java.lang.String);
+ method public abstract boolean isEqualNode(org.w3c.dom.Node);
+ method public abstract boolean isSameNode(org.w3c.dom.Node);
+ method public abstract boolean isSupported(java.lang.String, java.lang.String);
+ method public abstract java.lang.String lookupNamespaceURI(java.lang.String);
+ method public abstract java.lang.String lookupPrefix(java.lang.String);
+ method public abstract void normalize();
+ method public abstract org.w3c.dom.Node removeChild(org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Node replaceChild(org.w3c.dom.Node, org.w3c.dom.Node) throws org.w3c.dom.DOMException;
+ method public abstract void setNodeValue(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void setPrefix(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract void setTextContent(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract java.lang.Object setUserData(java.lang.String, java.lang.Object, org.w3c.dom.UserDataHandler);
+ field public static final short ATTRIBUTE_NODE = 2; // 0x2
+ field public static final short CDATA_SECTION_NODE = 4; // 0x4
+ field public static final short COMMENT_NODE = 8; // 0x8
+ field public static final short DOCUMENT_FRAGMENT_NODE = 11; // 0xb
+ field public static final short DOCUMENT_NODE = 9; // 0x9
+ field public static final short DOCUMENT_POSITION_CONTAINED_BY = 16; // 0x10
+ field public static final short DOCUMENT_POSITION_CONTAINS = 8; // 0x8
+ field public static final short DOCUMENT_POSITION_DISCONNECTED = 1; // 0x1
+ field public static final short DOCUMENT_POSITION_FOLLOWING = 4; // 0x4
+ field public static final short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32; // 0x20
+ field public static final short DOCUMENT_POSITION_PRECEDING = 2; // 0x2
+ field public static final short DOCUMENT_TYPE_NODE = 10; // 0xa
+ field public static final short ELEMENT_NODE = 1; // 0x1
+ field public static final short ENTITY_NODE = 6; // 0x6
+ field public static final short ENTITY_REFERENCE_NODE = 5; // 0x5
+ field public static final short NOTATION_NODE = 12; // 0xc
+ field public static final short PROCESSING_INSTRUCTION_NODE = 7; // 0x7
+ field public static final short TEXT_NODE = 3; // 0x3
+ }
+
+ public abstract interface NodeList {
+ method public abstract int getLength();
+ method public abstract org.w3c.dom.Node item(int);
+ }
+
+ public abstract interface Notation implements org.w3c.dom.Node {
+ method public abstract java.lang.String getPublicId();
+ method public abstract java.lang.String getSystemId();
+ }
+
+ public abstract interface ProcessingInstruction implements org.w3c.dom.Node {
+ method public abstract java.lang.String getData();
+ method public abstract java.lang.String getTarget();
+ method public abstract void setData(java.lang.String) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface Text implements org.w3c.dom.CharacterData {
+ method public abstract java.lang.String getWholeText();
+ method public abstract boolean isElementContentWhitespace();
+ method public abstract org.w3c.dom.Text replaceWholeText(java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.Text splitText(int) throws org.w3c.dom.DOMException;
+ }
+
+ public abstract interface TypeInfo {
+ method public abstract java.lang.String getTypeName();
+ method public abstract java.lang.String getTypeNamespace();
+ method public abstract boolean isDerivedFrom(java.lang.String, java.lang.String, int);
+ field public static final int DERIVATION_EXTENSION = 2; // 0x2
+ field public static final int DERIVATION_LIST = 8; // 0x8
+ field public static final int DERIVATION_RESTRICTION = 1; // 0x1
+ field public static final int DERIVATION_UNION = 4; // 0x4
+ }
+
+ public abstract interface UserDataHandler {
+ method public abstract void handle(short, java.lang.String, java.lang.Object, org.w3c.dom.Node, org.w3c.dom.Node);
+ field public static final short NODE_ADOPTED = 5; // 0x5
+ field public static final short NODE_CLONED = 1; // 0x1
+ field public static final short NODE_DELETED = 3; // 0x3
+ field public static final short NODE_IMPORTED = 2; // 0x2
+ field public static final short NODE_RENAMED = 4; // 0x4
+ }
+
+}
+
+package org.w3c.dom.ls {
+
+ public abstract interface DOMImplementationLS {
+ method public abstract org.w3c.dom.ls.LSInput createLSInput();
+ method public abstract org.w3c.dom.ls.LSOutput createLSOutput();
+ method public abstract org.w3c.dom.ls.LSParser createLSParser(short, java.lang.String) throws org.w3c.dom.DOMException;
+ method public abstract org.w3c.dom.ls.LSSerializer createLSSerializer();
+ field public static final short MODE_ASYNCHRONOUS = 2; // 0x2
+ field public static final short MODE_SYNCHRONOUS = 1; // 0x1
+ }
+
+ public class LSException extends java.lang.RuntimeException {
+ ctor public LSException(short, java.lang.String);
+ field public static final short PARSE_ERR = 81; // 0x51
+ field public static final short SERIALIZE_ERR = 82; // 0x52
+ field public short code;
+ }
+
+ public abstract interface LSInput {
+ method public abstract java.lang.String getBaseURI();
+ method public abstract java.io.InputStream getByteStream();
+ method public abstract boolean getCertifiedText();
+ method public abstract java.io.Reader getCharacterStream();
+ method public abstract java.lang.String getEncoding();
+ method public abstract java.lang.String getPublicId();
+ method public abstract java.lang.String getStringData();
+ method public abstract java.lang.String getSystemId();
+ method public abstract void setBaseURI(java.lang.String);
+ method public abstract void setByteStream(java.io.InputStream);
+ method public abstract void setCertifiedText(boolean);
+ method public abstract void setCharacterStream(java.io.Reader);
+ method public abstract void setEncoding(java.lang.String);
+ method public abstract void setPublicId(java.lang.String);
+ method public abstract void setStringData(java.lang.String);
+ method public abstract void setSystemId(java.lang.String);
+ }
+
+ public abstract interface LSOutput {
+ method public abstract java.io.OutputStream getByteStream();
+ method public abstract java.io.Writer getCharacterStream();
+ method public abstract java.lang.String getEncoding();
+ method public abstract java.lang.String getSystemId();
+ method public abstract void setByteStream(java.io.OutputStream);
+ method public abstract void setCharacterStream(java.io.Writer);
+ method public abstract void setEncoding(java.lang.String);
+ method public abstract void setSystemId(java.lang.String);
+ }
+
+ public abstract interface LSParser {
+ method public abstract void abort();
+ method public abstract boolean getAsync();
+ method public abstract boolean getBusy();
+ method public abstract org.w3c.dom.DOMConfiguration getDomConfig();
+ method public abstract org.w3c.dom.ls.LSParserFilter getFilter();
+ method public abstract org.w3c.dom.Document parse(org.w3c.dom.ls.LSInput) throws org.w3c.dom.DOMException, org.w3c.dom.ls.LSException;
+ method public abstract org.w3c.dom.Document parseURI(java.lang.String) throws org.w3c.dom.DOMException, org.w3c.dom.ls.LSException;
+ method public abstract org.w3c.dom.Node parseWithContext(org.w3c.dom.ls.LSInput, org.w3c.dom.Node, short) throws org.w3c.dom.DOMException, org.w3c.dom.ls.LSException;
+ method public abstract void setFilter(org.w3c.dom.ls.LSParserFilter);
+ field public static final short ACTION_APPEND_AS_CHILDREN = 1; // 0x1
+ field public static final short ACTION_INSERT_AFTER = 4; // 0x4
+ field public static final short ACTION_INSERT_BEFORE = 3; // 0x3
+ field public static final short ACTION_REPLACE = 5; // 0x5
+ field public static final short ACTION_REPLACE_CHILDREN = 2; // 0x2
+ }
+
+ public abstract interface LSParserFilter {
+ method public abstract short acceptNode(org.w3c.dom.Node);
+ method public abstract int getWhatToShow();
+ method public abstract short startElement(org.w3c.dom.Element);
+ field public static final short FILTER_ACCEPT = 1; // 0x1
+ field public static final short FILTER_INTERRUPT = 4; // 0x4
+ field public static final short FILTER_REJECT = 2; // 0x2
+ field public static final short FILTER_SKIP = 3; // 0x3
+ }
+
+ public abstract interface LSResourceResolver {
+ method public abstract org.w3c.dom.ls.LSInput resolveResource(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ }
+
+ public abstract interface LSSerializer {
+ method public abstract org.w3c.dom.DOMConfiguration getDomConfig();
+ method public abstract java.lang.String getNewLine();
+ method public abstract void setNewLine(java.lang.String);
+ method public abstract boolean write(org.w3c.dom.Node, org.w3c.dom.ls.LSOutput) throws org.w3c.dom.ls.LSException;
+ method public abstract java.lang.String writeToString(org.w3c.dom.Node) throws org.w3c.dom.DOMException, org.w3c.dom.ls.LSException;
+ method public abstract boolean writeToURI(org.w3c.dom.Node, java.lang.String) throws org.w3c.dom.ls.LSException;
+ }
+
+}
+
+package org.xml.sax {
+
+ public abstract deprecated interface AttributeList {
+ method public abstract int getLength();
+ method public abstract java.lang.String getName(int);
+ method public abstract java.lang.String getType(int);
+ method public abstract java.lang.String getType(java.lang.String);
+ method public abstract java.lang.String getValue(int);
+ method public abstract java.lang.String getValue(java.lang.String);
+ }
+
+ public abstract interface Attributes {
+ method public abstract int getIndex(java.lang.String, java.lang.String);
+ method public abstract int getIndex(java.lang.String);
+ method public abstract int getLength();
+ method public abstract java.lang.String getLocalName(int);
+ method public abstract java.lang.String getQName(int);
+ method public abstract java.lang.String getType(int);
+ method public abstract java.lang.String getType(java.lang.String, java.lang.String);
+ method public abstract java.lang.String getType(java.lang.String);
+ method public abstract java.lang.String getURI(int);
+ method public abstract java.lang.String getValue(int);
+ method public abstract java.lang.String getValue(java.lang.String, java.lang.String);
+ method public abstract java.lang.String getValue(java.lang.String);
+ }
+
+ public abstract interface ContentHandler {
+ method public abstract void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public abstract void endDocument() throws org.xml.sax.SAXException;
+ method public abstract void endElement(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void endPrefixMapping(java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public abstract void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void setDocumentLocator(org.xml.sax.Locator);
+ method public abstract void skippedEntity(java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void startDocument() throws org.xml.sax.SAXException;
+ method public abstract void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) throws org.xml.sax.SAXException;
+ method public abstract void startPrefixMapping(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ }
+
+ public abstract interface DTDHandler {
+ method public abstract void notationDecl(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ }
+
+ public abstract deprecated interface DocumentHandler {
+ method public abstract void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public abstract void endDocument() throws org.xml.sax.SAXException;
+ method public abstract void endElement(java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public abstract void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void setDocumentLocator(org.xml.sax.Locator);
+ method public abstract void startDocument() throws org.xml.sax.SAXException;
+ method public abstract void startElement(java.lang.String, org.xml.sax.AttributeList) throws org.xml.sax.SAXException;
+ }
+
+ public abstract interface EntityResolver {
+ method public abstract org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ }
+
+ public abstract interface ErrorHandler {
+ method public abstract void error(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public abstract void fatalError(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public abstract void warning(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ }
+
+ public deprecated class HandlerBase implements org.xml.sax.DTDHandler org.xml.sax.DocumentHandler org.xml.sax.EntityResolver org.xml.sax.ErrorHandler {
+ ctor public HandlerBase();
+ method public void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public void endDocument() throws org.xml.sax.SAXException;
+ method public void endElement(java.lang.String) throws org.xml.sax.SAXException;
+ method public void error(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public void fatalError(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public void notationDecl(java.lang.String, java.lang.String, java.lang.String);
+ method public void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void setDocumentLocator(org.xml.sax.Locator);
+ method public void startDocument() throws org.xml.sax.SAXException;
+ method public void startElement(java.lang.String, org.xml.sax.AttributeList) throws org.xml.sax.SAXException;
+ method public void unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public void warning(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ }
+
+ public class InputSource {
+ ctor public InputSource();
+ ctor public InputSource(java.lang.String);
+ ctor public InputSource(java.io.InputStream);
+ ctor public InputSource(java.io.Reader);
+ method public java.io.InputStream getByteStream();
+ method public java.io.Reader getCharacterStream();
+ method public java.lang.String getEncoding();
+ method public java.lang.String getPublicId();
+ method public java.lang.String getSystemId();
+ method public void setByteStream(java.io.InputStream);
+ method public void setCharacterStream(java.io.Reader);
+ method public void setEncoding(java.lang.String);
+ method public void setPublicId(java.lang.String);
+ method public void setSystemId(java.lang.String);
+ }
+
+ public abstract interface Locator {
+ method public abstract int getColumnNumber();
+ method public abstract int getLineNumber();
+ method public abstract java.lang.String getPublicId();
+ method public abstract java.lang.String getSystemId();
+ }
+
+ public abstract deprecated interface Parser {
+ method public abstract void parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract void parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract void setDTDHandler(org.xml.sax.DTDHandler);
+ method public abstract void setDocumentHandler(org.xml.sax.DocumentHandler);
+ method public abstract void setEntityResolver(org.xml.sax.EntityResolver);
+ method public abstract void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public abstract void setLocale(java.util.Locale) throws org.xml.sax.SAXException;
+ }
+
+ public class SAXException extends java.lang.Exception {
+ ctor public SAXException();
+ ctor public SAXException(java.lang.String);
+ ctor public SAXException(java.lang.Exception);
+ ctor public SAXException(java.lang.String, java.lang.Exception);
+ method public java.lang.Exception getException();
+ }
+
+ public class SAXNotRecognizedException extends org.xml.sax.SAXException {
+ ctor public SAXNotRecognizedException();
+ ctor public SAXNotRecognizedException(java.lang.String);
+ }
+
+ public class SAXNotSupportedException extends org.xml.sax.SAXException {
+ ctor public SAXNotSupportedException();
+ ctor public SAXNotSupportedException(java.lang.String);
+ }
+
+ public class SAXParseException extends org.xml.sax.SAXException {
+ ctor public SAXParseException(java.lang.String, org.xml.sax.Locator);
+ ctor public SAXParseException(java.lang.String, org.xml.sax.Locator, java.lang.Exception);
+ ctor public SAXParseException(java.lang.String, java.lang.String, java.lang.String, int, int);
+ ctor public SAXParseException(java.lang.String, java.lang.String, java.lang.String, int, int, java.lang.Exception);
+ method public int getColumnNumber();
+ method public int getLineNumber();
+ method public java.lang.String getPublicId();
+ method public java.lang.String getSystemId();
+ }
+
+ public abstract interface XMLFilter implements org.xml.sax.XMLReader {
+ method public abstract org.xml.sax.XMLReader getParent();
+ method public abstract void setParent(org.xml.sax.XMLReader);
+ }
+
+ public abstract interface XMLReader {
+ method public abstract org.xml.sax.ContentHandler getContentHandler();
+ method public abstract org.xml.sax.DTDHandler getDTDHandler();
+ method public abstract org.xml.sax.EntityResolver getEntityResolver();
+ method public abstract org.xml.sax.ErrorHandler getErrorHandler();
+ method public abstract boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract void parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract void parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract void setContentHandler(org.xml.sax.ContentHandler);
+ method public abstract void setDTDHandler(org.xml.sax.DTDHandler);
+ method public abstract void setEntityResolver(org.xml.sax.EntityResolver);
+ method public abstract void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public abstract void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public abstract void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ }
+
+}
+
+package org.xml.sax.ext {
+
+ public abstract interface Attributes2 implements org.xml.sax.Attributes {
+ method public abstract boolean isDeclared(int);
+ method public abstract boolean isDeclared(java.lang.String);
+ method public abstract boolean isDeclared(java.lang.String, java.lang.String);
+ method public abstract boolean isSpecified(int);
+ method public abstract boolean isSpecified(java.lang.String, java.lang.String);
+ method public abstract boolean isSpecified(java.lang.String);
+ }
+
+ public class Attributes2Impl extends org.xml.sax.helpers.AttributesImpl implements org.xml.sax.ext.Attributes2 {
+ ctor public Attributes2Impl();
+ ctor public Attributes2Impl(org.xml.sax.Attributes);
+ method public boolean isDeclared(int);
+ method public boolean isDeclared(java.lang.String, java.lang.String);
+ method public boolean isDeclared(java.lang.String);
+ method public boolean isSpecified(int);
+ method public boolean isSpecified(java.lang.String, java.lang.String);
+ method public boolean isSpecified(java.lang.String);
+ method public void setDeclared(int, boolean);
+ method public void setSpecified(int, boolean);
+ }
+
+ public abstract interface DeclHandler {
+ method public abstract void attributeDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void elementDecl(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void externalEntityDecl(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void internalEntityDecl(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ }
+
+ public class DefaultHandler2 extends org.xml.sax.helpers.DefaultHandler implements org.xml.sax.ext.DeclHandler org.xml.sax.ext.EntityResolver2 org.xml.sax.ext.LexicalHandler {
+ ctor public DefaultHandler2();
+ method public void attributeDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void comment(char[], int, int) throws org.xml.sax.SAXException;
+ method public void elementDecl(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void endCDATA() throws org.xml.sax.SAXException;
+ method public void endDTD() throws org.xml.sax.SAXException;
+ method public void endEntity(java.lang.String) throws org.xml.sax.SAXException;
+ method public void externalEntityDecl(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public org.xml.sax.InputSource getExternalSubset(java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void internalEntityDecl(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void startCDATA() throws org.xml.sax.SAXException;
+ method public void startDTD(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void startEntity(java.lang.String) throws org.xml.sax.SAXException;
+ }
+
+ public abstract interface EntityResolver2 implements org.xml.sax.EntityResolver {
+ method public abstract org.xml.sax.InputSource getExternalSubset(java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public abstract org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ }
+
+ public abstract interface LexicalHandler {
+ method public abstract void comment(char[], int, int) throws org.xml.sax.SAXException;
+ method public abstract void endCDATA() throws org.xml.sax.SAXException;
+ method public abstract void endDTD() throws org.xml.sax.SAXException;
+ method public abstract void endEntity(java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void startCDATA() throws org.xml.sax.SAXException;
+ method public abstract void startDTD(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public abstract void startEntity(java.lang.String) throws org.xml.sax.SAXException;
+ }
+
+ public abstract interface Locator2 implements org.xml.sax.Locator {
+ method public abstract java.lang.String getEncoding();
+ method public abstract java.lang.String getXMLVersion();
+ }
+
+ public class Locator2Impl extends org.xml.sax.helpers.LocatorImpl implements org.xml.sax.ext.Locator2 {
+ ctor public Locator2Impl();
+ ctor public Locator2Impl(org.xml.sax.Locator);
+ method public java.lang.String getEncoding();
+ method public java.lang.String getXMLVersion();
+ method public void setEncoding(java.lang.String);
+ method public void setXMLVersion(java.lang.String);
+ }
+
+}
+
+package org.xml.sax.helpers {
+
+ public deprecated class AttributeListImpl implements org.xml.sax.AttributeList {
+ ctor public AttributeListImpl();
+ ctor public AttributeListImpl(org.xml.sax.AttributeList);
+ method public void addAttribute(java.lang.String, java.lang.String, java.lang.String);
+ method public void clear();
+ method public int getLength();
+ method public java.lang.String getName(int);
+ method public java.lang.String getType(int);
+ method public java.lang.String getType(java.lang.String);
+ method public java.lang.String getValue(int);
+ method public java.lang.String getValue(java.lang.String);
+ method public void removeAttribute(java.lang.String);
+ method public void setAttributeList(org.xml.sax.AttributeList);
+ }
+
+ public class AttributesImpl implements org.xml.sax.Attributes {
+ ctor public AttributesImpl();
+ ctor public AttributesImpl(org.xml.sax.Attributes);
+ method public void addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public void clear();
+ method public int getIndex(java.lang.String, java.lang.String);
+ method public int getIndex(java.lang.String);
+ method public int getLength();
+ method public java.lang.String getLocalName(int);
+ method public java.lang.String getQName(int);
+ method public java.lang.String getType(int);
+ method public java.lang.String getType(java.lang.String, java.lang.String);
+ method public java.lang.String getType(java.lang.String);
+ method public java.lang.String getURI(int);
+ method public java.lang.String getValue(int);
+ method public java.lang.String getValue(java.lang.String, java.lang.String);
+ method public java.lang.String getValue(java.lang.String);
+ method public void removeAttribute(int);
+ method public void setAttribute(int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
+ method public void setAttributes(org.xml.sax.Attributes);
+ method public void setLocalName(int, java.lang.String);
+ method public void setQName(int, java.lang.String);
+ method public void setType(int, java.lang.String);
+ method public void setURI(int, java.lang.String);
+ method public void setValue(int, java.lang.String);
+ }
+
+ public class DefaultHandler implements org.xml.sax.ContentHandler org.xml.sax.DTDHandler org.xml.sax.EntityResolver org.xml.sax.ErrorHandler {
+ ctor public DefaultHandler();
+ method public void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public void endDocument() throws org.xml.sax.SAXException;
+ method public void endElement(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void endPrefixMapping(java.lang.String) throws org.xml.sax.SAXException;
+ method public void error(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public void fatalError(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public void notationDecl(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void setDocumentLocator(org.xml.sax.Locator);
+ method public void skippedEntity(java.lang.String) throws org.xml.sax.SAXException;
+ method public void startDocument() throws org.xml.sax.SAXException;
+ method public void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) throws org.xml.sax.SAXException;
+ method public void startPrefixMapping(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void warning(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ }
+
+ public class LocatorImpl implements org.xml.sax.Locator {
+ ctor public LocatorImpl();
+ ctor public LocatorImpl(org.xml.sax.Locator);
+ method public int getColumnNumber();
+ method public int getLineNumber();
+ method public java.lang.String getPublicId();
+ method public java.lang.String getSystemId();
+ method public void setColumnNumber(int);
+ method public void setLineNumber(int);
+ method public void setPublicId(java.lang.String);
+ method public void setSystemId(java.lang.String);
+ }
+
+ public class NamespaceSupport {
+ ctor public NamespaceSupport();
+ method public boolean declarePrefix(java.lang.String, java.lang.String);
+ method public java.util.Enumeration getDeclaredPrefixes();
+ method public java.lang.String getPrefix(java.lang.String);
+ method public java.util.Enumeration getPrefixes();
+ method public java.util.Enumeration getPrefixes(java.lang.String);
+ method public java.lang.String getURI(java.lang.String);
+ method public boolean isNamespaceDeclUris();
+ method public void popContext();
+ method public java.lang.String[] processName(java.lang.String, java.lang.String[], boolean);
+ method public void pushContext();
+ method public void reset();
+ method public void setNamespaceDeclUris(boolean);
+ field public static final java.lang.String NSDECL = "http://www.w3.org/xmlns/2000/";
+ field public static final java.lang.String XMLNS = "http://www.w3.org/XML/1998/namespace";
+ }
+
+ public class ParserAdapter implements org.xml.sax.DocumentHandler org.xml.sax.XMLReader {
+ ctor public ParserAdapter() throws org.xml.sax.SAXException;
+ ctor public ParserAdapter(org.xml.sax.Parser);
+ method public void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public void endDocument() throws org.xml.sax.SAXException;
+ method public void endElement(java.lang.String) throws org.xml.sax.SAXException;
+ method public org.xml.sax.ContentHandler getContentHandler();
+ method public org.xml.sax.DTDHandler getDTDHandler();
+ method public org.xml.sax.EntityResolver getEntityResolver();
+ method public org.xml.sax.ErrorHandler getErrorHandler();
+ method public boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public void parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void setContentHandler(org.xml.sax.ContentHandler);
+ method public void setDTDHandler(org.xml.sax.DTDHandler);
+ method public void setDocumentLocator(org.xml.sax.Locator);
+ method public void setEntityResolver(org.xml.sax.EntityResolver);
+ method public void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void startDocument() throws org.xml.sax.SAXException;
+ method public void startElement(java.lang.String, org.xml.sax.AttributeList) throws org.xml.sax.SAXException;
+ }
+
+ public deprecated class ParserFactory {
+ method public static org.xml.sax.Parser makeParser() throws java.lang.ClassCastException, java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException, java.lang.NullPointerException;
+ method public static org.xml.sax.Parser makeParser(java.lang.String) throws java.lang.ClassCastException, java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;
+ }
+
+ public class XMLFilterImpl implements org.xml.sax.ContentHandler org.xml.sax.DTDHandler org.xml.sax.EntityResolver org.xml.sax.ErrorHandler org.xml.sax.XMLFilter {
+ ctor public XMLFilterImpl();
+ ctor public XMLFilterImpl(org.xml.sax.XMLReader);
+ method public void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public void endDocument() throws org.xml.sax.SAXException;
+ method public void endElement(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void endPrefixMapping(java.lang.String) throws org.xml.sax.SAXException;
+ method public void error(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public void fatalError(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ method public org.xml.sax.ContentHandler getContentHandler();
+ method public org.xml.sax.DTDHandler getDTDHandler();
+ method public org.xml.sax.EntityResolver getEntityResolver();
+ method public org.xml.sax.ErrorHandler getErrorHandler();
+ method public boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public org.xml.sax.XMLReader getParent();
+ method public java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public void notationDecl(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public org.xml.sax.InputSource resolveEntity(java.lang.String, java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void setContentHandler(org.xml.sax.ContentHandler);
+ method public void setDTDHandler(org.xml.sax.DTDHandler);
+ method public void setDocumentLocator(org.xml.sax.Locator);
+ method public void setEntityResolver(org.xml.sax.EntityResolver);
+ method public void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setParent(org.xml.sax.XMLReader);
+ method public void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void skippedEntity(java.lang.String) throws org.xml.sax.SAXException;
+ method public void startDocument() throws org.xml.sax.SAXException;
+ method public void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) throws org.xml.sax.SAXException;
+ method public void startPrefixMapping(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void warning(org.xml.sax.SAXParseException) throws org.xml.sax.SAXException;
+ }
+
+ public class XMLReaderAdapter implements org.xml.sax.ContentHandler org.xml.sax.Parser {
+ ctor public XMLReaderAdapter() throws org.xml.sax.SAXException;
+ ctor public XMLReaderAdapter(org.xml.sax.XMLReader);
+ method public void characters(char[], int, int) throws org.xml.sax.SAXException;
+ method public void endDocument() throws org.xml.sax.SAXException;
+ method public void endElement(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void endPrefixMapping(java.lang.String);
+ method public void ignorableWhitespace(char[], int, int) throws org.xml.sax.SAXException;
+ method public void parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void processingInstruction(java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ method public void setDTDHandler(org.xml.sax.DTDHandler);
+ method public void setDocumentHandler(org.xml.sax.DocumentHandler);
+ method public void setDocumentLocator(org.xml.sax.Locator);
+ method public void setEntityResolver(org.xml.sax.EntityResolver);
+ method public void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setLocale(java.util.Locale) throws org.xml.sax.SAXException;
+ method public void skippedEntity(java.lang.String) throws org.xml.sax.SAXException;
+ method public void startDocument() throws org.xml.sax.SAXException;
+ method public void startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) throws org.xml.sax.SAXException;
+ method public void startPrefixMapping(java.lang.String, java.lang.String);
+ }
+
+ public final class XMLReaderFactory {
+ method public static org.xml.sax.XMLReader createXMLReader() throws org.xml.sax.SAXException;
+ method public static org.xml.sax.XMLReader createXMLReader(java.lang.String) throws org.xml.sax.SAXException;
+ }
+
+}
+
+package org.xmlpull.v1 {
+
+ public abstract interface XmlPullParser {
+ method public abstract void defineEntityReplacementText(java.lang.String, java.lang.String) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract int getAttributeCount();
+ method public abstract java.lang.String getAttributeName(int);
+ method public abstract java.lang.String getAttributeNamespace(int);
+ method public abstract java.lang.String getAttributePrefix(int);
+ method public abstract java.lang.String getAttributeType(int);
+ method public abstract java.lang.String getAttributeValue(int);
+ method public abstract java.lang.String getAttributeValue(java.lang.String, java.lang.String);
+ method public abstract int getColumnNumber();
+ method public abstract int getDepth();
+ method public abstract int getEventType() throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract boolean getFeature(java.lang.String);
+ method public abstract java.lang.String getInputEncoding();
+ method public abstract int getLineNumber();
+ method public abstract java.lang.String getName();
+ method public abstract java.lang.String getNamespace(java.lang.String);
+ method public abstract java.lang.String getNamespace();
+ method public abstract int getNamespaceCount(int) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract java.lang.String getNamespacePrefix(int) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract java.lang.String getNamespaceUri(int) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract java.lang.String getPositionDescription();
+ method public abstract java.lang.String getPrefix();
+ method public abstract java.lang.Object getProperty(java.lang.String);
+ method public abstract java.lang.String getText();
+ method public abstract char[] getTextCharacters(int[]);
+ method public abstract boolean isAttributeDefault(int);
+ method public abstract boolean isEmptyElementTag() throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract boolean isWhitespace() throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract int next() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public abstract int nextTag() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public abstract java.lang.String nextText() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public abstract int nextToken() throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public abstract void require(int, java.lang.String, java.lang.String) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public abstract void setFeature(java.lang.String, boolean) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract void setInput(java.io.Reader) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract void setInput(java.io.InputStream, java.lang.String) throws org.xmlpull.v1.XmlPullParserException;
+ method public abstract void setProperty(java.lang.String, java.lang.Object) throws org.xmlpull.v1.XmlPullParserException;
+ field public static final int CDSECT = 5; // 0x5
+ field public static final int COMMENT = 9; // 0x9
+ field public static final int DOCDECL = 10; // 0xa
+ field public static final int END_DOCUMENT = 1; // 0x1
+ field public static final int END_TAG = 3; // 0x3
+ field public static final int ENTITY_REF = 6; // 0x6
+ field public static final java.lang.String FEATURE_PROCESS_DOCDECL = "http://xmlpull.org/v1/doc/features.html#process-docdecl";
+ field public static final java.lang.String FEATURE_PROCESS_NAMESPACES = "http://xmlpull.org/v1/doc/features.html#process-namespaces";
+ field public static final java.lang.String FEATURE_REPORT_NAMESPACE_ATTRIBUTES = "http://xmlpull.org/v1/doc/features.html#report-namespace-prefixes";
+ field public static final java.lang.String FEATURE_VALIDATION = "http://xmlpull.org/v1/doc/features.html#validation";
+ field public static final int IGNORABLE_WHITESPACE = 7; // 0x7
+ field public static final java.lang.String NO_NAMESPACE = "";
+ field public static final int PROCESSING_INSTRUCTION = 8; // 0x8
+ field public static final int START_DOCUMENT = 0; // 0x0
+ field public static final int START_TAG = 2; // 0x2
+ field public static final int TEXT = 4; // 0x4
+ field public static final java.lang.String[] TYPES;
+ }
+
+ public class XmlPullParserException extends java.lang.Exception {
+ ctor public XmlPullParserException(java.lang.String);
+ ctor public XmlPullParserException(java.lang.String, org.xmlpull.v1.XmlPullParser, java.lang.Throwable);
+ method public int getColumnNumber();
+ method public java.lang.Throwable getDetail();
+ method public int getLineNumber();
+ field protected int column;
+ field protected java.lang.Throwable detail;
+ field protected int row;
+ }
+
+ public class XmlPullParserFactory {
+ ctor protected XmlPullParserFactory();
+ method public boolean getFeature(java.lang.String);
+ method public boolean isNamespaceAware();
+ method public boolean isValidating();
+ method public static org.xmlpull.v1.XmlPullParserFactory newInstance() throws org.xmlpull.v1.XmlPullParserException;
+ method public static org.xmlpull.v1.XmlPullParserFactory newInstance(java.lang.String, java.lang.Class) throws org.xmlpull.v1.XmlPullParserException;
+ method public org.xmlpull.v1.XmlPullParser newPullParser() throws org.xmlpull.v1.XmlPullParserException;
+ method public org.xmlpull.v1.XmlSerializer newSerializer() throws org.xmlpull.v1.XmlPullParserException;
+ method public void setFeature(java.lang.String, boolean) throws org.xmlpull.v1.XmlPullParserException;
+ method public void setNamespaceAware(boolean);
+ method public void setValidating(boolean);
+ field public static final java.lang.String PROPERTY_NAME = "org.xmlpull.v1.XmlPullParserFactory";
+ field protected java.lang.String classNamesLocation;
+ field protected java.util.HashMap<java.lang.String, java.lang.Boolean> features;
+ field protected java.util.ArrayList parserClasses;
+ field protected java.util.ArrayList serializerClasses;
+ }
+
+ public abstract interface XmlSerializer {
+ method public abstract org.xmlpull.v1.XmlSerializer attribute(java.lang.String, java.lang.String, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void cdsect(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void comment(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void docdecl(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void endDocument() throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract org.xmlpull.v1.XmlSerializer endTag(java.lang.String, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void entityRef(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void flush() throws java.io.IOException;
+ method public abstract int getDepth();
+ method public abstract boolean getFeature(java.lang.String);
+ method public abstract java.lang.String getName();
+ method public abstract java.lang.String getNamespace();
+ method public abstract java.lang.String getPrefix(java.lang.String, boolean) throws java.lang.IllegalArgumentException;
+ method public abstract java.lang.Object getProperty(java.lang.String);
+ method public abstract void ignorableWhitespace(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void processingInstruction(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void setFeature(java.lang.String, boolean) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void setOutput(java.io.OutputStream, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void setOutput(java.io.Writer) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void setPrefix(java.lang.String, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void setProperty(java.lang.String, java.lang.Object) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract void startDocument(java.lang.String, java.lang.Boolean) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract org.xmlpull.v1.XmlSerializer startTag(java.lang.String, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract org.xmlpull.v1.XmlSerializer text(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ method public abstract org.xmlpull.v1.XmlSerializer text(char[], int, int) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
+ }
+
+}
+
+package org.xmlpull.v1.sax2 {
+
+ public class Driver implements org.xml.sax.Attributes org.xml.sax.Locator org.xml.sax.XMLReader {
+ ctor public Driver() throws org.xmlpull.v1.XmlPullParserException;
+ ctor public Driver(org.xmlpull.v1.XmlPullParser) throws org.xmlpull.v1.XmlPullParserException;
+ method public int getColumnNumber();
+ method public org.xml.sax.ContentHandler getContentHandler();
+ method public org.xml.sax.DTDHandler getDTDHandler();
+ method public org.xml.sax.EntityResolver getEntityResolver();
+ method public org.xml.sax.ErrorHandler getErrorHandler();
+ method public boolean getFeature(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public int getIndex(java.lang.String, java.lang.String);
+ method public int getIndex(java.lang.String);
+ method public int getLength();
+ method public int getLineNumber();
+ method public java.lang.String getLocalName(int);
+ method public java.lang.Object getProperty(java.lang.String) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public java.lang.String getPublicId();
+ method public java.lang.String getQName(int);
+ method public java.lang.String getSystemId();
+ method public java.lang.String getType(int);
+ method public java.lang.String getType(java.lang.String, java.lang.String);
+ method public java.lang.String getType(java.lang.String);
+ method public java.lang.String getURI(int);
+ method public java.lang.String getValue(int);
+ method public java.lang.String getValue(java.lang.String, java.lang.String);
+ method public java.lang.String getValue(java.lang.String);
+ method public void parse(org.xml.sax.InputSource) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parse(java.lang.String) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void parseSubTree(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xml.sax.SAXException;
+ method public void setContentHandler(org.xml.sax.ContentHandler);
+ method public void setDTDHandler(org.xml.sax.DTDHandler);
+ method public void setEntityResolver(org.xml.sax.EntityResolver);
+ method public void setErrorHandler(org.xml.sax.ErrorHandler);
+ method public void setFeature(java.lang.String, boolean) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method public void setProperty(java.lang.String, java.lang.Object) throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+ method protected void startElement(java.lang.String, java.lang.String, java.lang.String) throws org.xml.sax.SAXException;
+ field protected static final java.lang.String APACHE_DYNAMIC_VALIDATION_FEATURE = "http://apache.org/xml/features/validation/dynamic";
+ field protected static final java.lang.String APACHE_SCHEMA_VALIDATION_FEATURE = "http://apache.org/xml/features/validation/schema";
+ field protected static final java.lang.String DECLARATION_HANDLER_PROPERTY = "http://xml.org/sax/properties/declaration-handler";
+ field protected static final java.lang.String LEXICAL_HANDLER_PROPERTY = "http://xml.org/sax/properties/lexical-handler";
+ field protected static final java.lang.String NAMESPACES_FEATURE = "http://xml.org/sax/features/namespaces";
+ field protected static final java.lang.String NAMESPACE_PREFIXES_FEATURE = "http://xml.org/sax/features/namespace-prefixes";
+ field protected static final java.lang.String VALIDATION_FEATURE = "http://xml.org/sax/features/validation";
+ field protected org.xml.sax.ContentHandler contentHandler;
+ field protected org.xml.sax.ErrorHandler errorHandler;
+ field protected org.xmlpull.v1.XmlPullParser pp;
+ field protected java.lang.String systemId;
+ }
+
+}
+
diff --git a/api/test-removed.txt b/api/test-removed.txt
new file mode 100644
index 0000000..f12e61e
--- /dev/null
+++ b/api/test-removed.txt
@@ -0,0 +1,258 @@
+package android.app {
+
+ public class Notification implements android.os.Parcelable {
+ method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);
+ }
+
+}
+
+package android.app.admin {
+
+ public class DevicePolicyManager {
+ method public deprecated java.lang.String getDeviceInitializerApp();
+ method public deprecated android.content.ComponentName getDeviceInitializerComponent();
+ }
+
+}
+
+package android.content.pm {
+
+ public class PackageInfo implements android.os.Parcelable {
+ field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
+ }
+
+}
+
+package android.database {
+
+ public abstract class AbstractCursor implements android.database.CrossProcessCursor {
+ field protected java.lang.Long mCurrentRowID;
+ field protected int mRowIdColumnIndex;
+ field protected java.util.HashMap<java.lang.Long, java.util.Map<java.lang.String, java.lang.Object>> mUpdatedRows;
+ }
+
+}
+
+package android.media {
+
+ public class AudioFormat {
+ ctor public AudioFormat();
+ }
+
+}
+
+package android.net {
+
+ public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
+ method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
+ }
+
+}
+
+package android.os {
+
+ public class BatteryManager {
+ ctor public BatteryManager();
+ }
+
+ public final class PowerManager {
+ method public void goToSleep(long);
+ method public deprecated void userActivity(long, boolean);
+ method public void wakeUp(long);
+ }
+
+ public class RecoverySystem {
+ ctor public RecoverySystem();
+ }
+
+ public class UserManager {
+ method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
+ method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
+ method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
+ }
+
+}
+
+package android.provider {
+
+ public class Browser {
+ method public static final void addSearchUrl(android.content.ContentResolver, java.lang.String);
+ method public static final boolean canClearHistory(android.content.ContentResolver);
+ method public static final void clearHistory(android.content.ContentResolver);
+ method public static final void clearSearches(android.content.ContentResolver);
+ method public static final void deleteFromHistory(android.content.ContentResolver, java.lang.String);
+ method public static final void deleteHistoryTimeFrame(android.content.ContentResolver, long, long);
+ method public static final android.database.Cursor getAllBookmarks(android.content.ContentResolver) throws java.lang.IllegalStateException;
+ method public static final android.database.Cursor getAllVisitedUrls(android.content.ContentResolver) throws java.lang.IllegalStateException;
+ method public static final void requestAllIcons(android.content.ContentResolver, java.lang.String, android.webkit.WebIconDatabase.IconListener);
+ method public static final void saveBookmark(android.content.Context, java.lang.String, java.lang.String);
+ method public static final void truncateHistory(android.content.ContentResolver);
+ method public static final void updateVisitedHistory(android.content.ContentResolver, java.lang.String, boolean);
+ field public static final android.net.Uri BOOKMARKS_URI;
+ field public static final java.lang.String[] HISTORY_PROJECTION;
+ field public static final int HISTORY_PROJECTION_BOOKMARK_INDEX = 4; // 0x4
+ field public static final int HISTORY_PROJECTION_DATE_INDEX = 3; // 0x3
+ field public static final int HISTORY_PROJECTION_FAVICON_INDEX = 6; // 0x6
+ field public static final int HISTORY_PROJECTION_ID_INDEX = 0; // 0x0
+ field public static final int HISTORY_PROJECTION_TITLE_INDEX = 5; // 0x5
+ field public static final int HISTORY_PROJECTION_URL_INDEX = 1; // 0x1
+ field public static final int HISTORY_PROJECTION_VISITS_INDEX = 2; // 0x2
+ field public static final java.lang.String[] SEARCHES_PROJECTION;
+ field public static final int SEARCHES_PROJECTION_DATE_INDEX = 2; // 0x2
+ field public static final int SEARCHES_PROJECTION_SEARCH_INDEX = 1; // 0x1
+ field public static final android.net.Uri SEARCHES_URI;
+ field public static final java.lang.String[] TRUNCATE_HISTORY_PROJECTION;
+ field public static final int TRUNCATE_HISTORY_PROJECTION_ID_INDEX = 0; // 0x0
+ field public static final int TRUNCATE_N_OLDEST = 5; // 0x5
+ }
+
+ public static class Browser.BookmarkColumns implements android.provider.BaseColumns {
+ ctor public Browser.BookmarkColumns();
+ field public static final java.lang.String BOOKMARK = "bookmark";
+ field public static final java.lang.String CREATED = "created";
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String FAVICON = "favicon";
+ field public static final java.lang.String THUMBNAIL = "thumbnail";
+ field public static final java.lang.String TITLE = "title";
+ field public static final java.lang.String TOUCH_ICON = "touch_icon";
+ field public static final java.lang.String URL = "url";
+ field public static final java.lang.String USER_ENTERED = "user_entered";
+ field public static final java.lang.String VISITS = "visits";
+ }
+
+ public static class Browser.SearchColumns implements android.provider.BaseColumns {
+ ctor public Browser.SearchColumns();
+ field public static final java.lang.String DATE = "date";
+ field public static final java.lang.String SEARCH = "search";
+ field public static final deprecated java.lang.String URL = "url";
+ }
+
+ public static final deprecated class ContactsContract.Contacts.StreamItems {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items";
+ }
+
+ public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items";
+ }
+
+ public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns {
+ field public static final deprecated java.lang.String PHOTO = "photo";
+ }
+
+ protected static abstract deprecated interface ContactsContract.StreamItemPhotosColumns {
+ field public static final deprecated java.lang.String PHOTO_FILE_ID = "photo_file_id";
+ field public static final deprecated java.lang.String PHOTO_URI = "photo_uri";
+ field public static final deprecated java.lang.String SORT_INDEX = "sort_index";
+ field public static final deprecated java.lang.String STREAM_ITEM_ID = "stream_item_id";
+ field public static final deprecated java.lang.String SYNC1 = "stream_item_photo_sync1";
+ field public static final deprecated java.lang.String SYNC2 = "stream_item_photo_sync2";
+ field public static final deprecated java.lang.String SYNC3 = "stream_item_photo_sync3";
+ field public static final deprecated java.lang.String SYNC4 = "stream_item_photo_sync4";
+ }
+
+ public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns {
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item";
+ field public static final deprecated android.net.Uri CONTENT_LIMIT_URI;
+ field public static final deprecated android.net.Uri CONTENT_PHOTO_URI;
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item";
+ field public static final deprecated android.net.Uri CONTENT_URI;
+ field public static final deprecated java.lang.String MAX_ITEMS = "max_items";
+ }
+
+ public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns {
+ field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo";
+ field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo";
+ field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo";
+ }
+
+ protected static abstract deprecated interface ContactsContract.StreamItemsColumns {
+ field public static final deprecated java.lang.String ACCOUNT_NAME = "account_name";
+ field public static final deprecated java.lang.String ACCOUNT_TYPE = "account_type";
+ field public static final deprecated java.lang.String COMMENTS = "comments";
+ field public static final deprecated java.lang.String CONTACT_ID = "contact_id";
+ field public static final deprecated java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup";
+ field public static final deprecated java.lang.String DATA_SET = "data_set";
+ field public static final deprecated java.lang.String RAW_CONTACT_ID = "raw_contact_id";
+ field public static final deprecated java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id";
+ field public static final deprecated java.lang.String RES_ICON = "icon";
+ field public static final deprecated java.lang.String RES_LABEL = "label";
+ field public static final deprecated java.lang.String RES_PACKAGE = "res_package";
+ field public static final deprecated java.lang.String SYNC1 = "stream_item_sync1";
+ field public static final deprecated java.lang.String SYNC2 = "stream_item_sync2";
+ field public static final deprecated java.lang.String SYNC3 = "stream_item_sync3";
+ field public static final deprecated java.lang.String SYNC4 = "stream_item_sync4";
+ field public static final deprecated java.lang.String TEXT = "text";
+ field public static final deprecated java.lang.String TIMESTAMP = "timestamp";
+ }
+
+ public static final class Settings.System extends android.provider.Settings.NameValueTable {
+ field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";
+ field public static final java.lang.String VOLUME_ALARM = "volume_alarm";
+ field public static final java.lang.String VOLUME_BLUETOOTH_SCO = "volume_bluetooth_sco";
+ field public static final java.lang.String VOLUME_MUSIC = "volume_music";
+ field public static final java.lang.String VOLUME_NOTIFICATION = "volume_notification";
+ field public static final java.lang.String VOLUME_RING = "volume_ring";
+ field public static final java.lang.String[] VOLUME_SETTINGS;
+ field public static final java.lang.String VOLUME_SYSTEM = "volume_system";
+ field public static final java.lang.String VOLUME_VOICE = "volume_voice";
+ }
+
+}
+
+package android.text.format {
+
+ public class DateFormat {
+ field public static final deprecated char AM_PM = 97; // 0x0061 'a'
+ field public static final deprecated char CAPITAL_AM_PM = 65; // 0x0041 'A'
+ field public static final deprecated char DATE = 100; // 0x0064 'd'
+ field public static final deprecated char DAY = 69; // 0x0045 'E'
+ field public static final deprecated char HOUR = 104; // 0x0068 'h'
+ field public static final deprecated char HOUR_OF_DAY = 107; // 0x006b 'k'
+ field public static final deprecated char MINUTE = 109; // 0x006d 'm'
+ field public static final deprecated char MONTH = 77; // 0x004d 'M'
+ field public static final deprecated char QUOTE = 39; // 0x0027 '\''
+ field public static final deprecated char SECONDS = 115; // 0x0073 's'
+ field public static final deprecated char STANDALONE_MONTH = 76; // 0x004c 'L'
+ field public static final deprecated char TIME_ZONE = 122; // 0x007a 'z'
+ field public static final deprecated char YEAR = 121; // 0x0079 'y'
+ }
+
+}
+
+package android.util {
+
+ public deprecated class FloatMath {
+ method public static float ceil(float);
+ method public static float cos(float);
+ method public static float exp(float);
+ method public static float floor(float);
+ method public static float hypot(float, float);
+ method public static float pow(float, float);
+ method public static float sin(float);
+ method public static float sqrt(float);
+ }
+
+}
+
+package android.view {
+
+ public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
+ method protected void initializeFadingEdge(android.content.res.TypedArray);
+ method protected void initializeScrollbars(android.content.res.TypedArray);
+ }
+
+ public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
+ field public static final int TYPE_KEYGUARD = 2004; // 0x7d4
+ }
+
+}
+
+package android.widget {
+
+ public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {
+ method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);
+ method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray);
+ }
+
+}
+
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index 7f33cb5..2ad63b5 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -55,6 +55,7 @@
import android.os.RemoteException;
import android.os.SELinux;
import android.os.ServiceManager;
+import android.os.ShellCommand;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
@@ -64,6 +65,7 @@
import android.view.IWindowManager;
import com.android.internal.os.BaseCommand;
+import com.android.internal.util.HexDump;
import com.android.internal.util.Preconditions;
import java.io.BufferedReader;
@@ -72,6 +74,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
+import java.io.PrintWriter;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collections;
@@ -117,7 +120,8 @@
@Override
public void onShowUsage(PrintStream out) {
- out.println(
+ PrintWriter pw = new PrintWriter(out);
+ pw.println(
"usage: am [subcommand] [options]\n" +
"usage: am start [-D] [-W] [-P <FILE>] [--start-profiler <FILE>]\n" +
" [--sampling INTERVAL] [-R COUNT] [-S]\n" +
@@ -149,7 +153,8 @@
" am to-app-uri [INTENT]\n" +
" am switch-user <USER_ID>\n" +
" am start-user <USER_ID>\n" +
- " am stop-user [-w] <USER_ID>\n" +
+ " am unlock-user <USER_ID> [TOKEN_HEX]\n" +
+ " am stop-user [-w] [-f] <USER_ID>\n" +
" am stack start <DISPLAY_ID> <INTENT>\n" +
" am stack movetask <TASK_ID> <STACK_ID> [true|false]\n" +
" am stack resize <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
@@ -285,6 +290,7 @@
"am stop-user: stop execution of USER_ID, not allowing it to run any\n" +
" code until a later explicit start or switch to it.\n" +
" -w: wait for stop-user to complete.\n" +
+ " -f: force stop even if there are related users that cannot be stopped.\n" +
"\n" +
"am stack start: start a new activity on <DISPLAY_ID> using <INTENT>.\n" +
"\n" +
@@ -337,52 +343,10 @@
"am send-trim-memory: send a memory trim event to a <PROCESS>.\n" +
"\n" +
"am get-current-user: returns id of the current foreground user.\n" +
- "\n" +
- "<INTENT> specifications include these flags and arguments:\n" +
- " [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" +
- " [-c <CATEGORY> [-c <CATEGORY>] ...]\n" +
- " [-e|--es <EXTRA_KEY> <EXTRA_STRING_VALUE> ...]\n" +
- " [--esn <EXTRA_KEY> ...]\n" +
- " [--ez <EXTRA_KEY> <EXTRA_BOOLEAN_VALUE> ...]\n" +
- " [--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]\n" +
- " [--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" +
- " (mutiple extras passed as Integer[])\n" +
- " [--eial <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]\n" +
- " (mutiple extras passed as List<Integer>)\n" +
- " [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" +
- " (mutiple extras passed as Long[])\n" +
- " [--elal <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" +
- " (mutiple extras passed as List<Long>)\n" +
- " [--efa <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]\n" +
- " (mutiple extras passed as Float[])\n" +
- " [--efal <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]\n" +
- " (mutiple extras passed as List<Float>)\n" +
- " [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]\n" +
- " (mutiple extras passed as String[]; to embed a comma into a string,\n" +
- " escape it using \"\\,\")\n" +
- " [--esal <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]\n" +
- " (mutiple extras passed as List<String>; to embed a comma into a string,\n" +
- " escape it using \"\\,\")\n" +
- " [--grant-read-uri-permission] [--grant-write-uri-permission]\n" +
- " [--grant-persistable-uri-permission] [--grant-prefix-uri-permission]\n" +
- " [--debug-log-resolution] [--exclude-stopped-packages]\n" +
- " [--include-stopped-packages]\n" +
- " [--activity-brought-to-front] [--activity-clear-top]\n" +
- " [--activity-clear-when-task-reset] [--activity-exclude-from-recents]\n" +
- " [--activity-launched-from-history] [--activity-multiple-task]\n" +
- " [--activity-no-animation] [--activity-no-history]\n" +
- " [--activity-no-user-action] [--activity-previous-is-top]\n" +
- " [--activity-reorder-to-front] [--activity-reset-task-if-needed]\n" +
- " [--activity-single-top] [--activity-clear-task]\n" +
- " [--activity-task-on-home]\n" +
- " [--receiver-registered-only] [--receiver-replace-pending]\n" +
- " [--selector]\n" +
- " [<URI> | <PACKAGE> | <COMPONENT>]\n"
- );
+ "\n"
+ );
+ Intent.printIntentArgsHelp(pw, "");
+ pw.flush();
}
@Override
@@ -450,6 +414,8 @@
runSwitchUser();
} else if (op.equals("start-user")) {
runStartUserInBackground();
+ } else if (op.equals("unlock-user")) {
+ runUnlockUser();
} else if (op.equals("stop-user")) {
runStopUser();
} else if (op.equals("stack")) {
@@ -486,10 +452,6 @@
}
private Intent makeIntent(int defUser) throws URISyntaxException {
- Intent intent = new Intent();
- Intent baseIntent = intent;
- boolean hasIntentInfo = false;
-
mStartFlags = 0;
mWaitOption = false;
mStopOption = false;
@@ -498,316 +460,38 @@
mSamplingInterval = 0;
mAutoStop = false;
mUserId = defUser;
- Uri data = null;
- String type = null;
- String opt;
- while ((opt=nextOption()) != null) {
- if (opt.equals("-a")) {
- intent.setAction(nextArgRequired());
- if (intent == baseIntent) {
- hasIntentInfo = true;
- }
- } else if (opt.equals("-d")) {
- data = Uri.parse(nextArgRequired());
- if (intent == baseIntent) {
- hasIntentInfo = true;
- }
- } else if (opt.equals("-t")) {
- type = nextArgRequired();
- if (intent == baseIntent) {
- hasIntentInfo = true;
- }
- } else if (opt.equals("-c")) {
- intent.addCategory(nextArgRequired());
- if (intent == baseIntent) {
- hasIntentInfo = true;
- }
- } else if (opt.equals("-e") || opt.equals("--es")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- intent.putExtra(key, value);
- } else if (opt.equals("--esn")) {
- String key = nextArgRequired();
- intent.putExtra(key, (String) null);
- } else if (opt.equals("--ei")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- intent.putExtra(key, Integer.decode(value));
- } else if (opt.equals("--eu")) {
- 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();
- String[] strings = value.split(",");
- int[] list = new int[strings.length];
- for (int i = 0; i < strings.length; i++) {
- list[i] = Integer.decode(strings[i]);
- }
- intent.putExtra(key, list);
- } else if (opt.equals("--eial")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- String[] strings = value.split(",");
- ArrayList<Integer> list = new ArrayList<>(strings.length);
- for (int i = 0; i < strings.length; i++) {
- list.add(Integer.decode(strings[i]));
- }
- intent.putExtra(key, list);
- } else if (opt.equals("--el")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- intent.putExtra(key, Long.valueOf(value));
- } else if (opt.equals("--ela")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- String[] strings = value.split(",");
- long[] list = new long[strings.length];
- for (int i = 0; i < strings.length; i++) {
- list[i] = Long.valueOf(strings[i]);
- }
- intent.putExtra(key, list);
- hasIntentInfo = true;
- } else if (opt.equals("--elal")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- String[] strings = value.split(",");
- ArrayList<Long> list = new ArrayList<>(strings.length);
- for (int i = 0; i < strings.length; i++) {
- list.add(Long.valueOf(strings[i]));
- }
- intent.putExtra(key, list);
- hasIntentInfo = true;
- } else if (opt.equals("--ef")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- intent.putExtra(key, Float.valueOf(value));
- hasIntentInfo = true;
- } else if (opt.equals("--efa")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- String[] strings = value.split(",");
- float[] list = new float[strings.length];
- for (int i = 0; i < strings.length; i++) {
- list[i] = Float.valueOf(strings[i]);
- }
- intent.putExtra(key, list);
- hasIntentInfo = true;
- } else if (opt.equals("--efal")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- String[] strings = value.split(",");
- ArrayList<Float> list = new ArrayList<>(strings.length);
- for (int i = 0; i < strings.length; i++) {
- list.add(Float.valueOf(strings[i]));
- }
- intent.putExtra(key, list);
- hasIntentInfo = true;
- } else if (opt.equals("--esa")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- // Split on commas unless they are preceeded by an escape.
- // The escape character must be escaped for the string and
- // again for the regex, thus four escape characters become one.
- String[] strings = value.split("(?<!\\\\),");
- intent.putExtra(key, strings);
- hasIntentInfo = true;
- } else if (opt.equals("--esal")) {
- String key = nextArgRequired();
- String value = nextArgRequired();
- // Split on commas unless they are preceeded by an escape.
- // The escape character must be escaped for the string and
- // again for the regex, thus four escape characters become one.
- String[] strings = value.split("(?<!\\\\),");
- ArrayList<String> list = new ArrayList<>(strings.length);
- for (int i = 0; i < strings.length; i++) {
- list.add(strings[i]);
- }
- intent.putExtra(key, list);
- hasIntentInfo = true;
- } else if (opt.equals("--ez")) {
- String key = nextArgRequired();
- String value = nextArgRequired().toLowerCase();
- // Boolean.valueOf() results in false for anything that is not "true", which is
- // error-prone in shell commands
- boolean arg;
- if ("true".equals(value) || "t".equals(value)) {
- arg = true;
- } else if ("false".equals(value) || "f".equals(value)) {
- arg = false;
+ return Intent.parseCommandArgs(mArgs, new Intent.CommandOptionHandler() {
+ @Override
+ public boolean handleOption(String opt, ShellCommand cmd) {
+ if (opt.equals("-D")) {
+ mStartFlags |= ActivityManager.START_FLAG_DEBUG;
+ } else if (opt.equals("-W")) {
+ mWaitOption = true;
+ } else if (opt.equals("-P")) {
+ mProfileFile = nextArgRequired();
+ mAutoStop = true;
+ } else if (opt.equals("--start-profiler")) {
+ mProfileFile = nextArgRequired();
+ mAutoStop = false;
+ } else if (opt.equals("--sampling")) {
+ mSamplingInterval = Integer.parseInt(nextArgRequired());
+ } else if (opt.equals("-R")) {
+ mRepeat = Integer.parseInt(nextArgRequired());
+ } else if (opt.equals("-S")) {
+ mStopOption = true;
+ } else if (opt.equals("--track-allocation")) {
+ mStartFlags |= ActivityManager.START_FLAG_TRACK_ALLOCATION;
+ } else if (opt.equals("--user")) {
+ mUserId = parseUserArg(nextArgRequired());
+ } else if (opt.equals("--receiver-permission")) {
+ mReceiverPermission = nextArgRequired();
} else {
- try {
- arg = Integer.decode(value) != 0;
- } catch (NumberFormatException ex) {
- throw new IllegalArgumentException("Invalid boolean value: " + value);
- }
+ return false;
}
-
- intent.putExtra(key, arg);
- } else if (opt.equals("-n")) {
- String str = nextArgRequired();
- ComponentName cn = ComponentName.unflattenFromString(str);
- if (cn == null) throw new IllegalArgumentException("Bad component name: " + str);
- intent.setComponent(cn);
- if (intent == baseIntent) {
- hasIntentInfo = true;
- }
- } else if (opt.equals("-p")) {
- String str = nextArgRequired();
- intent.setPackage(str);
- if (intent == baseIntent) {
- hasIntentInfo = true;
- }
- } else if (opt.equals("-f")) {
- String str = nextArgRequired();
- intent.setFlags(Integer.decode(str).intValue());
- } else if (opt.equals("--grant-read-uri-permission")) {
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- } else if (opt.equals("--grant-write-uri-permission")) {
- intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
- } else if (opt.equals("--grant-persistable-uri-permission")) {
- intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
- } else if (opt.equals("--grant-prefix-uri-permission")) {
- intent.addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
- } else if (opt.equals("--exclude-stopped-packages")) {
- intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
- } else if (opt.equals("--include-stopped-packages")) {
- intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
- } else if (opt.equals("--debug-log-resolution")) {
- intent.addFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION);
- } else if (opt.equals("--activity-brought-to-front")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
- } else if (opt.equals("--activity-clear-top")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- } else if (opt.equals("--activity-clear-when-task-reset")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
- } else if (opt.equals("--activity-exclude-from-recents")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- } else if (opt.equals("--activity-launched-from-history")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY);
- } else if (opt.equals("--activity-multiple-task")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
- } else if (opt.equals("--activity-no-animation")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
- } else if (opt.equals("--activity-no-history")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
- } else if (opt.equals("--activity-no-user-action")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
- } else if (opt.equals("--activity-previous-is-top")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
- } else if (opt.equals("--activity-reorder-to-front")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
- } else if (opt.equals("--activity-reset-task-if-needed")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
- } else if (opt.equals("--activity-single-top")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
- } else if (opt.equals("--activity-clear-task")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- } else if (opt.equals("--activity-task-on-home")) {
- intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);
- } else if (opt.equals("--receiver-registered-only")) {
- intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
- } else if (opt.equals("--receiver-replace-pending")) {
- intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
- } else if (opt.equals("--selector")) {
- intent.setDataAndType(data, type);
- intent = new Intent();
- } else if (opt.equals("-D")) {
- mStartFlags |= ActivityManager.START_FLAG_DEBUG;
- } else if (opt.equals("-W")) {
- mWaitOption = true;
- } else if (opt.equals("-P")) {
- mProfileFile = nextArgRequired();
- mAutoStop = true;
- } else if (opt.equals("--start-profiler")) {
- mProfileFile = nextArgRequired();
- mAutoStop = false;
- } else if (opt.equals("--sampling")) {
- mSamplingInterval = Integer.parseInt(nextArgRequired());
- } else if (opt.equals("-R")) {
- mRepeat = Integer.parseInt(nextArgRequired());
- } else if (opt.equals("-S")) {
- mStopOption = true;
- } else if (opt.equals("--track-allocation")) {
- mStartFlags |= ActivityManager.START_FLAG_TRACK_ALLOCATION;
- } else if (opt.equals("--user")) {
- mUserId = parseUserArg(nextArgRequired());
- } else if (opt.equals("--receiver-permission")) {
- mReceiverPermission = nextArgRequired();
- } else {
- throw new IllegalArgumentException("Unknown option: " + opt);
+ return true;
}
- }
- intent.setDataAndType(data, type);
-
- final boolean hasSelector = intent != baseIntent;
- if (hasSelector) {
- // A selector was specified; fix up.
- baseIntent.setSelector(intent);
- intent = baseIntent;
- }
-
- String arg = nextArg();
- baseIntent = null;
- if (arg == null) {
- if (hasSelector) {
- // If a selector has been specified, and no arguments
- // have been supplied for the main Intent, then we can
- // assume it is ACTION_MAIN CATEGORY_LAUNCHER; we don't
- // need to have a component name specified yet, the
- // selector will take care of that.
- baseIntent = new Intent(Intent.ACTION_MAIN);
- baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
- }
- } else if (arg.indexOf(':') >= 0) {
- // The argument is a URI. Fully parse it, and use that result
- // to fill in any data not specified so far.
- baseIntent = Intent.parseUri(arg, Intent.URI_INTENT_SCHEME
- | Intent.URI_ANDROID_APP_SCHEME | Intent.URI_ALLOW_UNSAFE);
- } else if (arg.indexOf('/') >= 0) {
- // The argument is a component name. Build an Intent to launch
- // it.
- baseIntent = new Intent(Intent.ACTION_MAIN);
- baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
- baseIntent.setComponent(ComponentName.unflattenFromString(arg));
- } else {
- // Assume the argument is a package name.
- baseIntent = new Intent(Intent.ACTION_MAIN);
- baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
- baseIntent.setPackage(arg);
- }
- if (baseIntent != null) {
- Bundle extras = intent.getExtras();
- intent.replaceExtras((Bundle)null);
- Bundle uriExtras = baseIntent.getExtras();
- baseIntent.replaceExtras((Bundle)null);
- if (intent.getAction() != null && baseIntent.getCategories() != null) {
- HashSet<String> cats = new HashSet<String>(baseIntent.getCategories());
- for (String c : cats) {
- baseIntent.removeCategory(c);
- }
- }
- intent.fillIn(baseIntent, Intent.FILL_IN_COMPONENT | Intent.FILL_IN_SELECTOR);
- if (extras == null) {
- extras = uriExtras;
- } else if (uriExtras != null) {
- uriExtras.putAll(extras);
- extras = uriExtras;
- }
- intent.replaceExtras(extras);
- hasIntentInfo = true;
- }
-
- if (!hasIntentInfo) throw new IllegalArgumentException("No intent supplied");
- return intent;
+ });
}
private void runStartService() throws Exception {
@@ -1407,6 +1091,21 @@
}
}
+ private void runUnlockUser() throws Exception {
+ int userId = Integer.parseInt(nextArgRequired());
+ String tokenHex = nextArg();
+ byte[] token = null;
+ if (tokenHex != null) {
+ token = HexDump.hexStringToByteArray(tokenHex);
+ }
+ boolean success = mAm.unlockUser(userId, token);
+ if (success) {
+ System.out.println("Success: user unlocked");
+ } else {
+ System.err.println("Error: could not unlock user");
+ }
+ }
+
private static class StopUserCallback extends IStopUserCallback.Stub {
private boolean mFinished = false;
@@ -1433,10 +1132,13 @@
private void runStopUser() throws Exception {
boolean wait = false;
- String opt = null;
+ boolean force = false;
+ String opt;
while ((opt = nextOption()) != null) {
if ("-w".equals(opt)) {
wait = true;
+ } else if ("-f".equals(opt)) {
+ force = true;
} else {
System.err.println("Error: unknown option: " + opt);
return;
@@ -1445,7 +1147,7 @@
int user = Integer.parseInt(nextArgRequired());
StopUserCallback callback = wait ? new StopUserCallback() : null;
- int res = mAm.stopUser(user, callback);
+ int res = mAm.stopUser(user, force, callback);
if (res != ActivityManager.USER_OP_SUCCESS) {
String txt = "";
switch (res) {
@@ -1455,6 +1157,13 @@
case ActivityManager.USER_OP_UNKNOWN_USER:
txt = " (Unknown user " + user + ")";
break;
+ case ActivityManager.USER_OP_ERROR_IS_SYSTEM:
+ txt = " (System user cannot be stopped)";
+ break;
+ case ActivityManager.USER_OP_ERROR_RELATED_USERS_CANNOT_STOP:
+ txt = " (Can't stop user " + user
+ + " - one of its related users can't be stopped)";
+ break;
}
System.err.println("Switch failed: " + res + txt);
} else if (callback != null) {
diff --git a/cmds/appops/Android.mk b/cmds/appops/Android.mk
index 1e15204..6801ce9 100644
--- a/cmds/appops/Android.mk
+++ b/cmds/appops/Android.mk
@@ -3,14 +3,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := appops
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := appops
LOCAL_SRC_FILES := appops
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
include $(BUILD_PREBUILT)
-
diff --git a/cmds/appops/appops b/cmds/appops/appops
index 407e551..25d2031 100755
--- a/cmds/appops/appops
+++ b/cmds/appops/appops
@@ -1,5 +1 @@
-# Script to start "appwidget" on the device, which has a very rudimentary shell.
-base=/system
-export CLASSPATH=$base/framework/appops.jar
-exec app_process $base/bin com.android.commands.appops.AppOpsCommand "$@"
-
+cmd appops $@
diff --git a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
deleted file mode 100644
index c9b9e58..0000000
--- a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-** Copyright 2014, 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.commands.appops;
-
-import android.app.ActivityManager;
-import android.app.ActivityThread;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.pm.IPackageManager;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-
-import android.util.TimeUtils;
-import com.android.internal.app.IAppOpsService;
-import com.android.internal.os.BaseCommand;
-
-import java.io.PrintStream;
-import java.util.List;
-
-/**
- * This class is a command line utility for manipulating AppOps permissions.
- */
-public class AppOpsCommand extends BaseCommand {
-
- public static void main(String[] args) {
- new AppOpsCommand().run(args);
- }
-
- @Override
- public void onShowUsage(PrintStream out) {
- out.println("usage: appops set [--user <USER_ID>] <PACKAGE> <OP> <MODE>\n"
- + " appops get [--user <USER_ID>] <PACKAGE> [<OP>]\n"
- + " appops reset [--user <USER_ID>] [<PACKAGE>]\n"
- + " <PACKAGE> an Android package name.\n"
- + " <OP> an AppOps operation.\n"
- + " <MODE> one of allow, ignore, deny, or default\n"
- + " <USER_ID> the user id under which the package is installed. If --user is not\n"
- + " specified, the current user is assumed.\n");
- }
-
- private static final String COMMAND_SET = "set";
- private static final String COMMAND_GET = "get";
- private static final String COMMAND_RESET = "reset";
-
- @Override
- public void onRun() throws Exception {
- String command = nextArgRequired();
- switch (command) {
- case COMMAND_SET:
- runSet();
- break;
-
- case COMMAND_GET:
- runGet();
- break;
-
- case COMMAND_RESET:
- runReset();
- break;
-
- default:
- System.err.println("Error: Unknown command: '" + command + "'.");
- break;
- }
- }
-
- private static final String ARGUMENT_USER = "--user";
-
- // Modes
- private static final String MODE_ALLOW = "allow";
- private static final String MODE_DENY = "deny";
- private static final String MODE_IGNORE = "ignore";
- private static final String MODE_DEFAULT = "default";
-
- private int strOpToOp(String op) {
- try {
- return AppOpsManager.strOpToOp(op);
- } catch (IllegalArgumentException e) {
- }
- try {
- return Integer.parseInt(op);
- } catch (NumberFormatException e) {
- }
- try {
- return AppOpsManager.strDebugOpToOp(op);
- } catch (IllegalArgumentException e) {
- System.err.println("Error: " + e.getMessage());
- return -1;
- }
- }
-
- private void runSet() throws Exception {
- String packageName = null;
- String op = null;
- String mode = null;
- int userId = UserHandle.USER_CURRENT;
- for (String argument; (argument = nextArg()) != null;) {
- if (ARGUMENT_USER.equals(argument)) {
- userId = Integer.parseInt(nextArgRequired());
- } else {
- if (packageName == null) {
- packageName = argument;
- } else if (op == null) {
- op = argument;
- } else if (mode == null) {
- mode = argument;
- } else {
- System.err.println("Error: Unsupported argument: " + argument);
- return;
- }
- }
- }
-
- if (packageName == null) {
- System.err.println("Error: Package name not specified.");
- return;
- } else if (op == null) {
- System.err.println("Error: Operation not specified.");
- return;
- } else if (mode == null) {
- System.err.println("Error: Mode not specified.");
- return;
- }
-
- final int opInt = strOpToOp(op);
- if (opInt < 0) {
- return;
- }
- final int modeInt;
- switch (mode) {
- case MODE_ALLOW:
- modeInt = AppOpsManager.MODE_ALLOWED;
- break;
- case MODE_DENY:
- modeInt = AppOpsManager.MODE_ERRORED;
- break;
- case MODE_IGNORE:
- modeInt = AppOpsManager.MODE_IGNORED;
- break;
- case MODE_DEFAULT:
- modeInt = AppOpsManager.MODE_DEFAULT;
- break;
- default:
- System.err.println("Error: Mode " + mode + " is not valid,");
- return;
- }
-
- // Parsing complete, let's execute the command.
-
- if (userId == UserHandle.USER_CURRENT) {
- userId = ActivityManager.getCurrentUser();
- }
-
- final IPackageManager pm = ActivityThread.getPackageManager();
- final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface(
- ServiceManager.getService(Context.APP_OPS_SERVICE));
- final int uid;
- if ("root".equals(packageName)) {
- uid = 0;
- } else {
- uid = pm.getPackageUid(packageName, userId);
- }
- if (uid < 0) {
- System.err.println("Error: No UID for " + packageName + " in user " + userId);
- return;
- }
- appOpsService.setMode(opInt, uid, packageName, modeInt);
- }
-
- private void runGet() throws Exception {
- String packageName = null;
- String op = null;
- int userId = UserHandle.USER_CURRENT;
- for (String argument; (argument = nextArg()) != null;) {
- if (ARGUMENT_USER.equals(argument)) {
- userId = Integer.parseInt(nextArgRequired());
- } else {
- if (packageName == null) {
- packageName = argument;
- } else if (op == null) {
- op = argument;
- } else {
- System.err.println("Error: Unsupported argument: " + argument);
- return;
- }
- }
- }
-
- if (packageName == null) {
- System.err.println("Error: Package name not specified.");
- return;
- }
-
- final int opInt = op != null ? strOpToOp(op) : 0;
-
- // Parsing complete, let's execute the command.
-
- if (userId == UserHandle.USER_CURRENT) {
- userId = ActivityManager.getCurrentUser();
- }
-
- final IPackageManager pm = ActivityThread.getPackageManager();
- final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface(
- ServiceManager.getService(Context.APP_OPS_SERVICE));
- final int uid;
- if ("root".equals(packageName)) {
- uid = 0;
- } else {
- uid = pm.getPackageUid(packageName, userId);
- }
- if (uid < 0) {
- System.err.println("Error: No UID for " + packageName + " in user " + userId);
- return;
- }
- List<AppOpsManager.PackageOps> ops = appOpsService.getOpsForPackage(uid, packageName,
- op != null ? new int[] {opInt} : null);
- if (ops == null || ops.size() <= 0) {
- System.out.println("No operations.");
- return;
- }
- final long now = System.currentTimeMillis();
- for (int i=0; i<ops.size(); i++) {
- List<AppOpsManager.OpEntry> entries = ops.get(i).getOps();
- for (int j=0; j<entries.size(); j++) {
- AppOpsManager.OpEntry ent = entries.get(j);
- System.out.print(AppOpsManager.opToName(ent.getOp()));
- System.out.print(": ");
- switch (ent.getMode()) {
- case AppOpsManager.MODE_ALLOWED:
- System.out.print("allow");
- break;
- case AppOpsManager.MODE_IGNORED:
- System.out.print("ignore");
- break;
- case AppOpsManager.MODE_ERRORED:
- System.out.print("deny");
- break;
- case AppOpsManager.MODE_DEFAULT:
- System.out.print("default");
- break;
- default:
- System.out.print("mode=");
- System.out.print(ent.getMode());
- break;
- }
- if (ent.getTime() != 0) {
- System.out.print("; time=");
- StringBuilder sb = new StringBuilder();
- TimeUtils.formatDuration(now - ent.getTime(), sb);
- System.out.print(sb);
- System.out.print(" ago");
- }
- if (ent.getRejectTime() != 0) {
- System.out.print("; rejectTime=");
- StringBuilder sb = new StringBuilder();
- TimeUtils.formatDuration(now - ent.getRejectTime(), sb);
- System.out.print(sb);
- System.out.print(" ago");
- }
- if (ent.getDuration() == -1) {
- System.out.print(" (running)");
- } else if (ent.getDuration() != 0) {
- System.out.print("; duration=");
- StringBuilder sb = new StringBuilder();
- TimeUtils.formatDuration(ent.getDuration(), sb);
- System.out.print(sb);
- }
- System.out.println();
- }
- }
- }
-
- private void runReset() throws Exception {
- String packageName = null;
- int userId = UserHandle.USER_CURRENT;
- for (String argument; (argument = nextArg()) != null;) {
- if (ARGUMENT_USER.equals(argument)) {
- String userStr = nextArgRequired();
- if ("all".equals(userStr)) {
- userId = UserHandle.USER_ALL;
- } else if ("current".equals(userStr)) {
- userId = UserHandle.USER_CURRENT;
- } else if ("owner".equals(userStr) || "system".equals(userStr)) {
- userId = UserHandle.USER_SYSTEM;
- } else {
- userId = Integer.parseInt(nextArgRequired());
- }
- } else {
- if (packageName == null) {
- packageName = argument;
- } else {
- System.err.println("Error: Unsupported argument: " + argument);
- return;
- }
- }
- }
-
- // Parsing complete, let's execute the command.
-
- if (userId == UserHandle.USER_CURRENT) {
- userId = ActivityManager.getCurrentUser();
- }
-
- final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface(
- ServiceManager.getService(Context.APP_OPS_SERVICE));
- appOpsService.resetAllModes(userId, packageName);
- System.out.print("Reset all modes for: ");
- if (userId == UserHandle.USER_ALL) {
- System.out.print("all users");
- } else {
- System.out.print("user "); System.out.print(userId);
- }
- System.out.print(", ");
- if (packageName == null) {
- System.out.println("all packages");
- } else {
- System.out.print("package "); System.out.println(packageName);
- }
- }
-}
diff --git a/cmds/settings/src/com/android/commands/settings/SettingsCmd.java b/cmds/settings/src/com/android/commands/settings/SettingsCmd.java
index a675769..e63a1f5 100644
--- a/cmds/settings/src/com/android/commands/settings/SettingsCmd.java
+++ b/cmds/settings/src/com/android/commands/settings/SettingsCmd.java
@@ -76,7 +76,12 @@
// --user specified more than once; invalid
break;
}
- mUser = Integer.parseInt(nextArg());
+ arg = nextArg();
+ if ("current".equals(arg) || "cur".equals(arg)) {
+ mUser = UserHandle.USER_CURRENT;
+ } else {
+ mUser = Integer.parseInt(arg);
+ }
} else if (mVerb == CommandVerb.UNSPECIFIED) {
if ("get".equalsIgnoreCase(arg)) {
mVerb = CommandVerb.GET;
@@ -129,12 +134,14 @@
}
if (valid) {
- if (mUser < 0) {
- mUser = UserHandle.USER_SYSTEM;
- }
-
try {
IActivityManager activityManager = ActivityManagerNative.getDefault();
+ if (mUser == UserHandle.USER_CURRENT) {
+ mUser = activityManager.getCurrentUser().id;
+ }
+ if (mUser < 0) {
+ mUser = UserHandle.USER_SYSTEM;
+ }
IContentProvider provider = null;
IBinder token = new Binder();
try {
@@ -286,13 +293,13 @@
}
private static void printUsage() {
- System.err.println("usage: settings [--user NUM] get namespace key");
- System.err.println(" settings [--user NUM] put namespace key value");
- System.err.println(" settings [--user NUM] delete namespace key");
- System.err.println(" settings [--user NUM] list namespace");
+ System.err.println("usage: settings [--user <USER_ID> | current] get namespace key");
+ System.err.println(" settings [--user <USER_ID> | current] put namespace key value");
+ System.err.println(" settings [--user <USER_ID> | current] delete namespace key");
+ System.err.println(" settings [--user <USER_ID> | current] list namespace");
System.err.println("\n'namespace' is one of {system, secure, global}, case-insensitive");
- System.err.println("If '--user NUM' is not given, the operations are performed on the"
- + "system user.");
+ System.err.println("If '--user <USER_ID> | current' is not given, the operations are "
+ + "performed on the system user.");
}
public static String resolveCallingPackage() {
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java
index 9d6aa13..468c145 100644
--- a/core/java/android/accessibilityservice/AccessibilityService.java
+++ b/core/java/android/accessibilityservice/AccessibilityService.java
@@ -17,14 +17,19 @@
package android.accessibilityservice;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
+import android.graphics.Region;
+import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
+import android.util.ArrayMap;
import android.util.Log;
+import android.util.Slog;
import android.view.KeyEvent;
import android.view.WindowManager;
import android.view.WindowManagerImpl;
@@ -36,7 +41,10 @@
import com.android.internal.os.HandlerCaller;
import com.android.internal.os.SomeArgs;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
/**
* An accessibility service runs in the background and receives callbacks by the system
@@ -170,15 +178,8 @@
* </p>
* <h3>Notification strategy</h3>
* <p>
- * For each feedback type only one accessibility service is notified. Services are notified
- * in the order of registration. Hence, if two services are registered for the same
- * feedback type in the same package the first one wins. It is possible however, to
- * register a service as the default one for a given feedback type. In such a case this
- * service is invoked if no other service was interested in the event. In other words, default
- * services do not compete with other services and are notified last regardless of the
- * registration order. This enables "generic" accessibility services that work reasonably
- * well with most applications to coexist with "polished" ones that are targeted for
- * specific applications.
+ * All accessibility services are notified of all events they have requested, regardless of their
+ * feedback type.
* </p>
* <p class="note">
* <strong>Note:</strong> The event notification timeout is useful to avoid propagating
@@ -373,6 +374,8 @@
public void init(int connectionId, IBinder windowToken);
public boolean onGesture(int gestureId);
public boolean onKeyEvent(KeyEvent event);
+ public void onMagnificationChanged(@NonNull Region region,
+ float scale, float centerX, float centerY);
}
private int mConnectionId;
@@ -383,6 +386,8 @@
private WindowManager mWindowManager;
+ private MagnificationController mMagnificationController;
+
/**
* Callback for {@link android.view.accessibility.AccessibilityEvent}s.
*
@@ -396,6 +401,20 @@
public abstract void onInterrupt();
/**
+ * Dispatches service connection to internal components first, then the
+ * client code.
+ */
+ private void dispatchServiceConnected() {
+ if (mMagnificationController != null) {
+ mMagnificationController.onServiceConnected();
+ }
+
+ // The client gets to handle service connection last, after we've set
+ // up any state upon which their code may rely.
+ onServiceConnected();
+ }
+
+ /**
* This method is a part of the {@link AccessibilityService} lifecycle and is
* called after the system has successfully bound to the service. If is
* convenient to use this method for setting the {@link AccessibilityServiceInfo}.
@@ -513,6 +532,385 @@
}
/**
+ * Returns the magnification controller, which may be used to query and
+ * modify the state of display magnification.
+ * <p>
+ * <strong>Note:</strong> In order to control magnification, your service
+ * must declare the capability by setting the
+ * {@link android.R.styleable#AccessibilityService_canControlMagnification}
+ * property in its meta-data. For more information, see
+ * {@link #SERVICE_META_DATA}.
+ *
+ * @return the magnification controller
+ */
+ @NonNull
+ public final MagnificationController getMagnificationController() {
+ if (mMagnificationController == null) {
+ mMagnificationController = new MagnificationController(this);
+ }
+ return mMagnificationController;
+ }
+
+ private void onMagnificationChanged(@NonNull Region region, float scale,
+ float centerX, float centerY) {
+ if (mMagnificationController != null) {
+ mMagnificationController.dispatchMagnificationChanged(
+ region, scale, centerX, centerY);
+ }
+ }
+
+ /**
+ * Used to control and query the state of display magnification.
+ */
+ public static final class MagnificationController {
+ private final AccessibilityService mService;
+
+ /**
+ * Map of listeners to their handlers. Lazily created when adding the
+ * first magnification listener.
+ */
+ private ArrayMap<OnMagnificationChangedListener, Handler> mListeners;
+
+ MagnificationController(@NonNull AccessibilityService service) {
+ mService = service;
+ }
+
+ /**
+ * Called when the service is connected.
+ */
+ void onServiceConnected() {
+ if (mListeners != null && !mListeners.isEmpty()) {
+ setMagnificationCallbackEnabled(true);
+ }
+ }
+
+ /**
+ * Adds the specified change listener to the list of magnification
+ * change listeners. The callback will occur on the service's main
+ * thread.
+ *
+ * @param listener the listener to add, must be non-{@code null}
+ */
+ public void addListener(@NonNull OnMagnificationChangedListener listener) {
+ addListener(listener, null);
+ }
+
+ /**
+ * Adds the specified change listener to the list of magnification
+ * change listeners. The callback will occur on the specified
+ * {@link Handler}'s thread, or on the service's main thread if the
+ * handler is {@code null}.
+ *
+ * @param listener the listener to add, must be non-null
+ * @param handler the handler on which the callback should execute, or
+ * {@code null} to execute on the service's main thread
+ */
+ public void addListener(@NonNull OnMagnificationChangedListener listener,
+ @Nullable Handler handler) {
+ if (mListeners == null) {
+ mListeners = new ArrayMap<>();
+ }
+
+ final boolean shouldEnableCallback = mListeners.isEmpty();
+ mListeners.put(listener, handler);
+
+ if (shouldEnableCallback) {
+ // This may fail if the service is not connected yet, but if we
+ // still have listeners when it connects then we can try again.
+ setMagnificationCallbackEnabled(true);
+ }
+ }
+
+ /**
+ * Removes all instances of the specified change listener from the list
+ * of magnification change listeners.
+ *
+ * @param listener the listener to remove, must be non-null
+ * @return {@code true} if at least one instance of the listener was
+ * removed
+ */
+ public boolean removeListener(@NonNull OnMagnificationChangedListener listener) {
+ if (mListeners == null) {
+ return false;
+ }
+
+ final int keyIndex = mListeners.indexOfKey(listener);
+ final boolean hasKey = keyIndex >= 0;
+ if (hasKey) {
+ mListeners.removeAt(keyIndex);
+ }
+
+ if (hasKey && mListeners.isEmpty()) {
+ // We just removed the last listener, so we don't need
+ // callbacks from the service anymore.
+ setMagnificationCallbackEnabled(false);
+ }
+
+ return hasKey;
+ }
+
+ private void setMagnificationCallbackEnabled(boolean enabled) {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ connection.setMagnificationCallbackEnabled(enabled);
+ } catch (RemoteException re) {
+ throw new RuntimeException(re);
+ }
+ }
+ }
+
+ /**
+ * Dispatches magnification changes to any registered listeners. This
+ * should be called on the service's main thread.
+ */
+ void dispatchMagnificationChanged(final @NonNull Region region, final float scale,
+ final float centerX, final float centerY) {
+ if (mListeners == null || mListeners.isEmpty()) {
+ Slog.d(LOG_TAG, "Received magnification changed "
+ + "callback with no listeners registered!");
+ setMagnificationCallbackEnabled(false);
+ return;
+ }
+
+ // Listeners may remove themselves. Perform a shallow copy to avoid
+ // concurrent modification.
+ final ArrayMap<OnMagnificationChangedListener, Handler> entries =
+ new ArrayMap<>(mListeners);
+
+ for (int i = 0, count = entries.size(); i < count; i++) {
+ final OnMagnificationChangedListener listener = entries.keyAt(i);
+ final Handler handler = entries.valueAt(i);
+ if (handler != null) {
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ listener.onMagnificationChanged(MagnificationController.this,
+ region, scale, centerX, centerY);
+ }
+ });
+ } else {
+ // We're already on the main thread, just run the listener.
+ listener.onMagnificationChanged(this, region, scale, centerX, centerY);
+ }
+ }
+ }
+
+ /**
+ * Returns the current magnification scale.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will
+ * return a default value of {@code 1.0f}.
+ *
+ * @return the current magnification scale
+ */
+ public float getScale() {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.getMagnificationScale();
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to obtain scale", re);
+ }
+ }
+ return 1.0f;
+ }
+
+ /**
+ * Returns the unscaled screen-relative X coordinate of the focal
+ * center of the magnified region. This is the point around which
+ * zooming occurs and is guaranteed to lie within the magnified
+ * region.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will
+ * return a default value of {@code 0.0f}.
+ *
+ * @return the unscaled screen-relative X coordinate of the center of
+ * the magnified region
+ */
+ public float getCenterX() {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.getMagnificationCenterX();
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to obtain center X", re);
+ }
+ }
+ return 0.0f;
+ }
+
+ /**
+ * Returns the unscaled screen-relative Y coordinate of the focal
+ * center of the magnified region. This is the point around which
+ * zooming occurs and is guaranteed to lie within the magnified
+ * region.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will
+ * return a default value of {@code 0.0f}.
+ *
+ * @return the unscaled screen-relative Y coordinate of the center of
+ * the magnified region
+ */
+ public float getCenterY() {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.getMagnificationCenterY();
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to obtain center Y", re);
+ }
+ }
+ return 0.0f;
+ }
+
+ /**
+ * Returns the region of the screen currently being magnified. If
+ * magnification is not enabled, the returned region will be empty.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will
+ * return an empty region.
+ *
+ * @return the screen-relative bounds of the magnified region
+ */
+ @NonNull
+ public Region getMagnifiedRegion() {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.getMagnifiedRegion();
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to obtain magnified region", re);
+ }
+ }
+ return Region.obtain();
+ }
+
+ /**
+ * Resets magnification scale and center to their default (e.g. no
+ * magnification) values.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will have
+ * no effect and return {@code false}.
+ *
+ * @param animate {@code true} to animate from the current scale and
+ * center or {@code false} to reset the scale and center
+ * immediately
+ * @return {@code true} on success, {@code false} on failure
+ */
+ public boolean reset(boolean animate) {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.resetMagnification(animate);
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to reset", re);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Sets the magnification scale.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will have
+ * no effect and return {@code false}.
+ *
+ * @param scale the magnification scale to set, must be >= 1 and <= 5
+ * @param animate {@code true} to animate from the current scale or
+ * {@code false} to set the scale immediately
+ * @return {@code true} on success, {@code false} on failure
+ */
+ public boolean setScale(float scale, boolean animate) {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.setMagnificationScaleAndCenter(
+ scale, Float.NaN, Float.NaN, animate);
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to set scale", re);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Sets the center of the magnified viewport.
+ * <p>
+ * <strong>Note:</strong> If the service is not yet connected (e.g.
+ * {@link AccessibilityService#onServiceConnected()} has not yet been
+ * called) or the service has been disconnected, this method will have
+ * no effect and return {@code false}.
+ *
+ * @param centerX the unscaled screen-relative X coordinate on which to
+ * center the viewport
+ * @param centerY the unscaled screen-relative Y coordinate on which to
+ * center the viewport
+ * @param animate {@code true} to animate from the current viewport
+ * center or {@code false} to set the center immediately
+ * @return {@code true} on success, {@code false} on failure
+ */
+ public boolean setCenter(float centerX, float centerY, boolean animate) {
+ final IAccessibilityServiceConnection connection =
+ AccessibilityInteractionClient.getInstance().getConnection(
+ mService.mConnectionId);
+ if (connection != null) {
+ try {
+ return connection.setMagnificationScaleAndCenter(
+ Float.NaN, centerX, centerY, animate);
+ } catch (RemoteException re) {
+ Log.w(LOG_TAG, "Failed to set center", re);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Listener for changes in the state of magnification.
+ */
+ public interface OnMagnificationChangedListener {
+ /**
+ * Called when the magnified region, scale, or center changes.
+ *
+ * @param controller the magnification controller
+ * @param region the new magnified region, may be empty if
+ * magnification is not enabled (e.g. scale is 1)
+ * @param scale the new scale
+ * @param centerX the new X coordinate around which magnification is focused
+ * @param centerY the new Y coordinate around which magnification is focused
+ */
+ void onMagnificationChanged(@NonNull MagnificationController controller,
+ @NonNull Region region, float scale, float centerX, float centerY);
+ }
+ }
+
+ /**
* Performs a global action. Such an action can be performed
* at any moment regardless of the current application or user
* location in that application. For example going back, going
@@ -645,7 +1043,7 @@
return new IAccessibilityServiceClientWrapper(this, getMainLooper(), new Callbacks() {
@Override
public void onServiceConnected() {
- AccessibilityService.this.onServiceConnected();
+ AccessibilityService.this.dispatchServiceConnected();
}
@Override
@@ -678,6 +1076,12 @@
public boolean onKeyEvent(KeyEvent event) {
return AccessibilityService.this.onKeyEvent(event);
}
+
+ @Override
+ public void onMagnificationChanged(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ AccessibilityService.this.onMagnificationChanged(region, scale, centerX, centerY);
+ }
});
}
@@ -695,6 +1099,7 @@
private static final int DO_ON_GESTURE = 4;
private static final int DO_CLEAR_ACCESSIBILITY_CACHE = 5;
private static final int DO_ON_KEY_EVENT = 6;
+ private static final int DO_ON_MAGNIFICATION_CHANGED = 7;
private final HandlerCaller mCaller;
@@ -741,6 +1146,18 @@
mCaller.sendMessage(message);
}
+ public void onMagnificationChanged(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ final SomeArgs args = SomeArgs.obtain();
+ args.arg1 = region;
+ args.arg2 = scale;
+ args.arg3 = centerX;
+ args.arg4 = centerY;
+
+ final Message message = mCaller.obtainMessageO(DO_ON_MAGNIFICATION_CHANGED, args);
+ mCaller.sendMessage(message);
+ }
+
@Override
public void executeMessage(Message message) {
switch (message.what) {
@@ -816,6 +1233,15 @@
}
} return;
+ case DO_ON_MAGNIFICATION_CHANGED: {
+ final SomeArgs args = (SomeArgs) message.obj;
+ final Region region = (Region) args.arg1;
+ final float scale = (float) args.arg2;
+ final float centerX = (float) args.arg3;
+ final float centerY = (float) args.arg4;
+ mCallback.onMagnificationChanged(region, scale, centerX, centerY);
+ } 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 4edb0c6..2c98fef 100644
--- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
@@ -104,6 +104,12 @@
*/
public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 0x00000008;
+ /**
+ * Capability: This accessibility service can control display magnification.
+ * @see android.R.styleable#AccessibilityService_canControlMagnification
+ */
+ public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 0x00000010;
+
private static final SparseArray<CapabilityInfo> sAvailableCapabilityInfos =
new SparseArray<CapabilityInfo>();
static {
@@ -123,6 +129,10 @@
new CapabilityInfo(CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS,
R.string.capability_title_canRequestFilterKeyEvents,
R.string.capability_desc_canRequestFilterKeyEvents));
+ sAvailableCapabilityInfos.put(CAPABILITY_CAN_CONTROL_MAGNIFICATION,
+ new CapabilityInfo(CAPABILITY_CAN_CONTROL_MAGNIFICATION,
+ R.string.capability_title_canControlMagnification,
+ R.string.capability_desc_canControlMagnification));
}
/**
@@ -502,6 +512,10 @@
.AccessibilityService_canRequestFilterKeyEvents, false)) {
mCapabilities |= CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS;
}
+ if (asAttributes.getBoolean(com.android.internal.R.styleable
+ .AccessibilityService_canControlMagnification, false)) {
+ mCapabilities |= CAPABILITY_CAN_CONTROL_MAGNIFICATION;
+ }
TypedValue peekedValue = asAttributes.peekValue(
com.android.internal.R.styleable.AccessibilityService_description);
if (peekedValue != null) {
@@ -917,6 +931,8 @@
return "CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY";
case CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS:
return "CAPABILITY_CAN_FILTER_KEY_EVENTS";
+ case CAPABILITY_CAN_CONTROL_MAGNIFICATION:
+ return "CAPABILITY_CAN_CONTROL_MAGNIFICATION";
default:
return "UNKNOWN";
}
diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
index 8b503dd..15666bf 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl
@@ -17,6 +17,7 @@
package android.accessibilityservice;
import android.accessibilityservice.IAccessibilityServiceConnection;
+import android.graphics.Region;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityWindowInfo;
import android.view.KeyEvent;
@@ -39,4 +40,6 @@
void clearAccessibilityCache();
void onKeyEvent(in KeyEvent event, int sequence);
+
+ void onMagnificationChanged(in Region region, float scale, float centerX, float centerY);
}
diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
index 5f7a17d..6ac50bd 100644
--- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
+++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl
@@ -18,6 +18,7 @@
import android.os.Bundle;
import android.accessibilityservice.AccessibilityServiceInfo;
+import android.graphics.Region;
import android.view.MagnificationSpec;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.IAccessibilityInteractionConnectionCallback;
@@ -63,4 +64,19 @@
boolean performGlobalAction(int action);
oneway void setOnKeyEventResult(boolean handled, int sequence);
+
+ float getMagnificationScale();
+
+ float getMagnificationCenterX();
+
+ float getMagnificationCenterY();
+
+ Region getMagnifiedRegion();
+
+ boolean resetMagnification(boolean animate);
+
+ boolean setMagnificationScaleAndCenter(float scale, float centerX, float centerY,
+ boolean animate);
+
+ void setMagnificationCallbackEnabled(boolean enabled);
}
diff --git a/core/java/android/accounts/AbstractAccountAuthenticator.java b/core/java/android/accounts/AbstractAccountAuthenticator.java
index 9c401c7f..041f591 100644
--- a/core/java/android/accounts/AbstractAccountAuthenticator.java
+++ b/core/java/android/accounts/AbstractAccountAuthenticator.java
@@ -116,6 +116,30 @@
*/
public static final String KEY_CUSTOM_TOKEN_EXPIRY = "android.accounts.expiry";
+ /**
+ * Bundle key used for the {@link String} account type in session bundle.
+ * This is used in the default implementation of
+ * {@link #startAddAccountSession} and {@link startUpdateCredentialsSession}.
+ */
+ private static final String KEY_AUTH_TOKEN_TYPE = "android.accounts.KEY_AUTH_TOKEN_TYPE";
+ /**
+ * Bundle key used for the {@link String} array of required features in
+ * session bundle. This is used in the default implementation of
+ * {@link #startAddAccountSession} and {@link startUpdateCredentialsSession}.
+ */
+ private static final String KEY_REQUIRED_FEATURES = "android.accounts.AbstractAccountAuthenticator.KEY_REQUIRED_FEATURES";
+ /**
+ * Bundle key used for the {@link Bundle} options in session bundle. This is
+ * used in default implementation of {@link #startAddAccountSession} and
+ * {@link startUpdateCredentialsSession}.
+ */
+ private static final String KEY_OPTIONS = "android.accounts.AbstractAccountAuthenticator.KEY_OPTIONS";
+ /**
+ * Bundle key used for the {@link Account} account in session bundle. This is used
+ * used in default implementation of {@link startUpdateCredentialsSession}.
+ */
+ private static final String KEY_ACCOUNT = "android.accounts.AbstractAccountAuthenticator.KEY_ACCOUNT";
+
private final Context mContext;
public AbstractAccountAuthenticator(Context context) {
@@ -336,6 +360,73 @@
handleException(response, "addAccountFromCredentials", account.toString(), e);
}
}
+
+ @Override
+ public void startAddAccountSession(IAccountAuthenticatorResponse response,
+ String accountType, String authTokenType, String[] features, Bundle options)
+ throws RemoteException {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG,
+ "startAddAccountSession: accountType " + accountType
+ + ", authTokenType " + authTokenType
+ + ", features " + (features == null ? "[]" : Arrays.toString(features)));
+ }
+ checkBinderPermission();
+ try {
+ final Bundle result = AbstractAccountAuthenticator.this.startAddAccountSession(
+ new AccountAuthenticatorResponse(response), accountType, authTokenType,
+ features, options);
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ if (result != null) {
+ result.keySet(); // force it to be unparcelled
+ }
+ Log.v(TAG, "startAddAccountSession: result "
+ + AccountManager.sanitizeResult(result));
+ }
+ if (result != null) {
+ response.onResult(result);
+ }
+ } catch (Exception e) {
+ handleException(response, "startAddAccountSession", accountType, e);
+ }
+ }
+
+ @Override
+ public void startUpdateCredentialsSession(
+ IAccountAuthenticatorResponse response,
+ Account account,
+ String authTokenType,
+ Bundle loginOptions) throws RemoteException {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, "startUpdateCredentialsSession: "
+ + account
+ + ", authTokenType "
+ + authTokenType);
+ }
+ checkBinderPermission();
+ try {
+ final Bundle result = AbstractAccountAuthenticator.this
+ .startUpdateCredentialsSession(
+ new AccountAuthenticatorResponse(response),
+ account,
+ authTokenType,
+ loginOptions);
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ // Result may be null.
+ if (result != null) {
+ result.keySet(); // force it to be unparcelled
+ }
+ Log.v(TAG, "startUpdateCredentialsSession: result "
+ + AccountManager.sanitizeResult(result));
+ }
+ if (result != null) {
+ response.onResult(result);
+ }
+ } catch (Exception e) {
+ handleException(response, "startUpdateCredentialsSession",
+ account.toString() + "," + authTokenType, e);
+ }
+ }
}
private void handleException(IAccountAuthenticatorResponse response, String method,
@@ -603,4 +694,97 @@
}).start();
return null;
}
+
+ /**
+ * Starts the add account session to authenticate user to an account of the
+ * specified accountType.
+ *
+ * @param response to send the result back to the AccountManager, will never
+ * be null
+ * @param accountType the type of account to authenticate with, will never
+ * be null
+ * @param authTokenType the type of auth token to retrieve after
+ * authenticating with the account, may be null
+ * @param requiredFeatures a String array of authenticator-specific features
+ * that the account authenticated with must support, may be null
+ * @param options a Bundle of authenticator-specific options, may be null
+ * @return a Bundle result or null if the result is to be returned via the
+ * response. The result will contain either:
+ * <ul>
+ * <li>{@link AccountManager#KEY_INTENT}, or
+ * <li>{@link AccountManager#KEY_ACCOUNT_SESSION_BUNDLE} for adding
+ * the account to device later, and if account is authenticated,
+ * optional {@link AccountManager#KEY_PASSWORD} and
+ * {@link AccountManager#KEY_ACCOUNT_STATUS_TOKEN} for checking the
+ * status of the account, or
+ * <li>{@link AccountManager#KEY_ERROR_CODE} and
+ * {@link AccountManager#KEY_ERROR_MESSAGE} to indicate an error
+ * </ul>
+ * @throws NetworkErrorException if the authenticator could not honor the
+ * request due to a network error
+ */
+ public Bundle startAddAccountSession(final AccountAuthenticatorResponse response,
+ final String accountType, final String authTokenType, final String[] requiredFeatures,
+ final Bundle options)
+ throws NetworkErrorException {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ Bundle sessionBundle = new Bundle();
+ sessionBundle.putString(KEY_AUTH_TOKEN_TYPE, authTokenType);
+ sessionBundle.putStringArray(KEY_REQUIRED_FEATURES, requiredFeatures);
+ sessionBundle.putBundle(KEY_OPTIONS, options);
+ Bundle result = new Bundle();
+ result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+ response.onResult(result);
+ }
+
+ }).start();
+ return null;
+ }
+
+ /**
+ * Asks user to re-authenticate for an account but defers updating the locally stored
+ * credentials.
+ *
+ * @param response to send the result back to the AccountManager, will never
+ * be null
+ * @param account the account whose credentials are to be updated, will
+ * never be null
+ * @param authTokenType the type of auth token to retrieve after updating
+ * the credentials, may be null (TODO)
+ * @param options a Bundle of authenticator-specific options, may be null
+ * @return a Bundle result or null if the result is to be returned via the
+ * response. The result will contain either:
+ * <ul>
+ * <li>{@link AccountManager#KEY_INTENT}, or
+ * <li>{@link AccountManager#KEY_ACCOUNT_SESSION_BUNDLE} for updating the
+ * locally stored credentials later, and if account is
+ * re-authenticated, {@link AccountManager#KEY_PASSWORD} and
+ * {@link AccountManager#KEY_ACCOUNT_STATUS_TOKEN} for checking the
+ * status of the account later, or
+ * <li>{@link AccountManager#KEY_ERROR_CODE} and
+ * {@link AccountManager#KEY_ERROR_MESSAGE} to indicate an error
+ * </ul>
+ * @throws NetworkErrorException if the authenticator could not honor the
+ * request due to a network error
+ */
+ public Bundle startUpdateCredentialsSession(final AccountAuthenticatorResponse response,
+ final Account account, final String authTokenType, final Bundle options)
+ throws NetworkErrorException {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ Bundle sessionBundle = new Bundle();
+ sessionBundle.putString(KEY_AUTH_TOKEN_TYPE, authTokenType);
+ sessionBundle.putParcelable(KEY_ACCOUNT, account);
+ sessionBundle.putBundle(KEY_OPTIONS, options);
+ Bundle result = new Bundle();
+ result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+ response.onResult(result);
+ }
+
+ }).start();
+ return null;
+ }
}
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index 0a7568a..5557905 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -240,6 +240,20 @@
*/
public static final String KEY_NOTIFY_ON_FAILURE = "notifyOnAuthFailure";
+ /**
+ * Bundle key used for a {@link Bundle} in result from
+ * {@link #startAddAccountSession} and friends which returns session data
+ * for installing an account later.
+ */
+ public static final String KEY_ACCOUNT_SESSION_BUNDLE = "accountSessionBundle";
+
+ /**
+ * Bundle key used for the {@link String} account status token in result
+ * from {@link #startAddAccountSession} and friends which returns
+ * information about a particular account.
+ */
+ public static final String KEY_ACCOUNT_STATUS_TOKEN = "accountStatusToken";
+
public static final String ACTION_AUTHENTICATOR_INTENT =
"android.accounts.AccountAuthenticator";
public static final String AUTHENTICATOR_META_DATA_NAME =
@@ -2590,4 +2604,170 @@
}
}
}
+
+ /**
+ * Asks the user to authenticate with an account of a specified type. The
+ * authenticator for this account type processes this request with the
+ * appropriate user interface. If the user does elect to authenticate with a
+ * new account, a bundle of session data for installing the account later is
+ * returned with optional account password and account status token.
+ * <p>
+ * This method may be called from any thread, but the returned
+ * {@link AccountManagerFuture} must not be used on the main thread.
+ * <p>
+ * <p>
+ * <b>NOTE:</b> The account will not be installed to the device by calling
+ * this api alone.
+ *
+ * @param accountType The type of account to add; must not be null
+ * @param authTokenType The type of auth token (see {@link #getAuthToken})
+ * this account will need to be able to generate, null for none
+ * @param requiredFeatures The features (see {@link #hasFeatures}) this
+ * account must have, null for none
+ * @param options Authenticator-specific options for the request, may be
+ * null or empty
+ * @param activity The {@link Activity} context to use for launching a new
+ * authenticator-defined sub-Activity to prompt the user to
+ * create an account; used only to call startActivity(); if null,
+ * the prompt will not be launched directly, but the necessary
+ * {@link Intent} will be returned to the caller instead
+ * @param callback Callback to invoke when the request completes, null for
+ * no callback
+ * @param handler {@link Handler} identifying the callback thread, null for
+ * the main thread
+ * @return An {@link AccountManagerFuture} which resolves to a Bundle with
+ * these fields if activity was specified and user was authenticated
+ * with an account:
+ * <ul>
+ * <li>{@link #KEY_ACCOUNT_SESSION_BUNDLE} - encrypted Bundle for
+ * adding the the to the device later.
+ * <li>{@link #KEY_PASSWORD} - optional, the password or password
+ * hash of the account.
+ * <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check
+ * status of the account
+ * </ul>
+ * If no activity was specified, the returned Bundle contains only
+ * {@link #KEY_INTENT} with the {@link Intent} needed to launch the
+ * actual account creation process. If authenticator doesn't support
+ * this method, the returned Bundle contains only
+ * {@link #KEY_ACCOUNT_SESSION_BUNDLE} with encrypted
+ * {@code options} needed to add account later. If an error
+ * occurred, {@link AccountManagerFuture#getResult()} throws:
+ * <ul>
+ * <li>{@link AuthenticatorException} if no authenticator was
+ * registered for this account type or the authenticator failed to
+ * respond
+ * <li>{@link OperationCanceledException} if the operation was
+ * canceled for any reason, including the user canceling the
+ * creation process or adding accounts (of this type) has been
+ * disabled by policy
+ * <li>{@link IOException} if the authenticator experienced an I/O
+ * problem creating a new account, usually because of network
+ * trouble
+ * </ul>
+ */
+ public AccountManagerFuture<Bundle> startAddAccountSession(
+ final String accountType,
+ final String authTokenType,
+ final String[] requiredFeatures,
+ final Bundle options,
+ final Activity activity,
+ AccountManagerCallback<Bundle> callback,
+ Handler handler) {
+ if (accountType == null) throw new IllegalArgumentException("accountType is null");
+ final Bundle optionsIn = new Bundle();
+ if (options != null) {
+ optionsIn.putAll(options);
+ }
+ optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName());
+
+ return new AmsTask(activity, handler, callback) {
+ @Override
+ public void doWork() throws RemoteException {
+ mService.startAddAccountSession(
+ mResponse,
+ accountType,
+ authTokenType,
+ requiredFeatures,
+ activity != null,
+ optionsIn);
+ }
+ }.start();
+ }
+
+ /**
+ * Asks the user to enter a new password for an account but not updating the
+ * saved credentials for the account until finishSession is
+ * called.
+ * <p>
+ * This method may be called from any thread, but the returned
+ * {@link AccountManagerFuture} must not be used on the main thread.
+ * <p>
+ * <b>NOTE:</b> The saved credentials for the account alone will not be
+ * updated by calling this API alone .
+ *
+ * @param account The account to update credentials for
+ * @param authTokenType The credentials entered must allow an auth token of
+ * this type to be created (but no actual auth token is
+ * returned); may be null
+ * @param options Authenticator-specific options for the request; may be
+ * null or empty
+ * @param activity The {@link Activity} context to use for launching a new
+ * authenticator-defined sub-Activity to prompt the user to enter
+ * a password; used only to call startActivity(); if null, the
+ * prompt will not be launched directly, but the necessary
+ * {@link Intent} will be returned to the caller instead
+ * @param callback Callback to invoke when the request completes, null for
+ * no callback
+ * @param handler {@link Handler} identifying the callback thread, null for
+ * the main thread
+ * @return An {@link AccountManagerFuture} which resolves to a Bundle with
+ * these fields if an activity was supplied and user was
+ * successfully re-authenticated to the account (TODO: default impl
+ * only returns escorw?):
+ * <ul>
+ * <li>{@link #KEY_ACCOUNT_SESSION_BUNDLE} - encrypted Bundle for
+ * updating the local credentials on device later.
+ * <li>{@link #KEY_PASSWORD} - optional, the password or password hash of the
+ * account
+ * <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check status of
+ * the account
+ * </ul>
+ * If no activity was specified, the returned Bundle contains
+ * {@link #KEY_INTENT} with the {@link Intent} needed to launch the
+ * password prompt. If an error occurred,
+ * {@link AccountManagerFuture#getResult()} throws:
+ * <ul>
+ * <li>{@link AuthenticatorException} if the authenticator failed to
+ * respond
+ * <li>{@link OperationCanceledException} if the operation was
+ * canceled for any reason, including the user canceling the
+ * password prompt
+ * <li>{@link IOException} if the authenticator experienced an I/O
+ * problem verifying the password, usually because of network
+ * trouble
+ * </ul>
+ */
+ public AccountManagerFuture<Bundle> startUpdateCredentialsSession(
+ final Account account,
+ final String authTokenType,
+ final Bundle options,
+ final Activity activity,
+ final AccountManagerCallback<Bundle> callback,
+ final Handler handler) {
+ if (account == null) {
+ throw new IllegalArgumentException("account is null");
+ }
+ return new AmsTask(activity, handler, callback) {
+ @Override
+ public void doWork() throws RemoteException {
+ mService.startUpdateCredentialsSession(
+ mResponse,
+ account,
+ authTokenType,
+ activity != null,
+ options);
+ }
+ }.start();
+ }
}
diff --git a/core/java/android/accounts/IAccountAuthenticator.aidl b/core/java/android/accounts/IAccountAuthenticator.aidl
index 58612da..921fb19 100644
--- a/core/java/android/accounts/IAccountAuthenticator.aidl
+++ b/core/java/android/accounts/IAccountAuthenticator.aidl
@@ -83,4 +83,17 @@
*/
void addAccountFromCredentials(in IAccountAuthenticatorResponse response, in Account account,
in Bundle accountCredentials);
+
+ /**
+ * Starts the add account session by prompting the user for account information
+ * and return a Bundle containing data to finish the session later.
+ */
+ void startAddAccountSession(in IAccountAuthenticatorResponse response, String accountType,
+ String authTokenType, in String[] requiredFeatures, in Bundle options);
+
+ /**
+ * Prompts the user for a new password but does not write it to the IAccountManager.
+ */
+ void startUpdateCredentialsSession(in IAccountAuthenticatorResponse response, in Account account,
+ String authTokenType, in Bundle options);
}
diff --git a/core/java/android/accounts/IAccountManager.aidl b/core/java/android/accounts/IAccountManager.aidl
index 0d95db1..8489e47 100644
--- a/core/java/android/accounts/IAccountManager.aidl
+++ b/core/java/android/accounts/IAccountManager.aidl
@@ -83,4 +83,12 @@
String getPreviousName(in Account account);
boolean renameSharedAccountAsUser(in Account accountToRename, String newName, int userId);
+ /* Add account in two steps. */
+ void startAddAccountSession(in IAccountManagerResponse response, String accountType,
+ String authTokenType, in String[] requiredFeatures, boolean expectActivityLaunch,
+ in Bundle options);
+
+ /* Update credentials in two steps. */
+ void startUpdateCredentialsSession(in IAccountManagerResponse response, in Account account,
+ String authTokenType, boolean expectActivityLaunch, in Bundle options);
}
diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java
index d8d2737..20d71a6 100644
--- a/core/java/android/animation/AnimatorInflater.java
+++ b/core/java/android/animation/AnimatorInflater.java
@@ -250,50 +250,19 @@
/**
* PathDataEvaluator is used to interpolate between two paths which are
* represented in the same format but different control points' values.
- * The path is represented as an array of PathDataNode here, which is
- * fundamentally an array of floating point numbers.
+ * The path is represented as verbs and points for each of the verbs.
*/
- private static class PathDataEvaluator implements TypeEvaluator<PathParser.PathDataNode[]> {
- private PathParser.PathDataNode[] mNodeArray;
-
- /**
- * Create a PathParser.PathDataNode[] that does not reuse the animated value.
- * Care must be taken when using this option because on every evaluation
- * a new <code>PathParser.PathDataNode[]</code> will be allocated.
- */
- private PathDataEvaluator() {}
-
- /**
- * Create a PathDataEvaluator that reuses <code>nodeArray</code> for every evaluate() call.
- * Caution must be taken to ensure that the value returned from
- * {@link android.animation.ValueAnimator#getAnimatedValue()} is not cached, modified, or
- * used across threads. The value will be modified on each <code>evaluate()</code> call.
- *
- * @param nodeArray The array to modify and return from <code>evaluate</code>.
- */
- public PathDataEvaluator(PathParser.PathDataNode[] nodeArray) {
- mNodeArray = nodeArray;
- }
+ private static class PathDataEvaluator implements TypeEvaluator<PathParser.PathData> {
+ private final PathParser.PathData mPathData = new PathParser.PathData();
@Override
- public PathParser.PathDataNode[] evaluate(float fraction,
- PathParser.PathDataNode[] startPathData,
- PathParser.PathDataNode[] endPathData) {
- if (!PathParser.canMorph(startPathData, endPathData)) {
+ public PathParser.PathData evaluate(float fraction, PathParser.PathData startPathData,
+ PathParser.PathData endPathData) {
+ if (!PathParser.interpolatePathData(mPathData, startPathData, endPathData, fraction)) {
throw new IllegalArgumentException("Can't interpolate between"
+ " two incompatible pathData");
}
-
- if (mNodeArray == null || !PathParser.canMorph(mNodeArray, startPathData)) {
- mNodeArray = PathParser.deepCopyNodes(startPathData);
- }
-
- for (int i = 0; i < startPathData.length; i++) {
- mNodeArray[i].interpolatePathDataNode(startPathData[i],
- endPathData[i], fraction);
- }
-
- return mNodeArray;
+ return mPathData;
}
}
@@ -323,13 +292,14 @@
if (valueType == VALUE_TYPE_PATH) {
String fromString = styledAttributes.getString(valueFromId);
String toString = styledAttributes.getString(valueToId);
- PathParser.PathDataNode[] nodesFrom = PathParser.createNodesFromPathData(fromString);
- PathParser.PathDataNode[] nodesTo = PathParser.createNodesFromPathData(toString);
+ PathParser.PathData nodesFrom = fromString == null
+ ? null : new PathParser.PathData(fromString);
+ PathParser.PathData nodesTo = toString == null
+ ? null : new PathParser.PathData(toString);
if (nodesFrom != null || nodesTo != null) {
if (nodesFrom != null) {
- TypeEvaluator evaluator =
- new PathDataEvaluator(PathParser.deepCopyNodes(nodesFrom));
+ TypeEvaluator evaluator = new PathDataEvaluator();
if (nodesTo != null) {
if (!PathParser.canMorph(nodesFrom, nodesTo)) {
throw new InflateException(" Can't morph from " + fromString + " to " +
@@ -342,8 +312,7 @@
(Object) nodesFrom);
}
} else if (nodesTo != null) {
- TypeEvaluator evaluator =
- new PathDataEvaluator(PathParser.deepCopyNodes(nodesTo));
+ TypeEvaluator evaluator = new PathDataEvaluator();
returnValue = PropertyValuesHolder.ofObject(propertyName, evaluator,
(Object) nodesTo);
}
@@ -484,23 +453,25 @@
TypeEvaluator evaluator = null;
String fromString = arrayAnimator.getString(R.styleable.Animator_valueFrom);
String toString = arrayAnimator.getString(R.styleable.Animator_valueTo);
- PathParser.PathDataNode[] nodesFrom = PathParser.createNodesFromPathData(fromString);
- PathParser.PathDataNode[] nodesTo = PathParser.createNodesFromPathData(toString);
+ PathParser.PathData pathDataFrom = fromString == null
+ ? null : new PathParser.PathData(fromString);
+ PathParser.PathData pathDataTo = toString == null
+ ? null : new PathParser.PathData(toString);
- if (nodesFrom != null) {
- if (nodesTo != null) {
- anim.setObjectValues(nodesFrom, nodesTo);
- if (!PathParser.canMorph(nodesFrom, nodesTo)) {
+ if (pathDataFrom != null) {
+ if (pathDataTo != null) {
+ anim.setObjectValues(pathDataFrom, pathDataTo);
+ if (!PathParser.canMorph(pathDataFrom, pathDataTo)) {
throw new InflateException(arrayAnimator.getPositionDescription()
+ " Can't morph from " + fromString + " to " + toString);
}
} else {
- anim.setObjectValues((Object)nodesFrom);
+ anim.setObjectValues((Object)pathDataFrom);
}
- evaluator = new PathDataEvaluator(PathParser.deepCopyNodes(nodesFrom));
- } else if (nodesTo != null) {
- anim.setObjectValues((Object)nodesTo);
- evaluator = new PathDataEvaluator(PathParser.deepCopyNodes(nodesTo));
+ evaluator = new PathDataEvaluator();
+ } else if (pathDataTo != null) {
+ anim.setObjectValues((Object)pathDataTo);
+ evaluator = new PathDataEvaluator();
}
if (DBG_ANIMATOR_INFLATER && evaluator != null) {
diff --git a/core/java/android/annotation/TestApi.java b/core/java/android/annotation/TestApi.java
new file mode 100644
index 0000000..0e9ed37
--- /dev/null
+++ b/core/java/android/annotation/TestApi.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2015 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.annotation;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates an API is exposed for use by CTS.
+ * <p>
+ * These APIs are not guaranteed to remain consistent release-to-release,
+ * and are not for use by apps linking against the Android SDK.
+ * </p>
+ *
+ * @hide
+ */
+@Target({TYPE, FIELD, METHOD, CONSTRUCTOR, ANNOTATION_TYPE, PACKAGE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface TestApi {
+}
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 472d97f..8bb0ff5 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -6618,6 +6618,17 @@
}
/**
+ * Set whether the caption should displayed directly on the content rather than push it down.
+ *
+ * This affects only freeform windows since they display the caption and only the main
+ * window of the activity. The caption is used to drag the window around and also shows
+ * maximize and close action buttons.
+ */
+ public void overlayWithDecorCaption(boolean overlay) {
+ mWindow.setOverlayDecorCaption(overlay);
+ }
+
+ /**
* Interface for informing a translucent {@link Activity} once all visible activities below it
* have completed drawing. This is necessary only after an {@link Activity} has been made
* opaque using {@link Activity#convertFromTranslucent()} and before it has been drawn
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 65de4ca..c203854 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -265,6 +265,12 @@
/** @hide User operation call: given user id is the current user, can't be stopped. */
public static final int USER_OP_IS_CURRENT = -2;
+ /** @hide User operation call: system user can't be stopped. */
+ public static final int USER_OP_ERROR_IS_SYSTEM = -3;
+
+ /** @hide User operation call: one of related users cannot be stopped. */
+ public static final int USER_OP_ERROR_RELATED_USERS_CANNOT_STOP = -4;
+
/** @hide Process does not exist. */
public static final int PROCESS_STATE_NONEXISTENT = -1;
@@ -327,12 +333,39 @@
/** @hide Process is being cached for later use and is empty. */
public static final int PROCESS_STATE_CACHED_EMPTY = 16;
+ /** @hide Should this process state be considered a background state? */
+ public static final boolean isProcStateBackground(int procState) {
+ return procState >= PROCESS_STATE_BACKUP;
+ }
+
/** @hide requestType for assist context: only basic information. */
public static final int ASSIST_CONTEXT_BASIC = 0;
/** @hide requestType for assist context: generate full AssistStructure. */
public static final int ASSIST_CONTEXT_FULL = 1;
+ /** @hide Flag for registerUidObserver: report changes in process state. */
+ public static final int UID_OBSERVER_PROCSTATE = 1<<0;
+
+ /** @hide Flag for registerUidObserver: report uid gone. */
+ public static final int UID_OBSERVER_GONE = 1<<1;
+
+ /** @hide Flag for registerUidObserver: report uid has become idle. */
+ public static final int UID_OBSERVER_IDLE = 1<<2;
+
+ /** @hide Flag for registerUidObserver: report uid has become active. */
+ public static final int UID_OBSERVER_ACTIVE = 1<<3;
+
+ /** @hide Mode for {@link IActivityManager#getAppStartMode}: normal free-to-run operation. */
+ public static final int APP_START_MODE_NORMAL = 0;
+
+ /** @hide Mode for {@link IActivityManager#getAppStartMode}: delay running until later. */
+ public static final int APP_START_MODE_DELAYED = 1;
+
+ /** @hide Mode for {@link IActivityManager#getAppStartMode}: disable/cancel pending
+ * launches. */
+ public static final int APP_START_MODE_DISABLED = 2;
+
/**
* Lock task mode is not active.
*/
@@ -501,6 +534,20 @@
return stackId == FULLSCREEN_WORKSPACE_STACK_ID
|| stackId == DOCKED_STACK_ID || stackId == PINNED_STACK_ID;
}
+
+ /**
+ * Returns true if animation specs should be constructed for app transition that moves
+ * the task to the specified stack.
+ */
+ public static boolean useAnimationSpecForAppTransition(int stackId) {
+ return stackId == FREEFORM_WORKSPACE_STACK_ID
+ || stackId == FULLSCREEN_WORKSPACE_STACK_ID || stackId == DOCKED_STACK_ID;
+ }
+
+ /** Returns true if the windows in the stack can receive input keys. */
+ public static boolean canReceiveKeys(int stackId) {
+ return stackId != PINNED_STACK_ID;
+ }
}
/**
@@ -857,7 +904,7 @@
if (mIcon != null) {
return mIcon;
}
- return loadTaskDescriptionIcon(mIconFilename);
+ return loadTaskDescriptionIcon(mIconFilename, UserHandle.myUserId());
}
/** @hide */
@@ -871,11 +918,11 @@
}
/** @hide */
- public static Bitmap loadTaskDescriptionIcon(String iconFilename) {
+ public static Bitmap loadTaskDescriptionIcon(String iconFilename, int userId) {
if (iconFilename != null) {
try {
return ActivityManagerNative.getDefault().
- getTaskDescriptionIcon(iconFilename);
+ getTaskDescriptionIcon(iconFilename, userId);
} catch (RemoteException e) {
}
}
@@ -3048,7 +3095,9 @@
/** {@hide} */
public static final int FLAG_OR_STOPPED = 1 << 0;
/** {@hide} */
- public static final int FLAG_WITH_AMNESIA = 1 << 1;
+ public static final int FLAG_AND_LOCKED = 1 << 1;
+ /** {@hide} */
+ public static final int FLAG_AND_UNLOCKED = 1 << 2;
/**
* Return whether the given user is actively running. This means that
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 4449e4f..c05d5e8 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -751,12 +751,18 @@
int taskId = data.readInt();
int createMode = data.readInt();
boolean toTop = data.readInt() != 0;
- moveTaskToDockedStack(taskId, createMode, toTop);
+ boolean animate = data.readInt() != 0;
+ Rect bounds = null;
+ boolean hasBounds = data.readInt() != 0;
+ if (hasBounds) {
+ bounds = Rect.CREATOR.createFromParcel(data);
+ }
+ moveTaskToDockedStack(taskId, createMode, toTop, animate, bounds);
reply.writeNoException();
return true;
}
- case MOVE_TOP_ACTIVITY_TO_PINNED_STACK: {
+ case MOVE_TOP_ACTIVITY_TO_PINNED_STACK_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
final int stackId = data.readInt();
final Rect r = Rect.CREATOR.createFromParcel(data);
@@ -1962,12 +1968,23 @@
return true;
}
+ case UNLOCK_USER_TRANSACTION: {
+ data.enforceInterface(IActivityManager.descriptor);
+ int userId = data.readInt();
+ byte[] token = data.createByteArray();
+ boolean result = unlockUser(userId, token);
+ reply.writeNoException();
+ reply.writeInt(result ? 1 : 0);
+ return true;
+ }
+
case STOP_USER_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
int userid = data.readInt();
+ boolean force = data.readInt() != 0;
IStopUserCallback callback = IStopUserCallback.Stub.asInterface(
data.readStrongBinder());
- int result = stopUser(userid, callback);
+ int result = stopUser(userid, force, callback);
reply.writeNoException();
reply.writeInt(result);
return true;
@@ -2029,7 +2046,8 @@
data.enforceInterface(IActivityManager.descriptor);
IUidObserver observer = IUidObserver.Stub.asInterface(
data.readStrongBinder());
- registerUidObserver(observer);
+ int which = data.readInt();
+ registerUidObserver(observer, which);
return true;
}
@@ -2489,7 +2507,8 @@
case GET_TASK_DESCRIPTION_ICON_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
String filename = data.readString();
- Bitmap icon = getTaskDescriptionIcon(filename);
+ int userId = data.readInt();
+ Bitmap icon = getTaskDescriptionIcon(filename, userId);
reply.writeNoException();
if (icon == null) {
reply.writeInt(0);
@@ -2698,13 +2717,22 @@
reply.writeNoException();
return true;
}
- case REMOVE_STACK: {
+ case REMOVE_STACK_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
final int stackId = data.readInt();
removeStack(stackId);
reply.writeNoException();
return true;
}
+ case GET_APP_START_MODE_TRANSACTION: {
+ data.enforceInterface(IActivityManager.descriptor);
+ final int uid = data.readInt();
+ final String pkg = data.readString();
+ int res = getAppStartMode(uid, pkg);
+ reply.writeNoException();
+ reply.writeInt(res);
+ return true;
+ }
}
return super.onTransact(code, data, reply, flags);
@@ -3556,8 +3584,8 @@
reply.recycle();
}
@Override
- public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop)
- throws RemoteException
+ public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate,
+ Rect initialBounds) throws RemoteException
{
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -3565,6 +3593,13 @@
data.writeInt(taskId);
data.writeInt(createMode);
data.writeInt(toTop ? 1 : 0);
+ data.writeInt(animate ? 1 : 0);
+ if (initialBounds != null) {
+ data.writeInt(1);
+ initialBounds.writeToParcel(data, 0);
+ } else {
+ data.writeInt(0);
+ }
mRemote.transact(MOVE_TASK_TO_DOCKED_STACK_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
@@ -3579,7 +3614,7 @@
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(stackId);
r.writeToParcel(data, 0);
- mRemote.transact(MOVE_TOP_ACTIVITY_TO_PINNED_STACK, data, reply, 0);
+ mRemote.transact(MOVE_TOP_ACTIVITY_TO_PINNED_STACK_TRANSACTION, data, reply, 0);
reply.readException();
final boolean res = reply.readInt() != 0;
data.recycle();
@@ -5239,11 +5274,27 @@
return result;
}
- public int stopUser(int userid, IStopUserCallback callback) throws RemoteException {
+ public boolean unlockUser(int userId, byte[] token) throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeInt(userId);
+ data.writeByteArray(token);
+ mRemote.transact(IActivityManager.UNLOCK_USER_TRANSACTION, data, reply, 0);
+ reply.readException();
+ boolean result = reply.readInt() != 0;
+ reply.recycle();
+ data.recycle();
+ return result;
+ }
+
+ public int stopUser(int userid, boolean force, IStopUserCallback callback)
+ throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(userid);
+ data.writeInt(force ? 1 : 0);
data.writeStrongInterface(callback);
mRemote.transact(STOP_USER_TRANSACTION, data, reply, 0);
reply.readException();
@@ -5326,11 +5377,12 @@
reply.recycle();
}
- public void registerUidObserver(IUidObserver observer) throws RemoteException {
+ public void registerUidObserver(IUidObserver observer, int which) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(observer != null ? observer.asBinder() : null);
+ data.writeInt(which);
mRemote.transact(REGISTER_UID_OBSERVER_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
@@ -5987,11 +6039,12 @@
}
@Override
- public Bitmap getTaskDescriptionIcon(String filename) throws RemoteException {
+ public Bitmap getTaskDescriptionIcon(String filename, int userId) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeString(filename);
+ data.writeInt(userId);
mRemote.transact(GET_TASK_DESCRIPTION_ICON_TRANSACTION, data, reply, 0);
reply.readException();
final Bitmap icon = reply.readInt() == 0 ? null : Bitmap.CREATOR.createFromParcel(reply);
@@ -6292,11 +6345,26 @@
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(stackId);
- mRemote.transact(REMOVE_STACK, data, reply, 0);
+ mRemote.transact(REMOVE_STACK_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
reply.recycle();
}
+ @Override
+ public int getAppStartMode(int uid, String packageName) throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeInt(uid);
+ data.writeString(packageName);
+ mRemote.transact(GET_APP_START_MODE_TRANSACTION, data, reply, 0);
+ reply.readException();
+ int res = reply.readInt();
+ data.recycle();
+ reply.recycle();
+ return res;
+ }
+
private IBinder mRemote;
}
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index 57900aa..cee1aa5 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -64,11 +64,13 @@
public static final String KEY_PACKAGE_NAME = "android:activity.packageName";
/**
- * The bounds that the activity should be started in. Set to null explicitly
- * for full screen. If the key is not found, previous bounds will be preserved.
+ * The bounds (window size) that the activity should be launched in. Set to null explicitly for
+ * full screen. If the key is not found, previous bounds will be preserved.
+ * NOTE: This value is ignored on devices that don't have
+ * {@link android.content.pm.PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT} enabled.
* @hide
*/
- public static final String KEY_BOUNDS = "android:activity.bounds";
+ public static final String KEY_LAUNCH_BOUNDS = "android:activity.launchBounds";
/**
* Type of animation that arguments specify.
@@ -193,8 +195,8 @@
public static final int ANIM_CLIP_REVEAL = 11;
private String mPackageName;
- private boolean mHasBounds;
- private Rect mBounds;
+ private boolean mHasLaunchBounds;
+ private Rect mLaunchBounds;
private int mAnimationType = ANIM_NONE;
private int mCustomEnterResId;
private int mCustomExitResId;
@@ -705,9 +707,9 @@
} catch (RuntimeException e) {
Slog.w(TAG, e);
}
- mHasBounds = opts.containsKey(KEY_BOUNDS);
- if (mHasBounds) {
- mBounds = opts.getParcelable(KEY_BOUNDS);
+ mHasLaunchBounds = opts.containsKey(KEY_LAUNCH_BOUNDS);
+ if (mHasLaunchBounds) {
+ mLaunchBounds = opts.getParcelable(KEY_LAUNCH_BOUNDS);
}
mAnimationType = opts.getInt(KEY_ANIM_TYPE);
switch (mAnimationType) {
@@ -766,10 +768,15 @@
}
}
- /** @hide */
- public ActivityOptions setBounds(Rect bounds) {
- mHasBounds = true;
- mBounds = bounds;
+ /**
+ * Sets the bounds (window size) that the activity should be launched in. Set to null explicitly
+ * for full screen.
+ * NOTE: This value is ignored on devices that don't have
+ * {@link android.content.pm.PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT} enabled.
+ */
+ public ActivityOptions setLaunchBounds(Rect launchBounds) {
+ mHasLaunchBounds = true;
+ mLaunchBounds = launchBounds;
return this;
}
@@ -778,14 +785,12 @@
return mPackageName;
}
- /** @hide */
- public boolean hasBounds() {
- return mHasBounds;
+ public boolean hasLaunchBounds() {
+ return mHasLaunchBounds;
}
- /** @hide */
- public Rect getBounds(){
- return mBounds;
+ public Rect getLaunchBounds(){
+ return mLaunchBounds;
}
/** @hide */
@@ -997,8 +1002,8 @@
if (mPackageName != null) {
b.putString(KEY_PACKAGE_NAME, mPackageName);
}
- if (mHasBounds) {
- b.putParcelable(KEY_BOUNDS, mBounds);
+ if (mHasLaunchBounds) {
+ b.putParcelable(KEY_LAUNCH_BOUNDS, mLaunchBounds);
}
b.putInt(KEY_ANIM_TYPE, mAnimationType);
if (mUsageTimeReport != null) {
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b3d6382..74f0c0e 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -78,6 +78,7 @@
import android.os.UserHandle;
import android.provider.Settings;
import android.security.NetworkSecurityPolicy;
+import android.security.net.config.NetworkSecurityConfigProvider;
import android.util.AndroidRuntimeException;
import android.util.ArrayMap;
import android.util.DisplayMetrics;
@@ -91,7 +92,7 @@
import android.util.SparseIntArray;
import android.util.SuperNotCalledException;
import android.view.Display;
-import android.view.HardwareRenderer;
+import android.view.ThreadedRenderer;
import android.view.View;
import android.view.ViewDebug;
import android.view.ViewManager;
@@ -4611,7 +4612,7 @@
// If there are several packages in this application we won't
// initialize the graphics disk caches
if (packages != null && packages.length == 1) {
- HardwareRenderer.setupDiskCache(cacheDir);
+ ThreadedRenderer.setupDiskCache(cacheDir);
RenderScriptCacheDir.setupDiskCache(cacheDir);
}
} catch (RemoteException e) {
@@ -4658,7 +4659,7 @@
// use hardware accelerated drawing, since this can add too much
// overhead to the process.
if (!ActivityManager.isHighEndGfx()) {
- HardwareRenderer.disable(false);
+ ThreadedRenderer.disable(false);
}
}
@@ -4831,6 +4832,11 @@
}
}
+ // Install the Network Security Config Provider. This must happen before the application
+ // code is loaded to prevent issues with instances of TLS objects being created before
+ // the provider is installed.
+ NetworkSecurityConfigProvider.install(appContext);
+
// Continue loading instrumentation.
if (ii != null) {
final ApplicationInfo instrApp = new ApplicationInfo();
@@ -5523,9 +5529,9 @@
// accelerated drawing, since this can add too much overhead to the
// process.
if (!ActivityManager.isHighEndGfx()) {
- HardwareRenderer.disable(true);
+ ThreadedRenderer.disable(true);
} else {
- HardwareRenderer.enableForegroundTrimming();
+ ThreadedRenderer.enableForegroundTrimming();
}
ActivityThread thread = new ActivityThread();
thread.attach(true);
diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java
index bf2e13a..b569416 100644
--- a/core/java/android/app/AlarmManager.java
+++ b/core/java/android/app/AlarmManager.java
@@ -25,7 +25,6 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
-import android.os.SystemClock;
import android.os.UserHandle;
import android.os.WorkSource;
import android.text.TextUtils;
@@ -869,13 +868,19 @@
* {@link Intent#filterEquals}), will be canceled.
*
* @param operation IntentSender which matches a previously added
- * IntentSender.
+ * IntentSender. This parameter must not be {@code null}.
*
* @see #set
*/
public void cancel(PendingIntent operation) {
if (operation == null) {
- throw new NullPointerException("operation");
+ final String msg = "cancel() called with a null PendingIntent";
+ if (mTargetSdkVersion >= Build.VERSION_CODES.N) {
+ throw new NullPointerException(msg);
+ } else {
+ Log.e(TAG, msg);
+ return;
+ }
}
try {
@@ -891,7 +896,7 @@
*/
public void cancel(OnAlarmListener listener) {
if (listener == null) {
- throw new NullPointerException("listener");
+ throw new NullPointerException("cancel() called with a null OnAlarmListener");
}
ListenerWrapper wrapper = null;
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 77a9795..f0453e9 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -237,8 +237,10 @@
public static final int OP_TURN_SCREEN_ON = 61;
/** @hide Get device accounts. */
public static final int OP_GET_ACCOUNTS = 62;
+ /** @hide Control whether an application is allowed to run in the background. */
+ public static final int OP_RUN_IN_BACKGROUND = 63;
/** @hide */
- public static final int _NUM_OP = 63;
+ public static final int _NUM_OP = 64;
/** Access to coarse location information. */
public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -409,6 +411,7 @@
OP_WRITE_EXTERNAL_STORAGE,
OP_TURN_SCREEN_ON,
OP_GET_ACCOUNTS,
+ OP_RUN_IN_BACKGROUND,
};
/**
@@ -478,7 +481,8 @@
OPSTR_READ_EXTERNAL_STORAGE,
OPSTR_WRITE_EXTERNAL_STORAGE,
null,
- OPSTR_GET_ACCOUNTS
+ OPSTR_GET_ACCOUNTS,
+ null,
};
/**
@@ -549,6 +553,7 @@
"WRITE_EXTERNAL_STORAGE",
"TURN_ON_SCREEN",
"GET_ACCOUNTS",
+ "RUN_IN_BACKGROUND",
};
/**
@@ -618,7 +623,8 @@
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
null, // no permission for turning the screen on
- Manifest.permission.GET_ACCOUNTS
+ Manifest.permission.GET_ACCOUNTS,
+ null, // no permission for running in background
};
/**
@@ -690,6 +696,7 @@
null, // WRITE_EXTERNAL_STORAGE
null, // TURN_ON_SCREEN
null, // GET_ACCOUNTS
+ null, // RUN_IN_BACKGROUND
};
/**
@@ -760,6 +767,7 @@
false, // WRITE_EXTERNAL_STORAGE
false, // TURN_ON_SCREEN
false, // GET_ACCOUNTS
+ false, // RUN_IN_BACKGROUND
};
/**
@@ -829,6 +837,7 @@
AppOpsManager.MODE_ALLOWED,
AppOpsManager.MODE_ALLOWED, // OP_TURN_ON_SCREEN
AppOpsManager.MODE_ALLOWED,
+ AppOpsManager.MODE_ALLOWED, // OP_RUN_IN_BACKGROUND
};
/**
@@ -901,7 +910,8 @@
false,
false,
false,
- false
+ false,
+ false,
};
/**
@@ -1329,7 +1339,7 @@
IAppOpsCallback cb = mModeWatchers.get(callback);
if (cb == null) {
cb = new IAppOpsCallback.Stub() {
- public void opChanged(int op, String packageName) {
+ public void opChanged(int op, int uid, String packageName) {
if (callback instanceof OnOpChangedInternalListener) {
((OnOpChangedInternalListener)callback).onOpChanged(op, packageName);
}
diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 9081ef8..b24bce3 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -798,21 +798,33 @@
}
}
- private static void setFirstOut(SparseArray<Fragment> fragments, Fragment fragment) {
+ private static void setFirstOut(SparseArray<Fragment> firstOutFragments,
+ SparseArray<Fragment> lastInFragments, Fragment fragment) {
if (fragment != null) {
int containerId = fragment.mContainerId;
- if (containerId != 0 && !fragment.isHidden() && fragment.isAdded() &&
- fragment.getView() != null && fragments.get(containerId) == null) {
- fragments.put(containerId, fragment);
+ if (containerId != 0 && !fragment.isHidden()) {
+ if (fragment.isAdded() && fragment.getView() != null
+ && firstOutFragments.get(containerId) == null) {
+ firstOutFragments.put(containerId, fragment);
+ }
+ if (lastInFragments.get(containerId) == fragment) {
+ lastInFragments.remove(containerId);
+ }
}
}
}
- private void setLastIn(SparseArray<Fragment> fragments, Fragment fragment) {
+ private void setLastIn(SparseArray<Fragment> firstOutFragments,
+ SparseArray<Fragment> lastInFragments, Fragment fragment) {
if (fragment != null) {
int containerId = fragment.mContainerId;
if (containerId != 0) {
- fragments.put(containerId, fragment);
+ if (!fragment.isAdded()) {
+ lastInFragments.put(containerId, fragment);
+ }
+ if (firstOutFragments.get(containerId) == fragment) {
+ firstOutFragments.remove(containerId);
+ }
}
}
}
@@ -835,7 +847,7 @@
while (op != null) {
switch (op.cmd) {
case OP_ADD:
- setLastIn(lastInFragments, op.fragment);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_REPLACE: {
Fragment f = op.fragment;
@@ -845,29 +857,30 @@
if (f == null || old.mContainerId == f.mContainerId) {
if (old == f) {
f = null;
+ lastInFragments.remove(old.mContainerId);
} else {
- setFirstOut(firstOutFragments, old);
+ setFirstOut(firstOutFragments, lastInFragments, old);
}
}
}
}
- setLastIn(lastInFragments, f);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
}
case OP_REMOVE:
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_HIDE:
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_SHOW:
- setLastIn(lastInFragments, op.fragment);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_DETACH:
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_ATTACH:
- setLastIn(lastInFragments, op.fragment);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
}
@@ -889,38 +902,38 @@
if (!mManager.mContainer.onHasView()) {
return; // nothing to see, so no transitions
}
- Op op = mHead;
+ Op op = mTail;
while (op != null) {
switch (op.cmd) {
case OP_ADD:
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_REPLACE:
if (op.removed != null) {
for (int i = op.removed.size() - 1; i >= 0; i--) {
- setLastIn(lastInFragments, op.removed.get(i));
+ setLastIn(firstOutFragments, lastInFragments, op.removed.get(i));
}
}
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_REMOVE:
- setLastIn(lastInFragments, op.fragment);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_HIDE:
- setLastIn(lastInFragments, op.fragment);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_SHOW:
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_DETACH:
- setLastIn(lastInFragments, op.fragment);
+ setLastIn(firstOutFragments, lastInFragments, op.fragment);
break;
case OP_ATTACH:
- setFirstOut(firstOutFragments, op.fragment);
+ setFirstOut(firstOutFragments, lastInFragments, op.fragment);
break;
}
- op = op.next;
+ op = op.prev;
}
}
@@ -957,6 +970,7 @@
*/
private TransitionState beginTransition(SparseArray<Fragment> firstOutFragments,
SparseArray<Fragment> lastInFragments, boolean isBack) {
+ ensureFragmentsAreInitialized(lastInFragments);
TransitionState state = new TransitionState();
// Adding a non-existent target view makes sure that the transitions don't target
@@ -982,6 +996,20 @@
return state;
}
+ /**
+ * Ensure that fragments that are entering are at least at the CREATED state
+ * so that they may load Transitions using TransitionInflater.
+ */
+ private void ensureFragmentsAreInitialized(SparseArray<Fragment> lastInFragments) {
+ final int count = lastInFragments.size();
+ for (int i = 0; i < count; i++) {
+ final Fragment fragment = lastInFragments.valueAt(i);
+ if (fragment.mState < Fragment.CREATED) {
+ mManager.moveToState(fragment, Fragment.CREATED, 0, 0, false);
+ }
+ }
+ }
+
private static Transition cloneTransition(Transition transition) {
if (transition != null) {
transition = transition.clone();
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index bc7c3d0..23c4198 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -129,7 +129,7 @@
/**
* Map from package name, to preference name, to cached preferences.
*/
- private static ArrayMap<String, ArrayMap<String, SharedPreferencesImpl>> sSharedPrefs;
+ private static ArrayMap<String, ArrayMap<File, SharedPreferencesImpl>> sSharedPrefs;
final ActivityThread mMainThread;
final LoadedApk mPackageInfo;
@@ -327,34 +327,39 @@
@Override
public SharedPreferences getSharedPreferences(String name, int mode) {
+ // At least one application in the world actually passes in a null
+ // name. This happened to work because when we generated the file name
+ // we would stringify it to "null.xml". Nice.
+ if (mPackageInfo.getApplicationInfo().targetSdkVersion <
+ Build.VERSION_CODES.KITKAT) {
+ if (name == null) {
+ name = "null";
+ }
+ }
+
+ final File file = getSharedPrefsFile(name);
+ return getSharedPreferences(file, mode);
+ }
+
+ @Override
+ public SharedPreferences getSharedPreferences(File file, int mode) {
SharedPreferencesImpl sp;
synchronized (ContextImpl.class) {
if (sSharedPrefs == null) {
- sSharedPrefs = new ArrayMap<String, ArrayMap<String, SharedPreferencesImpl>>();
+ sSharedPrefs = new ArrayMap<String, ArrayMap<File, SharedPreferencesImpl>>();
}
final String packageName = getPackageName();
- ArrayMap<String, SharedPreferencesImpl> packagePrefs = sSharedPrefs.get(packageName);
+ ArrayMap<File, SharedPreferencesImpl> packagePrefs = sSharedPrefs.get(packageName);
if (packagePrefs == null) {
- packagePrefs = new ArrayMap<String, SharedPreferencesImpl>();
+ packagePrefs = new ArrayMap<File, SharedPreferencesImpl>();
sSharedPrefs.put(packageName, packagePrefs);
}
- // At least one application in the world actually passes in a null
- // name. This happened to work because when we generated the file name
- // we would stringify it to "null.xml". Nice.
- if (mPackageInfo.getApplicationInfo().targetSdkVersion <
- Build.VERSION_CODES.KITKAT) {
- if (name == null) {
- name = "null";
- }
- }
-
- sp = packagePrefs.get(name);
+ sp = packagePrefs.get(file);
if (sp == null) {
- File prefsFile = getSharedPrefsFile(name);
- sp = new SharedPreferencesImpl(prefsFile, mode);
- packagePrefs.put(name, sp);
+ sp = new SharedPreferencesImpl(file, mode);
+ packagePrefs.put(file, sp);
return sp;
}
}
@@ -584,6 +589,9 @@
if ((mode & MODE_ENABLE_WRITE_AHEAD_LOGGING) != 0) {
flags |= SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING;
}
+ if ((mode & MODE_NO_LOCALIZED_COLLATORS) != 0) {
+ flags |= SQLiteDatabase.NO_LOCALIZED_COLLATORS;
+ }
SQLiteDatabase db = SQLiteDatabase.openDatabase(f.getPath(), factory, flags, errorHandler);
setFilePermissionsFromMode(f.getPath(), mode, 0);
return db;
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 0745537..20f3495 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -248,6 +248,7 @@
} else if (mTransitioningViews != null) {
mTransitioningViews.addAll(mSharedElements);
}
+ moveSharedElementsFromOverlay();
mSharedElementNames.clear();
mSharedElements.clear();
mAllSharedElementNames.clear();
@@ -574,14 +575,20 @@
setGhostVisibility(View.INVISIBLE);
mHasStopped = true;
mIsCanceled = true;
+ clearState();
+ return super.cancelPendingTransitions();
+ }
+
+ @Override
+ protected void clearState() {
+ mSharedElementsBundle = null;
+ mEnterViewsTransition = null;
mResultReceiver = null;
if (mBackgroundAnimator != null) {
mBackgroundAnimator.cancel();
mBackgroundAnimator = null;
}
- mActivity = null;
- clearState();
- return super.cancelPendingTransitions();
+ super.clearState();
}
private void makeOpaque() {
diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 4b670cd..e93b40e 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -470,6 +470,11 @@
mActivity = null;
}
// Clear the state so that we can't hold any references accidentally and leak memory.
+ clearState();
+ }
+
+ @Override
+ protected void clearState() {
mHandler = null;
mSharedElementBundle = null;
if (mBackgroundAnimator != null) {
@@ -477,7 +482,7 @@
mBackgroundAnimator = null;
}
mExitSharedElementBundle = null;
- clearState();
+ super.clearState();
}
@Override
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index b69a480..38c7957 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -142,8 +142,8 @@
public boolean moveActivityTaskToBack(IBinder token, boolean nonRoot) throws RemoteException;
public void moveTaskBackwards(int task) throws RemoteException;
public void moveTaskToStack(int taskId, int stackId, boolean toTop) throws RemoteException;
- public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop)
- throws RemoteException;
+ public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate,
+ Rect initialBounds) throws RemoteException;
public boolean moveTopActivityToPinnedStack(int stackId, Rect bounds) throws RemoteException;
public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode) throws RemoteException;
public void positionTaskInStack(int taskId, int stackId, int position) throws RemoteException;
@@ -390,7 +390,8 @@
// Multi-user APIs
public boolean switchUser(int userid) throws RemoteException;
public boolean startUserInBackground(int userid) throws RemoteException;
- public int stopUser(int userid, IStopUserCallback callback) throws RemoteException;
+ public boolean unlockUser(int userid, byte[] token) throws RemoteException;
+ public int stopUser(int userid, boolean force, IStopUserCallback callback) throws RemoteException;
public UserInfo getCurrentUser() throws RemoteException;
public boolean isUserRunning(int userid, int flags) throws RemoteException;
public int[] getRunningUserIds() throws RemoteException;
@@ -400,7 +401,7 @@
public void registerProcessObserver(IProcessObserver observer) throws RemoteException;
public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException;
- public void registerUidObserver(IUidObserver observer) throws RemoteException;
+ public void registerUidObserver(IUidObserver observer, int which) throws RemoteException;
public void unregisterUidObserver(IUidObserver observer) throws RemoteException;
public boolean isIntentSenderTargetedToPackage(IIntentSender sender) throws RemoteException;
@@ -497,7 +498,7 @@
public void resizeTask(int taskId, Rect bounds, int resizeMode) throws RemoteException;
public Rect getTaskBounds(int taskId) throws RemoteException;
- public Bitmap getTaskDescriptionIcon(String filename) throws RemoteException;
+ public Bitmap getTaskDescriptionIcon(String filename, int userId) throws RemoteException;
public void startInPlaceAnimationOnFrontMostApplication(ActivityOptions opts)
throws RemoteException;
@@ -542,6 +543,8 @@
public void removeStack(int stackId) throws RemoteException;
+ public int getAppStartMode(int uid, String packageName) throws RemoteException;
+
/*
* Private non-Binder interfaces
*/
@@ -899,6 +902,8 @@
int REPORT_SIZE_CONFIGURATIONS = IBinder.FIRST_CALL_TRANSACTION + 345;
int MOVE_TASK_TO_DOCKED_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 346;
int SUPPRESS_RESIZE_CONFIG_CHANGES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 347;
- int REMOVE_STACK = IBinder.FIRST_CALL_TRANSACTION + 348;
- int MOVE_TOP_ACTIVITY_TO_PINNED_STACK = IBinder.FIRST_CALL_TRANSACTION + 349;
+ int REMOVE_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 348;
+ int MOVE_TOP_ACTIVITY_TO_PINNED_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 349;
+ int GET_APP_START_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 350;
+ int UNLOCK_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 351;
}
diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl
index 30232da..c504ce3 100644
--- a/core/java/android/app/INotificationManager.aidl
+++ b/core/java/android/app/INotificationManager.aidl
@@ -47,14 +47,11 @@
void setNotificationsEnabledForPackage(String pkg, int uid, boolean enabled);
boolean areNotificationsEnabledForPackage(String pkg, int uid);
- void setPackagePriority(String pkg, int uid, int priority);
- int getPackagePriority(String pkg, int uid);
-
- void setPackagePeekable(String pkg, int uid, boolean peekable);
- boolean getPackagePeekable(String pkg, int uid);
-
- void setPackageVisibilityOverride(String pkg, int uid, int visibility);
- int getPackageVisibilityOverride(String pkg, int uid);
+ ParceledListSlice getTopics(String pkg, int uid);
+ void setTopicVisibilityOverride(String pkg, int uid, in Notification.Topic topic, int visibility);
+ int getTopicVisibilityOverride(String pkg, int uid, in Notification.Topic topic);
+ void setTopicPriority(String pkg, int uid, in Notification.Topic topic, int priority);
+ int getTopicPriority(String pkg, int uid, in Notification.Topic topic);
// TODO: Remove this when callers have been migrated to the equivalent
// INotificationListener method.
@@ -96,6 +93,7 @@
AutomaticZenRule addAutomaticZenRule(in AutomaticZenRule automaticZenRule);
boolean updateAutomaticZenRule(in AutomaticZenRule automaticZenRule);
boolean removeAutomaticZenRule(String id);
+ boolean removeAutomaticZenRules(String packageName);
byte[] getBackupPayload(int user);
void applyRestore(in byte[] payload, int user);
diff --git a/core/java/android/app/IUidObserver.aidl b/core/java/android/app/IUidObserver.aidl
index 308cb94..fa8d0c9 100644
--- a/core/java/android/app/IUidObserver.aidl
+++ b/core/java/android/app/IUidObserver.aidl
@@ -18,6 +18,24 @@
/** {@hide} */
oneway interface IUidObserver {
+ /**
+ * General report of a state change of an uid.
+ */
void onUidStateChanged(int uid, int procState);
+
+ /**
+ * Report that there are no longer any processes running for a uid.
+ */
void onUidGone(int uid);
+
+ /**
+ * Report that a uid is now active (no longer idle).
+ */
+ void onUidActive(int uid);
+
+ /**
+ * Report that a uid is idle -- it has either been running in the background for
+ * a sufficient period of time, or all of its processes have gone away.
+ */
+ void onUidIdle(int uid);
}
diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java
index 2e05edb..1370000 100644
--- a/core/java/android/app/NativeActivity.java
+++ b/core/java/android/app/NativeActivity.java
@@ -129,8 +129,8 @@
String libname = "main";
String funcname = "ANativeActivity_onCreate";
ActivityInfo ai;
-
- mIMM = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+
+ mIMM = getSystemService(InputMethodManager.class);
getWindow().takeSurface(this);
getWindow().takeInputQueue(this);
diff --git a/core/java/android/app/Notification.aidl b/core/java/android/app/Notification.aidl
index 9d8129c..3f1d113 100644
--- a/core/java/android/app/Notification.aidl
+++ b/core/java/android/app/Notification.aidl
@@ -17,3 +17,4 @@
package android.app;
parcelable Notification;
+parcelable Notification.Topic;
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0b77be3..6c0c3e8 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -21,9 +21,11 @@
import android.annotation.IntDef;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.SystemApi;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Bitmap;
@@ -44,7 +46,6 @@
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
-import android.util.MathUtils;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
@@ -57,7 +58,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Constructor;
-import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -838,13 +838,6 @@
public static final String EXTRA_PEOPLE = "android.people";
/**
- * {@link #extras} key: used to provide hints about the appropriateness of
- * displaying this notification as a heads-up notification.
- * @hide
- */
- public static final String EXTRA_AS_HEADS_UP = "headsup";
-
- /**
* Allow certain system-generated notifications to appear before the device is provisioned.
* Only available to notifications coming from the android package.
* @hide
@@ -887,32 +880,6 @@
*/
public static final String EXTRA_BUILDER_APPLICATION_INFO = "android.appInfo";
- /**
- * Value for {@link #EXTRA_AS_HEADS_UP} that indicates this notification should not be
- * displayed in the heads up space.
- *
- * <p>
- * If this notification has a {@link #fullScreenIntent}, then it will always launch the
- * full-screen intent when posted.
- * </p>
- * @hide
- */
- public static final int HEADS_UP_NEVER = 0;
-
- /**
- * Default value for {@link #EXTRA_AS_HEADS_UP} that indicates this notification may be
- * displayed as a heads up.
- * @hide
- */
- public static final int HEADS_UP_ALLOWED = 1;
-
- /**
- * Value for {@link #EXTRA_AS_HEADS_UP} that indicates this notification is a
- * good candidate for display as a heads up.
- * @hide
- */
- public static final int HEADS_UP_REQUESTED = 2;
-
private Icon mSmallIcon;
private Icon mLargeIcon;
@@ -1466,10 +1433,13 @@
};
}
- private Topic[] topics;
+ @SystemApi
+ public static final String TOPIC_DEFAULT = "system_default_topic";
- public Topic[] getTopics() {
- return topics;
+ private Topic topic;
+
+ public Topic getTopic() {
+ return topic;
}
/**
@@ -1599,7 +1569,9 @@
color = parcel.readInt();
- topics = parcel.createTypedArray(Topic.CREATOR); // may be null
+ if (parcel.readInt() != 0) {
+ topic = Topic.CREATOR.createFromParcel(parcel);
+ }
}
@Override
@@ -1700,11 +1672,8 @@
that.color = this.color;
- if (this.topics != null) {
- that.topics = new Topic[this.topics.length];
- for(int i=0; i<this.topics.length; i++) {
- that.topics[i] = this.topics[i].clone();
- }
+ if (this.topic != null) {
+ that.topic = this.topic.clone();
}
if (!heavy) {
@@ -1878,7 +1847,12 @@
parcel.writeInt(color);
- parcel.writeTypedArray(topics, 0); // null ok
+ if (topic != null) {
+ parcel.writeInt(1);
+ topic.writeToParcel(parcel, 0);
+ } else {
+ parcel.writeInt(0);
+ }
}
/**
@@ -1940,6 +1914,19 @@
builder.build(); // callers expect this notification to be ready to use
}
+ /**
+ * @hide
+ */
+ public static void addFieldsFromContext(Context context, Notification notification) {
+ if (notification.extras.getParcelable(EXTRA_BUILDER_APPLICATION_INFO) == null) {
+ notification.extras.putParcelable(EXTRA_BUILDER_APPLICATION_INFO,
+ context.getApplicationInfo());
+ }
+ if (!notification.extras.containsKey(EXTRA_ORIGINATING_USERID)) {
+ notification.extras.putInt(EXTRA_ORIGINATING_USERID, context.getUserId());
+ }
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -2008,17 +1995,9 @@
sb.append(" publicVersion=");
sb.append(publicVersion.toString());
}
- if (topics != null) {
- sb.append("topics=[");
- int N = topics.length;
- if (N > 0) {
- for (int i = 0; i < N-1; i++) {
- sb.append(topics[i]);
- sb.append(',');
- }
- sb.append(topics[N-1]);
- }
- sb.append("]");
+ if (topic != null) {
+ sb.append("topic=");
+ sb.append(topic.toString());
}
sb.append(")");
return sb.toString();
@@ -2136,12 +2115,6 @@
private ArrayList<String> mPersonList = new ArrayList<String>();
private NotificationColorUtil mColorUtil;
private boolean mColorUtilInited = false;
- private List<Topic> mTopics = new ArrayList<>();
-
- /**
- * The user that built the notification originally.
- */
- private int mOriginatingUserId;
/**
* Constructs a new Builder with the defaults:
@@ -2187,10 +2160,6 @@
Collections.addAll(mPersonList, mN.extras.getStringArray(EXTRA_PEOPLE));
}
- if (mN.getTopics() != null) {
- Collections.addAll(mTopics, mN.getTopics());
- }
-
String templateClass = mN.extras.getString(EXTRA_TEMPLATE);
if (!TextUtils.isEmpty(templateClass)) {
final Class<? extends Style> styleClass
@@ -2962,15 +2931,15 @@
}
/**
- * Add a topic to this notification. Topics are typically displayed in Notification
+ * Sets the topic of this notification. Topics are typically displayed in Notification
* settings.
* <p>
* Every topic must have an id and a textual label.
*
* @param topic The topic to add.
*/
- public Builder addTopic(Topic topic) {
- mTopics.add(topic);
+ public Builder setTopic(Topic topic) {
+ mN.topic = topic;
return this;
}
@@ -2978,7 +2947,7 @@
// Note: This assumes that the current user can read the profile badge of the
// originating user.
return mContext.getPackageManager().getUserBadgeForDensity(
- new UserHandle(mOriginatingUserId), 0);
+ new UserHandle(mContext.getUserId()), 0);
}
private Bitmap getProfileBadge() {
@@ -2999,7 +2968,6 @@
Bitmap profileBadge = getProfileBadge();
contentView.setViewVisibility(R.id.profile_badge_large_template, View.GONE);
- contentView.setViewVisibility(R.id.profile_badge_line2, View.GONE);
contentView.setViewVisibility(R.id.profile_badge_line3, View.GONE);
if (profileBadge != null) {
@@ -3016,38 +2984,35 @@
return false;
}
- private void shrinkLine3Text(RemoteViews contentView) {
- float subTextSize = mContext.getResources().getDimensionPixelSize(
- R.dimen.notification_subtext_size);
- contentView.setTextViewTextSize(R.id.text, TypedValue.COMPLEX_UNIT_PX, subTextSize);
- }
-
- private void unshrinkLine3Text(RemoteViews contentView) {
- float regularTextSize = mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.notification_text_size);
- contentView.setTextViewTextSize(R.id.text, TypedValue.COMPLEX_UNIT_PX, regularTextSize);
- }
-
private void resetStandardTemplate(RemoteViews contentView) {
- removeLargeIconBackground(contentView);
- contentView.setViewPadding(R.id.icon, 0, 0, 0, 0);
- contentView.setImageViewResource(R.id.icon, 0);
- contentView.setInt(R.id.icon, "setBackgroundResource", 0);
+ resetNotificationHeader(contentView);
+ resetContentMargins(contentView);
contentView.setViewVisibility(R.id.right_icon, View.GONE);
- contentView.setInt(R.id.right_icon, "setBackgroundResource", 0);
- contentView.setImageViewResource(R.id.right_icon, 0);
- contentView.setImageViewResource(R.id.icon, 0);
contentView.setTextViewText(R.id.title, null);
contentView.setTextViewText(R.id.text, null);
- unshrinkLine3Text(contentView);
- contentView.setTextViewText(R.id.text2, null);
- contentView.setViewVisibility(R.id.text2, View.GONE);
- contentView.setViewVisibility(R.id.info, View.GONE);
- contentView.setViewVisibility(R.id.time, View.GONE);
contentView.setViewVisibility(R.id.line3, View.GONE);
- contentView.setViewVisibility(R.id.overflow_divider, View.GONE);
+ contentView.setViewVisibility(R.id.text_line_1, View.GONE);
contentView.setViewVisibility(R.id.progress, View.GONE);
+ }
+
+ /**
+ * Resets the notification header to its original state
+ */
+ private void resetNotificationHeader(RemoteViews contentView) {
+ contentView.setImageViewResource(R.id.icon, 0);
+ contentView.setTextViewText(R.id.app_name_text, null);
contentView.setViewVisibility(R.id.chronometer, View.GONE);
+ contentView.setViewVisibility(R.id.header_sub_text, View.GONE);
+ contentView.setViewVisibility(R.id.header_content_info, View.GONE);
+ contentView.setViewVisibility(R.id.number_of_children, View.GONE);
+ contentView.setViewVisibility(R.id.sub_text_divider, View.GONE);
+ contentView.setViewVisibility(R.id.content_info_divider, View.GONE);
+ contentView.setViewVisibility(R.id.time_divider, View.GONE);
+ }
+
+ private void resetContentMargins(RemoteViews contentView) {
+ contentView.setViewLayoutMarginEnd(R.id.line1, 0);
+ contentView.setViewLayoutMarginEnd(R.id.line3, 0);
}
private RemoteViews applyStandardTemplate(int resId) {
@@ -3063,95 +3028,118 @@
resetStandardTemplate(contentView);
boolean showLine3 = false;
- boolean showLine2 = false;
- boolean contentTextInLine2 = false;
final Bundle ex = mN.extras;
- if (mN.mLargeIcon != null) {
- contentView.setImageViewIcon(R.id.icon, mN.mLargeIcon);
- processLargeLegacyIcon(mN.mLargeIcon, contentView);
- contentView.setImageViewIcon(R.id.right_icon, mN.mSmallIcon);
- contentView.setViewVisibility(R.id.right_icon, View.VISIBLE);
- processSmallRightIcon(mN.mSmallIcon, contentView);
- } else { // small icon at left
- contentView.setImageViewIcon(R.id.icon, mN.mSmallIcon);
- contentView.setViewVisibility(R.id.icon, View.VISIBLE);
- processSmallIconAsLarge(mN.mSmallIcon, contentView);
- }
+ bindNotificationHeader(contentView);
+ bindLargeIcon(contentView);
if (ex.getCharSequence(EXTRA_TITLE) != null) {
contentView.setTextViewText(R.id.title,
processLegacyText(ex.getCharSequence(EXTRA_TITLE)));
}
+ boolean showProgress = handleProgressBar(hasProgress, contentView, ex);
if (ex.getCharSequence(EXTRA_TEXT) != null) {
- contentView.setTextViewText(R.id.text,
+ contentView.setTextViewText(showProgress ? R.id.text_line_1 : R.id.text,
processLegacyText(ex.getCharSequence(EXTRA_TEXT)));
+ if (showProgress) {
+ contentView.setViewVisibility(R.id.text_line_1, View.VISIBLE);
+ }
+ showLine3 = !showProgress;
+ }
+ // We want to add badge to first line of text.
+ if (addProfileBadge(contentView, R.id.profile_badge_line3)) {
showLine3 = true;
}
- if (ex.getCharSequence(EXTRA_INFO_TEXT) != null) {
- contentView.setTextViewText(R.id.info,
- processLegacyText(ex.getCharSequence(EXTRA_INFO_TEXT)));
- contentView.setViewVisibility(R.id.info, View.VISIBLE);
- showLine3 = true;
+ // Note getStandardView may hide line 3 again.
+ contentView.setViewVisibility(R.id.line3, showLine3 ? View.VISIBLE : View.GONE);
+
+ return contentView;
+ }
+
+ private boolean handleProgressBar(boolean hasProgress, RemoteViews contentView, Bundle ex) {
+ final int max = ex.getInt(EXTRA_PROGRESS_MAX, 0);
+ final int progress = ex.getInt(EXTRA_PROGRESS, 0);
+ final boolean ind = ex.getBoolean(EXTRA_PROGRESS_INDETERMINATE);
+ if (hasProgress && (max != 0 || ind)) {
+ contentView.setViewVisibility(com.android.internal.R.id.progress, View.VISIBLE);
+ contentView.setProgressBar(
+ R.id.progress, max, progress, ind);
+ contentView.setProgressBackgroundTintList(
+ R.id.progress, ColorStateList.valueOf(mContext.getColor(
+ R.color.notification_progress_background_color)));
+ if (mN.color != COLOR_DEFAULT) {
+ ColorStateList colorStateList = ColorStateList.valueOf(mN.color);
+ contentView.setProgressTintList(R.id.progress, colorStateList);
+ contentView.setProgressIndeterminateTintList(R.id.progress, colorStateList);
+ }
+ return true;
+ } else {
+ contentView.setViewVisibility(R.id.progress, View.GONE);
+ return false;
+ }
+ }
+
+ private void bindLargeIcon(RemoteViews contentView) {
+ if (mN.mLargeIcon != null) {
+ contentView.setViewVisibility(R.id.right_icon, View.VISIBLE);
+ contentView.setImageViewIcon(R.id.right_icon, mN.mLargeIcon);
+ processLargeLegacyIcon(mN.mLargeIcon, contentView);
+ int endMargin = mContext.getResources().getDimensionPixelSize(
+ R.dimen.notification_content_picture_margin);
+ contentView.setViewLayoutMarginEnd(R.id.line1, endMargin);
+ contentView.setViewLayoutMarginEnd(R.id.line3, endMargin);
+ contentView.setViewLayoutMarginEnd(R.id.progress, endMargin);
+ }
+ }
+
+ private void bindNotificationHeader(RemoteViews contentView) {
+ bindSmallIcon(contentView);
+ bindChildCountColor(contentView);
+ bindHeaderAppName(contentView);
+ bindHeaderSubText(contentView);
+ bindContentInfo(contentView);
+ bindHeaderChronometerAndTime(contentView);
+ bindExpandButton(contentView);
+ }
+
+ private void bindChildCountColor(RemoteViews contentView) {
+ contentView.setTextColor(R.id.number_of_children, resolveColor());
+ }
+
+ private void bindContentInfo(RemoteViews contentView) {
+ boolean visible = false;
+ if (mN.extras.getCharSequence(EXTRA_INFO_TEXT) != null) {
+ contentView.setTextViewText(R.id.header_content_info,
+ processLegacyText(mN.extras.getCharSequence(EXTRA_INFO_TEXT)));
+ contentView.setViewVisibility(R.id.header_content_info, View.VISIBLE);
+ visible = true;
} else if (mN.number > 0) {
final int tooBig = mContext.getResources().getInteger(
R.integer.status_bar_notification_info_maxnum);
if (mN.number > tooBig) {
- contentView.setTextViewText(R.id.info, processLegacyText(
+ contentView.setTextViewText(R.id.header_content_info, processLegacyText(
mContext.getResources().getString(
R.string.status_bar_notification_info_overflow)));
} else {
- NumberFormat f = NumberFormat.getIntegerInstance();
- contentView.setTextViewText(R.id.info, processLegacyText(f.format(mN.number)));
+ contentView.setTextViewText(R.id.header_content_info,
+ processLegacyText(String.valueOf(mN.number)));
}
- contentView.setViewVisibility(R.id.info, View.VISIBLE);
- showLine3 = true;
- } else {
- contentView.setViewVisibility(R.id.info, View.GONE);
+ contentView.setViewVisibility(R.id.header_content_info, View.VISIBLE);
+ visible = true;
}
-
- // Need to show three lines?
- if (ex.getCharSequence(EXTRA_SUB_TEXT) != null) {
- contentView.setTextViewText(R.id.text,
- processLegacyText(ex.getCharSequence(EXTRA_SUB_TEXT)));
- if (ex.getCharSequence(EXTRA_TEXT) != null) {
- contentView.setTextViewText(R.id.text2,
- processLegacyText(ex.getCharSequence(EXTRA_TEXT)));
- contentView.setViewVisibility(R.id.text2, View.VISIBLE);
- showLine2 = true;
- contentTextInLine2 = true;
- } else {
- contentView.setViewVisibility(R.id.text2, View.GONE);
- }
- } else {
- contentView.setViewVisibility(R.id.text2, View.GONE);
- final int max = ex.getInt(EXTRA_PROGRESS_MAX, 0);
- final int progress = ex.getInt(EXTRA_PROGRESS, 0);
- final boolean ind = ex.getBoolean(EXTRA_PROGRESS_INDETERMINATE);
- if (hasProgress && (max != 0 || ind)) {
- contentView.setViewVisibility(R.id.progress, View.VISIBLE);
- contentView.setProgressBar(
- R.id.progress, max, progress, ind);
- contentView.setProgressBackgroundTintList(
- R.id.progress, ColorStateList.valueOf(mContext.getColor(
- R.color.notification_progress_background_color)));
- if (mN.color != COLOR_DEFAULT) {
- ColorStateList colorStateList = ColorStateList.valueOf(mN.color);
- contentView.setProgressTintList(R.id.progress, colorStateList);
- contentView.setProgressIndeterminateTintList(R.id.progress, colorStateList);
- }
- showLine2 = true;
- } else {
- contentView.setViewVisibility(R.id.progress, View.GONE);
- }
+ if (visible) {
+ contentView.setViewVisibility(R.id.content_info_divider, View.VISIBLE);
}
- if (showLine2) {
+ }
- // need to shrink all the type to make sure everything fits
- shrinkLine3Text(contentView);
- }
+ private void bindExpandButton(RemoteViews contentView) {
+ contentView.setDrawableParameters(R.id.expand_button, false, -1, resolveColor(),
+ PorterDuff.Mode.SRC_ATOP, -1);
+ }
+ private void bindHeaderChronometerAndTime(RemoteViews contentView) {
if (showsTimeOrChronometer()) {
- if (ex.getBoolean(EXTRA_SHOW_CHRONOMETER)) {
+ contentView.setViewVisibility(R.id.time_divider, View.VISIBLE);
+ if (mN.extras.getBoolean(EXTRA_SHOW_CHRONOMETER)) {
contentView.setViewVisibility(R.id.chronometer, View.VISIBLE);
contentView.setLong(R.id.chronometer, "setBase",
mN.when + (SystemClock.elapsedRealtime() - System.currentTimeMillis()));
@@ -3161,26 +3149,42 @@
contentView.setLong(R.id.time, "setTime", mN.when);
}
}
+ }
- // Adjust padding depending on line count and font size.
- contentView.setViewPadding(R.id.line1, 0,
- calculateTopPadding(mContext, hasThreeLines(),
- mContext.getResources().getConfiguration().fontScale),
- 0, 0);
-
- // We want to add badge to first line of text.
- boolean addedBadge = addProfileBadge(contentView,
- contentTextInLine2 ? R.id.profile_badge_line2 : R.id.profile_badge_line3);
- // If we added the badge to line 3 then we should show line 3.
- if (addedBadge && !contentTextInLine2) {
- showLine3 = true;
+ private void bindHeaderSubText(RemoteViews contentView) {
+ CharSequence subText = mN.extras.getCharSequence(EXTRA_SUB_TEXT);
+ if (subText == null && mStyle != null && mStyle.mSummaryTextSet
+ && mStyle.hasSummaryInHeader()) {
+ subText = mStyle.mSummaryText;
}
+ if (subText != null) {
+ // TODO: Remove the span entirely to only have the string with propper formating.
+ contentView.setTextViewText(R.id.header_sub_text, processLegacyText(subText));
+ contentView.setViewVisibility(R.id.header_sub_text, View.VISIBLE);
+ contentView.setViewVisibility(R.id.sub_text_divider, View.VISIBLE);
+ }
+ }
- // Note getStandardView may hide line 3 again.
- contentView.setViewVisibility(R.id.line3, showLine3 ? View.VISIBLE : View.GONE);
- contentView.setViewVisibility(R.id.overflow_divider,
- showLine3 ? View.VISIBLE : View.GONE);
- return contentView;
+ private void bindHeaderAppName(RemoteViews contentView) {
+ PackageManager packageManager = mContext.getPackageManager();
+ ApplicationInfo info = null;
+ try {
+ info = packageManager.getApplicationInfo(mContext.getApplicationInfo().packageName,
+ 0);
+ } catch (final NameNotFoundException e) {
+ return;
+ }
+ CharSequence appName = info != null ? packageManager.getApplicationLabel(info)
+ : null;
+ if (TextUtils.isEmpty(appName)) {
+ return;
+ }
+ contentView.setTextViewText(R.id.app_name_text, appName);
+ }
+
+ private void bindSmallIcon(RemoteViews contentView) {
+ contentView.setImageViewIcon(R.id.icon, mN.mSmallIcon);
+ processSmallIconColor(mN.mSmallIcon, contentView);
}
/**
@@ -3191,49 +3195,6 @@
return mN.when != 0 && mN.extras.getBoolean(EXTRA_SHOW_WHEN);
}
- /**
- * Logic to find out whether the notification is going to have three lines in the contracted
- * layout. This is used to adjust the top padding.
- *
- * @return true if the notification is going to have three lines; false if the notification
- * is going to have one or two lines
- */
- private boolean hasThreeLines() {
- final CharSequence subText = mN.extras.getCharSequence(EXTRA_SUB_TEXT);
- final CharSequence text = mN.extras.getCharSequence(EXTRA_TEXT);
- boolean contentTextInLine2 = subText != null && text != null;
- boolean hasProgress = mStyle == null || mStyle.hasProgress();
- // If we have content text in line 2, badge goes into line 2, or line 3 otherwise
- boolean badgeInLine3 = getProfileBadgeDrawable() != null && !contentTextInLine2;
- boolean hasLine3 = text != null || mN.extras.getCharSequence(EXTRA_INFO_TEXT) != null
- || mN.number > 0 || badgeInLine3;
- final Bundle ex = mN.extras;
- final int max = ex.getInt(EXTRA_PROGRESS_MAX, 0);
- final boolean ind = ex.getBoolean(EXTRA_PROGRESS_INDETERMINATE);
- boolean hasLine2 = (subText != null && text != null) ||
- (hasProgress && subText == null && (max != 0 || ind));
- return hasLine2 && hasLine3;
- }
-
- /**
- * @hide
- */
- public static int calculateTopPadding(Context ctx, boolean hasThreeLines,
- float fontScale) {
- int padding = ctx.getResources().getDimensionPixelSize(hasThreeLines
- ? R.dimen.notification_top_pad_narrow
- : R.dimen.notification_top_pad);
- int largePadding = ctx.getResources().getDimensionPixelSize(hasThreeLines
- ? R.dimen.notification_top_pad_large_text_narrow
- : R.dimen.notification_top_pad_large_text);
- float largeFactor = (MathUtils.constrain(fontScale, 1.0f, LARGE_TEXT_SCALE) - 1f)
- / (LARGE_TEXT_SCALE - 1f);
-
- // Linearly interpolate the padding between large and normal with the font scale ranging
- // from 1f to LARGE_TEXT_SCALE
- return Math.round((1 - largeFactor) * padding + largeFactor * largePadding);
- }
-
private void resetStandardTemplateWithActions(RemoteViews big) {
big.setViewVisibility(R.id.actions, View.GONE);
big.setViewVisibility(R.id.action_divider, View.GONE);
@@ -3280,26 +3241,63 @@
* Construct a RemoteViews for the final big notification layout.
*/
public RemoteViews makeBigContentView() {
- if (mStyle != null) {
- final RemoteViews styleView = mStyle.makeBigContentView();
- if (styleView != null) {
- return styleView;
- }
- } else if (mActions.size() == 0) return null;
+ RemoteViews result = null;
+ if (mN.bigContentView != null) {
+ return mN.bigContentView;
+ } else if (mStyle != null) {
+ result = mStyle.makeBigContentView();
+ } else if (mActions.size() == 0) {
+ return null;
+ }
+ if (result == null) {
+ result = applyStandardTemplateWithActions(getBigBaseLayoutResource());
+ } else {
+ hideLine1Text(result);
+ }
+ adaptNotificationHeaderForBigContentView(result);
+ return result;
+ }
- return applyStandardTemplateWithActions(getBigBaseLayoutResource());
+ /**
+ * Construct a RemoteViews for the final notification header only
+ *
+ * @hide
+ */
+ public RemoteViews makeNotificationHeader() {
+ RemoteViews header = new BuilderRemoteViews(mContext.getApplicationInfo(),
+ R.layout.notification_template_header);
+ resetNotificationHeader(header);
+ bindNotificationHeader(header);
+ return header;
+ }
+
+ private void hideLine1Text(RemoteViews result) {
+ result.setViewVisibility(R.id.text_line_1, View.GONE);
+ }
+
+ private void adaptNotificationHeaderForBigContentView(RemoteViews result) {
+ // We have to set the collapse button instead
+ result.setImageViewResource(R.id.expand_button, R.drawable.ic_arrow_up_14dp);
+ // Apply the color again
+ result.setDrawableParameters(R.id.expand_button, false, -1, resolveColor(),
+ PorterDuff.Mode.SRC_ATOP, -1);
}
/**
* Construct a RemoteViews for the final heads-up notification layout.
*/
public RemoteViews makeHeadsUpContentView() {
- if (mStyle != null) {
- final RemoteViews styleView = mStyle.makeHeadsUpContentView();
- if (styleView != null) {
- return styleView;
- }
- } else if (mActions.size() == 0) return null;
+ if (mN.headsUpContentView != null) {
+ return mN.headsUpContentView;
+ } else if (mStyle != null) {
+ final RemoteViews styleView = mStyle.makeHeadsUpContentView();
+ if (styleView != null) {
+ return styleView;
+ }
+ } else if (mActions.size() == 0) {
+ return null;
+ }
+
return applyStandardTemplateWithActions(getBigBaseLayoutResource());
}
@@ -3311,12 +3309,17 @@
tombstone ? getActionTombstoneLayoutResource()
: getActionLayoutResource());
final Icon ai = action.getIcon();
- button.setTextViewCompoundDrawablesRelative(R.id.action0, ai, null, null, null);
button.setTextViewText(R.id.action0, processLegacyText(action.title));
if (!tombstone) {
button.setOnClickPendingIntent(R.id.action0, action.actionIntent);
}
button.setContentDescription(R.id.action0, action.title);
+ if (action.mRemoteInputs != null) {
+ button.setRemoteInputs(R.id.action0, action.mRemoteInputs);
+ }
+ if (mN.color != COLOR_DEFAULT) {
+ button.setTextColor(R.id.action0, mN.color);
+ }
processLegacyAction(action, button);
return button;
}
@@ -3346,84 +3349,27 @@
}
/**
- * Apply any necessary background to smallIcons being used in the largeIcon spot.
+ * Apply any necessariy colors to the small icon
*/
- private void processSmallIconAsLarge(Icon largeIcon, RemoteViews contentView) {
- if (!isLegacy()) {
- contentView.setDrawableParameters(R.id.icon, false, -1,
- 0xFFFFFFFF,
+ private void processSmallIconColor(Icon smallIcon, RemoteViews contentView) {
+ if (!isLegacy() || getColorUtil().isGrayscaleIcon(mContext, smallIcon)) {
+ contentView.setDrawableParameters(R.id.icon, false, -1, resolveColor(),
PorterDuff.Mode.SRC_ATOP, -1);
- applyLargeIconBackground(contentView);
- } else {
- if (getColorUtil().isGrayscaleIcon(mContext, largeIcon)) {
- applyLargeIconBackground(contentView);
- }
}
}
/**
- * Apply any necessary background to a largeIcon if it's a fake smallIcon (that is,
+ * Make the largeIcon dark if it's a fake smallIcon (that is,
* if it's grayscale).
*/
// TODO: also check bounds, transparency, that sort of thing.
private void processLargeLegacyIcon(Icon largeIcon, RemoteViews contentView) {
if (largeIcon != null && isLegacy()
&& getColorUtil().isGrayscaleIcon(mContext, largeIcon)) {
- applyLargeIconBackground(contentView);
- } else {
- removeLargeIconBackground(contentView);
- }
- }
-
- /**
- * Add a colored circle behind the largeIcon slot.
- */
- private void applyLargeIconBackground(RemoteViews contentView) {
- contentView.setInt(R.id.icon, "setBackgroundResource",
- R.drawable.notification_icon_legacy_bg);
-
- contentView.setDrawableParameters(
- R.id.icon,
- true,
- -1,
- resolveColor(),
- PorterDuff.Mode.SRC_ATOP,
- -1);
-
- int padding = mContext.getResources().getDimensionPixelSize(
- R.dimen.notification_large_icon_circle_padding);
- contentView.setViewPadding(R.id.icon, padding, padding, padding, padding);
- }
-
- private void removeLargeIconBackground(RemoteViews contentView) {
- contentView.setInt(R.id.icon, "setBackgroundResource", 0);
- }
-
- /**
- * Recolor small icons when used in the R.id.right_icon slot.
- */
- private void processSmallRightIcon(Icon smallIcon, RemoteViews contentView) {
- if (!isLegacy()) {
- contentView.setDrawableParameters(R.id.right_icon, false, -1,
- 0xFFFFFFFF,
+ // resolve color will fall back to the default when legacy
+ contentView.setDrawableParameters(R.id.icon, false, -1, resolveColor(),
PorterDuff.Mode.SRC_ATOP, -1);
}
- final boolean gray = isLegacy()
- && smallIcon.getType() == Icon.TYPE_RESOURCE
- && getColorUtil().isGrayscaleIcon(mContext, smallIcon.getResId());
- if (!isLegacy() || gray) {
- contentView.setInt(R.id.right_icon,
- "setBackgroundResource",
- R.drawable.notification_icon_legacy_bg);
-
- contentView.setDrawableParameters(
- R.id.right_icon,
- true,
- -1,
- resolveColor(),
- PorterDuff.Mode.SRC_ATOP,
- -1);
- }
}
private void sanitizeColor() {
@@ -3432,9 +3378,9 @@
}
}
- private int resolveColor() {
+ int resolveColor() {
if (mN.color == COLOR_DEFAULT) {
- return mContext.getColor(R.color.notification_icon_bg_color);
+ return mContext.getColor(R.color.notification_icon_default_color);
}
return mN.color;
}
@@ -3452,10 +3398,6 @@
mN.extras.putStringArray(EXTRA_PEOPLE,
mPersonList.toArray(new String[mPersonList.size()]));
}
- if (mTopics.size() > 0) {
- mN.topics = new Topic[mTopics.size()];
- mTopics.toArray(mN.topics);
- }
return mN;
}
@@ -3464,12 +3406,16 @@
ApplicationInfo applicationInfo = n.extras.getParcelable(
EXTRA_BUILDER_APPLICATION_INFO);
Context builderContext;
- try {
- builderContext = context.createApplicationContext(applicationInfo,
- Context.CONTEXT_RESTRICTED);
- } catch (NameNotFoundException e) {
- Log.e(TAG, "ApplicationInfo " + applicationInfo + " not found");
- builderContext = context; // try with our context
+ if (applicationInfo != null) {
+ try {
+ builderContext = context.createApplicationContext(applicationInfo,
+ Context.CONTEXT_RESTRICTED);
+ } catch (NameNotFoundException e) {
+ Log.e(TAG, "ApplicationInfo " + applicationInfo + " not found");
+ builderContext = context; // try with our context
+ }
+ } else {
+ builderContext = context; // try with given context
}
return new Builder(builderContext, n);
@@ -3518,9 +3464,7 @@
}
// lazy stuff from mContext; see comment in Builder(Context, Notification)
- mN.extras.putParcelable(EXTRA_BUILDER_APPLICATION_INFO, mContext.getApplicationInfo());
- mOriginatingUserId = mContext.getUserId();
- mN.extras.putInt(EXTRA_ORIGINATING_USERID, mOriginatingUserId);
+ Notification.addFieldsFromContext(mContext, mN);
buildUnstyled();
@@ -3640,20 +3584,9 @@
contentView.setViewVisibility(R.id.line1, View.VISIBLE);
}
- // The last line defaults to the subtext, but can be replaced by mSummaryText
- final CharSequence overflowText =
- mSummaryTextSet ? mSummaryText
- : mBuilder.getAllExtras().getCharSequence(EXTRA_SUB_TEXT);
- if (overflowText != null) {
- contentView.setTextViewText(R.id.text, mBuilder.processLegacyText(overflowText));
- contentView.setViewVisibility(R.id.overflow_divider, View.VISIBLE);
- contentView.setViewVisibility(R.id.line3, View.VISIBLE);
- } else {
- // Clear text in case we use the line to show the profile badge.
- contentView.setTextViewText(R.id.text, "");
- contentView.setViewVisibility(R.id.overflow_divider, View.GONE);
- contentView.setViewVisibility(R.id.line3, View.GONE);
- }
+ // Clear text in case we use the line to show the profile badge.
+ contentView.setTextViewText(com.android.internal.R.id.text, "");
+ contentView.setViewVisibility(com.android.internal.R.id.line3, View.GONE);
return contentView;
}
@@ -3684,19 +3617,6 @@
}
/**
- * Changes the padding of the first line such that the big and small content view have the
- * same top padding.
- *
- * @hide
- */
- protected void applyTopPadding(RemoteViews contentView) {
- int topPadding = Builder.calculateTopPadding(mBuilder.mContext,
- mBuilder.hasThreeLines(),
- mBuilder.mContext.getResources().getConfiguration().fontScale);
- contentView.setViewPadding(R.id.line1, 0, topPadding, 0, 0);
- }
-
- /**
* Apply any style-specific extras to this notification before shipping it out.
* @hide
*/
@@ -3757,6 +3677,14 @@
protected boolean hasProgress() {
return true;
}
+
+ /**
+ * @hide
+ * @return Whether we should put the summary be put into the notification header
+ */
+ public boolean hasSummaryInHeader() {
+ return true;
+ }
}
/**
@@ -3864,6 +3792,16 @@
}
RemoteViews contentView = getStandardView(mBuilder.getBigPictureLayoutResource());
+ if (mSummaryTextSet) {
+ contentView.setTextViewText(R.id.text, mBuilder.processLegacyText(mSummaryText));
+ contentView.setViewVisibility(R.id.line3, View.VISIBLE);
+ }
+ int imageMinHeight = mBuilder.mContext.getResources().getDimensionPixelSize(
+ R.dimen.notification_big_picture_content_min_height_with_picture);
+ // We need to make space for the right image, so we're enforcing a minheight if there
+ // is a picture.
+ int minHeight = (mBuilder.mN.mLargeIcon == null) ? 0 : imageMinHeight;
+ contentView.setInt(R.id.notification_main_column, "setMinimumHeight", minHeight);
if (mBigLargeIconSet) {
mBuilder.mN.mLargeIcon = oldLargeIcon;
@@ -3871,12 +3809,7 @@
contentView.setImageViewBitmap(R.id.big_picture, mPicture);
- applyTopPadding(contentView);
-
- boolean twoTextLines = mBuilder.getAllExtras().getCharSequence(EXTRA_SUB_TEXT) != null
- && mBuilder.getAllExtras().getCharSequence(EXTRA_TEXT) != null;
- mBuilder.addProfileBadge(contentView,
- twoTextLines ? R.id.profile_badge_line2 : R.id.profile_badge_line3);
+ mBuilder.addProfileBadge(contentView, R.id.profile_badge_line3);
return contentView;
}
@@ -3905,6 +3838,14 @@
}
mPicture = extras.getParcelable(EXTRA_PICTURE);
}
+
+ /**
+ * @hide
+ */
+ @Override
+ public boolean hasSummaryInHeader() {
+ return false;
+ }
}
/**
@@ -4001,14 +3942,11 @@
contentView.setTextViewText(R.id.big_text, mBuilder.processLegacyText(mBigText));
contentView.setViewVisibility(R.id.big_text, View.VISIBLE);
contentView.setInt(R.id.big_text, "setMaxLines", calculateMaxLines());
- contentView.setViewVisibility(R.id.text2, View.GONE);
-
- applyTopPadding(contentView);
-
- mBuilder.shrinkLine3Text(contentView);
mBuilder.addProfileBadge(contentView, R.id.profile_badge_large_template);
+ contentView.setBoolean(R.id.big_text, "setHasImage", mBuilder.mN.mLargeIcon != null);
+
return contentView;
}
@@ -4023,11 +3961,6 @@
if (hasSummary) {
lineCount -= LINES_CONSUMED_BY_SUMMARY;
}
-
- // If we have less top padding at the top, we can fit less lines.
- if (!mBuilder.hasThreeLines()) {
- lineCount--;
- }
return lineCount;
}
}
@@ -4123,8 +4056,6 @@
mBuilder.getAllExtras().putCharSequence(EXTRA_TEXT, oldBuilderContentText);
- contentView.setViewVisibility(R.id.text2, View.GONE);
-
int[] rowIds = {R.id.inbox_text0, R.id.inbox_text1, R.id.inbox_text2, R.id.inbox_text3,
R.id.inbox_text4, R.id.inbox_text5, R.id.inbox_text6};
@@ -4138,6 +4069,9 @@
final float subTextSize = mBuilder.mContext.getResources().getDimensionPixelSize(
R.dimen.notification_subtext_size);
int i=0;
+ final float density = mBuilder.mContext.getResources().getDisplayMetrics().density;
+ int topPadding = (int) (5 * density);
+ int bottomPadding = (int) (13 * density);
while (i < mTexts.size() && i < rowIds.length) {
CharSequence str = mTexts.get(i);
if (str != null && !str.equals("")) {
@@ -4147,24 +4081,29 @@
contentView.setTextViewTextSize(rowIds[i], TypedValue.COMPLEX_UNIT_PX,
subTextSize);
}
+ contentView.setViewPadding(rowIds[i], 0, topPadding, 0,
+ i == rowIds.length - 1 || i == mTexts.size() - 1 ? bottomPadding : 0);
}
i++;
}
-
- contentView.setViewVisibility(R.id.inbox_end_pad,
- mTexts.size() > 0 ? View.VISIBLE : View.GONE);
-
- contentView.setViewVisibility(R.id.inbox_more,
- mTexts.size() > rowIds.length ? View.VISIBLE : View.GONE);
-
- applyTopPadding(contentView);
-
- mBuilder.shrinkLine3Text(contentView);
-
mBuilder.addProfileBadge(contentView, R.id.profile_badge_large_template);
+ handleInboxImageMargin(contentView, rowIds[0]);
+
return contentView;
}
+
+ private void handleInboxImageMargin(RemoteViews contentView, int id) {
+ final int max = mBuilder.mN.extras.getInt(EXTRA_PROGRESS_MAX, 0);
+ final boolean ind = mBuilder.mN.extras.getBoolean(EXTRA_PROGRESS_INDETERMINATE);
+ boolean hasProgress = max != 0 || ind;
+ int endMargin = 0;
+ if (mTexts.size() > 0 && mBuilder.mN.mLargeIcon != null && !hasProgress) {
+ endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
+ R.dimen.notification_content_picture_margin);
+ }
+ contentView.setViewLayoutMarginEnd(id, endMargin);
+ }
}
/**
@@ -4296,14 +4235,13 @@
}
}
- private RemoteViews generateMediaActionButton(Action action) {
+ private RemoteViews generateMediaActionButton(Action action, int color) {
final boolean tombstone = (action.actionIntent == null);
RemoteViews button = new BuilderRemoteViews(mBuilder.mContext.getApplicationInfo(),
R.layout.notification_material_media_action);
button.setImageViewIcon(R.id.action0, action.getIcon());
- button.setDrawableParameters(R.id.action0, false, -1,
- 0xFFFFFFFF,
- PorterDuff.Mode.SRC_ATOP, -1);
+ button.setDrawableParameters(R.id.action0, false, -1, color, PorterDuff.Mode.SRC_ATOP,
+ -1);
if (!tombstone) {
button.setOnClickPendingIntent(R.id.action0, action.actionIntent);
}
@@ -4329,67 +4267,40 @@
}
final Action action = mBuilder.mActions.get(mActionsToShowInCompact[i]);
- final RemoteViews button = generateMediaActionButton(action);
+ final RemoteViews button = generateMediaActionButton(action,
+ mBuilder.resolveColor());
view.addView(com.android.internal.R.id.media_actions, button);
}
}
- styleText(view);
- hideRightIcon(view);
+ handleImage(view /* addPaddingToMainColumn */);
return view;
}
private RemoteViews makeMediaBigContentView() {
final int actionCount = Math.min(mBuilder.mActions.size(), MAX_MEDIA_BUTTONS);
- RemoteViews big = mBuilder.applyStandardTemplate(getBigLayoutResource(actionCount),
- false /* hasProgress */);
+ RemoteViews big = mBuilder.applyStandardTemplate(
+ R.layout.notification_template_material_big_media,
+ false);
if (actionCount > 0) {
big.removeAllViews(com.android.internal.R.id.media_actions);
for (int i = 0; i < actionCount; i++) {
- final RemoteViews button = generateMediaActionButton(mBuilder.mActions.get(i));
+ final RemoteViews button = generateMediaActionButton(mBuilder.mActions.get(i),
+ mBuilder.resolveColor());
big.addView(com.android.internal.R.id.media_actions, button);
}
}
- styleText(big);
- hideRightIcon(big);
- applyTopPadding(big);
- big.setViewVisibility(android.R.id.progress, View.GONE);
+ handleImage(big);
return big;
}
- private int getBigLayoutResource(int actionCount) {
- if (actionCount <= 3) {
- return R.layout.notification_template_material_big_media_narrow;
- } else {
- return R.layout.notification_template_material_big_media;
+ private void handleImage(RemoteViews contentView) {
+ if (mBuilder.mN.mLargeIcon != null) {
+ contentView.setViewLayoutMarginEnd(R.id.line1, 0);
+ contentView.setViewLayoutMarginEnd(R.id.line3, 0);
}
}
- private void hideRightIcon(RemoteViews contentView) {
- contentView.setViewVisibility(R.id.right_icon, View.GONE);
- }
-
- /**
- * Applies the special text colors for media notifications to all text views.
- */
- private void styleText(RemoteViews contentView) {
- int primaryColor = mBuilder.mContext.getColor(
- R.color.notification_media_primary_color);
- int secondaryColor = mBuilder.mContext.getColor(
- R.color.notification_media_secondary_color);
- contentView.setTextColor(R.id.title, primaryColor);
- if (mBuilder.showsTimeOrChronometer()) {
- if (mBuilder.getAllExtras().getBoolean(EXTRA_SHOW_CHRONOMETER)) {
- contentView.setTextColor(R.id.chronometer, secondaryColor);
- } else {
- contentView.setTextColor(R.id.time, secondaryColor);
- }
- }
- contentView.setTextColor(R.id.text2, secondaryColor);
- contentView.setTextColor(R.id.text, secondaryColor);
- contentView.setTextColor(R.id.info, secondaryColor);
- }
-
/**
* @hide
*/
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 07b4d39..89610e9 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -218,6 +218,8 @@
int[] idOut = new int[1];
INotificationManager service = getService();
String pkg = mContext.getPackageName();
+ // Fix the notification as best we can.
+ Notification.addFieldsFromContext(mContext, notification);
if (notification.sound != null) {
notification.sound = notification.sound.getCanonicalUri();
if (StrictMode.vmFileUriExposureEnabled()) {
@@ -468,6 +470,20 @@
}
/**
+ * Deletes all automatic zen rules owned by the given package.
+ *
+ * @hide
+ */
+ public boolean removeAutomaticZenRules(String packageName) {
+ INotificationManager service = getService();
+ try {
+ return service.removeAutomaticZenRules(packageName);
+ } catch (RemoteException e) {
+ }
+ return false;
+ }
+
+ /**
* Checks the ability to read/modify notification policy for the calling package.
*
* <p>
@@ -610,15 +626,39 @@
* PRIORITY_SENDERS_ANY, PRIORITY_SENDERS_CONTACTS, PRIORITY_SENDERS_STARRED */
public final int priorityMessageSenders;
+ public static final int SUPPRESSED_EFFECTS_UNSET = -1;
+ public static final int SUPPRESSED_EFFECT_LIGHTS = 1 << 0;
+ public static final int SUPPRESSED_EFFECT_PEEK = 1 << 1;
+
+ private static final int[] ALL_SUPPRESSED_EFFECTS = {
+ SUPPRESSED_EFFECT_LIGHTS,
+ SUPPRESSED_EFFECT_PEEK,
+ };
+
+ /**
+ * Visual effects to suppress for a notification that is filtered by Do Not Disturb mode.
+ * Bitmask of SUPPRESSED_EFFECT_* constants.
+ */
+ public final int suppressedVisualEffects;
+
+
+ @Deprecated
public Policy(int priorityCategories, int priorityCallSenders, int priorityMessageSenders) {
+ this(priorityCategories, priorityCallSenders, priorityMessageSenders,
+ SUPPRESSED_EFFECTS_UNSET);
+ }
+
+ public Policy(int priorityCategories, int priorityCallSenders, int priorityMessageSenders,
+ int suppressedVisualEffects) {
this.priorityCategories = priorityCategories;
this.priorityCallSenders = priorityCallSenders;
this.priorityMessageSenders = priorityMessageSenders;
+ this.suppressedVisualEffects = suppressedVisualEffects;
}
/** @hide */
public Policy(Parcel source) {
- this(source.readInt(), source.readInt(), source.readInt());
+ this(source.readInt(), source.readInt(), source.readInt(), source.readInt());
}
@Override
@@ -626,6 +666,7 @@
dest.writeInt(priorityCategories);
dest.writeInt(priorityCallSenders);
dest.writeInt(priorityMessageSenders);
+ dest.writeInt(suppressedVisualEffects);
}
@Override
@@ -635,7 +676,8 @@
@Override
public int hashCode() {
- return Objects.hash(priorityCategories, priorityCallSenders, priorityMessageSenders);
+ return Objects.hash(priorityCategories, priorityCallSenders, priorityMessageSenders,
+ suppressedVisualEffects);
}
@Override
@@ -645,7 +687,8 @@
final Policy other = (Policy) o;
return other.priorityCategories == priorityCategories
&& other.priorityCallSenders == priorityCallSenders
- && other.priorityMessageSenders == priorityMessageSenders;
+ && other.priorityMessageSenders == priorityMessageSenders
+ && other.suppressedVisualEffects == suppressedVisualEffects;
}
@Override
@@ -654,9 +697,29 @@
+ "priorityCategories=" + priorityCategoriesToString(priorityCategories)
+ ",priorityCallSenders=" + prioritySendersToString(priorityCallSenders)
+ ",priorityMessageSenders=" + prioritySendersToString(priorityMessageSenders)
+ + ",suppressedVisualEffects="
+ + suppressedEffectsToString(suppressedVisualEffects)
+ "]";
}
+ public static String suppressedEffectsToString(int effects) {
+ if (effects <= 0) return "";
+ final StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < ALL_SUPPRESSED_EFFECTS.length; i++) {
+ final int effect = ALL_SUPPRESSED_EFFECTS[i];
+ if ((effects & effect) != 0) {
+ if (sb.length() > 0) sb.append(',');
+ sb.append(effectToString(effect));
+ }
+ effects &= ~effect;
+ }
+ if (effects != 0) {
+ if (sb.length() > 0) sb.append(',');
+ sb.append("UNKNOWN_").append(effects);
+ }
+ return sb.toString();
+ }
+
public static String priorityCategoriesToString(int priorityCategories) {
if (priorityCategories == 0) return "";
final StringBuilder sb = new StringBuilder();
@@ -675,6 +738,15 @@
return sb.toString();
}
+ private static String effectToString(int effect) {
+ switch (effect) {
+ case SUPPRESSED_EFFECT_LIGHTS: return "SUPPRESSED_EFFECT_LIGHTS";
+ case SUPPRESSED_EFFECT_PEEK: return "SUPPRESSED_EFFECT_PEEK";
+ case SUPPRESSED_EFFECTS_UNSET: return "SUPPRESSED_EFFECTS_UNSET";
+ default: return "UNKNOWN_" + effect;
+ }
+ }
+
private static String priorityCategoryToString(int priorityCategory) {
switch (priorityCategory) {
case PRIORITY_CATEGORY_REMINDERS: return "PRIORITY_CATEGORY_REMINDERS";
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index fa11221..9c18df8 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -505,8 +505,7 @@
// We made sure the IME was displayed, so also make sure it is closed
// when we go away.
- InputMethodManager imm = (InputMethodManager)getContext()
- .getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager imm = getContext().getSystemService(InputMethodManager.class);
if (imm != null) {
imm.hideSoftInputFromWindow(
getWindow().getDecorView().getWindowToken(), 0);
@@ -643,8 +642,7 @@
public void onBackPressed() {
// If the input method is covering the search dialog completely,
// e.g. in landscape mode with no hard keyboard, dismiss just the input method
- InputMethodManager imm = (InputMethodManager)getContext()
- .getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager imm = getContext().getSystemService(InputMethodManager.class);
if (imm != null && imm.isFullscreenMode() &&
imm.hideSoftInputFromWindow(getWindow().getDecorView().getWindowToken(), 0)) {
return;
diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java
index a3b3022..aca0763 100644
--- a/core/java/android/app/TimePickerDialog.java
+++ b/core/java/android/app/TimePickerDialog.java
@@ -23,10 +23,8 @@
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
-import android.widget.Button;
import android.widget.TimePicker;
import android.widget.TimePicker.OnTimeChangedListener;
-import android.widget.TimePicker.ValidationCallback;
import com.android.internal.R;
@@ -64,7 +62,7 @@
* @param hourOfDay the hour that was set
* @param minute the minute that was set
*/
- public void onTimeSet(TimePicker view, int hourOfDay, int minute);
+ void onTimeSet(TimePicker view, int hourOfDay, int minute);
}
/**
@@ -115,7 +113,6 @@
final TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(R.attr.timePickerDialogTheme, outValue, true);
- final int layoutResId = outValue.resourceId;
final LayoutInflater inflater = LayoutInflater.from(themeContext);
final View view = inflater.inflate(R.layout.time_picker_dialog, null);
@@ -129,7 +126,6 @@
mTimePicker.setCurrentHour(mInitialHourOfDay);
mTimePicker.setCurrentMinute(mInitialMinute);
mTimePicker.setOnTimeChangedListener(this);
- mTimePicker.setValidationCallback(mValidationCallback);
}
@Override
@@ -181,14 +177,4 @@
mTimePicker.setCurrentHour(hour);
mTimePicker.setCurrentMinute(minute);
}
-
- private final ValidationCallback mValidationCallback = new ValidationCallback() {
- @Override
- public void onValidationChanged(boolean valid) {
- final Button positive = getButton(BUTTON_POSITIVE);
- if (positive != null) {
- positive.setEnabled(valid);
- }
- }
- };
}
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index efed2e0..f7848f9 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -21,9 +21,11 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.IAccessibilityServiceClient;
import android.accessibilityservice.IAccessibilityServiceConnection;
+import android.annotation.NonNull;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Point;
+import android.graphics.Region;
import android.hardware.display.DisplayManagerGlobal;
import android.os.IBinder;
import android.os.Looper;
@@ -1020,6 +1022,12 @@
public boolean onKeyEvent(KeyEvent event) {
return false;
}
+
+ @Override
+ public void onMagnificationChanged(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ /* do nothing */
+ }
});
}
}
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index faed7a0..471750e 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -31,6 +31,7 @@
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.net.ProxyInfo;
+import android.net.Uri;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.Process;
@@ -40,6 +41,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.provider.ContactsContract.Directory;
import android.security.Credentials;
import android.service.restrictions.RestrictionsReceiver;
import android.util.Log;
@@ -87,6 +89,10 @@
private final Context mContext;
private final IDevicePolicyManager mService;
+ // TODO Use it everywhere.
+ private static final String REMOTE_EXCEPTION_MESSAGE =
+ "Failed to talk with device policy manager service";
+
private DevicePolicyManager(Context context) {
this(context, IDevicePolicyManager.Stub.asInterface(
ServiceManager.getService(Context.DEVICE_POLICY_SERVICE)));
@@ -131,6 +137,12 @@
* {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME} instead, although specifying only
* {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME} is still supported.
*
+ * <p> The intent may also contain the following extras:
+ * <ul>
+ * <li> {@link #EXTRA_PROVISIONING_LOGO_URI}, optional </li>
+ * <li> {@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional </li>
+ * </ul>
+ *
* <p> When managed provisioning has completed, broadcasts are sent to the application specified
* in the provisioning intent. The
* {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} broadcast is sent in the
@@ -196,6 +208,8 @@
* <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>
+ * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>
+ * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>
* </ul>
*
* <p> When device owner provisioning has completed, an intent of the type
@@ -355,6 +369,16 @@
= "android.app.extra.PROVISIONING_EMAIL_ADDRESS";
/**
+ * A integer extra indicating the predominant color to show during the provisioning.
+ * Refer to {@link android.graphics.Color} for how the color is represented.
+ *
+ * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE} or
+ * {@link #ACTION_PROVISION_MANAGED_DEVICE}.
+ */
+ public static final String EXTRA_PROVISIONING_MAIN_COLOR =
+ "android.app.extra.PROVISIONING_MAIN_COLOR";
+
+ /**
* A Boolean extra that can be used by the mobile device management application to skip the
* disabling of system apps during provisioning when set to {@code true}.
*
@@ -573,6 +597,28 @@
"android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
/**
+ * A {@link Uri} extra pointing to a logo image. This image will be shown during the
+ * provisioning. If this extra is not passed, a default image will be shown.
+ * <h5>The following URI schemes are accepted:</h5>
+ * <ul>
+ * <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>
+ * <li>android.resource ({@link android.content.ContentResolver#SCHEME_ANDROID_RESOURCE})</li>
+ * </ul>
+ *
+ * <p> It is the responsability of the caller to provide an image with a reasonable
+ * pixed density for the device.
+ *
+ * <p> If a content: URI is passed, the intent should have the flag
+ * {@link Intent#FLAG_GRANT_READ_URI_PERMISSION} and the uri should be added to the
+ * {@link android.content.ClipData} of the intent too.
+ *
+ * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE} or
+ * {@link #ACTION_PROVISION_MANAGED_DEVICE}
+ */
+ public static final String EXTRA_PROVISIONING_LOGO_URI =
+ "android.app.extra.PROVISIONING_LOGO_URI";
+
+ /**
* This MIME type is used for starting the Device Owner provisioning.
*
* <p>During device owner provisioning a device admin app is set as the owner of the device.
@@ -644,7 +690,7 @@
* extra field. This will invoke a UI to bring the user through adding the profile owner admin
* to remotely control restrictions on the user.
*
- * <p>The intent must be invoked via {@link Activity#startActivityForResult()} to receive the
+ * <p>The intent must be invoked via {@link Activity#startActivityForResult} to receive the
* result of whether or not the user approved the action. If approved, the result will
* be {@link Activity#RESULT_OK} and the component will be set as an active admin as well
* as a profile owner.
@@ -2723,37 +2769,94 @@
* the setup process.
* @param packageName the package name of the app, to compare with the registered device owner
* app, if any.
- * @return whether or not the package is registered as the device owner app. Note this method
- * does *not* check weather the device owner is actually running on the current user.
+ * @return whether or not the package is registered as the device owner app.
*/
public boolean isDeviceOwnerApp(String packageName) {
+ return isDeviceOwnerAppOnCallingUser(packageName);
+ }
+
+ /**
+ * @return true if a package is registered as device owner, only when it's running on the
+ * calling user.
+ *
+ * <p>Same as {@link #isDeviceOwnerApp}, but bundled code should use it for clarity.
+ * @hide
+ */
+ public boolean isDeviceOwnerAppOnCallingUser(String packageName) {
+ return isDeviceOwnerAppOnAnyUserInner(packageName, /* callingUserOnly =*/ true);
+ }
+
+ /**
+ * @return true if a package is registered as device owner, even if it's running on a different
+ * user.
+ *
+ * <p>Requires the MANAGE_USERS permission.
+ *
+ * @hide
+ */
+ public boolean isDeviceOwnerAppOnAnyUser(String packageName) {
+ return isDeviceOwnerAppOnAnyUserInner(packageName, /* callingUserOnly =*/ false);
+ }
+
+ /**
+ * @return device owner component name, only when it's running on the calling user.
+ *
+ * @hide
+ */
+ public ComponentName getDeviceOwnerComponentOnCallingUser() {
+ return getDeviceOwnerComponentInner(/* callingUserOnly =*/ true);
+ }
+
+ /**
+ * @return device owner component name, even if it's running on a different user.
+ *
+ * <p>Requires the MANAGE_USERS permission.
+ *
+ * @hide
+ */
+ public ComponentName getDeviceOwnerComponentOnAnyUser() {
+ return getDeviceOwnerComponentInner(/* callingUserOnly =*/ false);
+ }
+
+ private boolean isDeviceOwnerAppOnAnyUserInner(String packageName, boolean callingUserOnly) {
if (packageName == null) {
return false;
}
- final ComponentName deviceOwner = getDeviceOwnerComponent();
+ final ComponentName deviceOwner = getDeviceOwnerComponentInner(callingUserOnly);
if (deviceOwner == null) {
return false;
}
return packageName.equals(deviceOwner.getPackageName());
}
- /**
- * @hide
- * Redirect to isDeviceOwnerApp.
- */
- public boolean isDeviceOwner(String packageName) {
- return isDeviceOwnerApp(packageName);
+ private ComponentName getDeviceOwnerComponentInner(boolean callingUserOnly) {
+ if (mService != null) {
+ try {
+ return mService.getDeviceOwnerComponent(callingUserOnly);
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE);
+ }
+ }
+ return null;
}
/**
- * Check whether a given component is registered as a device owner.
- * Note this method does *not* check weather the device owner is actually running on the current
- * user.
+ * @return ID of the user who runs device owner, or {@link UserHandle#USER_NULL} if there's
+ * no device owner.
+ *
+ * <p>Requires the MANAGE_USERS permission.
*
* @hide
*/
- public boolean isDeviceOwner(ComponentName who) {
- return (who != null) && who.equals(getDeviceOwner());
+ public int getDeviceOwnerUserId() {
+ if (mService != null) {
+ try {
+ return mService.getDeviceOwnerUserId();
+ } catch (RemoteException re) {
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE);
+ }
+ }
+ return UserHandle.USER_NULL;
}
/**
@@ -2776,46 +2879,43 @@
}
/**
- * Returns the device owner package name. Note this method will still return the device owner
- * package name even if it's running on a different user.
+ * Returns the device owner package name, only if it's running on the calling user.
+ *
+ * <p>Bundled components should use {@code getDeviceOwnerComponentOnCallingUser()} for clarity.
*
* @hide
*/
@SystemApi
public String getDeviceOwner() {
- final ComponentName componentName = getDeviceOwnerComponent();
- return componentName == null ? null : componentName.getPackageName();
+ final ComponentName name = getDeviceOwnerComponentOnCallingUser();
+ return name != null ? name.getPackageName() : null;
}
/**
- * Returns the device owner name. Note this method will still return the device owner
- * name even if it's running on a different user.
+ * @return true if the device is managed by any device owner.
+ *
+ * <p>Requires the MANAGE_USERS permission.
*
* @hide
*/
- public String getDeviceOwnerName() {
+ public boolean isDeviceManaged() {
+ return getDeviceOwnerComponentOnAnyUser() != null;
+ }
+
+ /**
+ * Returns the device owner name. Note this method *will* return the device owner
+ * name when it's running on a different user.
+ *
+ * <p>Requires the MANAGE_USERS permission.
+ *
+ * @hide
+ */
+ public String getDeviceOwnerNameOnAnyUser() {
if (mService != null) {
try {
return mService.getDeviceOwnerName();
} catch (RemoteException re) {
- Log.w(TAG, "Failed to get device owner");
- }
- }
- return null;
- }
-
- /**
- * Returns the device owner component name. Note this method will still return the device owner
- * component name even if it's running on a different user.
- *
- * @hide
- */
- public ComponentName getDeviceOwnerComponent() {
- if (mService != null) {
- try {
- return mService.getDeviceOwner();
- } catch (RemoteException re) {
- Log.w(TAG, "Failed to get device owner");
+ Log.w(TAG, REMOTE_EXCEPTION_MESSAGE);
}
}
return null;
@@ -3088,7 +3188,7 @@
/**
* @hide
- * @param user The user for whom to fetch the profile owner name, if any.
+ * @param userId The user for whom to fetch the profile owner name, if any.
* @return the human readable name of the organisation associated with this profile owner or
* null if one is not set.
* @throws IllegalArgumentException if the userId is invalid.
@@ -3320,11 +3420,11 @@
* @hide
*/
public void startManagedQuickContact(String actualLookupKey, long actualContactId,
- Intent originalIntent) {
+ long directoryId, Intent originalIntent) {
if (mService != null) {
try {
mService.startManagedQuickContact(
- actualLookupKey, actualContactId, originalIntent);
+ actualLookupKey, actualContactId, directoryId, originalIntent);
} catch (RemoteException e) {
Log.w(TAG, "Failed talking with device policy service", e);
}
@@ -3332,6 +3432,16 @@
}
/**
+ * Start Quick Contact on the managed profile for the current user, if the policy allows.
+ * @hide
+ */
+ public void startManagedQuickContact(String actualLookupKey, long actualContactId,
+ Intent originalIntent) {
+ startManagedQuickContact(actualLookupKey, actualContactId, Directory.DEFAULT,
+ originalIntent);
+ }
+
+ /**
* Called by a profile owner of a managed profile to set whether bluetooth
* devices can access enterprise contacts.
* <p>
@@ -3591,6 +3701,48 @@
}
/**
+ * Called by a device owner to get the list of apps to keep around as APKs even if no user has
+ * currently installed it.
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+ *
+ * @return List of package names to keep cached.
+ * @hide
+ */
+ public List<String> getKeepUninstalledPackages(@NonNull ComponentName admin) {
+ if (mService != null) {
+ try {
+ return mService.getKeepUninstalledPackages(admin);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed talking with device policy service", e);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Called by a device owner to set a list of apps to keep around as APKs even if no user has
+ * currently installed it.
+ *
+ * <p>Please note that setting this policy does not imply that specified apps will be
+ * automatically pre-cached.</p>
+ *
+ * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+ * @param packageNames List of package names to keep cached.
+ * @hide
+ */
+ public void setKeepUninstalledPackages(@NonNull ComponentName admin,
+ @NonNull List<String> packageNames) {
+ if (mService != null) {
+ try {
+ mService.setKeepUninstalledPackages(admin, packageNames);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Failed talking with device policy service", e);
+ }
+ }
+ }
+
+ /**
* Called by a device owner to create a user with the specified name. The UserHandle returned
* by this method should not be persisted as user handles are recycled as users are removed and
* created. If you need to persist an identifier for this user, use
@@ -3763,12 +3915,18 @@
* {@link UserManager#getUserRestrictions()}.
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
+ * @throws SecurityException if the {@code admin} is not an active admin.
*/
public Bundle getUserRestrictions(@NonNull ComponentName admin) {
+ return getUserRestrictions(admin, myUserId());
+ }
+
+ /** @hide per-user version */
+ public Bundle getUserRestrictions(@NonNull ComponentName admin, int userHandle) {
Bundle ret = null;
if (mService != null) {
try {
- ret = mService.getUserRestrictions(admin);
+ ret = mService.getUserRestrictions(admin, userHandle);
} catch (RemoteException e) {
Log.w(TAG, "Failed talking with device policy service", e);
}
@@ -4458,4 +4616,54 @@
return false;
}
}
+
+ /**
+ * @hide
+ * Return if this user is a managed profile of another user. An admin can become the profile
+ * owner of a managed profile with {@link #ACTION_PROVISION_MANAGED_PROFILE} and of a managed
+ * user with {@link #ACTION_PROVISION_MANAGED_USER}.
+ * @param admin Which profile owner this request is associated with.
+ * @return if this user is a managed profile of another user.
+ */
+ public boolean isManagedProfile(@NonNull ComponentName admin) {
+ try {
+ return mService.isManagedProfile(admin);
+ } catch (RemoteException re) {
+ Log.w(TAG, "Failed talking with device policy service", re);
+ return false;
+ }
+ }
+
+ /**
+ * @hide
+ * Return if this user is a system-only user. An admin can manage a device from a system only
+ * user by calling {@link #ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE}.
+ * @param admin Which device owner this request is associated with.
+ * @return if this user is a system-only user.
+ */
+ public boolean isSystemOnlyUser(@NonNull ComponentName admin) {
+ try {
+ return mService.isSystemOnlyUser(admin);
+ } catch (RemoteException re) {
+ Log.w(TAG, "Failed talking with device policy service", re);
+ return false;
+ }
+ }
+
+ /**
+ * Called by device owner to get the MAC address of the Wi-Fi device.
+ *
+ * @return the MAC address of the Wi-Fi device, or null when the information is not
+ * available. (For example, Wi-Fi hasn't been enabled, or the device doesn't support Wi-Fi.)
+ *
+ * <p>The address will be in the {@code XX:XX:XX:XX:XX:XX} format.
+ */
+ public String getWifiMacAddress() {
+ try {
+ return mService.getWifiMacAddress();
+ } catch (RemoteException re) {
+ Log.w(TAG, "Failed talking with device policy service", re);
+ return null;
+ }
+ }
}
diff --git a/core/java/android/app/admin/DevicePolicyManagerInternal.java b/core/java/android/app/admin/DevicePolicyManagerInternal.java
index 4270e16..0a0d77d 100644
--- a/core/java/android/app/admin/DevicePolicyManagerInternal.java
+++ b/core/java/android/app/admin/DevicePolicyManagerInternal.java
@@ -16,8 +16,6 @@
package android.app.admin;
-import android.os.Bundle;
-
import java.util.List;
/**
@@ -71,13 +69,4 @@
* @return true if the uid is an active admin with the given policy.
*/
public abstract boolean isActiveAdminWithPolicy(int uid, int reqPolicy);
-
- /**
- * Takes a {@link Bundle} containing "base" user restrictions stored in
- * {@link com.android.server.pm.UserManagerService}, mixes restrictions set by the device owner
- * and the profile owner and returns the merged restrictions.
- *
- * This method always returns a new {@link Bundle}.
- */
- public abstract Bundle getComposedUserRestrictions(int userId, Bundle inBundle);
}
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 7601cf2..6b4567c 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -114,9 +114,10 @@
void reportSuccessfulPasswordAttempt(int userHandle);
boolean setDeviceOwner(in ComponentName who, String ownerName, int userId);
- ComponentName getDeviceOwner();
+ ComponentName getDeviceOwnerComponent(boolean callingUserOnly);
String getDeviceOwnerName();
void clearDeviceOwner(String packageName);
+ int getDeviceOwnerUserId();
boolean setProfileOwner(in ComponentName who, String ownerName, int userHandle);
ComponentName getProfileOwner(int userHandle);
@@ -149,7 +150,7 @@
ComponentName getRestrictionsProvider(int userHandle);
void setUserRestriction(in ComponentName who, in String key, boolean enable);
- Bundle getUserRestrictions(in ComponentName who);
+ Bundle getUserRestrictions(in ComponentName who, int userId);
void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags);
void clearCrossProfileIntentFilters(in ComponentName admin);
@@ -194,7 +195,7 @@
void setCrossProfileCallerIdDisabled(in ComponentName who, boolean disabled);
boolean getCrossProfileCallerIdDisabled(in ComponentName who);
boolean getCrossProfileCallerIdDisabledForUser(int userId);
- void startManagedQuickContact(String lookupKey, long contactId, in Intent originalIntent);
+ void startManagedQuickContact(String lookupKey, long contactId, long directoryId, in Intent originalIntent);
void setBluetoothContactSharingDisabled(in ComponentName who, boolean disabled);
boolean getBluetoothContactSharingDisabled(in ComponentName who);
@@ -231,4 +232,9 @@
String permission, int grantState);
int getPermissionGrantState(in ComponentName admin, String packageName, String permission);
boolean isProvisioningAllowed(String action);
+ void setKeepUninstalledPackages(in ComponentName admin,in List<String> packageList);
+ List<String> getKeepUninstalledPackages(in ComponentName admin);
+ boolean isManagedProfile(in ComponentName admin);
+ boolean isSystemOnlyUser(in ComponentName admin);
+ String getWifiMacAddress();
}
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
index 25d9aa9..09a15de 100644
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
@@ -685,6 +685,48 @@
}
/**
+ * Sets whether audio routing is allowed. When set to {@code false}, the AG will not route any
+ * audio to the HF unless explicitly told to.
+ * This method should be used in cases where the SCO channel is shared between multiple profiles
+ * and must be delegated by a source knowledgeable
+ * Note: This is an internal function and shouldn't be exposed
+ *
+ * @param allowed {@code true} if the profile can reroute audio, {@code false} otherwise.
+ *
+ * @hide
+ */
+ public void setAudioRouteAllowed(boolean allowed) {
+ if (VDBG) log("setAudioRouteAllowed");
+ if (mService != null && isEnabled()) {
+ try {
+ mService.setAudioRouteAllowed(allowed);
+ } catch (RemoteException e) {Log.e(TAG, e.toString());}
+ } else {
+ Log.w(TAG, "Proxy not attached to service");
+ if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
+ }
+ }
+
+ /**
+ * Returns whether audio routing is allowed. see {@link #setAudioRouteAllowed(boolean)}.
+ * Note: This is an internal function and shouldn't be exposed
+ *
+ * @hide
+ */
+ public boolean getAudioRouteAllowed() {
+ if (VDBG) log("getAudioRouteAllowed");
+ if (mService != null && isEnabled()) {
+ try {
+ return mService.getAudioRouteAllowed();
+ } catch (RemoteException e) {Log.e(TAG, e.toString());}
+ } else {
+ Log.w(TAG, "Proxy not attached to service");
+ if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
+ }
+ return false;
+ }
+
+ /**
* Check if Bluetooth SCO audio is connected.
*
* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
diff --git a/core/java/android/bluetooth/IBluetoothHeadset.aidl b/core/java/android/bluetooth/IBluetoothHeadset.aidl
index 0e23fad..0bb4088 100755
--- a/core/java/android/bluetooth/IBluetoothHeadset.aidl
+++ b/core/java/android/bluetooth/IBluetoothHeadset.aidl
@@ -50,6 +50,8 @@
boolean isAudioOn();
boolean connectAudio();
boolean disconnectAudio();
+ void setAudioRouteAllowed(boolean allowed);
+ boolean getAudioRouteAllowed();
boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);
boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);
void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);
diff --git a/core/java/android/content/ClipDescription.java b/core/java/android/content/ClipDescription.java
index e988516..1b024e2 100644
--- a/core/java/android/content/ClipDescription.java
+++ b/core/java/android/content/ClipDescription.java
@@ -18,6 +18,7 @@
import android.os.Parcel;
import android.os.Parcelable;
+import android.os.PersistableBundle;
import android.text.TextUtils;
import java.util.ArrayList;
@@ -59,8 +60,35 @@
*/
public static final String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";
+ /**
+ * The name of the extra used to define a component name when copying/dragging
+ * an app icon from Launcher.
+ * <p>
+ * Type: String
+ * </p>
+ * <p>
+ * Use {@link ComponentName#unflattenFromString(String)}
+ * and {@link ComponentName#flattenToString()} to convert the extra value
+ * to/from {@link ComponentName}.
+ * </p>
+ */
+ public static final String EXTRA_TARGET_COMPONENT_NAME =
+ "android.content.extra.TARGET_COMPONENT_NAME";
+
+ /**
+ * The name of the extra used to define a user serial number when copying/dragging
+ * an app icon from Launcher.
+ * <p>
+ * Type: long
+ * </p>
+ */
+ public static final String EXTRA_USER_SERIAL_NUMBER =
+ "android.content.extra.USER_SERIAL_NUMBER";
+
+
final CharSequence mLabel;
final String[] mMimeTypes;
+ private PersistableBundle mExtras;
/**
* Create a new clip.
@@ -173,6 +201,27 @@
return mMimeTypes[index];
}
+ /**
+ * Retrieve extended data from the clip description.
+ *
+ * @return the bundle containing extended data previously set with
+ * {@link #setExtras(PersistableBundle)}, or null if no extras have been set.
+ *
+ * @see #setExtras(PersistableBundle)
+ */
+ public PersistableBundle getExtras() {
+ return mExtras;
+ }
+
+ /**
+ * Add extended data to the clip description.
+ *
+ * @see #getExtras()
+ */
+ public void setExtras(PersistableBundle extras) {
+ mExtras = new PersistableBundle(extras);
+ }
+
/** @hide */
public void validate() {
if (mMimeTypes == null) {
@@ -211,6 +260,13 @@
b.append(mLabel);
b.append('"');
}
+ if (mExtras != null) {
+ if (!first) {
+ b.append(' ');
+ }
+ first = false;
+ b.append(mExtras.toString());
+ }
return !first;
}
@@ -236,11 +292,13 @@
public void writeToParcel(Parcel dest, int flags) {
TextUtils.writeToParcel(mLabel, dest, flags);
dest.writeStringArray(mMimeTypes);
+ dest.writePersistableBundle(mExtras);
}
ClipDescription(Parcel in) {
mLabel = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
mMimeTypes = in.createStringArray();
+ mExtras = in.readPersistableBundle();
}
public static final Parcelable.Creator<ClipDescription> CREATOR =
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index a0102b6..6cc5497 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -159,6 +159,16 @@
*/
public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 0x0008;
+ /**
+ * Database open flag: when set, the database is opened without support for
+ * localized collators.
+ *
+ * @see #openOrCreateDatabase(String, int, CursorFactory)
+ * @see #openOrCreateDatabase(String, int, CursorFactory, DatabaseErrorHandler)
+ * @see SQLiteDatabase#NO_LOCALIZED_COLLATORS
+ */
+ public static final int MODE_NO_LOCALIZED_COLLATORS = 0x0010;
+
/** @hide */
@IntDef(flag = true,
value = {
@@ -625,8 +635,30 @@
* @see #MODE_WORLD_READABLE
* @see #MODE_WORLD_WRITEABLE
*/
- public abstract SharedPreferences getSharedPreferences(String name,
- int mode);
+ public abstract SharedPreferences getSharedPreferences(String name, int mode);
+
+ /**
+ * Retrieve and hold the contents of the preferences file, returning
+ * a SharedPreferences through which you can retrieve and modify its
+ * values. Only one instance of the SharedPreferences object is returned
+ * to any callers for the same name, meaning they will see each other's
+ * edits as soon as they are made.
+ *
+ * @param file Desired preferences file. If a preferences file by this name
+ * does not exist, it will be created when you retrieve an
+ * editor (SharedPreferences.edit()) and then commit changes (Editor.commit()).
+ * @param mode Operating mode. Use 0 or {@link #MODE_PRIVATE} for the
+ * default operation, {@link #MODE_WORLD_READABLE}
+ * and {@link #MODE_WORLD_WRITEABLE} to control permissions.
+ *
+ * @return The single {@link SharedPreferences} instance that can be used
+ * to retrieve and modify the preference values.
+ *
+ * @see #MODE_PRIVATE
+ * @see #MODE_WORLD_READABLE
+ * @see #MODE_WORLD_WRITEABLE
+ */
+ public abstract SharedPreferences getSharedPreferences(File file, int mode);
/**
* Open a private file associated with this Context's application package
@@ -1249,6 +1281,7 @@
* default operation, {@link #MODE_WORLD_READABLE}
* and {@link #MODE_WORLD_WRITEABLE} to control permissions.
* Use {@link #MODE_ENABLE_WRITE_AHEAD_LOGGING} to enable write-ahead logging by default.
+ * Use {@link #MODE_NO_LOCALIZED_COLLATORS} to disable localized collators.
* @param factory An optional factory class that is called to instantiate a
* cursor when query is called.
*
@@ -1259,6 +1292,7 @@
* @see #MODE_WORLD_READABLE
* @see #MODE_WORLD_WRITEABLE
* @see #MODE_ENABLE_WRITE_AHEAD_LOGGING
+ * @see #MODE_NO_LOCALIZED_COLLATORS
* @see #deleteDatabase
*/
public abstract SQLiteDatabase openOrCreateDatabase(String name,
@@ -1276,6 +1310,7 @@
* default operation, {@link #MODE_WORLD_READABLE}
* and {@link #MODE_WORLD_WRITEABLE} to control permissions.
* Use {@link #MODE_ENABLE_WRITE_AHEAD_LOGGING} to enable write-ahead logging by default.
+ * Use {@link #MODE_NO_LOCALIZED_COLLATORS} to disable localized collators.
* @param factory An optional factory class that is called to instantiate a
* cursor when query is called.
* @param errorHandler the {@link DatabaseErrorHandler} to be used when sqlite reports database
@@ -1287,6 +1322,7 @@
* @see #MODE_WORLD_READABLE
* @see #MODE_WORLD_WRITEABLE
* @see #MODE_ENABLE_WRITE_AHEAD_LOGGING
+ * @see #MODE_NO_LOCALIZED_COLLATORS
* @see #deleteDatabase
*/
public abstract SQLiteDatabase openOrCreateDatabase(String name,
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index bec1b37..a345aae 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -172,6 +172,11 @@
}
@Override
+ public SharedPreferences getSharedPreferences(File file, int mode) {
+ return mBase.getSharedPreferences(file, mode);
+ }
+
+ @Override
public FileInputStream openFileInput(String name)
throws FileNotFoundException {
return mBase.openFileInput(name);
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 68b77fe..2178c38 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -18,6 +18,7 @@
import android.content.pm.ApplicationInfo;
import android.os.ResultReceiver;
+import android.os.ShellCommand;
import android.provider.MediaStore;
import android.util.ArraySet;
@@ -57,11 +58,13 @@
import org.xmlpull.v1.XmlSerializer;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.Serializable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
@@ -1423,6 +1426,36 @@
public static final String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
/**
+ * Activity Action: Launch ephemeral installer.
+ * <p>
+ * Input: The data must be a http: URI that the ephemeral application is registered
+ * to handle.
+ * <p class="note">
+ * This is a protected intent that can only be sent by the system.
+ * </p>
+ *
+ * @hide
+ */
+ @SystemApi
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_INSTALL_EPHEMERAL_PACKAGE
+ = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE";
+
+ /**
+ * Service Action: Resolve ephemeral application.
+ * <p>
+ * The system will have a persistent connection to this service.
+ * This is a protected intent that can only be sent by the system.
+ * </p>
+ *
+ * @hide
+ */
+ @SystemApi
+ @SdkConstant(SdkConstantType.SERVICE_ACTION)
+ public static final String ACTION_RESOLVE_EPHEMERAL_PACKAGE
+ = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE";
+
+ /**
* Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} to install a
* package. Specifies the installer package name; this package will receive the
* {@link #ACTION_APP_ERROR} intent.
@@ -1576,6 +1609,53 @@
"android.intent.action.MANAGE_PERMISSIONS";
/**
+ * Activity action: Launch UI to review permissions for an app.
+ * The system uses this intent if permission review for apps not
+ * supporting the new runtime permissions model is enabled. In
+ * this mode a permission review is required before any of the
+ * app components can run.
+ * <p>
+ * Input: {@link #EXTRA_PACKAGE_NAME} specifies the package whose
+ * permissions will be reviewed (mandatory).
+ * </p>
+ * <p>
+ * Input: {@link #EXTRA_INTENT} specifies a pending intent to
+ * be fired after the permission review (optional).
+ * </p>
+ * <p>
+ * Input: {@link #EXTRA_REMOTE_CALLBACK} specifies a callback to
+ * be invoked after the permission review (optional).
+ * </p>
+ * <p>
+ * Input: {@link #EXTRA_RESULT_NEEDED} specifies whether the intent
+ * passed via {@link #EXTRA_INTENT} needs a result (optional).
+ * </p>
+ * <p>
+ * Output: Nothing.
+ * </p>
+ *
+ * @see #EXTRA_PACKAGE_NAME
+ * @see #EXTRA_INTENT
+ * @see #EXTRA_REMOTE_CALLBACK
+ * @see #EXTRA_RESULT_NEEDED
+ *
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_REVIEW_PERMISSIONS =
+ "android.intent.action.REVIEW_PERMISSIONS";
+
+ /**
+ * Intent extra: A callback for reporting remote result as a bundle.
+ * <p>
+ * Type: IRemoteCallback
+ * </p>
+ *
+ * @hide
+ */
+ public static final String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";
+
+ /**
* Intent extra: An app package name.
* <p>
* Type: String
@@ -1587,6 +1667,16 @@
public static final String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME";
/**
+ * Intent extra: An extra for specifying whether a result is needed.
+ * <p>
+ * Type: boolean
+ * </p>
+ *
+ * @hide
+ */
+ public static final String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
+
+ /**
* Broadcast action that requests current permission granted information. It will respond
* to the request by sending a broadcast with action defined by
* {@link #EXTRA_GET_PERMISSIONS_RESPONSE_INTENT}. The response will contain
@@ -2844,6 +2934,14 @@
"android.intent.action.USER_SWITCHED";
/**
+ * Broadcast Action: Sent when the credential-encrypted private storage has
+ * become unlocked for the target user. This is only sent to registered
+ * receivers, not manifest receivers.
+ */
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+ public static final String ACTION_USER_UNLOCKED = "android.intent.action.USER_UNLOCKED";
+
+ /**
* Broadcast sent to the system when a user's information changes. Carries an extra
* {@link #EXTRA_USER_HANDLE} to indicate which user's information changed.
* This is only sent to registered receivers, not manifest receivers. It is sent to all users.
@@ -2923,8 +3021,8 @@
* multiple selection), then you can specify {@link #EXTRA_ALLOW_MULTIPLE}
* to indicate this.
* <p>
- * Callers must include {@link #CATEGORY_OPENABLE} in the Intent so that
- * returned URIs can be opened with
+ * Callers must include {@link #CATEGORY_OPENABLE} in the Intent to obtain
+ * URIs that can be opened with
* {@link ContentResolver#openFileDescriptor(Uri, String)}.
* <p>
* Output: The URI of the item that was picked, returned in
@@ -2959,8 +3057,8 @@
* Callers can provide an initial display name through {@link #EXTRA_TITLE},
* but the user may change this value before creating the file.
* <p>
- * Callers must include {@link #CATEGORY_OPENABLE} in the Intent so that
- * returned URIs can be opened with
+ * Callers must include {@link #CATEGORY_OPENABLE} in the Intent to obtain
+ * URIs that can be opened with
* {@link ContentResolver#openFileDescriptor(Uri, String)}.
* <p>
* Output: The URI of the item that was created. This must be a
@@ -3054,21 +3152,21 @@
/**
* Thermal state when the device is normal. This state is sent in the
- * {@link ACTION_THERMAL_EVENT} broadcast as {@link EXTRA_THERMAL_STATE}.
+ * {@link #ACTION_THERMAL_EVENT} broadcast as {@link #EXTRA_THERMAL_STATE}.
* {@hide}
*/
public static final int EXTRA_THERMAL_STATE_NORMAL = 0;
/**
* Thermal state where the device is approaching its maximum threshold. This state is sent in
- * the {@link ACTION_THERMAL_EVENT} broadcast as {@link EXTRA_THERMAL_STATE}.
+ * the {@link #ACTION_THERMAL_EVENT} broadcast as {@link #EXTRA_THERMAL_STATE}.
* {@hide}
*/
public static final int EXTRA_THERMAL_STATE_WARNING = 1;
/**
* Thermal state where the device has reached its maximum threshold. This state is sent in the
- * {@link ACTION_THERMAL_EVENT} broadcast as {@link EXTRA_THERMAL_STATE}.
+ * {@link #ACTION_THERMAL_EVENT} broadcast as {@link #EXTRA_THERMAL_STATE}.
* {@hide}
*/
public static final int EXTRA_THERMAL_STATE_EXCEEDED = 2;
@@ -5083,6 +5181,437 @@
return intent;
}
+ /** @hide */
+ public interface CommandOptionHandler {
+ boolean handleOption(String opt, ShellCommand cmd);
+ }
+
+ /** @hide */
+ public static Intent parseCommandArgs(ShellCommand cmd, CommandOptionHandler optionHandler)
+ throws URISyntaxException {
+ Intent intent = new Intent();
+ Intent baseIntent = intent;
+ boolean hasIntentInfo = false;
+
+ Uri data = null;
+ String type = null;
+
+ String opt;
+ while ((opt=cmd.getNextOption()) != null) {
+ switch (opt) {
+ case "-a":
+ intent.setAction(cmd.getNextArgRequired());
+ if (intent == baseIntent) {
+ hasIntentInfo = true;
+ }
+ break;
+ case "-d":
+ data = Uri.parse(cmd.getNextArgRequired());
+ if (intent == baseIntent) {
+ hasIntentInfo = true;
+ }
+ break;
+ case "-t":
+ type = cmd.getNextArgRequired();
+ if (intent == baseIntent) {
+ hasIntentInfo = true;
+ }
+ break;
+ case "-c":
+ intent.addCategory(cmd.getNextArgRequired());
+ if (intent == baseIntent) {
+ hasIntentInfo = true;
+ }
+ break;
+ case "-e":
+ case "--es": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ intent.putExtra(key, value);
+ }
+ break;
+ case "--esn": {
+ String key = cmd.getNextArgRequired();
+ intent.putExtra(key, (String) null);
+ }
+ break;
+ case "--ei": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ intent.putExtra(key, Integer.decode(value));
+ }
+ break;
+ case "--eu": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ intent.putExtra(key, Uri.parse(value));
+ }
+ break;
+ case "--ecn": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ ComponentName cn = ComponentName.unflattenFromString(value);
+ if (cn == null)
+ throw new IllegalArgumentException("Bad component name: " + value);
+ intent.putExtra(key, cn);
+ }
+ break;
+ case "--eia": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ int[] list = new int[strings.length];
+ for (int i = 0; i < strings.length; i++) {
+ list[i] = Integer.decode(strings[i]);
+ }
+ intent.putExtra(key, list);
+ }
+ break;
+ case "--eial": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ ArrayList<Integer> list = new ArrayList<>(strings.length);
+ for (int i = 0; i < strings.length; i++) {
+ list.add(Integer.decode(strings[i]));
+ }
+ intent.putExtra(key, list);
+ }
+ break;
+ case "--el": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ intent.putExtra(key, Long.valueOf(value));
+ }
+ break;
+ case "--ela": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ long[] list = new long[strings.length];
+ for (int i = 0; i < strings.length; i++) {
+ list[i] = Long.valueOf(strings[i]);
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--elal": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ ArrayList<Long> list = new ArrayList<>(strings.length);
+ for (int i = 0; i < strings.length; i++) {
+ list.add(Long.valueOf(strings[i]));
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--ef": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ intent.putExtra(key, Float.valueOf(value));
+ hasIntentInfo = true;
+ }
+ break;
+ case "--efa": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ float[] list = new float[strings.length];
+ for (int i = 0; i < strings.length; i++) {
+ list[i] = Float.valueOf(strings[i]);
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--efal": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ ArrayList<Float> list = new ArrayList<>(strings.length);
+ for (int i = 0; i < strings.length; i++) {
+ list.add(Float.valueOf(strings[i]));
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--esa": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ // Split on commas unless they are preceeded by an escape.
+ // The escape character must be escaped for the string and
+ // again for the regex, thus four escape characters become one.
+ String[] strings = value.split("(?<!\\\\),");
+ intent.putExtra(key, strings);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--esal": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ // Split on commas unless they are preceeded by an escape.
+ // The escape character must be escaped for the string and
+ // again for the regex, thus four escape characters become one.
+ String[] strings = value.split("(?<!\\\\),");
+ ArrayList<String> list = new ArrayList<>(strings.length);
+ for (int i = 0; i < strings.length; i++) {
+ list.add(strings[i]);
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--ez": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired().toLowerCase();
+ // Boolean.valueOf() results in false for anything that is not "true", which is
+ // error-prone in shell commands
+ boolean arg;
+ if ("true".equals(value) || "t".equals(value)) {
+ arg = true;
+ } else if ("false".equals(value) || "f".equals(value)) {
+ arg = false;
+ } else {
+ try {
+ arg = Integer.decode(value) != 0;
+ } catch (NumberFormatException ex) {
+ throw new IllegalArgumentException("Invalid boolean value: " + value);
+ }
+ }
+
+ intent.putExtra(key, arg);
+ }
+ break;
+ case "-n": {
+ String str = cmd.getNextArgRequired();
+ ComponentName cn = ComponentName.unflattenFromString(str);
+ if (cn == null)
+ throw new IllegalArgumentException("Bad component name: " + str);
+ intent.setComponent(cn);
+ if (intent == baseIntent) {
+ hasIntentInfo = true;
+ }
+ }
+ break;
+ case "-p": {
+ String str = cmd.getNextArgRequired();
+ intent.setPackage(str);
+ if (intent == baseIntent) {
+ hasIntentInfo = true;
+ }
+ }
+ break;
+ case "-f":
+ String str = cmd.getNextArgRequired();
+ intent.setFlags(Integer.decode(str).intValue());
+ break;
+ case "--grant-read-uri-permission":
+ intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ break;
+ case "--grant-write-uri-permission":
+ intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+ break;
+ case "--grant-persistable-uri-permission":
+ intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
+ break;
+ case "--grant-prefix-uri-permission":
+ intent.addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
+ break;
+ case "--exclude-stopped-packages":
+ intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
+ break;
+ case "--include-stopped-packages":
+ intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+ break;
+ case "--debug-log-resolution":
+ intent.addFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION);
+ break;
+ case "--activity-brought-to-front":
+ intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
+ break;
+ case "--activity-clear-top":
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ break;
+ case "--activity-clear-when-task-reset":
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+ break;
+ case "--activity-exclude-from-recents":
+ intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ break;
+ case "--activity-launched-from-history":
+ intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY);
+ break;
+ case "--activity-multiple-task":
+ intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+ break;
+ case "--activity-no-animation":
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ break;
+ case "--activity-no-history":
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+ break;
+ case "--activity-no-user-action":
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
+ break;
+ case "--activity-previous-is-top":
+ intent.addFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
+ break;
+ case "--activity-reorder-to-front":
+ intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+ break;
+ case "--activity-reset-task-if-needed":
+ intent.addFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+ break;
+ case "--activity-single-top":
+ intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ break;
+ case "--activity-clear-task":
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ break;
+ case "--activity-task-on-home":
+ intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);
+ break;
+ case "--receiver-registered-only":
+ intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+ break;
+ case "--receiver-replace-pending":
+ intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
+ break;
+ case "--selector":
+ intent.setDataAndType(data, type);
+ intent = new Intent();
+ break;
+ default:
+ if (optionHandler != null && optionHandler.handleOption(opt, cmd)) {
+ // Okay, caller handled this option.
+ } else {
+ throw new IllegalArgumentException("Unknown option: " + opt);
+ }
+ break;
+ }
+ }
+ intent.setDataAndType(data, type);
+
+ final boolean hasSelector = intent != baseIntent;
+ if (hasSelector) {
+ // A selector was specified; fix up.
+ baseIntent.setSelector(intent);
+ intent = baseIntent;
+ }
+
+ String arg = cmd.getNextArg();
+ baseIntent = null;
+ if (arg == null) {
+ if (hasSelector) {
+ // If a selector has been specified, and no arguments
+ // have been supplied for the main Intent, then we can
+ // assume it is ACTION_MAIN CATEGORY_LAUNCHER; we don't
+ // need to have a component name specified yet, the
+ // selector will take care of that.
+ baseIntent = new Intent(Intent.ACTION_MAIN);
+ baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ }
+ } else if (arg.indexOf(':') >= 0) {
+ // The argument is a URI. Fully parse it, and use that result
+ // to fill in any data not specified so far.
+ baseIntent = Intent.parseUri(arg, Intent.URI_INTENT_SCHEME
+ | Intent.URI_ANDROID_APP_SCHEME | Intent.URI_ALLOW_UNSAFE);
+ } else if (arg.indexOf('/') >= 0) {
+ // The argument is a component name. Build an Intent to launch
+ // it.
+ baseIntent = new Intent(Intent.ACTION_MAIN);
+ baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ baseIntent.setComponent(ComponentName.unflattenFromString(arg));
+ } else {
+ // Assume the argument is a package name.
+ baseIntent = new Intent(Intent.ACTION_MAIN);
+ baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ baseIntent.setPackage(arg);
+ }
+ if (baseIntent != null) {
+ Bundle extras = intent.getExtras();
+ intent.replaceExtras((Bundle)null);
+ Bundle uriExtras = baseIntent.getExtras();
+ baseIntent.replaceExtras((Bundle)null);
+ if (intent.getAction() != null && baseIntent.getCategories() != null) {
+ HashSet<String> cats = new HashSet<String>(baseIntent.getCategories());
+ for (String c : cats) {
+ baseIntent.removeCategory(c);
+ }
+ }
+ intent.fillIn(baseIntent, Intent.FILL_IN_COMPONENT | Intent.FILL_IN_SELECTOR);
+ if (extras == null) {
+ extras = uriExtras;
+ } else if (uriExtras != null) {
+ uriExtras.putAll(extras);
+ extras = uriExtras;
+ }
+ intent.replaceExtras(extras);
+ hasIntentInfo = true;
+ }
+
+ if (!hasIntentInfo) throw new IllegalArgumentException("No intent supplied");
+ return intent;
+ }
+
+ /** @hide */
+ public static void printIntentArgsHelp(PrintWriter pw, String prefix) {
+ final String[] lines = new String[] {
+ "<INTENT> specifications include these flags and arguments:",
+ " [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]",
+ " [-c <CATEGORY> [-c <CATEGORY>] ...]",
+ " [-e|--es <EXTRA_KEY> <EXTRA_STRING_VALUE> ...]",
+ " [--esn <EXTRA_KEY> ...]",
+ " [--ez <EXTRA_KEY> <EXTRA_BOOLEAN_VALUE> ...]",
+ " [--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]",
+ " [--el <EXTRA_KEY> <EXTRA_LONG_VALUE> ...]",
+ " [--ef <EXTRA_KEY> <EXTRA_FLOAT_VALUE> ...]",
+ " [--eu <EXTRA_KEY> <EXTRA_URI_VALUE> ...]",
+ " [--ecn <EXTRA_KEY> <EXTRA_COMPONENT_NAME_VALUE>]",
+ " [--eia <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]",
+ " (mutiple extras passed as Integer[])",
+ " [--eial <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]",
+ " (mutiple extras passed as List<Integer>)",
+ " [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]",
+ " (mutiple extras passed as Long[])",
+ " [--elal <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]",
+ " (mutiple extras passed as List<Long>)",
+ " [--efa <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]",
+ " (mutiple extras passed as Float[])",
+ " [--efal <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]",
+ " (mutiple extras passed as List<Float>)",
+ " [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]",
+ " (mutiple extras passed as String[]; to embed a comma into a string,",
+ " escape it using \"\\,\")",
+ " [--esal <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]",
+ " (mutiple extras passed as List<String>; to embed a comma into a string,",
+ " escape it using \"\\,\")",
+ " [--grant-read-uri-permission] [--grant-write-uri-permission]",
+ " [--grant-persistable-uri-permission] [--grant-prefix-uri-permission]",
+ " [--debug-log-resolution] [--exclude-stopped-packages]",
+ " [--include-stopped-packages]",
+ " [--activity-brought-to-front] [--activity-clear-top]",
+ " [--activity-clear-when-task-reset] [--activity-exclude-from-recents]",
+ " [--activity-launched-from-history] [--activity-multiple-task]",
+ " [--activity-no-animation] [--activity-no-history]",
+ " [--activity-no-user-action] [--activity-previous-is-top]",
+ " [--activity-reorder-to-front] [--activity-reset-task-if-needed]",
+ " [--activity-single-top] [--activity-clear-task]",
+ " [--activity-task-on-home]",
+ " [--receiver-registered-only] [--receiver-replace-pending]",
+ " [--selector]",
+ " [<URI> | <PACKAGE> | <COMPONENT>]"
+ };
+ for (String line : lines) {
+ pw.print(prefix);
+ pw.println(line);
+ }
+ }
+
/**
* Retrieve the general action to be performed, such as
* {@link #ACTION_VIEW}. The action describes the general way the rest of
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index 885255f..4a3c59b 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -627,9 +627,9 @@
* {@link #CONFIG_MCC}, {@link #CONFIG_MNC},
* {@link #CONFIG_LOCALE}, {@link #CONFIG_TOUCHSCREEN},
* {@link #CONFIG_KEYBOARD}, {@link #CONFIG_NAVIGATION},
- * {@link #CONFIG_ORIENTATION}, {@link #CONFIG_SCREEN_LAYOUT} and
- * {@link #CONFIG_LAYOUT_DIRECTION}. Set from the {@link android.R.attr#configChanges}
- * attribute.
+ * {@link #CONFIG_ORIENTATION}, {@link #CONFIG_SCREEN_LAYOUT},
+ * {@link #CONFIG_DENSITY}, and {@link #CONFIG_LAYOUT_DIRECTION}.
+ * Set from the {@link android.R.attr#configChanges} attribute.
*/
public int configChanges;
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 9c880d3..65e5945 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -479,6 +479,21 @@
public static final int PRIVATE_FLAG_ENCRYPTION_AWARE = 1 << 6;
/**
+ * Value for {@link #privateFlags}: set to {@code true} if the application
+ * is AutoPlay.
+ *
+ * {@hide}
+ */
+ public static final int PRIVATE_FLAG_AUTOPLAY = 1 << 7;
+
+ /**
+ * When set, at least one component inside this application is encryption aware.
+ *
+ * @hide
+ */
+ public static final int PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE = 1 << 8;
+
+ /**
* Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.
* {@hide}
*/
@@ -974,7 +989,7 @@
.getAbsolutePath();
if ((privateFlags & PRIVATE_FLAG_FORCE_DEVICE_ENCRYPTED) != 0
- && SystemProperties.getBoolean(StorageManager.PROP_HAS_FBE, false)) {
+ && StorageManager.isFileBasedEncryptionEnabled()) {
dataDir = deviceEncryptedDataDir;
} else {
dataDir = credentialEncryptedDataDir;
@@ -1046,6 +1061,18 @@
return (privateFlags & ApplicationInfo.PRIVATE_FLAG_ENCRYPTION_AWARE) != 0;
}
+ /** @hide */
+ public boolean isPartiallyEncryptionAware() {
+ return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE) != 0;
+ }
+
+ /**
+ * @hide
+ */
+ public boolean isAutoPlayApp() {
+ return (privateFlags & ApplicationInfo.PRIVATE_FLAG_AUTOPLAY) != 0;
+ }
+
/**
* @hide
*/
diff --git a/core/java/android/content/pm/AppsQueryHelper.java b/core/java/android/content/pm/AppsQueryHelper.java
index a5a8e3f..084bc18 100644
--- a/core/java/android/content/pm/AppsQueryHelper.java
+++ b/core/java/android/content/pm/AppsQueryHelper.java
@@ -18,13 +18,11 @@
import android.Manifest;
import android.app.AppGlobals;
-import android.content.Context;
import android.content.Intent;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.ArraySet;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethod;
import com.android.internal.annotations.VisibleForTesting;
@@ -44,36 +42,37 @@
public static int GET_NON_LAUNCHABLE_APPS = 1;
/**
- * Return apps with {@link android.Manifest.permission#INTERACT_ACROSS_USERS} permission
+ * Return apps with {@link Manifest.permission#INTERACT_ACROSS_USERS} permission
*/
public static int GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM = 1 << 1;
/**
- * Return all input methods that are marked as default.
- * <p>When this flag is set, {@code user} specified in
- * {@link #queryApps(int, boolean, UserHandle)} must be
- * {@link UserHandle#myUserId user of the current process}.
+ * Return all input methods available for the current user.
*/
- public static int GET_DEFAULT_IMES = 1 << 2;
+ public static int GET_IMES = 1 << 2;
- private final Context mContext;
+ private final IPackageManager mPackageManager;
private List<ApplicationInfo> mAllApps;
- public AppsQueryHelper(Context context) {
- mContext = context;
+ public AppsQueryHelper(IPackageManager packageManager) {
+ mPackageManager = packageManager;
+ }
+
+ public AppsQueryHelper() {
+ this(AppGlobals.getPackageManager());
}
/**
* Return a List of all packages that satisfy a specified criteria.
* @param flags search flags. Use any combination of {@link #GET_NON_LAUNCHABLE_APPS},
- * {@link #GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM} or {@link #GET_DEFAULT_IMES}.
+ * {@link #GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM} or {@link #GET_IMES}.
* @param systemAppsOnly if true, only system apps will be returned
* @param user user, whose apps are queried
*/
public List<String> queryApps(int flags, boolean systemAppsOnly, UserHandle user) {
boolean nonLaunchableApps = (flags & GET_NON_LAUNCHABLE_APPS) > 0;
boolean interactAcrossUsers = (flags & GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM) > 0;
- boolean defaultImes = (flags & GET_DEFAULT_IMES) > 0;
+ boolean imes = (flags & GET_IMES) > 0;
if (mAllApps == null) {
mAllApps = getAllApps(user.getIdentifier());
}
@@ -113,7 +112,6 @@
}
}
}
-
if (interactAcrossUsers) {
final List<PackageInfo> packagesHoldingPermissions = getPackagesHoldingPermission(
Manifest.permission.INTERACT_ACROSS_USERS, user.getIdentifier());
@@ -129,29 +127,18 @@
}
}
- if (defaultImes) {
- if (UserHandle.myUserId() != user.getIdentifier()) {
- throw new IllegalArgumentException("Specified user handle " + user
- + " is not a user of the current process.");
- }
- List<InputMethodInfo> imis = getInputMethodList();
- int imisSize = imis.size();
- ArraySet<String> defaultImePackages = new ArraySet<>();
- for (int i = 0; i < imisSize; i++) {
- InputMethodInfo imi = imis.get(i);
- if (imi.isDefault(mContext)) {
- defaultImePackages.add(imi.getPackageName());
- }
- }
- final int allAppsSize = mAllApps.size();
- for (int i = 0; i < allAppsSize; i++) {
- final ApplicationInfo appInfo = mAllApps.get(i);
- if (systemAppsOnly && !appInfo.isSystemApp()) {
+ if (imes) {
+ final List<ResolveInfo> resolveInfos = queryIntentServicesAsUser(
+ new Intent(InputMethod.SERVICE_INTERFACE), user.getIdentifier());
+ final int resolveInfosSize = resolveInfos.size();
+
+ for (int i = 0; i < resolveInfosSize; i++) {
+ ServiceInfo serviceInfo = resolveInfos.get(i).serviceInfo;
+ if (systemAppsOnly && !serviceInfo.applicationInfo.isSystemApp()) {
continue;
}
- final String packageName = appInfo.packageName;
- if (defaultImePackages.contains(packageName)) {
- result.add(packageName);
+ if (!result.contains(serviceInfo.packageName)) {
+ result.add(serviceInfo.packageName);
}
}
}
@@ -163,9 +150,8 @@
@SuppressWarnings("unchecked")
protected List<ApplicationInfo> getAllApps(int userId) {
try {
- return AppGlobals.getPackageManager().getInstalledApplications(
- PackageManager.GET_UNINSTALLED_PACKAGES
- | PackageManager.GET_DISABLED_COMPONENTS, userId).getList();
+ return mPackageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES
+ | PackageManager.GET_DISABLED_COMPONENTS, userId).getList();
} catch (RemoteException e) {
throw new IllegalStateException("Package manager has died", e);
}
@@ -173,17 +159,22 @@
@VisibleForTesting
protected List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent, int userId) {
- return mContext.getPackageManager()
- .queryIntentActivitiesAsUser(intent, PackageManager.GET_DISABLED_COMPONENTS
- | PackageManager.GET_UNINSTALLED_PACKAGES, userId);
+ try {
+ return mPackageManager.queryIntentActivities(intent, null,
+ PackageManager.GET_DISABLED_COMPONENTS
+ | PackageManager.GET_UNINSTALLED_PACKAGES,
+ userId);
+ } catch (RemoteException e) {
+ throw new IllegalStateException("Package manager has died", e);
+ }
}
@VisibleForTesting
- @SuppressWarnings("unchecked")
- protected List<PackageInfo> getPackagesHoldingPermission(String perm, int userId) {
+ protected List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int userId) {
try {
- return AppGlobals.getPackageManager().getPackagesHoldingPermissions(new String[]{perm},
- 0, userId).getList();
+ return mPackageManager.queryIntentServices(intent, null,
+ PackageManager.GET_META_DATA
+ | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, userId);
} catch (RemoteException e) {
throw new IllegalStateException("Package manager has died", e);
}
@@ -191,9 +182,13 @@
@VisibleForTesting
@SuppressWarnings("unchecked")
- protected List<InputMethodInfo> getInputMethodList() {
- InputMethodManager imm = (InputMethodManager)
- mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
- return imm.getInputMethodList();
+ protected List<PackageInfo> getPackagesHoldingPermission(String perm, int userId) {
+ try {
+ return mPackageManager.getPackagesHoldingPermissions(new String[]{perm}, 0,
+ userId).getList();
+ } catch (RemoteException e) {
+ throw new IllegalStateException("Package manager has died", e);
+ }
}
+
}
diff --git a/core/java/android/content/pm/ILauncherApps.aidl b/core/java/android/content/pm/ILauncherApps.aidl
index d9005b2..6586426 100644
--- a/core/java/android/content/pm/ILauncherApps.aidl
+++ b/core/java/android/content/pm/ILauncherApps.aidl
@@ -19,6 +19,7 @@
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.IOnAppsChangedListener;
+import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo;
import android.graphics.Rect;
import android.os.Bundle;
@@ -31,7 +32,7 @@
interface ILauncherApps {
void addOnAppsChangedListener(in IOnAppsChangedListener listener);
void removeOnAppsChangedListener(in IOnAppsChangedListener listener);
- List<ResolveInfo> getLauncherActivities(String packageName, in UserHandle user);
+ ParceledListSlice getLauncherActivities(String packageName, in UserHandle user);
ResolveInfo resolveActivity(in Intent intent, in UserHandle user);
void startActivityAsUser(in ComponentName component, in Rect sourceBounds,
in Bundle opts, in UserHandle user);
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 6fe1efd..b9a42eb 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -59,7 +59,7 @@
* {@hide}
*/
interface IPackageManager {
- boolean isPackageFrozen(String packageName);
+ void checkPackageStartable(String packageName, int userId);
boolean isPackageAvailable(String packageName, int userId);
PackageInfo getPackageInfo(String packageName, int flags, int userId);
int getPackageUid(String packageName, int userId);
diff --git a/core/java/android/content/pm/LauncherActivityInfo.java b/core/java/android/content/pm/LauncherActivityInfo.java
index 6827d7a..a5617b4 100644
--- a/core/java/android/content/pm/LauncherActivityInfo.java
+++ b/core/java/android/content/pm/LauncherActivityInfo.java
@@ -41,7 +41,6 @@
private ComponentName mComponentName;
private ResolveInfo mResolveInfo;
private UserHandle mUser;
- private long mFirstInstallTime;
/**
* Create a launchable activity object for a given ResolveInfo and user.
@@ -50,14 +49,12 @@
* @param info ResolveInfo from which to create the LauncherActivityInfo.
* @param user The UserHandle of the profile to which this activity belongs.
*/
- LauncherActivityInfo(Context context, ResolveInfo info, UserHandle user,
- long firstInstallTime) {
+ LauncherActivityInfo(Context context, ResolveInfo info, UserHandle user) {
this(context);
mResolveInfo = info;
mActivityInfo = info.activityInfo;
mComponentName = LauncherApps.getComponentName(info);
mUser = user;
- mFirstInstallTime = firstInstallTime;
}
LauncherActivityInfo(Context context) {
@@ -136,7 +133,7 @@
/**
* Returns the drawable for this activity, without any badging for the profile.
- * @param resource id of the drawable.
+ * @param iconRes id of the drawable.
* @param density The preferred density of the icon, zero for default density. Use
* density DPI values from {@link DisplayMetrics}.
* @see DisplayMetrics
@@ -179,7 +176,13 @@
* @return The time of installation of the package, in milliseconds.
*/
public long getFirstInstallTime() {
- return mFirstInstallTime;
+ try {
+ return mPm.getPackageInfo(mActivityInfo.packageName,
+ PackageManager.GET_UNINSTALLED_PACKAGES).firstInstallTime;
+ } catch (NameNotFoundException nnfe) {
+ // Sorry, can't find package
+ return 0;
+ }
}
/**
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index e9ec771..6e67af4 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -142,28 +142,18 @@
* @return List of launchable activities. Can be an empty list but will not be null.
*/
public List<LauncherActivityInfo> getActivityList(String packageName, UserHandle user) {
- List<ResolveInfo> activities = null;
+ ParceledListSlice<ResolveInfo> activities = null;
try {
activities = mService.getLauncherActivities(packageName, user);
} catch (RemoteException re) {
- throw new RuntimeException("Failed to call LauncherAppsService");
+ throw new RuntimeException("Failed to call LauncherAppsService", re);
}
if (activities == null) {
return Collections.EMPTY_LIST;
}
ArrayList<LauncherActivityInfo> lais = new ArrayList<LauncherActivityInfo>();
- final int count = activities.size();
- for (int i = 0; i < count; i++) {
- ResolveInfo ri = activities.get(i);
- long firstInstallTime = 0;
- try {
- firstInstallTime = mPm.getPackageInfo(ri.activityInfo.packageName,
- PackageManager.GET_UNINSTALLED_PACKAGES).firstInstallTime;
- } catch (NameNotFoundException nnfe) {
- // Sorry, can't find package
- }
- LauncherActivityInfo lai = new LauncherActivityInfo(mContext, ri, user,
- firstInstallTime);
+ for (ResolveInfo ri : activities.getList()) {
+ LauncherActivityInfo lai = new LauncherActivityInfo(mContext, ri, user);
if (DEBUG) {
Log.v(TAG, "Returning activity for profile " + user + " : "
+ lai.getComponentName());
@@ -189,19 +179,11 @@
try {
ResolveInfo ri = mService.resolveActivity(intent, user);
if (ri != null) {
- long firstInstallTime = 0;
- try {
- firstInstallTime = mPm.getPackageInfo(ri.activityInfo.packageName,
- PackageManager.GET_UNINSTALLED_PACKAGES).firstInstallTime;
- } catch (NameNotFoundException nnfe) {
- // Sorry, can't find package
- }
- LauncherActivityInfo info = new LauncherActivityInfo(mContext, ri, user,
- firstInstallTime);
+ LauncherActivityInfo info = new LauncherActivityInfo(mContext, ri, user);
return info;
}
} catch (RemoteException re) {
- throw new RuntimeException("Failed to call LauncherAppsService");
+ throw new RuntimeException("Failed to call LauncherAppsService", re);
}
return null;
}
@@ -256,7 +238,7 @@
try {
return mService.isPackageEnabled(packageName, user);
} catch (RemoteException re) {
- throw new RuntimeException("Failed to call LauncherAppsService");
+ throw new RuntimeException("Failed to call LauncherAppsService", re);
}
}
@@ -272,7 +254,7 @@
try {
return mService.isActivityEnabled(component, user);
} catch (RemoteException re) {
- throw new RuntimeException("Failed to call LauncherAppsService");
+ throw new RuntimeException("Failed to call LauncherAppsService", re);
}
}
diff --git a/core/java/android/content/pm/ManifestDigest.java b/core/java/android/content/pm/ManifestDigest.java
index 1fbef7a..e7dc764 100644
--- a/core/java/android/content/pm/ManifestDigest.java
+++ b/core/java/android/content/pm/ManifestDigest.java
@@ -16,6 +16,8 @@
package android.content.pm;
+import com.android.internal.util.HexDump;
+
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -118,7 +120,7 @@
final int N = mDigest.length;
for (int i = 0; i < N; i++) {
final byte b = mDigest[i];
- IntegralToString.appendByteAsHex(sb, b, false);
+ HexDump.appendByteAsHex(sb, b, false);
sb.append(',');
}
sb.append('}');
@@ -142,4 +144,4 @@
}
};
-}
\ No newline at end of file
+}
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 566de4e..aa960a4 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -240,16 +240,15 @@
public static final int GET_ENCRYPTION_UNAWARE_COMPONENTS = 0x00040000;
/**
- * {@link PackageInfo} flag: return components as if the given user is
- * running with amnesia. This typically limits the component to only those
- * marked as {@link ComponentInfo#encryptionAware}, unless
+ * {@link PackageInfo} flag: return components that are marked as
+ * {@link ComponentInfo#encryptionAware}, unless
* {@link #GET_ENCRYPTION_UNAWARE_COMPONENTS} is also specified.
* <p>
* This flag is for internal use only.
*
* @hide
*/
- public static final int FLAG_USER_RUNNING_WITH_AMNESIA = 0x00080000;
+ public static final int MATCH_ENCRYPTION_AWARE_ONLY = 0x00080000;
/**
* Flag for {@link addCrossProfileIntentFilter}: if this flag is set:
@@ -1730,6 +1729,8 @@
* {@link #hasSystemFeature}: The device supports freeform window management.
* Windows have title bars and can be moved and resized.
*/
+ // If this feature is present, you also need to set
+ // com.android.internal.R.config_freeformWindowManagement to true in your configuration overlay.
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_FREEFORM_WINDOW_MANAGEMENT
= "android.software.freeform_window_management";
@@ -2017,7 +2018,6 @@
*/
public static final int FLAG_PERMISSION_SYSTEM_FIXED = 1 << 4;
-
/**
* Permission flag: The permission is granted by default because it
* enables app functionality that is expected to work out-of-the-box
@@ -2029,6 +2029,14 @@
public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 1 << 5;
/**
+ * Permission flag: The permission has to be reviewed before any of
+ * the app components can run.
+ *
+ * @hide
+ */
+ public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 1 << 6;
+
+ /**
* Mask for all permission flags.
*
* @hide
@@ -4807,6 +4815,7 @@
case FLAG_PERMISSION_USER_SET: return "USER_SET";
case FLAG_PERMISSION_REVOKE_ON_UPGRADE: return "REVOKE_ON_UPGRADE";
case FLAG_PERMISSION_USER_FIXED: return "USER_FIXED";
+ case FLAG_PERMISSION_REVIEW_REQUIRED: return "REVIEW_REQUIRED";
default: return Integer.toString(flag);
}
}
diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java
index bf70d6c..8bf20bf 100644
--- a/core/java/android/content/pm/PackageManagerInternal.java
+++ b/core/java/android/content/pm/PackageManagerInternal.java
@@ -16,7 +16,7 @@
package android.content.pm;
-import android.annotation.NonNull;
+import java.util.List;
/**
* Package manager local system service interface.
@@ -115,4 +115,20 @@
*/
public abstract void grantDefaultPermissionsToDefaultSimCallManager(String packageName,
int userId);
+
+ /**
+ * Sets a list of apps to keep in PM's internal data structures and as APKs even if no user has
+ * currently installed it. The apps are not preloaded.
+ * @param packageList List of package names to keep cached.
+ */
+ public abstract void setKeepUninstalledPackages(List<String> packageList);
+
+ /**
+ * Gets whether some of the permissions used by this package require a user
+ * review before any of the app components can run.
+ * @param packageName The package name for which to check.
+ * @param userId The user under which to check.
+ * @return True a permissions review is required.
+ */
+ public abstract boolean isPermissionsReviewRequired(String packageName, int userId);
}
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 838da37..fd1e57b 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -84,9 +84,10 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.jar.StrictJarFile;
import java.util.zip.ZipEntry;
+import android.util.jar.StrictJarFile;
+
/**
* Parser for package files (APKs) on disk. This supports apps packaged either
* as a single "monolithic" APK, or apps packaged as a "cluster" of multiple
@@ -1067,19 +1068,20 @@
pkg.mSignatures = null;
pkg.mSigningKeys = null;
- collectCertificates(pkg, new File(pkg.baseCodePath), parseFlags);
+ collectCertificates(pkg, new File(pkg.baseCodePath), pkg.applicationInfo.flags, parseFlags);
if (!ArrayUtils.isEmpty(pkg.splitCodePaths)) {
- for (String splitCodePath : pkg.splitCodePaths) {
- collectCertificates(pkg, new File(splitCodePath), parseFlags);
+ for (int i = 0; i < pkg.splitCodePaths.length; i++) {
+ collectCertificates(pkg, new File(pkg.splitCodePaths[i]), pkg.splitFlags[i],
+ parseFlags);
}
}
}
- private static void collectCertificates(Package pkg, File apkFile, int parseFlags)
+ private static void collectCertificates(Package pkg, File apkFile, int apkFlags, int parseFlags)
throws PackageParserException {
- final boolean requireCode = ((parseFlags & PARSE_ENFORCE_CODE) != 0)
- && ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0);
+ final boolean hasCode = (apkFlags & ApplicationInfo.FLAG_HAS_CODE) != 0;
+ final boolean requireCode = ((parseFlags & PARSE_ENFORCE_CODE) != 0) && hasCode;
final String apkPath = apkFile.getAbsolutePath();
final boolean skipVerification = Build.IS_DEBUGGABLE
&& ((parseFlags & PARSE_SKIP_VERIFICATION) != 0);
@@ -1216,7 +1218,8 @@
// TODO: factor signature related items out of Package object
final Package tempPkg = new Package(null);
// TODO: fix b/25118622; pass in '0' for parse flags
- collectCertificates(tempPkg, apkFile, flags & PARSE_SKIP_VERIFICATION);
+ collectCertificates(tempPkg, apkFile, 0 /*apkFlags*/,
+ flags & PARSE_SKIP_VERIFICATION);
signatures = tempPkg.mSignatures;
} else {
signatures = null;
@@ -3262,6 +3265,11 @@
owner.applicationInfo.isEncryptionAware());
}
+ if (a.info.encryptionAware) {
+ owner.applicationInfo.privateFlags |=
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE;
+ }
+
sa.recycle();
if (receiver && (owner.applicationInfo.privateFlags
@@ -3663,6 +3671,10 @@
p.info.encryptionAware = sa.getBoolean(
R.styleable.AndroidManifestProvider_encryptionAware,
owner.applicationInfo.isEncryptionAware());
+ if (p.info.encryptionAware) {
+ owner.applicationInfo.privateFlags |=
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE;
+ }
sa.recycle();
@@ -3947,6 +3959,10 @@
s.info.encryptionAware = sa.getBoolean(
R.styleable.AndroidManifestService_encryptionAware,
owner.applicationInfo.isEncryptionAware());
+ if (s.info.encryptionAware) {
+ owner.applicationInfo.privateFlags |=
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE;
+ }
sa.recycle();
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 0606e35..7b3dde4 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -48,7 +48,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Trace;
-import android.util.ArrayMap;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.LocaleList;
@@ -68,7 +67,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.lang.ref.WeakReference;
import java.util.Locale;
/**
@@ -120,9 +118,6 @@
private static final LongSparseArray<android.content.res.ConstantState<ColorStateList>>
sPreloadedColorStateLists = new LongSparseArray<>();
- private static final String CACHE_NOT_THEMED = "";
- private static final String CACHE_NULL_THEME = "null_theme";
-
// Pool of TypedArrays targeted to this Resources object.
final SynchronizedPool<TypedArray> mTypedArrayPool = new SynchronizedPool<>(5);
@@ -130,10 +125,11 @@
static Resources mSystem = null;
private static boolean sPreloaded;
- private static int sPreloadedDensity;
+
+ /** Lock object used to protect access to caches and configuration. */
+ private final Object mAccessLock = new Object();
// These are protected by mAccessLock.
- private final Object mAccessLock = new Object();
private final Configuration mTmpConfig = new Configuration();
private final DrawableCache mDrawableCache = new DrawableCache(this);
private final DrawableCache mColorDrawableCache = new DrawableCache(this);
@@ -147,7 +143,12 @@
/** Used to inflate drawable objects from XML. */
private DrawableInflater mDrawableInflater;
+ /** Lock object used to protect access to {@link #mTmpValue}. */
+ private final Object mTmpValueLock = new Object();
+
+ /** Single-item pool used to minimize TypedValue allocations. */
private TypedValue mTmpValue = new TypedValue();
+
private boolean mPreloading;
private int mLastCachedXmlBlockIndex = -1;
@@ -249,6 +250,10 @@
public NotFoundException(String name) {
super(name);
}
+
+ public NotFoundException(String name, Exception cause) {
+ super(name, cause);
+ }
}
/**
@@ -621,18 +626,15 @@
* @see #getDimensionPixelSize
*/
public float getDimension(@DimenRes int id) throws NotFoundException {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type == TypedValue.TYPE_DIMENSION) {
return TypedValue.complexToDimension(value.data, mMetrics);
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -656,19 +658,15 @@
* @see #getDimensionPixelSize
*/
public int getDimensionPixelOffset(@DimenRes int id) throws NotFoundException {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type == TypedValue.TYPE_DIMENSION) {
- return TypedValue.complexToDimensionPixelOffset(
- value.data, mMetrics);
+ return TypedValue.complexToDimensionPixelOffset(value.data, mMetrics);
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -693,19 +691,15 @@
* @see #getDimensionPixelOffset
*/
public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type == TypedValue.TYPE_DIMENSION) {
- return TypedValue.complexToDimensionPixelSize(
- value.data, mMetrics);
+ return TypedValue.complexToDimensionPixelSize(value.data, mMetrics);
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -727,18 +721,15 @@
* @throws NotFoundException Throws NotFoundException if the given ID does not exist.
*/
public float getFraction(@FractionRes int id, int base, int pbase) {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type == TypedValue.TYPE_FRACTION) {
return TypedValue.complexToFraction(value.data, base, pbase);
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -801,24 +792,14 @@
* not exist.
*/
@Nullable
- public Drawable getDrawable(@DrawableRes int id, @Nullable Theme theme) throws NotFoundException {
- TypedValue value;
- synchronized (mAccessLock) {
- value = mTmpValue;
- if (value == null) {
- value = new TypedValue();
- } else {
- mTmpValue = null;
- }
- getValue(id, value, true);
+ public Drawable getDrawable(@DrawableRes int id, @Nullable Theme theme)
+ throws NotFoundException {
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
+ return loadDrawable(value, id, theme);
+ } finally {
+ releaseTempTypedValue(value);
}
- final Drawable res = loadDrawable(value, id, theme);
- synchronized (mAccessLock) {
- if (mTmpValue == null) {
- mTmpValue = value;
- }
- }
- return res;
}
/**
@@ -849,7 +830,8 @@
*/
@Deprecated
@Nullable
- public Drawable getDrawableForDensity(@DrawableRes int id, int density) throws NotFoundException {
+ public Drawable getDrawableForDensity(@DrawableRes int id, int density)
+ throws NotFoundException {
return getDrawableForDensity(id, density, null);
}
@@ -869,14 +851,8 @@
*/
@Nullable
public Drawable getDrawableForDensity(@DrawableRes int id, int density, @Nullable Theme theme) {
- TypedValue value;
- synchronized (mAccessLock) {
- value = mTmpValue;
- if (value == null) {
- value = new TypedValue();
- } else {
- mTmpValue = null;
- }
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
getValueForDensity(id, density, value, true);
/*
@@ -893,15 +869,11 @@
value.density = (value.density * mMetrics.densityDpi) / density;
}
}
- }
- final Drawable res = loadDrawable(value, id, theme);
- synchronized (mAccessLock) {
- if (mTmpValue == null) {
- mTmpValue = value;
- }
+ return loadDrawable(value, id, theme);
+ } finally {
+ releaseTempTypedValue(value);
}
- return res;
}
/**
@@ -963,33 +935,21 @@
*/
@ColorInt
public int getColor(@ColorRes int id, @Nullable Theme theme) throws NotFoundException {
- TypedValue value;
- synchronized (mAccessLock) {
- value = mTmpValue;
- if (value == null) {
- value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type >= TypedValue.TYPE_FIRST_INT
&& value.type <= TypedValue.TYPE_LAST_INT) {
- mTmpValue = value;
return value.data;
} else if (value.type != TypedValue.TYPE_STRING) {
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
}
- mTmpValue = null;
- }
- final ColorStateList csl = loadColorStateList(value, id, theme);
- synchronized (mAccessLock) {
- if (mTmpValue == null) {
- mTmpValue = value;
- }
+ final ColorStateList csl = loadColorStateList(value, id, theme);
+ return csl.getDefaultColor();
+ } finally {
+ releaseTempTypedValue(value);
}
-
- return csl.getDefaultColor();
}
/**
@@ -1043,25 +1003,12 @@
@Nullable
public ColorStateList getColorStateList(@ColorRes int id, @Nullable Theme theme)
throws NotFoundException {
- TypedValue value;
- synchronized (mAccessLock) {
- value = mTmpValue;
- if (value == null) {
- value = new TypedValue();
- } else {
- mTmpValue = null;
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
+ return loadColorStateList(value, id, theme);
+ } finally {
+ releaseTempTypedValue(value);
}
-
- final ColorStateList res = loadColorStateList(value, id, theme);
- synchronized (mAccessLock) {
- if (mTmpValue == null) {
- mTmpValue = value;
- }
- }
-
- return res;
}
/**
@@ -1078,19 +1025,16 @@
* @return Returns the boolean value contained in the resource.
*/
public boolean getBoolean(@BoolRes int id) throws NotFoundException {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type >= TypedValue.TYPE_FIRST_INT
- && value.type <= TypedValue.TYPE_LAST_INT) {
+ && value.type <= TypedValue.TYPE_LAST_INT) {
return value.data != 0;
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -1106,19 +1050,16 @@
* @return Returns the integer value contained in the resource.
*/
public int getInteger(@IntegerRes int id) throws NotFoundException {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type >= TypedValue.TYPE_FIRST_INT
- && value.type <= TypedValue.TYPE_LAST_INT) {
+ && value.type <= TypedValue.TYPE_LAST_INT) {
return value.data;
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -1136,17 +1077,15 @@
* @hide Pending API council approval.
*/
public float getFloat(int id) {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type == TypedValue.TYPE_FLOAT) {
return value.getFloat();
}
- throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
@@ -1238,22 +1177,60 @@
*
*/
public InputStream openRawResource(@RawRes int id) throws NotFoundException {
- TypedValue value;
- synchronized (mAccessLock) {
- value = mTmpValue;
- if (value == null) {
- value = new TypedValue();
- } else {
+ final TypedValue value = obtainTempTypedValue();
+ try {
+ return openRawResource(id, value);
+ } finally {
+ releaseTempTypedValue(value);
+ }
+ }
+
+ /**
+ * Returns a TypedValue populated with data for the specified resource ID
+ * that's suitable for temporary use. The obtained TypedValue should be
+ * released using {@link #releaseTempTypedValue(TypedValue)}.
+ *
+ * @param id the resource ID for which data should be obtained
+ * @return a populated typed value suitable for temporary use
+ */
+ private TypedValue obtainTempTypedValue(@AnyRes int id) {
+ final TypedValue value = obtainTempTypedValue();
+ getValue(id, value, true);
+ return value;
+ }
+
+ /**
+ * Returns a TypedValue suitable for temporary use. The obtained TypedValue
+ * should be released using {@link #releaseTempTypedValue(TypedValue)}.
+ *
+ * @return a typed value suitable for temporary use
+ */
+ private TypedValue obtainTempTypedValue() {
+ TypedValue tmpValue = null;
+ synchronized (mTmpValueLock) {
+ if (mTmpValue != null) {
+ tmpValue = mTmpValue;
mTmpValue = null;
}
}
- InputStream res = openRawResource(id, value);
- synchronized (mAccessLock) {
+ if (tmpValue == null) {
+ return new TypedValue();
+ }
+ return tmpValue;
+ }
+
+ /**
+ * Returns a TypedValue to the pool. After calling this method, the
+ * specified TypedValue should no longer be accessed.
+ *
+ * @param value the typed value to return to the pool
+ */
+ private void releaseTempTypedValue(TypedValue value) {
+ synchronized (mTmpValueLock) {
if (mTmpValue == null) {
mTmpValue = value;
}
}
- return res;
}
/**
@@ -1307,32 +1284,14 @@
*/
public AssetFileDescriptor openRawResourceFd(@RawRes int id)
throws NotFoundException {
- TypedValue value;
- synchronized (mAccessLock) {
- value = mTmpValue;
- if (value == null) {
- value = new TypedValue();
- } else {
- mTmpValue = null;
- }
- getValue(id, value, true);
- }
+ final TypedValue value = obtainTempTypedValue(id);
try {
- return mAssets.openNonAssetFd(
- value.assetCookie, value.string.toString());
+ return mAssets.openNonAssetFd(value.assetCookie, value.string.toString());
} catch (Exception e) {
- NotFoundException rnf = new NotFoundException(
- "File " + value.string.toString()
- + " from drawable resource ID #0x"
- + Integer.toHexString(id));
- rnf.initCause(e);
- throw rnf;
+ throw new NotFoundException("File " + value.string.toString() + " from drawable "
+ + "resource ID #0x" + Integer.toHexString(id), e);
} finally {
- synchronized (mAccessLock) {
- if (mTmpValue == null) {
- mTmpValue = value;
- }
- }
+ releaseTempTypedValue(value);
}
}
@@ -2015,8 +1974,8 @@
Build.VERSION.RESOURCES_SDK_INT);
if (DEBUG_CONFIG) {
- Slog.i(TAG, "**** Updating config of " + this + ": final config is " + mConfiguration
- + " final compat is " + mCompatibilityInfo);
+ Slog.i(TAG, "**** Updating config of " + this + ": final config is "
+ + mConfiguration + " final compat is " + mCompatibilityInfo);
}
mDrawableCache.onConfigurationChange(configChanges);
@@ -2402,8 +2361,7 @@
}
sPreloaded = true;
mPreloading = true;
- sPreloadedDensity = DisplayMetrics.DENSITY_DEVICE;
- mConfiguration.densityDpi = sPreloadedDensity;
+ mConfiguration.densityDpi = DisplayMetrics.DENSITY_DEVICE;
updateConfiguration(null, null);
}
}
@@ -2740,19 +2698,16 @@
/*package*/ XmlResourceParser loadXmlResourceParser(int id, String type)
throws NotFoundException {
- synchronized (mAccessLock) {
- TypedValue value = mTmpValue;
- if (value == null) {
- mTmpValue = value = new TypedValue();
- }
- getValue(id, value, true);
+ final TypedValue value = obtainTempTypedValue(id);
+ try {
if (value.type == TypedValue.TYPE_STRING) {
return loadXmlResourceParser(value.string.toString(), id,
value.assetCookie, type);
}
- throw new NotFoundException(
- "Resource ID #0x" + Integer.toHexString(id) + " type #0x"
- + Integer.toHexString(value.type) + " is not valid");
+ throw new NotFoundException("Resource ID #0x" + Integer.toHexString(id)
+ + " type #0x" + Integer.toHexString(value.type) + " is not valid");
+ } finally {
+ releaseTempTypedValue(value);
}
}
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index a2ef078..6fc998f 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -2178,11 +2178,18 @@
* (8-14 bits is expected), or by the point where the sensor response
* becomes too non-linear to be useful. The default value for this is
* maximum representable value for a 16-bit raw sample (2^16 - 1).</p>
+ * <p>The white level values of captured images may vary for different
+ * capture settings (e.g., {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}). This key
+ * represents a coarse approximation for such case. It is recommended
+ * to use {@link CaptureResult#SENSOR_DYNAMIC_WHITE_LEVEL android.sensor.dynamicWhiteLevel} for captures when supported
+ * by the camera device, which provides more accurate white level values.</p>
* <p><b>Range of valid values:</b><br>
* > 255 (8-bit output)</p>
* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
*
* @see CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN
+ * @see CaptureResult#SENSOR_DYNAMIC_WHITE_LEVEL
+ * @see CaptureRequest#SENSOR_SENSITIVITY
*/
@PublicKey
public static final Key<Integer> SENSOR_INFO_WHITE_LEVEL =
@@ -2520,12 +2527,24 @@
* layout key (see {@link CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT android.sensor.info.colorFilterArrangement}), i.e. the
* nth value given corresponds to the black level offset for the nth
* color channel listed in the CFA.</p>
+ * <p>The black level values of captured images may vary for different
+ * capture settings (e.g., {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}). This key
+ * represents a coarse approximation for such case. It is recommended to
+ * use {@link CaptureResult#SENSOR_DYNAMIC_BLACK_LEVEL android.sensor.dynamicBlackLevel} or use pixels from
+ * {@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions} directly for captures when
+ * supported by the camera device, which provides more accurate black
+ * level values. For raw capture in particular, it is recommended to use
+ * pixels from {@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions} to calculate black
+ * level values for each frame.</p>
* <p><b>Range of valid values:</b><br>
* >= 0 for each.</p>
* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
*
+ * @see CaptureResult#SENSOR_DYNAMIC_BLACK_LEVEL
* @see CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
* @see CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL
+ * @see CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS
+ * @see CaptureRequest#SENSOR_SENSITIVITY
*/
@PublicKey
public static final Key<android.hardware.camera2.params.BlackLevelPattern> SENSOR_BLACK_LEVEL_PATTERN =
@@ -2580,6 +2599,32 @@
new Key<int[]>("android.sensor.availableTestPatternModes", int[].class);
/**
+ * <p>List of disjoint rectangles indicating the sensor
+ * optically shielded black pixel regions.</p>
+ * <p>In most camera sensors, the active array is surrounded by some
+ * optically shielded pixel areas. By blocking light, these pixels
+ * provides a reliable black reference for black level compensation
+ * in active array region.</p>
+ * <p>This key provides a list of disjoint rectangles specifying the
+ * regions of optically shielded (with metal shield) black pixel
+ * regions if the camera device is capable of reading out these black
+ * pixels in the output raw images. In comparison to the fixed black
+ * level values reported by {@link CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN android.sensor.blackLevelPattern}, this key
+ * may provide a more accurate way for the application to calculate
+ * black level of each captured raw images.</p>
+ * <p>When this key is reported, the {@link CaptureResult#SENSOR_DYNAMIC_BLACK_LEVEL android.sensor.dynamicBlackLevel} and
+ * {@link CaptureResult#SENSOR_DYNAMIC_WHITE_LEVEL android.sensor.dynamicWhiteLevel} will also be reported.</p>
+ * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
+ *
+ * @see CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN
+ * @see CaptureResult#SENSOR_DYNAMIC_BLACK_LEVEL
+ * @see CaptureResult#SENSOR_DYNAMIC_WHITE_LEVEL
+ */
+ @PublicKey
+ public static final Key<android.graphics.Rect[]> SENSOR_OPTICAL_BLACK_REGIONS =
+ new Key<android.graphics.Rect[]>("android.sensor.opticalBlackRegions", android.graphics.Rect[].class);
+
+ /**
* <p>List of lens shading modes for {@link CaptureRequest#SHADING_MODE android.shading.mode} that are supported by this camera device.</p>
* <p>This list contains lens shading modes that can be set for the camera device.
* Camera devices that support the MANUAL_POST_PROCESSING capability will always
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index b3acf2b..3c2d503 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -3292,6 +3292,69 @@
new Key<Long>("android.sensor.rollingShutterSkew", long.class);
/**
+ * <p>A per-frame dynamic black level offset for each of the color filter
+ * arrangement (CFA) mosaic channels.</p>
+ * <p>Camera sensor black levels may vary dramatically for different
+ * capture settings (e.g. {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}). The fixed black
+ * level reported by {@link CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN android.sensor.blackLevelPattern} may be too
+ * inaccurate to represent the actual value on a per-frame basis. The
+ * camera device internal pipeline relies on reliable black level values
+ * to process the raw images appropriately. To get the best image
+ * quality, the camera device may choose to estimate the per frame black
+ * level values either based on optically shielded black regions
+ * ({@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions}) or its internal model.</p>
+ * <p>This key reports the camera device estimated per-frame zero light
+ * value for each of the CFA mosaic channels in the camera sensor. The
+ * {@link CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN android.sensor.blackLevelPattern} may only represent a coarse
+ * approximation of the actual black level values. This value is the
+ * black level used in camera device internal image processing pipeline
+ * and generally more accurate than the fixed black level values.
+ * However, since they are estimated values by the camera device, they
+ * may not be as accurate as the black level values calculated from the
+ * optical black pixels reported by {@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions}.</p>
+ * <p>The values are given in the same order as channels listed for the CFA
+ * layout key (see {@link CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT android.sensor.info.colorFilterArrangement}), i.e. the
+ * nth value given corresponds to the black level offset for the nth
+ * color channel listed in the CFA.</p>
+ * <p>This key will be available if {@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions} is
+ * available or the camera device advertises this key via
+ * {@link android.hardware.camera2.CameraCharacteristics#getAvailableCaptureRequestKeys }.</p>
+ * <p><b>Range of valid values:</b><br>
+ * >= 0 for each.</p>
+ * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
+ *
+ * @see CameraCharacteristics#SENSOR_BLACK_LEVEL_PATTERN
+ * @see CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
+ * @see CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS
+ * @see CaptureRequest#SENSOR_SENSITIVITY
+ */
+ @PublicKey
+ public static final Key<float[]> SENSOR_DYNAMIC_BLACK_LEVEL =
+ new Key<float[]>("android.sensor.dynamicBlackLevel", float[].class);
+
+ /**
+ * <p>Maximum raw value output by sensor for this frame.</p>
+ * <p>Since the android.sensor.blackLevel may change for different
+ * capture settings (e.g., {@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}), the white
+ * level will change accordingly. This key is similar to
+ * {@link CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL android.sensor.info.whiteLevel}, but specifies the camera device
+ * estimated white level for each frame.</p>
+ * <p>This key will be available if {@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions} is
+ * available or the camera device advertises this key via
+ * {@link android.hardware.camera2.CameraCharacteristics#getAvailableCaptureRequestKeys }.</p>
+ * <p><b>Range of valid values:</b><br>
+ * >= 0</p>
+ * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
+ *
+ * @see CameraCharacteristics#SENSOR_INFO_WHITE_LEVEL
+ * @see CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS
+ * @see CaptureRequest#SENSOR_SENSITIVITY
+ */
+ @PublicKey
+ public static final Key<Integer> SENSOR_DYNAMIC_WHITE_LEVEL =
+ new Key<Integer>("android.sensor.dynamicWhiteLevel", int.class);
+
+ /**
* <p>Quality of lens shading correction applied
* to the image data.</p>
* <p>When set to OFF mode, no lens shading correction will be applied by the
diff --git a/core/java/android/hardware/input/InputManagerInternal.java b/core/java/android/hardware/input/InputManagerInternal.java
index 6a392dd..014e73f 100644
--- a/core/java/android/hardware/input/InputManagerInternal.java
+++ b/core/java/android/hardware/input/InputManagerInternal.java
@@ -16,8 +16,11 @@
package android.hardware.input;
+import android.annotation.Nullable;
import android.hardware.display.DisplayViewport;
import android.view.InputEvent;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodSubtype;
/**
* Input manager local system service interface.
@@ -39,4 +42,14 @@
* watching for wake events.
*/
public abstract void setInteractive(boolean interactive);
+
+ /**
+ * Notifies that InputMethodManagerService switched the current input method subtype.
+ *
+ * @param userId user id that indicates who is using the specified input method and subtype.
+ * @param inputMethodInfo {@code null} when no input method is selected.
+ * @param subtype {@code null} when {@code inputMethodInfo} does has no subtype.
+ */
+ public abstract void onInputMethodSubtypeChanged(int userId,
+ @Nullable InputMethodInfo inputMethodInfo, @Nullable InputMethodSubtype subtype);
}
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index ad9058f..515e9a2 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1028,13 +1028,25 @@
* Guess what the network request was trying to say so that the resulting
* network is accessible via the legacy (deprecated) API such as
* requestRouteToHost.
- * This means we should try to be fairly preceise about transport and
+ *
+ * This means we should try to be fairly precise about transport and
* capability but ignore things such as networkSpecifier.
* If the request has more than one transport or capability it doesn't
* match the old legacy requests (they selected only single transport/capability)
* so this function cannot map the request to a single legacy type and
* the resulting network will not be available to the legacy APIs.
*
+ * This code is only called from the requestNetwork API (L and above).
+ *
+ * Setting a legacy type causes CONNECTIVITY_ACTION broadcasts, which are expensive
+ * because they wake up lots of apps - see http://b/23350688 . So we currently only
+ * do this for SUPL requests, which are the only ones that we know need it. If
+ * omitting these broadcasts causes unacceptable app breakage, then for backwards
+ * compatibility we can send them:
+ *
+ * if (targetSdkVersion < Build.VERSION_CODES.M) && // legacy API unsupported >= M
+ * targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP)) // requestNetwork not present < L
+ *
* TODO - This should be removed when the legacy APIs are removed.
*/
private int inferLegacyTypeForNetworkCapabilities(NetworkCapabilities netCap) {
@@ -1046,6 +1058,14 @@
return TYPE_NONE;
}
+ // Do this only for SUPL, until GpsLocationProvider is fixed. http://b/25876485 .
+ if (!netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) {
+ // NOTE: if this causes app breakage, we should not just comment out this early return;
+ // instead, we should make this early return conditional on the requesting app's target
+ // SDK version, as described in the comment above.
+ return TYPE_NONE;
+ }
+
String type = null;
int result = TYPE_NONE;
@@ -1062,7 +1082,7 @@
type = "enableDUN";
result = TYPE_MOBILE_DUN;
} else if (netCap.hasCapability(NetworkCapabilities.NET_CAPABILITY_SUPL)) {
- type = "enableSUPL";
+ type = "enableSUPL";
result = TYPE_MOBILE_SUPL;
// back out this hack for mms as they no longer need this and it's causing
// device slowdowns - b/23350688 (note, supl still needs this)
@@ -2484,6 +2504,23 @@
}
/**
+ * Helper function to requests a network with a particular legacy type.
+ *
+ * This is temporarily public @hide so it can be called by system code that uses the
+ * NetworkRequest API to request networks but relies on CONNECTIVITY_ACTION broadcasts for
+ * instead network notifications.
+ *
+ * TODO: update said system code to rely on NetworkCallbacks and make this method private.
+ *
+ * @hide
+ */
+ public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
+ int timeoutMs, int legacyType) {
+ sendRequestForNetwork(request.networkCapabilities, networkCallback, timeoutMs, REQUEST,
+ legacyType);
+ }
+
+ /**
* Request a network to satisfy a set of {@link android.net.NetworkCapabilities}.
*
* This {@link NetworkRequest} will live until released via
@@ -2513,8 +2550,8 @@
* {@code NetworkCapabilities}.
*/
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback) {
- sendRequestForNetwork(request.networkCapabilities, networkCallback, 0,
- REQUEST, inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));
+ requestNetwork(request, networkCallback, 0,
+ inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));
}
/**
@@ -2524,7 +2561,7 @@
* This function behaves identically to the non-timedout version, but if a suitable
* network is not found within the given time (in milliseconds) the
* {@link NetworkCallback#unavailable} callback is called. The request must
- * still be released normally by calling {@link releaseNetworkRequest}.
+ * still be released normally by calling {@link unregisterNetworkCallback}.
*
* <p>This method requires the caller to hold either the
* {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission
@@ -2537,12 +2574,15 @@
* this request.
* @param timeoutMs The time in milliseconds to attempt looking for a suitable network
* before {@link NetworkCallback#unavailable} is called.
+ *
+ * TODO: Make timeouts work and then unhide this method.
+ *
* @hide
*/
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs) {
- sendRequestForNetwork(request.networkCapabilities, networkCallback, timeoutMs,
- REQUEST, inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));
+ requestNetwork(request, networkCallback, timeoutMs,
+ inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));
}
/**
diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java
index 5b60c0d..2715af0 100644
--- a/core/java/android/net/http/SslCertificate.java
+++ b/core/java/android/net/http/SslCertificate.java
@@ -16,6 +16,8 @@
package android.net.http;
+import com.android.internal.util.HexDump;
+
import android.content.Context;
import android.os.Bundle;
import android.text.format.DateFormat;
@@ -285,7 +287,7 @@
StringBuilder sb = new StringBuilder();
for (int i = 0; i < bytes.length; i++) {
byte b = bytes[i];
- IntegralToString.appendByteAsHex(sb, b, true);
+ HexDump.appendByteAsHex(sb, b, true);
if (i+1 != bytes.length) {
sb.append(':');
}
diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java
index 521df28..63f39c5 100644
--- a/core/java/android/os/AsyncTask.java
+++ b/core/java/android/os/AsyncTask.java
@@ -181,9 +181,12 @@
private static final String LOG_TAG = "AsyncTask";
private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
- private static final int CORE_POOL_SIZE = CPU_COUNT + 1;
+ // We want at least 2 threads and at most 4 threads in the core pool,
+ // preferring to have 1 less than the CPU count to avoid saturating
+ // the CPU with background work
+ private static final int CORE_POOL_SIZE = Math.max(2, Math.min(CPU_COUNT - 1, 4));
private static final int MAXIMUM_POOL_SIZE = CPU_COUNT * 2 + 1;
- private static final int KEEP_ALIVE = 1;
+ private static final int KEEP_ALIVE_SECONDS = 30;
private static final ThreadFactory sThreadFactory = new ThreadFactory() {
private final AtomicInteger mCount = new AtomicInteger(1);
@@ -199,9 +202,15 @@
/**
* An {@link Executor} that can be used to execute tasks in parallel.
*/
- public static final Executor THREAD_POOL_EXECUTOR
- = new ThreadPoolExecutor(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,
- TimeUnit.SECONDS, sPoolWorkQueue, sThreadFactory);
+ public static final Executor THREAD_POOL_EXECUTOR;
+
+ static {
+ ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(
+ CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE_SECONDS, TimeUnit.SECONDS,
+ sPoolWorkQueue, sThreadFactory);
+ threadPoolExecutor.allowCoreThreadTimeOut(true);
+ THREAD_POOL_EXECUTOR = threadPoolExecutor;
+ }
/**
* An {@link Executor} that executes tasks one at a time in serial
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 1aa5c66..bce38f4 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -169,7 +169,7 @@
/**
* Current version of checkin data format.
*/
- static final String CHECKIN_VERSION = "16";
+ static final String CHECKIN_VERSION = "17";
/**
* Old version, we hit 9 and ran out of room, need to remove.
@@ -407,17 +407,23 @@
public abstract Timer getCameraTurnedOnTimer();
public abstract Timer getForegroundActivityTimer();
- // Time this uid has any processes in foreground state.
- public static final int PROCESS_STATE_FOREGROUND = 0;
- // Time this uid has any process in active state (not cached).
- public static final int PROCESS_STATE_ACTIVE = 1;
+ // Time this uid has any processes in the top state.
+ public static final int PROCESS_STATE_TOP = 0;
+ // Time this uid has any process with a started out bound foreground service.
+ public static final int PROCESS_STATE_FOREGROUND_SERVICE = 1;
+ // Time this uid has any process that is top while the device is sleeping.
+ public static final int PROCESS_STATE_TOP_SLEEPING = 2;
+ // Time this uid has any process in an active foreground state.
+ public static final int PROCESS_STATE_FOREGROUND = 3;
+ // Time this uid has any process in an active background state.
+ public static final int PROCESS_STATE_BACKGROUND = 4;
// Time this uid has any processes running at all.
- public static final int PROCESS_STATE_RUNNING = 2;
+ public static final int PROCESS_STATE_CACHED = 5;
// Total number of process states we track.
- public static final int NUM_PROCESS_STATE = 3;
+ public static final int NUM_PROCESS_STATE = 6;
static final String[] PROCESS_STATE_NAMES = {
- "Foreground", "Active", "Running"
+ "Top", "Fg Service", "Top Sleeping", "Foreground", "Background", "Cached"
};
public abstract long getProcessStateTime(int state, long elapsedRealtimeUs, int which);
@@ -2954,8 +2960,9 @@
final Object[] stateTimes = new Object[Uid.NUM_PROCESS_STATE];
long totalStateTime = 0;
for (int ips=0; ips<Uid.NUM_PROCESS_STATE; ips++) {
- totalStateTime += u.getProcessStateTime(ips, rawRealtime, which);
- stateTimes[ips] = (totalStateTime + 500) / 1000;
+ final long time = u.getProcessStateTime(ips, rawRealtime, which);
+ totalStateTime += time;
+ stateTimes[ips] = (time + 500) / 1000;
}
if (totalStateTime > 0) {
dumpLine(pw, uid, category, STATE_TIME_DATA, stateTimes);
@@ -4122,11 +4129,18 @@
sb.append(" ");
sb.append(Uid.PROCESS_STATE_NAMES[ips]);
sb.append(" for: ");
- formatTimeMs(sb, (totalStateTime + 500) / 1000);
+ formatTimeMs(sb, (time + 500) / 1000);
pw.println(sb.toString());
uidActivity = true;
}
}
+ if (totalStateTime > 0) {
+ sb.setLength(0);
+ sb.append(prefix);
+ sb.append(" Total running: ");
+ formatTimeMs(sb, (totalStateTime + 500) / 1000);
+ pw.println(sb.toString());
+ }
final long userCpuTimeUs = u.getUserCpuTimeUs(which);
final long systemCpuTimeUs = u.getSystemCpuTimeUs(which);
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index f7c8662..de8b690 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -788,6 +788,18 @@
SystemProperties.getInt("ro.debuggable", 0) == 1;
/**
+ * Specifies whether the permissions needed by a legacy app should be
+ * reviewed before any of its components can run. A legacy app is one
+ * with targetSdkVersion < 23, i.e apps using the old permission model.
+ * If review is not required, permissions are reviewed before the app
+ * is installed.
+ *
+ * @hide
+ */
+ public static final boolean PERMISSIONS_REVIEW_REQUIRED =
+ SystemProperties.getInt("ro.permission_review_required", 0) == 1;
+
+ /**
* Returns the version string for the radio firmware. May return
* null (if, for instance, the radio is not currently on).
*/
diff --git a/core/java/android/os/IDeviceIdleController.aidl b/core/java/android/os/IDeviceIdleController.aidl
index f55883a..7a1a6a2 100644
--- a/core/java/android/os/IDeviceIdleController.aidl
+++ b/core/java/android/os/IDeviceIdleController.aidl
@@ -35,4 +35,6 @@
long addPowerSaveTempWhitelistAppForMms(String name, int userId, String reason);
long addPowerSaveTempWhitelistAppForSms(String name, int userId, String reason);
void exitIdle(String reason);
+ void downloadServiceActive(IBinder token);
+ void downloadServiceInactive();
}
diff --git a/core/java/android/os/IProcessInfoService.aidl b/core/java/android/os/IProcessInfoService.aidl
index c98daa2..62237f5 100644
--- a/core/java/android/os/IProcessInfoService.aidl
+++ b/core/java/android/os/IProcessInfoService.aidl
@@ -25,5 +25,12 @@
* to indicate that no process with the given PID exists.
*/
void getProcessStatesFromPids(in int[] pids, out int[] states);
+
+ /**
+ * For each PID in the given input array, write the current process state and OOM score
+ * for that process into the output arrays, or ActivityManager.PROCESS_STATE_NONEXISTENT
+ * in the states array to indicate that no process with the given PID exists.
+ */
+ void getProcessStatesAndOomScoresFromPids(in int[] pids, out int[] states, out int[] scores);
}
diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl
index b5bbbbb..c71d6cc 100644
--- a/core/java/android/os/IUserManager.aidl
+++ b/core/java/android/os/IUserManager.aidl
@@ -56,7 +56,6 @@
Bundle getUserRestrictions(int userHandle);
boolean hasUserRestriction(in String restrictionKey, int userHandle);
void setUserRestriction(String key, boolean value, int userId);
- void setSystemControlledUserRestriction(String key, boolean value, int userId);
void setApplicationRestrictions(in String packageName, in Bundle restrictions,
int userHandle);
Bundle getApplicationRestrictions(in String packageName);
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 4ac361d0..54bfca3 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -632,9 +632,6 @@
if ((debugFlags & Zygote.DEBUG_ENABLE_CHECKJNI) != 0) {
argsForZygote.add("--enable-checkjni");
}
- if ((debugFlags & Zygote.DEBUG_ENABLE_JIT) != 0) {
- argsForZygote.add("--enable-jit");
- }
if ((debugFlags & Zygote.DEBUG_GENERATE_DEBUG_INFO) != 0) {
argsForZygote.add("--generate-debug-info");
}
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 4535572..407ff08 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -44,11 +44,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import org.apache.harmony.security.asn1.BerInputStream;
-import org.apache.harmony.security.pkcs7.ContentInfo;
-import org.apache.harmony.security.pkcs7.SignedData;
-import org.apache.harmony.security.pkcs7.SignerInfo;
-import org.apache.harmony.security.x509.Certificate;
+import sun.security.pkcs.PKCS7;
+import sun.security.pkcs.SignerInfo;
/**
* RecoverySystem contains methods for interacting with the Android
@@ -150,14 +147,13 @@
ProgressListener listener,
File deviceCertsZipFile)
throws IOException, GeneralSecurityException {
- long fileLen = packageFile.length();
+ final long fileLen = packageFile.length();
- RandomAccessFile raf = new RandomAccessFile(packageFile, "r");
+ final RandomAccessFile raf = new RandomAccessFile(packageFile, "r");
try {
- int lastPercent = 0;
- long lastPublishTime = System.currentTimeMillis();
+ final long startTimeMillis = System.currentTimeMillis();
if (listener != null) {
- listener.onProgress(lastPercent);
+ listener.onProgress(0);
}
raf.seek(fileLen - 6);
@@ -168,8 +164,8 @@
throw new SignatureException("no signature in file (no footer)");
}
- int commentSize = (footer[4] & 0xff) | ((footer[5] & 0xff) << 8);
- int signatureStart = (footer[0] & 0xff) | ((footer[1] & 0xff) << 8);
+ final int commentSize = (footer[4] & 0xff) | ((footer[5] & 0xff) << 8);
+ final int signatureStart = (footer[0] & 0xff) | ((footer[1] & 0xff) << 8);
byte[] eocd = new byte[commentSize + 22];
raf.seek(fileLen - (commentSize + 22));
@@ -189,51 +185,30 @@
}
}
- // The following code is largely copied from
- // JarUtils.verifySignature(). We could just *call* that
- // method here if that function didn't read the entire
- // input (ie, the whole OTA package) into memory just to
- // compute its message digest.
+ // Parse the signature
+ PKCS7 block =
+ new PKCS7(new ByteArrayInputStream(eocd, commentSize+22-signatureStart, signatureStart));
- BerInputStream bis = new BerInputStream(
- new ByteArrayInputStream(eocd, commentSize+22-signatureStart, signatureStart));
- ContentInfo info = (ContentInfo)ContentInfo.ASN1.decode(bis);
- SignedData signedData = info.getSignedData();
- if (signedData == null) {
- throw new IOException("signedData is null");
- }
- List<Certificate> encCerts = signedData.getCertificates();
- if (encCerts.isEmpty()) {
- throw new IOException("encCerts is empty");
- }
// Take the first certificate from the signature (packages
// should contain only one).
- Iterator<Certificate> it = encCerts.iterator();
- X509Certificate cert = null;
- if (it.hasNext()) {
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
- InputStream is = new ByteArrayInputStream(it.next().getEncoded());
- cert = (X509Certificate) cf.generateCertificate(is);
- } else {
+ X509Certificate[] certificates = block.getCertificates();
+ if (certificates == null || certificates.length == 0) {
throw new SignatureException("signature contains no certificates");
}
+ X509Certificate cert = certificates[0];
+ PublicKey signatureKey = cert.getPublicKey();
- List<SignerInfo> sigInfos = signedData.getSignerInfos();
- SignerInfo sigInfo;
- if (!sigInfos.isEmpty()) {
- sigInfo = (SignerInfo)sigInfos.get(0);
- } else {
- throw new IOException("no signer infos!");
+ SignerInfo[] signerInfos = block.getSignerInfos();
+ if (signerInfos == null || signerInfos.length == 0) {
+ throw new SignatureException("signature contains no signedData");
}
+ SignerInfo signerInfo = signerInfos[0];
// Check that the public key of the certificate contained
// in the package equals one of our trusted public keys.
-
+ boolean verified = false;
HashSet<X509Certificate> trusted = getTrustedCerts(
deviceCertsZipFile == null ? DEFAULT_KEYSTORE : deviceCertsZipFile);
-
- PublicKey signatureKey = cert.getPublicKey();
- boolean verified = false;
for (X509Certificate c : trusted) {
if (c.getPublicKey().equals(signatureKey)) {
verified = true;
@@ -246,61 +221,54 @@
// The signature cert matches a trusted key. Now verify that
// the digest in the cert matches the actual file data.
-
- // The verifier in recovery only handles SHA1withRSA and
- // SHA256withRSA signatures. SignApk chooses which to use
- // based on the signature algorithm of the cert:
- //
- // "SHA256withRSA" cert -> "SHA256withRSA" signature
- // "SHA1withRSA" cert -> "SHA1withRSA" signature
- // "MD5withRSA" cert -> "SHA1withRSA" signature (for backwards compatibility)
- // any other cert -> SignApk fails
- //
- // Here we ignore whatever the cert says, and instead use
- // whatever algorithm is used by the signature.
-
- String da = sigInfo.getDigestAlgorithm();
- String dea = sigInfo.getDigestEncryptionAlgorithm();
- String alg = null;
- if (da == null || dea == null) {
- // fall back to the cert algorithm if the sig one
- // doesn't look right.
- alg = cert.getSigAlgName();
- } else {
- alg = da + "with" + dea;
- }
- Signature sig = Signature.getInstance(alg);
- sig.initVerify(cert);
-
- // The signature covers all of the OTA package except the
- // archive comment and its 2-byte length.
- long toRead = fileLen - commentSize - 2;
- long soFar = 0;
raf.seek(0);
- byte[] buffer = new byte[4096];
- boolean interrupted = false;
- while (soFar < toRead) {
- interrupted = Thread.interrupted();
- if (interrupted) break;
- int size = buffer.length;
- if (soFar + size > toRead) {
- size = (int)(toRead - soFar);
- }
- int read = raf.read(buffer, 0, size);
- sig.update(buffer, 0, read);
- soFar += read;
+ final ProgressListener listenerForInner = listener;
+ SignerInfo verifyResult = block.verify(signerInfo, new InputStream() {
+ // The signature covers all of the OTA package except the
+ // archive comment and its 2-byte length.
+ long toRead = fileLen - commentSize - 2;
+ long soFar = 0;
- if (listener != null) {
- long now = System.currentTimeMillis();
- int p = (int)(soFar * 100 / toRead);
- if (p > lastPercent &&
- now - lastPublishTime > PUBLISH_PROGRESS_INTERVAL_MS) {
- lastPercent = p;
- lastPublishTime = now;
- listener.onProgress(lastPercent);
- }
+ int lastPercent = 0;
+ long lastPublishTime = startTimeMillis;
+
+ @Override
+ public int read() throws IOException {
+ throw new UnsupportedOperationException();
}
- }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException {
+ if (soFar >= toRead) {
+ return -1;
+ }
+ if (Thread.currentThread().isInterrupted()) {
+ return -1;
+ }
+
+ int size = len;
+ if (soFar + size > toRead) {
+ size = (int)(toRead - soFar);
+ }
+ int read = raf.read(b, off, size);
+ soFar += read;
+
+ if (listenerForInner != null) {
+ long now = System.currentTimeMillis();
+ int p = (int)(soFar * 100 / toRead);
+ if (p > lastPercent &&
+ now - lastPublishTime > PUBLISH_PROGRESS_INTERVAL_MS) {
+ lastPercent = p;
+ lastPublishTime = now;
+ listenerForInner.onProgress(lastPercent);
+ }
+ }
+
+ return read;
+ }
+ });
+
+ final boolean interrupted = Thread.interrupted();
if (listener != null) {
listener.onProgress(100);
}
@@ -309,7 +277,7 @@
throw new SignatureException("verification was interrupted");
}
- if (!sig.verify(sigInfo.getEncryptedDigest())) {
+ if (verifyResult == null) {
throw new SignatureException("signature digest verification failed");
}
} finally {
diff --git a/core/java/android/os/RemoteCallback.java b/core/java/android/os/RemoteCallback.java
index ca95bdf..89e30a9 100644
--- a/core/java/android/os/RemoteCallback.java
+++ b/core/java/android/os/RemoteCallback.java
@@ -16,88 +16,84 @@
package android.os;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+
/**
- * TODO: Make this a public API? Let's see how it goes with a few use
- * cases first.
* @hide
*/
-public abstract class RemoteCallback implements Parcelable {
- final Handler mHandler;
- final IRemoteCallback mTarget;
-
- class DeliverResult implements Runnable {
- final Bundle mResult;
-
- DeliverResult(Bundle result) {
- mResult = result;
- }
-
- public void run() {
- onResult(mResult);
- }
+public final class RemoteCallback implements Parcelable {
+
+ public interface OnResultListener {
+ public void onResult(Bundle result);
}
-
- class LocalCallback extends IRemoteCallback.Stub {
- public void sendResult(Bundle bundle) {
- mHandler.post(new DeliverResult(bundle));
- }
+
+ private final OnResultListener mListener;
+ private final Handler mHandler;
+ private final IRemoteCallback mCallback;
+
+ public RemoteCallback(OnResultListener listener) {
+ this(listener, null);
}
-
- static class RemoteCallbackProxy extends RemoteCallback {
- RemoteCallbackProxy(IRemoteCallback target) {
- super(target);
+
+ public RemoteCallback(@NonNull OnResultListener listener, @Nullable Handler handler) {
+ if (listener == null) {
+ throw new NullPointerException("listener cannot be null");
}
-
- protected void onResult(Bundle bundle) {
- }
- }
-
- public RemoteCallback(Handler handler) {
+ mListener = listener;
mHandler = handler;
- mTarget = new LocalCallback();
+ mCallback = new IRemoteCallback.Stub() {
+ @Override
+ public void sendResult(Bundle data) {
+ RemoteCallback.this.sendResult(data);
+ }
+ };
}
-
- RemoteCallback(IRemoteCallback target) {
+
+ RemoteCallback(Parcel parcel) {
+ mListener = null;
mHandler = null;
- mTarget = target;
+ mCallback = IRemoteCallback.Stub.asInterface(
+ parcel.readStrongBinder());
}
-
- public void sendResult(Bundle bundle) throws RemoteException {
- mTarget.sendResult(bundle);
- }
-
- protected abstract void onResult(Bundle bundle);
-
- public boolean equals(Object otherObj) {
- if (otherObj == null) {
- return false;
+
+ public void sendResult(@Nullable final Bundle result) {
+ // Do local dispatch
+ if (mListener != null) {
+ if (mHandler != null) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mListener.onResult(result);
+ }
+ });
+ } else {
+ mListener.onResult(result);
+ }
+ // Do remote dispatch
+ } else {
+ try {
+ mCallback.sendResult(result);
+ } catch (RemoteException e) {
+ /* ignore */
+ }
}
- try {
- return mTarget.asBinder().equals(((RemoteCallback)otherObj)
- .mTarget.asBinder());
- } catch (ClassCastException e) {
- }
- return false;
}
-
- public int hashCode() {
- return mTarget.asBinder().hashCode();
- }
-
+
+ @Override
public int describeContents() {
return 0;
}
- public void writeToParcel(Parcel out, int flags) {
- out.writeStrongBinder(mTarget.asBinder());
+ @Override
+ public void writeToParcel(Parcel parcel, int flags) {
+ parcel.writeStrongBinder(mCallback.asBinder());
}
public static final Parcelable.Creator<RemoteCallback> CREATOR
= new Parcelable.Creator<RemoteCallback>() {
- public RemoteCallback createFromParcel(Parcel in) {
- IBinder target = in.readStrongBinder();
- return target != null ? new RemoteCallbackProxy(
- IRemoteCallback.Stub.asInterface(target)) : null;
+ public RemoteCallback createFromParcel(Parcel parcel) {
+ return new RemoteCallback(parcel);
}
public RemoteCallback[] newArray(int size) {
diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java
index cad482b..6f12b62 100644
--- a/core/java/android/os/ShellCommand.java
+++ b/core/java/android/os/ShellCommand.java
@@ -48,19 +48,35 @@
private FastPrintWriter mErrPrintWriter;
private InputStream mInputStream;
- public int exec(Binder target, FileDescriptor in, FileDescriptor out, FileDescriptor err,
- String[] args, ResultReceiver resultReceiver) {
+ public void init(Binder target, FileDescriptor in, FileDescriptor out, FileDescriptor err,
+ String[] args, int firstArgPos) {
mTarget = target;
mIn = in;
mOut = out;
mErr = err;
mArgs = args;
- mResultReceiver = resultReceiver;
- mCmd = args != null && args.length > 0 ? args[0] : null;
- mArgPos = 1;
+ mResultReceiver = null;
+ mCmd = null;
+ mArgPos = firstArgPos;
mCurArgData = null;
mOutPrintWriter = null;
mErrPrintWriter = null;
+ }
+
+ public int exec(Binder target, FileDescriptor in, FileDescriptor out, FileDescriptor err,
+ String[] args, ResultReceiver resultReceiver) {
+ String cmd;
+ int start;
+ if (args != null && args.length > 0) {
+ cmd = args[0];
+ start = 1;
+ } else {
+ cmd = null;
+ start = 0;
+ }
+ init(target, in, out, err, args, start);
+ mCmd = cmd;
+ mResultReceiver = resultReceiver;
if (DEBUG) Slog.d(TAG, "Starting command " + mCmd + " on " + mTarget);
int res = -1;
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 95da438..f946ca7 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -256,6 +256,23 @@
}
}
+ /** @hide */
+ public static int parseUserArg(String arg) {
+ int userId;
+ if ("all".equals(arg)) {
+ userId = UserHandle.USER_ALL;
+ } else if ("current".equals(arg) || "cur".equals(arg)) {
+ userId = UserHandle.USER_CURRENT;
+ } else {
+ try {
+ userId = Integer.parseInt(arg);
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException("Bad user number: " + arg);
+ }
+ }
+ return userId;
+ }
+
/**
* Returns the user id of the current process
* @return user id of the current process
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 0a149bb..79390d4 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -487,6 +487,19 @@
public static final String DISALLOW_RECORD_AUDIO = "no_record_audio";
/**
+ * Specifies if a user is not allowed to run in the background and should be stopped during
+ * user switch. The default value is <code>false</code>.
+ *
+ * <p>This restriction can be set by device owners and profile owners.
+ *
+ * @see DevicePolicyManager#addUserRestriction(ComponentName, String)
+ * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
+ * @see #getUserRestrictions()
+ * @hide
+ */
+ public static final String DISALLOW_RUN_IN_BACKGROUND = "no_run_in_background";
+
+ /**
* Specifies if a user is not allowed to use the camera.
*
* @see DevicePolicyManager#addUserRestriction(ComponentName, String)
@@ -742,6 +755,23 @@
}
/**
+ * Return whether the given user is running in an "unlocked" state. A user
+ * is unlocked only after they've entered their credentials (such as a lock
+ * pattern or PIN), and credential-encrypted private app data storage is
+ * available.
+ *
+ * @param user to retrieve the unlocked state for.
+ */
+ public boolean isUserRunningUnlocked(UserHandle user) {
+ try {
+ return ActivityManagerNative.getDefault().isUserRunning(
+ user.getIdentifier(), ActivityManager.FLAG_AND_UNLOCKED);
+ } catch (RemoteException e) {
+ return false;
+ }
+ }
+
+ /**
* Returns the UserInfo object describing a specific user.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
* @param userHandle the user handle of the user whose information is being requested.
@@ -929,9 +959,6 @@
if (guest != null) {
Settings.Secure.putStringForUser(context.getContentResolver(),
Settings.Secure.SKIP_FIRST_USE_HINTS, "1", guest.id);
-
- mService.setUserRestriction(DISALLOW_SMS, true, guest.id);
- mService.setUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES, true, guest.id);
}
} catch (RemoteException re) {
Log.w(TAG, "Could not create a user", re);
diff --git a/core/java/android/os/UserManagerInternal.java b/core/java/android/os/UserManagerInternal.java
index 9178ec6..898b6cf 100644
--- a/core/java/android/os/UserManagerInternal.java
+++ b/core/java/android/os/UserManagerInternal.java
@@ -15,6 +15,9 @@
*/
package android.os;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+
/**
* @hide Only for use within the system server.
*/
@@ -31,32 +34,18 @@
}
/**
- * Lock that must be held when calling certain methods in this class.
+ * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService}
+ * to set per-user as well as global user restrictions.
*
- * This is used to avoid dead lock between
- * {@link com.android.server.pm.UserManagerService} and
- * {@link com.android.server.devicepolicy.DevicePolicyManagerService}. This lock should not
- * be newly taken while holding the DPMS lock, which would cause a dead lock. Take this
- * lock first before taking the DPMS lock to avoid that.
+ * @param userId target user id for the local restrictions.
+ * @param localRestrictions per-user restrictions.
+ * Caller must not change it once passed to this method.
+ * @param globalRestrictions global restrictions set by DO. Must be null when PO changed user
+ * restrictions, in which case global restrictions won't change.
+ * Caller must not change it once passed to this method.
*/
- public abstract Object getUserRestrictionsLock();
-
- /**
- * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService} to get
- * {@link com.android.server.pm.UserManagerService} to update effective user restrictions.
- *
- * Must be called while taking the {@link #getUserRestrictionsLock()} lock.
- */
- public abstract void updateEffectiveUserRestrictionsLR(int userId);
-
- /**
- * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService} to get
- * {@link com.android.server.pm.UserManagerService} to update effective user restrictions.
- *
- * Must be called while taking the {@link #getUserRestrictionsLock()} lock.
- */
- public abstract void updateEffectiveUserRestrictionsForAllUsersLR();
-
+ public abstract void setDevicePolicyUserRestrictions(int userId,
+ @NonNull Bundle localRestrictions, @Nullable Bundle globalRestrictions);
/**
* Returns the "base" user restrictions.
*
@@ -80,4 +69,16 @@
/** Remove a {@link UserRestrictionsListener}. */
public abstract void removeUserRestrictionsListener(UserRestrictionsListener listener);
+
+ /**
+ * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService} to update
+ * whether the device is managed by device owner.
+ */
+ public abstract void setDeviceManaged(boolean isManaged);
+
+ /**
+ * Called by {@link com.android.server.devicepolicy.DevicePolicyManagerService} to update
+ * whether the user is managed by profile owner.
+ */
+ public abstract void setUserManaged(int userId, boolean isManaged);
}
diff --git a/core/java/android/os/storage/IMountService.java b/core/java/android/os/storage/IMountService.java
index d19c7c9..c6510f0 100644
--- a/core/java/android/os/storage/IMountService.java
+++ b/core/java/android/os/storage/IMountService.java
@@ -21,8 +21,12 @@
import android.os.IBinder;
import android.os.IInterface;
import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.os.Parcelable;
import android.os.RemoteException;
+import java.io.FileDescriptor;
+
/**
* WARNING! Update IMountService.h and IMountService.cpp if you change this
* file. In particular, the ordering of the methods below must match the
@@ -1297,15 +1301,17 @@
}
@Override
- public boolean isPerUserEncryptionEnabled() throws RemoteException {
+ public ParcelFileDescriptor mountAppFuse(String name) throws RemoteException {
Parcel _data = Parcel.obtain();
Parcel _reply = Parcel.obtain();
- boolean _result;
+ ParcelFileDescriptor _result = null;
try {
_data.writeInterfaceToken(DESCRIPTOR);
- mRemote.transact(Stub.TRANSACTION_isPerUserEncryptionEnabled, _data, _reply, 0);
+ _data.writeString(name);
+ mRemote.transact(Stub.TRANSACTION_mountAppFuse, _data, _reply, 0);
_reply.readException();
- _result = 0 != _reply.readInt();
+ _result = _reply.<ParcelFileDescriptor>readParcelable(
+ ClassLoader.getSystemClassLoader());
} finally {
_reply.recycle();
_data.recycle();
@@ -1436,9 +1442,10 @@
static final int TRANSACTION_prepareUserStorage = IBinder.FIRST_CALL_TRANSACTION + 66;
- static final int TRANSACTION_isPerUserEncryptionEnabled = IBinder.FIRST_CALL_TRANSACTION + 67;
static final int TRANSACTION_isConvertibleToFBE = IBinder.FIRST_CALL_TRANSACTION + 68;
+ static final int TRANSACTION_mountAppFuse = IBinder.FIRST_CALL_TRANSACTION + 69;
+
/**
* Cast an IBinder object into an IMountService interface, generating a
* proxy if needed.
@@ -2049,11 +2056,12 @@
reply.writeNoException();
return true;
}
- case TRANSACTION_isPerUserEncryptionEnabled: {
+ case TRANSACTION_mountAppFuse: {
data.enforceInterface(DESCRIPTOR);
- boolean result = isPerUserEncryptionEnabled();
+ String name = data.readString();
+ ParcelFileDescriptor fd = mountAppFuse(name);
reply.writeNoException();
- reply.writeInt(result ? 1 : 0);
+ reply.writeParcelable(fd, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
return true;
}
}
@@ -2378,5 +2386,5 @@
public void prepareUserStorage(String volumeUuid, int userId, int serialNumber)
throws RemoteException;
- public boolean isPerUserEncryptionEnabled() throws RemoteException;
+ public ParcelFileDescriptor mountAppFuse(String name) throws RemoteException;
}
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 27df46d..db12564 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -30,8 +30,10 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.SystemProperties;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -76,11 +78,9 @@
/** {@hide} */
public static final String PROP_HAS_ADOPTABLE = "vold.has_adoptable";
/** {@hide} */
- public static final String PROP_HAS_FBE = "vold.has_fbe";
- /** {@hide} */
public static final String PROP_FORCE_ADOPTABLE = "persist.fw.force_adoptable";
/** {@hide} */
- public static final String PROP_EMULATE_FBE = "vold.emulate_fbe";
+ public static final String PROP_EMULATE_FBE = "persist.sys.emulate_fbe";
/** {@hide} */
public static final String UUID_PRIVATE_INTERNAL = null;
@@ -293,7 +293,7 @@
/**
* Constructs a StorageManager object through which an application can
* can communicate with the systems mount service.
- *
+ *
* @param tgtLooper The {@link android.os.Looper} which events will be received on.
*
* <p>Applications can get instance of this class by calling
@@ -409,7 +409,7 @@
* file matches a package ID that is owned by the calling program's UID.
* That is, shared UID applications can attempt to mount any other
* application's OBB that shares its UID.
- *
+ *
* @param rawPath the path to the OBB file
* @param key secret used to encrypt the OBB; may be <code>null</code> if no
* encryption was used on the OBB.
@@ -447,7 +447,7 @@
* That is, shared UID applications can obtain access to any other
* application's OBB that shares its UID.
* <p>
- *
+ *
* @param rawPath path to the OBB file
* @param force whether to kill any programs using this in order to unmount
* it
@@ -471,7 +471,7 @@
/**
* Check whether an Opaque Binary Blob (OBB) is mounted or not.
- *
+ *
* @param rawPath path to OBB image
* @return true if OBB is mounted; false if not mounted or on error
*/
@@ -491,7 +491,7 @@
* Check the mounted path of an Opaque Binary Blob (OBB) file. This will
* give you the path to where you can obtain access to the internals of the
* OBB.
- *
+ *
* @param rawPath path to OBB image
* @return absolute path to mounted OBB image data or <code>null</code> if
* not mounted or exception encountered trying to read status
@@ -1020,12 +1020,9 @@
}
/** {@hide} */
- public boolean isPerUserEncryptionEnabled() {
- try {
- return mMountService.isPerUserEncryptionEnabled();
- } catch (RemoteException e) {
- throw e.rethrowAsRuntimeException();
- }
+ public static boolean isFileBasedEncryptionEnabled() {
+ return "file".equals(SystemProperties.get("ro.crypto.type", "none"))
+ || SystemProperties.getBoolean(StorageManager.PROP_EMULATE_FBE, false);
}
/** {@hide} */
@@ -1049,6 +1046,15 @@
return path;
}
+ /** {@hide} */
+ public ParcelFileDescriptor mountAppFuse(String name) {
+ try {
+ return mMountService.mountAppFuse(name);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
/// Consts to match the password types in cryptfs.h
/** @hide */
public static final int CRYPT_TYPE_PASSWORD = 0;
diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java
index c368e5a..5997515 100644
--- a/core/java/android/os/storage/VolumeInfo.java
+++ b/core/java/android/os/storage/VolumeInfo.java
@@ -435,7 +435,7 @@
return null;
}
- final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE_DOCUMENT_ROOT);
+ final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);
intent.addCategory(Intent.CATEGORY_DEFAULT);
intent.setData(uri);
intent.putExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, true);
diff --git a/core/java/android/print/IPrintSpooler.aidl b/core/java/android/print/IPrintSpooler.aidl
index db2bf1a..b7cfbea 100644
--- a/core/java/android/print/IPrintSpooler.aidl
+++ b/core/java/android/print/IPrintSpooler.aidl
@@ -41,6 +41,23 @@
void createPrintJob(in PrintJobInfo printJob);
void setPrintJobState(in PrintJobId printJobId, int status, String stateReason,
IPrintSpoolerCallbacks callback, int sequence);
+
+ /**
+ * Set the progress of this print job
+ *
+ * @param printJobId The print job to update
+ * @param progress The new progress
+ */
+ void setProgress(in PrintJobId printJobId, in float progress);
+
+ /**
+ * Set the status of this print job
+ *
+ * @param printJobId The print job to update
+ * @param status The new status, can be null
+ */
+ void setStatus(in PrintJobId printJobId, in CharSequence status);
+
void setPrintJobTag(in PrintJobId printJobId, String tag, IPrintSpoolerCallbacks callback,
int sequence);
void writePrintJobData(in ParcelFileDescriptor fd, in PrintJobId printJobId);
diff --git a/core/java/android/print/PrintJobInfo.java b/core/java/android/print/PrintJobInfo.java
index 63f94fe..7148c87 100644
--- a/core/java/android/print/PrintJobInfo.java
+++ b/core/java/android/print/PrintJobInfo.java
@@ -16,10 +16,15 @@
package android.print;
+import android.annotation.FloatRange;
+import android.annotation.Nullable;
+import android.annotation.TestApi;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
+import com.android.internal.util.Preconditions;
+
import java.util.Arrays;
/**
@@ -149,9 +154,6 @@
/** How many copies to print. */
private int mCopies;
- /** Reason for the print job being in its current state. */
- private String mStateReason;
-
/** The pages to print */
private PageRange[] mPageRanges;
@@ -161,6 +163,12 @@
/** Information about the printed document. */
private PrintDocumentInfo mDocumentInfo;
+ /** The progress made on printing this job or -1 if not set. */
+ private float mProgress;
+
+ /** A short string describing the status of this job. */
+ private CharSequence mStatus;
+
/** Advanced printer specific options. */
private Bundle mAdvancedOptions;
@@ -169,7 +177,7 @@
/** @hide*/
public PrintJobInfo() {
- /* do nothing */
+ mProgress = -1;
}
/** @hide */
@@ -183,10 +191,11 @@
mTag = other.mTag;
mCreationTime = other.mCreationTime;
mCopies = other.mCopies;
- mStateReason = other.mStateReason;
mPageRanges = other.mPageRanges;
mAttributes = other.mAttributes;
mDocumentInfo = other.mDocumentInfo;
+ mProgress = other.mProgress;
+ mStatus = other.mStatus;
mCanceling = other.mCanceling;
mAdvancedOptions = other.mAdvancedOptions;
}
@@ -201,7 +210,6 @@
mTag = parcel.readString();
mCreationTime = parcel.readLong();
mCopies = parcel.readInt();
- mStateReason = parcel.readString();
Parcelable[] parcelables = parcel.readParcelableArray(null);
if (parcelables != null) {
mPageRanges = new PageRange[parcelables.length];
@@ -211,6 +219,8 @@
}
mAttributes = (PrintAttributes) parcel.readParcelable(null);
mDocumentInfo = (PrintDocumentInfo) parcel.readParcelable(null);
+ mProgress = parcel.readFloat();
+ mStatus = parcel.readCharSequence();
mCanceling = (parcel.readInt() == 1);
mAdvancedOptions = parcel.readBundle();
}
@@ -227,7 +237,7 @@
/**
* Sets the unique print job id.
*
- * @param The job id.
+ * @param id The job id.
*
* @hide
*/
@@ -265,7 +275,7 @@
}
/**
- * Sets the unique target pritner id.
+ * Sets the unique target printer id.
*
* @param printerId The target printer id.
*
@@ -326,6 +336,30 @@
}
/**
+ * Sets the progress of the print job.
+ *
+ * @param progress the progress of the job
+ *
+ * @hide
+ */
+ public void setProgress(@FloatRange(from=0.0, to=1.0) float progress) {
+ Preconditions.checkArgumentInRange(progress, 0, 1, "progress");
+
+ mProgress = progress;
+ }
+
+ /**
+ * Sets the status of the print job.
+ *
+ * @param status the status of the job, can be null
+ *
+ * @hide
+ */
+ public void setStatus(@Nullable CharSequence status) {
+ mStatus = status;
+ }
+
+ /**
* Sets the owning application id.
*
* @return The owning app id.
@@ -416,30 +450,6 @@
}
/**
- * Gets the reason for the print job being in the current state.
- *
- * @return The reason, or null if there is no reason or the
- * reason is unknown.
- *
- * @hide
- */
- public String getStateReason() {
- return mStateReason;
- }
-
- /**
- * Sets the reason for the print job being in the current state.
- *
- * @param stateReason The reason, or null if there is no reason
- * or the reason is unknown.
- *
- * @hide
- */
- public void setStateReason(String stateReason) {
- mStateReason = stateReason;
- }
-
- /**
* Gets the included pages.
*
* @return The included pages or <code>null</code> if not set.
@@ -604,10 +614,11 @@
parcel.writeString(mTag);
parcel.writeLong(mCreationTime);
parcel.writeInt(mCopies);
- parcel.writeString(mStateReason);
parcel.writeParcelableArray(mPageRanges, flags);
parcel.writeParcelable(mAttributes, flags);
parcel.writeParcelable(mDocumentInfo, 0);
+ parcel.writeFloat(mProgress);
+ parcel.writeCharSequence(mStatus);
parcel.writeInt(mCanceling ? 1 : 0);
parcel.writeBundle(mAdvancedOptions);
}
@@ -631,6 +642,9 @@
builder.append(", pages: " + (mPageRanges != null
? Arrays.toString(mPageRanges) : null));
builder.append(", hasAdvancedOptions: " + (mAdvancedOptions != null));
+ builder.append(", progress: " + mProgress);
+ builder.append(", status: " + (mStatus != null
+ ? mStatus.toString() : null));
builder.append("}");
return builder.toString();
}
@@ -666,6 +680,28 @@
}
/**
+ * Get the progress that has been made printing this job.
+ *
+ * @return the print progress or -1 if not set
+ * @hide
+ */
+ @TestApi
+ public float getProgress() {
+ return mProgress;
+ }
+
+ /**
+ * Get the status of this job.
+ *
+ * @return the status of this job or null if not set
+ * @hide
+ */
+ @TestApi
+ public @Nullable CharSequence getStatus() {
+ return mStatus;
+ }
+
+ /**
* Builder for creating a {@link PrintJobInfo}.
*/
public static final class Builder {
@@ -711,6 +747,28 @@
}
/**
+ * Sets the progress of the print job.
+ *
+ * @param progress the progress of the job
+ * @hide
+ */
+ public void setProgress(@FloatRange(from=0.0, to=1.0) float progress) {
+ Preconditions.checkArgumentInRange(progress, 0, 1, "progress");
+
+ mPrototype.mProgress = progress;
+ }
+
+ /**
+ * Sets the status of the print job.
+ *
+ * @param status the status of the job, can be null
+ * @hide
+ */
+ public void setStatus(@Nullable CharSequence status) {
+ mPrototype.mStatus = status;
+ }
+
+ /**
* Puts an advanced (printer specific) option.
*
* @param key The option key.
diff --git a/core/java/android/printservice/IPrintServiceClient.aidl b/core/java/android/printservice/IPrintServiceClient.aidl
index c2dfc30..b4baa48 100644
--- a/core/java/android/printservice/IPrintServiceClient.aidl
+++ b/core/java/android/printservice/IPrintServiceClient.aidl
@@ -35,6 +35,22 @@
boolean setPrintJobTag(in PrintJobId printJobId, String tag);
oneway void writePrintJobData(in ParcelFileDescriptor fd, in PrintJobId printJobId);
+ /**
+ * Set the progress of this print job
+ *
+ * @param printJobId The print job to update
+ * @param progress The new progress
+ */
+ void setProgress(in PrintJobId printJobId, in float progress);
+
+ /**
+ * Set the status of this print job
+ *
+ * @param printJobId The print job to update
+ * @param status The new status, can be null
+ */
+ void setStatus(in PrintJobId printJobId, in CharSequence status);
+
void onPrintersAdded(in ParceledListSlice printers);
void onPrintersRemoved(in ParceledListSlice printerIds);
}
diff --git a/core/java/android/printservice/PrintJob.java b/core/java/android/printservice/PrintJob.java
index 6fa0bdd..86fc292 100644
--- a/core/java/android/printservice/PrintJob.java
+++ b/core/java/android/printservice/PrintJob.java
@@ -16,6 +16,10 @@
package android.printservice;
+import android.annotation.FloatRange;
+import android.annotation.MainThread;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.os.RemoteException;
import android.print.PrintJobId;
import android.print.PrintJobInfo;
@@ -41,7 +45,7 @@
private PrintJobInfo mCachedInfo;
- PrintJob(PrintJobInfo jobInfo, IPrintServiceClient client) {
+ PrintJob(@NonNull PrintJobInfo jobInfo, @NonNull IPrintServiceClient client) {
mCachedInfo = jobInfo;
mPrintServiceClient = client;
mDocument = new PrintDocument(mCachedInfo.getId(), client,
@@ -53,6 +57,7 @@
*
* @return The id.
*/
+ @MainThread
public PrintJobId getId() {
PrintService.throwIfNotCalledOnMainThread();
return mCachedInfo.getId();
@@ -68,7 +73,8 @@
*
* @return The print job info.
*/
- public PrintJobInfo getInfo() {
+ @MainThread
+ public @NonNull PrintJobInfo getInfo() {
PrintService.throwIfNotCalledOnMainThread();
if (isInImmutableState()) {
return mCachedInfo;
@@ -90,7 +96,8 @@
*
* @return The document.
*/
- public PrintDocument getDocument() {
+ @MainThread
+ public @NonNull PrintDocument getDocument() {
PrintService.throwIfNotCalledOnMainThread();
return mDocument;
}
@@ -104,6 +111,7 @@
* @see #start()
* @see #cancel()
*/
+ @MainThread
public boolean isQueued() {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getState() == PrintJobInfo.STATE_QUEUED;
@@ -117,8 +125,9 @@
*
* @see #complete()
* @see #cancel()
- * @see #fail(CharSequence)
+ * @see #fail(String)
*/
+ @MainThread
public boolean isStarted() {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getState() == PrintJobInfo.STATE_STARTED;
@@ -132,8 +141,9 @@
*
* @see #start()
* @see #cancel()
- * @see #fail(CharSequence)
+ * @see #fail(String)
*/
+ @MainThread
public boolean isBlocked() {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getState() == PrintJobInfo.STATE_BLOCKED;
@@ -147,6 +157,7 @@
*
* @see #complete()
*/
+ @MainThread
public boolean isCompleted() {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getState() == PrintJobInfo.STATE_COMPLETED;
@@ -158,8 +169,9 @@
*
* @return Whether the print job is failed.
*
- * @see #fail(CharSequence)
+ * @see #fail(String)
*/
+ @MainThread
public boolean isFailed() {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getState() == PrintJobInfo.STATE_FAILED;
@@ -173,6 +185,7 @@
*
* @see #cancel()
*/
+ @MainThread
public boolean isCancelled() {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getState() == PrintJobInfo.STATE_CANCELED;
@@ -182,12 +195,16 @@
* Starts the print job. You should call this method if {@link
* #isQueued()} or {@link #isBlocked()} returns true and you started
* resumed printing.
+ * <p>
+ * This resets the print status to null. Set the new status by using {@link #setStatus}.
+ * </p>
*
* @return Whether the job was started.
*
* @see #isQueued()
* @see #isBlocked()
*/
+ @MainThread
public boolean start() {
PrintService.throwIfNotCalledOnMainThread();
final int state = getInfo().getState();
@@ -205,18 +222,20 @@
* paper to continue printing. To resume the print job call {@link
* #start()}.
*
+ * @param reason The human readable, short, and translated reason why the print job is blocked.
* @return Whether the job was blocked.
*
* @see #isStarted()
* @see #isBlocked()
*/
- public boolean block(String reason) {
+ @MainThread
+ public boolean block(@Nullable String reason) {
PrintService.throwIfNotCalledOnMainThread();
PrintJobInfo info = getInfo();
final int state = info.getState();
if (state == PrintJobInfo.STATE_STARTED
|| (state == PrintJobInfo.STATE_BLOCKED
- && !TextUtils.equals(info.getStateReason(), reason))) {
+ && !TextUtils.equals(info.getStatus(), reason))) {
return setState(PrintJobInfo.STATE_BLOCKED, reason);
}
return false;
@@ -230,6 +249,7 @@
*
* @see #isStarted()
*/
+ @MainThread
public boolean complete() {
PrintService.throwIfNotCalledOnMainThread();
if (isStarted()) {
@@ -251,7 +271,8 @@
* @see #isStarted()
* @see #isBlocked()
*/
- public boolean fail(String error) {
+ @MainThread
+ public boolean fail(@Nullable String error) {
PrintService.throwIfNotCalledOnMainThread();
if (!isInImmutableState()) {
return setState(PrintJobInfo.STATE_FAILED, error);
@@ -271,6 +292,7 @@
* @see #isQueued()
* @see #isBlocked()
*/
+ @MainThread
public boolean cancel() {
PrintService.throwIfNotCalledOnMainThread();
if (!isInImmutableState()) {
@@ -280,6 +302,39 @@
}
/**
+ * Sets the progress of this print job as a fraction of 1.
+ *
+ * @param progress The new progress
+ */
+ @MainThread
+ public void setProgress(@FloatRange(from=0.0, to=1.0) float progress) {
+ PrintService.throwIfNotCalledOnMainThread();
+
+ try {
+ mPrintServiceClient.setProgress(mCachedInfo.getId(), progress);
+ } catch (RemoteException re) {
+ Log.e(LOG_TAG, "Error setting progress for job: " + mCachedInfo.getId(), re);
+ }
+ }
+
+ /**
+ * Sets the status of this print job. This should be a human readable, short, and translated
+ * description of the current state of the print job.
+ *
+ * @param status The new status. If null the status will be empty.
+ */
+ @MainThread
+ public void setStatus(@Nullable CharSequence status) {
+ PrintService.throwIfNotCalledOnMainThread();
+
+ try {
+ mPrintServiceClient.setStatus(mCachedInfo.getId(), status);
+ } catch (RemoteException re) {
+ Log.e(LOG_TAG, "Error setting status for job: " + mCachedInfo.getId(), re);
+ }
+ }
+
+ /**
* Sets a tag that is valid in the context of a {@link PrintService}
* and is not interpreted by the system. For example, a print service
* may set as a tag the key of the print job returned by a remote
@@ -288,6 +343,7 @@
* @param tag The tag.
* @return True if the tag was set, false otherwise.
*/
+ @MainThread
public boolean setTag(String tag) {
PrintService.throwIfNotCalledOnMainThread();
if (isInImmutableState()) {
@@ -319,6 +375,7 @@
* @param key The option key.
* @return The option value.
*/
+ @MainThread
public String getAdvancedStringOption(String key) {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getAdvancedStringOption(key);
@@ -331,6 +388,7 @@
* @param key The option key.
* @return Whether the option is present.
*/
+ @MainThread
public boolean hasAdvancedOption(String key) {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().hasAdvancedOption(key);
@@ -342,6 +400,7 @@
* @param key The option key.
* @return The option value.
*/
+ @MainThread
public int getAdvancedIntOption(String key) {
PrintService.throwIfNotCalledOnMainThread();
return getInfo().getAdvancedIntOption(key);
@@ -374,14 +433,14 @@
|| state == PrintJobInfo.STATE_FAILED;
}
- private boolean setState(int state, String error) {
+ private boolean setState(int state, @Nullable String error) {
try {
if (mPrintServiceClient.setPrintJobState(mCachedInfo.getId(), state, error)) {
// Best effort - update the state of the cached info since
// we may not be able to re-fetch it later if the job gets
// removed from the spooler as a result of the state change.
mCachedInfo.setState(state);
- mCachedInfo.setStateReason(error);
+ mCachedInfo.setStatus(error);
return true;
}
} catch (RemoteException re) {
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 4b63c36..1d4d572 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -413,6 +413,14 @@
public static final String POST_DIAL_DIGITS = "post_dial_digits";
/**
+ * Indicates that the entry will be copied from primary user to other users.
+ * <P>Type: INTEGER</P>
+ *
+ * @hide
+ */
+ public static final String ADD_FOR_ALL_USERS = "add_for_all_users";
+
+ /**
* If a successful call is made that is longer than this duration, update the phone number
* in the ContactsProvider with the normalized version of the number, based on the user's
* current country code.
@@ -444,7 +452,7 @@
int presentation, int callType, int features, PhoneAccountHandle accountHandle,
long start, int duration, Long dataUsage) {
return addCall(ci, context, number, "", presentation, callType, features, accountHandle,
- start, duration, dataUsage, false, false);
+ start, duration, dataUsage, false, null, false);
}
@@ -467,7 +475,9 @@
* the call.
* @param addForAllUsers If true, the call is added to the call log of all currently
* running users. The caller must have the MANAGE_USERS permission if this is true.
- *
+ * @param userToBeInsertedTo {@link UserHandle} of user that the call is going to be
+ * inserted to. null if it is inserted to the current user. The
+ * value is ignored if @{link addForAllUsers} is true.
* @result The URI of the call log entry belonging to the user that made or received this
* call.
* {@hide}
@@ -475,9 +485,10 @@
public static Uri addCall(CallerInfo ci, Context context, String number,
String postDialDigits, int presentation, int callType, int features,
PhoneAccountHandle accountHandle, long start, int duration, Long dataUsage,
- boolean addForAllUsers) {
+ boolean addForAllUsers, UserHandle userToBeInsertedTo) {
return addCall(ci, context, number, postDialDigits, presentation, callType, features,
- accountHandle, start, duration, dataUsage, addForAllUsers, false);
+ accountHandle, start, duration, dataUsage, addForAllUsers, userToBeInsertedTo,
+ false);
}
/**
@@ -501,6 +512,9 @@
* the call.
* @param addForAllUsers If true, the call is added to the call log of all currently
* running users. The caller must have the MANAGE_USERS permission if this is true.
+ * @param userToBeInsertedTo {@link UserHandle} of user that the call is going to be
+ * inserted to. null if it is inserted to the current user. The
+ * value is ignored if @{link addForAllUsers} is true.
* @param is_read Flag to show if the missed call log has been read by the user or not.
* Used for call log restore of missed calls.
*
@@ -511,7 +525,7 @@
public static Uri addCall(CallerInfo ci, Context context, String number,
String postDialDigits, int presentation, int callType, int features,
PhoneAccountHandle accountHandle, long start, int duration, Long dataUsage,
- boolean addForAllUsers, boolean is_read) {
+ boolean addForAllUsers, UserHandle userToBeInsertedTo, boolean is_read) {
final ContentResolver resolver = context.getContentResolver();
int numberPresentation = PRESENTATION_ALLOWED;
@@ -575,6 +589,7 @@
values.put(PHONE_ACCOUNT_ID, accountId);
values.put(PHONE_ACCOUNT_ADDRESS, accountAddress);
values.put(NEW, Integer.valueOf(1));
+ values.put(ADD_FOR_ALL_USERS, addForAllUsers ? 1 : 0);
if (callType == MISSED_TYPE) {
values.put(IS_READ, Integer.valueOf(is_read ? 1 : 0));
@@ -650,9 +665,13 @@
}
}
} else {
- result = addEntryAndRemoveExpiredEntries(context, CONTENT_URI, values);
+ Uri uri = CONTENT_URI;
+ if (userToBeInsertedTo != null) {
+ uri = ContentProvider
+ .maybeAddUserId(CONTENT_URI, userToBeInsertedTo.getIdentifier());
+ }
+ result = addEntryAndRemoveExpiredEntries(context, uri, values);
}
-
return result;
}
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index e3694e8..94a2bea 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -394,6 +394,14 @@
Uri.withAppendedPath(AUTHORITY_URI, "directories");
/**
+ * The content:// style URI for enterprise Directory table. Requests to this URI can be
+ * performed on the UI thread because they are always unblocking.
+ *
+ */
+ public static final Uri CORP_CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI,
+ "directories_corp");
+
+ /**
* The MIME-type of {@link #CONTENT_URI} providing a directory of
* contact directories.
*/
@@ -417,6 +425,22 @@
public static final long LOCAL_INVISIBLE = 1;
/**
+ * _ID of the work profile default directory, which represents locally stored contacts.
+ *
+ * @hide
+ */
+ public static final long ENTERPRISE_DEFAULT = Directory.ENTERPRISE_DIRECTORY_ID_BASE
+ + DEFAULT;
+
+ /**
+ * _ID of the work profile directory that represents locally stored invisible contacts.
+ *
+ * @hide
+ */
+ public static final long ENTERPRISE_LOCAL_INVISIBLE = Directory.ENTERPRISE_DIRECTORY_ID_BASE
+ + LOCAL_INVISIBLE;
+
+ /**
* The name of the package that owns this directory. Contacts Provider
* fill it in with the name of the package containing the directory provider.
* If the package is later uninstalled, the directories it owns are
@@ -472,6 +496,15 @@
public static final String ACCOUNT_NAME = "accountName";
/**
+ * Mimimal ID for corp directory returned from
+ * {@link Directory#CORP_CONTENT_URI}.
+ *
+ * @hide
+ */
+ // slightly smaller than 2 ** 30
+ public static final long ENTERPRISE_DIRECTORY_ID_BASE = 1000000000;
+
+ /**
* One of {@link #EXPORT_SUPPORT_NONE}, {@link #EXPORT_SUPPORT_ANY_ACCOUNT},
* {@link #EXPORT_SUPPORT_SAME_ACCOUNT_ONLY}. This is the expectation the
* directory has for data exported from it. Clients must obey this setting.
@@ -555,6 +588,24 @@
public static final int PHOTO_SUPPORT_FULL = 3;
/**
+ * Return TRUE if it is a remote stored directory.
+ */
+ public static boolean isRemoteDirectory(long directoryId) {
+ return directoryId != Directory.DEFAULT
+ && directoryId != Directory.LOCAL_INVISIBLE
+ && directoryId != Directory.ENTERPRISE_DEFAULT
+ && directoryId != Directory.ENTERPRISE_LOCAL_INVISIBLE;
+ }
+
+ /**
+ * Return TRUE if a directory ID is from the contacts provider on the enterprise profile.
+ *
+ */
+ public static boolean isEnterpriseDirectoryId(long directoryId) {
+ return directoryId >= ENTERPRISE_DIRECTORY_ID_BASE;
+ }
+
+ /**
* Notifies the system of a change in the list of directories handled by
* a particular directory provider. The Contacts provider will turn around
* and send a query to the directory provider for the full list of directories,
@@ -1589,6 +1640,14 @@
CONTENT_URI, "filter");
/**
+ * It supports the same semantics as {@link #CONTENT_FILTER_URI} and returns the same
+ * columns. If there is a corp profile linked to the current profile, it will query corp
+ * profile, otherwise it will return null.
+ */
+ public static final Uri CORP_CONTENT_FILTER_URI = Uri.withAppendedPath(
+ CORP_CONTENT_URI, "filter");
+
+ /**
* The content:// style URI for this table joined with useful data from
* {@link ContactsContract.Data}, filtered to include only starred contacts
* and the most frequently contacted contacts.
@@ -8301,10 +8360,15 @@
* @hide
*/
public static Intent rebuildManagedQuickContactsIntent(String lookupKey, long contactId,
- Intent originalIntent) {
+ long directoryId, Intent originalIntent) {
final Intent intent = new Intent(ACTION_QUICK_CONTACT);
// Rebuild the URI from a lookup key and a contact ID.
- intent.setData(Contacts.getLookupUri(contactId, lookupKey));
+ Uri uri = Contacts.getLookupUri(contactId, lookupKey);
+ if (uri != null && directoryId != Directory.DEFAULT) {
+ uri = uri.buildUpon().appendQueryParameter(
+ ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId)).build();
+ }
+ intent.setData(uri);
// Copy flags and always set NEW_TASK because it won't have a parent activity.
intent.setFlags(originalIntent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/core/java/android/provider/ContactsInternal.java b/core/java/android/provider/ContactsInternal.java
index 059a603..36ef52d 100644
--- a/core/java/android/provider/ContactsInternal.java
+++ b/core/java/android/provider/ContactsInternal.java
@@ -91,6 +91,10 @@
final List<String> pathSegments = uri.getPathSegments();
final long contactId = ContentUris.parseId(uri);
final String lookupKey = pathSegments.get(2);
+ final String directoryIdStr = uri.getQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY);
+ final long directoryId = (directoryIdStr == null)
+ ? ContactsContract.Directory.ENTERPRISE_DIRECTORY_ID_BASE
+ : Long.parseLong(directoryIdStr);
// See if it has a corp lookupkey.
if (TextUtils.isEmpty(lookupKey)
@@ -99,14 +103,24 @@
return false; // It's not a corp lookup key.
}
+ if (!ContactsContract.Contacts.isEnterpriseContactId(contactId)) {
+ throw new IllegalArgumentException("Invalid enterprise contact id: " + contactId);
+ }
+ if (!ContactsContract.Directory.isEnterpriseDirectoryId(directoryId)) {
+ throw new IllegalArgumentException("Invalid enterprise directory id: " + directoryId);
+ }
+
// Launch Quick Contact on the managed profile, if the policy allows.
final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
final String actualLookupKey = lookupKey.substring(
ContactsContract.Contacts.ENTERPRISE_CONTACT_LOOKUP_PREFIX.length());
final long actualContactId =
(contactId - ContactsContract.Contacts.ENTERPRISE_CONTACT_ID_BASE);
+ final long actualDirectoryId = (directoryId
+ - ContactsContract.Directory.ENTERPRISE_DIRECTORY_ID_BASE);
- dpm.startManagedQuickContact(actualLookupKey, actualContactId, originalIntent);
+ dpm.startManagedQuickContact(actualLookupKey, actualContactId, actualDirectoryId,
+ originalIntent);
return true;
}
}
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index 159ca01..d53bb0d 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -67,7 +67,7 @@
* @see DocumentsProvider
*/
public final class DocumentsContract {
- private static final String TAG = "Documents";
+ private static final String TAG = "DocumentsContract";
// content://com.example/root/
// content://com.example/root/sdcard/
@@ -125,8 +125,7 @@
public static final String ACTION_MANAGE_DOCUMENT = "android.provider.action.MANAGE_DOCUMENT";
/** {@hide} */
- public static final String
- ACTION_BROWSE_DOCUMENT_ROOT = "android.provider.action.BROWSE_DOCUMENT_ROOT";
+ public static final String ACTION_BROWSE = "android.provider.action.BROWSE";
/** {@hide} */
public static final String
@@ -234,6 +233,7 @@
* @see #FLAG_SUPPORTS_TYPED_DOCUMENT
* @see #FLAG_DIR_PREFERS_GRID
* @see #FLAG_DIR_PREFERS_LAST_MODIFIED
+ * @see #FLAG_VIRTUAL_DOCUMENT
*/
public static final String COLUMN_FLAGS = "flags";
@@ -357,6 +357,17 @@
public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 1 << 9;
/**
+ * Flag indicating that a document is virtual, and doesn't have byte
+ * representation in the MIME type specified as {@link #COLUMN_MIME_TYPE}.
+ *
+ * @see #COLUMN_FLAGS
+ * @see #COLUMN_MIME_TYPE
+ * @see DocumentsProvider#openTypedDocument(String, String, Bundle,
+ * android.os.CancellationSignal)
+ */
+ public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 10;
+
+ /**
* Flag indicating that document titles should be hidden when viewing
* this directory in a larger format grid. For example, a directory
* containing only images may want the image thumbnails to speak for
@@ -580,6 +591,12 @@
*/
public static final String EXTRA_ERROR = "error";
+ /**
+ * Optional result (I'm thinking boolean) answer to a question.
+ * {@hide}
+ */
+ public static final String EXTRA_RESULT = "result";
+
/** {@hide} */
public static final String METHOD_CREATE_DOCUMENT = "android:createDocument";
/** {@hide} */
@@ -590,6 +607,8 @@
public static final String METHOD_COPY_DOCUMENT = "android:copyDocument";
/** {@hide} */
public static final String METHOD_MOVE_DOCUMENT = "android:moveDocument";
+ /** {@hide} */
+ public static final String METHOD_IS_CHILD_DOCUMENT = "android:isChildDocument";
/** {@hide} */
public static final String EXTRA_URI = "uri";
@@ -1014,6 +1033,24 @@
return out.getParcelable(DocumentsContract.EXTRA_URI);
}
+ /** {@hide} */
+ public static boolean isChildDocument(ContentProviderClient client, Uri parentDocumentUri,
+ Uri childDocumentUri) throws RemoteException {
+
+ final Bundle in = new Bundle();
+ in.putParcelable(DocumentsContract.EXTRA_URI, parentDocumentUri);
+ in.putParcelable(DocumentsContract.EXTRA_TARGET_URI, childDocumentUri);
+
+ final Bundle out = client.call(METHOD_IS_CHILD_DOCUMENT, null, in);
+ if (out == null) {
+ throw new RemoteException("Failed to get a reponse from isChildDocument query.");
+ }
+ if (!out.containsKey(DocumentsContract.EXTRA_RESULT)) {
+ throw new RemoteException("Response did not include result field..");
+ }
+ return out.getBoolean(DocumentsContract.EXTRA_RESULT);
+ }
+
/**
* Change the display name of an existing document.
* <p>
diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java
index f01073b..e25ba35 100644
--- a/core/java/android/provider/DocumentsProvider.java
+++ b/core/java/android/provider/DocumentsProvider.java
@@ -16,11 +16,12 @@
package android.provider;
+import static android.provider.DocumentsContract.METHOD_COPY_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_CREATE_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_DELETE_DOCUMENT;
-import static android.provider.DocumentsContract.METHOD_RENAME_DOCUMENT;
-import static android.provider.DocumentsContract.METHOD_COPY_DOCUMENT;
+import static android.provider.DocumentsContract.METHOD_IS_CHILD_DOCUMENT;
import static android.provider.DocumentsContract.METHOD_MOVE_DOCUMENT;
+import static android.provider.DocumentsContract.METHOD_RENAME_DOCUMENT;
import static android.provider.DocumentsContract.buildDocumentUri;
import static android.provider.DocumentsContract.buildDocumentUriMaybeUsingTree;
import static android.provider.DocumentsContract.buildTreeDocumentUri;
@@ -688,6 +689,16 @@
return super.call(method, arg, extras);
}
+ try {
+ return callUnchecked(method, arg, extras);
+ } catch (FileNotFoundException e) {
+ throw new IllegalStateException("Failed call " + method, e);
+ }
+ }
+
+ private Bundle callUnchecked(String method, String arg, Bundle extras)
+ throws FileNotFoundException {
+
final Context context = getContext();
final Uri documentUri = extras.getParcelable(DocumentsContract.EXTRA_URI);
final String authority = documentUri.getAuthority();
@@ -697,109 +708,120 @@
throw new SecurityException(
"Requested authority " + authority + " doesn't match provider " + mAuthority);
}
- enforceTree(documentUri);
final Bundle out = new Bundle();
- try {
- if (METHOD_CREATE_DOCUMENT.equals(method)) {
- enforceWritePermissionInner(documentUri, getCallingPackage(), null);
- final String mimeType = extras.getString(Document.COLUMN_MIME_TYPE);
- final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME);
- final String newDocumentId = createDocument(documentId, mimeType, displayName);
+ // If the URI is a tree URI performs some validation.
+ enforceTree(documentUri);
- // No need to issue new grants here, since caller either has
- // manage permission or a prefix grant. We might generate a
- // tree style URI if that's how they called us.
+ if (METHOD_IS_CHILD_DOCUMENT.equals(method)) {
+ enforceReadPermissionInner(documentUri, getCallingPackage(), null);
+
+ final Uri childUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);
+ final String childAuthority = childUri.getAuthority();
+ final String childId = DocumentsContract.getDocumentId(childUri);
+
+ out.putBoolean(
+ DocumentsContract.EXTRA_RESULT,
+ mAuthority.equals(childAuthority)
+ && isChildDocument(documentId, childId));
+
+ } else if (METHOD_CREATE_DOCUMENT.equals(method)) {
+ enforceWritePermissionInner(documentUri, getCallingPackage(), null);
+
+ final String mimeType = extras.getString(Document.COLUMN_MIME_TYPE);
+ final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME);
+ final String newDocumentId = createDocument(documentId, mimeType, displayName);
+
+ // No need to issue new grants here, since caller either has
+ // manage permission or a prefix grant. We might generate a
+ // tree style URI if that's how they called us.
+ final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
+ newDocumentId);
+ out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
+
+ } else if (METHOD_RENAME_DOCUMENT.equals(method)) {
+ enforceWritePermissionInner(documentUri, getCallingPackage(), null);
+
+ final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME);
+ final String newDocumentId = renameDocument(documentId, displayName);
+
+ if (newDocumentId != null) {
final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
newDocumentId);
+
+ // If caller came in with a narrow grant, issue them a
+ // narrow grant for the newly renamed document.
+ if (!isTreeUri(newDocumentUri)) {
+ final int modeFlags = getCallingOrSelfUriPermissionModeFlags(context,
+ documentUri);
+ context.grantUriPermission(getCallingPackage(), newDocumentUri, modeFlags);
+ }
+
out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
- } else if (METHOD_RENAME_DOCUMENT.equals(method)) {
- enforceWritePermissionInner(documentUri, getCallingPackage(), null);
-
- final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME);
- final String newDocumentId = renameDocument(documentId, displayName);
-
- if (newDocumentId != null) {
- final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
- newDocumentId);
-
- // If caller came in with a narrow grant, issue them a
- // narrow grant for the newly renamed document.
- if (!isTreeUri(newDocumentUri)) {
- final int modeFlags = getCallingOrSelfUriPermissionModeFlags(context,
- documentUri);
- context.grantUriPermission(getCallingPackage(), newDocumentUri, modeFlags);
- }
-
- out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
-
- // Original document no longer exists, clean up any grants
- revokeDocumentPermission(documentId);
- }
-
- } else if (METHOD_DELETE_DOCUMENT.equals(method)) {
- enforceWritePermissionInner(documentUri, getCallingPackage(), null);
- deleteDocument(documentId);
-
- // Document no longer exists, clean up any grants
- revokeDocumentPermission(documentId);
-
- } else if (METHOD_COPY_DOCUMENT.equals(method)) {
- final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);
- final String targetId = DocumentsContract.getDocumentId(targetUri);
-
- enforceReadPermissionInner(documentUri, getCallingPackage(), null);
- enforceWritePermissionInner(targetUri, getCallingPackage(), null);
-
- final String newDocumentId = copyDocument(documentId, targetId);
-
- if (newDocumentId != null) {
- final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
- newDocumentId);
-
- if (!isTreeUri(newDocumentUri)) {
- final int modeFlags = getCallingOrSelfUriPermissionModeFlags(context,
- documentUri);
- context.grantUriPermission(getCallingPackage(), newDocumentUri, modeFlags);
- }
-
- out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
- }
-
- } else if (METHOD_MOVE_DOCUMENT.equals(method)) {
- final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);
- final String targetId = DocumentsContract.getDocumentId(targetUri);
-
- enforceReadPermissionInner(documentUri, getCallingPackage(), null);
- enforceWritePermissionInner(targetUri, getCallingPackage(), null);
-
- final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME);
- final String newDocumentId = moveDocument(documentId, targetId);
-
- if (newDocumentId != null) {
- final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
- newDocumentId);
-
- if (!isTreeUri(newDocumentUri)) {
- final int modeFlags = getCallingOrSelfUriPermissionModeFlags(context,
- documentUri);
- context.grantUriPermission(getCallingPackage(), newDocumentUri, modeFlags);
- }
-
- out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
- }
-
// Original document no longer exists, clean up any grants
revokeDocumentPermission(documentId);
-
- } else {
- throw new UnsupportedOperationException("Method not supported " + method);
}
- } catch (FileNotFoundException e) {
- throw new IllegalStateException("Failed call " + method, e);
+
+ } else if (METHOD_DELETE_DOCUMENT.equals(method)) {
+ enforceWritePermissionInner(documentUri, getCallingPackage(), null);
+ deleteDocument(documentId);
+
+ // Document no longer exists, clean up any grants
+ revokeDocumentPermission(documentId);
+
+ } else if (METHOD_COPY_DOCUMENT.equals(method)) {
+ final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);
+ final String targetId = DocumentsContract.getDocumentId(targetUri);
+
+ enforceReadPermissionInner(documentUri, getCallingPackage(), null);
+ enforceWritePermissionInner(targetUri, getCallingPackage(), null);
+
+ final String newDocumentId = copyDocument(documentId, targetId);
+
+ if (newDocumentId != null) {
+ final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
+ newDocumentId);
+
+ if (!isTreeUri(newDocumentUri)) {
+ final int modeFlags = getCallingOrSelfUriPermissionModeFlags(context,
+ documentUri);
+ context.grantUriPermission(getCallingPackage(), newDocumentUri, modeFlags);
+ }
+
+ out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
+ }
+
+ } else if (METHOD_MOVE_DOCUMENT.equals(method)) {
+ final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);
+ final String targetId = DocumentsContract.getDocumentId(targetUri);
+
+ enforceReadPermissionInner(documentUri, getCallingPackage(), null);
+ enforceWritePermissionInner(targetUri, getCallingPackage(), null);
+
+ final String newDocumentId = moveDocument(documentId, targetId);
+
+ if (newDocumentId != null) {
+ final Uri newDocumentUri = buildDocumentUriMaybeUsingTree(documentUri,
+ newDocumentId);
+
+ if (!isTreeUri(newDocumentUri)) {
+ final int modeFlags = getCallingOrSelfUriPermissionModeFlags(context,
+ documentUri);
+ context.grantUriPermission(getCallingPackage(), newDocumentUri, modeFlags);
+ }
+
+ out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri);
+ }
+
+ // Original document no longer exists, clean up any grants
+ revokeDocumentPermission(documentId);
+
+ } else {
+ throw new UnsupportedOperationException("Method not supported " + method);
}
+
return out;
}
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9034cc9..c92382a 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4420,8 +4420,19 @@
* to receive changes in this value.
*/
public static final String LOCATION_MODE = "location_mode";
+ /**
+ * Stores the previous location mode when {@link #LOCATION_MODE} is set to
+ * {@link #LOCATION_MODE_OFF}
+ * @hide
+ */
+ public static final String LOCATION_PREVIOUS_MODE = "location_previous_mode";
/**
+ * Sets all location providers to the previous states before location was turned off.
+ * @hide
+ */
+ public static final int LOCATION_MODE_PREVIOUS = -1;
+ /**
* Location access disabled.
*/
public static final int LOCATION_MODE_OFF = 0;
@@ -5795,6 +5806,7 @@
CLONE_TO_MANAGED_PROFILE.add(ENABLED_ACCESSIBILITY_SERVICES);
CLONE_TO_MANAGED_PROFILE.add(ENABLED_INPUT_METHODS);
CLONE_TO_MANAGED_PROFILE.add(LOCATION_MODE);
+ CLONE_TO_MANAGED_PROFILE.add(LOCATION_PREVIOUS_MODE);
CLONE_TO_MANAGED_PROFILE.add(LOCATION_PROVIDERS_ALLOWED);
CLONE_TO_MANAGED_PROFILE.add(LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);
CLONE_TO_MANAGED_PROFILE.add(SELECTED_INPUT_METHOD_SUBTYPE);
@@ -5882,6 +5894,28 @@
}
/**
+ * Saves the current location mode into {@link #LOCATION_PREVIOUS_MODE}.
+ */
+ private static final boolean saveLocationModeForUser(ContentResolver cr, int userId) {
+ final int mode = getLocationModeForUser(cr, userId);
+ return putIntForUser(cr, Settings.Secure.LOCATION_PREVIOUS_MODE, mode, userId);
+ }
+
+ /**
+ * Restores the current location mode from {@link #LOCATION_PREVIOUS_MODE}.
+ */
+ private static final boolean restoreLocationModeForUser(ContentResolver cr, int userId) {
+ int mode = getIntForUser(cr, Settings.Secure.LOCATION_PREVIOUS_MODE,
+ LOCATION_MODE_HIGH_ACCURACY, userId);
+ // Make sure that the previous mode is never "off". Otherwise the user won't be able to
+ // turn on location any longer.
+ if (mode == LOCATION_MODE_OFF) {
+ mode = LOCATION_MODE_HIGH_ACCURACY;
+ }
+ return setLocationModeForUser(cr, mode, userId);
+ }
+
+ /**
* Thread-safe method for setting the location mode to one of
* {@link #LOCATION_MODE_HIGH_ACCURACY}, {@link #LOCATION_MODE_SENSORS_ONLY},
* {@link #LOCATION_MODE_BATTERY_SAVING}, or {@link #LOCATION_MODE_OFF}.
@@ -5899,7 +5933,11 @@
boolean gps = false;
boolean network = false;
switch (mode) {
+ case LOCATION_MODE_PREVIOUS:
+ // Retrieve the actual mode and set to that mode.
+ return restoreLocationModeForUser(cr, userId);
case LOCATION_MODE_OFF:
+ saveLocationModeForUser(cr, userId);
break;
case LOCATION_MODE_SENSORS_ONLY:
gps = true;
@@ -7758,6 +7796,7 @@
AUTO_TIME_ZONE,
POWER_SOUNDS_ENABLED,
DOCK_SOUNDS_ENABLED,
+ CHARGING_SOUNDS_ENABLED,
USB_MASS_STORAGE_ENABLED,
ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED,
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
diff --git a/core/java/android/security/net/config/CertificateSource.java b/core/java/android/security/net/config/CertificateSource.java
index 386354d..2b7829e 100644
--- a/core/java/android/security/net/config/CertificateSource.java
+++ b/core/java/android/security/net/config/CertificateSource.java
@@ -22,4 +22,5 @@
/** @hide */
public interface CertificateSource {
Set<X509Certificate> getCertificates();
+ X509Certificate findBySubjectAndPublicKey(X509Certificate cert);
}
diff --git a/core/java/android/security/net/config/CertificatesEntryRef.java b/core/java/android/security/net/config/CertificatesEntryRef.java
index 2ba38c21..1d15e19 100644
--- a/core/java/android/security/net/config/CertificatesEntryRef.java
+++ b/core/java/android/security/net/config/CertificatesEntryRef.java
@@ -30,6 +30,10 @@
mOverridesPins = overridesPins;
}
+ boolean overridesPins() {
+ return mOverridesPins;
+ }
+
public Set<TrustAnchor> getTrustAnchors() {
// TODO: cache this [but handle mutable sources]
Set<TrustAnchor> anchors = new ArraySet<TrustAnchor>();
@@ -38,4 +42,13 @@
}
return anchors;
}
+
+ public TrustAnchor findBySubjectAndPublicKey(X509Certificate cert) {
+ X509Certificate foundCert = mSource.findBySubjectAndPublicKey(cert);
+ if (foundCert == null) {
+ return null;
+ }
+
+ return new TrustAnchor(foundCert, mOverridesPins);
+ }
}
diff --git a/core/java/android/security/net/config/DirectoryCertificateSource.java b/core/java/android/security/net/config/DirectoryCertificateSource.java
new file mode 100644
index 0000000..a261e06
--- /dev/null
+++ b/core/java/android/security/net/config/DirectoryCertificateSource.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2015 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.security.net.config;
+
+import android.os.Environment;
+import android.os.UserHandle;
+import android.util.ArraySet;
+import android.util.Pair;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Set;
+import libcore.io.IoUtils;
+
+import com.android.org.conscrypt.Hex;
+import com.android.org.conscrypt.NativeCrypto;
+
+import javax.security.auth.x500.X500Principal;
+
+/**
+ * {@link CertificateSource} based on a directory where certificates are stored as individual files
+ * named after a hash of their SubjectName for more efficient lookups.
+ * @hide
+ */
+abstract class DirectoryCertificateSource implements CertificateSource {
+ private final File mDir;
+ private final Object mLock = new Object();
+ private final CertificateFactory mCertFactory;
+
+ private Set<X509Certificate> mCertificates;
+
+ protected DirectoryCertificateSource(File caDir) {
+ mDir = caDir;
+ try {
+ mCertFactory = CertificateFactory.getInstance("X.509");
+ } catch (CertificateException e) {
+ throw new RuntimeException("Failed to obtain X.509 CertificateFactory", e);
+ }
+ }
+
+ protected abstract boolean isCertMarkedAsRemoved(String caFile);
+
+ @Override
+ public Set<X509Certificate> getCertificates() {
+ // TODO: loading all of these is wasteful, we should instead use a keystore style API.
+ synchronized (mLock) {
+ if (mCertificates != null) {
+ return mCertificates;
+ }
+
+ Set<X509Certificate> certs = new ArraySet<X509Certificate>();
+ if (mDir.isDirectory()) {
+ for (String caFile : mDir.list()) {
+ if (isCertMarkedAsRemoved(caFile)) {
+ continue;
+ }
+ X509Certificate cert = readCertificate(caFile);
+ if (cert != null) {
+ certs.add(cert);
+ }
+ }
+ }
+ mCertificates = certs;
+ return mCertificates;
+ }
+ }
+
+ @Override
+ public X509Certificate findBySubjectAndPublicKey(final X509Certificate cert) {
+ return findCert(cert.getSubjectX500Principal(), new CertSelector() {
+ @Override
+ public boolean match(X509Certificate ca) {
+ return ca.getPublicKey().equals(cert.getPublicKey());
+ }
+ });
+ }
+
+ private static interface CertSelector {
+ boolean match(X509Certificate cert);
+ }
+
+ private X509Certificate findCert(X500Principal subj, CertSelector selector) {
+ String hash = getHash(subj);
+ for (int index = 0; index >= 0; index++) {
+ String fileName = hash + "." + index;
+ if (!new File(mDir, fileName).exists()) {
+ break;
+ }
+ if (isCertMarkedAsRemoved(fileName)) {
+ continue;
+ }
+ X509Certificate cert = readCertificate(fileName);
+ if (!subj.equals(cert.getSubjectX500Principal())) {
+ continue;
+ }
+ if (selector.match(cert)) {
+ return cert;
+ }
+ }
+ return null;
+ }
+
+ private String getHash(X500Principal name) {
+ int hash = NativeCrypto.X509_NAME_hash_old(name);
+ return Hex.intToHexString(hash, 8);
+ }
+
+ private X509Certificate readCertificate(String file) {
+ InputStream is = null;
+ try {
+ is = new BufferedInputStream(new FileInputStream(new File(mDir, file)));
+ return (X509Certificate) mCertFactory.generateCertificate(is);
+ } catch (CertificateException | IOException e) {
+ return null;
+ } finally {
+ IoUtils.closeQuietly(is);
+ }
+ }
+}
diff --git a/core/java/android/security/net/config/KeyStoreCertificateSource.java b/core/java/android/security/net/config/KeyStoreCertificateSource.java
index 1973ef1..7a01a64 100644
--- a/core/java/android/security/net/config/KeyStoreCertificateSource.java
+++ b/core/java/android/security/net/config/KeyStoreCertificateSource.java
@@ -24,6 +24,8 @@
import java.util.Enumeration;
import java.util.Set;
+import com.android.org.conscrypt.TrustedCertificateIndex;
+
/**
* {@link CertificateSource} which provides certificates from trusted certificate entries of a
* {@link KeyStore}.
@@ -31,6 +33,7 @@
class KeyStoreCertificateSource implements CertificateSource {
private final Object mLock = new Object();
private final KeyStore mKeyStore;
+ private TrustedCertificateIndex mIndex;
private Set<X509Certificate> mCertificates;
public KeyStoreCertificateSource(KeyStore ks) {
@@ -39,27 +42,42 @@
@Override
public Set<X509Certificate> getCertificates() {
+ ensureInitialized();
+ return mCertificates;
+ }
+
+ private void ensureInitialized() {
synchronized (mLock) {
if (mCertificates != null) {
- return mCertificates;
+ return;
}
+
try {
+ TrustedCertificateIndex localIndex = new TrustedCertificateIndex();
Set<X509Certificate> certificates = new ArraySet<>(mKeyStore.size());
for (Enumeration<String> en = mKeyStore.aliases(); en.hasMoreElements();) {
String alias = en.nextElement();
- if (!mKeyStore.isCertificateEntry(alias)) {
- continue;
- }
X509Certificate cert = (X509Certificate) mKeyStore.getCertificate(alias);
if (cert != null) {
certificates.add(cert);
+ localIndex.index(cert);
}
}
+ mIndex = localIndex;
mCertificates = certificates;
- return mCertificates;
} catch (KeyStoreException e) {
throw new RuntimeException("Failed to load certificates from KeyStore", e);
}
}
}
+
+ @Override
+ public X509Certificate findBySubjectAndPublicKey(X509Certificate cert) {
+ ensureInitialized();
+ java.security.cert.TrustAnchor anchor = mIndex.findBySubjectAndPublicKey(cert);
+ if (anchor == null) {
+ return null;
+ }
+ return anchor.getTrustedCert();
+ }
}
diff --git a/core/java/android/security/net/config/ManifestConfigSource.java b/core/java/android/security/net/config/ManifestConfigSource.java
new file mode 100644
index 0000000..bf1fb8a
--- /dev/null
+++ b/core/java/android/security/net/config/ManifestConfigSource.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2015 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.security.net.config;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+import android.util.Pair;
+import java.util.Set;
+
+/** @hide */
+public class ManifestConfigSource implements ConfigSource {
+ public static final String META_DATA_NETWORK_SECURITY_CONFIG =
+ "android.security.net.config";
+ private static final boolean DBG = true;
+ private static final String LOG_TAG = "NetworkSecurityConfig";
+
+ private final Object mLock = new Object();
+ private final Context mContext;
+
+ private ConfigSource mConfigSource;
+
+ public ManifestConfigSource(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ public Set<Pair<Domain, NetworkSecurityConfig>> getPerDomainConfigs() {
+ return getConfigSource().getPerDomainConfigs();
+ }
+
+ @Override
+ public NetworkSecurityConfig getDefaultConfig() {
+ return getConfigSource().getDefaultConfig();
+ }
+
+ private ConfigSource getConfigSource() {
+ synchronized (mLock) {
+ if (mConfigSource != null) {
+ return mConfigSource;
+ }
+ ApplicationInfo info;
+ try {
+ info = mContext.getPackageManager().getApplicationInfo(mContext.getPackageName(),
+ PackageManager.GET_META_DATA);
+ } catch (PackageManager.NameNotFoundException e) {
+ throw new RuntimeException("Failed to look up ApplicationInfo", e);
+ }
+ int configResourceId = 0;
+ if (info != null && info.metaData != null) {
+ configResourceId = info.metaData.getInt(META_DATA_NETWORK_SECURITY_CONFIG);
+ }
+
+ ConfigSource source;
+ if (configResourceId != 0) {
+ boolean debugBuild = (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+ if (DBG) {
+ Log.d(LOG_TAG, "Using Network Security Config from resource "
+ + mContext.getResources().getResourceEntryName(configResourceId)
+ + " debugBuild: " + debugBuild);
+ }
+ source = new XmlConfigSource(mContext, configResourceId, debugBuild);
+ } else {
+ if (DBG) {
+ Log.d(LOG_TAG, "No Network Security Config specified, using platform default");
+ }
+ source = new DefaultConfigSource();
+ }
+ mConfigSource = source;
+ return mConfigSource;
+ }
+ }
+
+ private static final class DefaultConfigSource implements ConfigSource {
+ @Override
+ public NetworkSecurityConfig getDefaultConfig() {
+ return NetworkSecurityConfig.DEFAULT;
+ }
+
+ @Override
+ public Set<Pair<Domain, NetworkSecurityConfig>> getPerDomainConfigs() {
+ return null;
+ }
+ }
+}
diff --git a/core/java/android/security/net/config/NetworkSecurityConfig.java b/core/java/android/security/net/config/NetworkSecurityConfig.java
index 8906f9b..2ab07b5 100644
--- a/core/java/android/security/net/config/NetworkSecurityConfig.java
+++ b/core/java/android/security/net/config/NetworkSecurityConfig.java
@@ -16,11 +16,15 @@
package android.security.net.config;
+import android.util.ArrayMap;
import android.util.ArraySet;
+import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.net.ssl.X509TrustManager;
@@ -50,6 +54,19 @@
mHstsEnforced = hstsEnforced;
mPins = pins;
mCertificatesEntryRefs = certificatesEntryRefs;
+ // Sort the certificates entry refs so that all entries that override pins come before
+ // non-override pin entries. This allows us to handle the case where a certificate is in
+ // multiple entry refs by returning the certificate from the first entry ref.
+ Collections.sort(mCertificatesEntryRefs, new Comparator<CertificatesEntryRef>() {
+ @Override
+ public int compare(CertificatesEntryRef lhs, CertificatesEntryRef rhs) {
+ if (lhs.overridesPins()) {
+ return rhs.overridesPins() ? 0 : -1;
+ } else {
+ return rhs.overridesPins() ? 1 : 0;
+ }
+ }
+ });
}
public Set<TrustAnchor> getTrustAnchors() {
@@ -57,12 +74,25 @@
if (mAnchors != null) {
return mAnchors;
}
- Set<TrustAnchor> anchors = new ArraySet<TrustAnchor>();
+ // Merge trust anchors based on the X509Certificate.
+ // If we see the same certificate in two TrustAnchors, one with overridesPins and one
+ // without, the one with overridesPins wins.
+ // Because mCertificatesEntryRefs is sorted with all overridesPins anchors coming first
+ // this can be simplified to just using the first occurrence of a certificate.
+ Map<X509Certificate, TrustAnchor> anchorMap = new ArrayMap<>();
for (CertificatesEntryRef ref : mCertificatesEntryRefs) {
- anchors.addAll(ref.getTrustAnchors());
+ Set<TrustAnchor> anchors = ref.getTrustAnchors();
+ for (TrustAnchor anchor : anchors) {
+ X509Certificate cert = anchor.certificate;
+ if (!anchorMap.containsKey(cert)) {
+ anchorMap.put(cert, anchor);
+ }
+ }
}
+ ArraySet<TrustAnchor> anchors = new ArraySet<TrustAnchor>(anchorMap.size());
+ anchors.addAll(anchorMap.values());
mAnchors = anchors;
- return anchors;
+ return mAnchors;
}
}
@@ -93,6 +123,17 @@
}
}
+ /** @hide */
+ public TrustAnchor findTrustAnchorBySubjectAndPublicKey(X509Certificate cert) {
+ for (CertificatesEntryRef ref : mCertificatesEntryRefs) {
+ TrustAnchor anchor = ref.findBySubjectAndPublicKey(cert);
+ if (anchor != null) {
+ return anchor;
+ }
+ }
+ return null;
+ }
+
/**
* Return a {@link Builder} for the default {@code NetworkSecurityConfig}.
*
diff --git a/core/java/android/security/net/config/NetworkSecurityConfigProvider.java b/core/java/android/security/net/config/NetworkSecurityConfigProvider.java
index ca8cdae..5ebc7ac 100644
--- a/core/java/android/security/net/config/NetworkSecurityConfigProvider.java
+++ b/core/java/android/security/net/config/NetworkSecurityConfigProvider.java
@@ -16,12 +16,13 @@
package android.security.net.config;
+import android.content.Context;
+import java.security.Security;
import java.security.Provider;
/** @hide */
public final class NetworkSecurityConfigProvider extends Provider {
-
- private static String PREFIX =
+ private static final String PREFIX =
NetworkSecurityConfigProvider.class.getPackage().getName() + ".";
public NetworkSecurityConfigProvider() {
@@ -30,4 +31,14 @@
put("TrustManagerFactory.PKIX", PREFIX + "RootTrustManagerFactorySpi");
put("Alg.Alias.TrustManagerFactory.X509", "PKIX");
}
+
+ public static void install(Context context) {
+ ApplicationConfig config = new ApplicationConfig(new ManifestConfigSource(context));
+ ApplicationConfig.setDefaultInstance(config);
+ int pos = Security.insertProviderAt(new NetworkSecurityConfigProvider(), 1);
+ if (pos != 1) {
+ throw new RuntimeException("Failed to install provider as highest priority provider."
+ + " Provider was installed at position " + pos);
+ }
+ }
}
diff --git a/core/java/android/security/net/config/NetworkSecurityTrustManager.java b/core/java/android/security/net/config/NetworkSecurityTrustManager.java
index 7f5b3ca..6013c1e 100644
--- a/core/java/android/security/net/config/NetworkSecurityTrustManager.java
+++ b/core/java/android/security/net/config/NetworkSecurityTrustManager.java
@@ -65,7 +65,7 @@
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
- throw new CertificateException("Client authentication not supported");
+ mDelegate.checkClientTrusted(chain, authType);
}
@Override
@@ -133,14 +133,8 @@
return false;
}
X509Certificate anchorCert = chain.get(chain.size() - 1);
- TrustAnchor chainAnchor = null;
- // TODO: faster lookup
- for (TrustAnchor anchor : mNetworkSecurityConfig.getTrustAnchors()) {
- if (anchor.certificate.equals(anchorCert)) {
- chainAnchor = anchor;
- break;
- }
- }
+ TrustAnchor chainAnchor =
+ mNetworkSecurityConfig.findTrustAnchorBySubjectAndPublicKey(anchorCert);
if (chainAnchor == null) {
throw new CertificateException("Trusted chain does not end in a TrustAnchor");
}
@@ -149,6 +143,6 @@
@Override
public X509Certificate[] getAcceptedIssuers() {
- return new X509Certificate[0];
+ return mDelegate.getAcceptedIssuers();
}
}
diff --git a/core/java/android/security/net/config/ResourceCertificateSource.java b/core/java/android/security/net/config/ResourceCertificateSource.java
index 06dd9d4..b007f8f 100644
--- a/core/java/android/security/net/config/ResourceCertificateSource.java
+++ b/core/java/android/security/net/config/ResourceCertificateSource.java
@@ -27,26 +27,29 @@
import java.util.Collection;
import java.util.Set;
+import com.android.org.conscrypt.TrustedCertificateIndex;
+
/**
* {@link CertificateSource} based on certificates contained in an application resource file.
* @hide
*/
public class ResourceCertificateSource implements CertificateSource {
- private Set<X509Certificate> mCertificates;
- private final int mResourceId;
- private Context mContext;
private final Object mLock = new Object();
+ private final int mResourceId;
+
+ private Set<X509Certificate> mCertificates;
+ private Context mContext;
+ private TrustedCertificateIndex mIndex;
public ResourceCertificateSource(int resourceId, Context context) {
mResourceId = resourceId;
mContext = context.getApplicationContext();
}
- @Override
- public Set<X509Certificate> getCertificates() {
+ private void ensureInitialized() {
synchronized (mLock) {
if (mCertificates != null) {
- return mCertificates;
+ return;
}
Set<X509Certificate> certificates = new ArraySet<X509Certificate>();
Collection<? extends Certificate> certs;
@@ -61,12 +64,30 @@
} finally {
IoUtils.closeQuietly(in);
}
+ TrustedCertificateIndex indexLocal = new TrustedCertificateIndex();
for (Certificate cert : certs) {
- certificates.add((X509Certificate) cert);
+ certificates.add((X509Certificate) cert);
+ indexLocal.index((X509Certificate) cert);
}
mCertificates = certificates;
+ mIndex = indexLocal;
mContext = null;
- return mCertificates;
}
}
+
+ @Override
+ public Set<X509Certificate> getCertificates() {
+ ensureInitialized();
+ return mCertificates;
+ }
+
+ @Override
+ public X509Certificate findBySubjectAndPublicKey(X509Certificate cert) {
+ ensureInitialized();
+ java.security.cert.TrustAnchor anchor = mIndex.findBySubjectAndPublicKey(cert);
+ if (anchor == null) {
+ return null;
+ }
+ return anchor.getTrustedCert();
+ }
}
diff --git a/core/java/android/security/net/config/RootTrustManager.java b/core/java/android/security/net/config/RootTrustManager.java
index b87bf1f..e307ad0 100644
--- a/core/java/android/security/net/config/RootTrustManager.java
+++ b/core/java/android/security/net/config/RootTrustManager.java
@@ -35,7 +35,6 @@
* @hide */
public class RootTrustManager implements X509TrustManager {
private final ApplicationConfig mConfig;
- private static final X509Certificate[] EMPTY_ISSUERS = new X509Certificate[0];
public RootTrustManager(ApplicationConfig config) {
if (config == null) {
@@ -47,7 +46,10 @@
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
- throw new CertificateException("Client authentication not supported");
+ // Use the default configuration for all client authentication. Domain specific configs are
+ // only for use in checking server trust not client trust.
+ NetworkSecurityConfig config = mConfig.getConfigForHostname("");
+ config.getTrustManager().checkClientTrusted(chain, authType);
}
@Override
@@ -84,6 +86,10 @@
@Override
public X509Certificate[] getAcceptedIssuers() {
- return EMPTY_ISSUERS;
+ // getAcceptedIssuers is meant to be used to determine which trust anchors the server will
+ // accept when verifying clients. Domain specific configs are only for use in checking
+ // server trust not client trust so use the default config.
+ NetworkSecurityConfig config = mConfig.getConfigForHostname("");
+ return config.getTrustManager().getAcceptedIssuers();
}
}
diff --git a/core/java/android/security/net/config/SystemCertificateSource.java b/core/java/android/security/net/config/SystemCertificateSource.java
index 7649a97..abef7b4 100644
--- a/core/java/android/security/net/config/SystemCertificateSource.java
+++ b/core/java/android/security/net/config/SystemCertificateSource.java
@@ -18,29 +18,20 @@
import android.os.Environment;
import android.os.UserHandle;
-import android.util.ArraySet;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Set;
-import libcore.io.IoUtils;
/**
* {@link CertificateSource} based on the system trusted CA store.
* @hide
*/
-public class SystemCertificateSource implements CertificateSource {
+public final class SystemCertificateSource extends DirectoryCertificateSource {
private static final SystemCertificateSource INSTANCE = new SystemCertificateSource();
- private Set<X509Certificate> mSystemCerts = null;
- private final Object mLock = new Object();
+ private final File mUserRemovedCaDir;
private SystemCertificateSource() {
+ super(new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts"));
+ File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId());
+ mUserRemovedCaDir = new File(configDir, "cacerts-removed");
}
public static SystemCertificateSource getInstance() {
@@ -48,54 +39,7 @@
}
@Override
- public Set<X509Certificate> getCertificates() {
- // TODO: loading all of these is wasteful, we should instead use a keystore style API.
- synchronized (mLock) {
- if (mSystemCerts != null) {
- return mSystemCerts;
- }
- CertificateFactory certFactory;
- try {
- certFactory = CertificateFactory.getInstance("X.509");
- } catch (CertificateException e) {
- throw new RuntimeException("Failed to obtain X.509 CertificateFactory", e);
- }
-
- final String ANDROID_ROOT = System.getenv("ANDROID_ROOT");
- final File systemCaDir = new File(ANDROID_ROOT + "/etc/security/cacerts");
- final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId());
- final File userRemovedCaDir = new File(configDir, "cacerts-removed");
- // Sanity check
- if (!systemCaDir.isDirectory()) {
- throw new AssertionError(systemCaDir + " is not a directory");
- }
-
- Set<X509Certificate> systemCerts = new ArraySet<X509Certificate>();
- for (String caFile : systemCaDir.list()) {
- // Skip any CAs in the user's deleted directory.
- if (new File(userRemovedCaDir, caFile).exists()) {
- continue;
- }
- InputStream is = null;
- try {
- is = new BufferedInputStream(
- new FileInputStream(new File(systemCaDir, caFile)));
- systemCerts.add((X509Certificate) certFactory.generateCertificate(is));
- } catch (CertificateException | IOException e) {
- // Don't rethrow to be consistent with conscrypt's cert loading code.
- continue;
- } finally {
- IoUtils.closeQuietly(is);
- }
- }
- mSystemCerts = systemCerts;
- return mSystemCerts;
- }
- }
-
- public void onCertificateStorageChange() {
- synchronized (mLock) {
- mSystemCerts = null;
- }
+ protected boolean isCertMarkedAsRemoved(String caFile) {
+ return new File(mUserRemovedCaDir, caFile).exists();
}
}
diff --git a/core/java/android/security/net/config/UserCertificateSource.java b/core/java/android/security/net/config/UserCertificateSource.java
index e9d5aa1..1a7d924 100644
--- a/core/java/android/security/net/config/UserCertificateSource.java
+++ b/core/java/android/security/net/config/UserCertificateSource.java
@@ -18,29 +18,18 @@
import android.os.Environment;
import android.os.UserHandle;
-import android.util.ArraySet;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Set;
-import libcore.io.IoUtils;
/**
* {@link CertificateSource} based on the user-installed trusted CA store.
* @hide
*/
-public class UserCertificateSource implements CertificateSource {
+public final class UserCertificateSource extends DirectoryCertificateSource {
private static final UserCertificateSource INSTANCE = new UserCertificateSource();
- private Set<X509Certificate> mUserCerts = null;
- private final Object mLock = new Object();
private UserCertificateSource() {
+ super(new File(
+ Environment.getUserConfigDirectory(UserHandle.myUserId()), "cacerts-added"));
}
public static UserCertificateSource getInstance() {
@@ -48,45 +37,7 @@
}
@Override
- public Set<X509Certificate> getCertificates() {
- // TODO: loading all of these is wasteful, we should instead use a keystore style API.
- synchronized (mLock) {
- if (mUserCerts != null) {
- return mUserCerts;
- }
- CertificateFactory certFactory;
- try {
- certFactory = CertificateFactory.getInstance("X.509");
- } catch (CertificateException e) {
- throw new RuntimeException("Failed to obtain X.509 CertificateFactory", e);
- }
- final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId());
- final File userCaDir = new File(configDir, "cacerts-added");
- Set<X509Certificate> userCerts = new ArraySet<X509Certificate>();
- // If the user hasn't added any certificates the directory may not exist.
- if (userCaDir.isDirectory()) {
- for (String caFile : userCaDir.list()) {
- InputStream is = null;
- try {
- is = new BufferedInputStream(
- new FileInputStream(new File(userCaDir, caFile)));
- userCerts.add((X509Certificate) certFactory.generateCertificate(is));
- } catch (CertificateException | IOException e) {
- // Don't rethrow to be consistent with conscrypt's cert loading code.
- continue;
- } finally {
- IoUtils.closeQuietly(is);
- }
- }
- }
- mUserCerts = userCerts;
- return mUserCerts;
- }
- }
-
- public void onCertificateStorageChange() {
- synchronized (mLock) {
- mUserCerts = null;
- }
+ protected boolean isCertMarkedAsRemoved(String caFile) {
+ return false;
}
}
diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index 7e7b5fc..ee97e8e 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -108,6 +108,11 @@
* This does not change the interruption filter, only the effects. **/
public static final int HINT_HOST_DISABLE_EFFECTS = 1;
+ public static final int SUPPRESSED_EFFECT_LIGHTS =
+ NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
+ public static final int SUPPRESSED_EFFECT_PEEK =
+ NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
+
/**
* The full trim of the StatusBarNotification including all its features.
*
@@ -822,6 +827,7 @@
private boolean mIsAmbient;
private boolean mMatchesInterruptionFilter;
private int mVisibilityOverride;
+ private int mSuppressedVisualEffects;
public Ranking() {}
@@ -861,6 +867,14 @@
return mVisibilityOverride;
}
+ /**
+ * Returns the type(s) of visual effects that should be suppressed for this notification.
+ * See {@link #SUPPRESSED_EFFECT_LIGHTS}, {@link #SUPPRESSED_EFFECT_PEEK}}.
+ */
+ public int getSuppressedVisualEffects() {
+ return mSuppressedVisualEffects;
+ }
+
/**
* Returns whether the notification matches the user's interruption
@@ -874,12 +888,14 @@
}
private void populate(String key, int rank, boolean isAmbient,
- boolean matchesInterruptionFilter, int visibilityOverride) {
+ boolean matchesInterruptionFilter, int visibilityOverride,
+ int suppressedVisualEffects) {
mKey = key;
mRank = rank;
mIsAmbient = isAmbient;
mMatchesInterruptionFilter = matchesInterruptionFilter;
mVisibilityOverride = visibilityOverride;
+ mSuppressedVisualEffects = suppressedVisualEffects;
}
}
@@ -896,6 +912,7 @@
private ArrayMap<String,Integer> mRanks;
private ArraySet<Object> mIntercepted;
private ArrayMap<String, Integer> mVisibilityOverrides;
+ private ArrayMap<String, Integer> mSuppressedVisualEffects;
private RankingMap(NotificationRankingUpdate rankingUpdate) {
mRankingUpdate = rankingUpdate;
@@ -921,7 +938,7 @@
public boolean getRanking(String key, Ranking outRanking) {
int rank = getRank(key);
outRanking.populate(key, rank, isAmbient(key), !isIntercepted(key),
- getVisibilityOverride(key));
+ getVisibilityOverride(key), getSuppressedVisualEffects(key));
return rank >= 0;
}
@@ -959,11 +976,24 @@
buildVisibilityOverridesLocked();
}
}
- Integer overide = mVisibilityOverrides.get(key);
- if (overide == null) {
+ Integer override = mVisibilityOverrides.get(key);
+ if (override == null) {
return Ranking.VISIBILITY_NO_OVERRIDE;
}
- return overide.intValue();
+ return override.intValue();
+ }
+
+ private int getSuppressedVisualEffects(String key) {
+ synchronized (this) {
+ if (mSuppressedVisualEffects == null) {
+ buildSuppressedVisualEffectsLocked();
+ }
+ }
+ Integer suppressed = mSuppressedVisualEffects.get(key);
+ if (suppressed == null) {
+ return 0;
+ }
+ return suppressed.intValue();
}
// Locked by 'this'
@@ -992,6 +1022,15 @@
}
}
+ // Locked by 'this'
+ private void buildSuppressedVisualEffectsLocked() {
+ Bundle suppressedBundle = mRankingUpdate.getSuppressedVisualEffects();
+ mSuppressedVisualEffects = new ArrayMap<>(suppressedBundle.size());
+ for (String key: suppressedBundle.keySet()) {
+ mSuppressedVisualEffects.put(key, suppressedBundle.getInt(key));
+ }
+ }
+
// ----------- Parcelable
@Override
diff --git a/core/java/android/service/notification/NotificationRankingUpdate.java b/core/java/android/service/notification/NotificationRankingUpdate.java
index 6fba900..1282fb1 100644
--- a/core/java/android/service/notification/NotificationRankingUpdate.java
+++ b/core/java/android/service/notification/NotificationRankingUpdate.java
@@ -28,13 +28,15 @@
private final String[] mInterceptedKeys;
private final int mFirstAmbientIndex;
private final Bundle mVisibilityOverrides;
+ private final Bundle mSuppressedVisualEffects;
public NotificationRankingUpdate(String[] keys, String[] interceptedKeys,
- Bundle visibilityOverrides, int firstAmbientIndex) {
+ Bundle visibilityOverrides, int firstAmbientIndex, Bundle suppressedVisualEffects) {
mKeys = keys;
mFirstAmbientIndex = firstAmbientIndex;
mInterceptedKeys = interceptedKeys;
mVisibilityOverrides = visibilityOverrides;
+ mSuppressedVisualEffects = suppressedVisualEffects;
}
public NotificationRankingUpdate(Parcel in) {
@@ -42,6 +44,7 @@
mFirstAmbientIndex = in.readInt();
mInterceptedKeys = in.readStringArray();
mVisibilityOverrides = in.readBundle();
+ mSuppressedVisualEffects = in.readBundle();
}
@Override
@@ -55,6 +58,7 @@
out.writeInt(mFirstAmbientIndex);
out.writeStringArray(mInterceptedKeys);
out.writeBundle(mVisibilityOverrides);
+ out.writeBundle(mSuppressedVisualEffects);
}
public static final Parcelable.Creator<NotificationRankingUpdate> CREATOR
@@ -83,4 +87,8 @@
public Bundle getVisibilityOverrides() {
return mVisibilityOverrides;
}
+
+ public Bundle getSuppressedVisualEffects() {
+ return mSuppressedVisualEffects;
+ }
}
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 82f1b28..541623d 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -77,6 +77,8 @@
private static final boolean DEFAULT_ALLOW_REMINDERS = true;
private static final boolean DEFAULT_ALLOW_EVENTS = true;
private static final boolean DEFAULT_ALLOW_REPEAT_CALLERS = false;
+ private static final boolean DEFAULT_ALLOW_PEEK = true;
+ private static final boolean DEFAULT_ALLOW_LIGHTS = true;
private static final int XML_VERSION = 2;
private static final String ZEN_TAG = "zen";
@@ -91,6 +93,8 @@
private static final String ALLOW_ATT_MESSAGES_FROM = "messagesFrom";
private static final String ALLOW_ATT_REMINDERS = "reminders";
private static final String ALLOW_ATT_EVENTS = "events";
+ private static final String ALLOW_ATT_PEEK = "peek";
+ private static final String ALLOW_ATT_LIGHTS = "lights";
private static final String CONDITION_TAG = "condition";
private static final String CONDITION_ATT_COMPONENT = "component";
@@ -122,6 +126,8 @@
public int allowCallsFrom = DEFAULT_SOURCE;
public int allowMessagesFrom = DEFAULT_SOURCE;
public int user = UserHandle.USER_SYSTEM;
+ public boolean allowPeek = DEFAULT_ALLOW_PEEK;
+ public boolean allowLights = DEFAULT_ALLOW_LIGHTS;
public ZenRule manualRule;
public ArrayMap<String, ZenRule> automaticRules = new ArrayMap<>();
@@ -148,6 +154,8 @@
automaticRules.put(ids[i], rules[i]);
}
}
+ allowPeek = source.readInt() == 1;
+ allowLights = source.readInt() == 1;
}
@Override
@@ -175,22 +183,26 @@
} else {
dest.writeInt(0);
}
+ dest.writeInt(allowPeek ? 1 : 0);
+ dest.writeInt(allowLights ? 1 : 0);
}
@Override
public String toString() {
return new StringBuilder(ZenModeConfig.class.getSimpleName()).append('[')
- .append("user=").append(user)
- .append(",allowCalls=").append(allowCalls)
- .append(",allowRepeatCallers=").append(allowRepeatCallers)
- .append(",allowMessages=").append(allowMessages)
- .append(",allowCallsFrom=").append(sourceToString(allowCallsFrom))
- .append(",allowMessagesFrom=").append(sourceToString(allowMessagesFrom))
- .append(",allowReminders=").append(allowReminders)
- .append(",allowEvents=").append(allowEvents)
- .append(",automaticRules=").append(automaticRules)
- .append(",manualRule=").append(manualRule)
- .append(']').toString();
+ .append("user=").append(user)
+ .append(",allowCalls=").append(allowCalls)
+ .append(",allowRepeatCallers=").append(allowRepeatCallers)
+ .append(",allowMessages=").append(allowMessages)
+ .append(",allowCallsFrom=").append(sourceToString(allowCallsFrom))
+ .append(",allowMessagesFrom=").append(sourceToString(allowMessagesFrom))
+ .append(",allowReminders=").append(allowReminders)
+ .append(",allowEvents=").append(allowEvents)
+ .append(",allowPeek=").append(allowPeek)
+ .append(",allowLights=").append(allowLights)
+ .append(",automaticRules=").append(automaticRules)
+ .append(",manualRule=").append(manualRule)
+ .append(']').toString();
}
private Diff diff(ZenModeConfig to) {
@@ -222,6 +234,12 @@
if (allowEvents != to.allowEvents) {
d.addLine("allowEvents", allowEvents, to.allowEvents);
}
+ if (allowPeek != to.allowPeek) {
+ d.addLine("allowPeek", allowPeek, to.allowPeek);
+ }
+ if (allowLights != to.allowLights) {
+ d.addLine("allowLights", allowLights, to.allowLights);
+ }
final ArraySet<String> allRules = new ArraySet<>();
addKeys(allRules, automaticRules);
addKeys(allRules, to.automaticRules);
@@ -319,6 +337,8 @@
&& other.allowMessagesFrom == allowMessagesFrom
&& other.allowReminders == allowReminders
&& other.allowEvents == allowEvents
+ && other.allowPeek == allowPeek
+ && other.allowLights == allowLights
&& other.user == user
&& Objects.equals(other.automaticRules, automaticRules)
&& Objects.equals(other.manualRule, manualRule);
@@ -327,7 +347,8 @@
@Override
public int hashCode() {
return Objects.hash(allowCalls, allowRepeatCallers, allowMessages, allowCallsFrom,
- allowMessagesFrom, allowReminders, allowEvents, user, automaticRules, manualRule);
+ allowMessagesFrom, allowReminders, allowEvents, allowPeek, allowLights,
+ user, automaticRules, manualRule);
}
private static String toDayList(int[] days) {
@@ -412,6 +433,8 @@
rt.allowCallsFrom = DEFAULT_SOURCE;
rt.allowMessagesFrom = DEFAULT_SOURCE;
}
+ rt.allowPeek = safeBoolean(parser, ALLOW_ATT_PEEK, DEFAULT_ALLOW_PEEK);
+ rt.allowLights = safeBoolean(parser, ALLOW_ATT_LIGHTS, DEFAULT_ALLOW_LIGHTS);
} else if (MANUAL_TAG.equals(tag)) {
rt.manualRule = readRuleXml(parser);
} else if (AUTOMATIC_TAG.equals(tag)) {
@@ -440,6 +463,8 @@
out.attribute(null, ALLOW_ATT_EVENTS, Boolean.toString(allowEvents));
out.attribute(null, ALLOW_ATT_CALLS_FROM, Integer.toString(allowCallsFrom));
out.attribute(null, ALLOW_ATT_MESSAGES_FROM, Integer.toString(allowMessagesFrom));
+ out.attribute(null, ALLOW_ATT_PEEK, Boolean.toString(allowPeek));
+ out.attribute(null, ALLOW_ATT_LIGHTS, Boolean.toString(allowLights));
out.endTag(null, ALLOW_TAG);
if (manualRule != null) {
@@ -611,9 +636,17 @@
if (allowRepeatCallers) {
priorityCategories |= Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
}
+ int suppressedVisualEffects = 0;
+ if (!allowPeek) {
+ suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_PEEK;
+ }
+ if (!allowLights) {
+ suppressedVisualEffects |= Policy.SUPPRESSED_EFFECT_LIGHTS;
+ }
priorityCallSenders = sourceToPrioritySenders(allowCallsFrom, priorityCallSenders);
priorityMessageSenders = sourceToPrioritySenders(allowMessagesFrom, priorityMessageSenders);
- return new Policy(priorityCategories, priorityCallSenders, priorityMessageSenders);
+ return new Policy(priorityCategories, priorityCallSenders, priorityMessageSenders,
+ suppressedVisualEffects);
}
private static int sourceToPrioritySenders(int source, int def) {
@@ -645,6 +678,10 @@
allowCallsFrom = prioritySendersToSource(policy.priorityCallSenders, allowCallsFrom);
allowMessagesFrom = prioritySendersToSource(policy.priorityMessageSenders,
allowMessagesFrom);
+ if (policy.suppressedVisualEffects != Policy.SUPPRESSED_EFFECTS_UNSET) {
+ allowPeek = (policy.suppressedVisualEffects & Policy.SUPPRESSED_EFFECT_PEEK) == 0;
+ allowLights = (policy.suppressedVisualEffects & Policy.SUPPRESSED_EFFECT_LIGHTS) == 0;
+ }
}
public static Condition toTimeCondition(Context context, int minutesFromNow, int userHandle) {
@@ -1073,7 +1110,7 @@
if (!Objects.equals(id, to.id)) {
d.addLine(item, "id", id, to.id);
}
- if (creationTime == to.creationTime) {
+ if (creationTime != to.creationTime) {
d.addLine(item, "creationTime", creationTime, to.creationTime);
}
}
diff --git a/core/java/android/service/quicksettings/IQSService.aidl b/core/java/android/service/quicksettings/IQSService.aidl
new file mode 100644
index 0000000..087eb61
--- /dev/null
+++ b/core/java/android/service/quicksettings/IQSService.aidl
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, 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.service.quicksettings;
+
+import android.content.ComponentName;
+import android.service.quicksettings.Tile;
+
+/**
+ * @hide
+ */
+interface IQSService {
+ void updateQsTile(in Tile tile);
+}
diff --git a/core/java/android/service/quicksettings/IQSTileService.aidl b/core/java/android/service/quicksettings/IQSTileService.aidl
new file mode 100644
index 0000000..6b46bee5
--- /dev/null
+++ b/core/java/android/service/quicksettings/IQSTileService.aidl
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, 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.service.quicksettings;
+
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.IQSService;
+
+/**
+ * @hide
+ */
+oneway interface IQSTileService {
+ void setQSTile(in Tile tile);
+ void onTileAdded();
+ void onTileRemoved();
+ void onStartListening();
+ void onStopListening();
+ void onClick();
+}
diff --git a/core/java/android/service/quicksettings/Tile.aidl b/core/java/android/service/quicksettings/Tile.aidl
new file mode 100644
index 0000000..0373326
--- /dev/null
+++ b/core/java/android/service/quicksettings/Tile.aidl
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015, 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.service.quicksettings;
+
+parcelable Tile;
diff --git a/core/java/android/service/quicksettings/Tile.java b/core/java/android/service/quicksettings/Tile.java
new file mode 100644
index 0000000..c8ae171
--- /dev/null
+++ b/core/java/android/service/quicksettings/Tile.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2015 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.service.quicksettings;
+
+import android.content.ComponentName;
+import android.graphics.drawable.Icon;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+import android.text.TextUtils;
+import android.util.Log;
+
+/**
+ * A Tile holds the state of a tile that will be displayed
+ * in Quick Settings.
+ *
+ * A tile in Quick Settings exists as an icon with an accompanied label.
+ * It also may have content description for accessibility usability.
+ * The style and layout of the tile may change to match a given
+ * device.
+ */
+public final class Tile implements Parcelable {
+
+ private static final String TAG = "Tile";
+
+ private ComponentName mComponentName;
+ private IQSService mService;
+ private Icon mIcon;
+ private CharSequence mLabel;
+ private CharSequence mContentDescription;
+
+ /**
+ * @hide
+ */
+ public Tile(Parcel source) {
+ readFromParcel(source);
+ }
+
+ /**
+ * @hide
+ */
+ public Tile(ComponentName componentName, IQSService service) {
+ mComponentName = componentName;
+ mService = service;
+ }
+
+ /**
+ * @hide
+ */
+ public ComponentName getComponentName() {
+ return mComponentName;
+ }
+
+ /**
+ * Gets the current icon for the tile.
+ */
+ public Icon getIcon() {
+ return mIcon;
+ }
+
+ /**
+ * Sets the current icon for the tile.
+ *
+ * This icon is expected to be white on alpha, and may be
+ * tinted by the system to match it's theme.
+ *
+ * Does not take effect until {@link #updateTile()} is called.
+ *
+ * @param icon New icon to show.
+ */
+ public void setIcon(Icon icon) {
+ this.mIcon = icon;
+ }
+
+ /**
+ * Gets the current label for the tile.
+ */
+ public CharSequence getLabel() {
+ return mLabel;
+ }
+
+ /**
+ * Sets the current label for the tile.
+ *
+ * Does not take effect until {@link #updateTile()} is called.
+ *
+ * @param label New label to show.
+ */
+ public void setLabel(CharSequence label) {
+ this.mLabel = label;
+ }
+
+ /**
+ * Gets the current content description for the tile.
+ */
+ public CharSequence getContentDescription() {
+ return mContentDescription;
+ }
+
+ /**
+ * Sets the current content description for the tile.
+ *
+ * Does not take effect until {@link #updateTile()} is called.
+ *
+ * @param contentDescription New content description to use.
+ */
+ public void setContentDescription(CharSequence contentDescription) {
+ this.mContentDescription = contentDescription;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /**
+ * Pushes the state of the Tile to Quick Settings to be displayed.
+ */
+ public void updateTile() {
+ try {
+ mService.updateQsTile(this);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Couldn't update tile");
+ }
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeStrongInterface(mService);
+ if (mComponentName != null) {
+ dest.writeByte((byte) 1);
+ mComponentName.writeToParcel(dest, flags);
+ } else {
+ dest.writeByte((byte) 0);
+ }
+ if (mIcon != null) {
+ dest.writeByte((byte) 1);
+ mIcon.writeToParcel(dest, flags);
+ } else {
+ dest.writeByte((byte) 0);
+ }
+ TextUtils.writeToParcel(mLabel, dest, flags);
+ TextUtils.writeToParcel(mContentDescription, dest, flags);
+ }
+
+ private void readFromParcel(Parcel source) {
+ mService = IQSService.Stub.asInterface(source.readStrongBinder());
+ if (source.readByte() != 0) {
+ mComponentName = ComponentName.CREATOR.createFromParcel(source);
+ } else {
+ mComponentName = null;
+ }
+ if (source.readByte() != 0) {
+ mIcon = Icon.CREATOR.createFromParcel(source);
+ } else {
+ mIcon = null;
+ }
+ mLabel = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
+ mContentDescription = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
+ }
+
+ public static final Creator<Tile> CREATOR = new Creator<Tile>() {
+ @Override
+ public Tile createFromParcel(Parcel source) {
+ return new Tile(source);
+ }
+
+ @Override
+ public Tile[] newArray(int size) {
+ return new Tile[size];
+ }
+ };
+}
\ No newline at end of file
diff --git a/core/java/android/service/quicksettings/TileService.java b/core/java/android/service/quicksettings/TileService.java
new file mode 100644
index 0000000..eba4c6f
--- /dev/null
+++ b/core/java/android/service/quicksettings/TileService.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2015 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.service.quicksettings;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.RemoteException;
+
+/**
+ * A QSTileService provides the user a tile that can be added to Quick Settings.
+ * Quick Settings is a space provided that allows the user to change settings and
+ * take quick actions without leaving the context of their current app.
+ *
+ * <p>The lifecycle of a QSTileService is different from some other services in
+ * that it may be unbound during parts of its lifecycle. Any of the following
+ * lifecycle events can happen indepently in a separate binding/creation of the
+ * service.</p>
+ *
+ * <ul>
+ * <li>When a tile is added by the user its QSTileService will be bound to and
+ * {@link #onTileAdded()} will be called.</li>
+ *
+ * <li>When a tile should be up to date and listing will be indicated by
+ * {@link #onStartListening()} and {@link #onStopListening()}.</li>
+ *
+ * <li>When the user removes a tile from Quick Settings {@link #onStopListening()}
+ * will be called.</li>
+ * </ul>
+ * <p>QSTileService will be detected by tiles that match the {@value #ACTION_QS_TILE}
+ * and require the permission "android.permission.BIND_QUICK_SETTINGS_TILE".
+ * The label and icon for the service will be used as the default label and
+ * icon for the tile. Here is an example QSTileService declaration.</p>
+ * <pre class="prettyprint">
+ * {@literal
+ * <service
+ * android:name=".MyQSTileService"
+ * android:label="@string/my_default_tile_label"
+ * android:icon="@drawable/my_default_icon_label"
+ * android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+ * <intent-filter>
+ * <action android:name="android.intent.action.QS_TILE" />
+ * </intent-filter>
+ * </service>}
+ * </pre>
+ *
+ * @see Tile Tile for details about the UI of a Quick Settings Tile.
+ */
+public class TileService extends Service {
+
+ /**
+ * Action that identifies a Service as being a QSTileService.
+ */
+ public static final String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
+
+ private final H mHandler = new H(Looper.getMainLooper());
+
+ private boolean mListening = false;
+ private Tile mTile;
+
+ /**
+ * Called when the user adds this tile to Quick Settings.
+ * <p/>
+ * Note that this is not guaranteed to be called between {@link #onCreate()}
+ * and {@link #onStartListening()}, it will only be called when the tile is added
+ * and not on subsequent binds.
+ */
+ public void onTileAdded() {
+ }
+
+ /**
+ * Called when the user removes this tile from Quick Settings.
+ */
+ public void onTileRemoved() {
+ }
+
+ /**
+ * Called when this tile moves into a listening state.
+ * <p/>
+ * When this tile is in a listening state it is expected to keep the
+ * UI up to date. Any listeners or callbacks needed to keep this tile
+ * up to date should be registered here and unregistered in {@link #onStopListening()}.
+ *
+ * @see #getQsTile()
+ * @see Tile#updateTile()
+ */
+ public void onStartListening() {
+ }
+
+ /**
+ * Called when this tile moves out of the listening state.
+ */
+ public void onStopListening() {
+ }
+
+ /**
+ * Called when the user clicks on this tile.
+ */
+ public void onClick() {
+ }
+
+ /**
+ * Gets the {@link Tile} for this service.
+ * <p/>
+ * This tile may be used to get or set the current state for this
+ * tile. This tile is only valid for updates between {@link #onStartListening()}
+ * and {@link #onStopListening()}.
+ */
+ public final Tile getQsTile() {
+ return mTile;
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return new IQSTileService.Stub() {
+ @Override
+ public void setQSTile(Tile tile) throws RemoteException {
+ mHandler.obtainMessage(H.MSG_SET_TILE, tile).sendToTarget();
+ }
+
+ @Override
+ public void onTileRemoved() throws RemoteException {
+ mHandler.sendEmptyMessage(H.MSG_TILE_REMOVED);
+ }
+
+ @Override
+ public void onTileAdded() throws RemoteException {
+ mHandler.sendEmptyMessage(H.MSG_TILE_ADDED);
+ }
+
+ @Override
+ public void onStopListening() throws RemoteException {
+ mHandler.sendEmptyMessage(H.MSG_STOP_LISTENING);
+ }
+
+ @Override
+ public void onStartListening() throws RemoteException {
+ mHandler.sendEmptyMessage(H.MSG_START_LISTENING);
+ }
+
+ @Override
+ public void onClick() throws RemoteException {
+ mHandler.sendEmptyMessage(H.MSG_TILE_CLICKED);
+ }
+ };
+ }
+
+ private class H extends Handler {
+ private static final int MSG_SET_TILE = 1;
+ private static final int MSG_START_LISTENING = 2;
+ private static final int MSG_STOP_LISTENING = 3;
+ private static final int MSG_TILE_ADDED = 4;
+ private static final int MSG_TILE_REMOVED = 5;
+ private static final int MSG_TILE_CLICKED = 6;
+
+ public H(Looper looper) {
+ super(looper);
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_SET_TILE:
+ mTile = (Tile) msg.obj;
+ break;
+ case MSG_TILE_ADDED:
+ TileService.this.onTileRemoved();
+ break;
+ case MSG_TILE_REMOVED:
+ TileService.this.onTileAdded();
+ break;
+ case MSG_START_LISTENING:
+ if (mListening) {
+ mListening = false;
+ TileService.this.onStopListening();
+ }
+ break;
+ case MSG_STOP_LISTENING:
+ if (!mListening) {
+ mListening = true;
+ TileService.this.onStartListening();
+ }
+ break;
+ case MSG_TILE_CLICKED:
+ TileService.this.onClick();
+ break;
+ }
+ }
+ }
+}
diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
index 463eb5b..ebe3f47 100644
--- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java
+++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
@@ -52,9 +52,21 @@
}
public VoiceInteractionServiceInfo(PackageManager pm, ComponentName comp, int userHandle)
- throws PackageManager.NameNotFoundException, RemoteException {
- this(pm, AppGlobals.getPackageManager().getServiceInfo(comp,
- PackageManager.GET_META_DATA, userHandle));
+ throws PackageManager.NameNotFoundException {
+ this(pm, getServiceInfoOrThrow(comp, userHandle));
+ }
+
+ static ServiceInfo getServiceInfoOrThrow(ComponentName comp, int userHandle)
+ throws PackageManager.NameNotFoundException {
+ try {
+ ServiceInfo si = AppGlobals.getPackageManager().getServiceInfo(comp,
+ PackageManager.GET_META_DATA, userHandle);
+ if (si != null) {
+ return si;
+ }
+ } catch (RemoteException e) {
+ }
+ throw new PackageManager.NameNotFoundException(comp.toString());
}
public VoiceInteractionServiceInfo(PackageManager pm, ServiceInfo si) {
diff --git a/core/java/android/speech/tts/FileSynthesisCallback.java b/core/java/android/speech/tts/FileSynthesisCallback.java
index a88eead..c7a4ccc 100644
--- a/core/java/android/speech/tts/FileSynthesisCallback.java
+++ b/core/java/android/speech/tts/FileSynthesisCallback.java
@@ -15,6 +15,7 @@
*/
package android.speech.tts;
+import android.annotation.NonNull;
import android.media.AudioFormat;
import android.speech.tts.TextToSpeechService.UtteranceProgressDispatcher;
import android.util.Log;
@@ -46,7 +47,6 @@
private FileChannel mFileChannel;
private final UtteranceProgressDispatcher mDispatcher;
- private final Object mCallerIdentity;
private boolean mStarted = false;
private boolean mDone = false;
@@ -54,12 +54,11 @@
/** Status code of synthesis */
protected int mStatusCode;
- FileSynthesisCallback(FileChannel fileChannel, UtteranceProgressDispatcher dispatcher,
- Object callerIdentity, boolean clientIsUsingV2) {
+ FileSynthesisCallback(@NonNull FileChannel fileChannel,
+ @NonNull UtteranceProgressDispatcher dispatcher, boolean clientIsUsingV2) {
super(clientIsUsingV2);
mFileChannel = fileChannel;
mDispatcher = dispatcher;
- mCallerIdentity = callerIdentity;
mStatusCode = TextToSpeech.SUCCESS;
}
@@ -75,9 +74,7 @@
mStatusCode = TextToSpeech.STOPPED;
cleanUp();
- if (mDispatcher != null) {
- mDispatcher.dispatchOnStop();
- }
+ mDispatcher.dispatchOnStop();
}
}
@@ -107,6 +104,14 @@
Log.d(TAG, "FileSynthesisRequest.start(" + sampleRateInHz + "," + audioFormat
+ "," + channelCount + ")");
}
+ if (audioFormat != AudioFormat.ENCODING_PCM_8BIT ||
+ audioFormat != AudioFormat.ENCODING_PCM_16BIT ||
+ audioFormat != AudioFormat.ENCODING_PCM_FLOAT) {
+ Log.e(TAG, "Audio format encoding " + audioFormat + " not supported. Please use one " +
+ "of AudioFormat.ENCODING_PCM_8BIT, AudioFormat.ENCODING_PCM_16BIT or " +
+ "AudioFormat.ENCODING_PCM_FLOAT");
+ }
+
FileChannel fileChannel = null;
synchronized (mStateLock) {
if (mStatusCode == TextToSpeech.STOPPED) {
@@ -126,9 +131,7 @@
mAudioFormat = audioFormat;
mChannelCount = channelCount;
- if (mDispatcher != null) {
- mDispatcher.dispatchOnStart();
- }
+ mDispatcher.dispatchOnStart();
fileChannel = mFileChannel;
}
@@ -206,8 +209,7 @@
if (DBG) Log.d(TAG, "Request has been aborted.");
return errorCodeOnStop();
}
- if (mDispatcher != null && mStatusCode != TextToSpeech.SUCCESS &&
- mStatusCode != TextToSpeech.STOPPED) {
+ if (mStatusCode != TextToSpeech.SUCCESS && mStatusCode != TextToSpeech.STOPPED) {
mDispatcher.dispatchOnError(mStatusCode);
return TextToSpeech.ERROR;
}
@@ -231,9 +233,7 @@
synchronized (mStateLock) {
closeFile();
- if (mDispatcher != null) {
- mDispatcher.dispatchOnSuccess();
- }
+ mDispatcher.dispatchOnSuccess();
return TextToSpeech.SUCCESS;
}
} catch (IOException ex) {
diff --git a/core/java/android/speech/tts/PlaybackSynthesisCallback.java b/core/java/android/speech/tts/PlaybackSynthesisCallback.java
index f850f10..a6fb543 100644
--- a/core/java/android/speech/tts/PlaybackSynthesisCallback.java
+++ b/core/java/android/speech/tts/PlaybackSynthesisCallback.java
@@ -15,6 +15,7 @@
*/
package android.speech.tts;
+import android.media.AudioFormat;
import android.speech.tts.TextToSpeechService.AudioOutputParams;
import android.speech.tts.TextToSpeechService.UtteranceProgressDispatcher;
import android.util.Log;
@@ -122,6 +123,13 @@
public int start(int sampleRateInHz, int audioFormat, int channelCount) {
if (DBG) Log.d(TAG, "start(" + sampleRateInHz + "," + audioFormat + "," + channelCount
+ ")");
+ if (audioFormat != AudioFormat.ENCODING_PCM_8BIT ||
+ audioFormat != AudioFormat.ENCODING_PCM_16BIT ||
+ audioFormat != AudioFormat.ENCODING_PCM_FLOAT) {
+ Log.w(TAG, "Audio format encoding " + audioFormat + " not supported. Please use one " +
+ "of AudioFormat.ENCODING_PCM_8BIT, AudioFormat.ENCODING_PCM_16BIT or " +
+ "AudioFormat.ENCODING_PCM_FLOAT");
+ }
int channelConfig = BlockingAudioTrack.getChannelConfig(channelCount);
diff --git a/core/java/android/speech/tts/SynthesisCallback.java b/core/java/android/speech/tts/SynthesisCallback.java
index e32438b..6c7a217 100644
--- a/core/java/android/speech/tts/SynthesisCallback.java
+++ b/core/java/android/speech/tts/SynthesisCallback.java
@@ -15,6 +15,14 @@
*/
package android.speech.tts;
+import android.annotation.IntDef;
+import android.annotation.IntRange;
+import android.media.AudioFormat;
+import android.speech.tts.TextToSpeech;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* A callback to return speech data synthesized by a text to speech engine.
*
@@ -31,6 +39,13 @@
* All methods can be only called on the synthesis thread.
*/
public interface SynthesisCallback {
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({AudioFormat.ENCODING_PCM_8BIT, AudioFormat.ENCODING_PCM_16BIT,
+ AudioFormat.ENCODING_PCM_FLOAT})
+ public @interface SupportedAudioFormat {};
+
/**
* @return the maximum number of bytes that the TTS engine can pass in a single call of
* {@link #audioAvailable}. Calls to {@link #audioAvailable} with data lengths
@@ -38,6 +53,7 @@
*/
public int getMaxBufferSize();
+ // TODO: Replace reference to Android N to an API level when the API level for N is decided.
/**
* The service should call this when it starts to synthesize audio for this
* request.
@@ -47,12 +63,16 @@
*
* @param sampleRateInHz Sample rate in HZ of the generated audio.
* @param audioFormat Audio format of the generated audio. Must be one of
- * the ENCODING_ constants defined in {@link android.media.AudioFormat}.
+ * {@link AudioFormat#ENCODING_PCM_8BIT} or
+ * {@link AudioFormat#ENCODING_PCM_16BIT}. Can also be
+ * {@link AudioFormat#ENCODING_PCM_FLOAT} when targetting Android N and
+ * above.
* @param channelCount The number of channels. Must be {@code 1} or {@code 2}.
* @return {@link TextToSpeech#SUCCESS}, {@link TextToSpeech#ERROR} or
* {@link TextToSpeech#STOPPED}.
*/
- public int start(int sampleRateInHz, int audioFormat, int channelCount);
+ public int start(int sampleRateInHz, @SupportedAudioFormat int audioFormat,
+ @IntRange(from=1,to=2) int channelCount);
/**
* The service should call this method when synthesized audio is ready for consumption.
@@ -102,7 +122,7 @@
* @param errorCode Error code to pass to the client. One of the ERROR_ values from
* {@link TextToSpeech}
*/
- public void error(int errorCode);
+ public void error(@TextToSpeech.Error int errorCode);
/**
* Check if {@link #start} was called or not.
diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java
index eae4329..61c33ff 100644
--- a/core/java/android/speech/tts/TextToSpeech.java
+++ b/core/java/android/speech/tts/TextToSpeech.java
@@ -15,6 +15,7 @@
*/
package android.speech.tts;
+import android.annotation.IntDef;
import android.annotation.RawRes;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
@@ -38,6 +39,8 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -75,6 +78,12 @@
*/
public static final int STOPPED = -2;
+ /** @hide */
+ @IntDef({ERROR_SYNTHESIS, ERROR_SERVICE, ERROR_OUTPUT, ERROR_NETWORK, ERROR_NETWORK_TIMEOUT,
+ ERROR_INVALID_REQUEST, ERROR_NOT_INSTALLED_YET})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Error {}
+
/**
* Denotes a failure of a TTS engine to synthesize the given input.
*/
diff --git a/core/java/android/speech/tts/TextToSpeechService.java b/core/java/android/speech/tts/TextToSpeechService.java
index c3aed75..8c355d8 100644
--- a/core/java/android/speech/tts/TextToSpeechService.java
+++ b/core/java/android/speech/tts/TextToSpeechService.java
@@ -1032,8 +1032,7 @@
@Override
protected AbstractSynthesisCallback createSynthesisCallback() {
- return new FileSynthesisCallback(mFileOutputStream.getChannel(),
- this, getCallerIdentity(), false);
+ return new FileSynthesisCallback(mFileOutputStream.getChannel(), this, false);
}
@Override
diff --git a/core/java/android/text/Hyphenator.java b/core/java/android/text/Hyphenator.java
index f2b6041..5d9d929 100644
--- a/core/java/android/text/Hyphenator.java
+++ b/core/java/android/text/Hyphenator.java
@@ -166,7 +166,7 @@
sMap.put(null, null);
// TODO: replace this with a discovery-based method that looks into /system/usr/hyphen-data
- String[] availableLanguages = {"en-US", "eu", "hu", "hy", "nb", "nn", "und-Ethi"};
+ String[] availableLanguages = {"en-US", "es", "eu", "hu", "hy", "nb", "nn", "und-Ethi"};
for (int i = 0; i < availableLanguages.length; i++) {
String languageTag = availableLanguages[i];
Hyphenator h = loadHyphenator(languageTag);
diff --git a/core/java/android/util/LocaleList.java b/core/java/android/util/LocaleList.java
index 0d5c135..c1d23bb 100644
--- a/core/java/android/util/LocaleList.java
+++ b/core/java/android/util/LocaleList.java
@@ -49,6 +49,7 @@
return location < mList.length ? mList[location] : null;
}
+ @Nullable
public Locale getPrimary() {
return mList.length == 0 ? null : get(0);
}
@@ -179,6 +180,12 @@
}
}
+ @Nullable
+ public Locale getBestMatch(String[] locales) {
+ // TODO: Fix this to actually do locale negotiation and choose the best match
+ return getPrimary();
+ }
+
private final static Object sLock = new Object();
@GuardedBy("sLock")
diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java
index f099479..f17a16c 100644
--- a/core/java/android/util/PathParser.java
+++ b/core/java/android/util/PathParser.java
@@ -15,10 +15,6 @@
package android.util;
import android.graphics.Path;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Arrays;
/**
* @hide
@@ -45,663 +41,94 @@
}
/**
- * @param pathData The string representing a path, the same as "d" string in svg file.
- * @return an array of the PathDataNode.
+ * Interpret PathData as path commands and insert the commands to the given path.
+ *
+ * @param data The source PathData to be converted.
+ * @param outPath The Path object where path commands will be inserted.
*/
- public static PathDataNode[] createNodesFromPathData(String pathData) {
- if (pathData == null) {
- return null;
- }
- int start = 0;
- int end = 1;
-
- ArrayList<PathDataNode> list = new ArrayList<PathDataNode>();
- while (end < pathData.length()) {
- end = nextStart(pathData, end);
- String s = pathData.substring(start, end).trim();
- if (s.length() > 0) {
- float[] val = getFloats(s);
- addNode(list, s.charAt(0), val);
- }
-
- start = end;
- end++;
- }
- if ((end - start) == 1 && start < pathData.length()) {
- addNode(list, pathData.charAt(start), new float[0]);
- }
- return list.toArray(new PathDataNode[list.size()]);
+ public static void createPathFromPathData(Path outPath, PathData data) {
+ nCreatePathFromPathData(outPath.mNativePath, data.mNativePathData);
}
/**
- * @param source The array of PathDataNode to be duplicated.
- * @return a deep copy of the <code>source</code>.
- */
- public static PathDataNode[] deepCopyNodes(PathDataNode[] source) {
- if (source == null) {
- return null;
- }
- PathDataNode[] copy = new PathParser.PathDataNode[source.length];
- for (int i = 0; i < source.length; i ++) {
- copy[i] = new PathDataNode(source[i]);
- }
- return copy;
- }
-
- /**
- * @param nodesFrom The source path represented in an array of PathDataNode
- * @param nodesTo The target path represented in an array of PathDataNode
+ * @param pathDataFrom The source path represented in PathData
+ * @param pathDataTo The target path represented in PathData
* @return whether the <code>nodesFrom</code> can morph into <code>nodesTo</code>
*/
- public static boolean canMorph(PathDataNode[] nodesFrom, PathDataNode[] nodesTo) {
- if (nodesFrom == null || nodesTo == null) {
- return false;
- }
-
- if (nodesFrom.length != nodesTo.length) {
- return false;
- }
-
- for (int i = 0; i < nodesFrom.length; i ++) {
- if (nodesFrom[i].mType != nodesTo[i].mType
- || nodesFrom[i].mParams.length != nodesTo[i].mParams.length) {
- return false;
- }
- }
- return true;
+ public static boolean canMorph(PathData pathDataFrom, PathData pathDataTo) {
+ return nCanMorph(pathDataFrom.mNativePathData, pathDataTo.mNativePathData);
}
/**
- * Update the target's data to match the source.
- * Before calling this, make sure canMorph(target, source) is true.
+ * PathData class is a wrapper around the native PathData object, which contains
+ * the result of parsing a path string. Specifically, there are verbs and points
+ * associated with each verb stored in PathData. This data can then be used to
+ * generate commands to manipulate a Path.
+ */
+ public static class PathData {
+ long mNativePathData = 0;
+ public PathData() {
+ mNativePathData = nCreateEmptyPathData();
+ }
+
+ public PathData(PathData data) {
+ mNativePathData = nCreatePathData(data.mNativePathData);
+ }
+
+ public PathData(String pathString) {
+ mNativePathData = nCreatePathDataFromString(pathString, pathString.length());
+ if (mNativePathData == 0) {
+ throw new IllegalArgumentException("Invalid pathData: " + pathString);
+ }
+ }
+
+ /**
+ * Update the path data to match the source.
+ * Before calling this, make sure canMorph(target, source) is true.
+ *
+ * @param source The source path represented in PathData
+ */
+ public void setPathData(PathData source) {
+ nSetPathData(mNativePathData, source.mNativePathData);
+ }
+
+ @Override
+ protected void finalize() throws Throwable {
+ if (mNativePathData != 0) {
+ nFinalize(mNativePathData);
+ mNativePathData = 0;
+ }
+ super.finalize();
+ }
+ }
+
+ /**
+ * Interpolate between the <code>fromData</code> and <code>toData</code> according to the
+ * <code>fraction</code>, and put the resulting path data into <code>outData</code>.
*
- * @param target The target path represented in an array of PathDataNode
- * @param source The source path represented in an array of PathDataNode
+ * @param outData The resulting PathData of the interpolation
+ * @param fromData The start value as a PathData.
+ * @param toData The end value as a PathData
+ * @param fraction The fraction to interpolate.
*/
- public static void updateNodes(PathDataNode[] target, PathDataNode[] source) {
- for (int i = 0; i < source.length; i ++) {
- target[i].mType = source[i].mType;
- for (int j = 0; j < source[i].mParams.length; j ++) {
- target[i].mParams[j] = source[i].mParams[j];
- }
- }
+ public static boolean interpolatePathData(PathData outData, PathData fromData, PathData toData,
+ float fraction) {
+ return nInterpolatePathData(outData.mNativePathData, fromData.mNativePathData,
+ toData.mNativePathData, fraction);
}
- private static int nextStart(String s, int end) {
- char c;
-
- while (end < s.length()) {
- c = s.charAt(end);
- // Note that 'e' or 'E' are not valid path commands, but could be
- // used for floating point numbers' scientific notation.
- // Therefore, when searching for next command, we should ignore 'e'
- // and 'E'.
- if ((((c - 'A') * (c - 'Z') <= 0) || ((c - 'a') * (c - 'z') <= 0))
- && c != 'e' && c != 'E') {
- return end;
- }
- end++;
- }
- return end;
- }
-
- private static void addNode(ArrayList<PathDataNode> list, char cmd, float[] val) {
- list.add(new PathDataNode(cmd, val));
- }
-
- private static class ExtractFloatResult {
- // We need to return the position of the next separator and whether the
- // next float starts with a '-' or a '.'.
- int mEndPosition;
- boolean mEndWithNegOrDot;
- }
-
- /**
- * Parse the floats in the string.
- * This is an optimized version of parseFloat(s.split(",|\\s"));
- *
- * @param s the string containing a command and list of floats
- * @return array of floats
- */
- private static float[] getFloats(String s) {
- if (s.charAt(0) == 'z' || s.charAt(0) == 'Z') {
- return new float[0];
- }
- try {
- float[] results = new float[s.length()];
- int count = 0;
- int startPosition = 1;
- int endPosition = 0;
-
- ExtractFloatResult result = new ExtractFloatResult();
- int totalLength = s.length();
-
- // The startPosition should always be the first character of the
- // current number, and endPosition is the character after the current
- // number.
- while (startPosition < totalLength) {
- extract(s, startPosition, result);
- endPosition = result.mEndPosition;
-
- if (startPosition < endPosition) {
- results[count++] = Float.parseFloat(
- s.substring(startPosition, endPosition));
- }
-
- if (result.mEndWithNegOrDot) {
- // Keep the '-' or '.' sign with next number.
- startPosition = endPosition;
- } else {
- startPosition = endPosition + 1;
- }
- }
- return Arrays.copyOf(results, count);
- } catch (NumberFormatException e) {
- throw new RuntimeException("error in parsing \"" + s + "\"", e);
- }
- }
-
- /**
- * Calculate the position of the next comma or space or negative sign
- * @param s the string to search
- * @param start the position to start searching
- * @param result the result of the extraction, including the position of the
- * the starting position of next number, whether it is ending with a '-'.
- */
- private static void extract(String s, int start, ExtractFloatResult result) {
- // Now looking for ' ', ',', '.' or '-' from the start.
- int currentIndex = start;
- boolean foundSeparator = false;
- result.mEndWithNegOrDot = false;
- boolean secondDot = false;
- boolean isExponential = false;
- for (; currentIndex < s.length(); currentIndex++) {
- boolean isPrevExponential = isExponential;
- isExponential = false;
- char currentChar = s.charAt(currentIndex);
- switch (currentChar) {
- case ' ':
- case ',':
- foundSeparator = true;
- break;
- case '-':
- // The negative sign following a 'e' or 'E' is not a separator.
- if (currentIndex != start && !isPrevExponential) {
- foundSeparator = true;
- result.mEndWithNegOrDot = true;
- }
- break;
- case '.':
- if (!secondDot) {
- secondDot = true;
- } else {
- // This is the second dot, and it is considered as a separator.
- foundSeparator = true;
- result.mEndWithNegOrDot = true;
- }
- break;
- case 'e':
- case 'E':
- isExponential = true;
- break;
- }
- if (foundSeparator) {
- break;
- }
- }
- // When there is nothing found, then we put the end position to the end
- // of the string.
- result.mEndPosition = currentIndex;
- }
-
- /**
- * Each PathDataNode represents one command in the "d" attribute of the svg
- * file.
- * An array of PathDataNode can represent the whole "d" attribute.
- */
- public static class PathDataNode {
- private char mType;
- private float[] mParams;
-
- private PathDataNode(char type, float[] params) {
- mType = type;
- mParams = params;
- }
-
- private PathDataNode(PathDataNode n) {
- mType = n.mType;
- mParams = Arrays.copyOf(n.mParams, n.mParams.length);
- }
-
- /**
- * Convert an array of PathDataNode to Path.
- *
- * @param node The source array of PathDataNode.
- * @param path The target Path object.
- */
- public static void nodesToPath(PathDataNode[] node, Path path) {
- float[] current = new float[6];
- char previousCommand = 'm';
- for (int i = 0; i < node.length; i++) {
- addCommand(path, current, previousCommand, node[i].mType, node[i].mParams);
- previousCommand = node[i].mType;
- }
- }
-
- /**
- * The current PathDataNode will be interpolated between the
- * <code>nodeFrom</code> and <code>nodeTo</code> according to the
- * <code>fraction</code>.
- *
- * @param nodeFrom The start value as a PathDataNode.
- * @param nodeTo The end value as a PathDataNode
- * @param fraction The fraction to interpolate.
- */
- public void interpolatePathDataNode(PathDataNode nodeFrom,
- PathDataNode nodeTo, float fraction) {
- for (int i = 0; i < nodeFrom.mParams.length; i++) {
- mParams[i] = nodeFrom.mParams[i] * (1 - fraction)
- + nodeTo.mParams[i] * fraction;
- }
- }
-
- private static void addCommand(Path path, float[] current,
- char previousCmd, char cmd, float[] val) {
-
- int incr = 2;
- float currentX = current[0];
- float currentY = current[1];
- float ctrlPointX = current[2];
- float ctrlPointY = current[3];
- float currentSegmentStartX = current[4];
- float currentSegmentStartY = current[5];
- float reflectiveCtrlPointX;
- float reflectiveCtrlPointY;
-
- switch (cmd) {
- case 'z':
- case 'Z':
- path.close();
- // Path is closed here, but we need to move the pen to the
- // closed position. So we cache the segment's starting position,
- // and restore it here.
- currentX = currentSegmentStartX;
- currentY = currentSegmentStartY;
- ctrlPointX = currentSegmentStartX;
- ctrlPointY = currentSegmentStartY;
- path.moveTo(currentX, currentY);
- break;
- case 'm':
- case 'M':
- case 'l':
- case 'L':
- case 't':
- case 'T':
- incr = 2;
- break;
- case 'h':
- case 'H':
- case 'v':
- case 'V':
- incr = 1;
- break;
- case 'c':
- case 'C':
- incr = 6;
- break;
- case 's':
- case 'S':
- case 'q':
- case 'Q':
- incr = 4;
- break;
- case 'a':
- case 'A':
- incr = 7;
- break;
- }
-
- for (int k = 0; k < val.length; k += incr) {
- switch (cmd) {
- case 'm': // moveto - Start a new sub-path (relative)
- currentX += val[k + 0];
- currentY += val[k + 1];
- if (k > 0) {
- // According to the spec, if a moveto is followed by multiple
- // pairs of coordinates, the subsequent pairs are treated as
- // implicit lineto commands.
- path.rLineTo(val[k + 0], val[k + 1]);
- } else {
- path.rMoveTo(val[k + 0], val[k + 1]);
- currentSegmentStartX = currentX;
- currentSegmentStartY = currentY;
- }
- break;
- case 'M': // moveto - Start a new sub-path
- currentX = val[k + 0];
- currentY = val[k + 1];
- if (k > 0) {
- // According to the spec, if a moveto is followed by multiple
- // pairs of coordinates, the subsequent pairs are treated as
- // implicit lineto commands.
- path.lineTo(val[k + 0], val[k + 1]);
- } else {
- path.moveTo(val[k + 0], val[k + 1]);
- currentSegmentStartX = currentX;
- currentSegmentStartY = currentY;
- }
- break;
- case 'l': // lineto - Draw a line from the current point (relative)
- path.rLineTo(val[k + 0], val[k + 1]);
- currentX += val[k + 0];
- currentY += val[k + 1];
- break;
- case 'L': // lineto - Draw a line from the current point
- path.lineTo(val[k + 0], val[k + 1]);
- currentX = val[k + 0];
- currentY = val[k + 1];
- break;
- case 'h': // horizontal lineto - Draws a horizontal line (relative)
- path.rLineTo(val[k + 0], 0);
- currentX += val[k + 0];
- break;
- case 'H': // horizontal lineto - Draws a horizontal line
- path.lineTo(val[k + 0], currentY);
- currentX = val[k + 0];
- break;
- case 'v': // vertical lineto - Draws a vertical line from the current point (r)
- path.rLineTo(0, val[k + 0]);
- currentY += val[k + 0];
- break;
- case 'V': // vertical lineto - Draws a vertical line from the current point
- path.lineTo(currentX, val[k + 0]);
- currentY = val[k + 0];
- break;
- case 'c': // curveto - Draws a cubic Bézier curve (relative)
- path.rCubicTo(val[k + 0], val[k + 1], val[k + 2], val[k + 3],
- val[k + 4], val[k + 5]);
-
- ctrlPointX = currentX + val[k + 2];
- ctrlPointY = currentY + val[k + 3];
- currentX += val[k + 4];
- currentY += val[k + 5];
-
- break;
- case 'C': // curveto - Draws a cubic Bézier curve
- path.cubicTo(val[k + 0], val[k + 1], val[k + 2], val[k + 3],
- val[k + 4], val[k + 5]);
- currentX = val[k + 4];
- currentY = val[k + 5];
- ctrlPointX = val[k + 2];
- ctrlPointY = val[k + 3];
- break;
- case 's': // smooth curveto - Draws a cubic Bézier curve (reflective cp)
- reflectiveCtrlPointX = 0;
- reflectiveCtrlPointY = 0;
- if (previousCmd == 'c' || previousCmd == 's'
- || previousCmd == 'C' || previousCmd == 'S') {
- reflectiveCtrlPointX = currentX - ctrlPointX;
- reflectiveCtrlPointY = currentY - ctrlPointY;
- }
- path.rCubicTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- val[k + 0], val[k + 1],
- val[k + 2], val[k + 3]);
-
- ctrlPointX = currentX + val[k + 0];
- ctrlPointY = currentY + val[k + 1];
- currentX += val[k + 2];
- currentY += val[k + 3];
- break;
- case 'S': // shorthand/smooth curveto Draws a cubic Bézier curve(reflective cp)
- reflectiveCtrlPointX = currentX;
- reflectiveCtrlPointY = currentY;
- if (previousCmd == 'c' || previousCmd == 's'
- || previousCmd == 'C' || previousCmd == 'S') {
- reflectiveCtrlPointX = 2 * currentX - ctrlPointX;
- reflectiveCtrlPointY = 2 * currentY - ctrlPointY;
- }
- path.cubicTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- val[k + 0], val[k + 1], val[k + 2], val[k + 3]);
- ctrlPointX = val[k + 0];
- ctrlPointY = val[k + 1];
- currentX = val[k + 2];
- currentY = val[k + 3];
- break;
- case 'q': // Draws a quadratic Bézier (relative)
- path.rQuadTo(val[k + 0], val[k + 1], val[k + 2], val[k + 3]);
- ctrlPointX = currentX + val[k + 0];
- ctrlPointY = currentY + val[k + 1];
- currentX += val[k + 2];
- currentY += val[k + 3];
- break;
- case 'Q': // Draws a quadratic Bézier
- path.quadTo(val[k + 0], val[k + 1], val[k + 2], val[k + 3]);
- ctrlPointX = val[k + 0];
- ctrlPointY = val[k + 1];
- currentX = val[k + 2];
- currentY = val[k + 3];
- break;
- case 't': // Draws a quadratic Bézier curve(reflective control point)(relative)
- reflectiveCtrlPointX = 0;
- reflectiveCtrlPointY = 0;
- if (previousCmd == 'q' || previousCmd == 't'
- || previousCmd == 'Q' || previousCmd == 'T') {
- reflectiveCtrlPointX = currentX - ctrlPointX;
- reflectiveCtrlPointY = currentY - ctrlPointY;
- }
- path.rQuadTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- val[k + 0], val[k + 1]);
- ctrlPointX = currentX + reflectiveCtrlPointX;
- ctrlPointY = currentY + reflectiveCtrlPointY;
- currentX += val[k + 0];
- currentY += val[k + 1];
- break;
- case 'T': // Draws a quadratic Bézier curve (reflective control point)
- reflectiveCtrlPointX = currentX;
- reflectiveCtrlPointY = currentY;
- if (previousCmd == 'q' || previousCmd == 't'
- || previousCmd == 'Q' || previousCmd == 'T') {
- reflectiveCtrlPointX = 2 * currentX - ctrlPointX;
- reflectiveCtrlPointY = 2 * currentY - ctrlPointY;
- }
- path.quadTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- val[k + 0], val[k + 1]);
- ctrlPointX = reflectiveCtrlPointX;
- ctrlPointY = reflectiveCtrlPointY;
- currentX = val[k + 0];
- currentY = val[k + 1];
- break;
- case 'a': // Draws an elliptical arc
- // (rx ry x-axis-rotation large-arc-flag sweep-flag x y)
- drawArc(path,
- currentX,
- currentY,
- val[k + 5] + currentX,
- val[k + 6] + currentY,
- val[k + 0],
- val[k + 1],
- val[k + 2],
- val[k + 3] != 0,
- val[k + 4] != 0);
- currentX += val[k + 5];
- currentY += val[k + 6];
- ctrlPointX = currentX;
- ctrlPointY = currentY;
- break;
- case 'A': // Draws an elliptical arc
- drawArc(path,
- currentX,
- currentY,
- val[k + 5],
- val[k + 6],
- val[k + 0],
- val[k + 1],
- val[k + 2],
- val[k + 3] != 0,
- val[k + 4] != 0);
- currentX = val[k + 5];
- currentY = val[k + 6];
- ctrlPointX = currentX;
- ctrlPointY = currentY;
- break;
- }
- previousCmd = cmd;
- }
- current[0] = currentX;
- current[1] = currentY;
- current[2] = ctrlPointX;
- current[3] = ctrlPointY;
- current[4] = currentSegmentStartX;
- current[5] = currentSegmentStartY;
- }
-
- private static void drawArc(Path p,
- float x0,
- float y0,
- float x1,
- float y1,
- float a,
- float b,
- float theta,
- boolean isMoreThanHalf,
- boolean isPositiveArc) {
-
- /* Convert rotation angle from degrees to radians */
- double thetaD = Math.toRadians(theta);
- /* Pre-compute rotation matrix entries */
- double cosTheta = Math.cos(thetaD);
- double sinTheta = Math.sin(thetaD);
- /* Transform (x0, y0) and (x1, y1) into unit space */
- /* using (inverse) rotation, followed by (inverse) scale */
- double x0p = (x0 * cosTheta + y0 * sinTheta) / a;
- double y0p = (-x0 * sinTheta + y0 * cosTheta) / b;
- double x1p = (x1 * cosTheta + y1 * sinTheta) / a;
- double y1p = (-x1 * sinTheta + y1 * cosTheta) / b;
-
- /* Compute differences and averages */
- double dx = x0p - x1p;
- double dy = y0p - y1p;
- double xm = (x0p + x1p) / 2;
- double ym = (y0p + y1p) / 2;
- /* Solve for intersecting unit circles */
- double dsq = dx * dx + dy * dy;
- if (dsq == 0.0) {
- Log.w(LOGTAG, " Points are coincident");
- return; /* Points are coincident */
- }
- double disc = 1.0 / dsq - 1.0 / 4.0;
- if (disc < 0.0) {
- Log.w(LOGTAG, "Points are too far apart " + dsq);
- float adjust = (float) (Math.sqrt(dsq) / 1.99999);
- drawArc(p, x0, y0, x1, y1, a * adjust,
- b * adjust, theta, isMoreThanHalf, isPositiveArc);
- return; /* Points are too far apart */
- }
- double s = Math.sqrt(disc);
- double sdx = s * dx;
- double sdy = s * dy;
- double cx;
- double cy;
- if (isMoreThanHalf == isPositiveArc) {
- cx = xm - sdy;
- cy = ym + sdx;
- } else {
- cx = xm + sdy;
- cy = ym - sdx;
- }
-
- double eta0 = Math.atan2((y0p - cy), (x0p - cx));
-
- double eta1 = Math.atan2((y1p - cy), (x1p - cx));
-
- double sweep = (eta1 - eta0);
- if (isPositiveArc != (sweep >= 0)) {
- if (sweep > 0) {
- sweep -= 2 * Math.PI;
- } else {
- sweep += 2 * Math.PI;
- }
- }
-
- cx *= a;
- cy *= b;
- double tcx = cx;
- cx = cx * cosTheta - cy * sinTheta;
- cy = tcx * sinTheta + cy * cosTheta;
-
- arcToBezier(p, cx, cy, a, b, x0, y0, thetaD, eta0, sweep);
- }
-
- /**
- * Converts an arc to cubic Bezier segments and records them in p.
- *
- * @param p The target for the cubic Bezier segments
- * @param cx The x coordinate center of the ellipse
- * @param cy The y coordinate center of the ellipse
- * @param a The radius of the ellipse in the horizontal direction
- * @param b The radius of the ellipse in the vertical direction
- * @param e1x E(eta1) x coordinate of the starting point of the arc
- * @param e1y E(eta2) y coordinate of the starting point of the arc
- * @param theta The angle that the ellipse bounding rectangle makes with horizontal plane
- * @param start The start angle of the arc on the ellipse
- * @param sweep The angle (positive or negative) of the sweep of the arc on the ellipse
- */
- private static void arcToBezier(Path p,
- double cx,
- double cy,
- double a,
- double b,
- double e1x,
- double e1y,
- double theta,
- double start,
- double sweep) {
- // Taken from equations at: http://spaceroots.org/documents/ellipse/node8.html
- // and http://www.spaceroots.org/documents/ellipse/node22.html
-
- // Maximum of 45 degrees per cubic Bezier segment
- int numSegments = (int) Math.ceil(Math.abs(sweep * 4 / Math.PI));
-
- double eta1 = start;
- double cosTheta = Math.cos(theta);
- double sinTheta = Math.sin(theta);
- double cosEta1 = Math.cos(eta1);
- double sinEta1 = Math.sin(eta1);
- double ep1x = (-a * cosTheta * sinEta1) - (b * sinTheta * cosEta1);
- double ep1y = (-a * sinTheta * sinEta1) + (b * cosTheta * cosEta1);
-
- double anglePerSegment = sweep / numSegments;
- for (int i = 0; i < numSegments; i++) {
- double eta2 = eta1 + anglePerSegment;
- double sinEta2 = Math.sin(eta2);
- double cosEta2 = Math.cos(eta2);
- double e2x = cx + (a * cosTheta * cosEta2) - (b * sinTheta * sinEta2);
- double e2y = cy + (a * sinTheta * cosEta2) + (b * cosTheta * sinEta2);
- double ep2x = -a * cosTheta * sinEta2 - b * sinTheta * cosEta2;
- double ep2y = -a * sinTheta * sinEta2 + b * cosTheta * cosEta2;
- double tanDiff2 = Math.tan((eta2 - eta1) / 2);
- double alpha =
- Math.sin(eta2 - eta1) * (Math.sqrt(4 + (3 * tanDiff2 * tanDiff2)) - 1) / 3;
- double q1x = e1x + alpha * ep1x;
- double q1y = e1y + alpha * ep1y;
- double q2x = e2x - alpha * ep2x;
- double q2y = e2y - alpha * ep2y;
-
- p.cubicTo((float) q1x,
- (float) q1y,
- (float) q2x,
- (float) q2y,
- (float) e2x,
- (float) e2y);
- eta1 = eta2;
- e1x = e2x;
- e1y = e2y;
- ep1x = ep2x;
- ep1y = ep2y;
- }
- }
- }
-
+ // Native functions are defined below.
private static native boolean nParseStringForPath(long pathPtr, String pathString,
int stringLength);
+ private static native void nCreatePathFromPathData(long outPathPtr, long pathData);
+ private static native long nCreateEmptyPathData();
+ private static native long nCreatePathData(long nativePtr);
+ private static native long nCreatePathDataFromString(String pathString, int stringLength);
+ private static native boolean nInterpolatePathData(long outDataPtr, long fromDataPtr,
+ long toDataPtr, float fraction);
+ private static native void nFinalize(long nativePtr);
+ private static native boolean nCanMorph(long fromDataPtr, long toDataPtr);
+ private static native void nSetPathData(long outDataPtr, long fromDataPtr);
}
+
+
diff --git a/core/java/android/util/jar/StrictJarFile.java b/core/java/android/util/jar/StrictJarFile.java
new file mode 100644
index 0000000..fd57806
--- /dev/null
+++ b/core/java/android/util/jar/StrictJarFile.java
@@ -0,0 +1,427 @@
+/*
+ * Copyright (C) 2013 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.util.jar;
+
+import dalvik.system.CloseGuard;
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.security.cert.Certificate;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import libcore.io.IoUtils;
+import libcore.io.Streams;
+
+/**
+ * A subset of the JarFile API implemented as a thin wrapper over
+ * system/core/libziparchive.
+ *
+ * @hide for internal use only. Not API compatible (or as forgiving) as
+ * {@link java.util.jar.JarFile}
+ */
+public final class StrictJarFile {
+
+ private final long nativeHandle;
+
+ // NOTE: It's possible to share a file descriptor with the native
+ // code, at the cost of some additional complexity.
+ private final RandomAccessFile raf;
+
+ private final StrictJarManifest manifest;
+ private final StrictJarVerifier verifier;
+
+ private final boolean isSigned;
+
+ private final CloseGuard guard = CloseGuard.get();
+ private boolean closed;
+
+ public StrictJarFile(String fileName) throws IOException, SecurityException {
+ this.nativeHandle = nativeOpenJarFile(fileName);
+ this.raf = new RandomAccessFile(fileName, "r");
+
+ try {
+ // Read the MANIFEST and signature files up front and try to
+ // parse them. We never want to accept a JAR File with broken signatures
+ // or manifests, so it's best to throw as early as possible.
+ HashMap<String, byte[]> metaEntries = getMetaEntries();
+ this.manifest = new StrictJarManifest(metaEntries.get(JarFile.MANIFEST_NAME), true);
+ this.verifier = new StrictJarVerifier(fileName, manifest, metaEntries);
+ Set<String> files = manifest.getEntries().keySet();
+ for (String file : files) {
+ if (findEntry(file) == null) {
+ throw new SecurityException(fileName + ": File " + file + " in manifest does not exist");
+ }
+ }
+
+ isSigned = verifier.readCertificates() && verifier.isSignedJar();
+ } catch (IOException | SecurityException e) {
+ nativeClose(this.nativeHandle);
+ IoUtils.closeQuietly(this.raf);
+ throw e;
+ }
+
+ guard.open("close");
+ }
+
+ public StrictJarManifest getManifest() {
+ return manifest;
+ }
+
+ public Iterator<ZipEntry> iterator() throws IOException {
+ return new EntryIterator(nativeHandle, "");
+ }
+
+ public ZipEntry findEntry(String name) {
+ return nativeFindEntry(nativeHandle, name);
+ }
+
+ /**
+ * Return all certificate chains for a given {@link ZipEntry} belonging to this jar.
+ * This method MUST be called only after fully exhausting the InputStream belonging
+ * to this entry.
+ *
+ * Returns {@code null} if this jar file isn't signed or if this method is
+ * called before the stream is processed.
+ */
+ public Certificate[][] getCertificateChains(ZipEntry ze) {
+ if (isSigned) {
+ return verifier.getCertificateChains(ze.getName());
+ }
+
+ return null;
+ }
+
+ /**
+ * Return all certificates for a given {@link ZipEntry} belonging to this jar.
+ * This method MUST be called only after fully exhausting the InputStream belonging
+ * to this entry.
+ *
+ * Returns {@code null} if this jar file isn't signed or if this method is
+ * called before the stream is processed.
+ *
+ * @deprecated Switch callers to use getCertificateChains instead
+ */
+ @Deprecated
+ public Certificate[] getCertificates(ZipEntry ze) {
+ if (isSigned) {
+ Certificate[][] certChains = verifier.getCertificateChains(ze.getName());
+
+ // Measure number of certs.
+ int count = 0;
+ for (Certificate[] chain : certChains) {
+ count += chain.length;
+ }
+
+ // Create new array and copy all the certs into it.
+ Certificate[] certs = new Certificate[count];
+ int i = 0;
+ for (Certificate[] chain : certChains) {
+ System.arraycopy(chain, 0, certs, i, chain.length);
+ i += chain.length;
+ }
+
+ return certs;
+ }
+
+ return null;
+ }
+
+ public InputStream getInputStream(ZipEntry ze) {
+ final InputStream is = getZipInputStream(ze);
+
+ if (isSigned) {
+ StrictJarVerifier.VerifierEntry entry = verifier.initEntry(ze.getName());
+ if (entry == null) {
+ return is;
+ }
+
+ return new JarFileInputStream(is, ze.getSize(), entry);
+ }
+
+ return is;
+ }
+
+ public void close() throws IOException {
+ if (!closed) {
+ guard.close();
+
+ nativeClose(nativeHandle);
+ IoUtils.closeQuietly(raf);
+ closed = true;
+ }
+ }
+
+ private InputStream getZipInputStream(ZipEntry ze) {
+ if (ze.getMethod() == ZipEntry.STORED) {
+ return new RAFStream(raf, ze.getDataOffset(),
+ ze.getDataOffset() + ze.getSize());
+ } else {
+ final RAFStream wrapped = new RAFStream(
+ raf, ze.getDataOffset(), ze.getDataOffset() + ze.getCompressedSize());
+
+ int bufSize = Math.max(1024, (int) Math.min(ze.getSize(), 65535L));
+ return new ZipInflaterInputStream(wrapped, new Inflater(true), bufSize, ze);
+ }
+ }
+
+ static final class EntryIterator implements Iterator<ZipEntry> {
+ private final long iterationHandle;
+ private ZipEntry nextEntry;
+
+ EntryIterator(long nativeHandle, String prefix) throws IOException {
+ iterationHandle = nativeStartIteration(nativeHandle, prefix);
+ }
+
+ public ZipEntry next() {
+ if (nextEntry != null) {
+ final ZipEntry ze = nextEntry;
+ nextEntry = null;
+ return ze;
+ }
+
+ return nativeNextEntry(iterationHandle);
+ }
+
+ public boolean hasNext() {
+ if (nextEntry != null) {
+ return true;
+ }
+
+ final ZipEntry ze = nativeNextEntry(iterationHandle);
+ if (ze == null) {
+ return false;
+ }
+
+ nextEntry = ze;
+ return true;
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ private HashMap<String, byte[]> getMetaEntries() throws IOException {
+ HashMap<String, byte[]> metaEntries = new HashMap<String, byte[]>();
+
+ Iterator<ZipEntry> entryIterator = new EntryIterator(nativeHandle, "META-INF/");
+ while (entryIterator.hasNext()) {
+ final ZipEntry entry = entryIterator.next();
+ metaEntries.put(entry.getName(), Streams.readFully(getInputStream(entry)));
+ }
+
+ return metaEntries;
+ }
+
+ static final class JarFileInputStream extends FilterInputStream {
+ private final StrictJarVerifier.VerifierEntry entry;
+
+ private long count;
+ private boolean done = false;
+
+ JarFileInputStream(InputStream is, long size, StrictJarVerifier.VerifierEntry e) {
+ super(is);
+ entry = e;
+
+ count = size;
+ }
+
+ @Override
+ public int read() throws IOException {
+ if (done) {
+ return -1;
+ }
+ if (count > 0) {
+ int r = super.read();
+ if (r != -1) {
+ entry.write(r);
+ count--;
+ } else {
+ count = 0;
+ }
+ if (count == 0) {
+ done = true;
+ entry.verify();
+ }
+ return r;
+ } else {
+ done = true;
+ entry.verify();
+ return -1;
+ }
+ }
+
+ @Override
+ public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException {
+ if (done) {
+ return -1;
+ }
+ if (count > 0) {
+ int r = super.read(buffer, byteOffset, byteCount);
+ if (r != -1) {
+ int size = r;
+ if (count < size) {
+ size = (int) count;
+ }
+ entry.write(buffer, byteOffset, size);
+ count -= size;
+ } else {
+ count = 0;
+ }
+ if (count == 0) {
+ done = true;
+ entry.verify();
+ }
+ return r;
+ } else {
+ done = true;
+ entry.verify();
+ return -1;
+ }
+ }
+
+ @Override
+ public int available() throws IOException {
+ if (done) {
+ return 0;
+ }
+ return super.available();
+ }
+
+ @Override
+ public long skip(long byteCount) throws IOException {
+ return Streams.skipByReading(this, byteCount);
+ }
+ }
+
+ /** @hide */
+ public static class ZipInflaterInputStream extends InflaterInputStream {
+ private final ZipEntry entry;
+ private long bytesRead = 0;
+
+ public ZipInflaterInputStream(InputStream is, Inflater inf, int bsize, ZipEntry entry) {
+ super(is, inf, bsize);
+ this.entry = entry;
+ }
+
+ @Override public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException {
+ final int i;
+ try {
+ i = super.read(buffer, byteOffset, byteCount);
+ } catch (IOException e) {
+ throw new IOException("Error reading data for " + entry.getName() + " near offset "
+ + bytesRead, e);
+ }
+ if (i == -1) {
+ if (entry.getSize() != bytesRead) {
+ throw new IOException("Size mismatch on inflated file: " + bytesRead + " vs "
+ + entry.getSize());
+ }
+ } else {
+ bytesRead += i;
+ }
+ return i;
+ }
+
+ @Override public int available() throws IOException {
+ if (closed) {
+ // Our superclass will throw an exception, but there's a jtreg test that
+ // explicitly checks that the InputStream returned from ZipFile.getInputStream
+ // returns 0 even when closed.
+ return 0;
+ }
+ return super.available() == 0 ? 0 : (int) (entry.getSize() - bytesRead);
+ }
+ }
+
+ /**
+ * Wrap a stream around a RandomAccessFile. The RandomAccessFile is shared
+ * among all streams returned by getInputStream(), so we have to synchronize
+ * access to it. (We can optimize this by adding buffering here to reduce
+ * collisions.)
+ *
+ * <p>We could support mark/reset, but we don't currently need them.
+ *
+ * @hide
+ */
+ public static class RAFStream extends InputStream {
+ private final RandomAccessFile sharedRaf;
+ private long endOffset;
+ private long offset;
+
+
+ public RAFStream(RandomAccessFile raf, long initialOffset, long endOffset) {
+ sharedRaf = raf;
+ offset = initialOffset;
+ this.endOffset = endOffset;
+ }
+
+ public RAFStream(RandomAccessFile raf, long initialOffset) throws IOException {
+ this(raf, initialOffset, raf.length());
+ }
+
+ @Override public int available() throws IOException {
+ return (offset < endOffset ? 1 : 0);
+ }
+
+ @Override public int read() throws IOException {
+ return Streams.readSingleByte(this);
+ }
+
+ @Override public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException {
+ synchronized (sharedRaf) {
+ final long length = endOffset - offset;
+ if (byteCount > length) {
+ byteCount = (int) length;
+ }
+ sharedRaf.seek(offset);
+ int count = sharedRaf.read(buffer, byteOffset, byteCount);
+ if (count > 0) {
+ offset += count;
+ return count;
+ } else {
+ return -1;
+ }
+ }
+ }
+
+ @Override public long skip(long byteCount) throws IOException {
+ if (byteCount > endOffset - offset) {
+ byteCount = endOffset - offset;
+ }
+ offset += byteCount;
+ return byteCount;
+ }
+ }
+
+
+ private static native long nativeOpenJarFile(String fileName) throws IOException;
+ private static native long nativeStartIteration(long nativeHandle, String prefix);
+ private static native ZipEntry nativeNextEntry(long iterationHandle);
+ private static native ZipEntry nativeFindEntry(long nativeHandle, String entryName);
+ private static native void nativeClose(long nativeHandle);
+}
diff --git a/core/java/android/util/jar/StrictJarManifest.java b/core/java/android/util/jar/StrictJarManifest.java
new file mode 100644
index 0000000..dbb466c
--- /dev/null
+++ b/core/java/android/util/jar/StrictJarManifest.java
@@ -0,0 +1,315 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.util.jar;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.jar.Attributes;
+import libcore.io.Streams;
+
+/**
+ * The {@code StrictJarManifest} class is used to obtain attribute information for a
+ * {@code StrictJarFile} and its entries.
+ *
+ * @hide
+ */
+public class StrictJarManifest implements Cloneable {
+ static final int LINE_LENGTH_LIMIT = 72;
+
+ private static final byte[] LINE_SEPARATOR = new byte[] { '\r', '\n' };
+
+ private static final byte[] VALUE_SEPARATOR = new byte[] { ':', ' ' };
+
+ private final Attributes mainAttributes;
+ private final HashMap<String, Attributes> entries;
+
+ static final class Chunk {
+ final int start;
+ final int end;
+
+ Chunk(int start, int end) {
+ this.start = start;
+ this.end = end;
+ }
+ }
+
+ private HashMap<String, Chunk> chunks;
+
+ /**
+ * The end of the main attributes section in the manifest is needed in
+ * verification.
+ */
+ private int mainEnd;
+
+ /**
+ * Creates a new {@code StrictJarManifest} instance.
+ */
+ public StrictJarManifest() {
+ entries = new HashMap<String, Attributes>();
+ mainAttributes = new Attributes();
+ }
+
+ /**
+ * Creates a new {@code StrictJarManifest} instance using the attributes obtained
+ * from the input stream.
+ *
+ * @param is
+ * {@code InputStream} to parse for attributes.
+ * @throws IOException
+ * if an IO error occurs while creating this {@code StrictJarManifest}
+ */
+ public StrictJarManifest(InputStream is) throws IOException {
+ this();
+ read(Streams.readFully(is));
+ }
+
+ /**
+ * Creates a new {@code StrictJarManifest} instance. The new instance will have the
+ * same attributes as those found in the parameter {@code StrictJarManifest}.
+ *
+ * @param man
+ * {@code StrictJarManifest} instance to obtain attributes from.
+ */
+ @SuppressWarnings("unchecked")
+ public StrictJarManifest(StrictJarManifest man) {
+ mainAttributes = (Attributes) man.mainAttributes.clone();
+ entries = (HashMap<String, Attributes>) ((HashMap<String, Attributes>) man
+ .getEntries()).clone();
+ }
+
+ StrictJarManifest(byte[] manifestBytes, boolean readChunks) throws IOException {
+ this();
+ if (readChunks) {
+ chunks = new HashMap<String, Chunk>();
+ }
+ read(manifestBytes);
+ }
+
+ /**
+ * Resets the both the main attributes as well as the entry attributes
+ * associated with this {@code StrictJarManifest}.
+ */
+ public void clear() {
+ entries.clear();
+ mainAttributes.clear();
+ }
+
+ /**
+ * Returns the {@code Attributes} associated with the parameter entry
+ * {@code name}.
+ *
+ * @param name
+ * the name of the entry to obtain {@code Attributes} from.
+ * @return the Attributes for the entry or {@code null} if the entry does
+ * not exist.
+ */
+ public Attributes getAttributes(String name) {
+ return getEntries().get(name);
+ }
+
+ /**
+ * Returns a map containing the {@code Attributes} for each entry in the
+ * {@code StrictJarManifest}.
+ *
+ * @return the map of entry attributes.
+ */
+ public Map<String, Attributes> getEntries() {
+ return entries;
+ }
+
+ /**
+ * Returns the main {@code Attributes} of the {@code JarFile}.
+ *
+ * @return main {@code Attributes} associated with the source {@code
+ * JarFile}.
+ */
+ public Attributes getMainAttributes() {
+ return mainAttributes;
+ }
+
+ /**
+ * Creates a copy of this {@code StrictJarManifest}. The returned {@code StrictJarManifest}
+ * will equal the {@code StrictJarManifest} from which it was cloned.
+ *
+ * @return a copy of this instance.
+ */
+ @Override
+ public Object clone() {
+ return new StrictJarManifest(this);
+ }
+
+ /**
+ * Writes this {@code StrictJarManifest}'s name/attributes pairs to the given {@code OutputStream}.
+ * The {@code MANIFEST_VERSION} or {@code SIGNATURE_VERSION} attribute must be set before
+ * calling this method, or no attributes will be written.
+ *
+ * @throws IOException
+ * If an error occurs writing the {@code StrictJarManifest}.
+ */
+ public void write(OutputStream os) throws IOException {
+ write(this, os);
+ }
+
+ /**
+ * Merges name/attribute pairs read from the input stream {@code is} into this manifest.
+ *
+ * @param is
+ * The {@code InputStream} to read from.
+ * @throws IOException
+ * If an error occurs reading the manifest.
+ */
+ public void read(InputStream is) throws IOException {
+ read(Streams.readFullyNoClose(is));
+ }
+
+ private void read(byte[] buf) throws IOException {
+ if (buf.length == 0) {
+ return;
+ }
+
+ StrictJarManifestReader im = new StrictJarManifestReader(buf, mainAttributes);
+ mainEnd = im.getEndOfMainSection();
+ im.readEntries(entries, chunks);
+ }
+
+ /**
+ * Returns the hash code for this instance.
+ *
+ * @return this {@code StrictJarManifest}'s hashCode.
+ */
+ @Override
+ public int hashCode() {
+ return mainAttributes.hashCode() ^ getEntries().hashCode();
+ }
+
+ /**
+ * Determines if the receiver is equal to the parameter object. Two {@code
+ * StrictJarManifest}s are equal if they have identical main attributes as well as
+ * identical entry attributes.
+ *
+ * @param o
+ * the object to compare against.
+ * @return {@code true} if the manifests are equal, {@code false} otherwise
+ */
+ @Override
+ public boolean equals(Object o) {
+ if (o == null) {
+ return false;
+ }
+ if (o.getClass() != this.getClass()) {
+ return false;
+ }
+ if (!mainAttributes.equals(((StrictJarManifest) o).mainAttributes)) {
+ return false;
+ }
+ return getEntries().equals(((StrictJarManifest) o).getEntries());
+ }
+
+ Chunk getChunk(String name) {
+ return chunks.get(name);
+ }
+
+ void removeChunks() {
+ chunks = null;
+ }
+
+ int getMainAttributesEnd() {
+ return mainEnd;
+ }
+
+ /**
+ * Writes out the attribute information of the specified manifest to the
+ * specified {@code OutputStream}
+ *
+ * @param manifest
+ * the manifest to write out.
+ * @param out
+ * The {@code OutputStream} to write to.
+ * @throws IOException
+ * If an error occurs writing the {@code StrictJarManifest}.
+ */
+ static void write(StrictJarManifest manifest, OutputStream out) throws IOException {
+ CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder();
+ ByteBuffer buffer = ByteBuffer.allocate(LINE_LENGTH_LIMIT);
+
+ Attributes.Name versionName = Attributes.Name.MANIFEST_VERSION;
+ String version = manifest.mainAttributes.getValue(versionName);
+ if (version == null) {
+ versionName = Attributes.Name.SIGNATURE_VERSION;
+ version = manifest.mainAttributes.getValue(versionName);
+ }
+ if (version != null) {
+ writeEntry(out, versionName, version, encoder, buffer);
+ Iterator<?> entries = manifest.mainAttributes.keySet().iterator();
+ while (entries.hasNext()) {
+ Attributes.Name name = (Attributes.Name) entries.next();
+ if (!name.equals(versionName)) {
+ writeEntry(out, name, manifest.mainAttributes.getValue(name), encoder, buffer);
+ }
+ }
+ }
+ out.write(LINE_SEPARATOR);
+ Iterator<String> i = manifest.getEntries().keySet().iterator();
+ while (i.hasNext()) {
+ String key = i.next();
+ writeEntry(out, Attributes.Name.NAME, key, encoder, buffer);
+ Attributes attributes = manifest.entries.get(key);
+ Iterator<?> entries = attributes.keySet().iterator();
+ while (entries.hasNext()) {
+ Attributes.Name name = (Attributes.Name) entries.next();
+ writeEntry(out, name, attributes.getValue(name), encoder, buffer);
+ }
+ out.write(LINE_SEPARATOR);
+ }
+ }
+
+ private static void writeEntry(OutputStream os, Attributes.Name name,
+ String value, CharsetEncoder encoder, ByteBuffer bBuf) throws IOException {
+ String nameString = name.toString();
+ os.write(nameString.getBytes(StandardCharsets.US_ASCII));
+ os.write(VALUE_SEPARATOR);
+
+ encoder.reset();
+ bBuf.clear().limit(LINE_LENGTH_LIMIT - nameString.length() - 2);
+
+ CharBuffer cBuf = CharBuffer.wrap(value);
+
+ while (true) {
+ CoderResult r = encoder.encode(cBuf, bBuf, true);
+ if (CoderResult.UNDERFLOW == r) {
+ r = encoder.flush(bBuf);
+ }
+ os.write(bBuf.array(), bBuf.arrayOffset(), bBuf.position());
+ os.write(LINE_SEPARATOR);
+ if (CoderResult.UNDERFLOW == r) {
+ break;
+ }
+ os.write(' ');
+ bBuf.clear().limit(LINE_LENGTH_LIMIT - 1);
+ }
+ }
+}
diff --git a/core/java/android/util/jar/StrictJarManifestReader.java b/core/java/android/util/jar/StrictJarManifestReader.java
new file mode 100644
index 0000000..9881bb0
--- /dev/null
+++ b/core/java/android/util/jar/StrictJarManifestReader.java
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.util.jar;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.Attributes;
+
+/**
+ * Reads a JAR file manifest. The specification is here:
+ * http://java.sun.com/javase/6/docs/technotes/guides/jar/jar.html
+ */
+class StrictJarManifestReader {
+ // There are relatively few unique attribute names,
+ // but a manifest might have thousands of entries.
+ private final HashMap<String, Attributes.Name> attributeNameCache = new HashMap<String, Attributes.Name>();
+
+ private final ByteArrayOutputStream valueBuffer = new ByteArrayOutputStream(80);
+
+ private final byte[] buf;
+
+ private final int endOfMainSection;
+
+ private int pos;
+
+ private Attributes.Name name;
+
+ private String value;
+
+ private int consecutiveLineBreaks = 0;
+
+ public StrictJarManifestReader(byte[] buf, Attributes main) throws IOException {
+ this.buf = buf;
+ while (readHeader()) {
+ main.put(name, value);
+ }
+ this.endOfMainSection = pos;
+ }
+
+ public void readEntries(Map<String, Attributes> entries, Map<String, StrictJarManifest.Chunk> chunks) throws IOException {
+ int mark = pos;
+ while (readHeader()) {
+ if (!Attributes.Name.NAME.equals(name)) {
+ throw new IOException("Entry is not named");
+ }
+ String entryNameValue = value;
+
+ Attributes entry = entries.get(entryNameValue);
+ if (entry == null) {
+ entry = new Attributes(12);
+ }
+
+ while (readHeader()) {
+ entry.put(name, value);
+ }
+
+ if (chunks != null) {
+ if (chunks.get(entryNameValue) != null) {
+ // TODO A bug: there might be several verification chunks for
+ // the same name. I believe they should be used to update
+ // signature in order of appearance; there are two ways to fix
+ // this: either use a list of chunks, or decide on used
+ // signature algorithm in advance and reread the chunks while
+ // updating the signature; for now a defensive error is thrown
+ throw new IOException("A jar verifier does not support more than one entry with the same name");
+ }
+ chunks.put(entryNameValue, new StrictJarManifest.Chunk(mark, pos));
+ mark = pos;
+ }
+
+ entries.put(entryNameValue, entry);
+ }
+ }
+
+ public int getEndOfMainSection() {
+ return endOfMainSection;
+ }
+
+ /**
+ * Read a single line from the manifest buffer.
+ */
+ private boolean readHeader() throws IOException {
+ if (consecutiveLineBreaks > 1) {
+ // break a section on an empty line
+ consecutiveLineBreaks = 0;
+ return false;
+ }
+ readName();
+ consecutiveLineBreaks = 0;
+ readValue();
+ // if the last line break is missed, the line
+ // is ignored by the reference implementation
+ return consecutiveLineBreaks > 0;
+ }
+
+ private void readName() throws IOException {
+ int mark = pos;
+
+ while (pos < buf.length) {
+ if (buf[pos++] != ':') {
+ continue;
+ }
+
+ String nameString = new String(buf, mark, pos - mark - 1, StandardCharsets.US_ASCII);
+
+ if (buf[pos++] != ' ') {
+ throw new IOException(String.format("Invalid value for attribute '%s'", nameString));
+ }
+
+ try {
+ name = attributeNameCache.get(nameString);
+ if (name == null) {
+ name = new Attributes.Name(nameString);
+ attributeNameCache.put(nameString, name);
+ }
+ } catch (IllegalArgumentException e) {
+ // new Attributes.Name() throws IllegalArgumentException but we declare IOException
+ throw new IOException(e.getMessage());
+ }
+ return;
+ }
+ }
+
+ private void readValue() throws IOException {
+ boolean lastCr = false;
+ int mark = pos;
+ int last = pos;
+ valueBuffer.reset();
+ while (pos < buf.length) {
+ byte next = buf[pos++];
+ switch (next) {
+ case 0:
+ throw new IOException("NUL character in a manifest");
+ case '\n':
+ if (lastCr) {
+ lastCr = false;
+ } else {
+ consecutiveLineBreaks++;
+ }
+ continue;
+ case '\r':
+ lastCr = true;
+ consecutiveLineBreaks++;
+ continue;
+ case ' ':
+ if (consecutiveLineBreaks == 1) {
+ valueBuffer.write(buf, mark, last - mark);
+ mark = pos;
+ consecutiveLineBreaks = 0;
+ continue;
+ }
+ }
+
+ if (consecutiveLineBreaks >= 1) {
+ pos--;
+ break;
+ }
+ last = pos;
+ }
+
+ valueBuffer.write(buf, mark, last - mark);
+ // A bit frustrating that that Charset.forName will be called
+ // again.
+ value = valueBuffer.toString(StandardCharsets.UTF_8.name());
+ }
+}
diff --git a/core/java/android/util/jar/StrictJarVerifier.java b/core/java/android/util/jar/StrictJarVerifier.java
new file mode 100644
index 0000000..ca2aec1
--- /dev/null
+++ b/core/java/android/util/jar/StrictJarVerifier.java
@@ -0,0 +1,456 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.util.jar;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import libcore.io.Base64;
+import sun.security.jca.Providers;
+import sun.security.pkcs.PKCS7;
+
+/**
+ * Non-public class used by {@link JarFile} and {@link JarInputStream} to manage
+ * the verification of signed JARs. {@code JarFile} and {@code JarInputStream}
+ * objects are expected to have a {@code JarVerifier} instance member which
+ * can be used to carry out the tasks associated with verifying a signed JAR.
+ * These tasks would typically include:
+ * <ul>
+ * <li>verification of all signed signature files
+ * <li>confirmation that all signed data was signed only by the party or parties
+ * specified in the signature block data
+ * <li>verification that the contents of all signature files (i.e. {@code .SF}
+ * files) agree with the JAR entries information found in the JAR manifest.
+ * </ul>
+ */
+class StrictJarVerifier {
+ /**
+ * List of accepted digest algorithms. This list is in order from most
+ * preferred to least preferred.
+ */
+ private static final String[] DIGEST_ALGORITHMS = new String[] {
+ "SHA-512",
+ "SHA-384",
+ "SHA-256",
+ "SHA1",
+ };
+
+ private final String jarName;
+ private final StrictJarManifest manifest;
+ private final HashMap<String, byte[]> metaEntries;
+ private final int mainAttributesEnd;
+
+ private final Hashtable<String, HashMap<String, Attributes>> signatures =
+ new Hashtable<String, HashMap<String, Attributes>>(5);
+
+ private final Hashtable<String, Certificate[]> certificates =
+ new Hashtable<String, Certificate[]>(5);
+
+ private final Hashtable<String, Certificate[][]> verifiedEntries =
+ new Hashtable<String, Certificate[][]>();
+
+ /**
+ * Stores and a hash and a message digest and verifies that massage digest
+ * matches the hash.
+ */
+ static class VerifierEntry extends OutputStream {
+
+ private final String name;
+
+ private final MessageDigest digest;
+
+ private final byte[] hash;
+
+ private final Certificate[][] certChains;
+
+ private final Hashtable<String, Certificate[][]> verifiedEntries;
+
+ VerifierEntry(String name, MessageDigest digest, byte[] hash,
+ Certificate[][] certChains, Hashtable<String, Certificate[][]> verifedEntries) {
+ this.name = name;
+ this.digest = digest;
+ this.hash = hash;
+ this.certChains = certChains;
+ this.verifiedEntries = verifedEntries;
+ }
+
+ /**
+ * Updates a digest with one byte.
+ */
+ @Override
+ public void write(int value) {
+ digest.update((byte) value);
+ }
+
+ /**
+ * Updates a digest with byte array.
+ */
+ @Override
+ public void write(byte[] buf, int off, int nbytes) {
+ digest.update(buf, off, nbytes);
+ }
+
+ /**
+ * Verifies that the digests stored in the manifest match the decrypted
+ * digests from the .SF file. This indicates the validity of the
+ * signing, not the integrity of the file, as its digest must be
+ * calculated and verified when its contents are read.
+ *
+ * @throws SecurityException
+ * if the digest value stored in the manifest does <i>not</i>
+ * agree with the decrypted digest as recovered from the
+ * <code>.SF</code> file.
+ */
+ void verify() {
+ byte[] d = digest.digest();
+ if (!MessageDigest.isEqual(d, Base64.decode(hash))) {
+ throw invalidDigest(JarFile.MANIFEST_NAME, name, name);
+ }
+ verifiedEntries.put(name, certChains);
+ }
+ }
+
+ private static SecurityException invalidDigest(String signatureFile, String name,
+ String jarName) {
+ throw new SecurityException(signatureFile + " has invalid digest for " + name +
+ " in " + jarName);
+ }
+
+ private static SecurityException failedVerification(String jarName, String signatureFile) {
+ throw new SecurityException(jarName + " failed verification of " + signatureFile);
+ }
+
+ private static SecurityException failedVerification(String jarName, String signatureFile,
+ Throwable e) {
+ throw new SecurityException(jarName + " failed verification of " + signatureFile, e);
+ }
+
+
+ /**
+ * Constructs and returns a new instance of {@code JarVerifier}.
+ *
+ * @param name
+ * the name of the JAR file being verified.
+ */
+ StrictJarVerifier(String name, StrictJarManifest manifest,
+ HashMap<String, byte[]> metaEntries) {
+ jarName = name;
+ this.manifest = manifest;
+ this.metaEntries = metaEntries;
+ this.mainAttributesEnd = manifest.getMainAttributesEnd();
+ }
+
+ /**
+ * Invoked for each new JAR entry read operation from the input
+ * stream. This method constructs and returns a new {@link VerifierEntry}
+ * which contains the certificates used to sign the entry and its hash value
+ * as specified in the JAR MANIFEST format.
+ *
+ * @param name
+ * the name of an entry in a JAR file which is <b>not</b> in the
+ * {@code META-INF} directory.
+ * @return a new instance of {@link VerifierEntry} which can be used by
+ * callers as an {@link OutputStream}.
+ */
+ VerifierEntry initEntry(String name) {
+ // If no manifest is present by the time an entry is found,
+ // verification cannot occur. If no signature files have
+ // been found, do not verify.
+ if (manifest == null || signatures.isEmpty()) {
+ return null;
+ }
+
+ Attributes attributes = manifest.getAttributes(name);
+ // entry has no digest
+ if (attributes == null) {
+ return null;
+ }
+
+ ArrayList<Certificate[]> certChains = new ArrayList<Certificate[]>();
+ Iterator<Map.Entry<String, HashMap<String, Attributes>>> it = signatures.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry<String, HashMap<String, Attributes>> entry = it.next();
+ HashMap<String, Attributes> hm = entry.getValue();
+ if (hm.get(name) != null) {
+ // Found an entry for entry name in .SF file
+ String signatureFile = entry.getKey();
+ Certificate[] certChain = certificates.get(signatureFile);
+ if (certChain != null) {
+ certChains.add(certChain);
+ }
+ }
+ }
+
+ // entry is not signed
+ if (certChains.isEmpty()) {
+ return null;
+ }
+ Certificate[][] certChainsArray = certChains.toArray(new Certificate[certChains.size()][]);
+
+ for (int i = 0; i < DIGEST_ALGORITHMS.length; i++) {
+ final String algorithm = DIGEST_ALGORITHMS[i];
+ final String hash = attributes.getValue(algorithm + "-Digest");
+ if (hash == null) {
+ continue;
+ }
+ byte[] hashBytes = hash.getBytes(StandardCharsets.ISO_8859_1);
+
+ try {
+ return new VerifierEntry(name, MessageDigest.getInstance(algorithm), hashBytes,
+ certChainsArray, verifiedEntries);
+ } catch (NoSuchAlgorithmException ignored) {
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Add a new meta entry to the internal collection of data held on each JAR
+ * entry in the {@code META-INF} directory including the manifest
+ * file itself. Files associated with the signing of a JAR would also be
+ * added to this collection.
+ *
+ * @param name
+ * the name of the file located in the {@code META-INF}
+ * directory.
+ * @param buf
+ * the file bytes for the file called {@code name}.
+ * @see #removeMetaEntries()
+ */
+ void addMetaEntry(String name, byte[] buf) {
+ metaEntries.put(name.toUpperCase(Locale.US), buf);
+ }
+
+ /**
+ * If the associated JAR file is signed, check on the validity of all of the
+ * known signatures.
+ *
+ * @return {@code true} if the associated JAR is signed and an internal
+ * check verifies the validity of the signature(s). {@code false} if
+ * the associated JAR file has no entries at all in its {@code
+ * META-INF} directory. This situation is indicative of an invalid
+ * JAR file.
+ * <p>
+ * Will also return {@code true} if the JAR file is <i>not</i>
+ * signed.
+ * @throws SecurityException
+ * if the JAR file is signed and it is determined that a
+ * signature block file contains an invalid signature for the
+ * corresponding signature file.
+ */
+ synchronized boolean readCertificates() {
+ if (metaEntries.isEmpty()) {
+ return false;
+ }
+
+ Iterator<String> it = metaEntries.keySet().iterator();
+ while (it.hasNext()) {
+ String key = it.next();
+ if (key.endsWith(".DSA") || key.endsWith(".RSA") || key.endsWith(".EC")) {
+ verifyCertificate(key);
+ it.remove();
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Verifies that the signature computed from {@code sfBytes} matches
+ * that specified in {@code blockBytes} (which is a PKCS7 block). Returns
+ * certificates listed in the PKCS7 block. Throws a {@code GeneralSecurityException}
+ * if something goes wrong during verification.
+ */
+ static Certificate[] verifyBytes(byte[] blockBytes, byte[] sfBytes)
+ throws GeneralSecurityException {
+
+ Object obj = null;
+ try {
+
+ obj = Providers.startJarVerification();
+ PKCS7 block = new PKCS7(blockBytes);
+ if (block.verify(sfBytes) == null) {
+ throw new GeneralSecurityException("Failed to verify signature");
+ }
+ X509Certificate[] blockCerts = block.getCertificates();
+ Certificate[] signerCertChain = null;
+ if (blockCerts != null) {
+ signerCertChain = new Certificate[blockCerts.length];
+ for (int i = 0; i < blockCerts.length; ++i) {
+ signerCertChain[i] = blockCerts[i];
+ }
+ }
+ return signerCertChain;
+ } catch (IOException e) {
+ throw new GeneralSecurityException("IO exception verifying jar cert", e);
+ } finally {
+ Providers.stopJarVerification(obj);
+ }
+ }
+
+ /**
+ * @param certFile
+ */
+ private void verifyCertificate(String certFile) {
+ // Found Digital Sig, .SF should already have been read
+ String signatureFile = certFile.substring(0, certFile.lastIndexOf('.')) + ".SF";
+ byte[] sfBytes = metaEntries.get(signatureFile);
+ if (sfBytes == null) {
+ return;
+ }
+
+ byte[] manifestBytes = metaEntries.get(JarFile.MANIFEST_NAME);
+ // Manifest entry is required for any verifications.
+ if (manifestBytes == null) {
+ return;
+ }
+
+ byte[] sBlockBytes = metaEntries.get(certFile);
+ try {
+ Certificate[] signerCertChain = verifyBytes(sBlockBytes, sfBytes);
+ if (signerCertChain != null) {
+ certificates.put(signatureFile, signerCertChain);
+ }
+ } catch (GeneralSecurityException e) {
+ throw failedVerification(jarName, signatureFile, e);
+ }
+
+ // Verify manifest hash in .sf file
+ Attributes attributes = new Attributes();
+ HashMap<String, Attributes> entries = new HashMap<String, Attributes>();
+ try {
+ StrictJarManifestReader im = new StrictJarManifestReader(sfBytes, attributes);
+ im.readEntries(entries, null);
+ } catch (IOException e) {
+ return;
+ }
+
+ // Do we actually have any signatures to look at?
+ if (attributes.get(Attributes.Name.SIGNATURE_VERSION) == null) {
+ return;
+ }
+
+ boolean createdBySigntool = false;
+ String createdBy = attributes.getValue("Created-By");
+ if (createdBy != null) {
+ createdBySigntool = createdBy.indexOf("signtool") != -1;
+ }
+
+ // Use .SF to verify the mainAttributes of the manifest
+ // If there is no -Digest-Manifest-Main-Attributes entry in .SF
+ // file, such as those created before java 1.5, then we ignore
+ // such verification.
+ if (mainAttributesEnd > 0 && !createdBySigntool) {
+ String digestAttribute = "-Digest-Manifest-Main-Attributes";
+ if (!verify(attributes, digestAttribute, manifestBytes, 0, mainAttributesEnd, false, true)) {
+ throw failedVerification(jarName, signatureFile);
+ }
+ }
+
+ // Use .SF to verify the whole manifest.
+ String digestAttribute = createdBySigntool ? "-Digest" : "-Digest-Manifest";
+ if (!verify(attributes, digestAttribute, manifestBytes, 0, manifestBytes.length, false, false)) {
+ Iterator<Map.Entry<String, Attributes>> it = entries.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry<String, Attributes> entry = it.next();
+ StrictJarManifest.Chunk chunk = manifest.getChunk(entry.getKey());
+ if (chunk == null) {
+ return;
+ }
+ if (!verify(entry.getValue(), "-Digest", manifestBytes,
+ chunk.start, chunk.end, createdBySigntool, false)) {
+ throw invalidDigest(signatureFile, entry.getKey(), jarName);
+ }
+ }
+ }
+ metaEntries.put(signatureFile, null);
+ signatures.put(signatureFile, entries);
+ }
+
+ /**
+ * Returns a <code>boolean</code> indication of whether or not the
+ * associated jar file is signed.
+ *
+ * @return {@code true} if the JAR is signed, {@code false}
+ * otherwise.
+ */
+ boolean isSignedJar() {
+ return certificates.size() > 0;
+ }
+
+ private boolean verify(Attributes attributes, String entry, byte[] data,
+ int start, int end, boolean ignoreSecondEndline, boolean ignorable) {
+ for (int i = 0; i < DIGEST_ALGORITHMS.length; i++) {
+ String algorithm = DIGEST_ALGORITHMS[i];
+ String hash = attributes.getValue(algorithm + entry);
+ if (hash == null) {
+ continue;
+ }
+
+ MessageDigest md;
+ try {
+ md = MessageDigest.getInstance(algorithm);
+ } catch (NoSuchAlgorithmException e) {
+ continue;
+ }
+ if (ignoreSecondEndline && data[end - 1] == '\n' && data[end - 2] == '\n') {
+ md.update(data, start, end - 1 - start);
+ } else {
+ md.update(data, start, end - start);
+ }
+ byte[] b = md.digest();
+ byte[] hashBytes = hash.getBytes(StandardCharsets.ISO_8859_1);
+ return MessageDigest.isEqual(b, Base64.decode(hashBytes));
+ }
+ return ignorable;
+ }
+
+ /**
+ * Returns all of the {@link java.security.cert.Certificate} chains that
+ * were used to verify the signature on the JAR entry called
+ * {@code name}. Callers must not modify the returned arrays.
+ *
+ * @param name
+ * the name of a JAR entry.
+ * @return an array of {@link java.security.cert.Certificate} chains.
+ */
+ Certificate[][] getCertificateChains(String name) {
+ return verifiedEntries.get(name);
+ }
+
+ /**
+ * Remove all entries from the internal collection of data held about each
+ * JAR entry in the {@code META-INF} directory.
+ */
+ void removeMetaEntries() {
+ metaEntries.clear();
+ }
+}
diff --git a/core/java/android/view/HardwareLayer.java b/core/java/android/view/HardwareLayer.java
index 692ca7b..a12434c 100644
--- a/core/java/android/view/HardwareLayer.java
+++ b/core/java/android/view/HardwareLayer.java
@@ -33,10 +33,10 @@
* @hide
*/
final class HardwareLayer {
- private HardwareRenderer mRenderer;
+ private ThreadedRenderer mRenderer;
private VirtualRefBasePtr mFinalizer;
- private HardwareLayer(HardwareRenderer renderer, long deferredUpdater) {
+ private HardwareLayer(ThreadedRenderer renderer, long deferredUpdater) {
if (renderer == null || deferredUpdater == 0) {
throw new IllegalArgumentException("Either hardware renderer: " + renderer
+ " or deferredUpdater: " + deferredUpdater + " is invalid");
@@ -140,7 +140,7 @@
mRenderer.pushLayerUpdate(this);
}
- static HardwareLayer adoptTextureLayer(HardwareRenderer renderer, long layer) {
+ static HardwareLayer adoptTextureLayer(ThreadedRenderer renderer, long layer) {
return new HardwareLayer(renderer, layer);
}
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
deleted file mode 100644
index 5e58250..0000000
--- a/core/java/android/view/HardwareRenderer.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * Copyright (C) 2013 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.view;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.view.Surface.OutOfResourcesException;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-
-/**
- * Interface for rendering a view hierarchy using hardware acceleration.
- *
- * @hide
- */
-public abstract class HardwareRenderer {
- static final String LOG_TAG = "HardwareRenderer";
-
- /**
- * Name of the file that holds the shaders cache.
- */
- private static final String CACHE_PATH_SHADERS = "com.android.opengl.shaders_cache";
-
- /**
- * System property used to enable or disable dirty regions invalidation.
- * This property is only queried if {@link #RENDER_DIRTY_REGIONS} is true.
- * The default value of this property is assumed to be true.
- *
- * Possible values:
- * "true", to enable partial invalidates
- * "false", to disable partial invalidates
- */
- static final String RENDER_DIRTY_REGIONS_PROPERTY = "debug.hwui.render_dirty_regions";
-
- /**
- * System property used to enable or disable hardware rendering profiling.
- * The default value of this property is assumed to be false.
- *
- * When profiling is enabled, the adb shell dumpsys gfxinfo command will
- * output extra information about the time taken to execute by the last
- * frames.
- *
- * Possible values:
- * "true", to enable profiling
- * "visual_bars", to enable profiling and visualize the results on screen
- * "false", to disable profiling
- *
- * @see #PROFILE_PROPERTY_VISUALIZE_BARS
- *
- * @hide
- */
- public static final String PROFILE_PROPERTY = "debug.hwui.profile";
-
- /**
- * Value for {@link #PROFILE_PROPERTY}. When the property is set to this
- * value, profiling data will be visualized on screen as a bar chart.
- *
- * @hide
- */
- public static final String PROFILE_PROPERTY_VISUALIZE_BARS = "visual_bars";
-
- /**
- * System property used to specify the number of frames to be used
- * when doing hardware rendering profiling.
- * The default value of this property is #PROFILE_MAX_FRAMES.
- *
- * When profiling is enabled, the adb shell dumpsys gfxinfo command will
- * output extra information about the time taken to execute by the last
- * frames.
- *
- * Possible values:
- * "60", to set the limit of frames to 60
- */
- static final String PROFILE_MAXFRAMES_PROPERTY = "debug.hwui.profile.maxframes";
-
- /**
- * System property used to debug EGL configuration choice.
- *
- * Possible values:
- * "choice", print the chosen configuration only
- * "all", print all possible configurations
- */
- static final String PRINT_CONFIG_PROPERTY = "debug.hwui.print_config";
-
- /**
- * Turn on to draw dirty regions every other frame.
- *
- * Possible values:
- * "true", to enable dirty regions debugging
- * "false", to disable dirty regions debugging
- *
- * @hide
- */
- public static final String DEBUG_DIRTY_REGIONS_PROPERTY = "debug.hwui.show_dirty_regions";
-
- /**
- * Turn on to flash hardware layers when they update.
- *
- * Possible values:
- * "true", to enable hardware layers updates debugging
- * "false", to disable hardware layers updates debugging
- *
- * @hide
- */
- public static final String DEBUG_SHOW_LAYERS_UPDATES_PROPERTY =
- "debug.hwui.show_layers_updates";
-
- /**
- * Controls overdraw debugging.
- *
- * Possible values:
- * "false", to disable overdraw debugging
- * "show", to show overdraw areas on screen
- * "count", to display an overdraw counter
- *
- * @hide
- */
- public static final String DEBUG_OVERDRAW_PROPERTY = "debug.hwui.overdraw";
-
- /**
- * Value for {@link #DEBUG_OVERDRAW_PROPERTY}. When the property is set to this
- * value, overdraw will be shown on screen by coloring pixels.
- *
- * @hide
- */
- public static final String OVERDRAW_PROPERTY_SHOW = "show";
-
- /**
- * Turn on to debug non-rectangular clip operations.
- *
- * Possible values:
- * "hide", to disable this debug mode
- * "highlight", highlight drawing commands tested against a non-rectangular clip
- * "stencil", renders the clip region on screen when set
- *
- * @hide
- */
- public static final String DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY =
- "debug.hwui.show_non_rect_clip";
-
- /**
- * A process can set this flag to false to prevent the use of hardware
- * rendering.
- *
- * @hide
- */
- public static boolean sRendererDisabled = false;
-
- /**
- * Further hardware renderer disabling for the system process.
- *
- * @hide
- */
- public static boolean sSystemRendererDisabled = false;
-
- private boolean mEnabled;
- private boolean mRequested = true;
-
- /**
- * Invoke this method to disable hardware rendering in the current process.
- *
- * @hide
- */
- public static void disable(boolean system) {
- sRendererDisabled = true;
- if (system) {
- sSystemRendererDisabled = true;
- }
- }
-
- public static boolean sTrimForeground = false;
-
- /**
- * Controls whether or not the hardware renderer should aggressively
- * trim memory. Note that this must not be set for any process that
- * uses WebView! This should be only used by system_process or similar
- * that do not go into the background.
- */
- public static void enableForegroundTrimming() {
- sTrimForeground = true;
- }
-
- /**
- * Indicates whether hardware acceleration is available under any form for
- * the view hierarchy.
- *
- * @return True if the view hierarchy can potentially be hardware accelerated,
- * false otherwise
- */
- public static boolean isAvailable() {
- return DisplayListCanvas.isAvailable();
- }
-
- /**
- * Destroys the hardware rendering context.
- */
- abstract void destroy();
-
- /**
- * Initializes the hardware renderer for the specified surface.
- *
- * @param surface The surface to hardware accelerate
- *
- * @return True if the initialization was successful, false otherwise.
- */
- abstract boolean initialize(Surface surface) throws OutOfResourcesException;
-
- /**
- * Updates the hardware renderer for the specified surface.
- *
- * @param surface The surface to hardware accelerate
- */
- abstract void updateSurface(Surface surface) throws OutOfResourcesException;
-
- /**
- * Stops any rendering into the surface. Use this if it is unclear whether
- * or not the surface used by the HardwareRenderer will be changing. It
- * Suspends any rendering into the surface, but will not do any destruction
- */
- abstract boolean pauseSurface(Surface surface);
-
- /**
- * Destroys all hardware rendering resources associated with the specified
- * view hierarchy.
- *
- * @param view The root of the view hierarchy
- */
- abstract void destroyHardwareResources(View view);
-
- /**
- * This method should be invoked whenever the current hardware renderer
- * context should be reset.
- *
- * @param surface The surface to hardware accelerate
- */
- abstract void invalidate(Surface surface);
-
- /**
- * Detaches the layer's surface texture from the GL context and releases
- * the texture id
- */
- abstract void detachSurfaceTexture(long hardwareLayer);
-
- /**
- * Gets the current width of the surface. This is the width that the surface
- * was last set to in a call to {@link #setup(int, int, View.AttachInfo, Rect)}.
- *
- * @return the current width of the surface
- */
- abstract int getWidth();
-
- /**
- * Gets the current height of the surface. This is the height that the surface
- * was last set to in a call to {@link #setup(int, int, View.AttachInfo, Rect)}.
- *
- * @return the current width of the surface
- */
- abstract int getHeight();
-
- /**
- * Outputs extra debugging information in the specified file descriptor.
- */
- abstract void dumpGfxInfo(PrintWriter pw, FileDescriptor fd, String[] args);
-
- /**
- * Loads system properties used by the renderer. This method is invoked
- * whenever system properties are modified. Implementations can use this
- * to trigger live updates of the renderer based on properties.
- *
- * @return True if a property has changed.
- */
- abstract boolean loadSystemProperties();
-
- /**
- * Sets the directory to use as a persistent storage for hardware rendering
- * resources.
- *
- * @param cacheDir A directory the current process can write to
- *
- * @hide
- */
- public static void setupDiskCache(File cacheDir) {
- ThreadedRenderer.setupShadersDiskCache(new File(cacheDir, CACHE_PATH_SHADERS).getAbsolutePath());
- }
-
- /**
- * Indicates that the specified hardware layer needs to be updated
- * as soon as possible.
- *
- * @param layer The hardware layer that needs an update
- */
- abstract void pushLayerUpdate(HardwareLayer layer);
-
- /**
- * Tells the HardwareRenderer that the layer is destroyed. The renderer
- * should remove the layer from any update queues.
- */
- abstract void onLayerDestroyed(HardwareLayer layer);
-
- /**
- * Interface used to receive callbacks whenever a view is drawn by
- * a hardware renderer instance.
- */
- interface HardwareDrawCallbacks {
- /**
- * Invoked before a view is drawn by a hardware renderer.
- * This method can be used to apply transformations to the
- * canvas but no drawing command should be issued.
- *
- * @param canvas The Canvas used to render the view.
- */
- void onHardwarePreDraw(DisplayListCanvas canvas);
-
- /**
- * Invoked after a view is drawn by a hardware renderer.
- * It is safe to invoke drawing commands from this method.
- *
- * @param canvas The Canvas used to render the view.
- */
- void onHardwarePostDraw(DisplayListCanvas canvas);
- }
-
- /**
- * Indicates that the content drawn by HardwareDrawCallbacks needs to
- * be updated, which will be done by the next call to draw()
- */
- abstract void invalidateRoot();
-
- /**
- * Draws the specified view.
- *
- * @param view The view to draw.
- * @param attachInfo AttachInfo tied to the specified view.
- * @param callbacks Callbacks invoked when drawing happens.
- */
- abstract void draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callbacks);
-
- /**
- * Creates a new hardware layer. A hardware layer built by calling this
- * method will be treated as a texture layer, instead of as a render target.
- *
- * @return A hardware layer
- */
- abstract HardwareLayer createTextureLayer();
-
- abstract void buildLayer(RenderNode node);
-
- abstract boolean copyLayerInto(HardwareLayer layer, Bitmap bitmap);
-
- /**
- * Initializes the hardware renderer for the specified surface and setup the
- * renderer for drawing, if needed. This is invoked when the ViewAncestor has
- * potentially lost the hardware renderer. The hardware renderer should be
- * reinitialized and setup when the render {@link #isRequested()} and
- * {@link #isEnabled()}.
- *
- * @param width The width of the drawing surface.
- * @param height The height of the drawing surface.
- * @param attachInfo Information about the window.
- * @param surface The surface to hardware accelerate
- * @param surfaceInsets The drawing surface insets to apply
- *
- * @return true if the surface was initialized, false otherwise. Returning
- * false might mean that the surface was already initialized.
- */
- boolean initializeIfNeeded(int width, int height, View.AttachInfo attachInfo,
- Surface surface, Rect surfaceInsets) throws OutOfResourcesException {
- if (isRequested()) {
- // We lost the gl context, so recreate it.
- if (!isEnabled()) {
- if (initialize(surface)) {
- setup(width, height, attachInfo, surfaceInsets);
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Sets up the renderer for drawing.
- *
- * @param width The width of the drawing surface.
- * @param height The height of the drawing surface.
- * @param attachInfo Information about the window.
- * @param surfaceInsets The drawing surface insets to apply
- */
- abstract void setup(int width, int height, View.AttachInfo attachInfo, Rect surfaceInsets);
-
- /**
- * Updates the light position based on the position of the window.
- *
- * @param attachInfo Information about the window.
- */
- abstract void setLightCenter(View.AttachInfo attachInfo);
-
- /**
- * Optional, sets the name of the renderer. Useful for debugging purposes.
- *
- * @param name The name of this renderer, can be null
- */
- abstract void setName(String name);
-
- /**
- * Change the HardwareRenderer's opacity
- */
- abstract void setOpaque(boolean opaque);
-
- /**
- * Creates a hardware renderer using OpenGL.
- *
- * @param translucent True if the surface is translucent, false otherwise
- *
- * @return A hardware renderer backed by OpenGL.
- */
- static HardwareRenderer create(Context context, boolean translucent) {
- HardwareRenderer renderer = null;
- if (DisplayListCanvas.isAvailable()) {
- renderer = new ThreadedRenderer(context, translucent);
- }
- return renderer;
- }
-
- /**
- * Invoke this method when the system is running out of memory. This
- * method will attempt to recover as much memory as possible, based on
- * the specified hint.
- *
- * @param level Hint about the amount of memory that should be trimmed,
- * see {@link android.content.ComponentCallbacks}
- */
- static void trimMemory(int level) {
- ThreadedRenderer.trimMemory(level);
- }
-
- /**
- * Indicates whether hardware acceleration is currently enabled.
- *
- * @return True if hardware acceleration is in use, false otherwise.
- */
- boolean isEnabled() {
- return mEnabled;
- }
-
- /**
- * Indicates whether hardware acceleration is currently enabled.
- *
- * @param enabled True if the hardware renderer is in use, false otherwise.
- */
- void setEnabled(boolean enabled) {
- mEnabled = enabled;
- }
-
- /**
- * Indicates whether hardware acceleration is currently request but not
- * necessarily enabled yet.
- *
- * @return True if requested, false otherwise.
- */
- boolean isRequested() {
- return mRequested;
- }
-
- /**
- * Indicates whether hardware acceleration is currently requested but not
- * necessarily enabled yet.
- *
- * @return True to request hardware acceleration, false otherwise.
- */
- void setRequested(boolean requested) {
- mRequested = requested;
- }
-
- /**
- * Blocks until all previously queued work has completed.
- */
- abstract void fence();
-
- /**
- * Prevents any further drawing until draw() is called. This is a signal
- * that the contents of the RenderNode tree are no longer safe to play back.
- * In practice this usually means that there are Functor pointers in the
- * display list that are no longer valid.
- */
- abstract void stopDrawing();
-
- /**
- * Called by {@link ViewRootImpl} when a new performTraverals is scheduled.
- */
- abstract void notifyFramePending();
-
- abstract void registerAnimatingRenderNode(RenderNode animator);
-}
diff --git a/core/java/android/view/IDockDividerVisibilityListener.aidl b/core/java/android/view/IDockDividerVisibilityListener.aidl
new file mode 100644
index 0000000..a7d5cda
--- /dev/null
+++ b/core/java/android/view/IDockDividerVisibilityListener.aidl
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2015, 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.view;
+
+/**
+ * Listener for showing/hiding of the dock divider. Will fire when an app is shown in side by side
+ * mode and a divider should be shown.
+ *
+ * @hide
+ */
+oneway interface IDockDividerVisibilityListener {
+ void onDockDividerVisibilityChanged(boolean visible);
+}
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 7b5f5ab..bd65532 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -29,6 +29,7 @@
import android.os.IRemoteCallback;
import android.view.IApplicationToken;
import android.view.IAppTransitionAnimationSpecsFuture;
+import android.view.IDockDividerVisibilityListener;
import android.view.IOnKeyguardExitResult;
import android.view.IRotationWatcher;
import android.view.IWindowSession;
@@ -289,8 +290,12 @@
/**
* Create a screenshot of the applications currently displayed.
+ *
+ * @param frameScale the scale to apply to the frame, only used when width = -1 and
+ * height = -1
*/
- Bitmap screenshotApplications(IBinder appToken, int displayId, int maxWidth, int maxHeight);
+ Bitmap screenshotApplications(IBinder appToken, int displayId, int maxWidth, int maxHeight,
+ float frameScale);
/**
* Called by the status bar to notify Views of changes to System UI visiblity.
@@ -344,4 +349,9 @@
* stack size.
*/
void setDockedStackResizing(boolean resizing);
+
+ /**
+ * Registers a listener that will be called when the dock divider changes its visibility.
+ */
+ void registerDockDividerVisibilityListener(IDockDividerVisibilityListener listener);
}
diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl
index 3fc70cc..b3cd8c11 100644
--- a/core/java/android/view/IWindowSession.aidl
+++ b/core/java/android/view/IWindowSession.aidl
@@ -186,6 +186,11 @@
void reportDropResult(IWindow window, boolean consumed);
/**
+ * Cancel the current drag operation.
+ */
+ void cancelDragAndDrop(IBinder dragToken);
+
+ /**
* Tell the OS that we've just dragged into a View that is willing to accept the drop
*/
void dragRecipientEntered(IWindow window);
diff --git a/core/java/android/view/MagnificationSpec.java b/core/java/android/view/MagnificationSpec.java
index 0ee6714..49242bb 100644
--- a/core/java/android/view/MagnificationSpec.java
+++ b/core/java/android/view/MagnificationSpec.java
@@ -28,10 +28,21 @@
public class MagnificationSpec implements Parcelable {
private static final int MAX_POOL_SIZE = 20;
private static final SynchronizedPool<MagnificationSpec> sPool =
- new SynchronizedPool<MagnificationSpec>(MAX_POOL_SIZE);
+ new SynchronizedPool<>(MAX_POOL_SIZE);
+ /** The magnification scaling factor. */
public float scale = 1.0f;
+
+ /**
+ * The X coordinate, in unscaled screen-relative pixels, around which
+ * magnification is focused.
+ */
public float offsetX;
+
+ /**
+ * The Y coordinate, in unscaled screen-relative pixels, around which
+ * magnification is focused.
+ */
public float offsetY;
private MagnificationSpec() {
@@ -75,6 +86,12 @@
offsetY = 0.0f;
}
+ public void setTo(MagnificationSpec other) {
+ scale = other.scale;
+ offsetX = other.offsetX;
+ offsetY = other.offsetY;
+ }
+
@Override
public int describeContents() {
return 0;
@@ -89,6 +106,28 @@
}
@Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
+
+ final MagnificationSpec s = (MagnificationSpec) other;
+ return scale == s.scale && offsetX == s.offsetX && offsetY == s.offsetY;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = (scale != +0.0f ? Float.floatToIntBits(scale) : 0);
+ result = 31 * result + (offsetX != +0.0f ? Float.floatToIntBits(offsetX) : 0);
+ result = 31 * result + (offsetY != +0.0f ? Float.floatToIntBits(offsetY) : 0);
+ return result;
+ }
+
+ @Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("<scale:");
diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java
new file mode 100644
index 0000000..82f6c7f
--- /dev/null
+++ b/core/java/android/view/NotificationHeaderView.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2015 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.view;
+
+import android.annotation.Nullable;
+import android.app.Notification;
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.RemoteViews;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+/**
+ * A header of a notification view
+ *
+ * @hide
+ */
+@RemoteViews.RemoteView
+public class NotificationHeaderView extends LinearLayout {
+ private final int mHeaderMinWidth;
+ private View mAppName;
+ private View mSubTextView;
+ private OnClickListener mExpandClickListener;
+ private HeaderTouchListener mTouchListener = new HeaderTouchListener();
+ private View mExpandButton;
+ private View mIcon;
+ private TextView mChildCount;
+
+ public NotificationHeaderView(Context context) {
+ this(context, null);
+ }
+
+ public NotificationHeaderView(Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public NotificationHeaderView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public NotificationHeaderView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ mHeaderMinWidth = getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.notification_header_shrink_min_width);
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ mAppName = findViewById(com.android.internal.R.id.app_name_text);
+ mSubTextView = findViewById(com.android.internal.R.id.header_sub_text);
+ mExpandButton = findViewById(com.android.internal.R.id.expand_button);
+ mIcon = findViewById(com.android.internal.R.id.icon);
+ mChildCount = (TextView) findViewById(com.android.internal.R.id.number_of_children);
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ final int givenWidth = MeasureSpec.getSize(widthMeasureSpec);
+ final int givenHeight = MeasureSpec.getSize(heightMeasureSpec);
+ int wrapContentWidthSpec = MeasureSpec.makeMeasureSpec(givenWidth,
+ MeasureSpec.AT_MOST);
+ int wrapContentHeightSpec = MeasureSpec.makeMeasureSpec(givenHeight,
+ MeasureSpec.AT_MOST);
+ int totalWidth = getPaddingStart() + getPaddingEnd();
+ for (int i = 0; i < getChildCount(); i++) {
+ final View child = getChildAt(i);
+ if (child.getVisibility() == GONE) {
+ // We'll give it the rest of the space in the end
+ continue;
+ }
+ final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
+ int childWidthSpec = getChildMeasureSpec(wrapContentWidthSpec,
+ lp.leftMargin + lp.rightMargin, lp.width);
+ int childHeightSpec = getChildMeasureSpec(wrapContentHeightSpec,
+ lp.topMargin + lp.bottomMargin, lp.height);
+ child.measure(childWidthSpec, childHeightSpec);
+ totalWidth += lp.leftMargin + lp.rightMargin + child.getMeasuredWidth();
+ }
+ if (totalWidth > givenWidth) {
+ int overFlow = totalWidth - givenWidth;
+ // We are overflowing, lets shrink
+ final int appWidth = mAppName.getMeasuredWidth();
+ if (appWidth > mHeaderMinWidth) {
+ int newSize = appWidth - Math.min(appWidth - mHeaderMinWidth, overFlow);
+ int childWidthSpec = MeasureSpec.makeMeasureSpec(newSize, MeasureSpec.AT_MOST);
+ mAppName.measure(childWidthSpec, wrapContentHeightSpec);
+ overFlow -= appWidth - newSize;
+ }
+ if (overFlow > 0 && mSubTextView.getVisibility() != GONE) {
+ // we're still too big
+ final int subTextWidth = mSubTextView.getMeasuredWidth();
+ int newSize = Math.max(0, subTextWidth - overFlow);
+ int childWidthSpec = MeasureSpec.makeMeasureSpec(newSize, MeasureSpec.AT_MOST);
+ mSubTextView.measure(childWidthSpec, wrapContentHeightSpec);
+ }
+ totalWidth = givenWidth;
+ }
+ setMeasuredDimension(totalWidth, givenHeight);
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int l, int t, int r, int b) {
+ super.onLayout(changed, l, t, r, b);
+ updateTouchListener();
+ }
+
+ private void updateTouchListener() {
+ if (mExpandClickListener != null) {
+ mTouchListener.bindTouchRects();
+ }
+ }
+
+ @Override
+ public void setOnClickListener(@Nullable OnClickListener l) {
+ mExpandClickListener = l;
+ setOnTouchListener(mExpandClickListener != null ? mTouchListener : null);
+ updateTouchListener();
+ }
+
+ public void setChildCount(int childCount) {
+ if (childCount > 0) {
+ mChildCount.setText(getContext().getString(
+ com.android.internal.R.string.notification_children_count_bracketed,
+ childCount));
+ mChildCount.setVisibility(VISIBLE);
+ } else {
+ mChildCount.setVisibility(GONE);
+ }
+ }
+
+ public class HeaderTouchListener implements View.OnTouchListener {
+
+ private final ArrayList<Rect> mTouchRects = new ArrayList<>();
+ private int mTouchSlop;
+ private boolean mTrackGesture;
+ private float mDownX;
+ private float mDownY;
+
+ public HeaderTouchListener() {
+ }
+
+ public void bindTouchRects() {
+ mTouchRects.clear();
+ addRectAroundViewView(mIcon);
+ addRectAroundViewView(mExpandButton);
+ addInBetweenRect();
+ mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
+ }
+
+ private void addInBetweenRect() {
+ final Rect r = new Rect();
+ r.top = 0;
+ r.bottom = (int) (32 * getResources().getDisplayMetrics().density);
+ Rect leftRect = mTouchRects.get(0);
+ r.left = leftRect.right;
+ Rect rightRect = mTouchRects.get(1);
+ r.right = rightRect.left;
+ mTouchRects.add(r);
+ }
+
+ private void addRectAroundViewView(View view) {
+ final Rect r = getRectAroundView(view);
+ mTouchRects.add(r);
+ }
+
+ private Rect getRectAroundView(View view) {
+ float size = 48 * getResources().getDisplayMetrics().density;
+ final Rect r = new Rect();
+ if (view.getVisibility() == GONE) {
+ view = getFirstChildNotGone();
+ r.left = (int) (view.getLeft() - size / 2.0f);
+ } else {
+ r.left = (int) ((view.getLeft() + view.getRight()) / 2.0f - size / 2.0f);
+ }
+ r.top = (int) ((view.getTop() + view.getBottom()) / 2.0f - size / 2.0f);
+ r.bottom = (int) (r.top + size);
+ r.right = (int) (r.left + size);
+ return r;
+ }
+
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ float x = event.getX();
+ float y = event.getY();
+ switch (event.getActionMasked() & MotionEvent.ACTION_MASK) {
+ case MotionEvent.ACTION_DOWN:
+ mTrackGesture = false;
+ if (isInside(x, y)) {
+ mTrackGesture = true;
+ return true;
+ }
+ break;
+ case MotionEvent.ACTION_MOVE:
+ if (mTrackGesture) {
+ if (Math.abs(mDownX - x) > mTouchSlop
+ || Math.abs(mDownY - y) > mTouchSlop) {
+ mTrackGesture = false;
+ }
+ }
+ break;
+ case MotionEvent.ACTION_UP:
+ if (mTrackGesture) {
+ mExpandClickListener.onClick(NotificationHeaderView.this);
+ }
+ break;
+ }
+ return mTrackGesture;
+ }
+
+ private boolean isInside(float x, float y) {
+ for (int i = 0; i < mTouchRects.size(); i++) {
+ Rect r = mTouchRects.get(i);
+ if (r.contains((int) x, (int) y)) {
+ mDownX = x;
+ mDownY = y;
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ private View getFirstChildNotGone() {
+ for (int i = 0; i < getChildCount(); i++) {
+ final View child = getChildAt(i);
+ if (child.getVisibility() != GONE) {
+ return child;
+ }
+ }
+ return this;
+ }
+}
diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java
index 88e9a95..b61706e 100644
--- a/core/java/android/view/PointerIcon.java
+++ b/core/java/android/view/PointerIcon.java
@@ -24,6 +24,7 @@
import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.graphics.Bitmap;
+import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Parcel;
@@ -142,6 +143,10 @@
private Bitmap mBitmap;
private float mHotSpotX;
private float mHotSpotY;
+ // The bitmaps for the additional frame of animated pointer icon. Note that the first frame
+ // will be stored in mBitmap.
+ private Bitmap mBitmapFrames[];
+ private int mDurationPerFrame;
private PointerIcon(int style) {
mStyle = style;
@@ -472,6 +477,36 @@
} else {
drawable = context.getDrawable(bitmapRes);
}
+ if (drawable instanceof AnimationDrawable) {
+ // Extract animation frame bitmaps.
+ final AnimationDrawable animationDrawable = (AnimationDrawable) drawable;
+ final int frames = animationDrawable.getNumberOfFrames();
+ drawable = animationDrawable.getFrame(0);
+ if (frames == 1) {
+ Log.w(TAG, "Animation icon with single frame -- simply treating the first "
+ + "frame as a normal bitmap icon.");
+ } else {
+ // Assumes they have the exact duration.
+ mDurationPerFrame = animationDrawable.getDuration(0);
+ mBitmapFrames = new Bitmap[frames - 1];
+ final int width = drawable.getIntrinsicWidth();
+ final int height = drawable.getIntrinsicHeight();
+ for (int i = 1; i < frames; ++i) {
+ Drawable drawableFrame = animationDrawable.getFrame(i);
+ if (!(drawableFrame instanceof BitmapDrawable)) {
+ throw new IllegalArgumentException("Frame of an animated pointer icon "
+ + "must refer to a bitmap drawable.");
+ }
+ if (drawableFrame.getIntrinsicWidth() != width ||
+ drawableFrame.getIntrinsicHeight() != height) {
+ throw new IllegalArgumentException("The bitmap size of " + i + "-th frame "
+ + "is different. All frames should have the exact same size and "
+ + "share the same hotspot.");
+ }
+ mBitmapFrames[i - 1] = ((BitmapDrawable)drawableFrame).getBitmap();
+ }
+ }
+ }
if (!(drawable instanceof BitmapDrawable)) {
throw new IllegalArgumentException("<pointer-icon> bitmap attribute must "
+ "refer to a bitmap drawable.");
@@ -509,8 +544,7 @@
case STYLE_HELP:
return com.android.internal.R.styleable.Pointer_pointerIconHelp;
case STYLE_WAIT:
- // falls back to the default icon because no animation support.
- return com.android.internal.R.styleable.Pointer_pointerIconArrow;
+ return com.android.internal.R.styleable.Pointer_pointerIconWait;
case STYLE_CELL:
return com.android.internal.R.styleable.Pointer_pointerIconCell;
case STYLE_CROSSHAIR:
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index 304e9c0..f2a4d7b 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -35,6 +35,7 @@
import com.android.internal.R;
+import java.io.File;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.annotation.Retention;
@@ -59,8 +60,230 @@
*
* @hide
*/
-public class ThreadedRenderer extends HardwareRenderer {
- private static final String LOGTAG = "ThreadedRenderer";
+public final class ThreadedRenderer {
+ private static final String LOG_TAG = "ThreadedRenderer";
+
+ /**
+ * Name of the file that holds the shaders cache.
+ */
+ private static final String CACHE_PATH_SHADERS = "com.android.opengl.shaders_cache";
+
+ /**
+ * System property used to enable or disable dirty regions invalidation.
+ * This property is only queried if {@link #RENDER_DIRTY_REGIONS} is true.
+ * The default value of this property is assumed to be true.
+ *
+ * Possible values:
+ * "true", to enable partial invalidates
+ * "false", to disable partial invalidates
+ */
+ static final String RENDER_DIRTY_REGIONS_PROPERTY = "debug.hwui.render_dirty_regions";
+
+ /**
+ * System property used to enable or disable hardware rendering profiling.
+ * The default value of this property is assumed to be false.
+ *
+ * When profiling is enabled, the adb shell dumpsys gfxinfo command will
+ * output extra information about the time taken to execute by the last
+ * frames.
+ *
+ * Possible values:
+ * "true", to enable profiling
+ * "visual_bars", to enable profiling and visualize the results on screen
+ * "false", to disable profiling
+ *
+ * @see #PROFILE_PROPERTY_VISUALIZE_BARS
+ *
+ * @hide
+ */
+ public static final String PROFILE_PROPERTY = "debug.hwui.profile";
+
+ /**
+ * Value for {@link #PROFILE_PROPERTY}. When the property is set to this
+ * value, profiling data will be visualized on screen as a bar chart.
+ *
+ * @hide
+ */
+ public static final String PROFILE_PROPERTY_VISUALIZE_BARS = "visual_bars";
+
+ /**
+ * System property used to specify the number of frames to be used
+ * when doing hardware rendering profiling.
+ * The default value of this property is #PROFILE_MAX_FRAMES.
+ *
+ * When profiling is enabled, the adb shell dumpsys gfxinfo command will
+ * output extra information about the time taken to execute by the last
+ * frames.
+ *
+ * Possible values:
+ * "60", to set the limit of frames to 60
+ */
+ static final String PROFILE_MAXFRAMES_PROPERTY = "debug.hwui.profile.maxframes";
+
+ /**
+ * System property used to debug EGL configuration choice.
+ *
+ * Possible values:
+ * "choice", print the chosen configuration only
+ * "all", print all possible configurations
+ */
+ static final String PRINT_CONFIG_PROPERTY = "debug.hwui.print_config";
+
+ /**
+ * Turn on to draw dirty regions every other frame.
+ *
+ * Possible values:
+ * "true", to enable dirty regions debugging
+ * "false", to disable dirty regions debugging
+ *
+ * @hide
+ */
+ public static final String DEBUG_DIRTY_REGIONS_PROPERTY = "debug.hwui.show_dirty_regions";
+
+ /**
+ * Turn on to flash hardware layers when they update.
+ *
+ * Possible values:
+ * "true", to enable hardware layers updates debugging
+ * "false", to disable hardware layers updates debugging
+ *
+ * @hide
+ */
+ public static final String DEBUG_SHOW_LAYERS_UPDATES_PROPERTY =
+ "debug.hwui.show_layers_updates";
+
+ /**
+ * Controls overdraw debugging.
+ *
+ * Possible values:
+ * "false", to disable overdraw debugging
+ * "show", to show overdraw areas on screen
+ * "count", to display an overdraw counter
+ *
+ * @hide
+ */
+ public static final String DEBUG_OVERDRAW_PROPERTY = "debug.hwui.overdraw";
+
+ /**
+ * Value for {@link #DEBUG_OVERDRAW_PROPERTY}. When the property is set to this
+ * value, overdraw will be shown on screen by coloring pixels.
+ *
+ * @hide
+ */
+ public static final String OVERDRAW_PROPERTY_SHOW = "show";
+
+ /**
+ * Turn on to debug non-rectangular clip operations.
+ *
+ * Possible values:
+ * "hide", to disable this debug mode
+ * "highlight", highlight drawing commands tested against a non-rectangular clip
+ * "stencil", renders the clip region on screen when set
+ *
+ * @hide
+ */
+ public static final String DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY =
+ "debug.hwui.show_non_rect_clip";
+
+ /**
+ * A process can set this flag to false to prevent the use of hardware
+ * rendering.
+ *
+ * @hide
+ */
+ public static boolean sRendererDisabled = false;
+
+ /**
+ * Further hardware renderer disabling for the system process.
+ *
+ * @hide
+ */
+ public static boolean sSystemRendererDisabled = false;
+
+ /**
+ * Invoke this method to disable hardware rendering in the current process.
+ *
+ * @hide
+ */
+ public static void disable(boolean system) {
+ sRendererDisabled = true;
+ if (system) {
+ sSystemRendererDisabled = true;
+ }
+ }
+
+ public static boolean sTrimForeground = false;
+
+ /**
+ * Controls whether or not the hardware renderer should aggressively
+ * trim memory. Note that this must not be set for any process that
+ * uses WebView! This should be only used by system_process or similar
+ * that do not go into the background.
+ */
+ public static void enableForegroundTrimming() {
+ sTrimForeground = true;
+ }
+
+ /**
+ * Indicates whether hardware acceleration is available under any form for
+ * the view hierarchy.
+ *
+ * @return True if the view hierarchy can potentially be hardware accelerated,
+ * false otherwise
+ */
+ public static boolean isAvailable() {
+ return DisplayListCanvas.isAvailable();
+ }
+
+ /**
+ * Sets the directory to use as a persistent storage for hardware rendering
+ * resources.
+ *
+ * @param cacheDir A directory the current process can write to
+ *
+ * @hide
+ */
+ public static void setupDiskCache(File cacheDir) {
+ ThreadedRenderer.setupShadersDiskCache(new File(cacheDir, CACHE_PATH_SHADERS).getAbsolutePath());
+ }
+
+ /**
+ * Creates a hardware renderer using OpenGL.
+ *
+ * @param translucent True if the surface is translucent, false otherwise
+ *
+ * @return A hardware renderer backed by OpenGL.
+ */
+ public static ThreadedRenderer create(Context context, boolean translucent) {
+ ThreadedRenderer renderer = null;
+ if (DisplayListCanvas.isAvailable()) {
+ renderer = new ThreadedRenderer(context, translucent);
+ }
+ return renderer;
+ }
+
+ /**
+ * Invoke this method when the system is running out of memory. This
+ * method will attempt to recover as much memory as possible, based on
+ * the specified hint.
+ *
+ * @param level Hint about the amount of memory that should be trimmed,
+ * see {@link android.content.ComponentCallbacks}
+ */
+ public static void trimMemory(int level) {
+ nTrimMemory(level);
+ }
+
+ public static void overrideProperty(@NonNull String name, @NonNull String value) {
+ if (name == null || value == null) {
+ throw new IllegalArgumentException("name and value must be non-null");
+ }
+ nOverrideProperty(name, value);
+ }
+
+ public static void dumpProfileData(byte[] data, FileDescriptor fd) {
+ nDumpProfileData(data, fd);
+ }
// Keep in sync with DrawFrameTask.h SYNC_* flags
// Nothing interesting to report
@@ -113,6 +336,9 @@
private final Rect mCurrentContentBounds = new Rect();
private final Rect mStagedContentBounds = new Rect();
+ private boolean mEnabled;
+ private boolean mRequested = true;
+
ThreadedRenderer(Context context, boolean translucent) {
final TypedArray a = context.obtainStyledAttributes(null, R.styleable.Lighting, 0, 0);
mLightY = a.getDimension(R.styleable.Lighting_lightY, 0);
@@ -133,13 +359,53 @@
loadSystemProperties();
}
- @Override
+ /**
+ * Destroys the hardware rendering context.
+ */
void destroy() {
mInitialized = false;
updateEnabledState(null);
nDestroy(mNativeProxy);
}
+ /**
+ * Indicates whether hardware acceleration is currently enabled.
+ *
+ * @return True if hardware acceleration is in use, false otherwise.
+ */
+ boolean isEnabled() {
+ return mEnabled;
+ }
+
+ /**
+ * Indicates whether hardware acceleration is currently enabled.
+ *
+ * @param enabled True if the hardware renderer is in use, false otherwise.
+ */
+ void setEnabled(boolean enabled) {
+ mEnabled = enabled;
+ }
+
+ /**
+ * Indicates whether hardware acceleration is currently request but not
+ * necessarily enabled yet.
+ *
+ * @return True if requested, false otherwise.
+ */
+ boolean isRequested() {
+ return mRequested;
+ }
+
+ /**
+ * Indicates whether hardware acceleration is currently requested but not
+ * necessarily enabled yet.
+ *
+ * @return True to request hardware acceleration, false otherwise.
+ */
+ void setRequested(boolean requested) {
+ mRequested = requested;
+ }
+
private void updateEnabledState(Surface surface) {
if (surface == null || !surface.isValid()) {
setEnabled(false);
@@ -148,7 +414,13 @@
}
}
- @Override
+ /**
+ * Initializes the hardware renderer for the specified surface.
+ *
+ * @param surface The surface to hardware accelerate
+ *
+ * @return True if the initialization was successful, false otherwise.
+ */
boolean initialize(Surface surface) throws OutOfResourcesException {
mInitialized = true;
updateEnabledState(surface);
@@ -156,18 +428,61 @@
return status;
}
- @Override
+ /**
+ * Initializes the hardware renderer for the specified surface and setup the
+ * renderer for drawing, if needed. This is invoked when the ViewAncestor has
+ * potentially lost the hardware renderer. The hardware renderer should be
+ * reinitialized and setup when the render {@link #isRequested()} and
+ * {@link #isEnabled()}.
+ *
+ * @param width The width of the drawing surface.
+ * @param height The height of the drawing surface.
+ * @param attachInfo Information about the window.
+ * @param surface The surface to hardware accelerate
+ * @param surfaceInsets The drawing surface insets to apply
+ *
+ * @return true if the surface was initialized, false otherwise. Returning
+ * false might mean that the surface was already initialized.
+ */
+ boolean initializeIfNeeded(int width, int height, View.AttachInfo attachInfo,
+ Surface surface, Rect surfaceInsets) throws OutOfResourcesException {
+ if (isRequested()) {
+ // We lost the gl context, so recreate it.
+ if (!isEnabled()) {
+ if (initialize(surface)) {
+ setup(width, height, attachInfo, surfaceInsets);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Updates the hardware renderer for the specified surface.
+ *
+ * @param surface The surface to hardware accelerate
+ */
void updateSurface(Surface surface) throws OutOfResourcesException {
updateEnabledState(surface);
nUpdateSurface(mNativeProxy, surface);
}
- @Override
+ /**
+ * Stops any rendering into the surface. Use this if it is unclear whether
+ * or not the surface used by the HardwareRenderer will be changing. It
+ * Suspends any rendering into the surface, but will not do any destruction
+ */
boolean pauseSurface(Surface surface) {
return nPauseSurface(mNativeProxy, surface);
}
- @Override
+ /**
+ * Destroys all hardware rendering resources associated with the specified
+ * view hierarchy.
+ *
+ * @param view The root of the view hierarchy
+ */
void destroyHardwareResources(View view) {
destroyResources(view);
nDestroyHardwareResources(mNativeProxy);
@@ -186,17 +501,32 @@
}
}
- @Override
+ /**
+ * This method should be invoked whenever the current hardware renderer
+ * context should be reset.
+ *
+ * @param surface The surface to hardware accelerate
+ */
void invalidate(Surface surface) {
updateSurface(surface);
}
- @Override
+ /**
+ * Detaches the layer's surface texture from the GL context and releases
+ * the texture id
+ */
void detachSurfaceTexture(long hardwareLayer) {
nDetachSurfaceTexture(mNativeProxy, hardwareLayer);
}
- @Override
+ /**
+ * Sets up the renderer for drawing.
+ *
+ * @param width The width of the drawing surface.
+ * @param height The height of the drawing surface.
+ * @param attachInfo Information about the window.
+ * @param surfaceInsets The drawing surface insets to apply
+ */
void setup(int width, int height, AttachInfo attachInfo, Rect surfaceInsets) {
mWidth = width;
mHeight = height;
@@ -226,7 +556,11 @@
setLightCenter(attachInfo);
}
- @Override
+ /**
+ * Updates the light position based on the position of the window.
+ *
+ * @param attachInfo Information about the window.
+ */
void setLightCenter(AttachInfo attachInfo) {
// Adjust light position for window offsets.
final Point displaySize = attachInfo.mPoint;
@@ -237,22 +571,36 @@
nSetLightCenter(mNativeProxy, lightX, lightY, mLightZ);
}
- @Override
+ /**
+ * Change the HardwareRenderer's opacity
+ */
void setOpaque(boolean opaque) {
nSetOpaque(mNativeProxy, opaque && !mHasInsets);
}
- @Override
+ /**
+ * Gets the current width of the surface. This is the width that the surface
+ * was last set to in a call to {@link #setup(int, int, View.AttachInfo, Rect)}.
+ *
+ * @return the current width of the surface
+ */
int getWidth() {
return mWidth;
}
- @Override
+ /**
+ * Gets the current height of the surface. This is the height that the surface
+ * was last set to in a call to {@link #setup(int, int, View.AttachInfo, Rect)}.
+ *
+ * @return the current width of the surface
+ */
int getHeight() {
return mHeight;
}
- @Override
+ /**
+ * Outputs extra debugging information in the specified file descriptor.
+ */
void dumpGfxInfo(PrintWriter pw, FileDescriptor fd, String[] args) {
pw.flush();
int flags = 0;
@@ -269,7 +617,13 @@
nDumpProfileInfo(mNativeProxy, fd, flags);
}
- @Override
+ /**
+ * Loads system properties used by the renderer. This method is invoked
+ * whenever system properties are modified. Implementations can use this
+ * to trigger live updates of the renderer based on properties.
+ *
+ * @return True if a property has changed.
+ */
boolean loadSystemProperties() {
boolean changed = nLoadSystemProperties(mNativeProxy);
if (changed) {
@@ -353,12 +707,44 @@
mStagedContentBounds.set(left, top, right, bottom);
}
- @Override
+ /**
+ * Interface used to receive callbacks whenever a view is drawn by
+ * a hardware renderer instance.
+ */
+ interface HardwareDrawCallbacks {
+ /**
+ * Invoked before a view is drawn by a hardware renderer.
+ * This method can be used to apply transformations to the
+ * canvas but no drawing command should be issued.
+ *
+ * @param canvas The Canvas used to render the view.
+ */
+ void onHardwarePreDraw(DisplayListCanvas canvas);
+
+ /**
+ * Invoked after a view is drawn by a hardware renderer.
+ * It is safe to invoke drawing commands from this method.
+ *
+ * @param canvas The Canvas used to render the view.
+ */
+ void onHardwarePostDraw(DisplayListCanvas canvas);
+ }
+
+ /**
+ * Indicates that the content drawn by HardwareDrawCallbacks needs to
+ * be updated, which will be done by the next call to draw()
+ */
void invalidateRoot() {
mRootNodeNeedsUpdate = true;
}
- @Override
+ /**
+ * Draws the specified view.
+ *
+ * @param view The view to draw.
+ * @param attachInfo AttachInfo tied to the specified view.
+ * @param callbacks Callbacks invoked when drawing happens.
+ */
void draw(View view, AttachInfo attachInfo, HardwareDrawCallbacks callbacks) {
attachInfo.mIgnoreDirtyState = true;
@@ -409,54 +795,80 @@
nInvokeFunctor(functor, waitForCompletion);
}
- @Override
+ /**
+ * Creates a new hardware layer. A hardware layer built by calling this
+ * method will be treated as a texture layer, instead of as a render target.
+ *
+ * @return A hardware layer
+ */
HardwareLayer createTextureLayer() {
long layer = nCreateTextureLayer(mNativeProxy);
return HardwareLayer.adoptTextureLayer(this, layer);
}
- @Override
+
void buildLayer(RenderNode node) {
nBuildLayer(mNativeProxy, node.getNativeDisplayList());
}
- @Override
+
boolean copyLayerInto(final HardwareLayer layer, final Bitmap bitmap) {
return nCopyLayerInto(mNativeProxy,
layer.getDeferredLayerUpdater(), bitmap);
}
- @Override
+ /**
+ * Indicates that the specified hardware layer needs to be updated
+ * as soon as possible.
+ *
+ * @param layer The hardware layer that needs an update
+ */
void pushLayerUpdate(HardwareLayer layer) {
nPushLayerUpdate(mNativeProxy, layer.getDeferredLayerUpdater());
}
- @Override
+ /**
+ * Tells the HardwareRenderer that the layer is destroyed. The renderer
+ * should remove the layer from any update queues.
+ */
void onLayerDestroyed(HardwareLayer layer) {
nCancelLayerUpdate(mNativeProxy, layer.getDeferredLayerUpdater());
}
- @Override
+ /**
+ * Optional, sets the name of the renderer. Useful for debugging purposes.
+ *
+ * @param name The name of this renderer, can be null
+ */
void setName(String name) {
nSetName(mNativeProxy, name);
}
- @Override
+ /**
+ * Blocks until all previously queued work has completed.
+ */
void fence() {
nFence(mNativeProxy);
}
- @Override
+ /**
+ * Prevents any further drawing until draw() is called. This is a signal
+ * that the contents of the RenderNode tree are no longer safe to play back.
+ * In practice this usually means that there are Functor pointers in the
+ * display list that are no longer valid.
+ */
void stopDrawing() {
nStopDrawing(mNativeProxy);
}
- @Override
+ /**
+ * Called by {@link ViewRootImpl} when a new performTraverals is scheduled.
+ */
public void notifyFramePending() {
nNotifyFramePending(mNativeProxy);
}
- @Override
+
void registerAnimatingRenderNode(RenderNode animator) {
nRegisterAnimatingRenderNode(mRootNode.mNativeRenderNode, animator.mNativeRenderNode);
}
@@ -475,21 +887,6 @@
}
}
- static void trimMemory(int level) {
- nTrimMemory(level);
- }
-
- public static void overrideProperty(@NonNull String name, @NonNull String value) {
- if (name == null || value == null) {
- throw new IllegalArgumentException("name and value must be non-null");
- }
- nOverrideProperty(name, value);
- }
-
- public static void dumpProfileData(byte[] data, FileDescriptor fd) {
- nDumpProfileData(data, fd);
- }
-
private static class ProcessInitializer {
static ProcessInitializer sInstance = new ProcessInitializer();
private static IBinder sProcToken;
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 461506b..1b8ef9e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -83,6 +83,7 @@
import android.view.AccessibilityIterators.CharacterTextSegmentIterator;
import android.view.AccessibilityIterators.WordTextSegmentIterator;
import android.view.AccessibilityIterators.ParagraphTextSegmentIterator;
+import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityEventSource;
import android.view.accessibility.AccessibilityManager;
@@ -806,6 +807,12 @@
private static boolean sAlwaysRemeasureExactly = false;
/**
+ * Relax constraints around whether setLayoutParams() must be called after
+ * modifying the layout params.
+ */
+ private static boolean sLayoutParamsAlwaysChanged = false;
+
+ /**
* This view does not want keystrokes. Use with TAKES_FOCUS_MASK when
* calling setFlags.
*/
@@ -2416,6 +2423,8 @@
* 1 PFLAG3_SCROLL_INDICATOR_END
* 1 PFLAG3_ASSIST_BLOCKED
* 1111111 PFLAG3_POINTER_ICON_MASK
+ * 1 PFLAG3_PARTIAL_LAYOUT_REQUESTED
+ * 1 PFLAG3_LAYOUT_PARAMS_CHANGED
* |-------|-------|-------|-------|
*/
@@ -2504,6 +2513,7 @@
*/
static final int PFLAG3_SCROLL_INDICATOR_END = 0x2000;
+
/* End of masks for mPrivateFlags3 */
static final int DRAG_MASK = PFLAG2_DRAG_CAN_ACCEPT | PFLAG2_DRAG_HOVERED;
@@ -2642,6 +2652,19 @@
private static final int PFLAG3_POINTER_ICON_VALUE_START = 3 << PFLAG3_POINTER_ICON_LSHIFT;
/**
+ * Flag indicating that this view has requested a partial layout and
+ * is added to the AttachInfo's list of views that need a partial layout
+ * request handled on the next traversal.
+ */
+ static final int PFLAG3_PARTIAL_LAYOUT_REQUESTED = 0x800000;
+
+ /**
+ * Flag indicating that this view's LayoutParams have been explicitly changed
+ * since the last layout pass.
+ */
+ static final int PFLAG3_LAYOUT_PARAMS_CHANGED = 0x1000000;
+
+ /**
* Always allow a user to over-scroll this view, provided it is a
* view that can scroll.
*
@@ -3679,7 +3702,7 @@
/**
* Flag indicating that a drag can cross window boundaries. When
- * {@link #startDrag(ClipData, DragShadowBuilder, Object, int)} is called
+ * {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int)} is called
* with this flag set, all visible applications will be able to participate
* in the drag operation and receive the dragged content.
*
@@ -3724,7 +3747,7 @@
/**
* Flag indicating that the drag shadow will be opaque. When
- * {@link #startDrag(ClipData, DragShadowBuilder, Object, int)} is called
+ * {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int)} is called
* with this flag set, the drag shadow will be opaque, otherwise, it will be semitransparent.
*/
public static final int DRAG_FLAG_OPAQUE = 1 << 9;
@@ -3958,6 +3981,11 @@
// modes, so we always need to run an additional EXACTLY pass.
sAlwaysRemeasureExactly = targetSdkVersion <= M;
+ // Prior to N, layout params could change without requiring a
+ // subsequent call to setLayoutParams() and they would usually
+ // work. Partial layout breaks this assumption.
+ sLayoutParamsAlwaysChanged = targetSdkVersion <= M;
+
sCompatibilityDone = true;
}
}
@@ -6329,8 +6357,8 @@
position.offset(mAttachInfo.mWindowLeft, mAttachInfo.mWindowTop);
- outRect.set((int) (position.left + 0.5f), (int) (position.top + 0.5f),
- (int) (position.right + 0.5f), (int) (position.bottom + 0.5f));
+ outRect.set(Math.round(position.left), Math.round(position.top),
+ Math.round(position.right), Math.round(position.bottom));
}
/**
@@ -12622,10 +12650,14 @@
* ViewGroup.LayoutParams, and these correspond to the different subclasses
* of ViewGroup that are responsible for arranging their children.
*
- * This method may return null if this View is not attached to a parent
+ * <p>This method may return null if this View is not attached to a parent
* ViewGroup or {@link #setLayoutParams(android.view.ViewGroup.LayoutParams)}
* was not invoked successfully. When a View is attached to a parent
- * ViewGroup, this method must not return null.
+ * ViewGroup, this method must not return null.</p>
+ *
+ * <p>Callers that modify the returned LayoutParams object should call
+ * {@link #setLayoutParams(LayoutParams)} to explicitly inform the view that
+ * LayoutParams have changed.</p>
*
* @return The LayoutParams associated with this view, or null if no
* parameters have been set yet
@@ -12642,6 +12674,9 @@
* correspond to the different subclasses of ViewGroup that are responsible
* for arranging their children.
*
+ * <p>If the View's existing LayoutParams object as obtained by {@link #getLayoutParams()} is
+ * modified, you should call this method to inform the view that it has changed.</p>
+ *
* @param params The layout parameters for this view, cannot be null
*/
public void setLayoutParams(ViewGroup.LayoutParams params) {
@@ -12649,6 +12684,7 @@
throw new NullPointerException("Layout parameters cannot be null");
}
mLayoutParams = params;
+ mPrivateFlags3 |= PFLAG3_LAYOUT_PARAMS_CHANGED;
resolveLayoutParams();
if (mParent instanceof ViewGroup) {
((ViewGroup) mParent).onSetLayoutParams(this, params);
@@ -13234,7 +13270,7 @@
/**
* @hide
*/
- public HardwareRenderer getHardwareRenderer() {
+ public ThreadedRenderer getHardwareRenderer() {
return mAttachInfo != null ? mAttachInfo.mHardwareRenderer : null;
}
@@ -14324,7 +14360,12 @@
mParent.requestTransparentRegion(this);
}
- mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT;
+ if ((mPrivateFlags & PFLAG_AWAKEN_SCROLL_BARS_ON_ATTACH) != 0) {
+ initialAwakenScrollBars();
+ mPrivateFlags &= ~PFLAG_AWAKEN_SCROLL_BARS_ON_ATTACH;
+ }
+
+ mPrivateFlags3 &= ~(PFLAG3_IS_LAID_OUT | PFLAG3_PARTIAL_LAYOUT_REQUESTED);
jumpDrawablesToCurrentState();
@@ -14662,8 +14703,13 @@
*/
@CallSuper
protected void onDetachedFromWindowInternal() {
+ if (mAttachInfo != null && isPartialLayoutRequested()) {
+ mAttachInfo.mPartialLayoutViews.remove(this);
+ }
+
mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT;
- mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT;
+ mPrivateFlags3 &= ~(PFLAG3_IS_LAID_OUT | PFLAG3_PARTIAL_LAYOUT_REQUESTED
+ | PFLAG3_LAYOUT_PARAMS_CHANGED);
removeUnsetPressCallback();
removeLongPressCallback();
@@ -16850,6 +16896,32 @@
}
/**
+ * Indicates whether or not this view has requested a partial layout that
+ * may not affect its size or position within its parent. This state will be reset
+ * the next time this view is laid out.
+ *
+ * @return true if partial layout has been requested
+ */
+ public final boolean isPartialLayoutRequested() {
+ return (mPrivateFlags3 & PFLAG3_PARTIAL_LAYOUT_REQUESTED)
+ == PFLAG3_PARTIAL_LAYOUT_REQUESTED;
+ }
+
+ /**
+ * Returns true if this view's {@link ViewGroup.LayoutParams LayoutParams} changed
+ * since the last time this view was successfully laid out. Typically this happens as a
+ * result of a call to {@link #setLayoutParams(LayoutParams)}.
+ *
+ * @return true if this view's LayoutParams changed since last layout.
+ */
+ public final boolean didLayoutParamsChange() {
+ if (sLayoutParamsAlwaysChanged) {
+ return true;
+ }
+ return (mPrivateFlags3 & PFLAG3_LAYOUT_PARAMS_CHANGED) == PFLAG3_LAYOUT_PARAMS_CHANGED;
+ }
+
+ /**
* Return true if o is a ViewGroup that is laying out using optical bounds.
* @hide
*/
@@ -16906,6 +16978,7 @@
if (changed || (mPrivateFlags & PFLAG_LAYOUT_REQUIRED) == PFLAG_LAYOUT_REQUIRED) {
onLayout(changed, l, t, r, b);
mPrivateFlags &= ~PFLAG_LAYOUT_REQUIRED;
+ mPrivateFlags3 &= ~PFLAG3_LAYOUT_PARAMS_CHANGED;
ListenerInfo li = mListenerInfo;
if (li != null && li.mOnLayoutChangeListeners != null) {
@@ -16919,6 +16992,7 @@
}
mPrivateFlags &= ~PFLAG_FORCE_LAYOUT;
+ mPrivateFlags3 &= ~PFLAG3_PARTIAL_LAYOUT_REQUESTED;
mPrivateFlags3 |= PFLAG3_IS_LAID_OUT;
}
@@ -17362,7 +17436,7 @@
if (hasWindowFocus()) viewStateIndex |= StateSet.VIEW_STATE_WINDOW_FOCUSED;
if ((privateFlags & PFLAG_ACTIVATED) != 0) viewStateIndex |= StateSet.VIEW_STATE_ACTIVATED;
if (mAttachInfo != null && mAttachInfo.mHardwareAccelerationRequested &&
- HardwareRenderer.isAvailable()) {
+ ThreadedRenderer.isAvailable()) {
// This is set if HW acceleration is requested, even if the current
// process doesn't allow it. This is just to allow app preview
// windows to better match their app.
@@ -18548,8 +18622,8 @@
position[1] -= vr.mCurScrollY;
}
- inOutLocation[0] = (int) (position[0] + 0.5f);
- inOutLocation[1] = (int) (position[1] + 0.5f);
+ inOutLocation[0] = Math.round(position[0]);
+ inOutLocation[1] = Math.round(position[1]);
}
/**
@@ -19012,7 +19086,7 @@
mPrivateFlags |= PFLAG_INVALIDATED;
if (mParent != null && !mParent.isLayoutRequested()) {
- mParent.requestLayout();
+ mParent.requestLayoutForChild(this);
}
if (mAttachInfo != null && mAttachInfo.mViewRequestingLayout == this) {
mAttachInfo.mViewRequestingLayout = null;
@@ -19031,6 +19105,11 @@
mPrivateFlags |= PFLAG_INVALIDATED;
}
+ void forcePartialLayout() {
+ forceLayout();
+ mPrivateFlags3 |= PFLAG3_PARTIAL_LAYOUT_REQUESTED;
+ }
+
/**
* <p>
* This is called to find out how big a view should be. The parent
@@ -19350,6 +19429,7 @@
*
* @attr ref android.R.styleable#View_minHeight
*/
+ @RemotableViewMethod
public void setMinimumHeight(int minHeight) {
mMinHeight = minHeight;
requestLayout();
@@ -19845,6 +19925,15 @@
}
/**
+ * @deprecated Use {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int)
+ * startDragAndDrop()} for newer platform versions.
+ */
+ public final boolean startDrag(ClipData data, DragShadowBuilder shadowBuilder,
+ Object myLocalState, int flags) {
+ return startDragAndDrop(data, shadowBuilder, myLocalState, flags);
+ }
+
+ /**
* Starts a drag and drop operation. When your application calls this method, it passes a
* {@link android.view.View.DragShadowBuilder} object to the system. The
* system calls this object's {@link DragShadowBuilder#onProvideShadowMetrics(Point, Point)}
@@ -19861,9 +19950,10 @@
* {@link android.view.DragEvent#ACTION_DRAG_STARTED}.
* </p>
* <p>
- * Your application can invoke startDrag() on any attached View object. The View object does not
- * need to be the one used in {@link android.view.View.DragShadowBuilder}, nor does it need to
- * be related to the View the user selected for dragging.
+ * Your application can invoke {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object,
+ * int) startDragAndDrop()} on any attached View object. The View object does not need to be
+ * the one used in {@link android.view.View.DragShadowBuilder}, nor does it need to be related
+ * to the View the user selected for dragging.
* </p>
* @param data A {@link android.content.ClipData} object pointing to the data to be
* transferred by the drag and drop operation.
@@ -19883,10 +19973,10 @@
* {@code false} if it fails anywhere. Returning {@code false} means the system was unable to
* do a drag, and so no drag operation is in progress.
*/
- public final boolean startDrag(ClipData data, DragShadowBuilder shadowBuilder,
+ public final boolean startDragAndDrop(ClipData data, DragShadowBuilder shadowBuilder,
Object myLocalState, int flags) {
if (ViewDebug.DEBUG_DRAG) {
- Log.d(VIEW_LOG_TAG, "startDrag: data=" + data + " flags=" + flags);
+ Log.d(VIEW_LOG_TAG, "startDragAndDrop: data=" + data + " flags=" + flags);
}
boolean okay = false;
@@ -19903,19 +19993,22 @@
Log.d(VIEW_LOG_TAG, "drag shadow: width=" + shadowSize.x + " height=" + shadowSize.y
+ " shadowX=" + shadowTouchPoint.x + " shadowY=" + shadowTouchPoint.y);
}
- Surface surface = new Surface();
+ if (mAttachInfo.mDragSurface != null) {
+ mAttachInfo.mDragSurface.release();
+ }
+ mAttachInfo.mDragSurface = new Surface();
try {
- IBinder token = mAttachInfo.mSession.prepareDrag(mAttachInfo.mWindow,
- flags, shadowSize.x, shadowSize.y, surface);
- if (ViewDebug.DEBUG_DRAG) Log.d(VIEW_LOG_TAG, "prepareDrag returned token=" + token
- + " surface=" + surface);
- if (token != null) {
- Canvas canvas = surface.lockCanvas(null);
+ mAttachInfo.mDragToken = mAttachInfo.mSession.prepareDrag(mAttachInfo.mWindow,
+ flags, shadowSize.x, shadowSize.y, mAttachInfo.mDragSurface);
+ if (ViewDebug.DEBUG_DRAG) Log.d(VIEW_LOG_TAG, "prepareDrag returned token="
+ + mAttachInfo.mDragToken + " surface=" + mAttachInfo.mDragSurface);
+ if (mAttachInfo.mDragToken != null) {
+ Canvas canvas = mAttachInfo.mDragSurface.lockCanvas(null);
try {
canvas.drawColor(0, PorterDuff.Mode.CLEAR);
shadowBuilder.onDrawShadow(canvas);
} finally {
- surface.unlockCanvasAndPost(canvas);
+ mAttachInfo.mDragSurface.unlockCanvasAndPost(canvas);
}
final ViewRootImpl root = getViewRootImpl();
@@ -19926,24 +20019,75 @@
// repurpose 'shadowSize' for the last touch point
root.getLastTouchPoint(shadowSize);
- okay = mAttachInfo.mSession.performDrag(mAttachInfo.mWindow, token,
+ okay = mAttachInfo.mSession.performDrag(mAttachInfo.mWindow, mAttachInfo.mDragToken,
shadowSize.x, shadowSize.y,
shadowTouchPoint.x, shadowTouchPoint.y, data);
if (ViewDebug.DEBUG_DRAG) Log.d(VIEW_LOG_TAG, "performDrag returned " + okay);
-
- // Off and running! Release our local surface instance; the drag
- // shadow surface is now managed by the system process.
- surface.release();
}
} catch (Exception e) {
Log.e(VIEW_LOG_TAG, "Unable to initiate drag", e);
- surface.destroy();
+ mAttachInfo.mDragSurface.destroy();
+ mAttachInfo.mDragSurface = null;
}
return okay;
}
/**
+ * Cancels an ongoing drag and drop operation.
+ * <p>
+ * A {@link android.view.DragEvent} object with
+ * {@link android.view.DragEvent#getAction()} value of
+ * {@link android.view.DragEvent#ACTION_DRAG_ENDED} and
+ * {@link android.view.DragEvent#getResult()} value of {@code false}
+ * will be sent to every
+ * View that received {@link android.view.DragEvent#ACTION_DRAG_STARTED}
+ * even if they are not currently visible.
+ * </p>
+ * <p>
+ * This method can be called on any View in the same window as the View on which
+ * {@link #startDragAndDrop(ClipData, DragShadowBuilder, Object, int) startDragAndDrop}
+ * was called.
+ * </p>
+ */
+ public final void cancelDragAndDrop() {
+ if (ViewDebug.DEBUG_DRAG) {
+ Log.d(VIEW_LOG_TAG, "cancelDragAndDrop");
+ }
+ if (mAttachInfo.mDragToken != null) {
+ try {
+ mAttachInfo.mSession.cancelDragAndDrop(mAttachInfo.mDragToken);
+ } catch (Exception e) {
+ Log.e(VIEW_LOG_TAG, "Unable to cancel drag", e);
+ }
+ mAttachInfo.mDragToken = null;
+ } else {
+ Log.e(VIEW_LOG_TAG, "No active drag to cancel");
+ }
+ }
+
+ public final void updateDragShadow(DragShadowBuilder shadowBuilder) {
+ if (ViewDebug.DEBUG_DRAG) {
+ Log.d(VIEW_LOG_TAG, "updateDragShadow");
+ }
+ if (mAttachInfo.mDragToken != null) {
+ try {
+ Canvas canvas = mAttachInfo.mDragSurface.lockCanvas(null);
+ try {
+ canvas.drawColor(0, PorterDuff.Mode.CLEAR);
+ shadowBuilder.onDrawShadow(canvas);
+ } finally {
+ mAttachInfo.mDragSurface.unlockCanvasAndPost(canvas);
+ }
+ } catch (Exception e) {
+ Log.e(VIEW_LOG_TAG, "Unable to update drag shadow", e);
+ }
+ } else {
+ Log.e(VIEW_LOG_TAG, "No active drag");
+ }
+ }
+
+ /**
* Starts a move from {startX, startY}, the amount of the movement will be the offset
* between {startX, startY} and the new cursor positon.
* @param startX horizontal coordinate where the move started.
@@ -19965,7 +20109,8 @@
/**
* Handles drag events sent by the system following a call to
- * {@link android.view.View#startDrag(ClipData,DragShadowBuilder,Object,int) startDrag()}.
+ * {@link android.view.View#startDragAndDrop(ClipData,DragShadowBuilder,Object,int)
+ * startDragAndDrop()}.
*<p>
* When the system calls this method, it passes a
* {@link android.view.DragEvent} object. A call to
@@ -21851,6 +21996,7 @@
interface Callbacks {
void playSoundEffect(int effectId);
boolean performHapticFeedback(int effectId, boolean always);
+ void schedulePartialLayout();
}
/**
@@ -21908,7 +22054,7 @@
boolean mHardwareAccelerated;
boolean mHardwareAccelerationRequested;
- HardwareRenderer mHardwareRenderer;
+ ThreadedRenderer mHardwareRenderer;
List<RenderNode> mPendingAnimatingRenderNodes;
/**
@@ -22221,6 +22367,28 @@
View mViewRequestingLayout;
/**
+ * Used to track views that need (at least) a partial relayout at their current size
+ * during the next traversal.
+ */
+ List<View> mPartialLayoutViews = new ArrayList<>();
+
+ /**
+ * Swapped with mPartialLayoutViews during layout to avoid concurrent
+ * modification. Lazily assigned during ViewRootImpl layout.
+ */
+ List<View> mEmptyPartialLayoutViews;
+
+ /**
+ * Used to track the identity of the current drag operation.
+ */
+ IBinder mDragToken;
+
+ /**
+ * The drag shadow surface for the current drag operation.
+ */
+ public Surface mDragSurface;
+
+ /**
* Creates a new set of attachment information with the specified
* events handler and thread.
*
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index db978a6..11df9a3 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -60,6 +60,8 @@
import java.util.List;
import java.util.Map;
import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
/**
* <p>
@@ -222,7 +224,7 @@
* NOTE: If you change the flags below make sure to reflect the changes
* the DisplayList class
*/
-
+
// When set, ViewGroup invalidates only the child's rectangle
// Set by default
static final int FLAG_CLIP_CHILDREN = 0x1;
@@ -267,7 +269,7 @@
/**
* When set, the drawing method will call {@link #getChildDrawingOrder(int, int)}
* to get the index of the child to draw for that iteration.
- *
+ *
* @hide
*/
protected static final int FLAG_USE_CHILD_DRAWING_ORDER = 0x400;
@@ -1325,7 +1327,7 @@
children[i].dispatchConfigurationChanged(newConfig);
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -2212,7 +2214,7 @@
final float y = ev.getY(actionIndex);
// Find a child that can receive the event.
// Scan children from front to back.
- final ArrayList<View> preorderedList = buildOrderedChildList();
+ final ArrayList<View> preorderedList = buildTouchDispatchChildList();
final boolean customOrder = preorderedList == null
&& isChildrenDrawingOrderEnabled();
final View[] children = mChildren;
@@ -2345,6 +2347,18 @@
}
/**
+ * Provide custom ordering of views in which the touch will be dispatched.
+ *
+ * This is called within a tight loop, so you are not allowed to allocate objects, including
+ * the return array. Instead, you should return a pre-allocated list that will be cleared
+ * after the dispatch is finished.
+ * @hide
+ */
+ public ArrayList<View> buildTouchDispatchChildList() {
+ return buildOrderedChildList();
+ }
+
+ /**
* Finds the child which has accessibility focus.
*
* @return The child that has focus.
@@ -2785,7 +2799,7 @@
* @see #FOCUS_BEFORE_DESCENDANTS
* @see #FOCUS_AFTER_DESCENDANTS
* @see #FOCUS_BLOCK_DESCENDANTS
- * @see #onRequestFocusInDescendants(int, android.graphics.Rect)
+ * @see #onRequestFocusInDescendants(int, android.graphics.Rect)
*/
@Override
public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
@@ -4102,7 +4116,7 @@
/**
* <p>Adds a child view. If no layout parameters are already set on the child, the
* default parameters for this ViewGroup are set on the child.</p>
- *
+ *
* <p><strong>Note:</strong> do not invoke this method from
* {@link #draw(android.graphics.Canvas)}, {@link #onDraw(android.graphics.Canvas)},
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
@@ -4118,7 +4132,7 @@
/**
* Adds a child view. If no layout parameters are already set on the child, the
* default parameters for this ViewGroup are set on the child.
- *
+ *
* <p><strong>Note:</strong> do not invoke this method from
* {@link #draw(android.graphics.Canvas)}, {@link #onDraw(android.graphics.Canvas)},
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
@@ -4558,7 +4572,7 @@
/**
* {@inheritDoc}
- *
+ *
* <p><strong>Note:</strong> do not invoke this method from
* {@link #draw(android.graphics.Canvas)}, {@link #onDraw(android.graphics.Canvas)},
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
@@ -4577,7 +4591,7 @@
* <p><strong>Note:</strong> do not invoke this method from
* {@link #draw(android.graphics.Canvas)}, {@link #onDraw(android.graphics.Canvas)},
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
- *
+ *
* @param view the view to remove from the group
*/
public void removeViewInLayout(View view) {
@@ -4605,7 +4619,7 @@
* <p><strong>Note:</strong> do not invoke this method from
* {@link #draw(android.graphics.Canvas)}, {@link #onDraw(android.graphics.Canvas)},
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
- *
+ *
* @param index the position in the group of the view to remove
*/
public void removeViewAt(int index) {
@@ -4794,7 +4808,7 @@
/**
* Call this method to remove all child views from the
* ViewGroup.
- *
+ *
* <p><strong>Note:</strong> do not invoke this method from
* {@link #draw(android.graphics.Canvas)}, {@link #onDraw(android.graphics.Canvas)},
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
@@ -5114,10 +5128,10 @@
transformMatrix = childMatrix;
}
transformMatrix.mapRect(boundingRect);
- dirty.set((int) (boundingRect.left - 0.5f),
- (int) (boundingRect.top - 0.5f),
- (int) (boundingRect.right + 0.5f),
- (int) (boundingRect.bottom + 0.5f));
+ dirty.set((int) Math.floor(boundingRect.left),
+ (int) Math.floor(boundingRect.top),
+ (int) Math.ceil(boundingRect.right),
+ (int) Math.ceil(boundingRect.bottom));
}
do {
@@ -5154,10 +5168,10 @@
RectF boundingRect = attachInfo.mTmpTransformRect;
boundingRect.set(dirty);
m.mapRect(boundingRect);
- dirty.set((int) (boundingRect.left - 0.5f),
- (int) (boundingRect.top - 0.5f),
- (int) (boundingRect.right + 0.5f),
- (int) (boundingRect.bottom + 0.5f));
+ dirty.set((int) Math.floor(boundingRect.left),
+ (int) Math.floor(boundingRect.top),
+ (int) Math.ceil(boundingRect.right),
+ (int) Math.ceil(boundingRect.bottom));
}
}
} while (parent != null);
@@ -5457,8 +5471,8 @@
position[0] = offset.x;
position[1] = offset.y;
child.getMatrix().mapPoints(position);
- offset.x = (int) (position[0] + 0.5f);
- offset.y = (int) (position[1] + 0.5f);
+ offset.x = Math.round(position[0]);
+ offset.y = Math.round(position[1]);
}
offset.x += dx;
offset.y += dy;
@@ -5485,8 +5499,8 @@
rectIsVisible = rect.intersect(mClipBounds.left, mClipBounds.top, mClipBounds.right,
mClipBounds.bottom);
}
- r.set((int) (rect.left + 0.5f), (int) (rect.top + 0.5f), (int) (rect.right + 0.5f),
- (int) (rect.bottom + 0.5f));
+ r.set((int) Math.floor(rect.left), (int) Math.floor(rect.top),
+ (int) Math.ceil(rect.right), (int) Math.ceil(rect.bottom));
if (rectIsVisible && mParent != null) {
rectIsVisible = mParent.getChildVisibleRect(this, r, offset);
}
@@ -5517,6 +5531,172 @@
int l, int t, int r, int b);
/**
+ * {@inheritDoc}
+ *
+ * <p>Most subclasses should not need to override this method. The default implementation
+ * will call {@link #findDependentLayoutAxes(View, int)} to determine how
+ * to optimally proceed. If neither horizontal nor vertical layout depends on the given
+ * child, this method will call {@link #requestPartialLayoutForChild(View)}. If one or both
+ * do, it will call {@link #requestLayout()}.</p>
+ *
+ * @param child Child requesting a layout
+ */
+ @Override
+ public void requestLayoutForChild(View child) {
+ if (child == null || child.getParent() != this) {
+ throw new IllegalArgumentException(
+ "child parameter must be a direct child view of this ViewGroup");
+ }
+
+ // If we don't have a parent ourselves, record that we need a full layout.
+ // Our whole subtree is detached.
+ final ViewParent parent = getParent();
+ if (parent == null) {
+ requestLayout();
+ return;
+ }
+
+ // We can optimize the layout request for this child into a partial layout
+ // if the child has already been laid out at least once and neither horizontal nor
+ // vertical layout within ourselves is dependent on pending layout changes within
+ // this child. Otherwise we need to request a full layout for ourselves and continue
+ // to recurse up the view hierarchy.
+ if (child.isLaidOut() && findDependentLayoutAxes(child, FLAG_LAYOUT_AXIS_ANY) == 0) {
+ requestPartialLayoutForChild(child);
+ } else {
+ requestLayout();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * <p>The default implementation returns {@link #FLAG_LAYOUT_AXIS_ANY}.
+ * Optimized implementations for specific ViewGroup subclasses may check if the child's
+ * {@link View#didLayoutParamsChange() LayoutParams changed} and in what ways.</p>
+ *
+ * @param child Direct child of this ViewParent to check
+ * @param axisFilter Which axes to check for dependencies. Can be
+ * {@link #FLAG_LAYOUT_AXIS_HORIZONTAL}, {@link #FLAG_LAYOUT_AXIS_VERTICAL}
+ * or {@link #FLAG_LAYOUT_AXIS_ANY}.
+ * @return Axes of this ViewParent that depend on the given child's layout changes
+ */
+ @Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ return FLAG_LAYOUT_AXIS_ANY;
+ }
+
+ /**
+ * This is a helper implementation for {@link #findDependentLayoutAxes(View, int)} that
+ * is not the default implementation in ViewGroup. This is to preserve compatibility with
+ * existing app-side ViewGroup subclasses that existed before the partial layout system was
+ * added to Android. It explicitly checks that the LayoutParams of the child are of the
+ * expected type so that subclasses of standard framework layouts do not erroneously
+ * start believing that it's safe to do a partial layout when that assertion can't
+ * reasonably be confirmed.
+ *
+ * <p>If you're reading this as an author of a custom ViewGroup's findDependentLayoutAxes
+ * method you might be frustrated to discover that it is not a part of the Android public API.
+ * Many ViewGroup implementations will need to make small but important modifications
+ * to an implementation like this one in order to be correct. Instead of encouraging
+ * view authors to call this method, then make their own redundant recursive calls to
+ * <code>getParent().findDependentLayoutAxes(...)</code> in addition to the one
+ * that can happen here, this method is hidden and only used internally.</p>
+ *
+ * <p>Do feel free to copy this implementation and adapt it to suit your own purposes.</p>
+ *
+ * @hide
+ */
+ protected final int findDependentLayoutAxesHelper(View child, int axisFilter,
+ Class<?> layoutParamsClass) {
+ if (!checkPartialLayoutParams(child, layoutParamsClass)) return axisFilter;
+ if (child.didLayoutParamsChange()) {
+ // Anything could have changed about our previous assumptions.
+ return axisFilter;
+ }
+
+ final LayoutParams lp = child.getLayoutParams();
+
+ // Our layout can always end up depending on a WRAP_CONTENT child.
+ final int wrapAxisFilter = ((lp.width == WRAP_CONTENT ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0)
+ | (lp.height == WRAP_CONTENT ? FLAG_LAYOUT_AXIS_VERTICAL : 0)) & axisFilter;
+
+ if (wrapAxisFilter == axisFilter) {
+ // We know all queried axes are affected, just return early.
+ return wrapAxisFilter;
+ }
+
+ // Our layout *may* depend on a MATCH_PARENT child, depending on whether we can determine
+ // that our layout will remain stable within our parent. We need to ask.
+ final int matchAxisFilter = ((lp.width == MATCH_PARENT ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0)
+ | (lp.height == MATCH_PARENT ? FLAG_LAYOUT_AXIS_VERTICAL : 0)) & axisFilter;
+
+ if (matchAxisFilter != 0) {
+ final ViewParent parent = getParent();
+ if (parent != null) {
+ // If our parent depends on us for an axis, then our layout can also be affected
+ // by a MATCH_PARENT child along that axis.
+ return getParent().findDependentLayoutAxes(this, matchAxisFilter)
+ | wrapAxisFilter;
+ }
+
+ // If we don't have a parent, assume we're affected
+ // in any determined affected direction.
+ return matchAxisFilter | wrapAxisFilter;
+ }
+
+ // Two exact sizes and LayoutParams didn't change. We're safe.
+ return 0;
+ }
+
+ /**
+ * Throw an IllegalArgumentException if the supplied view is not a direct child of
+ * this ViewGroup and return false if this view's LayoutParams is not of class lpClass.
+ * Implementations of {@link ViewGroup#findDependentLayoutAxes(View, int)} use this
+ * to check input parameters and defensively return the full axis filter mask themselves
+ * if the LayoutParams class is not of the exact expected type; e.g. it is a subclass
+ * of one of the standard framework layouts and we can't make assumptions.
+ * @hide
+ */
+ protected final boolean checkPartialLayoutParams(View child, Class<?> lpClass) {
+ if (child.getParent() != this) {
+ throw new IllegalArgumentException("View " + child
+ + " is not a direct child of " + this);
+ }
+ final ViewGroup.LayoutParams lp = child.getLayoutParams();
+ return lp != null || lp.getClass() == lpClass;
+ }
+
+ /**
+ * Called when a child of this ViewParent requires a relayout before the next frame
+ * is drawn, but the caller can guarantee that the size of the child will not change
+ * during a measure and layout pass.
+ *
+ * <p>A call to this method will schedule a partial layout for the supplied view as long as
+ * it is a direct child of this ViewGroup and this ViewGroup is attached to a window.
+ * On the next scheduled view hierarchy traversal the given child view will be re-measured
+ * at its current measured size and re-laid out at its current position within its parent.</p>
+ *
+ * @param child Child that requires a partial layout
+ */
+ public void requestPartialLayoutForChild(View child) {
+ if (!child.isPartialLayoutRequested()) {
+ child.forcePartialLayout();
+ if (mAttachInfo != null) {
+ final List<View> partialLayoutViews = mAttachInfo.mPartialLayoutViews;
+ final boolean schedule = partialLayoutViews.isEmpty();
+ partialLayoutViews.add(child);
+ if (schedule) {
+ mAttachInfo.mRootCallbacks.schedulePartialLayout();
+ }
+ child.invalidate();
+ } else {
+ requestLayout();
+ }
+ }
+ }
+
+ /**
* Indicates whether the view group has the ability to animate its children
* after the first layout.
*
@@ -5862,7 +6042,7 @@
* of its descendants
*/
protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
- return p;
+ return new LayoutParams(p);
}
/**
diff --git a/core/java/android/view/ViewParent.java b/core/java/android/view/ViewParent.java
index 07f1e2c..6ae448a 100644
--- a/core/java/android/view/ViewParent.java
+++ b/core/java/android/view/ViewParent.java
@@ -26,6 +26,11 @@
*
*/
public interface ViewParent {
+ public static final int FLAG_LAYOUT_AXIS_HORIZONTAL = 1;
+ public static final int FLAG_LAYOUT_AXIS_VERTICAL = 2;
+ public static final int FLAG_LAYOUT_AXIS_ANY
+ = FLAG_LAYOUT_AXIS_HORIZONTAL | FLAG_LAYOUT_AXIS_VERTICAL;
+
/**
* Called when something has changed which has invalidated the layout of a
* child of this view parent. This will schedule a layout pass of the view
@@ -601,4 +606,48 @@
* @return true if the action was consumed by this ViewParent
*/
public boolean onNestedPrePerformAccessibilityAction(View target, int action, Bundle arguments);
+
+ /**
+ * Called when a child of this ViewParent requires a relayout before
+ * the next frame is drawn. A call to {@link View#requestLayout() child.requestLayout()}
+ * will implicitly result in a call to
+ * <code>child.getParent().requestLayoutForChild(child)</code>. App code should not call this
+ * method directly. Call <code>child.requestLayout()</code> instead.
+ *
+ * <p>On versions of Android from API 23 and older, a call to {@link View#requestLayout()}
+ * would cause a matching call to <code>requestLayout</code> on each parent view up to
+ * the root. With the addition of <code>requestLayoutForChild</code> a view's parent may
+ * explicitly decide how to handle a layout request. This allows for optimizations when
+ * a view parent knows that a layout-altering change in a child will not affect its own
+ * measurement.</p>
+ *
+ * @param child Child requesting a layout
+ */
+ public void requestLayoutForChild(View child);
+
+ /**
+ * Determine which axes of this ViewParent's layout are dependent on the given
+ * direct child view. The returned value is a flag set that may contain
+ * {@link #FLAG_LAYOUT_AXIS_HORIZONTAL} and/or {@link #FLAG_LAYOUT_AXIS_VERTICAL}.
+ * {@link #FLAG_LAYOUT_AXIS_ANY} is provided as a shortcut for
+ * <code>FLAG_LAYOUT_AXIS_HORIZONTAL | FLAG_LAYOUT_AXIS_VERTICAL</code>.
+ *
+ * <p>The given child must be a direct child view. Implementations should throw
+ * {@link IllegalArgumentException} otherwise.</p>
+ *
+ * <p>The caller may specify which axes it cares about. This should be treated as a filter.
+ * Implementations should never return a result that would be different from
+ * <code>result & axisFilter</code>.</p>
+ *
+ * @param child Direct child of this ViewParent to check
+ * @param axisFilter Which axes to check for dependencies. Can be
+ * {@link #FLAG_LAYOUT_AXIS_HORIZONTAL}, {@link #FLAG_LAYOUT_AXIS_VERTICAL}
+ * or {@link #FLAG_LAYOUT_AXIS_ANY}.
+ * @return Axes of this ViewParent that depend on the given child's layout changes
+ *
+ * @see #FLAG_LAYOUT_AXIS_HORIZONTAL
+ * @see #FLAG_LAYOUT_AXIS_VERTICAL
+ * @see #FLAG_LAYOUT_AXIS_ANY
+ */
+ public int findDependentLayoutAxes(View child, int axisFilter);
}
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 625ed38..b7bb9a3 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -16,6 +16,8 @@
package android.view;
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;
+
import android.Manifest;
import android.animation.LayoutTransition;
import android.app.ActivityManagerNative;
@@ -37,7 +39,6 @@
import android.graphics.drawable.Drawable;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManager.DisplayListener;
-import android.hardware.input.InputManager;
import android.media.AudioManager;
import android.os.Binder;
import android.os.Build;
@@ -74,7 +75,6 @@
import android.view.animation.Interpolator;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
-import android.view.WindowCallbacks;
import android.widget.Scroller;
import com.android.internal.R;
@@ -91,6 +91,7 @@
import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.HashSet;
+import java.util.List;
/**
* The top of a view hierarchy, implementing the needed protocol between View
@@ -101,7 +102,7 @@
*/
@SuppressWarnings({"EmptyCatchBlock", "PointlessBooleanExpression"})
public final class ViewRootImpl implements ViewParent,
- View.AttachInfo.Callbacks, HardwareRenderer.HardwareDrawCallbacks {
+ View.AttachInfo.Callbacks, ThreadedRenderer.HardwareDrawCallbacks {
private static final String TAG = "ViewRootImpl";
private static final boolean DBG = false;
private static final boolean LOCAL_LOGV = false;
@@ -176,6 +177,11 @@
int mViewVisibility;
boolean mAppVisible = true;
+ // For recents to freeform transition we need to keep drawing after the app receives information
+ // that it became invisible. This will ignore that information and depend on the decor view
+ // visibility to control drawing. The decor view visibility will get adjusted when the app get
+ // stopped and that's when the app will stop drawing further frames.
+ private boolean mForceDecorViewVisibility = false;
int mOrigWindowType = -1;
/** Whether the window had focus during the most recent traversal. */
@@ -561,6 +567,8 @@
& WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0) {
mInputChannel = new InputChannel();
}
+ mForceDecorViewVisibility = (mWindowAttributes.privateFlags
+ & PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY) != 0;
try {
mOrigWindowType = mWindowAttributes.type;
mAttachInfo.mRecomputeGlobalAttributes = true;
@@ -753,7 +761,7 @@
(attrs.flags & WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0;
if (hardwareAccelerated) {
- if (!HardwareRenderer.isAvailable()) {
+ if (!ThreadedRenderer.isAvailable()) {
return;
}
@@ -776,8 +784,8 @@
// shows for launching applications, so they will look more like
// the app being launched.
mAttachInfo.mHardwareAccelerationRequested = true;
- } else if (!HardwareRenderer.sRendererDisabled
- || (HardwareRenderer.sSystemRendererDisabled && forceHwAccelerated)) {
+ } else if (!ThreadedRenderer.sRendererDisabled
+ || (ThreadedRenderer.sSystemRendererDisabled && forceHwAccelerated)) {
if (mAttachInfo.mHardwareRenderer != null) {
mAttachInfo.mHardwareRenderer.destroy();
}
@@ -786,7 +794,7 @@
final boolean hasSurfaceInsets = insets.left != 0 || insets.right != 0
|| insets.top != 0 || insets.bottom != 0;
final boolean translucent = attrs.format != PixelFormat.OPAQUE || hasSurfaceInsets;
- mAttachInfo.mHardwareRenderer = HardwareRenderer.create(mContext, translucent);
+ mAttachInfo.mHardwareRenderer = ThreadedRenderer.create(mContext, translucent);
if (mAttachInfo.mHardwareRenderer != null) {
mAttachInfo.mHardwareRenderer.setName(attrs.getTitle().toString());
mAttachInfo.mHardwareAccelerated =
@@ -945,6 +953,25 @@
}
@Override
+ public void requestLayoutForChild(View child) {
+ requestLayout();
+ }
+
+ @Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ if (child != mView) {
+ return 0;
+ }
+
+ final WindowManager.LayoutParams lp = (WindowManager.LayoutParams) child.getLayoutParams();
+ final int horizontal = (lp.width == WindowManager.LayoutParams.WRAP_CONTENT
+ || lp.horizontalWeight != 0) ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0;
+ final int vertical = (lp.height == WindowManager.LayoutParams.WRAP_CONTENT
+ || lp.verticalWeight != 0) ? FLAG_LAYOUT_AXIS_VERTICAL : 0;
+ return (horizontal | vertical) & axisFilter;
+ }
+
+ @Override
public boolean isLayoutRequested() {
return mLayoutRequested;
}
@@ -1063,7 +1090,7 @@
}
int getHostVisibility() {
- return mAppVisible ? mView.getVisibility() : View.GONE;
+ return (mAppVisible || mForceDecorViewVisibility) ? mView.getVisibility() : View.GONE;
}
/**
@@ -1088,6 +1115,10 @@
}
}
+ public void schedulePartialLayout() {
+ scheduleTraversals();
+ }
+
/**
* Notifies the HardwareRenderer that a new frame will be coming soon.
* Currently only {@link ThreadedRenderer} cares about this, and uses
@@ -1568,7 +1599,7 @@
boolean insetsPending = false;
int relayoutResult = 0;
- boolean isViewVisible = viewVisibility == View.VISIBLE;
+ final boolean isViewVisible = viewVisibility == View.VISIBLE;
if (mFirst || windowShouldResize || insetsChanged ||
viewVisibilityChanged || params != null) {
@@ -1638,6 +1669,8 @@
final boolean stableInsetsChanged = !mPendingStableInsets.equals(
mAttachInfo.mStableInsets);
final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets);
+ final boolean surfaceSizeChanged = (relayoutResult
+ & WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0;
if (contentInsetsChanged) {
mAttachInfo.mContentInsets.set(mPendingContentInsets);
if (DEBUG_LAYOUT) Log.v(TAG, "Content insets changing to: "
@@ -1723,10 +1756,20 @@
mAttachInfo.mHardwareRenderer.isEnabled()) {
mAttachInfo.mHardwareRenderer.destroy();
}
- } else if (surfaceGenerationId != mSurface.getGenerationId() &&
- mSurfaceHolder == null && mAttachInfo.mHardwareRenderer != null) {
+ } else if ((surfaceGenerationId != mSurface.getGenerationId()
+ || surfaceSizeChanged)
+ && mSurfaceHolder == null
+ && mAttachInfo.mHardwareRenderer != null) {
mFullRedrawNeeded = true;
try {
+ // Need to do updateSurface (which leads to CanvasContext::setSurface and
+ // re-create the EGLSurface) if either the Surface changed (as indicated by
+ // generation id), or WindowManager changed the surface size. The latter is
+ // because on some chips, changing the consumer side's BufferQueue size may
+ // not take effect immediately unless we create a new EGLSurface.
+ // Note that frame size change doesn't always imply surface size change (eg.
+ // drag resizing uses fullscreen surface), need to check surfaceSizeChanged
+ // flag from WindowManager.
mAttachInfo.mHardwareRenderer.updateSurface(mSurface);
} catch (OutOfResourcesException e) {
handleOutOfResourcesException(e);
@@ -1822,7 +1865,7 @@
}
}
- final HardwareRenderer hardwareRenderer = mAttachInfo.mHardwareRenderer;
+ final ThreadedRenderer hardwareRenderer = mAttachInfo.mHardwareRenderer;
if (hardwareRenderer != null && hardwareRenderer.isEnabled()) {
if (hwInitialized
|| mWidth != hardwareRenderer.getWidth()
@@ -1915,7 +1958,60 @@
|| mAttachInfo.mRecomputeGlobalAttributes;
if (didLayout) {
performLayout(lp, desiredWindowWidth, desiredWindowHeight);
+ }
+ /*
+ * Handle partial layouts.
+ *
+ * Views that have requested partial layouts will not change size or position
+ * within their parent view, therefore we will re-measure and re-layout each one
+ * after any regularly scheduled layout pass. Any view that already had its
+ * isLayoutRequested bit cleared will be skipped, since this means the view has already
+ * been measured and laid out on this traversal pass naturally. Views won't be added
+ * to this list if layout was already requested when a partial layout is requested
+ * for a view, so there should not be duplicates in the list.
+ */
+ final List<View> partialLayoutViews = mAttachInfo.mPartialLayoutViews;
+ final boolean didPartialLayout;
+ if (!partialLayoutViews.isEmpty()) {
+ // Measurement or layout of views may result in changes to the list
+ // of partial-layout views. Swap in an "empty" list to prevent
+ // concurrent modification of the list being traversed.
+ if (mAttachInfo.mEmptyPartialLayoutViews == null) {
+ mAttachInfo.mPartialLayoutViews = new ArrayList<>();
+ } else {
+ mAttachInfo.mPartialLayoutViews = mAttachInfo.mEmptyPartialLayoutViews;
+ }
+
+ final int count = partialLayoutViews.size();
+ mInLayout = true;
+ for (int i = 0; i < count; i++) {
+ final View view = partialLayoutViews.get(i);
+
+ // Make sure the view is still attached and that it still has layout requested.
+ // We might have already serviced the layout request through the standard full-tree
+ // layout pass above or even through a previous partial layout view in this list.
+ if (view.isAttachedToWindow() && view.isLayoutRequested()) {
+ final int widthSpec = MeasureSpec.makeMeasureSpec(view.getMeasuredWidth(),
+ MeasureSpec.EXACTLY);
+ final int heightSpec = MeasureSpec.makeMeasureSpec(view.getMeasuredHeight(),
+ MeasureSpec.EXACTLY);
+ view.measure(widthSpec, heightSpec);
+ view.layout(view.getLeft(), view.getTop(), view.getRight(), view.getBottom());
+ }
+ }
+ mInLayout = false;
+ didPartialLayout = true;
+ triggerGlobalLayoutListener = true;
+
+ // The traversal list becomes the new empty list.
+ partialLayoutViews.clear();
+ mAttachInfo.mEmptyPartialLayoutViews = partialLayoutViews;
+ } else {
+ didPartialLayout = false;
+ }
+
+ if (didLayout || didPartialLayout) {
// By this point all views have been sized and positioned
// We can compute the transparent area
@@ -1945,7 +2041,7 @@
if (DBG) {
System.out.println("======================================");
- System.out.println("performTraversals -- after setFrame");
+ System.out.println("performTraversals -- after performLayout/partial layout");
host.debug();
}
}
@@ -2459,8 +2555,7 @@
if (callbacks != null) {
for (SurfaceHolder.Callback c : callbacks) {
if (c instanceof SurfaceHolder.Callback2) {
- ((SurfaceHolder.Callback2)c).surfaceRedrawNeeded(
- mSurfaceHolder);
+ ((SurfaceHolder.Callback2)c).surfaceRedrawNeeded(mSurfaceHolder);
}
}
}
@@ -5289,10 +5384,14 @@
}
}
- // When the drag operation ends, release any local state object
- // that may have been in use
+ // When the drag operation ends, reset drag-related state
if (what == DragEvent.ACTION_DRAG_ENDED) {
setLocalDragState(null);
+ mAttachInfo.mDragToken = null;
+ if (mAttachInfo.mDragSurface != null) {
+ mAttachInfo.mDragSurface.release();
+ mAttachInfo.mDragSurface = null;
+ }
}
}
}
@@ -5634,7 +5733,7 @@
}
private void destroyHardwareRenderer() {
- HardwareRenderer hardwareRenderer = mAttachInfo.mHardwareRenderer;
+ ThreadedRenderer hardwareRenderer = mAttachInfo.mHardwareRenderer;
if (hardwareRenderer != null) {
if (mView != null) {
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 8259372..3c4d45a 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -276,6 +276,8 @@
private boolean mDestroyed;
+ private boolean mOverlayWithDecorCaption = false;
+
// The current window attributes.
private final WindowManager.LayoutParams mWindowAttributes =
new WindowManager.LayoutParams();
@@ -2044,4 +2046,18 @@
/** @hide */
public void setTheme(int resId) {
}
+
+ /**
+ * Whether the caption should be displayed directly on the content rather than push the content
+ * down. This affects only freeform windows since they display the caption.
+ * @hide
+ */
+ public void setOverlayDecorCaption(boolean overlayCaption) {
+ mOverlayWithDecorCaption = overlayCaption;
+ }
+
+ /** @hide */
+ public boolean getOverlayDecorCaption() {
+ return mOverlayWithDecorCaption;
+ }
}
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index edf4297..1521f2e 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -118,8 +118,7 @@
*/
public void removeViewImmediate(View view);
- public static class LayoutParams extends ViewGroup.LayoutParams
- implements Parcelable {
+ public static class LayoutParams extends ViewGroup.LayoutParams implements Parcelable {
/**
* X position for this window. With the default gravity it is ignored.
* When using {@link Gravity#LEFT} or {@link Gravity#START} or {@link Gravity#RIGHT} or
@@ -1149,13 +1148,21 @@
/**
* Flag indicating that the x, y, width, and height members should be
- * ignored (and thus their previous value preserved). For example
+ * ignored (and thus their previous value preserved). For example
* because they are being managed externally through repositionChild.
*
* {@hide}
*/
public static final int PRIVATE_FLAG_PRESERVE_GEOMETRY = 0x00002000;
+ /**
+ * Flag that will make window ignore app visibility and instead depend purely on the decor
+ * view visibility for determining window visibility. This is used by recents to keep
+ * drawing after it launches an app.
+ * @hide
+ */
+ public static final int PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY = 0x00004000;
+
/**
* Control flags that are private to the platform.
diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index 43d643e..8c68e92 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -77,6 +77,11 @@
public static final int RELAYOUT_RES_DRAG_RESIZING = 0x8;
/**
+ * The window manager has changed the size of the surface from the last call.
+ */
+ public static final int RELAYOUT_RES_SURFACE_RESIZED = 0x10;
+
+ /**
* Flag for relayout: the client will be later giving
* internal insets; as a result, the window will not impact other window
* layouts until the insets are given.
@@ -420,7 +425,7 @@
mDyingViews.remove(view);
}
}
- if (HardwareRenderer.sTrimForeground && HardwareRenderer.isAvailable()) {
+ if (ThreadedRenderer.sTrimForeground && ThreadedRenderer.isAvailable()) {
doTrimForeground();
}
}
@@ -447,7 +452,7 @@
}
public void trimMemory(int level) {
- if (HardwareRenderer.isAvailable()) {
+ if (ThreadedRenderer.isAvailable()) {
if (shouldDestroyEglContext(level)) {
// Destroy all hardware surfaces and resources associated to
// known windows
@@ -460,16 +465,16 @@
level = ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
}
- HardwareRenderer.trimMemory(level);
+ ThreadedRenderer.trimMemory(level);
- if (HardwareRenderer.sTrimForeground) {
+ if (ThreadedRenderer.sTrimForeground) {
doTrimForeground();
}
}
}
public static void trimForeground() {
- if (HardwareRenderer.sTrimForeground && HardwareRenderer.isAvailable()) {
+ if (ThreadedRenderer.sTrimForeground && ThreadedRenderer.isAvailable()) {
WindowManagerGlobal wm = WindowManagerGlobal.getInstance();
wm.doTrimForeground();
}
@@ -489,7 +494,7 @@
}
}
if (!hasVisibleWindows) {
- HardwareRenderer.trimMemory(
+ ThreadedRenderer.trimMemory(
ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
}
}
@@ -508,7 +513,7 @@
String name = getWindowName(root);
pw.printf("\n\t%s (visibility=%d)", name, root.getHostVisibility());
- HardwareRenderer renderer =
+ ThreadedRenderer renderer =
root.getView().mAttachInfo.mHardwareRenderer;
if (renderer != null) {
renderer.dumpGfxInfo(pw, fd, args);
diff --git a/core/java/android/view/WindowManagerInternal.java b/core/java/android/view/WindowManagerInternal.java
index 3882bca..89b1eb9 100644
--- a/core/java/android/view/WindowManagerInternal.java
+++ b/core/java/android/view/WindowManagerInternal.java
@@ -16,6 +16,7 @@
package android.view;
+import android.annotation.Nullable;
import android.graphics.Rect;
import android.graphics.Region;
import android.hardware.display.DisplayManagerInternal;
@@ -55,9 +56,10 @@
* Called when the bounds of the screen content that is magnified changed.
* Note that not the entire screen is magnified.
*
- * @param bounds The bounds.
+ * @param magnifiedBounds the currently magnified region
+ * @param availableBounds the region available for magnification
*/
- public void onMagnifedBoundsChanged(Region bounds);
+ public void onMagnifiedBoundsChanged(Region magnifiedBounds, Region availableBounds);
/**
* Called when an application requests a rectangle on the screen to allow
@@ -142,7 +144,7 @@
*
* @param callbacks The callbacks to invoke.
*/
- public abstract void setMagnificationCallbacks(MagnificationCallbacks callbacks);
+ public abstract void setMagnificationCallbacks(@Nullable MagnificationCallbacks callbacks);
/**
* Set by the accessibility layer to specify the magnification and panning to
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index ee06806..329d1b0 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -23,6 +23,7 @@
import com.android.internal.view.IInputMethodManager;
import com.android.internal.view.IInputMethodSession;
import com.android.internal.view.InputBindResult;
+import com.android.internal.view.InputMethodClient;
import android.annotation.RequiresPermission;
import android.content.Context;
@@ -435,41 +436,35 @@
mCurId = res.id;
mBindSequence = res.sequence;
}
- startInputInner(null, 0, 0, 0);
+ startInputInner(InputMethodClient.START_INPUT_REASON_BOUND_TO_IMMS,
+ null, 0, 0, 0);
return;
}
case MSG_UNBIND: {
final int sequence = msg.arg1;
+ @InputMethodClient.UnbindReason
+ final int reason = msg.arg2;
if (DEBUG) {
- Log.i(TAG, "handleMessage: MSG_UNBIND " + sequence);
+ Log.i(TAG, "handleMessage: MSG_UNBIND " + sequence +
+ " reason=" + InputMethodClient.getUnbindReason(reason));
}
- boolean startInput = false;
+ final boolean startInput;
synchronized (mH) {
- if (mBindSequence == sequence) {
- if (false) {
- // XXX the server has already unbound!
- if (mCurMethod != null && mCurrentTextBoxAttribute != null) {
- try {
- mCurMethod.finishInput();
- } catch (RemoteException e) {
- Log.w(TAG, "IME died: " + mCurId, e);
- }
- }
- }
- clearBindingLocked();
-
- // If we were actively using the last input method, then
- // we would like to re-connect to the next input method.
- if (mServedView != null && mServedView.isFocused()) {
- mServedConnecting = true;
- }
- if (mActive) {
- startInput = true;
- }
+ if (mBindSequence != sequence) {
+ return;
}
+ clearBindingLocked();
+ // If we were actively using the last input method, then
+ // we would like to re-connect to the next input method.
+ if (mServedView != null && mServedView.isFocused()) {
+ mServedConnecting = true;
+ }
+ startInput = mActive;
}
if (startInput) {
- startInputInner(null, 0, 0, 0);
+ startInputInner(
+ InputMethodClient.START_INPUT_REASON_UNBOUND_FROM_IMMS, null, 0, 0,
+ 0);
}
return;
}
@@ -502,7 +497,10 @@
// In that case, we really should not call
// mServedInputConnection.finishComposingText.
if (checkFocusNoStartInput(mHasBeenInactive, false)) {
- startInputInner(null, 0, 0, 0);
+ final int reason = active ?
+ InputMethodClient.START_INPUT_REASON_ACTIVATED_BY_IMMS :
+ InputMethodClient.START_INPUT_REASON_DEACTIVATED_BY_IMMS;
+ startInputInner(reason, null, 0, 0, 0);
}
}
}
@@ -548,6 +546,13 @@
void deactivate() {
mActive = false;
}
+
+ @Override
+ public String toString() {
+ return "ControlledInputConnectionWrapper{mActive=" + mActive
+ + " mParentInputMethodManager.mActive=" + mParentInputMethodManager.mActive
+ + "}";
+ }
}
final IInputMethodClient.Stub mClient = new IInputMethodClient.Stub() {
@@ -581,8 +586,8 @@
}
@Override
- public void onUnbindMethod(int sequence) {
- mH.sendMessage(mH.obtainMessage(MSG_UNBIND, sequence, 0));
+ public void onUnbindMethod(int sequence, @InputMethodClient.UnbindReason int unbindReason) {
+ mH.sendMessage(mH.obtainMessage(MSG_UNBIND, sequence, unbindReason));
}
@Override
@@ -1119,18 +1124,23 @@
mServedConnecting = true;
}
-
- startInputInner(null, 0, 0, 0);
+
+ startInputInner(InputMethodClient.START_INPUT_REASON_APP_CALLED_RESTART_INPUT_API, null, 0,
+ 0, 0);
}
-
- boolean startInputInner(IBinder windowGainingFocus, int controlFlags, int softInputMode,
+
+ boolean startInputInner(@InputMethodClient.StartInputReason final int startInputReason,
+ IBinder windowGainingFocus, int controlFlags, int softInputMode,
int windowFlags) {
final View view;
synchronized (mH) {
view = mServedView;
// Make sure we have a window token for the served view.
- if (DEBUG) Log.v(TAG, "Starting input: view=" + view);
+ if (DEBUG) {
+ Log.v(TAG, "Starting input: view=" + view +
+ " reason=" + InputMethodClient.getStartInputReason(startInputReason));
+ }
if (view == null) {
if (DEBUG) Log.v(TAG, "ABORT input: no served view!");
return false;
@@ -1158,7 +1168,7 @@
vh.post(new Runnable() {
@Override
public void run() {
- startInputInner(null, 0, 0, 0);
+ startInputInner(startInputReason, null, 0, 0, 0);
}
});
return false;
@@ -1222,11 +1232,11 @@
+ Integer.toHexString(controlFlags));
InputBindResult res;
if (windowGainingFocus != null) {
- res = mService.windowGainedFocus(mClient, windowGainingFocus,
+ res = mService.windowGainedFocus(startInputReason, mClient, windowGainingFocus,
controlFlags, softInputMode, windowFlags,
tba, servedContext);
} else {
- res = mService.startInput(mClient,
+ res = mService.startInput(startInputReason, mClient,
servedContext, tba, controlFlags);
}
if (DEBUG) Log.v(TAG, "Starting input: Bind result=" + res);
@@ -1353,7 +1363,7 @@
*/
public void checkFocus() {
if (checkFocusNoStartInput(false, true)) {
- startInputInner(null, 0, 0, 0);
+ startInputInner(InputMethodClient.START_INPUT_REASON_CHECK_FOCUS, null, 0, 0, 0);
}
}
@@ -1441,8 +1451,8 @@
// should be done in conjunction with telling the system service
// about the window gaining focus, to help make the transition
// smooth.
- if (startInputInner(rootView.getWindowToken(),
- controlFlags, softInputMode, windowFlags)) {
+ if (startInputInner(InputMethodClient.START_INPUT_REASON_WINDOW_FOCUS_GAIN,
+ rootView.getWindowToken(), controlFlags, softInputMode, windowFlags)) {
return;
}
}
@@ -1452,8 +1462,10 @@
synchronized (mH) {
try {
if (DEBUG) Log.v(TAG, "Reporting focus gain, without startInput");
- mService.windowGainedFocus(mClient, rootView.getWindowToken(),
- controlFlags, softInputMode, windowFlags, null, null);
+ mService.windowGainedFocus(
+ InputMethodClient.START_INPUT_REASON_WINDOW_FOCUS_GAIN_REPORT_ONLY, mClient,
+ rootView.getWindowToken(), controlFlags, softInputMode, windowFlags, null,
+ null);
} catch (RemoteException e) {
}
}
diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java
index b3b95f8..f313893 100644
--- a/core/java/android/webkit/FindActionModeCallback.java
+++ b/core/java/android/webkit/FindActionModeCallback.java
@@ -61,8 +61,7 @@
setText("");
mMatches = (TextView) mCustomView.findViewById(
com.android.internal.R.id.matches);
- mInput = (InputMethodManager)
- context.getSystemService(Context.INPUT_METHOD_SERVICE);
+ mInput = context.getSystemService(InputMethodManager.class);
mResources = context.getResources();
}
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index b8faf0c..f050e49 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2109,6 +2109,11 @@
}
@Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ return findDependentLayoutAxesHelper(child, axisFilter, LayoutParams.class);
+ }
+
+ @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
if (mSelector == null) {
useDefaultSelector();
@@ -5750,8 +5755,8 @@
// The editor is off in its own window; we need to be
// the one that does this.
if (editorAction == EditorInfo.IME_ACTION_DONE) {
- InputMethodManager imm = (InputMethodManager)
- getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager imm =
+ getContext().getSystemService(InputMethodManager.class);
if (imm != null) {
imm.hideSoftInputFromWindow(getWindowToken(), 0);
}
diff --git a/core/java/android/widget/ActionMenuPresenter.java b/core/java/android/widget/ActionMenuPresenter.java
index 5eea252..41f1ce7 100644
--- a/core/java/android/widget/ActionMenuPresenter.java
+++ b/core/java/android/widget/ActionMenuPresenter.java
@@ -177,8 +177,7 @@
public void onConfigurationChanged(Configuration newConfig) {
if (!mMaxItemsSet) {
- mMaxItems = mContext.getResources().getInteger(
- com.android.internal.R.integer.max_action_buttons);
+ mMaxItems = ActionBarPolicy.get(mContext).getMaxActionButtons();
}
if (mMenu != null) {
mMenu.onItemsChanged(true);
@@ -938,10 +937,11 @@
}
@Override
- public void onDismiss() {
- super.onDismiss();
+ protected void onDismiss() {
mMenu.close();
mOverflowPopup = null;
+
+ super.onDismiss();
}
}
@@ -960,10 +960,11 @@
}
@Override
- public void onDismiss() {
- super.onDismiss();
+ protected void onDismiss() {
mActionButtonPopup = null;
mOpenSubMenuId = 0;
+
+ super.onDismiss();
}
}
diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index a018d26..9f94005 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -28,6 +28,8 @@
import android.graphics.Canvas;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.RemotableViewMethod;
@@ -447,6 +449,68 @@
return CheckedTextView.class.getName();
}
+ static class SavedState extends BaseSavedState {
+ boolean checked;
+
+ /**
+ * Constructor called from {@link CheckedTextView#onSaveInstanceState()}
+ */
+ SavedState(Parcelable superState) {
+ super(superState);
+ }
+
+ /**
+ * Constructor called from {@link #CREATOR}
+ */
+ private SavedState(Parcel in) {
+ super(in);
+ checked = (Boolean)in.readValue(null);
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ super.writeToParcel(out, flags);
+ out.writeValue(checked);
+ }
+
+ @Override
+ public String toString() {
+ return "CheckedTextView.SavedState{"
+ + Integer.toHexString(System.identityHashCode(this))
+ + " checked=" + checked + "}";
+ }
+
+ public static final Parcelable.Creator<SavedState> CREATOR
+ = new Parcelable.Creator<SavedState>() {
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
+ }
+
+ @Override
+ public Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
+
+ SavedState ss = new SavedState(superState);
+
+ ss.checked = isChecked();
+ return ss;
+ }
+
+ @Override
+ public void onRestoreInstanceState(Parcelable state) {
+ SavedState ss = (SavedState) state;
+
+ super.onRestoreInstanceState(ss.getSuperState());
+ setChecked(ss.checked);
+ requestLayout();
+ }
+
/** @hide */
@Override
public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 2983053..5146bc6 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -17,6 +17,7 @@
package android.widget;
import android.R;
+import android.annotation.IntDef;
import android.annotation.Nullable;
import android.app.PendingIntent;
import android.app.PendingIntent.CanceledException;
@@ -106,6 +107,8 @@
import com.android.internal.util.Preconditions;
import com.android.internal.widget.EditableInputConnection;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.text.BreakIterator;
import java.util.Arrays;
import java.util.Comparator;
@@ -2634,8 +2637,11 @@
@VisibleForTesting
public class SuggestionsPopupWindow extends PinnedPopupWindow implements OnItemClickListener {
private static final int MAX_NUMBER_SUGGESTIONS = SuggestionSpan.SUGGESTIONS_MAX_SIZE;
- private static final int ADD_TO_DICTIONARY = -1;
- private static final int DELETE_TEXT = -2;
+
+ // Key of intent extras for inserting new word into user dictionary.
+ private static final String USER_DICTIONARY_EXTRA_WORD = "word";
+ private static final String USER_DICTIONARY_EXTRA_LOCALE = "locale";
+
private SuggestionInfo[] mSuggestionInfos;
private int mNumberOfSuggestions;
private boolean mCursorWasVisibleBeforeSuggestions;
@@ -2644,7 +2650,10 @@
private final Comparator<SuggestionSpan> mSuggestionSpanComparator;
private final HashMap<SuggestionSpan, Integer> mSpansLengths;
private final TextAppearanceSpan mHighlightSpan = new TextAppearanceSpan(
- mTextView.getContext(), android.R.style.TextAppearance_SuggestionHighlight);
+ mTextView.getContext(), mTextView.mTextEditSuggestionHighlightStyle);
+ private TextView mAddToDictionaryButton;
+ private TextView mDeleteButton;
+ private SuggestionSpan mMisspelledSpan;
private class CustomPopupWindow extends PopupWindow {
public CustomPopupWindow(Context context, int defStyleAttr) {
@@ -2684,17 +2693,73 @@
@Override
protected void initContentView() {
- ListView listView = new ListView(mTextView.getContext());
- mSuggestionsAdapter = new SuggestionAdapter();
- listView.setAdapter(mSuggestionsAdapter);
- listView.setOnItemClickListener(this);
- mContentView = listView;
+ final LayoutInflater inflater = (LayoutInflater) mTextView.getContext().
+ getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ final LinearLayout linearLayout = (LinearLayout) inflater.inflate(
+ mTextView.mTextEditSuggestionContainerLayout, null);
- // Inflate the suggestion items once and for all. + 2 for add to dictionary and delete
- mSuggestionInfos = new SuggestionInfo[MAX_NUMBER_SUGGESTIONS + 2];
+ final ListView suggestionListView = (ListView) linearLayout.findViewById(
+ com.android.internal.R.id.suggestionContainer);
+
+ mSuggestionsAdapter = new SuggestionAdapter();
+ suggestionListView.setAdapter(mSuggestionsAdapter);
+ suggestionListView.setOnItemClickListener(this);
+
+ // Inflate the suggestion items once and for all.
+ mSuggestionInfos = new SuggestionInfo[MAX_NUMBER_SUGGESTIONS];
for (int i = 0; i < mSuggestionInfos.length; i++) {
mSuggestionInfos[i] = new SuggestionInfo();
}
+
+ mContentView = linearLayout;
+
+ mAddToDictionaryButton = (TextView) linearLayout.findViewById(
+ com.android.internal.R.id.addToDictionaryButton);
+ mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ final Editable editable = (Editable) mTextView.getText();
+ final int spanStart = editable.getSpanStart(mMisspelledSpan);
+ final int spanEnd = editable.getSpanEnd(mMisspelledSpan);
+ final String originalText = TextUtils.substring(editable, spanStart, spanEnd);
+
+ final Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);
+ intent.putExtra(USER_DICTIONARY_EXTRA_WORD, originalText);
+ intent.putExtra(USER_DICTIONARY_EXTRA_LOCALE,
+ mTextView.getTextServicesLocale().toString());
+ intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+ mTextView.getContext().startActivity(intent);
+ // There is no way to know if the word was indeed added. Re-check.
+ // TODO The ExtractEditText should remove the span in the original text instead
+ editable.removeSpan(mMisspelledSpan);
+ Selection.setSelection(editable, spanEnd);
+ updateSpellCheckSpans(spanStart, spanEnd, false);
+ hideWithCleanUp();
+ }
+ });
+
+ mDeleteButton = (TextView) linearLayout.findViewById(
+ com.android.internal.R.id.deleteButton);
+ mDeleteButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ final Editable editable = (Editable) mTextView.getText();
+
+ final int spanUnionStart = editable.getSpanStart(mSuggestionRangeSpan);
+ int spanUnionEnd = editable.getSpanEnd(mSuggestionRangeSpan);
+ if (spanUnionStart >= 0 && spanUnionEnd > spanUnionStart) {
+ // Do not leave two adjacent spaces after deletion, or one at beginning of
+ // text
+ if (spanUnionEnd < editable.length() &&
+ Character.isSpaceChar(editable.charAt(spanUnionEnd)) &&
+ (spanUnionStart == 0 ||
+ Character.isSpaceChar(editable.charAt(spanUnionStart - 1)))) {
+ spanUnionEnd = spanUnionEnd + 1;
+ }
+ mTextView.deleteText_internal(spanUnionStart, spanUnionEnd);
+ }
+ hideWithCleanUp();
+ }
+ });
+
}
public boolean isShowingUp() {
@@ -2753,14 +2818,6 @@
final SuggestionInfo suggestionInfo = mSuggestionInfos[position];
textView.setText(suggestionInfo.text);
-
- if (suggestionInfo.suggestionIndex == ADD_TO_DICTIONARY ||
- suggestionInfo.suggestionIndex == DELETE_TEXT) {
- textView.setBackgroundColor(Color.TRANSPARENT);
- } else {
- textView.setBackgroundColor(Color.WHITE);
- }
-
return textView;
}
}
@@ -2843,6 +2900,14 @@
width = Math.max(width, view.getMeasuredWidth());
}
+ if (mAddToDictionaryButton.getVisibility() != View.GONE) {
+ mAddToDictionaryButton.measure(horizontalMeasure, verticalMeasure);
+ width = Math.max(width, mAddToDictionaryButton.getMeasuredWidth());
+ }
+
+ mDeleteButton.measure(horizontalMeasure, verticalMeasure);
+ width = Math.max(width, mDeleteButton.getMeasuredWidth());
+
// Enforce the width based on actual text widths
mContentView.measure(
View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
@@ -2878,6 +2943,7 @@
for (final SuggestionInfo info : mSuggestionInfos) {
info.clear();
}
+ mMisspelledSpan = null;
hide();
}
@@ -2893,7 +2959,7 @@
int spanUnionStart = mTextView.getText().length();
int spanUnionEnd = 0;
- SuggestionSpan misspelledSpan = null;
+ mMisspelledSpan = null;
int underlineColor = 0;
for (int spanIndex = 0; spanIndex < nbSpans; spanIndex++) {
@@ -2904,7 +2970,7 @@
spanUnionEnd = Math.max(spanEnd, spanUnionEnd);
if ((suggestionSpan.getFlags() & SuggestionSpan.FLAG_MISSPELLED) != 0) {
- misspelledSpan = suggestionSpan;
+ mMisspelledSpan = suggestionSpan;
}
// The first span dictates the background color of the highlighted text
@@ -2949,31 +3015,16 @@
highlightTextDifferences(mSuggestionInfos[i], spanUnionStart, spanUnionEnd);
}
- // Add "Add to dictionary" item if there is a span with the misspelled flag
- if (misspelledSpan != null) {
- final int misspelledStart = spannable.getSpanStart(misspelledSpan);
- final int misspelledEnd = spannable.getSpanEnd(misspelledSpan);
+ // Make "Add to dictionary" item visible if there is a span with the misspelled flag
+ int addToDictionaryButtonVisibility = View.GONE;
+ if (mMisspelledSpan != null) {
+ final int misspelledStart = spannable.getSpanStart(mMisspelledSpan);
+ final int misspelledEnd = spannable.getSpanEnd(mMisspelledSpan);
if (misspelledStart >= 0 && misspelledEnd > misspelledStart) {
- SuggestionInfo suggestionInfo = mSuggestionInfos[mNumberOfSuggestions];
- suggestionInfo.suggestionSpan = misspelledSpan;
- suggestionInfo.suggestionIndex = ADD_TO_DICTIONARY;
- suggestionInfo.text.replace(0, suggestionInfo.text.length(), mTextView.
- getContext().getString(com.android.internal.R.string.addToDictionary));
- suggestionInfo.text.setSpan(mHighlightSpan, 0, 0,
- Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
- mNumberOfSuggestions++;
+ addToDictionaryButtonVisibility = View.VISIBLE;
}
}
-
- // Delete item
- SuggestionInfo suggestionInfo = mSuggestionInfos[mNumberOfSuggestions];
- suggestionInfo.suggestionSpan = null;
- suggestionInfo.suggestionIndex = DELETE_TEXT;
- suggestionInfo.text.replace(0, suggestionInfo.text.length(),
- mTextView.getContext().getString(com.android.internal.R.string.deleteText));
- suggestionInfo.text.setSpan(mHighlightSpan, 0, 0, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
- mNumberOfSuggestions++;
+ mAddToDictionaryButton.setVisibility(addToDictionaryButtonVisibility);
if (mSuggestionRangeSpan == null) mSuggestionRangeSpan = new SuggestionRangeSpan();
if (underlineColor == 0) {
@@ -3017,23 +3068,6 @@
Editable editable = (Editable) mTextView.getText();
SuggestionInfo suggestionInfo = mSuggestionInfos[position];
- if (suggestionInfo.suggestionIndex == DELETE_TEXT) {
- final int spanUnionStart = editable.getSpanStart(mSuggestionRangeSpan);
- int spanUnionEnd = editable.getSpanEnd(mSuggestionRangeSpan);
- if (spanUnionStart >= 0 && spanUnionEnd > spanUnionStart) {
- // Do not leave two adjacent spaces after deletion, or one at beginning of text
- if (spanUnionEnd < editable.length() &&
- Character.isSpaceChar(editable.charAt(spanUnionEnd)) &&
- (spanUnionStart == 0 ||
- Character.isSpaceChar(editable.charAt(spanUnionStart - 1)))) {
- spanUnionEnd = spanUnionEnd + 1;
- }
- mTextView.deleteText_internal(spanUnionStart, spanUnionEnd);
- }
- hideWithCleanUp();
- return;
- }
-
final int spanStart = editable.getSpanStart(suggestionInfo.suggestionSpan);
final int spanEnd = editable.getSpanEnd(suggestionInfo.suggestionSpan);
if (spanStart < 0 || spanEnd <= spanStart) {
@@ -3044,75 +3078,59 @@
final String originalText = TextUtils.substring(editable, spanStart, spanEnd);
- if (suggestionInfo.suggestionIndex == ADD_TO_DICTIONARY) {
- Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);
- intent.putExtra("word", originalText);
- intent.putExtra("locale", mTextView.getTextServicesLocale().toString());
- // Put a listener to replace the original text with a word which the user
- // modified in a user dictionary dialog.
- intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
- mTextView.getContext().startActivity(intent);
- // There is no way to know if the word was indeed added. Re-check.
- // TODO The ExtractEditText should remove the span in the original text instead
- editable.removeSpan(suggestionInfo.suggestionSpan);
- Selection.setSelection(editable, spanEnd);
- updateSpellCheckSpans(spanStart, spanEnd, false);
- } else {
- // SuggestionSpans are removed by replace: save them before
- SuggestionSpan[] suggestionSpans = editable.getSpans(spanStart, spanEnd,
- SuggestionSpan.class);
- final int length = suggestionSpans.length;
- int[] suggestionSpansStarts = new int[length];
- int[] suggestionSpansEnds = new int[length];
- int[] suggestionSpansFlags = new int[length];
- for (int i = 0; i < length; i++) {
- final SuggestionSpan suggestionSpan = suggestionSpans[i];
- suggestionSpansStarts[i] = editable.getSpanStart(suggestionSpan);
- suggestionSpansEnds[i] = editable.getSpanEnd(suggestionSpan);
- suggestionSpansFlags[i] = editable.getSpanFlags(suggestionSpan);
+ // SuggestionSpans are removed by replace: save them before
+ final SuggestionSpan[] suggestionSpans = editable.getSpans(spanStart, spanEnd,
+ SuggestionSpan.class);
+ final int length = suggestionSpans.length;
+ final int[] suggestionSpansStarts = new int[length];
+ final int[] suggestionSpansEnds = new int[length];
+ final int[] suggestionSpansFlags = new int[length];
+ for (int i = 0; i < length; i++) {
+ final SuggestionSpan suggestionSpan = suggestionSpans[i];
+ suggestionSpansStarts[i] = editable.getSpanStart(suggestionSpan);
+ suggestionSpansEnds[i] = editable.getSpanEnd(suggestionSpan);
+ suggestionSpansFlags[i] = editable.getSpanFlags(suggestionSpan);
- // Remove potential misspelled flags
- int suggestionSpanFlags = suggestionSpan.getFlags();
- if ((suggestionSpanFlags & SuggestionSpan.FLAG_MISSPELLED) > 0) {
- suggestionSpanFlags &= ~SuggestionSpan.FLAG_MISSPELLED;
- suggestionSpanFlags &= ~SuggestionSpan.FLAG_EASY_CORRECT;
- suggestionSpan.setFlags(suggestionSpanFlags);
- }
+ // Remove potential misspelled flags
+ int suggestionSpanFlags = suggestionSpan.getFlags();
+ if ((suggestionSpanFlags & SuggestionSpan.FLAG_MISSPELLED) > 0) {
+ suggestionSpanFlags &= ~SuggestionSpan.FLAG_MISSPELLED;
+ suggestionSpanFlags &= ~SuggestionSpan.FLAG_EASY_CORRECT;
+ suggestionSpan.setFlags(suggestionSpanFlags);
}
-
- final int suggestionStart = suggestionInfo.suggestionStart;
- final int suggestionEnd = suggestionInfo.suggestionEnd;
- final String suggestion = suggestionInfo.text.subSequence(
- suggestionStart, suggestionEnd).toString();
- mTextView.replaceText_internal(spanStart, spanEnd, suggestion);
-
- // Notify source IME of the suggestion pick. Do this before
- // swaping texts.
- suggestionInfo.suggestionSpan.notifySelection(
- mTextView.getContext(), originalText, suggestionInfo.suggestionIndex);
-
- // Swap text content between actual text and Suggestion span
- String[] suggestions = suggestionInfo.suggestionSpan.getSuggestions();
- suggestions[suggestionInfo.suggestionIndex] = originalText;
-
- // Restore previous SuggestionSpans
- final int lengthDifference = suggestion.length() - (spanEnd - spanStart);
- for (int i = 0; i < length; i++) {
- // Only spans that include the modified region make sense after replacement
- // Spans partially included in the replaced region are removed, there is no
- // way to assign them a valid range after replacement
- if (suggestionSpansStarts[i] <= spanStart &&
- suggestionSpansEnds[i] >= spanEnd) {
- mTextView.setSpan_internal(suggestionSpans[i], suggestionSpansStarts[i],
- suggestionSpansEnds[i] + lengthDifference, suggestionSpansFlags[i]);
- }
- }
-
- // Move cursor at the end of the replaced word
- final int newCursorPosition = spanEnd + lengthDifference;
- mTextView.setCursorPosition_internal(newCursorPosition, newCursorPosition);
}
+ final int suggestionStart = suggestionInfo.suggestionStart;
+ final int suggestionEnd = suggestionInfo.suggestionEnd;
+ final String suggestion = suggestionInfo.text.subSequence(
+ suggestionStart, suggestionEnd).toString();
+ mTextView.replaceText_internal(spanStart, spanEnd, suggestion);
+
+ // Notify source IME of the suggestion pick. Do this before
+ // swaping texts.
+ suggestionInfo.suggestionSpan.notifySelection(
+ mTextView.getContext(), originalText, suggestionInfo.suggestionIndex);
+
+ // Swap text content between actual text and Suggestion span
+ final String[] suggestions = suggestionInfo.suggestionSpan.getSuggestions();
+ suggestions[suggestionInfo.suggestionIndex] = originalText;
+
+ // Restore previous SuggestionSpans
+ final int lengthDifference = suggestion.length() - (spanEnd - spanStart);
+ for (int i = 0; i < length; i++) {
+ // Only spans that include the modified region make sense after replacement
+ // Spans partially included in the replaced region are removed, there is no
+ // way to assign them a valid range after replacement
+ if (suggestionSpansStarts[i] <= spanStart &&
+ suggestionSpansEnds[i] >= spanEnd) {
+ mTextView.setSpan_internal(suggestionSpans[i], suggestionSpansStarts[i],
+ suggestionSpansEnds[i] + lengthDifference, suggestionSpansFlags[i]);
+ }
+ }
+
+ // Move cursor at the end of the replaced word
+ final int newCursorPosition = spanEnd + lengthDifference;
+ mTextView.setCursorPosition_internal(newCursorPosition, newCursorPosition);
hideWithCleanUp();
}
}
@@ -3507,7 +3525,8 @@
}
}
- private abstract class HandleView extends View implements TextViewPositionListener {
+ @VisibleForTesting
+ public abstract class HandleView extends View implements TextViewPositionListener {
protected Drawable mDrawable;
protected Drawable mDrawableLtr;
protected Drawable mDrawableRtl;
@@ -3538,8 +3557,9 @@
// a different line.
protected int mPreviousLineTouched = UNSET_LINE;
- public HandleView(Drawable drawableLtr, Drawable drawableRtl) {
+ private HandleView(Drawable drawableLtr, Drawable drawableRtl, final int id) {
super(mTextView.getContext());
+ setId(id);
mContainer = new PopupWindow(mTextView.getContext(), null,
com.android.internal.R.attr.textSelectHandleWindowStyle);
mContainer.setSplitTouchEnabled(true);
@@ -3901,7 +3921,7 @@
private Runnable mHider;
public InsertionHandleView(Drawable drawable) {
- super(drawable, drawable);
+ super(drawable, drawable, com.android.internal.R.id.insertion_handle);
}
@Override
@@ -4070,7 +4090,17 @@
}
}
- private class SelectionStartHandleView extends HandleView {
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({HANDLE_TYPE_SELECTION_START, HANDLE_TYPE_SELECTION_END})
+ public @interface HandleType {}
+ public static final int HANDLE_TYPE_SELECTION_START = 0;
+ public static final int HANDLE_TYPE_SELECTION_END = 1;
+
+ private class SelectionHandleView extends HandleView {
+ // Indicates the handle type, selection start (HANDLE_TYPE_SELECTION_START) or selection
+ // end (HANDLE_TYPE_SELECTION_END).
+ @HandleType
+ private final int mHandleType;
// Indicates whether the cursor is making adjustments within a word.
private boolean mInWord = false;
// Difference between touch position and word boundary position.
@@ -4085,16 +4115,21 @@
// Used to save text view location.
private final int[] mTextViewLocation = new int[2];
- public SelectionStartHandleView(Drawable drawableLtr, Drawable drawableRtl) {
- super(drawableLtr, drawableRtl);
- ViewConfiguration viewConfiguration = ViewConfiguration.get(
- mTextView.getContext());
+ public SelectionHandleView(Drawable drawableLtr, Drawable drawableRtl, int id,
+ @HandleType int handleType) {
+ super(drawableLtr, drawableRtl, id);
+ mHandleType = handleType;
+ ViewConfiguration viewConfiguration = ViewConfiguration.get(mTextView.getContext());
mTextViewEdgeSlop = viewConfiguration.getScaledTouchSlop() * 4;
}
+ private boolean isStartHandle() {
+ return mHandleType == HANDLE_TYPE_SELECTION_START;
+ }
+
@Override
protected int getHotspotX(Drawable drawable, boolean isRtlRun) {
- if (isRtlRun) {
+ if (isRtlRun == isStartHandle()) {
return drawable.getIntrinsicWidth() / 4;
} else {
return (drawable.getIntrinsicWidth() * 3) / 4;
@@ -4103,18 +4138,23 @@
@Override
protected int getHorizontalGravity(boolean isRtlRun) {
- return isRtlRun ? Gravity.LEFT : Gravity.RIGHT;
+ return (isRtlRun == isStartHandle()) ? Gravity.LEFT : Gravity.RIGHT;
}
@Override
public int getCurrentCursorOffset() {
- return mTextView.getSelectionStart();
+ return isStartHandle() ? mTextView.getSelectionStart() : mTextView.getSelectionEnd();
}
@Override
- public void updateSelection(int offset) {
- Selection.setSelection((Spannable) mTextView.getText(), offset,
- mTextView.getSelectionEnd());
+ protected void updateSelection(int offset) {
+ if (isStartHandle()) {
+ Selection.setSelection((Spannable) mTextView.getText(), offset,
+ mTextView.getSelectionEnd());
+ } else {
+ Selection.setSelection((Spannable) mTextView.getText(),
+ mTextView.getSelectionStart(), offset);
+ }
updateDrawable();
if (mTextActionMode != null) {
mTextActionMode.invalidate();
@@ -4136,35 +4176,36 @@
}
boolean positionCursor = false;
- final int selectionEnd = mTextView.getSelectionEnd();
+ final int anotherHandleOffset =
+ isStartHandle() ? mTextView.getSelectionEnd() : mTextView.getSelectionStart();
int currLine = getCurrentLineAdjustedForSlop(layout, mPreviousLineTouched, y);
int initialOffset = mTextView.getOffsetAtCoordinate(currLine, x);
- if (initialOffset >= selectionEnd) {
- // Handles have crossed, bound it to the last selected line and
+ if (isStartHandle() && initialOffset >= anotherHandleOffset
+ || !isStartHandle() && initialOffset <= anotherHandleOffset) {
+ // Handles have crossed, bound it to the first selected line and
// adjust by word / char as normal.
- currLine = layout.getLineForOffset(selectionEnd);
+ currLine = layout.getLineForOffset(anotherHandleOffset);
initialOffset = mTextView.getOffsetAtCoordinate(currLine, x);
}
int offset = initialOffset;
- int end = getWordEnd(offset);
- int start = getWordStart(offset);
+ final int wordEnd = getWordEnd(offset);
+ final int wordStart = getWordStart(offset);
if (mPrevX == UNSET_X_VALUE) {
mPrevX = x;
}
- final int selectionStart = mTextView.getSelectionStart();
- final boolean selectionStartRtl = layout.isRtlCharAt(selectionStart);
+ final int currentOffset = getCurrentCursorOffset();
+ final boolean rtlAtCurrentOffset = layout.isRtlCharAt(currentOffset);
final boolean atRtl = layout.isRtlCharAt(offset);
final boolean isLvlBoundary = layout.isLevelBoundary(offset);
- boolean isExpanding;
// We can't determine if the user is expanding or shrinking the selection if they're
// on a bi-di boundary, so until they've moved past the boundary we'll just place
// the cursor at the current position.
- if (isLvlBoundary || (selectionStartRtl && !atRtl) || (!selectionStartRtl && atRtl)) {
+ if (isLvlBoundary || (rtlAtCurrentOffset && !atRtl) || (!rtlAtCurrentOffset && atRtl)) {
// We're on a boundary or this is the first direction change -- just update
// to the current position.
mLanguageDirectionChanged = true;
@@ -4178,24 +4219,30 @@
mTouchWordDelta = 0.0f;
mLanguageDirectionChanged = false;
return;
+ }
+
+ boolean isExpanding;
+ final float xDiff = x - mPrevX;
+ if (atRtl == isStartHandle()) {
+ isExpanding = xDiff > 0 || currLine > mPreviousLineTouched;
} else {
- final float xDiff = x - mPrevX;
- if (atRtl) {
- isExpanding = xDiff > 0 || currLine > mPreviousLineTouched;
- } else {
- isExpanding = xDiff < 0 || currLine < mPreviousLineTouched;
- }
+ isExpanding = xDiff < 0 || currLine < mPreviousLineTouched;
}
if (mTextView.getHorizontallyScrolling()) {
if (positionNearEdgeOfScrollingView(x, atRtl)
- && (mTextView.getScrollX() != 0)
- && ((isExpanding && offset < selectionStart) || !isExpanding)) {
- // If we're expanding ensure that the offset is smaller than the
- // selection start, if the handle snapped to the word, the finger position
+ && ((isStartHandle() && mTextView.getScrollX() != 0)
+ || (!isStartHandle()
+ && mTextView.canScrollHorizontally(atRtl ? -1 : 1)))
+ && ((isExpanding && ((isStartHandle() && offset < currentOffset)
+ || (!isStartHandle() && offset > currentOffset)))
+ || !isExpanding)) {
+ // If we're expanding ensure that the offset is actually expanding compared to
+ // the current offset, if the handle snapped to the word, the finger position
// may be out of sync and we don't want the selection to jump back.
mTouchWordDelta = 0.0f;
- final int nextOffset = atRtl ? layout.getOffsetToRightOf(mPreviousOffset)
+ final int nextOffset = (atRtl == isStartHandle())
+ ? layout.getOffsetToRightOf(mPreviousOffset)
: layout.getOffsetToLeftOf(mPreviousOffset);
positionAndAdjustForCrossingHandles(nextOffset);
return;
@@ -4204,24 +4251,36 @@
if (isExpanding) {
// User is increasing the selection.
- if (!mInWord || currLine < mPrevLine) {
+ final boolean snapToWord = !mInWord
+ || (isStartHandle() ? currLine < mPrevLine : currLine > mPrevLine);
+ if (snapToWord) {
// Sometimes words can be broken across lines (Chinese, hyphenation).
- // We still snap to the start of the word but we only use the letters on the
+ // We still snap to the word boundary but we only use the letters on the
// current line to determine if the user is far enough into the word to snap.
- int wordStartOnCurrLine = start;
- if (layout != null && layout.getLineForOffset(start) != currLine) {
- wordStartOnCurrLine = layout.getLineStart(currLine);
+ int wordBoundary = isStartHandle() ? wordStart : wordEnd;
+ if (layout != null && layout.getLineForOffset(wordBoundary) != currLine) {
+ wordBoundary = isStartHandle() ?
+ layout.getLineStart(currLine) : layout.getLineEnd(currLine);
}
- int offsetThresholdToSnap = end - ((end - wordStartOnCurrLine) / 2);
- if (offset <= offsetThresholdToSnap || currLine < mPrevLine) {
- // User is far enough into the word or on a different
- // line so we expand by word.
- offset = start;
+ final int offsetThresholdToSnap = isStartHandle()
+ ? wordEnd - ((wordEnd - wordBoundary) / 2)
+ : wordStart + ((wordBoundary - wordStart) / 2);
+ if (isStartHandle()
+ && (offset <= offsetThresholdToSnap || currLine < mPrevLine)) {
+ // User is far enough into the word or on a different line so we expand by
+ // word.
+ offset = wordStart;
+ } else if (!isStartHandle()
+ && (offset >= offsetThresholdToSnap || currLine > mPrevLine)) {
+ // User is far enough into the word or on a different line so we expand by
+ // word.
+ offset = wordEnd;
} else {
offset = mPreviousOffset;
}
}
- if (layout != null && offset < initialOffset) {
+ if (layout != null && (isStartHandle() && offset < initialOffset)
+ || (!isStartHandle() && offset > initialOffset)) {
final float adjustedX = layout.getPrimaryHorizontal(offset);
mTouchWordDelta =
mTextView.convertToLocalHorizontalCoordinate(x) - adjustedX;
@@ -4232,12 +4291,16 @@
} else {
final int adjustedOffset =
mTextView.getOffsetAtCoordinate(currLine, x - mTouchWordDelta);
- if (adjustedOffset > mPreviousOffset || currLine > mPrevLine) {
+ final boolean shrinking = isStartHandle()
+ ? adjustedOffset > mPreviousOffset || currLine > mPrevLine
+ : adjustedOffset < mPreviousOffset || currLine < mPrevLine;
+ if (shrinking) {
// User is shrinking the selection.
- if (currLine > mPrevLine) {
+ if (currLine != mPrevLine) {
// We're on a different line, so we'll snap to word boundaries.
- offset = start;
- if (layout != null && offset < initialOffset) {
+ offset = isStartHandle() ? wordStart : wordEnd;
+ if (layout != null && (isStartHandle() && offset < initialOffset)
+ || (!isStartHandle() && offset > initialOffset)) {
final float adjustedX = layout.getPrimaryHorizontal(offset);
mTouchWordDelta =
mTextView.convertToLocalHorizontalCoordinate(x) - adjustedX;
@@ -4248,11 +4311,12 @@
offset = adjustedOffset;
}
positionCursor = true;
- } else if (adjustedOffset < mPreviousOffset) {
- // Handle has jumped to the start of the word, and the user is moving
+ } else if ((isStartHandle() && adjustedOffset < mPreviousOffset)
+ || (!isStartHandle() && adjustedOffset > mPreviousOffset)) {
+ // Handle has jumped to the word boundary, and the user is moving
// their finger towards the handle, the delta should be updated.
- mTouchWordDelta = mTextView.convertToLocalHorizontalCoordinate(x)
- - layout.getPrimaryHorizontal(mPreviousOffset);
+ mTouchWordDelta = mTextView.convertToLocalHorizontalCoordinate(x) -
+ layout.getPrimaryHorizontal(mPreviousOffset);
}
}
@@ -4263,16 +4327,6 @@
mPrevX = x;
}
- private void positionAndAdjustForCrossingHandles(int offset) {
- final int selectionEnd = mTextView.getSelectionEnd();
- if (offset >= selectionEnd) {
- // Handles can not cross and selection is at least one character.
- offset = getNextCursorOffset(selectionEnd, false);
- mTouchWordDelta = 0.0f;
- }
- positionAtCursorOffset(offset, false);
- }
-
/**
* @param offset Cursor offset. Must be in [-1, length].
* @param parentScrolled If the parent has been scrolled or not.
@@ -4295,256 +4349,28 @@
return superResult;
}
- private boolean positionNearEdgeOfScrollingView(float x, boolean atRtl) {
- mTextView.getLocationOnScreen(mTextViewLocation);
- boolean nearEdge;
- if (atRtl) {
- int rightEdge = mTextViewLocation[0] + mTextView.getWidth()
- - mTextView.getPaddingRight();
- nearEdge = x > rightEdge - mTextViewEdgeSlop;
- } else {
- int leftEdge = mTextViewLocation[0] + mTextView.getPaddingLeft();
- nearEdge = x < leftEdge + mTextViewEdgeSlop;
- }
- return nearEdge;
- }
- }
-
- private class SelectionEndHandleView extends HandleView {
- // Indicates whether the cursor is making adjustments within a word.
- private boolean mInWord = false;
- // Difference between touch position and word boundary position.
- private float mTouchWordDelta;
- // X value of the previous updatePosition call.
- private float mPrevX;
- // Indicates if the handle has moved a boundary between LTR and RTL text.
- private boolean mLanguageDirectionChanged = false;
- // Distance from edge of horizontally scrolling text view
- // to use to switch to character mode.
- private final float mTextViewEdgeSlop;
- // Used to save the text view location.
- private final int[] mTextViewLocation = new int[2];
-
- public SelectionEndHandleView(Drawable drawableLtr, Drawable drawableRtl) {
- super(drawableLtr, drawableRtl);
- ViewConfiguration viewConfiguration = ViewConfiguration.get(
- mTextView.getContext());
- mTextViewEdgeSlop = viewConfiguration.getScaledTouchSlop() * 4;
- }
-
- @Override
- protected int getHotspotX(Drawable drawable, boolean isRtlRun) {
- if (isRtlRun) {
- return (drawable.getIntrinsicWidth() * 3) / 4;
- } else {
- return drawable.getIntrinsicWidth() / 4;
- }
- }
-
- @Override
- protected int getHorizontalGravity(boolean isRtlRun) {
- return isRtlRun ? Gravity.RIGHT : Gravity.LEFT;
- }
-
- @Override
- public int getCurrentCursorOffset() {
- return mTextView.getSelectionEnd();
- }
-
- @Override
- public void updateSelection(int offset) {
- Selection.setSelection((Spannable) mTextView.getText(),
- mTextView.getSelectionStart(), offset);
- if (mTextActionMode != null) {
- mTextActionMode.invalidate();
- }
- updateDrawable();
- }
-
- @Override
- public void updatePosition(float x, float y) {
- final Layout layout = mTextView.getLayout();
- if (layout == null) {
- // HandleView will deal appropriately in positionAtCursorOffset when
- // layout is null.
- positionAndAdjustForCrossingHandles(mTextView.getOffsetForPosition(x, y));
- return;
- }
-
- if (mPreviousLineTouched == UNSET_LINE) {
- mPreviousLineTouched = mTextView.getLineAtCoordinate(y);
- }
-
- boolean positionCursor = false;
- final int selectionStart = mTextView.getSelectionStart();
- int currLine = getCurrentLineAdjustedForSlop(layout, mPreviousLineTouched, y);
- int initialOffset = mTextView.getOffsetAtCoordinate(currLine, x);
-
- if (initialOffset <= selectionStart) {
- // Handles have crossed, bound it to the first selected line and
- // adjust by word / char as normal.
- currLine = layout.getLineForOffset(selectionStart);
- initialOffset = mTextView.getOffsetAtCoordinate(currLine, x);
- }
-
- int offset = initialOffset;
- int end = getWordEnd(offset);
- int start = getWordStart(offset);
-
- if (mPrevX == UNSET_X_VALUE) {
- mPrevX = x;
- }
-
- final int selectionEnd = mTextView.getSelectionEnd();
- final boolean selectionEndRtl = layout.isRtlCharAt(selectionEnd);
- final boolean atRtl = layout.isRtlCharAt(offset);
- final boolean isLvlBoundary = layout.isLevelBoundary(offset);
- boolean isExpanding;
-
- // We can't determine if the user is expanding or shrinking the selection if they're
- // on a bi-di boundary, so until they've moved past the boundary we'll just place
- // the cursor at the current position.
- if (isLvlBoundary || (selectionEndRtl && !atRtl) || (!selectionEndRtl && atRtl)) {
- // We're on a boundary or this is the first direction change -- just update
- // to the current position.
- mLanguageDirectionChanged = true;
- mTouchWordDelta = 0.0f;
- positionAndAdjustForCrossingHandles(offset);
- return;
- } else if (mLanguageDirectionChanged && !isLvlBoundary) {
- // We've just moved past the boundary so update the position. After this we can
- // figure out if the user is expanding or shrinking to go by word or character.
- positionAndAdjustForCrossingHandles(offset);
- mTouchWordDelta = 0.0f;
- mLanguageDirectionChanged = false;
- return;
- } else {
- final float xDiff = x - mPrevX;
- if (atRtl) {
- isExpanding = xDiff < 0 || currLine < mPreviousLineTouched;
- } else {
- isExpanding = xDiff > 0 || currLine > mPreviousLineTouched;
- }
- }
-
- if (mTextView.getHorizontallyScrolling()) {
- if (positionNearEdgeOfScrollingView(x, atRtl)
- && mTextView.canScrollHorizontally(atRtl ? -1 : 1)
- && ((isExpanding && offset > selectionEnd) || !isExpanding)) {
- // If we're expanding ensure that the offset is actually greater than the
- // selection end, if the handle snapped to the word, the finger position
- // may be out of sync and we don't want the selection to jump back.
- mTouchWordDelta = 0.0f;
- final int nextOffset = atRtl ? layout.getOffsetToLeftOf(mPreviousOffset)
- : layout.getOffsetToRightOf(mPreviousOffset);
- positionAndAdjustForCrossingHandles(nextOffset);
- return;
- }
- }
-
- if (isExpanding) {
- // User is increasing the selection.
- if (!mInWord || currLine > mPrevLine) {
- // Sometimes words can be broken across lines (Chinese, hyphenation).
- // We still snap to the end of the word but we only use the letters on the
- // current line to determine if the user is far enough into the word to snap.
- int wordEndOnCurrLine = end;
- if (layout != null && layout.getLineForOffset(end) != currLine) {
- wordEndOnCurrLine = layout.getLineEnd(currLine);
- }
- final int offsetThresholdToSnap = start + ((wordEndOnCurrLine - start) / 2);
- if (offset >= offsetThresholdToSnap || currLine > mPrevLine) {
- // User is far enough into the word or on a different
- // line so we expand by word.
- offset = end;
- } else {
- offset = mPreviousOffset;
- }
- }
- if (offset > initialOffset) {
- final float adjustedX = layout.getPrimaryHorizontal(offset);
- mTouchWordDelta =
- adjustedX - mTextView.convertToLocalHorizontalCoordinate(x);
- } else {
- mTouchWordDelta = 0.0f;
- }
- positionCursor = true;
- } else {
- final int adjustedOffset =
- mTextView.getOffsetAtCoordinate(currLine, x + mTouchWordDelta);
- if (adjustedOffset < mPreviousOffset || currLine < mPrevLine) {
- // User is shrinking the selection.
- if (currLine < mPrevLine) {
- // We're on a different line, so we'll snap to word boundaries.
- offset = end;
- if (offset > initialOffset) {
- final float adjustedX = layout.getPrimaryHorizontal(offset);
- mTouchWordDelta =
- adjustedX - mTextView.convertToLocalHorizontalCoordinate(x);
- } else {
- mTouchWordDelta = 0.0f;
- }
- } else {
- offset = adjustedOffset;
- }
- positionCursor = true;
- } else if (adjustedOffset > mPreviousOffset) {
- // Handle has jumped to the end of the word, and the user is moving
- // their finger towards the handle, the delta should be updated.
- mTouchWordDelta = layout.getPrimaryHorizontal(mPreviousOffset)
- - mTextView.convertToLocalHorizontalCoordinate(x);
- }
- }
-
- if (positionCursor) {
- mPreviousLineTouched = currLine;
- positionAndAdjustForCrossingHandles(offset);
- }
- mPrevX = x;
- }
-
private void positionAndAdjustForCrossingHandles(int offset) {
- final int selectionStart = mTextView.getSelectionStart();
- if (offset <= selectionStart) {
+ final int anotherHandleOffset =
+ isStartHandle() ? mTextView.getSelectionEnd() : mTextView.getSelectionStart();
+ if ((isStartHandle() && offset >= anotherHandleOffset)
+ || (!isStartHandle() && offset <= anotherHandleOffset)) {
// Handles can not cross and selection is at least one character.
- offset = getNextCursorOffset(selectionStart, true);
+ offset = getNextCursorOffset(anotherHandleOffset, !isStartHandle());
mTouchWordDelta = 0.0f;
}
positionAtCursorOffset(offset, false);
}
- /**
- * @param offset Cursor offset. Must be in [-1, length].
- * @param parentScrolled If the parent has been scrolled or not.
- */
- @Override
- protected void positionAtCursorOffset(int offset, boolean parentScrolled) {
- super.positionAtCursorOffset(offset, parentScrolled);
- mInWord = (offset != -1) && !getWordIteratorWithText().isBoundary(offset);
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- boolean superResult = super.onTouchEvent(event);
- if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
- // Reset the touch word offset and x value when the user
- // re-engages the handle.
- mTouchWordDelta = 0.0f;
- mPrevX = UNSET_X_VALUE;
- }
- return superResult;
- }
-
private boolean positionNearEdgeOfScrollingView(float x, boolean atRtl) {
mTextView.getLocationOnScreen(mTextViewLocation);
boolean nearEdge;
- if (atRtl) {
- int leftEdge = mTextViewLocation[0] + mTextView.getPaddingLeft();
- nearEdge = x < leftEdge + mTextViewEdgeSlop;
- } else {
+ if (atRtl == isStartHandle()) {
int rightEdge = mTextViewLocation[0] + mTextView.getWidth()
- mTextView.getPaddingRight();
nearEdge = x > rightEdge - mTextViewEdgeSlop;
+ } else {
+ int leftEdge = mTextViewLocation[0] + mTextView.getPaddingLeft();
+ nearEdge = x < leftEdge + mTextViewEdgeSlop;
}
return nearEdge;
}
@@ -4656,8 +4482,8 @@
class SelectionModifierCursorController implements CursorController {
// The cursor controller handles, lazily created when shown.
- private SelectionStartHandleView mStartHandle;
- private SelectionEndHandleView mEndHandle;
+ private SelectionHandleView mStartHandle;
+ private SelectionHandleView mEndHandle;
// The offsets of that last touch down event. Remembered to start selection there.
private int mMinTouchOffset, mMaxTouchOffset;
@@ -4701,10 +4527,14 @@
private void initHandles() {
// Lazy object creation has to be done before updatePosition() is called.
if (mStartHandle == null) {
- mStartHandle = new SelectionStartHandleView(mSelectHandleLeft, mSelectHandleRight);
+ mStartHandle = new SelectionHandleView(mSelectHandleLeft, mSelectHandleRight,
+ com.android.internal.R.id.selection_start_handle,
+ HANDLE_TYPE_SELECTION_START);
}
if (mEndHandle == null) {
- mEndHandle = new SelectionEndHandleView(mSelectHandleRight, mSelectHandleLeft);
+ mEndHandle = new SelectionHandleView(mSelectHandleRight, mSelectHandleLeft,
+ com.android.internal.R.id.selection_end_handle,
+ HANDLE_TYPE_SELECTION_END);
}
mStartHandle.show();
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
index 280ff15..4d9f55c 100644
--- a/core/java/android/widget/FrameLayout.java
+++ b/core/java/android/widget/FrameLayout.java
@@ -21,12 +21,8 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
-import android.content.res.ColorStateList;
import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.PorterDuff;
import android.graphics.Rect;
-import android.graphics.Region;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.Gravity;
@@ -36,9 +32,6 @@
import android.view.ViewHierarchyEncoder;
import android.widget.RemoteViews.RemoteView;
-import com.android.internal.R;
-
-
/**
* FrameLayout is designed to block out an area on the screen to display
* a single item. Generally, FrameLayout should be used to hold a single child view, because it can
@@ -171,6 +164,10 @@
mPaddingBottom + mForegroundPaddingBottom;
}
+ @Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ return findDependentLayoutAxesHelper(child, axisFilter, LayoutParams.class);
+ }
/**
* {@inheritDoc}
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index ad939be..ba868a1 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -16,6 +16,7 @@
package android.widget;
+import android.view.ViewParent;
import com.android.internal.R;
import android.annotation.IntDef;
@@ -37,6 +38,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
/**
* A Layout that arranges its children in a single column or a single row. The direction of
@@ -644,6 +647,60 @@
}
}
+ @Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ // This implementation is almost exactly equivalent to the default implementation
+ // offered to the rest of the framework in ViewGroup, but we treat weight to be
+ // functionally equivalent to MATCH_PARENT along the orientation axis.
+
+ if (!checkPartialLayoutParams(child, LayoutParams.class)) return axisFilter;
+ final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+ if (child.didLayoutParamsChange()) {
+ // Anything could have changed about our previous assumptions.
+ return axisFilter;
+ }
+
+ // Our layout can always end up depending on a WRAP_CONTENT child.
+ final int wrapAxisFilter = ((lp.width == WRAP_CONTENT ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0)
+ | (lp.height == WRAP_CONTENT ? FLAG_LAYOUT_AXIS_VERTICAL : 0)) & axisFilter;
+
+ if (wrapAxisFilter == axisFilter) {
+ // We know all queried axes are affected, just return early.
+ return wrapAxisFilter;
+ }
+
+ // Our layout *may* depend on a MATCH_PARENT child, depending on whether we can determine
+ // that our layout will remain stable within our parent. We need to ask.
+ int matchAxisFilter = ((lp.width == MATCH_PARENT ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0)
+ | (lp.height == MATCH_PARENT ? FLAG_LAYOUT_AXIS_VERTICAL : 0)) & axisFilter;
+
+ // For LinearLayout, a nonzero weight is equivalent to MATCH_PARENT for this purpose.
+ if (lp.weight > 0) {
+ if (mOrientation == HORIZONTAL) {
+ matchAxisFilter |= FLAG_LAYOUT_AXIS_HORIZONTAL & axisFilter;
+ } else {
+ matchAxisFilter |= FLAG_LAYOUT_AXIS_VERTICAL & axisFilter;
+ }
+ }
+
+ if (matchAxisFilter != 0) {
+ final ViewParent parent = getParent();
+ if (parent != null) {
+ // If our parent depends on us for an axis, then our layout can also be affected
+ // by a MATCH_PARENT child along that axis.
+ return getParent().findDependentLayoutAxes(this, matchAxisFilter)
+ | wrapAxisFilter;
+ }
+
+ // If we don't have a parent, assume we're affected
+ // in any determined affected direction.
+ return matchAxisFilter | wrapAxisFilter;
+ }
+
+ // Two exact sizes and LayoutParams didn't change. We're safe.
+ return 0;
+ }
+
/**
* Determines where to position dividers between children.
*
diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index 53ca6d1..b43ea76 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -1158,7 +1158,7 @@
final View child = obtainView(0, mIsScrap);
// Lay out child directly against the parent measure spec so that
- // we can obtain exected minimum width and height.
+ // we can obtain expected minimum width and height.
measureScrapChild(child, 0, widthMeasureSpec, heightSize);
childWidth = child.getMeasuredWidth();
diff --git a/core/java/android/widget/PopupMenu.java b/core/java/android/widget/PopupMenu.java
index 34a8439..027f874 100644
--- a/core/java/android/widget/PopupMenu.java
+++ b/core/java/android/widget/PopupMenu.java
@@ -19,9 +19,7 @@
import com.android.internal.R;
import com.android.internal.view.menu.MenuBuilder;
import com.android.internal.view.menu.MenuPopupHelper;
-import com.android.internal.view.menu.MenuPresenter;
import com.android.internal.view.menu.ShowableListMenu;
-import com.android.internal.view.menu.SubMenuBuilder;
import android.annotation.MenuRes;
import android.content.Context;
@@ -33,35 +31,23 @@
import android.view.View.OnTouchListener;
/**
- * A PopupMenu displays a {@link Menu} in a modal popup window anchored to a {@link View}.
- * The popup will appear below the anchor view if there is room, or above it if there is not.
- * If the IME is visible the popup will not overlap it until it is touched. Touching outside
- * of the popup will dismiss it.
+ * A PopupMenu displays a {@link Menu} in a modal popup window anchored to a
+ * {@link View}. The popup will appear below the anchor view if there is room,
+ * or above it if there is not. If the IME is visible the popup will not
+ * overlap it until it is touched. Touching outside of the popup will dismiss
+ * it.
*/
-public class PopupMenu implements MenuBuilder.Callback, MenuPresenter.Callback {
+public class PopupMenu {
private final Context mContext;
private final MenuBuilder mMenu;
private final View mAnchor;
private final MenuPopupHelper mPopup;
- private final boolean mShowCascadingMenus;
private OnMenuItemClickListener mMenuItemClickListener;
- private OnDismissListener mDismissListener;
+ private OnDismissListener mOnDismissListener;
private OnTouchListener mDragListener;
/**
- * Callback interface used to notify the application that the menu has closed.
- */
- public interface OnDismissListener {
- /**
- * Called when the associated menu has been dismissed.
- *
- * @param menu The PopupMenu that was dismissed.
- */
- public void onDismiss(PopupMenu menu);
- }
-
- /**
* Constructor to create a new popup menu with an anchor view.
*
* @param context Context the popup menu is running in, through which it
@@ -108,14 +94,33 @@
public PopupMenu(Context context, View anchor, int gravity, int popupStyleAttr,
int popupStyleRes) {
mContext = context;
- mShowCascadingMenus = context.getResources().getBoolean(
- com.android.internal.R.bool.config_enableCascadingSubmenus);
- mMenu = new MenuBuilder(context);
- mMenu.setCallback(this);
mAnchor = anchor;
+
+ mMenu = new MenuBuilder(context);
+ mMenu.setCallback(new MenuBuilder.Callback() {
+ @Override
+ public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+ if (mMenuItemClickListener != null) {
+ return mMenuItemClickListener.onMenuItemClick(item);
+ }
+ return false;
+ }
+
+ @Override
+ public void onMenuModeChange(MenuBuilder menu) {
+ }
+ });
+
mPopup = new MenuPopupHelper(context, mMenu, anchor, false, popupStyleAttr, popupStyleRes);
mPopup.setGravity(gravity);
- mPopup.setCallback(this);
+ mPopup.setOnDismissListener(new PopupWindow.OnDismissListener() {
+ @Override
+ public void onDismiss() {
+ if (mOnDismissListener != null) {
+ mOnDismissListener.onDismiss(PopupMenu.this);
+ }
+ }
+ });
}
/**
@@ -125,7 +130,6 @@
* the next time the popup is shown.
*
* @param gravity the gravity used to align the popup window
- *
* @see #getGravity()
*/
public void setGravity(int gravity) {
@@ -134,7 +138,6 @@
/**
* @return the gravity used to align the popup window to its anchor view
- *
* @see #setGravity(int)
*/
public int getGravity() {
@@ -146,8 +149,8 @@
* to implement drag-to-open behavior.
* <p>
* When the listener is set on a view, touching that view and dragging
- * outside of its bounds will open the popup window. Lifting will select the
- * currently touched list item.
+ * outside of its bounds will open the popup window. Lifting will select
+ * the currently touched list item.
* <p>
* Example usage:
* <pre>
@@ -184,9 +187,10 @@
}
/**
- * @return the {@link Menu} associated with this popup. Populate the returned Menu with
- * items before calling {@link #show()}.
+ * Returns the {@link Menu} associated with this popup. Populate the
+ * returned Menu with items before calling {@link #show()}.
*
+ * @return the {@link Menu} associated with this popup
* @see #show()
* @see #getMenuInflater()
*/
@@ -195,9 +199,8 @@
}
/**
- * @return a {@link MenuInflater} that can be used to inflate menu items from XML into the
- * menu returned by {@link #getMenu()}.
- *
+ * @return a {@link MenuInflater} that can be used to inflate menu items
+ * from XML into the menu returned by {@link #getMenu()}
* @see #getMenu()
*/
public MenuInflater getMenuInflater() {
@@ -205,8 +208,9 @@
}
/**
- * Inflate a menu resource into this PopupMenu. This is equivalent to calling
- * popupMenu.getMenuInflater().inflate(menuRes, popupMenu.getMenu()).
+ * Inflate a menu resource into this PopupMenu. This is equivalent to
+ * calling {@code popupMenu.getMenuInflater().inflate(menuRes, popupMenu.getMenu())}.
+ *
* @param menuRes Menu resource to inflate
*/
public void inflate(@MenuRes int menuRes) {
@@ -215,6 +219,7 @@
/**
* Show the menu popup anchored to the view specified during construction.
+ *
* @see #dismiss()
*/
public void show() {
@@ -223,6 +228,7 @@
/**
* Dismiss the menu popup.
+ *
* @see #show()
*/
public void dismiss() {
@@ -230,68 +236,49 @@
}
/**
- * Set a listener that will be notified when the user selects an item from the menu.
+ * Sets a listener that will be notified when the user selects an item from
+ * the menu.
*
- * @param listener Listener to notify
+ * @param listener the listener to notify
*/
public void setOnMenuItemClickListener(OnMenuItemClickListener listener) {
mMenuItemClickListener = listener;
}
/**
- * Set a listener that will be notified when this menu is dismissed.
+ * Sets a listener that will be notified when this menu is dismissed.
*
- * @param listener Listener to notify
+ * @param listener the listener to notify
*/
public void setOnDismissListener(OnDismissListener listener) {
- mDismissListener = listener;
+ mOnDismissListener = listener;
}
/**
- * @hide
- */
- public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
- if (mMenuItemClickListener != null) {
- return mMenuItemClickListener.onMenuItemClick(item);
- }
- return false;
- }
-
- /**
- * @hide
- */
- public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
- if (mDismissListener != null) {
- mDismissListener.onDismiss(this);
- }
- }
-
- /**
- * @hide
- */
- public boolean onOpenSubMenu(MenuBuilder subMenu) {
- // The menu presenter will handle opening the submenu itself. Nothing to do here.
- return false;
- }
-
- /**
- * @hide
- */
- public void onMenuModeChange(MenuBuilder menu) {
- }
-
- /**
- * Interface responsible for receiving menu item click events if the items themselves
- * do not have individual item click listeners.
+ * Interface responsible for receiving menu item click events if the items
+ * themselves do not have individual item click listeners.
*/
public interface OnMenuItemClickListener {
/**
- * This method will be invoked when a menu item is clicked if the item itself did
- * not already handle the event.
+ * This method will be invoked when a menu item is clicked if the item
+ * itself did not already handle the event.
*
- * @param item {@link MenuItem} that was clicked
- * @return <code>true</code> if the event was handled, <code>false</code> otherwise.
+ * @param item the menu item that was clicked
+ * @return {@code true} if the event was handled, {@code false}
+ * otherwise
*/
- public boolean onMenuItemClick(MenuItem item);
+ boolean onMenuItemClick(MenuItem item);
+ }
+
+ /**
+ * Callback interface used to notify the application that the menu has closed.
+ */
+ public interface OnDismissListener {
+ /**
+ * Called when the associated menu has been dismissed.
+ *
+ * @param menu the popup menu that was dismissed
+ */
+ void onDismiss(PopupMenu menu);
}
}
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index ca1b211..0dd803a2 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -21,6 +21,7 @@
import android.app.ActivityThread;
import android.app.Application;
import android.app.PendingIntent;
+import android.app.RemoteInput;
import android.appwidget.AppWidgetHostView;
import android.content.Context;
import android.content.ContextWrapper;
@@ -153,6 +154,13 @@
};
/**
+ * @hide
+ */
+ public void setRemoteInputs(int viewId, RemoteInput[] remoteInputs) {
+ mActions.add(new SetRemoteInputsAction(viewId, remoteInputs));
+ }
+
+ /**
* Handle with care!
*/
static class MutablePair<F, S> {
@@ -1630,6 +1638,48 @@
}
/**
+ * Helper action to set layout margin on a View.
+ */
+ private class ViewMarginEndAction extends Action {
+ public ViewMarginEndAction(int viewId, int end) {
+ this.viewId = viewId;
+ this.end = end;
+ }
+
+ public ViewMarginEndAction(Parcel parcel) {
+ viewId = parcel.readInt();
+ end = parcel.readInt();
+ }
+
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(TAG);
+ dest.writeInt(viewId);
+ dest.writeInt(end);
+ }
+
+ @Override
+ public void apply(View root, ViewGroup rootParent, OnClickHandler handler) {
+ final View target = root.findViewById(viewId);
+ if (target == null) {
+ return;
+ }
+ ViewGroup.LayoutParams layoutParams = target.getLayoutParams();
+ if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+ ((ViewGroup.MarginLayoutParams) layoutParams).setMarginEnd(end);
+ target.setLayoutParams(layoutParams);
+ }
+ }
+
+ public String getActionName() {
+ return "ViewMarginEndAction";
+ }
+
+ int end;
+
+ public final static int TAG = 19;
+ }
+
+ /**
* Helper action to set a color filter on a compound drawable on a TextView. Supports relative
* (s/t/e/b) or cardinal (l/t/r/b) arrangement.
*/
@@ -1699,6 +1749,43 @@
}
/**
+ * Helper action to add a view tag with RemoteInputs.
+ */
+ private class SetRemoteInputsAction extends Action {
+
+ public SetRemoteInputsAction(int viewId, RemoteInput[] remoteInputs) {
+ this.viewId = viewId;
+ this.remoteInputs = remoteInputs;
+ }
+
+ public SetRemoteInputsAction(Parcel parcel) {
+ viewId = parcel.readInt();
+ remoteInputs = parcel.readParcelableArray(RemoteInput.class.getClassLoader());
+ }
+
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(TAG);
+ dest.writeInt(viewId);
+ dest.writeParcelableArray(remoteInputs, flags);
+ }
+
+ @Override
+ public void apply(View root, ViewGroup rootParent, OnClickHandler handler) {
+ final TextView target = (TextView) root.findViewById(viewId);
+ if (target == null) return;
+
+ target.setTagInternal(R.id.remote_input_tag, remoteInputs);
+ }
+
+ public String getActionName() {
+ return "SetRemoteInputsAction";
+ }
+
+ final Parcelable[] remoteInputs;
+ public final static int TAG = 18;
+ }
+
+ /**
* Simple class used to keep track of memory usage in a RemoteViews.
*
*/
@@ -1894,6 +1981,12 @@
case TextViewDrawableColorFilterAction.TAG:
mActions.add(new TextViewDrawableColorFilterAction(parcel));
break;
+ case SetRemoteInputsAction.TAG:
+ mActions.add(new SetRemoteInputsAction(parcel));
+ break;
+ case ViewMarginEndAction.TAG:
+ mActions.add(new ViewMarginEndAction(parcel));
+ break;
default:
throw new ActionException("Tag " + tag + " not found");
}
@@ -2501,6 +2594,19 @@
}
/**
+ * @hide
+ * Equivalent to calling {@link android.view.ViewGroup.MarginLayoutParams#setMarginEnd(int)}.
+ * Only works if the {@link View#getLayoutParams()} supports margins.
+ * Hidden for now since we don't want to support this for all different layout margins yet.
+ *
+ * @param viewId The id of the view to change
+ * @param endMargin the left padding in pixels
+ */
+ public void setViewLayoutMarginEnd(int viewId, int endMargin) {
+ addAction(new ViewMarginEndAction(viewId, endMargin));
+ }
+
+ /**
* Call a method taking one boolean on a view in the layout for this RemoteViews.
*
* @param viewId The id of the view on which to call the method.
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index ad2b4a7..88f02d1 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -152,8 +152,7 @@
*/
private Runnable mShowImeRunnable = new Runnable() {
public void run() {
- InputMethodManager imm = (InputMethodManager)
- getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager imm = getContext().getSystemService(InputMethodManager.class);
if (imm != null) {
imm.showSoftInputUnchecked(0, null);
@@ -912,8 +911,7 @@
post(mShowImeRunnable);
} else {
removeCallbacks(mShowImeRunnable);
- InputMethodManager imm = (InputMethodManager)
- getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager imm = getContext().getSystemService(InputMethodManager.class);
if (imm != null) {
imm.hideSoftInputFromWindow(getWindowToken(), 0);
@@ -1768,8 +1766,8 @@
super.onWindowFocusChanged(hasWindowFocus);
if (hasWindowFocus && mSearchView.hasFocus() && getVisibility() == VISIBLE) {
- InputMethodManager inputManager = (InputMethodManager) getContext()
- .getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager inputManager =
+ getContext().getSystemService(InputMethodManager.class);
inputManager.showSoftInput(this, 0);
// If in landscape mode, then make sure that
// the ime is in front of the dropdown.
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index b5d994d..d666939 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -624,7 +624,7 @@
// Although these fields are specific to editable text, they are not added to Editor because
// they are defined by the TextView's style and are theme-dependent.
int mCursorDrawableRes;
- // These four fields, could be moved to Editor, since we know their default values and we
+ // These six fields, could be moved to Editor, since we know their default values and we
// could condition the creation of the Editor to a non standard value. This is however
// brittle since the hardcoded values here (such as
// com.android.internal.R.drawable.text_select_handle_left) would have to be updated if the
@@ -633,6 +633,8 @@
int mTextSelectHandleRightRes;
int mTextSelectHandleRes;
int mTextEditSuggestionItemLayout;
+ int mTextEditSuggestionContainerLayout;
+ int mTextEditSuggestionHighlightStyle;
/**
* EditText specific data, created on demand when one of the Editor fields is used.
@@ -1155,6 +1157,14 @@
mTextEditSuggestionItemLayout = a.getResourceId(attr, 0);
break;
+ case com.android.internal.R.styleable.TextView_textEditSuggestionContainerLayout:
+ mTextEditSuggestionContainerLayout = a.getResourceId(attr, 0);
+ break;
+
+ case com.android.internal.R.styleable.TextView_textEditSuggestionHighlightStyle:
+ mTextEditSuggestionHighlightStyle = a.getResourceId(attr, 0);
+ break;
+
case com.android.internal.R.styleable.TextView_textIsSelectable:
setTextIsSelectable(a.getBoolean(attr, false));
break;
@@ -3366,10 +3376,17 @@
}
/**
- * Sets whether the movement method will automatically be set to
- * {@link LinkMovementMethod} if {@link #setAutoLinkMask} has been
- * set to nonzero and links are detected in {@link #setText}.
- * The default is true.
+ * Sets whether the movement method will automatically be set to {@link LinkMovementMethod}
+ * after {@link #setText} or {@link #append} is called. The movement method is set if one of the
+ * following is true:
+ * <ul>
+ * <li>{@link #setAutoLinkMask} has been set to nonzero and links are detected in
+ * {@link #setText} or {@link #append}.
+ * <li>The input for {@link #setText} or {@link #append} contains a {@link ClickableSpan}.
+ * </ul>
+ *
+ * <p>This function does not have an immediate effect, movement method will be set only after a
+ * call to {@link #setText} or {@link #append}. The default is true.</p>
*
* @attr ref android.R.styleable#TextView_linksClickable
*/
@@ -3379,10 +3396,14 @@
}
/**
- * Returns whether the movement method will automatically be set to
- * {@link LinkMovementMethod} if {@link #setAutoLinkMask} has been
- * set to nonzero and links are detected in {@link #setText}.
- * The default is true.
+ * Returns whether the movement method will automatically be set to {@link LinkMovementMethod}
+ * after {@link #setText} or {@link #append} is called.
+ *
+ * See {@link #setLinksClickable} for details.
+ *
+ * <p>The default is true.</p>
+ *
+ * @see #setLinksClickable
*
* @attr ref android.R.styleable#TextView_linksClickable
*/
@@ -3976,13 +3997,19 @@
((Editable) mText).append(text, start, end);
+ boolean hasClickableSpans = false;
if (mAutoLinkMask != 0) {
- boolean linksWereAdded = Linkify.addLinks((Spannable) mText, mAutoLinkMask);
- // Do not change the movement method for text that support text selection as it
- // would prevent an arbitrary cursor displacement.
- if (linksWereAdded && mLinksClickable && !textCanBeSelected()) {
- setMovementMethod(LinkMovementMethod.getInstance());
- }
+ hasClickableSpans = Linkify.addLinks((Spannable) mText, mAutoLinkMask);
+ } else if (mLinksClickable && text instanceof Spanned) {
+ ClickableSpan[] clickableSpans =
+ ((Spanned) text).getSpans(0, text.length(), ClickableSpan.class);
+ hasClickableSpans = clickableSpans != null && clickableSpans.length > 0;
+ }
+
+ // Do not change the movement method for text that supports text selection as it
+ // would prevent an arbitrary cursor displacement.
+ if (hasClickableSpans && mLinksClickable && !textCanBeSelected()) {
+ setMovementMethod(LinkMovementMethod.getInstance());
}
}
@@ -4327,6 +4354,7 @@
text = TextUtils.stringOrSpannedString(text);
}
+ boolean hasClickableSpans = false;
if (mAutoLinkMask != 0) {
Spannable s2;
@@ -4336,22 +4364,32 @@
s2 = mSpannableFactory.newSpannable(text);
}
- if (Linkify.addLinks(s2, mAutoLinkMask)) {
+ hasClickableSpans = Linkify.addLinks(s2, mAutoLinkMask);
+ if (hasClickableSpans) {
text = s2;
- type = (type == BufferType.EDITABLE) ? BufferType.EDITABLE : BufferType.SPANNABLE;
+ }
+ } else if (mLinksClickable && text instanceof Spanned) {
+ ClickableSpan[] clickableSpans =
+ ((Spanned) text).getSpans(0, text.length(), ClickableSpan.class);
+ hasClickableSpans = clickableSpans != null && clickableSpans.length > 0;
+ if (hasClickableSpans && !(text instanceof Spannable)) {
+ text = mSpannableFactory.newSpannable(text);
+ }
+ }
- /*
- * We must go ahead and set the text before changing the
- * movement method, because setMovementMethod() may call
- * setText() again to try to upgrade the buffer type.
- */
- mText = text;
+ if (hasClickableSpans) {
+ type = (type == BufferType.EDITABLE) ? BufferType.EDITABLE : BufferType.SPANNABLE;
+ /*
+ * We must go ahead and set the text before changing the
+ * movement method, because setMovementMethod() may call
+ * setText() again to try to upgrade the buffer type.
+ */
+ mText = text;
- // Do not change the movement method for text that support text selection as it
- // would prevent an arbitrary cursor displacement.
- if (mLinksClickable && !textCanBeSelected()) {
- setMovementMethod(LinkMovementMethod.getInstance());
- }
+ // Do not change the movement method for text that supports text selection as it
+ // would prevent an arbitrary cursor displacement.
+ if (mLinksClickable && !textCanBeSelected()) {
+ setMovementMethod(LinkMovementMethod.getInstance());
}
}
@@ -6773,10 +6811,11 @@
if (mEllipsize == TextUtils.TruncateAt.MARQUEE) {
if (!compressText(ellipsisWidth)) {
- final int height = mLayoutParams.height;
// If the size of the view does not depend on the size of the text, try to
// start the marquee immediately
- if (height != LayoutParams.WRAP_CONTENT && height != LayoutParams.MATCH_PARENT) {
+ final ViewParent parent = getParent();
+ if (parent != null && parent.findDependentLayoutAxes(this,
+ ViewParent.FLAG_LAYOUT_AXIS_VERTICAL) == 0) {
startMarquee();
} else {
// Defer the start of the marquee until we know our width (see setFrame())
@@ -6789,7 +6828,10 @@
if (mEditor != null) mEditor.prepareCursorControllers();
}
- private Layout makeSingleLayout(int wantWidth, BoringLayout.Metrics boring, int ellipsisWidth,
+ /**
+ * @hide
+ */
+ protected Layout makeSingleLayout(int wantWidth, BoringLayout.Metrics boring, int ellipsisWidth,
Layout.Alignment alignment, boolean shouldEllipsize, TruncateAt effectiveEllipsize,
boolean useSaved) {
Layout result = null;
@@ -7172,37 +7214,9 @@
* new view layout.
*/
private void checkForResize() {
- boolean sizeChanged = false;
-
- if (mLayout != null) {
- // Check if our width changed
- if (mLayoutParams.width == LayoutParams.WRAP_CONTENT) {
- sizeChanged = true;
- invalidate();
- }
-
- // Check if our height changed
- if (mLayoutParams.height == LayoutParams.WRAP_CONTENT) {
- int desiredHeight = getDesiredHeight();
-
- if (desiredHeight != this.getHeight()) {
- sizeChanged = true;
- }
- } else if (mLayoutParams.height == LayoutParams.MATCH_PARENT) {
- if (mDesiredHeightAtMeasure >= 0) {
- int desiredHeight = getDesiredHeight();
-
- if (desiredHeight != mDesiredHeightAtMeasure) {
- sizeChanged = true;
- }
- }
- }
- }
-
- if (sizeChanged) {
- requestLayout();
- // caller will have already invalidated
- }
+ // Always request a layout. The parent will perform the correct version
+ // of the intended optimizations as part of requestLayoutForChild.
+ requestLayout();
}
/**
@@ -7210,56 +7224,11 @@
* or merely a new text layout.
*/
private void checkForRelayout() {
- // If we have a fixed width, we can just swap in a new text layout
- // if the text height stays the same or if the view height is fixed.
-
- if ((mLayoutParams.width != LayoutParams.WRAP_CONTENT ||
- (mMaxWidthMode == mMinWidthMode && mMaxWidth == mMinWidth)) &&
- (mHint == null || mHintLayout != null) &&
- (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight() > 0)) {
- // Static width, so try making a new text layout.
-
- int oldht = mLayout.getHeight();
- int want = mLayout.getWidth();
- int hintWant = mHintLayout == null ? 0 : mHintLayout.getWidth();
-
- /*
- * No need to bring the text into view, since the size is not
- * changing (unless we do the requestLayout(), in which case it
- * will happen at measure).
- */
- makeNewLayout(want, hintWant, UNKNOWN_BORING, UNKNOWN_BORING,
- mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight(),
- false);
-
- if (mEllipsize != TextUtils.TruncateAt.MARQUEE) {
- // In a fixed-height view, so use our new text layout.
- if (mLayoutParams.height != LayoutParams.WRAP_CONTENT &&
- mLayoutParams.height != LayoutParams.MATCH_PARENT) {
- invalidate();
- return;
- }
-
- // Dynamic height, but height has stayed the same,
- // so use our new text layout.
- if (mLayout.getHeight() == oldht &&
- (mHintLayout == null || mHintLayout.getHeight() == oldht)) {
- invalidate();
- return;
- }
- }
-
- // We lose: the height has changed and we have a dynamic height.
- // Request a new view layout using our new text layout.
- requestLayout();
- invalidate();
- } else {
- // Dynamic width, so we have no choice but to request a new
- // view layout with a new text layout.
- nullLayouts();
- requestLayout();
- invalidate();
- }
+ // Always request a layout. The parent will perform the correct version
+ // of the intended optimizations as part of requestLayoutForChild.
+ nullLayouts();
+ requestLayout();
+ invalidate();
}
@Override
@@ -9742,7 +9711,10 @@
}
}
- TextDirectionHeuristic getTextDirectionHeuristic() {
+ /**
+ * @hide
+ */
+ protected TextDirectionHeuristic getTextDirectionHeuristic() {
if (hasPasswordTransformationMethod()) {
// passwords fields should be LTR
return TextDirectionHeuristics.LTR;
diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java
index 8e5af79..a24d37f 100644
--- a/core/java/android/widget/TimePicker.java
+++ b/core/java/android/widget/TimePicker.java
@@ -100,7 +100,7 @@
* @see #getHour()
*/
public void setHour(int hour) {
- mDelegate.setCurrentHour(hour);
+ mDelegate.setHour(hour);
}
/**
@@ -110,7 +110,7 @@
* @see #setHour(int)
*/
public int getHour() {
- return mDelegate.getCurrentHour();
+ return mDelegate.getHour();
}
/**
@@ -120,7 +120,7 @@
* @see #getMinute()
*/
public void setMinute(int minute) {
- mDelegate.setCurrentMinute(minute);
+ mDelegate.setMinute(minute);
}
/**
@@ -130,7 +130,7 @@
* @see #setMinute(int)
*/
public int getMinute() {
- return mDelegate.getCurrentMinute();
+ return mDelegate.getMinute();
}
/**
@@ -150,7 +150,7 @@
@NonNull
@Deprecated
public Integer getCurrentHour() {
- return mDelegate.getCurrentHour();
+ return mDelegate.getHour();
}
/**
@@ -160,7 +160,7 @@
*/
@Deprecated
public void setCurrentMinute(@NonNull Integer currentMinute) {
- mDelegate.setCurrentMinute(currentMinute);
+ mDelegate.setMinute(currentMinute);
}
/**
@@ -170,7 +170,7 @@
@NonNull
@Deprecated
public Integer getCurrentMinute() {
- return mDelegate.getCurrentMinute();
+ return mDelegate.getMinute();
}
/**
@@ -186,7 +186,7 @@
return;
}
- mDelegate.setIs24HourView(is24HourView);
+ mDelegate.setIs24Hour(is24HourView);
}
/**
@@ -195,7 +195,7 @@
* @see #setIs24HourView(Boolean)
*/
public boolean is24HourView() {
- return mDelegate.is24HourView();
+ return mDelegate.is24Hour();
}
/**
@@ -207,16 +207,6 @@
mDelegate.setOnTimeChangedListener(onTimeChangedListener);
}
- /**
- * Sets the callback that indicates the current time is valid.
- *
- * @param callback the callback, may be null
- * @hide
- */
- public void setValidationCallback(@Nullable ValidationCallback callback) {
- mDelegate.setValidationCallback(callback);
- }
-
@Override
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
@@ -234,12 +224,6 @@
}
@Override
- protected void onConfigurationChanged(Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
- mDelegate.onConfigurationChanged(newConfig);
- }
-
- @Override
protected Parcelable onSaveInstanceState() {
Parcelable superState = super.onSaveInstanceState();
return mDelegate.onSaveInstanceState(superState);
@@ -269,25 +253,22 @@
* for the real behavior.
*/
interface TimePickerDelegate {
- void setCurrentHour(int currentHour);
- int getCurrentHour();
+ void setHour(int hour);
+ int getHour();
- void setCurrentMinute(int currentMinute);
- int getCurrentMinute();
+ void setMinute(int minute);
+ int getMinute();
- void setIs24HourView(boolean is24HourView);
- boolean is24HourView();
+ void setIs24Hour(boolean is24Hour);
+ boolean is24Hour();
void setOnTimeChangedListener(OnTimeChangedListener onTimeChangedListener);
- void setValidationCallback(ValidationCallback callback);
void setEnabled(boolean enabled);
boolean isEnabled();
int getBaseline();
- void onConfigurationChanged(Configuration newConfig);
-
Parcelable onSaveInstanceState(Parcelable superState);
void onRestoreInstanceState(Parcelable state);
@@ -295,16 +276,6 @@
void onPopulateAccessibilityEvent(AccessibilityEvent event);
}
- /**
- * A callback interface for updating input validity when the TimePicker
- * when included into a Dialog.
- *
- * @hide
- */
- public static interface ValidationCallback {
- void onValidationChanged(boolean valid);
- }
-
static String[] getAmPmStrings(Context context) {
final Locale locale = context.getResources().getConfiguration().locale;
final LocaleData d = LocaleData.get(locale);
@@ -319,43 +290,16 @@
* An abstract class which can be used as a start for TimePicker implementations
*/
abstract static class AbstractTimePickerDelegate implements TimePickerDelegate {
- // The delegator
- protected TimePicker mDelegator;
+ protected final TimePicker mDelegator;
+ protected final Context mContext;
+ protected final Locale mLocale;
- // The context
- protected Context mContext;
-
- // The current locale
- protected Locale mCurrentLocale;
-
- // Callbacks
protected OnTimeChangedListener mOnTimeChangedListener;
- protected ValidationCallback mValidationCallback;
- public AbstractTimePickerDelegate(TimePicker delegator, Context context) {
+ public AbstractTimePickerDelegate(@NonNull TimePicker delegator, @NonNull Context context) {
mDelegator = delegator;
mContext = context;
-
- // initialization based on locale
- setCurrentLocale(Locale.getDefault());
- }
-
- public void setCurrentLocale(Locale locale) {
- if (locale.equals(mCurrentLocale)) {
- return;
- }
- mCurrentLocale = locale;
- }
-
- @Override
- public void setValidationCallback(ValidationCallback callback) {
- mValidationCallback = callback;
- }
-
- protected void onValidationChanged(boolean valid) {
- if (mValidationCallback != null) {
- mValidationCallback.onValidationChanged(valid);
- }
+ mLocale = context.getResources().getConfiguration().locale;
}
}
}
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java
index 4dc5fd3e..1d6e52c 100644
--- a/core/java/android/widget/TimePickerClockDelegate.java
+++ b/core/java/android/widget/TimePickerClockDelegate.java
@@ -19,7 +19,6 @@
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.ColorStateList;
-import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.os.Parcel;
@@ -85,11 +84,13 @@
private final RadialTimePickerView mRadialTimePickerView;
private final TextView mSeparatorView;
+ private final Calendar mTempCalendar;
+
private boolean mIsEnabled = true;
private boolean mAllowAutoAdvance;
private int mInitialHourOfDay;
private int mInitialMinute;
- private boolean mIs24HourView;
+ private boolean mIs24Hour;
private boolean mIsAmPmAtStart;
// Accessibility strings.
@@ -104,8 +105,6 @@
private CharSequence mLastAnnouncedText;
private boolean mLastAnnouncedIsHour;
- private Calendar mTempCalendar;
-
public TimePickerClockDelegate(TimePicker delegator, Context context, AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
super(delegator, context);
@@ -199,20 +198,13 @@
mAllowAutoAdvance = true;
- // Updates mHourFormat variables used below.
- updateHourFormat(mCurrentLocale, mIs24HourView);
-
- // Update hour text field.
- final int minHour = mHourFormatStartsAtZero ? 0 : 1;
- final int maxHour = (mIs24HourView ? 23 : 11) + minHour;
- mHourView.setRange(minHour, maxHour);
- mHourView.setShowLeadingZeroes(mHourFormatShowLeadingZero);
+ updateHourFormat();
// Initialize with current time.
- mTempCalendar = Calendar.getInstance(mCurrentLocale);
+ mTempCalendar = Calendar.getInstance(mLocale);
final int currentHour = mTempCalendar.get(Calendar.HOUR_OF_DAY);
final int currentMinute = mTempCalendar.get(Calendar.MINUTE);
- initialize(currentHour, currentMinute, mIs24HourView, HOUR_INDEX);
+ initialize(currentHour, currentMinute, mIs24Hour, HOUR_INDEX);
}
/**
@@ -233,15 +225,14 @@
}
/**
- * Determines how the hour should be formatted and updates member variables
- * related to hour formatting.
- *
- * @param locale the locale in which the view is displayed
- * @param is24Hour whether the view is in 24-hour (hour-of-day) mode
+ * Updates hour formatting based on the current locale and 24-hour mode.
+ * <p>
+ * Determines how the hour should be formatted, sets member variables for
+ * leading zero and starting hour, and sets the hour view's presentation.
*/
- private void updateHourFormat(Locale locale, boolean is24Hour) {
+ private void updateHourFormat() {
final String bestDateTimePattern = DateFormat.getBestDateTimePattern(
- locale, is24Hour ? "Hm" : "hm");
+ mLocale, mIs24Hour ? "Hm" : "hm");
final int lengthPattern = bestDateTimePattern.length();
boolean showLeadingZero = false;
char hourFormat = '\0';
@@ -259,6 +250,12 @@
mHourFormatShowLeadingZero = showLeadingZero;
mHourFormatStartsAtZero = hourFormat == 'K' || hourFormat == 'H';
+
+ // Update hour text field.
+ final int minHour = mHourFormatStartsAtZero ? 0 : 1;
+ final int maxHour = (mIs24Hour ? 23 : 11) + minHour;
+ mHourView.setRange(minHour, maxHour);
+ mHourView.setShowLeadingZeroes(mHourFormatShowLeadingZero);
}
private static final CharSequence obtainVerbatim(String text) {
@@ -333,7 +330,7 @@
private void initialize(int hourOfDay, int minute, boolean is24HourView, int index) {
mInitialHourOfDay = hourOfDay;
mInitialMinute = minute;
- mIs24HourView = is24HourView;
+ mIs24Hour = is24HourView;
updateUI(index);
}
@@ -352,17 +349,16 @@
}
private void updateRadialPicker(int index) {
- mRadialTimePickerView.initialize(mInitialHourOfDay, mInitialMinute, mIs24HourView);
+ mRadialTimePickerView.initialize(mInitialHourOfDay, mInitialMinute, mIs24Hour);
setCurrentItemShowing(index, false, true);
}
private void updateHeaderAmPm() {
-
- if (mIs24HourView) {
+ if (mIs24Hour) {
mAmPmLayout.setVisibility(View.GONE);
} else {
// Ensure that AM/PM layout is in the correct position.
- final String dateTimePattern = DateFormat.getBestDateTimePattern(mCurrentLocale, "hm");
+ final String dateTimePattern = DateFormat.getBestDateTimePattern(mLocale, "hm");
final boolean isAmPmAtStart = dateTimePattern.startsWith("a");
setAmPmAtStart(isAmPmAtStart);
@@ -395,35 +391,32 @@
* Set the current hour.
*/
@Override
- public void setCurrentHour(int currentHour) {
- if (mInitialHourOfDay == currentHour) {
- return;
+ public void setHour(int hour) {
+ if (mInitialHourOfDay != hour) {
+ mInitialHourOfDay = hour;
+ updateHeaderHour(hour, true);
+ updateHeaderAmPm();
+ mRadialTimePickerView.setCurrentHour(hour);
+ mRadialTimePickerView.setAmOrPm(mInitialHourOfDay < 12 ? AM : PM);
+ mDelegator.invalidate();
+ onTimeChanged();
}
- mInitialHourOfDay = currentHour;
- updateHeaderHour(currentHour, true);
- updateHeaderAmPm();
- mRadialTimePickerView.setCurrentHour(currentHour);
- mRadialTimePickerView.setAmOrPm(mInitialHourOfDay < 12 ? AM : PM);
- mDelegator.invalidate();
- onTimeChanged();
}
/**
- * @return The current hour in the range (0-23).
+ * @return the current hour in the range (0-23)
*/
@Override
- public int getCurrentHour() {
- int currentHour = mRadialTimePickerView.getCurrentHour();
- if (mIs24HourView) {
+ public int getHour() {
+ final int currentHour = mRadialTimePickerView.getCurrentHour();
+ if (mIs24Hour) {
return currentHour;
+ }
+
+ if (mRadialTimePickerView.getAmOrPm() == PM) {
+ return (currentHour % HOURS_IN_HALF_DAY) + HOURS_IN_HALF_DAY;
} else {
- switch(mRadialTimePickerView.getAmOrPm()) {
- case PM:
- return (currentHour % HOURS_IN_HALF_DAY) + HOURS_IN_HALF_DAY;
- case AM:
- default:
- return currentHour % HOURS_IN_HALF_DAY;
- }
+ return currentHour % HOURS_IN_HALF_DAY;
}
}
@@ -431,48 +424,49 @@
* Set the current minute (0-59).
*/
@Override
- public void setCurrentMinute(int currentMinute) {
- if (mInitialMinute == currentMinute) {
- return;
+ public void setMinute(int minute) {
+ if (mInitialMinute != minute) {
+ mInitialMinute = minute;
+ updateHeaderMinute(minute, true);
+ mRadialTimePickerView.setCurrentMinute(minute);
+ mDelegator.invalidate();
+ onTimeChanged();
}
- mInitialMinute = currentMinute;
- updateHeaderMinute(currentMinute, true);
- mRadialTimePickerView.setCurrentMinute(currentMinute);
- mDelegator.invalidate();
- onTimeChanged();
}
/**
* @return The current minute.
*/
@Override
- public int getCurrentMinute() {
+ public int getMinute() {
return mRadialTimePickerView.getCurrentMinute();
}
/**
- * Set whether in 24 hour or AM/PM mode.
+ * Sets whether time is displayed in 24-hour mode or 12-hour mode with
+ * AM/PM indicators.
*
- * @param is24HourView True = 24 hour mode. False = AM/PM.
+ * @param is24Hour {@code true} to display time in 24-hour mode or
+ * {@code false} for 12-hour mode with AM/PM
*/
- @Override
- public void setIs24HourView(boolean is24HourView) {
- if (is24HourView == mIs24HourView) {
- return;
+ public void setIs24Hour(boolean is24Hour) {
+ if (mIs24Hour != is24Hour) {
+ mIs24Hour = is24Hour;
+ mInitialHourOfDay = getHour();
+
+ updateHourFormat();
+ updateUI(mRadialTimePickerView.getCurrentItemShowing());
}
-
- mIs24HourView = is24HourView;
- mInitialHourOfDay = getCurrentHour();
-
- updateUI(mRadialTimePickerView.getCurrentItemShowing());
}
/**
- * @return true if this is in 24 hour view else false.
+ * @return {@code true} if time is displayed in 24-hour mode, or
+ * {@code false} if time is displayed in 12-hour mode with AM/PM
+ * indicators
*/
@Override
- public boolean is24HourView() {
- return mIs24HourView;
+ public boolean is24Hour() {
+ return mIs24Hour;
}
@Override
@@ -502,14 +496,9 @@
}
@Override
- public void onConfigurationChanged(Configuration newConfig) {
- updateUI(mRadialTimePickerView.getCurrentItemShowing());
- }
-
- @Override
public Parcelable onSaveInstanceState(Parcelable superState) {
- return new SavedState(superState, getCurrentHour(), getCurrentMinute(),
- is24HourView(), getCurrentItemShowing());
+ return new SavedState(superState, getHour(), getMinute(),
+ is24Hour(), getCurrentItemShowing());
}
@Override
@@ -520,12 +509,6 @@
}
@Override
- public void setCurrentLocale(Locale locale) {
- super.setCurrentLocale(locale);
- mTempCalendar = Calendar.getInstance(locale);
- }
-
- @Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
onPopulateAccessibilityEvent(event);
return true;
@@ -534,13 +517,13 @@
@Override
public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
int flags = DateUtils.FORMAT_SHOW_TIME;
- if (mIs24HourView) {
+ if (mIs24Hour) {
flags |= DateUtils.FORMAT_24HOUR;
} else {
flags |= DateUtils.FORMAT_12HOUR;
}
- mTempCalendar.set(Calendar.HOUR_OF_DAY, getCurrentHour());
- mTempCalendar.set(Calendar.MINUTE, getCurrentMinute());
+ mTempCalendar.set(Calendar.HOUR_OF_DAY, getHour());
+ mTempCalendar.set(Calendar.MINUTE, getMinute());
String selectedDate = DateUtils.formatDateTime(mContext,
mTempCalendar.getTimeInMillis(), flags);
event.getText().add(selectedDate);
@@ -559,8 +542,7 @@
private void onTimeChanged() {
mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
if (mOnTimeChangedListener != null) {
- mOnTimeChangedListener.onTimeChanged(mDelegator,
- getCurrentHour(), getCurrentMinute());
+ mOnTimeChangedListener.onTimeChanged(mDelegator, getHour(), getMinute());
}
}
@@ -666,25 +648,29 @@
}
if (mOnTimeChangedListener != null) {
- mOnTimeChangedListener.onTimeChanged(mDelegator, getCurrentHour(), getCurrentMinute());
+ mOnTimeChangedListener.onTimeChanged(mDelegator, getHour(), getMinute());
}
}
/**
* Converts hour-of-day (0-23) time into a localized hour number.
+ * <p>
+ * The localized value may be in the range (0-23), (1-24), (0-11), or
+ * (1-12) depending on the locale. This method does not handle leading
+ * zeroes.
*
* @param hourOfDay the hour-of-day (0-23)
* @return a localized hour number
*/
private int getLocalizedHour(int hourOfDay) {
- if (!mIs24HourView) {
+ if (!mIs24Hour) {
// Convert to hour-of-am-pm.
hourOfDay %= 12;
}
if (!mHourFormatStartsAtZero && hourOfDay == 0) {
// Convert to clock-hour (either of-day or of-am-pm).
- hourOfDay = mIs24HourView ? 24 : 12;
+ hourOfDay = mIs24Hour ? 24 : 12;
}
return hourOfDay;
@@ -716,8 +702,8 @@
* separator as the character which is just after the hour marker in the returned pattern.
*/
private void updateHeaderSeparator() {
- final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mCurrentLocale,
- (mIs24HourView) ? "Hm" : "hm");
+ final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mLocale,
+ (mIs24Hour) ? "Hm" : "hm");
final String separatorText;
// See http://www.unicode.org/reports/tr35/tr35-dates.html for hour formats
final char[] hourFormats = {'H', 'h', 'K', 'k'};
@@ -819,14 +805,14 @@
private final Runnable mCommitHour = new Runnable() {
@Override
public void run() {
- setCurrentHour(mHourView.getValue());
+ setHour(mHourView.getValue());
}
};
private final Runnable mCommitMinute = new Runnable() {
@Override
public void run() {
- setCurrentMinute(mMinuteView.getValue());
+ setMinute(mMinuteView.getValue());
}
};
@@ -894,8 +880,12 @@
public boolean onTouch(View view, MotionEvent motionEvent) {
final int actionMasked = motionEvent.getActionMasked();
if (actionMasked == MotionEvent.ACTION_DOWN) {
- mInitialTouchTarget = findNearestChild((ViewGroup) view,
- (int) motionEvent.getX(), (int) motionEvent.getY());
+ if (view instanceof ViewGroup) {
+ mInitialTouchTarget = findNearestChild((ViewGroup) view,
+ (int) motionEvent.getX(), (int) motionEvent.getY());
+ } else {
+ mInitialTouchTarget = null;
+ }
}
final View child = mInitialTouchTarget;
diff --git a/core/java/android/widget/TimePickerSpinnerDelegate.java b/core/java/android/widget/TimePickerSpinnerDelegate.java
index 8741cc3..863d409 100644
--- a/core/java/android/widget/TimePickerSpinnerDelegate.java
+++ b/core/java/android/widget/TimePickerSpinnerDelegate.java
@@ -17,7 +17,6 @@
package android.widget;
import android.content.Context;
-import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.os.Parcel;
import android.os.Parcelable;
@@ -47,11 +46,6 @@
private static final boolean DEFAULT_ENABLED_STATE = true;
private static final int HOURS_IN_HALF_DAY = 12;
- // state
- private boolean mIs24HourView;
- private boolean mIsAm;
-
- // ui components
private final NumberPicker mHourSpinner;
private final NumberPicker mMinuteSpinner;
private final NumberPicker mAmPmSpinner;
@@ -68,11 +62,15 @@
private final String[] mAmPmStrings;
+ private final Calendar mTempCalendar;
+
private boolean mIsEnabled = DEFAULT_ENABLED_STATE;
- private Calendar mTempCalendar;
private boolean mHourWithTwoDigit;
private char mHourFormat;
+ private boolean mIs24HourView;
+ private boolean mIsAm;
+
public TimePickerSpinnerDelegate(TimePicker delegator, Context context, AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
super(delegator, context);
@@ -92,7 +90,7 @@
mHourSpinner.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() {
public void onValueChange(NumberPicker spinner, int oldVal, int newVal) {
updateInputState();
- if (!is24HourView()) {
+ if (!is24Hour()) {
if ((oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) ||
(oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1)) {
mIsAm = !mIsAm;
@@ -124,14 +122,14 @@
int maxValue = mMinuteSpinner.getMaxValue();
if (oldVal == maxValue && newVal == minValue) {
int newHour = mHourSpinner.getValue() + 1;
- if (!is24HourView() && newHour == HOURS_IN_HALF_DAY) {
+ if (!is24Hour() && newHour == HOURS_IN_HALF_DAY) {
mIsAm = !mIsAm;
updateAmPmControl();
}
mHourSpinner.setValue(newHour);
} else if (oldVal == minValue && newVal == maxValue) {
int newHour = mHourSpinner.getValue() - 1;
- if (!is24HourView() && newHour == HOURS_IN_HALF_DAY - 1) {
+ if (!is24Hour() && newHour == HOURS_IN_HALF_DAY - 1) {
mIsAm = !mIsAm;
updateAmPmControl();
}
@@ -204,8 +202,9 @@
updateAmPmControl();
// set to current time
- setCurrentHour(mTempCalendar.get(Calendar.HOUR_OF_DAY));
- setCurrentMinute(mTempCalendar.get(Calendar.MINUTE));
+ mTempCalendar = Calendar.getInstance(mLocale);
+ setHour(mTempCalendar.get(Calendar.HOUR_OF_DAY));
+ setMinute(mTempCalendar.get(Calendar.MINUTE));
if (!isEnabled()) {
setEnabled(false);
@@ -221,7 +220,7 @@
}
private void getHourFormatData() {
- final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mCurrentLocale,
+ final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mLocale,
(mIs24HourView) ? "Hm" : "hm");
final int lengthPattern = bestDateTimePattern.length();
mHourWithTwoDigit = false;
@@ -241,7 +240,7 @@
}
private boolean isAmPmAtStart() {
- final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mCurrentLocale,
+ final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mLocale,
"hm" /* skeleton */);
return bestDateTimePattern.startsWith("a");
@@ -257,7 +256,7 @@
*/
private void setDividerText() {
final String skeleton = (mIs24HourView) ? "Hm" : "hm";
- final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mCurrentLocale,
+ final String bestDateTimePattern = DateFormat.getBestDateTimePattern(mLocale,
skeleton);
final String separatorText;
int hourIndex = bestDateTimePattern.lastIndexOf('H');
@@ -279,16 +278,16 @@
}
@Override
- public void setCurrentHour(int currentHour) {
- setCurrentHour(currentHour, true);
+ public void setHour(int hour) {
+ setCurrentHour(hour, true);
}
private void setCurrentHour(int currentHour, boolean notifyTimeChanged) {
// why was Integer used in the first place?
- if (currentHour == getCurrentHour()) {
+ if (currentHour == getHour()) {
return;
}
- if (!is24HourView()) {
+ if (!is24Hour()) {
// convert [0,23] ordinal to wall clock display
if (currentHour >= HOURS_IN_HALF_DAY) {
mIsAm = false;
@@ -310,9 +309,9 @@
}
@Override
- public int getCurrentHour() {
+ public int getHour() {
int currentHour = mHourSpinner.getValue();
- if (is24HourView()) {
+ if (is24Hour()) {
return currentHour;
} else if (mIsAm) {
return currentHour % HOURS_IN_HALF_DAY;
@@ -322,28 +321,27 @@
}
@Override
- public void setCurrentMinute(int currentMinute) {
- if (currentMinute == getCurrentMinute()) {
+ public void setMinute(int minute) {
+ if (minute == getMinute()) {
return;
}
- mMinuteSpinner.setValue(currentMinute);
+ mMinuteSpinner.setValue(minute);
onTimeChanged();
}
@Override
- public int getCurrentMinute() {
+ public int getMinute() {
return mMinuteSpinner.getValue();
}
- @Override
- public void setIs24HourView(boolean is24HourView) {
- if (mIs24HourView == is24HourView) {
+ public void setIs24Hour(boolean is24Hour) {
+ if (mIs24HourView == is24Hour) {
return;
}
// cache the current hour since spinner range changes and BEFORE changing mIs24HourView!!
- int currentHour = getCurrentHour();
+ int currentHour = getHour();
// Order is important here.
- mIs24HourView = is24HourView;
+ mIs24HourView = is24Hour;
getHourFormatData();
updateHourControl();
// set value after spinner range is updated
@@ -353,7 +351,7 @@
}
@Override
- public boolean is24HourView() {
+ public boolean is24Hour() {
return mIs24HourView;
}
@@ -388,20 +386,15 @@
}
@Override
- public void onConfigurationChanged(Configuration newConfig) {
- setCurrentLocale(newConfig.locale);
- }
-
- @Override
public Parcelable onSaveInstanceState(Parcelable superState) {
- return new SavedState(superState, getCurrentHour(), getCurrentMinute());
+ return new SavedState(superState, getHour(), getMinute());
}
@Override
public void onRestoreInstanceState(Parcelable state) {
SavedState ss = (SavedState) state;
- setCurrentHour(ss.getHour());
- setCurrentMinute(ss.getMinute());
+ setHour(ss.getHour());
+ setMinute(ss.getMinute());
}
@Override
@@ -418,8 +411,8 @@
} else {
flags |= DateUtils.FORMAT_12HOUR;
}
- mTempCalendar.set(Calendar.HOUR_OF_DAY, getCurrentHour());
- mTempCalendar.set(Calendar.MINUTE, getCurrentMinute());
+ mTempCalendar.set(Calendar.HOUR_OF_DAY, getHour());
+ mTempCalendar.set(Calendar.MINUTE, getMinute());
String selectedDateUtterance = DateUtils.formatDateTime(mContext,
mTempCalendar.getTimeInMillis(), flags);
event.getText().add(selectedDateUtterance);
@@ -447,7 +440,7 @@
}
private void updateAmPmControl() {
- if (is24HourView()) {
+ if (is24Hour()) {
if (mAmPmSpinner != null) {
mAmPmSpinner.setVisibility(View.GONE);
} else {
@@ -466,27 +459,16 @@
mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
}
- /**
- * Sets the current locale.
- *
- * @param locale The current locale.
- */
- @Override
- public void setCurrentLocale(Locale locale) {
- super.setCurrentLocale(locale);
- mTempCalendar = Calendar.getInstance(locale);
- }
-
private void onTimeChanged() {
mDelegator.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
if (mOnTimeChangedListener != null) {
- mOnTimeChangedListener.onTimeChanged(mDelegator, getCurrentHour(),
- getCurrentMinute());
+ mOnTimeChangedListener.onTimeChanged(mDelegator, getHour(),
+ getMinute());
}
}
private void updateHourControl() {
- if (is24HourView()) {
+ if (is24Hour()) {
// 'k' means 1-24 hour
if (mHourFormat == 'k') {
mHourSpinner.setMinValue(1);
@@ -509,7 +491,7 @@
}
private void updateMinuteControl() {
- if (is24HourView()) {
+ if (is24Hour()) {
mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
} else {
mMinuteSpinnerInput.setImeOptions(EditorInfo.IME_ACTION_NEXT);
diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java
index acbf5eb..6e56513 100644
--- a/core/java/android/widget/Toolbar.java
+++ b/core/java/android/widget/Toolbar.java
@@ -1368,6 +1368,11 @@
}
@Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ return findDependentLayoutAxesHelper(child, axisFilter, LayoutParams.class);
+ }
+
+ @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int width = 0;
int height = 0;
diff --git a/core/java/com/android/internal/app/EphemeralResolveInfo.aidl b/core/java/com/android/internal/app/EphemeralResolveInfo.aidl
new file mode 100644
index 0000000..529527b
--- /dev/null
+++ b/core/java/com/android/internal/app/EphemeralResolveInfo.aidl
@@ -0,0 +1,19 @@
+/*
+** Copyright 2015, 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.app;
+
+parcelable EphemeralResolveInfo;
diff --git a/core/java/com/android/internal/app/EphemeralResolveInfo.java b/core/java/com/android/internal/app/EphemeralResolveInfo.java
new file mode 100644
index 0000000..0e7ef05
--- /dev/null
+++ b/core/java/com/android/internal/app/EphemeralResolveInfo.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2015 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.app;
+
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Information that is returned when resolving ephemeral
+ * applications.
+ */
+public final class EphemeralResolveInfo implements Parcelable {
+ public static final String SHA_ALGORITHM = "SHA-256";
+ private byte[] mDigestBytes;
+ private int mDigestPrefix;
+ private final List<IntentFilter> mFilters = new ArrayList<IntentFilter>();
+
+ public EphemeralResolveInfo(Uri uri, List<IntentFilter> filters) {
+ generateDigest(uri);
+ mFilters.addAll(filters);
+ }
+
+ private EphemeralResolveInfo(Parcel in) {
+ readFromParcel(in);
+ }
+
+ public byte[] getDigestBytes() {
+ return mDigestBytes;
+ }
+
+ public int getDigestPrefix() {
+ return mDigestPrefix;
+ }
+
+ public List<IntentFilter> getFilters() {
+ return mFilters;
+ }
+
+ private void generateDigest(Uri uri) {
+ try {
+ final MessageDigest digest = MessageDigest.getInstance(SHA_ALGORITHM);
+ final byte[] hostBytes = uri.getHost().getBytes();
+ final byte[] digestBytes = digest.digest(hostBytes);
+ mDigestBytes = digestBytes;
+ mDigestPrefix =
+ digestBytes[0] << 24
+ | digestBytes[1] << 16
+ | digestBytes[2] << 8
+ | digestBytes[3] << 0;
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException("could not find digest algorithm");
+ }
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ if (mDigestBytes == null) {
+ out.writeInt(0);
+ } else {
+ out.writeInt(mDigestBytes.length);
+ out.writeByteArray(mDigestBytes);
+ }
+ out.writeInt(mDigestPrefix);
+ out.writeList(mFilters);
+ }
+
+ private void readFromParcel(Parcel in) {
+ int digestBytesSize = in.readInt();
+ if (digestBytesSize > 0) {
+ mDigestBytes = new byte[digestBytesSize];
+ in.readByteArray(mDigestBytes);
+ }
+ mDigestPrefix = in.readInt();
+ in.readList(mFilters, null /*loader*/);
+ }
+
+ public static final Parcelable.Creator<EphemeralResolveInfo> CREATOR
+ = new Parcelable.Creator<EphemeralResolveInfo>() {
+ public EphemeralResolveInfo createFromParcel(Parcel in) {
+ return new EphemeralResolveInfo(in);
+ }
+
+ public EphemeralResolveInfo[] newArray(int size) {
+ return new EphemeralResolveInfo[size];
+ }
+ };
+}
diff --git a/core/java/com/android/internal/app/EphemeralResolverService.java b/core/java/com/android/internal/app/EphemeralResolverService.java
new file mode 100644
index 0000000..65530f2
--- /dev/null
+++ b/core/java/com/android/internal/app/EphemeralResolverService.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2015 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.app;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.IRemoteCallback;
+import android.os.Looper;
+import android.os.Message;
+import android.os.RemoteException;
+
+import java.util.List;
+
+/**
+ * Base class for implementing the resolver service.
+ * @hide
+ */
+public abstract class EphemeralResolverService extends Service {
+ public static final String EXTRA_RESOLVE_INFO = "com.android.internal.app.RESOLVE_INFO";
+ public static final String EXTRA_SEQUENCE = "com.android.internal.app.SEQUENCE";
+ private Handler mHandler;
+
+ /**
+ * Called to retrieve resolve info for ephemeral applications.
+ *
+ * @param digestPrefix The hash prefix of the ephemeral's domain.
+ */
+ protected abstract List<EphemeralResolveInfo> getEphemeralResolveInfoList(int digestPrefix);
+
+ @Override
+ protected final void attachBaseContext(Context base) {
+ super.attachBaseContext(base);
+ mHandler = new ServiceHandler(base.getMainLooper());
+ }
+
+ @Override
+ public final IBinder onBind(Intent intent) {
+ return new IEphemeralResolver.Stub() {
+ @Override
+ public void getEphemeralResolveInfoList(
+ IRemoteCallback callback, int digestPrefix, int sequence) {
+ mHandler.obtainMessage(ServiceHandler.MSG_GET_EPHEMERAL_RESOLVE_INFO,
+ digestPrefix, sequence, callback)
+ .sendToTarget();
+ }
+ };
+ }
+
+ private final class ServiceHandler extends Handler {
+ public static final int MSG_GET_EPHEMERAL_RESOLVE_INFO = 1;
+
+ public ServiceHandler(Looper looper) {
+ super(looper, null /*callback*/, true /*async*/);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public void handleMessage(Message message) {
+ final int action = message.what;
+ switch (action) {
+ case MSG_GET_EPHEMERAL_RESOLVE_INFO: {
+ final IRemoteCallback callback = (IRemoteCallback) message.obj;
+ final List<EphemeralResolveInfo> resolveInfo =
+ getEphemeralResolveInfoList(message.arg1);
+ final Bundle data = new Bundle();
+ data.putInt(EXTRA_SEQUENCE, message.arg2);
+ data.putParcelableList(EXTRA_RESOLVE_INFO, resolveInfo);
+ try {
+ callback.sendResult(data);
+ } catch (RemoteException e) {
+ }
+ } break;
+
+ default: {
+ throw new IllegalArgumentException("Unknown message: " + action);
+ }
+ }
+ }
+ }
+}
diff --git a/core/java/com/android/internal/app/IAppOpsCallback.aidl b/core/java/com/android/internal/app/IAppOpsCallback.aidl
index afbc609..5fdc920 100644
--- a/core/java/com/android/internal/app/IAppOpsCallback.aidl
+++ b/core/java/com/android/internal/app/IAppOpsCallback.aidl
@@ -19,5 +19,5 @@
// This interface is also used by native code, so must
// be kept in sync with frameworks/native/include/binder/IAppOpsCallback.h
oneway interface IAppOpsCallback {
- void opChanged(int op, String packageName);
+ void opChanged(int op, int uid, String packageName);
}
diff --git a/core/java/com/android/internal/app/IEphemeralResolver.aidl b/core/java/com/android/internal/app/IEphemeralResolver.aidl
new file mode 100644
index 0000000..40429ee
--- /dev/null
+++ b/core/java/com/android/internal/app/IEphemeralResolver.aidl
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 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.app;
+
+import android.content.Intent;
+import android.os.IRemoteCallback;
+
+oneway interface IEphemeralResolver {
+ void getEphemeralResolveInfoList(IRemoteCallback callback, int digestPrefix, int sequence);
+}
diff --git a/core/java/com/android/internal/app/SystemUserHomeActivity.java b/core/java/com/android/internal/app/SystemUserHomeActivity.java
new file mode 100644
index 0000000..26fbf6f
--- /dev/null
+++ b/core/java/com/android/internal/app/SystemUserHomeActivity.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 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.app;
+
+import android.app.Activity;
+
+/**
+ * Placeholder home activity, which is always installed on the system user. At least one home
+ * activity must be present and enabled in order for the system to boot.
+ */
+public class SystemUserHomeActivity extends Activity {
+}
diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java
index 2c5e50c..cc677cc 100644
--- a/core/java/com/android/internal/logging/MetricsLogger.java
+++ b/core/java/com/android/internal/logging/MetricsLogger.java
@@ -30,6 +30,11 @@
public static final int QS_LOCK_TILE = 257;
public static final int QS_USER_TILE = 258;
public static final int QS_BATTERY_TILE = 259;
+ public static final int NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS = 260;
+ public static final int ACTION_ZEN_ALLOW_PEEK = 261;
+ public static final int ACTION_ZEN_ALLOW_LIGHTS = 262;
+ public static final int NOTIFICATION_TOPIC_NOTIFICATION = 263;
+ public static final int ACTION_DEFAULT_SMS_APP_CHANGED = 264;
public static void visible(Context context, int category) throws IllegalArgumentException {
if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {
diff --git a/core/java/com/android/internal/os/BaseCommand.java b/core/java/com/android/internal/os/BaseCommand.java
index e26b27d..c067da7 100644
--- a/core/java/com/android/internal/os/BaseCommand.java
+++ b/core/java/com/android/internal/os/BaseCommand.java
@@ -17,13 +17,19 @@
package com.android.internal.os;
+import android.os.ShellCommand;
+
import java.io.PrintStream;
public abstract class BaseCommand {
- protected String[] mArgs;
- private int mNextArg;
- private String mCurArgData;
+ final protected ShellCommand mArgs = new ShellCommand() {
+ @Override public int onCommand(String cmd) {
+ return 0;
+ }
+ @Override public void onHelp() {
+ }
+ };
// These are magic strings understood by the Eclipse plugin.
public static final String FATAL_ERROR_CODE = "Error type 1";
@@ -39,9 +45,7 @@
return;
}
- mArgs = args;
- mNextArg = 0;
- mCurArgData = null;
+ mArgs.init(null, null, null, null, args, 0);
try {
onRun();
@@ -87,32 +91,7 @@
* starts with '-'. If the next argument is not an option, null is returned.
*/
public String nextOption() {
- if (mCurArgData != null) {
- String prev = mArgs[mNextArg - 1];
- throw new IllegalArgumentException("No argument expected after \"" + prev + "\"");
- }
- if (mNextArg >= mArgs.length) {
- return null;
- }
- String arg = mArgs[mNextArg];
- if (!arg.startsWith("-")) {
- return null;
- }
- mNextArg++;
- if (arg.equals("--")) {
- return null;
- }
- if (arg.length() > 1 && arg.charAt(1) != '-') {
- if (arg.length() > 2) {
- mCurArgData = arg.substring(2);
- return arg.substring(0, 2);
- } else {
- mCurArgData = null;
- return arg;
- }
- }
- mCurArgData = null;
- return arg;
+ return mArgs.getNextOption();
}
/**
@@ -120,15 +99,7 @@
* no arguments left, return null.
*/
public String nextArg() {
- if (mCurArgData != null) {
- String arg = mCurArgData;
- mCurArgData = null;
- return arg;
- } else if (mNextArg < mArgs.length) {
- return mArgs[mNextArg++];
- } else {
- return null;
- }
+ return mArgs.getNextArg();
}
/**
@@ -136,11 +107,6 @@
* no arguments left, throws an IllegalArgumentException to report this to the user.
*/
public String nextArgRequired() {
- String arg = nextArg();
- if (arg == null) {
- String prev = mArgs[mNextArg - 1];
- throw new IllegalArgumentException("Argument expected after \"" + prev + "\"");
- }
- return arg;
+ return mArgs.getNextArgRequired();
}
}
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index f73df00..4a969b2 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -105,7 +105,7 @@
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
- private static final int VERSION = 135 + (USE_OLD_HISTORY ? 1000 : 0);
+ private static final int VERSION = 138 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000;
@@ -1975,8 +1975,14 @@
private int buildBatteryLevelInt(HistoryItem h) {
return ((((int)h.batteryLevel)<<25)&0xfe000000)
- | ((((int)h.batteryTemperature)<<14)&0x01ff8000)
- | ((((int)h.batteryVoltage)<<1)&0x00007fff);
+ | ((((int)h.batteryTemperature)<<15)&0x01ff8000)
+ | ((((int)h.batteryVoltage)<<1)&0x00007ffe);
+ }
+
+ private void readBatteryLevelInt(int batteryLevelInt, HistoryItem out) {
+ out.batteryLevel = (byte)((batteryLevelInt & 0xfe000000) >>> 25);
+ out.batteryTemperature = (short)((batteryLevelInt & 0x01ff8000) >>> 15);
+ out.batteryVoltage = (char)((batteryLevelInt & 0x00007ffe) >>> 1);
}
private int buildStateInt(HistoryItem h) {
@@ -2117,9 +2123,7 @@
final int batteryLevelInt;
if ((firstToken&DELTA_BATTERY_LEVEL_FLAG) != 0) {
batteryLevelInt = src.readInt();
- cur.batteryLevel = (byte)((batteryLevelInt>>25)&0x7f);
- cur.batteryTemperature = (short)((batteryLevelInt<<7)>>21);
- cur.batteryVoltage = (char)(batteryLevelInt&0x3fff);
+ readBatteryLevelInt(batteryLevelInt, cur);
cur.numReadInts += 1;
if (DEBUG) Slog.i(TAG, "READ DELTA: batteryToken=0x"
+ Integer.toHexString(batteryLevelInt)
@@ -2617,10 +2621,9 @@
}
}
- public void noteProcessStateLocked(String name, int uid, int state) {
+ public void noteUidProcessStateLocked(int uid, int state) {
uid = mapUid(uid);
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- getUidStatsLocked(uid).updateProcessStateLocked(name, state, elapsedRealtime);
+ getUidStatsLocked(uid).updateUidProcessStateLocked(state);
}
public void noteProcessFinishLocked(String name, int uid) {
@@ -2628,13 +2631,11 @@
if (!mActiveEvents.updateState(HistoryItem.EVENT_PROC_FINISH, name, uid, 0)) {
return;
}
- final long elapsedRealtime = SystemClock.elapsedRealtime();
- final long uptime = SystemClock.uptimeMillis();
- getUidStatsLocked(uid).updateProcessStateLocked(name, Uid.PROCESS_STATE_NONE,
- elapsedRealtime);
if (!mRecordAllHistory) {
return;
}
+ final long elapsedRealtime = SystemClock.elapsedRealtime();
+ final long uptime = SystemClock.uptimeMillis();
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_PROC_FINISH, name, uid);
}
@@ -4442,8 +4443,7 @@
StopwatchTimer mForegroundActivityTimer;
- static final int PROCESS_STATE_NONE = NUM_PROCESS_STATE;
- int mProcessState = PROCESS_STATE_NONE;
+ int mProcessState = ActivityManager.PROCESS_STATE_NONEXISTENT;
StopwatchTimer[] mProcessStateTimer;
BatchTimer mVibratorOnTimer;
@@ -4808,21 +4808,6 @@
}
}
- void updateUidProcessStateLocked(int state, long elapsedRealtimeMs) {
- if (mProcessState == state) return;
-
- if (mProcessState != PROCESS_STATE_NONE) {
- mProcessStateTimer[mProcessState].stopRunningLocked(elapsedRealtimeMs);
- }
- mProcessState = state;
- if (state != PROCESS_STATE_NONE) {
- if (mProcessStateTimer[state] == null) {
- makeProcessState(state, null);
- }
- mProcessStateTimer[state].startRunningLocked(elapsedRealtimeMs);
- }
- }
-
public BatchTimer createVibratorOnTimerLocked() {
if (mVibratorOnTimer == null) {
mVibratorOnTimer = new BatchTimer(Uid.this, VIBRATOR_ON, mOnBatteryTimeBase);
@@ -5163,7 +5148,7 @@
active |= !mProcessStateTimer[i].reset(false);
}
}
- active |= (mProcessState != PROCESS_STATE_NONE);
+ active |= (mProcessState != ActivityManager.PROCESS_STATE_NONEXISTENT);
}
if (mVibratorOnTimer != null) {
if (mVibratorOnTimer.reset(false)) {
@@ -5257,14 +5242,9 @@
}
for (int ip=mProcessStats.size()-1; ip>=0; ip--) {
Proc proc = mProcessStats.valueAt(ip);
- if (proc.mProcessState == PROCESS_STATE_NONE) {
- proc.detach();
- mProcessStats.removeAt(ip);
- } else {
- proc.reset();
- active = true;
- }
+ proc.detach();
}
+ mProcessStats.clear();
if (mPids.size() > 0) {
for (int i=mPids.size()-1; i>=0; i--) {
Pid pid = mPids.valueAt(i);
@@ -5693,7 +5673,7 @@
} else {
mForegroundActivityTimer = null;
}
- mProcessState = PROCESS_STATE_NONE;
+ mProcessState = ActivityManager.PROCESS_STATE_NONEXISTENT;
for (int i = 0; i < NUM_PROCESS_STATE; i++) {
if (in.readInt() != 0) {
makeProcessState(i, in);
@@ -6076,11 +6056,6 @@
*/
int mUnpluggedNumAnrs;
- /**
- * Current process state.
- */
- int mProcessState = PROCESS_STATE_NONE;
-
ArrayList<ExcessivePower> mExcessivePower;
Proc(String name) {
@@ -6100,16 +6075,6 @@
public void onTimeStopped(long elapsedRealtime, long baseUptime, long baseRealtime) {
}
- void reset() {
- mUserTime = mSystemTime = mForegroundTime = 0;
- mStarts = mNumCrashes = mNumAnrs = 0;
- mLoadedUserTime = mLoadedSystemTime = mLoadedForegroundTime = 0;
- mLoadedStarts = mLoadedNumCrashes = mLoadedNumAnrs = 0;
- mUnpluggedUserTime = mUnpluggedSystemTime = mUnpluggedForegroundTime = 0;
- mUnpluggedStarts = mUnpluggedNumCrashes = mUnpluggedNumAnrs = 0;
- mExcessivePower = null;
- }
-
void detach() {
mActive = false;
mOnBatteryTimeBase.remove(this);
@@ -6664,46 +6629,39 @@
return ps;
}
- public void updateProcessStateLocked(String procName, int state, long elapsedRealtimeMs) {
- int procState;
- if (state <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) {
- procState = PROCESS_STATE_FOREGROUND;
- } else if (state <= ActivityManager.PROCESS_STATE_RECEIVER) {
- procState = PROCESS_STATE_ACTIVE;
+ public void updateUidProcessStateLocked(int procState) {
+ int uidRunningState;
+ if (procState == ActivityManager.PROCESS_STATE_NONEXISTENT) {
+ uidRunningState = ActivityManager.PROCESS_STATE_NONEXISTENT;
+ } else if (procState == ActivityManager.PROCESS_STATE_TOP) {
+ uidRunningState = PROCESS_STATE_TOP;
+ } else if (procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {
+ // Persistent and other foreground states go here.
+ uidRunningState = PROCESS_STATE_FOREGROUND_SERVICE;
+ } else if (procState <= ActivityManager.PROCESS_STATE_TOP_SLEEPING) {
+ uidRunningState = PROCESS_STATE_TOP_SLEEPING;
+ } else if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) {
+ // Persistent and other foreground states go here.
+ uidRunningState = PROCESS_STATE_FOREGROUND;
+ } else if (procState <= ActivityManager.PROCESS_STATE_RECEIVER) {
+ uidRunningState = PROCESS_STATE_BACKGROUND;
} else {
- procState = PROCESS_STATE_RUNNING;
+ uidRunningState = PROCESS_STATE_CACHED;
}
- updateRealProcessStateLocked(procName, procState, elapsedRealtimeMs);
- }
- public void updateRealProcessStateLocked(String procName, int procState,
- long elapsedRealtimeMs) {
- Proc proc = getProcessStatsLocked(procName);
- if (proc.mProcessState != procState) {
- boolean changed;
- if (procState < proc.mProcessState) {
- // Has this process become more important? If so,
- // we may need to change the uid if the currrent uid proc state
- // is not as important as what we are now setting.
- changed = mProcessState > procState;
- } else {
- // Has this process become less important? If so,
- // we may need to change the uid if the current uid proc state
- // is the same importance as the old setting.
- changed = mProcessState == proc.mProcessState;
+ if (mProcessState == uidRunningState) return;
+
+ final long elapsedRealtime = SystemClock.elapsedRealtime();
+
+ if (mProcessState != ActivityManager.PROCESS_STATE_NONEXISTENT) {
+ mProcessStateTimer[mProcessState].stopRunningLocked(elapsedRealtime);
+ }
+ mProcessState = uidRunningState;
+ if (uidRunningState != ActivityManager.PROCESS_STATE_NONEXISTENT) {
+ if (mProcessStateTimer[uidRunningState] == null) {
+ makeProcessState(uidRunningState, null);
}
- proc.mProcessState = procState;
- if (changed) {
- // uid's state may have changed; compute what the new state should be.
- int uidProcState = PROCESS_STATE_NONE;
- for (int ip=mProcessStats.size()-1; ip>=0; ip--) {
- proc = mProcessStats.valueAt(ip);
- if (proc.mProcessState < uidProcState) {
- uidProcState = proc.mProcessState;
- }
- }
- updateUidProcessStateLocked(uidProcState, elapsedRealtimeMs);
- }
+ mProcessStateTimer[uidRunningState].startRunningLocked(elapsedRealtime);
}
}
@@ -9419,7 +9377,7 @@
if (in.readInt() != 0) {
u.createForegroundActivityTimerLocked().readSummaryFromParcelLocked(in);
}
- u.mProcessState = Uid.PROCESS_STATE_NONE;
+ u.mProcessState = ActivityManager.PROCESS_STATE_NONEXISTENT;
for (int i = 0; i < Uid.NUM_PROCESS_STATE; i++) {
if (in.readInt() != 0) {
u.makeProcessState(i, null);
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java
index 197004c..8186378 100644
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -39,10 +39,8 @@
public static final int DEBUG_ENABLE_SAFEMODE = 1 << 3;
/** Enable logging of third-party JNI activity. */
public static final int DEBUG_ENABLE_JNI_LOGGING = 1 << 4;
- /** enable the JIT compiler */
- public static final int DEBUG_ENABLE_JIT = 1 << 5;
/** Force generation of native debugging information. */
- public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 6;
+ public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 5;
/** No external storage should be mounted. */
public static final int MOUNT_EXTERNAL_NONE = 0;
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index 3e86fac..a40f9a8 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -322,7 +322,7 @@
/**
* From --enable-debugger, --enable-checkjni, --enable-assert,
- * --enable-safemode, --enable-jit, --generate-debug-info and --enable-jni-logging.
+ * --enable-safemode, --generate-debug-info and --enable-jni-logging.
*/
int debugFlags;
@@ -432,8 +432,6 @@
debugFlags |= Zygote.DEBUG_ENABLE_SAFEMODE;
} else if (arg.equals("--enable-checkjni")) {
debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;
- } else if (arg.equals("--enable-jit")) {
- debugFlags |= Zygote.DEBUG_ENABLE_JIT;
} else if (arg.equals("--generate-debug-info")) {
debugFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;
} else if (arg.equals("--enable-jni-logging")) {
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index f78d8d8..8e318a2 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -346,7 +346,7 @@
long startTime = SystemClock.uptimeMillis();
TypedArray ar = mResources.obtainTypedArray(
com.android.internal.R.array.preloaded_drawables);
- int N = preloadDrawables(runtime, ar);
+ int N = preloadDrawables(ar);
ar.recycle();
Log.i(TAG, "...preloaded " + N + " resources in "
+ (SystemClock.uptimeMillis()-startTime) + "ms.");
@@ -354,10 +354,21 @@
startTime = SystemClock.uptimeMillis();
ar = mResources.obtainTypedArray(
com.android.internal.R.array.preloaded_color_state_lists);
- N = preloadColorStateLists(runtime, ar);
+ N = preloadColorStateLists(ar);
ar.recycle();
Log.i(TAG, "...preloaded " + N + " resources in "
+ (SystemClock.uptimeMillis()-startTime) + "ms.");
+
+ if (mResources.getBoolean(
+ com.android.internal.R.bool.config_freeformWindowManagement)) {
+ startTime = SystemClock.uptimeMillis();
+ ar = mResources.obtainTypedArray(
+ com.android.internal.R.array.preloaded_freeform_multi_window_drawables);
+ N = preloadDrawables(ar);
+ ar.recycle();
+ Log.i(TAG, "...preloaded " + N + " resource in "
+ + (SystemClock.uptimeMillis() - startTime) + "ms.");
+ }
}
mResources.finishPreloading();
} catch (RuntimeException e) {
@@ -365,7 +376,7 @@
}
}
- private static int preloadColorStateLists(VMRuntime runtime, TypedArray ar) {
+ private static int preloadColorStateLists(TypedArray ar) {
int N = ar.length();
for (int i=0; i<N; i++) {
int id = ar.getResourceId(i, 0);
@@ -385,7 +396,7 @@
}
- private static int preloadDrawables(VMRuntime runtime, TypedArray ar) {
+ private static int preloadDrawables(TypedArray ar) {
int N = ar.length();
for (int i=0; i<N; i++) {
int id = ar.getResourceId(i, 0);
diff --git a/core/java/com/android/internal/policy/BackdropFrameRenderer.java b/core/java/com/android/internal/policy/BackdropFrameRenderer.java
new file mode 100644
index 0000000..b101733
--- /dev/null
+++ b/core/java/com/android/internal/policy/BackdropFrameRenderer.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2015 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.policy;
+
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Looper;
+import android.view.Choreographer;
+import android.view.DisplayListCanvas;
+import android.view.RenderNode;
+import android.view.ThreadedRenderer;
+import android.view.View;
+
+/**
+ * The thread which draws a fill in background while the app is resizing in areas where the app
+ * content draw is lagging behind the resize operation.
+ * It starts with the creation and it ends once someone calls destroy().
+ * Any size changes can be passed by a call to setTargetRect will passed to the thread and
+ * executed via the Choreographer.
+ * @hide
+ */
+public class BackdropFrameRenderer extends Thread implements Choreographer.FrameCallback {
+
+ private DecorView mDecorView;
+
+ // This is containing the last requested size by a resize command. Note that this size might
+ // or might not have been applied to the output already.
+ private final Rect mTargetRect = new Rect();
+
+ // The render nodes for the multi threaded renderer.
+ private ThreadedRenderer mRenderer;
+ private RenderNode mFrameAndBackdropNode;
+
+ private final Rect mOldTargetRect = new Rect();
+ private final Rect mNewTargetRect = new Rect();
+ private Choreographer mChoreographer;
+
+ // Cached size values from the last render for the case that the view hierarchy is gone
+ // during a configuration change.
+ private int mLastContentWidth;
+ private int mLastContentHeight;
+ private int mLastCaptionHeight;
+ private int mLastXOffset;
+ private int mLastYOffset;
+
+ // Whether to report when next frame is drawn or not.
+ private boolean mReportNextDraw;
+
+ private Drawable mCaptionBackgroundDrawable;
+ private Drawable mResizingBackgroundDrawable;
+
+ public BackdropFrameRenderer(DecorView decorView, ThreadedRenderer renderer, Rect initialBounds,
+ Drawable resizingBackgroundDrawable, Drawable captionBackgroundDrawable) {
+ setName("ResizeFrame");
+
+ mRenderer = renderer;
+ onResourcesLoaded(decorView, resizingBackgroundDrawable, captionBackgroundDrawable);
+
+ // Create a render node for the content and frame backdrop
+ // which can be resized independently from the content.
+ mFrameAndBackdropNode = RenderNode.create("FrameAndBackdropNode", null);
+
+ mRenderer.addRenderNode(mFrameAndBackdropNode, true);
+
+ // Set the initial bounds and draw once so that we do not get a broken frame.
+ mTargetRect.set(initialBounds);
+ synchronized (this) {
+ changeWindowSizeLocked(initialBounds);
+ }
+
+ // Kick off our draw thread.
+ start();
+ }
+
+ void onResourcesLoaded(DecorView decorView, Drawable resizingBackgroundDrawable,
+ Drawable captionBackgroundDrawableDrawable) {
+ mDecorView = decorView;
+ mResizingBackgroundDrawable = resizingBackgroundDrawable;
+ mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable;
+ }
+
+ /**
+ * Call this function asynchronously when the window size has been changed. The change will
+ * be picked up once per frame and the frame will be re-rendered accordingly.
+ * @param newTargetBounds The new target bounds.
+ */
+ public void setTargetRect(Rect newTargetBounds) {
+ synchronized (this) {
+ mTargetRect.set(newTargetBounds);
+ // Notify of a bounds change.
+ pingRenderLocked();
+ }
+ }
+
+ /**
+ * The window got replaced due to a configuration change.
+ */
+ public void onConfigurationChange() {
+ synchronized (this) {
+ if (mRenderer != null) {
+ // Enforce a window redraw.
+ mOldTargetRect.set(0, 0, 0, 0);
+ pingRenderLocked();
+ }
+ }
+ }
+
+ /**
+ * All resources of the renderer will be released. This function can be called from the
+ * the UI thread as well as the renderer thread.
+ */
+ public void releaseRenderer() {
+ synchronized (this) {
+ if (mRenderer != null) {
+ // Invalidate the current content bounds.
+ mRenderer.setContentDrawBounds(0, 0, 0, 0);
+
+ // Remove the render node again
+ // (see comment above - better to do that only once).
+ mRenderer.removeRenderNode(mFrameAndBackdropNode);
+
+ mRenderer = null;
+
+ // Exit the renderer loop.
+ pingRenderLocked();
+ }
+ }
+ }
+
+ @Override
+ public void run() {
+ try {
+ Looper.prepare();
+ synchronized (this) {
+ mChoreographer = Choreographer.getInstance();
+
+ // Draw at least once.
+ mChoreographer.postFrameCallback(this);
+ }
+ Looper.loop();
+ } finally {
+ releaseRenderer();
+ }
+ synchronized (this) {
+ // Make sure no more messages are being sent.
+ mChoreographer = null;
+ }
+ }
+
+ /**
+ * The implementation of the FrameCallback.
+ * @param frameTimeNanos The time in nanoseconds when the frame started being rendered,
+ * in the {@link System#nanoTime()} timebase. Divide this value by {@code 1000000}
+ */
+ @Override
+ public void doFrame(long frameTimeNanos) {
+ synchronized (this) {
+ if (mRenderer == null) {
+ reportDrawIfNeeded();
+ // Tell the looper to stop. We are done.
+ Looper.myLooper().quit();
+ return;
+ }
+ mNewTargetRect.set(mTargetRect);
+ if (!mNewTargetRect.equals(mOldTargetRect) || mReportNextDraw) {
+ mOldTargetRect.set(mNewTargetRect);
+ changeWindowSizeLocked(mNewTargetRect);
+ }
+ }
+ }
+
+ /**
+ * The content is about to be drawn and we got the location of where it will be shown.
+ * If a "changeWindowSizeLocked" call has already been processed, we will re-issue the call
+ * if the previous call was ignored since the size was unknown.
+ * @param xOffset The x offset where the content is drawn to.
+ * @param yOffset The y offset where the content is drawn to.
+ * @param xSize The width size of the content. This should not be 0.
+ * @param ySize The height of the content.
+ * @return true if a frame should be requested after the content is drawn; false otherwise.
+ */
+ public boolean onContentDrawn(int xOffset, int yOffset, int xSize, int ySize) {
+ synchronized (this) {
+ final boolean firstCall = mLastContentWidth == 0;
+ // The current content buffer is drawn here.
+ mLastContentWidth = xSize;
+ mLastContentHeight = ySize - mLastCaptionHeight;
+ mLastXOffset = xOffset;
+ mLastYOffset = yOffset;
+
+ mRenderer.setContentDrawBounds(
+ mLastXOffset,
+ mLastYOffset,
+ mLastXOffset + mLastContentWidth,
+ mLastYOffset + mLastCaptionHeight + mLastContentHeight);
+ // If this was the first call and changeWindowSizeLocked got already called prior
+ // to us, we should re-issue a changeWindowSizeLocked now.
+ return firstCall
+ && (mLastCaptionHeight != 0 || !mDecorView.isShowingCaption());
+ }
+ }
+
+ public void onRequestDraw(boolean reportNextDraw) {
+ synchronized (this) {
+ mReportNextDraw = reportNextDraw;
+ mOldTargetRect.set(0, 0, 0, 0);
+ pingRenderLocked();
+ }
+ }
+
+ /**
+ * Resizing the frame to fit the new window size.
+ * @param newBounds The window bounds which needs to be drawn.
+ */
+ private void changeWindowSizeLocked(Rect newBounds) {
+
+ // While a configuration change is taking place the view hierarchy might become
+ // inaccessible. For that case we remember the previous metrics to avoid flashes.
+ // Note that even when there is no visible caption, the caption child will exist.
+ final int captionHeight = mDecorView.getCaptionHeight();
+ // The caption height will probably never dynamically change while we are resizing.
+ // Once set to something other then 0 it should be kept that way.
+ if (captionHeight != 0) {
+ // Remember the height of the caption.
+ mLastCaptionHeight = captionHeight;
+ }
+
+ // Make sure that the other thread has already prepared the render draw calls for the
+ // content. If any size is 0, we have to wait for it to be drawn first.
+ if ((mLastCaptionHeight == 0 && mDecorView.isShowingCaption()) ||
+ mLastContentWidth == 0 || mLastContentHeight == 0) {
+ return;
+ }
+
+ // Since the surface is spanning the entire screen, we have to add the start offset of
+ // the bounds to get to the surface location.
+ final int left = mLastXOffset + newBounds.left;
+ final int top = mLastYOffset + newBounds.top;
+ final int width = newBounds.width();
+ final int height = newBounds.height();
+
+ mFrameAndBackdropNode.setLeftTopRightBottom(left, top, left + width, top + height);
+
+ // Draw the caption and content backdrops in to our render node.
+ final DisplayListCanvas canvas = mFrameAndBackdropNode.start(width, height);
+ mCaptionBackgroundDrawable.setBounds(0, 0, left + width, top + mLastCaptionHeight);
+ mCaptionBackgroundDrawable.draw(canvas);
+
+ // The backdrop: clear everything with the background. Clipping is done elsewhere.
+ mResizingBackgroundDrawable.setBounds(0, mLastCaptionHeight, left + width, top + height);
+ mResizingBackgroundDrawable.draw(canvas);
+ mFrameAndBackdropNode.end(canvas);
+
+ // We need to render the node explicitly
+ mRenderer.drawRenderNode(mFrameAndBackdropNode);
+
+ reportDrawIfNeeded();
+ }
+
+ /** Notify view root that a frame has been drawn by us, if it has requested so. */
+ private void reportDrawIfNeeded() {
+ if (mReportNextDraw) {
+ if (mDecorView.isAttachedToWindow()) {
+ mDecorView.getViewRootImpl().reportDrawFinish();
+ }
+ mReportNextDraw = false;
+ }
+ }
+
+ /**
+ * Sends a message to the renderer to wake up and perform the next action which can be
+ * either the next rendering or the self destruction if mRenderer is null.
+ * Note: This call must be synchronized.
+ */
+ private void pingRenderLocked() {
+ if (mChoreographer != null) {
+ mChoreographer.postFrameCallback(this);
+ }
+ }
+}
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
new file mode 100644
index 0000000..27fe03c
--- /dev/null
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -0,0 +1,1936 @@
+/*
+ * Copyright (C) 2015 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.policy;
+
+import com.android.internal.R;
+import com.android.internal.view.FloatingActionMode;
+import com.android.internal.view.RootViewSurfaceTaker;
+import com.android.internal.view.StandaloneActionMode;
+import com.android.internal.view.menu.ContextMenuBuilder;
+import com.android.internal.view.menu.MenuDialogHelper;
+import com.android.internal.view.menu.MenuPopupHelper;
+import com.android.internal.widget.ActionBarContextView;
+import com.android.internal.widget.BackgroundFallback;
+import com.android.internal.widget.DecorCaptionView;
+import com.android.internal.widget.FloatingToolbar;
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.RemoteException;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.ActionMode;
+import android.view.ContextThemeWrapper;
+import android.view.Gravity;
+import android.view.InputQueue;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.ThreadedRenderer;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewStub;
+import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowCallbacks;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+import android.widget.FrameLayout;
+import android.widget.PopupWindow;
+
+import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
+import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.getMode;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;
+import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;
+import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
+import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
+
+/** @hide */
+public class DecorView extends FrameLayout implements RootViewSurfaceTaker, WindowCallbacks {
+ private static final String TAG = "DecorView";
+
+ private static final boolean SWEEP_OPEN_MENU = false;
+
+ // The height of a window which has focus in DIP.
+ private final static int DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP = 20;
+ // The height of a window which has not in DIP.
+ private final static int DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP = 5;
+
+ // Cludge to address b/22668382: Set the shadow size to the maximum so that the layer
+ // size calculation takes the shadow size into account. We set the elevation currently
+ // to max until the first layout command has been executed.
+ private boolean mAllowUpdateElevation = false;
+
+ private boolean mElevationAdjustedForStack = false;
+
+ int mDefaultOpacity = PixelFormat.OPAQUE;
+
+ /** The feature ID of the panel, or -1 if this is the application's DecorView */
+ private final int mFeatureId;
+
+ private final Rect mDrawingBounds = new Rect();
+
+ private final Rect mBackgroundPadding = new Rect();
+
+ private final Rect mFramePadding = new Rect();
+
+ private final Rect mFrameOffsets = new Rect();
+
+ private boolean mHasCaption = false;
+
+ private boolean mChanging;
+
+ private Drawable mMenuBackground;
+ private boolean mWatchingForMenu;
+ private int mDownY;
+
+ ActionMode mPrimaryActionMode;
+ private ActionMode mFloatingActionMode;
+ private ActionBarContextView mPrimaryActionModeView;
+ private PopupWindow mPrimaryActionModePopup;
+ private Runnable mShowPrimaryActionModePopup;
+ private ViewTreeObserver.OnPreDrawListener mFloatingToolbarPreDrawListener;
+ private View mFloatingActionModeOriginatingView;
+ private FloatingToolbar mFloatingToolbar;
+ private ObjectAnimator mFadeAnim;
+
+ // View added at runtime to draw under the status bar area
+ private View mStatusGuard;
+ // View added at runtime to draw under the navigation bar area
+ private View mNavigationGuard;
+
+ private final ColorViewState mStatusColorViewState = new ColorViewState(
+ SYSTEM_UI_FLAG_FULLSCREEN, FLAG_TRANSLUCENT_STATUS,
+ Gravity.TOP, Gravity.LEFT,
+ Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME,
+ com.android.internal.R.id.statusBarBackground,
+ FLAG_FULLSCREEN);
+ private final ColorViewState mNavigationColorViewState = new ColorViewState(
+ SYSTEM_UI_FLAG_HIDE_NAVIGATION, FLAG_TRANSLUCENT_NAVIGATION,
+ Gravity.BOTTOM, Gravity.RIGHT,
+ Window.NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME,
+ com.android.internal.R.id.navigationBarBackground,
+ 0 /* hideWindowFlag */);
+
+ private final Interpolator mShowInterpolator;
+ private final Interpolator mHideInterpolator;
+ private final int mBarEnterExitDuration;
+
+ private final BackgroundFallback mBackgroundFallback = new BackgroundFallback();
+
+ private int mLastTopInset = 0;
+ private int mLastBottomInset = 0;
+ private int mLastRightInset = 0;
+ private boolean mLastHasTopStableInset = false;
+ private boolean mLastHasBottomStableInset = false;
+ private boolean mLastHasRightStableInset = false;
+ private int mLastWindowFlags = 0;
+
+ private int mRootScrollY = 0;
+
+ private PhoneWindow mWindow;
+
+ ViewGroup mContentRoot;
+
+ private Rect mTempRect;
+ private Rect mOutsets = new Rect();
+
+ // This is the caption view for the window, containing the caption and window control
+ // buttons. The visibility of this decor depends on the workspace and the window type.
+ // If the window type does not require such a view, this member might be null.
+ DecorCaptionView mDecorCaptionView;
+
+ // Stack window is currently in. Since querying and changing the stack is expensive,
+ // this is the stack value the window is currently set up for.
+ int mStackId;
+
+ private boolean mWindowResizeCallbacksAdded = false;
+
+ BackdropFrameRenderer mBackdropFrameRenderer = null;
+ private Drawable mResizingBackgroundDrawable;
+ private Drawable mCaptionBackgroundDrawable;
+
+ DecorView(Context context, int featureId, PhoneWindow window) {
+ super(context);
+ mFeatureId = featureId;
+
+ mShowInterpolator = AnimationUtils.loadInterpolator(context,
+ android.R.interpolator.linear_out_slow_in);
+ mHideInterpolator = AnimationUtils.loadInterpolator(context,
+ android.R.interpolator.fast_out_linear_in);
+
+ mBarEnterExitDuration = context.getResources().getInteger(
+ R.integer.dock_enter_exit_duration);
+
+ setWindow(window);
+ }
+
+ void setBackgroundFallback(int resId) {
+ mBackgroundFallback.setDrawable(resId != 0 ? getContext().getDrawable(resId) : null);
+ setWillNotDraw(getBackground() == null && !mBackgroundFallback.hasFallback());
+ }
+
+ @Override
+ public void onDraw(Canvas c) {
+ super.onDraw(c);
+ mBackgroundFallback.draw(mContentRoot, c, mWindow.mContentParent);
+ }
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+ final int keyCode = event.getKeyCode();
+ final int action = event.getAction();
+ final boolean isDown = action == KeyEvent.ACTION_DOWN;
+
+ if (isDown && (event.getRepeatCount() == 0)) {
+ // First handle chording of panel key: if a panel key is held
+ // but not released, try to execute a shortcut in it.
+ if ((mWindow.mPanelChordingKey > 0) && (mWindow.mPanelChordingKey != keyCode)) {
+ boolean handled = dispatchKeyShortcutEvent(event);
+ if (handled) {
+ return true;
+ }
+ }
+
+ // If a panel is open, perform a shortcut on it without the
+ // chorded panel key
+ if ((mWindow.mPreparedPanel != null) && mWindow.mPreparedPanel.isOpen) {
+ if (mWindow.performPanelShortcut(mWindow.mPreparedPanel, keyCode, event, 0)) {
+ return true;
+ }
+ }
+ }
+
+ if (!mWindow.isDestroyed()) {
+ final Window.Callback cb = mWindow.getCallback();
+ final boolean handled = cb != null && mFeatureId < 0 ? cb.dispatchKeyEvent(event)
+ : super.dispatchKeyEvent(event);
+ if (handled) {
+ return true;
+ }
+ }
+
+ return isDown ? mWindow.onKeyDown(mFeatureId, event.getKeyCode(), event)
+ : mWindow.onKeyUp(mFeatureId, event.getKeyCode(), event);
+ }
+
+ @Override
+ public boolean dispatchKeyShortcutEvent(KeyEvent ev) {
+ // If the panel is already prepared, then perform the shortcut using it.
+ boolean handled;
+ if (mWindow.mPreparedPanel != null) {
+ handled = mWindow.performPanelShortcut(mWindow.mPreparedPanel, ev.getKeyCode(), ev,
+ Menu.FLAG_PERFORM_NO_CLOSE);
+ if (handled) {
+ if (mWindow.mPreparedPanel != null) {
+ mWindow.mPreparedPanel.isHandled = true;
+ }
+ return true;
+ }
+ }
+
+ // Shortcut not handled by the panel. Dispatch to the view hierarchy.
+ final Window.Callback cb = mWindow.getCallback();
+ handled = cb != null && !mWindow.isDestroyed() && mFeatureId < 0
+ ? cb.dispatchKeyShortcutEvent(ev) : super.dispatchKeyShortcutEvent(ev);
+ if (handled) {
+ return true;
+ }
+
+ // If the panel is not prepared, then we may be trying to handle a shortcut key
+ // combination such as Control+C. Temporarily prepare the panel then mark it
+ // unprepared again when finished to ensure that the panel will again be prepared
+ // the next time it is shown for real.
+ PhoneWindow.PanelFeatureState st =
+ mWindow.getPanelState(Window.FEATURE_OPTIONS_PANEL, false);
+ if (st != null && mWindow.mPreparedPanel == null) {
+ mWindow.preparePanel(st, ev);
+ handled = mWindow.performPanelShortcut(st, ev.getKeyCode(), ev,
+ Menu.FLAG_PERFORM_NO_CLOSE);
+ st.isPrepared = false;
+ if (handled) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent ev) {
+ final Window.Callback cb = mWindow.getCallback();
+ return cb != null && !mWindow.isDestroyed() && mFeatureId < 0
+ ? cb.dispatchTouchEvent(ev) : super.dispatchTouchEvent(ev);
+ }
+
+ @Override
+ public boolean dispatchTrackballEvent(MotionEvent ev) {
+ final Window.Callback cb = mWindow.getCallback();
+ return cb != null && !mWindow.isDestroyed() && mFeatureId < 0
+ ? cb.dispatchTrackballEvent(ev) : super.dispatchTrackballEvent(ev);
+ }
+
+ @Override
+ public boolean dispatchGenericMotionEvent(MotionEvent ev) {
+ final Window.Callback cb = mWindow.getCallback();
+ return cb != null && !mWindow.isDestroyed() && mFeatureId < 0
+ ? cb.dispatchGenericMotionEvent(ev) : super.dispatchGenericMotionEvent(ev);
+ }
+
+ public boolean superDispatchKeyEvent(KeyEvent event) {
+ // Give priority to closing action modes if applicable.
+ if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+ final int action = event.getAction();
+ // Back cancels action modes first.
+ if (mPrimaryActionMode != null) {
+ if (action == KeyEvent.ACTION_UP) {
+ mPrimaryActionMode.finish();
+ }
+ return true;
+ }
+ }
+
+ return super.dispatchKeyEvent(event);
+ }
+
+ public boolean superDispatchKeyShortcutEvent(KeyEvent event) {
+ return super.dispatchKeyShortcutEvent(event);
+ }
+
+ public boolean superDispatchTouchEvent(MotionEvent event) {
+ return super.dispatchTouchEvent(event);
+ }
+
+ public boolean superDispatchTrackballEvent(MotionEvent event) {
+ return super.dispatchTrackballEvent(event);
+ }
+
+ public boolean superDispatchGenericMotionEvent(MotionEvent event) {
+ return super.dispatchGenericMotionEvent(event);
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ return onInterceptTouchEvent(event);
+ }
+
+ private boolean isOutOfInnerBounds(int x, int y) {
+ return x < 0 || y < 0 || x > getWidth() || y > getHeight();
+ }
+
+ private boolean isOutOfBounds(int x, int y) {
+ return x < -5 || y < -5 || x > (getWidth() + 5)
+ || y > (getHeight() + 5);
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent event) {
+ int action = event.getAction();
+ if (mHasCaption && isShowingCaption()) {
+ // Don't dispatch ACTION_DOWN to the captionr if the window is resizable and the event
+ // was (starting) outside the window. Window resizing events should be handled by
+ // WindowManager.
+ // TODO: Investigate how to handle the outside touch in window manager
+ // without generating these events.
+ // Currently we receive these because we need to enlarge the window's
+ // touch region so that the monitor channel receives the events
+ // in the outside touch area.
+ if (action == MotionEvent.ACTION_DOWN) {
+ final int x = (int) event.getX();
+ final int y = (int) event.getY();
+ if (isOutOfInnerBounds(x, y)) {
+ return true;
+ }
+ }
+ }
+
+ if (mFeatureId >= 0) {
+ if (action == MotionEvent.ACTION_DOWN) {
+ int x = (int)event.getX();
+ int y = (int)event.getY();
+ if (isOutOfBounds(x, y)) {
+ mWindow.closePanel(mFeatureId);
+ return true;
+ }
+ }
+ }
+
+ if (!SWEEP_OPEN_MENU) {
+ return false;
+ }
+
+ if (mFeatureId >= 0) {
+ if (action == MotionEvent.ACTION_DOWN) {
+ Log.i(TAG, "Watchiing!");
+ mWatchingForMenu = true;
+ mDownY = (int) event.getY();
+ return false;
+ }
+
+ if (!mWatchingForMenu) {
+ return false;
+ }
+
+ int y = (int)event.getY();
+ if (action == MotionEvent.ACTION_MOVE) {
+ if (y > (mDownY+30)) {
+ Log.i(TAG, "Closing!");
+ mWindow.closePanel(mFeatureId);
+ mWatchingForMenu = false;
+ return true;
+ }
+ } else if (action == MotionEvent.ACTION_UP) {
+ mWatchingForMenu = false;
+ }
+
+ return false;
+ }
+
+ //Log.i(TAG, "Intercept: action=" + action + " y=" + event.getY()
+ // + " (in " + getHeight() + ")");
+
+ if (action == MotionEvent.ACTION_DOWN) {
+ int y = (int)event.getY();
+ if (y >= (getHeight()-5) && !mWindow.hasChildren()) {
+ Log.i(TAG, "Watching!");
+ mWatchingForMenu = true;
+ }
+ return false;
+ }
+
+ if (!mWatchingForMenu) {
+ return false;
+ }
+
+ int y = (int)event.getY();
+ if (action == MotionEvent.ACTION_MOVE) {
+ if (y < (getHeight()-30)) {
+ Log.i(TAG, "Opening!");
+ mWindow.openPanel(Window.FEATURE_OPTIONS_PANEL, new KeyEvent(
+ KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU));
+ mWatchingForMenu = false;
+ return true;
+ }
+ } else if (action == MotionEvent.ACTION_UP) {
+ mWatchingForMenu = false;
+ }
+
+ return false;
+ }
+
+ @Override
+ public void sendAccessibilityEvent(int eventType) {
+ if (!AccessibilityManager.getInstance(mContext).isEnabled()) {
+ return;
+ }
+
+ // if we are showing a feature that should be announced and one child
+ // make this child the event source since this is the feature itself
+ // otherwise the callback will take over and announce its client
+ if ((mFeatureId == Window.FEATURE_OPTIONS_PANEL ||
+ mFeatureId == Window.FEATURE_CONTEXT_MENU ||
+ mFeatureId == Window.FEATURE_PROGRESS ||
+ mFeatureId == Window.FEATURE_INDETERMINATE_PROGRESS)
+ && getChildCount() == 1) {
+ getChildAt(0).sendAccessibilityEvent(eventType);
+ } else {
+ super.sendAccessibilityEvent(eventType);
+ }
+ }
+
+ @Override
+ public boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
+ final Window.Callback cb = mWindow.getCallback();
+ if (cb != null && !mWindow.isDestroyed()) {
+ if (cb.dispatchPopulateAccessibilityEvent(event)) {
+ return true;
+ }
+ }
+ return super.dispatchPopulateAccessibilityEventInternal(event);
+ }
+
+ @Override
+ protected boolean setFrame(int l, int t, int r, int b) {
+ boolean changed = super.setFrame(l, t, r, b);
+ if (changed) {
+ final Rect drawingBounds = mDrawingBounds;
+ getDrawingRect(drawingBounds);
+
+ Drawable fg = getForeground();
+ if (fg != null) {
+ final Rect frameOffsets = mFrameOffsets;
+ drawingBounds.left += frameOffsets.left;
+ drawingBounds.top += frameOffsets.top;
+ drawingBounds.right -= frameOffsets.right;
+ drawingBounds.bottom -= frameOffsets.bottom;
+ fg.setBounds(drawingBounds);
+ final Rect framePadding = mFramePadding;
+ drawingBounds.left += framePadding.left - frameOffsets.left;
+ drawingBounds.top += framePadding.top - frameOffsets.top;
+ drawingBounds.right -= framePadding.right - frameOffsets.right;
+ drawingBounds.bottom -= framePadding.bottom - frameOffsets.bottom;
+ }
+
+ Drawable bg = getBackground();
+ if (bg != null) {
+ bg.setBounds(drawingBounds);
+ }
+
+ if (SWEEP_OPEN_MENU) {
+ if (mMenuBackground == null && mFeatureId < 0
+ && mWindow.getAttributes().height
+ == WindowManager.LayoutParams.MATCH_PARENT) {
+ mMenuBackground = getContext().getDrawable(
+ R.drawable.menu_background);
+ }
+ if (mMenuBackground != null) {
+ mMenuBackground.setBounds(drawingBounds.left,
+ drawingBounds.bottom-6, drawingBounds.right,
+ drawingBounds.bottom+20);
+ }
+ }
+ }
+ return changed;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
+ final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
+
+ final int widthMode = getMode(widthMeasureSpec);
+ final int heightMode = getMode(heightMeasureSpec);
+
+ boolean fixedWidth = false;
+ if (widthMode == AT_MOST) {
+ final TypedValue tvw = isPortrait ? mWindow.mFixedWidthMinor
+ : mWindow.mFixedWidthMajor;
+ if (tvw != null && tvw.type != TypedValue.TYPE_NULL) {
+ final int w;
+ if (tvw.type == TypedValue.TYPE_DIMENSION) {
+ w = (int) tvw.getDimension(metrics);
+ } else if (tvw.type == TypedValue.TYPE_FRACTION) {
+ w = (int) tvw.getFraction(metrics.widthPixels, metrics.widthPixels);
+ } else {
+ w = 0;
+ }
+
+ if (w > 0) {
+ final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+ widthMeasureSpec = MeasureSpec.makeMeasureSpec(
+ Math.min(w, widthSize), EXACTLY);
+ fixedWidth = true;
+ }
+ }
+ }
+
+ if (heightMode == AT_MOST) {
+ final TypedValue tvh = isPortrait ? mWindow.mFixedHeightMajor
+ : mWindow.mFixedHeightMinor;
+ if (tvh != null && tvh.type != TypedValue.TYPE_NULL) {
+ final int h;
+ if (tvh.type == TypedValue.TYPE_DIMENSION) {
+ h = (int) tvh.getDimension(metrics);
+ } else if (tvh.type == TypedValue.TYPE_FRACTION) {
+ h = (int) tvh.getFraction(metrics.heightPixels, metrics.heightPixels);
+ } else {
+ h = 0;
+ }
+ if (h > 0) {
+ final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+ heightMeasureSpec = MeasureSpec.makeMeasureSpec(
+ Math.min(h, heightSize), EXACTLY);
+ }
+ }
+ }
+
+ getOutsets(mOutsets);
+ if (mOutsets.top > 0 || mOutsets.bottom > 0) {
+ int mode = MeasureSpec.getMode(heightMeasureSpec);
+ if (mode != MeasureSpec.UNSPECIFIED) {
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+ heightMeasureSpec = MeasureSpec.makeMeasureSpec(
+ height + mOutsets.top + mOutsets.bottom, mode);
+ }
+ }
+ if (mOutsets.left > 0 || mOutsets.right > 0) {
+ int mode = MeasureSpec.getMode(widthMeasureSpec);
+ if (mode != MeasureSpec.UNSPECIFIED) {
+ int width = MeasureSpec.getSize(widthMeasureSpec);
+ widthMeasureSpec = MeasureSpec.makeMeasureSpec(
+ width + mOutsets.left + mOutsets.right, mode);
+ }
+ }
+
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+ int width = getMeasuredWidth();
+ boolean measure = false;
+
+ widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, EXACTLY);
+
+ if (!fixedWidth && widthMode == AT_MOST) {
+ final TypedValue tv = isPortrait ? mWindow.mMinWidthMinor : mWindow.mMinWidthMajor;
+ if (tv.type != TypedValue.TYPE_NULL) {
+ final int min;
+ if (tv.type == TypedValue.TYPE_DIMENSION) {
+ min = (int)tv.getDimension(metrics);
+ } else if (tv.type == TypedValue.TYPE_FRACTION) {
+ min = (int)tv.getFraction(metrics.widthPixels, metrics.widthPixels);
+ } else {
+ min = 0;
+ }
+
+ if (width < min) {
+ widthMeasureSpec = MeasureSpec.makeMeasureSpec(min, EXACTLY);
+ measure = true;
+ }
+ }
+ }
+
+ // TODO: Support height?
+
+ if (measure) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ super.onLayout(changed, left, top, right, bottom);
+ getOutsets(mOutsets);
+ if (mOutsets.left > 0) {
+ offsetLeftAndRight(-mOutsets.left);
+ }
+ if (mOutsets.top > 0) {
+ offsetTopAndBottom(-mOutsets.top);
+ }
+
+ // If the application changed its SystemUI metrics, we might also have to adapt
+ // our shadow elevation.
+ updateElevation();
+ mAllowUpdateElevation = true;
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ super.draw(canvas);
+
+ if (mMenuBackground != null) {
+ mMenuBackground.draw(canvas);
+ }
+ }
+
+ @Override
+ public boolean showContextMenuForChild(View originalView) {
+ // Reuse the context menu builder
+ if (mWindow.mContextMenu == null) {
+ mWindow.mContextMenu = new ContextMenuBuilder(getContext());
+ mWindow.mContextMenu.setCallback(mWindow.mContextMenuCallback);
+ } else {
+ mWindow.mContextMenu.clearAll();
+ }
+
+ final MenuDialogHelper helper = mWindow.mContextMenu.show(originalView,
+ originalView.getWindowToken());
+ if (helper != null) {
+ helper.setPresenterCallback(mWindow.mContextMenuCallback);
+ } else if (mWindow.mContextMenuHelper != null) {
+ // No menu to show, but if we have a menu currently showing it just became blank.
+ // Close it.
+ mWindow.mContextMenuHelper.dismiss();
+ }
+ mWindow.mContextMenuHelper = helper;
+ return helper != null;
+ }
+
+ @Override
+ public boolean showContextMenuForChild(View originalView, float x, float y) {
+ // Reuse the context menu builder
+ if (mWindow.mContextMenu == null) {
+ mWindow.mContextMenu = new ContextMenuBuilder(getContext());
+ mWindow.mContextMenu.setCallback(mWindow.mContextMenuCallback);
+ } else {
+ mWindow.mContextMenu.clearAll();
+ }
+
+ final MenuPopupHelper helper = mWindow.mContextMenu.showPopup(
+ getContext(), originalView, x, y);
+ if (helper != null) {
+ helper.setCallback(mWindow.mContextMenuCallback);
+ } else if (mWindow.mContextMenuPopupHelper != null) {
+ // No menu to show, but if we have a menu currently showing it just became blank.
+ // Close it.
+ mWindow.mContextMenuPopupHelper.dismiss();
+ }
+ mWindow.mContextMenuPopupHelper = helper;
+ return helper != null;
+ }
+
+ @Override
+ public ActionMode startActionModeForChild(View originalView,
+ ActionMode.Callback callback) {
+ return startActionModeForChild(originalView, callback, ActionMode.TYPE_PRIMARY);
+ }
+
+ @Override
+ public ActionMode startActionModeForChild(
+ View child, ActionMode.Callback callback, int type) {
+ return startActionMode(child, callback, type);
+ }
+
+ @Override
+ public ActionMode startActionMode(ActionMode.Callback callback) {
+ return startActionMode(callback, ActionMode.TYPE_PRIMARY);
+ }
+
+ @Override
+ public ActionMode startActionMode(ActionMode.Callback callback, int type) {
+ return startActionMode(this, callback, type);
+ }
+
+ private ActionMode startActionMode(
+ View originatingView, ActionMode.Callback callback, int type) {
+ ActionMode.Callback2 wrappedCallback = new ActionModeCallback2Wrapper(callback);
+ ActionMode mode = null;
+ if (mWindow.getCallback() != null && !mWindow.isDestroyed()) {
+ try {
+ mode = mWindow.getCallback().onWindowStartingActionMode(wrappedCallback, type);
+ } catch (AbstractMethodError ame) {
+ // Older apps might not implement the typed version of this method.
+ if (type == ActionMode.TYPE_PRIMARY) {
+ try {
+ mode = mWindow.getCallback().onWindowStartingActionMode(
+ wrappedCallback);
+ } catch (AbstractMethodError ame2) {
+ // Older apps might not implement this callback method at all.
+ }
+ }
+ }
+ }
+ if (mode != null) {
+ if (mode.getType() == ActionMode.TYPE_PRIMARY) {
+ cleanupPrimaryActionMode();
+ mPrimaryActionMode = mode;
+ } else if (mode.getType() == ActionMode.TYPE_FLOATING) {
+ if (mFloatingActionMode != null) {
+ mFloatingActionMode.finish();
+ }
+ mFloatingActionMode = mode;
+ }
+ } else {
+ mode = createActionMode(type, wrappedCallback, originatingView);
+ if (mode != null && wrappedCallback.onCreateActionMode(mode, mode.getMenu())) {
+ setHandledActionMode(mode);
+ } else {
+ mode = null;
+ }
+ }
+ if (mode != null && mWindow.getCallback() != null && !mWindow.isDestroyed()) {
+ try {
+ mWindow.getCallback().onActionModeStarted(mode);
+ } catch (AbstractMethodError ame) {
+ // Older apps might not implement this callback method.
+ }
+ }
+ return mode;
+ }
+
+ private void cleanupPrimaryActionMode() {
+ if (mPrimaryActionMode != null) {
+ mPrimaryActionMode.finish();
+ mPrimaryActionMode = null;
+ }
+ if (mPrimaryActionModeView != null) {
+ mPrimaryActionModeView.killMode();
+ }
+ }
+
+ private void cleanupFloatingActionModeViews() {
+ if (mFloatingToolbar != null) {
+ mFloatingToolbar.dismiss();
+ mFloatingToolbar = null;
+ }
+ if (mFloatingActionModeOriginatingView != null) {
+ if (mFloatingToolbarPreDrawListener != null) {
+ mFloatingActionModeOriginatingView.getViewTreeObserver()
+ .removeOnPreDrawListener(mFloatingToolbarPreDrawListener);
+ mFloatingToolbarPreDrawListener = null;
+ }
+ mFloatingActionModeOriginatingView = null;
+ }
+ }
+
+ void startChanging() {
+ mChanging = true;
+ }
+
+ void finishChanging() {
+ mChanging = false;
+ drawableChanged();
+ }
+
+ public void setWindowBackground(Drawable drawable) {
+ if (getBackground() != drawable) {
+ setBackgroundDrawable(drawable);
+ if (drawable != null) {
+ drawable.getPadding(mBackgroundPadding);
+ } else {
+ mBackgroundPadding.setEmpty();
+ }
+ drawableChanged();
+ }
+ }
+
+ public void setWindowFrame(Drawable drawable) {
+ if (getForeground() != drawable) {
+ setForeground(drawable);
+ if (drawable != null) {
+ drawable.getPadding(mFramePadding);
+ } else {
+ mFramePadding.setEmpty();
+ }
+ drawableChanged();
+ }
+ }
+
+ @Override
+ public void onWindowSystemUiVisibilityChanged(int visible) {
+ updateColorViews(null /* insets */, true /* animate */);
+ }
+
+ @Override
+ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+ mFrameOffsets.set(insets.getSystemWindowInsets());
+ insets = updateColorViews(insets, true /* animate */);
+ insets = updateStatusGuard(insets);
+ updateNavigationGuard(insets);
+ if (getForeground() != null) {
+ drawableChanged();
+ }
+ return insets;
+ }
+
+ @Override
+ public boolean isTransitionGroup() {
+ return false;
+ }
+
+ WindowInsets updateColorViews(WindowInsets insets, boolean animate) {
+ WindowManager.LayoutParams attrs = mWindow.getAttributes();
+ int sysUiVisibility = attrs.systemUiVisibility | getWindowSystemUiVisibility();
+
+ if (!mWindow.mIsFloating && ActivityManager.isHighEndGfx()) {
+ boolean disallowAnimate = !isLaidOut();
+ disallowAnimate |= ((mLastWindowFlags ^ attrs.flags)
+ & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0;
+ mLastWindowFlags = attrs.flags;
+
+ if (insets != null) {
+ mLastTopInset = Math.min(insets.getStableInsetTop(),
+ insets.getSystemWindowInsetTop());
+ mLastBottomInset = Math.min(insets.getStableInsetBottom(),
+ insets.getSystemWindowInsetBottom());
+ mLastRightInset = Math.min(insets.getStableInsetRight(),
+ insets.getSystemWindowInsetRight());
+
+ // Don't animate if the presence of stable insets has changed, because that
+ // indicates that the window was either just added and received them for the
+ // first time, or the window size or position has changed.
+ boolean hasTopStableInset = insets.getStableInsetTop() != 0;
+ disallowAnimate |= (hasTopStableInset != mLastHasTopStableInset);
+ mLastHasTopStableInset = hasTopStableInset;
+
+ boolean hasBottomStableInset = insets.getStableInsetBottom() != 0;
+ disallowAnimate |= (hasBottomStableInset != mLastHasBottomStableInset);
+ mLastHasBottomStableInset = hasBottomStableInset;
+
+ boolean hasRightStableInset = insets.getStableInsetRight() != 0;
+ disallowAnimate |= (hasRightStableInset != mLastHasRightStableInset);
+ mLastHasRightStableInset = hasRightStableInset;
+ }
+
+ boolean navBarToRightEdge = mLastBottomInset == 0 && mLastRightInset > 0;
+ int navBarSize = navBarToRightEdge ? mLastRightInset : mLastBottomInset;
+ updateColorViewInt(mNavigationColorViewState, sysUiVisibility,
+ mWindow.mNavigationBarColor, navBarSize, navBarToRightEdge,
+ 0 /* rightInset */, animate && !disallowAnimate);
+
+ boolean statusBarNeedsRightInset = navBarToRightEdge
+ && mNavigationColorViewState.present;
+ int statusBarRightInset = statusBarNeedsRightInset ? mLastRightInset : 0;
+ updateColorViewInt(mStatusColorViewState, sysUiVisibility, mWindow.mStatusBarColor,
+ mLastTopInset, false /* matchVertical */, statusBarRightInset,
+ animate && !disallowAnimate);
+ }
+
+ // When we expand the window with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, we still need
+ // to ensure that the rest of the view hierarchy doesn't notice it, unless they've
+ // explicitly asked for it.
+
+ boolean consumingNavBar =
+ (attrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0
+ && (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0
+ && (sysUiVisibility & SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
+
+ int consumedRight = consumingNavBar ? mLastRightInset : 0;
+ int consumedBottom = consumingNavBar ? mLastBottomInset : 0;
+
+ if (mContentRoot != null
+ && mContentRoot.getLayoutParams() instanceof MarginLayoutParams) {
+ MarginLayoutParams lp = (MarginLayoutParams) mContentRoot.getLayoutParams();
+ if (lp.rightMargin != consumedRight || lp.bottomMargin != consumedBottom) {
+ lp.rightMargin = consumedRight;
+ lp.bottomMargin = consumedBottom;
+ mContentRoot.setLayoutParams(lp);
+
+ if (insets == null) {
+ // The insets have changed, but we're not currently in the process
+ // of dispatching them.
+ requestApplyInsets();
+ }
+ }
+ if (insets != null) {
+ insets = insets.replaceSystemWindowInsets(
+ insets.getSystemWindowInsetLeft(),
+ insets.getSystemWindowInsetTop(),
+ insets.getSystemWindowInsetRight() - consumedRight,
+ insets.getSystemWindowInsetBottom() - consumedBottom);
+ }
+ }
+
+ if (insets != null) {
+ insets = insets.consumeStableInsets();
+ }
+ return insets;
+ }
+
+ /**
+ * Update a color view
+ *
+ * @param state the color view to update.
+ * @param sysUiVis the current systemUiVisibility to apply.
+ * @param color the current color to apply.
+ * @param size the current size in the non-parent-matching dimension.
+ * @param verticalBar if true the view is attached to a vertical edge, otherwise to a
+ * horizontal edge,
+ * @param rightMargin rightMargin for the color view.
+ * @param animate if true, the change will be animated.
+ */
+ private void updateColorViewInt(final ColorViewState state, int sysUiVis, int color,
+ int size, boolean verticalBar, int rightMargin, boolean animate) {
+ state.present = size > 0 && (sysUiVis & state.systemUiHideFlag) == 0
+ && (mWindow.getAttributes().flags & state.hideWindowFlag) == 0
+ && (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0;
+ boolean show = state.present
+ && (color & Color.BLACK) != 0
+ && (mWindow.getAttributes().flags & state.translucentFlag) == 0;
+
+ boolean visibilityChanged = false;
+ View view = state.view;
+
+ int resolvedHeight = verticalBar ? LayoutParams.MATCH_PARENT : size;
+ int resolvedWidth = verticalBar ? size : LayoutParams.MATCH_PARENT;
+ int resolvedGravity = verticalBar ? state.horizontalGravity : state.verticalGravity;
+
+ if (view == null) {
+ if (show) {
+ state.view = view = new View(mContext);
+ view.setBackgroundColor(color);
+ view.setTransitionName(state.transitionName);
+ view.setId(state.id);
+ visibilityChanged = true;
+ view.setVisibility(INVISIBLE);
+ state.targetVisibility = VISIBLE;
+
+ LayoutParams lp = new LayoutParams(resolvedWidth, resolvedHeight,
+ resolvedGravity);
+ lp.rightMargin = rightMargin;
+ addView(view, lp);
+ updateColorViewTranslations();
+ }
+ } else {
+ int vis = show ? VISIBLE : INVISIBLE;
+ visibilityChanged = state.targetVisibility != vis;
+ state.targetVisibility = vis;
+ LayoutParams lp = (LayoutParams) view.getLayoutParams();
+ if (lp.height != resolvedHeight || lp.width != resolvedWidth
+ || lp.gravity != resolvedGravity || lp.rightMargin != rightMargin) {
+ lp.height = resolvedHeight;
+ lp.width = resolvedWidth;
+ lp.gravity = resolvedGravity;
+ lp.rightMargin = rightMargin;
+ view.setLayoutParams(lp);
+ }
+ if (show) {
+ view.setBackgroundColor(color);
+ }
+ }
+ if (visibilityChanged) {
+ view.animate().cancel();
+ if (animate) {
+ if (show) {
+ if (view.getVisibility() != VISIBLE) {
+ view.setVisibility(VISIBLE);
+ view.setAlpha(0.0f);
+ }
+ view.animate().alpha(1.0f).setInterpolator(mShowInterpolator).
+ setDuration(mBarEnterExitDuration);
+ } else {
+ view.animate().alpha(0.0f).setInterpolator(mHideInterpolator)
+ .setDuration(mBarEnterExitDuration)
+ .withEndAction(new Runnable() {
+ @Override
+ public void run() {
+ state.view.setAlpha(1.0f);
+ state.view.setVisibility(INVISIBLE);
+ }
+ });
+ }
+ } else {
+ view.setAlpha(1.0f);
+ view.setVisibility(show ? VISIBLE : INVISIBLE);
+ }
+ }
+ }
+
+ private void updateColorViewTranslations() {
+ // Put the color views back in place when they get moved off the screen
+ // due to the the ViewRootImpl panning.
+ int rootScrollY = mRootScrollY;
+ if (mStatusColorViewState.view != null) {
+ mStatusColorViewState.view.setTranslationY(rootScrollY > 0 ? rootScrollY : 0);
+ }
+ if (mNavigationColorViewState.view != null) {
+ mNavigationColorViewState.view.setTranslationY(rootScrollY < 0 ? rootScrollY : 0);
+ }
+ }
+
+ private WindowInsets updateStatusGuard(WindowInsets insets) {
+ boolean showStatusGuard = false;
+ // Show the status guard when the non-overlay contextual action bar is showing
+ if (mPrimaryActionModeView != null) {
+ if (mPrimaryActionModeView.getLayoutParams() instanceof MarginLayoutParams) {
+ // Insets are magic!
+ final MarginLayoutParams mlp = (MarginLayoutParams)
+ mPrimaryActionModeView.getLayoutParams();
+ boolean mlpChanged = false;
+ if (mPrimaryActionModeView.isShown()) {
+ if (mTempRect == null) {
+ mTempRect = new Rect();
+ }
+ final Rect rect = mTempRect;
+
+ // If the parent doesn't consume the insets, manually
+ // apply the default system window insets.
+ mWindow.mContentParent.computeSystemWindowInsets(insets, rect);
+ final int newMargin = rect.top == 0 ? insets.getSystemWindowInsetTop() : 0;
+ if (mlp.topMargin != newMargin) {
+ mlpChanged = true;
+ mlp.topMargin = insets.getSystemWindowInsetTop();
+
+ if (mStatusGuard == null) {
+ mStatusGuard = new View(mContext);
+ mStatusGuard.setBackgroundColor(mContext.getColor(
+ R.color.input_method_navigation_guard));
+ addView(mStatusGuard, indexOfChild(mStatusColorViewState.view),
+ new LayoutParams(LayoutParams.MATCH_PARENT,
+ mlp.topMargin, Gravity.START | Gravity.TOP));
+ } else {
+ final LayoutParams lp = (LayoutParams)
+ mStatusGuard.getLayoutParams();
+ if (lp.height != mlp.topMargin) {
+ lp.height = mlp.topMargin;
+ mStatusGuard.setLayoutParams(lp);
+ }
+ }
+ }
+
+ // The action mode's theme may differ from the app, so
+ // always show the status guard above it if we have one.
+ showStatusGuard = mStatusGuard != null;
+
+ // We only need to consume the insets if the action
+ // mode is overlaid on the app content (e.g. it's
+ // sitting in a FrameLayout, see
+ // screen_simple_overlay_action_mode.xml).
+ final boolean nonOverlay = (mWindow.getLocalFeaturesPrivate()
+ & (1 << Window.FEATURE_ACTION_MODE_OVERLAY)) == 0;
+ insets = insets.consumeSystemWindowInsets(
+ false, nonOverlay && showStatusGuard /* top */, false, false);
+ } else {
+ // reset top margin
+ if (mlp.topMargin != 0) {
+ mlpChanged = true;
+ mlp.topMargin = 0;
+ }
+ }
+ if (mlpChanged) {
+ mPrimaryActionModeView.setLayoutParams(mlp);
+ }
+ }
+ }
+ if (mStatusGuard != null) {
+ mStatusGuard.setVisibility(showStatusGuard ? View.VISIBLE : View.GONE);
+ }
+ return insets;
+ }
+
+ private void updateNavigationGuard(WindowInsets insets) {
+ // IMEs lay out below the nav bar, but the content view must not (for back compat)
+ if (mWindow.getAttributes().type == WindowManager.LayoutParams.TYPE_INPUT_METHOD) {
+ // prevent the content view from including the nav bar height
+ if (mWindow.mContentParent != null) {
+ if (mWindow.mContentParent.getLayoutParams() instanceof MarginLayoutParams) {
+ MarginLayoutParams mlp =
+ (MarginLayoutParams) mWindow.mContentParent.getLayoutParams();
+ mlp.bottomMargin = insets.getSystemWindowInsetBottom();
+ mWindow.mContentParent.setLayoutParams(mlp);
+ }
+ }
+ // position the navigation guard view, creating it if necessary
+ if (mNavigationGuard == null) {
+ mNavigationGuard = new View(mContext);
+ mNavigationGuard.setBackgroundColor(mContext.getColor(
+ R.color.input_method_navigation_guard));
+ addView(mNavigationGuard, indexOfChild(mNavigationColorViewState.view),
+ new LayoutParams(LayoutParams.MATCH_PARENT,
+ insets.getSystemWindowInsetBottom(),
+ Gravity.START | Gravity.BOTTOM));
+ } else {
+ LayoutParams lp = (LayoutParams) mNavigationGuard.getLayoutParams();
+ lp.height = insets.getSystemWindowInsetBottom();
+ mNavigationGuard.setLayoutParams(lp);
+ }
+ }
+ }
+
+ private void drawableChanged() {
+ if (mChanging) {
+ return;
+ }
+
+ setPadding(mFramePadding.left + mBackgroundPadding.left,
+ mFramePadding.top + mBackgroundPadding.top,
+ mFramePadding.right + mBackgroundPadding.right,
+ mFramePadding.bottom + mBackgroundPadding.bottom);
+ requestLayout();
+ invalidate();
+
+ int opacity = PixelFormat.OPAQUE;
+ if (ActivityManager.StackId.hasWindowShadow(mStackId)) {
+ // If the window has a shadow, it must be translucent.
+ opacity = PixelFormat.TRANSLUCENT;
+ } else{
+ // Note: If there is no background, we will assume opaque. The
+ // common case seems to be that an application sets there to be
+ // no background so it can draw everything itself. For that,
+ // we would like to assume OPAQUE and let the app force it to
+ // the slower TRANSLUCENT mode if that is really what it wants.
+ Drawable bg = getBackground();
+ Drawable fg = getForeground();
+ if (bg != null) {
+ if (fg == null) {
+ opacity = bg.getOpacity();
+ } else if (mFramePadding.left <= 0 && mFramePadding.top <= 0
+ && mFramePadding.right <= 0 && mFramePadding.bottom <= 0) {
+ // If the frame padding is zero, then we can be opaque
+ // if either the frame -or- the background is opaque.
+ int fop = fg.getOpacity();
+ int bop = bg.getOpacity();
+ if (false)
+ Log.v(TAG, "Background opacity: " + bop + ", Frame opacity: " + fop);
+ if (fop == PixelFormat.OPAQUE || bop == PixelFormat.OPAQUE) {
+ opacity = PixelFormat.OPAQUE;
+ } else if (fop == PixelFormat.UNKNOWN) {
+ opacity = bop;
+ } else if (bop == PixelFormat.UNKNOWN) {
+ opacity = fop;
+ } else {
+ opacity = Drawable.resolveOpacity(fop, bop);
+ }
+ } else {
+ // For now we have to assume translucent if there is a
+ // frame with padding... there is no way to tell if the
+ // frame and background together will draw all pixels.
+ if (false)
+ Log.v(TAG, "Padding: " + mFramePadding);
+ opacity = PixelFormat.TRANSLUCENT;
+ }
+ }
+ if (false)
+ Log.v(TAG, "Background: " + bg + ", Frame: " + fg);
+ }
+
+ if (false)
+ Log.v(TAG, "Selected default opacity: " + opacity);
+
+ mDefaultOpacity = opacity;
+ if (mFeatureId < 0) {
+ mWindow.setDefaultWindowFormat(opacity);
+ }
+ }
+
+ @Override
+ public void onWindowFocusChanged(boolean hasWindowFocus) {
+ super.onWindowFocusChanged(hasWindowFocus);
+
+ // If the user is chording a menu shortcut, release the chord since
+ // this window lost focus
+ if (mWindow.hasFeature(Window.FEATURE_OPTIONS_PANEL) && !hasWindowFocus
+ && mWindow.mPanelChordingKey != 0) {
+ mWindow.closePanel(Window.FEATURE_OPTIONS_PANEL);
+ }
+
+ final Window.Callback cb = mWindow.getCallback();
+ if (cb != null && !mWindow.isDestroyed() && mFeatureId < 0) {
+ cb.onWindowFocusChanged(hasWindowFocus);
+ }
+
+ if (mPrimaryActionMode != null) {
+ mPrimaryActionMode.onWindowFocusChanged(hasWindowFocus);
+ }
+ if (mFloatingActionMode != null) {
+ mFloatingActionMode.onWindowFocusChanged(hasWindowFocus);
+ }
+
+ updateElevation();
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+
+ final Window.Callback cb = mWindow.getCallback();
+ if (cb != null && !mWindow.isDestroyed() && mFeatureId < 0) {
+ cb.onAttachedToWindow();
+ }
+
+ if (mFeatureId == -1) {
+ /*
+ * The main window has been attached, try to restore any panels
+ * that may have been open before. This is called in cases where
+ * an activity is being killed for configuration change and the
+ * menu was open. When the activity is recreated, the menu
+ * should be shown again.
+ */
+ mWindow.openPanelsAfterRestore();
+ }
+
+ if (!mWindowResizeCallbacksAdded) {
+ // If there is no window callback installed there was no window set before. Set it now.
+ // Note that our ViewRootImpl object will not change.
+ getViewRootImpl().addWindowCallbacks(this);
+ mWindowResizeCallbacksAdded = true;
+ } else if (mBackdropFrameRenderer != null) {
+ // We are resizing and this call happened due to a configuration change. Tell the
+ // renderer about it.
+ mBackdropFrameRenderer.onConfigurationChange();
+ }
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+
+ final Window.Callback cb = mWindow.getCallback();
+ if (cb != null && mFeatureId < 0) {
+ cb.onDetachedFromWindow();
+ }
+
+ if (mWindow.mDecorContentParent != null) {
+ mWindow.mDecorContentParent.dismissPopups();
+ }
+
+ if (mPrimaryActionModePopup != null) {
+ removeCallbacks(mShowPrimaryActionModePopup);
+ if (mPrimaryActionModePopup.isShowing()) {
+ mPrimaryActionModePopup.dismiss();
+ }
+ mPrimaryActionModePopup = null;
+ }
+ if (mFloatingToolbar != null) {
+ mFloatingToolbar.dismiss();
+ mFloatingToolbar = null;
+ }
+
+ PhoneWindow.PanelFeatureState st = mWindow.getPanelState(Window.FEATURE_OPTIONS_PANEL, false);
+ if (st != null && st.menu != null && mFeatureId < 0) {
+ st.menu.close();
+ }
+
+ if (mWindowResizeCallbacksAdded) {
+ getViewRootImpl().removeWindowCallbacks(this);
+ mWindowResizeCallbacksAdded = false;
+ }
+ }
+
+ @Override
+ public void onCloseSystemDialogs(String reason) {
+ if (mFeatureId >= 0) {
+ mWindow.closeAllPanels();
+ }
+ }
+
+ public android.view.SurfaceHolder.Callback2 willYouTakeTheSurface() {
+ return mFeatureId < 0 ? mWindow.mTakeSurfaceCallback : null;
+ }
+
+ public InputQueue.Callback willYouTakeTheInputQueue() {
+ return mFeatureId < 0 ? mWindow.mTakeInputQueueCallback : null;
+ }
+
+ public void setSurfaceType(int type) {
+ mWindow.setType(type);
+ }
+
+ public void setSurfaceFormat(int format) {
+ mWindow.setFormat(format);
+ }
+
+ public void setSurfaceKeepScreenOn(boolean keepOn) {
+ if (keepOn) mWindow.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ else mWindow.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+
+ @Override
+ public void onRootViewScrollYChanged(int rootScrollY) {
+ mRootScrollY = rootScrollY;
+ updateColorViewTranslations();
+ }
+
+ private ActionMode createActionMode(
+ int type, ActionMode.Callback2 callback, View originatingView) {
+ switch (type) {
+ case ActionMode.TYPE_PRIMARY:
+ default:
+ return createStandaloneActionMode(callback);
+ case ActionMode.TYPE_FLOATING:
+ return createFloatingActionMode(originatingView, callback);
+ }
+ }
+
+ private void setHandledActionMode(ActionMode mode) {
+ if (mode.getType() == ActionMode.TYPE_PRIMARY) {
+ setHandledPrimaryActionMode(mode);
+ } else if (mode.getType() == ActionMode.TYPE_FLOATING) {
+ setHandledFloatingActionMode(mode);
+ }
+ }
+
+ private ActionMode createStandaloneActionMode(ActionMode.Callback callback) {
+ endOnGoingFadeAnimation();
+ cleanupPrimaryActionMode();
+ if (mPrimaryActionModeView == null) {
+ if (mWindow.isFloating()) {
+ // Use the action bar theme.
+ final TypedValue outValue = new TypedValue();
+ final Resources.Theme baseTheme = mContext.getTheme();
+ baseTheme.resolveAttribute(R.attr.actionBarTheme, outValue, true);
+
+ final Context actionBarContext;
+ if (outValue.resourceId != 0) {
+ final Resources.Theme actionBarTheme = mContext.getResources().newTheme();
+ actionBarTheme.setTo(baseTheme);
+ actionBarTheme.applyStyle(outValue.resourceId, true);
+
+ actionBarContext = new ContextThemeWrapper(mContext, 0);
+ actionBarContext.getTheme().setTo(actionBarTheme);
+ } else {
+ actionBarContext = mContext;
+ }
+
+ mPrimaryActionModeView = new ActionBarContextView(actionBarContext);
+ mPrimaryActionModePopup = new PopupWindow(actionBarContext, null,
+ R.attr.actionModePopupWindowStyle);
+ mPrimaryActionModePopup.setWindowLayoutType(
+ WindowManager.LayoutParams.TYPE_APPLICATION);
+ mPrimaryActionModePopup.setContentView(mPrimaryActionModeView);
+ mPrimaryActionModePopup.setWidth(MATCH_PARENT);
+
+ actionBarContext.getTheme().resolveAttribute(
+ R.attr.actionBarSize, outValue, true);
+ final int height = TypedValue.complexToDimensionPixelSize(outValue.data,
+ actionBarContext.getResources().getDisplayMetrics());
+ mPrimaryActionModeView.setContentHeight(height);
+ mPrimaryActionModePopup.setHeight(WRAP_CONTENT);
+ mShowPrimaryActionModePopup = new Runnable() {
+ public void run() {
+ mPrimaryActionModePopup.showAtLocation(
+ mPrimaryActionModeView.getApplicationWindowToken(),
+ Gravity.TOP | Gravity.FILL_HORIZONTAL, 0, 0);
+ endOnGoingFadeAnimation();
+ mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA,
+ 0f, 1f);
+ mFadeAnim.addListener(new Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mPrimaryActionModeView.setVisibility(VISIBLE);
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mPrimaryActionModeView.setAlpha(1f);
+ mFadeAnim = null;
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+
+ }
+ });
+ mFadeAnim.start();
+ }
+ };
+ } else {
+ ViewStub stub = (ViewStub) findViewById(R.id.action_mode_bar_stub);
+ if (stub != null) {
+ mPrimaryActionModeView = (ActionBarContextView) stub.inflate();
+ }
+ }
+ }
+ if (mPrimaryActionModeView != null) {
+ mPrimaryActionModeView.killMode();
+ ActionMode mode = new StandaloneActionMode(
+ mPrimaryActionModeView.getContext(), mPrimaryActionModeView,
+ callback, mPrimaryActionModePopup == null);
+ return mode;
+ }
+ return null;
+ }
+
+ private void endOnGoingFadeAnimation() {
+ if (mFadeAnim != null) {
+ mFadeAnim.end();
+ }
+ }
+
+ private void setHandledPrimaryActionMode(ActionMode mode) {
+ endOnGoingFadeAnimation();
+ mPrimaryActionMode = mode;
+ mPrimaryActionMode.invalidate();
+ mPrimaryActionModeView.initForMode(mPrimaryActionMode);
+ if (mPrimaryActionModePopup != null) {
+ post(mShowPrimaryActionModePopup);
+ } else {
+ mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA, 0f, 1f);
+ mFadeAnim.addListener(new Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mPrimaryActionModeView.setVisibility(View.VISIBLE);
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mPrimaryActionModeView.setAlpha(1f);
+ mFadeAnim = null;
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+
+ }
+ });
+ mFadeAnim.start();
+ }
+ mPrimaryActionModeView.sendAccessibilityEvent(
+ AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+ }
+
+ private ActionMode createFloatingActionMode(
+ View originatingView, ActionMode.Callback2 callback) {
+ if (mFloatingActionMode != null) {
+ mFloatingActionMode.finish();
+ }
+ cleanupFloatingActionModeViews();
+ final FloatingActionMode mode =
+ new FloatingActionMode(mContext, callback, originatingView);
+ mFloatingActionModeOriginatingView = originatingView;
+ mFloatingToolbarPreDrawListener =
+ new ViewTreeObserver.OnPreDrawListener() {
+ @Override
+ public boolean onPreDraw() {
+ mode.updateViewLocationInWindow();
+ return true;
+ }
+ };
+ return mode;
+ }
+
+ private void setHandledFloatingActionMode(ActionMode mode) {
+ mFloatingActionMode = mode;
+ mFloatingToolbar = new FloatingToolbar(mContext, mWindow);
+ ((FloatingActionMode) mFloatingActionMode).setFloatingToolbar(mFloatingToolbar);
+ mFloatingActionMode.invalidate(); // Will show the floating toolbar if necessary.
+ mFloatingActionModeOriginatingView.getViewTreeObserver()
+ .addOnPreDrawListener(mFloatingToolbarPreDrawListener);
+ }
+
+ /**
+ * Informs the decor if the caption is attached and visible.
+ * @param attachedAndVisible true when the decor is visible.
+ * Note that this will even be called if there is no caption.
+ **/
+ void enableCaption(boolean attachedAndVisible) {
+ if (mHasCaption != attachedAndVisible) {
+ mHasCaption = attachedAndVisible;
+ if (getForeground() != null) {
+ drawableChanged();
+ }
+ }
+ }
+
+ void setWindow(PhoneWindow phoneWindow) {
+ mWindow = phoneWindow;
+ Context context = getContext();
+ if (context instanceof DecorContext) {
+ DecorContext decorContext = (DecorContext) context;
+ decorContext.setPhoneWindow(mWindow);
+ }
+ }
+
+ void onConfigurationChanged() {
+ int workspaceId = getStackId();
+ if (mDecorCaptionView != null) {
+ if (mStackId != workspaceId) {
+ mStackId = workspaceId;
+ // We might have to change the kind of surface before we do anything else.
+ mDecorCaptionView.onConfigurationChanged(
+ ActivityManager.StackId.hasWindowDecor(mStackId));
+ enableCaption(ActivityManager.StackId.hasWindowDecor(workspaceId));
+ }
+ }
+ initializeElevation();
+ }
+
+ View onResourcesLoaded(LayoutInflater inflater, int layoutResource) {
+ mStackId = getStackId();
+
+ mResizingBackgroundDrawable = getResizingBackgroundDrawable(
+ mWindow.mBackgroundResource, mWindow.mBackgroundFallbackResource);
+ mCaptionBackgroundDrawable =
+ getContext().getDrawable(R.drawable.decor_caption_title_focused);
+
+ if (mBackdropFrameRenderer != null) {
+ mBackdropFrameRenderer.onResourcesLoaded(
+ this, mResizingBackgroundDrawable, mCaptionBackgroundDrawable);
+ }
+
+ mDecorCaptionView = createDecorCaptionView(inflater);
+ final View root = inflater.inflate(layoutResource, null);
+ if (mDecorCaptionView != null) {
+ if (mDecorCaptionView.getParent() == null) {
+ addView(mDecorCaptionView,
+ new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+ }
+ mDecorCaptionView.addView(root,
+ new ViewGroup.MarginLayoutParams(MATCH_PARENT, MATCH_PARENT));
+ } else {
+ addView(root, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+ }
+ mContentRoot = (ViewGroup) root;
+ initializeElevation();
+ return root;
+ }
+
+ // Free floating overlapping windows require a caption.
+ private DecorCaptionView createDecorCaptionView(LayoutInflater inflater) {
+ DecorCaptionView DecorCaptionView = null;
+ for (int i = getChildCount() - 1; i >= 0 && DecorCaptionView == null; i--) {
+ View view = getChildAt(i);
+ if (view instanceof DecorCaptionView) {
+ // The decor was most likely saved from a relaunch - so reuse it.
+ DecorCaptionView = (DecorCaptionView) view;
+ removeViewAt(i);
+ }
+ }
+ final WindowManager.LayoutParams attrs = mWindow.getAttributes();
+ final boolean isApplication = attrs.type == TYPE_BASE_APPLICATION ||
+ attrs.type == TYPE_APPLICATION;
+ // Only a non floating application window on one of the allowed workspaces can get a caption
+ if (!mWindow.isFloating() && isApplication
+ && ActivityManager.StackId.hasWindowDecor(mStackId)) {
+ // Dependent on the brightness of the used title we either use the
+ // dark or the light button frame.
+ if (DecorCaptionView == null) {
+ Context context = getContext();
+ TypedValue value = new TypedValue();
+ context.getTheme().resolveAttribute(R.attr.colorPrimary, value, true);
+ inflater = inflater.from(context);
+ if (Color.luminance(value.data) < 0.5) {
+ DecorCaptionView = (DecorCaptionView) inflater.inflate(
+ R.layout.decor_caption_dark, null);
+ } else {
+ DecorCaptionView = (DecorCaptionView) inflater.inflate(
+ R.layout.decor_caption_light, null);
+ }
+ }
+ DecorCaptionView.setPhoneWindow(mWindow, true /*showDecor*/);
+ } else {
+ DecorCaptionView = null;
+ }
+
+ // Tell the decor if it has a visible caption.
+ enableCaption(DecorCaptionView != null);
+ return DecorCaptionView;
+ }
+
+ /**
+ * Returns the color used to fill areas the app has not rendered content to yet when the
+ * user is resizing the window of an activity in multi-window mode.
+ */
+ private Drawable getResizingBackgroundDrawable(int backgroundRes, int backgroundFallbackRes) {
+ final Context context = getContext();
+
+ if (backgroundRes != 0) {
+ final Drawable drawable = context.getDrawable(backgroundRes);
+ if (drawable != null) {
+ return drawable;
+ }
+ }
+
+ if (backgroundFallbackRes != 0) {
+ final Drawable fallbackDrawable = context.getDrawable(backgroundFallbackRes);
+ if (fallbackDrawable != null) {
+ return fallbackDrawable;
+ }
+ }
+
+ // We shouldn't really get here as the background fallback should be always available since
+ // it is defaulted by the system.
+ Log.w(TAG, "Failed to find background drawable for PhoneWindow=" + mWindow);
+ return null;
+ }
+
+ /**
+ * Returns the Id of the stack which contains this window.
+ * Note that if no stack can be determined - which usually means that it was not
+ * created for an activity - the fullscreen stack ID will be returned.
+ * @return Returns the stack id which contains this window.
+ **/
+ private int getStackId() {
+ int workspaceId = INVALID_STACK_ID;
+ final Window.WindowControllerCallback callback = mWindow.getWindowControllerCallback();
+ if (callback != null) {
+ try {
+ workspaceId = callback.getWindowStackId();
+ } catch (RemoteException ex) {
+ Log.e(TAG, "Failed to get the workspace ID of a PhoneWindow.");
+ }
+ }
+ if (workspaceId == INVALID_STACK_ID) {
+ return FULLSCREEN_WORKSPACE_STACK_ID;
+ }
+ return workspaceId;
+ }
+
+ void clearContentView() {
+ if (mDecorCaptionView != null) {
+ mDecorCaptionView.removeContentView();
+ } else {
+ // This window doesn't have caption, so we need to just remove the
+ // children of the decor view.
+ removeAllViews();
+ }
+ }
+
+ @Override
+ public void onWindowSizeIsChanging(Rect newBounds) {
+ if (mBackdropFrameRenderer != null) {
+ mBackdropFrameRenderer.setTargetRect(newBounds);
+ }
+ }
+
+ @Override
+ public void onWindowDragResizeStart(Rect initialBounds) {
+ if (mWindow.isDestroyed()) {
+ // If the owner's window is gone, we should not be able to come here anymore.
+ releaseThreadedRenderer();
+ return;
+ }
+ if (mBackdropFrameRenderer != null) {
+ return;
+ }
+ final ThreadedRenderer renderer = (ThreadedRenderer) getHardwareRenderer();
+ if (renderer != null) {
+ mBackdropFrameRenderer = new BackdropFrameRenderer(this, renderer,
+ initialBounds, mResizingBackgroundDrawable, mCaptionBackgroundDrawable);
+
+ // Get rid of the shadow while we are resizing. Shadow drawing takes considerable time.
+ // If we want to get the shadow shown while resizing, we would need to elevate a new
+ // element which owns the caption and has the elevation.
+ updateElevation();
+ }
+ }
+
+ @Override
+ public void onWindowDragResizeEnd() {
+ releaseThreadedRenderer();
+ }
+
+ @Override
+ public boolean onContentDrawn(int offsetX, int offsetY, int sizeX, int sizeY) {
+ if (mBackdropFrameRenderer == null) {
+ return false;
+ }
+ return mBackdropFrameRenderer.onContentDrawn(offsetX, offsetY, sizeX, sizeY);
+ }
+
+ @Override
+ public void onRequestDraw(boolean reportNextDraw) {
+ if (mBackdropFrameRenderer != null) {
+ mBackdropFrameRenderer.onRequestDraw(reportNextDraw);
+ } else if (reportNextDraw) {
+ // If render thread is gone, just report immediately.
+ if (isAttachedToWindow()) {
+ getViewRootImpl().reportDrawFinish();
+ }
+ }
+ }
+
+ /** Release the renderer thread which is usually done when the user stops resizing. */
+ private void releaseThreadedRenderer() {
+ if (mBackdropFrameRenderer != null) {
+ mBackdropFrameRenderer.releaseRenderer();
+ mBackdropFrameRenderer = null;
+ // Bring the shadow back.
+ updateElevation();
+ }
+ }
+
+ /**
+ * The elevation gets set for the first time and the framework needs to be informed that
+ * the surface layer gets created with the shadow size in mind.
+ */
+ private void initializeElevation() {
+ // TODO(skuhne): Call setMaxElevation here accordingly after b/22668382 got fixed.
+ mAllowUpdateElevation = false;
+ updateElevation();
+ }
+
+ private void updateElevation() {
+ float elevation = 0;
+ final boolean wasAdjustedForStack = mElevationAdjustedForStack;
+ // Do not use a shadow when we are in resizing mode (mBackdropFrameRenderer not null)
+ // since the shadow is bound to the content size and not the target size.
+ if (ActivityManager.StackId.hasWindowShadow(mStackId)
+ && mBackdropFrameRenderer == null) {
+ elevation = hasWindowFocus() ?
+ DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP : DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP;
+ // TODO(skuhne): Remove this if clause once b/22668382 got fixed.
+ if (!mAllowUpdateElevation) {
+ elevation = DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP;
+ }
+ // Convert the DP elevation into physical pixels.
+ elevation = dipToPx(elevation);
+ mElevationAdjustedForStack = true;
+ } else {
+ mElevationAdjustedForStack = false;
+ }
+
+ // Don't change the elevation if we didn't previously adjust it for the stack it was in
+ // or it didn't change.
+ if ((wasAdjustedForStack || mElevationAdjustedForStack)
+ && getElevation() != elevation) {
+ mWindow.setElevation(elevation);
+ }
+ }
+
+ boolean isShowingCaption() {
+ return mDecorCaptionView != null && mDecorCaptionView.isCaptionShowing();
+ }
+
+ int getCaptionHeight() {
+ return isShowingCaption() ? mDecorCaptionView.getCaptionHeight() : 0;
+ }
+
+ /**
+ * Converts a DIP measure into physical pixels.
+ * @param dip The dip value.
+ * @return Returns the number of pixels.
+ */
+ private float dipToPx(float dip) {
+ return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dip,
+ getResources().getDisplayMetrics());
+ }
+
+ private static class ColorViewState {
+ View view = null;
+ int targetVisibility = View.INVISIBLE;
+ boolean present = false;
+
+ final int id;
+ final int systemUiHideFlag;
+ final int translucentFlag;
+ final int verticalGravity;
+ final int horizontalGravity;
+ final String transitionName;
+ final int hideWindowFlag;
+
+ ColorViewState(int systemUiHideFlag,
+ int translucentFlag, int verticalGravity, int horizontalGravity,
+ String transitionName, int id, int hideWindowFlag) {
+ this.id = id;
+ this.systemUiHideFlag = systemUiHideFlag;
+ this.translucentFlag = translucentFlag;
+ this.verticalGravity = verticalGravity;
+ this.horizontalGravity = horizontalGravity;
+ this.transitionName = transitionName;
+ this.hideWindowFlag = hideWindowFlag;
+ }
+ }
+
+ /**
+ * Clears out internal references when the action mode is destroyed.
+ */
+ private class ActionModeCallback2Wrapper extends ActionMode.Callback2 {
+ private final ActionMode.Callback mWrapped;
+
+ public ActionModeCallback2Wrapper(ActionMode.Callback wrapped) {
+ mWrapped = wrapped;
+ }
+
+ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ return mWrapped.onCreateActionMode(mode, menu);
+ }
+
+ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+ requestFitSystemWindows();
+ return mWrapped.onPrepareActionMode(mode, menu);
+ }
+
+ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+ return mWrapped.onActionItemClicked(mode, item);
+ }
+
+ public void onDestroyActionMode(ActionMode mode) {
+ mWrapped.onDestroyActionMode(mode);
+ final boolean isMncApp = mContext.getApplicationInfo().targetSdkVersion
+ >= Build.VERSION_CODES.M;
+ final boolean isPrimary;
+ final boolean isFloating;
+ if (isMncApp) {
+ isPrimary = mode == mPrimaryActionMode;
+ isFloating = mode == mFloatingActionMode;
+ if (!isPrimary && mode.getType() == ActionMode.TYPE_PRIMARY) {
+ Log.e(TAG, "Destroying unexpected ActionMode instance of TYPE_PRIMARY; "
+ + mode + " was not the current primary action mode! Expected "
+ + mPrimaryActionMode);
+ }
+ if (!isFloating && mode.getType() == ActionMode.TYPE_FLOATING) {
+ Log.e(TAG, "Destroying unexpected ActionMode instance of TYPE_FLOATING; "
+ + mode + " was not the current floating action mode! Expected "
+ + mFloatingActionMode);
+ }
+ } else {
+ isPrimary = mode.getType() == ActionMode.TYPE_PRIMARY;
+ isFloating = mode.getType() == ActionMode.TYPE_FLOATING;
+ }
+ if (isPrimary) {
+ if (mPrimaryActionModePopup != null) {
+ removeCallbacks(mShowPrimaryActionModePopup);
+ }
+ if (mPrimaryActionModeView != null) {
+ endOnGoingFadeAnimation();
+ mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA,
+ 1f, 0f);
+ mFadeAnim.addListener(new Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mPrimaryActionModeView.setVisibility(GONE);
+ if (mPrimaryActionModePopup != null) {
+ mPrimaryActionModePopup.dismiss();
+ }
+ mPrimaryActionModeView.removeAllViews();
+ mFadeAnim = null;
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+
+ }
+ });
+ mFadeAnim.start();
+ }
+
+ mPrimaryActionMode = null;
+ } else if (isFloating) {
+ cleanupFloatingActionModeViews();
+ mFloatingActionMode = null;
+ }
+ if (mWindow.getCallback() != null && !mWindow.isDestroyed()) {
+ try {
+ mWindow.getCallback().onActionModeFinished(mode);
+ } catch (AbstractMethodError ame) {
+ // Older apps might not implement this callback method.
+ }
+ }
+ requestFitSystemWindows();
+ }
+
+ @Override
+ public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+ if (mWrapped instanceof ActionMode.Callback2) {
+ ((ActionMode.Callback2) mWrapped).onGetContentRect(mode, view, outRect);
+ } else {
+ super.onGetContentRect(mode, view, outRect);
+ }
+ }
+ }
+}
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index 83f810f..6e7e5cf 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -16,24 +16,14 @@
package com.android.internal.policy;
-import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
-import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
-import static android.view.View.MeasureSpec.AT_MOST;
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.getMode;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static android.view.WindowManager.LayoutParams.*;
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.app.ActivityManager.StackId;
import android.app.ActivityManagerNative;
import android.app.SearchManager;
-import android.os.Build;
import android.os.UserHandle;
-import android.view.ActionMode;
import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.IRotationWatcher.Stub;
@@ -55,15 +45,9 @@
import android.view.ViewManager;
import android.view.ViewParent;
import android.view.ViewRootImpl;
-import android.view.ViewStub;
-import android.view.ViewTreeObserver.OnPreDrawListener;
import android.view.Window;
-import android.view.WindowInsets;
import android.view.WindowManager;
import com.android.internal.R;
-import com.android.internal.view.FloatingActionMode;
-import com.android.internal.view.RootViewSurfaceTaker;
-import com.android.internal.view.StandaloneActionMode;
import com.android.internal.view.menu.ContextMenuBuilder;
import com.android.internal.view.menu.IconMenuPresenter;
import com.android.internal.view.menu.ListMenuPresenter;
@@ -72,11 +56,7 @@
import com.android.internal.view.menu.MenuPopupHelper;
import com.android.internal.view.menu.MenuPresenter;
import com.android.internal.view.menu.MenuView;
-import com.android.internal.widget.ActionBarContextView;
-import com.android.internal.widget.BackgroundFallback;
import com.android.internal.widget.DecorContentParent;
-import com.android.internal.widget.FloatingToolbar;
-import com.android.internal.widget.NonClientDecorView;
import com.android.internal.widget.SwipeDismissLayout;
import android.app.ActivityManager;
@@ -87,10 +67,7 @@
import android.content.res.Configuration;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
-import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.media.AudioManager;
import android.media.session.MediaController;
@@ -108,22 +85,17 @@
import android.transition.TransitionManager;
import android.transition.TransitionSet;
import android.util.AndroidRuntimeException;
-import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.Log;
import android.util.SparseArray;
import android.util.TypedValue;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.ImageView;
-import android.widget.PopupWindow;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -142,8 +114,6 @@
private final static String TAG = "PhoneWindow";
- private final static boolean SWEEP_OPEN_MENU = false;
-
private final static int DEFAULT_BACKGROUND_FADE_DURATION_MS = 300;
private static final int CUSTOM_TITLE_COMPATIBLE_FEATURES = DEFAULT_FEATURES |
@@ -174,32 +144,21 @@
// view is requested, so we need to force the recreating without introducing an infinite loop.
private boolean mForceDecorInstall = false;
- // This is the non client decor view for the window, containing the caption and window control
- // buttons. The visibility of this decor depends on the workspace and the window type.
- // If the window type does not require such a view, this member might be null.
- NonClientDecorView mNonClientDecorView;
-
- // The non client decor needs to adapt to the used workspace. Since querying and changing the
- // workspace is expensive, this is the workspace value the window is currently set up for.
- int mWorkspaceId;
-
// This is the view in which the window contents are placed. It is either
// mDecor itself, or a child of mDecor where the contents go.
- private ViewGroup mContentParent;
-
- private ViewGroup mContentRoot;
+ ViewGroup mContentParent;
Callback2 mTakeSurfaceCallback;
InputQueue.Callback mTakeInputQueueCallback;
- private boolean mIsFloating;
+ boolean mIsFloating;
private LayoutInflater mLayoutInflater;
private TextView mTitleView;
- private DecorContentParent mDecorContentParent;
+ DecorContentParent mDecorContentParent;
private ActionMenuPresenterCallback mActionMenuPresenterCallback;
private PanelMenuPresenterCallback mPanelMenuPresenterCallback;
@@ -231,13 +190,13 @@
* multiple panels). Shortcuts will go to this panel. It gets set in
* {@link #preparePanel} and cleared in {@link #closePanel}.
*/
- private PanelFeatureState mPreparedPanel;
+ PanelFeatureState mPreparedPanel;
/**
* The keycode that is currently held down (as a modifier) for chording. If
* this is 0, there is no key held down.
*/
- private int mPanelChordingKey;
+ int mPanelChordingKey;
private ImageView mLeftIconView;
@@ -247,12 +206,12 @@
private ProgressBar mHorizontalProgressBar;
- private int mBackgroundResource = 0;
- private int mBackgroundFallbackResource = 0;
+ int mBackgroundResource = 0;
+ int mBackgroundFallbackResource = 0;
private Drawable mBackgroundDrawable;
- private boolean mLoadEleveation = true;
+ private boolean mLoadElevation = true;
private float mElevation;
/** Whether window content should be clipped to the background outline. */
@@ -261,8 +220,8 @@
private int mFrameResource = 0;
private int mTextColor = 0;
- private int mStatusBarColor = 0;
- private int mNavigationBarColor = 0;
+ int mStatusBarColor = 0;
+ int mNavigationBarColor = 0;
private boolean mForcedStatusBarColor = false;
private boolean mForcedNavigationBarColor = false;
@@ -272,9 +231,9 @@
private boolean mAlwaysReadCloseOnTouchAttr = false;
- private ContextMenuBuilder mContextMenu;
- private MenuDialogHelper mContextMenuHelper;
- private MenuPopupHelper mContextMenuPopupHelper;
+ ContextMenuBuilder mContextMenu;
+ MenuDialogHelper mContextMenuHelper;
+ MenuPopupHelper mContextMenuPopupHelper;
private boolean mClosingActionMenu;
private int mVolumeControlStreamType = AudioManager.USE_DEFAULT_STREAM_TYPE;
@@ -312,9 +271,6 @@
private long mBackgroundFadeDurationMillis = -1;
private Boolean mSharedElementsUseOverlay;
- private Rect mTempRect;
- private Rect mOutsets = new Rect();
-
private boolean mIsStartingWindow;
private int mTheme = -1;
@@ -335,7 +291,7 @@
if (preservedWindow != null) {
mDecor = (DecorView) preservedWindow.getDecorView();
mElevation = preservedWindow.getElevation();
- mLoadEleveation = false;
+ mLoadElevation = false;
mForceDecorInstall = true;
// If we're preserving window, carry over the app token from the preserved
// window, as we'll be skipping the addView in handleResumeActivity(), and
@@ -508,15 +464,10 @@
}
}
+ @Override
public void clearContentView() {
- if (mNonClientDecorView != null) {
- if (mNonClientDecorView.getChildCount() > 1) {
- mNonClientDecorView.removeViewAt(1);
- }
- } else {
- // This window doesn't have non client decor, so we need to just remove the children
- // of the decor view.
- mDecor.removeAllViews();
+ if (mDecor != null) {
+ mDecor.clearContentView();
}
}
@@ -730,15 +681,8 @@
}
}
}
- if (mNonClientDecorView != null) {
- int workspaceId = getWorkspaceId();
- if (mWorkspaceId != workspaceId) {
- mWorkspaceId = workspaceId;
- // We might have to change the kind of surface before we do anything else.
- mNonClientDecorView.phoneWindowUpdated(StackId.hasWindowDecor(mWorkspaceId),
- StackId.hasWindowShadow(mWorkspaceId));
- mDecor.enableNonClientDecor(StackId.hasWindowDecor(workspaceId));
- }
+ if (mDecor != null) {
+ mDecor.onConfigurationChanged();
}
}
@@ -1170,7 +1114,7 @@
return performPanelShortcut(getPanelState(featureId, false), keyCode, event, flags);
}
- private boolean performPanelShortcut(PanelFeatureState st, int keyCode, KeyEvent event,
+ boolean performPanelShortcut(PanelFeatureState st, int keyCode, KeyEvent event,
int flags) {
if (event.isSystem() || (st == null)) {
return false;
@@ -2261,7 +2205,7 @@
* called sometime after {@link #restorePanelState} when it is safe to add
* to the window manager.
*/
- private void openPanelsAfterRestore() {
+ void openPanelsAfterRestore() {
PanelFeatureState[] panels = mPanels;
if (panels == null) {
@@ -2332,1530 +2276,6 @@
}
}
- private static final class DecorView extends FrameLayout implements RootViewSurfaceTaker {
-
- /* package */int mDefaultOpacity = PixelFormat.OPAQUE;
-
- /** The feature ID of the panel, or -1 if this is the application's DecorView */
- private final int mFeatureId;
-
- private final Rect mDrawingBounds = new Rect();
-
- private final Rect mBackgroundPadding = new Rect();
-
- private final Rect mFramePadding = new Rect();
-
- private final Rect mFrameOffsets = new Rect();
-
- // True if a non client area decor exists.
- private boolean mHasNonClientDecor = false;
-
- private boolean mChanging;
-
- private Drawable mMenuBackground;
- private boolean mWatchingForMenu;
- private int mDownY;
-
- private ActionMode mPrimaryActionMode;
- private ActionMode mFloatingActionMode;
- private ActionBarContextView mPrimaryActionModeView;
- private PopupWindow mPrimaryActionModePopup;
- private Runnable mShowPrimaryActionModePopup;
- private OnPreDrawListener mFloatingToolbarPreDrawListener;
- private View mFloatingActionModeOriginatingView;
- private FloatingToolbar mFloatingToolbar;
- private ObjectAnimator mFadeAnim;
-
- // View added at runtime to draw under the status bar area
- private View mStatusGuard;
- // View added at runtime to draw under the navigation bar area
- private View mNavigationGuard;
-
- private final ColorViewState mStatusColorViewState = new ColorViewState(
- SYSTEM_UI_FLAG_FULLSCREEN, FLAG_TRANSLUCENT_STATUS,
- Gravity.TOP,
- Gravity.LEFT,
- STATUS_BAR_BACKGROUND_TRANSITION_NAME,
- com.android.internal.R.id.statusBarBackground,
- FLAG_FULLSCREEN);
- private final ColorViewState mNavigationColorViewState = new ColorViewState(
- SYSTEM_UI_FLAG_HIDE_NAVIGATION, FLAG_TRANSLUCENT_NAVIGATION,
- Gravity.BOTTOM,
- Gravity.RIGHT,
- NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME,
- com.android.internal.R.id.navigationBarBackground,
- 0 /* hideWindowFlag */);
-
- private final Interpolator mShowInterpolator;
- private final Interpolator mHideInterpolator;
- private final int mBarEnterExitDuration;
-
- private final BackgroundFallback mBackgroundFallback = new BackgroundFallback();
-
- private int mLastTopInset = 0;
- private int mLastBottomInset = 0;
- private int mLastRightInset = 0;
- private boolean mLastHasTopStableInset = false;
- private boolean mLastHasBottomStableInset = false;
- private boolean mLastHasRightStableInset = false;
- private int mLastWindowFlags = 0;
-
- private int mRootScrollY = 0;
-
- private PhoneWindow mWindow;
-
- private DecorView(Context context, int featureId, PhoneWindow window) {
- super(context);
- mFeatureId = featureId;
-
- mShowInterpolator = AnimationUtils.loadInterpolator(context,
- android.R.interpolator.linear_out_slow_in);
- mHideInterpolator = AnimationUtils.loadInterpolator(context,
- android.R.interpolator.fast_out_linear_in);
-
- mBarEnterExitDuration = context.getResources().getInteger(
- R.integer.dock_enter_exit_duration);
-
- setWindow(window);
- }
-
- public void setBackgroundFallback(int resId) {
- mBackgroundFallback.setDrawable(resId != 0 ? getContext().getDrawable(resId) : null);
- setWillNotDraw(getBackground() == null && !mBackgroundFallback.hasFallback());
- }
-
- @Override
- public void onDraw(Canvas c) {
- super.onDraw(c);
- mBackgroundFallback.draw(mWindow.mContentRoot, c, mWindow.mContentParent);
- }
-
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
- final int keyCode = event.getKeyCode();
- final int action = event.getAction();
- final boolean isDown = action == KeyEvent.ACTION_DOWN;
-
- if (isDown && (event.getRepeatCount() == 0)) {
- // First handle chording of panel key: if a panel key is held
- // but not released, try to execute a shortcut in it.
- if ((mWindow.mPanelChordingKey > 0) && (mWindow.mPanelChordingKey != keyCode)) {
- boolean handled = dispatchKeyShortcutEvent(event);
- if (handled) {
- return true;
- }
- }
-
- // If a panel is open, perform a shortcut on it without the
- // chorded panel key
- if ((mWindow.mPreparedPanel != null) && mWindow.mPreparedPanel.isOpen) {
- if (mWindow.performPanelShortcut(mWindow.mPreparedPanel, keyCode, event, 0)) {
- return true;
- }
- }
- }
-
- if (!mWindow.isDestroyed()) {
- final Callback cb = mWindow.getCallback();
- final boolean handled = cb != null && mFeatureId < 0 ? cb.dispatchKeyEvent(event)
- : super.dispatchKeyEvent(event);
- if (handled) {
- return true;
- }
- }
-
- return isDown ? mWindow.onKeyDown(mFeatureId, event.getKeyCode(), event)
- : mWindow.onKeyUp(mFeatureId, event.getKeyCode(), event);
- }
-
- @Override
- public boolean dispatchKeyShortcutEvent(KeyEvent ev) {
- // If the panel is already prepared, then perform the shortcut using it.
- boolean handled;
- if (mWindow.mPreparedPanel != null) {
- handled = mWindow.performPanelShortcut(mWindow.mPreparedPanel, ev.getKeyCode(), ev,
- Menu.FLAG_PERFORM_NO_CLOSE);
- if (handled) {
- if (mWindow.mPreparedPanel != null) {
- mWindow.mPreparedPanel.isHandled = true;
- }
- return true;
- }
- }
-
- // Shortcut not handled by the panel. Dispatch to the view hierarchy.
- final Callback cb = mWindow.getCallback();
- handled = cb != null && !mWindow.isDestroyed() && mFeatureId < 0
- ? cb.dispatchKeyShortcutEvent(ev) : super.dispatchKeyShortcutEvent(ev);
- if (handled) {
- return true;
- }
-
- // If the panel is not prepared, then we may be trying to handle a shortcut key
- // combination such as Control+C. Temporarily prepare the panel then mark it
- // unprepared again when finished to ensure that the panel will again be prepared
- // the next time it is shown for real.
- PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false);
- if (st != null && mWindow.mPreparedPanel == null) {
- mWindow.preparePanel(st, ev);
- handled = mWindow.performPanelShortcut(st, ev.getKeyCode(), ev,
- Menu.FLAG_PERFORM_NO_CLOSE);
- st.isPrepared = false;
- if (handled) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public boolean dispatchTouchEvent(MotionEvent ev) {
- final Callback cb = mWindow.getCallback();
- return cb != null && !mWindow.isDestroyed() && mFeatureId < 0
- ? cb.dispatchTouchEvent(ev) : super.dispatchTouchEvent(ev);
- }
-
- @Override
- public boolean dispatchTrackballEvent(MotionEvent ev) {
- final Callback cb = mWindow.getCallback();
- return cb != null && !mWindow.isDestroyed() && mFeatureId < 0
- ? cb.dispatchTrackballEvent(ev) : super.dispatchTrackballEvent(ev);
- }
-
- @Override
- public boolean dispatchGenericMotionEvent(MotionEvent ev) {
- final Callback cb = mWindow.getCallback();
- return cb != null && !mWindow.isDestroyed() && mFeatureId < 0
- ? cb.dispatchGenericMotionEvent(ev) : super.dispatchGenericMotionEvent(ev);
- }
-
- public boolean superDispatchKeyEvent(KeyEvent event) {
- // Give priority to closing action modes if applicable.
- if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
- final int action = event.getAction();
- // Back cancels action modes first.
- if (mPrimaryActionMode != null) {
- if (action == KeyEvent.ACTION_UP) {
- mPrimaryActionMode.finish();
- }
- return true;
- }
- }
-
- return super.dispatchKeyEvent(event);
- }
-
- public boolean superDispatchKeyShortcutEvent(KeyEvent event) {
- return super.dispatchKeyShortcutEvent(event);
- }
-
- public boolean superDispatchTouchEvent(MotionEvent event) {
- return super.dispatchTouchEvent(event);
- }
-
- public boolean superDispatchTrackballEvent(MotionEvent event) {
- return super.dispatchTrackballEvent(event);
- }
-
- public boolean superDispatchGenericMotionEvent(MotionEvent event) {
- return super.dispatchGenericMotionEvent(event);
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- return onInterceptTouchEvent(event);
- }
-
- private boolean isOutOfInnerBounds(int x, int y) {
- return x < 0 || y < 0 || x > getWidth() || y > getHeight();
- }
-
- private boolean isOutOfBounds(int x, int y) {
- return x < -5 || y < -5 || x > (getWidth() + 5)
- || y > (getHeight() + 5);
- }
-
- @Override
- public boolean onInterceptTouchEvent(MotionEvent event) {
- int action = event.getAction();
- if (mHasNonClientDecor && mWindow.mNonClientDecorView.mVisible) {
- // Don't dispatch ACTION_DOWN to the non client decor if the window is
- // resizable and the event was (starting) outside the window.
- // Window resizing events should be handled by WindowManager.
- // TODO: Investigate how to handle the outside touch in window manager
- // without generating these events.
- // Currently we receive these because we need to enlarge the window's
- // touch region so that the monitor channel receives the events
- // in the outside touch area.
- if (action == MotionEvent.ACTION_DOWN) {
- final int x = (int) event.getX();
- final int y = (int) event.getY();
- if (isOutOfInnerBounds(x, y)) {
- return true;
- }
- }
- }
-
- if (mFeatureId >= 0) {
- if (action == MotionEvent.ACTION_DOWN) {
- int x = (int)event.getX();
- int y = (int)event.getY();
- if (isOutOfBounds(x, y)) {
- mWindow.closePanel(mFeatureId);
- return true;
- }
- }
- }
-
- if (!SWEEP_OPEN_MENU) {
- return false;
- }
-
- if (mFeatureId >= 0) {
- if (action == MotionEvent.ACTION_DOWN) {
- Log.i(TAG, "Watchiing!");
- mWatchingForMenu = true;
- mDownY = (int) event.getY();
- return false;
- }
-
- if (!mWatchingForMenu) {
- return false;
- }
-
- int y = (int)event.getY();
- if (action == MotionEvent.ACTION_MOVE) {
- if (y > (mDownY+30)) {
- Log.i(TAG, "Closing!");
- mWindow.closePanel(mFeatureId);
- mWatchingForMenu = false;
- return true;
- }
- } else if (action == MotionEvent.ACTION_UP) {
- mWatchingForMenu = false;
- }
-
- return false;
- }
-
- //Log.i(TAG, "Intercept: action=" + action + " y=" + event.getY()
- // + " (in " + getHeight() + ")");
-
- if (action == MotionEvent.ACTION_DOWN) {
- int y = (int)event.getY();
- if (y >= (getHeight()-5) && !mWindow.hasChildren()) {
- Log.i(TAG, "Watching!");
- mWatchingForMenu = true;
- }
- return false;
- }
-
- if (!mWatchingForMenu) {
- return false;
- }
-
- int y = (int)event.getY();
- if (action == MotionEvent.ACTION_MOVE) {
- if (y < (getHeight()-30)) {
- Log.i(TAG, "Opening!");
- mWindow.openPanel(FEATURE_OPTIONS_PANEL, new KeyEvent(
- KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU));
- mWatchingForMenu = false;
- return true;
- }
- } else if (action == MotionEvent.ACTION_UP) {
- mWatchingForMenu = false;
- }
-
- return false;
- }
-
- @Override
- public void sendAccessibilityEvent(int eventType) {
- if (!AccessibilityManager.getInstance(mContext).isEnabled()) {
- return;
- }
-
- // if we are showing a feature that should be announced and one child
- // make this child the event source since this is the feature itself
- // otherwise the callback will take over and announce its client
- if ((mFeatureId == FEATURE_OPTIONS_PANEL ||
- mFeatureId == FEATURE_CONTEXT_MENU ||
- mFeatureId == FEATURE_PROGRESS ||
- mFeatureId == FEATURE_INDETERMINATE_PROGRESS)
- && getChildCount() == 1) {
- getChildAt(0).sendAccessibilityEvent(eventType);
- } else {
- super.sendAccessibilityEvent(eventType);
- }
- }
-
- @Override
- public boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
- final Callback cb = mWindow.getCallback();
- if (cb != null && !mWindow.isDestroyed()) {
- if (cb.dispatchPopulateAccessibilityEvent(event)) {
- return true;
- }
- }
- return super.dispatchPopulateAccessibilityEventInternal(event);
- }
-
- @Override
- protected boolean setFrame(int l, int t, int r, int b) {
- boolean changed = super.setFrame(l, t, r, b);
- if (changed) {
- final Rect drawingBounds = mDrawingBounds;
- getDrawingRect(drawingBounds);
-
- Drawable fg = getForeground();
- if (fg != null) {
- final Rect frameOffsets = mFrameOffsets;
- drawingBounds.left += frameOffsets.left;
- drawingBounds.top += frameOffsets.top;
- drawingBounds.right -= frameOffsets.right;
- drawingBounds.bottom -= frameOffsets.bottom;
- fg.setBounds(drawingBounds);
- final Rect framePadding = mFramePadding;
- drawingBounds.left += framePadding.left - frameOffsets.left;
- drawingBounds.top += framePadding.top - frameOffsets.top;
- drawingBounds.right -= framePadding.right - frameOffsets.right;
- drawingBounds.bottom -= framePadding.bottom - frameOffsets.bottom;
- }
-
- Drawable bg = getBackground();
- if (bg != null) {
- bg.setBounds(drawingBounds);
- }
-
- if (SWEEP_OPEN_MENU) {
- if (mMenuBackground == null && mFeatureId < 0
- && mWindow.getAttributes().height
- == WindowManager.LayoutParams.MATCH_PARENT) {
- mMenuBackground = getContext().getDrawable(
- R.drawable.menu_background);
- }
- if (mMenuBackground != null) {
- mMenuBackground.setBounds(drawingBounds.left,
- drawingBounds.bottom-6, drawingBounds.right,
- drawingBounds.bottom+20);
- }
- }
- }
- return changed;
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
- final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
-
- final int widthMode = getMode(widthMeasureSpec);
- final int heightMode = getMode(heightMeasureSpec);
-
- boolean fixedWidth = false;
- if (widthMode == AT_MOST) {
- final TypedValue tvw = isPortrait ? mWindow.mFixedWidthMinor
- : mWindow.mFixedWidthMajor;
- if (tvw != null && tvw.type != TypedValue.TYPE_NULL) {
- final int w;
- if (tvw.type == TypedValue.TYPE_DIMENSION) {
- w = (int) tvw.getDimension(metrics);
- } else if (tvw.type == TypedValue.TYPE_FRACTION) {
- w = (int) tvw.getFraction(metrics.widthPixels, metrics.widthPixels);
- } else {
- w = 0;
- }
-
- if (w > 0) {
- final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
- widthMeasureSpec = MeasureSpec.makeMeasureSpec(
- Math.min(w, widthSize), EXACTLY);
- fixedWidth = true;
- }
- }
- }
-
- if (heightMode == AT_MOST) {
- final TypedValue tvh = isPortrait ? mWindow.mFixedHeightMajor
- : mWindow.mFixedHeightMinor;
- if (tvh != null && tvh.type != TypedValue.TYPE_NULL) {
- final int h;
- if (tvh.type == TypedValue.TYPE_DIMENSION) {
- h = (int) tvh.getDimension(metrics);
- } else if (tvh.type == TypedValue.TYPE_FRACTION) {
- h = (int) tvh.getFraction(metrics.heightPixels, metrics.heightPixels);
- } else {
- h = 0;
- }
- if (h > 0) {
- final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
- heightMeasureSpec = MeasureSpec.makeMeasureSpec(
- Math.min(h, heightSize), EXACTLY);
- }
- }
- }
-
- getOutsets(mWindow.mOutsets);
- if (mWindow.mOutsets.top > 0 || mWindow.mOutsets.bottom > 0) {
- int mode = MeasureSpec.getMode(heightMeasureSpec);
- if (mode != MeasureSpec.UNSPECIFIED) {
- int height = MeasureSpec.getSize(heightMeasureSpec);
- heightMeasureSpec = MeasureSpec.makeMeasureSpec(
- height + mWindow.mOutsets.top + mWindow.mOutsets.bottom, mode);
- }
- }
- if (mWindow.mOutsets.left > 0 || mWindow.mOutsets.right > 0) {
- int mode = MeasureSpec.getMode(widthMeasureSpec);
- if (mode != MeasureSpec.UNSPECIFIED) {
- int width = MeasureSpec.getSize(widthMeasureSpec);
- widthMeasureSpec = MeasureSpec.makeMeasureSpec(
- width + mWindow.mOutsets.left + mWindow.mOutsets.right, mode);
- }
- }
-
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
- int width = getMeasuredWidth();
- boolean measure = false;
-
- widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, EXACTLY);
-
- if (!fixedWidth && widthMode == AT_MOST) {
- final TypedValue tv = isPortrait ? mWindow.mMinWidthMinor : mWindow.mMinWidthMajor;
- if (tv.type != TypedValue.TYPE_NULL) {
- final int min;
- if (tv.type == TypedValue.TYPE_DIMENSION) {
- min = (int)tv.getDimension(metrics);
- } else if (tv.type == TypedValue.TYPE_FRACTION) {
- min = (int)tv.getFraction(metrics.widthPixels, metrics.widthPixels);
- } else {
- min = 0;
- }
-
- if (width < min) {
- widthMeasureSpec = MeasureSpec.makeMeasureSpec(min, EXACTLY);
- measure = true;
- }
- }
- }
-
- // TODO: Support height?
-
- if (measure) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- }
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- getOutsets(mWindow.mOutsets);
- if (mWindow.mOutsets.left > 0) {
- offsetLeftAndRight(-mWindow.mOutsets.left);
- }
- if (mWindow.mOutsets.top > 0) {
- offsetTopAndBottom(-mWindow.mOutsets.top);
- }
- }
-
- @Override
- public void draw(Canvas canvas) {
- super.draw(canvas);
-
- if (mMenuBackground != null) {
- mMenuBackground.draw(canvas);
- }
- }
-
- @Override
- public boolean showContextMenuForChild(View originalView) {
- // Reuse the context menu builder
- if (mWindow.mContextMenu == null) {
- mWindow.mContextMenu = new ContextMenuBuilder(getContext());
- mWindow.mContextMenu.setCallback(mWindow.mContextMenuCallback);
- } else {
- mWindow.mContextMenu.clearAll();
- }
-
- final MenuDialogHelper helper = mWindow.mContextMenu.show(originalView,
- originalView.getWindowToken());
- if (helper != null) {
- helper.setPresenterCallback(mWindow.mContextMenuCallback);
- } else if (mWindow.mContextMenuHelper != null) {
- // No menu to show, but if we have a menu currently showing it just became blank.
- // Close it.
- mWindow.mContextMenuHelper.dismiss();
- }
- mWindow.mContextMenuHelper = helper;
- return helper != null;
- }
-
- @Override
- public boolean showContextMenuForChild(View originalView, float x, float y) {
- // Reuse the context menu builder
- if (mWindow.mContextMenu == null) {
- mWindow.mContextMenu = new ContextMenuBuilder(getContext());
- mWindow.mContextMenu.setCallback(mWindow.mContextMenuCallback);
- } else {
- mWindow.mContextMenu.clearAll();
- }
-
- final MenuPopupHelper helper = mWindow.mContextMenu.showPopup(
- getContext(), originalView, x, y);
- if (helper != null) {
- helper.setCallback(mWindow.mContextMenuCallback);
- } else if (mWindow.mContextMenuPopupHelper != null) {
- // No menu to show, but if we have a menu currently showing it just became blank.
- // Close it.
- mWindow.mContextMenuPopupHelper.dismiss();
- }
- mWindow.mContextMenuPopupHelper = helper;
- return helper != null;
- }
-
- @Override
- public ActionMode startActionModeForChild(View originalView,
- ActionMode.Callback callback) {
- return startActionModeForChild(originalView, callback, ActionMode.TYPE_PRIMARY);
- }
-
- @Override
- public ActionMode startActionModeForChild(
- View child, ActionMode.Callback callback, int type) {
- return startActionMode(child, callback, type);
- }
-
- @Override
- public ActionMode startActionMode(ActionMode.Callback callback) {
- return startActionMode(callback, ActionMode.TYPE_PRIMARY);
- }
-
- @Override
- public ActionMode startActionMode(ActionMode.Callback callback, int type) {
- return startActionMode(this, callback, type);
- }
-
- private ActionMode startActionMode(
- View originatingView, ActionMode.Callback callback, int type) {
- ActionMode.Callback2 wrappedCallback = new ActionModeCallback2Wrapper(callback);
- ActionMode mode = null;
- if (mWindow.getCallback() != null && !mWindow.isDestroyed()) {
- try {
- mode = mWindow.getCallback().onWindowStartingActionMode(wrappedCallback, type);
- } catch (AbstractMethodError ame) {
- // Older apps might not implement the typed version of this method.
- if (type == ActionMode.TYPE_PRIMARY) {
- try {
- mode = mWindow.getCallback().onWindowStartingActionMode(
- wrappedCallback);
- } catch (AbstractMethodError ame2) {
- // Older apps might not implement this callback method at all.
- }
- }
- }
- }
- if (mode != null) {
- if (mode.getType() == ActionMode.TYPE_PRIMARY) {
- cleanupPrimaryActionMode();
- mPrimaryActionMode = mode;
- } else if (mode.getType() == ActionMode.TYPE_FLOATING) {
- if (mFloatingActionMode != null) {
- mFloatingActionMode.finish();
- }
- mFloatingActionMode = mode;
- }
- } else {
- mode = createActionMode(type, wrappedCallback, originatingView);
- if (mode != null && wrappedCallback.onCreateActionMode(mode, mode.getMenu())) {
- setHandledActionMode(mode);
- } else {
- mode = null;
- }
- }
- if (mode != null && mWindow.getCallback() != null && !mWindow.isDestroyed()) {
- try {
- mWindow.getCallback().onActionModeStarted(mode);
- } catch (AbstractMethodError ame) {
- // Older apps might not implement this callback method.
- }
- }
- return mode;
- }
-
- private void cleanupPrimaryActionMode() {
- if (mPrimaryActionMode != null) {
- mPrimaryActionMode.finish();
- mPrimaryActionMode = null;
- }
- if (mPrimaryActionModeView != null) {
- mPrimaryActionModeView.killMode();
- }
- }
-
- private void cleanupFloatingActionModeViews() {
- if (mFloatingToolbar != null) {
- mFloatingToolbar.dismiss();
- mFloatingToolbar = null;
- }
- if (mFloatingActionModeOriginatingView != null) {
- if (mFloatingToolbarPreDrawListener != null) {
- mFloatingActionModeOriginatingView.getViewTreeObserver()
- .removeOnPreDrawListener(mFloatingToolbarPreDrawListener);
- mFloatingToolbarPreDrawListener = null;
- }
- mFloatingActionModeOriginatingView = null;
- }
- }
-
- public void startChanging() {
- mChanging = true;
- }
-
- public void finishChanging() {
- mChanging = false;
- drawableChanged();
- }
-
- public void setWindowBackground(Drawable drawable) {
- if (getBackground() != drawable) {
- setBackgroundDrawable(drawable);
- if (drawable != null) {
- drawable.getPadding(mBackgroundPadding);
- } else {
- mBackgroundPadding.setEmpty();
- }
- drawableChanged();
- }
- }
-
- public void setWindowFrame(Drawable drawable) {
- if (getForeground() != drawable) {
- setForeground(drawable);
- if (drawable != null) {
- drawable.getPadding(mFramePadding);
- } else {
- mFramePadding.setEmpty();
- }
- drawableChanged();
- }
- }
-
- @Override
- public void onWindowSystemUiVisibilityChanged(int visible) {
- updateColorViews(null /* insets */, true /* animate */);
- }
-
- @Override
- public WindowInsets onApplyWindowInsets(WindowInsets insets) {
- mFrameOffsets.set(insets.getSystemWindowInsets());
- insets = updateColorViews(insets, true /* animate */);
- insets = updateStatusGuard(insets);
- updateNavigationGuard(insets);
- if (getForeground() != null) {
- drawableChanged();
- }
- return insets;
- }
-
- @Override
- public boolean isTransitionGroup() {
- return false;
- }
-
- private WindowInsets updateColorViews(WindowInsets insets, boolean animate) {
- WindowManager.LayoutParams attrs = mWindow.getAttributes();
- int sysUiVisibility = attrs.systemUiVisibility | getWindowSystemUiVisibility();
-
- if (!mWindow.mIsFloating && ActivityManager.isHighEndGfx()) {
- boolean disallowAnimate = !isLaidOut();
- disallowAnimate |= ((mLastWindowFlags ^ attrs.flags)
- & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0;
- mLastWindowFlags = attrs.flags;
-
- if (insets != null) {
- mLastTopInset = Math.min(insets.getStableInsetTop(),
- insets.getSystemWindowInsetTop());
- mLastBottomInset = Math.min(insets.getStableInsetBottom(),
- insets.getSystemWindowInsetBottom());
- mLastRightInset = Math.min(insets.getStableInsetRight(),
- insets.getSystemWindowInsetRight());
-
- // Don't animate if the presence of stable insets has changed, because that
- // indicates that the window was either just added and received them for the
- // first time, or the window size or position has changed.
- boolean hasTopStableInset = insets.getStableInsetTop() != 0;
- disallowAnimate |= (hasTopStableInset != mLastHasTopStableInset);
- mLastHasTopStableInset = hasTopStableInset;
-
- boolean hasBottomStableInset = insets.getStableInsetBottom() != 0;
- disallowAnimate |= (hasBottomStableInset != mLastHasBottomStableInset);
- mLastHasBottomStableInset = hasBottomStableInset;
-
- boolean hasRightStableInset = insets.getStableInsetRight() != 0;
- disallowAnimate |= (hasRightStableInset != mLastHasRightStableInset);
- mLastHasRightStableInset = hasRightStableInset;
- }
-
- boolean navBarToRightEdge = mLastBottomInset == 0 && mLastRightInset > 0;
- int navBarSize = navBarToRightEdge ? mLastRightInset : mLastBottomInset;
- updateColorViewInt(mNavigationColorViewState, sysUiVisibility,
- mWindow.mNavigationBarColor, navBarSize, navBarToRightEdge,
- 0 /* rightInset */, animate && !disallowAnimate);
-
- boolean statusBarNeedsRightInset = navBarToRightEdge
- && mNavigationColorViewState.present;
- int statusBarRightInset = statusBarNeedsRightInset ? mLastRightInset : 0;
- updateColorViewInt(mStatusColorViewState, sysUiVisibility, mWindow.mStatusBarColor,
- mLastTopInset, false /* matchVertical */, statusBarRightInset,
- animate && !disallowAnimate);
- }
-
- // When we expand the window with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, we still need
- // to ensure that the rest of the view hierarchy doesn't notice it, unless they've
- // explicitly asked for it.
-
- boolean consumingNavBar =
- (attrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0
- && (sysUiVisibility & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0
- && (sysUiVisibility & SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
-
- int consumedRight = consumingNavBar ? mLastRightInset : 0;
- int consumedBottom = consumingNavBar ? mLastBottomInset : 0;
-
- if (mWindow.mContentRoot != null
- && mWindow.mContentRoot.getLayoutParams() instanceof MarginLayoutParams) {
- MarginLayoutParams lp = (MarginLayoutParams) mWindow.mContentRoot.getLayoutParams();
- if (lp.rightMargin != consumedRight || lp.bottomMargin != consumedBottom) {
- lp.rightMargin = consumedRight;
- lp.bottomMargin = consumedBottom;
- mWindow.mContentRoot.setLayoutParams(lp);
-
- if (insets == null) {
- // The insets have changed, but we're not currently in the process
- // of dispatching them.
- requestApplyInsets();
- }
- }
- if (insets != null) {
- insets = insets.replaceSystemWindowInsets(
- insets.getSystemWindowInsetLeft(),
- insets.getSystemWindowInsetTop(),
- insets.getSystemWindowInsetRight() - consumedRight,
- insets.getSystemWindowInsetBottom() - consumedBottom);
- }
- }
-
- if (insets != null) {
- insets = insets.consumeStableInsets();
- }
- return insets;
- }
-
- /**
- * Update a color view
- *
- * @param state the color view to update.
- * @param sysUiVis the current systemUiVisibility to apply.
- * @param color the current color to apply.
- * @param size the current size in the non-parent-matching dimension.
- * @param verticalBar if true the view is attached to a vertical edge, otherwise to a
- * horizontal edge,
- * @param rightMargin rightMargin for the color view.
- * @param animate if true, the change will be animated.
- */
- private void updateColorViewInt(final ColorViewState state, int sysUiVis, int color,
- int size, boolean verticalBar, int rightMargin, boolean animate) {
- state.present = size > 0 && (sysUiVis & state.systemUiHideFlag) == 0
- && (mWindow.getAttributes().flags & state.hideWindowFlag) == 0
- && (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0;
- boolean show = state.present
- && (color & Color.BLACK) != 0
- && (mWindow.getAttributes().flags & state.translucentFlag) == 0;
-
- boolean visibilityChanged = false;
- View view = state.view;
-
- int resolvedHeight = verticalBar ? LayoutParams.MATCH_PARENT : size;
- int resolvedWidth = verticalBar ? size : LayoutParams.MATCH_PARENT;
- int resolvedGravity = verticalBar ? state.horizontalGravity : state.verticalGravity;
-
- if (view == null) {
- if (show) {
- state.view = view = new View(mContext);
- view.setBackgroundColor(color);
- view.setTransitionName(state.transitionName);
- view.setId(state.id);
- visibilityChanged = true;
- view.setVisibility(INVISIBLE);
- state.targetVisibility = VISIBLE;
-
- LayoutParams lp = new LayoutParams(resolvedWidth, resolvedHeight,
- resolvedGravity);
- lp.rightMargin = rightMargin;
- addView(view, lp);
- updateColorViewTranslations();
- }
- } else {
- int vis = show ? VISIBLE : INVISIBLE;
- visibilityChanged = state.targetVisibility != vis;
- state.targetVisibility = vis;
- LayoutParams lp = (LayoutParams) view.getLayoutParams();
- if (lp.height != resolvedHeight || lp.width != resolvedWidth
- || lp.gravity != resolvedGravity || lp.rightMargin != rightMargin) {
- lp.height = resolvedHeight;
- lp.width = resolvedWidth;
- lp.gravity = resolvedGravity;
- lp.rightMargin = rightMargin;
- view.setLayoutParams(lp);
- }
- if (show) {
- view.setBackgroundColor(color);
- }
- }
- if (visibilityChanged) {
- view.animate().cancel();
- if (animate) {
- if (show) {
- if (view.getVisibility() != VISIBLE) {
- view.setVisibility(VISIBLE);
- view.setAlpha(0.0f);
- }
- view.animate().alpha(1.0f).setInterpolator(mShowInterpolator).
- setDuration(mBarEnterExitDuration);
- } else {
- view.animate().alpha(0.0f).setInterpolator(mHideInterpolator)
- .setDuration(mBarEnterExitDuration)
- .withEndAction(new Runnable() {
- @Override
- public void run() {
- state.view.setAlpha(1.0f);
- state.view.setVisibility(INVISIBLE);
- }
- });
- }
- } else {
- view.setAlpha(1.0f);
- view.setVisibility(show ? VISIBLE : INVISIBLE);
- }
- }
- }
-
- private void updateColorViewTranslations() {
- // Put the color views back in place when they get moved off the screen
- // due to the the ViewRootImpl panning.
- int rootScrollY = mRootScrollY;
- if (mStatusColorViewState.view != null) {
- mStatusColorViewState.view.setTranslationY(rootScrollY > 0 ? rootScrollY : 0);
- }
- if (mNavigationColorViewState.view != null) {
- mNavigationColorViewState.view.setTranslationY(rootScrollY < 0 ? rootScrollY : 0);
- }
- }
-
- private WindowInsets updateStatusGuard(WindowInsets insets) {
- boolean showStatusGuard = false;
- // Show the status guard when the non-overlay contextual action bar is showing
- if (mPrimaryActionModeView != null) {
- if (mPrimaryActionModeView.getLayoutParams() instanceof MarginLayoutParams) {
- // Insets are magic!
- final MarginLayoutParams mlp = (MarginLayoutParams)
- mPrimaryActionModeView.getLayoutParams();
- boolean mlpChanged = false;
- if (mPrimaryActionModeView.isShown()) {
- if (mWindow.mTempRect == null) {
- mWindow.mTempRect = new Rect();
- }
- final Rect rect = mWindow.mTempRect;
-
- // If the parent doesn't consume the insets, manually
- // apply the default system window insets.
- mWindow.mContentParent.computeSystemWindowInsets(insets, rect);
- final int newMargin = rect.top == 0 ? insets.getSystemWindowInsetTop() : 0;
- if (mlp.topMargin != newMargin) {
- mlpChanged = true;
- mlp.topMargin = insets.getSystemWindowInsetTop();
-
- if (mStatusGuard == null) {
- mStatusGuard = new View(mContext);
- mStatusGuard.setBackgroundColor(mContext.getColor(
- R.color.input_method_navigation_guard));
- addView(mStatusGuard, indexOfChild(mStatusColorViewState.view),
- new LayoutParams(LayoutParams.MATCH_PARENT,
- mlp.topMargin, Gravity.START | Gravity.TOP));
- } else {
- final LayoutParams lp = (LayoutParams)
- mStatusGuard.getLayoutParams();
- if (lp.height != mlp.topMargin) {
- lp.height = mlp.topMargin;
- mStatusGuard.setLayoutParams(lp);
- }
- }
- }
-
- // The action mode's theme may differ from the app, so
- // always show the status guard above it if we have one.
- showStatusGuard = mStatusGuard != null;
-
- // We only need to consume the insets if the action
- // mode is overlaid on the app content (e.g. it's
- // sitting in a FrameLayout, see
- // screen_simple_overlay_action_mode.xml).
- final boolean nonOverlay = (mWindow.getLocalFeatures()
- & (1 << FEATURE_ACTION_MODE_OVERLAY)) == 0;
- insets = insets.consumeSystemWindowInsets(
- false, nonOverlay && showStatusGuard /* top */, false, false);
- } else {
- // reset top margin
- if (mlp.topMargin != 0) {
- mlpChanged = true;
- mlp.topMargin = 0;
- }
- }
- if (mlpChanged) {
- mPrimaryActionModeView.setLayoutParams(mlp);
- }
- }
- }
- if (mStatusGuard != null) {
- mStatusGuard.setVisibility(showStatusGuard ? View.VISIBLE : View.GONE);
- }
- return insets;
- }
-
- private void updateNavigationGuard(WindowInsets insets) {
- // IMEs lay out below the nav bar, but the content view must not (for back compat)
- if (mWindow.getAttributes().type == WindowManager.LayoutParams.TYPE_INPUT_METHOD) {
- // prevent the content view from including the nav bar height
- if (mWindow.mContentParent != null) {
- if (mWindow.mContentParent.getLayoutParams() instanceof MarginLayoutParams) {
- MarginLayoutParams mlp =
- (MarginLayoutParams) mWindow.mContentParent.getLayoutParams();
- mlp.bottomMargin = insets.getSystemWindowInsetBottom();
- mWindow.mContentParent.setLayoutParams(mlp);
- }
- }
- // position the navigation guard view, creating it if necessary
- if (mNavigationGuard == null) {
- mNavigationGuard = new View(mContext);
- mNavigationGuard.setBackgroundColor(mContext.getColor(
- R.color.input_method_navigation_guard));
- addView(mNavigationGuard, indexOfChild(mNavigationColorViewState.view),
- new LayoutParams(LayoutParams.MATCH_PARENT,
- insets.getSystemWindowInsetBottom(),
- Gravity.START | Gravity.BOTTOM));
- } else {
- LayoutParams lp = (LayoutParams) mNavigationGuard.getLayoutParams();
- lp.height = insets.getSystemWindowInsetBottom();
- mNavigationGuard.setLayoutParams(lp);
- }
- }
- }
-
- private void drawableChanged() {
- if (mChanging) {
- return;
- }
-
- setPadding(mFramePadding.left + mBackgroundPadding.left,
- mFramePadding.top + mBackgroundPadding.top,
- mFramePadding.right + mBackgroundPadding.right,
- mFramePadding.bottom + mBackgroundPadding.bottom);
- requestLayout();
- invalidate();
-
- int opacity = PixelFormat.OPAQUE;
- if (windowHasShadow()) {
- // If the window has a shadow, it must be translucent.
- opacity = PixelFormat.TRANSLUCENT;
- } else{
- // Note: If there is no background, we will assume opaque. The
- // common case seems to be that an application sets there to be
- // no background so it can draw everything itself. For that,
- // we would like to assume OPAQUE and let the app force it to
- // the slower TRANSLUCENT mode if that is really what it wants.
- Drawable bg = getBackground();
- Drawable fg = getForeground();
- if (bg != null) {
- if (fg == null) {
- opacity = bg.getOpacity();
- } else if (mFramePadding.left <= 0 && mFramePadding.top <= 0
- && mFramePadding.right <= 0 && mFramePadding.bottom <= 0) {
- // If the frame padding is zero, then we can be opaque
- // if either the frame -or- the background is opaque.
- int fop = fg.getOpacity();
- int bop = bg.getOpacity();
- if (false)
- Log.v(TAG, "Background opacity: " + bop + ", Frame opacity: " + fop);
- if (fop == PixelFormat.OPAQUE || bop == PixelFormat.OPAQUE) {
- opacity = PixelFormat.OPAQUE;
- } else if (fop == PixelFormat.UNKNOWN) {
- opacity = bop;
- } else if (bop == PixelFormat.UNKNOWN) {
- opacity = fop;
- } else {
- opacity = Drawable.resolveOpacity(fop, bop);
- }
- } else {
- // For now we have to assume translucent if there is a
- // frame with padding... there is no way to tell if the
- // frame and background together will draw all pixels.
- if (false)
- Log.v(TAG, "Padding: " + mFramePadding);
- opacity = PixelFormat.TRANSLUCENT;
- }
- }
- if (false)
- Log.v(TAG, "Background: " + bg + ", Frame: " + fg);
- }
-
- if (false)
- Log.v(TAG, "Selected default opacity: " + opacity);
-
- mDefaultOpacity = opacity;
- if (mFeatureId < 0) {
- mWindow.setDefaultWindowFormat(opacity);
- }
- }
-
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- super.onWindowFocusChanged(hasWindowFocus);
-
- // If the user is chording a menu shortcut, release the chord since
- // this window lost focus
- if (mWindow.hasFeature(FEATURE_OPTIONS_PANEL) && !hasWindowFocus
- && mWindow.mPanelChordingKey != 0) {
- mWindow.closePanel(FEATURE_OPTIONS_PANEL);
- }
-
- final Callback cb = mWindow.getCallback();
- if (cb != null && !mWindow.isDestroyed() && mFeatureId < 0) {
- cb.onWindowFocusChanged(hasWindowFocus);
- }
-
- if (mPrimaryActionMode != null) {
- mPrimaryActionMode.onWindowFocusChanged(hasWindowFocus);
- }
- if (mFloatingActionMode != null) {
- mFloatingActionMode.onWindowFocusChanged(hasWindowFocus);
- }
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
-
- final Callback cb = mWindow.getCallback();
- if (cb != null && !mWindow.isDestroyed() && mFeatureId < 0) {
- cb.onAttachedToWindow();
- }
-
- if (mFeatureId == -1) {
- /*
- * The main window has been attached, try to restore any panels
- * that may have been open before. This is called in cases where
- * an activity is being killed for configuration change and the
- * menu was open. When the activity is recreated, the menu
- * should be shown again.
- */
- mWindow.openPanelsAfterRestore();
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
-
- final Callback cb = mWindow.getCallback();
- if (cb != null && mFeatureId < 0) {
- cb.onDetachedFromWindow();
- }
-
- if (mWindow.mDecorContentParent != null) {
- mWindow.mDecorContentParent.dismissPopups();
- }
-
- if (mPrimaryActionModePopup != null) {
- removeCallbacks(mShowPrimaryActionModePopup);
- if (mPrimaryActionModePopup.isShowing()) {
- mPrimaryActionModePopup.dismiss();
- }
- mPrimaryActionModePopup = null;
- }
- if (mFloatingToolbar != null) {
- mFloatingToolbar.dismiss();
- mFloatingToolbar = null;
- }
-
- PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false);
- if (st != null && st.menu != null && mFeatureId < 0) {
- st.menu.close();
- }
- }
-
- @Override
- public void onCloseSystemDialogs(String reason) {
- if (mFeatureId >= 0) {
- mWindow.closeAllPanels();
- }
- }
-
- public android.view.SurfaceHolder.Callback2 willYouTakeTheSurface() {
- return mFeatureId < 0 ? mWindow.mTakeSurfaceCallback : null;
- }
-
- public InputQueue.Callback willYouTakeTheInputQueue() {
- return mFeatureId < 0 ? mWindow.mTakeInputQueueCallback : null;
- }
-
- public void setSurfaceType(int type) {
- mWindow.setType(type);
- }
-
- public void setSurfaceFormat(int format) {
- mWindow.setFormat(format);
- }
-
- public void setSurfaceKeepScreenOn(boolean keepOn) {
- if (keepOn) mWindow.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- else mWindow.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
-
- @Override
- public void onRootViewScrollYChanged(int rootScrollY) {
- mRootScrollY = rootScrollY;
- updateColorViewTranslations();
- }
-
- private ActionMode createActionMode(
- int type, ActionMode.Callback2 callback, View originatingView) {
- switch (type) {
- case ActionMode.TYPE_PRIMARY:
- default:
- return createStandaloneActionMode(callback);
- case ActionMode.TYPE_FLOATING:
- return createFloatingActionMode(originatingView, callback);
- }
- }
-
- private void setHandledActionMode(ActionMode mode) {
- if (mode.getType() == ActionMode.TYPE_PRIMARY) {
- setHandledPrimaryActionMode(mode);
- } else if (mode.getType() == ActionMode.TYPE_FLOATING) {
- setHandledFloatingActionMode(mode);
- }
- }
-
- private ActionMode createStandaloneActionMode(ActionMode.Callback callback) {
- endOnGoingFadeAnimation();
- cleanupPrimaryActionMode();
- if (mPrimaryActionModeView == null) {
- if (mWindow.isFloating()) {
- // Use the action bar theme.
- final TypedValue outValue = new TypedValue();
- final Theme baseTheme = mContext.getTheme();
- baseTheme.resolveAttribute(R.attr.actionBarTheme, outValue, true);
-
- final Context actionBarContext;
- if (outValue.resourceId != 0) {
- final Theme actionBarTheme = mContext.getResources().newTheme();
- actionBarTheme.setTo(baseTheme);
- actionBarTheme.applyStyle(outValue.resourceId, true);
-
- actionBarContext = new ContextThemeWrapper(mContext, 0);
- actionBarContext.getTheme().setTo(actionBarTheme);
- } else {
- actionBarContext = mContext;
- }
-
- mPrimaryActionModeView = new ActionBarContextView(actionBarContext);
- mPrimaryActionModePopup = new PopupWindow(actionBarContext, null,
- R.attr.actionModePopupWindowStyle);
- mPrimaryActionModePopup.setWindowLayoutType(
- WindowManager.LayoutParams.TYPE_APPLICATION);
- mPrimaryActionModePopup.setContentView(mPrimaryActionModeView);
- mPrimaryActionModePopup.setWidth(MATCH_PARENT);
-
- actionBarContext.getTheme().resolveAttribute(
- R.attr.actionBarSize, outValue, true);
- final int height = TypedValue.complexToDimensionPixelSize(outValue.data,
- actionBarContext.getResources().getDisplayMetrics());
- mPrimaryActionModeView.setContentHeight(height);
- mPrimaryActionModePopup.setHeight(WRAP_CONTENT);
- mShowPrimaryActionModePopup = new Runnable() {
- public void run() {
- mPrimaryActionModePopup.showAtLocation(
- mPrimaryActionModeView.getApplicationWindowToken(),
- Gravity.TOP | Gravity.FILL_HORIZONTAL, 0, 0);
- endOnGoingFadeAnimation();
- mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA,
- 0f, 1f);
- mFadeAnim.addListener(new Animator.AnimatorListener() {
- @Override
- public void onAnimationStart(Animator animation) {
- mPrimaryActionModeView.setVisibility(VISIBLE);
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- mPrimaryActionModeView.setAlpha(1f);
- mFadeAnim = null;
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
-
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
-
- }
- });
- mFadeAnim.start();
- }
- };
- } else {
- ViewStub stub = (ViewStub) findViewById(R.id.action_mode_bar_stub);
- if (stub != null) {
- mPrimaryActionModeView = (ActionBarContextView) stub.inflate();
- }
- }
- }
- if (mPrimaryActionModeView != null) {
- mPrimaryActionModeView.killMode();
- ActionMode mode = new StandaloneActionMode(
- mPrimaryActionModeView.getContext(), mPrimaryActionModeView,
- callback, mPrimaryActionModePopup == null);
- return mode;
- }
- return null;
- }
-
- private void endOnGoingFadeAnimation() {
- if (mFadeAnim != null) {
- mFadeAnim.end();
- }
- }
-
- private void setHandledPrimaryActionMode(ActionMode mode) {
- endOnGoingFadeAnimation();
- mPrimaryActionMode = mode;
- mPrimaryActionMode.invalidate();
- mPrimaryActionModeView.initForMode(mPrimaryActionMode);
- if (mPrimaryActionModePopup != null) {
- post(mShowPrimaryActionModePopup);
- } else {
- mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA, 0f, 1f);
- mFadeAnim.addListener(new Animator.AnimatorListener() {
- @Override
- public void onAnimationStart(Animator animation) {
- mPrimaryActionModeView.setVisibility(View.VISIBLE);
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- mPrimaryActionModeView.setAlpha(1f);
- mFadeAnim = null;
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
-
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
-
- }
- });
- mFadeAnim.start();
- }
- mPrimaryActionModeView.sendAccessibilityEvent(
- AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- }
-
- private ActionMode createFloatingActionMode(
- View originatingView, ActionMode.Callback2 callback) {
- if (mFloatingActionMode != null) {
- mFloatingActionMode.finish();
- }
- cleanupFloatingActionModeViews();
- final FloatingActionMode mode =
- new FloatingActionMode(mContext, callback, originatingView);
- mFloatingActionModeOriginatingView = originatingView;
- mFloatingToolbarPreDrawListener =
- new OnPreDrawListener() {
- @Override
- public boolean onPreDraw() {
- mode.updateViewLocationInWindow();
- return true;
- }
- };
- return mode;
- }
-
- private void setHandledFloatingActionMode(ActionMode mode) {
- mFloatingActionMode = mode;
- mFloatingToolbar = new FloatingToolbar(mContext, mWindow);
- ((FloatingActionMode) mFloatingActionMode).setFloatingToolbar(mFloatingToolbar);
- mFloatingActionMode.invalidate(); // Will show the floating toolbar if necessary.
- mFloatingActionModeOriginatingView.getViewTreeObserver()
- .addOnPreDrawListener(mFloatingToolbarPreDrawListener);
- }
-
- /**
- * Informs the decor if a non client decor is attached and visible.
- * @param attachedAndVisible true when the decor is visible.
- * Note that this will even be called if there is no non client decor.
- **/
- void enableNonClientDecor(boolean attachedAndVisible) {
- if (mHasNonClientDecor != attachedAndVisible) {
- mHasNonClientDecor = attachedAndVisible;
- if (getForeground() != null) {
- drawableChanged();
- }
- }
- }
-
- /**
- * Returns true if the window has a non client decor.
- * @return If there is a non client decor - even if it is not visible.
- **/
- private boolean windowHasNonClientDecor() {
- return mHasNonClientDecor;
- }
-
- /**
- * Returns true if the Window is free floating and has a shadow (although at some times
- * it might not be displaying it, e.g. during a resize). Note that non overlapping windows
- * do not have a shadow since it could not be seen anyways (a small screen / tablet
- * "tiles" the windows side by side but does not overlap them).
- * @return Returns true when the window has a shadow created by the non client decor.
- **/
- private boolean windowHasShadow() {
- return windowHasNonClientDecor() && StackId.hasWindowShadow(mWindow.mWorkspaceId);
- }
-
- void setWindow(PhoneWindow phoneWindow) {
- mWindow = phoneWindow;
- Context context = getContext();
- if (context instanceof DecorContext) {
- DecorContext decorContex = (DecorContext) context;
- decorContex.setPhoneWindow(mWindow);
- }
- }
-
- /**
- * Clears out internal references when the action mode is destroyed.
- */
- private class ActionModeCallback2Wrapper extends ActionMode.Callback2 {
- private final ActionMode.Callback mWrapped;
-
- public ActionModeCallback2Wrapper(ActionMode.Callback wrapped) {
- mWrapped = wrapped;
- }
-
- public boolean onCreateActionMode(ActionMode mode, Menu menu) {
- return mWrapped.onCreateActionMode(mode, menu);
- }
-
- public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
- requestFitSystemWindows();
- return mWrapped.onPrepareActionMode(mode, menu);
- }
-
- public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
- return mWrapped.onActionItemClicked(mode, item);
- }
-
- public void onDestroyActionMode(ActionMode mode) {
- mWrapped.onDestroyActionMode(mode);
- final boolean isMncApp = mContext.getApplicationInfo().targetSdkVersion
- >= Build.VERSION_CODES.M;
- final boolean isPrimary;
- final boolean isFloating;
- if (isMncApp) {
- isPrimary = mode == mPrimaryActionMode;
- isFloating = mode == mFloatingActionMode;
- if (!isPrimary && mode.getType() == ActionMode.TYPE_PRIMARY) {
- Log.e(TAG, "Destroying unexpected ActionMode instance of TYPE_PRIMARY; "
- + mode + " was not the current primary action mode! Expected "
- + mPrimaryActionMode);
- }
- if (!isFloating && mode.getType() == ActionMode.TYPE_FLOATING) {
- Log.e(TAG, "Destroying unexpected ActionMode instance of TYPE_FLOATING; "
- + mode + " was not the current floating action mode! Expected "
- + mFloatingActionMode);
- }
- } else {
- isPrimary = mode.getType() == ActionMode.TYPE_PRIMARY;
- isFloating = mode.getType() == ActionMode.TYPE_FLOATING;
- }
- if (isPrimary) {
- if (mPrimaryActionModePopup != null) {
- removeCallbacks(mShowPrimaryActionModePopup);
- }
- if (mPrimaryActionModeView != null) {
- endOnGoingFadeAnimation();
- mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA,
- 1f, 0f);
- mFadeAnim.addListener(new Animator.AnimatorListener() {
- @Override
- public void onAnimationStart(Animator animation) {
-
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- mPrimaryActionModeView.setVisibility(GONE);
- if (mPrimaryActionModePopup != null) {
- mPrimaryActionModePopup.dismiss();
- }
- mPrimaryActionModeView.removeAllViews();
- mFadeAnim = null;
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
-
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
-
- }
- });
- mFadeAnim.start();
- }
-
- mPrimaryActionMode = null;
- } else if (isFloating) {
- cleanupFloatingActionModeViews();
- mFloatingActionMode = null;
- }
- if (mWindow.getCallback() != null && !mWindow.isDestroyed()) {
- try {
- mWindow.getCallback().onActionModeFinished(mode);
- } catch (AbstractMethodError ame) {
- // Older apps might not implement this callback method.
- }
- }
- requestFitSystemWindows();
- }
-
- @Override
- public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
- if (mWrapped instanceof ActionMode.Callback2) {
- ((ActionMode.Callback2) mWrapped).onGetContentRect(mode, view, outRect);
- } else {
- super.onGetContentRect(mode, view, outRect);
- }
- }
- }
- }
-
protected DecorView generateDecor(int featureId) {
// System process doesn't have application context and in that case we need to directly use
// the context we have. Otherwise we want the application context, so we don't cling to the
@@ -4065,7 +2485,7 @@
+ Integer.toHexString(mFrameResource));
}
}
- if (mLoadEleveation) {
+ if (mLoadElevation) {
mElevation = a.getDimension(R.styleable.Window_windowElevation, 0);
}
mClipToOutline = a.getBoolean(R.styleable.Window_windowClipToOutline, false);
@@ -4135,19 +2555,7 @@
}
mDecor.startChanging();
-
- mNonClientDecorView = createNonClientDecorView();
- View in = mLayoutInflater.inflate(layoutResource, null);
- if (mNonClientDecorView != null) {
- if (mNonClientDecorView.getParent() == null) {
- decor.addView(mNonClientDecorView,
- new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
- }
- mNonClientDecorView.addView(in, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
- } else {
- decor.addView(in, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
- }
- mContentRoot = (ViewGroup) in;
+ final View in = mDecor.onResourcesLoaded(mLayoutInflater, layoutResource);
ViewGroup contentParent = (ViewGroup)findViewById(ID_ANDROID_CONTENT);
if (contentParent == null) {
@@ -4202,50 +2610,6 @@
return contentParent;
}
- // Free floating overlapping windows require a non client decor with a caption and shadow..
- private NonClientDecorView createNonClientDecorView() {
- NonClientDecorView nonClientDecorView = null;
- for (int i = mDecor.getChildCount() - 1; i >= 0 && nonClientDecorView == null; i--) {
- View view = mDecor.getChildAt(i);
- if (view instanceof NonClientDecorView) {
- // The decor was most likely saved from a relaunch - so reuse it.
- nonClientDecorView = (NonClientDecorView) view;
- mDecor.removeViewAt(i);
- }
- }
- final WindowManager.LayoutParams attrs = getAttributes();
- boolean isApplication = attrs.type == TYPE_BASE_APPLICATION ||
- attrs.type == TYPE_APPLICATION;
- mWorkspaceId = getWorkspaceId();
- // Only a non floating application window on one of the allowed workspaces can get a non
- // client decor.
- if (!isFloating() && isApplication && StackId.isStaticStack(mWorkspaceId)) {
- // Dependent on the brightness of the used title we either use the
- // dark or the light button frame.
- if (nonClientDecorView == null) {
- Context context = mDecor.getContext();
- TypedValue value = new TypedValue();
- context.getTheme().resolveAttribute(R.attr.colorPrimary, value, true);
- LayoutInflater inflater = mLayoutInflater.from(context);
- if (Color.luminance(value.data) < 0.5) {
- nonClientDecorView = (NonClientDecorView) inflater.inflate(
- R.layout.non_client_decor_dark, null);
- } else {
- nonClientDecorView = (NonClientDecorView) inflater.inflate(
- R.layout.non_client_decor_light, null);
- }
- }
- nonClientDecorView.setPhoneWindow(this, StackId.hasWindowDecor(mWorkspaceId),
- StackId.hasWindowShadow(mWorkspaceId), getResizingBackgroundDrawable(),
- mDecor.getContext().getDrawable(R.drawable.non_client_decor_title_focused));
- }
- // Tell the decor if it has a visible non client decor.
- mDecor.enableNonClientDecor(
- nonClientDecorView != null&& StackId.hasWindowDecor(mWorkspaceId));
-
- return nonClientDecorView;
- }
-
/** @hide */
public void alwaysReadCloseOnTouchAttr() {
mAlwaysReadCloseOnTouchAttr = true;
@@ -4450,7 +2814,7 @@
* isn't in our features, this throws an exception).
* @return The panel state.
*/
- private PanelFeatureState getPanelState(int featureId, boolean required) {
+ PanelFeatureState getPanelState(int featureId, boolean required) {
return getPanelState(featureId, required, null);
}
@@ -4914,7 +3278,7 @@
int curAlpha = 255;
}
- private static final class PanelFeatureState {
+ static final class PanelFeatureState {
/** Feature ID for this panel. */
int featureId;
@@ -5316,30 +3680,12 @@
}
}
- private static class ColorViewState {
- View view = null;
- int targetVisibility = View.INVISIBLE;
- boolean present = false;
+ int getLocalFeaturesPrivate() {
+ return super.getLocalFeatures();
+ }
- final int id;
- final int systemUiHideFlag;
- final int translucentFlag;
- final int verticalGravity;
- final int horizontalGravity;
- final String transitionName;
- final int hideWindowFlag;
-
- ColorViewState(int systemUiHideFlag,
- int translucentFlag, int verticalGravity, int horizontalGravity,
- String transitionName, int id, int hideWindowFlag) {
- this.id = id;
- this.systemUiHideFlag = systemUiHideFlag;
- this.translucentFlag = translucentFlag;
- this.verticalGravity = verticalGravity;
- this.horizontalGravity = horizontalGravity;
- this.transitionName = transitionName;
- this.hideWindowFlag = hideWindowFlag;
- }
+ protected void setDefaultWindowFormat(int format) {
+ super.setDefaultWindowFormat(format);
}
void sendCloseSystemWindows() {
@@ -5391,28 +3737,6 @@
mIsStartingWindow = isStartingWindow;
}
- /**
- * Returns the Id of the workspace which contains this window.
- * Note that if no workspace can be determined - which usually means that it was not
- * created for an activity - the fullscreen workspace ID will be returned.
- * @return Returns the workspace stack id which contains this window.
- **/
- private int getWorkspaceId() {
- int workspaceId = INVALID_STACK_ID;
- WindowControllerCallback callback = getWindowControllerCallback();
- if (callback != null) {
- try {
- workspaceId = callback.getWindowStackId();
- } catch (RemoteException ex) {
- Log.e(TAG, "Failed to get the workspace ID of a PhoneWindow.");
- }
- }
- if (workspaceId == INVALID_STACK_ID) {
- return FULLSCREEN_WORKSPACE_STACK_ID;
- }
- return workspaceId;
- }
-
@Override
public void setTheme(int resid) {
mTheme = resid;
@@ -5423,31 +3747,4 @@
}
}
}
-
- /**
- * Returns the color used to fill areas the app has not rendered content to yet when the user
- * is resizing the window of an activity in multi-window mode.
- * */
- private Drawable getResizingBackgroundDrawable() {
- final Context context = mDecor.getContext();
-
- if (mBackgroundResource != 0) {
- final Drawable drawable = context.getDrawable(mBackgroundResource);
- if (drawable != null) {
- return drawable;
- }
- }
-
- if (mBackgroundFallbackResource != 0) {
- final Drawable fallbackDrawable = context.getDrawable(mBackgroundFallbackResource);
- if (fallbackDrawable != null) {
- return fallbackDrawable;
- }
- }
-
- // We shouldn't really get here as the background fallback should be always available since
- // it is defaulted by the system.
- Log.w(TAG, "Failed to find background drawable for PhoneWindow=" + this);
- return null;
- }
}
diff --git a/core/java/com/android/internal/util/HexDump.java b/core/java/com/android/internal/util/HexDump.java
index 3c7b7ac..7be95d8 100644
--- a/core/java/com/android/internal/util/HexDump.java
+++ b/core/java/com/android/internal/util/HexDump.java
@@ -19,28 +19,29 @@
public class HexDump
{
private final static char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
+ private final static char[] HEX_LOWER_CASE_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
public static String dumpHexString(byte[] array)
{
return dumpHexString(array, 0, array.length);
}
-
+
public static String dumpHexString(byte[] array, int offset, int length)
{
StringBuilder result = new StringBuilder();
-
+
byte[] line = new byte[16];
int lineIndex = 0;
-
+
result.append("\n0x");
result.append(toHexString(offset));
-
+
for (int i = offset ; i < offset + length ; i++)
{
if (lineIndex == 16)
{
result.append(" ");
-
+
for (int j = 0 ; j < 16 ; j++)
{
if (line[j] > ' ' && line[j] < '~')
@@ -52,20 +53,20 @@
result.append(".");
}
}
-
+
result.append("\n0x");
result.append(toHexString(i));
lineIndex = 0;
}
-
+
byte b = array[i];
result.append(" ");
result.append(HEX_DIGITS[(b >>> 4) & 0x0F]);
result.append(HEX_DIGITS[b & 0x0F]);
-
+
line[lineIndex++] = b;
}
-
+
if (lineIndex != 16)
{
int count = (16 - lineIndex) * 3;
@@ -74,7 +75,7 @@
{
result.append(" ");
}
-
+
for (int i = 0 ; i < lineIndex ; i++)
{
if (line[i] > ' ' && line[i] < '~')
@@ -87,10 +88,10 @@
}
}
}
-
+
return result.toString();
}
-
+
public static String toHexString(byte b)
{
return toHexString(toByteArray(b));
@@ -98,48 +99,59 @@
public static String toHexString(byte[] array)
{
- return toHexString(array, 0, array.length);
+ return toHexString(array, 0, array.length, true);
}
-
+
+ public static String toHexString(byte[] array, boolean upperCase)
+ {
+ return toHexString(array, 0, array.length, upperCase);
+ }
+
public static String toHexString(byte[] array, int offset, int length)
{
+ return toHexString(array, offset, length, true);
+ }
+
+ public static String toHexString(byte[] array, int offset, int length, boolean upperCase)
+ {
+ char[] digits = upperCase ? HEX_DIGITS : HEX_LOWER_CASE_DIGITS;
char[] buf = new char[length * 2];
int bufIndex = 0;
- for (int i = offset ; i < offset + length; i++)
+ for (int i = offset ; i < offset + length; i++)
{
byte b = array[i];
- buf[bufIndex++] = HEX_DIGITS[(b >>> 4) & 0x0F];
- buf[bufIndex++] = HEX_DIGITS[b & 0x0F];
+ buf[bufIndex++] = digits[(b >>> 4) & 0x0F];
+ buf[bufIndex++] = digits[b & 0x0F];
}
- return new String(buf);
+ return new String(buf);
}
-
+
public static String toHexString(int i)
{
return toHexString(toByteArray(i));
}
-
+
public static byte[] toByteArray(byte b)
{
byte[] array = new byte[1];
array[0] = b;
return array;
}
-
+
public static byte[] toByteArray(int i)
{
byte[] array = new byte[4];
-
+
array[3] = (byte)(i & 0xFF);
array[2] = (byte)((i >> 8) & 0xFF);
array[1] = (byte)((i >> 16) & 0xFF);
array[0] = (byte)((i >> 24) & 0xFF);
-
+
return array;
}
-
+
private static int toByte(char c)
{
if (c >= '0' && c <= '9') return (c - '0');
@@ -148,7 +160,7 @@
throw new RuntimeException ("Invalid hex char '" + c + "'");
}
-
+
public static byte[] hexStringToByteArray(String hexString)
{
int length = hexString.length();
@@ -158,7 +170,15 @@
{
buffer[i / 2] = (byte)((toByte(hexString.charAt(i)) << 4) | toByte(hexString.charAt(i+1)));
}
-
+
return buffer;
- }
+ }
+
+ public static StringBuilder appendByteAsHex(StringBuilder sb, byte b, boolean upperCase) {
+ char[] digits = upperCase ? HEX_DIGITS : HEX_LOWER_CASE_DIGITS;
+ sb.append(digits[(b >> 4) & 0xf]);
+ sb.append(digits[b & 0xf]);
+ return sb;
+ }
+
}
diff --git a/core/java/com/android/internal/view/ActionBarPolicy.java b/core/java/com/android/internal/view/ActionBarPolicy.java
index bee59dc..007ab29 100644
--- a/core/java/com/android/internal/view/ActionBarPolicy.java
+++ b/core/java/com/android/internal/view/ActionBarPolicy.java
@@ -19,6 +19,7 @@
import com.android.internal.R;
import android.content.Context;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.os.Build;
@@ -38,10 +39,29 @@
mContext = context;
}
+ /**
+ * Returns 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.
+ */
public int getMaxActionButtons() {
- return mContext.getResources().getInteger(R.integer.max_action_buttons);
+ final Configuration config = mContext.getResources().getConfiguration();
+ final int width = config.screenWidthDp;
+ final int height = config.screenHeightDp;
+ final int smallest = config.smallestScreenWidthDp;
+ if (smallest > 600 || (width > 960 && height > 720) || (width > 720 && height > 960)) {
+ // For values-w600dp, values-sw600dp and values-xlarge.
+ return 5;
+ } else if (width >= 500 || (width > 640 && height > 480) || (width > 480 && height > 640)) {
+ // For values-w500dp and values-large.
+ return 4;
+ } else if (width >= 360) {
+ // For values-w360dp.
+ return 3;
+ } else {
+ return 2;
+ }
}
-
public boolean showsOverflowMenuButton() {
return true;
}
diff --git a/core/java/com/android/internal/view/IInputMethodClient.aidl b/core/java/com/android/internal/view/IInputMethodClient.aidl
index 89d36ff..81056f2 100644
--- a/core/java/com/android/internal/view/IInputMethodClient.aidl
+++ b/core/java/com/android/internal/view/IInputMethodClient.aidl
@@ -25,7 +25,8 @@
oneway interface IInputMethodClient {
void setUsingInputMethod(boolean state);
void onBindMethod(in InputBindResult res);
- void onUnbindMethod(int sequence);
+ // unbindReason corresponds to InputMethodClient.UnbindReason.
+ void onUnbindMethod(int sequence, int unbindReason);
void setActive(boolean active);
void setUserActionNotificationSequenceNumber(int sequenceNumber);
}
diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl
index 60c5e42..db3ecc6 100644
--- a/core/java/com/android/internal/view/IInputMethodManager.aidl
+++ b/core/java/com/android/internal/view/IInputMethodManager.aidl
@@ -45,9 +45,10 @@
void addClient(in IInputMethodClient client,
in IInputContext inputContext, int uid, int pid);
void removeClient(in IInputMethodClient client);
-
- InputBindResult startInput(in IInputMethodClient client,
- IInputContext inputContext, in EditorInfo attribute, int controlFlags);
+
+ InputBindResult startInput(/* @InputMethodClient.StartInputReason */ int startInputReason,
+ in IInputMethodClient client, IInputContext inputContext, in EditorInfo attribute,
+ int controlFlags);
void finishInput(in IInputMethodClient client);
boolean showSoftInput(in IInputMethodClient client, int flags,
in ResultReceiver resultReceiver);
@@ -55,9 +56,11 @@
in ResultReceiver resultReceiver);
// Report that a window has gained focus. If 'attribute' is non-null,
// this will also do a startInput.
- InputBindResult windowGainedFocus(in IInputMethodClient client, in IBinder windowToken,
- int controlFlags, int softInputMode, int windowFlags,
- in EditorInfo attribute, IInputContext inputContext);
+ InputBindResult windowGainedFocus(
+ /* @InputMethodClient.StartInputReason */ int startInputReason,
+ in IInputMethodClient client, in IBinder windowToken, int controlFlags,
+ int softInputMode, int windowFlags, in EditorInfo attribute,
+ IInputContext inputContext);
void showInputMethodPickerFromClient(in IInputMethodClient client,
int auxiliarySubtypeMode);
diff --git a/core/java/com/android/internal/view/InputMethodClient.java b/core/java/com/android/internal/view/InputMethodClient.java
new file mode 100644
index 0000000..c27e9aa
--- /dev/null
+++ b/core/java/com/android/internal/view/InputMethodClient.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2015 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 android.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+public final class InputMethodClient {
+ public static final int START_INPUT_REASON_UNSPECIFIED = 0;
+ public static final int START_INPUT_REASON_WINDOW_FOCUS_GAIN = 1;
+ public static final int START_INPUT_REASON_WINDOW_FOCUS_GAIN_REPORT_ONLY = 2;
+ public static final int START_INPUT_REASON_APP_CALLED_RESTART_INPUT_API = 3;
+ public static final int START_INPUT_REASON_CHECK_FOCUS = 4;
+ public static final int START_INPUT_REASON_BOUND_TO_IMMS = 5;
+ public static final int START_INPUT_REASON_UNBOUND_FROM_IMMS = 6;
+ public static final int START_INPUT_REASON_ACTIVATED_BY_IMMS = 7;
+ public static final int START_INPUT_REASON_DEACTIVATED_BY_IMMS = 8;
+
+ @Retention(SOURCE)
+ @IntDef({START_INPUT_REASON_UNSPECIFIED, START_INPUT_REASON_WINDOW_FOCUS_GAIN,
+ START_INPUT_REASON_WINDOW_FOCUS_GAIN_REPORT_ONLY,
+ START_INPUT_REASON_APP_CALLED_RESTART_INPUT_API, START_INPUT_REASON_CHECK_FOCUS,
+ START_INPUT_REASON_BOUND_TO_IMMS, START_INPUT_REASON_ACTIVATED_BY_IMMS,
+ START_INPUT_REASON_DEACTIVATED_BY_IMMS})
+ public @interface StartInputReason {}
+
+ public static String getStartInputReason(@StartInputReason final int reason) {
+ switch (reason) {
+ case START_INPUT_REASON_UNSPECIFIED:
+ return "UNSPECIFIED";
+ case START_INPUT_REASON_WINDOW_FOCUS_GAIN:
+ return "WINDOW_FOCUS_GAIN";
+ case START_INPUT_REASON_WINDOW_FOCUS_GAIN_REPORT_ONLY:
+ return "WINDOW_FOCUS_GAIN_REPORT_ONLY";
+ case START_INPUT_REASON_APP_CALLED_RESTART_INPUT_API:
+ return "APP_CALLED_RESTART_INPUT_API";
+ case START_INPUT_REASON_CHECK_FOCUS:
+ return "CHECK_FOCUS";
+ case START_INPUT_REASON_BOUND_TO_IMMS:
+ return "BOUND_TO_IMMS";
+ case START_INPUT_REASON_UNBOUND_FROM_IMMS:
+ return "UNBOUND_FROM_IMMS";
+ case START_INPUT_REASON_ACTIVATED_BY_IMMS:
+ return "ACTIVATED_BY_IMMS";
+ case START_INPUT_REASON_DEACTIVATED_BY_IMMS:
+ return "DEACTIVATED_BY_IMMS";
+ default:
+ return "Unknown=" + reason;
+ }
+ }
+
+ public static final int UNBIND_REASON_UNSPECIFIED = 0;
+ public static final int UNBIND_REASON_SWITCH_CLIENT = 1;
+ public static final int UNBIND_REASON_SWITCH_IME = 2;
+ public static final int UNBIND_REASON_DISCONNECT_IME = 3;
+ public static final int UNBIND_REASON_NO_IME = 4;
+ public static final int UNBIND_REASON_SWITCH_IME_FAILED = 5;
+ public static final int UNBIND_REASON_RESET_IME = 6;
+
+ @Retention(SOURCE)
+ @IntDef({UNBIND_REASON_UNSPECIFIED, UNBIND_REASON_SWITCH_CLIENT, UNBIND_REASON_SWITCH_IME,
+ UNBIND_REASON_DISCONNECT_IME, UNBIND_REASON_NO_IME, UNBIND_REASON_SWITCH_IME_FAILED,
+ UNBIND_REASON_RESET_IME})
+ public @interface UnbindReason {}
+
+ public static String getUnbindReason(@UnbindReason final int reason) {
+ switch (reason) {
+ case UNBIND_REASON_UNSPECIFIED:
+ return "UNSPECIFIED";
+ case UNBIND_REASON_SWITCH_CLIENT:
+ return "SWITCH_CLIENT";
+ case UNBIND_REASON_SWITCH_IME:
+ return "SWITCH_IME";
+ case UNBIND_REASON_DISCONNECT_IME:
+ return "DISCONNECT_IME";
+ case UNBIND_REASON_NO_IME:
+ return "NO_IME";
+ case UNBIND_REASON_SWITCH_IME_FAILED:
+ return "SWITCH_IME_FAILED";
+ case UNBIND_REASON_RESET_IME:
+ return "RESET_IME";
+ default:
+ return "Unknown=" + reason;
+ }
+ }
+}
diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
index e674ecc..59d5f94 100644
--- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java
+++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
@@ -18,82 +18,104 @@
import com.android.internal.view.menu.MenuPresenter.Callback;
+import android.annotation.AttrRes;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.StyleRes;
import android.content.Context;
import android.view.Gravity;
import android.view.View;
-import android.widget.PopupWindow;
+import android.widget.PopupWindow.OnDismissListener;
/**
* Presents a menu as a small, simple popup anchored to another view.
- *
- * @hide
*/
-public class MenuPopupHelper implements PopupWindow.OnDismissListener {
+public class MenuPopupHelper {
private final Context mContext;
+
+ // Immutable cached popup menu properties.
private final MenuBuilder mMenu;
private final boolean mOverflowOnly;
private final int mPopupStyleAttr;
private final int mPopupStyleRes;
+ // Mutable cached popup menu properties.
private View mAnchorView;
- private MenuPopup mPopup;
-
- private int mDropDownGravity = Gravity.NO_GRAVITY;
+ private int mDropDownGravity = Gravity.START;
private boolean mForceShowIcon;
- private boolean mShowTitle;
private Callback mPresenterCallback;
- private int mInitXOffset;
- private int mInitYOffset;
- public MenuPopupHelper(Context context, MenuBuilder menu) {
+ private MenuPopup mPopup;
+ private OnDismissListener mOnDismissListener;
+
+ public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu) {
this(context, menu, null, false, com.android.internal.R.attr.popupMenuStyle, 0);
}
- public MenuPopupHelper(Context context, MenuBuilder menu, View anchorView) {
+ public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu,
+ @NonNull View anchorView) {
this(context, menu, anchorView, false, com.android.internal.R.attr.popupMenuStyle, 0);
}
- public MenuPopupHelper(Context context, MenuBuilder menu, View anchorView,
- boolean overflowOnly, int popupStyleAttr) {
+ public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu,
+ @NonNull View anchorView,
+ boolean overflowOnly, @AttrRes int popupStyleAttr) {
this(context, menu, anchorView, overflowOnly, popupStyleAttr, 0);
}
- public MenuPopupHelper(Context context, MenuBuilder menu, View anchorView,
- boolean overflowOnly, int popupStyleAttr, int popupStyleRes) {
+ public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu,
+ @NonNull View anchorView, boolean overflowOnly, @AttrRes int popupStyleAttr,
+ @StyleRes int popupStyleRes) {
mContext = context;
mMenu = menu;
+ mAnchorView = anchorView;
mOverflowOnly = overflowOnly;
mPopupStyleAttr = popupStyleAttr;
mPopupStyleRes = popupStyleRes;
- mAnchorView = anchorView;
- mPopup = createMenuPopup();
}
- private MenuPopup createMenuPopup() {
- if (mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_enableCascadingSubmenus)) {
- return new CascadingMenuPopup(mContext, mAnchorView, mPopupStyleAttr, mPopupStyleRes,
- mOverflowOnly);
- }
- return new StandardMenuPopup(
- mContext, mMenu, mAnchorView, mPopupStyleAttr, mPopupStyleRes, mOverflowOnly);
+ public void setOnDismissListener(@Nullable OnDismissListener listener) {
+ mOnDismissListener = listener;
}
- public void setAnchorView(View anchor) {
+ /**
+ * Sets the view to which the popup window is anchored.
+ * <p>
+ * Changes take effect on the next call to show().
+ *
+ * @param anchor the view to which the popup window should be anchored
+ */
+ public void setAnchorView(@NonNull View anchor) {
mAnchorView = anchor;
- mPopup.setAnchorView(anchor);
}
- public void setForceShowIcon(boolean forceShow) {
- mForceShowIcon = forceShow;
- mPopup.setForceShowIcon(forceShow);
+ /**
+ * Sets whether the popup menu's adapter is forced to show icons in the
+ * menu item views.
+ * <p>
+ * Changes take effect on the next call to show().
+ *
+ * @param forceShowIcon {@code true} to force icons to be shown, or
+ * {@code false} for icons to be optionally shown
+ */
+ public void setForceShowIcon(boolean forceShowIcon) {
+ mForceShowIcon = forceShowIcon;
}
+ /**
+ * Sets the alignment of the popup window relative to the anchor view.
+ * <p>
+ * Changes take effect on the next call to show().
+ *
+ * @param gravity alignment of the popup relative to the anchor
+ */
public void setGravity(int gravity) {
mDropDownGravity = gravity;
- mPopup.setGravity(gravity);
}
+ /**
+ * @return alignment of the popup relative to the anchor
+ */
public int getGravity() {
return mDropDownGravity;
}
@@ -110,7 +132,11 @@
}
}
- public ShowableListMenu getPopup() {
+ @NonNull
+ public MenuPopup getPopup() {
+ if (mPopup == null) {
+ mPopup = createPopup();
+ }
return mPopup;
}
@@ -129,14 +155,28 @@
return false;
}
- mInitXOffset = 0;
- mInitYOffset = 0;
- mShowTitle = false;
-
- showPopup();
+ showPopup(0, 0, false, false);
return true;
}
+ /**
+ * Shows the popup menu and makes a best-effort to anchor it to the
+ * specified (x,y) coordinate relative to the anchor view.
+ * <p>
+ * If the popup's resolved gravity is {@link Gravity#LEFT}, this will
+ * display the popup with its top-left corner at (x,y) relative to the
+ * anchor view. If the resolved gravity is {@link Gravity#RIGHT}, the
+ * popup's top-right corner will be at (x,y).
+ * <p>
+ * If the popup cannot be displayed fully on-screen, this method will
+ * attempt to scroll the anchor view's ancestors and/or offset the popup
+ * such that it may be displayed fully on-screen.
+ *
+ * @param x x coordinate relative to the anchor view
+ * @param y y coordinate relative to the anchor view
+ * @return {@code true} if the popup was shown or was already showing prior
+ * to calling this method, {@code false} otherwise
+ */
public boolean tryShow(int x, int y) {
if (isShowing()) {
return true;
@@ -146,51 +186,104 @@
return false;
}
- mInitXOffset = x;
- mInitYOffset = y;
- mShowTitle = true;
-
- showPopup();
+ showPopup(x, y, true, true);
return true;
}
- private void showPopup() {
- mPopup = createMenuPopup();
- mPopup.setAnchorView(mAnchorView);
- mPopup.setCallback(mPresenterCallback);
- mPopup.setForceShowIcon(mForceShowIcon);
- mPopup.setGravity(mDropDownGravity);
- mPopup.setHorizontalOffset(mInitXOffset);
- mPopup.setShowTitle(mShowTitle);
- mPopup.setVerticalOffset(mInitYOffset);
+ /**
+ * Creates the popup and assigns cached properties.
+ *
+ * @return an initialized popup
+ */
+ @NonNull
+ private MenuPopup createPopup() {
+ final boolean enableCascadingSubmenus = mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_enableCascadingSubmenus);
- // In order for subclasses of MenuPopupHelper to satisfy the OnDismissedListener interface,
- // we must set the listener to this outer Helper rather than to the inner MenuPopup.
- // Not to worry -- the inner MenuPopup will call our own #onDismiss method after it's done
- // its own handling.
- mPopup.setOnDismissListener(this);
+ final MenuPopup popup;
+ if (enableCascadingSubmenus) {
+ popup = new CascadingMenuPopup(mContext, mAnchorView, mPopupStyleAttr,
+ mPopupStyleRes, mOverflowOnly);
+ } else {
+ popup = new StandardMenuPopup(mContext, mMenu, mAnchorView, mPopupStyleAttr,
+ mPopupStyleRes, mOverflowOnly);
+ }
- mPopup.addMenu(mMenu);
- mPopup.show();
+ // Assign immutable properties.
+ popup.addMenu(mMenu);
+ popup.setOnDismissListener(mInternalOnDismissListener);
+
+ // Assign mutable properties. These may be reassigned later.
+ popup.setAnchorView(mAnchorView);
+ popup.setCallback(mPresenterCallback);
+ popup.setForceShowIcon(mForceShowIcon);
+ popup.setGravity(mDropDownGravity);
+
+ return popup;
}
+ private void showPopup(int xOffset, int yOffset, boolean resolveOffsets, boolean showTitle) {
+ if (resolveOffsets) {
+ // If the resolved drop-down gravity is RIGHT, the popup's right
+ // edge will be aligned with the anchor view. Adjust by the anchor
+ // width such that the top-right corner is at the X offset.
+ final int hgrav = Gravity.getAbsoluteGravity(mDropDownGravity,
+ mAnchorView.getLayoutDirection()) & Gravity.HORIZONTAL_GRAVITY_MASK;
+ if (hgrav == Gravity.RIGHT) {
+ xOffset -= mAnchorView.getWidth();
+ }
+ }
+
+ final MenuPopup popup = getPopup();
+ popup.setHorizontalOffset(xOffset);
+ popup.setVerticalOffset(yOffset);
+ popup.setShowTitle(showTitle);
+ popup.show();
+ }
+
+ /**
+ * Dismisses the popup, if showing.
+ */
public void dismiss() {
if (isShowing()) {
mPopup.dismiss();
}
}
- @Override
- public void onDismiss() {
+ /**
+ * Called after the popup has been dismissed.
+ * <p>
+ * <strong>Note:</strong> Subclasses should call the super implementation
+ * last to ensure that any necessary tear down has occurred before the
+ * listener specified by {@link #setOnDismissListener(OnDismissListener)}
+ * is called.
+ */
+ protected void onDismiss() {
mPopup = null;
+
+ if (mOnDismissListener != null) {
+ mOnDismissListener.onDismiss();
+ }
}
public boolean isShowing() {
return mPopup != null && mPopup.isShowing();
}
- public void setCallback(MenuPresenter.Callback cb) {
+ public void setCallback(@Nullable MenuPresenter.Callback cb) {
mPresenterCallback = cb;
- mPopup.setCallback(cb);
+ if (mPopup != null) {
+ mPopup.setCallback(cb);
+ }
}
+
+ /**
+ * Listener used to proxy dismiss callbacks to the helper's owner.
+ */
+ private final OnDismissListener mInternalOnDismissListener = new OnDismissListener() {
+ @Override
+ public void onDismiss() {
+ MenuPopupHelper.this.onDismiss();
+ }
+ };
}
diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
index c3a7460..3e65320 100644
--- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
+++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
@@ -360,6 +360,11 @@
}
@Override
+ public int findDependentLayoutAxes(View child, int axisFilter) {
+ return findDependentLayoutAxesHelper(child, axisFilter, LayoutParams.class);
+ }
+
+ @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
pullChildren();
diff --git a/core/java/com/android/internal/widget/ButtonBarLayout.java b/core/java/com/android/internal/widget/ButtonBarLayout.java
index 3b7bce4..a694aca 100644
--- a/core/java/com/android/internal/widget/ButtonBarLayout.java
+++ b/core/java/com/android/internal/widget/ButtonBarLayout.java
@@ -30,6 +30,10 @@
* orientation when it can't fit its child views horizontally.
*/
public class ButtonBarLayout extends LinearLayout {
+ // Whether to allow vertically stacked button bars. This is disabled for
+ // configurations with a small (e.g. less than 320dp) screen height. -->
+ private static final int ALLOW_STACKING_MIN_HEIGHT_DP = 320;
+
/** Whether the current configuration allows stacking. */
private boolean mAllowStacking;
@@ -38,8 +42,12 @@
public ButtonBarLayout(Context context, AttributeSet attrs) {
super(context, attrs);
+ final boolean allowStackingDefault =
+ context.getResources().getConfiguration().screenHeightDp
+ >= ALLOW_STACKING_MIN_HEIGHT_DP;
final TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.ButtonBarLayout);
- mAllowStacking = ta.getBoolean(R.styleable.ButtonBarLayout_allowStacking, false);
+ mAllowStacking = ta.getBoolean(R.styleable.ButtonBarLayout_allowStacking,
+ allowStackingDefault);
ta.recycle();
}
diff --git a/core/java/com/android/internal/widget/DecorCaptionView.java b/core/java/com/android/internal/widget/DecorCaptionView.java
new file mode 100644
index 0000000..d747686
--- /dev/null
+++ b/core/java/com/android/internal/widget/DecorCaptionView.java
@@ -0,0 +1,431 @@
+/*
+ * Copyright (C) 2015 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.widget;
+
+import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.os.RemoteException;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
+import android.view.Window;
+
+import com.android.internal.R;
+import com.android.internal.policy.PhoneWindow;
+
+import java.util.ArrayList;
+
+/**
+ * This class represents the special screen elements to control a window on freeform
+ * environment.
+ * As such this class handles the following things:
+ * <ul>
+ * <li>The caption, containing the system buttons like maximize, close and such as well as
+ * allowing the user to drag the window around.</li>
+ * </ul>
+ * After creating the view, the function {@link #setPhoneWindow} needs to be called to make
+ * the connection to it's owning PhoneWindow.
+ * Note: At this time the application can change various attributes of the DecorView which
+ * will break things (in settle/unexpected ways):
+ * <ul>
+ * <li>setOutlineProvider</li>
+ * <li>setSurfaceFormat</li>
+ * <li>..</li>
+ * </ul>
+ *
+ * Although this ViewGroup has only two direct sub-Views, its behavior is more complex due to
+ * overlaying caption on the content and drawing.
+ *
+ * First, no matter where the content View gets added, it will always be the first child and the
+ * caption will be the second. This way the caption will always be drawn on top of the content when
+ * overlaying is enabled.
+ *
+ * Second, the touch dispatch is customized to handle overlaying. This is what happens when touch
+ * is dispatched on the caption area while overlaying it on content:
+ * <ul>
+ * <li>DecorCaptionView.onInterceptTouchEvent() will try intercepting the touch events if the
+ * down action is performed on top close or maximize buttons; the reason for that is we want these
+ * buttons to always work.</li>
+ * <li>The content View will receive the touch event. Mind that content is actually underneath the
+ * caption, so we need to introduce our own dispatch ordering. We achieve this by overriding
+ * {@link #buildTouchDispatchChildList()}.</li>
+ * <li>If the touch event is not consumed by the content View, it will go to the caption View
+ * and the dragging logic will be executed.</li>
+ * </ul>
+ */
+public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
+ GestureDetector.OnGestureListener {
+ private final static String TAG = "DecorCaptionView";
+ private PhoneWindow mOwner = null;
+ private boolean mShow = false;
+
+ // True if the window is being dragged.
+ private boolean mDragging = false;
+
+ // True when the left mouse button got released while dragging.
+ private boolean mLeftMouseButtonReleased;
+
+ private boolean mOverlayWithAppContent = false;
+
+ private View mCaption;
+ private View mContent;
+ private View mMaximize;
+ private View mClose;
+
+ // Fields for detecting drag events.
+ private int mTouchDownX;
+ private int mTouchDownY;
+ private boolean mCheckForDragging;
+ private int mDragSlop;
+
+ // Fields for detecting and intercepting click events on close/maximize.
+ private ArrayList<View> mTouchDispatchList = new ArrayList<>(2);
+ // We use the gesture detector to detect clicks on close/maximize buttons and to be consistent
+ // with existing click detection.
+ private GestureDetector mGestureDetector;
+ private final Rect mCloseRect = new Rect();
+ private final Rect mMaximizeRect = new Rect();
+ private View mClickTarget;
+
+ public DecorCaptionView(Context context) {
+ super(context);
+ init(context);
+ }
+
+ public DecorCaptionView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init(context);
+ }
+
+ public DecorCaptionView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ init(context);
+ }
+
+ private void init(Context context) {
+ mDragSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+ mGestureDetector = new GestureDetector(context, this);
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ mCaption = getChildAt(0);
+ }
+
+ public void setPhoneWindow(PhoneWindow owner, boolean show) {
+ mOwner = owner;
+ mShow = show;
+ mOverlayWithAppContent = owner.getOverlayDecorCaption();
+ if (mOverlayWithAppContent) {
+ // The caption is covering the content, so we make its background transparent to make
+ // the content visible.
+ mCaption.setBackgroundColor(Color.TRANSPARENT);
+ }
+ updateCaptionVisibility();
+ // By changing the outline provider to BOUNDS, the window can remove its
+ // background without removing the shadow.
+ mOwner.getDecorView().setOutlineProvider(ViewOutlineProvider.BOUNDS);
+ mMaximize = findViewById(R.id.maximize_window);
+ mClose = findViewById(R.id.close_window);
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ // If the user starts touch on the maximize/close buttons, we immediately intercept, so
+ // that these buttons are always clickable.
+ if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+ final int x = (int) ev.getX();
+ final int y = (int) ev.getY();
+ if (mMaximizeRect.contains(x, y)) {
+ mClickTarget = mMaximize;
+ }
+ if (mCloseRect.contains(x, y)) {
+ mClickTarget = mClose;
+ }
+ }
+ return mClickTarget != null;
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (mClickTarget != null) {
+ mGestureDetector.onTouchEvent(event);
+ final int action = event.getAction();
+ if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+ mClickTarget = null;
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean onTouch(View v, MotionEvent e) {
+ // Note: There are no mixed events. When a new device gets used (e.g. 1. Mouse, 2. touch)
+ // the old input device events get cancelled first. So no need to remember the kind of
+ // input device we are listening to.
+ final int x = (int) e.getX();
+ final int y = (int) e.getY();
+ switch (e.getActionMasked()) {
+ case MotionEvent.ACTION_DOWN:
+ if (!mShow) {
+ // When there is no caption we should not react to anything.
+ return false;
+ }
+ // Checking for a drag action is started if we aren't dragging already and the
+ // starting event is either a left mouse button or any other input device.
+ if (((e.getToolType(e.getActionIndex()) != MotionEvent.TOOL_TYPE_MOUSE ||
+ (e.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0))) {
+ mCheckForDragging = true;
+ mTouchDownX = x;
+ mTouchDownY = y;
+ }
+ break;
+
+ case MotionEvent.ACTION_MOVE:
+ if (!mDragging && mCheckForDragging && passedSlop(x, y)) {
+ mCheckForDragging = false;
+ mDragging = true;
+ mLeftMouseButtonReleased = false;
+ startMovingTask(e.getRawX(), e.getRawY());
+ } else if (mDragging && !mLeftMouseButtonReleased) {
+ if (e.getToolType(e.getActionIndex()) == MotionEvent.TOOL_TYPE_MOUSE &&
+ (e.getButtonState() & MotionEvent.BUTTON_PRIMARY) == 0) {
+ // There is no separate mouse button up call and if the user mixes mouse
+ // button drag actions, we stop dragging once he releases the button.
+ mLeftMouseButtonReleased = true;
+ break;
+ }
+ }
+ break;
+
+ case MotionEvent.ACTION_UP:
+ case MotionEvent.ACTION_CANCEL:
+ if (!mDragging) {
+ break;
+ }
+ // Abort the ongoing dragging.
+ mDragging = false;
+ return !mCheckForDragging;
+ }
+ return mDragging || mCheckForDragging;
+ }
+
+ @Override
+ public ArrayList<View> buildTouchDispatchChildList() {
+ mTouchDispatchList.ensureCapacity(3);
+ if (mCaption != null) {
+ mTouchDispatchList.add(mCaption);
+ }
+ if (mContent != null) {
+ mTouchDispatchList.add(mContent);
+ }
+ return mTouchDispatchList;
+ }
+
+ private boolean passedSlop(int x, int y) {
+ return Math.abs(x - mTouchDownX) > mDragSlop || Math.abs(y - mTouchDownY) > mDragSlop;
+ }
+
+ /**
+ * The phone window configuration has changed and the caption needs to be updated.
+ * @param show True if the caption should be shown.
+ */
+ public void onConfigurationChanged(boolean show) {
+ mShow = show;
+ updateCaptionVisibility();
+ }
+
+ @Override
+ public void addView(View child, int index, ViewGroup.LayoutParams params) {
+ if (!(params instanceof MarginLayoutParams)) {
+ throw new IllegalArgumentException(
+ "params " + params + " must subclass MarginLayoutParams");
+ }
+ // Make sure that we never get more then one client area in our view.
+ if (index >= 2 || getChildCount() >= 2) {
+ throw new IllegalStateException("DecorCaptionView can only handle 1 client view");
+ }
+ // To support the overlaying content in the caption, we need to put the content view as the
+ // first child to get the right Z-Ordering.
+ super.addView(child, 0, params);
+ mContent = child;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ final int captionHeight;
+ if (mCaption.getVisibility() != View.GONE) {
+ measureChildWithMargins(mCaption, widthMeasureSpec, 0, heightMeasureSpec, 0);
+ captionHeight = mCaption.getMeasuredHeight();
+ } else {
+ captionHeight = 0;
+ }
+ if (mContent != null) {
+ if (mOverlayWithAppContent) {
+ measureChildWithMargins(mContent, widthMeasureSpec, 0, heightMeasureSpec, 0);
+ } else {
+ measureChildWithMargins(mContent, widthMeasureSpec, 0, heightMeasureSpec,
+ captionHeight);
+ }
+ }
+
+ setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
+ MeasureSpec.getSize(heightMeasureSpec));
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ final int captionHeight;
+ if (mCaption.getVisibility() != View.GONE) {
+ mCaption.layout(0, 0, mCaption.getMeasuredWidth(), mCaption.getMeasuredHeight());
+ captionHeight = mCaption.getBottom() - mCaption.getTop();
+ mMaximize.getHitRect(mMaximizeRect);
+ mClose.getHitRect(mCloseRect);
+ } else {
+ captionHeight = 0;
+ mMaximizeRect.setEmpty();
+ mCloseRect.setEmpty();
+ }
+
+ if (mContent != null) {
+ if (mOverlayWithAppContent) {
+ mContent.layout(0, 0, mContent.getMeasuredWidth(), mContent.getMeasuredHeight());
+ } else {
+ mContent.layout(0, captionHeight, mContent.getMeasuredWidth(),
+ captionHeight + mContent.getMeasuredHeight());
+ }
+ }
+ }
+ /**
+ * Determine if the workspace is entirely covered by the window.
+ * @return Returns true when the window is filling the entire screen/workspace.
+ **/
+ private boolean isFillingScreen() {
+ return (0 != ((getWindowSystemUiVisibility() | getSystemUiVisibility()) &
+ (View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+ View.SYSTEM_UI_FLAG_IMMERSIVE | View.SYSTEM_UI_FLAG_LOW_PROFILE)));
+ }
+
+ /**
+ * Updates the visibility of the caption.
+ **/
+ private void updateCaptionVisibility() {
+ // Don't show the caption if the window has e.g. entered full screen.
+ boolean invisible = isFillingScreen() || !mShow;
+ mCaption.setVisibility(invisible ? GONE : VISIBLE);
+ mCaption.setOnTouchListener(this);
+ }
+
+ /**
+ * Maximize the window by moving it to the maximized workspace stack.
+ **/
+ private void maximizeWindow() {
+ Window.WindowControllerCallback callback = mOwner.getWindowControllerCallback();
+ if (callback != null) {
+ try {
+ callback.changeWindowStack(FULLSCREEN_WORKSPACE_STACK_ID);
+ } catch (RemoteException ex) {
+ Log.e(TAG, "Cannot change task workspace.");
+ }
+ }
+ }
+
+ public boolean isCaptionShowing() {
+ return mShow;
+ }
+
+ public int getCaptionHeight() {
+ return (mCaption != null) ? mCaption.getHeight() : 0;
+ }
+
+ public void removeContentView() {
+ if (mContent != null) {
+ removeView(mContent);
+ mContent = null;
+ }
+ }
+
+ public View getCaption() {
+ return mCaption;
+ }
+
+ @Override
+ public LayoutParams generateLayoutParams(AttributeSet attrs) {
+ return new MarginLayoutParams(getContext(), attrs);
+ }
+
+ @Override
+ protected LayoutParams generateDefaultLayoutParams() {
+ return new MarginLayoutParams(MarginLayoutParams.MATCH_PARENT,
+ MarginLayoutParams.MATCH_PARENT);
+ }
+
+ @Override
+ protected LayoutParams generateLayoutParams(LayoutParams p) {
+ return new MarginLayoutParams(p);
+ }
+
+ @Override
+ protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+ return p instanceof MarginLayoutParams;
+ }
+
+ @Override
+ public boolean onDown(MotionEvent e) {
+ return false;
+ }
+
+ @Override
+ public void onShowPress(MotionEvent e) {
+
+ }
+
+ @Override
+ public boolean onSingleTapUp(MotionEvent e) {
+ if (mClickTarget == mMaximize) {
+ maximizeWindow();
+ } else if (mClickTarget == mClose) {
+ mOwner.dispatchOnWindowDismissed(true /*finishTask*/);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+ return false;
+ }
+
+ @Override
+ public void onLongPress(MotionEvent e) {
+
+ }
+
+ @Override
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+ return false;
+ }
+}
diff --git a/core/java/com/android/internal/widget/FloatingToolbar.java b/core/java/com/android/internal/widget/FloatingToolbar.java
index 7bab446..3a00469 100644
--- a/core/java/com/android/internal/widget/FloatingToolbar.java
+++ b/core/java/com/android/internal/widget/FloatingToolbar.java
@@ -20,6 +20,7 @@
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
import android.content.ComponentCallbacks;
import android.content.Context;
import android.content.res.Configuration;
@@ -28,7 +29,9 @@
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
+import android.graphics.drawable.AnimatedVectorDrawable;
import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.Size;
import android.view.ContextThemeWrapper;
@@ -36,6 +39,7 @@
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.MotionEvent;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewGroup;
@@ -45,6 +49,8 @@
import android.view.animation.Animation;
import android.view.animation.AnimationSet;
import android.view.animation.Transformation;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
@@ -277,70 +283,56 @@
* A popup window used by the floating toolbar.
*
* This class is responsible for the rendering/animation of the floating toolbar.
- * It can hold one of 2 panels (i.e. main panel and overflow panel) at a time.
- * It delegates specific panel functionality to the appropriate panel.
+ * It holds 2 panels (i.e. main panel and overflow panel) and an overflow button
+ * to transition between panels.
*/
private static final class FloatingToolbarPopup {
- public static final int OVERFLOW_DIRECTION_UP = 0;
- public static final int OVERFLOW_DIRECTION_DOWN = 1;
+ /* Minimum and maximum number of items allowed in the overflow. */
+ private static final int MIN_OVERFLOW_SIZE = 2;
+ private static final int MAX_OVERFLOW_SIZE = 4;
+
+ /* The duration of the overflow button vector animation duration. */
+ private static final int OVERFLOW_BUTTON_ANIMATION_DELAY = 400;
private final Context mContext;
- private final View mParent;
+ private final View mParent; // Parent for the popup window.
private final PopupWindow mPopupWindow;
- private final ViewGroup mContentContainer;
+
+ /* Margins between the popup window and it's content. */
private final int mMarginHorizontal;
private final int mMarginVertical;
- private final Animation.AnimationListener mOnOverflowOpened =
- new Animation.AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {}
+ /* View components */
+ private final ViewGroup mContentContainer; // holds all contents.
+ private final ViewGroup mMainPanel; // holds menu items that are initially displayed.
+ private final ListView mOverflowPanel; // holds menu items hidden in the overflow.
+ private final ImageButton mOverflowButton; // opens/closes the overflow.
+ /* overflow button drawables. */
+ private final Drawable mArrow;
+ private final Drawable mOverflow;
+ private final AnimatedVectorDrawable mToArrow;
+ private final AnimatedVectorDrawable mToOverflow;
- @Override
- public void onAnimationEnd(Animation animation) {
- setOverflowPanelAsContent();
- mOverflowPanel.fadeIn(true);
- }
+ private final OverflowPanelViewHelper mOverflowPanelViewHelper;
- @Override
- public void onAnimationRepeat(Animation animation) {}
- };
- private final Animation.AnimationListener mOnOverflowClosed =
- new Animation.AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {}
+ /* Animation interpolators. */
+ private final Interpolator mLogAccelerateInterpolator;
+ private final Interpolator mFastOutSlowInInterpolator;
+ private final Interpolator mLinearOutSlowInInterpolator;
+ private final Interpolator mFastOutLinearInInterpolator;
- @Override
- public void onAnimationEnd(Animation animation) {
- setMainPanelAsContent();
- mMainPanel.fadeIn(true);
- }
-
- @Override
- public void onAnimationRepeat(Animation animation) {
- }
- };
+ /* Animations. */
+ private final AnimatorSet mShowAnimation;
private final AnimatorSet mDismissAnimation;
private final AnimatorSet mHideAnimation;
- private final AnimationSet mOpenOverflowAnimation = new AnimationSet(true);
- private final AnimationSet mCloseOverflowAnimation = new AnimationSet(true);
+ private final AnimationSet mOpenOverflowAnimation;
+ private final AnimationSet mCloseOverflowAnimation;
+ private final Animation.AnimationListener mOverflowAnimationListener;
- private final Runnable mOpenOverflow = new Runnable() {
- @Override
- public void run() {
- openOverflow();
- }
- };
- private final Runnable mCloseOverflow = new Runnable() {
- @Override
- public void run() {
- closeOverflow();
- }
- };
-
- private final Rect mViewPortOnScreen = new Rect();
- private final Point mCoordsOnWindow = new Point();
+ private final Rect mViewPortOnScreen = new Rect(); // portion of screen we can draw in.
+ private final Point mCoordsOnWindow = new Point(); // popup window coordinates.
+ /* Temporary data holders. Reset values before using. */
private final int[] mTmpCoords = new int[2];
private final Rect mTmpRect = new Rect();
@@ -357,12 +349,56 @@
}
};
+ /**
+ * @see OverflowPanelViewHelper#preparePopupContent().
+ */
+ private final Runnable mPreparePopupContentRTLHelper = new Runnable() {
+ @Override
+ public void run() {
+ setPanelsStatesAtRestingPosition();
+ setContentAreaAsTouchableSurface();
+ mContentContainer.setAlpha(1);
+ }
+ };
+
+ /* Runnable to reset the overflow button's drawable after an overflow transition. */
+ private final Runnable mResetOverflowButtonDrawable = new Runnable() {
+ @Override
+ public void run() {
+ if (mIsOverflowOpen) {
+ mOverflowButton.setImageDrawable(mArrow);
+ } else {
+ mOverflowButton.setImageDrawable(mOverflow);
+ }
+ }
+ };
+
private boolean mDismissed = true; // tracks whether this popup is dismissed or dismissing.
private boolean mHidden; // tracks whether this popup is hidden or hiding.
- private FloatingToolbarOverflowPanel mOverflowPanel;
- private FloatingToolbarMainPanel mMainPanel;
- private int mOverflowDirection;
+ /* Calculated sizes for panels and overflow button. */
+ private final Size mOverflowButtonSize;
+ private Size mOverflowPanelSize; // Should be null when there is no overflow.
+ private Size mMainPanelSize;
+
+ /* Item click listeners */
+ private MenuItem.OnMenuItemClickListener mOnMenuItemClickListener;
+ private final View.OnClickListener mMenuItemButtonOnClickListener =
+ new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (v.getTag() instanceof MenuItem) {
+ if (mOnMenuItemClickListener != null) {
+ mOnMenuItemClickListener.onMenuItemClick((MenuItem) v.getTag());
+ }
+ }
+ }
+ };
+
+ private boolean mOpenOverflowUpwards; // Whether the overflow opens upwards or downwards.
+ private boolean mIsOverflowOpen;
+
+ private int mTransitionDurationScale; // Used to scale the toolbar transition duration.
/**
* Initializes a new floating toolbar popup.
@@ -375,6 +411,48 @@
mContext = Preconditions.checkNotNull(context);
mContentContainer = createContentContainer(context);
mPopupWindow = createPopupWindow(mContentContainer);
+ mMarginHorizontal = parent.getResources()
+ .getDimensionPixelSize(R.dimen.floating_toolbar_horizontal_margin);
+ mMarginVertical = parent.getResources()
+ .getDimensionPixelSize(R.dimen.floating_toolbar_vertical_margin);
+
+ // Interpolators
+ mLogAccelerateInterpolator = new LogAccelerateInterpolator();
+ mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(
+ mContext, android.R.interpolator.fast_out_slow_in);
+ mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(
+ mContext, android.R.interpolator.linear_out_slow_in);
+ mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(
+ mContext, android.R.interpolator.fast_out_linear_in);
+
+ // Drawables. Needed for views.
+ mArrow = mContext.getResources()
+ .getDrawable(R.drawable.ft_avd_tooverflow, mContext.getTheme());
+ mArrow.setAutoMirrored(true);
+ mOverflow = mContext.getResources()
+ .getDrawable(R.drawable.ft_avd_toarrow, mContext.getTheme());
+ mOverflow.setAutoMirrored(true);
+ mToArrow = (AnimatedVectorDrawable) mContext.getResources()
+ .getDrawable(R.drawable.ft_avd_toarrow_animation, mContext.getTheme());
+ mToArrow.setAutoMirrored(true);
+ mToOverflow = (AnimatedVectorDrawable) mContext.getResources()
+ .getDrawable(R.drawable.ft_avd_tooverflow_animation, mContext.getTheme());
+ mToOverflow.setAutoMirrored(true);
+
+ // Views
+ mOverflowButton = createOverflowButton();
+ mOverflowButtonSize = measure(mOverflowButton);
+ mMainPanel = createMainPanel();
+ mOverflowPanelViewHelper = new OverflowPanelViewHelper(mContext);
+ mOverflowPanel = createOverflowPanel();
+
+ // Animation. Need views.
+ mOverflowAnimationListener = createOverflowAnimationListener();
+ mOpenOverflowAnimation = new AnimationSet(true);
+ mOpenOverflowAnimation.setAnimationListener(mOverflowAnimationListener);
+ mCloseOverflowAnimation = new AnimationSet(true);
+ mCloseOverflowAnimation.setAnimationListener(mOverflowAnimationListener);
+ mShowAnimation = createEnterAnimation(mContentContainer);
mDismissAnimation = createExitAnimation(
mContentContainer,
150, // startDelay
@@ -394,35 +472,23 @@
mPopupWindow.dismiss();
}
});
- mMarginHorizontal = parent.getResources()
- .getDimensionPixelSize(R.dimen.floating_toolbar_horizontal_margin);
- mMarginVertical = parent.getResources()
- .getDimensionPixelSize(R.dimen.floating_toolbar_vertical_margin);
}
/**
* Lays out buttons for the specified menu items.
+ * Requires a subsequent call to {@link #show()} to show the items.
*/
public void layoutMenuItems(
List<MenuItem> menuItems,
MenuItem.OnMenuItemClickListener menuItemClickListener,
int suggestedWidth) {
- Preconditions.checkNotNull(menuItems);
-
- mContentContainer.removeAllViews();
- if (mMainPanel == null) {
- mMainPanel = new FloatingToolbarMainPanel(mContext, mOpenOverflow);
- }
- List<MenuItem> overflowMenuItems =
- mMainPanel.layoutMenuItems(menuItems, getToolbarWidth(suggestedWidth));
- mMainPanel.setOnMenuItemClickListener(menuItemClickListener);
- if (!overflowMenuItems.isEmpty()) {
- if (mOverflowPanel == null) {
- mOverflowPanel =
- new FloatingToolbarOverflowPanel(mContext, mCloseOverflow);
- }
- mOverflowPanel.setMenuItems(overflowMenuItems);
- mOverflowPanel.setOnMenuItemClickListener(menuItemClickListener);
+ mOnMenuItemClickListener = menuItemClickListener;
+ cancelOverflowAnimations();
+ clearPanels();
+ menuItems = layoutMainPanelItems(menuItems, getAdjustedToolbarWidth(suggestedWidth));
+ if (!menuItems.isEmpty()) {
+ // Add remaining items to the overflow.
+ layoutOverflowPanelItems(menuItems);
}
updatePopupSize();
}
@@ -443,20 +509,13 @@
cancelDismissAndHideAnimations();
cancelOverflowAnimations();
- // Make sure a panel is set as the content.
- if (mContentContainer.getChildCount() == 0) {
- setMainPanelAsContent();
- // If we're yet to show the popup, set the container visibility to zero.
- // The "show" animation will make this visible.
- mContentContainer.setAlpha(0);
- }
refreshCoordinatesAndOverflowDirection(contentRectOnScreen);
preparePopupContent();
// We need to specify the position in window coordinates.
// TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can
- // specify the popup poision in screen coordinates.
- mPopupWindow.showAtLocation(mParent, Gravity.NO_GRAVITY, mCoordsOnWindow.x,
- mCoordsOnWindow.y);
+ // specify the popup position in screen coordinates.
+ mPopupWindow.showAtLocation(
+ mParent, Gravity.NO_GRAVITY, mCoordsOnWindow.x, mCoordsOnWindow.y);
setTouchableSurfaceInsetsComputer();
runShowAnimation();
}
@@ -472,6 +531,7 @@
mHidden = false;
mDismissed = true;
mHideAnimation.cancel();
+
runDismissAnimation();
setZeroTouchableSurface();
}
@@ -521,104 +581,90 @@
preparePopupContent();
// We need to specify the position in window coordinates.
// TODO: Consider to use PopupWindow.setLayoutInScreenEnabled(true) so that we can
- // specify the popup poision in screen coordinates.
- mPopupWindow.update(mCoordsOnWindow.x, mCoordsOnWindow.y, getWidth(), getHeight());
- }
-
- /**
- * Returns the width of this popup.
- */
- public int getWidth() {
- return mPopupWindow.getWidth();
- }
-
- /**
- * Returns the height of this popup.
- */
- public int getHeight() {
- return mPopupWindow.getHeight();
- }
-
- /**
- * Returns the context this popup is running in.
- */
- public Context getContext() {
- return mContext;
+ // specify the popup position in screen coordinates.
+ mPopupWindow.update(
+ mCoordsOnWindow.x, mCoordsOnWindow.y,
+ mPopupWindow.getWidth(), mPopupWindow.getHeight());
}
private void refreshCoordinatesAndOverflowDirection(Rect contentRectOnScreen) {
refreshViewPort();
- int x = contentRectOnScreen.centerX() - getWidth() / 2;
+ int x = contentRectOnScreen.centerX() - mPopupWindow.getWidth() / 2;
// Update x so that the toolbar isn't rendered behind the nav bar in landscape.
- x = Math.max(0, Math.min(x, mViewPortOnScreen.right - getWidth()));
+ x = Math.max(0, Math.min(x, mViewPortOnScreen.right - mPopupWindow.getWidth()));
- int y;
+ final int y;
- int availableHeightAboveContent = contentRectOnScreen.top - mViewPortOnScreen.top;
- int availableHeightBelowContent = mViewPortOnScreen.bottom - contentRectOnScreen.bottom;
+ final int availableHeightAboveContent =
+ contentRectOnScreen.top - mViewPortOnScreen.top;
+ final int availableHeightBelowContent =
+ mViewPortOnScreen.bottom - contentRectOnScreen.bottom;
- if (mOverflowPanel == null) { // There is no overflow.
- if (availableHeightAboveContent >= getToolbarHeightWithVerticalMargin()) {
+ final int margin = 2 * mMarginVertical;
+ final int toolbarHeightWithVerticalMargin = getLineHeight(mContext) + margin;
+
+ if (!hasOverflow()) {
+ if (availableHeightAboveContent >= toolbarHeightWithVerticalMargin) {
// There is enough space at the top of the content.
- y = contentRectOnScreen.top - getToolbarHeightWithVerticalMargin();
- } else if (availableHeightBelowContent >= getToolbarHeightWithVerticalMargin()) {
+ y = contentRectOnScreen.top - toolbarHeightWithVerticalMargin;
+ } else if (availableHeightBelowContent >= toolbarHeightWithVerticalMargin) {
// There is enough space at the bottom of the content.
y = contentRectOnScreen.bottom;
- } else if (availableHeightBelowContent >= getEstimatedToolbarHeight(mContext)) {
+ } else if (availableHeightBelowContent >= getLineHeight(mContext)) {
// Just enough space to fit the toolbar with no vertical margins.
y = contentRectOnScreen.bottom - mMarginVertical;
} else {
// Not enough space. Prefer to position as high as possible.
y = Math.max(
mViewPortOnScreen.top,
- contentRectOnScreen.top - getToolbarHeightWithVerticalMargin());
+ contentRectOnScreen.top - toolbarHeightWithVerticalMargin);
}
- } else { // There is an overflow.
- int margin = 2 * mMarginVertical;
- int minimumOverflowHeightWithMargin = mOverflowPanel.getMinimumHeight() + margin;
- int availableHeightThroughContentDown = mViewPortOnScreen.bottom -
- contentRectOnScreen.top + getToolbarHeightWithVerticalMargin();
- int availableHeightThroughContentUp = contentRectOnScreen.bottom -
- mViewPortOnScreen.top + getToolbarHeightWithVerticalMargin();
+ } else {
+ // Has an overflow.
+ final int minimumOverflowHeightWithMargin =
+ calculateOverflowHeight(MIN_OVERFLOW_SIZE) + margin;
+ final int availableHeightThroughContentDown = mViewPortOnScreen.bottom -
+ contentRectOnScreen.top + toolbarHeightWithVerticalMargin;
+ final int availableHeightThroughContentUp = contentRectOnScreen.bottom -
+ mViewPortOnScreen.top + toolbarHeightWithVerticalMargin;
if (availableHeightAboveContent >= minimumOverflowHeightWithMargin) {
// There is enough space at the top of the content rect for the overflow.
// Position above and open upwards.
updateOverflowHeight(availableHeightAboveContent - margin);
- y = contentRectOnScreen.top - getHeight();
- mOverflowDirection = OVERFLOW_DIRECTION_UP;
- } else if (availableHeightAboveContent >= getToolbarHeightWithVerticalMargin()
+ y = contentRectOnScreen.top - mPopupWindow.getHeight();
+ mOpenOverflowUpwards = true;
+ } else if (availableHeightAboveContent >= toolbarHeightWithVerticalMargin
&& availableHeightThroughContentDown >= minimumOverflowHeightWithMargin) {
// There is enough space at the top of the content rect for the main panel
// but not the overflow.
// Position above but open downwards.
updateOverflowHeight(availableHeightThroughContentDown - margin);
- y = contentRectOnScreen.top - getToolbarHeightWithVerticalMargin();
- mOverflowDirection = OVERFLOW_DIRECTION_DOWN;
+ y = contentRectOnScreen.top - toolbarHeightWithVerticalMargin;
+ mOpenOverflowUpwards = false;
} else if (availableHeightBelowContent >= minimumOverflowHeightWithMargin) {
// There is enough space at the bottom of the content rect for the overflow.
// Position below and open downwards.
updateOverflowHeight(availableHeightBelowContent - margin);
y = contentRectOnScreen.bottom;
- mOverflowDirection = OVERFLOW_DIRECTION_DOWN;
- } else if (availableHeightBelowContent >= getToolbarHeightWithVerticalMargin()
+ mOpenOverflowUpwards = false;
+ } else if (availableHeightBelowContent >= toolbarHeightWithVerticalMargin
&& mViewPortOnScreen.height() >= minimumOverflowHeightWithMargin) {
// There is enough space at the bottom of the content rect for the main panel
// but not the overflow.
// Position below but open upwards.
updateOverflowHeight(availableHeightThroughContentUp - margin);
- y = contentRectOnScreen.bottom + getToolbarHeightWithVerticalMargin() -
- getHeight();
- mOverflowDirection = OVERFLOW_DIRECTION_UP;
+ y = contentRectOnScreen.bottom + toolbarHeightWithVerticalMargin -
+ mPopupWindow.getHeight();
+ mOpenOverflowUpwards = true;
} else {
// Not enough space.
// Position at the top of the view port and open downwards.
updateOverflowHeight(mViewPortOnScreen.height() - margin);
y = mViewPortOnScreen.top;
- mOverflowDirection = OVERFLOW_DIRECTION_DOWN;
+ mOpenOverflowUpwards = false;
}
- mOverflowPanel.setOverflowDirection(mOverflowDirection);
}
// We later specify the location of PopupWindow relative to the attached window.
@@ -639,15 +685,11 @@
mCoordsOnWindow.set(x - windowLeftOnScreen, y - windowTopOnScreen);
}
- private int getToolbarHeightWithVerticalMargin() {
- return getEstimatedToolbarHeight(mContext) + mMarginVertical * 2;
- }
-
/**
* Performs the "show" animation on the floating popup.
*/
private void runShowAnimation() {
- createEnterAnimation(mContentContainer).start();
+ mShowAnimation.start();
}
/**
@@ -670,42 +712,16 @@
}
private void cancelOverflowAnimations() {
- if (mOpenOverflowAnimation.hasStarted()
- && !mOpenOverflowAnimation.hasEnded()) {
- // Remove the animation listener, stop the animation,
- // then trigger the lister explicitly so it is not posted
- // to the message queue.
- mOpenOverflowAnimation.setAnimationListener(null);
- mContentContainer.clearAnimation();
- mOnOverflowOpened.onAnimationEnd(null);
- }
- if (mCloseOverflowAnimation.hasStarted()
- && !mCloseOverflowAnimation.hasEnded()) {
- // Remove the animation listener, stop the animation,
- // then trigger the lister explicitly so it is not posted
- // to the message queue.
- mCloseOverflowAnimation.setAnimationListener(null);
- mContentContainer.clearAnimation();
- mOnOverflowClosed.onAnimationEnd(null);
- }
+ mContentContainer.clearAnimation();
+ mMainPanel.animate().cancel();
+ mOverflowPanel.animate().cancel();
+ mToArrow.stop();
+ mToOverflow.stop();
}
- /**
- * Opens the floating toolbar overflow.
- * This method should not be called if menu items have not been laid out with
- * {@link #layoutMenuItems(java.util.List, MenuItem.OnMenuItemClickListener, int)}.
- *
- * @throws IllegalStateException if called when menu items have not been laid out.
- */
private void openOverflow() {
- Preconditions.checkState(mMainPanel != null);
- Preconditions.checkState(mOverflowPanel != null);
-
- mMainPanel.fadeOut(true);
- Size overflowPanelSize = mOverflowPanel.measure();
- final int targetWidth = overflowPanelSize.getWidth();
- final int targetHeight = overflowPanelSize.getHeight();
- final boolean morphUpwards = (mOverflowDirection == OVERFLOW_DIRECTION_UP);
+ final int targetWidth = mOverflowPanelSize.getWidth();
+ final int targetHeight = mOverflowPanelSize.getHeight();
final int startWidth = mContentContainer.getWidth();
final int startHeight = mContentContainer.getHeight();
final float startY = mContentContainer.getY();
@@ -714,230 +730,281 @@
Animation widthAnimation = new Animation() {
@Override
protected void applyTransformation(float interpolatedTime, Transformation t) {
- ViewGroup.LayoutParams params = mContentContainer.getLayoutParams();
int deltaWidth = (int) (interpolatedTime * (targetWidth - startWidth));
- params.width = startWidth + deltaWidth;
- mContentContainer.setLayoutParams(params);
+ setWidth(mContentContainer, startWidth + deltaWidth);
if (isRTL()) {
mContentContainer.setX(left);
+
+ // Lock the panels in place.
+ mMainPanel.setX(0);
+ mOverflowPanel.setX(0);
} else {
mContentContainer.setX(right - mContentContainer.getWidth());
+
+ // Offset the panels' positions so they look like they're locked in place
+ // on the screen.
+ mMainPanel.setX(mContentContainer.getWidth() - startWidth);
+ mOverflowPanel.setX(mContentContainer.getWidth() - targetWidth);
}
}
};
Animation heightAnimation = new Animation() {
@Override
protected void applyTransformation(float interpolatedTime, Transformation t) {
- ViewGroup.LayoutParams params = mContentContainer.getLayoutParams();
int deltaHeight = (int) (interpolatedTime * (targetHeight - startHeight));
- params.height = startHeight + deltaHeight;
- mContentContainer.setLayoutParams(params);
- if (morphUpwards) {
- float y = startY - (mContentContainer.getHeight() - startHeight);
- mContentContainer.setY(y);
+ setHeight(mContentContainer, startHeight + deltaHeight);
+ if (mOpenOverflowUpwards) {
+ mContentContainer.setY(
+ startY - (mContentContainer.getHeight() - startHeight));
+ positionContentYCoordinatesIfOpeningOverflowUpwards();
}
}
};
- widthAnimation.setDuration(240);
- heightAnimation.setDuration(180);
- heightAnimation.setStartOffset(60);
+ final float overflowButtonStartX = mOverflowButton.getX();
+ final float overflowButtonTargetX = isRTL() ?
+ overflowButtonStartX + targetWidth - mOverflowButton.getWidth() :
+ overflowButtonStartX - targetWidth + mOverflowButton.getWidth();
+ Animation overflowButtonAnimation = new Animation() {
+ @Override
+ protected void applyTransformation(float interpolatedTime, Transformation t) {
+ float overflowButtonX = overflowButtonStartX
+ + interpolatedTime * (overflowButtonTargetX - overflowButtonStartX);
+ float deltaContainerWidth = isRTL() ?
+ 0 :
+ mContentContainer.getWidth() - startWidth;
+ float actualOverflowButtonX = overflowButtonX + deltaContainerWidth;
+ mOverflowButton.setX(actualOverflowButtonX);
+ }
+ };
+ widthAnimation.setInterpolator(mLogAccelerateInterpolator);
+ widthAnimation.setDuration(getAdjustedDuration(250));
+ heightAnimation.setInterpolator(mFastOutSlowInInterpolator);
+ heightAnimation.setDuration(getAdjustedDuration(250));
+ overflowButtonAnimation.setInterpolator(mFastOutSlowInInterpolator);
+ overflowButtonAnimation.setDuration(getAdjustedDuration(250));
mOpenOverflowAnimation.getAnimations().clear();
- mOpenOverflowAnimation.setAnimationListener(mOnOverflowOpened);
+ mOpenOverflowAnimation.getAnimations().clear();
mOpenOverflowAnimation.addAnimation(widthAnimation);
mOpenOverflowAnimation.addAnimation(heightAnimation);
+ mOpenOverflowAnimation.addAnimation(overflowButtonAnimation);
mContentContainer.startAnimation(mOpenOverflowAnimation);
+ mIsOverflowOpen = true;
+ mMainPanel.animate()
+ .alpha(0).withLayer()
+ .setInterpolator(mLinearOutSlowInInterpolator)
+ .setDuration(250)
+ .start();
+ mOverflowPanel.setAlpha(1); // fadeIn in 0ms.
}
- /**
- * Opens the floating toolbar overflow.
- * This method should not be called if menu items have not been laid out with
- * {@link #layoutMenuItems(java.util.List, MenuItem.OnMenuItemClickListener, int)}.
- *
- * @throws IllegalStateException if called when menu items have not been laid out.
- */
private void closeOverflow() {
- Preconditions.checkState(mMainPanel != null);
- Preconditions.checkState(mOverflowPanel != null);
-
- mOverflowPanel.fadeOut(true);
- Size mainPanelSize = mMainPanel.measure();
- final int targetWidth = mainPanelSize.getWidth();
- final int targetHeight = mainPanelSize.getHeight();
+ final int targetWidth = mMainPanelSize.getWidth();
final int startWidth = mContentContainer.getWidth();
- final int startHeight = mContentContainer.getHeight();
- final float bottom = mContentContainer.getY() + mContentContainer.getHeight();
- final boolean morphedUpwards = (mOverflowDirection == OVERFLOW_DIRECTION_UP);
final float left = mContentContainer.getX();
final float right = left + mContentContainer.getWidth();
Animation widthAnimation = new Animation() {
@Override
protected void applyTransformation(float interpolatedTime, Transformation t) {
- ViewGroup.LayoutParams params = mContentContainer.getLayoutParams();
int deltaWidth = (int) (interpolatedTime * (targetWidth - startWidth));
- params.width = startWidth + deltaWidth;
- mContentContainer.setLayoutParams(params);
+ setWidth(mContentContainer, startWidth + deltaWidth);
if (isRTL()) {
mContentContainer.setX(left);
+
+ // Lock the panels in place.
+ mMainPanel.setX(0);
+ mOverflowPanel.setX(0);
} else {
mContentContainer.setX(right - mContentContainer.getWidth());
+
+ // Offset the panels' positions so they look like they're locked in place
+ // on the screen.
+ mMainPanel.setX(mContentContainer.getWidth() - targetWidth);
+ mOverflowPanel.setX(mContentContainer.getWidth() - startWidth);
}
}
};
+ final int targetHeight = mMainPanelSize.getHeight();
+ final int startHeight = mContentContainer.getHeight();
+ final float bottom = mContentContainer.getY() + mContentContainer.getHeight();
Animation heightAnimation = new Animation() {
@Override
protected void applyTransformation(float interpolatedTime, Transformation t) {
- ViewGroup.LayoutParams params = mContentContainer.getLayoutParams();
int deltaHeight = (int) (interpolatedTime * (targetHeight - startHeight));
- params.height = startHeight + deltaHeight;
- mContentContainer.setLayoutParams(params);
- if (morphedUpwards) {
+ setHeight(mContentContainer, startHeight + deltaHeight);
+ if (mOpenOverflowUpwards) {
mContentContainer.setY(bottom - mContentContainer.getHeight());
+ positionContentYCoordinatesIfOpeningOverflowUpwards();
}
}
};
- widthAnimation.setDuration(150);
- widthAnimation.setStartOffset(150);
- heightAnimation.setDuration(210);
+ final float overflowButtonStartX = mOverflowButton.getX();
+ final float overflowButtonTargetX = isRTL() ?
+ overflowButtonStartX - startWidth + mOverflowButton.getWidth() :
+ overflowButtonStartX + startWidth - mOverflowButton.getWidth();
+ Animation overflowButtonAnimation = new Animation() {
+ @Override
+ protected void applyTransformation(float interpolatedTime, Transformation t) {
+ float overflowButtonX = overflowButtonStartX
+ + interpolatedTime * (overflowButtonTargetX - overflowButtonStartX);
+ float deltaContainerWidth = isRTL() ?
+ 0 :
+ mContentContainer.getWidth() - startWidth;
+ float actualOverflowButtonX = overflowButtonX + deltaContainerWidth;
+ mOverflowButton.setX(actualOverflowButtonX);
+ }
+ };
+ widthAnimation.setInterpolator(mFastOutSlowInInterpolator);
+ widthAnimation.setDuration(getAdjustedDuration(250));
+ heightAnimation.setInterpolator(mLogAccelerateInterpolator);
+ heightAnimation.setDuration(getAdjustedDuration(250));
+ overflowButtonAnimation.setInterpolator(mFastOutSlowInInterpolator);
+ overflowButtonAnimation.setDuration(getAdjustedDuration(250));
mCloseOverflowAnimation.getAnimations().clear();
- mCloseOverflowAnimation.setAnimationListener(mOnOverflowClosed);
mCloseOverflowAnimation.addAnimation(widthAnimation);
mCloseOverflowAnimation.addAnimation(heightAnimation);
+ mCloseOverflowAnimation.addAnimation(overflowButtonAnimation);
mContentContainer.startAnimation(mCloseOverflowAnimation);
+ mIsOverflowOpen = false;
+ mMainPanel.animate()
+ .alpha(1).withLayer()
+ .setInterpolator(mFastOutLinearInInterpolator)
+ .setDuration(100)
+ .start();
+ mOverflowPanel.animate()
+ .alpha(0).withLayer()
+ .setInterpolator(mLinearOutSlowInInterpolator)
+ .setDuration(150)
+ .start();
}
- /**
- * Prepares the content container for show and update calls.
- */
- private void preparePopupContent() {
- // Reset visibility.
- if (mMainPanel != null) {
- mMainPanel.fadeIn(false);
- }
- if (mOverflowPanel != null) {
- mOverflowPanel.fadeIn(false);
- }
+ private void setPanelsStatesAtRestingPosition() {
+ mOverflowButton.setEnabled(true);
- // Reset position.
- if (isMainPanelContent()) {
- positionMainPanel();
- }
- if (isOverflowPanelContent()) {
- positionOverflowPanel();
- }
- }
+ if (mIsOverflowOpen) {
+ // Set open state.
+ final Size containerSize = mOverflowPanelSize;
+ setSize(mContentContainer, containerSize);
+ mMainPanel.setAlpha(0);
+ mOverflowPanel.setAlpha(1);
+ mOverflowButton.setImageDrawable(mArrow);
- private boolean isMainPanelContent() {
- return mMainPanel != null
- && mContentContainer.getChildAt(0) == mMainPanel.getView();
- }
+ // Update x-coordinates depending on RTL state.
+ if (isRTL()) {
+ mContentContainer.setX(mMarginHorizontal); // align left
+ mMainPanel.setX(0); // align left
+ mOverflowButton.setX( // align right
+ containerSize.getWidth() - mOverflowButtonSize.getWidth());
+ mOverflowPanel.setX(0); // align left
+ } else {
+ mContentContainer.setX( // align right
+ mMarginHorizontal +
+ mMainPanelSize.getWidth() - containerSize.getWidth());
+ mMainPanel.setX(-mContentContainer.getX()); // align right
+ mOverflowButton.setX(0); // align left
+ mOverflowPanel.setX(0); // align left
+ }
- private boolean isOverflowPanelContent() {
- return mOverflowPanel != null
- && mContentContainer.getChildAt(0) == mOverflowPanel.getView();
- }
-
- /**
- * Sets the current content to be the main view panel.
- */
- private void setMainPanelAsContent() {
- // This should never be called if the main panel has not been initialized.
- Preconditions.checkNotNull(mMainPanel);
- mContentContainer.removeAllViews();
- Size mainPanelSize = mMainPanel.measure();
- ViewGroup.LayoutParams params = mContentContainer.getLayoutParams();
- params.width = mainPanelSize.getWidth();
- params.height = mainPanelSize.getHeight();
- mContentContainer.setLayoutParams(params);
- mContentContainer.addView(mMainPanel.getView());
- setContentAreaAsTouchableSurface();
- }
-
- /**
- * Sets the current content to be the overflow view panel.
- */
- private void setOverflowPanelAsContent() {
- // This should never be called if the overflow panel has not been initialized.
- Preconditions.checkNotNull(mOverflowPanel);
- mContentContainer.removeAllViews();
- Size overflowPanelSize = mOverflowPanel.measure();
- ViewGroup.LayoutParams params = mContentContainer.getLayoutParams();
- params.width = overflowPanelSize.getWidth();
- params.height = overflowPanelSize.getHeight();
- mContentContainer.setLayoutParams(params);
- mContentContainer.addView(mOverflowPanel.getView());
- setContentAreaAsTouchableSurface();
- }
-
- /**
- * Places the main view panel at the appropriate resting coordinates.
- */
- private void positionMainPanel() {
- Preconditions.checkNotNull(mMainPanel);
- mContentContainer.setX(mMarginHorizontal);
-
- float y = mMarginVertical;
- if (mOverflowDirection == OVERFLOW_DIRECTION_UP) {
- y = getHeight()
- - (mMainPanel.getView().getMeasuredHeight() + mMarginVertical);
- }
- mContentContainer.setY(y);
- setContentAreaAsTouchableSurface();
- }
-
- /**
- * Places the main view panel at the appropriate resting coordinates.
- */
- private void positionOverflowPanel() {
- Preconditions.checkNotNull(mOverflowPanel);
- float x;
- if (isRTL()) {
- x = mMarginHorizontal;
+ // Update y-coordinates depending on overflow's open direction.
+ if (mOpenOverflowUpwards) {
+ mContentContainer.setY(mMarginVertical); // align top
+ mMainPanel.setY( // align bottom
+ containerSize.getHeight() - mContentContainer.getHeight());
+ mOverflowButton.setY( // align bottom
+ containerSize.getHeight() - mOverflowButtonSize.getHeight());
+ mOverflowPanel.setY(0); // align top
+ } else {
+ // opens downwards.
+ mContentContainer.setY(mMarginVertical); // align top
+ mMainPanel.setY(0); // align top
+ mOverflowButton.setY(0); // align top
+ mOverflowPanel.setY(mOverflowButtonSize.getHeight()); // align bottom
+ }
} else {
- x = mPopupWindow.getWidth()
- - (mOverflowPanel.getView().getMeasuredWidth() + mMarginHorizontal);
+ if (hasOverflow()) {
+ // overflow not open. Set closed state.
+ final Size containerSize = mMainPanelSize;
+ setSize(mContentContainer, containerSize);
+ mMainPanel.setAlpha(1);
+ mOverflowPanel.setAlpha(0);
+ mOverflowButton.setImageDrawable(mOverflow);
+
+ // Update x-coordinates depending on RTL state.
+ if (isRTL()) {
+ mContentContainer.setX(mMarginHorizontal); // align left
+ mMainPanel.setX(0); // align left
+ mOverflowButton.setX(0); // align left
+ mOverflowPanel.setX(0); // align left
+ } else {
+ mContentContainer.setX(mMarginHorizontal); // align left
+ mMainPanel.setX(0); // align left
+ mOverflowButton.setX( // align right
+ containerSize.getWidth() - mOverflowButtonSize.getWidth());
+ mOverflowPanel.setX( // align right
+ containerSize.getWidth() - mOverflowPanelSize.getWidth());
+ }
+
+ // Update y-coordinates depending on overflow's open direction.
+ if (mOpenOverflowUpwards) {
+ mContentContainer.setY( // align bottom
+ mMarginVertical +
+ mOverflowPanelSize.getHeight() - containerSize.getHeight());
+ mMainPanel.setY(0); // align top
+ mOverflowButton.setY(0); // align top
+ mOverflowPanel.setY( // align bottom
+ containerSize.getHeight() - mOverflowPanelSize.getHeight());
+ } else {
+ // opens downwards.
+ mContentContainer.setY(mMarginVertical); // align top
+ mMainPanel.setY(0); // align top
+ mOverflowButton.setY(0); // align top
+ mOverflowPanel.setY(mOverflowButtonSize.getHeight()); // align bottom
+ }
+ } else {
+ mContentContainer.setX(mMarginHorizontal);
+ mContentContainer.setY(mMarginVertical);
+ }
}
- mContentContainer.setX(x);
- mContentContainer.setY(mMarginVertical);
- setContentAreaAsTouchableSurface();
}
- private void updateOverflowHeight(int height) {
- if (mOverflowPanel != null) {
- mOverflowPanel.setSuggestedHeight(height);
-
- // Re-measure the popup and it's contents.
- boolean mainPanelContent = isMainPanelContent();
- boolean overflowPanelContent = isOverflowPanelContent();
- mContentContainer.removeAllViews(); // required to update popup size.
+ private void updateOverflowHeight(int suggestedHeight) {
+ if (hasOverflow()) {
+ final int maxItemSize = (suggestedHeight - mOverflowButtonSize.getHeight()) /
+ getLineHeight(mContext);
+ final int newHeight = calculateOverflowHeight(maxItemSize);
+ if (mOverflowPanelSize.getHeight() != newHeight) {
+ mOverflowPanelSize = new Size(mOverflowPanelSize.getWidth(), newHeight);
+ }
+ setSize(mOverflowPanel, mOverflowPanelSize);
+ if (mIsOverflowOpen) {
+ setSize(mContentContainer, mOverflowPanelSize);
+ if (mOpenOverflowUpwards) {
+ final int deltaHeight = mOverflowPanelSize.getHeight() - newHeight;
+ mContentContainer.setY(mContentContainer.getY() + deltaHeight);
+ mOverflowButton.setY(mOverflowButton.getY() - deltaHeight);
+ }
+ } else {
+ setSize(mContentContainer, mMainPanelSize);
+ }
updatePopupSize();
- // Reset the appropriate content.
- if (mainPanelContent) {
- setMainPanelAsContent();
- }
- if (overflowPanelContent) {
- setOverflowPanelAsContent();
- }
}
}
private void updatePopupSize() {
int width = 0;
int height = 0;
- if (mMainPanel != null) {
- Size mainPanelSize = mMainPanel.measure();
- width = mainPanelSize.getWidth();
- height = mainPanelSize.getHeight();
+ if (mMainPanelSize != null) {
+ width = Math.max(width, mMainPanelSize.getWidth());
+ height = Math.max(height, mMainPanelSize.getHeight());
}
- if (mOverflowPanel != null) {
- Size overflowPanelSize = mOverflowPanel.measure();
- width = Math.max(width, overflowPanelSize.getWidth());
- height = Math.max(height, overflowPanelSize.getHeight());
+ if (mOverflowPanelSize != null) {
+ width = Math.max(width, mOverflowPanelSize.getWidth());
+ height = Math.max(height, mOverflowPanelSize.getHeight());
}
mPopupWindow.setWidth(width + mMarginHorizontal * 2);
mPopupWindow.setHeight(height + mMarginVertical * 2);
+ maybeComputeTransitionDurationScale();
}
-
private void refreshViewPort() {
mParent.getWindowVisibleDisplayFrame(mViewPortOnScreen);
}
@@ -947,7 +1014,7 @@
return !mTmpRect.equals(mViewPortOnScreen);
}
- private int getToolbarWidth(int suggestedWidth) {
+ private int getAdjustedToolbarWidth(int suggestedWidth) {
int width = suggestedWidth;
refreshViewPort();
int maximumWidth = mViewPortOnScreen.width() - 2 * mParent.getResources()
@@ -971,11 +1038,17 @@
* Sets the touchable region of this popup to be the area occupied by its content.
*/
private void setContentAreaAsTouchableSurface() {
- if (!mPopupWindow.isShowing()) {
- mContentContainer.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+ Preconditions.checkNotNull(mMainPanelSize);
+ final int width;
+ final int height;
+ if (mIsOverflowOpen) {
+ Preconditions.checkNotNull(mOverflowPanelSize);
+ width = mOverflowPanelSize.getWidth();
+ height = mOverflowPanelSize.getHeight();
+ } else {
+ width = mMainPanelSize.getWidth();
+ height = mMainPanelSize.getHeight();
}
- int width = mContentContainer.getMeasuredWidth();
- int height = mContentContainer.getMeasuredHeight();
mTouchableRegion.set(
(int) mContentContainer.getX(),
(int) mContentContainer.getY(),
@@ -997,45 +1070,12 @@
}
private boolean isRTL() {
- return mContentContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
+ return mContext.getResources().getConfiguration().getLayoutDirection()
+ == View.LAYOUT_DIRECTION_RTL;
}
- }
- /**
- * A widget that holds the primary menu items in the floating toolbar.
- */
- private static final class FloatingToolbarMainPanel {
-
- private final Context mContext;
- private final ViewGroup mContentView;
- private final View.OnClickListener mMenuItemButtonOnClickListener =
- new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (v.getTag() instanceof MenuItem) {
- if (mOnMenuItemClickListener != null) {
- mOnMenuItemClickListener.onMenuItemClick((MenuItem) v.getTag());
- }
- }
- }
- };
- private final ViewFader viewFader;
- private final Runnable mOpenOverflow;
-
- private View mOpenOverflowButton;
- private MenuItem.OnMenuItemClickListener mOnMenuItemClickListener;
-
- /**
- * Initializes a floating toolbar popup main view panel.
- *
- * @param context
- * @param openOverflow The code that opens the toolbar popup overflow.
- */
- public FloatingToolbarMainPanel(Context context, Runnable openOverflow) {
- mContext = Preconditions.checkNotNull(context);
- mContentView = new LinearLayout(context);
- viewFader = new ViewFader(mContentView);
- mOpenOverflow = Preconditions.checkNotNull(openOverflow);
+ private boolean hasOverflow() {
+ return mOverflowPanelSize != null;
}
/**
@@ -1044,16 +1084,14 @@
*
* @return The menu items that are not included in this main panel.
*/
- public List<MenuItem> layoutMenuItems(List<MenuItem> menuItems, int width) {
+ public List<MenuItem> layoutMainPanelItems(
+ List<MenuItem> menuItems, final int toolbarWidth) {
Preconditions.checkNotNull(menuItems);
- // Reserve space for the "open overflow" button.
- final int toolbarWidth = width - getEstimatedOpenOverflowButtonWidth(mContext);
-
int availableWidth = toolbarWidth;
final LinkedList<MenuItem> remainingMenuItems = new LinkedList<MenuItem>(menuItems);
- mContentView.removeAllViews();
+ mMainPanel.removeAllViews();
boolean isFirstItem = true;
while (!remainingMenuItems.isEmpty()) {
@@ -1081,59 +1119,119 @@
menuItemButton.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
int menuItemButtonWidth = Math.min(menuItemButton.getMeasuredWidth(), toolbarWidth);
- if (menuItemButtonWidth <= availableWidth) {
+ // Check if we can fit an item while reserving space for the overflowButton.
+ boolean canFitWithOverflow =
+ menuItemButtonWidth <= availableWidth - mOverflowButtonSize.getWidth();
+ boolean canFitNoOverflow =
+ remainingMenuItems.size() == 1 && menuItemButtonWidth <= availableWidth;
+ if (canFitWithOverflow || canFitNoOverflow) {
setButtonTagAndClickListener(menuItemButton, menuItem);
- mContentView.addView(menuItemButton);
+ mMainPanel.addView(menuItemButton);
ViewGroup.LayoutParams params = menuItemButton.getLayoutParams();
params.width = menuItemButtonWidth;
menuItemButton.setLayoutParams(params);
availableWidth -= menuItemButtonWidth;
remainingMenuItems.pop();
} else {
- if (mOpenOverflowButton == null) {
- mOpenOverflowButton = LayoutInflater.from(mContext)
- .inflate(R.layout.floating_popup_open_overflow_button, null);
- mOpenOverflowButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mOpenOverflowButton != null) {
- mOpenOverflow.run();
- }
- }
- });
- }
- mContentView.addView(mOpenOverflowButton);
+ // Reserve space for overflowButton.
+ mMainPanel.setPaddingRelative(0, 0, mOverflowButtonSize.getWidth(), 0);
break;
}
}
+ mMainPanelSize = measure(mMainPanel);
return remainingMenuItems;
}
- public void setOnMenuItemClickListener(MenuItem.OnMenuItemClickListener listener) {
- mOnMenuItemClickListener = listener;
- }
+ private void layoutOverflowPanelItems(List<MenuItem> menuItems) {
+ ArrayAdapter<MenuItem> overflowPanelAdapter =
+ (ArrayAdapter<MenuItem>) mOverflowPanel.getAdapter();
+ overflowPanelAdapter.clear();
+ final int size = menuItems.size();
+ for (int i = 0; i < size; i++) {
+ overflowPanelAdapter.add(menuItems.get(i));
+ }
+ mOverflowPanel.setAdapter(overflowPanelAdapter);
+ if (mOpenOverflowUpwards) {
+ mOverflowPanel.setY(0);
+ } else {
+ mOverflowPanel.setY(mOverflowButtonSize.getHeight());
+ }
- public View getView() {
- return mContentView;
- }
-
- public void fadeIn(boolean animate) {
- viewFader.fadeIn(animate);
- }
-
- public void fadeOut(boolean animate) {
- viewFader.fadeOut(animate);
+ int width = Math.max(getOverflowWidth(), mOverflowButtonSize.getWidth());
+ int height = calculateOverflowHeight(MAX_OVERFLOW_SIZE);
+ mOverflowPanelSize = new Size(width, height);
+ setSize(mOverflowPanel, mOverflowPanelSize);
}
/**
- * Returns how big this panel's view should be.
- * This method should only be called when the view has not been attached to a parent
- * otherwise it will throw an illegal state.
+ * Resets the content container and appropriately position it's panels.
*/
- public Size measure() throws IllegalStateException {
- Preconditions.checkState(mContentView.getParent() == null);
- mContentView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
- return new Size(mContentView.getMeasuredWidth(), mContentView.getMeasuredHeight());
+ private void preparePopupContent() {
+ mContentContainer.removeAllViews();
+
+ // Add views in the specified order so they stack up as expected.
+ // Order: overflowPanel, mainPanel, overflowButton.
+ if (hasOverflow()) {
+ mContentContainer.addView(mOverflowPanel);
+ }
+ mContentContainer.addView(mMainPanel);
+ if (hasOverflow()) {
+ mContentContainer.addView(mOverflowButton);
+ }
+ setPanelsStatesAtRestingPosition();
+ setContentAreaAsTouchableSurface();
+
+ // The positioning of contents in RTL is wrong when the view is first rendered.
+ // Hide the view and post a runnable to recalculate positions and render the view.
+ // TODO: Investigate why this happens and fix.
+ if (isRTL()) {
+ mContentContainer.setAlpha(0);
+ mContentContainer.post(mPreparePopupContentRTLHelper);
+ }
+ }
+
+ /**
+ * Clears out the panels and their container. Resets their calculated sizes.
+ */
+ private void clearPanels() {
+ mOverflowPanelSize = null;
+ mMainPanelSize = null;
+ mIsOverflowOpen = false;
+ mMainPanel.removeAllViews();
+ ArrayAdapter<MenuItem> overflowPanelAdapter =
+ (ArrayAdapter<MenuItem>) mOverflowPanel.getAdapter();
+ overflowPanelAdapter.clear();
+ mOverflowPanel.setAdapter(overflowPanelAdapter);
+ mContentContainer.removeAllViews();
+ }
+
+ private void positionContentYCoordinatesIfOpeningOverflowUpwards() {
+ if (mOpenOverflowUpwards) {
+ mMainPanel.setY(mContentContainer.getHeight() - mMainPanelSize.getHeight());
+ mOverflowButton.setY(mContentContainer.getHeight() - mOverflowButton.getHeight());
+ mOverflowPanel.setY(mContentContainer.getHeight() - mOverflowPanelSize.getHeight());
+ }
+ }
+
+ private int getOverflowWidth() {
+ int overflowWidth = 0;
+ final int count = mOverflowPanel.getAdapter().getCount();
+ for (int i = 0; i < count; i++) {
+ MenuItem menuItem = (MenuItem) mOverflowPanel.getAdapter().getItem(i);
+ overflowWidth =
+ Math.max(mOverflowPanelViewHelper.calculateWidth(menuItem), overflowWidth);
+ }
+ return overflowWidth;
+ }
+
+ private int calculateOverflowHeight(int maxItemSize) {
+ // Maximum of 4 items, minimum of 2 if the overflow has to scroll.
+ int actualSize = Math.min(
+ MAX_OVERFLOW_SIZE,
+ Math.min(
+ Math.max(MIN_OVERFLOW_SIZE, maxItemSize),
+ mOverflowPanel.getCount()));
+ return actualSize * getLineHeight(mContext) + mOverflowButtonSize.getHeight();
}
private void setButtonTagAndClickListener(View menuItemButton, MenuItem menuItem) {
@@ -1144,281 +1242,326 @@
button.setTag(menuItem);
button.setOnClickListener(mMenuItemButtonOnClickListener);
}
- }
-
-
- /**
- * A widget that holds the overflow items in the floating toolbar.
- */
- private static final class FloatingToolbarOverflowPanel {
-
- private final LinearLayout mContentView;
- private final ViewGroup mBackButtonContainer;
- private final View mBackButton;
- private final ListView mListView;
- private final TextView mListViewItemWidthCalculator;
- private final ViewFader mViewFader;
- private final Runnable mCloseOverflow;
-
- private MenuItem.OnMenuItemClickListener mOnMenuItemClickListener;
- private int mOverflowWidth;
- private int mSuggestedHeight;
/**
- * Initializes a floating toolbar popup overflow view panel.
- *
- * @param context
- * @param closeOverflow The code that closes the toolbar popup's overflow.
+ * NOTE: Use only in android.view.animation.* animations. Do not use in android.animation.*
+ * animations. See comment about this in the code.
*/
- public FloatingToolbarOverflowPanel(Context context, Runnable closeOverflow) {
- mCloseOverflow = Preconditions.checkNotNull(closeOverflow);
+ private int getAdjustedDuration(int originalDuration) {
+ if (mTransitionDurationScale < 150) {
+ // For smaller transition, decrease the time.
+ return Math.max(originalDuration - 50, 0);
+ } else if (mTransitionDurationScale > 300) {
+ // For bigger transition, increase the time.
+ return originalDuration + 50;
+ }
- mContentView = new LinearLayout(context);
- mContentView.setOrientation(LinearLayout.VERTICAL);
- mViewFader = new ViewFader(mContentView);
+ // Scale the animation duration with getDurationScale(). This allows
+ // android.view.animation.* animations to scale just like android.animation.* animations
+ // when animator duration scale is adjusted in "Developer Options".
+ // For this reason, do not use this method for android.animation.* animations.
+ return (int) (originalDuration * ValueAnimator.getDurationScale());
+ }
- mBackButton = LayoutInflater.from(context)
- .inflate(R.layout.floating_popup_close_overflow_button, null);
- mBackButton.setOnClickListener(new View.OnClickListener() {
+ private void maybeComputeTransitionDurationScale() {
+ if (mMainPanelSize == null || mOverflowPanel == null) {
+ int w = mMainPanelSize.getWidth() - mOverflowPanelSize.getWidth();
+ int h = mOverflowPanelSize.getHeight() - mMainPanelSize.getHeight();
+ mTransitionDurationScale = (int) (Math.sqrt(w * w + h * h) /
+ mContentContainer.getContext().getResources().getDisplayMetrics().density);
+ }
+ }
+
+ private ViewGroup createMainPanel() {
+ ViewGroup mainPanel = new LinearLayout(mContext) {
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ if (isOverflowAnimating()) {
+ // Update widthMeasureSpec to make sure that this view is not clipped
+ // as we offset it's coordinates with respect to it's parent.
+ widthMeasureSpec = MeasureSpec.makeMeasureSpec(
+ mMainPanelSize.getWidth(),
+ MeasureSpec.EXACTLY);
+ }
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ // Intercept the touch event while the overflow is animating.
+ return isOverflowAnimating();
+ }
+ };
+ return mainPanel;
+ }
+
+ private ImageButton createOverflowButton() {
+ final ImageButton overflowButton = (ImageButton) LayoutInflater.from(mContext)
+ .inflate(R.layout.floating_popup_overflow_button, null);
+ overflowButton.setImageDrawable(mOverflow);
+ overflowButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- mCloseOverflow.run();
+ final Drawable drawable = overflowButton.getDrawable();
+ if (mIsOverflowOpen) {
+ overflowButton.setImageDrawable(mToOverflow);
+ mToOverflow.start();
+ closeOverflow();
+ } else {
+ overflowButton.setImageDrawable(mToArrow);
+ mToArrow.start();
+ openOverflow();
+ }
+ overflowButton.postDelayed(
+ mResetOverflowButtonDrawable, OVERFLOW_BUTTON_ANIMATION_DELAY);
}
});
- mBackButtonContainer = new LinearLayout(context);
- mBackButtonContainer.addView(mBackButton);
+ return overflowButton;
+ }
- mListView = createOverflowListView();
- mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ private ListView createOverflowPanel() {
+ final ListView overflowPanel = new ListView(FloatingToolbarPopup.this.mContext) {
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ // Update heightMeasureSpec to make sure that this view is not clipped
+ // as we offset it's coordinates with respect to it's parent.
+ heightMeasureSpec = MeasureSpec.makeMeasureSpec(
+ mOverflowPanelSize.getHeight() - mOverflowButtonSize.getHeight(),
+ MeasureSpec.EXACTLY);
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent ev) {
+ if (isOverflowAnimating()) {
+ // Eat the touch event.
+ return true;
+ }
+ return super.dispatchTouchEvent(ev);
+ }
+ };
+ overflowPanel.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ overflowPanel.setDivider(null);
+ overflowPanel.setDividerHeight(0);
+
+ final ArrayAdapter adapter =
+ new ArrayAdapter<MenuItem>(mContext, 0) {
+ @Override
+ public int getViewTypeCount() {
+ return mOverflowPanelViewHelper.getViewTypeCount();
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return mOverflowPanelViewHelper.getItemViewType(getItem(position));
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return mOverflowPanelViewHelper.getView(
+ getItem(position), mOverflowPanelSize.getWidth(), convertView);
+ }
+ };
+ overflowPanel.setAdapter(adapter);
+
+ overflowPanel.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- MenuItem menuItem = (MenuItem) mListView.getAdapter().getItem(position);
+ MenuItem menuItem = (MenuItem) overflowPanel.getAdapter().getItem(position);
if (mOnMenuItemClickListener != null) {
mOnMenuItemClickListener.onMenuItemClick(menuItem);
}
}
});
- mContentView.addView(mListView);
- mContentView.addView(mBackButtonContainer);
+ return overflowPanel;
+ }
- mListViewItemWidthCalculator = createOverflowMenuItemButton(context);
- mListViewItemWidthCalculator.setLayoutParams(new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ private boolean isOverflowAnimating() {
+ final boolean overflowOpening = mOpenOverflowAnimation.hasStarted()
+ && !mOpenOverflowAnimation.hasEnded();
+ final boolean overflowClosing = mCloseOverflowAnimation.hasStarted()
+ && !mCloseOverflowAnimation.hasEnded();
+ return overflowOpening || overflowClosing;
+ }
+
+ private Animation.AnimationListener createOverflowAnimationListener() {
+ Animation.AnimationListener listener = new Animation.AnimationListener() {
+ @Override
+ public void onAnimationStart(Animation animation) {
+ // Disable the overflow button while it's animating.
+ // It will be re-enabled when the animation stops.
+ mOverflowButton.setEnabled(false);
+ }
+
+ @Override
+ public void onAnimationEnd(Animation animation) {
+ // Posting this because it seems like this is called before the animation
+ // actually ends.
+ mContentContainer.post(new Runnable() {
+ @Override
+ public void run() {
+ setPanelsStatesAtRestingPosition();
+ setContentAreaAsTouchableSurface();
+ }
+ });
+ }
+
+ @Override
+ public void onAnimationRepeat(Animation animation) {
+ }
+ };
+ return listener;
+ }
+
+ private static Size measure(View view) {
+ Preconditions.checkState(view.getParent() == null);
+ view.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+ return new Size(view.getMeasuredWidth(), view.getMeasuredHeight());
+ }
+
+ private static void setSize(View view, int width, int height) {
+ view.setMinimumWidth(width);
+ view.setMinimumHeight(height);
+ ViewGroup.LayoutParams params = view.getLayoutParams();
+ params = (params == null) ? new ViewGroup.LayoutParams(0, 0) : params;
+ params.width = width;
+ params.height = height;
+ view.setLayoutParams(params);
+ }
+
+ private static void setSize(View view, Size size) {
+ setSize(view, size.getWidth(), size.getHeight());
+ }
+
+ private static void setWidth(View view, int width) {
+ ViewGroup.LayoutParams params = view.getLayoutParams();
+ setSize(view, width, params.height);
+ }
+
+ private static void setHeight(View view, int height) {
+ ViewGroup.LayoutParams params = view.getLayoutParams();
+ setSize(view, params.width, height);
+ }
+
+ private static int getLineHeight(Context context) {
+ return context.getResources().getDimensionPixelSize(R.dimen.floating_toolbar_height);
}
/**
- * Sets the menu items to be displayed in the overflow.
+ * A custom interpolator used for various floating toolbar animations.
*/
- public void setMenuItems(List<MenuItem> menuItems) {
- ArrayAdapter overflowListViewAdapter = (ArrayAdapter) mListView.getAdapter();
- overflowListViewAdapter.clear();
- overflowListViewAdapter.addAll(menuItems);
- setListViewHeight();
- setOverflowWidth();
- }
+ private static final class LogAccelerateInterpolator implements Interpolator {
- public void setOnMenuItemClickListener(MenuItem.OnMenuItemClickListener listener) {
- mOnMenuItemClickListener = listener;
- }
+ private static final int BASE = 100;
+ private static final float LOGS_SCALE = 1f / computeLog(1, BASE);
- /**
- * Notifies the overflow of the current direction in which the overflow will be opened.
- *
- * @param overflowDirection {@link FloatingToolbarPopup#OVERFLOW_DIRECTION_UP}
- * or {@link FloatingToolbarPopup#OVERFLOW_DIRECTION_DOWN}.
- */
- public void setOverflowDirection(int overflowDirection) {
- mContentView.removeView(mBackButtonContainer);
- int index = (overflowDirection == FloatingToolbarPopup.OVERFLOW_DIRECTION_UP)? 1 : 0;
- mContentView.addView(mBackButtonContainer, index);
- }
-
- public void setSuggestedHeight(int height) {
- mSuggestedHeight = height;
- setListViewHeight();
- }
-
- public int getMinimumHeight() {
- return mContentView.getContext().getResources().
- getDimensionPixelSize(R.dimen.floating_toolbar_minimum_overflow_height)
- + getEstimatedToolbarHeight(mContentView.getContext());
- }
-
- /**
- * Returns the content view of the overflow.
- */
- public View getView() {
- return mContentView;
- }
-
- public void fadeIn(boolean animate) {
- mViewFader.fadeIn(animate);
- }
-
- public void fadeOut(boolean animate) {
- mViewFader.fadeOut(animate);
- }
-
- /**
- * Returns how big this panel's view should be.
- * This method should only be called when the view has not been attached to a parent.
- *
- * @throws IllegalStateException
- */
- public Size measure() {
- Preconditions.checkState(mContentView.getParent() == null);
- mContentView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
- return new Size(mContentView.getMeasuredWidth(), mContentView.getMeasuredHeight());
- }
-
- private void setListViewHeight() {
- int itemHeight = getEstimatedToolbarHeight(mContentView.getContext());
- int height = mListView.getAdapter().getCount() * itemHeight;
- int maxHeight = mContentView.getContext().getResources().
- getDimensionPixelSize(R.dimen.floating_toolbar_maximum_overflow_height);
- int minHeight = mContentView.getContext().getResources().
- getDimensionPixelSize(R.dimen.floating_toolbar_minimum_overflow_height);
- int suggestedListViewHeight = mSuggestedHeight - (mSuggestedHeight % itemHeight)
- - itemHeight; // reserve space for the back button.
- ViewGroup.LayoutParams params = mListView.getLayoutParams();
- if (suggestedListViewHeight <= 0) {
- // Invalid height. Use the maximum height available.
- params.height = Math.min(maxHeight, height);
- } else if (suggestedListViewHeight < minHeight) {
- // Height is smaller than minimum allowed. Use minimum height.
- params.height = minHeight;
- } else {
- // Use the suggested height. Cap it at the maximum available height.
- params.height = Math.min(Math.min(suggestedListViewHeight, maxHeight), height);
+ private static float computeLog(float t, int base) {
+ return (float) (1 - Math.pow(base, -t));
}
- mListView.setLayoutParams(params);
+
+ @Override
+ public float getInterpolation(float t) {
+ return 1 - computeLog(1 - t, BASE) * LOGS_SCALE;
+ }
}
- private void setOverflowWidth() {
- mOverflowWidth = 0;
- for (int i = 0; i < mListView.getAdapter().getCount(); i++) {
- MenuItem menuItem = (MenuItem) mListView.getAdapter().getItem(i);
+ /**
+ * A helper for generating views for the overflow panel.
+ */
+ private static final class OverflowPanelViewHelper {
+
+ private static final int NUM_OF_VIEW_TYPES = 2;
+ private static final int VIEW_TYPE_STRING_TITLE = 0;
+ private static final int VIEW_TYPE_ICON_ONLY = 1;
+
+ private final TextView mStringTitleViewCalculator;
+ private final View mIconOnlyViewCalculator;
+
+ private final Context mContext;
+
+ public OverflowPanelViewHelper(Context context) {
+ mContext = Preconditions.checkNotNull(context);
+ mStringTitleViewCalculator = getStringTitleView(null, 0, null);
+ mIconOnlyViewCalculator = getIconOnlyView(null, 0, null);
+ }
+
+ public int getViewTypeCount() {
+ return NUM_OF_VIEW_TYPES;
+ }
+
+ public View getView(MenuItem menuItem, int minimumWidth, View convertView) {
Preconditions.checkNotNull(menuItem);
- mListViewItemWidthCalculator.setText(menuItem.getTitle());
- mListViewItemWidthCalculator.measure(
- MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
- mOverflowWidth = Math.max(
- mListViewItemWidthCalculator.getMeasuredWidth(), mOverflowWidth);
+ if (getItemViewType(menuItem) == VIEW_TYPE_ICON_ONLY) {
+ return getIconOnlyView(menuItem, minimumWidth, convertView);
+ }
+ return getStringTitleView(menuItem, minimumWidth, convertView);
}
- }
- private ListView createOverflowListView() {
- final Context context = mContentView.getContext();
- final ListView overflowListView = new ListView(context);
- overflowListView.setLayoutParams(new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
- overflowListView.setDivider(null);
- overflowListView.setDividerHeight(0);
-
- final int viewTypeCount = 2;
- final int stringLabelViewType = 0;
- final int iconOnlyViewType = 1;
- final ArrayAdapter overflowListViewAdapter =
- new ArrayAdapter<MenuItem>(context, 0) {
- @Override
- public int getViewTypeCount() {
- return viewTypeCount;
- }
-
- @Override
- public int getItemViewType(int position) {
- if (isIconOnlyMenuItem(getItem(position))) {
- return iconOnlyViewType;
- }
- return stringLabelViewType;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- if (getItemViewType(position) == iconOnlyViewType) {
- return getIconOnlyView(position, convertView);
- }
- return getStringTitleView(position, convertView);
- }
-
- private View getStringTitleView(int position, View convertView) {
- TextView menuButton;
- if (convertView != null) {
- menuButton = (TextView) convertView;
- } else {
- menuButton = createOverflowMenuItemButton(context);
- }
- MenuItem menuItem = getItem(position);
- menuButton.setText(menuItem.getTitle());
- menuButton.setContentDescription(menuItem.getTitle());
- menuButton.setMinimumWidth(mOverflowWidth);
- return menuButton;
- }
-
- private View getIconOnlyView(int position, View convertView) {
- View menuButton;
- if (convertView != null) {
- menuButton = convertView;
- } else {
- menuButton = LayoutInflater.from(context).inflate(
- R.layout.floating_popup_overflow_image_list_item, null);
- }
- MenuItem menuItem = getItem(position);
- ((ImageView) menuButton
- .findViewById(R.id.floating_toolbar_menu_item_image_button))
- .setImageDrawable(menuItem.getIcon());
- menuButton.setMinimumWidth(mOverflowWidth);
- return menuButton;
- }
- };
- overflowListView.setAdapter(overflowListViewAdapter);
- return overflowListView;
- }
- }
-
-
- /**
- * A helper for fading in or out a view.
- */
- private static final class ViewFader {
-
- private static final int FADE_OUT_DURATION = 250;
- private static final int FADE_IN_DURATION = 150;
-
- private final View mView;
- private final ObjectAnimator mFadeOutAnimation;
- private final ObjectAnimator mFadeInAnimation;
-
- private ViewFader(View view) {
- mView = Preconditions.checkNotNull(view);
- mFadeOutAnimation = ObjectAnimator.ofFloat(view, View.ALPHA, 1, 0)
- .setDuration(FADE_OUT_DURATION);
- mFadeInAnimation = ObjectAnimator.ofFloat(view, View.ALPHA, 0, 1)
- .setDuration(FADE_IN_DURATION);
- }
-
- public void fadeIn(boolean animate) {
- cancelFadeAnimations();
- if (animate) {
- mFadeInAnimation.start();
- } else {
- mView.setAlpha(1);
+ public int getItemViewType(MenuItem menuItem) {
+ Preconditions.checkNotNull(menuItem);
+ if (isIconOnlyMenuItem(menuItem)) {
+ return VIEW_TYPE_ICON_ONLY;
+ }
+ return VIEW_TYPE_STRING_TITLE;
}
- }
- public void fadeOut(boolean animate) {
- cancelFadeAnimations();
- if (animate) {
- mFadeOutAnimation.start();
- } else {
- mView.setAlpha(0);
+ public int calculateWidth(MenuItem menuItem) {
+ final View calculator;
+ if (isIconOnlyMenuItem(menuItem)) {
+ ((ImageView) mIconOnlyViewCalculator
+ .findViewById(R.id.floating_toolbar_menu_item_image_button))
+ .setImageDrawable(menuItem.getIcon());
+ calculator = mIconOnlyViewCalculator;
+ } else {
+ mStringTitleViewCalculator.setText(menuItem.getTitle());
+ calculator = mStringTitleViewCalculator;
+ }
+ calculator.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+ return calculator.getMeasuredWidth();
}
- }
- private void cancelFadeAnimations() {
- mFadeInAnimation.cancel();
- mFadeOutAnimation.cancel();
+ private TextView getStringTitleView(
+ MenuItem menuItem, int minimumWidth, View convertView) {
+ TextView menuButton;
+ if (convertView != null) {
+ menuButton = (TextView) convertView;
+ } else {
+ menuButton = (TextView) LayoutInflater.from(mContext)
+ .inflate(R.layout.floating_popup_overflow_list_item, null);
+ menuButton.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+ }
+ if (menuItem != null) {
+ menuButton.setText(menuItem.getTitle());
+ menuButton.setContentDescription(menuItem.getTitle());
+ menuButton.setMinimumWidth(minimumWidth);
+ }
+ return menuButton;
+ }
+
+ private View getIconOnlyView(
+ MenuItem menuItem, int minimumWidth, View convertView) {
+ View menuButton;
+ if (convertView != null) {
+ menuButton = convertView;
+ } else {
+ menuButton = LayoutInflater.from(mContext).inflate(
+ R.layout.floating_popup_overflow_image_list_item, null);
+ menuButton.setLayoutParams(new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+ }
+ if (menuItem != null) {
+ ((ImageView) menuButton
+ .findViewById(R.id.floating_toolbar_menu_item_image_button))
+ .setImageDrawable(menuItem.getIcon());
+ menuButton.setMinimumWidth(minimumWidth);
+ }
+ return menuButton;
+ }
}
}
@@ -1453,14 +1596,6 @@
return menuItemButton;
}
- /**
- * Creates and returns a styled floating toolbar overflow list view item.
- */
- private static TextView createOverflowMenuItemButton(Context context) {
- return (TextView) LayoutInflater.from(context)
- .inflate(R.layout.floating_popup_overflow_list_item, null);
- }
-
private static ViewGroup createContentContainer(Context context) {
ViewGroup contentContainer = (ViewGroup) LayoutInflater.from(context)
.inflate(R.layout.floating_popup_container, null);
@@ -1468,7 +1603,7 @@
return contentContainer;
}
- private static PopupWindow createPopupWindow(View content) {
+ private static PopupWindow createPopupWindow(ViewGroup content) {
ViewGroup popupContentHolder = new LinearLayout(content.getContext());
PopupWindow popupWindow = new PopupWindow(popupContentHolder);
// TODO: Use .setLayoutInScreenEnabled(true) instead of .setClippingEnabled(false)
@@ -1490,11 +1625,9 @@
* @param view The view to animate
*/
private static AnimatorSet createEnterAnimation(View view) {
- AnimatorSet animation = new AnimatorSet();
+ AnimatorSet animation = new AnimatorSet();
animation.playTogether(
- ObjectAnimator.ofFloat(view, View.ALPHA, 0, 1).setDuration(150),
- // Make sure that view.x is always fixed throughout the duration of this animation.
- ObjectAnimator.ofFloat(view, View.X, view.getX(), view.getX()));
+ ObjectAnimator.ofFloat(view, View.ALPHA, 0, 1).setDuration(150));
return animation;
}
@@ -1525,13 +1658,4 @@
a.recycle();
return new ContextThemeWrapper(originalContext, themeId);
}
-
- private static int getEstimatedToolbarHeight(Context context) {
- return context.getResources().getDimensionPixelSize(R.dimen.floating_toolbar_height);
- }
-
- private static int getEstimatedOpenOverflowButtonWidth(Context context) {
- return context.getResources()
- .getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_minimum_width);
- }
-}
+}
\ No newline at end of file
diff --git a/core/java/com/android/internal/widget/ImageFloatingTextView.java b/core/java/com/android/internal/widget/ImageFloatingTextView.java
new file mode 100644
index 0000000..c4ed2e1
--- /dev/null
+++ b/core/java/com/android/internal/widget/ImageFloatingTextView.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2015 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.widget;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.text.BoringLayout;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.RemotableViewMethod;
+import android.widget.RemoteViews;
+import android.widget.TextView;
+
+/**
+ * A TextView that can float around an image on the end.
+ *
+ * @hide
+ */
+@RemoteViews.RemoteView
+public class ImageFloatingTextView extends TextView {
+
+ private boolean mHasImage;
+
+ public ImageFloatingTextView(Context context) {
+ this(context, null);
+ }
+
+ public ImageFloatingTextView(Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public ImageFloatingTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public ImageFloatingTextView(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ protected Layout makeSingleLayout(int wantWidth, BoringLayout.Metrics boring, int ellipsisWidth,
+ Layout.Alignment alignment, boolean shouldEllipsize,
+ TextUtils.TruncateAt effectiveEllipsize, boolean useSaved) {
+ CharSequence text = getText() == null ? "" : getText();
+ StaticLayout.Builder builder = StaticLayout.Builder.obtain(text, 0, text.length(),
+ getPaint(), wantWidth)
+ .setAlignment(alignment)
+ .setTextDirection(getTextDirectionHeuristic())
+ .setLineSpacing(getLineSpacingExtra(), getLineSpacingMultiplier())
+ .setIncludePad(getIncludeFontPadding())
+ .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)
+ .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
+ // we set the endmargin on the first 2 lines. this works just in our case but that's
+ // sufficient for now.
+ int endMargin = (int) (getResources().getDisplayMetrics().density * 52);
+ int[] margins = mHasImage ? new int[] {endMargin, endMargin, 0} : null;
+ if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
+ builder.setIndents(margins, null);
+ } else {
+ builder.setIndents(null, margins);
+ }
+
+ return builder.build();
+ }
+
+ @RemotableViewMethod
+ public void setHasImage(boolean hasImage) {
+ mHasImage = hasImage;
+ // The new layout will be automatically created when the text is
+ // set again by the notification.
+ }
+}
diff --git a/core/java/com/android/internal/widget/NonClientDecorView.java b/core/java/com/android/internal/widget/NonClientDecorView.java
deleted file mode 100644
index de6e228..0000000
--- a/core/java/com/android/internal/widget/NonClientDecorView.java
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Copyright (C) 2015 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.widget;
-
-import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Looper;
-import android.os.RemoteException;
-import android.util.AttributeSet;
-import android.view.Choreographer;
-import android.view.DisplayListCanvas;
-import android.view.MotionEvent;
-import android.view.RenderNode;
-import android.view.ThreadedRenderer;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
-import android.view.Window;
-import android.view.WindowCallbacks;
-import android.util.Log;
-import android.util.TypedValue;
-
-import com.android.internal.R;
-import com.android.internal.policy.PhoneWindow;
-
-/**
- * This class represents the special screen elements to control a window on free form
- * environment. All thse screen elements are added in the "non client area" which is the area of
- * the window which is handled by the OS and not the application.
- * As such this class handles the following things:
- * <ul>
- * <li>The caption, containing the system buttons like maximize, close and such as well as
- * allowing the user to drag the window around.</li>
- * <li>The shadow - which is changing dependent on the window focus.</li>
- * <li>The border around the client area (if there is one).</li>
- * <li>The resize handles which allow to resize the window.</li>
- * </ul>
- * After creating the view, the function
- * {@link #setPhoneWindow} needs to be called to make
- * the connection to it's owning PhoneWindow.
- * Note: At this time the application can change various attributes of the DecorView which
- * will break things (in settle/unexpected ways):
- * <ul>
- * <li>setElevation</li>
- * <li>setOutlineProvider</li>
- * <li>setSurfaceFormat</li>
- * <li>..</li>
- * </ul>
- * This will be mitigated once b/22527834 will be addressed.
- */
-public class NonClientDecorView extends LinearLayout
- implements View.OnClickListener, View.OnTouchListener, WindowCallbacks {
- private final static String TAG = "NonClientDecorView";
- // The height of a window which has focus in DIP.
- private final int DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP = 20;
- // The height of a window which has not in DIP.
- private final int DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP = 5;
- private PhoneWindow mOwner = null;
- private boolean mWindowHasShadow = false;
- private boolean mShowDecor = false;
- // True when this object is listening for window size changes.
- private boolean mAttachedCallbacksToRootViewImpl = false;
-
- // True if the window is being dragged.
- private boolean mDragging = false;
-
- // True when the left mouse button got released while dragging.
- private boolean mLeftMouseButtonReleased;
-
- // True if this window is resizable (which is currently only true when the decor is shown).
- public boolean mVisible = false;
-
- // The current focus state of the window for updating the window elevation.
- private boolean mWindowHasFocus = true;
-
- // Cludge to address b/22668382: Set the shadow size to the maximum so that the layer
- // size calculation takes the shadow size into account. We set the elevation currently
- // to max until the first layout command has been executed.
- private boolean mAllowUpdateElevation = false;
-
- // The resize frame renderer.
- private ResizeFrameThread mFrameRendererThread = null;
-
- private Drawable mResizingBackgroundDrawable;
- private Drawable mCaptionBackgroundDrawable;
-
- public NonClientDecorView(Context context) {
- super(context);
- }
-
- public NonClientDecorView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public NonClientDecorView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
- if (!mAttachedCallbacksToRootViewImpl) {
- // If there is no window callback installed there was no window set before. Set it now.
- // Note that our ViewRootImpl object will not change.
- getViewRootImpl().addWindowCallbacks(this);
- mAttachedCallbacksToRootViewImpl = true;
- } else if (mFrameRendererThread != null) {
- // We are resizing and this call happened due to a configuration change. Tell the
- // renderer about it.
- mFrameRendererThread.onConfigurationChange();
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- if (mAttachedCallbacksToRootViewImpl) {
- getViewRootImpl().removeWindowCallbacks(this);
- mAttachedCallbacksToRootViewImpl = false;
- }
- }
-
- public void setPhoneWindow(PhoneWindow owner, boolean showDecor, boolean windowHasShadow,
- Drawable resizingBackgroundDrawable, Drawable captionBackgroundDrawableDrawable) {
- mOwner = owner;
- mWindowHasShadow = windowHasShadow;
- mShowDecor = showDecor;
- mResizingBackgroundDrawable = resizingBackgroundDrawable;
- mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable;
- updateCaptionVisibility();
- if (mWindowHasShadow) {
- initializeElevation();
- }
- // By changing the outline provider to BOUNDS, the window can remove its
- // background without removing the shadow.
- mOwner.getDecorView().setOutlineProvider(ViewOutlineProvider.BOUNDS);
-
- findViewById(R.id.maximize_window).setOnClickListener(this);
- findViewById(R.id.close_window).setOnClickListener(this);
- }
-
- @Override
- public boolean onTouch(View v, MotionEvent e) {
- // Note: There are no mixed events. When a new device gets used (e.g. 1. Mouse, 2. touch)
- // the old input device events get cancelled first. So no need to remember the kind of
- // input device we are listening to.
- switch (e.getActionMasked()) {
- case MotionEvent.ACTION_DOWN:
- if (!mShowDecor) {
- // When there is no decor we should not react to anything.
- return false;
- }
- // A drag action is started if we aren't dragging already and the starting event is
- // either a left mouse button or any other input device.
- if (!mDragging &&
- (e.getToolType(e.getActionIndex()) != MotionEvent.TOOL_TYPE_MOUSE ||
- (e.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0)) {
- mDragging = true;
- mLeftMouseButtonReleased = false;
- startMovingTask(e.getRawX(), e.getRawY());
- }
- break;
-
- case MotionEvent.ACTION_MOVE:
- if (mDragging && !mLeftMouseButtonReleased) {
- if (e.getToolType(e.getActionIndex()) == MotionEvent.TOOL_TYPE_MOUSE &&
- (e.getButtonState() & MotionEvent.BUTTON_PRIMARY) == 0) {
- // There is no separate mouse button up call and if the user mixes mouse
- // button drag actions, we stop dragging once he releases the button.
- mLeftMouseButtonReleased = true;
- break;
- }
- }
- break;
-
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL:
- if (!mDragging) {
- break;
- }
- // Abort the ongoing dragging.
- mDragging = false;
- return true;
- }
- return mDragging;
- }
-
- /**
- * The phone window configuration has changed and the decor needs to be updated.
- * @param showDecor True if the decor should be shown.
- * @param windowHasShadow True when the window should show a shadow.
- **/
- public void phoneWindowUpdated(boolean showDecor, boolean windowHasShadow) {
- mShowDecor = showDecor;
- updateCaptionVisibility();
- if (windowHasShadow != mWindowHasShadow) {
- mWindowHasShadow = windowHasShadow;
- initializeElevation();
- }
- }
-
- @Override
- public void onClick(View view) {
- if (view.getId() == R.id.maximize_window) {
- maximizeWindow();
- } else if (view.getId() == R.id.close_window) {
- mOwner.dispatchOnWindowDismissed(true /*finishTask*/);
- }
- }
-
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- mWindowHasFocus = hasWindowFocus;
- updateElevation();
- super.onWindowFocusChanged(hasWindowFocus);
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- // If the application changed its SystemUI metrics, we might also have to adapt
- // our shadow elevation.
- updateElevation();
- mAllowUpdateElevation = true;
-
- super.onLayout(changed, left, top, right, bottom);
- }
-
- @Override
- public void addView(View child, int index, ViewGroup.LayoutParams params) {
- // Make sure that we never get more then one client area in our view.
- if (index >= 2 || getChildCount() >= 2) {
- throw new IllegalStateException("NonClientDecorView can only handle 1 client view");
- }
- super.addView(child, index, params);
- }
-
- /**
- * Determine if the workspace is entirely covered by the window.
- * @return Returns true when the window is filling the entire screen/workspace.
- **/
- private boolean isFillingScreen() {
- return (0 != ((getWindowSystemUiVisibility() | getSystemUiVisibility()) &
- (View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
- View.SYSTEM_UI_FLAG_IMMERSIVE | View.SYSTEM_UI_FLAG_LOW_PROFILE)));
- }
-
- /**
- * Updates the visibility of the caption.
- **/
- private void updateCaptionVisibility() {
- // Don't show the decor if the window has e.g. entered full screen.
- boolean invisible = isFillingScreen() || !mShowDecor;
- View caption = getChildAt(0);
- caption.setVisibility(invisible ? GONE : VISIBLE);
- caption.setOnTouchListener(this);
- mVisible = !invisible;
- }
-
- /**
- * The elevation gets set for the first time and the framework needs to be informed that
- * the surface layer gets created with the shadow size in mind.
- **/
- private void initializeElevation() {
- // TODO(skuhne): Call setMaxElevation here accordingly after b/22668382 got fixed.
- mAllowUpdateElevation = false;
- if (mWindowHasShadow) {
- updateElevation();
- } else {
- mOwner.setElevation(0);
- }
- }
-
- /**
- * The shadow height gets controlled by the focus to visualize highlighted windows.
- * Note: This will overwrite application elevation properties.
- * Note: Windows which have (temporarily) changed their attributes to cover the SystemUI
- * will get no shadow as they are expected to be "full screen".
- **/
- private void updateElevation() {
- float elevation = 0;
- // Do not use a shadow when we are in resizing mode (mRenderer not null) since the shadow
- // is bound to the content size and not the target size.
- if (mWindowHasShadow && mFrameRendererThread == null) {
- boolean fill = isFillingScreen();
- elevation = fill ? 0 :
- (mWindowHasFocus ? DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP :
- DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP);
- // TODO(skuhne): Remove this if clause once b/22668382 got fixed.
- if (!mAllowUpdateElevation && !fill) {
- elevation = DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP;
- }
- // Convert the DP elevation into physical pixels.
- elevation = dipToPx(elevation);
- }
- // Don't change the elevation if it didn't change since it can require some time.
- if (mOwner.getDecorView().getElevation() != elevation) {
- mOwner.setElevation(elevation);
- }
- }
-
- /**
- * Converts a DIP measure into physical pixels.
- * @param dip The dip value.
- * @return Returns the number of pixels.
- */
- private float dipToPx(float dip) {
- return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dip,
- getResources().getDisplayMetrics());
- }
-
- /**
- * Maximize the window by moving it to the maximized workspace stack.
- **/
- private void maximizeWindow() {
- Window.WindowControllerCallback callback = mOwner.getWindowControllerCallback();
- if (callback != null) {
- try {
- callback.changeWindowStack(FULLSCREEN_WORKSPACE_STACK_ID);
- } catch (RemoteException ex) {
- Log.e(TAG, "Cannot change task workspace.");
- }
- }
- }
-
- @Override
- public void onWindowDragResizeStart(Rect initialBounds) {
- if (mOwner.isDestroyed()) {
- // If the owner's window is gone, we should not be able to come here anymore.
- releaseResources();
- return;
- }
- if (mFrameRendererThread != null) {
- return;
- }
- final ThreadedRenderer renderer =
- (ThreadedRenderer) mOwner.getDecorView().getHardwareRenderer();
- if (renderer != null) {
- mFrameRendererThread = new ResizeFrameThread(renderer, initialBounds);
- // Get rid of the shadow while we are resizing. Shadow drawing takes considerable time.
- // If we want to get the shadow shown while resizing, we would need to elevate a new
- // element which owns the caption and has the elevation.
- updateElevation();
- }
- }
-
- @Override
- public boolean onContentDrawn(int xOffset, int yOffset, int xSize, int ySize) {
- if (mFrameRendererThread == null) {
- return false;
- }
- return mFrameRendererThread.onContentDrawn(xOffset, yOffset, xSize, ySize);
- }
-
- @Override
- public void onRequestDraw(boolean reportNextDraw) {
- if (mFrameRendererThread != null) {
- mFrameRendererThread.onRequestDraw(reportNextDraw);
- } else if (reportNextDraw) {
- // If render thread is gone, just report immediately.
- if (isAttachedToWindow()) {
- getViewRootImpl().reportDrawFinish();
- }
- }
- }
-
- @Override
- public void onWindowDragResizeEnd() {
- releaseThreadedRenderer();
- }
-
- @Override
- public void onWindowSizeIsChanging(Rect newBounds) {
- if (mFrameRendererThread != null) {
- mFrameRendererThread.setTargetRect(newBounds);
- }
- }
-
- /**
- * Release the renderer thread which is usually done when the user stops resizing.
- */
- private void releaseThreadedRenderer() {
- if (mFrameRendererThread != null) {
- mFrameRendererThread.releaseRenderer();
- mFrameRendererThread = null;
- // Bring the shadow back.
- updateElevation();
- }
- }
-
- /**
- * Called when the parent window is destroyed to release all resources. Note that this will also
- * destroy the renderer thread.
- */
- private void releaseResources() {
- releaseThreadedRenderer();
- }
-
- /**
- * The thread which draws the chrome while we are resizing.
- * It starts with the creation and it ends once someone calls destroy().
- * Any size changes can be passed by a call to setTargetRect will passed to the thread and
- * executed via the Choreographer.
- * TODO(b/24810450): Separate functionality from non-client-decor so that it can be used
- * independently.
- */
- private class ResizeFrameThread extends Thread implements Choreographer.FrameCallback {
- // This is containing the last requested size by a resize command. Note that this size might
- // or might not have been applied to the output already.
- private final Rect mTargetRect = new Rect();
-
- // The render nodes for the multi threaded renderer.
- private ThreadedRenderer mRenderer;
- private RenderNode mFrameAndBackdropNode;
-
- private final Rect mOldTargetRect = new Rect();
- private final Rect mNewTargetRect = new Rect();
- private Choreographer mChoreographer;
-
- // Cached size values from the last render for the case that the view hierarchy is gone
- // during a configuration change.
- private int mLastContentWidth;
- private int mLastContentHeight;
- private int mLastCaptionHeight;
- private int mLastXOffset;
- private int mLastYOffset;
-
- // Whether to report when next frame is drawn or not.
- private boolean mReportNextDraw;
-
- ResizeFrameThread(ThreadedRenderer renderer, Rect initialBounds) {
- setName("ResizeFrame");
- mRenderer = renderer;
-
- // Create a render node for the content and frame backdrop
- // which can be resized independently from the content.
- mFrameAndBackdropNode = RenderNode.create("FrameAndBackdropNode", null);
-
- mRenderer.addRenderNode(mFrameAndBackdropNode, true);
-
- // Set the initial bounds and draw once so that we do not get a broken frame.
- mTargetRect.set(initialBounds);
- synchronized (this) {
- changeWindowSizeLocked(initialBounds);
- }
-
- // Kick off our draw thread.
- start();
- }
-
- /**
- * Call this function asynchronously when the window size has been changed. The change will
- * be picked up once per frame and the frame will be re-rendered accordingly.
- * @param newTargetBounds The new target bounds.
- */
- public void setTargetRect(Rect newTargetBounds) {
- synchronized (this) {
- mTargetRect.set(newTargetBounds);
- // Notify of a bounds change.
- pingRenderLocked();
- }
- }
-
- /**
- * The window got replaced due to a configuration change.
- */
- public void onConfigurationChange() {
- synchronized (this) {
- if (mRenderer != null) {
- // Enforce a window redraw.
- mOldTargetRect.set(0, 0, 0, 0);
- pingRenderLocked();
- }
- }
- }
-
- /**
- * All resources of the renderer will be released. This function can be called from the
- * the UI thread as well as the renderer thread.
- */
- public void releaseRenderer() {
- synchronized (this) {
- if (mRenderer != null) {
- // Invalidate the current content bounds.
- mRenderer.setContentDrawBounds(0, 0, 0, 0);
-
- // Remove the render node again
- // (see comment above - better to do that only once).
- mRenderer.removeRenderNode(mFrameAndBackdropNode);
-
- mRenderer = null;
-
- // Exit the renderer loop.
- pingRenderLocked();
- }
- }
- }
-
- @Override
- public void run() {
- try {
- Looper.prepare();
- synchronized (this) {
- mChoreographer = Choreographer.getInstance();
-
- // Draw at least once.
- mChoreographer.postFrameCallback(this);
- }
- Looper.loop();
- } finally {
- releaseRenderer();
- }
- synchronized (this) {
- // Make sure no more messages are being sent.
- mChoreographer = null;
- }
- }
-
- /**
- * The implementation of the FrameCallback.
- * @param frameTimeNanos The time in nanoseconds when the frame started being rendered,
- * in the {@link System#nanoTime()} timebase. Divide this value by {@code 1000000}
- */
- @Override
- public void doFrame(long frameTimeNanos) {
- synchronized (this) {
- if (mRenderer == null) {
- reportDrawIfNeeded();
- // Tell the looper to stop. We are done.
- Looper.myLooper().quit();
- return;
- }
- mNewTargetRect.set(mTargetRect);
- if (!mNewTargetRect.equals(mOldTargetRect) || mReportNextDraw) {
- mOldTargetRect.set(mNewTargetRect);
- changeWindowSizeLocked(mNewTargetRect);
- }
- }
- }
-
- /**
- * The content is about to be drawn and we got the location of where it will be shown.
- * If a "changeWindowSizeLocked" call has already been processed, we will re-issue the call
- * if the previous call was ignored since the size was unknown.
- * @param xOffset The x offset where the content is drawn to.
- * @param yOffset The y offset where the content is drawn to.
- * @param xSize The width size of the content. This should not be 0.
- * @param ySize The height of the content.
- * @return true if a frame should be requested after the content is drawn; false otherwise.
- */
- public boolean onContentDrawn(int xOffset, int yOffset, int xSize, int ySize) {
- synchronized (this) {
- final boolean firstCall = mLastContentWidth == 0;
- // The current content buffer is drawn here.
- mLastContentWidth = xSize;
- mLastContentHeight = ySize - mLastCaptionHeight;
- mLastXOffset = xOffset;
- mLastYOffset = yOffset;
-
- mRenderer.setContentDrawBounds(
- mLastXOffset,
- mLastYOffset,
- mLastXOffset + mLastContentWidth,
- mLastYOffset + mLastCaptionHeight + mLastContentHeight);
- // If this was the first call and changeWindowSizeLocked got already called prior
- // to us, we should re-issue a changeWindowSizeLocked now.
- return firstCall && (mLastCaptionHeight != 0 || !mShowDecor);
- }
- }
-
- public void onRequestDraw(boolean reportNextDraw) {
- synchronized (this) {
- mReportNextDraw = reportNextDraw;
- mOldTargetRect.set(0, 0, 0, 0);
- pingRenderLocked();
- }
- }
-
- /**
- * Resizing the frame to fit the new window size.
- * @param newBounds The window bounds which needs to be drawn.
- */
- private void changeWindowSizeLocked(Rect newBounds) {
- // While a configuration change is taking place the view hierarchy might become
- // inaccessible. For that case we remember the previous metrics to avoid flashes.
- // Note that even when there is no visible caption, the caption child will exist.
- View caption = getChildAt(0);
- if (caption != null) {
- final int captionHeight = caption.getHeight();
- // The caption height will probably never dynamically change while we are resizing.
- // Once set to something other then 0 it should be kept that way.
- if (captionHeight != 0) {
- // Remember the height of the caption.
- mLastCaptionHeight = captionHeight;
- }
- }
- // Make sure that the other thread has already prepared the render draw calls for the
- // content. If any size is 0, we have to wait for it to be drawn first.
- if ((mLastCaptionHeight == 0 && mShowDecor) ||
- mLastContentWidth == 0 || mLastContentHeight == 0) {
- return;
- }
- // Since the surface is spanning the entire screen, we have to add the start offset of
- // the bounds to get to the surface location.
- final int left = mLastXOffset + newBounds.left;
- final int top = mLastYOffset + newBounds.top;
- final int width = newBounds.width();
- final int height = newBounds.height();
-
- mFrameAndBackdropNode.setLeftTopRightBottom(left, top, left + width, top + height);
-
- // Draw the caption and content backdrops in to our render node.
- DisplayListCanvas canvas = mFrameAndBackdropNode.start(width, height);
- mCaptionBackgroundDrawable.setBounds(0, 0, left + width, top + mLastCaptionHeight);
- mCaptionBackgroundDrawable.draw(canvas);
-
- // The backdrop: clear everything with the background. Clipping is done elsewhere.
- mResizingBackgroundDrawable.setBounds(0, mLastCaptionHeight, left + width, top + height);
- mResizingBackgroundDrawable.draw(canvas);
- mFrameAndBackdropNode.end(canvas);
-
- // We need to render the node explicitly
- mRenderer.drawRenderNode(mFrameAndBackdropNode);
-
- reportDrawIfNeeded();
- }
-
- /**
- * Notify view root that a frame has been drawn by us, if it has requested so.
- */
- private void reportDrawIfNeeded() {
- if (mReportNextDraw) {
- if (isAttachedToWindow()) {
- getViewRootImpl().reportDrawFinish();
- }
- mReportNextDraw = false;
- }
- }
-
- /**
- * Sends a message to the renderer to wake up and perform the next action which can be
- * either the next rendering or the self destruction if mRenderer is null.
- * Note: This call must be synchronized.
- */
- private void pingRenderLocked() {
- if (mChoreographer != null) {
- mChoreographer.postFrameCallback(this);
- }
- }
- }
-}
diff --git a/core/java/com/android/internal/widget/PointerLocationView.java b/core/java/com/android/internal/widget/PointerLocationView.java
index e339c44..592576b 100644
--- a/core/java/com/android/internal/widget/PointerLocationView.java
+++ b/core/java/com/android/internal/widget/PointerLocationView.java
@@ -137,7 +137,7 @@
super(c);
setFocusableInTouchMode(true);
- mIm = (InputManager)c.getSystemService(Context.INPUT_SERVICE);
+ mIm = c.getSystemService(InputManager.class);
mVC = ViewConfiguration.get(c);
mTextPaint = new Paint();
diff --git a/core/java/org/apache/http/conn/ssl/AbstractVerifier.java b/core/java/org/apache/http/conn/ssl/AbstractVerifier.java
index e264f1c4..66a5121 100644
--- a/core/java/org/apache/http/conn/ssl/AbstractVerifier.java
+++ b/core/java/org/apache/http/conn/ssl/AbstractVerifier.java
@@ -46,7 +46,6 @@
import java.util.logging.Logger;
import java.util.logging.Level;
-import javax.net.ssl.DistinguishedNameParser;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
diff --git a/core/java/org/apache/http/conn/ssl/DistinguishedNameParser.java b/core/java/org/apache/http/conn/ssl/DistinguishedNameParser.java
new file mode 100644
index 0000000..b2d0e3e
--- /dev/null
+++ b/core/java/org/apache/http/conn/ssl/DistinguishedNameParser.java
@@ -0,0 +1,480 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.http.conn.ssl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.security.auth.x500.X500Principal;
+
+/**
+ * A distinguished name (DN) parser. This parser only supports extracting a
+ * string value from a DN. It doesn't support values in the hex-string style.
+ *
+ * @hide
+ */
+@Deprecated
+final class DistinguishedNameParser {
+ private final String dn;
+ private final int length;
+ private int pos;
+ private int beg;
+ private int end;
+
+ /** tmp vars to store positions of the currently parsed item */
+ private int cur;
+
+ /** distinguished name chars */
+ private char[] chars;
+
+ public DistinguishedNameParser(X500Principal principal) {
+ // RFC2253 is used to ensure we get attributes in the reverse
+ // order of the underlying ASN.1 encoding, so that the most
+ // significant values of repeated attributes occur first.
+ this.dn = principal.getName(X500Principal.RFC2253);
+ this.length = this.dn.length();
+ }
+
+ // gets next attribute type: (ALPHA 1*keychar) / oid
+ private String nextAT() {
+ // skip preceding space chars, they can present after
+ // comma or semicolon (compatibility with RFC 1779)
+ for (; pos < length && chars[pos] == ' '; pos++) {
+ }
+ if (pos == length) {
+ return null; // reached the end of DN
+ }
+
+ // mark the beginning of attribute type
+ beg = pos;
+
+ // attribute type chars
+ pos++;
+ for (; pos < length && chars[pos] != '=' && chars[pos] != ' '; pos++) {
+ // we don't follow exact BNF syntax here:
+ // accept any char except space and '='
+ }
+ if (pos >= length) {
+ throw new IllegalStateException("Unexpected end of DN: " + dn);
+ }
+
+ // mark the end of attribute type
+ end = pos;
+
+ // skip trailing space chars between attribute type and '='
+ // (compatibility with RFC 1779)
+ if (chars[pos] == ' ') {
+ for (; pos < length && chars[pos] != '=' && chars[pos] == ' '; pos++) {
+ }
+
+ if (chars[pos] != '=' || pos == length) {
+ throw new IllegalStateException("Unexpected end of DN: " + dn);
+ }
+ }
+
+ pos++; //skip '=' char
+
+ // skip space chars between '=' and attribute value
+ // (compatibility with RFC 1779)
+ for (; pos < length && chars[pos] == ' '; pos++) {
+ }
+
+ // in case of oid attribute type skip its prefix: "oid." or "OID."
+ // (compatibility with RFC 1779)
+ if ((end - beg > 4) && (chars[beg + 3] == '.')
+ && (chars[beg] == 'O' || chars[beg] == 'o')
+ && (chars[beg + 1] == 'I' || chars[beg + 1] == 'i')
+ && (chars[beg + 2] == 'D' || chars[beg + 2] == 'd')) {
+ beg += 4;
+ }
+
+ return new String(chars, beg, end - beg);
+ }
+
+ // gets quoted attribute value: QUOTATION *( quotechar / pair ) QUOTATION
+ private String quotedAV() {
+ pos++;
+ beg = pos;
+ end = beg;
+ while (true) {
+
+ if (pos == length) {
+ throw new IllegalStateException("Unexpected end of DN: " + dn);
+ }
+
+ if (chars[pos] == '"') {
+ // enclosing quotation was found
+ pos++;
+ break;
+ } else if (chars[pos] == '\\') {
+ chars[end] = getEscaped();
+ } else {
+ // shift char: required for string with escaped chars
+ chars[end] = chars[pos];
+ }
+ pos++;
+ end++;
+ }
+
+ // skip trailing space chars before comma or semicolon.
+ // (compatibility with RFC 1779)
+ for (; pos < length && chars[pos] == ' '; pos++) {
+ }
+
+ return new String(chars, beg, end - beg);
+ }
+
+ // gets hex string attribute value: "#" hexstring
+ private String hexAV() {
+ if (pos + 4 >= length) {
+ // encoded byte array must be not less then 4 c
+ throw new IllegalStateException("Unexpected end of DN: " + dn);
+ }
+
+ beg = pos; // store '#' position
+ pos++;
+ while (true) {
+
+ // check for end of attribute value
+ // looks for space and component separators
+ if (pos == length || chars[pos] == '+' || chars[pos] == ','
+ || chars[pos] == ';') {
+ end = pos;
+ break;
+ }
+
+ if (chars[pos] == ' ') {
+ end = pos;
+ pos++;
+ // skip trailing space chars before comma or semicolon.
+ // (compatibility with RFC 1779)
+ for (; pos < length && chars[pos] == ' '; pos++) {
+ }
+ break;
+ } else if (chars[pos] >= 'A' && chars[pos] <= 'F') {
+ chars[pos] += 32; //to low case
+ }
+
+ pos++;
+ }
+
+ // verify length of hex string
+ // encoded byte array must be not less then 4 and must be even number
+ int hexLen = end - beg; // skip first '#' char
+ if (hexLen < 5 || (hexLen & 1) == 0) {
+ throw new IllegalStateException("Unexpected end of DN: " + dn);
+ }
+
+ // get byte encoding from string representation
+ byte[] encoded = new byte[hexLen / 2];
+ for (int i = 0, p = beg + 1; i < encoded.length; p += 2, i++) {
+ encoded[i] = (byte) getByte(p);
+ }
+
+ return new String(chars, beg, hexLen);
+ }
+
+ // gets string attribute value: *( stringchar / pair )
+ private String escapedAV() {
+ beg = pos;
+ end = pos;
+ while (true) {
+ if (pos >= length) {
+ // the end of DN has been found
+ return new String(chars, beg, end - beg);
+ }
+
+ switch (chars[pos]) {
+ case '+':
+ case ',':
+ case ';':
+ // separator char has been found
+ return new String(chars, beg, end - beg);
+ case '\\':
+ // escaped char
+ chars[end++] = getEscaped();
+ pos++;
+ break;
+ case ' ':
+ // need to figure out whether space defines
+ // the end of attribute value or not
+ cur = end;
+
+ pos++;
+ chars[end++] = ' ';
+
+ for (; pos < length && chars[pos] == ' '; pos++) {
+ chars[end++] = ' ';
+ }
+ if (pos == length || chars[pos] == ',' || chars[pos] == '+'
+ || chars[pos] == ';') {
+ // separator char or the end of DN has been found
+ return new String(chars, beg, cur - beg);
+ }
+ break;
+ default:
+ chars[end++] = chars[pos];
+ pos++;
+ }
+ }
+ }
+
+ // returns escaped char
+ private char getEscaped() {
+ pos++;
+ if (pos == length) {
+ throw new IllegalStateException("Unexpected end of DN: " + dn);
+ }
+
+ switch (chars[pos]) {
+ case '"':
+ case '\\':
+ case ',':
+ case '=':
+ case '+':
+ case '<':
+ case '>':
+ case '#':
+ case ';':
+ case ' ':
+ case '*':
+ case '%':
+ case '_':
+ //FIXME: escaping is allowed only for leading or trailing space char
+ return chars[pos];
+ default:
+ // RFC doesn't explicitly say that escaped hex pair is
+ // interpreted as UTF-8 char. It only contains an example of such DN.
+ return getUTF8();
+ }
+ }
+
+ // decodes UTF-8 char
+ // see http://www.unicode.org for UTF-8 bit distribution table
+ private char getUTF8() {
+ int res = getByte(pos);
+ pos++; //FIXME tmp
+
+ if (res < 128) { // one byte: 0-7F
+ return (char) res;
+ } else if (res >= 192 && res <= 247) {
+
+ int count;
+ if (res <= 223) { // two bytes: C0-DF
+ count = 1;
+ res = res & 0x1F;
+ } else if (res <= 239) { // three bytes: E0-EF
+ count = 2;
+ res = res & 0x0F;
+ } else { // four bytes: F0-F7
+ count = 3;
+ res = res & 0x07;
+ }
+
+ int b;
+ for (int i = 0; i < count; i++) {
+ pos++;
+ if (pos == length || chars[pos] != '\\') {
+ return 0x3F; //FIXME failed to decode UTF-8 char - return '?'
+ }
+ pos++;
+
+ b = getByte(pos);
+ pos++; //FIXME tmp
+ if ((b & 0xC0) != 0x80) {
+ return 0x3F; //FIXME failed to decode UTF-8 char - return '?'
+ }
+
+ res = (res << 6) + (b & 0x3F);
+ }
+ return (char) res;
+ } else {
+ return 0x3F; //FIXME failed to decode UTF-8 char - return '?'
+ }
+ }
+
+ // Returns byte representation of a char pair
+ // The char pair is composed of DN char in
+ // specified 'position' and the next char
+ // According to BNF syntax:
+ // hexchar = DIGIT / "A" / "B" / "C" / "D" / "E" / "F"
+ // / "a" / "b" / "c" / "d" / "e" / "f"
+ private int getByte(int position) {
+ if (position + 1 >= length) {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+
+ int b1, b2;
+
+ b1 = chars[position];
+ if (b1 >= '0' && b1 <= '9') {
+ b1 = b1 - '0';
+ } else if (b1 >= 'a' && b1 <= 'f') {
+ b1 = b1 - 87; // 87 = 'a' - 10
+ } else if (b1 >= 'A' && b1 <= 'F') {
+ b1 = b1 - 55; // 55 = 'A' - 10
+ } else {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+
+ b2 = chars[position + 1];
+ if (b2 >= '0' && b2 <= '9') {
+ b2 = b2 - '0';
+ } else if (b2 >= 'a' && b2 <= 'f') {
+ b2 = b2 - 87; // 87 = 'a' - 10
+ } else if (b2 >= 'A' && b2 <= 'F') {
+ b2 = b2 - 55; // 55 = 'A' - 10
+ } else {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+
+ return (b1 << 4) + b2;
+ }
+
+ /**
+ * Parses the DN and returns the most significant attribute value
+ * for an attribute type, or null if none found.
+ *
+ * @param attributeType attribute type to look for (e.g. "ca")
+ */
+ public String findMostSpecific(String attributeType) {
+ // Initialize internal state.
+ pos = 0;
+ beg = 0;
+ end = 0;
+ cur = 0;
+ chars = dn.toCharArray();
+
+ String attType = nextAT();
+ if (attType == null) {
+ return null;
+ }
+ while (true) {
+ String attValue = "";
+
+ if (pos == length) {
+ return null;
+ }
+
+ switch (chars[pos]) {
+ case '"':
+ attValue = quotedAV();
+ break;
+ case '#':
+ attValue = hexAV();
+ break;
+ case '+':
+ case ',':
+ case ';': // compatibility with RFC 1779: semicolon can separate RDNs
+ //empty attribute value
+ break;
+ default:
+ attValue = escapedAV();
+ }
+
+ // Values are ordered from most specific to least specific
+ // due to the RFC2253 formatting. So take the first match
+ // we see.
+ if (attributeType.equalsIgnoreCase(attType)) {
+ return attValue;
+ }
+
+ if (pos >= length) {
+ return null;
+ }
+
+ if (chars[pos] == ',' || chars[pos] == ';') {
+ } else if (chars[pos] != '+') {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+
+ pos++;
+ attType = nextAT();
+ if (attType == null) {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+ }
+ }
+
+ /**
+ * Parses the DN and returns all values for an attribute type, in
+ * the order of decreasing significance (most significant first).
+ *
+ * @param attributeType attribute type to look for (e.g. "ca")
+ */
+ public List<String> getAllMostSpecificFirst(String attributeType) {
+ // Initialize internal state.
+ pos = 0;
+ beg = 0;
+ end = 0;
+ cur = 0;
+ chars = dn.toCharArray();
+ List<String> result = Collections.emptyList();
+
+ String attType = nextAT();
+ if (attType == null) {
+ return result;
+ }
+ while (pos < length) {
+ String attValue = "";
+
+ switch (chars[pos]) {
+ case '"':
+ attValue = quotedAV();
+ break;
+ case '#':
+ attValue = hexAV();
+ break;
+ case '+':
+ case ',':
+ case ';': // compatibility with RFC 1779: semicolon can separate RDNs
+ //empty attribute value
+ break;
+ default:
+ attValue = escapedAV();
+ }
+
+ // Values are ordered from most specific to least specific
+ // due to the RFC2253 formatting. So take the first match
+ // we see.
+ if (attributeType.equalsIgnoreCase(attType)) {
+ if (result.isEmpty()) {
+ result = new ArrayList<String>();
+ }
+ result.add(attValue);
+ }
+
+ if (pos >= length) {
+ break;
+ }
+
+ if (chars[pos] == ',' || chars[pos] == ';') {
+ } else if (chars[pos] != '+') {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+
+ pos++;
+ attType = nextAT();
+ if (attType == null) {
+ throw new IllegalStateException("Malformed DN: " + dn);
+ }
+ }
+
+ return result;
+ }
+}
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 4d648ce..0473016f 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -93,6 +93,7 @@
android_util_Process.cpp \
android_util_StringBlock.cpp \
android_util_XmlBlock.cpp \
+ android_util_jar_StrictJarFile.cpp \
android_graphics_Canvas.cpp \
android_graphics_Picture.cpp \
android/graphics/AutoDecodeCancel.cpp \
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 815d330..f6f45b5 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -176,6 +176,7 @@
extern int register_android_app_ActivityThread(JNIEnv *env);
extern int register_android_app_NativeActivity(JNIEnv *env);
extern int register_android_media_RemoteDisplay(JNIEnv *env);
+extern int register_android_util_jar_StrictJarFile(JNIEnv* env);
extern int register_android_view_InputChannel(JNIEnv* env);
extern int register_android_view_InputDevice(JNIEnv* env);
extern int register_android_view_InputEventReceiver(JNIEnv* env);
@@ -580,7 +581,8 @@
char heapminfreeOptsBuf[sizeof("-XX:HeapMinFree=")-1 + PROPERTY_VALUE_MAX];
char heapmaxfreeOptsBuf[sizeof("-XX:HeapMaxFree=")-1 + PROPERTY_VALUE_MAX];
char usejitOptsBuf[sizeof("-Xusejit:")-1 + PROPERTY_VALUE_MAX];
- char jitcodecachesizeOptsBuf[sizeof("-Xjitcodecachesize:")-1 + PROPERTY_VALUE_MAX];
+ char jitmaxsizeOptsBuf[sizeof("-Xjitmaxsize:")-1 + PROPERTY_VALUE_MAX];
+ char jitinitialsizeOptsBuf[sizeof("-Xjitinitialsize:")-1 + PROPERTY_VALUE_MAX];
char jitthresholdOptsBuf[sizeof("-Xjitthreshold:")-1 + PROPERTY_VALUE_MAX];
char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];
char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];
@@ -608,15 +610,6 @@
kEMIntFast,
kEMJitCompiler,
} executionMode = kEMDefault;
- char profilePeriod[sizeof("-Xprofile-period:")-1 + PROPERTY_VALUE_MAX];
- char profileDuration[sizeof("-Xprofile-duration:")-1 + PROPERTY_VALUE_MAX];
- char profileInterval[sizeof("-Xprofile-interval:")-1 + PROPERTY_VALUE_MAX];
- char profileBackoff[sizeof("-Xprofile-backoff:")-1 + PROPERTY_VALUE_MAX];
- char profileTopKThreshold[sizeof("-Xprofile-top-k-threshold:")-1 + PROPERTY_VALUE_MAX];
- char profileTopKChangeThreshold[sizeof("-Xprofile-top-k-change-threshold:")-1 +
- PROPERTY_VALUE_MAX];
- char profileType[sizeof("-Xprofile-type:")-1 + PROPERTY_VALUE_MAX];
- char profileMaxStackDepth[sizeof("-Xprofile-max-stack-depth:")-1 + PROPERTY_VALUE_MAX];
char localeOption[sizeof("-Duser.locale=") + PROPERTY_VALUE_MAX];
char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:")-1 + PROPERTY_VALUE_MAX];
char nativeBridgeLibrary[sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX];
@@ -693,7 +686,8 @@
* JIT related options.
*/
parseRuntimeOption("dalvik.vm.usejit", usejitOptsBuf, "-Xusejit:");
- parseRuntimeOption("dalvik.vm.jitcodecachesize", jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");
+ parseRuntimeOption("dalvik.vm.jitmaxsize", jitmaxsizeOptsBuf, "-Xjitmaxsize:");
+ parseRuntimeOption("dalvik.vm.jitinitialsize", jitinitialsizeOptsBuf, "-Xjitinitialsize:");
parseRuntimeOption("dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");
property_get("ro.config.low_ram", propBuf, "");
@@ -835,60 +829,6 @@
addOption(localeOption);
}
- /*
- * Set profiler options
- */
- // Whether or not the profiler should be enabled.
- property_get("dalvik.vm.profiler", propBuf, "0");
- if (propBuf[0] == '1') {
- addOption("-Xenable-profiler");
- }
-
- // Whether the profile should start upon app startup or be delayed by some random offset
- // (in seconds) that is bound between 0 and a fixed value.
- property_get("dalvik.vm.profile.start-immed", propBuf, "0");
- if (propBuf[0] == '1') {
- addOption("-Xprofile-start-immediately");
- }
-
- // Number of seconds during profile runs.
- parseRuntimeOption("dalvik.vm.profile.period-secs", profilePeriod, "-Xprofile-period:");
-
- // Length of each profile run (seconds).
- parseRuntimeOption("dalvik.vm.profile.duration-secs",
- profileDuration,
- "-Xprofile-duration:");
-
- // Polling interval during profile run (microseconds).
- parseRuntimeOption("dalvik.vm.profile.interval-us", profileInterval, "-Xprofile-interval:");
-
- // Coefficient for period backoff. The the period is multiplied
- // by this value after each profile run.
- parseRuntimeOption("dalvik.vm.profile.backoff-coeff", profileBackoff, "-Xprofile-backoff:");
-
- // Top K% of samples that are considered relevant when
- // deciding if the app should be recompiled.
- parseRuntimeOption("dalvik.vm.profile.top-k-thr",
- profileTopKThreshold,
- "-Xprofile-top-k-threshold:");
-
- // The threshold after which a change in the structure of the
- // top K% profiled samples becomes significant and triggers
- // recompilation. A change in profile is considered
- // significant if X% (top-k-change-threshold) of the top K%
- // (top-k-threshold property) samples has changed.
- parseRuntimeOption("dalvik.vm.profile.top-k-ch-thr",
- profileTopKChangeThreshold,
- "-Xprofile-top-k-change-threshold:");
-
- // Type of profile data.
- parseRuntimeOption("dalvik.vm.profiler.type", profileType, "-Xprofile-type:");
-
- // Depth of bounded stack data
- parseRuntimeOption("dalvik.vm.profile.stack-depth",
- profileMaxStackDepth,
- "-Xprofile-max-stack-depth:");
-
// Trace files are stored in /data/misc/trace which is writable only in debug mode.
property_get("ro.debuggable", propBuf, "0");
if (strcmp(propBuf, "1") == 0) {
@@ -1420,6 +1360,7 @@
REG_JNI(register_android_app_backup_FullBackup),
REG_JNI(register_android_app_ActivityThread),
REG_JNI(register_android_app_NativeActivity),
+ REG_JNI(register_android_util_jar_StrictJarFile),
REG_JNI(register_android_view_InputChannel),
REG_JNI(register_android_view_InputEventReceiver),
REG_JNI(register_android_view_InputEventSender),
@@ -1435,6 +1376,8 @@
REG_JNI(register_android_animation_PropertyValuesHolder),
REG_JNI(register_com_android_internal_content_NativeLibraryHelper),
REG_JNI(register_com_android_internal_net_NetworkStatsFactory),
+
+
};
/*
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 703a9bd..a805b6d 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -1006,6 +1006,7 @@
// is disposed.
int dupFd = dup(blob.fd());
if (dupFd < 0) {
+ ALOGE("Error allocating dup fd. Error:%d", errno);
blob.release();
SkSafeUnref(ctable);
doThrowRE(env, "Could not allocate dup blob fd.");
diff --git a/core/jni/android/graphics/MinikinUtils.cpp b/core/jni/android/graphics/MinikinUtils.cpp
index 7fd288a..9b774b3 100644
--- a/core/jni/android/graphics/MinikinUtils.cpp
+++ b/core/jni/android/graphics/MinikinUtils.cpp
@@ -63,6 +63,11 @@
layout->doLayout(buf, start, count, bufSize, bidiFlags, minikinStyle, minikinPaint);
}
+bool MinikinUtils::hasVariationSelector(TypefaceImpl* typeface, uint32_t codepoint, uint32_t vs) {
+ const TypefaceImpl* resolvedFace = TypefaceImpl_resolveDefault(typeface);
+ return resolvedFace->fFontCollection->hasVariationSelector(codepoint, vs);
+}
+
float MinikinUtils::xOffsetForTextAlign(Paint* paint, const Layout& layout) {
switch (paint->getTextAlign()) {
case Paint::kCenter_Align:
diff --git a/core/jni/android/graphics/MinikinUtils.h b/core/jni/android/graphics/MinikinUtils.h
index 1ee6245..5bf1eec 100644
--- a/core/jni/android/graphics/MinikinUtils.h
+++ b/core/jni/android/graphics/MinikinUtils.h
@@ -40,6 +40,8 @@
TypefaceImpl* typeface, const uint16_t* buf, size_t start, size_t count,
size_t bufSize);
+ static bool hasVariationSelector(TypefaceImpl* typeface, uint32_t codepoint, uint32_t vs);
+
static float xOffsetForTextAlign(Paint* paint, const Layout& layout);
static float hOffsetForTextAlign(Paint* paint, const Layout& layout, const SkPath& path);
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index b50046f..9c11dd1 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -39,6 +39,7 @@
#include <minikin/GraphemeBreak.h>
#include <minikin/Measurement.h>
+#include <unicode/utf16.h>
#include "MinikinSkia.h"
#include "MinikinUtils.h"
#include "Paint.h"
@@ -852,45 +853,44 @@
return false;
}
- static jboolean hasGlyphVariation(const Paint* paint, TypefaceImpl* typeface, jint bidiFlags,
- const jchar* chars, size_t size) {
- // TODO: query font for whether character has variation selector; requires a corresponding
- // function in Minikin.
- return false;
- }
-
static jboolean hasGlyph(JNIEnv *env, jclass, jlong paintHandle, jlong typefaceHandle,
jint bidiFlags, jstring string) {
const Paint* paint = reinterpret_cast<Paint*>(paintHandle);
TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle);
ScopedStringChars str(env, string);
- /* start by rejecting variation selectors (not supported yet) */
+ /* Start by rejecting unsupported base code point and variation selector pairs. */
size_t nChars = 0;
+ const uint32_t kStartOfString = 0xFFFFFFFF;
+ uint32_t prevCp = kStartOfString;
for (size_t i = 0; i < str.size(); i++) {
- jchar c = str[i];
- if (0xDC00 <= c && c <= 0xDFFF) {
+ jchar cu = str[i];
+ uint32_t cp = cu;
+ if (U16_IS_TRAIL(cu)) {
// invalid UTF-16, unpaired trailing surrogate
return false;
- } else if (0xD800 <= c && c <= 0xDBFF) {
+ } else if (U16_IS_LEAD(cu)) {
if (i + 1 == str.size()) {
// invalid UTF-16, unpaired leading surrogate at end of string
return false;
}
i++;
- jchar c2 = str[i];
- if (!(0xDC00 <= c2 && c2 <= 0xDFFF)) {
+ jchar cu2 = str[i];
+ if (!U16_IS_TRAIL(cu2)) {
// invalid UTF-16, unpaired leading surrogate
return false;
}
- // UTF-16 encoding of range U+E0100..U+E01EF is DB40 DD00 .. DB40 DDEF
- if (c == 0xDB40 && 0xDD00 <= c2 && c2 <= 0xDDEF) {
- return hasGlyphVariation(paint, typeface, bidiFlags, str.get(), str.size());
- }
- } else if (0xFE00 <= c && c <= 0xFE0F) {
- return hasGlyphVariation(paint, typeface, bidiFlags, str.get(), str.size());
+ cp = U16_GET_SUPPLEMENTARY(cu, cu2);
+ }
+
+ if (prevCp != kStartOfString &&
+ ((0xFE00 <= cp && cp <= 0xFE0F) || (0xE0100 <= cp && cp <= 0xE01EF)) &&
+ !MinikinUtils::hasVariationSelector(typeface, prevCp, cp)) {
+ // No font has a glyph for the code point and variation selector pair.
+ return false;
}
nChars++;
+ prevCp = cp;
}
Layout layout;
MinikinUtils::doLayout(&layout, paint, bidiFlags, typeface, str.get(), 0, str.size(),
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index 3d96fab..e4e73a4 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -544,39 +544,6 @@
float totalAdvance;
};
-// Same values used by Skia
-#define kStdStrikeThru_Offset (-6.0f / 21.0f)
-#define kStdUnderline_Offset (1.0f / 9.0f)
-#define kStdUnderline_Thickness (1.0f / 18.0f)
-
-void drawTextDecorations(Canvas* canvas, float x, float y, float length, const SkPaint& paint) {
- uint32_t flags;
- SkDrawFilter* drawFilter = canvas->getDrawFilter();
- if (drawFilter) {
- SkPaint paintCopy(paint);
- drawFilter->filter(&paintCopy, SkDrawFilter::kText_Type);
- flags = paintCopy.getFlags();
- } else {
- flags = paint.getFlags();
- }
- if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) {
- SkScalar left = x;
- SkScalar right = x + length;
- float textSize = paint.getTextSize();
- float strokeWidth = fmax(textSize * kStdUnderline_Thickness, 1.0f);
- if (flags & SkPaint::kUnderlineText_Flag) {
- SkScalar top = y + textSize * kStdUnderline_Offset - 0.5f * strokeWidth;
- SkScalar bottom = y + textSize * kStdUnderline_Offset + 0.5f * strokeWidth;
- canvas->drawRect(left, top, right, bottom, paint);
- }
- if (flags & SkPaint::kStrikeThruText_Flag) {
- SkScalar top = y + textSize * kStdStrikeThru_Offset - 0.5f * strokeWidth;
- SkScalar bottom = y + textSize * kStdStrikeThru_Offset + 0.5f * strokeWidth;
- canvas->drawRect(left, top, right, bottom, paint);
- }
- }
-}
-
void drawText(Canvas* canvas, const uint16_t* text, int start, int count, int contextCount,
float x, float y, int bidiFlags, const Paint& origPaint, TypefaceImpl* typeface) {
// minikin may modify the original paint
@@ -586,8 +553,8 @@
MinikinUtils::doLayout(&layout, &paint, bidiFlags, typeface, text, start, count, contextCount);
size_t nGlyphs = layout.nGlyphs();
- uint16_t* glyphs = new uint16_t[nGlyphs];
- float* pos = new float[nGlyphs * 2];
+ std::unique_ptr<uint16_t[]> glyphs(new uint16_t[nGlyphs]);
+ std::unique_ptr<float[]> pos(new float[nGlyphs * 2]);
x += MinikinUtils::xOffsetForTextAlign(&paint, layout);
@@ -597,13 +564,9 @@
bounds.offset(x, y);
}
- DrawTextFunctor f(layout, canvas, glyphs, pos, paint, x, y, bounds, layout.getAdvance());
+ DrawTextFunctor f(layout, canvas, glyphs.get(), pos.get(),
+ paint, x, y, bounds, layout.getAdvance());
MinikinUtils::forFontRun(layout, &paint, f);
-
- drawTextDecorations(canvas, x, y, layout.getAdvance(), paint);
-
- delete[] glyphs;
- delete[] pos;
}
static void drawTextChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray text,
diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp
index c89f293c..2d23cda 100644
--- a/core/jni/android_util_Log.cpp
+++ b/core/jni/android_util_Log.cpp
@@ -42,9 +42,7 @@
static levels_t levels;
static jboolean isLoggable(const char* tag, jint level) {
- return __android_log_is_loggable(level, tag,
- ANDROID_LOG_INFO |
- ANDROID_LOGGABLE_FLAG_NOT_WITHIN_SIGNAL);
+ return __android_log_is_loggable(level, tag, ANDROID_LOG_INFO);
}
static jboolean android_util_Log_isLoggable(JNIEnv* env, jobject clazz, jstring tag, jint level)
diff --git a/core/jni/android_util_PathParser.cpp b/core/jni/android_util_PathParser.cpp
index bf6ffc54..0927120 100644
--- a/core/jni/android_util_PathParser.cpp
+++ b/core/jni/android_util_PathParser.cpp
@@ -18,23 +18,97 @@
#include <PathParser.h>
#include <SkPath.h>
+#include <utils/VectorDrawableUtils.h>
+#include <android/log.h>
#include "core_jni_helpers.h"
namespace android {
+using namespace uirenderer;
+
static bool parseStringForPath(JNIEnv* env, jobject, jlong skPathHandle, jstring inputPathStr,
jint strLength) {
const char* pathString = env->GetStringUTFChars(inputPathStr, NULL);
SkPath* skPath = reinterpret_cast<SkPath*>(skPathHandle);
- bool hasValidData = android::uirenderer::PathParser::parseStringForSkPath(skPath, pathString,
- strLength);
+
+ PathParser::ParseResult result;
+ PathParser::parseStringForSkPath(skPath, &result, pathString, strLength);
env->ReleaseStringUTFChars(inputPathStr, pathString);
- return hasValidData;
+ if (result.failureOccurred) {
+ ALOGE(result.failureMessage.c_str());
+ }
+ return !result.failureOccurred;
+}
+
+static long createEmptyPathData(JNIEnv*, jobject) {
+ PathData* pathData = new PathData();
+ return reinterpret_cast<jlong>(pathData);
+}
+
+static long createPathData(JNIEnv*, jobject, jlong pathDataPtr) {
+ PathData* pathData = reinterpret_cast<PathData*>(pathDataPtr);
+ PathData* newPathData = new PathData(*pathData);
+ return reinterpret_cast<jlong>(newPathData);
+}
+
+static long createPathDataFromStringPath(JNIEnv* env, jobject, jstring inputStr, jint strLength) {
+ const char* pathString = env->GetStringUTFChars(inputStr, NULL);
+ PathData* pathData = new PathData();
+ PathParser::ParseResult result;
+ PathParser::getPathDataFromString(pathData, &result, pathString, strLength);
+ env->ReleaseStringUTFChars(inputStr, pathString);
+ if (!result.failureOccurred) {
+ return reinterpret_cast<jlong>(pathData);
+ } else {
+ delete pathData;
+ ALOGE(result.failureMessage.c_str());
+ return NULL;
+ }
+}
+
+static bool interpolatePathData(JNIEnv*, jobject, jlong outPathDataPtr, jlong fromPathDataPtr,
+ jlong toPathDataPtr, jfloat fraction) {
+ PathData* outPathData = reinterpret_cast<PathData*>(outPathDataPtr);
+ PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);
+ PathData* toPathData = reinterpret_cast<PathData*>(toPathDataPtr);
+ return VectorDrawableUtils::interpolatePathData(outPathData, *fromPathData,
+ *toPathData, fraction);
+}
+
+static void deletePathData(JNIEnv*, jobject, jlong pathDataHandle) {
+ PathData* pathData = reinterpret_cast<PathData*>(pathDataHandle);
+ delete pathData;
+}
+
+static bool canMorphPathData(JNIEnv*, jobject, jlong fromPathDataPtr, jlong toPathDataPtr) {
+ PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);
+ PathData* toPathData = reinterpret_cast<PathData*>(toPathDataPtr);
+ return VectorDrawableUtils::canMorph(*fromPathData, *toPathData);
+}
+
+static void setPathData(JNIEnv*, jobject, jlong outPathDataPtr, jlong fromPathDataPtr) {
+ PathData* fromPathData = reinterpret_cast<PathData*>(fromPathDataPtr);
+ PathData* outPathData = reinterpret_cast<PathData*>(outPathDataPtr);
+ *outPathData = *fromPathData;
+}
+
+static void setSkPathFromPathData(JNIEnv*, jobject, jlong outPathPtr, jlong pathDataPtr) {
+ PathData* pathData = reinterpret_cast<PathData*>(pathDataPtr);
+ SkPath* skPath = reinterpret_cast<SkPath*>(outPathPtr);
+ VectorDrawableUtils::verbsToPath(skPath, *pathData);
}
static const JNINativeMethod gMethods[] = {
- {"nParseStringForPath", "(JLjava/lang/String;I)Z", (void*)parseStringForPath}
+ {"nParseStringForPath", "(JLjava/lang/String;I)Z", (void*)parseStringForPath},
+ {"nCreateEmptyPathData", "!()J", (void*)createEmptyPathData},
+ {"nCreatePathData", "!(J)J", (void*)createPathData},
+ {"nCreatePathDataFromString", "(Ljava/lang/String;I)J", (void*)createPathDataFromStringPath},
+ {"nInterpolatePathData", "!(JJJF)Z", (void*)interpolatePathData},
+ {"nFinalize", "!(J)V", (void*)deletePathData},
+ {"nCanMorph", "!(JJ)Z", (void*)canMorphPathData},
+ {"nSetPathData", "!(JJ)V", (void*)setPathData},
+ {"nCreatePathFromPathData", "!(JJ)V", (void*)setSkPathFromPathData},
};
int register_android_util_PathParser(JNIEnv* env) {
diff --git a/core/jni/android_util_jar_StrictJarFile.cpp b/core/jni/android_util_jar_StrictJarFile.cpp
new file mode 100644
index 0000000..7f8f708
--- /dev/null
+++ b/core/jni/android_util_jar_StrictJarFile.cpp
@@ -0,0 +1,172 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+#define LOG_TAG "StrictJarFile"
+
+#include <memory>
+#include <string>
+
+#include "JNIHelp.h"
+#include "JniConstants.h"
+#include "ScopedLocalRef.h"
+#include "ScopedUtfChars.h"
+#include "jni.h"
+#include "ziparchive/zip_archive.h"
+#include "cutils/log.h"
+
+namespace android {
+
+// The method ID for ZipEntry.<init>(String,String,JJJIII[BJJ)
+static jmethodID zipEntryCtor;
+
+static void throwIoException(JNIEnv* env, const int32_t errorCode) {
+ jniThrowException(env, "java/io/IOException", ErrorCodeString(errorCode));
+}
+
+static jobject newZipEntry(JNIEnv* env, const ZipEntry& entry, jstring entryName) {
+ return env->NewObject(JniConstants::zipEntryClass,
+ zipEntryCtor,
+ entryName,
+ NULL, // comment
+ static_cast<jlong>(entry.crc32),
+ static_cast<jlong>(entry.compressed_length),
+ static_cast<jlong>(entry.uncompressed_length),
+ static_cast<jint>(entry.method),
+ static_cast<jint>(0), // time
+ NULL, // byte[] extra
+ static_cast<jlong>(entry.offset));
+}
+
+static jlong StrictJarFile_nativeOpenJarFile(JNIEnv* env, jobject, jstring fileName) {
+ ScopedUtfChars fileChars(env, fileName);
+ if (fileChars.c_str() == NULL) {
+ return static_cast<jlong>(-1);
+ }
+
+ ZipArchiveHandle handle;
+ int32_t error = OpenArchive(fileChars.c_str(), &handle);
+ if (error) {
+ CloseArchive(handle);
+ throwIoException(env, error);
+ return static_cast<jlong>(-1);
+ }
+
+ return reinterpret_cast<jlong>(handle);
+}
+
+class IterationHandle {
+ public:
+ IterationHandle() :
+ cookie_(NULL) {
+ }
+
+ void** CookieAddress() {
+ return &cookie_;
+ }
+
+ ~IterationHandle() {
+ EndIteration(cookie_);
+ }
+
+ private:
+ void* cookie_;
+};
+
+
+static jlong StrictJarFile_nativeStartIteration(JNIEnv* env, jobject, jlong nativeHandle,
+ jstring prefix) {
+ ScopedUtfChars prefixChars(env, prefix);
+ if (prefixChars.c_str() == NULL) {
+ return static_cast<jlong>(-1);
+ }
+
+ IterationHandle* handle = new IterationHandle();
+ int32_t error = 0;
+ if (prefixChars.size() == 0) {
+ error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
+ handle->CookieAddress(), NULL, NULL);
+ } else {
+ ZipString entry_name(prefixChars.c_str());
+ error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
+ handle->CookieAddress(), &entry_name, NULL);
+ }
+
+ if (error) {
+ throwIoException(env, error);
+ return static_cast<jlong>(-1);
+ }
+
+ return reinterpret_cast<jlong>(handle);
+}
+
+static jobject StrictJarFile_nativeNextEntry(JNIEnv* env, jobject, jlong iterationHandle) {
+ ZipEntry data;
+ ZipString entryName;
+
+ IterationHandle* handle = reinterpret_cast<IterationHandle*>(iterationHandle);
+ const int32_t error = Next(*handle->CookieAddress(), &data, &entryName);
+ if (error) {
+ delete handle;
+ return NULL;
+ }
+
+ std::unique_ptr<char[]> entryNameCString(new char[entryName.name_length + 1]);
+ memcpy(entryNameCString.get(), entryName.name, entryName.name_length);
+ entryNameCString[entryName.name_length] = '\0';
+ ScopedLocalRef<jstring> entryNameString(env, env->NewStringUTF(entryNameCString.get()));
+
+ return newZipEntry(env, data, entryNameString.get());
+}
+
+static jobject StrictJarFile_nativeFindEntry(JNIEnv* env, jobject, jlong nativeHandle,
+ jstring entryName) {
+ ScopedUtfChars entryNameChars(env, entryName);
+ if (entryNameChars.c_str() == NULL) {
+ return NULL;
+ }
+
+ ZipEntry data;
+ const int32_t error = FindEntry(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
+ ZipString(entryNameChars.c_str()), &data);
+ if (error) {
+ return NULL;
+ }
+
+ return newZipEntry(env, data, entryName);
+}
+
+static void StrictJarFile_nativeClose(JNIEnv*, jobject, jlong nativeHandle) {
+ CloseArchive(reinterpret_cast<ZipArchiveHandle>(nativeHandle));
+}
+
+static JNINativeMethod gMethods[] = {
+ NATIVE_METHOD(StrictJarFile, nativeOpenJarFile, "(Ljava/lang/String;)J"),
+ NATIVE_METHOD(StrictJarFile, nativeStartIteration, "(JLjava/lang/String;)J"),
+ NATIVE_METHOD(StrictJarFile, nativeNextEntry, "(J)Ljava/util/zip/ZipEntry;"),
+ NATIVE_METHOD(StrictJarFile, nativeFindEntry, "(JLjava/lang/String;)Ljava/util/zip/ZipEntry;"),
+ NATIVE_METHOD(StrictJarFile, nativeClose, "(J)V"),
+};
+
+void register_android_util_jar_StrictJarFile(JNIEnv* env) {
+ jniRegisterNativeMethods(env, "android/util/jar/StrictJarFile", gMethods, NELEM(gMethods));
+
+ zipEntryCtor = env->GetMethodID(JniConstants::zipEntryClass, "<init>",
+ "(Ljava/lang/String;Ljava/lang/String;JJJII[BJ)V");
+ LOG_ALWAYS_FATAL_IF(zipEntryCtor == NULL, "Unable to find ZipEntry.<init>");
+}
+
+}; // namespace android
diff --git a/core/jni/android_view_PointerIcon.cpp b/core/jni/android_view_PointerIcon.cpp
index d04adbf..d7e2c02 100644
--- a/core/jni/android_view_PointerIcon.cpp
+++ b/core/jni/android_view_PointerIcon.cpp
@@ -24,6 +24,7 @@
#include <android_runtime/Log.h>
#include <utils/Log.h>
#include <android/graphics/GraphicsJNI.h>
+#include "ScopedLocalRef.h"
#include "core_jni_helpers.h"
@@ -35,6 +36,8 @@
jfieldID mBitmap;
jfieldID mHotSpotX;
jfieldID mHotSpotY;
+ jfieldID mBitmapFrames;
+ jfieldID mDurationPerFrame;
jmethodID getSystemIcon;
jmethodID load;
} gPointerIconClassInfo;
@@ -84,6 +87,19 @@
env->DeleteLocalRef(bitmapObj);
}
+ ScopedLocalRef<jobjectArray> bitmapFramesObj(env, reinterpret_cast<jobjectArray>(
+ env->GetObjectField(loadedPointerIconObj, gPointerIconClassInfo.mBitmapFrames)));
+ if (bitmapFramesObj.get()) {
+ outPointerIcon->durationPerFrame = env->GetIntField(
+ loadedPointerIconObj, gPointerIconClassInfo.mDurationPerFrame);
+ jsize size = env->GetArrayLength(bitmapFramesObj.get());
+ outPointerIcon->bitmapFrames.resize(size);
+ for (jsize i = 0; i < size; ++i) {
+ ScopedLocalRef<jobject> bitmapObj(env, env->GetObjectArrayElement(bitmapFramesObj.get(), i));
+ GraphicsJNI::getSkBitmap(env, bitmapObj.get(), &(outPointerIcon->bitmapFrames[i]));
+ }
+ }
+
env->DeleteLocalRef(loadedPointerIconObj);
return OK;
}
@@ -121,6 +137,12 @@
gPointerIconClassInfo.mHotSpotY = GetFieldIDOrDie(env, gPointerIconClassInfo.clazz,
"mHotSpotY", "F");
+ gPointerIconClassInfo.mBitmapFrames = GetFieldIDOrDie(env, gPointerIconClassInfo.clazz,
+ "mBitmapFrames", "[Landroid/graphics/Bitmap;");
+
+ gPointerIconClassInfo.mDurationPerFrame = GetFieldIDOrDie(env, gPointerIconClassInfo.clazz,
+ "mDurationPerFrame", "I");
+
gPointerIconClassInfo.getSystemIcon = GetStaticMethodIDOrDie(env, gPointerIconClassInfo.clazz,
"getSystemIcon", "(Landroid/content/Context;I)Landroid/view/PointerIcon;");
diff --git a/core/jni/android_view_PointerIcon.h b/core/jni/android_view_PointerIcon.h
index 86f288d..ca08085 100644
--- a/core/jni/android_view_PointerIcon.h
+++ b/core/jni/android_view_PointerIcon.h
@@ -19,6 +19,8 @@
#include "jni.h"
+#include <vector>
+
#include <utils/Errors.h>
#include <SkBitmap.h>
@@ -69,6 +71,8 @@
SkBitmap bitmap;
float hotSpotX;
float hotSpotY;
+ std::vector<SkBitmap> bitmapFrames;
+ int32_t durationPerFrame;
inline bool isNullIcon() {
return style == POINTER_ICON_STYLE_NULL;
@@ -79,6 +83,8 @@
bitmap.reset();
hotSpotX = 0;
hotSpotY = 0;
+ bitmapFrames.clear();
+ durationPerFrame = 0;
}
};
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 3f1be45..73c7487 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -21,6 +21,7 @@
#include <linux/fs.h>
#include <list>
+#include <sstream>
#include <string>
#include <fcntl.h>
@@ -74,8 +75,10 @@
MOUNT_EXTERNAL_WRITE = 3,
};
-static void RuntimeAbort(JNIEnv* env) {
- env->FatalError("RuntimeAbort");
+static void RuntimeAbort(JNIEnv* env, int line, const char* msg) {
+ std::ostringstream oss;
+ oss << __FILE__ << ":" << line << ": " << msg;
+ env->FatalError(oss.str().c_str());
}
// This signal handler is for zygote mode, since the zygote must reap its children
@@ -169,12 +172,11 @@
ScopedIntArrayRO gids(env, javaGids);
if (gids.get() == NULL) {
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "Getting gids int array failed");
}
int rc = setgroups(gids.size(), reinterpret_cast<const gid_t*>(&gids[0]));
if (rc == -1) {
- ALOGE("setgroups failed");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "setgroups failed");
}
}
@@ -194,8 +196,7 @@
ScopedLocalRef<jobject> javaRlimitObject(env, env->GetObjectArrayElement(javaRlimits, i));
ScopedIntArrayRO javaRlimit(env, reinterpret_cast<jintArray>(javaRlimitObject.get()));
if (javaRlimit.size() != 3) {
- ALOGE("rlimits array must have a second dimension of size 3");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "rlimits array must have a second dimension of size 3");
}
rlim.rlim_cur = javaRlimit[1];
@@ -205,7 +206,7 @@
if (rc == -1) {
ALOGE("setrlimit(%d, {%ld, %ld}) failed", javaRlimit[0], rlim.rlim_cur,
rlim.rlim_max);
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "setrlimit failed");
}
}
}
@@ -216,8 +217,7 @@
static void EnableKeepCapabilities(JNIEnv* env) {
int rc = prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);
if (rc == -1) {
- ALOGE("prctl(PR_SET_KEEPCAPS) failed");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "prctl(PR_SET_KEEPCAPS) failed");
}
}
@@ -229,8 +229,7 @@
ALOGE("prctl(PR_CAPBSET_DROP) failed with EINVAL. Please verify "
"your kernel is compiled with file capabilities support");
} else {
- ALOGE("prctl(PR_CAPBSET_DROP) failed");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "prctl(PR_CAPBSET_DROP) failed");
}
}
}
@@ -251,7 +250,7 @@
if (capset(&capheader, &capdata[0]) == -1) {
ALOGE("capset(%" PRId64 ", %" PRId64 ") failed", permitted, effective);
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "capset failed");
}
}
@@ -259,7 +258,7 @@
errno = -set_sched_policy(0, SP_DEFAULT);
if (errno != 0) {
ALOGE("set_sched_policy(0, SP_DEFAULT) failed");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "set_sched_policy(0, SP_DEFAULT) failed");
}
}
@@ -370,8 +369,7 @@
jsize count = env->GetArrayLength(fdsToClose);
ScopedIntArrayRO ar(env, fdsToClose);
if (ar.get() == NULL) {
- ALOGE("Bad fd array");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "Bad fd array");
}
jsize i;
int devnull;
@@ -379,13 +377,13 @@
devnull = open("/dev/null", O_RDWR);
if (devnull < 0) {
ALOGE("Failed to open /dev/null: %s", strerror(errno));
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "Failed to open /dev/null");
continue;
}
ALOGV("Switching descriptor %d to /dev/null: %s", ar[i], strerror(errno));
if (dup2(devnull, ar[i]) < 0) {
ALOGE("Failed dup2() on descriptor %d: %s", ar[i], strerror(errno));
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "Failed dup2()");
}
close(devnull);
}
@@ -493,8 +491,7 @@
// FUSE hasn't been created yet by init.
// In either case, continue without external storage.
} else {
- ALOGE("Cannot continue without emulated storage");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "Cannot continue without emulated storage");
}
}
@@ -522,13 +519,13 @@
int rc = setresgid(gid, gid, gid);
if (rc == -1) {
ALOGE("setresgid(%d) failed: %s", gid, strerror(errno));
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "setresgid failed");
}
rc = setresuid(uid, uid, uid);
if (rc == -1) {
ALOGE("setresuid(%d) failed: %s", uid, strerror(errno));
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "setresuid failed");
}
if (NeedsNoRandomizeWorkaround()) {
@@ -550,8 +547,7 @@
se_info = new ScopedUtfChars(env, java_se_info);
se_info_c_str = se_info->c_str();
if (se_info_c_str == NULL) {
- ALOGE("se_info_c_str == NULL");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "se_info_c_str == NULL");
}
}
const char* se_name_c_str = NULL;
@@ -560,15 +556,14 @@
se_name = new ScopedUtfChars(env, java_se_name);
se_name_c_str = se_name->c_str();
if (se_name_c_str == NULL) {
- ALOGE("se_name_c_str == NULL");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "se_name_c_str == NULL");
}
}
rc = selinux_android_setcontext(uid, is_system_server, se_info_c_str, se_name_c_str);
if (rc == -1) {
ALOGE("selinux_android_setcontext(%d, %d, \"%s\", \"%s\") failed", uid,
is_system_server, se_info_c_str, se_name_c_str);
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "selinux_android_setcontext failed");
}
// Make it easier to debug audit logs by setting the main thread's name to the
@@ -588,8 +583,7 @@
env->CallStaticVoidMethod(gZygoteClass, gCallPostForkChildHooks, debug_flags,
is_system_server ? NULL : instructionSet);
if (env->ExceptionCheck()) {
- ALOGE("Error calling post fork hooks.");
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "Error calling post fork hooks.");
}
} else if (pid > 0) {
// the parent process
@@ -641,7 +635,7 @@
int status;
if (waitpid(pid, &status, WNOHANG) == pid) {
ALOGE("System server process %d has died. Restarting Zygote!", pid);
- RuntimeAbort(env);
+ RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!");
}
}
return pid;
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6bdf71b..2940f6c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -33,6 +33,7 @@
<protected-broadcast android:name="android.intent.action.TIME_TICK" />
<protected-broadcast android:name="android.intent.action.TIMEZONE_CHANGED" />
<protected-broadcast android:name="android.intent.action.DATE_CHANGED" />
+ <protected-broadcast android:name="android.intent.action.PRE_BOOT_COMPLETED" />
<protected-broadcast android:name="android.intent.action.BOOT_COMPLETED" />
<protected-broadcast android:name="android.intent.action.PACKAGE_INSTALL" />
<protected-broadcast android:name="android.intent.action.PACKAGE_ADDED" />
@@ -76,6 +77,7 @@
<protected-broadcast android:name="android.intent.action.USER_BACKGROUND" />
<protected-broadcast android:name="android.intent.action.USER_FOREGROUND" />
<protected-broadcast android:name="android.intent.action.USER_SWITCHED" />
+ <protected-broadcast android:name="android.intent.action.USER_INITIALIZE" />
<protected-broadcast android:name="android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION" />
<protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
@@ -1458,6 +1460,12 @@
android:description="@string/permdesc_killBackgroundProcesses"
android:protectionLevel="normal" />
+ <!-- @SystemApi @hide Allows an application to query process states and current
+ OOM adjustment scores.
+ <p>Not for use by third-party applications. -->
+ <permission android:name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"
+ android:protectionLevel="signature|privileged|development" />
+
<!-- @SystemApi @hide Allows an application to retrieve a package's importance.
This permission is not available to third party applications. -->
<permission android:name="android.permission.GET_PACKAGE_IMPORTANCE"
@@ -1831,6 +1839,12 @@
<permission android:name="android.permission.STATUS_BAR_SERVICE"
android:protectionLevel="signature" />
+ <!-- Allows an application to bind to third party quick settings tiles.
+ <p>Should only be requested by the System, should be required by
+ QSTileService declarations.-->
+ <permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE"
+ android:protectionLevel="signature" />
+
<!-- @SystemApi Allows an application to force a BACK operation on whatever is the
top activity.
<p>Not for use by third-party applications.
@@ -1869,6 +1883,11 @@
<permission android:name="android.permission.MANAGE_APP_TOKENS"
android:protectionLevel="signature" />
+ <!-- Allows System UI to register listeners for events from Window Manager.
+ @hide -->
+ <permission android:name="android.permission.REGISTER_WINDOW_MANAGER_LISTENERS"
+ android:protectionLevel="signature" />
+
<!-- @hide Allows the application to temporarily freeze the screen for a
full-screen transition. -->
<permission android:name="android.permission.FREEZE_SCREEN"
@@ -2835,6 +2854,17 @@
android:process=":ui">
</activity>
+ <activity android:name="com.android.internal.app.SystemUserHomeActivity"
+ android:enabled="false"
+ android:process=":ui"
+ android:systemUserOnly="true"
+ android:theme="@style/Theme.Translucent.NoTitleBar">
+ <intent-filter android:priority="-100">
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.HOME" />
+ </intent-filter>
+ </activity>
+
<receiver android:name="com.android.server.BootReceiver"
android:systemUserOnly="true">
<intent-filter android:priority="1000">
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_1_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_1_animation.xml
new file mode 100644
index 0000000..e6a28bb
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_1_animation.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -6.5,0.0 c 1.08333,-1.0 5.41667,-5.0 6.5,-6.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_4" />
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="rotation"
+ android:valueFrom="-45.0"
+ android:valueTo="-45.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="150"
+ android:propertyName="rotation"
+ android:valueFrom="-45.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_0_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_0_animation.xml
new file mode 100644
index 0000000..c2414de
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_0_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,0.0 c 0.75,0.0 3.75,0.0 4.5,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_5" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_animation.xml
new file mode 100644
index 0000000..593a0ea
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_1_pivot_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="450"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 4.5,0.0 c -0.75,0.0 -3.75,0.0 -4.5,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_0" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_2_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_2_animation.xml
new file mode 100644
index 0000000..5b09a41
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_2_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -8.0,0.0 c 1.33333,0.0 6.66667,0.0 8.0,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_3" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_2_pivot_0_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_2_pivot_0_animation.xml
new file mode 100644
index 0000000..dccbc67
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_2_pivot_0_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="250"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,0.0 c 1.66667,0.0 8.5,0.0 10.0,0.0 c 0.13052,0.0 -0.83333,0.0 -1.0,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_2" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_2_pivot_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_2_pivot_animation.xml
new file mode 100644
index 0000000..c1c0c1c
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_2_pivot_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="516"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 9.0,0.0 c -1.5,0.0 -7.5,0.0 -9.0,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_6" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_3_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_3_animation.xml
new file mode 100644
index 0000000..df69bf7
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_3_animation.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="600"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -6.5,0.0 c 1.08333,1.0 5.41667,5.0 6.5,6.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_4" />
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="rotation"
+ android:valueFrom="45.0"
+ android:valueTo="45.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="150"
+ android:propertyName="rotation"
+ android:valueFrom="45.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_3_pivot_0_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_3_pivot_0_animation.xml
new file mode 100644
index 0000000..c2414de
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_3_pivot_0_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="200"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,0.0 c 0.75,0.0 3.75,0.0 4.5,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_5" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_3_pivot_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_3_pivot_animation.xml
new file mode 100644
index 0000000..593a0ea
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_3_pivot_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="450"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 4.5,0.0 c -0.75,0.0 -3.75,0.0 -4.5,0.0"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_0" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_4_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_4_animation.xml
new file mode 100644
index 0000000..a375330
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_4_animation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,6.0 c -1.08333,-1.0 -5.41667,-5.0 -6.5,-6.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="400"
+ android:propertyName="rotation"
+ android:valueFrom="0.0"
+ android:valueTo="45.0"
+ android:valueType="floatType"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_1" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_5_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_5_animation.xml
new file mode 100644
index 0000000..ae7ee47
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_5_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="250"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,0.0 c -1.33333,0.0 -6.66667,0.0 -8.0,0.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_6_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_6_animation.xml
new file mode 100644
index 0000000..3b872af
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_6_animation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 0.0,-6.0 c -1.08333,1.0 -5.41667,5.0 -6.5,6.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="400"
+ android:propertyName="rotation"
+ android:valueFrom="0.0"
+ android:valueTo="-45.0"
+ android:valueType="floatType"
+ android:interpolator="@interpolator/ft_avd_toarrow_animation_interpolator_1" />
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_path_1_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_path_1_animation.xml
new file mode 100644
index 0000000..94e04b4
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_path_1_animation.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -4.54266574364,-1.0 l 9.08533148727,0.0 c 0.528721110251,0.0 0.957334256364,0.428613146113 0.957334256364,0.957334256364 l 0.0,0.0853314872718 c 0.0,0.528721110251 -0.428613146113,0.957334256364 -0.957334256364,0.957334256364 l -9.08533148727,0.0 c -0.528721110251,0.0 -0.957334256364,-0.428613146113 -0.957334256364,-0.957334256364 l 0.0,-0.0853314872718 c 0.0,-0.528721110251 0.428613146113,-0.957334256364 0.957334256364,-0.957334256364 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.54266574364,-1.0 l 9.08533148727,0.0 c 0.528721110251,0.0 0.957334256364,0.428613146113 0.957334256364,0.957334256364 l 0.0,0.0853314872718 c 0.0,0.528721110251 -0.428613146113,0.957334256364 -0.957334256364,0.957334256364 l -9.08533148727,0.0 c -0.528721110251,0.0 -0.957334256364,-0.428613146113 -0.957334256364,-0.957334256364 l 0.0,-0.0853314872718 c 0.0,-0.528721110251 0.428613146113,-0.957334256364 0.957334256364,-0.957334256364 Z"
+ android:valueTo="M -3.54375000003,-1.21249999999 l 7.08750000005,0.0 c 0.669645259129,0.0 1.21249999999,0.542854740865 1.21249999999,1.21249999999 l 0.0,0.0 c 0.0,0.669645259129 -0.542854740865,1.21249999999 -1.21249999999,1.21249999999 l -7.08750000005,0.0 c -0.669645259129,0.0 -1.21249999999,-0.542854740865 -1.21249999999,-1.21249999999 l 0.0,0.0 c 0.0,-0.669645259129 0.542854740865,-1.21249999999 1.21249999999,-1.21249999999 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.54375000003,-1.21249999999 l 7.08750000005,0.0 c 0.669645259129,0.0 1.21249999999,0.542854740865 1.21249999999,1.21249999999 l 0.0,0.0 c 0.0,0.669645259129 -0.542854740865,1.21249999999 -1.21249999999,1.21249999999 l -7.08750000005,0.0 c -0.669645259129,0.0 -1.21249999999,-0.542854740865 -1.21249999999,-1.21249999999 l 0.0,0.0 c 0.0,-0.669645259129 0.542854740865,-1.21249999999 1.21249999999,-1.21249999999 Z"
+ android:valueTo="M -1.68627963028,-1.62527119327 l 3.37255926056,0.0 c 0.897612494333,0.0 1.62527119327,0.727658698938 1.62527119327,1.62527119327 l 0.0,0.0 c 0.0,0.897612494333 -0.727658698938,1.62527119327 -1.62527119327,1.62527119327 l -3.37255926056,0.0 c -0.897612494333,0.0 -1.62527119327,-0.727658698938 -1.62527119327,-1.62527119327 l 0.0,0.0 c 0.0,-0.897612494333 0.727658698938,-1.62527119327 1.62527119327,-1.62527119327 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.68627963028,-1.62527119327 l 3.37255926056,0.0 c 0.897612494333,0.0 1.62527119327,0.727658698938 1.62527119327,1.62527119327 l 0.0,0.0 c 0.0,0.897612494333 -0.727658698938,1.62527119327 -1.62527119327,1.62527119327 l -3.37255926056,0.0 c -0.897612494333,0.0 -1.62527119327,-0.727658698938 -1.62527119327,-1.62527119327 l 0.0,0.0 c 0.0,-0.897612494333 0.727658698938,-1.62527119327 1.62527119327,-1.62527119327 Z"
+ android:valueTo="M -0.866611597071,-1.8074196451 l 1.73322319414,0.0 c 0.998210306475,0.0 1.8074196451,0.80920933862 1.8074196451,1.8074196451 l 0.0,0.0 c 0.0,0.998210306475 -0.80920933862,1.8074196451 -1.8074196451,1.8074196451 l -1.73322319414,0.0 c -0.998210306475,0.0 -1.8074196451,-0.80920933862 -1.8074196451,-1.8074196451 l 0.0,0.0 c 0.0,-0.998210306475 0.80920933862,-1.8074196451 1.8074196451,-1.8074196451 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.866611597071,-1.8074196451 l 1.73322319414,0.0 c 0.998210306475,0.0 1.8074196451,0.80920933862 1.8074196451,1.8074196451 l 0.0,0.0 c 0.0,0.998210306475 -0.80920933862,1.8074196451 -1.8074196451,1.8074196451 l -1.73322319414,0.0 c -0.998210306475,0.0 -1.8074196451,-0.80920933862 -1.8074196451,-1.8074196451 l 0.0,0.0 c 0.0,-0.998210306475 0.80920933862,-1.8074196451 1.8074196451,-1.8074196451 Z"
+ android:valueTo="M -0.416762258226,-1.90738616484 l 0.833524516453,0.0 c 1.05342029082,0.0 1.90738616484,0.853965874019 1.90738616484,1.90738616484 l 0.0,0.0 c 0.0,1.05342029082 -0.853965874019,1.90738616484 -1.90738616484,1.90738616484 l -0.833524516453,0.0 c -1.05342029082,0.0 -1.90738616484,-0.853965874019 -1.90738616484,-1.90738616484 l 0.0,0.0 c 0.0,-1.05342029082 0.853965874019,-1.90738616484 1.90738616484,-1.90738616484 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.416762258226,-1.90738616484 l 0.833524516453,0.0 c 1.05342029082,0.0 1.90738616484,0.853965874019 1.90738616484,1.90738616484 l 0.0,0.0 c 0.0,1.05342029082 -0.853965874019,1.90738616484 -1.90738616484,1.90738616484 l -0.833524516453,0.0 c -1.05342029082,0.0 -1.90738616484,-0.853965874019 -1.90738616484,-1.90738616484 l 0.0,0.0 c 0.0,-1.05342029082 0.853965874019,-1.90738616484 1.90738616484,-1.90738616484 Z"
+ android:valueTo="M -0.163643891635,-1.96363469075 l 0.32728778327,0.0 c 1.08448549388,0.0 1.96363469075,0.87914919687 1.96363469075,1.96363469075 l 0.0,0.0 c 0.0,1.08448549388 -0.87914919687,1.96363469075 -1.96363469075,1.96363469075 l -0.32728778327,0.0 c -1.08448549388,0.0 -1.96363469075,-0.87914919687 -1.96363469075,-1.96363469075 l 0.0,0.0 c 0.0,-1.08448549388 0.87914919687,-1.96363469075 1.96363469075,-1.96363469075 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.163643891635,-1.96363469075 l 0.32728778327,0.0 c 1.08448549388,0.0 1.96363469075,0.87914919687 1.96363469075,1.96363469075 l 0.0,0.0 c 0.0,1.08448549388 -0.87914919687,1.96363469075 -1.96363469075,1.96363469075 l -0.32728778327,0.0 c -1.08448549388,0.0 -1.96363469075,-0.87914919687 -1.96363469075,-1.96363469075 l 0.0,0.0 c 0.0,-1.08448549388 0.87914919687,-1.96363469075 1.96363469075,-1.96363469075 Z"
+ android:valueTo="M -0.0368976091105,-1.99180053131 l 0.073795218221,0.0 c 1.10004105809,0.0 1.99180053131,0.891759473223 1.99180053131,1.99180053131 l 0.0,0.0 c 0.0,1.10004105809 -0.891759473223,1.99180053131 -1.99180053131,1.99180053131 l -0.073795218221,0.0 c -1.10004105809,0.0 -1.99180053131,-0.891759473223 -1.99180053131,-1.99180053131 l 0.0,0.0 c 0.0,-1.10004105809 0.891759473223,-1.99180053131 1.99180053131,-1.99180053131 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.0368976091105,-1.99180053131 l 0.073795218221,0.0 c 1.10004105809,0.0 1.99180053131,0.891759473223 1.99180053131,1.99180053131 l 0.0,0.0 c 0.0,1.10004105809 -0.891759473223,1.99180053131 -1.99180053131,1.99180053131 l -0.073795218221,0.0 c -1.10004105809,0.0 -1.99180053131,-0.891759473223 -1.99180053131,-1.99180053131 l 0.0,0.0 c 0.0,-1.10004105809 0.891759473223,-1.99180053131 1.99180053131,-1.99180053131 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_path_2_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_path_2_animation.xml
new file mode 100644
index 0000000..423f8d7
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_path_2_animation.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -4.54266574364,-1.0 l 9.08533148727,0.0 c 0.528721110251,0.0 0.957334256364,0.428613146113 0.957334256364,0.957334256364 l 0.0,0.0853314872718 c 0.0,0.528721110251 -0.428613146113,0.957334256364 -0.957334256364,0.957334256364 l -9.08533148727,0.0 c -0.528721110251,0.0 -0.957334256364,-0.428613146113 -0.957334256364,-0.957334256364 l 0.0,-0.0853314872718 c 0.0,-0.528721110251 0.428613146113,-0.957334256364 0.957334256364,-0.957334256364 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.54266574364,-1.0 l 9.08533148727,0.0 c 0.528721110251,0.0 0.957334256364,0.428613146113 0.957334256364,0.957334256364 l 0.0,0.0853314872718 c 0.0,0.528721110251 -0.428613146113,0.957334256364 -0.957334256364,0.957334256364 l -9.08533148727,0.0 c -0.528721110251,0.0 -0.957334256364,-0.428613146113 -0.957334256364,-0.957334256364 l 0.0,-0.0853314872718 c 0.0,-0.528721110251 0.428613146113,-0.957334256364 0.957334256364,-0.957334256364 Z"
+ android:valueTo="M -2.49262086719,-1.44608425174 l 4.98524173437,0.0 c 0.79865027916,0.0 1.44608425174,0.647433972576 1.44608425174,1.44608425174 l 0.0,0.0 c 0.0,0.79865027916 -0.647433972576,1.44608425174 -1.44608425174,1.44608425174 l -4.98524173437,0.0 c -0.79865027916,0.0 -1.44608425174,-0.647433972576 -1.44608425174,-1.44608425174 l 0.0,0.0 c 0.0,-0.79865027916 0.647433972576,-1.44608425174 1.44608425174,-1.44608425174 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -2.49262086719,-1.44608425174 l 4.98524173437,0.0 c 0.79865027916,0.0 1.44608425174,0.647433972576 1.44608425174,1.44608425174 l 0.0,0.0 c 0.0,0.79865027916 -0.647433972576,1.44608425174 -1.44608425174,1.44608425174 l -4.98524173437,0.0 c -0.79865027916,0.0 -1.44608425174,-0.647433972576 -1.44608425174,-1.44608425174 l 0.0,0.0 c 0.0,-0.79865027916 0.647433972576,-1.44608425174 1.44608425174,-1.44608425174 Z"
+ android:valueTo="M -1.39285008918,-1.69047775796 l 2.78570017836,0.0 c 0.933625085597,0.0 1.69047775796,0.756852672362 1.69047775796,1.69047775796 l 0.0,0.0 c 0.0,0.933625085597 -0.756852672362,1.69047775796 -1.69047775796,1.69047775796 l -2.78570017836,0.0 c -0.933625085597,0.0 -1.69047775796,-0.756852672362 -1.69047775796,-1.69047775796 l 0.0,0.0 c 0.0,-0.933625085597 0.756852672362,-1.69047775796 1.69047775796,-1.69047775796 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.39285008918,-1.69047775796 l 2.78570017836,0.0 c 0.933625085597,0.0 1.69047775796,0.756852672362 1.69047775796,1.69047775796 l 0.0,0.0 c 0.0,0.933625085597 -0.756852672362,1.69047775796 -1.69047775796,1.69047775796 l -2.78570017836,0.0 c -0.933625085597,0.0 -1.69047775796,-0.756852672362 -1.69047775796,-1.69047775796 l 0.0,0.0 c 0.0,-0.933625085597 0.756852672362,-1.69047775796 1.69047775796,-1.69047775796 Z"
+ android:valueTo="M -0.77117021921,-1.82862884018 l 1.54234043842,0.0 c 1.00992382147,0.0 1.82862884018,0.818705018702 1.82862884018,1.82862884018 l 0.0,0.0 c 0.0,1.00992382147 -0.818705018702,1.82862884018 -1.82862884018,1.82862884018 l -1.54234043842,0.0 c -1.00992382147,0.0 -1.82862884018,-0.818705018702 -1.82862884018,-1.82862884018 l 0.0,0.0 c 0.0,-1.00992382147 0.818705018702,-1.82862884018 1.82862884018,-1.82862884018 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.77117021921,-1.82862884018 l 1.54234043842,0.0 c 1.00992382147,0.0 1.82862884018,0.818705018702 1.82862884018,1.82862884018 l 0.0,0.0 c 0.0,1.00992382147 -0.818705018702,1.82862884018 -1.82862884018,1.82862884018 l -1.54234043842,0.0 c -1.00992382147,0.0 -1.82862884018,-0.818705018702 -1.82862884018,-1.82862884018 l 0.0,0.0 c 0.0,-1.00992382147 0.818705018702,-1.82862884018 1.82862884018,-1.82862884018 Z"
+ android:valueTo="M -0.387649645988,-1.91385563422 l 0.775299291975,0.0 c 1.0569932801,0.0 1.91385563422,0.856862354124 1.91385563422,1.91385563422 l 0.0,0.0 c 0.0,1.0569932801 -0.856862354124,1.91385563422 -1.91385563422,1.91385563422 l -0.775299291975,0.0 c -1.0569932801,0.0 -1.91385563422,-0.856862354124 -1.91385563422,-1.91385563422 l 0.0,0.0 c 0.0,-1.0569932801 0.856862354124,-1.91385563422 1.91385563422,-1.91385563422 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.387649645988,-1.91385563422 l 0.775299291975,0.0 c 1.0569932801,0.0 1.91385563422,0.856862354124 1.91385563422,1.91385563422 l 0.0,0.0 c 0.0,1.0569932801 -0.856862354124,1.91385563422 -1.91385563422,1.91385563422 l -0.775299291975,0.0 c -1.0569932801,0.0 -1.91385563422,-0.856862354124 -1.91385563422,-1.91385563422 l 0.0,0.0 c 0.0,-1.0569932801 0.856862354124,-1.91385563422 1.91385563422,-1.91385563422 Z"
+ android:valueTo="M -0.156963485208,-1.96511922551 l 0.313926970417,0.0 c 1.08530537979,0.0 1.96511922551,0.879813845722 1.96511922551,1.96511922551 l 0.0,0.0 c 0.0,1.08530537979 -0.879813845722,1.96511922551 -1.96511922551,1.96511922551 l -0.313926970417,0.0 c -1.08530537979,0.0 -1.96511922551,-0.879813845722 -1.96511922551,-1.96511922551 l 0.0,0.0 c 0.0,-1.08530537979 0.879813845722,-1.96511922551 1.96511922551,-1.96511922551 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.156963485208,-1.96511922551 l 0.313926970417,0.0 c 1.08530537979,0.0 1.96511922551,0.879813845722 1.96511922551,1.96511922551 l 0.0,0.0 c 0.0,1.08530537979 -0.879813845722,1.96511922551 -1.96511922551,1.96511922551 l -0.313926970417,0.0 c -1.08530537979,0.0 -1.96511922551,-0.879813845722 -1.96511922551,-1.96511922551 l 0.0,0.0 c 0.0,-1.08530537979 0.879813845722,-1.96511922551 1.96511922551,-1.96511922551 Z"
+ android:valueTo="M -0.0362224951386,-1.99195055664 l 0.0724449902773,0.0 c 1.10012391479,0.0 1.99195055664,0.89182664185 1.99195055664,1.99195055664 l 0.0,0.0 c 0.0,1.10012391479 -0.89182664185,1.99195055664 -1.99195055664,1.99195055664 l -0.0724449902773,0.0 c -1.10012391479,0.0 -1.99195055664,-0.89182664185 -1.99195055664,-1.99195055664 l 0.0,0.0 c 0.0,-1.10012391479 0.89182664185,-1.99195055664 1.99195055664,-1.99195055664 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.0362224951386,-1.99195055664 l 0.0724449902773,0.0 c 1.10012391479,0.0 1.99195055664,0.89182664185 1.99195055664,1.99195055664 l 0.0,0.0 c 0.0,1.10012391479 -0.89182664185,1.99195055664 -1.99195055664,1.99195055664 l -0.0724449902773,0.0 c -1.10012391479,0.0 -1.99195055664,-0.89182664185 -1.99195055664,-1.99195055664 l 0.0,0.0 c 0.0,-1.10012391479 0.89182664185,-1.99195055664 1.99195055664,-1.99195055664 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_path_3_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_path_3_animation.xml
new file mode 100644
index 0000000..444f6b6
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_path_3_animation.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyName="pathData"
+ android:valueFrom="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -6.04266574364,-1.0 l 12.0853314873,0.0 c 0.528721110251,0.0 0.957334256364,0.428613146113 0.957334256364,0.957334256364 l 0.0,0.0853314872718 c 0.0,0.528721110251 -0.428613146113,0.957334256364 -0.957334256364,0.957334256364 l -12.0853314873,0.0 c -0.528721110251,0.0 -0.957334256364,-0.428613146113 -0.957334256364,-0.957334256364 l 0.0,-0.0853314872718 c 0.0,-0.528721110251 0.428613146113,-0.957334256364 0.957334256364,-0.957334256364 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -6.04266574364,-1.0 l 12.0853314873,0.0 c 0.528721110251,0.0 0.957334256364,0.428613146113 0.957334256364,0.957334256364 l 0.0,0.0853314872718 c 0.0,0.528721110251 -0.428613146113,0.957334256364 -0.957334256364,0.957334256364 l -12.0853314873,0.0 c -0.528721110251,0.0 -0.957334256364,-0.428613146113 -0.957334256364,-0.957334256364 l 0.0,-0.0853314872718 c 0.0,-0.528721110251 0.428613146113,-0.957334256364 0.957334256364,-0.957334256364 Z"
+ android:valueTo="M -3.32349448958,-1.44608425174 l 6.64698897916,0.0 c 0.79865027916,0.0 1.44608425174,0.647433972576 1.44608425174,1.44608425174 l 0.0,0.0 c 0.0,0.79865027916 -0.647433972576,1.44608425174 -1.44608425174,1.44608425174 l -6.64698897916,0.0 c -0.79865027916,0.0 -1.44608425174,-0.647433972576 -1.44608425174,-1.44608425174 l 0.0,0.0 c 0.0,-0.79865027916 0.647433972576,-1.44608425174 1.44608425174,-1.44608425174 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.32349448958,-1.44608425174 l 6.64698897916,0.0 c 0.79865027916,0.0 1.44608425174,0.647433972576 1.44608425174,1.44608425174 l 0.0,0.0 c 0.0,0.79865027916 -0.647433972576,1.44608425174 -1.44608425174,1.44608425174 l -6.64698897916,0.0 c -0.79865027916,0.0 -1.44608425174,-0.647433972576 -1.44608425174,-1.44608425174 l 0.0,0.0 c 0.0,-0.79865027916 0.647433972576,-1.44608425174 1.44608425174,-1.44608425174 Z"
+ android:valueTo="M -1.85713345224,-1.69047775796 l 3.71426690449,0.0 c 0.933625085597,0.0 1.69047775796,0.756852672362 1.69047775796,1.69047775796 l 0.0,0.0 c 0.0,0.933625085597 -0.756852672362,1.69047775796 -1.69047775796,1.69047775796 l -3.71426690449,0.0 c -0.933625085597,0.0 -1.69047775796,-0.756852672362 -1.69047775796,-1.69047775796 l 0.0,0.0 c 0.0,-0.933625085597 0.756852672362,-1.69047775796 1.69047775796,-1.69047775796 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.85713345224,-1.69047775796 l 3.71426690449,0.0 c 0.933625085597,0.0 1.69047775796,0.756852672362 1.69047775796,1.69047775796 l 0.0,0.0 c 0.0,0.933625085597 -0.756852672362,1.69047775796 -1.69047775796,1.69047775796 l -3.71426690449,0.0 c -0.933625085597,0.0 -1.69047775796,-0.756852672362 -1.69047775796,-1.69047775796 l 0.0,0.0 c 0.0,-0.933625085597 0.756852672362,-1.69047775796 1.69047775796,-1.69047775796 Z"
+ android:valueTo="M -1.02822695895,-1.82862884018 l 2.05645391789,0.0 c 1.00992382147,0.0 1.82862884018,0.818705018702 1.82862884018,1.82862884018 l 0.0,0.0 c 0.0,1.00992382147 -0.818705018702,1.82862884018 -1.82862884018,1.82862884018 l -2.05645391789,0.0 c -1.00992382147,0.0 -1.82862884018,-0.818705018702 -1.82862884018,-1.82862884018 l 0.0,0.0 c 0.0,-1.00992382147 0.818705018702,-1.82862884018 1.82862884018,-1.82862884018 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.02822695895,-1.82862884018 l 2.05645391789,0.0 c 1.00992382147,0.0 1.82862884018,0.818705018702 1.82862884018,1.82862884018 l 0.0,0.0 c 0.0,1.00992382147 -0.818705018702,1.82862884018 -1.82862884018,1.82862884018 l -2.05645391789,0.0 c -1.00992382147,0.0 -1.82862884018,-0.818705018702 -1.82862884018,-1.82862884018 l 0.0,0.0 c 0.0,-1.00992382147 0.818705018702,-1.82862884018 1.82862884018,-1.82862884018 Z"
+ android:valueTo="M -0.51686619465,-1.91385563422 l 1.0337323893,0.0 c 1.0569932801,0.0 1.91385563422,0.856862354124 1.91385563422,1.91385563422 l 0.0,0.0 c 0.0,1.0569932801 -0.856862354124,1.91385563422 -1.91385563422,1.91385563422 l -1.0337323893,0.0 c -1.0569932801,0.0 -1.91385563422,-0.856862354124 -1.91385563422,-1.91385563422 l 0.0,0.0 c 0.0,-1.0569932801 0.856862354124,-1.91385563422 1.91385563422,-1.91385563422 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.51686619465,-1.91385563422 l 1.0337323893,0.0 c 1.0569932801,0.0 1.91385563422,0.856862354124 1.91385563422,1.91385563422 l 0.0,0.0 c 0.0,1.0569932801 -0.856862354124,1.91385563422 -1.91385563422,1.91385563422 l -1.0337323893,0.0 c -1.0569932801,0.0 -1.91385563422,-0.856862354124 -1.91385563422,-1.91385563422 l 0.0,0.0 c 0.0,-1.0569932801 0.856862354124,-1.91385563422 1.91385563422,-1.91385563422 Z"
+ android:valueTo="M -0.209284646944,-1.96511922551 l 0.418569293889,0.0 c 1.08530537979,0.0 1.96511922551,0.879813845722 1.96511922551,1.96511922551 l 0.0,0.0 c 0.0,1.08530537979 -0.879813845722,1.96511922551 -1.96511922551,1.96511922551 l -0.418569293889,0.0 c -1.08530537979,0.0 -1.96511922551,-0.879813845722 -1.96511922551,-1.96511922551 l 0.0,0.0 c 0.0,-1.08530537979 0.879813845722,-1.96511922551 1.96511922551,-1.96511922551 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.209284646944,-1.96511922551 l 0.418569293889,0.0 c 1.08530537979,0.0 1.96511922551,0.879813845722 1.96511922551,1.96511922551 l 0.0,0.0 c 0.0,1.08530537979 -0.879813845722,1.96511922551 -1.96511922551,1.96511922551 l -0.418569293889,0.0 c -1.08530537979,0.0 -1.96511922551,-0.879813845722 -1.96511922551,-1.96511922551 l 0.0,0.0 c 0.0,-1.08530537979 0.879813845722,-1.96511922551 1.96511922551,-1.96511922551 Z"
+ android:valueTo="M -0.0482966601849,-1.99195055664 l 0.0965933203697,0.0 c 1.10012391479,0.0 1.99195055664,0.89182664185 1.99195055664,1.99195055664 l 0.0,0.0 c 0.0,1.10012391479 -0.89182664185,1.99195055664 -1.99195055664,1.99195055664 l -0.0965933203697,0.0 c -1.10012391479,0.0 -1.99195055664,-0.89182664185 -1.99195055664,-1.99195055664 l 0.0,0.0 c 0.0,-1.10012391479 0.89182664185,-1.99195055664 1.99195055664,-1.99195055664 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.0482966601849,-1.99195055664 l 0.0965933203697,0.0 c 1.10012391479,0.0 1.99195055664,0.89182664185 1.99195055664,1.99195055664 l 0.0,0.0 c 0.0,1.10012391479 -0.89182664185,1.99195055664 -1.99195055664,1.99195055664 l -0.0965933203697,0.0 c -1.10012391479,0.0 -1.99195055664,-0.89182664185 -1.99195055664,-1.99195055664 l 0.0,0.0 c 0.0,-1.10012391479 0.89182664185,-1.99195055664 1.99195055664,-1.99195055664 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_path_4_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_path_4_animation.xml
new file mode 100644
index 0000000..db294c7
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_path_4_animation.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="100"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="49"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueTo="M -4.0950630677,-1.30952224204 l 8.1901261354,0.0 c 0.177619793131,0.0 0.32160908516,0.143989292029 0.32160908516,0.32160908516 l 0.0,1.97582631376 c 0.0,0.177619793131 -0.143989292029,0.32160908516 -0.32160908516,0.32160908516 l -8.1901261354,0.0 c -0.177619793131,0.0 -0.32160908516,-0.143989292029 -0.32160908516,-0.32160908516 l 0.0,-1.97582631376 c 0.0,-0.177619793131 0.143989292029,-0.32160908516 0.32160908516,-0.32160908516 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.0950630677,-1.30952224204 l 8.1901261354,0.0 c 0.177619793131,0.0 0.32160908516,0.143989292029 0.32160908516,0.32160908516 l 0.0,1.97582631376 c 0.0,0.177619793131 -0.143989292029,0.32160908516 -0.32160908516,0.32160908516 l -8.1901261354,0.0 c -0.177619793131,0.0 -0.32160908516,-0.143989292029 -0.32160908516,-0.32160908516 l 0.0,-1.97582631376 c 0.0,-0.177619793131 0.143989292029,-0.32160908516 0.32160908516,-0.32160908516 Z"
+ android:valueTo="M -5.11454284324,-1.11013061622 l 10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="49"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.11454284324,-1.11013061622 l 10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.41755510258,-1.02355568498 l 10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="49"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.41755510258,-1.02355568498 l 10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_path_5_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_path_5_animation.xml
new file mode 100644
index 0000000..86e4dd6
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_path_5_animation.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="41"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueTo="M -0.510644950991,-1.91489250817 l 1.02128990198,0.0 c 1.05756592977,0.0 1.91489250817,0.857326578401 1.91489250817,1.91489250817 l 0.0,0.0 c 0.0,1.05756592977 -0.857326578401,1.91489250817 -1.91489250817,1.91489250817 l -1.02128990198,0.0 c -1.05756592977,0.0 -1.91489250817,-0.857326578401 -1.91489250817,-1.91489250817 l 0.0,0.0 c 0.0,-1.05756592977 0.857326578401,-1.91489250817 1.91489250817,-1.91489250817 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="41"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.510644950991,-1.91489250817 l 1.02128990198,0.0 c 1.05756592977,0.0 1.91489250817,0.857326578401 1.91489250817,1.91489250817 l 0.0,0.0 c 0.0,1.05756592977 -0.857326578401,1.91489250817 -1.91489250817,1.91489250817 l -1.02128990198,0.0 c -1.05756592977,0.0 -1.91489250817,-0.857326578401 -1.91489250817,-1.91489250817 l 0.0,0.0 c 0.0,-1.05756592977 0.857326578401,-1.91489250817 1.91489250817,-1.91489250817 Z"
+ android:valueTo="M -3.66172292328,-1.54166666667 l 7.32344584656,0.0 c 0.347908322704,0.0 0.629943743386,0.282035420682 0.629943743386,0.629943743386 l 0.0,1.82344584656 c 0.0,0.347908322704 -0.282035420682,0.629943743386 -0.629943743386,0.629943743386 l -7.32344584656,0.0 c -0.347908322704,0.0 -0.629943743386,-0.282035420682 -0.629943743386,-0.629943743386 l 0.0,-1.82344584656 c 0.0,-0.347908322704 0.282035420682,-0.629943743386 0.629943743386,-0.629943743386 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="41"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.66172292328,-1.54166666667 l 7.32344584656,0.0 c 0.347908322704,0.0 0.629943743386,0.282035420682 0.629943743386,0.629943743386 l 0.0,1.82344584656 c 0.0,0.347908322704 -0.282035420682,0.629943743386 -0.629943743386,0.629943743386 l -7.32344584656,0.0 c -0.347908322704,0.0 -0.629943743386,-0.282035420682 -0.629943743386,-0.629943743386 l 0.0,-1.82344584656 c 0.0,-0.347908322704 0.282035420682,-0.629943743386 0.629943743386,-0.629943743386 Z"
+ android:valueTo="M -5.80605656225,-1.22447422869 l 11.6121131245,0.0 c 0.0395282866537,0.0 0.0715722943065,0.0320440076528 0.0715722943065,0.0715722943065 l 0.0,2.30580386877 c 0.0,0.0395282866537 -0.0320440076528,0.0715722943065 -0.0715722943065,0.0715722943065 l -11.6121131245,0.0 c -0.0395282866537,0.0 -0.0715722943065,-0.0320440076528 -0.0715722943065,-0.0715722943065 l 0.0,-2.30580386877 c 0.0,-0.0395282866537 0.0320440076528,-0.0715722943065 0.0715722943065,-0.0715722943065 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="41"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.80605656225,-1.22447422869 l 11.6121131245,0.0 c 0.0395282866537,0.0 0.0715722943065,0.0320440076528 0.0715722943065,0.0715722943065 l 0.0,2.30580386877 c 0.0,0.0395282866537 -0.0320440076528,0.0715722943065 -0.0715722943065,0.0715722943065 l -11.6121131245,0.0 c -0.0395282866537,0.0 -0.0715722943065,-0.0320440076528 -0.0715722943065,-0.0715722943065 l 0.0,-2.30580386877 c 0.0,-0.0395282866537 0.0320440076528,-0.0715722943065 0.0715722943065,-0.0715722943065 Z"
+ android:valueTo="M -6.60386380145,-1.07922723971 l 13.2077276029,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.15845447942 c 0.0,0.0 0.0,0.0 0.0,0.0 l -13.2077276029,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.15845447942 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="41"
+ android:propertyName="pathData"
+ android:valueFrom="M -6.60386380145,-1.07922723971 l 13.2077276029,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.15845447942 c 0.0,0.0 0.0,0.0 0.0,0.0 l -13.2077276029,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.15845447942 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -6.91679014084,-1.01664197183 l 13.8335802817,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.03328394367 c 0.0,0.0 0.0,0.0 0.0,0.0 l -13.8335802817,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.03328394367 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="41"
+ android:propertyName="pathData"
+ android:valueFrom="M -6.91679014084,-1.01664197183 l 13.8335802817,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.03328394367 c 0.0,0.0 0.0,0.0 0.0,0.0 l -13.8335802817,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.03328394367 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_toarrow_rectangle_path_6_animation.xml b/core/res/res/anim/ft_avd_toarrow_rectangle_path_6_animation.xml
new file mode 100644
index 0000000..db294c7
--- /dev/null
+++ b/core/res/res/anim/ft_avd_toarrow_rectangle_path_6_animation.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="100"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="49"
+ android:propertyName="pathData"
+ android:valueFrom="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueTo="M -4.0950630677,-1.30952224204 l 8.1901261354,0.0 c 0.177619793131,0.0 0.32160908516,0.143989292029 0.32160908516,0.32160908516 l 0.0,1.97582631376 c 0.0,0.177619793131 -0.143989292029,0.32160908516 -0.32160908516,0.32160908516 l -8.1901261354,0.0 c -0.177619793131,0.0 -0.32160908516,-0.143989292029 -0.32160908516,-0.32160908516 l 0.0,-1.97582631376 c 0.0,-0.177619793131 0.143989292029,-0.32160908516 0.32160908516,-0.32160908516 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.0950630677,-1.30952224204 l 8.1901261354,0.0 c 0.177619793131,0.0 0.32160908516,0.143989292029 0.32160908516,0.32160908516 l 0.0,1.97582631376 c 0.0,0.177619793131 -0.143989292029,0.32160908516 -0.32160908516,0.32160908516 l -8.1901261354,0.0 c -0.177619793131,0.0 -0.32160908516,-0.143989292029 -0.32160908516,-0.32160908516 l 0.0,-1.97582631376 c 0.0,-0.177619793131 0.143989292029,-0.32160908516 0.32160908516,-0.32160908516 Z"
+ android:valueTo="M -5.11454284324,-1.11013061622 l 10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="49"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.11454284324,-1.11013061622 l 10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.2290856865,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.22026123243 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.41755510258,-1.02355568498 l 10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="49"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.41755510258,-1.02355568498 l 10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.8351102052,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.04711136995 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_1_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_1_animation.xml
new file mode 100644
index 0000000..3869ced
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_1_animation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="400"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -6.5,0.0 c 1.08333,-1.0 5.41667,-5.0 6.5,-6.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="400"
+ android:propertyName="rotation"
+ android:valueFrom="-45.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_1_pivot_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_1_pivot_animation.xml
new file mode 100644
index 0000000..90010a75
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_1_pivot_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 4.5,0.0 c -0.75,0.0 -3.75,0.0 -4.5,0.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_2_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_2_animation.xml
new file mode 100644
index 0000000..b5e031e
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_2_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -8.0,0.0 c 1.33333,0.0 6.66667,0.0 8.0,0.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_2_pivot_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_2_pivot_animation.xml
new file mode 100644
index 0000000..55c72c6e
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_2_pivot_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="216"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 9.0,0.0 c -1.5,0.0 -7.5,0.0 -9.0,0.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_3_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_3_animation.xml
new file mode 100644
index 0000000..0524f2a
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_3_animation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="400"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M -6.5,0.0 c 1.08333,1.0 5.41667,5.0 6.5,6.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="400"
+ android:propertyName="rotation"
+ android:valueFrom="45.0"
+ android:valueTo="0.0"
+ android:valueType="floatType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_3_pivot_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_3_pivot_animation.xml
new file mode 100644
index 0000000..90010a75
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_3_pivot_animation.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <objectAnimator
+ android:duration="300"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:pathData="M 4.5,0.0 c -0.75,0.0 -3.75,0.0 -4.5,0.0"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_path_1_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_path_1_animation.xml
new file mode 100644
index 0000000..ced8cf5
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_path_1_animation.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.349609375,-1.04296875 l 10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.349609375,-1.04296875 l 10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -4.57327108594,-1.25 l 9.14654217189,0.0 c 0.0285690903566,0.0 0.0517289140556,0.023159823699 0.0517289140556,0.0517289140556 l 0.0,2.39654217189 c 0.0,0.0285690903566 -0.023159823699,0.0517289140556 -0.0517289140556,0.0517289140556 l -9.14654217189,0.0 c -0.0285690903566,0.0 -0.0517289140556,-0.023159823699 -0.0517289140556,-0.0517289140556 l 0.0,-2.39654217189 c 0.0,-0.0285690903566 0.023159823699,-0.0517289140556 0.0517289140556,-0.0517289140556 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.57327108594,-1.25 l 9.14654217189,0.0 c 0.0285690903566,0.0 0.0517289140556,0.023159823699 0.0517289140556,0.0517289140556 l 0.0,2.39654217189 c 0.0,0.0285690903566 -0.023159823699,0.0517289140556 -0.0517289140556,0.0517289140556 l -9.14654217189,0.0 c -0.0285690903566,0.0 -0.0517289140556,-0.023159823699 -0.0517289140556,-0.0517289140556 l 0.0,-2.39654217189 c 0.0,-0.0285690903566 0.023159823699,-0.0517289140556 0.0517289140556,-0.0517289140556 Z"
+ android:valueTo="M -3.04137381938,-1.55960748018 l 6.08274763876,0.0 c 0.2761423749,0.0 0.5,0.2238576251 0.5,0.5 l 0.0,2.11921496035 c 0.0,0.2761423749 -0.2238576251,0.5 -0.5,0.5 l -6.08274763876,0.0 c -0.2761423749,0.0 -0.5,-0.2238576251 -0.5,-0.5 l 0.0,-2.11921496035 c 0.0,-0.2761423749 0.2238576251,-0.5 0.5,-0.5 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.04137381938,-1.55960748018 l 6.08274763876,0.0 c 0.2761423749,0.0 0.5,0.2238576251 0.5,0.5 l 0.0,2.11921496035 c 0.0,0.2761423749 -0.2238576251,0.5 -0.5,0.5 l -6.08274763876,0.0 c -0.2761423749,0.0 -0.5,-0.2238576251 -0.5,-0.5 l 0.0,-2.11921496035 c 0.0,-0.2761423749 0.2238576251,-0.5 0.5,-0.5 Z"
+ android:valueTo="M -1.55858989728,-1.77552577131 l 3.11717979456,0.0 c 0.677691994437,0.0 1.22706990313,0.549377908693 1.22706990313,1.22706990313 l 0.0,1.09691173636 c 0.0,0.677691994437 -0.549377908693,1.22706990313 -1.22706990313,1.22706990313 l -3.11717979456,0.0 c -0.677691994437,0.0 -1.22706990313,-0.549377908693 -1.22706990313,-1.22706990313 l 0.0,-1.09691173636 c 0.0,-0.677691994437 0.549377908693,-1.22706990313 1.22706990313,-1.22706990313 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.55858989728,-1.77552577131 l 3.11717979456,0.0 c 0.677691994437,0.0 1.22706990313,0.549377908693 1.22706990313,1.22706990313 l 0.0,1.09691173636 c 0.0,0.677691994437 -0.549377908693,1.22706990313 -1.22706990313,1.22706990313 l -3.11717979456,0.0 c -0.677691994437,0.0 -1.22706990313,-0.549377908693 -1.22706990313,-1.22706990313 l 0.0,-1.09691173636 c 0.0,-0.677691994437 0.549377908693,-1.22706990313 1.22706990313,-1.22706990313 Z"
+ android:valueTo="M -0.706008791281,-1.89447268498 l 1.41201758256,0.0 c 0.918635554655,0.0 1.66333681129,0.744701256633 1.66333681129,1.66333681129 l 0.0,0.462271747384 c 0.0,0.918635554655 -0.744701256633,1.66333681129 -1.66333681129,1.66333681129 l -1.41201758256,0.0 c -0.918635554655,0.0 -1.66333681129,-0.744701256633 -1.66333681129,-1.66333681129 l 0.0,-0.462271747384 c 0.0,-0.918635554655 0.744701256633,-1.66333681129 1.66333681129,-1.66333681129 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.706008791281,-1.89447268498 l 1.41201758256,0.0 c 0.918635554655,0.0 1.66333681129,0.744701256633 1.66333681129,1.66333681129 l 0.0,0.462271747384 c 0.0,0.918635554655 -0.744701256633,1.66333681129 -1.66333681129,1.66333681129 l -1.41201758256,0.0 c -0.918635554655,0.0 -1.66333681129,-0.744701256633 -1.66333681129,-1.66333681129 l 0.0,-0.462271747384 c 0.0,-0.918635554655 0.744701256633,-1.66333681129 1.66333681129,-1.66333681129 Z"
+ android:valueTo="M -0.265730251554,-1.95936709392 l 0.531460503108,0.0 c 1.03635400439,0.0 1.87648491973,0.840130915331 1.87648491973,1.87648491973 l 0.0,0.165764348389 c 0.0,1.03635400439 -0.840130915331,1.87648491973 -1.87648491973,1.87648491973 l -0.531460503108,0.0 c -1.03635400439,0.0 -1.87648491973,-0.840130915331 -1.87648491973,-1.87648491973 l 0.0,-0.165764348389 c 0.0,-1.03635400439 0.840130915331,-1.87648491973 1.87648491973,-1.87648491973 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.265730251554,-1.95936709392 l 0.531460503108,0.0 c 1.03635400439,0.0 1.87648491973,0.840130915331 1.87648491973,1.87648491973 l 0.0,0.165764348389 c 0.0,1.03635400439 -0.840130915331,1.87648491973 -1.87648491973,1.87648491973 l -0.531460503108,0.0 c -1.03635400439,0.0 -1.87648491973,-0.840130915331 -1.87648491973,-1.87648491973 l 0.0,-0.165764348389 c 0.0,-1.03635400439 0.840130915331,-1.87648491973 1.87648491973,-1.87648491973 Z"
+ android:valueTo="M -0.0581061000545,-1.99098433926 l 0.116212200109,0.0 c 1.08990562844,0.0 1.97344871252,0.883543084083 1.97344871252,1.97344871252 l 0.0,0.0350712534878 c 0.0,1.08990562844 -0.883543084083,1.97344871252 -1.97344871252,1.97344871252 l -0.116212200109,0.0 c -1.08990562844,0.0 -1.97344871252,-0.883543084083 -1.97344871252,-1.97344871252 l 0.0,-0.0350712534878 c 0.0,-1.08990562844 0.883543084083,-1.97344871252 1.97344871252,-1.97344871252 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.0581061000545,-1.99098433926 l 0.116212200109,0.0 c 1.08990562844,0.0 1.97344871252,0.883543084083 1.97344871252,1.97344871252 l 0.0,0.0350712534878 c 0.0,1.08990562844 -0.883543084083,1.97344871252 -1.97344871252,1.97344871252 l -0.116212200109,0.0 c -1.08990562844,0.0 -1.97344871252,-0.883543084083 -1.97344871252,-1.97344871252 l 0.0,-0.0350712534878 c 0.0,-1.08990562844 0.883543084083,-1.97344871252 1.97344871252,-1.97344871252 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_path_2_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_path_2_animation.xml
new file mode 100644
index 0000000..ced8cf5
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_path_2_animation.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -5.349609375,-1.04296875 l 10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -5.349609375,-1.04296875 l 10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 l -10.69921875,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0859375 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -4.57327108594,-1.25 l 9.14654217189,0.0 c 0.0285690903566,0.0 0.0517289140556,0.023159823699 0.0517289140556,0.0517289140556 l 0.0,2.39654217189 c 0.0,0.0285690903566 -0.023159823699,0.0517289140556 -0.0517289140556,0.0517289140556 l -9.14654217189,0.0 c -0.0285690903566,0.0 -0.0517289140556,-0.023159823699 -0.0517289140556,-0.0517289140556 l 0.0,-2.39654217189 c 0.0,-0.0285690903566 0.023159823699,-0.0517289140556 0.0517289140556,-0.0517289140556 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.57327108594,-1.25 l 9.14654217189,0.0 c 0.0285690903566,0.0 0.0517289140556,0.023159823699 0.0517289140556,0.0517289140556 l 0.0,2.39654217189 c 0.0,0.0285690903566 -0.023159823699,0.0517289140556 -0.0517289140556,0.0517289140556 l -9.14654217189,0.0 c -0.0285690903566,0.0 -0.0517289140556,-0.023159823699 -0.0517289140556,-0.0517289140556 l 0.0,-2.39654217189 c 0.0,-0.0285690903566 0.023159823699,-0.0517289140556 0.0517289140556,-0.0517289140556 Z"
+ android:valueTo="M -3.04137381938,-1.55960748018 l 6.08274763876,0.0 c 0.2761423749,0.0 0.5,0.2238576251 0.5,0.5 l 0.0,2.11921496035 c 0.0,0.2761423749 -0.2238576251,0.5 -0.5,0.5 l -6.08274763876,0.0 c -0.2761423749,0.0 -0.5,-0.2238576251 -0.5,-0.5 l 0.0,-2.11921496035 c 0.0,-0.2761423749 0.2238576251,-0.5 0.5,-0.5 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -3.04137381938,-1.55960748018 l 6.08274763876,0.0 c 0.2761423749,0.0 0.5,0.2238576251 0.5,0.5 l 0.0,2.11921496035 c 0.0,0.2761423749 -0.2238576251,0.5 -0.5,0.5 l -6.08274763876,0.0 c -0.2761423749,0.0 -0.5,-0.2238576251 -0.5,-0.5 l 0.0,-2.11921496035 c 0.0,-0.2761423749 0.2238576251,-0.5 0.5,-0.5 Z"
+ android:valueTo="M -1.55858989728,-1.77552577131 l 3.11717979456,0.0 c 0.677691994437,0.0 1.22706990313,0.549377908693 1.22706990313,1.22706990313 l 0.0,1.09691173636 c 0.0,0.677691994437 -0.549377908693,1.22706990313 -1.22706990313,1.22706990313 l -3.11717979456,0.0 c -0.677691994437,0.0 -1.22706990313,-0.549377908693 -1.22706990313,-1.22706990313 l 0.0,-1.09691173636 c 0.0,-0.677691994437 0.549377908693,-1.22706990313 1.22706990313,-1.22706990313 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.55858989728,-1.77552577131 l 3.11717979456,0.0 c 0.677691994437,0.0 1.22706990313,0.549377908693 1.22706990313,1.22706990313 l 0.0,1.09691173636 c 0.0,0.677691994437 -0.549377908693,1.22706990313 -1.22706990313,1.22706990313 l -3.11717979456,0.0 c -0.677691994437,0.0 -1.22706990313,-0.549377908693 -1.22706990313,-1.22706990313 l 0.0,-1.09691173636 c 0.0,-0.677691994437 0.549377908693,-1.22706990313 1.22706990313,-1.22706990313 Z"
+ android:valueTo="M -0.706008791281,-1.89447268498 l 1.41201758256,0.0 c 0.918635554655,0.0 1.66333681129,0.744701256633 1.66333681129,1.66333681129 l 0.0,0.462271747384 c 0.0,0.918635554655 -0.744701256633,1.66333681129 -1.66333681129,1.66333681129 l -1.41201758256,0.0 c -0.918635554655,0.0 -1.66333681129,-0.744701256633 -1.66333681129,-1.66333681129 l 0.0,-0.462271747384 c 0.0,-0.918635554655 0.744701256633,-1.66333681129 1.66333681129,-1.66333681129 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.706008791281,-1.89447268498 l 1.41201758256,0.0 c 0.918635554655,0.0 1.66333681129,0.744701256633 1.66333681129,1.66333681129 l 0.0,0.462271747384 c 0.0,0.918635554655 -0.744701256633,1.66333681129 -1.66333681129,1.66333681129 l -1.41201758256,0.0 c -0.918635554655,0.0 -1.66333681129,-0.744701256633 -1.66333681129,-1.66333681129 l 0.0,-0.462271747384 c 0.0,-0.918635554655 0.744701256633,-1.66333681129 1.66333681129,-1.66333681129 Z"
+ android:valueTo="M -0.265730251554,-1.95936709392 l 0.531460503108,0.0 c 1.03635400439,0.0 1.87648491973,0.840130915331 1.87648491973,1.87648491973 l 0.0,0.165764348389 c 0.0,1.03635400439 -0.840130915331,1.87648491973 -1.87648491973,1.87648491973 l -0.531460503108,0.0 c -1.03635400439,0.0 -1.87648491973,-0.840130915331 -1.87648491973,-1.87648491973 l 0.0,-0.165764348389 c 0.0,-1.03635400439 0.840130915331,-1.87648491973 1.87648491973,-1.87648491973 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.265730251554,-1.95936709392 l 0.531460503108,0.0 c 1.03635400439,0.0 1.87648491973,0.840130915331 1.87648491973,1.87648491973 l 0.0,0.165764348389 c 0.0,1.03635400439 -0.840130915331,1.87648491973 -1.87648491973,1.87648491973 l -0.531460503108,0.0 c -1.03635400439,0.0 -1.87648491973,-0.840130915331 -1.87648491973,-1.87648491973 l 0.0,-0.165764348389 c 0.0,-1.03635400439 0.840130915331,-1.87648491973 1.87648491973,-1.87648491973 Z"
+ android:valueTo="M -0.0581061000545,-1.99098433926 l 0.116212200109,0.0 c 1.08990562844,0.0 1.97344871252,0.883543084083 1.97344871252,1.97344871252 l 0.0,0.0350712534878 c 0.0,1.08990562844 -0.883543084083,1.97344871252 -1.97344871252,1.97344871252 l -0.116212200109,0.0 c -1.08990562844,0.0 -1.97344871252,-0.883543084083 -1.97344871252,-1.97344871252 l 0.0,-0.0350712534878 c 0.0,-1.08990562844 0.883543084083,-1.97344871252 1.97344871252,-1.97344871252 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.0581061000545,-1.99098433926 l 0.116212200109,0.0 c 1.08990562844,0.0 1.97344871252,0.883543084083 1.97344871252,1.97344871252 l 0.0,0.0350712534878 c 0.0,1.08990562844 -0.883543084083,1.97344871252 -1.97344871252,1.97344871252 l -0.116212200109,0.0 c -1.08990562844,0.0 -1.97344871252,-0.883543084083 -1.97344871252,-1.97344871252 l 0.0,-0.0350712534878 c 0.0,-1.08990562844 0.883543084083,-1.97344871252 1.97344871252,-1.97344871252 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/anim/ft_avd_tooverflow_rectangle_path_3_animation.xml b/core/res/res/anim/ft_avd_tooverflow_rectangle_path_3_animation.xml
new file mode 100644
index 0000000..cb29410
--- /dev/null
+++ b/core/res/res/anim/ft_avd_tooverflow_rectangle_path_3_animation.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<set
+ xmlns:android="http://schemas.android.com/apk/res/android" >
+ <set
+ android:ordering="sequentially" >
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="pathData"
+ android:valueFrom="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
+ android:valueTo="M -4.36843359242,-1.49992262412 l 8.73686718484,0.0 c 0.0728757880921,0.0 0.131953286993,0.0590774989007 0.131953286993,0.131953286993 l 0.0,2.73593867425 c 0.0,0.0728757880921 -0.0590774989007,0.131953286993 -0.131953286993,0.131953286993 l -8.73686718484,0.0 c -0.0728757880921,0.0 -0.131953286993,-0.0590774989007 -0.131953286993,-0.131953286993 l 0.0,-2.73593867425 c 0.0,-0.0728757880921 0.0590774989007,-0.131953286993 0.131953286993,-0.131953286993 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -4.36843359242,-1.49992262412 l 8.73686718484,0.0 c 0.0728757880921,0.0 0.131953286993,0.0590774989007 0.131953286993,0.131953286993 l 0.0,2.73593867425 c 0.0,0.0728757880921 -0.0590774989007,0.131953286993 -0.131953286993,0.131953286993 l -8.73686718484,0.0 c -0.0728757880921,0.0 -0.131953286993,-0.0590774989007 -0.131953286993,-0.131953286993 l 0.0,-2.73593867425 c 0.0,-0.0728757880921 0.0590774989007,-0.131953286993 0.131953286993,-0.131953286993 Z"
+ android:valueTo="M -2.7976112102,-1.69047775796 l 5.59522242041,0.0 c 0.41421356235,0.0 0.75,0.33578643765 0.75,0.75 l 0.0,1.88095551592 c 0.0,0.41421356235 -0.33578643765,0.75 -0.75,0.75 l -5.59522242041,0.0 c -0.41421356235,0.0 -0.75,-0.33578643765 -0.75,-0.75 l 0.0,-1.88095551592 c 0.0,-0.41421356235 0.33578643765,-0.75 0.75,-0.75 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -2.7976112102,-1.69047775796 l 5.59522242041,0.0 c 0.41421356235,0.0 0.75,0.33578643765 0.75,0.75 l 0.0,1.88095551592 c 0.0,0.41421356235 -0.33578643765,0.75 -0.75,0.75 l -5.59522242041,0.0 c -0.41421356235,0.0 -0.75,-0.33578643765 -0.75,-0.75 l 0.0,-1.88095551592 c 0.0,-0.41421356235 0.33578643765,-0.75 0.75,-0.75 Z"
+ android:valueTo="M -1.5412962309,-1.81003891076 l 3.08259246181,0.0 c 0.777898159561,0.0 1.4085092153,0.630611055735 1.4085092153,1.4085092153 l 0.0,0.803059390927 c 0.0,0.777898159561 -0.630611055735,1.4085092153 -1.4085092153,1.4085092153 l -3.08259246181,0.0 c -0.777898159561,0.0 -1.4085092153,-0.630611055735 -1.4085092153,-1.4085092153 l 0.0,-0.803059390927 c 0.0,-0.777898159561 0.630611055735,-1.4085092153 1.4085092153,-1.4085092153 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -1.5412962309,-1.81003891076 l 3.08259246181,0.0 c 0.777898159561,0.0 1.4085092153,0.630611055735 1.4085092153,1.4085092153 l 0.0,0.803059390927 c 0.0,0.777898159561 -0.630611055735,1.4085092153 -1.4085092153,1.4085092153 l -3.08259246181,0.0 c -0.777898159561,0.0 -1.4085092153,-0.630611055735 -1.4085092153,-1.4085092153 l 0.0,-0.803059390927 c 0.0,-0.777898159561 0.630611055735,-1.4085092153 1.4085092153,-1.4085092153 Z"
+ android:valueTo="M -0.798718330914,-1.88987363368 l 1.59743666183,0.0 c 0.967555109393,0.0 1.75191350068,0.784358391285 1.75191350068,1.75191350068 l 0.0,0.275920266008 c 0.0,0.967555109393 -0.784358391285,1.75191350068 -1.75191350068,1.75191350068 l -1.59743666183,0.0 c -0.967555109393,0.0 -1.75191350068,-0.784358391285 -1.75191350068,-1.75191350068 l 0.0,-0.275920266008 c 0.0,-0.967555109393 0.784358391285,-1.75191350068 1.75191350068,-1.75191350068 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.798718330914,-1.88987363368 l 1.59743666183,0.0 c 0.967555109393,0.0 1.75191350068,0.784358391285 1.75191350068,1.75191350068 l 0.0,0.275920266008 c 0.0,0.967555109393 -0.784358391285,1.75191350068 -1.75191350068,1.75191350068 l -1.59743666183,0.0 c -0.967555109393,0.0 -1.75191350068,-0.784358391285 -1.75191350068,-1.75191350068 l 0.0,-0.275920266008 c 0.0,-0.967555109393 0.784358391285,-1.75191350068 1.75191350068,-1.75191350068 Z"
+ android:valueTo="M -0.366220962052,-1.94300934217 l 0.732441924103,0.0 c 1.05968660322,0.0 1.91873232712,0.859045723904 1.91873232712,1.91873232712 l 0.0,0.0485540300878 c 0.0,1.05968660322 -0.859045723904,1.91873232712 -1.91873232712,1.91873232712 l -0.732441924103,0.0 c -1.05968660322,0.0 -1.91873232712,-0.859045723904 -1.91873232712,-1.91873232712 l 0.0,-0.0485540300878 c 0.0,-1.05968660322 0.859045723904,-1.91873232712 1.91873232712,-1.91873232712 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.366220962052,-1.94300934217 l 0.732441924103,0.0 c 1.05968660322,0.0 1.91873232712,0.859045723904 1.91873232712,1.91873232712 l 0.0,0.0485540300878 c 0.0,1.05968660322 -0.859045723904,1.91873232712 -1.91873232712,1.91873232712 l -0.732441924103,0.0 c -1.05968660322,0.0 -1.91873232712,-0.859045723904 -1.91873232712,-1.91873232712 l 0.0,-0.0485540300878 c 0.0,-1.05968660322 0.859045723904,-1.91873232712 1.91873232712,-1.91873232712 Z"
+ android:valueTo="M -0.141334109858,-1.97644431502 l 0.282668219716,0.0 c 1.09156005402,0.0 1.97644431502,0.884884261007 1.97644431502,1.97644431502 l 0.0,0.0 c 0.0,1.09156005402 -0.884884261007,1.97644431502 -1.97644431502,1.97644431502 l -0.282668219716,0.0 c -1.09156005402,0.0 -1.97644431502,-0.884884261007 -1.97644431502,-1.97644431502 l 0.0,0.0 c 0.0,-1.09156005402 0.884884261007,-1.97644431502 1.97644431502,-1.97644431502 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.141334109858,-1.97644431502 l 0.282668219716,0.0 c 1.09156005402,0.0 1.97644431502,0.884884261007 1.97644431502,1.97644431502 l 0.0,0.0 c 0.0,1.09156005402 -0.884884261007,1.97644431502 -1.97644431502,1.97644431502 l -0.282668219716,0.0 c -1.09156005402,0.0 -1.97644431502,-0.884884261007 -1.97644431502,-1.97644431502 l 0.0,0.0 c 0.0,-1.09156005402 0.884884261007,-1.97644431502 1.97644431502,-1.97644431502 Z"
+ android:valueTo="M -0.0331287849506,-1.99447853584 l 0.0662575699012,0.0 c 1.10152007915,0.0 1.99447853584,0.892958456693 1.99447853584,1.99447853584 l 0.0,0.0 c 0.0,1.10152007915 -0.892958456693,1.99447853584 -1.99447853584,1.99447853584 l -0.0662575699012,0.0 c -1.10152007915,0.0 -1.99447853584,-0.892958456693 -1.99447853584,-1.99447853584 l 0.0,0.0 c 0.0,-1.10152007915 0.892958456693,-1.99447853584 1.99447853584,-1.99447853584 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ <objectAnimator
+ android:duration="37"
+ android:propertyName="pathData"
+ android:valueFrom="M -0.0331287849506,-1.99447853584 l 0.0662575699012,0.0 c 1.10152007915,0.0 1.99447853584,0.892958456693 1.99447853584,1.99447853584 l 0.0,0.0 c 0.0,1.10152007915 -0.892958456693,1.99447853584 -1.99447853584,1.99447853584 l -0.0662575699012,0.0 c -1.10152007915,0.0 -1.99447853584,-0.892958456693 -1.99447853584,-1.99447853584 l 0.0,0.0 c 0.0,-1.10152007915 0.892958456693,-1.99447853584 1.99447853584,-1.99447853584 Z"
+ android:valueTo="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/linear" />
+ </set>
+</set>
diff --git a/core/res/res/drawable-mdpi/pointer_wait_0.png b/core/res/res/drawable-mdpi/pointer_wait_0.png
new file mode 100644
index 0000000..adb7806
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_0.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_1.png b/core/res/res/drawable-mdpi/pointer_wait_1.png
new file mode 100644
index 0000000..fc6b42f
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_1.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_10.png b/core/res/res/drawable-mdpi/pointer_wait_10.png
new file mode 100644
index 0000000..02968b5
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_10.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_11.png b/core/res/res/drawable-mdpi/pointer_wait_11.png
new file mode 100644
index 0000000..24f866b
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_11.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_12.png b/core/res/res/drawable-mdpi/pointer_wait_12.png
new file mode 100644
index 0000000..d1a31bc
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_12.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_13.png b/core/res/res/drawable-mdpi/pointer_wait_13.png
new file mode 100644
index 0000000..b0c6798
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_13.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_14.png b/core/res/res/drawable-mdpi/pointer_wait_14.png
new file mode 100644
index 0000000..721e86d
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_14.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_15.png b/core/res/res/drawable-mdpi/pointer_wait_15.png
new file mode 100644
index 0000000..adb0199
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_15.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_16.png b/core/res/res/drawable-mdpi/pointer_wait_16.png
new file mode 100644
index 0000000..3695c18
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_16.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_17.png b/core/res/res/drawable-mdpi/pointer_wait_17.png
new file mode 100644
index 0000000..861605e
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_17.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_18.png b/core/res/res/drawable-mdpi/pointer_wait_18.png
new file mode 100644
index 0000000..f5dfdcf
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_18.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_19.png b/core/res/res/drawable-mdpi/pointer_wait_19.png
new file mode 100644
index 0000000..9d51f79
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_19.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_2.png b/core/res/res/drawable-mdpi/pointer_wait_2.png
new file mode 100644
index 0000000..d73a154
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_2.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_20.png b/core/res/res/drawable-mdpi/pointer_wait_20.png
new file mode 100644
index 0000000..81d1d51
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_20.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_21.png b/core/res/res/drawable-mdpi/pointer_wait_21.png
new file mode 100644
index 0000000..331820b
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_21.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_22.png b/core/res/res/drawable-mdpi/pointer_wait_22.png
new file mode 100644
index 0000000..2678d32
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_22.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_23.png b/core/res/res/drawable-mdpi/pointer_wait_23.png
new file mode 100644
index 0000000..d54d9eb
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_23.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_24.png b/core/res/res/drawable-mdpi/pointer_wait_24.png
new file mode 100644
index 0000000..442ace7
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_24.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_25.png b/core/res/res/drawable-mdpi/pointer_wait_25.png
new file mode 100644
index 0000000..27ce60d
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_25.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_26.png b/core/res/res/drawable-mdpi/pointer_wait_26.png
new file mode 100644
index 0000000..8143634
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_26.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_27.png b/core/res/res/drawable-mdpi/pointer_wait_27.png
new file mode 100644
index 0000000..496ab9a
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_27.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_28.png b/core/res/res/drawable-mdpi/pointer_wait_28.png
new file mode 100644
index 0000000..a2aab2b
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_28.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_29.png b/core/res/res/drawable-mdpi/pointer_wait_29.png
new file mode 100644
index 0000000..646d153
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_29.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_3.png b/core/res/res/drawable-mdpi/pointer_wait_3.png
new file mode 100644
index 0000000..9f45afe
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_3.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_30.png b/core/res/res/drawable-mdpi/pointer_wait_30.png
new file mode 100644
index 0000000..27b3fc4
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_30.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_31.png b/core/res/res/drawable-mdpi/pointer_wait_31.png
new file mode 100644
index 0000000..6dbe184
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_31.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_32.png b/core/res/res/drawable-mdpi/pointer_wait_32.png
new file mode 100644
index 0000000..9f072ef
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_32.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_33.png b/core/res/res/drawable-mdpi/pointer_wait_33.png
new file mode 100644
index 0000000..881ec5f
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_33.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_34.png b/core/res/res/drawable-mdpi/pointer_wait_34.png
new file mode 100644
index 0000000..94961e3
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_34.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_35.png b/core/res/res/drawable-mdpi/pointer_wait_35.png
new file mode 100644
index 0000000..dfa65d7
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_35.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_4.png b/core/res/res/drawable-mdpi/pointer_wait_4.png
new file mode 100644
index 0000000..5d3d652
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_4.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_5.png b/core/res/res/drawable-mdpi/pointer_wait_5.png
new file mode 100644
index 0000000..d440a82
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_5.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_6.png b/core/res/res/drawable-mdpi/pointer_wait_6.png
new file mode 100644
index 0000000..ae65590
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_6.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_7.png b/core/res/res/drawable-mdpi/pointer_wait_7.png
new file mode 100644
index 0000000..cd84aa5
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_7.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_8.png b/core/res/res/drawable-mdpi/pointer_wait_8.png
new file mode 100644
index 0000000..0b81a9a
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_8.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/pointer_wait_9.png b/core/res/res/drawable-mdpi/pointer_wait_9.png
new file mode 100644
index 0000000..c13a90c
--- /dev/null
+++ b/core/res/res/drawable-mdpi/pointer_wait_9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_0.png b/core/res/res/drawable-xhdpi/pointer_wait_0.png
new file mode 100644
index 0000000..5396784
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_0.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_1.png b/core/res/res/drawable-xhdpi/pointer_wait_1.png
new file mode 100644
index 0000000..25edbf5
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_1.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_10.png b/core/res/res/drawable-xhdpi/pointer_wait_10.png
new file mode 100644
index 0000000..96d93a9
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_10.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_11.png b/core/res/res/drawable-xhdpi/pointer_wait_11.png
new file mode 100644
index 0000000..cd78675
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_11.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_12.png b/core/res/res/drawable-xhdpi/pointer_wait_12.png
new file mode 100644
index 0000000..1b2c7b2
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_12.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_13.png b/core/res/res/drawable-xhdpi/pointer_wait_13.png
new file mode 100644
index 0000000..3b00f10
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_13.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_14.png b/core/res/res/drawable-xhdpi/pointer_wait_14.png
new file mode 100644
index 0000000..eca5c3f
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_14.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_15.png b/core/res/res/drawable-xhdpi/pointer_wait_15.png
new file mode 100644
index 0000000..0fc2085
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_15.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_16.png b/core/res/res/drawable-xhdpi/pointer_wait_16.png
new file mode 100644
index 0000000..db13cf6
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_16.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_17.png b/core/res/res/drawable-xhdpi/pointer_wait_17.png
new file mode 100644
index 0000000..9b6fac5
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_17.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_18.png b/core/res/res/drawable-xhdpi/pointer_wait_18.png
new file mode 100644
index 0000000..c56ff6c
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_18.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_19.png b/core/res/res/drawable-xhdpi/pointer_wait_19.png
new file mode 100644
index 0000000..22b7c90
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_19.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_2.png b/core/res/res/drawable-xhdpi/pointer_wait_2.png
new file mode 100644
index 0000000..4bdbe3f
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_2.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_20.png b/core/res/res/drawable-xhdpi/pointer_wait_20.png
new file mode 100644
index 0000000..6d042fb
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_20.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_21.png b/core/res/res/drawable-xhdpi/pointer_wait_21.png
new file mode 100644
index 0000000..e3ab63f
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_21.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_22.png b/core/res/res/drawable-xhdpi/pointer_wait_22.png
new file mode 100644
index 0000000..b25f6b7d
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_22.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_23.png b/core/res/res/drawable-xhdpi/pointer_wait_23.png
new file mode 100644
index 0000000..49faba9
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_23.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_24.png b/core/res/res/drawable-xhdpi/pointer_wait_24.png
new file mode 100644
index 0000000..e91c340
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_24.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_25.png b/core/res/res/drawable-xhdpi/pointer_wait_25.png
new file mode 100644
index 0000000..f4785c6
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_25.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_26.png b/core/res/res/drawable-xhdpi/pointer_wait_26.png
new file mode 100644
index 0000000..ea902f8
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_26.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_27.png b/core/res/res/drawable-xhdpi/pointer_wait_27.png
new file mode 100644
index 0000000..7d628c3
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_27.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_28.png b/core/res/res/drawable-xhdpi/pointer_wait_28.png
new file mode 100644
index 0000000..92d6dc1
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_28.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_29.png b/core/res/res/drawable-xhdpi/pointer_wait_29.png
new file mode 100644
index 0000000..5a8d189
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_29.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_3.png b/core/res/res/drawable-xhdpi/pointer_wait_3.png
new file mode 100644
index 0000000..de4d79c
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_3.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_30.png b/core/res/res/drawable-xhdpi/pointer_wait_30.png
new file mode 100644
index 0000000..ba04b5e
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_30.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_31.png b/core/res/res/drawable-xhdpi/pointer_wait_31.png
new file mode 100644
index 0000000..3ef8e98
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_31.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_32.png b/core/res/res/drawable-xhdpi/pointer_wait_32.png
new file mode 100644
index 0000000..3297a7d
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_32.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_33.png b/core/res/res/drawable-xhdpi/pointer_wait_33.png
new file mode 100644
index 0000000..b0ac3b9
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_33.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_34.png b/core/res/res/drawable-xhdpi/pointer_wait_34.png
new file mode 100644
index 0000000..0eaa386
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_34.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_35.png b/core/res/res/drawable-xhdpi/pointer_wait_35.png
new file mode 100644
index 0000000..73894d8
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_35.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_4.png b/core/res/res/drawable-xhdpi/pointer_wait_4.png
new file mode 100644
index 0000000..ea44e85
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_4.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_5.png b/core/res/res/drawable-xhdpi/pointer_wait_5.png
new file mode 100644
index 0000000..46c399d
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_5.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_6.png b/core/res/res/drawable-xhdpi/pointer_wait_6.png
new file mode 100644
index 0000000..3b9aff6
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_6.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_7.png b/core/res/res/drawable-xhdpi/pointer_wait_7.png
new file mode 100644
index 0000000..a54edc0
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_7.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_8.png b/core/res/res/drawable-xhdpi/pointer_wait_8.png
new file mode 100644
index 0000000..2f30732
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_8.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/pointer_wait_9.png b/core/res/res/drawable-xhdpi/pointer_wait_9.png
new file mode 100644
index 0000000..f39c7a7
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/pointer_wait_9.png
Binary files differ
diff --git a/core/res/res/drawable/non_client_decor_title.xml b/core/res/res/drawable/decor_caption_title.xml
similarity index 84%
rename from core/res/res/drawable/non_client_decor_title.xml
rename to core/res/res/drawable/decor_caption_title.xml
index e50daea..591605d3 100644
--- a/core/res/res/drawable/non_client_decor_title.xml
+++ b/core/res/res/drawable/decor_caption_title.xml
@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="true"
- android:drawable="@drawable/non_client_decor_title_focused" />
- <item android:drawable="@drawable/non_client_decor_title_unfocused" />
+ android:drawable="@drawable/decor_caption_title_focused" />
+ <item android:drawable="@drawable/decor_caption_title_unfocused" />
</selector>
diff --git a/core/res/res/drawable/non_client_decor_title_focused.xml b/core/res/res/drawable/decor_caption_title_focused.xml
similarity index 100%
rename from core/res/res/drawable/non_client_decor_title_focused.xml
rename to core/res/res/drawable/decor_caption_title_focused.xml
diff --git a/core/res/res/drawable/non_client_decor_title_unfocused.xml b/core/res/res/drawable/decor_caption_title_unfocused.xml
similarity index 100%
rename from core/res/res/drawable/non_client_decor_title_unfocused.xml
rename to core/res/res/drawable/decor_caption_title_unfocused.xml
diff --git a/core/res/res/drawable/ft_avd_toarrow.xml b/core/res/res/drawable/ft_avd_toarrow.xml
new file mode 100644
index 0000000..087ea74
--- /dev/null
+++ b/core/res/res/drawable/ft_avd_toarrow.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:name="ft_avd_toarrow"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:height="24dp"
+ android:viewportHeight="24" >
+ <group
+ android:name="carrot_3"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="rectangle_4"
+ android:translateY="6" >
+ <group
+ android:name="rectangle_3_pivot_0" >
+ <path
+ android:name="rectangle_path_4"
+ android:fillColor="#FF000000"
+ android:pathData="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z" />
+ </group>
+ </group>
+ <group
+ android:name="rectangle_5" >
+ <group
+ android:name="rectangle_2_pivot_0" >
+ <path
+ android:name="rectangle_path_5"
+ android:fillColor="#FF000000"
+ android:pathData="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z" />
+ </group>
+ </group>
+ <group
+ android:name="rectangle_6"
+ android:translateY="-6" >
+ <group
+ android:name="rectangle_1_pivot_0" >
+ <path
+ android:name="rectangle_path_6"
+ android:fillColor="#FF000000"
+ android:pathData="M 0.0,-2.0 l 0.0,0.0 c 1.1045694996,0.0 2.0,0.8954305004 2.0,2.0 l 0.0,0.0 c 0.0,1.1045694996 -0.8954305004,2.0 -2.0,2.0 l 0.0,0.0 c -1.1045694996,0.0 -2.0,-0.8954305004 -2.0,-2.0 l 0.0,0.0 c 0.0,-1.1045694996 0.8954305004,-2.0 2.0,-2.0 Z" />
+ </group>
+ </group>
+ </group>
+</vector>
diff --git a/core/res/res/drawable/ft_avd_toarrow_animation.xml b/core/res/res/drawable/ft_avd_toarrow_animation.xml
new file mode 100644
index 0000000..e31067d
--- /dev/null
+++ b/core/res/res/drawable/ft_avd_toarrow_animation.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<animated-vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/ft_avd_toarrow" >
+ <target
+ android:name="rectangle_4"
+ android:animation="@anim/ft_avd_toarrow_rectangle_4_animation" />
+ <target
+ android:name="rectangle_3_pivot_0"
+ android:animation="@anim/ft_avd_toarrow_rectangle_3_pivot_0_animation" />
+ <target
+ android:name="rectangle_path_4"
+ android:animation="@anim/ft_avd_toarrow_rectangle_path_4_animation" />
+ <target
+ android:name="rectangle_5"
+ android:animation="@anim/ft_avd_toarrow_rectangle_5_animation" />
+ <target
+ android:name="rectangle_2_pivot_0"
+ android:animation="@anim/ft_avd_toarrow_rectangle_2_pivot_0_animation" />
+ <target
+ android:name="rectangle_path_5"
+ android:animation="@anim/ft_avd_toarrow_rectangle_path_5_animation" />
+ <target
+ android:name="rectangle_6"
+ android:animation="@anim/ft_avd_toarrow_rectangle_6_animation" />
+ <target
+ android:name="rectangle_1_pivot_0"
+ android:animation="@anim/ft_avd_toarrow_rectangle_1_pivot_0_animation" />
+ <target
+ android:name="rectangle_path_6"
+ android:animation="@anim/ft_avd_toarrow_rectangle_path_6_animation" />
+</animated-vector>
diff --git a/core/res/res/drawable/ft_avd_tooverflow.xml b/core/res/res/drawable/ft_avd_tooverflow.xml
new file mode 100644
index 0000000..a2b9cec
--- /dev/null
+++ b/core/res/res/drawable/ft_avd_tooverflow.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:name="ft_avd_tooverflow"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:height="24dp"
+ android:viewportHeight="24" >
+ <group
+ android:name="carrot_5"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="rectangle_3"
+ android:translateX="-6.5"
+ android:rotation="45" >
+ <group
+ android:name="rectangle_3_pivot"
+ android:translateX="4.5" >
+ <path
+ android:name="rectangle_path_2"
+ android:fillColor="#FF000000"
+ android:pathData="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
+ </group>
+ </group>
+ <group
+ android:name="rectangle_2"
+ android:translateX="-8" >
+ <group
+ android:name="rectangle_2_pivot"
+ android:translateX="9" >
+ <path
+ android:name="rectangle_path_3"
+ android:fillColor="#FF000000"
+ android:pathData="M -7.0,-1.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
+ </group>
+ </group>
+ <group
+ android:name="rectangle_1"
+ android:translateX="-6.5"
+ android:rotation="-45" >
+ <group
+ android:name="rectangle_1_pivot"
+ android:translateX="4.5" >
+ <path
+ android:name="rectangle_path_1"
+ android:fillColor="#FF000000"
+ android:pathData="M -5.5,-1.0 l 11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -11.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
+ </group>
+ </group>
+ </group>
+</vector>
diff --git a/core/res/res/drawable/ft_avd_tooverflow_animation.xml b/core/res/res/drawable/ft_avd_tooverflow_animation.xml
new file mode 100644
index 0000000..ed9975b
--- /dev/null
+++ b/core/res/res/drawable/ft_avd_tooverflow_animation.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<animated-vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/ft_avd_tooverflow" >
+ <target
+ android:name="rectangle_3"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_3_animation" />
+ <target
+ android:name="rectangle_3_pivot"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_3_pivot_animation" />
+ <target
+ android:name="rectangle_path_2"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_path_2_animation" />
+ <target
+ android:name="rectangle_2"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_2_animation" />
+ <target
+ android:name="rectangle_2_pivot"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_2_pivot_animation" />
+ <target
+ android:name="rectangle_path_3"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_path_3_animation" />
+ <target
+ android:name="rectangle_1"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_1_animation" />
+ <target
+ android:name="rectangle_1_pivot"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_1_pivot_animation" />
+ <target
+ android:name="rectangle_path_1"
+ android:animation="@anim/ft_avd_tooverflow_rectangle_path_1_animation" />
+</animated-vector>
diff --git a/core/res/res/drawable/ic_arrow_drop_down.xml b/core/res/res/drawable/ic_arrow_drop_down.xml
new file mode 100644
index 0000000..c8bb411
--- /dev/null
+++ b/core/res/res/drawable/ic_arrow_drop_down.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="14.0dp"
+ android:height="14.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M16.600000,8.600000l-4.600000,4.599999 -4.600000,-4.599999 -1.400000,1.400000 6.000000,6.000000 6.000000,-6.000000z"
+ android:fillColor="#FF000000"/>
+</vector>
diff --git a/core/res/res/drawable/ic_arrow_up_14dp.xml b/core/res/res/drawable/ic_arrow_up_14dp.xml
new file mode 100644
index 0000000..c4cc0d1
--- /dev/null
+++ b/core/res/res/drawable/ic_arrow_up_14dp.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2015 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
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="14.0dp"
+ android:height="14.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M12.000000,8.000000l-6.000000,6.000000 1.400000,1.400000 4.600000,-4.599999 4.600000,4.599999 1.400000,-1.400000z"
+ android:fillColor="#FF000000"/>
+</vector>
diff --git a/core/res/res/drawable/pointer_wait.xml b/core/res/res/drawable/pointer_wait.xml
new file mode 100644
index 0000000..8955ce8
--- /dev/null
+++ b/core/res/res/drawable/pointer_wait.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
+ <item android:drawable="@drawable/pointer_wait_1" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_2" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_3" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_4" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_5" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_6" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_7" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_8" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_9" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_10" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_11" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_12" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_13" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_14" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_15" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_16" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_17" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_18" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_19" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_20" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_21" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_22" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_23" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_24" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_25" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_26" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_27" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_28" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_29" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_30" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_31" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_32" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_33" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_34" android:duration="25"/>
+ <item android:drawable="@drawable/pointer_wait_35" android:duration="25"/>
+</animation-list>
diff --git a/core/res/res/drawable/pointer_wait_icon.xml b/core/res/res/drawable/pointer_wait_icon.xml
new file mode 100644
index 0000000..d9b03b0
--- /dev/null
+++ b/core/res/res/drawable/pointer_wait_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pointer-icon xmlns:android="http://schemas.android.com/apk/res/android"
+ android:bitmap="@drawable/pointer_wait"
+ android:hotSpotX="7dp"
+ android:hotSpotY="7dp" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_0.xml
similarity index 61%
copy from core/res/res/values-w600dp/dimens.xml
copy to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_0.xml
index 83c45b5..c6db901 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_0.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 l 0.668316831683,0.0 c 0.00003,0.0 0.0663366336634,1.0 0.331683168317,1.0 L 1.0,1.0" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_1.xml
similarity index 61%
copy from core/res/res/values-w600dp/dimens.xml
copy to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_1.xml
index 83c45b5..584385d 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_1.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_2.xml
similarity index 61%
copy from core/res/res/values-w600dp/dimens.xml
copy to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_2.xml
index 83c45b5..334dee7 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_2.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.161290322581,0.0 0.0806451612903,0.909090909091 0.403225806452,0.909090909091 c 0.238709677419,0.0 0.11935483871,0.0909090909091 0.596774193548,0.0909090909091 L 1.0,1.0" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_3.xml
similarity index 61%
rename from core/res/res/values-w600dp/dimens.xml
rename to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_3.xml
index 83c45b5..67891fc 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_3.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 l 0.5,0.0 c 0.2,0.0 0.1,1.0 0.5,1.0 L 1.0,1.0" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_4.xml
similarity index 61%
copy from core/res/res/values-w600dp/dimens.xml
copy to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_4.xml
index 83c45b5..756a9e1 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_4.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 l 0.5,0.0 c 0.00005,0.0 0.1,1.0 0.5,1.0 L 1.0,1.0" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_5.xml
similarity index 61%
copy from core/res/res/values-w600dp/dimens.xml
copy to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_5.xml
index 83c45b5..584385d 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_5.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" />
diff --git a/core/res/res/values-w600dp/dimens.xml b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_6.xml
similarity index 61%
copy from core/res/res/values-w600dp/dimens.xml
copy to core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_6.xml
index 83c45b5..bed54d4 100644
--- a/core/res/res/values-w600dp/dimens.xml
+++ b/core/res/res/interpolator/ft_avd_toarrow_animation_interpolator_6.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The Android Open Source Project
+/* Copyright 2015, 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,9 +15,6 @@
** limitations under the License.
*/
-->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">5</integer>
-</resources>
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.0,0.0 l 0.582706766917,0.0 c 0.166917293233,0.0 0.0834586466165,1.0 0.417293233083,1.0 L 1.0,1.0" />
diff --git a/core/res/res/layout/alert_dialog_button_bar_material.xml b/core/res/res/layout/alert_dialog_button_bar_material.xml
index 6e102f3..f7974a5 100644
--- a/core/res/res/layout/alert_dialog_button_bar_material.xml
+++ b/core/res/res/layout/alert_dialog_button_bar_material.xml
@@ -27,7 +27,6 @@
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
- android:allowStacking="@bool/allow_stacked_button_bar"
style="?attr/buttonBarStyle">
<Button
diff --git a/core/res/res/layout/non_client_decor_dark.xml b/core/res/res/layout/decor_caption_dark.xml
similarity index 89%
rename from core/res/res/layout/non_client_decor_dark.xml
rename to core/res/res/layout/decor_caption_dark.xml
index 40b8960..273264d 100644
--- a/core/res/res/layout/non_client_decor_dark.xml
+++ b/core/res/res/layout/decor_caption_dark.xml
@@ -17,16 +17,17 @@
*/
-->
-<com.android.internal.widget.NonClientDecorView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.internal.widget.DecorCaptionView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants" >
<LinearLayout
+ android:id="@+id/caption"
android:layout_width="match_parent"
android:layout_gravity="end"
android:layout_height="wrap_content"
- android:background="@drawable/non_client_decor_title"
+ android:background="@drawable/decor_caption_title"
android:focusable="false"
android:descendantFocusability="blocksDescendants" >
<LinearLayout
@@ -53,4 +54,4 @@
android:contentDescription="@string/close_button_text"
android:background="@drawable/decor_close_button_dark" />
</LinearLayout>
-</com.android.internal.widget.NonClientDecorView>
+</com.android.internal.widget.DecorCaptionView>
diff --git a/core/res/res/layout/non_client_decor_light.xml b/core/res/res/layout/decor_caption_light.xml
similarity index 89%
rename from core/res/res/layout/non_client_decor_light.xml
rename to core/res/res/layout/decor_caption_light.xml
index c75d526..fd9198e 100644
--- a/core/res/res/layout/non_client_decor_light.xml
+++ b/core/res/res/layout/decor_caption_light.xml
@@ -17,16 +17,17 @@
*/
-->
-<com.android.internal.widget.NonClientDecorView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.internal.widget.DecorCaptionView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants" >
<LinearLayout
+ android:id="@+id/caption"
android:layout_width="match_parent"
android:layout_gravity="end"
android:layout_height="wrap_content"
- android:background="@drawable/non_client_decor_title"
+ android:background="@drawable/decor_caption_title"
android:focusable="false"
android:descendantFocusability="blocksDescendants" >
<LinearLayout
@@ -53,4 +54,4 @@
android:contentDescription="@string/close_button_text"
android:background="@drawable/decor_close_button_light" />
</LinearLayout>
-</com.android.internal.widget.NonClientDecorView>
+</com.android.internal.widget.DecorCaptionView>
diff --git a/core/res/res/layout/floating_popup_container.xml b/core/res/res/layout/floating_popup_container.xml
index 63dae44..dd161e3 100644
--- a/core/res/res/layout/floating_popup_container.xml
+++ b/core/res/res/layout/floating_popup_container.xml
@@ -15,12 +15,11 @@
** limitations under the License.
*/
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="@dimen/floating_toolbar_height"
+ android:layout_height="wrap_content"
android:padding="0dp"
- android:layout_margin="0dp"
+ android:layout_margin="20dp"
android:elevation="2dp"
android:focusable="true"
android:focusableInTouchMode="true"
diff --git a/core/res/res/layout/floating_popup_overflow_button.xml b/core/res/res/layout/floating_popup_overflow_button.xml
new file mode 100644
index 0000000..7053f3e
--- /dev/null
+++ b/core/res/res/layout/floating_popup_overflow_button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2015, 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.
+*/
+-->
+<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/overflow"
+ android:layout_width="@dimen/floating_toolbar_menu_image_button_width"
+ android:layout_height="@dimen/floating_toolbar_height"
+ android:paddingStart="@dimen/floating_toolbar_menu_button_side_padding"
+ android:paddingTop="@dimen/floating_toolbar_menu_image_button_vertical_padding"
+ android:paddingEnd="@dimen/floating_toolbar_menu_button_side_padding"
+ android:paddingBottom="@dimen/floating_toolbar_menu_image_button_vertical_padding"
+ android:scaleType="centerInside"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:tint="?attr/floatingToolbarForegroundColor" />
diff --git a/core/res/res/layout/notification_material_action.xml b/core/res/res/layout/notification_material_action.xml
index da8b2e7..62602d8 100644
--- a/core/res/res/layout/notification_material_action.xml
+++ b/core/res/res/layout/notification_material_action.xml
@@ -18,15 +18,11 @@
<Button xmlns:android="http://schemas.android.com/apk/res/android"
style="@android:style/Widget.Material.Light.Button.Borderless.Small"
android:id="@+id/action0"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="48dp"
- android:layout_weight="1"
- android:layout_margin="0dp"
- android:gravity="start|center_vertical"
- android:drawablePadding="8dp"
- android:paddingStart="8dp"
+ android:layout_gravity="center"
+ android:layout_marginStart="4dp"
android:textColor="@color/secondary_text_material_light"
- android:textSize="13sp"
android:singleLine="true"
android:ellipsize="end"
android:background="@drawable/notification_material_action_background"
diff --git a/core/res/res/layout/notification_material_action_list.xml b/core/res/res/layout/notification_material_action_list.xml
index 2a36949..2a89faa 100644
--- a/core/res/res/layout/notification_material_action_list.xml
+++ b/core/res/res/layout/notification_material_action_list.xml
@@ -14,14 +14,21 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/actions"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:visibility="gone"
- android:layout_marginBottom="8dp"
- >
- <!-- actions will be added here -->
-</LinearLayout>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/actions_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="-16dp"
+ android:layout_marginEnd="-16dp">
+ <LinearLayout
+ android:id="@+id/actions"
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:paddingEnd="4dp"
+ android:orientation="horizontal"
+ android:visibility="gone"
+ android:background="#ffeeeeee"
+ >
+ <!-- actions will be added here -->
+ </LinearLayout>
+</FrameLayout>
diff --git a/core/res/res/layout/notification_material_media_action.xml b/core/res/res/layout/notification_material_media_action.xml
index 1d52e54..19a6f84 100644
--- a/core/res/res/layout/notification_material_media_action.xml
+++ b/core/res/res/layout/notification_material_media_action.xml
@@ -19,10 +19,12 @@
style="@android:style/Widget.Material.Button.Borderless.Small"
android:id="@+id/action0"
android:layout_width="48dp"
- android:layout_height="match_parent"
- android:layout_marginLeft="2dp"
- android:layout_marginRight="2dp"
- android:layout_weight="1"
+ android:layout_height="48dp"
+ android:paddingBottom="8dp"
+ android:paddingTop="8dp"
+ android:paddingStart="8dp"
+ android:paddingEnd="8dp"
+ android:layout_marginEnd="2dp"
android:gravity="center"
android:background="@drawable/notification_material_media_action_background"
/>
diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml
new file mode 100644
index 0000000..aceae9f
--- /dev/null
+++ b/core/res/res/layout/notification_template_header.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2015 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
+ -->
+
+<NotificationHeaderView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/notification_header"
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="48dp"
+ android:clipChildren="false"
+ android:layout_gravity="start|top"
+ android:gravity="center_vertical"
+ android:paddingTop="5dp"
+ android:paddingBottom="16dp"
+ android:paddingStart="@dimen/notification_content_margin_start"
+ android:paddingEnd="16dp">
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:layout_marginEnd="3dp"
+ />
+ <TextView
+ android:id="@+id/number_of_children"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification"
+ android:layout_marginEnd="3dp"
+ android:layout_marginStart="2dp"
+ android:visibility="gone"
+ android:singleLine="true"
+ />
+ <TextView
+ android:id="@+id/app_name_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification.Info"
+ android:layout_marginStart="3dp"
+ android:layout_marginEnd="2dp"
+ android:singleLine="true"
+ />
+ <TextView
+ android:id="@+id/sub_text_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification.Info"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:text="@string/notification_header_divider_symbol"
+ android:visibility="gone"/>
+ <TextView
+ android:id="@+id/header_sub_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification.Info"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:visibility="gone"
+ android:singleLine="true"/>
+ <TextView
+ android:id="@+id/content_info_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification.Info"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:text="@string/notification_header_divider_symbol"
+ android:singleLine="true"
+ android:visibility="gone"/>
+ <TextView
+ android:id="@+id/header_content_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification.Info"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:visibility="gone"
+ android:maxWidth="72dp"
+ android:singleLine="true"/>
+ <TextView
+ android:id="@+id/time_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/TextAppearance.Material.Notification.Info"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:text="@string/notification_header_divider_symbol"
+ android:singleLine="true"
+ android:visibility="gone"/>
+ <ViewStub
+ android:id="@+id/time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:layout="@layout/notification_template_part_time"
+ android:visibility="gone"
+ />
+ <ViewStub
+ android:id="@+id/chronometer"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="2dp"
+ android:layout_marginEnd="2dp"
+ android:layout="@layout/notification_template_part_chronometer"
+ android:visibility="gone"
+ />
+ <ImageView
+ android:id="@+id/expand_button"
+ android:background="@null"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="1dp"
+ android:src="@drawable/ic_arrow_drop_down"
+ android:visibility="gone"
+ />
+</NotificationHeaderView>
+
diff --git a/core/res/res/layout/notification_template_icon_group.xml b/core/res/res/layout/notification_template_icon_group.xml
deleted file mode 100644
index fa66163..0000000
--- a/core/res/res/layout/notification_template_icon_group.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:internal="http://schemas.android.com/apk/prv/res/android"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- android:id="@+id/icon_group"
- >
- <ImageView android:id="@+id/icon"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="12dp"
- android:layout_marginBottom="12dp"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:scaleType="centerInside"
- />
- <ImageView android:id="@+id/right_icon"
- android:layout_width="16dp"
- android:layout_height="16dp"
- android:padding="3dp"
- android:layout_gravity="end|bottom"
- android:scaleType="centerInside"
- android:visibility="gone"
- android:layout_marginEnd="8dp"
- android:layout_marginBottom="8dp"
- />
-</FrameLayout>
-
diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml
index 94bbec8..b69eb24 100644
--- a/core/res/res/layout/notification_template_material_base.xml
+++ b/core/res/res/layout/notification_template_material_base.xml
@@ -18,24 +18,32 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_bar_latest_event_content"
android:layout_width="match_parent"
- android:layout_height="64dp"
+ android:layout_height="wrap_content"
android:tag="base"
>
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- />
+ <include layout="@layout/notification_template_header" />
<LinearLayout
android:id="@+id/notification_main_column"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="top"
- android:layout_marginStart="@dimen/notification_large_icon_width"
- android:minHeight="@dimen/notification_large_icon_height"
+ android:layout_marginStart="@dimen/notification_content_margin_start"
+ android:layout_marginEnd="@dimen/notification_content_margin_end"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:minHeight="@dimen/notification_min_content_height"
android:orientation="vertical"
>
<include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
<include layout="@layout/notification_template_part_line3" />
</LinearLayout>
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:layout_marginStart="@dimen/notification_content_margin_start"
+ android:layout_marginBottom="11dp"
+ android:layout_marginEnd="@dimen/notification_content_margin_end">
+ <include layout="@layout/notification_template_progress" />
+ </FrameLayout>
+ <include layout="@layout/notification_template_right_icon" />
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_big_base.xml b/core/res/res/layout/notification_template_material_big_base.xml
index 97df978e..8c78b8d 100644
--- a/core/res/res/layout/notification_template_material_big_base.xml
+++ b/core/res/res/layout/notification_template_material_big_base.xml
@@ -14,71 +14,56 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_bar_latest_event_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:tag="big"
>
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- />
- <LinearLayout
- android:id="@+id/notification_main_column"
+ <FrameLayout
+ android:id="@+id/status_bar_latest_event_content"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/notification_min_height"
+ android:layout_gravity="top"
+ android:tag="base"
+ >
+ <include layout="@layout/notification_template_header" />
+ <LinearLayout
+ android:id="@+id/notification_main_column"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="top"
+ android:layout_marginStart="@dimen/notification_content_margin_start"
+ android:layout_marginEnd="@dimen/notification_content_margin_end"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:minHeight="@dimen/notification_min_content_height"
+ android:orientation="vertical"
+ >
+ <include layout="@layout/notification_template_part_line1" />
+ <include layout="@layout/notification_template_part_line3" />
+ </LinearLayout>
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:layout_marginStart="@dimen/notification_content_margin_start"
+ android:layout_marginBottom="11dp"
+ android:layout_marginEnd="@dimen/notification_content_margin_end">
+ <include layout="@layout/notification_template_progress" />
+ </FrameLayout>
+ <include layout="@layout/notification_template_right_icon" />
+ </FrameLayout>
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:id="@+id/action_divider"
+ android:visibility="gone"
+ android:background="@drawable/notification_template_divider" />
+ <include
+ layout="@layout/notification_material_action_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_marginStart="@dimen/notification_large_icon_width"
- android:minHeight="@dimen/notification_large_icon_height"
- android:orientation="vertical"
- >
- <include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:orientation="horizontal"
- android:gravity="top"
- >
- <TextView android:id="@+id/big_text"
- android:textAppearance="@style/TextAppearance.Material.Notification"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:singleLine="false"
- android:visibility="gone"
- />
- <ImageView android:id="@+id/profile_badge_large_template"
- android:layout_width="@dimen/notification_badge_size"
- android:layout_height="@dimen/notification_badge_size"
- android:layout_weight="0"
- android:layout_marginStart="4dp"
- android:scaleType="fitCenter"
- android:visibility="gone"
- android:contentDescription="@string/notification_work_profile_content_description"
- />
- </LinearLayout>
- <include
- layout="@layout/notification_template_part_line3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- />
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_marginTop="10dp"
- android:id="@+id/action_divider"
- android:visibility="gone"
- android:background="@drawable/notification_template_divider" />
- <include
- layout="@layout/notification_material_action_list"
- android:layout_marginStart="-8dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
-</FrameLayout>
+ />
+</LinearLayout>
diff --git a/core/res/res/layout/notification_template_material_big_media.xml b/core/res/res/layout/notification_template_material_big_media.xml
index 7fd93de..0427c8a 100644
--- a/core/res/res/layout/notification_template_material_big_media.xml
+++ b/core/res/res/layout/notification_template_material_big_media.xml
@@ -15,44 +15,53 @@
~ limitations under the License
-->
+<!-- Layout for the expanded media notification -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_bar_latest_event_content"
android:layout_width="match_parent"
android:layout_height="128dp"
android:background="#00000000"
- android:tag="bigMedia"
+ android:tag="bigMediaNarrow"
>
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- />
+ <include layout="@layout/notification_template_header"
+ android:layout_width="fill_parent"
+ android:layout_height="48dp"
+ android:layout_marginEnd="106dp"/>
<LinearLayout
+ android:id="@+id/notification_main_column"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/notification_large_icon_width"
- android:minHeight="@dimen/notification_large_icon_height"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:layout_marginStart="@dimen/notification_content_margin_start"
+ android:layout_marginEnd="24dp"
+ android:layout_toStartOf="@id/right_icon"
+ android:minHeight="@dimen/notification_min_content_height"
android:orientation="vertical"
>
<include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
<include layout="@layout/notification_template_part_line3" />
</LinearLayout>
<LinearLayout
android:id="@+id/media_actions"
- android:layout_width="match_parent"
- android:layout_height="48dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
+ android:layout_alignParentStart="true"
+ android:paddingStart="8dp"
+ android:paddingBottom="8dp"
android:orientation="horizontal"
android:layoutDirection="ltr"
>
<!-- media buttons will be added here -->
</LinearLayout>
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_above="@id/media_actions"
- android:id="@+id/action_divider"
- android:background="@drawable/notification_template_divider_media" />
+
+ <ImageView android:id="@+id/right_icon"
+ android:layout_width="96dp"
+ android:layout_height="96dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentTop="true"
+ android:scaleType="centerCrop"
+ />
</RelativeLayout>
diff --git a/core/res/res/layout/notification_template_material_big_media_narrow.xml b/core/res/res/layout/notification_template_material_big_media_narrow.xml
deleted file mode 100644
index 807cfaf..0000000
--- a/core/res/res/layout/notification_template_material_big_media_narrow.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-
-<!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/status_bar_latest_event_content"
- android:layout_width="match_parent"
- android:layout_height="128dp"
- android:background="#00000000"
- android:tag="bigMediaNarrow"
- >
- <ImageView android:id="@+id/icon"
- android:layout_width="128dp"
- android:layout_height="128dp"
- android:scaleType="centerCrop"
- />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="12dp"
- android:layout_toEndOf="@id/icon"
- android:minHeight="@dimen/notification_large_icon_height"
- android:orientation="vertical"
- >
- <include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
- <include layout="@layout/notification_template_part_line3" />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/media_actions"
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:layout_toEndOf="@id/icon"
- android:layout_alignParentBottom="true"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:orientation="horizontal"
- android:layoutDirection="ltr"
- >
- <!-- media buttons will be added here -->
- </LinearLayout>
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_toEndOf="@id/icon"
- android:layout_above="@id/media_actions"
- android:id="@+id/action_divider"
- android:background="@drawable/notification_template_divider_media" />
-</RelativeLayout>
diff --git a/core/res/res/layout/notification_template_material_big_picture.xml b/core/res/res/layout/notification_template_material_big_picture.xml
index f3768b5..74e7775 100644
--- a/core/res/res/layout/notification_template_material_big_picture.xml
+++ b/core/res/res/layout/notification_template_material_big_picture.xml
@@ -21,39 +21,45 @@
android:layout_height="match_parent"
android:tag="bigPicture"
>
- <ImageView
- android:id="@+id/big_picture"
- android:layout_width="match_parent"
- android:layout_height="192dp"
- android:layout_marginTop="64dp"
- android:layout_gravity="bottom"
- android:scaleType="centerCrop"
- />
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="6dp"
- android:layout_marginTop="64dp"
- android:scaleType="fitXY"
- android:src="@drawable/title_bar_shadow"
- />
- <include layout="@layout/notification_template_material_base"
- android:layout_width="match_parent"
- android:layout_height="64dp"
- />
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="208dp"
- android:paddingStart="@dimen/notification_large_icon_width"
- android:layout_gravity="bottom"
- android:background="#CCEEEEEE"
- >
- <include
- layout="@layout/notification_material_action_list"
- android:id="@+id/actions"
- android:layout_gravity="bottom"
+ <include layout="@layout/notification_template_header" />
+ <include layout="@layout/notification_template_right_icon" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="top"
+ android:paddingStart="@dimen/notification_content_margin_start"
+ android:paddingEnd="@dimen/notification_content_margin_end"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:clipToPadding="false"
+ android:orientation="vertical"
+ >
+ <LinearLayout
+ android:id="@+id/notification_main_column"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- />
- </FrameLayout>
+ android:orientation="vertical">
+ <include layout="@layout/notification_template_part_line1"/>
+ <include layout="@layout/notification_template_progress"/>
+ <include layout="@layout/notification_template_part_line3"/>
+ </LinearLayout>
+ <ImageView
+ android:id="@+id/big_picture"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:adjustViewBounds="true"
+ android:layout_weight="1"
+ android:layout_marginTop="13dp"
+ android:layout_marginBottom="16dp"
+ android:scaleType="centerCrop"
+ />
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginStart="-16dp"
+ android:layout_marginEnd="-16dp"
+ android:id="@+id/action_divider"
+ android:visibility="gone"
+ android:background="@drawable/notification_template_divider" />
+ <include layout="@layout/notification_material_action_list" />
+ </LinearLayout>
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_big_text.xml b/core/res/res/layout/notification_template_material_big_text.xml
index 7ae29fb..354c0fb 100644
--- a/core/res/res/layout/notification_template_material_big_text.xml
+++ b/core/res/res/layout/notification_template_material_big_text.xml
@@ -21,31 +21,30 @@
android:layout_height="wrap_content"
android:tag="bigText"
>
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- />
+ <include layout="@layout/notification_template_header" />
<LinearLayout
android:id="@+id/notification_main_column"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginStart="@dimen/notification_large_icon_width"
- android:minHeight="@dimen/notification_large_icon_height"
+ android:paddingStart="@dimen/notification_content_margin_start"
+ android:paddingEnd="@dimen/notification_content_margin_end"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:clipToPadding="false"
+ android:minHeight="@dimen/notification_min_content_height"
android:orientation="vertical"
>
<include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
+ <include layout="@layout/notification_template_progress" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
- android:layout_marginBottom="10dp"
+ android:paddingBottom="13dp"
android:orientation="horizontal"
android:gravity="top"
android:layout_weight="1"
>
- <TextView android:id="@+id/big_text"
+ <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text"
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -66,27 +65,12 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="1dp"
+ android:layout_marginStart="-16dp"
+ android:layout_marginEnd="-16dp"
android:id="@+id/action_divider"
android:visibility="gone"
android:background="@drawable/notification_template_divider" />
- <include
- layout="@layout/notification_material_action_list"
- android:layout_marginStart="-8dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- />
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:id="@+id/overflow_divider"
- android:visibility="visible"
- android:background="@drawable/notification_template_divider" />
- <include
- layout="@layout/notification_template_part_line3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="10dp" />
+ <include layout="@layout/notification_material_action_list" />
</LinearLayout>
+ <include layout="@layout/notification_template_right_icon" />
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_inbox.xml b/core/res/res/layout/notification_template_material_inbox.xml
index 950ae40..4f12d76 100644
--- a/core/res/res/layout/notification_template_material_inbox.xml
+++ b/core/res/res/layout/notification_template_material_inbox.xml
@@ -21,21 +21,26 @@
android:layout_height="wrap_content"
android:tag="inbox"
>
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- />
+ <include layout="@layout/notification_template_header" />
<LinearLayout
android:id="@+id/notification_main_column"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginStart="@dimen/notification_large_icon_width"
- android:minHeight="@dimen/notification_large_icon_height"
+ android:paddingStart="@dimen/notification_content_margin_start"
+ android:paddingEnd="@dimen/notification_content_margin_end"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:minHeight="@dimen/notification_min_content_height"
+ android:clipToPadding="false"
android:orientation="vertical"
>
- <include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
+ <include layout="@layout/notification_template_part_line1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <include layout="@layout/notification_template_progress"
+ android:layout_width="match_parent"
+ android:layout_height="15dp"
+ android:layout_marginTop="4dp"/>
<!-- We can't have another vertical linear layout here with weight != 0 so this forces us to
put the badge on the first line. -->
@@ -43,7 +48,6 @@
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:orientation="horizontal"
>
<TextView android:id="@+id/inbox_text0"
@@ -69,7 +73,6 @@
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
@@ -79,7 +82,6 @@
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
@@ -89,7 +91,6 @@
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
@@ -99,7 +100,6 @@
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
@@ -109,7 +109,6 @@
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
@@ -119,27 +118,15 @@
android:textAppearance="@style/TextAppearance.Material.Notification"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
android:layout_weight="1"
/>
- <TextView android:id="@+id/inbox_more"
- android:textAppearance="@style/TextAppearance.Material.Notification"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginEnd="8dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:visibility="gone"
- android:layout_weight="1"
- android:text="@android:string/notification_inbox_ellipsis"
- />
<FrameLayout
android:id="@+id/inbox_end_pad"
android:layout_width="match_parent"
- android:layout_height="10dp"
+ android:layout_height="13dp"
android:visibility="gone"
android:layout_weight="0"
/>
@@ -148,27 +135,10 @@
android:layout_height="1dip"
android:id="@+id/action_divider"
android:visibility="gone"
+ android:layout_marginStart="-16dp"
+ android:layout_marginEnd="-16dp"
android:background="@drawable/notification_template_divider" />
- <include
- layout="@layout/notification_material_action_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="-8dp"
- android:layout_marginRight="-8dp"
- android:layout_weight="0"
- />
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:id="@+id/overflow_divider"
- android:visibility="visible"
- android:background="@drawable/notification_template_divider" />
- <include
- layout="@layout/notification_template_part_line3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="10dp" />
+ <include layout="@layout/notification_material_action_list" />
</LinearLayout>
+ <include layout="@layout/notification_template_right_icon" />
</FrameLayout>
diff --git a/core/res/res/layout/notification_template_material_media.xml b/core/res/res/layout/notification_template_material_media.xml
index f6c22c8..dc4afb8 100644
--- a/core/res/res/layout/notification_template_material_media.xml
+++ b/core/res/res/layout/notification_template_material_media.xml
@@ -15,40 +15,52 @@
~ limitations under the License
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
android:id="@+id/status_bar_latest_event_content"
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="64dp"
- android:orientation="horizontal"
- android:background="#00000000"
+ android:layout_height="wrap_content"
android:tag="media"
>
- <include layout="@layout/notification_template_icon_group"
- android:layout_width="@dimen/notification_large_icon_width"
- android:layout_height="@dimen/notification_large_icon_height"
- android:layout_weight="0"
- />
+ <include layout="@layout/notification_template_header"
+ android:layout_width="fill_parent"
+ android:layout_height="48dp"
+ android:layout_marginEnd="106dp"/>
<LinearLayout
+ android:id="@+id/notification_main_column"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="fill_vertical"
- android:minHeight="@dimen/notification_large_icon_height"
- android:orientation="vertical"
- >
- <include layout="@layout/notification_template_part_line1" />
- <include layout="@layout/notification_template_part_line2" />
- <include layout="@layout/notification_template_part_line3" />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/media_actions"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginEnd="6dp"
- android:layout_gravity="center_vertical|end"
+ android:layout_height="@dimen/notification_min_content_height"
+ android:background="#00000000"
android:orientation="horizontal"
- android:layoutDirection="ltr"
+ android:layout_marginStart="@dimen/notification_content_margin_start"
+ android:layout_marginTop="@dimen/notification_content_margin_top"
+ android:layout_marginEnd="72dp"
+ android:tag="media"
>
- <!-- media buttons will be added here -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="fill_vertical"
+ android:layout_weight="1"
+ android:minHeight="@dimen/notification_min_content_height"
+ android:orientation="vertical"
+ >
+ <include layout="@layout/notification_template_part_line1"/>
+ <include layout="@layout/notification_template_progress"/>
+ <include layout="@layout/notification_template_part_line3"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/media_actions"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="bottom|end"
+ android:layout_marginStart="10dp"
+ android:layout_marginBottom="8dp"
+ android:layoutDirection="ltr"
+ android:orientation="horizontal"
+ >
+ <!-- media buttons will be added here -->
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
+ <include layout="@layout/notification_template_right_icon" />
+</FrameLayout>
diff --git a/core/res/res/layout/notification_template_part_chronometer.xml b/core/res/res/layout/notification_template_part_chronometer.xml
index 1f0430e..c5ffbea 100644
--- a/core/res/res/layout/notification_template_part_chronometer.xml
+++ b/core/res/res/layout/notification_template_part_chronometer.xml
@@ -18,9 +18,7 @@
android:textAppearance="@style/TextAppearance.Material.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_marginEnd="4dp"
android:layout_weight="0"
android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
/>
diff --git a/core/res/res/layout/notification_template_part_line1.xml b/core/res/res/layout/notification_template_part_line1.xml
index 78bc1ed..e7ac408 100644
--- a/core/res/res/layout/notification_template_part_line1.xml
+++ b/core/res/res/layout/notification_template_part_line1.xml
@@ -19,30 +19,25 @@
android:id="@+id/line1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:orientation="horizontal"
+ android:layout_marginBottom="1dp"
>
<TextView android:id="@+id/title"
android:textAppearance="@style/TextAppearance.Material.Notification.Title"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
- android:layout_weight="1"
/>
- <ViewStub android:id="@+id/time"
- android:layout_width="wrap_content"
+ <TextView android:id="@+id/text_line_1"
+ android:textAppearance="@style/TextAppearance.Material.Notification"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_time"
- />
- <ViewStub android:id="@+id/chronometer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone"
- android:layout="@layout/notification_template_part_chronometer"
+ android:gravity="end|bottom"
+ android:layout_marginStart="16dp"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
/>
</LinearLayout>
diff --git a/core/res/res/layout/notification_template_part_line2.xml b/core/res/res/layout/notification_template_part_line2.xml
deleted file mode 100644
index db43271..0000000
--- a/core/res/res/layout/notification_template_part_line2.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 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
- -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- >
- <TextView
- android:id="@+id/text2"
- android:textAppearance="@style/TextAppearance.Material.Notification.Line2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="-1dp"
- android:layout_marginBottom="-1dp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:ellipsize="marquee"
- android:visibility="gone"
- android:layout_weight="1"
- />
- <ImageView android:id="@+id/profile_badge_line2"
- android:layout_width="@dimen/notification_badge_size"
- android:layout_height="@dimen/notification_badge_size"
- android:layout_weight="0"
- android:layout_marginStart="4dp"
- android:scaleType="fitCenter"
- android:visibility="gone"
- android:contentDescription="@string/notification_work_profile_content_description"
- />
- </LinearLayout>
- <ViewStub
- android:id="@android:id/progress"
- android:layout="@layout/notification_template_progressbar"
- android:layout_width="match_parent"
- android:layout_height="15dp"
- android:layout_marginEnd="8dp"
- android:visibility="gone"
- android:layout_weight="0"
- />
-</merge>
diff --git a/core/res/res/layout/notification_template_part_line3.xml b/core/res/res/layout/notification_template_part_line3.xml
index da3c5c5..76337ac 100644
--- a/core/res/res/layout/notification_template_part_line3.xml
+++ b/core/res/res/layout/notification_template_part_line3.xml
@@ -19,7 +19,6 @@
android:id="@+id/line3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:orientation="horizontal"
android:gravity="center_vertical"
>
@@ -33,16 +32,6 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
/>
- <TextView android:id="@+id/info"
- android:textAppearance="@style/TextAppearance.Material.Notification.Info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="0"
- android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
- />
<ImageView android:id="@+id/profile_badge_line3"
android:layout_width="@dimen/notification_badge_size"
android:layout_height="@dimen/notification_badge_size"
diff --git a/core/res/res/layout/notification_template_part_time.xml b/core/res/res/layout/notification_template_part_time.xml
index 37c7ebe..442ff8c 100644
--- a/core/res/res/layout/notification_template_part_time.xml
+++ b/core/res/res/layout/notification_template_part_time.xml
@@ -19,8 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:layout_marginEnd="4dp"
android:layout_weight="0"
android:singleLine="true"
- android:gravity="center"
- android:paddingStart="8dp"
/>
diff --git a/core/res/res/drawable/notification_icon_legacy_bg.xml b/core/res/res/layout/notification_template_progress.xml
similarity index 64%
rename from core/res/res/drawable/notification_icon_legacy_bg.xml
rename to core/res/res/layout/notification_template_progress.xml
index cc5755d..85532ad 100644
--- a/core/res/res/drawable/notification_icon_legacy_bg.xml
+++ b/core/res/res/layout/notification_template_progress.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2014 The Android Open Source Project
+ ~ Copyright (C) 2015 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.
@@ -14,9 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="oval">
- <solid
- android:color="@color/notification_icon_bg_color"/>
-</shape>
+<ViewStub
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/progress"
+ android:layout="@layout/notification_template_progressbar"
+ android:layout_width="match_parent"
+ android:layout_height="15dp"
+ android:visibility="gone"
+ />
diff --git a/core/res/res/drawable/notification_icon_legacy_bg.xml b/core/res/res/layout/notification_template_right_icon.xml
similarity index 62%
copy from core/res/res/drawable/notification_icon_legacy_bg.xml
copy to core/res/res/layout/notification_template_right_icon.xml
index cc5755d..3b358ab 100644
--- a/core/res/res/drawable/notification_icon_legacy_bg.xml
+++ b/core/res/res/layout/notification_template_right_icon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2014 The Android Open Source Project
+ ~ Copyright (C) 2015 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.
@@ -15,8 +15,13 @@
~ limitations under the License
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="oval">
- <solid
- android:color="@color/notification_icon_bg_color"/>
-</shape>
+<ImageView android:id="@+id/right_icon" xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_gravity="top|end"
+ android:scaleType="centerCrop"
+ />
+
+
diff --git a/core/res/res/layout/text_edit_suggestion_container.xml b/core/res/res/layout/text_edit_suggestion_container.xml
new file mode 100644
index 0000000..04eca8f
--- /dev/null
+++ b/core/res/res/layout/text_edit_suggestion_container.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:divider="@null">
+ <ListView
+ android:id="@+id/suggestionContainer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:attr/dividerHorizontal">
+ <!-- Suggestions will be added here. -->
+ </ListView>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:divider="?android:attr/dividerHorizontal"
+ android:showDividers="middle">
+ <TextView
+ style="@android:style/Widget.Holo.SuggestionButton"
+ android:id="@+id/addToDictionaryButton"
+ android:text="@string/addToDictionary" />
+ <TextView
+ style="@android:style/Widget.Holo.SuggestionButton"
+ android:id="@+id/deleteButton"
+ android:text="@string/deleteText" />
+ </LinearLayout>
+</LinearLayout>
diff --git a/core/res/res/layout/text_edit_suggestion_container_material.xml b/core/res/res/layout/text_edit_suggestion_container_material.xml
new file mode 100644
index 0000000..d0e2467
--- /dev/null
+++ b/core/res/res/layout/text_edit_suggestion_container_material.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:divider="?android:attr/dividerHorizontal"
+ android:showDividers="middle" >
+ <ListView
+ android:id="@+id/suggestionContainer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/white"
+ android:paddingTop="8dip"
+ android:paddingBottom="8dip"
+ android:divider="@null" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ style="@android:style/Widget.Material.SuggestionButton"
+ android:id="@+id/addToDictionaryButton"
+ android:text="@string/addToDictionary" />
+ <TextView
+ style="@android:style/Widget.Material.SuggestionButton"
+ android:id="@+id/deleteButton"
+ android:text="@string/deleteText" />
+ </LinearLayout>
+</LinearLayout>
diff --git a/core/res/res/layout/text_edit_suggestion_item.xml b/core/res/res/layout/text_edit_suggestion_item.xml
index a965ddd..9dcbf2e 100644
--- a/core/res/res/layout/text_edit_suggestion_item.xml
+++ b/core/res/res/layout/text_edit_suggestion_item.xml
@@ -4,9 +4,9 @@
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.
@@ -15,16 +15,5 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="16dip"
- android:paddingEnd="16dip"
- android:paddingTop="8dip"
- android:paddingBottom="8dip"
- android:layout_gravity="start|center_vertical"
- android:singleLine="true"
- android:drawablePadding="8dip"
- android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@android:color/dim_foreground_light" />
+ style="@android:style/Widget.Holo.SuggestionItem" />
diff --git a/core/res/res/values-h320dp/bools.xml b/core/res/res/layout/text_edit_suggestion_item_material.xml
similarity index 76%
rename from core/res/res/values-h320dp/bools.xml
rename to core/res/res/layout/text_edit_suggestion_item_material.xml
index 3bbfe96..0443a97 100644
--- a/core/res/res/values-h320dp/bools.xml
+++ b/core/res/res/layout/text_edit_suggestion_item_material.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2015 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.
@@ -15,6 +14,6 @@
limitations under the License.
-->
-<resources>
- <bool name="allow_stacked_button_bar">true</bool>
-</resources>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@android:style/Widget.Material.SuggestionItem" />
+
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index f8b88a7..c3f7afc 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Stembystand"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Sluit nou"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Veiligmodus"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-stelsel"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Persoonlik"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skripte kan geïnstalleer word om program-inhoud meer toeganklik te maak."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Neem teks wat jy tik waar"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Sluit persoonlike data soos kredietkaartnommers en wagwoorde in."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Beheer vertoonskermvergroting"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Beheer die vertoonskerm se zoemvlak en posisionering."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"deaktiveer of verander statusbalk"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Laat die program toe om die statusbalk te deaktiveer en stelselikone by te voeg of te verwyder."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"wees die statusbalk"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Toeganklikheid gekanselleer."</string>
<string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g> ."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Skakel tans oor na <xliff:g id="NAME">%1$s</xliff:g> …"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Meld <xliff:g id="NAME">%1$s</xliff:g> tans af …"</string>
<string name="owner_name" msgid="2716755460376028154">"Eienaar"</string>
<string name="error_message_title" msgid="4510373083082500195">"Fout"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Hierdie verandering word nie deur jou administrateur toegelaat nie"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Vra PIN voordat jy ontspeld"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Vra ontsluitpatroon voordat jy ontspeld"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Vra wagwoord voordat jy ontspeld"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Program se grootte kan nie verander word nie; rollees dit met twee vingers."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Deur jou administrateur geïnstalleer"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Opgedateer deur jou administrateur"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Deur jou administrateur uitgevee"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> gekies</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gekies</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diverse"</string>
</resources>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index d9246bc..4de0097 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"የድምጽ እርዳታ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"አሁን ቆልፍ"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"የሚያስተማምን ሁነታ"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android ስርዓት"</string>
<string name="user_owner_label" msgid="2804351898001038951">"የግል"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"የመተግበሪያ ይዘት ይበልጥ የሚገኙ ለማድረግ ስክሪፕቶች ሊጫኑ ይችላሉ።"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"የሚተይቡት ጽሑፍ ይመልከቱ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"እንደ የክሬዲት ካርድ ቁጥሮች እና የይለፍ ቃላት ያሉ የግል ውሂብ ያካትታል።"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"የመቆጣጠሪያ ማሳያ እንዲጎላ አደራረግ"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"የማሳያውን የማጉያ ደረጃ እና አቀማመጥ ይቆጣጠሩ።"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"የሁኔቴ አሞሌ አቦዝን ወይም ቀይር"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"የስርዓት አዶዎችን ወደ ሁኔታ አሞሌ ላለማስቻል ወይም ለማከል እና ለማስወገድ ለመተግበሪያው ይፈቅዳሉ፡፡"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"የሁኔታ አሞሌ መሆን"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ተደራሽነት ተሰርዟል።"</string>
<string name="user_switched" msgid="3768006783166984410">"የአሁኑ ተጠቃሚ <xliff:g id="NAME">%1$s</xliff:g>።"</string>
<string name="user_switching_message" msgid="2871009331809089783">"ወደ <xliff:g id="NAME">%1$s</xliff:g> በመቀየር ላይ…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> በማውጣት ላይ…"</string>
<string name="owner_name" msgid="2716755460376028154">"ባለቤት"</string>
<string name="error_message_title" msgid="4510373083082500195">"ስህተት"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ይህ ለውጥ በአስተዳዳሪዎ አይፈቀድም"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ከመንቀል በፊት ፒን ጠይቅ"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ከመንቀል በፊት የማስከፈቻ ስርዓተ-ጥለት ጠይቅ"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ከመንቀል በፊት የይለፍ ቃል ጠይቅ"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"የመተግበሪያው መጠን ሊቀየር የሚችል አይደለም፣ በሁለት ጣቶች ያሸብልሉት።"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"በእርስዎ አስተዳዳሪ ተጭኗል"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"በአስተዳዳሪዎ ተዘምኗል"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"በእርስዎ አስተዳዳሪ ተሰርዟል"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጧል</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጠዋል</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"የተለያዩ"</string>
</resources>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index c62fb2c..0c05bc4 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -226,6 +226,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"المساعد الصوتي"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"قفل الآن"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"الوضع الآمن"</string>
<string name="android_system_label" msgid="6577375335728551336">"نظام Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"شخصي"</string>
@@ -256,6 +258,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"قد يتم تثبيت النصوص البرمجية لتسهيل الدخول إلى المحتوى."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ملاحظة النص الذي تكتبه"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"يتضمن بيانات شخصية مثل أرقام بطاقات الائتمان وكلمات المرور."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"التحكم في تكبير الشاشة"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"يمكنك التحكم في مستوى التكبير/التصغير للشاشة وتحديد الموضع."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"تعطيل شريط الحالة أو تعديله"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"للسماح للتطبيق بتعطيل شريط الحالة أو إضافة رموز نظام وإزالتها."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"العمل كشريط للحالة"</string>
@@ -1335,6 +1339,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"تم إلغاء تسهيل الدخول."</string>
<string name="user_switched" msgid="3768006783166984410">"المستخدم الحالي <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"جارٍ التبديل إلى <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"جارٍ الخروج <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"المالك"</string>
<string name="error_message_title" msgid="4510373083082500195">"خطأ"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"لا يسمح المشرف بإجراء هذا التغيير"</string>
@@ -1467,6 +1472,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"المطالبة برقم التعريف الشخصي قبل إزالة التثبيت"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"المطالبة بنقش إلغاء القفل قبل إزالة التثبيت"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"المطالبة بكلمة المرور قبل إزالة التثبيت"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"التطبيق غير قابل لتغيير الحجم، يمكنك تمريره بإصبعين."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"تم تثبيت الحزمة عن طريق المشرف"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"تم التحديث بواسطة المشرف"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"تم حذف الحزمة عن طريق المشرف"</string>
@@ -1571,4 +1577,5 @@
<item quantity="other">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> من العناصر</item>
<item quantity="one">تم تحديد <xliff:g id="COUNT_0">%1$d</xliff:g> عنصر</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"متنوعة"</string>
</resources>
diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml
index db91232..593400e 100644
--- a/core/res/res/values-az-rAZ/strings.xml
+++ b/core/res/res/values-az-rAZ/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Səs Yardımçısı"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"İndi kilidləyin"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Təhlükəsiz rejim"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android sistemi"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Şəxsi"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skriptlər tətbiq məzmununun daha əlçatımlı olması üçün quraşdırıla bilər."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Yazdığınız mətni izləyin"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Kredit kartı nömrələri və parollar kimi şəxsi məlumatlar daxildir."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ekran böyütməsinə nəzarət edin"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Ekran yaxınlaşdırma səviyyəsi və yerləşdirməsinə nəzarət edin."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"status panelini deaktivləşdir və ya dəyişdir"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Tətbiqə status panelini deaktiv etməyə və ya sistem ikonalarını əlavə etmək və ya silmək imkanı verir."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"status paneli edin"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Giriş imkanı ləğv edilib."</string>
<string name="user_switched" msgid="3768006783166984410">"Cari istifadəçi <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> adına keçirilir…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> çıxır..."</string>
<string name="owner_name" msgid="2716755460376028154">"Sahib"</string>
<string name="error_message_title" msgid="4510373083082500195">"Xəta"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Bu dəyişikliyə administrator icazə vermir"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ayırmadan öncə PIN istənilsin"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ayırmadan öncə kilid modeli istənilsin"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ayırmadan öncə parol istənilsin"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Tətbiq ölçüləndirilmədi, iki barmağınızla sürüşdürün."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Administratorunuz tərəfindən quraşdırılıb"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Sizin administrator tərəfindən yeniləndi"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Administratorunuz tərəfindən silinib"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seçilib</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seçilib</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Müxtəlif"</string>
</resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index fcab6d0..50f2938 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Гласова помощ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Заключване сега"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Безопасен режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Системно от Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Личен"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Скриптовете може да бъдат инсталирани, за да направят съдържанието от приложенията по-достъпно."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Наблюдение на въвеждания от вас текст"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Включва лични данни, като например номера на кредитни карти и пароли."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Управление на увеличението на дисплея"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Управление на нивото на мащаба и позиционирането на дисплея."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"деактивиране или промяна на лентата на състоянието"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Разрешава на приложението да деактивира лентата на състоянието или да добавя и премахва системни икони."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"изпълняване на ролята на лента на състоянието"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Функцията за достъпност е анулирана."</string>
<string name="user_switched" msgid="3768006783166984410">"Текущ потребител <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Превключва се към <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> излиза…"</string>
<string name="owner_name" msgid="2716755460376028154">"Собственик"</string>
<string name="error_message_title" msgid="4510373083082500195">"Грешка"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Тази промяна не е разрешена от администратора ви"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Запитване за ПИН код преди освобождаване"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Запитване за фигура за отключване преди освобождаване"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Запитване за парола преди освобождаване"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Приложението не може да се преоразмерява. Превъртете го с два пръста."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Инсталирано от администратора ви"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Актуализирано от администратора ви"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Изтрито от администратора ви"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">Избрахте <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Избрахте <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Други"</string>
</resources>
diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml
index d66c249..fdd46172 100644
--- a/core/res/res/values-bn-rBD/strings.xml
+++ b/core/res/res/values-bn-rBD/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ভয়েস সহায়তা"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"এখনই লক করুন"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"৯৯৯+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"নিরাপদ মোড"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android সিস্টেম"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ব্যক্তিগত"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"অ্যাপ্লিকেশানের সামগ্রীকে আরো অ্যাক্সেসযোগ্য করতে স্ক্রিপ্টগুলি ইনস্টল করা হতে পারে৷"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"আপনার লেখা পাঠ্যকে নিরীক্ষণ করে"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ক্রেডিট কার্ডের নম্বর ও পাসওয়ার্ডগুলির মতো ব্যক্তিগত তথ্য অন্তর্ভুক্ত করে৷"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"প্রদর্শনের বৃহত্তরীকরণ ব্যবস্থা নিয়ন্ত্রণ করুন"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"প্রদর্শনের জুমের স্তর এবং অবস্থান নির্ধারন নিয়ন্ত্রণ করুন৷"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"স্থিতি দন্ড নিষ্ক্রিয় অথবা সংশোধন করে"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"অ্যাপ্লিকেশানকে স্থিতি দন্ড অক্ষম করতে এবং সিস্টেম আইকনগুলি সরাতে দেয়৷"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"স্থিতি দন্ডে থাকুন"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"অ্যাক্সেসযোগ্যতা বাতিল করা হয়েছে৷"</string>
<string name="user_switched" msgid="3768006783166984410">"বর্তমান ব্যবহারকারী <xliff:g id="NAME">%1$s</xliff:g>৷"</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> নামের ব্যবহারকারীতে যাচ্ছে…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g>কে লগ আউট করা হচ্ছে..."</string>
<string name="owner_name" msgid="2716755460376028154">"মালিক"</string>
<string name="error_message_title" msgid="4510373083082500195">"ত্রুটি"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"এই পরিবর্তনটি আপনার প্রশাসক দ্বারা অনুমোদিত নয়"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"আনপিন করার আগে পিন চান"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"আনপিন করার আগে আনলক প্যাটার্ন চান"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"আনপিন করার আগে পাসওয়ার্ড চান"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"অ্যাপ্লিকেশানকে পুনরায় আকার দেওয়া যাবে না, দুটি আঙ্গুল ব্যবহার করে স্ক্রোল করুন৷"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"আপনার প্রশাসক দ্বারা ইনস্টল করা হয়েছে"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"আপনার প্রশাসক দ্বারা আপডেট করা হয়েছে"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"আপনার প্রশাসক দ্বারা মুছে ফেলা হয়েছে"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"বিবিধ"</string>
</resources>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index fae3b41..cb24d26 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. per veu"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloqueja ara"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"+999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mode segur"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"És possible que s\'instal·lin scripts perquè el contingut de les aplicacions sigui més accessible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar el text que escrius"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclou dades personals com ara números de targetes de crèdit i contrasenyes."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controla l\'ampliació de la pantalla"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controla el nivell i el posicionament del zoom de la pantalla."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desactivar o modificar la barra d\'estat"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permet que l\'aplicació desactivi la barra d\'estat o afegeixi i elimini icones del sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"aparèixer a la barra d\'estat"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibilitat cancel·lada."</string>
<string name="user_switched" msgid="3768006783166984410">"Usuari actual: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"S\'està canviant a <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"S\'està tancant la sessió de l\'usuari <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Propietari"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"L\'administrador no permet aquest canvi."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Sol·licita el codi PIN per anul·lar"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Sol·licita el patró de desbloqueig per anul·lar"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Demana la contrasenya per anul·lar"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"No es pot canviar la mida de l\'aplicació. Desplaça-la amb dos dits."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"L\'administrador ho ha instal·lat"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"L\'administrador l\'ha actualitzat"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"L\'administrador ho ha suprimit"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">Seleccionats: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Seleccionats: <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Altres"</string>
</resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index b68d1ef..c2f1364 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Hlas. asistence"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Zamknout"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Nouzový režim"</string>
<string name="android_system_label" msgid="6577375335728551336">"Systém Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Osobní"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Za účelem usnadnění přístupu k obsahu aplikací mohou být nainstalovány skripty."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Sledovat zadávaný text"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Sledování zahrnuje osobní údaje, jako jsou například čísla kreditních karet a hesla."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Nastavení zvětšení obsahu obrazovky"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Určuje umístění a úroveň přiblížení displeje."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"zakázání či změny stavového řádku"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Umožňuje aplikaci zakázat stavový řádek nebo přidat či odebrat systémové ikony."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"vydávání se za stavový řádek"</string>
@@ -353,7 +357,7 @@
<string name="permlab_vibrate" msgid="7696427026057705834">"ovládání vibrací"</string>
<string name="permdesc_vibrate" msgid="6284989245902300945">"Umožňuje aplikaci ovládat vibrace."</string>
<string name="permlab_flashlight" msgid="2155920810121984215">"ovládání kontrolky"</string>
- <string name="permdesc_flashlight" msgid="6522284794568368310">"Umožňuje aplikaci ovládat baterku."</string>
+ <string name="permdesc_flashlight" msgid="6522284794568368310">"Umožňuje aplikaci ovládat svítilnu."</string>
<string name="permlab_callPhone" msgid="3925836347681847954">"přímé volání na telefonní čísla"</string>
<string name="permdesc_callPhone" msgid="3740797576113760827">"Umožňuje aplikaci volat na telefonní čísla bez vašeho přičinění. Může mít za následek neočekávané poplatky nebo hovory. Toto oprávnění neumožňuje aplikaci volat na tísňová čísla. Škodlivé aplikace vás mohou připravit o peníze uskutečňováním hovorů bez vašeho svolení."</string>
<string name="permlab_accessImsCallService" msgid="3574943847181793918">"přístup ke službě zasílání rychlých zpráv pro účely hovorů"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Usnadnění zrušeno."</string>
<string name="user_switched" msgid="3768006783166984410">"Aktuální uživatel je <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Přepínání na účet <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Odhlašování uživatele <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Vlastník"</string>
<string name="error_message_title" msgid="4510373083082500195">"Chyba"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Administrátor tuto změnu zakázal"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Před uvolněním požádat o PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Před uvolněním požádat o bezpečnostní gesto"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Před uvolněním požádat o heslo"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Velikost aplikace nelze změnit. Zobrazení můžete posouvat dvěma prsty."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Nainstalováno administrátorem"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Aktualizováno administrátorem"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Smazáno administrátorem"</string>
@@ -1535,4 +1541,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> položek</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> položka</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Různé"</string>
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index f83828f..42cb42b 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Taleassistent"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lås nu"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Sikker tilstand"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personlig"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Der installeres muligvis scripts for at gøre appindhold mere tilgængeligt."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"observere tekst, du skriver"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Dette omfatter personlige data såsom kreditkortnumre og adgangskoder."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kontrollér skærmforstørrelsen"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrollér skærmens zoomniveau og position."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"deaktiver eller rediger statuslinje"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Tillader, at appen kan deaktivere statusbjælken eller tilføje og fjerne systemikoner."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"vær statusbjælken"</string>
@@ -851,7 +854,7 @@
<string name="Midnight" msgid="5630806906897892201">"Midnat"</string>
<string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
- <string name="selectAll" msgid="6876518925844129331">"Vælg alle"</string>
+ <string name="selectAll" msgid="6876518925844129331">"Markér alt"</string>
<string name="cut" msgid="3092569408438626261">"Klip"</string>
<string name="copy" msgid="2681946229533511987">"Kopier"</string>
<string name="paste" msgid="5629880836805036433">"Indsæt"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Hjælpefunktioner er annulleret."</string>
<string name="user_switched" msgid="3768006783166984410">"Nuværende bruger <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Skifter til <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> logges ud…"</string>
<string name="owner_name" msgid="2716755460376028154">"Ejer"</string>
<string name="error_message_title" msgid="4510373083082500195">"Fejl"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Din administrator har ikke givet tilladelse til at foretage denne ændring"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Bed om pinkode inden frigørelse"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Bed om oplåsningsmønster ved deaktivering"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Bed om adgangskode inden frigørelse"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Appens størrelse kan ikke ændres. Gennemgå den ved at rulle med to fingre."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installeret af din administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Opdateret af administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Slettet af din administrator"</string>
@@ -1499,4 +1504,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>valgt</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valgt</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diverse"</string>
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index ea6239c..d52c728 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Sprachassistent"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Jetzt sperren"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Abgesicherter Modus"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-System"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Privat"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skripts können installiert werden, um den Zugriff auf App-Inhalte zu erleichtern."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Text bei der Eingabe beobachten"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Einschließlich personenbezogener Daten wie Kreditkartennummern und Passwörter."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Displayvergrößerung festlegen"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Legt die Zoom-Stufe des Displays und die Zoom-Position auf dem Display fest."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"Statusleiste deaktivieren oder ändern"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Ermöglicht der App, die Statusleiste zu deaktivieren oder Systemsymbole hinzuzufügen oder zu entfernen"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"Statusleiste darstellen"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Bedienungshilfen abgebrochen"</string>
<string name="user_switched" msgid="3768006783166984410">"Aktueller Nutzer <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Wechseln zu <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> wird abgemeldet…"</string>
<string name="owner_name" msgid="2716755460376028154">"Eigentümer"</string>
<string name="error_message_title" msgid="4510373083082500195">"Fehler"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ihr Administrator lässt diese Änderung nicht zu."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Vor dem Beenden nach PIN fragen"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Vor dem Beenden nach Entsperrungsmuster fragen"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Vor dem Beenden nach Passwort fragen"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Die Größe der App kann nicht angepasst werden. Scrollen Sie sie mit zwei Fingern."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Von Ihrem Administrator installiert"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Von Ihrem Administrator aktualisiert"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Von Ihrem Administrator gelöscht"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ausgewählt</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ausgewählt</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Sonstige"</string>
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 83ad7de..f86c2fd 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Φων.υποβοηθ."</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Κλείδωμα τώρα"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Ασφαλής λειτουργία"</string>
<string name="android_system_label" msgid="6577375335728551336">"Σύστημα Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Προσωπικό"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Ενδέχεται να εγκατασταθούν σενάρια για τη βελτίωση της πρόσβασης στο περιεχόμενο της εφαρμογής."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Παρακολούθηση του κειμένου που πληκτρολογείτε"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Περιλαμβάνει προσωπικά δεδομένα, όπως είναι οι αριθμοί πιστωτικών καρτών και οι κωδικοί πρόσβασης."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ελέγξτε τη μεγέθυνση της οθόνης"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Ελέγξτε το επίπεδο ζουμ και τη θέση της οθόνης."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"απενεργοποίηση ή τροποποίηση γραμμής κατάστασης"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Επιτρέπει στην εφαρμογή να απενεργοποιεί τη γραμμή κατάστασης ή να προσθέτει και να αφαιρεί εικονίδια συστήματος."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ορισμός ως γραμμής κατάστασης"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Η λειτουργία προσβασιμότητας ακυρώθηκε."</string>
<string name="user_switched" msgid="3768006783166984410">"Τρέχων χρήστης <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Εναλλαγή σε <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Αποσύνδεση <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Κάτοχος"</string>
<string name="error_message_title" msgid="4510373083082500195">"Σφάλμα"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Αυτή η αλλαγή δεν επιτρέπεται από το διαχειριστή σας"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Να γίνεται ερώτηση για το PIN, πριν από το ξεκαρφίτσωμα"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Να γίνεται ερώτηση για το μοτίβο ξεκλειδώματος, πριν από το ξεκαρφίτσωμα"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Να γίνεται ερώτηση για τον κωδικό πρόσβασης, πριν από το ξεκαρφίτσωμα"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Το μέγεθος της εφαρμογής δεν είναι προσαρμόσιμο. Σύρετε προς τα κάτω με δύο δάχτυλα."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Εγκαταστάθηκε από το διαχειριστή σας"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Ενημερώθηκε από το διαχειριστή σας"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Διαγράφηκε από το διαχειριστή σας"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">Επιλέχτηκαν <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Επιλέχτηκε <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Διάφορα"</string>
</resources>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 7ff1ef3..e23f8d5 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Scripts may be installed to make app content more accessible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observe text that you type"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Includes personal data such as credit card numbers and passwords."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Control display magnification"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Control the display\'s zoom level and positioning."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"disable or modify status bar"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Allows the app to disable the status bar or add and remove system icons."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"be the status bar"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibility cancelled."</string>
<string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Switching to <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Logging out <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Owner"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"This change isn\'t allowed by your administrator"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ask for PIN before unpinning"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ask for unlock pattern before unpinning"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ask for password before unpinning"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"App is not resizeable, scroll it with two fingers."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installed by your administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Updated by your administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Deleted by your administrator"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Miscellaneous"</string>
</resources>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 7ff1ef3..e23f8d5 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Scripts may be installed to make app content more accessible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observe text that you type"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Includes personal data such as credit card numbers and passwords."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Control display magnification"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Control the display\'s zoom level and positioning."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"disable or modify status bar"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Allows the app to disable the status bar or add and remove system icons."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"be the status bar"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibility cancelled."</string>
<string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Switching to <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Logging out <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Owner"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"This change isn\'t allowed by your administrator"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ask for PIN before unpinning"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ask for unlock pattern before unpinning"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ask for password before unpinning"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"App is not resizeable, scroll it with two fingers."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installed by your administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Updated by your administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Deleted by your administrator"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Miscellaneous"</string>
</resources>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 7ff1ef3..e23f8d5 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Scripts may be installed to make app content more accessible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observe text that you type"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Includes personal data such as credit card numbers and passwords."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Control display magnification"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Control the display\'s zoom level and positioning."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"disable or modify status bar"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Allows the app to disable the status bar or add and remove system icons."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"be the status bar"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibility cancelled."</string>
<string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Switching to <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Logging out <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Owner"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"This change isn\'t allowed by your administrator"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ask for PIN before unpinning"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ask for unlock pattern before unpinning"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ask for password before unpinning"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"App is not resizeable, scroll it with two fingers."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installed by your administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Updated by your administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Deleted by your administrator"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Miscellaneous"</string>
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index bc05551..b442bc1f 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear ahora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Es posible que se instalen secuencias de comandos para que el contenido de las aplicaciones sea más accesible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar el texto que escribes"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Incluye datos personales, como números de tarjeta de crédito y contraseñas."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar la ampliación de pantalla"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controla el posicionamiento y el nivel de zoom de la pantalla."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desactivar o modificar la barra de estado"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite que la aplicación inhabilite la barra de estado o que agregue y elimine íconos del sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"aparecer en la barra de estado"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Se canceló la accesibilidad."</string>
<string name="user_switched" msgid="3768006783166984410">"Usuario actual: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Cambiando a <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Saliendo de <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Propietario"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"El administrador no permite este cambio."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicitar PIN para quitar fijación"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicitar patrón de desbloqueo para quitar fijación"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicitar contraseña para quitar fijación"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"No se puede modificar el tamaño de la app, desplázala con dos dedos."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Lo instaló el administrador."</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizado por el administrador"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Lo eliminó el administrador."</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos seleccionados</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento seleccionado</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Varios"</string>
</resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index aadf387..acbef23 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear ahora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"> 999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -243,7 +245,7 @@
<string name="permgrouplab_phone" msgid="5229115638567440675">"Teléfono"</string>
<string name="permgroupdesc_phone" msgid="6234224354060641055">"hacer y administrar llamadas de teléfono"</string>
<string name="permgrouplab_sensors" msgid="416037179223226722">"Sensores corporales"</string>
- <string name="permgroupdesc_sensors" msgid="7147968539346634043">"acceder a datos del sensor sobre tus constantes vitales"</string>
+ <string name="permgroupdesc_sensors" msgid="7147968539346634043">"acceder a datos de sensores de tus constantes vitales"</string>
<string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Recuperar el contenido de la ventana"</string>
<string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Inspecciona el contenido de una ventana con la que estés interactuando."</string>
<string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Activar la exploración táctil"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Es posible que se instalen secuencias de comandos para que el contenido de las aplicaciones sea más accesible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar el texto que escribes"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Incluye datos personales como números de tarjetas de crédito y contraseñas."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controla la ampliación de la pantalla"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controla el posicionamiento y el nivel de zoom de la pantalla."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"inhabilitar o modificar la barra de estado"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite que la aplicación inhabilite la barra de estado o añada y elimine iconos del sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"aparecer en la barra de estado"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accesibilidad cancelada"</string>
<string name="user_switched" msgid="3768006783166984410">"Usuario actual: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Cambiando a <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Cerrando la sesión de <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Propietario"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"El administrador no permite este cambio"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicitar PIN para desactivar"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicitar patrón de desbloqueo para desactivar"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicitar contraseña para desactivar"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"No se puede cambiar el tamaño de la aplicación: desplázala con dos dedos."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalado por tu administrador"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizado por tu administrador"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Eliminado por tu administrador"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seleccionados</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seleccionado</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Varios"</string>
</resources>
diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml
index 4aed72d..9a96683 100644
--- a/core/res/res/values-et-rEE/strings.xml
+++ b/core/res/res/values-et-rEE/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Häälabi"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lukusta kohe"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Turvarežiim"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-süsteem"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Isiklik"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Rakenduse sisu kättesaadavamaks muutmiseks võidakse installida skripte."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Sisestatud teksti jälgimine"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Sisaldab isiklikke andmeid, nt krediitkaardi numbreid ja paroole."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ekraani suurenduse juhtimine"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Saate juhtida ekraani suumitaset ja asendit."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"keela või muuda olekuriba"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Võimaldab rakendusel keelata olekuriba või lisada ja eemaldada süsteemiikoone."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"olekuribana kuvamine"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Hõlbustus on tühistatud."</string>
<string name="user_switched" msgid="3768006783166984410">"Praegune kasutaja <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Üleminek kasutajale <xliff:g id="NAME">%1$s</xliff:g> ..."</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Kasutaja <xliff:g id="NAME">%1$s</xliff:g> väljalogimine …"</string>
<string name="owner_name" msgid="2716755460376028154">"Omanik"</string>
<string name="error_message_title" msgid="4510373083082500195">"Viga"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Administraator ei luba sellist muudatust teha"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Enne vabastamist küsi PIN-koodi"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Enne vabastamist küsi avamismustrit"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Enne vabastamist küsi parooli"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Rakenduse suurust ei saa muuta. Kerige kahe sõrmega."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installis teie administraator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Värskendas administraator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Kustutas teie administraator"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> on valitud</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> on valitud</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Mitmesugust"</string>
</resources>
diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml
index 9f10506..a30c437 100644
--- a/core/res/res/values-eu-rES/strings.xml
+++ b/core/res/res/values-eu-rES/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ahots-laguntza"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Blokeatu"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modu segurua"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android sistema"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Pertsonalak"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Scriptak instala daitezke aplikazioaren edukia erabilerrazagoa egiteko."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Behatu idazten duzun testua"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Ez da salbuespenik egiten datu pertsonalekin, hala nola, kreditu-txartelen zenbakiekin eta pasahitzekin."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kontrolatu pantailaren zoom-maila"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrolatu pantailaren zoom-maila eta kokapena."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"Desgaitu edo aldatu egoera-barra"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Egoera-barra desgaitzea edo sistema-ikonoak gehitzea edo kentzea baimentzen die aplikazioei."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"Bihurtu egoera-barra"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Erabilerraztasuna bertan behera utzi da."</string>
<string name="user_switched" msgid="3768006783166984410">"Uneko erabiltzailea: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailera aldatzen…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen saioa amaitzen…"</string>
<string name="owner_name" msgid="2716755460376028154">"Jabea"</string>
<string name="error_message_title" msgid="4510373083082500195">"Errorea"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Zure administratzaileak ez du aldaketa egiteko baimena eman"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Eskatu PIN kodea aingura kendu aurretik"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Eskatu desblokeatzeko eredua aingura kendu aurretik"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Eskatu pasahitza aingura kendu aurretik"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Ezin da aldatu aplikazioaren tamaina. Erabili bi hatz aplikazioan gora eta behera egiteko."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Administratzaileak instalatu du"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Administratzaileak eguneratu du"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Administratzaileak ezabatu du"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> hautatuta</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hautatuta</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Askotarikoak"</string>
</resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 2a41913..8672171 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -191,7 +191,7 @@
<string name="reboot_to_update_prepare" msgid="6305853831955310890">"آمادهسازی برای بهروزرسانی…"</string>
<string name="reboot_to_update_package" msgid="3871302324500927291">"در حال پردازش بستهبندی بهروز…"</string>
<string name="reboot_to_update_reboot" msgid="6428441000951565185">"در حال راهاندازی مجدد…"</string>
- <string name="reboot_to_reset_title" msgid="4142355915340627490">"بازنشانی به دادههای کارخانه"</string>
+ <string name="reboot_to_reset_title" msgid="4142355915340627490">"بازنشانی دادههای کارخانه"</string>
<string name="reboot_to_reset_message" msgid="2432077491101416345">"در حال راهاندازی مجدد…"</string>
<string name="shutdown_progress" msgid="2281079257329981203">"در حال خاموش شدن…"</string>
<string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"رایانهٔ لوحی شما خاموش میشود."</string>
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"دستیار صوتی"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"اکنون قفل شود"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"بیشتر از 999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"حالت ایمن"</string>
<string name="android_system_label" msgid="6577375335728551336">"سیستم Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"شخصی"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ممکن است جهت افزایش دسترسپذیری به محتوای برنامه، اسکریپتهایی نصب شود."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"نوشتاری را که تایپ میکنید مشاهده کند"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"اطلاعات شخصی مانند شماره کارت اعتباری و گذرواژهها را لحاظ میکند."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"کنترل درشتنمایی نمایشگر"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"سطح و موقعیت بزرگنمایی نمایشگر را کنترل کنید."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"غیرفعال کردن یا تغییر نوار وضعیت"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"به برنامه اجازه میدهد تا نوار وضعیت را غیرفعال کند یا نمادهای سیستم را اضافه یا حذف کند."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"نوار وضعیت باشد"</string>
@@ -509,9 +513,9 @@
<string name="policylab_forceLock" msgid="2274085384704248431">"قفل کردن صفحه"</string>
<string name="policydesc_forceLock" msgid="1141797588403827138">"نحوه و زمان قفل شدن صفحه را کنترل میکند."</string>
<string name="policylab_wipeData" msgid="3910545446758639713">"پاک کردن تمام دادهها"</string>
- <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"با انجام بازنشانی به دادههای کارخانه، دادههای رایانهٔ لوحی بدون هشدار پاک میشود."</string>
- <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"دادههای تلویزیون را بدون هشدار با انجام بازنشانی به داده کارخانه پاک کنید."</string>
- <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"با انجام بازنشانی به دادههای کارخانه، دادههای تلفن بدون هشدار پاک میشود."</string>
+ <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"با انجام بازنشانی دادههای کارخانه، دادههای رایانهٔ لوحی بدون هشدار پاک میشود."</string>
+ <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"دادههای تلویزیون را بدون هشدار با انجام بازنشانی دادههای کارخانه پاک کنید."</string>
+ <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"با انجام بازنشانی دادههای کارخانه، دادههای تلفن بدون هشدار پاک میشود."</string>
<string name="policylab_wipeData_secondaryUser" msgid="8362863289455531813">"پاک کردن دادههای کاربر"</string>
<string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"دادههای این کاربر را در این رایانه لوحی بدون هشدار پاک میکند."</string>
<string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"دادههای این کاربر را در این تلویزیون بدون هشدار پاک میکند."</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"دسترسپذیری لغو شد."</string>
<string name="user_switched" msgid="3768006783166984410">"کاربر کنونی <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"در حالت تغییر به <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"در حال خروج از سیستم <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"دارنده"</string>
<string name="error_message_title" msgid="4510373083082500195">"خطا"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"این تغییر از طرف سرپرستتان مجاز دانسته نشده است"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"درخواست کد پین قبل از برداشتن پین"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"درخواست الگوی باز کردن قفل قبل از برداشتن پین"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"درخواست گذرواژه قبل از برداشتن پین"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"اندازه برنامه قابل تغییر نیست، با دو انگشت آن را پیمایش کنید."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"توسط سرپرستتان نصب شد"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"توسط سرپرست شما بهروزرسانی شد"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"توسط سرپرستتان حذف شد"</string>
@@ -1479,7 +1485,7 @@
<string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"آخر هفته"</string>
<string name="zen_mode_default_events_name" msgid="8158334939013085363">"رویداد"</string>
<string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> آن را بیصدا کرد"</string>
- <string name="system_error_wipe_data" msgid="6608165524785354962">"دستگاهتان یک مشکل داخلی دارد، و ممکن است تا زمانی که بازنشانی به داده کارخانه انجام نگیرد، بیثبات بماند."</string>
+ <string name="system_error_wipe_data" msgid="6608165524785354962">"دستگاهتان یک مشکل داخلی دارد، و ممکن است تا زمانی که بازنشانی دادههای کارخانه انجام نگیرد، بیثبات بماند."</string>
<string name="system_error_manufacturer" msgid="8086872414744210668">"دستگاهتان یک مشکل داخلی دارد. برای جزئیات آن با سازندهتان تماس بگیرید."</string>
<string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"درخواست USSD به درخواست DIAL اصلاح میشود."</string>
<string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"درخواست USSD به درخواست SS اصلاح میشود."</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> انتخاب شد</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> انتخاب شد</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"متفرقه"</string>
</resources>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index b83307e..8100305 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ääniapuri"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lukitse nyt"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Suojattu tila"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-järjestelmä"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Henkilökoht."</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Sovellus voi asentaa ohjelmia tehdäkseen sisällöstään esteettömämmän."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Tarkkailla kirjoittamaasi tekstiä"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Sisältää henkilökohtaisia tietoja, kuten luottokortin numeroita ja salasanoja."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Näytön suurentamisen hallinnointi"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Hallinnoi näytön zoomaustasoa ja asettelua."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"poista tilapalkki käytöstä tai muokkaa tilapalkkia"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Antaa sovelluksen poistaa tilapalkin käytöstä ja lisätä tai poistaa järjestelmäkuvakkeita."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"sijaita tilapalkissa"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Esteettömyystila peruutettu."</string>
<string name="user_switched" msgid="3768006783166984410">"Nykyinen käyttäjä: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Vaihdetaan käyttäjään <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> kirjautuu ulos…"</string>
<string name="owner_name" msgid="2716755460376028154">"Omistaja"</string>
<string name="error_message_title" msgid="4510373083082500195">"Virhe"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Järjestelmänvalvoja ei salli tätä muutosta"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Pyydä PIN ennen irrotusta"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pyydä lukituksenpoistokuvio ennen irrotusta"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pyydä salasana ennen irrotusta"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Sovelluksen koko ei muutu. Vieritä näkymää kahdella sormella."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Järjestelmänvalvoja on asentanut paketin."</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Järjestelmänvalvojasi on päivittänyt paketin."</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Järjestelmänvalvoja on poistanut paketin."</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valittu</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> valittu</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Muut"</string>
</resources>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index 6f54ece..b273980 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. vocale"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Verrouiller"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mode sécurisé"</string>
<string name="android_system_label" msgid="6577375335728551336">"Système Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personnel"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Vous pouvez installer des scripts pour rendre le contenu des applications plus accessible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observer le texte que vous saisissez"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclut des données personnelles telles que les numéros de cartes de paiement et les mots de passe."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Contrôler l\'agrandissement de l\'écran"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Contrôler le niveau de zoom et le positionnement de l\'écran."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"désactiver ou modifier la barre d\'état"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permet à l\'application de désactiver la barre d\'état, ou d\'ajouter et de supprimer des icônes système."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"servir de barre d\'état"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibilité annulée."</string>
<string name="user_switched" msgid="3768006783166984410">"Utilisateur actuel : <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Changement d\'utilisateur (<xliff:g id="NAME">%1$s</xliff:g>) en cours…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Déconnexion de <xliff:g id="NAME">%1$s</xliff:g> en cours..."</string>
<string name="owner_name" msgid="2716755460376028154">"Propriétaire"</string>
<string name="error_message_title" msgid="4510373083082500195">"Erreur"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Cette modification n\'est pas autorisée par votre administrateur"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Demander le NIP avant d\'annuler l\'épinglage"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Impossible de redimensionner l\'application. Faites-la défiler avec deux doigts."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installé par votre administrateur"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Mis à jour par votre administrateur"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Supprimé par votre administrateur"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Divers"</string>
</resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 7a7a814..850c18a 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Assistance vocale"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Verrouiller"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mode sécurisé"</string>
<string name="android_system_label" msgid="6577375335728551336">"Système Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personnel"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Vous pouvez installer des scripts pour rendre le contenu des applications plus accessible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observer le texte que vous saisissez"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclut des données personnelles telles que les numéros de cartes de paiement et les mots de passe."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Contrôler l\'agrandissement de l\'écran"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Contrôler le niveau de zoom et le positionnement de l\'écran"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"Désactivation ou modification de la barre d\'état"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permet à l\'application de désactiver la barre d\'état, ou d\'ajouter et de supprimer des icônes système."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"remplacer la barre d\'état"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibilité annulée."</string>
<string name="user_switched" msgid="3768006783166984410">"Utilisateur actuel : <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Chargement du profil de <xliff:g id="NAME">%1$s</xliff:g>..."</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Déconnexion de <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Propriétaire"</string>
<string name="error_message_title" msgid="4510373083082500195">"Erreur"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Votre administrateur n\'autorise pas cette modification."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Demander le code PIN avant d\'annuler l\'épinglage"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Il est impossible de redimensionner l\'application. Faites-la défiler avec deux doigts."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installé par votre administrateur"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Mis à jour par votre administrateur"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Supprimé par votre administrateur"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Divers"</string>
</resources>
diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml
index ab24047..998f494 100644
--- a/core/res/res/values-gl-rES/strings.xml
+++ b/core/res/res/values-gl-rES/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Persoal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"É posible que se instalen scripts para que o contido da aplicación resulte máis accesible."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar o texto que escribes"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclúe datos persoais como números e contrasinais de tarxetas de crédito."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar ampliación da pantalla"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlar o nivel do zoom e o posicionamento da pantalla"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desactivar ou modificar a barra de estado"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite á aplicación desactivar a barra de estado ou engadir e eliminar as iconas do sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"actuar como a barra de estado"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accesibilidade cancelada"</string>
<string name="user_switched" msgid="3768006783166984410">"Usuario actual <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Cambiando a <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Pechando sesión de <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Propietario"</string>
<string name="error_message_title" msgid="4510373083082500195">"Erro"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"O administrador non admite este cambio"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicitar un PIN antes de soltar a pantalla"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicitar un padrón de desbloqueo antes de soltar a pantalla"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicitar un contrasinal antes de soltar a pantalla"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Non se pode cambiar o tamaño da aplicación. Desprázate por ela con dous dedos."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalado polo administrador"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizado polo administrador"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Eliminado polo administrador"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">Seleccionáronse <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Seleccionouse <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Varios"</string>
</resources>
diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml
index 93faa70..7cfd200 100644
--- a/core/res/res/values-gu-rIN/strings.xml
+++ b/core/res/res/values-gu-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"વૉઇસ સહાય"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"હવે લૉક કરો"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"સુરક્ષિત મોડ"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android સિસ્ટમ"</string>
<string name="user_owner_label" msgid="2804351898001038951">"વ્યક્તિગત"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"એપ્લિકેશન સામગ્રીને વધુ ઍક્સેસિબલ બનાવવા માટે સ્ક્રિપ્ટ્સ ઇન્સ્ટોલ કરી શકાય છે."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"તમે લખો તે ટેક્સ્ટનું અવલોકન કરો"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ક્રેડિટ કાર્ડ નંબર્સ અને પાસવર્ડ્સ જેવો વ્યક્તિગત ડેટા શામેલ છે."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"પ્રદર્શન વિસ્તૃતિકરણ નિયંત્રિત કરો"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"પ્રદર્શનનું ઝૂમ સ્તર અને સ્થિતિનિર્ધારણ નિયંત્રિત કરો."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"સ્થિતિ બાર અક્ષમ કરો અથવા સંશોધિત કરો"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"એપ્લિકેશનને સ્થિતિ બાર અક્ષમ કરવાની અથવા સિસ્ટમ આયકન્સ ઉમેરવા અને દૂર કરવાની મંજૂરી આપે છે."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"સ્થિતિ બાર થાઓ"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ઍક્સેસિબિલિટી રદ કરી."</string>
<string name="user_switched" msgid="3768006783166984410">"વર્તમાન વપરાશકર્તા <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> પર સ્વિચ કરી રહ્યાં છે…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> લોગ આઉટ થઈ રહ્યાં છે…"</string>
<string name="owner_name" msgid="2716755460376028154">"માલિક"</string>
<string name="error_message_title" msgid="4510373083082500195">"ભૂલ"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"તમારા વ્યવસ્થાપક દ્વારા આ પરિવર્તનની મંજૂરી નથી"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"અનપિન કરતાં પહેલાં PIN માટે પૂછો"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"અનપિન કરતા પહેલાં અનલૉક પેટર્ન માટે પૂછો"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"અનપિન કરતાં પહેલાં પાસવર્ડ માટે પૂછો"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ઍપ્લિકેશનનું કદ બદલવા યોગ્ય નથી, બે આંગળીઓ વડે તેને સ્ક્રોલ કરો."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"તમારા વ્યવસ્થાપક દ્વારા ઇન્સ્ટોલ કરેલ"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"તમારા વ્યવસ્થાપક દ્વારા અપડેટ થયેલ"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"તમારા વ્યવસ્થાપક દ્વારા કાઢી નાખેલ"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"વિવિધ"</string>
</resources>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index 6dba1fb..a001211 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"वॉइस सहायक"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"अभी लॉक करें"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"सुरक्षित मोड"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android सिस्टम"</string>
<string name="user_owner_label" msgid="2804351898001038951">"व्यक्तिगत"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ऐप्स सामग्री को अधिक पहुंच-योग्य बनाने के लिए स्क्रिप्ट इंस्टॉल किए जा सकते हैं."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"आपके द्वारा लिखे हुए लेख को ध्यान से देखें"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"क्रेडिट कार्ड नंबर और पासवर्ड जैसा व्यक्तिगत डेटा शामिल होता है."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"प्रदर्शन आवर्धन नियंत्रित करें"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"प्रदर्शन का ज़ूम स्तर और स्थिति निर्धारण नियंत्रित करें."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"स्थिति बार अक्षम या बदलें"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ऐप्स को स्थिति बार अक्षम करने या सिस्टम आइकन को जोड़ने या निकालने देता है."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"स्थिति बार होने दें"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"आसान तरीका रद्द की गई."</string>
<string name="user_switched" msgid="3768006783166984410">"वर्तमान उपयोगकर्ता <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> पर स्विच किया जा रहा है…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> द्वारा प्रस्थान किया जा रहा है…"</string>
<string name="owner_name" msgid="2716755460376028154">"स्वामी"</string>
<string name="error_message_title" msgid="4510373083082500195">"त्रुटि"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"यह बदलाव आपके व्यवस्थापक द्वारा अनुमत नहीं है"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"अनपिन करने से पहले पिन के लिए पूछें"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"अनपिन करने से पहले अनलॉक पैटर्न के लिए पूछें"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"अनपिन करने से पहले पासवर्ड के लिए पूछें"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ऐप का आकार बदला नहीं जा सकता है, इसे दो अंगुलियों से स्क्रॉल करें."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"आपके नियंत्रक द्वारा इंस्टॉल किया गया"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"आपके नियंत्रक द्वारा अपडेट किया गया"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"आपके नियंत्रक द्वारा हटाया गया"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"विविध"</string>
</resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 643cf0d..55399af 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -223,6 +223,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj sada"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Siguran način rada"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sustav Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Osobno"</string>
@@ -253,6 +255,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Kako bi sadržaj aplikacije bio pristupačniji, mogu se instalirati skripte."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Pratiti tekst koji pišete"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Uključuje osobne podatke kao što su brojevi kreditnih kartica i zaporke."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kontrola uvećanja zaslona"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrolira razinu zumiranja i položaj zaslona."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"onemogućavanje ili izmjena trake statusa"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Aplikaciji omogućuje onemogućavanje trake statusa ili dodavanje i uklanjanje sistemskih ikona."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"biti traka statusa"</string>
@@ -1311,6 +1315,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Pristupačnost otkazana."</string>
<string name="user_switched" msgid="3768006783166984410">"Trenutačni korisnik <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Prebacivanje na korisnika <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Odjavljivanje korisnika <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Vlasnik"</string>
<string name="error_message_title" msgid="4510373083082500195">"Pogreška"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Vaš administrator ne dopušta tu promjenu"</string>
@@ -1440,6 +1445,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Traži PIN radi otkvačivanja"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Traži uzorak za otključavanje radi otkvačivanja"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Traži zaporku radi otkvačivanja"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Veličina aplikacije ne može se mijenjati, pomičite je s dva prsta."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalirao administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Ažurira vaš administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Izbrisao administrator"</string>
@@ -1517,4 +1523,5 @@
<item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> odabrane</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> odabranih</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Razno"</string>
</resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index a6fdad3..dc87943 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Hangsegéd"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Zárolás most"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Biztonsági üzemmód"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android rendszer"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Személyes"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Szkripteket lehet telepíteni, hogy könnyebb legyen hozzáférni az alkalmazások tartalmához."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"A gépelt szöveg figyelése"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Beleértve a személyes adatokat, például a hitelkártyaszámokat és jelszavakat."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"A kijelző nagyításának vezérlése"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"A kijelző nagyítási/kicsinyítési szintjének és pozíciójának vezérlése"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"állapotsor kikapcsolása vagy módosítása"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Lehetővé teszi az alkalmazás számára az állapotsor kikapcsolását, illetve rendszerikonok hozzáadását és eltávolítását."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"az állapotsor szerepének átvétele"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Hozzáférés megszakítva."</string>
<string name="user_switched" msgid="3768006783166984410">"<xliff:g id="NAME">%1$s</xliff:g> az aktuális felhasználó."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Átváltás erre: <xliff:g id="NAME">%1$s</xliff:g>..."</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> kijelentkeztetése folyamatban van…"</string>
<string name="owner_name" msgid="2716755460376028154">"Tulajdonos"</string>
<string name="error_message_title" msgid="4510373083082500195">"Hiba"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Rendszergazdája nem engedélyezi ezt a módosítást"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"PIN-kód kérése a rögzítés feloldásához"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Feloldási minta kérése a rögzítés feloldásához"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Jelszó kérése a rögzítés feloldásához"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Az alkalmazást nem lehet átméretezni – két ujjal görgessen."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"A rendszergazda telepítette"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Frissítette a rendszergazda"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"A rendszergazda törölte"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> kiválasztva</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kiválasztva</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Vegyes"</string>
</resources>
diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml
index e829a76..f1d32d8 100644
--- a/core/res/res/values-hy-rAM/strings.xml
+++ b/core/res/res/values-hy-rAM/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ձայնային օգնութ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Կողպել հիմա"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Անվտանգ ռեժիմ"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android համակարգ"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Անձնական"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Հնարավոր է սկրիպտներ տեղադրվեն` ծրագրի բովանդակությունն ավելի մատչելի դարձնելու համար:"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Զննել ձեր մուտքագրած տեքստը"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Ներառում է անձնական տվյալներ, ինչպիսիք են վարկային քարտերի համարները և գաղտնաբառերը:"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ցուցասարքի խոշորացման կառավարում"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Ցուցասարքի մասշտաբավորման և դիրքավորման կառավարում:"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"անջատել կամ փոփոխել կարգավիճակի գոտին"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Թույլ է տալիս հավելվածին անջատել կարգավիճակի գոտին կամ ավելացնել ու հեռացնել համակարգի պատկերակները:"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"լինել կարգավիճակի գոտի"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Մուտքի հնարավորությունը չեղարկված է:"</string>
<string name="user_switched" msgid="3768006783166984410">"Ներկայիս օգտվողը <xliff:g id="NAME">%1$s</xliff:g>:"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Փոխարկվում է <xliff:g id="NAME">%1$s</xliff:g>-ին..."</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Ելք <xliff:g id="NAME">%1$s</xliff:g>-ից…"</string>
<string name="owner_name" msgid="2716755460376028154">"Սեփականատեր"</string>
<string name="error_message_title" msgid="4510373083082500195">"Սխալ"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Այս փոփոխությունը չի թույլատրվում ձեր ադմինիստրատորի կողմից:"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ապաամրացնելուց առաջ հարցնել ապակողպող նախշը"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Հավելվածի չափը հնարավոր չէ փոխել, ոլորեք այն երկու մատի օգնությամբ:"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Ադմինիստրատորը տեղադրել է այն"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Ադմինիստրատորը թարմացրել է այն"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Ադմինիստրատորը ջնջել է այն"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="other">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Զանազան"</string>
</resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index f626389..8e18dae 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Kunci sekarang"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mode aman"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Pribadi"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skrip mungkin dipasang agar konten aplikasi lebih dapat diakses."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Mengamati teks yang Anda ketik"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Meliputi data pribadi seperti nomor kartu kredit dan sandi."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Mengontrol perbesaran layar"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Mengontrol tingkat zoom dan pemosisian layar."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"nonaktifkan atau ubah bilah status"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Mengizinkan apl menonaktifkan bilah status atau menambah dan menghapus ikon sistem."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"jadikan bilah status"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Aksesibilitas dibatalkan."</string>
<string name="user_switched" msgid="3768006783166984410">"Pengguna saat ini <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Beralih ke <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Mengeluarkan <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Pemilik"</string>
<string name="error_message_title" msgid="4510373083082500195">"Kesalahan"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Perubahan ini tidak diizinkan oleh administrator Anda"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Meminta PIN sebelum melepas sematan"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Meminta pola pembukaan kunci sebelum melepas sematan"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Meminta sandi sebelum melepas sematan"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Aplikasi tidak dapat diubah ukurannya, gulir dengan dua jari."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Dipasang oleh administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Diperbarui oleh administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Dihapus oleh administrator"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Lain-Lain"</string>
</resources>
diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml
index 3ebbad7..b2c98f0 100644
--- a/core/res/res/values-is-rIS/strings.xml
+++ b/core/res/res/values-is-rIS/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Raddaðstoð"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Læsa núna"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Örugg stilling"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android kerfið"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Persónulegt"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Hægt er að setja upp skriftur til að bæta aðgengi að efni forrits."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Fylgjast með texta sem þú slærð inn"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Felur í sér persónuleg gögn á borð við kreditkortanúmer og aðgangsorð."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Stilla skjástærð"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Stjórnaðu aðdrætti og afstöðu skjásins."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"slökkva á eða breyta stöðustiku"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Leyfir forriti að slökkva á stöðustikunni eða bæta við og fjarlægja kerfistákn."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"vera stöðustikan"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Hætt við aukið aðgengi."</string>
<string name="user_switched" msgid="3768006783166984410">"Núverandi notandi <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Skiptir yfir á <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Skráir <xliff:g id="NAME">%1$s</xliff:g> út…"</string>
<string name="owner_name" msgid="2716755460376028154">"Eigandi"</string>
<string name="error_message_title" msgid="4510373083082500195">"Villa"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Stjórnandinn þinn leyfir ekki þessa breytingu."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Biðja um PIN-númer til að losa"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Biðja um opnunarmynstur til að losa"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Biðja um aðgangsorð til að losa"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Ekki er hægt að breyta stærð forritsins, flettu upp og niður með tveimur fingrum."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Uppsett af kerfisstjóra"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Uppfært af kerfisstjóranum"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Eytt af kerfisstjóra"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> valið</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valin</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Ýmislegt"</string>
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 521eae2..b36e2e5 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Blocca ora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Modalità provvisoria"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personale"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Potrebbero essere installati script per rendere più accessibili i contenuti delle app."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Osservare il testo digitato"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Sono inclusi dati personali come numeri di carte di credito e password."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlla l\'ingrandimento del display"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlla il livello di zoom e la posizione del display."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"disattivare o modificare la barra di stato"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Consente all\'applicazione di disattivare la barra di stato o di aggiungere e rimuovere icone di sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ruolo di barra di stato"</string>
@@ -914,7 +917,7 @@
<string name="screen_compat_mode_hint" msgid="1064524084543304459">"Riattivala in Impostazioni di sistema > Applicazioni > Scaricate."</string>
<string name="smv_application" msgid="3307209192155442829">"L\'applicazione <xliff:g id="APPLICATION">%1$s</xliff:g> (processo <xliff:g id="PROCESS">%2$s</xliff:g>) ha violato la norma StrictMode autoimposta."</string>
<string name="smv_process" msgid="5120397012047462446">"Il processo <xliff:g id="PROCESS">%1$s</xliff:g> ha violato la norma StrictMode autoimposta."</string>
- <string name="android_upgrading_title" msgid="1584192285441405746">"Upgrade di Android..."</string>
+ <string name="android_upgrading_title" msgid="1584192285441405746">"Aggiornamento di Android..."</string>
<string name="android_start_title" msgid="8418054686415318207">"Avvio di Android…"</string>
<string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ottimizzazione archiviazione."</string>
<string name="android_upgrading_apk" msgid="7904042682111526169">"Ottimizzazione applicazione <xliff:g id="NUMBER_0">%1$d</xliff:g> di <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibilità annullata."</string>
<string name="user_switched" msgid="3768006783166984410">"Utente corrente <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Passaggio a <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Disconnessione di <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Proprietario"</string>
<string name="error_message_title" msgid="4510373083082500195">"Errore"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Questa modifica non è consentita dal tuo amministratore"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Richiedi il PIN per lo sblocco"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Richiedi sequenza di sblocco prima di sbloccare"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Richiedi password prima di sbloccare"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Non è posssibile ridimensionare l\'app: scorri con due dita."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installato dall\'amministratore"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Aggiornato dall\'amministratore"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Eliminato dall\'amministratore"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi selezionati</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento selezionato</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Vari"</string>
</resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index 4eb153a..cf4ca52 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"נעל עכשיו"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"מצב בטוח"</string>
<string name="android_system_label" msgid="6577375335728551336">"מערכת Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"אישי"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ייתכן שסקריפטים יותקנו על מנת להקל את הגישה אל תוכן של אפליקציות."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"הצגת טקסט בזמן הקלדה"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"כולל נתונים אישיים כמו מספרי כרטיס אשראי וסיסמאות."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"שליטה בהגדלת התצוגה"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"קבע את המרחק מהתצוגה ואת מיקום התצוגה."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"השבת או שנה את שורת המצב"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"מאפשר לאפליקציה להשבית את שורת המצב או להוסיף ולהסיר סמלי מערכת."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"להיות שורת הסטטוס"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"נגישות בוטלה."</string>
<string name="user_switched" msgid="3768006783166984410">"המשתמש הנוכחי <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"עובר אל <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"מתבצע ניתוק של <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"בעלים"</string>
<string name="error_message_title" msgid="4510373083082500195">"שגיאה"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"מנהל המערכת שלך אינו מתיר שינוי זה"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"בקש PIN לפני ביטול הצמדה"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"בקש קו ביטול נעילה לפני ביטול הצמדה"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"בקש סיסמה לפני ביטול הצמדה"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"אין אפשרות לשנות את גודל האפליקציה, גלול אותה בשתי אצבעות."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"הותקנה על ידי מנהל המערכת שלך"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"עודכן על ידי מנהל המערכת שלך"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"נמחקה על ידי מנהל המערכת שלך"</string>
@@ -1535,4 +1541,5 @@
<item quantity="other">בחרת <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">בחרת <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"שונות"</string>
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index f900301..1ebf699 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"音声アシスト"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"今すぐロック"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"（<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g> 件）"</string>
<string name="safeMode" msgid="2788228061547930246">"セーフモード"</string>
<string name="android_system_label" msgid="6577375335728551336">"Androidシステム"</string>
<string name="user_owner_label" msgid="2804351898001038951">"個人用"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"スクリプトをインストールしてアプリコンテンツにアクセスしやすくできます。"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"入力テキストの監視"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"クレジットカードの番号やパスワードなどの個人データが含まれます。"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"画面の拡大の制御"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"画面のズームレベルと位置を制御します。"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"ステータスバーの無効化や変更"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ステータスバーの無効化、システムアイコンの追加や削除をアプリに許可します。"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ステータスバーへの表示"</string>
@@ -420,7 +423,7 @@
<string name="permdesc_useFingerprint" msgid="9165097460730684114">"指紋ハードウェアを認証に使用することをアプリに許可します"</string>
<string name="fingerprint_acquired_partial" msgid="735082772341716043">"指紋を一部しか検出できませんでした。もう一度お試しください。"</string>
<string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"指紋を処理できませんでした。もう一度お試しください。"</string>
- <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"指紋センサーに汚れがあります。汚れを落としてもう一度お試しください。"</string>
+ <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"指紋認証センサーに汚れがあります。汚れを落としてもう一度お試しください。"</string>
<string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"指の動きが速すぎました。もう一度お試しください。"</string>
<string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"指の動きが遅すぎました。もう一度お試しください。"</string>
<string-array name="fingerprint_acquired_vendor">
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ユーザー補助をキャンセルしました。"</string>
<string name="user_switched" msgid="3768006783166984410">"現在のユーザーは<xliff:g id="NAME">%1$s</xliff:g>です。"</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g>に切り替えています…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> をログアウトしています…"</string>
<string name="owner_name" msgid="2716755460376028154">"所有者"</string>
<string name="error_message_title" msgid="4510373083082500195">"エラー"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"この変更は管理者によって許可されていません"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"オフライン再生を解除する前にPINの入力を求める"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"画面固定を解除する前にロック解除パターンの入力を求める"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"オフライン再生を解除する前にパスワードの入力を求める"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"アプリのサイズは変更できません。2 本の指でスクロールしてください。"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"管理者によってインストールされました"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"管理者によって更新されています"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"管理者によって削除されました"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>件選択済み</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>件選択済み</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"その他"</string>
</resources>
diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml
index 94988ab..604323a 100644
--- a/core/res/res/values-ka-rGE/strings.xml
+++ b/core/res/res/values-ka-rGE/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ხმოვანი ასისტ."</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ახლა ჩაკეტვა"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"უსაფრთხო რეჟიმი"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-ის სისტემა"</string>
<string name="user_owner_label" msgid="2804351898001038951">"პირადი"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"შესაძლებელია სკრიპტების ინსტალაცია აპის კონტენტის წვდომადობის უზრუნველსაყოფად."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"თქვენ მიერ აკრეფილ ტექსტზე დაკვირვება"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"შეიცავს ისეთ პირად მონაცემებს, როგორიცაა საკრედიტო ბარათის ნომრები და პაროლები."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ერანის გადიდების მართვა"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ეკრანის მასშტაბირების დონისა და პოზიციის მართვა."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"სტატუსის ზოლის გათიშვა ან ცვლილება"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"აპს შეეძლება სტატუსების ზოლის გათიშვა და სისტემის ხატულების დამატება/წაშლა."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"სტატუსის ზოლის ჩანაცვლება"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"მარტივი წვდომა გაუქმდა."</string>
<string name="user_switched" msgid="3768006783166984410">"ამჟამინდელი მომხმარებელი <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g>-ზე გადართვა…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g>-ის ანგარიშიდან გასვლა…"</string>
<string name="owner_name" msgid="2716755460376028154">"მფლობელი"</string>
<string name="error_message_title" msgid="4510373083082500195">"შეცდომა"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ეს ცვლილება თქვენი დომენის ადმინისტრატორის მიერ ნებადართული არ არის."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ფიქსაციის მოხსნამდე PIN-ის მოთხოვნა"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ფიქსაციის მოხსნამდე განბლოკვის ნიმუშის მოთხოვნა"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ფიქსაციის მოხსნამდე პაროლის მოთხოვნა"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"აპის ზომა ვერ შეიცვლება. გადაადგილდით მასში ორი თითის მეშვეობით."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"თქვენი ადმინისტრატორის მიერ დაყენებული"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"განახლებულია თქვენი ადმინისტრატორის მიერ"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"თქვენი ადმინისტრატორის მიერ წაშლილი"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> შერჩეული</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> შერჩეული</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"სხვადასხვა"</string>
</resources>
diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml
index 8e45087..323be5d 100644
--- a/core/res/res/values-kk-rKZ/strings.xml
+++ b/core/res/res/values-kk-rKZ/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Дауыс көмекшісі"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Қазір бекіту"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Қауіпсіз режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android жүйесі"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Жеке"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Қолданба мазұнына кіруді жеңілдету үшін скрипт орнатылуы мүмкін."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Терілген мәтінді тексеру"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Кредит карта нөмірі және кілтсөздер сияқты жеке деректерді қоса."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Дисплей ұлғайтуды басқару"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Дисплейдің масштабтау деңгейін және орналастыруды басқару."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"күйін көрсету тақтасын өшіру немесе өзгерту"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Қолданбаға күй жолағын өшіруге немесе жүйелік белгішелерді қосуға және жоюға рұқсат береді."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"күй жолағы болу"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Қол жетімділік өшірілді."</string>
<string name="user_switched" msgid="3768006783166984410">"Ағымдағы пайдаланушы <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> ауысу орындалуда…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> ішінен шығу…"</string>
<string name="owner_name" msgid="2716755460376028154">"Пайдаланушы"</string>
<string name="error_message_title" msgid="4510373083082500195">"Қателік"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Бұл өзгертуге әкімші рұқсат етпеген"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Босату алдында PIN кодын сұрау"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Босату алдында бекітпесін ашу өрнегін сұрау"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Босату алдында құпия сөзді сұрау"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Қолданба өлшемін өзгерту мүмкін емес, оны екі саусақпен айналдырыңыз."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Әкімші орнатқан"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Әкімші жаңартты"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Әкімші жойған"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> таңдалды</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> таңдалды</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Әр түрлі"</string>
</resources>
diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml
index 69fe257..c00bc14 100644
--- a/core/res/res/values-km-rKH/strings.xml
+++ b/core/res/res/values-km-rKH/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ជំនួយសម្លេង"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ចាក់សោឥឡូវនេះ"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"របៀបសុវត្ថិភាព"</string>
<string name="android_system_label" msgid="6577375335728551336">"ប្រព័ន្ធ Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ផ្ទាល់ខ្លួន"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ស្គ្រីបអាចត្រូវបានដំឡើង ដើម្បីធ្វើឲ្យមាតិកាកម្មវិធីអាចចូលដំណើរការបានកាន់តែច្រើន។"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"មើលអត្ថបទដែលវាយ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"រួមបញ្ចូលទិន្នន័យផ្ទាល់ខ្លួន ដូចជាលេខកាតឥណទាន និងពាក្យសម្ងាត់។"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"គ្រប់គ្រងការពង្រីកអេក្រង់"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"គ្រប់គ្រងការកំណត់ទីតាំង និងកម្រិតពង្រីករបស់អេក្រង់"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"បិទ ឬកែរបារស្ថានភាព"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ឲ្យកម្មវិធីបិទរបារស្ថានភាព ឬបន្ថែម និងលុបរូបតំណាងប្រព័ន្ធ។"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ធ្វើជារបារស្ថានភាព"</string>
@@ -1305,6 +1309,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"បានបោះបង់ភាពងាយស្រួល។"</string>
<string name="user_switched" msgid="3768006783166984410">"អ្នកប្រើបច្ចុប្បន្ន <xliff:g id="NAME">%1$s</xliff:g> ។"</string>
<string name="user_switching_message" msgid="2871009331809089783">"កំពុងប្ដូរទៅ <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"កំពុងចេញ <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"ម្ចាស់"</string>
<string name="error_message_title" msgid="4510373083082500195">"កំហុស"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ការផ្លាស់ប្ដូរនេះមិនត្រូវបានអនុញ្ញាតដោយអ្នកគ្រប់គ្រងរបស់អ្នកទេ"</string>
@@ -1433,6 +1438,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"សួររកកូដ PIN មុនពេលផ្ដាច់"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"សួររកលំនាំដោះសោមុនពេលផ្ដាច់"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"សួររកពាក្យសម្ងាត់មុនពេលផ្ដាច់"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"កម្មវិធីមិនអាចផ្លាស់ប្តូរទំហំបានទេ សូមរមូរវាដោយប្រើម្រាមដៃពីរ។"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"បានដំឡើងដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"បានធ្វើបច្ចុប្បន្នភាពដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"បានលុបដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
@@ -1501,4 +1507,5 @@
<item quantity="other">បានជ្រើស <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">បានជ្រើស <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"ផ្សេងៗ"</string>
</resources>
diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml
index f3ff668..1aba0bb 100644
--- a/core/res/res/values-kn-rIN/strings.xml
+++ b/core/res/res/values-kn-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ಧ್ವನಿ ಸಹಾಯಕ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ಈಗ ಲಾಕ್ ಮಾಡಿ"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"ಸುರಕ್ಷಿತ ಮೋಡ್"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android ಸಿಸ್ಟಂ"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ವೈಯಕ್ತಿಕ"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ಅಪ್ಲಿಕೇಶನ್ ವಿಷಯ ಇನ್ನಷ್ಟು ಲಭ್ಯವಾಗುವಂತೆ ಮಾಡಲು ಸ್ಕ್ರಿಪ್ಟ್ಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದಾಗಿದೆ."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ನೀವು ಟೈಪ್ ಮಾಡುವ ಪಠ್ಯವನ್ನು ಗಮನಿಸುತ್ತದೆ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಸಂಖ್ಯೆಗಳು ಮತ್ತು ಪಾಸ್ವರ್ಡ್ಗಳಂತಹ ವೈಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ಪ್ರದರ್ಶನದ ವರ್ಧಕವನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ಪ್ರದರ್ಶನದ ಝೂಮ್ ಮಟ್ಟ ಮತ್ತು ಸ್ಥಾನ ನಿರ್ಧಾರವನ್ನು ನಿಯಂತ್ರಿಸಿ."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಇಲ್ಲವೇ ಮಾರ್ಪಡಿಸಿ"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಸೇರಿಸಲು ಮತ್ತು ಸಿಸ್ಟಂ ಐಕಾನ್ಗಳನ್ನು ತೆಗೆದುಹಾಕಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯಾಗಿರಲು"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ರದ್ದುಮಾಡಲಾಗಿದೆ."</string>
<string name="user_switched" msgid="3768006783166984410">"ಪ್ರಸ್ತುತ ಬಳಕೆದಾರರು <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> ಗೆ ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರನ್ನು ಲಾಗ್ ಔಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="owner_name" msgid="2716755460376028154">"ಮಾಲೀಕರು"</string>
<string name="error_message_title" msgid="4510373083082500195">"ದೋಷ"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ಈ ಬದಲಾವಣೆಯನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ಅನ್ಪಿನ್ ಮಾಡಲು ಪಿನ್ ಕೇಳು"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ಅನ್ಪಿನ್ ಮಾಡಲು ಅನ್ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಕೇಳಿ"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ಅನ್ಪಿನ್ ಮಾಡಲು ಪಾಸ್ವರ್ಡ್ ಕೇಳು"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಮರುಗಾತ್ರಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಅದನ್ನು ಎರಡು ಬೆರಳುಗಳಿಂದ ಸ್ಕ್ರಾಲ್ ಮಾಡಿ."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಂದ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಂದ ನವೀಕರಿಸಲಾಗಿದೆ"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಂದ ಅಳಿಸಲಾಗಿದೆ"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"ಇತರೆ"</string>
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index fbc6ac2..3384f09 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"음성 지원"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"지금 잠그기"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"안전 모드"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android 시스템"</string>
<string name="user_owner_label" msgid="2804351898001038951">"개인"</string>
@@ -229,7 +231,7 @@
<string name="permgrouplab_contacts" msgid="3657758145679177612">"주소록"</string>
<string name="permgroupdesc_contacts" msgid="6951499528303668046">"주소록 액세스"</string>
<string name="permgrouplab_location" msgid="7275582855722310164">"위치"</string>
- <string name="permgroupdesc_location" msgid="1346617465127855033">"이 기기의 위치에 액세스하기"</string>
+ <string name="permgroupdesc_location" msgid="1346617465127855033">"이 기기의 위치에 액세스"</string>
<string name="permgrouplab_calendar" msgid="5863508437783683902">"캘린더"</string>
<string name="permgroupdesc_calendar" msgid="3889615280211184106">"캘린더 액세스"</string>
<string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string>
@@ -239,7 +241,7 @@
<string name="permgrouplab_microphone" msgid="171539900250043464">"마이크"</string>
<string name="permgroupdesc_microphone" msgid="4988812113943554584">"오디오 녹음"</string>
<string name="permgrouplab_camera" msgid="4820372495894586615">"카메라"</string>
- <string name="permgroupdesc_camera" msgid="3250611594678347720">"사진 찍기 및 동영상 녹화"</string>
+ <string name="permgroupdesc_camera" msgid="3250611594678347720">"사진 및 동영상 촬영"</string>
<string name="permgrouplab_phone" msgid="5229115638567440675">"전화"</string>
<string name="permgroupdesc_phone" msgid="6234224354060641055">"전화 걸기 및 관리"</string>
<string name="permgrouplab_sensors" msgid="416037179223226722">"신체 센서"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"스크립트를 설치하여 앱 콘텐츠에 더 간편하게 액세스할 수 있습니다."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"입력하는 텍스트 살펴보기"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"신용카드 번호와 비밀번호 등의 개인 데이터를 포함합니다."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"디스플레이 배율 제어"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"디스플레이의 확대/축소 수준 및 위치를 제어합니다."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"상태 표시줄 사용 중지 또는 수정"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"앱이 상태 표시줄을 사용중지하거나 시스템 아이콘을 추가 및 제거할 수 있도록 허용합니다."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"상태 표시줄에 위치"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"접근성이 취소되었습니다."</string>
<string name="user_switched" msgid="3768006783166984410">"현재 사용자는 <xliff:g id="NAME">%1$s</xliff:g>님입니다."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g>(으)로 전환하는 중…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g>님을 로그아웃하는 중…"</string>
<string name="owner_name" msgid="2716755460376028154">"소유자"</string>
<string name="error_message_title" msgid="4510373083082500195">"오류"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"관리자가 이 변경을 허용하지 않습니다."</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"고정 해제 이전에 PIN 요청"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"고정 해제 이전에 잠금해제 패턴 요청"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"고정 해제 이전에 비밀번호 요청"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"앱에서 크기 조절이 불가능합니다. 두 손가락을 사용해 스크롤하세요."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"관리자가 설치함"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"관리자에 의해 업데이트됨"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"관리자가 삭제함"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>개 선택됨</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>개 선택됨</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"기타"</string>
</resources>
diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml
index 5263dd8..870c858 100644
--- a/core/res/res/values-ky-rKG/strings.xml
+++ b/core/res/res/values-ky-rKG/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Үн жардамчысы"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Азыр кулпулоо"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Коопсуз режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android Тутуму"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Жеке"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Колдонмонун мазмунун жеткиликтүүрөөк кылыш үчүн скрипттер орнотулушу мүмкүн."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Терип жаткан текстти текшерүү"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Кредиттик карта номурлары жана сырсөздөр сыяктуу өздүк берилиштерди камтыйт."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Дисплейди чоңойтууну башкаруу"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Экрандагы сүрөттүн өлчөмүн өзгөртүү жана жайгаштыруу."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"абал тилкесин өчүрүү же өзгөртүү"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Колдонмого абал тилкесин өчүрүү же тутум сүрөтчөлөрүн кошуу же алып салуу мүмкүнчүлүгүн берет."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"абал тилкесинин милдетин аткаруу"</string>
@@ -1304,6 +1308,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Атайын мүмкүнчүлүктөр иштетилген жок."</string>
<string name="user_switched" msgid="3768006783166984410">"Учурдагы колдонуучу <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> дегенге которулууда…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> чыгууда…"</string>
<string name="owner_name" msgid="2716755460376028154">"Ээси"</string>
<string name="error_message_title" msgid="4510373083082500195">"Ката"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Мындай өзгөртүүгө администраторуңуз тарабынан тыюу салынган."</string>
@@ -1432,6 +1437,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Бошотуудан мурун PIN суралсын"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Бошотуудан мурун кулпуну ачкан үлгү суралсын"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Бошотуудан мурун сырсөз суралсын"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Колдонмонун көлөмүн өзгөртүүгө болбойт, андыктан эки манжаңыз менен сыдырып караңыз."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Администраторуңуз тарабынан орнотулган"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Администраторуңуз жаңырткан"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Администраторуңуз тарабынан жок кылынган"</string>
@@ -1500,4 +1506,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> тандалды</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> тандалды</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Калган-каткандар"</string>
</resources>
diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml
index 805982a..d5484d3 100644
--- a/core/res/res/values-lo-rLA/strings.xml
+++ b/core/res/res/values-lo-rLA/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ຊ່ວຍເຫຼືອທາງສຽງ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ລັອກດຽວນີ້"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
<string name="android_system_label" msgid="6577375335728551336">"ລະບົບ Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ສ່ວນໂຕ"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ສະຄຣິບອາດຖືກຕິດຕັ້ງ ເພື່ອເຮັດໃຫ້ເນື້ອຫາແອັບຯເຂົ້າເຖິງໄດ້ຫຼາຍຂຶ້ນ."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ຕິດຕາມເບິ່ງຂໍ້ຄວາມທີ່ທ່ານພິມ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ຮວມທັງຂໍ້ມູນສ່ວນໂຕເຊັ່ນ: ເລກບັດເຄຣດິດ ແລະລະຫັດຜ່ານ."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ຄວບຄຸມການຂະຫຍາຍຈໍສະແດງຜົນ"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ຄວບຄຸມລະດັບການຊູມ ແລະການວາງຕຳແໜ່ງຂອງຈໍສະແດງຜົນ."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"ປິດການນນຳໃຊ້ ຫຼື ແກ້ໄຂແຖບສະຖານະ"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ອະນຸຍາດໃຫ້ແອັບຯປິດການເຮັດວຽກຂອງແຖບສະຖານະ ຫຼືເພີ່ມ ແລະລຶບໄອຄອນລະບົບອອກໄດ້."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ເປັນແຖບສະຖານະ"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ຍົກເລີກໂຕຊ່ວຍການເຂົ້າເຖິງແລ້ວ."</string>
<string name="user_switched" msgid="3768006783166984410">"ຜູ່ໃຊ້ປັດຈຸບັນ <xliff:g id="NAME">%1$s</xliff:g> ."</string>
<string name="user_switching_message" msgid="2871009331809089783">"ກຳລັງສະລັບໄປຫາ <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"ກຳລັງອອກຈາກລະບົບ <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"ເຈົ້າຂອງ"</string>
<string name="error_message_title" msgid="4510373083082500195">"ຜິດພາດ"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ຜູ່ເບິ່ງແຍງລະບົບຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ປ່ຽນແປງສິ່ງນີ້"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ຖາມຫາ PIN ກ່ອນຍົກເລີກການປັກໝຸດ"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ຖາມຫາຮູບແບບປົດລັອກກ່ອນຍົກເລີກການປັກໝຸດ"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ຖາມຫາລະຫັດຜ່ານກ່ອນຍົກເລີກການປັກໝຸດ"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ບໍ່ສາມາດປັບຂະໜາດແອັບຯໄດ້, ກະລຸນາເລື່ອນມັນໂດຍໃຊ້ນິ້ວສອງນິ້ວແທນ."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"ຜູ້ຄວບຄຸມຂອງທ່ານຕິດຕັ້ງໃສ່ແລ້ວ"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"ອັບເດດໂດຍຜູ້ຄວບຄຸມຂອງທ່ານແລ້ວ"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"ຖືກຜູ້ຄວບຄຸມຂອງທ່ານລຶບໄປແລ້ວ"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ຖືກເລືອກແລ້ວ</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ຖືກເລືອກແລ້ວ</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"ອື່ນໆ"</string>
</resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 3d3e333..6ee24cf 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Užrakinti dabar"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Saugos režimas"</string>
<string name="android_system_label" msgid="6577375335728551336">"„Android“ sistema"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Asmeninė"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Gali būti įdiegti scenarijai, kad būtų lengviau pasiekti programų turinį."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Stebėti jūsų įvedamą tekstą"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Įtraukiami asmeniniai duomenys, pavyzdžiui, kredito kortelių numeriai ir slaptažodžiai."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ekrano didinimo valdymas"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Valdykite ekrano mastelio keitimo lygį ir pozicijos nustatymą."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"išjungti ar keisti būsenos juostą"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Leidžiama programai neleisti būsenos juostos arba pridėti ir pašalinti sistemos piktogramas."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"būti būsenos juosta"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Pritaikymo neįgaliesiems režimas atšauktas."</string>
<string name="user_switched" msgid="3768006783166984410">"Dabartinis naudotojas: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Perjungiama į <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Atsijungiama (<xliff:g id="NAME">%1$s</xliff:g>)…"</string>
<string name="owner_name" msgid="2716755460376028154">"Savininkas"</string>
<string name="error_message_title" msgid="4510373083082500195">"Klaida"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Administratorius neleidžia atlikti šio pakeitimo"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Prašyti PIN kodo prieš atsegant"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Prašyti atrakinimo piešinio prieš atsegant"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Prašyti slaptažodžio prieš atsegant"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Programos dydis nekeičiamas, slinkite dviem pirštais."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Įdiegė administratorius"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Atnaujino administratorius"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Ištrynė administratorius"</string>
@@ -1535,4 +1541,5 @@
<item quantity="many">Pasir. <xliff:g id="COUNT_1">%1$d</xliff:g> elem.</item>
<item quantity="other">Pasir. <xliff:g id="COUNT_1">%1$d</xliff:g> elem.</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Įvairūs"</string>
</resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index f233737..7785965 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -223,6 +223,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Balss palīgs"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloķēt tūlīt"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"Pārsniedz"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Drošais režīms"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android sistēma"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personisks"</string>
@@ -253,6 +255,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Var tikt instalēti skripti, lai padarītu lietotņu saturu pieejamāku."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Skatīt ierakstīto tekstu."</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Ietver personas datus, piemēram, kredītkartes numurus un paroles."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Displeja palielinājuma kontrole"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrolējiet displeja tālummaiņas līmeni un pozicionēšanu."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"atspējot vai pārveidot statusa joslu"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Ļauj lietotnei atspējot statusa joslu vai pievienot un noņemt sistēmas ikonas."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"Būt par statusa joslu"</string>
@@ -1311,6 +1315,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Pieejamība ir atcelta."</string>
<string name="user_switched" msgid="3768006783166984410">"Pašreizējais lietotājs: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Notiek pāriešana uz: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Notiek lietotāja <xliff:g id="NAME">%1$s</xliff:g> atteikšanās…"</string>
<string name="owner_name" msgid="2716755460376028154">"Īpašnieks"</string>
<string name="error_message_title" msgid="4510373083082500195">"Kļūda"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Jūsu administrators neļauj veikt šīs izmaiņas."</string>
@@ -1440,6 +1445,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Prasīt PIN kodu pirms atspraušanas"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pirms atspraušanas pieprasīt grafisko atslēgu"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pirms atspraušanas pieprasīt paroli"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Lietotnes lielumu nevar mainīt. Ritiniet to ar diviem pirkstiem."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalēja jūsu administrators"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Atjaunināja administrators"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Izdzēsa jūsu administrators"</string>
@@ -1517,4 +1523,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīts</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīti</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Dažādi"</string>
</resources>
diff --git a/core/res/res/values-mcc208-mnc01/config.xml b/core/res/res/values-mcc208-mnc01/config.xml
index c56da24..5930e3a 100644
--- a/core/res/res/values-mcc208-mnc01/config.xml
+++ b/core/res/res/values-mcc208-mnc01/config.xml
@@ -28,9 +28,6 @@
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string-array translatable="false" name="config_tether_apndata">
<item>Orange Internet,orange.fr,,,orange,orange,,,,,208,01,1,DUN</item>
- <item>[ApnSettingV3]Carrefour WAP,ofnew.fr,,,orange,orange,,,,,208,01,1,DUN,,,true,0,,,,,,,gid,33</item>
- <item>[ApnSettingV3]VM WAP,ofnew.fr,,,orange,orange,,,,,208,01,1,DUN,,,true,0,,,,,,,gid,52</item>
- <item>[ApnSettingV3]NRJWEB,ofnew.fr,,,orange,orange,,,,,208,01,1,DUN,,,true,0,,,,,,,gid,4E</item>
</string-array>
</resources>
diff --git a/core/res/res/values-mcc208-mnc10/config.xml b/core/res/res/values-mcc208-mnc10/config.xml
index a32f266..d3640e5 100644
--- a/core/res/res/values-mcc208-mnc10/config.xml
+++ b/core/res/res/values-mcc208-mnc10/config.xml
@@ -29,11 +29,6 @@
<string-array translatable="false" name="config_tether_apndata">
<item>SFR option modem,websfr,,,,,,,,,208,10,,DUN</item>
<item>[ApnSettingV3]INTERNET NRJ,internetnrj,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,4E</item>
- <item>[ApnSettingV3]Auchan,wap65,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,spn,A MOBILE</item>
- <item>[ApnSettingV3]LeclercMobile,wap66,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,spn,LeclercMobile</item>
- <item>[ApnSettingV3]Coriolis,fnetcoriolis,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,12</item>
- <item>[ApnSettingV3]WEB La Poste Mobile,wapdebitel,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,4C</item>
- <item>[ApnSettingV3]Darty Surf Mails,wap68,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,44</item>
</string-array>
<string-array translatable="false" name="config_operatorConsideredNonRoaming">
diff --git a/core/res/res/values-mcc214-mnc07/config.xml b/core/res/res/values-mcc214-mnc07/config.xml
index 91571a5..4b7cc7c 100644
--- a/core/res/res/values-mcc214-mnc07/config.xml
+++ b/core/res/res/values-mcc214-mnc07/config.xml
@@ -28,7 +28,6 @@
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
<string-array translatable="false" name="config_tether_apndata">
<item>Conexión Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</item>
- <item>[ApnSettingV3]Jazztel Internet,jazzinternet,,,,,,,,,214,07,,DUN,,,true,0,,,,,,,spn,JAZZTEL</item>
</string-array>
</resources>
diff --git a/core/res/res/values-mcc222-mnc10/config.xml b/core/res/res/values-mcc222-mnc10/config.xml
index 5a74462..cd6e8c6 100644
--- a/core/res/res/values-mcc222-mnc10/config.xml
+++ b/core/res/res/values-mcc222-mnc10/config.xml
@@ -20,16 +20,6 @@
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. Do not translate. -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
- <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
- <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
- <integer-array translatable="false" name="config_tether_upstream_types">
- <item>1</item>
- <item>4</item>
- <item>7</item>
- <item>9</item>
- </integer-array>
-
<!-- String containing the apn value for tethering. May be overriden by secure settings
TETHER_DUN_APN. Value is a comma separated series of strings:
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
diff --git a/core/res/res/values-mcc234-mnc20/config.xml b/core/res/res/values-mcc234-mnc20/config.xml
index 814960a..27c91d2 100644
--- a/core/res/res/values-mcc234-mnc20/config.xml
+++ b/core/res/res/values-mcc234-mnc20/config.xml
@@ -21,16 +21,6 @@
for different hardware and product builds. -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
- <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
- <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
- <integer-array translatable="false" name="config_tether_upstream_types">
- <item>1</item>
- <item>4</item>
- <item>7</item>
- <item>9</item>
- </integer-array>
-
<!-- String containing the apn value for tethering. May be overriden by secure settings
TETHER_DUN_APN. Value is a comma separated series of strings:
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml
index 62ba912..eb90369 100644
--- a/core/res/res/values-mk-rMK/strings.xml
+++ b/core/res/res/values-mk-rMK/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помош"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Заклучи сега"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Безбеден режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Систем Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Лични"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"За содржината на апликацијата да биде подостапна, може да се инсталираат скрипти."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Набљудувај го напишаниот текст"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Опфаќа лични податоци како што се броеви на кредитни картички и лозинки."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Контролирајте го зголемувањето на екранот"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Контролирајте го нивото на зумирање и позиционирање на екранот."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"оневозможи или измени статусна лента"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Дозволува апликацијата да ја оневозможи статусната лента или да додава или отстранува системски икони."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"да стане статусна лента"</string>
@@ -1305,6 +1308,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Пристапноста е откажана."</string>
<string name="user_switched" msgid="3768006783166984410">"Тековен корисник <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Се префрла на <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> се одјавува…"</string>
<string name="owner_name" msgid="2716755460376028154">"Сопственик"</string>
<string name="error_message_title" msgid="4510373083082500195">"Грешка"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Администраторот не ја дозволува промената"</string>
@@ -1433,6 +1437,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Прашај за ПИН пред откачување"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Прашај за шема за отклучување пред откачување"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Прашај за лозинка пред откачување"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Не може да се промени големината на апликацијата. Движете ја со два прста."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Инсталирано од администраторот"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Ажурирано од администраторот"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Избришано од администраторот"</string>
@@ -1501,4 +1506,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> е избрана</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> се избрани</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Разно"</string>
</resources>
diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml
index 925688d..a83928e 100644
--- a/core/res/res/values-ml-rIN/strings.xml
+++ b/core/res/res/values-ml-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"വോയ്സ് സഹായം"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ഇപ്പോൾ ലോക്കുചെയ്യുക"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"സുരക്ഷിത മോഡ്"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android സിസ്റ്റം"</string>
<string name="user_owner_label" msgid="2804351898001038951">"വ്യക്തിഗതം"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"അപ്ലിക്കേഷൻ ഉള്ളടക്കം കൂടുതൽ ആക്സസ്സുചെയ്യാൻ കഴിയുന്നതാക്കാൻ സ്ക്രിപ്റ്റുകൾ ഇൻസ്റ്റാളുചെയ്യാനിടയുണ്ട്."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"നിങ്ങൾ ടൈപ്പുചെയ്യുന്ന വാചകം നിരീക്ഷിക്കുക"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ക്രെഡിറ്റ് കാർഡ് നമ്പറുകളും പാസ്വേഡുകളും പോലുള്ള വ്യക്തിഗത ഡാറ്റ ഉൾപ്പെടുന്നു."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ഡിസ്പ്ലേ മാഗ്നിഫിക്കേഷൻ നിയന്ത്രിക്കുക"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ഡിസ്പ്ലേയുടെ സൂം നിലയും പൊസിഷനിംഗും നിയന്ത്രിക്കുക."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"സ്റ്റാറ്റസ് ബാർ പ്രവർത്തനരഹിതമാക്കുക അല്ലെങ്കിൽ പരിഷ്ക്കരിക്കുക"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"നില ബാർ പ്രവർത്തരഹിതമാക്കുന്നതിന് അല്ലെങ്കിൽ സിസ്റ്റം ഐക്കണുകൾ ചേർക്കുന്നതിനും നീക്കംചെയ്യുന്നതിനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"സ്റ്റാറ്റസ് ബാർ ആയിരിക്കുക"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"പ്രവേശനക്ഷമത റദ്ദാക്കി."</string>
<string name="user_switched" msgid="3768006783166984410">"നിലവിലെ ഉപയോക്താവ് <xliff:g id="NAME">%1$s</xliff:g> ആണ്."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> എന്ന ഉപയോക്താവിലേക്ക് മാറുന്നു…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> ലോഗൌട്ട് ചെയ്യുന്നു…"</string>
<string name="owner_name" msgid="2716755460376028154">"ഉടമ"</string>
<string name="error_message_title" msgid="4510373083082500195">"പിശക്"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ഈ മാറ്റം നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ അനുവദിച്ചതല്ല"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ചെയ്യുംമുമ്പ് പിൻ ചോദിക്കൂ"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടുക"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് പാസ്വേഡ് ആവശ്യപ്പെടുക"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ആപ്പിന്റെ വലുപ്പം ക്രമീകരിക്കാൻ കഴിയില്ല, രണ്ട് വിരലുകൾ ഉപയോഗിച്ച് അത് സ്ക്രോൾ ചെയ്യുക."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇൻസ്റ്റാളുചെയ്തു"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ അപ്ഡേറ്റുചെയ്തു"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇല്ലാതാക്കി"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"പലവക"</string>
</resources>
diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml
index ef01668..a9fb8593 100644
--- a/core/res/res/values-mn-rMN/strings.xml
+++ b/core/res/res/values-mn-rMN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Дуут туслах"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Одоо түгжих"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Аюулгүй горим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Андройд систем"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Хувийн"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Апп контентод илүү хялбар хандуулахын тулд скриптыг суулгана."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Бичсэн текстээ ажиглах"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Кредит картын дугаар болон нууц үг зэрэг хувийн датаг агуулж байна."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Дэлгэцийн өсгөлтийг хянах"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Дэлгэцийн томруулах түвшин болон байршлыг хянах."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"статус самбарыг идэвхгүй болгох болон өөрчлөх"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Апп нь статус самбарыг идэвхгүй болгох эсвэл систем дүрсийг нэмэх, хасах боломжтой."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"статусын хэсэг болох"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Хандалт цуцлагдсан."</string>
<string name="user_switched" msgid="3768006783166984410">"Одоогийн хэрэглэгч <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> руу сэлгэж байна…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g>-с гарч байна…"</string>
<string name="owner_name" msgid="2716755460376028154">"Эзэмшигч"</string>
<string name="error_message_title" msgid="4510373083082500195">"Алдаа"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Энэ өөрчлөлтийг админ зөвшөөрөөгүй байна"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Тогтоосныг суллахаас өмнө PIN асуух"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Тогтоосныг суллахаас өмнө түгжээ тайлах хээ асуух"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Тогтоосныг суллахаас өмнө нууц үг асуух"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Апп-н хэмжээ нь өөрчлөгддөггүй. Үүнийг 2 хуруугаараа гүйлгэнэ үү."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Таны админ суулгасан байна"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Танай админ шинэчилсэн"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Таны админ устгасан байна"</string>
@@ -1497,4 +1503,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> сонгосон</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> сонгосон</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Бусад"</string>
</resources>
diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml
index 4e43265..a8896c3 100644
--- a/core/res/res/values-mr-rIN/strings.xml
+++ b/core/res/res/values-mr-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"व्हॉइस सहाय्य"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"आता लॉक करा"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"सुरक्षित मोड"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android सिस्टम"</string>
<string name="user_owner_label" msgid="2804351898001038951">"वैयक्तिक"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"अॅप सामग्री अधिक प्रवेशयोग्य बनविण्यासाठी कदाचित स्क्रिप्ट स्थापित केली जाऊ शकतात."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"आपण टाइप करता त्या मजकुराचे निरीक्षण करा"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"क्रेडिट कार्ड नंबर आणि संकेतशब्द यासारखा वैयक्तिक डेटा समाविष्ट करते."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"प्रदर्शन विस्तृतीकरण नियंत्रित करा"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"प्रदर्शनाचा झूम स्तर आणि स्थिती निर्धारण नियंत्रित करा."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"स्टेटस बार अक्षम करा किंवा सुधारित करा"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"स्टेटस बार अक्षम करण्यासाठी किंवा सिस्टीम चिन्हे जोडण्यासाठी आणि काढण्यासाठी अॅप ला अनुमती देते."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"स्टेटस बार होऊ द्या"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"प्रवेशयोग्यता रद्द."</string>
<string name="user_switched" msgid="3768006783166984410">"वर्तमान वापरकर्ता <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> वर स्विच करत आहे…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> लॉग आउट करीत आहे…"</string>
<string name="owner_name" msgid="2716755460376028154">"मालक"</string>
<string name="error_message_title" msgid="4510373083082500195">"त्रुटी"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"या बदलास आपल्या प्रशासकाकडून अनुमती नाही"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"अनपिन करण्यापूर्वी पिन साठी विचारा"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"अनपिन करण्यापूर्वी अनलॉक नमुन्यासाठी विचारा"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"अनपिन करण्यापूर्वी संकेतशब्दासाठी विचारा"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"अॅपचा आकार बदलण्यायोग्य नाही, दोन बोटांनी तो स्क्रोल करा."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"आपल्या प्रशासकाद्वारे स्थापित केले आहे"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"आपल्या प्रशासकाद्वारे अद्यतनित केले"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"आपल्या प्रशासकाद्वारे हटविले आहे"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडला</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडले</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"संकीर्ण"</string>
</resources>
diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml
index a1955bf..cababdd 100644
--- a/core/res/res/values-ms-rMY/strings.xml
+++ b/core/res/res/values-ms-rMY/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Kunci sekarang"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mod selamat"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Peribadi"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skrip boleh dipasang untuk menjadikan kandungan apl lebih mudah diakses."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Perhatikan teks yang anda taip"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Termasuk data peribadi seperti nombor kad kredit dan kata laluan."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kawal pembesaran paparan"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kawal tahap zum dan kedudukan paparan."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"lumpuhkan atau ubah suai bar status"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Membenarkan apl melumpuhkan bar status atau menambah dan mengalih keluar ikon sistem."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"jadi bar status"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Kebolehcapaian dibatalkan."</string>
<string name="user_switched" msgid="3768006783166984410">"Pengguna semasa <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Bertukar kepada <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Log keluar daripada <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Pemilik"</string>
<string name="error_message_title" msgid="4510373083082500195">"Ralat"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Perubahan ini tidak dibenarkan oleh pentadbir anda"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Minta PIN sebelum menyahsemat"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Minta corak buka kunci sebelum menyahsemat"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Minta kata laluan sebelum menyahsemat"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Apl tidak boleh tukar saiznya, tatal apl itu menggunakan dua jari."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Dipasang oleh pentadbir anda"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Dikemas kini oleh pentadbir anda"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Dipadamkan oleh pentadbir anda"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Pelbagai"</string>
</resources>
diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml
index a913e38..8e61f41 100644
--- a/core/res/res/values-my-rMM/strings.xml
+++ b/core/res/res/values-my-rMM/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"အသံ အကူအညီ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ယခု သော့ပိတ်ရန်"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"၉၉၉+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"အန္တရာယ်ကင်းမှု စနစ်(Safe mode)"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android စနစ်"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ကိုယ်ရေး"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"အပလီကေးရှင်းကို ပိုမိုပြည့်စုံစေရန် စကရစ်များကို သွင်းနိုင်ပါတယ်"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ရိုက်သောစာများကို သေချာစွာ စစ်ဆေးပါ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"အရေးကြီးသော ကိုယ်ရေးအချက်အလက်များဖြစ်တဲ့ ခရက်ဒစ်ကဒ်နံပါတ်များနှင့် စကားဝှက်များ ပါဝင်ပါတယ်."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"မျက်နှာပြင် ချဲ့ခြင်းကို ထိန်းချုပ်ပါ"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"မျက်နှာပြင် ချဲ့ခြင်းနှင့် နေရာချထားခြင်းကို ထိန်းချုပ်ပါ"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"အခြေအနေပြဘားအား အလုပ်မလုပ်ခိုင်းရန်သို့မဟုတ် မွမ်းမံရန်"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"appအား အခြေအနေပြ ဘားကို ပိတ်ခွင့် သို့မဟတ် စနစ် အိုင်ကွန်များကို ထည့်ခြင်း ဖယ်ရှားခြင်း ပြုလုပ်ခွင့် ပြုသည်။"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"အခြေအနေပြ ဘားဖြစ်ပါစေ"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"အသုံးပြုခွင့် ဖျက်လိုက်သည်"</string>
<string name="user_switched" msgid="3768006783166984410">"လက်ရှိအသုံးပြုနေသူ <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g>သို့ ပြောင်းနေ…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g>ကို ထွက်ပစ်ပါတော့မည်..."</string>
<string name="owner_name" msgid="2716755460376028154">"ပိုင်ရှင်"</string>
<string name="error_message_title" msgid="4510373083082500195">"အမှား"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ပင်မဖြုတ်မီမှာ PIN ကို မေးကြည့်ရန်"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ပင်မဖြုတ်မီမှာ သော့ဖွင့် ရေးဆွဲမှုပုံစံကို မေးကြည့်ရန်"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ပင်မဖြုတ်မီမှာ စကားဝှက်ကို မေးကြည့်ရန်"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"အက်ပ်ကို ဆိုက်ပြောင်းမရပါ၊ ၎င်းကို လက်နှစ်ချောင်းဖြင့် ရွှေ့ယူပါ။"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"သင့် အက်ဒမင်မှ သွင်းယူထား၏"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"သင့်စီမံခန့်ခွဲသူမှ အဆင့်မြှင့်ထားပါသည်။"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"သင့် အက်ဒမင်အား ဖျက်ပစ်ရန်"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ရွေးချယ်ပြီးပါပြီ</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ရွေးချယ်ပြီးပါပြီ</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"အထွေထွေ"</string>
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 74d7c98..f29a903 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Talehjelp"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lås nå"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Sikkermodus"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personlig"</string>
@@ -235,7 +237,7 @@
<string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string>
<string name="permgroupdesc_sms" msgid="4656988620100940350">"sende og lese SMS-meldinger"</string>
<string name="permgrouplab_storage" msgid="1971118770546336966">"Lagring"</string>
- <string name="permgroupdesc_storage" msgid="637758554581589203">"åpne bilder, media og filer på enheten din"</string>
+ <string name="permgroupdesc_storage" msgid="637758554581589203">"åpne bilder, medier og filer på enheten din"</string>
<string name="permgrouplab_microphone" msgid="171539900250043464">"Mikrofon"</string>
<string name="permgroupdesc_microphone" msgid="4988812113943554584">"spill inn lyd"</string>
<string name="permgrouplab_camera" msgid="4820372495894586615">"Kamera"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skript kan installeres for å gjøre appinnhold mer tilgjengelig."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"observere teksten du skriver inn"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Dette omfatter personlige data, som kredittkortnumre og passord."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kontrollér forstørrelse for skjermen"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrollér zoomenivået og plasseringen for skjermen."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"deaktivere eller endre statusfeltet"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Lar appen deaktivere statusfeltet eller legge til og fjerne systemikoner."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"vise appen i statusfeltet"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Tilgjengelighetstjenesten ble avbrutt."</string>
<string name="user_switched" msgid="3768006783166984410">"Gjeldende bruker: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Bytter til <xliff:g id="NAME">%1$s</xliff:g> …"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Logger av <xliff:g id="NAME">%1$s</xliff:g> …"</string>
<string name="owner_name" msgid="2716755460376028154">"Eier"</string>
<string name="error_message_title" msgid="4510373083082500195">"Feil"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Denne endringen er ikke tillatt av administratoren"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"PIN-kode for å løsne apper"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Krev bruk av opplåsningsmønster for å løsne apper"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Krev passord for å løsne apper"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Du kan ikke endre størrselse på appen – rull med to fingre."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Installert av administratoren"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Oppdatert av administratoren"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Slettet av administratoren"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> er valgt</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> er valgt</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diverse"</string>
</resources>
diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml
index 6fe9c4d..a33289f 100644
--- a/core/res/res/values-ne-rNP/strings.xml
+++ b/core/res/res/values-ne-rNP/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज सहायता"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"अब बन्द गर्नुहोस्"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"९९९+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"सुरक्षित मोड"</string>
<string name="android_system_label" msgid="6577375335728551336">"एन्ड्रोइड प्रणाली"</string>
<string name="user_owner_label" msgid="2804351898001038951">"व्यक्तिगत"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"अनुप्रयोगको सामग्रीलाई थप पहुँचयोग्य बनाउन लिपिहरू स्थापना गर्न सक्नु हुन्छ।"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"आफुले टाइप गरेको पाठको निरीक्षण गर्नुहोस्"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"व्यक्तिगत डेटा जस्तै क्रेडिट कार्ड नम्बरहरू र पासवर्डहरू समावेश गर्दछ।"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"प्रदर्शन आवर्धन नियन्त्रण गर्नुहोस्"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"प्रदर्शनको जुम स्तर र स्थिति नियन्त्रण गर्नुहोस्।"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"स्थिति पट्टिलाई अक्षम वा संशोधित गर्नुहोस्"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"स्थिति पट्टि असक्षम पार्न वा प्रणाली आइकनहरू थप्न र हटाउन अनुप्रयोगलाई अनुमति दिन्छ।"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"वस्तुस्थिति पट्टी हुन दिनुहोस्"</string>
@@ -1309,6 +1313,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"पहुँचयोग्यता रद्द गरियो।"</string>
<string name="user_switched" msgid="3768006783166984410">"अहिलेको प्रयोगकर्ता <xliff:g id="NAME">%1$s</xliff:g>।"</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> मा स्विच गर्दै..."</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"लग आउट गर्दै <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"मालिक"</string>
<string name="error_message_title" msgid="4510373083082500195">"त्रुटि"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"यो परिवर्तन गर्न तपाईँको प्रशासक द्वारा अनुमति छैन"</string>
@@ -1437,10 +1442,11 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"पिन निकाल्नुअघि खोल्ने रूपरेखा सोध्नुहोस्"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"पिन निकाल्नुअघि पासवर्ड सोध्नुहोस्"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"अनुप्रयोगको आकार सानो-ठुलो बनाउन मिल्दैन, दुई औँलाले यसलाई स्क्रोल गर्नुहोस्।"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"तपाईँको प्रशासकद्वारा स्थापना गरिएको"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"तपाईँको प्रशासकद्वारा अद्यावधिक गरिएको"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"तपाईँको प्रशासकद्वारा हटाइएको"</string>
- <string name="battery_saver_description" msgid="1960431123816253034">"ब्याट्रीको आयु सुधार्न, ब्याट्री रक्षकले तपाईँको यन्त्रको कार्यसम्पादन घटाउँछ र भाइब्रेसन, स्थान सेवा र बहुसंख्यक पृष्ठभूमि डेटा सीमित गर्दछ। इमेल, सन्देश, र अन्य अनुप्रयोगहरू जुन सिङ्कमा भर पर्छन् अद्यावधिक नहुन सक्छन् जबसम्म तपाईँ तिनीहरूलाई खोल्नुहुन्न\n\n ब्याट्री रक्षक स्वत: निस्कृय हुन्छ जब तपाईँको यन्त्र चार्ज हुँदै हुन्छ।"</string>
+ <string name="battery_saver_description" msgid="1960431123816253034">"ब्याट्रीको आयु सुधार्न, ब्याट्री संरक्षकले तपाईँको यन्त्रको कार्यसम्पादन घटाउँछ र भाइब्रेसन, स्थान सेवा र बहुसंख्यक पृष्ठभूमि डेटा सीमित गर्दछ। इमेल, सन्देश, र अन्य अनुप्रयोगहरू जुन सिङ्कमा भर पर्छन् अद्यावधिक नहुन सक्छन् जबसम्म तपाईँ तिनीहरूलाई खोल्नुहुन्न\n\n ब्याट्री संरक्षक स्वत: निस्कृय हुन्छ जब तपाईँको यन्त्र चार्ज हुँदै हुन्छ।"</string>
<plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848">
<item quantity="other"> %1$d मिनेटको लागि (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> सम्म)</item>
<item quantity="one">एक मिनेटको लागि (<xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g> सम्म)</item>
@@ -1505,4 +1511,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयन गरियो</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> चयन गरियो</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"विविध"</string>
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index e4f388f..53b45b0 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Spraakassistent"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Nu vergrendelen"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Veilige modus"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-systeem"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Persoonlijk"</string>
@@ -243,7 +244,7 @@
<string name="permgrouplab_phone" msgid="5229115638567440675">"Telefoon"</string>
<string name="permgroupdesc_phone" msgid="6234224354060641055">"bellen en telefoontjes beheren"</string>
<string name="permgrouplab_sensors" msgid="416037179223226722">"Lichaamssensoren"</string>
- <string name="permgroupdesc_sensors" msgid="7147968539346634043">"toegang tot sensorgegevens over je vitale functies"</string>
+ <string name="permgroupdesc_sensors" msgid="7147968539346634043">"toegang krijgen tot sensorgegevens over je vitale functies"</string>
<string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Inhoud van vensters ophalen"</string>
<string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"De inhoud inspecteren van een venster waarmee je interactie hebt."</string>
<string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"\'Verkennen via aanraking\' inschakelen"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Er kunnen scripts worden geïnstalleerd om app-inhoud toegankelijker te maken."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Tekst observeren die u typt"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Omvat persoonlijke gegevens zoals creditcardnummers en wachtwoorden."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Schermvergroting bedienen"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Bedien het zoomniveau en de positionering van het scherm."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"statusbalk uitschakelen of wijzigen"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Hiermee kan de app de statusbalk uitschakelen of systeempictogrammen toevoegen en verwijderen."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"de statusbalk zijn"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Toegankelijkheid geannuleerd."</string>
<string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Overschakelen naar <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> uitloggen…"</string>
<string name="owner_name" msgid="2716755460376028154">"Eigenaar"</string>
<string name="error_message_title" msgid="4510373083082500195">"Fout"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Deze wijziging is niet toegestaan door je beheerder"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Vraag pin voor losmaken"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Vraag patroon voor losmaken"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Vraag wachtwoord voor losmaken"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Formaat van app kan niet worden aangepast, scroll met twee vingers."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Geïnstalleerd door je beheerder"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Geüpdatet door je beheerder"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Verwijderd door je beheerder"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diversen"</string>
</resources>
diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml
index 96343d8..d450bf9 100644
--- a/core/res/res/values-pa-rIN/strings.xml
+++ b/core/res/res/values-pa-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ਵੌਇਸ ਅਸਿਸਟ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ਹੁਣ ਲੌਕ ਕਰੋ"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"ਸੁਰੱਖਿਅਤ ਮੋਡ"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ਨਿੱਜੀ"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਵੱਧ ਪਹੁੰਚਯੋਗ ਬਣਾਉਣ ਲਈ ਸਕ੍ਰਿਪਟਾਂ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ।"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ਜੋ ਟੈਕਸਟ ਤੁਸੀਂ ਟਾਈਪ ਕਰਦੇ ਹੋ, ਉਸਦਾ ਨਿਰੀਖਣ ਕਰੋ"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ਇਸ ਵਿੱਚ ਨਿੱਜੀ ਡਾਟਾ ਸ਼ਾਮਲ ਹੈ ਜਿਵੇਂ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ ਅਤੇ ਪਾਸਵਰਡ।"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ਡਿਸਪਲੇ ਵੱਡਦਰਸ਼ੀ ਨੂੰ ਨਿਯੰਤ੍ਰਿਤ ਕਰੋ"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ਡਿਸਪਲੇ ਦੇ ਜ਼ੂਮ ਪੱਧਰ ਅਤੇ ਸਥਿਤੀ ਨੂੰ ਨਿਯੰਤ੍ਰਿਤ ਕਰੋ।"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"ਸਥਿਤੀ ਬਾਰ ਅਸਮਰੱਥ ਬਣਾਓ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਬਾਰ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਜਾਂ ਸਿਸਟਮ ਆਈਕਨਾਂ ਨੂੰ ਜੋੜਨ ਅਤੇ ਹਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ਸਥਿਤੀ ਪੱਟੀ ਬਣਨ ਦਿਓ"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ਪਹੁੰਚਯੋਗਤਾ ਰੱਦ ਕੀਤੀ।"</string>
<string name="user_switched" msgid="3768006783166984410">"ਮੌਜੂਦਾ ਉਪਭੋਗਤਾ <xliff:g id="NAME">%1$s</xliff:g>।"</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> ਤੇ ਸਵਿਚ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਲਾਗ-ਆਉਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ …"</string>
<string name="owner_name" msgid="2716755460376028154">"ਮਾਲਕ"</string>
<string name="error_message_title" msgid="4510373083082500195">"ਅਸ਼ੁੱਧੀ"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਇਸ ਬਦਲਾਵ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ।"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ PIN ਮੰਗੋ"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪੈਟਰਨ ਅਨਲੌਕ ਕਰਨ ਲਈ ਪੁੱਛੋ"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਮੰਗੋ"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ਐਪ ਮੁੜ-ਆਕਾਰ ਦੇਣਯੋਗ ਨਹੀਂ ਹੈ, ਇਸ ਨੂੰ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਸਕਰੋਲ ਕਰੋ।"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਇੰਸਟੌਲ ਕੀਤਾ ਗਿਆ"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਮਿਟਾਇਆ ਗਿਆ"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣਿਆ ਗਿਆ</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣਿਆ ਗਿਆ</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"ਵਿਵਿਧ"</string>
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index ae06e33..b7f984d 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Asystent głosowy"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Zablokuj teraz"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Tryb awaryjny"</string>
<string name="android_system_label" msgid="6577375335728551336">"System Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Osobiste"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Można zainstalować skrypty, by zawartość aplikacji była łatwiej dostępna."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Obserwowanie wpisywanego tekstu"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Obejmuje informacje osobiste, takie jak numery kart kredytowych i hasła."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Regulowanie powiększenia ekranu"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Regulowanie poziomu i obszaru powiększenia ekranu."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"wyłączanie lub zmienianie paska stanu"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Pozwala aplikacji na wyłączanie paska stanu oraz dodawanie i usuwanie ikon systemowych."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"działanie jako pasek stanu"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Ułatwienia dostępu zostały anulowane."</string>
<string name="user_switched" msgid="3768006783166984410">"Bieżący użytkownik: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Przełączam na użytkownika <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Wylogowuję użytkownika <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Właściciel"</string>
<string name="error_message_title" msgid="4510373083082500195">"Błąd"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ta zmiana nie jest dozwolona przez administratora"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Podaj PIN, aby odpiąć"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Aby odpiąć, poproś o wzór odblokowania"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Aby odpiąć, poproś o hasło"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Rozmiaru tej aplikacji nie można zmienić. Przewiń ją dwoma palcami."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Zainstalowany przez administratora"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Zaktualizowane przez administratora"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Usunięty przez administratora"</string>
@@ -1535,4 +1541,5 @@
<item quantity="other">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Wybrano <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Inne"</string>
</resources>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index 4d88275..4464259 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modo de segurança"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Pessoal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Scripts podem ser instalados para tornar o conteúdo do app mais acessível."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar o texto digitado"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclui dados pessoais, como números de cartão de crédito e senhas."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar ampliação da tela"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlar o posicionamento e nível de zoom da tela."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desativar ou modificar a barra de status"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite que o app desative a barra de status ou adicione e remova ícones do sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ser a barra de status"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Acessibilidade cancelada."</string>
<string name="user_switched" msgid="3768006783166984410">"Usuário atual <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Alternando para <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Desconectando <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Proprietário"</string>
<string name="error_message_title" msgid="4510373083082500195">"Erro"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Esta alteração não é permitida pelo administrador"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Pedir PIN antes de liberar"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pedir padrão de desbloqueio antes de liberar"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pedir senha antes de liberar"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"O app não é redimensionável. Desloque-o com dois dedos."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalado pelo seu administrador"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Atualizado pelo administrador"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Excluído pelo seu administrador"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diversos"</string>
</resources>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 863b6e8..af38435 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. de voz"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Pessoal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Poderão ser instalados scripts para tornar o conteúdo da aplicação mais acessível."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar o texto que escreve"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclui dados pessoais, como números de cartões de crédito e palavras-passe."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar a ampliação do ecrã"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlar o nível de zoom e o posicionamento do ecrã."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desativar ou modificar barra de estado"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite à aplicação desativar a barra de estado ou adicionar e remover ícones do sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ser apresentada na barra de estado"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Acessibilidade cancelada."</string>
<string name="user_switched" msgid="3768006783166984410">"<xliff:g id="NAME">%1$s</xliff:g> do utilizador atual."</string>
<string name="user_switching_message" msgid="2871009331809089783">"A mudar para <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"A terminar a sessão de <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Proprietário"</string>
<string name="error_message_title" msgid="4510373083082500195">"Erro"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"O administrador não permite esta alteração"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Pedir PIN antes de soltar"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pedir sequência de desbloqueio antes de soltar"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pedir palavra-passe antes de soltar"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"A aplicação não é redimensionável. Desloque-a com dois dedos."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalado pelo administrador"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Atualizado pelo administrador"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Eliminado pelo administrador"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selecionado</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diversos"</string>
</resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 4d88275..4464259 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Modo de segurança"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Pessoal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Scripts podem ser instalados para tornar o conteúdo do app mais acessível."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar o texto digitado"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclui dados pessoais, como números de cartão de crédito e senhas."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar ampliação da tela"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlar o posicionamento e nível de zoom da tela."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"desativar ou modificar a barra de status"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite que o app desative a barra de status ou adicione e remova ícones do sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"ser a barra de status"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Acessibilidade cancelada."</string>
<string name="user_switched" msgid="3768006783166984410">"Usuário atual <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Alternando para <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Desconectando <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Proprietário"</string>
<string name="error_message_title" msgid="4510373083082500195">"Erro"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Esta alteração não é permitida pelo administrador"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Pedir PIN antes de liberar"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pedir padrão de desbloqueio antes de liberar"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pedir senha antes de liberar"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"O app não é redimensionável. Desloque-o com dois dedos."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalado pelo seu administrador"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Atualizado pelo administrador"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Excluído pelo seu administrador"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diversos"</string>
</resources>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 9af1378b..7ac92c3 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -223,6 +223,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Asistent vocal"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Blocați acum"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"˃999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mod sigur"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistemul Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -253,6 +255,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Pot fi instalate scripturi pentru a face conținutul aplicațiilor mai accesibil."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Remarcă textul pe care îl introduceți"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Include date personale, cum ar fi numere ale cardurilor de credit sau parole."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlați mărirea pe afișaj"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlați nivelul de zoom și poziționarea afișajului."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"dezactivare sau modificare bare de stare"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Permite aplicației să dezactiveze bara de stare sau să adauge și să elimine pictograme de sistem."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"să fie bara de stare"</string>
@@ -1311,6 +1315,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accesibilitatea a fost anulată"</string>
<string name="user_switched" msgid="3768006783166984410">"Utilizator curent: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Se comută la <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Se deconectează utilizatorul <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Proprietar"</string>
<string name="error_message_title" msgid="4510373083082500195">"Eroare"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Această modificare nu este permisă de administratorul dvs."</string>
@@ -1440,6 +1445,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicită codul PIN înainte de a anula fixarea"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicită modelul pentru deblocare înainte de a anula fixarea"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicită parola înainte de a anula fixarea"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Aplicația nu poate fi redimensionată. Derulați în ea cu două degete."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Instalat de administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizat de un administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Șters de administrator"</string>
@@ -1517,4 +1523,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selectat</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diverse"</string>
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 8a64091..b7ba99f 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Аудиоподсказки"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Заблокировать"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Безопасный режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Система Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Личные данные"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Могут быть установлены дополнительные скрипты."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Обрабатывать набираемый текст"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"В том числе личные данные, например номера кредитных карт и пароли."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Управлять масштабом изображения"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Управлять позиционированием и размером изображения на экране."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"Отключение/изменение строки состояния"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Приложение сможет отключать строку состояния, а также добавлять и удалять системные значки."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"Замена строки состояния"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Специальные возможности не будут включены."</string>
<string name="user_switched" msgid="3768006783166984410">"Выбран аккаунт пользователя <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Смена профиля на <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Выход из аккаунта <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Владелец"</string>
<string name="error_message_title" msgid="4510373083082500195">"Ошибка"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Это действие запрещено администратором"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"PIN-код для отключения"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Запрашивать графический ключ для отключения блокировки"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Запрашивать пароль для отключения блокировки"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Размер окна нельзя изменить. Прокрутите страницу двумя пальцами."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Установлено администратором"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Обновлено администратором"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Удалено администратором"</string>
@@ -1535,4 +1541,5 @@
<item quantity="many">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="other">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Другое"</string>
</resources>
diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml
index c6f0d08..4e265177 100644
--- a/core/res/res/values-si-rLK/strings.xml
+++ b/core/res/res/values-si-rLK/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"හඬ සහායක"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"දැන් අගුළු දමන්න"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"ආරක්ෂිත ආකාරය"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android පද්ධතිය"</string>
<string name="user_owner_label" msgid="2804351898001038951">"පෞද්ගලික"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"යෙදුම් අන්තර්ගතයට ප්රවේශ්යතාවය වැඩිවන ලෙස සකස් කිරීමට ඇතැම් විට ස්ක්රිප්ට් ස්ථාපනය කර ඇත."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"ඔබ ටයිප් කළ පෙළ බලන්න"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"ණයවරපත් අංක සහ මුරපද වැනි පුද්ගලික දත්ත ඇතුළත් වේ."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"සංදර්ශන විශාලන මට්ටම පාලනය කිරීම"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"සංදර්ශනයේ විශාලන මට්ටම සහ පිහිටීම පාලනය කිරීම."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"තත්ව තීරුව අබල කරන්න හෝ වෙනස් කරන්න"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"තත්ව තීරුව අක්රිය කිරීමට හෝ පද්ධති නිරූපක එකතු හෝ ඉවත් කිරීමට යෙදුමට අවසර දේ."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"තත්ත්ව තීරුව බවට පත්වීම"</string>
@@ -1305,6 +1309,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ප්රවේශ්යතාව අවලංගු කර ඇත."</string>
<string name="user_switched" msgid="3768006783166984410">"දැනට සිටින පරිශීලකයා <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> වෙත මාරු කරමින්…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> වරමින්…"</string>
<string name="owner_name" msgid="2716755460376028154">"හිමිකරු"</string>
<string name="error_message_title" msgid="4510373083082500195">"දෝෂය"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ඔබගේ පරිපාලක විසින් මෙම වෙනස් කිරීමට ඉඩ නොදේ"</string>
@@ -1433,6 +1438,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ගැලවීමට පෙර PIN විමසන්න"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ගැලවීමට පෙර අගුළු අරින රටාව සඳහා අසන්න"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ගැලවීමට පෙර මුරපදය විමසන්න"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"යෙදුම ප්රතිප්රමාණ කළ හැකි නොවේ, එය ඇඟිලි දෙකකින් අනුචලනය කරන්න."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"ඔබගේ පරිපාලක විසින් ස්ථාපනය කරන ලද"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"ඔබගේ පරිපාලක විසින් යාවත්කාලීන කරන ලදී"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"ඔබගේ පරිපාලක විසින් මකන ලද"</string>
@@ -1501,4 +1507,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ක් තෝරන ලදි</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ක් තෝරන ලදි</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"විවිධාකාර"</string>
</resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 0ecb92d..ba5465e 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Hlasový asistent"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Uzamknúť"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Núdzový režim"</string>
<string name="android_system_label" msgid="6577375335728551336">"Systém Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Osobné"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Môže nainštalovať skripty na sprístupnenie obsahu aplikácie."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Sledovať zadávaný text"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Sledovanie zahŕňa osobné údaje ako sú čísla kreditných kariet a heslá."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ovládanie priblíženia obrazovky"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Ovládajte úroveň priblíženia/oddialenia obrazovky a umiestnenie"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"zakázanie alebo zmeny stavového riadka"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Umožňuje aplikácii vypnúť stavový riadok alebo pridať a odstrániť systémové ikony."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"vydávanie sa za stavový riadok"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Zjednodušenie ovládania bolo zrušené."</string>
<string name="user_switched" msgid="3768006783166984410">"Aktuálny používateľ je <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Prepína sa na účet <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Prebieha odhlásenie používateľa <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Vlastník"</string>
<string name="error_message_title" msgid="4510373083082500195">"Chyba"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Správca túto zmenu zakázal"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Pred uvoľnením požiadať o číslo PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pred uvoľnením požiadať o bezpečnostný vzor"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pred uvoľnením požiadať o heslo"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Veľkosť aplikácie nie je možné zmeniť. Zobrazenie môžete posúvať dvoma prstami."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Inštalovaný správcom"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Aktualizované správcom"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Odstránený správcom"</string>
@@ -1535,4 +1541,5 @@
<item quantity="other">Vybrané: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Vybrané: <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Rôzne"</string>
</resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index a5c1013..04b7fc7 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Glas. pomočnik"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Zakleni zdaj"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Varni način"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Osebno"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Za boljšo dostopnost vsebine aplikacije je mogoče namestiti skripte."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Opazovati besedilo, ki ga natipkate"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Vključuje osebne podatke, kot so številke kreditnih kartic in gesla."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Nadziranje povečave prikaza"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Nadziranje stopnje povečave in položaja prikaza."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"onemogočanje ali spreminjanje vrstice stanja"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Aplikacijam omogoča onemogočenje vrstice stanja ali dodajanje in odstranjevanje ikon sistema."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"postane vrstica stanja"</string>
@@ -1319,6 +1323,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Omogočanje pripomočkov za ljudi s posebnimi potrebami preklicano."</string>
<string name="user_switched" msgid="3768006783166984410">"Trenutni uporabnik <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Preklop na uporabnika <xliff:g id="NAME">%1$s</xliff:g> …"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Odjavljanje uporabnika <xliff:g id="NAME">%1$s</xliff:g> …"</string>
<string name="owner_name" msgid="2716755460376028154">"Lastnik"</string>
<string name="error_message_title" msgid="4510373083082500195">"Napaka"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Skrbnik ne dovoli te spremembe"</string>
@@ -1449,6 +1454,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Zahtevaj PIN pred odpenjanjem"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pred odpenjanjem vprašaj za vzorec za odklepanje"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pred odpenjanjem vprašaj za geslo"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Velikosti aplikacije ni mogoče spremeniti. Po njej se pomikajte z dvema prstoma."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Namestil skrbnik"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Posodobil skrbnik"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Izbrisal skrbnik"</string>
@@ -1535,4 +1541,5 @@
<item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> izbrani</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> izbranih</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Razno"</string>
</resources>
diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml
index 82f8b3b..b8ca565 100644
--- a/core/res/res/values-sq-rAL/strings.xml
+++ b/core/res/res/values-sq-rAL/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ndihma zanore"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Kyç tani"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Modaliteti i sigurisë"</string>
<string name="android_system_label" msgid="6577375335728551336">"Sistemi \"android\""</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skriptet mund të instalohen për ta bërë përmbajtjen e aplikacionit më të qasshme."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Vëzhgojë tekstin që shkruan"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Përfshi të dhënat personale si numrat e kartave të kreditit si dhe fjalëkalimet."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kontrollo zmadhimin e ekranit"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrollo nivelin dhe pozicionimin e zmadhimit të ekranit."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"çaktivizo ose modifiko shiritin e statusit"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Lejon aplikacionin të çaktivizojë shiritin e statusit dhe të heqë ikonat e sistemit."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"të bëhet shiriti i statusit"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Qasja u anulua."</string>
<string name="user_switched" msgid="3768006783166984410">"Emri i përdoruesit aktual: <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"Po kalon në <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> po del…"</string>
<string name="owner_name" msgid="2716755460376028154">"Zotëruesi"</string>
<string name="error_message_title" msgid="4510373083082500195">"Gabim"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ky ndryshim nuk lejohet nga administratori yt"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Zhgozhdimi kërkon PIN-in"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Kërko model shkyçjeje para heqjes së gozhdimit"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Kërko fjalëkalim para heqjes nga gozhdimi."</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Përmasa e apl. nuk mund të ndryshohet, lëvize atë me të dy gishtat."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"U instalua nga administratori yt"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Përditësuar nga administratori"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"U fshi nga administratori yt"</string>
@@ -1499,4 +1504,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> të zgjedhura</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> i zgjedhur</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Të ndryshme"</string>
</resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index bab8944..4118c63 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -223,6 +223,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помоћ"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Закључај одмах"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Безбедни режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android систем"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Лично"</string>
@@ -253,6 +255,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Могу да се инсталирају скрипте да би садржај апликација био приступачнији."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Прати текст који уносите"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Обухвата личне податке као што су бројеви кредитних картица и лозинке."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Управљај увећањем приказа"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Управља нивоом зумирања приказа и одређивањем положаја."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"онемогућавање или измена статусне траке"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Дозвољава апликацији да онемогући статусну траку или да додаје и уклања системске иконе."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"функционисање као статусна трака"</string>
@@ -1311,6 +1315,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Приступачност је отказана."</string>
<string name="user_switched" msgid="3768006783166984410">"Актуелни корисник <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Пребацивање на <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Одјављује се <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Власник"</string>
<string name="error_message_title" msgid="4510373083082500195">"Грешка"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Администратор није дозволио ову промену"</string>
@@ -1440,6 +1445,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Тражи PIN пре откачињања"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Тражи шаблон за откључавање пре откачињања"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Тражи лозинку пре откачињања"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Величина апликације не може да се мења, померајте је помоћу два прста."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Инсталирао је ваш администратор"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Ажурирао је администратор"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Избрисао је ваш адмиистратор"</string>
@@ -1517,4 +1523,5 @@
<item quantity="few">Изабране су <xliff:g id="COUNT_1">%1$d</xliff:g> ставке</item>
<item quantity="other">Изабрано је <xliff:g id="COUNT_1">%1$d</xliff:g> ставки</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Разно"</string>
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 3909c6b..40141de 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Lås nu"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Säkert läge"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android-system"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personligt"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Skript kan installeras för att göra appens innehåll tillgängligare."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observera text som du skriver"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Omfattar personuppgifter som kreditkortsnummer och lösenord."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Styr skärmförstoringen"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Styr skärmens zoomnivå och positionering."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"inaktivera eller ändra statusfält"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Tillåter att appen inaktiverar statusfältet eller lägger till och tar bort systemikoner."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"visas i statusfältet"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Byte till tillgänglighetsläge avbrutet."</string>
<string name="user_switched" msgid="3768006783166984410">"Nuvarande användare: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Byter till <xliff:g id="NAME">%1$s</xliff:g> …"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Loggar ut <xliff:g id="NAME">%1$s</xliff:g> …"</string>
<string name="owner_name" msgid="2716755460376028154">"Ägare"</string>
<string name="error_message_title" msgid="4510373083082500195">"Fel"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Administratören tillåter inte den här ändringen"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Be om pinkod innan skärmen slutar fästas"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Be om upplåsningsmönster innan skärmen slutar fästas"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Be om lösenord innan skärmen slutar fästas"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Det går inte att ändra appens storlek. Rulla med två fingrar."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Paketet har installerats av administratören"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Uppdaterat av administratören"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Paketet har raderats av administratören"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> har valts</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> har valts</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Diverse"</string>
</resources>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index c9cdd8d..196d5dc 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -224,6 +224,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Usaidizi wa Sauti"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Funga sasa"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Mtindo salama"</string>
<string name="android_system_label" msgid="6577375335728551336">"Mfumo wa Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Binafsi"</string>
@@ -254,6 +256,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Hati zinaweza kusakinishwa ili kuyafanya maudhui ya programu kufikiwa zaidi."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Angalia maandishi unayoyacharaza"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inajumuisha data binafsi kama vile nambari za kadi ya mkopo na manenosiri."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Dhibiti ukuzaji wa onyesho"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Dhibiti kiwango cha kukuza na nafasi cha onyesho."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"zima au rekebisha mwambaa hali"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Inaruhusu programu kulemaza upau wa hali au kuongeza na kutoa ikoni za mfumo."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"kuwa sehemu ya arifa"</string>
@@ -1305,6 +1309,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Ufikivu umeghairiwa."</string>
<string name="user_switched" msgid="3768006783166984410">"Mtumiaji wa sasa <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Inabadili kwenda <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Inamwondoa <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Mmiliki"</string>
<string name="error_message_title" msgid="4510373083082500195">"Hitilafu"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
@@ -1433,6 +1438,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Omba PIN kabla hujabandua"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Omba mchoro wa kufungua kabla hujabandua"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Omba nenosiri kabla hujabandua"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Programu haiwezi kurekebishwa ukubwa, sogeza kwa kutumia vidole viwili."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Kilisakinishwa na msimamizi wako"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Kimesasiswa na msimamizi wako"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Kilifutwa na msimamizi wako"</string>
@@ -1501,4 +1507,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vimechaguliwa</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kimechaguliwa</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Anuwai"</string>
</resources>
diff --git a/core/res/res/values-sw600dp/dimens.xml b/core/res/res/values-sw600dp/dimens.xml
index 94e9c4e..9c45c12 100644
--- a/core/res/res/values-sw600dp/dimens.xml
+++ b/core/res/res/values-sw600dp/dimens.xml
@@ -22,10 +22,6 @@
<dimen name="thumbnail_width">360dp</dimen>
<!-- The height that is used when creating thumbnails of applications. -->
<dimen name="thumbnail_height">360dp</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. -->
- <integer name="max_action_buttons">5</integer>
<!-- Default height of an action bar. -->
<dimen name="action_bar_default_height">56dip</dimen>
<!-- Vertical padding around action bar icons. -->
@@ -88,7 +84,7 @@
<!-- Size of the generic status lines keyguard's status view -->
<dimen name="kg_status_line_font_size">16sp</dimen>
- <!-- Top margin for the clock view -->
+ <!-- Top margin for the clock view -->
<dimen name="kg_clock_top_margin">0dp</dimen>
<!-- Size of margin on the right of keyguard's status view -->
diff --git a/core/res/res/values-sw720dp/config.xml b/core/res/res/values-sw720dp/config.xml
index 9792835..1f5791a 100644
--- a/core/res/res/values-sw720dp/config.xml
+++ b/core/res/res/values-sw720dp/config.xml
@@ -19,4 +19,7 @@
used for picking activities to handle an intent. -->
<integer name="config_maxResolverActivityColumns">4</integer>
+ <!-- Enable cascading submenus. -->
+ <bool name="config_enableCascadingSubmenus">true</bool>
+
</resources>
diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml
index 67b85583..1113776 100644
--- a/core/res/res/values-ta-rIN/strings.xml
+++ b/core/res/res/values-ta-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"குரல் உதவி"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"இப்போது பூட்டு"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"பாதுகாப்பு பயன்முறை"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android அமைப்பு"</string>
<string name="user_owner_label" msgid="2804351898001038951">"தனிப்பட்ட"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"பயன்பாட்டு உள்ளடக்கத்தை மேலும் எளிதாக அணுகக்கூடியதாக்க ஸ்கிரிப்ட்கள் நிறுவப்படலாம்."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"நீங்கள் தட்டச்சு செய்யும் உரையைக் கவனிக்கும்"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"கிரெடிட் கார்டு எண்கள் மற்றும் கடவுச்சொற்கள் போன்ற தனிப்பட்ட தகவலும் உள்ளடங்கும்."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"திரையின் உருப்பெருக்கத்தைக் கட்டுப்படுத்துதல்"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"திரையின் ஜூம் அளவையும் நிலையையும் கட்டுப்படுத்தலாம்."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"நிலைப் பட்டியை முடக்குதல் அல்லது மாற்றுதல்"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"நிலைப் பட்டியை முடக்க அல்லது முறைமையில் ஐகான்களைச் சேர்க்க மற்றும் அகற்ற பயன்பாட்டை அனுமதிக்கிறது."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"நிலைப் பட்டியில் இருக்கும்"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"அணுகல்தன்மை ரத்துசெய்யப்பட்டது."</string>
<string name="user_switched" msgid="3768006783166984410">"நடப்பு பயனர் <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g>க்கு மாறுகிறது…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> வெளியேறுகிறார்…"</string>
<string name="owner_name" msgid="2716755460376028154">"உரிமையாளர்"</string>
<string name="error_message_title" msgid="4510373083082500195">"பிழை"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"உங்கள் நிர்வாகி இந்த மாற்றத்தை அனுமதிக்கவில்லை"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"அகற்றும் முன் PINஐக் கேள்"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"அகற்றும் முன் திறத்தல் வடிவத்தைக் கேள்"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"அகற்றும் முன் கடவுச்சொல்லைக் கேள்"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"பயன்பாடு அளவுமாறக்கூடியது அல்ல, இருவிரல்களைப் பயன்படுத்தி அதை உருட்டவும்."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"நிர்வாகி நிறுவினார்"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"உங்கள் நிர்வாகி புதுப்பித்துள்ளார்"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"நிர்வாகி நீக்கிவிட்டார்"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டன</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"இதர அமைப்பு"</string>
</resources>
diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml
index 97789e1..c563e7c 100644
--- a/core/res/res/values-te-rIN/strings.xml
+++ b/core/res/res/values-te-rIN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"వాయిస్ సహాయకం"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ఇప్పుడు లాక్ చేయండి"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"సురక్షిత మోడ్"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android సిస్టమ్"</string>
<string name="user_owner_label" msgid="2804351898001038951">"వ్యక్తిగతం"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"అనువర్తన కంటెంట్కు మరింత సులభ ప్రాప్యత సౌలభ్యం అందించడానికి స్క్రిప్ట్లు ఇన్స్టాల్ చేయబడవచ్చు."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"మీరు టైప్ చేస్తున్న వచనాన్ని పరిశీలిస్తుంది"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"క్రెడిట్ కార్డు నంబర్లు మరియు పాస్వర్డ్ల వంటి వ్యక్తిగత డేటాను కలిగి ఉంటుంది."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"డిస్ప్లే మాగ్నిఫికేషన్ను నియంత్రించండి"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"డిస్ప్లే జూమ్ స్థాయి మరియు స్థానాన్ని నియంత్రిస్తుంది."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"స్థితి బార్ను నిలిపివేయడం లేదా సవరించడం"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"స్థితి బార్ను నిలిపివేయడానికి లేదా సిస్టమ్ చిహ్నాలను జోడించడానికి మరియు తీసివేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"స్థితి పట్టీగా ఉండటం"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ప్రాప్యత రద్దు చేయబడింది."</string>
<string name="user_switched" msgid="3768006783166984410">"ప్రస్తుత వినియోగదారు <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g>కి మారుస్తోంది…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g>ని లాగ్ అవుట్ చేస్తోంది…"</string>
<string name="owner_name" msgid="2716755460376028154">"యజమాని"</string>
<string name="error_message_title" msgid="4510373083082500195">"లోపం"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ఈ మార్పును మీ నిర్వాహకుడు అనుమతించలేదు"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"అన్పిన్ చేయడానికి ముందు పిన్ కోసం అడుగు"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"అన్పిన్ చేయడానికి ముందు అన్లాక్ నమూనా కోసం అడుగు"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"అన్పిన్ చేయడానికి ముందు పాస్వర్డ్ కోసం అడుగు"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"అనువర్తన పరిమాణాన్ని మార్చడం సాధ్యపడదు, రెండు వేళ్లతో దీన్ని స్క్రోల్ చేయండి."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"మీ నిర్వాహకులు ఇన్స్టాల్ చేసారు"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"మీ నిర్వాహకుడు నవీకరించారు"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"మీ నిర్వాహకులు తొలగించారు"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఎంచుకోబడ్డాయి</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఎంచుకోబడింది</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"ఇతరాలు"</string>
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 013da3d..0080f51 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"ตัวช่วยเสียง"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ล็อกเลย"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"โหมดปลอดภัย"</string>
<string name="android_system_label" msgid="6577375335728551336">"ระบบ Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ส่วนตัว"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"อาจติดตั้งสคริปต์เพื่อทำให้สามารถเข้าถึงเนื้อหาแอปได้ง่ายขึ้น"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"สังเกตข้อความที่คุณพิมพ์"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"รวมถึงข้อมูลส่วนบุคคล เช่น หมายเลขบัตรเครดิตและรหัสผ่าน"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ควบคุมการขยายการแสดงผล"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ควบคุมระดับการซูมและการวางตำแหน่งของการแสดงผล"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"ปิดการใช้งานหรือแก้ไขแถบสถานะ"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"อนุญาตให้แอปพลิเคชันปิดใช้งานแถบสถานะหรือเพิ่มและนำไอคอนระบบออก"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"เป็นแถบสถานะ"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"ยกเลิกการเข้าถึงแล้ว"</string>
<string name="user_switched" msgid="3768006783166984410">"ผู้ใช้ปัจจุบัน <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="user_switching_message" msgid="2871009331809089783">"กำลังเปลี่ยนเป็น <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"กำลังออกจากระบบ <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"เจ้าของ"</string>
<string name="error_message_title" msgid="4510373083082500195">"ข้อผิดพลาด"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"ผู้ดูแลระบบไม่อนุญาตการเปลี่ยนแปลงนี้"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ขอ PIN ก่อนเลิกตรึง"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"ขอรูปแบบการปลดล็อกก่อนเลิกตรึง"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ขอรหัสผ่านก่อนเลิกตรึง"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"แอปไม่สามารถปรับขนาดได้ เลื่อนแอปด้วยนิ้ว 2 นิ้ว"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"ติดตั้งโดยผู้ดูแลระบบของคุณ"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"อัปเดตโดยผู้ดูแลระบบ"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"ลบโดยผู้ดูแลระบบของคุณ"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">เลือกไว้ <xliff:g id="COUNT_1">%1$d</xliff:g> รายการ</item>
<item quantity="one">เลือกไว้ <xliff:g id="COUNT_0">%1$d</xliff:g> รายการ</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"เบ็ดเตล็ด"</string>
</resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index 8c6c37d..4f907c1 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"I-lock ngayon"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Personal"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Maaaring mag-install ng mga script upang gawing mas naa-access ang nilalaman ng app."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Obserbahan ang tekstong tina-type mo"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"May kasamang personal na data tulad ng mga numero ng credit card at password."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kontrolin ang pag-magnify ng display"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kontrolin ang antas ng pag-zoom at pagpoposisyon ng display."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"huwag paganahin o baguhin ang status bar"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Pinapayagan ang app na huwag paganahin ang status bar o magdagdag at mag-alis ng mga icon ng system."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"maging status bar"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Nakansela ang pagiging naa-access."</string>
<string name="user_switched" msgid="3768006783166984410">"Kasalukuyang user <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Lumilipat kay <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Nila-log out si <xliff:g id="NAME">%1$s</xliff:g>..."</string>
<string name="owner_name" msgid="2716755460376028154">"May-ari"</string>
<string name="error_message_title" msgid="4510373083082500195">"Error"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ang pagbabagong ito ay hindi pinapahintulutan ng iyong administrator"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Humingi ng PIN bago mag-unpin"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Humingi ng password bago mag-unpin"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Hindi nare-resize ang app, mag-scroll dito gamit ang dalawang daliri."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Na-install ng iyong administrator"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Na-update ng iyong administrator"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Na-delete ng iyong administrator"</string>
@@ -1499,4 +1505,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Iba Pa"</string>
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 20f6191..06f8c75 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Sesli Yardım"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Şimdi kilitle"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Güvenli mod"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android Sistemi"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Kişisel"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Uygulamanın erişilebilirliğini artırmak için komut dosyaları yüklenebilir."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Yazdığınız metni izleme"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Kredi kartı ve şifre gibi kişisel bilgiler içerir."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ekran büyütecini kontrol et"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Ekranın yakınlaştırma seviyesini ve konumunu kontrol edin."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"durum çubuğunu devre dışı bırak veya değiştir"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Uygulamaya, durum çubuğunu devre dışı bırakma ve sistem simgelerini ekleyip kaldırma izni verir."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"durum çubuğunda olma"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Erişilebilirlik iptal edildi."</string>
<string name="user_switched" msgid="3768006783166984410">"Geçerli kullanıcı: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> adlı kullanıcıya geçiliyor…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> hesabından çıkış yapılıyor…"</string>
<string name="owner_name" msgid="2716755460376028154">"Sahibi"</string>
<string name="error_message_title" msgid="4510373083082500195">"Hata"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Yöneticiniz bu değişikliğe izin vermiyor"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Sabitlemeyi kaldırmadan önce PIN\'i sor"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Sabitlemeyi kaldırmadan önce kilit açma desenini sor"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Sabitlemeyi kaldırmadan önce şifre sor"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Uygulama yeniden boyutlandırılamaz. İki parmağınızla kaydırın."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Yöneticiniz tarafından yüklendi"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Yöneticiniz tarafından güncellendi"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Yöneticiniz tarafından silindi"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> öğe seçildi</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> öğe seçildi</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Çeşitli"</string>
</resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index 871153f..721f24d 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -224,6 +224,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Голос. підказки"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Блокувати зараз"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Безп. режим"</string>
<string name="android_system_label" msgid="6577375335728551336">"Система Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Особисті дані"</string>
@@ -254,6 +255,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Можуть установлюватися сценарії, щоб зробити вміст програми доступнішим."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Обробляти текст, який ви вводите"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Включає особисті дані, як-от номери кредитних карток і паролі."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Контролювати збільшення екрана"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Контролювати масштаб і розташування екрана."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"вимикати чи змін. рядок стану"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Дозволяє програмі вимикати рядок стану чи додавати та видаляти піктограми системи."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"відображатися як рядок стану"</string>
@@ -1319,6 +1322,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Доступність скасовано."</string>
<string name="user_switched" msgid="3768006783166984410">"Поточний користувач: <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Перехід в обліковий запис \"<xliff:g id="NAME">%1$s</xliff:g>\"…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Вихід з облікового запису користувача <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Власник"</string>
<string name="error_message_title" msgid="4510373083082500195">"Помилка"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ця дія заборонена адміністратором"</string>
@@ -1449,6 +1453,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"PIN-код для відкріплення"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Запитувати ключ розблокування перед відкріпленням"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Запитувати пароль перед відкріпленням"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Розмір додатка не можна змінити. Прокручуйте його двома пальцями."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Установив адміністратор"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Оновлено адміністратором"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Видалив адміністратор"</string>
@@ -1535,4 +1540,5 @@
<item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Інше"</string>
</resources>
diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml
index 175a840..e31fa57 100644
--- a/core/res/res/values-ur-rPK/strings.xml
+++ b/core/res/res/values-ur-rPK/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"ابھی مقفل کریں"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"حفاظتی وضع"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android سسٹم"</string>
<string name="user_owner_label" msgid="2804351898001038951">"ذاتی"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"ایپ کا مواد مزید قابل رسائی بنانے کیلئے اسکرپٹس کو انسٹال کیا جا سکتا ہے۔"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"آپکے ٹائپ کردہ متن کا مشاہدہ کرنے کی"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"اس میں ذاتی ڈیٹا جیسے کریڈٹ کارڈ نمبرز اور پاس ورڈز شامل ہیں۔"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ڈسپلے بڑا کرنے کے عمل کو کنٹرول کریں"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ڈسپلے کے زوم کی سطح اور پوزیشن کو کنٹرول کریں۔"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"اسٹیٹس بار کو غیر فعال یا اس میں ترمیم کریں"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"ایپ کو اسٹیٹس بار غیر فعال کرنے یا سسٹم آئیکنز شامل کرنے اور ہٹانے کی اجازت دیتا ہے۔"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"بطور اسٹیٹس بار کام لیں"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibility منسوخ ہوگئی۔"</string>
<string name="user_switched" msgid="3768006783166984410">"موجودہ صارف <xliff:g id="NAME">%1$s</xliff:g>۔"</string>
<string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> پر سوئچ کیا جا رہا ہے…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> لاگ آؤٹ ہو رہا ہے…"</string>
<string name="owner_name" msgid="2716755460376028154">"مالک"</string>
<string name="error_message_title" msgid="4510373083082500195">"خرابی"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"آپ کے منتظم کے ذریعے اس تبدیلی کی اجازت نہیں ہے"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"پن ہٹانے سے پہلے PIN طلب کریں"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"پن ہٹانے سے پہلے غیر مقفل کرنے کا پیٹرن طلب کریں"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"پن ہٹانے سے پہلے پاس ورڈ طلب کریں"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"ایپ ری سائز ایبل نہیں ہے، اسے دو انگلیوں کے ساتھ سکرول کریں۔"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"آپ کے منتظم کی جانب سے انسٹال کر دیا گیا"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"آپ کے منتظم نے اپ ڈيٹ کر دیا"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"آپ کے منتظم کی جانب سے حذف کر دیا گیا"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> منتخب کردہ</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> منتخب کردہ</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"متفرقات"</string>
</resources>
diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml
index 278ef6d..0489638 100644
--- a/core/res/res/values-uz-rUZ/strings.xml
+++ b/core/res/res/values-uz-rUZ/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Ovozli yordam"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Qulflash"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Xavfsiz usul"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android tizimi"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Shaxsiy"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Qo‘shimcha skriptlar o‘rnatilishi mumkin."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Kiritilayotgan matnni kuzatadi"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Bunga kredit karta raqamlari va parollar kabi shaxsiy ma’lumotlar kiradi."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Ekranni kattalashtirishni boshqarish"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Ekranni kattalashtirish darajasi va joylashuvini boshqaradi."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"holat panelini o‘zgartirish yoki o‘chirish"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Ilova holat panelini o‘chirib qo‘yishi hamda tizim ikonkalarini qo‘shishi yoki olib tashlashi mumkin."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"holat qatorida ko‘rinishi"</string>
@@ -664,7 +668,7 @@
<string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM karta yo‘q"</string>
<string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Planshetingizga SIM karta yo‘q."</string>
<string name="lockscreen_missing_sim_message" product="tv" msgid="1943633865476989599">"Televizorda SIM karta yo‘q."</string>
- <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Telefoningizga SIM karta yo‘q."</string>
+ <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Telefoningizda SIM karta yo‘q."</string>
<string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"SIM kartani soling."</string>
<string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM karta solinmagan yoki uni o‘qib bo‘lmaydi. SIM kartani soling."</string>
<string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Foydalanib bo‘lmaydigan SIM karta."</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Qulaylik bekor qilindi."</string>
<string name="user_switched" msgid="3768006783166984410">"Joriy foydalanuvchi <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Quyidagi foydalanuvchiga o‘tilmoqda: <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> hisobidan chiqilmoqda…"</string>
<string name="owner_name" msgid="2716755460376028154">"Egasi"</string>
<string name="error_message_title" msgid="4510373083082500195">"Xato"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ushbu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Yechishda PIN-kod so‘ralsin"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Bo‘shatishdan oldin chizmali parol so‘ralsin"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Bo‘shatishdan oldin parol so‘ralsin"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Oyna o‘lchamini o‘zgartirib bo‘lmaydi. Sahifani ikkita barmoq bilan aylantiring."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Administratoringiz tomonidan o‘rnatilgan"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Administratoringiz tomonidan yangilandi"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Administratoringiz tomonidan o‘chirilgan"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta tanlandi</item>
<item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta tanlandi</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Boshqa belgilar"</string>
</resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index 439fe25..ccd1345 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Trợ lý thoại"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Khóa ngay"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"Chế độ an toàn"</string>
<string name="android_system_label" msgid="6577375335728551336">"Hệ thống Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Cá nhân"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Tập lệnh có thể được cài đặt để làm cho nội dung ứng dụng dễ truy cập hơn."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Xem nội dung bạn nhập"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Bao gồm dữ liệu cá nhân chẳng hạn như số thẻ tín dụng và mật khẩu."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Kiểm soát thu phóng màn hình"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Kiểm soát vị trí và mức thu phóng của màn hình."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"vô hiệu hóa hoặc sửa đổi thanh trạng thái"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Cho phép ứng dụng vô hiệu hóa thanh trạng thái hoặc thêm và xóa biểu tượng hệ thống."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"trở thành thanh trạng thái"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Đã hủy trợ năng."</string>
<string name="user_switched" msgid="3768006783166984410">"Người dùng hiện tại <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Đang chuyển sang <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Đang đăng xuất <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Chủ sở hữu"</string>
<string name="error_message_title" msgid="4510373083082500195">"Lỗi"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Quản trị viên của bạn không cho phép thực hiện thay đổi này"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Hỏi mã PIN trước khi bỏ ghim"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Hỏi hình mở khóa trước khi bỏ ghim"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Hỏi mật khẩu trước khi bỏ ghim"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Ứng dụng không đổi kích thước được, hãy cuộn ứng dụng bằng hai ngón tay."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Được cài đặt bởi quản trị viên của bạn"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Được cập nhật bởi quản trị viên của bạn"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Đã bị xóa bởi quản trị viên của bạn"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">Đã chọn <xliff:g id="COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Đã chọn <xliff:g id="COUNT_0">%1$d</xliff:g></item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Khác"</string>
</resources>
diff --git a/core/res/res/values-w360dp/dimens.xml b/core/res/res/values-w360dp/dimens.xml
deleted file mode 100644
index 0f5d656..0000000
--- a/core/res/res/values-w360dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">3</integer>
-</resources>
diff --git a/core/res/res/values-w500dp/dimens.xml b/core/res/res/values-w500dp/dimens.xml
deleted file mode 100644
index 68841ca..0000000
--- a/core/res/res/values-w500dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources>
- <!-- 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. -->
- <integer name="max_action_buttons">4</integer>
-</resources>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index b3c70a5..1afede0 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"语音助理"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"立即锁定"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"安全模式"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string>
<string name="user_owner_label" msgid="2804351898001038951">"个人"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"安装脚本以方便访问应用的内容。"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"监测您输入的文字"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"包含个人数据，例如信用卡号和密码。"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"控制显示内容放大功能"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"控制显示内容的缩放级别和位置。"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"停用或修改状态栏"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"允许应用停用状态栏或者增删系统图标。"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"用作状态栏"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"已取消无障碍功能。"</string>
<string name="user_switched" msgid="3768006783166984410">"当前用户是<xliff:g id="NAME">%1$s</xliff:g>。"</string>
<string name="user_switching_message" msgid="2871009331809089783">"正在切换为<xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"正在将<xliff:g id="NAME">%1$s</xliff:g>退出帐号…"</string>
<string name="owner_name" msgid="2716755460376028154">"机主"</string>
<string name="error_message_title" msgid="4510373083082500195">"错误"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"您的管理员不允许进行此更改"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消时要求输入PIN码"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消时要求绘制解锁图案"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消时要求输入密码"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"无法调整这个应用的大小，请用双指滚动应用。"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理员安装"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"由您单位的管理员更新"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"已被管理员删除"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item>
<item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"其他"</string>
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index ddafe6d..84c85bf 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"語音助手"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"立即鎖定"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"安全模式"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android 系統"</string>
<string name="user_owner_label" msgid="2804351898001038951">"個人"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"可能會安裝程式碼，使應用程式內容更易於存取。"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"記錄您輸入的文字"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"包括個人資料，如信用卡號碼和密碼。"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"控制顯示屏的放大功能"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"控制顯示屏的縮放程度和位置。"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"停用或修改狀態列"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"允許應用程式停用狀態列，並可新增或移除系統圖示。"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"成為狀態列"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"無障礙功能已取消。"</string>
<string name="user_switched" msgid="3768006783166984410">"目前的使用者是<xliff:g id="NAME">%1$s</xliff:g>。"</string>
<string name="user_switching_message" msgid="2871009331809089783">"正在切換至<xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"正在登出 <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"擁有者"</string>
<string name="error_message_title" msgid="4510373083082500195">"錯誤"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"您的管理員不允許這項變更"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消固定時必須輸入 PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消固定時必須畫出解鎖圖案"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消固定時必須輸入密碼"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"不可更改應用程式尺寸，請使用兩隻手指捲動應用程式。"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理員安裝"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"已由您的管理員更新"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"已由管理員刪除"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
<item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"其他"</string>
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 1163137..b45fe75 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -222,6 +222,8 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"語音小幫手"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"立即鎖定"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"超過 999"</string>
+ <!-- no translation found for notification_children_count_bracketed (1769425473168347839) -->
+ <skip />
<string name="safeMode" msgid="2788228061547930246">"安全模式"</string>
<string name="android_system_label" msgid="6577375335728551336">"Android 系統"</string>
<string name="user_owner_label" msgid="2804351898001038951">"個人"</string>
@@ -252,6 +254,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"可能會安裝程式碼，使應用程式內容更易於存取。"</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"記錄您輸入的文字"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"包括個人資料，如信用卡號碼和密碼。"</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"控管顯示畫面放大功能"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"控管顯示畫面的縮放等級和位置。"</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"停用或變更狀態列"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"允許應用程式停用狀態列，並可新增或移除系統圖示。"</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"以狀態列顯示"</string>
@@ -1303,6 +1307,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"協助工具已取消。"</string>
<string name="user_switched" msgid="3768006783166984410">"目前的使用者是 <xliff:g id="NAME">%1$s</xliff:g>。"</string>
<string name="user_switching_message" msgid="2871009331809089783">"正在切換至<xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"正在將<xliff:g id="NAME">%1$s</xliff:g>登出帳戶…"</string>
<string name="owner_name" msgid="2716755460376028154">"擁有者"</string>
<string name="error_message_title" msgid="4510373083082500195">"錯誤"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"您的管理員不允許這項變更"</string>
@@ -1431,6 +1436,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消固定時必須輸入 PIN"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消固定時必須畫出解鎖圖形"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消固定時必須輸入密碼"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"無法調整這個應用程式的大小，請用雙指捲動該應用程式。"</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理員安裝"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"由您的管理員更新"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"已遭管理員刪除"</string>
@@ -1499,4 +1505,5 @@
<item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
<item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"其他"</string>
</resources>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index 9557f58..c2159d7 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -222,6 +222,7 @@
<string name="global_action_voice_assist" msgid="7751191495200504480">"Isisekeli sezwi"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"Khiya manje"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_children_count_bracketed" msgid="1769425473168347839">"(<xliff:g id="NOTIFICATIONCOUNT">%d</xliff:g>)"</string>
<string name="safeMode" msgid="2788228061547930246">"Imodi ephephile"</string>
<string name="android_system_label" msgid="6577375335728551336">"Uhlelo lwe-Android"</string>
<string name="user_owner_label" msgid="2804351898001038951">"Okomuntu siqu"</string>
@@ -252,6 +253,8 @@
<string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Amaskripthi angase afakwe ukwenza okuqukethwe kohlelo lokusebenza kufinyeleleke kakhulu."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Qapha umbhalo owuthayiphayo"</string>
<string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Kufaka phakathi idatha yomuntu siqu efana nezinombolo zekhadi lesikweletu namaphasiwedi."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Lawula ukulungiswa kwesibonisi"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Lawula ileveli yokusondeza yesibonisi nendawo."</string>
<string name="permlab_statusBar" msgid="7417192629601890791">"khubaza noma guqula ibha yomumo"</string>
<string name="permdesc_statusBar" msgid="8434669549504290975">"Ivumela uhlelo lokusebenza ukuthi yenze umudwa ochaza ngesimo ukuthi ungasebenzi noma ukufaka noma ukukhipha izithonjana zohlelo."</string>
<string name="permlab_statusBarService" msgid="4826835508226139688">"yiba yibha yesimo"</string>
@@ -1303,6 +1306,7 @@
<string name="enable_accessibility_canceled" msgid="3833923257966635673">"Ukufinyelela kukhanseliwe."</string>
<string name="user_switched" msgid="3768006783166984410">"Umsebenzisi wamanje <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="user_switching_message" msgid="2871009331809089783">"Ishintshela ku-<xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Iyaphuma <xliff:g id="NAME">%1$s</xliff:g>…"</string>
<string name="owner_name" msgid="2716755460376028154">"Umnikazi"</string>
<string name="error_message_title" msgid="4510373083082500195">"Iphutha"</string>
<string name="error_message_change_not_allowed" msgid="1347282344200417578">"Le nguquko ayivumelekile ngomqondisi wakho"</string>
@@ -1431,6 +1435,7 @@
<string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Cela iphinikhodi ngaphambi kokuphina"</string>
<string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Cela iphethini yokuvula ngaphambi kokususa ukuphina"</string>
<string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Cela iphasiwedi ngaphambi kokususa ukuphina"</string>
+ <string name="dock_non_resizeble_text" msgid="9156251681042762723">"Uhlelo lokusebenza alukwazi ukunikezwa usayizi omusha, liskrole ngeminwe emibili."</string>
<string name="package_installed_device_owner" msgid="8420696545959087545">"Ifakwe ngumlawuli wakho"</string>
<string name="package_updated_device_owner" msgid="8856631322440187071">"Ibuyekezwe ngumqondisi wakho"</string>
<string name="package_deleted_device_owner" msgid="7650577387493101353">"Isuswe ngumlawuli wakho"</string>
@@ -1499,4 +1504,5 @@
<item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item>
</plurals>
+ <string name="default_notification_topic_label" msgid="227586145791870829">"Okwahlukahlukene"</string>
</resources>
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index 33c41ef..a6a4564 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -364,6 +364,11 @@
<item>@color/search_url_text_material_light</item>
</array>
+ <array name="preloaded_freeform_multi_window_drawables">
+ <item>@drawable/decor_maximize_button_dark</item>
+ <item>@drawable/decor_maximize_button_light</item>
+ </array>
+
<!-- Used in LocalePicker -->
<string-array translatable="false" name="special_locale_codes">
<!-- http://b/17150708 - ensure that the list of languages says "Arabic"
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 50cf302..f9f8162 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -942,6 +942,10 @@
<!-- Layout of the TextView item that will populate the suggestion popup window. -->
<attr name="textEditSuggestionItemLayout" format="reference" />
+ <!-- Layout of the container of the suggestion popup window. -->
+ <attr name="textEditSuggestionContainerLayout" format="reference" />
+ <!-- Text appearance of the focused words to be replaced by suggested word. -->
+ <attr name="textEditSuggestionHighlightStyle" format="reference" />
<!-- Theme to use for dialogs spawned from this theme. -->
<attr name="dialogTheme" format="reference" />
@@ -3242,6 +3246,14 @@
</p>
-->
<attr name="canRequestFilterKeyEvents" format="boolean" />
+ <!-- Attribute whether the accessibility service wants to be able to control
+ display magnification.
+ <p>
+ Required to allow setting the {@link android.accessibilityservice
+ #AccessibilityServiceInfo#FLAG_CAN_CONTROL_MAGNIFICATION} flag.
+ </p>
+ -->
+ <attr name="canControlMagnification" format="boolean" />
<!-- Short description of the accessibility serivce purpose or behavior.-->
<attr name="description" />
</declare-styleable>
@@ -4240,7 +4252,8 @@
<attr name="autoLink" />
<!-- If set to false, keeps the movement method from being set
to the link movement method even if autoLink causes links
- to be found. -->
+ to be found or the input text contains a
+ {@link android.text.style.ClickableSpan ClickableSpan}. -->
<attr name="linksClickable" format="boolean" />
<!-- If set, specifies that this TextView has a numeric input method.
The default is false.
@@ -4402,6 +4415,10 @@
<!-- Layout of the TextView item that will populate the suggestion popup window. -->
<attr name="textEditSuggestionItemLayout" />
+ <!-- Layout of the container of the suggestion popup window. -->
+ <attr name="textEditSuggestionContainerLayout" />
+ <!-- Style of the highlighted string in the suggestion popup window. -->
+ <attr name="textEditSuggestionHighlightStyle" />
<!-- Reference to a drawable that will be drawn under the insertion cursor. -->
@@ -7623,6 +7640,8 @@
<attr name="pointerIconHand" format="reference"/>
<!-- Reference to a pointer drawable with STYLE_HELP -->
<attr name="pointerIconHelp" format="reference"/>
+ <!-- Reference to a pointer drawable with STYLE_WAIT -->
+ <attr name="pointerIconWait" format="reference"/>
<!-- Reference to a pointer drawable with STYLE_CELL -->
<attr name="pointerIconCell" format="reference"/>
<!-- Reference to a pointer drawable with STYLE_CROSSHAIR -->
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index e376903..67933cd 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -793,6 +793,10 @@
physical screen size has changed such as switching to an external
display. -->
<flag name="smallestScreenSize" value="0x0800" />
+ <!-- The display density has changed. This might be caused by the user
+ specifying a different display scale, or it might be caused by a
+ different display being activated. -->
+ <flag name="density" value="0x1000" />
<!-- The layout direction has changed. For example going from LTR to RTL. -->
<flag name="layoutDirection" value="0x2000" />
<!-- The font scaling factor has changed, that is the user has
diff --git a/core/res/res/values/bools.xml b/core/res/res/values/bools.xml
index 7c63950..457131a 100644
--- a/core/res/res/values/bools.xml
+++ b/core/res/res/values/bools.xml
@@ -25,8 +25,4 @@
<bool name="show_ongoing_ime_switcher">true</bool>
<bool name="action_bar_expanded_action_views_exclusive">true</bool>
<bool name="target_honeycomb_needs_options_menu">true</bool>
-
- <!-- Whether to allow vertically stacked button bars. This is disabled for
- configurations with a small (e.g. less than 320dp) screen height. -->
- <bool name="allow_stacked_button_bar">false</bool>
</resources>
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 7f8c460..dad68ba 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -130,12 +130,9 @@
<drawable name="notification_template_divider">#29000000</drawable>
<drawable name="notification_template_divider_media">#29ffffff</drawable>
- <color name="notification_icon_bg_color">#ff9e9e9e</color>
+ <color name="notification_icon_default_color">#ff616161</color>
<color name="notification_action_color_filter">@color/secondary_text_material_light</color>
- <color name="notification_media_primary_color">@color/primary_text_material_dark</color>
- <color name="notification_media_secondary_color">@color/secondary_text_material_dark</color>
-
<color name="notification_progress_background_color">@color/secondary_text_material_light</color>
<!-- Keyguard colors -->
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 9c75b7a..d9e0472 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -411,7 +411,7 @@
<bool translatable="false" name="config_wifi_revert_country_code_on_cellular_loss">false</bool>
<!-- Boolean indicating whether or not wifi firmware debugging is enabled -->
- <bool translatable="false" name="config_wifi_enable_wifi_firmware_debugging">false</bool>
+ <bool translatable="false" name="config_wifi_enable_wifi_firmware_debugging">true</bool>
<!-- Integer specifying the basic autojoin parameters -->
<integer translatable="false" name="config_wifi_framework_5GHz_preference_boost_threshold">-65</integer>
@@ -1091,6 +1091,14 @@
This feature should be disabled for most devices. -->
<integer name="config_virtualKeyQuietTimeMillis">0</integer>
+ <!-- A list of potential packages, in priority order, that may contain an
+ ephemeral resolver. Each package will be be queried for a component
+ that has been granted the PACKAGE_EPHEMERAL_AGENT permission.
+ This may be empty if ephemeral apps are not supported. -->
+ <string-array name="config_ephemeralResolverPackage" translatable="false">
+ <!-- Add packages here -->
+ </string-array>
+
<!-- Component name of the default wallpaper. This will be ImageWallpaper if not
specified -->
<string name="default_wallpaper_component" translatable="false">@null</string>
@@ -1938,9 +1946,9 @@
See {@link com.android.server.notification.NotificationSignalExtractor} -->
<string-array name="config_notificationSignalExtractors">
<item>com.android.server.notification.ValidateNotificationPeople</item>
- <item>com.android.server.notification.PackagePriorityExtractor</item>
+ <item>com.android.server.notification.TopicPriorityExtractor</item>
<item>com.android.server.notification.NotificationIntrusivenessExtractor</item>
- <item>com.android.server.notification.PackageVisibilityExtractor</item>
+ <item>com.android.server.notification.TopicVisibilityExtractor</item>
</string-array>
<!-- Flag indicating that this device does not rotate and will always remain in its default
@@ -2369,4 +2377,11 @@
<!-- The BT name of the keyboard packaged with the device. If this is defined, SystemUI will
automatically try to pair with it when the device exits tablet mode. -->
<string translatable="false" name="config_packagedKeyboardName"></string>
+
+ <!-- The device supports freeform window management. Windows have title bars and can be moved
+ and resized. If you set this to true, you also need to add
+ PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT feature to your device specification.
+ The duplication is necessary, because this information is used before the features are
+ available to the system.-->
+ <bool name="config_freeformWindowManagement">false</bool>
</resources>
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 28756f5..7b4becc 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -25,10 +25,7 @@
<!-- The standard size (both width and height) of an application icon that
will be displayed in the app launcher and elsewhere. -->
<dimen name="app_icon_size">48dip</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. -->
- <integer name="max_action_buttons">2</integer>
+
<dimen name="toast_y_offset">64dip</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">24dp</dimen>
@@ -133,11 +130,38 @@
<!-- Default padding for dialogs. -->
<dimen name="dialog_padding">16dp</dimen>
+ <!-- The margin on the start of the content view -->
+ <dimen name="notification_content_margin_start">16dp</dimen>
+
+ <!-- The margin on the end of the content view -->
+ <dimen name="notification_content_margin_end">16dp</dimen>
+
+ <!-- The margin on the end of the content view with a picture.-->
+ <dimen name="notification_content_picture_margin">56dp</dimen>
+
+ <!-- height of the content margin to accomodate for the header -->
+ <dimen name="notification_content_margin_top">30dp</dimen>
+
+ <!-- height of notification header view if present -->
+ <dimen name="notification_header_height">32dp</dimen>
+
+ <!-- Height of a small notification in the status bar -->
+ <dimen name="notification_min_height">84dp</dimen>
+
<!-- The width of the big icons in notifications. -->
<dimen name="notification_large_icon_width">64dp</dimen>
<!-- The width of the big icons in notifications. -->
<dimen name="notification_large_icon_height">64dp</dimen>
+ <!-- Min height of the notification content. -->
+ <dimen name="notification_min_content_height">54dp</dimen>
+
+ <!-- The minimum width of the app name in the header if it shrinks -->
+ <dimen name="notification_header_shrink_min_width">72dp</dimen>
+
+ <!-- The minimum height of the content if there is a picture present with big picture -->
+ <dimen name="notification_big_picture_content_min_height_with_picture">41dp</dimen>
+
<!-- Minimum width of the search view text entry area. -->
<dimen name="search_view_text_min_width">160dip</dimen>
diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml
index 9d5e5ac..7f8acd3 100644
--- a/core/res/res/values/ids.xml
+++ b/core/res/res/values/ids.xml
@@ -97,6 +97,9 @@
<item type="id" name="redo" />
<item type="id" name="replaceText" />
<item type="id" name="shareText" />
+ <item type="id" name="selection_start_handle" />
+ <item type="id" name="selection_end_handle" />
+ <item type="id" name="insertion_handle" />
<item type="id" name="floating_toolbar_menu_item_image_button" />
<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SHOW_ON_SCREEN}. -->
@@ -122,4 +125,6 @@
<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_CONTEXT_CLICK}. -->
<item type="id" name="accessibilityActionContextClick" />
+
+ <item type="id" name="remote_input_tag" />
</resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 54e43c8..b6b2e20 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2682,6 +2682,7 @@
<public type="attr" name="forceDeviceEncrypted" />
<public type="attr" name="encryptionAware" />
<public type="attr" name="preferenceFragmentStyle" />
+ <public type="attr" name="canControlMagnification" />
<public type="style" name="Theme.Material.DayNight" />
<public type="style" name="Theme.Material.DayNight.DarkActionBar" />
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index faa76f2..d6dd842 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -531,6 +531,12 @@
[CHAR LIMIT=4] -->
<string name="status_bar_notification_info_overflow">999+</string>
+ <!-- The number of notifications in the notification header. An example would be (2) or (12) -->
+ <string name="notification_children_count_bracketed">(<xliff:g id="notificationCount" example="1">%d</xliff:g>)</string>
+
+ <!-- The divider symbol between different parts of the notification header. not translatable [CHAR LIMIT=1] -->
+ <string name="notification_header_divider_symbol" translatable="false">•</string>
+
<!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
<string name="safeMode">Safe mode</string>
@@ -613,6 +619,12 @@
<string name="capability_desc_canRequestFilterKeyEvents">Includes personal data such as credit
card numbers and passwords.</string>
+ <!-- Title for the capability of an accessibility service to control display magnification. -->
+ <string name="capability_title_canControlMagnification">Control display magnification</string>
+ <!-- Description for the capability of an accessibility service to control display magnification. -->
+ <string name="capability_desc_canControlMagnification">Control the display\'s zoom level and
+ positioning.</string>
+
<!-- Permissions -->
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -3617,6 +3629,8 @@
<string name="user_switched">Current user <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string>
<!-- Message shown when switching to a user [CHAR LIMIT=none] -->
<string name="user_switching_message">Switching to <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string>
+ <!-- Message when logging out a user on a split user system -->
+ <string name="user_logging_out_message">Logging out <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string>
<!-- Default name of the owner user [CHAR LIMIT=20] -->
<string name="owner_name" msgid="3879126011135546571">Owner</string>
<!-- Error message title [CHAR LIMIT=35] -->
@@ -3926,6 +3940,10 @@
<!-- Lock-to-app unlock password string -->
<string name="lock_to_app_unlock_password">Ask for password before unpinning</string>
+ <!-- Multi-Window strings -->
+ <!-- Warning message when a non-resizeble tasks is docked. -->
+ <string name="dock_non_resizeble_text">App is not resizeable, scroll it with two fingers.</string>
+
<!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
<string name="package_installed_device_owner">Installed by your administrator</string>
<!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
@@ -4066,4 +4084,6 @@
<item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item>
<item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> selected</item>
</plurals>
+
+ <string name="default_notification_topic_label">Miscellaneous</string>
</resources>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index b831df8..e6f279d 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -496,6 +496,8 @@
<item name="textEditSidePasteWindowLayout">?attr/textEditSidePasteWindowLayout</item>
<item name="textEditSideNoPasteWindowLayout">?attr/textEditSideNoPasteWindowLayout</item>
<item name="textEditSuggestionItemLayout">?attr/textEditSuggestionItemLayout</item>
+ <item name="textEditSuggestionContainerLayout">?attr/textEditSuggestionContainerLayout</item>
+ <item name="textEditSuggestionHighlightStyle">?attr/textEditSuggestionHighlightStyle</item>
<item name="textCursorDrawable">?attr/textCursorDrawable</item>
<item name="breakStrategy">high_quality</item>
<item name="hyphenationFrequency">normal</item>
@@ -954,10 +956,10 @@
<item name="dividerPadding">6dip</item>
</style>
- <style name="TextAppearance.SuggestionHighlight">
- <item name="textSize">18sp</item>
- <item name="textColor">@color/suggestion_highlight_text</item>
- </style>
+ <style name="TextAppearance.SuggestionHighlight">
+ <item name="textSize">18sp</item>
+ <item name="textColor">@color/suggestion_highlight_text</item>
+ </style>
<!-- Preference Styles -->
@@ -1339,6 +1341,7 @@
<item name="pointerIconHand">@drawable/pointer_hand_icon</item>
<item name="pointerIconContextMenu">@drawable/pointer_context_menu_icon</item>
<item name="pointerIconHelp">@drawable/pointer_help_icon</item>
+ <item name="pointerIconWait">@drawable/pointer_wait_icon</item>
<item name="pointerIconCell">@drawable/pointer_cell_icon</item>
<item name="pointerIconCrosshair">@drawable/pointer_crosshair_icon</item>
<item name="pointerIconText">@drawable/pointer_text_icon</item>
diff --git a/core/res/res/values/styles_holo.xml b/core/res/res/values/styles_holo.xml
index 6861069..841afd8 100644
--- a/core/res/res/values/styles_holo.xml
+++ b/core/res/res/values/styles_holo.xml
@@ -1176,4 +1176,27 @@
<style name="Widget.Holo.Light.FastScroll" parent="Widget.Holo.FastScroll" />
+ <style name="Widget.Holo.SuggestionItem" parent="@android:attr/textAppearanceMedium">
+ <item name="background">@color/white</item>
+ <item name="drawablePadding">8dip</item>
+ <item name="ellipsize">marquee</item>
+ <item name="gravity">start|center_vertical</item>
+ <item name="layout_gravity">start|center_vertical</item>
+ <item name="layout_height">wrap_content</item>
+ <item name="layout_width">match_parent</item>
+ <item name="paddingBottom">8dip</item>
+ <item name="paddingEnd">16dip</item>
+ <item name="paddingStart">16dip</item>
+ <item name="paddingTop">8dip</item>
+ <item name="singleLine">true</item>
+ <item name="textSize">18sp</item>
+ <item name="textColor">@color/black</item>
+ </style>
+
+ <style name="TextAppearance.Holo.SuggestionHighlight" parent="TextAppearance.SuggestionHighlight" />
+
+ <style name="Widget.Holo.SuggestionButton" parent="Widget.Holo.SuggestionItem">
+ <item name="background">#E9E9E9</item>
+ <item name="textColor">@color/black</item>
+ </style>
</resources>
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 4b2a451..adcb79b 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -988,6 +988,47 @@
<item name="contentDescription">@string/media_route_button_content_description</item>
</style>
+ <style name="Widget.Material.SuggestionItem" parent="@android:style/TextAppearance.Material.Body1">
+ <item name="background">@color/white</item>
+ <item name="alpha">.87</item>
+ <item name="textColor">@color/black</item>
+ <item name="drawablePadding">8dip</item>
+ <item name="ellipsize">marquee</item>
+ <item name="gravity">start|center_vertical</item>
+ <item name="layout_gravity">start|center_vertical</item>
+ <item name="layout_height">48dip</item>
+ <item name="layout_width">match_parent</item>
+ <item name="paddingBottom">8dip</item>
+ <item name="paddingEnd">16dip</item>
+ <item name="paddingStart">16dip</item>
+ <item name="paddingTop">8dip</item>
+ <item name="singleLine">true</item>
+ <item name="textSize">14sp</item>
+ </style>
+
+ <style name="TextAppearance.Material.TextSuggestionHighlight" parent="Widget.Material.SuggestionItem">
+ <item name="textColor">#009688</item>
+ </style>
+
+ <style name="Widget.Material.SuggestionButton" parent="@android:style/TextAppearance.Material.Button">
+ <item name="background">@color/white</item>
+ <item name="alpha">.87</item>
+ <item name="textColor">#009688</item>
+ <item name="drawablePadding">8dip</item>
+ <item name="ellipsize">marquee</item>
+ <item name="gravity">start|center_vertical</item>
+ <item name="layout_gravity">start|center_vertical</item>
+ <item name="layout_height">48dip</item>
+ <item name="layout_width">match_parent</item>
+ <item name="paddingBottom">8dip</item>
+ <item name="paddingEnd">16dip</item>
+ <item name="paddingStart">16dip</item>
+ <item name="paddingTop">8dip</item>
+ <item name="singleLine">true</item>
+ <item name="textAllCaps">true</item>
+ <item name="textSize">14sp</item>
+ </style>
+
<!-- Light widget styles -->
<style name="Widget.Material.Light" parent="Widget.Material"/>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 6820c25..3860f68 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -197,11 +197,8 @@
<java-symbol type="id" name="inbox_text4" />
<java-symbol type="id" name="inbox_text5" />
<java-symbol type="id" name="inbox_text6" />
- <java-symbol type="id" name="inbox_more" />
- <java-symbol type="id" name="inbox_end_pad" />
<java-symbol type="id" name="status_bar_latest_event_content" />
<java-symbol type="id" name="action_divider" />
- <java-symbol type="id" name="overflow_divider" />
<java-symbol type="id" name="notification_main_column" />
<java-symbol type="id" name="sms_short_code_confirm_message" />
<java-symbol type="id" name="sms_short_code_detail_layout" />
@@ -218,9 +215,11 @@
<java-symbol type="id" name="pin_error_message" />
<java-symbol type="id" name="timePickerLayout" />
<java-symbol type="id" name="profile_badge_large_template" />
- <java-symbol type="id" name="profile_badge_line2" />
<java-symbol type="id" name="profile_badge_line3" />
<java-symbol type="id" name="transitionPosition" />
+ <java-symbol type="id" name="selection_start_handle" />
+ <java-symbol type="id" name="selection_end_handle" />
+ <java-symbol type="id" name="insertion_handle" />
<java-symbol type="attr" name="actionModeShareDrawable" />
<java-symbol type="attr" name="alertDialogCenterButtons" />
@@ -311,6 +310,7 @@
<java-symbol type="bool" name="config_wifi_enable_wifi_firmware_debugging" />
<java-symbol type="bool" name="config_supportMicNearUltrasound" />
<java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />
+ <java-symbol type="bool" name="config_freeformWindowManagement" />
<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" />
<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />
<java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" />
@@ -401,7 +401,6 @@
<java-symbol type="integer" name="db_connection_pool_size" />
<java-symbol type="integer" name="db_journal_size_limit" />
<java-symbol type="integer" name="db_wal_autocheckpoint" />
- <java-symbol type="integer" name="max_action_buttons" />
<java-symbol type="integer" name="config_soundEffectVolumeDb" />
<java-symbol type="integer" name="config_lockSoundVolumeDb" />
<java-symbol type="integer" name="config_multiuserMaximumUsers" />
@@ -564,6 +563,8 @@
<java-symbol type="string" name="capability_desc_canRequestFilterKeyEvents" />
<java-symbol type="string" name="capability_title_canRequestTouchExploration" />
<java-symbol type="string" name="capability_title_canRetrieveWindowContent" />
+ <java-symbol type="string" name="capability_desc_canControlMagnification" />
+ <java-symbol type="string" name="capability_title_canControlMagnification" />
<java-symbol type="string" name="cfTemplateForwarded" />
<java-symbol type="string" name="cfTemplateForwardedTime" />
<java-symbol type="string" name="cfTemplateNotForwarded" />
@@ -603,6 +604,7 @@
<java-symbol type="string" name="display_manager_overlay_display_name" />
<java-symbol type="string" name="display_manager_overlay_display_secure_suffix" />
<java-symbol type="string" name="display_manager_overlay_display_title" />
+ <java-symbol type="string" name="dock_non_resizeble_text" />
<java-symbol type="string" name="double_tap_toast" />
<java-symbol type="string" name="durationDays" />
<java-symbol type="string" name="durationDayHours" />
@@ -627,6 +629,7 @@
<java-symbol type="string" name="widget_default_package_name" />
<java-symbol type="string" name="widget_default_class_name" />
<java-symbol type="string" name="emergency_calls_only" />
+ <java-symbol type="array" name="config_ephemeralResolverPackage" />
<java-symbol type="string" name="enable_accessibility_canceled" />
<java-symbol type="string" name="eventTypeAnniversary" />
<java-symbol type="string" name="eventTypeBirthday" />
@@ -930,6 +933,7 @@
<java-symbol type="string" name="upload_file" />
<java-symbol type="string" name="user_switched" />
<java-symbol type="string" name="user_switching_message" />
+ <java-symbol type="string" name="user_logging_out_message" />
<java-symbol type="string" name="volume_alarm" />
<java-symbol type="string" name="volume_icon_description_bluetooth" />
<java-symbol type="string" name="volume_icon_description_incall" />
@@ -1120,6 +1124,7 @@
<java-symbol type="array" name="networkAttributes" />
<java-symbol type="array" name="preloaded_color_state_lists" />
<java-symbol type="array" name="preloaded_drawables" />
+ <java-symbol type="array" name="preloaded_freeform_multi_window_drawables" />
<java-symbol type="array" name="sim_colors" />
<java-symbol type="array" name="special_locale_codes" />
<java-symbol type="array" name="special_locale_names" />
@@ -1868,15 +1873,11 @@
<java-symbol type="layout" name="notification_template_material_inbox" />
<java-symbol type="layout" name="notification_template_material_media" />
<java-symbol type="layout" name="notification_template_material_big_media" />
- <java-symbol type="layout" name="notification_template_material_big_media_narrow" />
<java-symbol type="layout" name="notification_template_material_big_text" />
- <java-symbol type="layout" name="notification_template_icon_group" />
+ <java-symbol type="layout" name="notification_template_header" />
<java-symbol type="layout" name="notification_material_media_action" />
<java-symbol type="color" name="notification_action_color_filter" />
- <java-symbol type="color" name="notification_icon_bg_color" />
- <java-symbol type="drawable" name="notification_icon_legacy_bg" />
- <java-symbol type="color" name="notification_media_primary_color" />
- <java-symbol type="color" name="notification_media_secondary_color" />
+ <java-symbol type="color" name="notification_icon_default_color" />
<java-symbol type="color" name="notification_progress_background_color" />
<java-symbol type="id" name="media_actions" />
@@ -1956,9 +1957,9 @@
<java-symbol type="id" name="maximize_window" />
<java-symbol type="id" name="close_window" />
<java-symbol type="id" name="client_decor_placeholder" />
- <java-symbol type="layout" name="non_client_decor_light" />
- <java-symbol type="layout" name="non_client_decor_dark" />
- <java-symbol type="drawable" name="non_client_decor_title_focused" />
+ <java-symbol type="layout" name="decor_caption_light" />
+ <java-symbol type="layout" name="decor_caption_dark" />
+ <java-symbol type="drawable" name="decor_caption_title_focused" />
<!-- From TelephonyProvider -->
<java-symbol type="xml" name="apns" />
@@ -2267,6 +2268,7 @@
<java-symbol type="layout" name="floating_popup_menu_image_button" />
<java-symbol type="layout" name="floating_popup_overflow_list_item" />
<java-symbol type="layout" name="floating_popup_overflow_image_list_item" />
+ <java-symbol type="layout" name="floating_popup_overflow_button" />
<java-symbol type="dimen" name="floating_toolbar_height" />
<java-symbol type="dimen" name="floating_toolbar_menu_button_side_padding" />
<java-symbol type="dimen" name="floating_toolbar_overflow_side_padding" />
@@ -2278,6 +2280,10 @@
<java-symbol type="dimen" name="floating_toolbar_horizontal_margin" />
<java-symbol type="dimen" name="floating_toolbar_vertical_margin" />
<java-symbol type="dimen" name="content_rect_bottom_clip_allowance" />
+ <java-symbol type="drawable" name="ft_avd_tooverflow" />
+ <java-symbol type="drawable" name="ft_avd_toarrow" />
+ <java-symbol type="drawable" name="ft_avd_toarrow_animation" />
+ <java-symbol type="drawable" name="ft_avd_tooverflow_animation" />
<java-symbol type="string" name="date_picker_prev_month_button" />
<java-symbol type="string" name="date_picker_next_month_button" />
@@ -2300,6 +2306,9 @@
<java-symbol type="string" name="notification_inbox_ellipsis" />
<java-symbol type="bool" name="config_mainBuiltInDisplayIsRound" />
+ <java-symbol type="id" name="actions_container" />
+ <java-symbol type="id" name="remote_input_tag" />
+
<java-symbol type="attr" name="seekBarDialogPreferenceStyle" />
<java-symbol type="string" name="ext_media_status_removed" />
<java-symbol type="string" name="ext_media_status_unmounted" />
@@ -2319,7 +2328,6 @@
<java-symbol type="string" name="lockscreen_access_pattern_area" />
- <java-symbol type="bool" name="allow_stacked_button_bar" />
<java-symbol type="bool" name="config_eap_sim_based_auth_supported" />
<java-symbol type="array" name="config_cell_retries_per_error_code" />
@@ -2335,4 +2343,30 @@
<java-symbol type="string" name="config_iccHotswapPromptForRestartDialogComponent" />
<java-symbol type="string" name="config_packagedKeyboardName" />
+ <java-symbol type="string" name="default_notification_topic_label" />
+
+ <!-- EditText suggestion popup. -->
+ <java-symbol type="id" name="suggestionContainer" />
+ <java-symbol type="id" name="addToDictionaryButton" />
+ <java-symbol type="id" name="deleteButton" />
+
+ <java-symbol type="string" name="notification_children_count_bracketed" />
+ <java-symbol type="id" name="app_name_text" />
+ <java-symbol type="id" name="number_of_children" />
+ <java-symbol type="id" name="header_sub_text" />
+ <java-symbol type="id" name="expand_button" />
+ <java-symbol type="id" name="notification_header" />
+ <java-symbol type="id" name="header_content_info" />
+ <java-symbol type="id" name="time_divider" />
+ <java-symbol type="id" name="sub_text_divider" />
+ <java-symbol type="id" name="content_info_divider" />
+ <java-symbol type="id" name="text_line_1" />
+ <java-symbol type="drawable" name="ic_arrow_up_14dp" />
+ <java-symbol type="dimen" name="notification_header_height" />
+ <java-symbol type="dimen" name="notification_big_picture_content_min_height_with_picture" />
+ <java-symbol type="dimen" name="notification_header_shrink_min_width" />
+ <java-symbol type="dimen" name="notification_content_margin_start" />
+ <java-symbol type="dimen" name="notification_content_margin_end" />
+ <java-symbol type="dimen" name="notification_content_picture_margin" />
+ <java-symbol type="dimen" name="notification_content_margin_top" />
</resources>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index c230645..d56674a 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -256,8 +256,6 @@
<item name="textEditNoPasteWindowLayout">@layout/text_edit_no_paste_window</item>
<item name="textEditSidePasteWindowLayout">@layout/text_edit_side_paste_window</item>
<item name="textEditSideNoPasteWindowLayout">@layout/text_edit_side_no_paste_window</item>
- <item name="textSuggestionsWindowStyle">@style/Widget.TextSuggestionsPopupWindow</item>
- <item name="textEditSuggestionItemLayout">@layout/text_edit_suggestion_item</item>
<item name="textCursorDrawable">@null</item>
<!-- Widget styles -->
diff --git a/core/res/res/values/themes_holo.xml b/core/res/res/values/themes_holo.xml
index 701d0ef..d9599b3 100644
--- a/core/res/res/values/themes_holo.xml
+++ b/core/res/res/values/themes_holo.xml
@@ -133,6 +133,11 @@
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.Holo.Widget.PopupMenu.Large</item>
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Holo.Widget.PopupMenu.Small</item>
+ <item name="textEditSuggestionItemLayout">@layout/text_edit_suggestion_item</item>
+ <item name="textEditSuggestionContainerLayout">@layout/text_edit_suggestion_container</item>
+ <item name="textEditSuggestionHighlightStyle">@style/TextAppearance.Holo.SuggestionHighlight</item>
+ <item name="textSuggestionsWindowStyle">@style/Widget.Holo.TextSuggestionsPopupWindow</item>
+
<!-- Button styles -->
<item name="buttonStyle">@style/Widget.Holo.Button</item>
@@ -247,7 +252,6 @@
<item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
<item name="textSelectHandle">@drawable/text_select_handle_middle</item>
<item name="textSelectHandleWindowStyle">@style/Widget.Holo.TextSelectHandle</item>
- <item name="textSuggestionsWindowStyle">@style/Widget.Holo.TextSuggestionsPopupWindow</item>
<item name="textCursorDrawable">@drawable/text_cursor_holo_dark</item>
<!-- Widget styles -->
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 59dfc92..a5b8476 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -221,6 +221,8 @@
<item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
<item name="textSelectHandle">@drawable/text_select_handle_middle_material</item>
<item name="textSelectHandleWindowStyle">@style/Widget.Material.TextSelectHandle</item>
+ <item name="textEditSuggestionItemLayout">@layout/text_edit_suggestion_item_material</item>
+ <item name="textEditSuggestionContainerLayout">@layout/text_edit_suggestion_container_material</item>
<item name="textSuggestionsWindowStyle">@style/Widget.Material.TextSuggestionsPopupWindow</item>
<item name="textCursorDrawable">@drawable/text_cursor_material</item>
@@ -580,9 +582,14 @@
<item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
<item name="textSelectHandle">@drawable/text_select_handle_middle_material</item>
<item name="textSelectHandleWindowStyle">@style/Widget.Material.TextSelectHandle</item>
- <item name="textSuggestionsWindowStyle">@style/Widget.Material.Light.TextSuggestionsPopupWindow</item>
<item name="textCursorDrawable">@drawable/text_cursor_material</item>
+ <!-- Suggestion window attributes -->
+ <item name="textEditSuggestionItemLayout">@layout/text_edit_suggestion_item_material</item>
+ <item name="textEditSuggestionContainerLayout">@layout/text_edit_suggestion_container_material</item>
+ <item name="textEditSuggestionHighlightStyle">@style/TextAppearance.Material.TextSuggestionHighlight</item>
+ <item name="textSuggestionsWindowStyle">@style/Widget.Material.Light.TextSuggestionsPopupWindow</item>
+
<!-- Widget styles -->
<item name="absListViewStyle">@style/Widget.Material.Light.AbsListView</item>
<item name="autoCompleteTextViewStyle">@style/Widget.Material.Light.AutoCompleteTextView</item>
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index 6903b7b..5177836 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -138,7 +138,8 @@
<activity android:name="android.widget.TextViewActivity"
android:label="TextViewActivity"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ android:theme="@android:style/Theme.Material.Light">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
diff --git a/core/tests/coretests/apks/install_complete_package_info/Android.mk b/core/tests/coretests/apks/install_complete_package_info/Android.mk
index 1edccb4..19bf356 100644
--- a/core/tests/coretests/apks/install_complete_package_info/Android.mk
+++ b/core/tests/coretests/apks/install_complete_package_info/Android.mk
@@ -5,7 +5,9 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_complete_package_info
+LOCAL_PACKAGE_NAME := install_complete_package_info
+#LOCAL_MANIFEST_FILE := api_test/AndroidManifest.xml
-include $(BUILD_PACKAGE)
+include $(FrameworkCoreTests_BUILD_PACKAGE)
+#include $(BUILD_PACKAGE)
diff --git a/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml b/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml
index 4c7e968..2897bd5 100644
--- a/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml
+++ b/core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml
@@ -17,4 +17,11 @@
package="com.android.frameworks.coretests.keysets_api">
<application android:hasCode="false">
</application>
+ <key-sets>
+ <key-set android:name="A" >
+ <public-key android:name="keyA"
+ android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/>
+ </key-set>
+ </key-sets>
+
</manifest>
diff --git a/core/tests/coretests/assets/fonts/hasGlyphTestFont.ttf b/core/tests/coretests/assets/fonts/hasGlyphTestFont.ttf
new file mode 100644
index 0000000..add3f40
--- /dev/null
+++ b/core/tests/coretests/assets/fonts/hasGlyphTestFont.ttf
Binary files differ
diff --git a/core/tests/coretests/assets/fonts/hasGlyphTestFont.ttx b/core/tests/coretests/assets/fonts/hasGlyphTestFont.ttx
new file mode 100644
index 0000000..7038f46
--- /dev/null
+++ b/core/tests/coretests/assets/fonts/hasGlyphTestFont.ttx
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
+
+ <GlyphOrder>
+ <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
+ <GlyphID id="0" name=".notdef"/>
+ <GlyphID id="1" name="BaseChar1"/>
+ <GlyphID id="2" name="BaseChar1_VS1"/>
+ <GlyphID id="3" name="BaseChar1_VS17"/>
+ <GlyphID id="4" name="BaseChar1_VS18"/>
+ <GlyphID id="5" name="BaseChar2"/>
+ <GlyphID id="6" name="BaseChar2_VS2"/>
+ <GlyphID id="7" name="BaseChar2_VS18"/>
+ <GlyphID id="8" name="BaseChar2_VS19"/>
+ <GlyphID id="9" name="BaseChar3"/>
+ <GlyphID id="10" name="BaseChar4_VS3"/>
+ <GlyphID id="11" name="BaseChar4_VS19"/>
+ <GlyphID id="12" name="BaseChar4_VS20"/>
+ <GlyphID id="13" name="BaseChar5"/>
+ <GlyphID id="14" name="BaseChar5_VS1"/>
+ <GlyphID id="15" name="BaseChar5_VS17"/>
+ <GlyphID id="16" name="BaseChar5_VS18"/>
+ <GlyphID id="17" name="BaseChar6"/>
+ <GlyphID id="18" name="BaseChar6_VS2"/>
+ <GlyphID id="19" name="BaseChar6_VS18"/>
+ <GlyphID id="20" name="BaseChar6_VS19"/>
+ <GlyphID id="21" name="BaseChar7"/>
+ <GlyphID id="22" name="BaseChar8_VS3"/>
+ <GlyphID id="23" name="BaseChar8_VS19"/>
+ <GlyphID id="24" name="BaseChar8_VS20"/>
+ </GlyphOrder>
+
+ <head>
+ <!-- Most of this table will be recalculated by the compiler -->
+ <tableVersion value="1.0"/>
+ <fontRevision value="1.0"/>
+ <checkSumAdjustment value="0x640cdb2f"/>
+ <magicNumber value="0x5f0f3cf5"/>
+ <flags value="00000000 00000011"/>
+ <unitsPerEm value="1000"/>
+ <created value="Wed Sep 9 08:01:17 2015"/>
+ <modified value="Wed Sep 9 08:48:07 2015"/>
+ <xMin value="30"/>
+ <yMin value="-200"/>
+ <xMax value="629"/>
+ <yMax value="800"/>
+ <macStyle value="00000000 00000000"/>
+ <lowestRecPPEM value="7"/>
+ <fontDirectionHint value="2"/>
+ <indexToLocFormat value="0"/>
+ <glyphDataFormat value="0"/>
+ </head>
+
+ <hhea>
+ <tableVersion value="1.0"/>
+ <ascent value="1000"/>
+ <descent value="-200"/>
+ <lineGap value="0"/>
+ <advanceWidthMax value="659"/>
+ <minLeftSideBearing value="0"/>
+ <minRightSideBearing value="30"/>
+ <xMaxExtent value="629"/>
+ <caretSlopeRise value="1"/>
+ <caretSlopeRun value="0"/>
+ <caretOffset value="0"/>
+ <reserved0 value="0"/>
+ <reserved1 value="0"/>
+ <reserved2 value="0"/>
+ <reserved3 value="0"/>
+ <metricDataFormat value="0"/>
+ <numberOfHMetrics value="18"/>
+ </hhea>
+
+ <maxp>
+ <!-- Most of this table will be recalculated by the compiler -->
+ <tableVersion value="0x10000"/>
+ <numGlyphs value="54"/>
+ <maxPoints value="73"/>
+ <maxContours value="10"/>
+ <maxCompositePoints value="0"/>
+ <maxCompositeContours value="0"/>
+ <maxZones value="2"/>
+ <maxTwilightPoints value="12"/>
+ <maxStorage value="28"/>
+ <maxFunctionDefs value="119"/>
+ <maxInstructionDefs value="0"/>
+ <maxStackElements value="61"/>
+ <maxSizeOfInstructions value="2967"/>
+ <maxComponentElements value="0"/>
+ <maxComponentDepth value="0"/>
+ </maxp>
+
+ <OS_2>
+ <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
+ will be recalculated by the compiler -->
+ <version value="3"/>
+ <xAvgCharWidth value="594"/>
+ <usWeightClass value="400"/>
+ <usWidthClass value="5"/>
+ <fsType value="00000000 00001000"/>
+ <ySubscriptXSize value="650"/>
+ <ySubscriptYSize value="600"/>
+ <ySubscriptXOffset value="0"/>
+ <ySubscriptYOffset value="75"/>
+ <ySuperscriptXSize value="650"/>
+ <ySuperscriptYSize value="600"/>
+ <ySuperscriptXOffset value="0"/>
+ <ySuperscriptYOffset value="350"/>
+ <yStrikeoutSize value="50"/>
+ <yStrikeoutPosition value="300"/>
+ <sFamilyClass value="0"/>
+ <panose>
+ <bFamilyType value="0"/>
+ <bSerifStyle value="0"/>
+ <bWeight value="5"/>
+ <bProportion value="0"/>
+ <bContrast value="0"/>
+ <bStrokeVariation value="0"/>
+ <bArmStyle value="0"/>
+ <bLetterForm value="0"/>
+ <bMidline value="0"/>
+ <bXHeight value="0"/>
+ </panose>
+ <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
+ <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
+ <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
+ <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
+ <achVendID value="UKWN"/>
+ <fsSelection value="00000000 01000000"/>
+ <usFirstCharIndex value="32"/>
+ <usLastCharIndex value="122"/>
+ <sTypoAscender value="800"/>
+ <sTypoDescender value="-200"/>
+ <sTypoLineGap value="200"/>
+ <usWinAscent value="1000"/>
+ <usWinDescent value="200"/>
+ <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
+ <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
+ <sxHeight value="500"/>
+ <sCapHeight value="700"/>
+ <usDefaultChar value="0"/>
+ <usBreakChar value="32"/>
+ <usMaxContext value="0"/>
+ </OS_2>
+
+ <hmtx>
+ <mtx name=".notdef" width="500" lsb="93"/>
+ <mtx name="BaseChar1" width="500" lsb="93"/>
+ <mtx name="BaseChar1_VS1" width="500" lsb="93"/>
+ <mtx name="BaseChar1_VS17" width="500" lsb="93"/>
+ <mtx name="BaseChar1_VS18" width="500" lsb="93"/>
+ <mtx name="BaseChar2" width="500" lsb="93"/>
+ <mtx name="BaseChar2_VS2" width="500" lsb="93"/>
+ <mtx name="BaseChar2_VS18" width="500" lsb="93"/>
+ <mtx name="BaseChar2_VS19" width="500" lsb="93"/>
+ <mtx name="BaseChar3" width="500" lsb="93"/>
+ <mtx name="BaseChar4_VS3" width="500" lsb="93"/>
+ <mtx name="BaseChar4_VS19" width="500" lsb="93"/>
+ <mtx name="BaseChar4_VS20" width="500" lsb="93"/>
+ <mtx name="BaseChar5" width="500" lsb="93"/>
+ <mtx name="BaseChar5_VS1" width="500" lsb="93"/>
+ <mtx name="BaseChar5_VS17" width="500" lsb="93"/>
+ <mtx name="BaseChar5_VS18" width="500" lsb="93"/>
+ <mtx name="BaseChar6" width="500" lsb="93"/>
+ <mtx name="BaseChar6_VS2" width="500" lsb="93"/>
+ <mtx name="BaseChar6_VS18" width="500" lsb="93"/>
+ <mtx name="BaseChar6_VS19" width="500" lsb="93"/>
+ <mtx name="BaseChar7" width="500" lsb="93"/>
+ <mtx name="BaseChar8_VS3" width="500" lsb="93"/>
+ <mtx name="BaseChar8_VS19" width="500" lsb="93"/>
+ <mtx name="BaseChar8_VS20" width="500" lsb="93"/>
+ </hmtx>
+
+ <cmap>
+ <tableVersion version="0"/>
+ <cmap_format_12 format="12" reserved="0" length="6" nGroups="1" platformID="3" platEncID="10" language="0">
+ <map code="0x0061" name="BaseChar1" />
+ <map code="0x0062" name="BaseChar2" />
+ <map code="0x0063" name="BaseChar3" />
+ <!-- No cmap4 entry for BaseChar4 -->
+ <map code="0x1F000" name="BaseChar5" />
+ <map code="0x1F001" name="BaseChar6" />
+ <map code="0x1F002" name="BaseChar7" />
+ <!-- No cmap4 entry for BaseChar8 -->
+ </cmap_format_12>
+ <cmap_format_14 format="14" platformID="0" platEncID="5" length="24" numVarSelectorRecords="3">
+ <map uvs="0xFE00" uv="0x0061" name="BaseChar1_VS1" />
+ <map uvs="0xE0100" uv="0x0061" name="BaseChar1_VS17" />
+ <map uvs="0xE0101" uv="0x0061" name="BaseChar1_VS18" />
+ <map uvs="0xE0102" uv="0x0061" name="None" />
+
+ <map uvs="0xFE01" uv="0x0062" name="BaseChar2_VS2" />
+ <map uvs="0xE0101" uv="0x0062" name="BaseChar2_VS18" />
+ <map uvs="0xE0102" uv="0x0062" name="BaseChar2_VS19" />
+ <map uvs="0xE0103" uv="0x0062" name="None" />
+
+ <map uvs="0xFE02" uv="0x0064" name="BaseChar4_VS3" />
+ <map uvs="0xE0102" uv="0x0064" name="BaseChar4_VS19" />
+ <map uvs="0xE0103" uv="0x0064" name="BaseChar4_VS20" />
+ <!-- There is no default glyph for U+0064 U+E0104 but there is a entry for
+ default UVS entry. hasGlyph should return false in this
+ case. -->
+ <map uvs="0xE0104" uv="0x0064" name="None" />
+
+ <map uvs="0xFE00" uv="0x1F000" name="BaseChar5_VS1" />
+ <map uvs="0xE0100" uv="0x1F000" name="BaseChar5_VS17" />
+ <map uvs="0xE0101" uv="0x1F000" name="BaseChar5_VS18" />
+ <map uvs="0xE0102" uv="0x1F000" name="None" />
+
+ <map uvs="0xFE01" uv="0x1F001" name="BaseChar6_VS2" />
+ <map uvs="0xE0101" uv="0x1F001" name="BaseChar6_VS18" />
+ <map uvs="0xE0102" uv="0x1F001" name="BaseChar6_VS19" />
+ <map uvs="0xE0103" uv="0x1F001" name="None" />
+
+ <map uvs="0xFE02" uv="0x1F003" name="BaseChar8_VS3" />
+ <map uvs="0xE0102" uv="0x1F003" name="BaseChar8_VS19" />
+ <map uvs="0xE0103" uv="0x1F003" name="BaseChar8_VS20" />
+ <!-- There is no default glyph for U+1F003 U+E0104 but there is a entry for
+ default UVS entry. hasGlyph should return false in this
+ case. -->
+ <map uvs="0xE0104" uv="0x1F003" name="None" />
+ </cmap_format_14>
+ </cmap>
+
+ <loca>
+ <!-- The 'loca' table will be calculated by the compiler -->
+ </loca>
+
+ <glyf>
+
+ <!-- The xMin, yMin, xMax and yMax values
+ will be recalculated by the compiler. -->
+
+ <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+
+ <TTGlyph name="BaseChar1" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar1_VS1" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar1_VS17" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar1_VS18" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar2" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar2_VS2" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar2_VS18" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar2_VS19" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar3" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar4_VS3" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar4_VS19" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar4_VS20" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar5" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar5_VS1" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar5_VS17" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar5_VS18" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar6" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar6_VS2" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar6_VS18" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar6_VS19" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar7" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar8_VS3" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar8_VS19" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ <TTGlyph name="BaseChar8_VS20" xMin="0" yMin="0" xMax="0" yMax="0">
+ <contour></contour><instructions><assembly></assembly></instructions>
+ </TTGlyph>
+ </glyf>
+
+ <name>
+ <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+ Paint.hasGlyph Test
+ </namerecord>
+ <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+ Regular
+ </namerecord>
+ <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+ Paint.hasGlyph Test
+ </namerecord>
+ <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+ hasGlyphTestFont-Regular
+ </namerecord>
+ <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+ Paint.hasGlyph Test
+ </namerecord>
+ <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+ Regular
+ </namerecord>
+ <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+ hasGlyphTestFont Test
+ </namerecord>
+ <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+ hasGlyphTestFont-Regular
+ </namerecord>
+ </name>
+
+ <post>
+ <formatType value="3.0"/>
+ <italicAngle value="0.0"/>
+ <underlinePosition value="-75"/>
+ <underlineThickness value="50"/>
+ <isFixedPitch value="0"/>
+ <minMemType42 value="0"/>
+ <maxMemType42 value="0"/>
+ <minMemType1 value="0"/>
+ <maxMemType1 value="0"/>
+ </post>
+
+</ttFont>
diff --git a/core/tests/coretests/src/android/content/pm/AppsQueryHelperTests.java b/core/tests/coretests/src/android/content/pm/AppsQueryHelperTests.java
index 4c9b00a..dcf2c89 100644
--- a/core/tests/coretests/src/android/content/pm/AppsQueryHelperTests.java
+++ b/core/tests/coretests/src/android/content/pm/AppsQueryHelperTests.java
@@ -33,7 +33,7 @@
@Override
public void setUp() throws Exception {
super.setUp();
- mAppsQueryHelper = new AppsQueryHelperTestable(getContext());
+ mAppsQueryHelper = new AppsQueryHelperTestable();
}
public void testQueryAppsSystemAppsOnly() {
@@ -78,33 +78,20 @@
assertEqualsIgnoreOrder(Arrays.asList("sys_app1", "sys_app3"), apps);
}
- public void testQueryAppsDefaultIme() {
- // Test query default system IMEs
- List<String> apps = mAppsQueryHelper.queryApps(AppsQueryHelper.GET_DEFAULT_IMES,
+ public void testQueryAppsImes() {
+ // Test query system IMEs
+ List<String> apps = mAppsQueryHelper.queryApps(AppsQueryHelper.GET_IMES,
true, UserHandle.of(UserHandle.myUserId()));
assertEqualsIgnoreOrder(Arrays.asList("sys_app1"), apps);
- // Test query default IMEs
- apps = mAppsQueryHelper.queryApps(AppsQueryHelper.GET_DEFAULT_IMES, false,
+ // Test query IMEs
+ apps = mAppsQueryHelper.queryApps(AppsQueryHelper.GET_IMES, false,
UserHandle.of(UserHandle.myUserId()));
assertEqualsIgnoreOrder(Arrays.asList("sys_app1", "app4"), apps);
-
- // Test that GET_DEFAULT_IMES cannot be used with a user id different from current process
- try {
- mAppsQueryHelper.queryApps(AppsQueryHelper.GET_DEFAULT_IMES, false,
- UserHandle.of(UserHandle.USER_NULL));
- fail("queryApps must fail if wrong user was passed");
- } catch (IllegalArgumentException e) {
- // OK
- }
}
private class AppsQueryHelperTestable extends AppsQueryHelper {
- public AppsQueryHelperTestable(Context context) {
- super(context);
- }
-
@Override
protected List<ApplicationInfo> getAllApps(int userId) {
final ApplicationInfo ai1 = new ApplicationInfo();
@@ -145,18 +132,19 @@
}
@Override
- protected List<InputMethodInfo> getInputMethodList() {
+ protected List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int userId) {
final ResolveInfo sysApp1 = new ResolveInfo();
sysApp1.serviceInfo = new ServiceInfo();
sysApp1.serviceInfo.packageName = "sys_app1";
sysApp1.serviceInfo.name = "name";
- InputMethodInfo imi1 = new InputMethodInfo(sysApp1, false, null, null, 0, true);
+ sysApp1.serviceInfo.applicationInfo = new ApplicationInfo();
+ sysApp1.serviceInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
final ResolveInfo app4 = new ResolveInfo();
app4.serviceInfo = new ServiceInfo();
app4.serviceInfo.packageName = "app4";
app4.serviceInfo.name = "name";
- InputMethodInfo imi2 = new InputMethodInfo(app4, false, null, null, 0, true);
- return Arrays.asList(imi1, imi2);
+ app4.serviceInfo.applicationInfo = new ApplicationInfo();
+ return Arrays.asList(sysApp1, app4);
}
}
diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java
index 9498f4c..b5f0617 100644
--- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java
+++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java
@@ -73,7 +73,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-@Suppress // Failing.
public class PackageManagerTests extends AndroidTestCase {
private static final boolean localLOGV = true;
@@ -434,14 +433,6 @@
SECURE_CONTAINERS_PREFIX, publicSrcPath);
assertStartsWith("The native library path should point to the ASEC",
SECURE_CONTAINERS_PREFIX, info.nativeLibraryDir);
- try {
- String compatLib = new File(info.dataDir + "/lib").getCanonicalPath();
- assertEquals("The compatibility lib directory should be a symbolic link to "
- + info.nativeLibraryDir,
- info.nativeLibraryDir, compatLib);
- } catch (IOException e) {
- fail("compat check: Can't read " + info.dataDir + "/lib");
- }
} else {
assertFalse(
(info.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) != 0);
@@ -1014,7 +1005,8 @@
private static void assertUninstalled(ApplicationInfo info) throws Exception {
File nativeLibraryFile = new File(info.nativeLibraryDir);
- assertFalse("Native library directory should be erased", nativeLibraryFile.exists());
+ assertFalse("Native library directory " + info.nativeLibraryDir
+ + " should be erased", nativeLibraryFile.exists());
}
public void deleteFromRawResource(int iFlags, int dFlags) throws Exception {
@@ -1650,15 +1642,10 @@
(info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0);
assertStartsWith("Native library dir should point to ASEC",
SECURE_CONTAINERS_PREFIX, info.nativeLibraryDir);
- final File nativeLibSymLink = new File(info.dataDir, "lib");
- assertStartsWith("The data directory should have a 'lib' symlink that points to the ASEC container",
- SECURE_CONTAINERS_PREFIX, nativeLibSymLink.getCanonicalPath());
}
}
} catch (NameNotFoundException e) {
failStr("Pkg hasnt been installed correctly");
- } catch (Exception e) {
- failStr("Failed with exception : " + e);
} finally {
if (ip != null) {
cleanUpInstall(ip);
@@ -1689,6 +1676,7 @@
sampleMoveFromRawResource(installFlags, moveFlags, fail, result);
}
+ @Suppress
@LargeTest
public void testMoveAppInternalToInternal() throws Exception {
int installFlags = PackageManager.INSTALL_INTERNAL;
@@ -2157,6 +2145,7 @@
-1);
}
+ @Suppress
@LargeTest
public void testFlagFExistingI() throws Exception {
int iFlags = PackageManager.INSTALL_INTERNAL;
@@ -3272,14 +3261,15 @@
assertTrue(false); // should have thrown
} catch (IllegalArgumentException e) {
}
- installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
+ final InstallParams ip = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
try {
ks = pm.getSigningKeySet(otherPkgName);
assertTrue(false); // should have thrown
} catch (SecurityException e) {
+ } finally {
+ cleanUpInstall(ip);
}
- cleanUpInstall(otherPkgName);
ks = pm.getSigningKeySet(mContext.getPackageName());
assertNotNull(ks);
}
@@ -3318,16 +3308,20 @@
assertTrue(false); // should have thrown
} catch(IllegalArgumentException e) {
}
- installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
+
+ // make sure we can get a KeySet from our pkg
+ ks = pm.getKeySetByAlias(mPkgName, "A");
+ assertNotNull(ks);
+
+ // and another
+ final InstallParams ip = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
try {
ks = pm.getKeySetByAlias(otherPkgName, "A");
- assertTrue(false); // should have thrown
- } catch (SecurityException e) {
+ assertNotNull(ks);
+ } finally {
+ cleanUpInstall(ip);
}
- cleanUpInstall(otherPkgName);
- ks = pm.getKeySetByAlias(mPkgName, "A");
- assertNotNull(ks);
}
public void testIsSignedBy() throws Exception {
@@ -3360,17 +3354,23 @@
assertFalse(pm.isSignedBy(mPkgName, new KeySet(new Binder())));
assertTrue(pm.isSignedBy(mPkgName, mSigningKS));
- installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
+ final InstallParams ip1 = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
- assertFalse(pm.isSignedBy(otherPkgName, mDefinedKS));
- assertTrue(pm.isSignedBy(otherPkgName, mSigningKS));
- cleanUpInstall(otherPkgName);
+ try {
+ assertFalse(pm.isSignedBy(otherPkgName, mDefinedKS));
+ assertTrue(pm.isSignedBy(otherPkgName, mSigningKS));
+ } finally {
+ cleanUpInstall(ip1);
+ }
- installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api,
+ final InstallParams ip2 = installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api,
0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
- assertTrue(pm.isSignedBy(otherPkgName, mDefinedKS));
- assertTrue(pm.isSignedBy(otherPkgName, mSigningKS));
- cleanUpInstall(otherPkgName);
+ try {
+ assertTrue(pm.isSignedBy(otherPkgName, mDefinedKS));
+ assertTrue(pm.isSignedBy(otherPkgName, mSigningKS));
+ } finally {
+ cleanUpInstall(ip2);
+ }
}
public void testIsSignedByExactly() throws Exception {
@@ -3402,17 +3402,23 @@
assertFalse(pm.isSignedByExactly(mPkgName, new KeySet(new Binder())));
assertTrue(pm.isSignedByExactly(mPkgName, mSigningKS));
- installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
+ final InstallParams ip1 = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
- assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS));
- assertTrue(pm.isSignedByExactly(otherPkgName, mSigningKS));
- cleanUpInstall(otherPkgName);
+ try {
+ assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS));
+ assertTrue(pm.isSignedByExactly(otherPkgName, mSigningKS));
+ } finally {
+ cleanUpInstall(ip1);
+ }
- installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api,
+ final InstallParams ip2 = installFromRawResource("keysetApi.apk", R.raw.keyset_splata_api,
0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
- assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS));
- assertFalse(pm.isSignedByExactly(otherPkgName, mSigningKS));
- cleanUpInstall(otherPkgName);
+ try {
+ assertFalse(pm.isSignedByExactly(otherPkgName, mDefinedKS));
+ assertFalse(pm.isSignedByExactly(otherPkgName, mSigningKS));
+ } finally {
+ cleanUpInstall(ip2);
+ }
}
@@ -3465,11 +3471,10 @@
int apk2 = APP2_CERT1_CERT2;
String apk1Name = "install1.apk";
String apk2Name = "install2.apk";
- InstallParams ip1 = null;
+ final InstallParams ip = installFromRawResource(apk1Name, apk1, 0, false,
+ false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
try {
- ip1 = installFromRawResource(apk1Name, apk1, 0, false,
- false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
PackageManager pm = mContext.getPackageManager();
// Delete app2
File filesDir = mContext.getFilesDir();
@@ -3480,12 +3485,10 @@
getPm().deletePackage(pkg.packageName, null, PackageManager.DELETE_ALL_USERS);
// Check signatures now
int match = mContext.getPackageManager().checkSignatures(
- ip1.pkg.packageName, pkg.packageName);
+ ip.pkg.packageName, pkg.packageName);
assertEquals(PackageManager.SIGNATURE_UNKNOWN_PACKAGE, match);
} finally {
- if (ip1 != null) {
- cleanUpInstall(ip1);
- }
+ cleanUpInstall(ip);
}
}
@@ -3493,14 +3496,10 @@
public void testInstallNoCertificates() throws Exception {
int apk1 = APP1_UNSIGNED;
String apk1Name = "install1.apk";
- InstallParams ip1 = null;
- try {
- installFromRawResource(apk1Name, apk1, 0, false,
- true, PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES,
- PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
- } finally {
- }
+ installFromRawResource(apk1Name, apk1, 0, false,
+ true, PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES,
+ PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
}
/*
@@ -3766,35 +3765,43 @@
* Test that getInstalledPackages returns all the data specified in flags.
*/
public void testGetInstalledPackagesAll() throws Exception {
- int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS
+ final int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS
| PackageManager.GET_CONFIGURATIONS | PackageManager.GET_INSTRUMENTATION
| PackageManager.GET_PERMISSIONS | PackageManager.GET_PROVIDERS
| PackageManager.GET_RECEIVERS | PackageManager.GET_SERVICES
| PackageManager.GET_SIGNATURES | PackageManager.GET_UNINSTALLED_PACKAGES;
- List<PackageInfo> packages = getPm().getInstalledPackages(flags);
- assertNotNull("installed packages cannot be null", packages);
- assertTrue("installed packages cannot be empty", packages.size() > 0);
+ final InstallParams ip =
+ installFromRawResource("install.apk", R.raw.install_complete_package_info,
+ 0 /*flags*/, false /*cleanUp*/, false /*fail*/, -1 /*result*/,
+ PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY);
+ try {
+ final List<PackageInfo> packages = getPm().getInstalledPackages(flags);
+ assertNotNull("installed packages cannot be null", packages);
+ assertTrue("installed packages cannot be empty", packages.size() > 0);
- PackageInfo packageInfo = null;
+ PackageInfo packageInfo = null;
- // Find the package with all components specified in the AndroidManifest
- // to ensure no null values
- for (PackageInfo pi : packages) {
- if ("com.android.frameworks.coretests.install_complete_package_info"
- .equals(pi.packageName)) {
- packageInfo = pi;
- break;
+ // Find the package with all components specified in the AndroidManifest
+ // to ensure no null values
+ for (PackageInfo pi : packages) {
+ if ("com.android.frameworks.coretests.install_complete_package_info"
+ .equals(pi.packageName)) {
+ packageInfo = pi;
+ break;
+ }
}
+ assertNotNull("activities should not be null", packageInfo.activities);
+ assertNotNull("configPreferences should not be null", packageInfo.configPreferences);
+ assertNotNull("instrumentation should not be null", packageInfo.instrumentation);
+ assertNotNull("permissions should not be null", packageInfo.permissions);
+ assertNotNull("providers should not be null", packageInfo.providers);
+ assertNotNull("receivers should not be null", packageInfo.receivers);
+ assertNotNull("services should not be null", packageInfo.services);
+ assertNotNull("signatures should not be null", packageInfo.signatures);
+ } finally {
+ cleanUpInstall(ip);
}
- assertNotNull("activities should not be null", packageInfo.activities);
- assertNotNull("configPreferences should not be null", packageInfo.configPreferences);
- assertNotNull("instrumentation should not be null", packageInfo.instrumentation);
- assertNotNull("permissions should not be null", packageInfo.permissions);
- assertNotNull("providers should not be null", packageInfo.providers);
- assertNotNull("receivers should not be null", packageInfo.receivers);
- assertNotNull("services should not be null", packageInfo.services);
- assertNotNull("signatures should not be null", packageInfo.signatures);
}
/**
@@ -3802,38 +3809,52 @@
* flags when the GET_UNINSTALLED_PACKAGES flag is set.
*/
public void testGetUnInstalledPackagesAll() throws Exception {
- int flags = PackageManager.GET_UNINSTALLED_PACKAGES
+ final int flags = PackageManager.GET_UNINSTALLED_PACKAGES
| PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS
| PackageManager.GET_CONFIGURATIONS | PackageManager.GET_INSTRUMENTATION
| PackageManager.GET_PERMISSIONS | PackageManager.GET_PROVIDERS
| PackageManager.GET_RECEIVERS | PackageManager.GET_SERVICES
| PackageManager.GET_SIGNATURES | PackageManager.GET_UNINSTALLED_PACKAGES;
- List<PackageInfo> packages = getPm().getInstalledPackages(flags);
- assertNotNull("installed packages cannot be null", packages);
- assertTrue("installed packages cannot be empty", packages.size() > 0);
+ // first, install the package
+ final InstallParams ip =
+ installFromRawResource("install.apk", R.raw.install_complete_package_info,
+ 0 /*flags*/, false /*cleanUp*/, false /*fail*/, -1 /*result*/,
+ PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY);
+ try {
+ // then, remove it, keeping it's data around
+ final GenericReceiver receiver = new DeleteReceiver(ip.pkg.packageName);
+ invokeDeletePackage(ip.pkg.packageName, PackageManager.DELETE_KEEP_DATA, receiver);
- PackageInfo packageInfo = null;
+ final List<PackageInfo> packages = getPm().getInstalledPackages(flags);
+ assertNotNull("installed packages cannot be null", packages);
+ assertTrue("installed packages cannot be empty", packages.size() > 0);
- // Find the package with all components specified in the AndroidManifest
- // to ensure no null values
- for (PackageInfo pi : packages) {
- if ("com.android.frameworks.coretests.install_complete_package_info"
- .equals(pi.packageName)) {
- packageInfo = pi;
- break;
+ PackageInfo packageInfo = null;
+
+ // Find the package with all components specified in the AndroidManifest
+ // to ensure no null values
+ for (PackageInfo pi : packages) {
+ if ("com.android.frameworks.coretests.install_complete_package_info"
+ .equals(pi.packageName)) {
+ packageInfo = pi;
+ break;
+ }
}
+ assertNotNull("activities should not be null", packageInfo.activities);
+ assertNotNull("configPreferences should not be null", packageInfo.configPreferences);
+ assertNotNull("instrumentation should not be null", packageInfo.instrumentation);
+ assertNotNull("permissions should not be null", packageInfo.permissions);
+ assertNotNull("providers should not be null", packageInfo.providers);
+ assertNotNull("receivers should not be null", packageInfo.receivers);
+ assertNotNull("services should not be null", packageInfo.services);
+ assertNotNull("signatures should not be null", packageInfo.signatures);
+ } finally {
+ cleanUpInstall(ip);
}
- assertNotNull("activities should not be null", packageInfo.activities);
- assertNotNull("configPreferences should not be null", packageInfo.configPreferences);
- assertNotNull("instrumentation should not be null", packageInfo.instrumentation);
- assertNotNull("permissions should not be null", packageInfo.permissions);
- assertNotNull("providers should not be null", packageInfo.providers);
- assertNotNull("receivers should not be null", packageInfo.receivers);
- assertNotNull("services should not be null", packageInfo.services);
- assertNotNull("signatures should not be null", packageInfo.signatures);
}
+ @Suppress
public void testInstall_BadDex_CleanUp() throws Exception {
int retCode = PackageManager.INSTALL_FAILED_DEXOPT;
installFromRawResource("install.apk", R.raw.install_bad_dex, 0, true, true, retCode,
diff --git a/core/tests/coretests/src/android/graphics/PaintTest.java b/core/tests/coretests/src/android/graphics/PaintTest.java
index e97bb33..2a3d463 100644
--- a/core/tests/coretests/src/android/graphics/PaintTest.java
+++ b/core/tests/coretests/src/android/graphics/PaintTest.java
@@ -20,6 +20,9 @@
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import java.util.Arrays;
+import java.util.HashSet;
+
/**
* PaintTest tests {@link Paint}.
*/
@@ -94,4 +97,63 @@
testCase.mWidthWithHinting, widths);
}
}
+
+ private static class HasGlyphTestCase {
+ public final int mBaseCodepoint;
+ public final HashSet<Integer> mVariationSelectors;
+
+ public HasGlyphTestCase(int baseCodepoint, Integer[] variationSelectors) {
+ mBaseCodepoint = baseCodepoint;
+ mVariationSelectors = new HashSet<>(Arrays.asList(variationSelectors));
+ }
+ }
+
+ private static String codePointsToString(int[] codepoints) {
+ StringBuilder sb = new StringBuilder();
+ for (int codepoint : codepoints) {
+ sb.append(Character.toChars(codepoint));
+ }
+ return sb.toString();
+ }
+
+ public void testHasGlyph_variationSelectors() {
+ final Typeface fontTypeface = Typeface.createFromAsset(
+ getInstrumentation().getContext().getAssets(), "fonts/hasGlyphTestFont.ttf");
+ Paint p = new Paint();
+ p.setTypeface(fontTypeface);
+
+ // Usually latin letters U+0061..U+0064 and Mahjong Tiles U+1F000..U+1F003 don't have
+ // variation selectors. This test may fail if system pre-installed fonts have a variation
+ // selector support for U+0061..U+0064 and U+1F000..U+1F003.
+ HasGlyphTestCase[] HAS_GLYPH_TEST_CASES = {
+ new HasGlyphTestCase(0x0061, new Integer[] {0xFE00, 0xE0100, 0xE0101, 0xE0102}),
+ new HasGlyphTestCase(0x0062, new Integer[] {0xFE01, 0xE0101, 0xE0102, 0xE0103}),
+ new HasGlyphTestCase(0x0063, new Integer[] {}),
+ new HasGlyphTestCase(0x0064, new Integer[] {0xFE02, 0xE0102, 0xE0103}),
+
+ new HasGlyphTestCase(0x1F000, new Integer[] {0xFE00, 0xE0100, 0xE0101, 0xE0102}),
+ new HasGlyphTestCase(0x1F001, new Integer[] {0xFE01, 0xE0101, 0xE0102, 0xE0103}),
+ new HasGlyphTestCase(0x1F002, new Integer[] {}),
+ new HasGlyphTestCase(0x1F003, new Integer[] {0xFE02, 0xE0102, 0xE0103}),
+ };
+
+ for (HasGlyphTestCase testCase : HAS_GLYPH_TEST_CASES) {
+ for (int vs = 0xFE00; vs <= 0xE01EF; ++vs) {
+ // Move to variation selector supplements after variation selectors.
+ if (vs == 0xFF00) {
+ vs = 0xE0100;
+ }
+ final String signature =
+ "hasGlyph(U+" + Integer.toHexString(testCase.mBaseCodepoint) +
+ " U+" + Integer.toHexString(vs) + ")";
+ final String testString =
+ codePointsToString(new int[] {testCase.mBaseCodepoint, vs});
+ if (testCase.mVariationSelectors.contains(vs)) {
+ assertTrue(signature + " is expected to be true", p.hasGlyph(testString));
+ } else {
+ assertFalse(signature + " is expected to be false", p.hasGlyph(testString));
+ }
+ }
+ }
+ }
}
diff --git a/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java b/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java
index 3ce45e9..3d8fe69 100644
--- a/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java
+++ b/core/tests/coretests/src/android/widget/SuggestionsPopupWindowTest.java
@@ -17,6 +17,7 @@
package android.widget;
import android.app.Activity;
+import android.content.res.TypedArray;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.Selection;
@@ -25,6 +26,7 @@
import android.text.TextPaint;
import android.text.style.SuggestionSpan;
import android.text.style.TextAppearanceSpan;
+import android.view.View;
import com.android.frameworks.coretests.R;
@@ -54,8 +56,12 @@
final int multiWordSpanStart = 0;
final int multiWordSpanEnd = 11;
- TextAppearanceSpan expectedSpan = new TextAppearanceSpan(activity,
- android.R.style.TextAppearance_SuggestionHighlight);
+ TypedArray array = activity.obtainStyledAttributes(com.android.internal.R.styleable.Theme);
+ int id = array.getResourceId(
+ com.android.internal.R.styleable.Theme_textEditSuggestionHighlightStyle, 0);
+ array.recycle();
+
+ TextAppearanceSpan expectedSpan = new TextAppearanceSpan(activity, id);
TextPaint tmpTp = new TextPaint();
expectedSpan.updateDrawState(tmpTp);
final int expectedHighlightTextColor = tmpTp.getColor();
@@ -89,6 +95,7 @@
// | abc *Def* ghi |
// | *ABC DEF GHI* |
// | *Abc Def Ghi* |
+ // -----------------
// | DELETE |
// -----------------
// *XX* means that XX is highlighted.
@@ -99,13 +106,15 @@
editor.getSuggestionsPopupWindowForTesting();
assertNotNull(popupWindow);
- ListView listView = (ListView) popupWindow.getContentViewForTesting();
+ LinearLayout linearLayout = (LinearLayout) popupWindow.getContentViewForTesting();
+ assertNotNull(linearLayout);
+
+ ListView listView = (ListView)linearLayout.findViewById(
+ com.android.internal.R.id.suggestionContainer);
assertNotNull(listView);
int childNum = listView.getChildCount();
- // +1 for "DELETE" command.
- assertEquals(singleWordCandidates.length + multiWordCandidates.length + 1,
- childNum);
+ assertEquals(singleWordCandidates.length + multiWordCandidates.length, childNum);
for (int i = 0; i < singleWordCandidates.length; ++i) {
TextView textView = (TextView) listView.getChildAt(i);
@@ -156,6 +165,10 @@
assertEquals(multiWordSpanStart, spanned.getSpanStart(taSpan[0]));
assertEquals(multiWordSpanEnd, spanned.getSpanEnd(taSpan[0]));
}
+
+ TextView deleteButton = (TextView)linearLayout.findViewById(
+ com.android.internal.R.id.deleteButton);
+ assertEquals(View.VISIBLE, deleteButton.getWindowVisibility());
}
};
diff --git a/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java b/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java
index c5e2ae6..ddbdc87 100644
--- a/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java
+++ b/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java
@@ -16,7 +16,11 @@
package android.widget;
+import static android.widget.espresso.TextViewActions.mouseDoubleClickOnTextAtIndex;
+import static android.widget.espresso.TextViewActions.mouseLongClickOnTextAtIndex;
+import static android.widget.espresso.TextViewActions.mouseDoubleClickAndDragOnText;
import static android.widget.espresso.TextViewActions.mouseDragOnText;
+import static android.widget.espresso.TextViewActions.mouseLongClickAndDragOnText;
import static android.widget.espresso.TextViewAssertions.hasSelection;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
@@ -62,4 +66,104 @@
onView(withId(R.id.textview)).check(hasSelection("llo wor"));
}
+
+ @SmallTest
+ public void testSelectTextByLongClick() throws Exception {
+ getActivity();
+
+ final String helloWorld = "Hello world!";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(helloWorld));
+
+ onView(withId(R.id.textview)).perform(mouseLongClickOnTextAtIndex(0));
+ onView(withId(R.id.textview)).check(hasSelection("Hello"));
+
+ onView(withId(R.id.textview)).perform(mouseLongClickOnTextAtIndex(
+ helloWorld.indexOf("world")));
+ onView(withId(R.id.textview)).check(hasSelection("world"));
+
+ onView(withId(R.id.textview)).perform(mouseLongClickOnTextAtIndex(
+ helloWorld.indexOf("llo")));
+ onView(withId(R.id.textview)).check(hasSelection("Hello"));
+
+ onView(withId(R.id.textview)).perform(mouseLongClickOnTextAtIndex(
+ helloWorld.indexOf("rld")));
+ onView(withId(R.id.textview)).check(hasSelection("world"));
+ }
+
+ @SmallTest
+ public void testSelectTextByDoubleClick() throws Exception {
+ getActivity();
+
+ final String helloWorld = "Hello world!";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(helloWorld));
+
+ onView(withId(R.id.textview)).perform(mouseDoubleClickOnTextAtIndex(0));
+ onView(withId(R.id.textview)).check(hasSelection("Hello"));
+
+ onView(withId(R.id.textview)).perform(mouseDoubleClickOnTextAtIndex(
+ helloWorld.indexOf("world")));
+ onView(withId(R.id.textview)).check(hasSelection("world"));
+
+ onView(withId(R.id.textview)).perform(mouseDoubleClickOnTextAtIndex(
+ helloWorld.indexOf("llo")));
+ onView(withId(R.id.textview)).check(hasSelection("Hello"));
+
+ onView(withId(R.id.textview)).perform(mouseDoubleClickOnTextAtIndex(
+ helloWorld.indexOf("rld")));
+ onView(withId(R.id.textview)).check(hasSelection("world"));
+ }
+
+ @SmallTest
+ public void testSelectTextByDoubleClickAndDrag() throws Exception {
+ getActivity();
+
+ final String text = "abcd efg hijk lmn";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+
+ onView(withId(R.id.textview)).perform(
+ mouseDoubleClickAndDragOnText(text.indexOf("f"), text.indexOf("j")));
+ onView(withId(R.id.textview)).check(hasSelection("efg hijk"));
+ }
+
+ @SmallTest
+ public void testSelectTextByDoubleClickAndDrag_reverse() throws Exception {
+ getActivity();
+
+ final String text = "abcd efg hijk lmn";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+
+ onView(withId(R.id.textview)).perform(
+ mouseDoubleClickAndDragOnText(text.indexOf("j"), text.indexOf("f")));
+ onView(withId(R.id.textview)).check(hasSelection("efg hijk"));
+ }
+
+ @SmallTest
+ public void testSelectTextByLongPressAndDrag() throws Exception {
+ getActivity();
+
+ final String text = "abcd efg hijk lmn";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+
+ onView(withId(R.id.textview)).perform(
+ mouseLongClickAndDragOnText(text.indexOf("f"), text.indexOf("j")));
+ onView(withId(R.id.textview)).check(hasSelection("efg hijk"));
+ }
+
+ @SmallTest
+ public void testSelectTextByLongPressAndDrag_reverse() throws Exception {
+ getActivity();
+
+ final String text = "abcd efg hijk lmn";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+
+ onView(withId(R.id.textview)).perform(
+ mouseLongClickAndDragOnText(text.indexOf("j"), text.indexOf("f")));
+ onView(withId(R.id.textview)).check(hasSelection("efg hijk"));
+ }
}
diff --git a/core/tests/coretests/src/android/widget/TextViewActivityTest.java b/core/tests/coretests/src/android/widget/TextViewActivityTest.java
index bb51570..4614505 100644
--- a/core/tests/coretests/src/android/widget/TextViewActivityTest.java
+++ b/core/tests/coretests/src/android/widget/TextViewActivityTest.java
@@ -19,6 +19,8 @@
import static android.widget.espresso.TextViewActions.clickOnTextAtIndex;
import static android.widget.espresso.TextViewActions.doubleTapAndDragOnText;
import static android.widget.espresso.TextViewActions.doubleClickOnTextAtIndex;
+import static android.widget.espresso.TextViewActions.dragHandle;
+import static android.widget.espresso.TextViewActions.Handle;
import static android.widget.espresso.TextViewActions.longPressAndDragOnText;
import static android.widget.espresso.TextViewActions.longPressOnTextAtIndex;
import static android.widget.espresso.TextViewAssertions.hasInsertionPointerAtIndex;
@@ -29,11 +31,19 @@
import static android.support.test.espresso.action.ViewActions.pressKey;
import static android.support.test.espresso.action.ViewActions.typeTextIntoFocusedView;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
+import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
import com.android.frameworks.coretests.R;
+import android.support.test.espresso.NoMatchingRootException;
+import android.support.test.espresso.NoMatchingViewException;
+import android.support.test.espresso.ViewInteraction;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import android.view.KeyEvent;
@@ -157,4 +167,200 @@
Thread.sleep(100);
assertFloatingToolbarIsDisplayed(getActivity());
}
+
+ @SmallTest
+ public void testSelectionHandles() throws Exception {
+ final String text = "abcd efg hijk lmn";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+
+ assertNoSelectionHandles();
+
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('f')));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .check(matches(isDisplayed()));
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .check(matches(isDisplayed()));
+
+ final TextView textView = (TextView)getActivity().findViewById(R.id.textview);
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('a')));
+ onView(withId(R.id.textview)).check(hasSelection("abcd efg"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('k') + 1));
+ onView(withId(R.id.textview)).check(hasSelection("abcd efg hijk"));
+ }
+
+ @SmallTest
+ public void testSelectionHandles_multiLine() throws Exception {
+ final String text = "abcd\n" + "efg\n" + "hijk\n" + "lmn\n" + "opqr";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('i')));
+
+ final TextView textView = (TextView)getActivity().findViewById(R.id.textview);
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('e')));
+ onView(withId(R.id.textview)).check(hasSelection("efg\nhijk"));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('a')));
+ onView(withId(R.id.textview)).check(hasSelection("abcd\nefg\nhijk"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('n') + 1));
+ onView(withId(R.id.textview)).check(hasSelection("abcd\nefg\nhijk\nlmn"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('r') + 1));
+ onView(withId(R.id.textview)).check(hasSelection("abcd\nefg\nhijk\nlmn\nopqr"));
+ }
+
+ @SmallTest
+ public void testSelectionHandles_doesNotPassAnotherHandle() throws Exception {
+ final String text = "abcd efg hijk lmn";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('f')));
+
+ final TextView textView = (TextView)getActivity().findViewById(R.id.textview);
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('l')));
+ onView(withId(R.id.textview)).check(hasSelection("g"));
+
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('f')));
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('a')));
+ onView(withId(R.id.textview)).check(hasSelection("e"));
+ }
+
+ @SmallTest
+ public void testSelectionHandles_doesNotPassAnotherHandle_multiLine() throws Exception {
+ final String text = "abcd\n" + "efg\n" + "hijk\n" + "lmn\n" + "opqr";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('i')));
+
+ final TextView textView = (TextView)getActivity().findViewById(R.id.textview);
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('r') + 1));
+ onView(withId(R.id.textview)).check(hasSelection("k"));
+
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('i')));
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('a')));
+ onView(withId(R.id.textview)).check(hasSelection("h"));
+ }
+
+ @SmallTest
+ public void testSelectionHandles_snapToWordBoundary() throws Exception {
+ final String text = "abcd efg hijk lmn opqr";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('i')));
+
+ final TextView textView = (TextView)getActivity().findViewById(R.id.textview);
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('f')));
+ onView(withId(R.id.textview)).check(hasSelection("efg hijk"));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('d') + 1));
+ onView(withId(R.id.textview)).check(hasSelection("efg hijk"));
+
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('c')));
+ onView(withId(R.id.textview)).check(hasSelection("abcd efg hijk"));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('d')));
+ onView(withId(R.id.textview)).check(hasSelection("d efg hijk"));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('b')));
+ onView(withId(R.id.textview)).check(hasSelection("bcd efg hijk"));
+
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('i')));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('n')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('o')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('q')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn opqr"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('p')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn o"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('r')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn opq"));
+ }
+
+ @SmallTest
+ public void testSelectionHandles_snapToWordBoundary_multiLine() throws Exception {
+ final String text = "abcd efg\n" + "hijk lmn\n" + "opqr stu";
+ onView(withId(R.id.textview)).perform(click());
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView(text));
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('m')));
+
+ final TextView textView = (TextView)getActivity().findViewById(R.id.textview);
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('c')));
+ onView(withId(R.id.textview)).check(hasSelection("abcd efg\nhijk lmn"));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('g')));
+ onView(withId(R.id.textview)).check(hasSelection("g\nhijk lmn"));
+
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('m')));
+ onView(withId(R.id.textview)).check(hasSelection("lmn"));
+
+ onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('i')));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('u')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn\nopqr stu"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('p')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk lmn\no"));
+
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('i')));
+ onView(withId(R.id.textview)).check(hasSelection("hijk"));
+ }
+
+ private static void assertNoSelectionHandles() {
+ try {
+ onHandleView(com.android.internal.R.id.selection_start_handle)
+ .check(matches(isDisplayed()));
+ } catch (NoMatchingRootException | NoMatchingViewException | AssertionError e) {
+ try {
+ onHandleView(com.android.internal.R.id.selection_end_handle)
+ .check(matches(isDisplayed()));
+ } catch (NoMatchingRootException | NoMatchingViewException | AssertionError e1) {
+ return;
+ }
+ }
+ throw new AssertionError("Selection handle found");
+ }
+
+ private static ViewInteraction onHandleView(int id)
+ throws NoMatchingRootException, NoMatchingViewException, AssertionError {
+ return onView(allOf(withId(id), isAssignableFrom(Editor.HandleView.class)))
+ .inRoot(withDecorView(hasDescendant(withId(id))));
+ }
}
diff --git a/core/tests/coretests/src/android/widget/espresso/DragOnTextViewActions.java b/core/tests/coretests/src/android/widget/espresso/DragAction.java
similarity index 63%
rename from core/tests/coretests/src/android/widget/espresso/DragOnTextViewActions.java
rename to core/tests/coretests/src/android/widget/espresso/DragAction.java
index 9ff8e82..ce97568 100644
--- a/core/tests/coretests/src/android/widget/espresso/DragOnTextViewActions.java
+++ b/core/tests/coretests/src/android/widget/espresso/DragAction.java
@@ -34,26 +34,25 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
-import android.widget.TextView;
import org.hamcrest.Matcher;
/**
- * Drags on text in a TextView using touch events.<br>
+ * Drags on a View using touch events.<br>
* <br>
* View constraints:
* <ul>
- * <li>must be a TextView displayed on screen
+ * <li>must be displayed on screen
* <ul>
*/
-public final class DragOnTextViewActions implements ViewAction {
+public final class DragAction implements ViewAction {
public interface Dragger extends Swiper {
UiController wrapUiController(UiController uiController);
}
/**
- * Executes different "drag on text" types to given positions.
+ * Executes different drag types to given positions.
*/
public enum Drag implements Dragger {
@@ -82,7 +81,7 @@
@Override
public String toString() {
- return "mouse down and drag to select";
+ return "mouse down and drag";
}
@Override
@@ -92,9 +91,41 @@
},
/**
- * Starts a drag with a long-press.
+ * Starts a drag with a mouse double click.
*/
- LONG_PRESS {
+ MOUSE_DOUBLE_CLICK {
+ private DownMotionPerformer downMotion = new DownMotionPerformer() {
+ @Override
+ @Nullable
+ public MotionEvent perform(
+ UiController uiController, float[] coordinates, float[] precision) {
+ return performDoubleTap(uiController, coordinates, precision);
+ }
+ };
+
+ @Override
+ public Status sendSwipe(
+ UiController uiController,
+ float[] startCoordinates, float[] endCoordinates, float[] precision) {
+ return sendLinearDrag(
+ uiController, downMotion, startCoordinates, endCoordinates, precision);
+ }
+
+ @Override
+ public String toString() {
+ return "mouse double click and drag to select";
+ }
+
+ @Override
+ public UiController wrapUiController(UiController uiController) {
+ return new MouseUiController(uiController);
+ }
+ },
+
+ /**
+ * Starts a drag with a mouse long click.
+ */
+ MOUSE_LONG_CLICK {
private DownMotionPerformer downMotion = new DownMotionPerformer() {
@Override
public MotionEvent perform(
@@ -102,11 +133,40 @@
MotionEvent downEvent = MotionEvents.sendDown(
uiController, coordinates, precision)
.down;
- // Duration before a press turns into a long press.
- // Factor 1.5 is needed, otherwise a long press is not safely detected.
- // See android.test.TouchUtils longClickView
- long longPressTimeout = (long) (ViewConfiguration.getLongPressTimeout() * 1.5f);
- uiController.loopMainThreadForAtLeast(longPressTimeout);
+ return performLongPress(uiController, coordinates, precision);
+ }
+ };
+
+ @Override
+ public Status sendSwipe(
+ UiController uiController,
+ float[] startCoordinates, float[] endCoordinates, float[] precision) {
+ return sendLinearDrag(
+ uiController, downMotion, startCoordinates, endCoordinates, precision);
+ }
+
+ @Override
+ public String toString() {
+ return "mouse long click and drag to select";
+ }
+
+ @Override
+ public UiController wrapUiController(UiController uiController) {
+ return new MouseUiController(uiController);
+ }
+ },
+
+ /**
+ * Starts a drag with a tap.
+ */
+ TAP {
+ private DownMotionPerformer downMotion = new DownMotionPerformer() {
+ @Override
+ public MotionEvent perform(
+ UiController uiController, float[] coordinates, float[] precision) {
+ MotionEvent downEvent = MotionEvents.sendDown(
+ uiController, coordinates, precision)
+ .down;
return downEvent;
}
};
@@ -121,38 +181,19 @@
@Override
public String toString() {
- return "long press and drag to select";
+ return "tap and drag";
}
},
/**
- * Starts a drag with a double-tap.
+ * Starts a drag with a long-press.
*/
- DOUBLE_TAP {
+ LONG_PRESS {
private DownMotionPerformer downMotion = new DownMotionPerformer() {
@Override
- @Nullable
public MotionEvent perform(
- UiController uiController, float[] coordinates, float[] precision) {
- MotionEvent downEvent = MotionEvents.sendDown(
- uiController, coordinates, precision)
- .down;
- try {
- if (!MotionEvents.sendUp(uiController, downEvent)) {
- String logMessage = "Injection of up event as part of the double tap " +
- "failed. Sending cancel event.";
- Log.d(TAG, logMessage);
- MotionEvents.sendCancel(uiController, downEvent);
- return null;
- }
-
- long doubleTapMinimumTimeout = ViewConfiguration.getDoubleTapMinTime();
- uiController.loopMainThreadForAtLeast(doubleTapMinimumTimeout);
-
- return MotionEvents.sendDown(uiController, coordinates, precision).down;
- } finally {
- downEvent.recycle();
- }
+ UiController uiController, float[] coordinates, float[] precision) {
+ return performLongPress(uiController, coordinates, precision);
}
};
@@ -166,7 +207,34 @@
@Override
public String toString() {
- return "double-tap and drag to select";
+ return "long press and drag";
+ }
+ },
+
+ /**
+ * Starts a drag with a double-tap.
+ */
+ DOUBLE_TAP {
+ private DownMotionPerformer downMotion = new DownMotionPerformer() {
+ @Override
+ @Nullable
+ public MotionEvent perform(
+ UiController uiController, float[] coordinates, float[] precision) {
+ return performDoubleTap(uiController, coordinates, precision);
+ }
+ };
+
+ @Override
+ public Status sendSwipe(
+ UiController uiController,
+ float[] startCoordinates, float[] endCoordinates, float[] precision) {
+ return sendLinearDrag(
+ uiController, downMotion, startCoordinates, endCoordinates, precision);
+ }
+
+ @Override
+ public String toString() {
+ return "double-tap and drag";
}
};
@@ -178,6 +246,9 @@
/** Length of time a drag should last for, in milliseconds. */
private static final int DRAG_DURATION = 1500;
+ /** Duration between the last move event and the up event, in milliseconds. */
+ private static final int WAIT_BEFORE_SENDING_UP = 400;
+
private static Status sendLinearDrag(
UiController uiController, DownMotionPerformer downMotion,
float[] startCoordinates, float[] endCoordinates, float[] precision) {
@@ -208,6 +279,10 @@
}
}
+ // Wait before sending up because some drag handling logic may discard move events
+ // that has been sent immediately before the up event. e.g. HandleView.
+ uiController.loopMainThreadForAtLeast(WAIT_BEFORE_SENDING_UP);
+
if (!MotionEvents.sendUp(uiController, downEvent, endCoordinates)) {
String logMessage = "Injection of up event as part of the drag failed. " +
"Sending cancel event.";
@@ -224,14 +299,51 @@
private static float[][] interpolate(float[] start, float[] end) {
float[][] res = new float[DRAG_STEP_COUNT][2];
- for (int i = 1; i < DRAG_STEP_COUNT + 1; i++) {
- res[i - 1][0] = start[0] + (end[0] - start[0]) * i / (DRAG_STEP_COUNT + 2f);
- res[i - 1][1] = start[1] + (end[1] - start[1]) * i / (DRAG_STEP_COUNT + 2f);
+ for (int i = 0; i < DRAG_STEP_COUNT; i++) {
+ res[i][0] = start[0] + (end[0] - start[0]) * i / (DRAG_STEP_COUNT - 1f);
+ res[i][1] = start[1] + (end[1] - start[1]) * i / (DRAG_STEP_COUNT - 1f);
}
return res;
}
+ private static MotionEvent performLongPress(
+ UiController uiController, float[] coordinates, float[] precision) {
+ MotionEvent downEvent = MotionEvents.sendDown(
+ uiController, coordinates, precision)
+ .down;
+ // Duration before a press turns into a long press.
+ // Factor 1.5 is needed, otherwise a long press is not safely detected.
+ // See android.test.TouchUtils longClickView
+ long longPressTimeout = (long) (ViewConfiguration.getLongPressTimeout() * 1.5f);
+ uiController.loopMainThreadForAtLeast(longPressTimeout);
+ return downEvent;
+ }
+
+ @Nullable
+ private static MotionEvent performDoubleTap(
+ UiController uiController, float[] coordinates, float[] precision) {
+ MotionEvent downEvent = MotionEvents.sendDown(
+ uiController, coordinates, precision)
+ .down;
+ try {
+ if (!MotionEvents.sendUp(uiController, downEvent)) {
+ String logMessage = "Injection of up event as part of the double tap " +
+ "failed. Sending cancel event.";
+ Log.d(TAG, logMessage);
+ MotionEvents.sendCancel(uiController, downEvent);
+ return null;
+ }
+
+ long doubleTapMinimumTimeout = ViewConfiguration.getDoubleTapMinTime();
+ uiController.loopMainThreadForAtLeast(doubleTapMinimumTimeout);
+
+ return MotionEvents.sendDown(uiController, coordinates, precision).down;
+ } finally {
+ downEvent.recycle();
+ }
+ }
+
@Override
public UiController wrapUiController(UiController uiController) {
return uiController;
@@ -258,22 +370,25 @@
private final CoordinatesProvider mStartCoordinatesProvider;
private final CoordinatesProvider mEndCoordinatesProvider;
private final PrecisionDescriber mPrecisionDescriber;
+ private final Class<? extends View> mViewClass;
- public DragOnTextViewActions(
+ public DragAction(
Dragger dragger,
CoordinatesProvider startCoordinatesProvider,
CoordinatesProvider endCoordinatesProvider,
- PrecisionDescriber precisionDescriber) {
+ PrecisionDescriber precisionDescriber,
+ Class<? extends View> viewClass) {
mDragger = checkNotNull(dragger);
mStartCoordinatesProvider = checkNotNull(startCoordinatesProvider);
mEndCoordinatesProvider = checkNotNull(endCoordinatesProvider);
mPrecisionDescriber = checkNotNull(precisionDescriber);
+ mViewClass = viewClass;
}
@Override
@SuppressWarnings("unchecked")
public Matcher<View> getConstraints() {
- return allOf(isCompletelyDisplayed(), isAssignableFrom(TextView.class));
+ return allOf(isCompletelyDisplayed(), isAssignableFrom(mViewClass));
}
@Override
diff --git a/core/tests/coretests/src/android/widget/espresso/MouseClickAction.java b/core/tests/coretests/src/android/widget/espresso/MouseClickAction.java
new file mode 100644
index 0000000..de640ca
--- /dev/null
+++ b/core/tests/coretests/src/android/widget/espresso/MouseClickAction.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 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.widget.espresso;
+
+import org.hamcrest.Matcher;
+
+import android.support.test.espresso.UiController;
+import android.support.test.espresso.ViewAction;
+import android.support.test.espresso.action.CoordinatesProvider;
+import android.support.test.espresso.action.GeneralClickAction;
+import android.support.test.espresso.action.PrecisionDescriber;
+import android.support.test.espresso.action.Tapper;
+import android.view.View;
+
+/**
+ * ViewAction for performing an click on View by a mouse.
+ */
+public final class MouseClickAction implements ViewAction {
+ private final GeneralClickAction mGeneralClickAction;
+
+ public MouseClickAction(Tapper tapper, CoordinatesProvider coordinatesProvider,
+ PrecisionDescriber precisionDescriber) {
+ mGeneralClickAction = new GeneralClickAction(tapper, coordinatesProvider,
+ precisionDescriber);
+ }
+
+ @Override
+ public Matcher<View> getConstraints() {
+ return mGeneralClickAction.getConstraints();
+ }
+
+ @Override
+ public String getDescription() {
+ return mGeneralClickAction.getDescription();
+ }
+
+ @Override
+ public void perform(UiController uiController, View view) {
+ mGeneralClickAction.perform(new MouseUiController(uiController), view);
+ }
+}
diff --git a/core/tests/coretests/src/android/widget/espresso/TextViewActions.java b/core/tests/coretests/src/android/widget/espresso/TextViewActions.java
index 4f5a72b..32cc6d6 100644
--- a/core/tests/coretests/src/android/widget/espresso/TextViewActions.java
+++ b/core/tests/coretests/src/android/widget/espresso/TextViewActions.java
@@ -17,7 +17,7 @@
package android.widget.espresso;
import static android.support.test.espresso.action.ViewActions.actionWithAssertions;
-
+import android.graphics.Rect;
import android.support.test.espresso.PerformException;
import android.support.test.espresso.ViewAction;
import android.support.test.espresso.action.CoordinatesProvider;
@@ -27,6 +27,7 @@
import android.support.test.espresso.util.HumanReadables;
import android.text.Layout;
import android.view.View;
+import android.widget.Editor;
import android.widget.TextView;
/**
@@ -52,6 +53,21 @@
}
/**
+ * Returns an action that clicks by mouse on text at an index on the TextView.<br>
+ * <br>
+ * View constraints:
+ * <ul>
+ * <li>must be a TextView displayed on screen
+ * <ul>
+ *
+ * @param index The index of the TextView's text to click on.
+ */
+ public static ViewAction mouseClickOnTextAtIndex(int index) {
+ return actionWithAssertions(
+ new MouseClickAction(Tap.SINGLE, new TextCoordinates(index), Press.PINPOINT));
+ }
+
+ /**
* Returns an action that double-clicks on text at an index on the TextView.<br>
* <br>
* View constraints:
@@ -67,6 +83,21 @@
}
/**
+ * Returns an action that double-clicks by mouse on text at an index on the TextView.<br>
+ * <br>
+ * View constraints:
+ * <ul>
+ * <li>must be a TextView displayed on screen
+ * <ul>
+ *
+ * @param index The index of the TextView's text to double-click on.
+ */
+ public static ViewAction mouseDoubleClickOnTextAtIndex(int index) {
+ return actionWithAssertions(
+ new MouseClickAction(Tap.DOUBLE, new TextCoordinates(index), Press.PINPOINT));
+ }
+
+ /**
* Returns an action that long presses on text at an index on the TextView.<br>
* <br>
* View constraints:
@@ -82,6 +113,21 @@
}
/**
+ * Returns an action that long click by mouse on text at an index on the TextView.<br>
+ * <br>
+ * View constraints:
+ * <ul>
+ * <li>must be a TextView displayed on screen
+ * <ul>
+ *
+ * @param index The index of the TextView's text to long click on.
+ */
+ public static ViewAction mouseLongClickOnTextAtIndex(int index) {
+ return actionWithAssertions(
+ new MouseClickAction(Tap.LONG, new TextCoordinates(index), Press.PINPOINT));
+ }
+
+ /**
* Returns an action that long presses then drags on text from startIndex to endIndex on the
* TextView.<br>
* <br>
@@ -95,11 +141,12 @@
*/
public static ViewAction longPressAndDragOnText(int startIndex, int endIndex) {
return actionWithAssertions(
- new DragOnTextViewActions(
- DragOnTextViewActions.Drag.LONG_PRESS,
+ new DragAction(
+ DragAction.Drag.LONG_PRESS,
new TextCoordinates(startIndex),
new TextCoordinates(endIndex),
- Press.FINGER));
+ Press.FINGER,
+ TextView.class));
}
/**
@@ -116,11 +163,12 @@
*/
public static ViewAction doubleTapAndDragOnText(int startIndex, int endIndex) {
return actionWithAssertions(
- new DragOnTextViewActions(
- DragOnTextViewActions.Drag.DOUBLE_TAP,
+ new DragAction(
+ DragAction.Drag.DOUBLE_TAP,
new TextCoordinates(startIndex),
new TextCoordinates(endIndex),
- Press.FINGER));
+ Press.FINGER,
+ TextView.class));
}
/**
@@ -137,11 +185,162 @@
*/
public static ViewAction mouseDragOnText(int startIndex, int endIndex) {
return actionWithAssertions(
- new DragOnTextViewActions(
- DragOnTextViewActions.Drag.MOUSE_DOWN,
+ new DragAction(
+ DragAction.Drag.MOUSE_DOWN,
new TextCoordinates(startIndex),
new TextCoordinates(endIndex),
- Press.PINPOINT));
+ Press.PINPOINT,
+ TextView.class));
+ }
+
+ /**
+ * Returns an action that double click then drags by mouse on text from startIndex to endIndex
+ * on the TextView.<br>
+ * <br>
+ * View constraints:
+ * <ul>
+ * <li>must be a TextView displayed on screen
+ * <ul>
+ *
+ * @param startIndex The index of the TextView's text to start a drag from
+ * @param endIndex The index of the TextView's text to end the drag at
+ */
+ public static ViewAction mouseDoubleClickAndDragOnText(int startIndex, int endIndex) {
+ return actionWithAssertions(
+ new DragAction(
+ DragAction.Drag.MOUSE_DOUBLE_CLICK,
+ new TextCoordinates(startIndex),
+ new TextCoordinates(endIndex),
+ Press.PINPOINT,
+ TextView.class));
+ }
+
+ /**
+ * Returns an action that long click then drags by mouse on text from startIndex to endIndex
+ * on the TextView.<br>
+ * <br>
+ * View constraints:
+ * <ul>
+ * <li>must be a TextView displayed on screen
+ * <ul>
+ *
+ * @param startIndex The index of the TextView's text to start a drag from
+ * @param endIndex The index of the TextView's text to end the drag at
+ */
+ public static ViewAction mouseLongClickAndDragOnText(int startIndex, int endIndex) {
+ return actionWithAssertions(
+ new DragAction(
+ DragAction.Drag.MOUSE_LONG_CLICK,
+ new TextCoordinates(startIndex),
+ new TextCoordinates(endIndex),
+ Press.PINPOINT,
+ TextView.class));
+ }
+
+ public enum Handle {
+ SELECTION_START,
+ SELECTION_END,
+ INSERTION
+ };
+
+ /**
+ * Returns an action that tap then drags on the handle from the current position to endIndex on
+ * the TextView.<br>
+ * <br>
+ * View constraints:
+ * <ul>
+ * <li>must be a TextView's drag-handle displayed on screen
+ * <ul>
+ *
+ * @param textView TextView the handle is on
+ * @param handleType Type of the handle
+ * @param endIndex The index of the TextView's text to end the drag at
+ */
+ public static ViewAction dragHandle(TextView textView, Handle handleType, int endIndex) {
+ final int currentOffset = handleType == Handle.SELECTION_START ?
+ textView.getSelectionStart() : textView.getSelectionEnd();
+ return actionWithAssertions(
+ new DragAction(
+ DragAction.Drag.TAP,
+ new HandleCoordinates(textView, handleType, currentOffset),
+ new HandleCoordinates(textView, handleType, endIndex),
+ Press.FINGER,
+ Editor.HandleView.class));
+ }
+
+ /**
+ * A provider of the x, y coordinates of the handle that points the specified text index in a
+ * text view.
+ */
+ private static final class HandleCoordinates implements CoordinatesProvider {
+ // Must be larger than Editor#LINE_SLOP_MULTIPLIER_FOR_HANDLEVIEWS.
+ private final static float LINE_SLOP_MULTIPLIER = 0.6f;
+ private final TextView mTextView;
+ private final Handle mHandleType;
+ private final int mIndex;
+ private final String mActionDescription;
+
+ public HandleCoordinates(TextView textView, Handle handleType, int index) {
+ mTextView = textView;
+ mHandleType = handleType;
+ mIndex = index;
+ mActionDescription = "Could not locate " + handleType.toString()
+ + " handle that points text index: " + index;
+ }
+
+ @Override
+ public float[] calculateCoordinates(View view) {
+ try {
+ return locateHandlePointsTextIndex(view);
+ } catch (StringIndexOutOfBoundsException e) {
+ throw new PerformException.Builder()
+ .withActionDescription(mActionDescription)
+ .withViewDescription(HumanReadables.describe(view))
+ .withCause(e)
+ .build();
+ }
+ }
+
+ private float[] locateHandlePointsTextIndex(View view) {
+ final int currentOffset = mHandleType == Handle.SELECTION_START ?
+ mTextView.getSelectionStart() : mTextView.getSelectionEnd();
+
+ final Layout layout = mTextView.getLayout();
+ final int currentLine = layout.getLineForOffset(currentOffset);
+ final int targetLine = layout.getLineForOffset(mIndex);
+
+ final float[] currentCoordinates =
+ (new TextCoordinates(currentOffset)).calculateCoordinates(mTextView);
+ final float[] targetCoordinates =
+ (new TextCoordinates(mIndex)).calculateCoordinates(mTextView);
+ final Rect bounds = new Rect();
+ view.getBoundsOnScreen(bounds);
+ final Rect visibleDisplayBounds = new Rect();
+ mTextView.getWindowVisibleDisplayFrame(visibleDisplayBounds);
+ visibleDisplayBounds.right -= 1;
+ visibleDisplayBounds.bottom -= 1;
+ if (!visibleDisplayBounds.intersect(bounds)) {
+ throw new PerformException.Builder()
+ .withActionDescription(mActionDescription
+ + " The handle is entirely out of the visible display frame of"
+ + "the TextView's window.")
+ .withViewDescription(HumanReadables.describe(view))
+ .build();
+ }
+ final float dragPointX = Math.max(Math.min(bounds.centerX(),
+ visibleDisplayBounds.right), visibleDisplayBounds.left);
+ final float diffX = dragPointX - currentCoordinates[0];
+ final float verticalOffset = bounds.height() * 0.7f;
+ final float dragPointY = Math.max(Math.min(bounds.top + verticalOffset,
+ visibleDisplayBounds.bottom), visibleDisplayBounds.top);
+ float diffY = dragPointY - currentCoordinates[1];
+ if (currentLine > targetLine) {
+ diffY -= mTextView.getLineHeight() * LINE_SLOP_MULTIPLIER;
+ } else if (currentLine < targetLine) {
+ diffY += mTextView.getLineHeight() * LINE_SLOP_MULTIPLIER;
+ }
+ return new float[] {targetCoordinates[0] + diffX, targetCoordinates[1] + diffY};
+ }
}
/**
diff --git a/core/tests/coretests/src/com/android/internal/util/HexDumpTest.java b/core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
new file mode 100644
index 0000000..951e87a
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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 com.android.internal.util;
+
+import junit.framework.TestCase;
+
+public final class HexDumpTest extends TestCase {
+ public void testBytesToHexString() {
+ assertEquals("abcdef", HexDump.toHexString(
+ new byte[] { (byte) 0xab, (byte) 0xcd, (byte) 0xef }, false));
+ assertEquals("ABCDEF", HexDump.toHexString(
+ new byte[] { (byte) 0xab, (byte) 0xcd, (byte) 0xef }, true));
+ }
+}
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
index 78e718f..edeecb2 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
@@ -47,9 +47,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/multidexlegacyandexception/Test.class" >> $@
$(built_dex_intermediate): $(mainDexList)
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
index 7c699b6..7e4f0a9 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
@@ -47,9 +47,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/multidexlegacytestapp/Test.class" >> $@
$(built_dex_intermediate): $(mainDexList)
@@ -88,9 +88,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList2): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/multidexlegacytestapp/Test.class" >> $@
$(built_dex_intermediate): $(mainDexList2)
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
index b85c02c..99bcd6c 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
@@ -37,9 +37,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
$(built_dex_intermediate): $(mainDexList)
endif
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
index 0f1d9c0..1c7d807 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
@@ -46,9 +46,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
$(built_dex_intermediate): $(mainDexList)
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
index 67ca483..b77cf31 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
@@ -46,9 +46,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
$(built_dex_intermediate): $(mainDexList)
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
index bf2efb1..3631626 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
@@ -46,9 +46,9 @@
include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
-$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
+$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@)
- $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
+ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
$(built_dex_intermediate): $(mainDexList)
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 27c6620..51019cc 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -126,6 +126,7 @@
<assign-permission name="android.permission.WAKE_LOCK" uid="media" />
<assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="media" />
<assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="media" />
+ <assign-permission name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE" uid="media" />
<assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />
@@ -143,7 +144,9 @@
access while in power save mode, even if they aren't in the foreground. -->
<allow-in-power-save-except-idle package="com.android.providers.downloads" />
+ <!-- These are the packages that are white-listed to be able to run as system user -->
+ <system-user-whitelisted-app package="com.android.settings" />
+
<!-- These are the packages that shouldn't run as system user -->
<system-user-blacklisted-app package="com.android.wallpaper.livepicker" />
- <system-user-blacklisted-app package="com.android.settings" />
</permissions>
diff --git a/data/keyboards/qwerty.kl b/data/keyboards/qwerty.kl
index 58bf654..4186007 100644
--- a/data/keyboards/qwerty.kl
+++ b/data/keyboards/qwerty.kl
@@ -81,7 +81,7 @@
key 39 SEMICOLON
key 40 APOSTROPHE
key 14 DEL
-
+
key 44 Z
key 45 X
key 46 C
@@ -93,7 +93,7 @@
key 52 PERIOD
key 53 SLASH
key 28 ENTER
-
+
key 56 ALT_LEFT
key 100 ALT_RIGHT
key 42 SHIFT_LEFT
@@ -101,7 +101,7 @@
key 15 TAB
key 57 SPACE
key 150 EXPLORER
-key 155 ENVELOPE
+key 155 ENVELOPE
key 12 MINUS
key 13 EQUALS
@@ -110,3 +110,16 @@
# On an AT keyboard: ESC, F10
key 1 BACK
key 68 MENU
+
+# App switch = Overview key
+key 580 APP_SWITCH
+
+# Media control keys
+key 160 MEDIA_CLOSE
+key 161 MEDIA_EJECT
+key 163 MEDIA_NEXT
+key 164 MEDIA_PLAY_PAUSE
+key 165 MEDIA_PREVIOUS
+key 166 MEDIA_STOP
+key 167 MEDIA_RECORD
+key 168 MEDIA_REWIND
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk
index f6d8ee9..edfd380 100644
--- a/data/sounds/AllAudio.mk
+++ b/data/sounds/AllAudio.mk
@@ -228,6 +228,7 @@
$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
$(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/ogg/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
$(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk
index 5a5eea6..c5222af 100644
--- a/data/sounds/AudioPackage10.mk
+++ b/data/sounds/AudioPackage10.mk
@@ -1,9 +1,9 @@
#
# Audio Package 10 - Mako
-#
+#
# Include this file in a product makefile to include these audio files
#
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -23,6 +23,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/material/ogg/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/material/ogg/LowBattery_48k.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/AudioPackage11.mk b/data/sounds/AudioPackage11.mk
index 0f85b33..43c83b9 100644
--- a/data/sounds/AudioPackage11.mk
+++ b/data/sounds/AudioPackage11.mk
@@ -1,9 +1,9 @@
#
# Audio Package 11 - Razor
-#
+#
# Include this file in a product makefile to include these audio files
#
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -23,6 +23,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/material/ogg/VideoStop_48k.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/material/ogg/LowBattery_48k.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/AudioPackage12.mk b/data/sounds/AudioPackage12.mk
index 4251332..cd4d35b 100644
--- a/data/sounds/AudioPackage12.mk
+++ b/data/sounds/AudioPackage12.mk
@@ -13,7 +13,7 @@
RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel
EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
camera_focus Dock Undock Lock Unlock Trusted
-MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted
+MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted VideoStop
PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
$(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)
diff --git a/data/sounds/AudioPackage12_48.mk b/data/sounds/AudioPackage12_48.mk
index 70e68d3..80758f4 100644
--- a/data/sounds/AudioPackage12_48.mk
+++ b/data/sounds/AudioPackage12_48.mk
@@ -13,7 +13,7 @@
RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel
EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
Lock Unlock Trusted
-MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted
+MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted VideoStop
# Alarms not yet available in 48 kHz
PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
diff --git a/data/sounds/AudioPackage13.mk b/data/sounds/AudioPackage13.mk
index cec7280..d33a4af 100644
--- a/data/sounds/AudioPackage13.mk
+++ b/data/sounds/AudioPackage13.mk
@@ -14,7 +14,7 @@
Umbriel
EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
camera_focus Dock Undock Lock Unlock Trusted
-MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery
+MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop
PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
$(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)
diff --git a/data/sounds/AudioPackage13_48.mk b/data/sounds/AudioPackage13_48.mk
index d1b17c8..9c320ae 100644
--- a/data/sounds/AudioPackage13_48.mk
+++ b/data/sounds/AudioPackage13_48.mk
@@ -14,7 +14,7 @@
Umbriel
EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
Lock Unlock Trusted
-MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery
+MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop
PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
$(LOCAL_PATH)/alarms/material/ogg/$(fn)_48k.ogg:system/media/audio/alarms/$(fn).ogg)
diff --git a/data/sounds/AudioPackage2.mk b/data/sounds/AudioPackage2.mk
index ba9d7e2..40319c4 100644
--- a/data/sounds/AudioPackage2.mk
+++ b/data/sounds/AudioPackage2.mk
@@ -1,11 +1,11 @@
#
# Audio Package 2
-#
+#
# Include this file in a product makefile to include these audio files
#
# This is a larger package of sounds than the 1.0 release for devices
# that have larger internal flash.
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -34,6 +34,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \
diff --git a/data/sounds/AudioPackage3.mk b/data/sounds/AudioPackage3.mk
index 5bfeb42..a05de72 100644
--- a/data/sounds/AudioPackage3.mk
+++ b/data/sounds/AudioPackage3.mk
@@ -1,11 +1,11 @@
#
# Audio Package 3
-#
+#
# Include this file in a product makefile to include these audio files
#
# This is a larger package of sounds than the 1.0 release for devices
# that have larger internal flash.
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -34,6 +34,7 @@
$(LOCAL_PATH)/effects/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \
diff --git a/data/sounds/AudioPackage4.mk b/data/sounds/AudioPackage4.mk
index 43dbe20..d376a2d 100644
--- a/data/sounds/AudioPackage4.mk
+++ b/data/sounds/AudioPackage4.mk
@@ -1,11 +1,11 @@
#
# Audio Package 4
-#
+#
# Include this file in a product makefile to include these audio files
#
# This is a larger package of sounds than the 1.0 release for devices
# that have larger internal flash.
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -39,6 +39,7 @@
$(LOCAL_PATH)/effects/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/Dock.ogg:system/media/audio/ui/Dock.ogg \
diff --git a/data/sounds/AudioPackage5.mk b/data/sounds/AudioPackage5.mk
index fbbb16a..72384c8 100644
--- a/data/sounds/AudioPackage5.mk
+++ b/data/sounds/AudioPackage5.mk
@@ -1,9 +1,9 @@
#
# Audio Package 5 - Crespo/Soju
-#
+#
# Include this file in a product makefile to include these audio files
#
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -20,6 +20,7 @@
$(LOCAL_PATH)/effects/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/AudioPackage6.mk b/data/sounds/AudioPackage6.mk
index c843fdc..5413704 100644
--- a/data/sounds/AudioPackage6.mk
+++ b/data/sounds/AudioPackage6.mk
@@ -1,9 +1,9 @@
#
# Audio Package 6 - Trygon/Stingray
-#
+#
# Include this file in a product makefile to include these audio files
#
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -19,6 +19,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/AudioPackage7.mk b/data/sounds/AudioPackage7.mk
index ce82651..e4763be 100644
--- a/data/sounds/AudioPackage7.mk
+++ b/data/sounds/AudioPackage7.mk
@@ -1,9 +1,9 @@
#
# Audio Package 7 - Tuna
-#
+#
# Include this file in a product makefile to include these audio files
#
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -21,6 +21,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid_120.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/AudioPackage7alt.mk b/data/sounds/AudioPackage7alt.mk
index db468f3..30e6173 100644
--- a/data/sounds/AudioPackage7alt.mk
+++ b/data/sounds/AudioPackage7alt.mk
@@ -21,6 +21,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid_120.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn_120.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
$(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \
diff --git a/data/sounds/AudioPackage8.mk b/data/sounds/AudioPackage8.mk
index 4112c18..b38e62d 100644
--- a/data/sounds/AudioPackage8.mk
+++ b/data/sounds/AudioPackage8.mk
@@ -1,9 +1,9 @@
#
# Audio Package 7 - Tuna
-#
+#
# Include this file in a product makefile to include these audio files
#
-#
+#
LOCAL_PATH:= frameworks/base/data/sounds
@@ -23,6 +23,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/AudioPackage9.mk b/data/sounds/AudioPackage9.mk
index 1b430c0..dbe1350 100644
--- a/data/sounds/AudioPackage9.mk
+++ b/data/sounds/AudioPackage9.mk
@@ -23,6 +23,7 @@
$(LOCAL_PATH)/effects/ogg/KeypressInvalid.ogg:system/media/audio/ui/KeypressInvalid.ogg \
$(LOCAL_PATH)/effects/ogg/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/material/ogg/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/material/ogg/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/material/ogg/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/effects/material/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
diff --git a/data/sounds/OriginalAudio.mk b/data/sounds/OriginalAudio.mk
index e1ca24b..f683752 100644
--- a/data/sounds/OriginalAudio.mk
+++ b/data/sounds/OriginalAudio.mk
@@ -1,8 +1,8 @@
#
# Original audio package that shipped on G1
-#
+#
# This file is included from core.mk so that all devices will have these sounds
-#
+#
# TODO: Clean up for future releases
#
@@ -32,6 +32,7 @@
$(LOCAL_PATH)/effects/KeypressDelete.ogg:system/media/audio/ui/KeypressDelete.ogg \
$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \
$(LOCAL_PATH)/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
+ $(LOCAL_PATH)/effects/VideoStop.ogg:system/media/audio/ui/VideoStop.ogg \
$(LOCAL_PATH)/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \
$(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg
diff --git a/data/sounds/effects/VideoStop.ogg b/data/sounds/effects/VideoStop.ogg
new file mode 100644
index 0000000..1450522
--- /dev/null
+++ b/data/sounds/effects/VideoStop.ogg
Binary files differ
diff --git a/data/sounds/effects/VideoStop.wav b/data/sounds/effects/VideoStop.wav
new file mode 100644
index 0000000..5809d93
--- /dev/null
+++ b/data/sounds/effects/VideoStop.wav
Binary files differ
diff --git a/data/sounds/effects/material/ogg/VideoStop.ogg b/data/sounds/effects/material/ogg/VideoStop.ogg
new file mode 100644
index 0000000..e98fabc
--- /dev/null
+++ b/data/sounds/effects/material/ogg/VideoStop.ogg
Binary files differ
diff --git a/data/sounds/effects/material/ogg/VideoStop_48k.ogg b/data/sounds/effects/material/ogg/VideoStop_48k.ogg
new file mode 100644
index 0000000..b1eb780
--- /dev/null
+++ b/data/sounds/effects/material/ogg/VideoStop_48k.ogg
Binary files differ
diff --git a/docs/html/guide/components/services.jd b/docs/html/guide/components/services.jd
index 6e22be8..b8c105d 100644
--- a/docs/html/guide/components/services.jd
+++ b/docs/html/guide/components/services.jd
@@ -512,7 +512,7 @@
onStartCommand()} directly.)</p>
<p>For example, an activity can start the example service in the previous section ({@code
-HelloSevice}) using an explicit intent with {@link android.content.Context#startService
+HelloService}) using an explicit intent with {@link android.content.Context#startService
startService()}:</p>
<pre>
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index e22dc4a..21e3057 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -563,8 +563,8 @@
<td rowspan="6">Camera</td>
<td><code>android.hardware.camera</code></td>
<td>The application uses the device's back-facing (main) camera.</td>
- <td>Importantly, devices with only a front-facing camera will not list this
- feature, so the <code>android.hardware.camera.any</code> feature should be
+ <td>Devices with only a front-facing camera do not list this feature, so the
+ <code>android.hardware.camera.any</code> feature should be
used instead if a camera facing any direction is acceptable for the
application.</td>
</tr>
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 95ae72e..5acc1a3 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -484,7 +484,7 @@
*
* @param bounds The maximum size the offscreen bitmap needs to be
* (in local coordinates)
- * @param alpha The alpha to apply to the offscreen when when it is
+ * @param alpha The alpha to apply to the offscreen when it is
drawn during restore()
* @param saveFlags see _SAVE_FLAG constants, generally {@link #ALL_SAVE_FLAG} is recommended
* for performance reasons.
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 64f2698..0ee877e 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -1240,30 +1240,54 @@
*/
public static abstract class ConstantState {
/**
- * Create a new drawable without supplying resources the caller
- * is running in. Note that using this means the density-dependent
- * drawables (like bitmaps) will not be able to update their target
- * density correctly. One should use {@link #newDrawable(Resources)}
- * instead to provide a resource.
+ * Creates a new Drawable instance from its constant state.
+ * <p>
+ * <strong>Note:</strong> Using this method means density-dependent
+ * properties, such as pixel dimensions or bitmap images, will not be
+ * updated to match the density of the target display. To ensure
+ * correct scaling, use {@link #newDrawable(Resources)} instead to
+ * provide an appropriate Resources object.
+ *
+ * @return a new drawable object based on this constant state
+ * @see {@link #newDrawable(Resources)}
*/
+ @NonNull
public abstract Drawable newDrawable();
/**
- * Create a new Drawable instance from its constant state. This
- * must be implemented for drawables that change based on the target
- * density of their caller (that is depending on whether it is
- * in compatibility mode).
+ * Creates a new Drawable instance from its constant state using the
+ * specified resources. This method should be implemented for drawables
+ * that have density-dependent properties.
+ * <p>
+ * The default implementation for this method calls through to
+ * {@link #newDrawable()}.
+ *
+ * @param res the resources of the context in which the drawable will
+ * be displayed
+ * @return a new drawable object based on this constant state
*/
- public Drawable newDrawable(Resources res) {
+ @NonNull
+ public Drawable newDrawable(@Nullable Resources res) {
return newDrawable();
}
/**
- * Create a new Drawable instance from its constant state. This must be
- * implemented for drawables that can have a theme applied.
+ * Creates a new Drawable instance from its constant state using the
+ * specified resources and theme. This method should be implemented for
+ * drawables that have theme-dependent properties.
+ * <p>
+ * The default implementation for this method calls through to
+ * {@link #newDrawable(Resources)}.
+ *
+ * @param res the resources of the context in which the drawable will
+ * be displayed
+ * @param theme the theme of the context in which the drawable will be
+ * displayed
+ * @return a new drawable object based on this constant state
*/
- public Drawable newDrawable(Resources res, Theme theme) {
- return newDrawable(null);
+ @NonNull
+ public Drawable newDrawable(@Nullable Resources res, @Nullable Theme theme) {
+ return newDrawable(res);
}
/**
@@ -1400,7 +1424,7 @@
}
}
- static int resolveDensity(@NonNull Resources r, int parentDensity) {
+ static int resolveDensity(@Nullable Resources r, int parentDensity) {
final int densityDpi = r == null ? parentDensity : r.getDisplayMetrics().densityDpi;
return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
}
diff --git a/graphics/java/android/graphics/drawable/RippleBackground.java b/graphics/java/android/graphics/drawable/RippleBackground.java
index f9474ef..d313aa5 100644
--- a/graphics/java/android/graphics/drawable/RippleBackground.java
+++ b/graphics/java/android/graphics/drawable/RippleBackground.java
@@ -139,6 +139,7 @@
exit.setInterpolator(LINEAR_INTERPOLATOR);
exit.setDuration(OPACITY_EXIT_DURATION);
exit.setStartDelay(fastEnterDuration);
+ exit.setStartValue(targetAlpha);
set.add(exit);
// Linear "fast" enter based on current opacity.
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index eee9b24..f630055e 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -231,6 +231,9 @@
private int mDpiScaledHeight = 0;
private Insets mDpiScaledInsets = Insets.NONE;
+ /** Whether DPI-scaled width, height, and insets need to be updated. */
+ private boolean mDpiScaledDirty = true;
+
// Temp variable, only for saving "new" operation at the draw() time.
private final float[] mTmpFloats = new float[9];
private final Matrix mTmpMatrix = new Matrix();
@@ -259,9 +262,13 @@
* displayed, or {@code null} to use the constant state defaults
*/
private void updateLocalState(Resources res) {
- mTargetDensity = Drawable.resolveDensity(res, mVectorState.mVPathRenderer.mSourceDensity);
+ final int density = Drawable.resolveDensity(res, mVectorState.mVPathRenderer.mDensity);
+ if (mTargetDensity != density) {
+ mTargetDensity = density;
+ mDpiScaledDirty = true;
+ }
+
mTintFilter = updateTintFilter(mTintFilter, mVectorState.mTint, mVectorState.mTintMode);
- computeVectorSize();
}
@Override
@@ -422,17 +429,26 @@
@Override
public int getIntrinsicWidth() {
+ if (mDpiScaledDirty) {
+ computeVectorSize();
+ }
return mDpiScaledWidth;
}
@Override
public int getIntrinsicHeight() {
+ if (mDpiScaledDirty) {
+ computeVectorSize();
+ }
return mDpiScaledHeight;
}
/** @hide */
@Override
public Insets getOpticalInsets() {
+ if (mDpiScaledDirty) {
+ computeVectorSize();
+ }
return mDpiScaledInsets;
}
@@ -444,7 +460,7 @@
final VPathRenderer pathRenderer = mVectorState.mVPathRenderer;
final Insets opticalInsets = pathRenderer.mOpticalInsets;
- final int sourceDensity = pathRenderer.mSourceDensity;
+ final int sourceDensity = pathRenderer.mDensity;
final int targetDensity = mTargetDensity;
if (targetDensity != sourceDensity) {
mDpiScaledWidth = Drawable.scaleFromDensity(
@@ -465,6 +481,8 @@
mDpiScaledHeight = (int) pathRenderer.mBaseHeight;
mDpiScaledInsets = opticalInsets;
}
+
+ mDpiScaledDirty = false;
}
@Override
@@ -481,6 +499,11 @@
return;
}
+ final VPathRenderer path = state.mVPathRenderer;
+ final boolean changedDensity = path.setDensity(
+ Drawable.resolveDensity(t.getResources(), 0));
+ mDpiScaledDirty |= changedDensity;
+
if (state.mThemeAttrs != null) {
final TypedArray a = t.resolveAttributes(
state.mThemeAttrs, R.styleable.VectorDrawable);
@@ -492,6 +515,9 @@
} finally {
a.recycle();
}
+
+ // May have changed size.
+ mDpiScaledDirty = true;
}
// Apply theme to contained color state list.
@@ -499,7 +525,6 @@
state.mTint = state.mTint.obtainForTheme(t);
}
- final VPathRenderer path = state.mVPathRenderer;
if (path != null && path.canApplyTheme()) {
path.applyTheme(t);
}
@@ -565,21 +590,24 @@
}
@Override
- public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)
+ public void inflate(@NonNull Resources r, @NonNull XmlPullParser parser,
+ @NonNull AttributeSet attrs, @Nullable Theme theme)
throws XmlPullParserException, IOException {
final VectorDrawableState state = mVectorState;
- final VPathRenderer pathRenderer = new VPathRenderer();
- state.mVPathRenderer = pathRenderer;
+ state.mVPathRenderer = new VPathRenderer();
+ state.mVPathRenderer.setDensity(Drawable.resolveDensity(r, 0));
- final TypedArray a = obtainAttributes(res, theme, attrs, R.styleable.VectorDrawable);
+ final TypedArray a = obtainAttributes(r, theme, attrs, R.styleable.VectorDrawable);
updateStateFromTypedArray(a);
a.recycle();
+ mDpiScaledDirty = true;
+
state.mCacheDirty = true;
- inflateInternal(res, parser, attrs, theme);
+ inflateChildElements(r, parser, attrs, theme);
// Update local properties.
- updateLocalState(res);
+ updateLocalState(r);
}
private void updateStateFromTypedArray(TypedArray a) throws XmlPullParserException {
@@ -592,13 +620,6 @@
// Extract the theme attributes, if any.
state.mThemeAttrs = a.extractThemeAttrs();
- // The density may have changed since the last update (if any). Any
- // dimension-type attributes will need their default values scaled.
- final int targetDensity = Drawable.resolveDensity(a.getResources(), 0);
- final int sourceDensity = pathRenderer.mSourceDensity;
- final float densityScale = targetDensity / (float) sourceDensity;
- pathRenderer.mSourceDensity = targetDensity;
-
final int tintMode = a.getInt(R.styleable.VectorDrawable_tintMode, -1);
if (tintMode != -1) {
state.mTintMode = Drawable.parseTintMode(tintMode, Mode.SRC_IN);
@@ -626,11 +647,9 @@
}
pathRenderer.mBaseWidth = a.getDimension(
- R.styleable.VectorDrawable_width,
- pathRenderer.mBaseWidth * densityScale);
+ R.styleable.VectorDrawable_width, pathRenderer.mBaseWidth);
pathRenderer.mBaseHeight = a.getDimension(
- R.styleable.VectorDrawable_height,
- pathRenderer.mBaseHeight * densityScale);
+ R.styleable.VectorDrawable_height, pathRenderer.mBaseHeight);
if (pathRenderer.mBaseWidth <= 0) {
throw new XmlPullParserException(a.getPositionDescription() +
@@ -641,21 +660,17 @@
}
final int insetLeft = a.getDimensionPixelOffset(
- R.styleable.VectorDrawable_opticalInsetLeft,
- (int) (pathRenderer.mOpticalInsets.left * densityScale));
+ R.styleable.VectorDrawable_opticalInsetLeft, pathRenderer.mOpticalInsets.left);
final int insetTop = a.getDimensionPixelOffset(
- R.styleable.VectorDrawable_opticalInsetTop,
- (int) (pathRenderer.mOpticalInsets.top * densityScale));
+ R.styleable.VectorDrawable_opticalInsetTop, pathRenderer.mOpticalInsets.top);
final int insetRight = a.getDimensionPixelOffset(
- R.styleable.VectorDrawable_opticalInsetRight,
- (int) (pathRenderer.mOpticalInsets.right * densityScale));
+ R.styleable.VectorDrawable_opticalInsetRight, pathRenderer.mOpticalInsets.right);
final int insetBottom = a.getDimensionPixelOffset(
- R.styleable.VectorDrawable_opticalInsetBottom,
- (int) (pathRenderer.mOpticalInsets.bottom * densityScale));
+ R.styleable.VectorDrawable_opticalInsetBottom, pathRenderer.mOpticalInsets.bottom);
pathRenderer.mOpticalInsets = Insets.of(insetLeft, insetTop, insetRight, insetBottom);
- final float alphaInFloat = a.getFloat(R.styleable.VectorDrawable_alpha,
- pathRenderer.getAlpha());
+ final float alphaInFloat = a.getFloat(
+ R.styleable.VectorDrawable_alpha, pathRenderer.getAlpha());
pathRenderer.setAlpha(alphaInFloat);
final String name = a.getString(R.styleable.VectorDrawable_name);
@@ -665,7 +680,7 @@
}
}
- private void inflateInternal(Resources res, XmlPullParser parser, AttributeSet attrs,
+ private void inflateChildElements(Resources res, XmlPullParser parser, AttributeSet attrs,
Theme theme) throws XmlPullParserException, IOException {
final VectorDrawableState state = mVectorState;
final VPathRenderer pathRenderer = state.mVPathRenderer;
@@ -929,7 +944,7 @@
int mRootAlpha = 0xFF;
String mRootName = null;
- int mSourceDensity = DisplayMetrics.DENSITY_DEFAULT;
+ int mDensity = DisplayMetrics.DENSITY_DEFAULT;
final ArrayMap<String, Object> mVGTargetsMap = new ArrayMap<>();
@@ -966,12 +981,37 @@
mChangingConfigurations = copy.mChangingConfigurations;
mRootAlpha = copy.mRootAlpha;
mRootName = copy.mRootName;
- mSourceDensity = copy.mSourceDensity;
+ mDensity = copy.mDensity;
if (copy.mRootName != null) {
mVGTargetsMap.put(copy.mRootName, this);
}
}
+ public final boolean setDensity(int targetDensity) {
+ if (mDensity != targetDensity) {
+ final int sourceDensity = mDensity;
+ mDensity = targetDensity;
+ applyDensityScaling(sourceDensity, targetDensity);
+ return true;
+ }
+ return false;
+ }
+
+ private void applyDensityScaling(int sourceDensity, int targetDensity) {
+ mBaseWidth = Drawable.scaleFromDensity(mBaseWidth, sourceDensity, targetDensity);
+ mBaseHeight = Drawable.scaleFromDensity(mBaseHeight, sourceDensity, targetDensity);
+
+ final int insetLeft = Drawable.scaleFromDensity(
+ mOpticalInsets.left, sourceDensity, targetDensity, false);
+ final int insetTop = Drawable.scaleFromDensity(
+ mOpticalInsets.top, sourceDensity, targetDensity, false);
+ final int insetRight = Drawable.scaleFromDensity(
+ mOpticalInsets.right, sourceDensity, targetDensity, false);
+ final int insetBottom = Drawable.scaleFromDensity(
+ mOpticalInsets.bottom, sourceDensity, targetDensity, false);
+ mOpticalInsets = Insets.of(insetLeft, insetTop, insetRight, insetBottom);
+ }
+
public boolean canApplyTheme() {
return mRootGroup.canApplyTheme();
}
@@ -1321,7 +1361,7 @@
* Common Path information for clip path and normal path.
*/
private static abstract class VPath implements VObject {
- protected PathParser.PathDataNode[] mNodes = null;
+ protected PathParser.PathData mPathData = null;
String mPathName;
int mChangingConfigurations;
@@ -1332,7 +1372,7 @@
public VPath(VPath copy) {
mPathName = copy.mPathName;
mChangingConfigurations = copy.mChangingConfigurations;
- mNodes = PathParser.deepCopyNodes(copy.mNodes);
+ mPathData = copy.mPathData == null ? null : new PathParser.PathData(copy.mPathData);
}
public String getPathName() {
@@ -1345,18 +1385,14 @@
/* Setters and Getters, used by animator from AnimatedVectorDrawable. */
@SuppressWarnings("unused")
- public PathParser.PathDataNode[] getPathData() {
- return mNodes;
+ public PathParser.PathData getPathData() {
+ return mPathData;
}
+ // TODO: Move the PathEvaluator and this setter and the getter above into native.
@SuppressWarnings("unused")
- public void setPathData(PathParser.PathDataNode[] nodes) {
- if (!PathParser.canMorph(mNodes, nodes)) {
- // This should not happen in the middle of animation.
- mNodes = PathParser.deepCopyNodes(nodes);
- } else {
- PathParser.updateNodes(mNodes, nodes);
- }
+ public void setPathData(PathParser.PathData pathData) {
+ mPathData.setPathData(pathData);
}
@Override
@@ -1392,8 +1428,8 @@
* @param outPath the output path
*/
protected void toPath(TempState temp, Path outPath) {
- if (mNodes != null) {
- PathParser.PathDataNode.nodesToPath(mNodes, outPath);
+ if (mPathData != null) {
+ PathParser.createPathFromPathData(outPath, mPathData);
}
}
@@ -1488,9 +1524,9 @@
mPathName = pathName;
}
- final String pathData = a.getString(R.styleable.VectorDrawableClipPath_pathData);
- if (pathData != null) {
- mNodes = PathParser.createNodesFromPathData(pathData);
+ final String pathDataString = a.getString(R.styleable.VectorDrawableClipPath_pathData);
+ if (pathDataString != null) {
+ mPathData = new PathParser.PathData(pathDataString);
}
}
@@ -1719,9 +1755,9 @@
mPathName = pathName;
}
- final String pathData = a.getString(R.styleable.VectorDrawablePath_pathData);
- if (pathData != null) {
- mNodes = PathParser.createNodesFromPathData(pathData);
+ final String pathString = a.getString(R.styleable.VectorDrawablePath_pathData);
+ if (pathString != null) {
+ mPathData = new PathParser.PathData(pathString);
}
final ColorStateList fillColors = a.getColorStateList(
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
index 042dc83..fdebf37 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
@@ -28,6 +28,7 @@
import libcore.util.EmptyArray;
+import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.security.AlgorithmParameters;
import java.security.GeneralSecurityException;
@@ -386,7 +387,38 @@
@Override
protected final int engineUpdate(ByteBuffer input, ByteBuffer output)
throws ShortBufferException {
- return super.engineUpdate(input, output);
+ if (input == null) {
+ throw new NullPointerException("input == null");
+ }
+ if (output == null) {
+ throw new NullPointerException("output == null");
+ }
+
+ int inputSize = input.remaining();
+ byte[] outputArray;
+ if (input.hasArray()) {
+ outputArray =
+ engineUpdate(
+ input.array(), input.arrayOffset() + input.position(), inputSize);
+ input.position(input.position() + inputSize);
+ } else {
+ byte[] inputArray = new byte[inputSize];
+ input.get(inputArray);
+ outputArray = engineUpdate(inputArray, 0, inputSize);
+ }
+
+ int outputSize = (outputArray != null) ? outputArray.length : 0;
+ if (outputSize > 0) {
+ int outputBufferAvailable = output.remaining();
+ try {
+ output.put(outputArray);
+ } catch (BufferOverflowException e) {
+ throw new ShortBufferException(
+ "Output buffer too small. Produced: " + outputSize + ", available: "
+ + outputBufferAvailable);
+ }
+ }
+ return outputSize;
}
@Override
@@ -512,7 +544,38 @@
@Override
protected final int engineDoFinal(ByteBuffer input, ByteBuffer output)
throws ShortBufferException, IllegalBlockSizeException, BadPaddingException {
- return super.engineDoFinal(input, output);
+ if (input == null) {
+ throw new NullPointerException("input == null");
+ }
+ if (output == null) {
+ throw new NullPointerException("output == null");
+ }
+
+ int inputSize = input.remaining();
+ byte[] outputArray;
+ if (input.hasArray()) {
+ outputArray =
+ engineDoFinal(
+ input.array(), input.arrayOffset() + input.position(), inputSize);
+ input.position(input.position() + inputSize);
+ } else {
+ byte[] inputArray = new byte[inputSize];
+ input.get(inputArray);
+ outputArray = engineDoFinal(inputArray, 0, inputSize);
+ }
+
+ int outputSize = (outputArray != null) ? outputArray.length : 0;
+ if (outputSize > 0) {
+ int outputBufferAvailable = output.remaining();
+ try {
+ output.put(outputArray);
+ } catch (BufferOverflowException e) {
+ throw new ShortBufferException(
+ "Output buffer too small. Produced: " + outputSize + ", available: "
+ + outputBufferAvailable);
+ }
+ }
+ return outputSize;
}
@Override
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
index c31a8b7..8c20ddc 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -101,20 +101,21 @@
*/
public static void install() {
Provider[] providers = Security.getProviders();
- int bcProviderPosition = -1;
- for (int position = 0; position < providers.length; position++) {
- Provider provider = providers[position];
+ int bcProviderIndex = -1;
+ for (int i = 0; i < providers.length; i++) {
+ Provider provider = providers[i];
if ("BC".equals(provider.getName())) {
- bcProviderPosition = position;
+ bcProviderIndex = i;
break;
}
}
Security.addProvider(new AndroidKeyStoreProvider());
Provider workaroundProvider = new AndroidKeyStoreBCWorkaroundProvider();
- if (bcProviderPosition != -1) {
+ if (bcProviderIndex != -1) {
// Bouncy Castle provider found -- install the workaround provider above it.
- Security.insertProviderAt(workaroundProvider, bcProviderPosition);
+ // insertProviderAt uses 1-based positions.
+ Security.insertProviderAt(workaroundProvider, bcProviderIndex + 1);
} else {
// Bouncy Castle provider not found -- install the workaround provider at lowest
// priority.
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 4acad67..fc4916c 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -29,12 +29,15 @@
utils/NinePatchImpl.cpp \
utils/StringUtils.cpp \
utils/TestWindowContext.cpp \
+ utils/VectorDrawableUtils.cpp \
+ utils/TestUtils.cpp \
AmbientShadow.cpp \
AnimationContext.cpp \
Animator.cpp \
AnimatorManager.cpp \
AssetAtlas.cpp \
Caches.cpp \
+ Canvas.cpp \
CanvasState.cpp \
ClipArea.cpp \
DamageAccumulator.cpp \
@@ -98,6 +101,7 @@
ifeq (true, $(HWUI_NEW_OPS))
hwui_src_files += \
+ BakedOpDispatcher.cpp \
BakedOpRenderer.cpp \
OpReorderer.cpp \
RecordingCanvas.cpp
@@ -206,7 +210,9 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SHARED_LIBRARIES := $(hwui_shared_libraries)
LOCAL_STATIC_LIBRARIES := libhwui_static_null_gpu
-LOCAL_CFLAGS := $(hwui_cflags)
+LOCAL_CFLAGS := \
+ $(hwui_cflags) \
+ -DHWUI_NULL_GPU
LOCAL_SRC_FILES += \
unit_tests/CanvasStateTests.cpp \
@@ -216,7 +222,7 @@
unit_tests/FatVectorTests.cpp \
unit_tests/LayerUpdateQueueTests.cpp \
unit_tests/LinearAllocatorTests.cpp \
- unit_tests/PathParserTests.cpp \
+ unit_tests/VectorDrawableTests.cpp \
unit_tests/OffscreenBufferPoolTests.cpp \
unit_tests/StringUtilsTests.cpp
@@ -250,9 +256,11 @@
LOCAL_SRC_FILES += \
tests/TestContext.cpp \
- tests/TreeContentAnimation.cpp \
+ tests/TestSceneRunner.cpp \
tests/main.cpp
+LOCAL_SRC_FILES += $(call all-cpp-files-under, tests/scenes)
+
include $(BUILD_EXECUTABLE)
# ------------------------
@@ -268,7 +276,9 @@
LOCAL_MODULE_STEM_32 := hwuimicro
LOCAL_MODULE_STEM_64 := hwuimicro64
LOCAL_SHARED_LIBRARIES := $(hwui_shared_libraries)
-LOCAL_CFLAGS := $(hwui_cflags)
+LOCAL_CFLAGS := \
+ $(hwui_cflags) \
+ -DHWUI_NULL_GPU
LOCAL_C_INCLUDES += bionic/benchmarks/
LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static_null_gpu
diff --git a/libs/hwui/BakedOpDispatcher.cpp b/libs/hwui/BakedOpDispatcher.cpp
new file mode 100644
index 0000000..b56b1e4
--- /dev/null
+++ b/libs/hwui/BakedOpDispatcher.cpp
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "BakedOpDispatcher.h"
+
+#include "BakedOpRenderer.h"
+#include "Caches.h"
+#include "Glop.h"
+#include "GlopBuilder.h"
+#include "renderstate/OffscreenBufferPool.h"
+#include "renderstate/RenderState.h"
+#include "utils/GLUtils.h"
+#include "VertexBuffer.h"
+
+#include <algorithm>
+#include <math.h>
+
+namespace android {
+namespace uirenderer {
+
+void BakedOpDispatcher::onRenderNodeOp(BakedOpRenderer&, const RenderNodeOp&, const BakedOpState&) {
+ LOG_ALWAYS_FATAL("unsupported operation");
+}
+
+void BakedOpDispatcher::onBeginLayerOp(BakedOpRenderer& renderer, const BeginLayerOp& op, const BakedOpState& state) {
+ LOG_ALWAYS_FATAL("unsupported operation");
+}
+
+void BakedOpDispatcher::onEndLayerOp(BakedOpRenderer& renderer, const EndLayerOp& op, const BakedOpState& state) {
+ LOG_ALWAYS_FATAL("unsupported operation");
+}
+
+void BakedOpDispatcher::onBitmapOp(BakedOpRenderer& renderer, const BitmapOp& op, const BakedOpState& state) {
+ renderer.caches().textureState().activateTexture(0); // TODO: should this be automatic, and/or elsewhere?
+ Texture* texture = renderer.getTexture(op.bitmap);
+ if (!texture) return;
+ const AutoTexture autoCleanup(texture);
+
+ const int textureFillFlags = (op.bitmap->colorType() == kAlpha_8_SkColorType)
+ ? TextureFillFlags::IsAlphaMaskTexture : TextureFillFlags::None;
+ Glop glop;
+ GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
+ .setRoundRectClipState(state.roundRectClipState)
+ .setMeshTexturedUnitQuad(texture->uvMapper)
+ .setFillTexturePaint(*texture, textureFillFlags, op.paint, state.alpha)
+ .setTransform(state.computedState.transform, TransformFlags::None)
+ .setModelViewMapUnitToRectSnap(Rect(0, 0, texture->width, texture->height))
+ .build();
+ renderer.renderGlop(state, glop);
+}
+
+void BakedOpDispatcher::onLinesOp(BakedOpRenderer& renderer, const LinesOp& op, const BakedOpState& state) {
+ LOG_ALWAYS_FATAL("todo");
+}
+
+void BakedOpDispatcher::onRectOp(BakedOpRenderer& renderer, const RectOp& op, const BakedOpState& state) {
+ Glop glop;
+ GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
+ .setRoundRectClipState(state.roundRectClipState)
+ .setMeshUnitQuad()
+ .setFillPaint(*op.paint, state.alpha)
+ .setTransform(state.computedState.transform, TransformFlags::None)
+ .setModelViewMapUnitToRect(op.unmappedBounds)
+ .build();
+ renderer.renderGlop(state, glop);
+}
+
+namespace VertexBufferRenderFlags {
+ enum {
+ Offset = 0x1,
+ ShadowInterp = 0x2,
+ };
+}
+
+static void renderVertexBuffer(BakedOpRenderer& renderer, const BakedOpState& state,
+ const VertexBuffer& vertexBuffer, float translateX, float translateY,
+ SkPaint& paint, int vertexBufferRenderFlags) {
+ if (CC_LIKELY(vertexBuffer.getVertexCount())) {
+ bool shadowInterp = vertexBufferRenderFlags & VertexBufferRenderFlags::ShadowInterp;
+ const int transformFlags = TransformFlags::OffsetByFudgeFactor;
+ Glop glop;
+ GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
+ .setRoundRectClipState(state.roundRectClipState)
+ .setMeshVertexBuffer(vertexBuffer, shadowInterp)
+ .setFillPaint(paint, state.alpha)
+ .setTransform(state.computedState.transform, transformFlags)
+ .setModelViewOffsetRect(translateX, translateY, vertexBuffer.getBounds())
+ .build();
+ renderer.renderGlop(state, glop);
+ }
+}
+
+static void renderShadow(BakedOpRenderer& renderer, const BakedOpState& state, float casterAlpha,
+ const VertexBuffer* ambientShadowVertexBuffer, const VertexBuffer* spotShadowVertexBuffer) {
+ SkPaint paint;
+ paint.setAntiAlias(true); // want to use AlphaVertex
+
+ // The caller has made sure casterAlpha > 0.
+ uint8_t ambientShadowAlpha = renderer.getLightInfo().ambientShadowAlpha;
+ if (CC_UNLIKELY(Properties::overrideAmbientShadowStrength >= 0)) {
+ ambientShadowAlpha = Properties::overrideAmbientShadowStrength;
+ }
+ if (ambientShadowVertexBuffer && ambientShadowAlpha > 0) {
+ paint.setAlpha((uint8_t)(casterAlpha * ambientShadowAlpha));
+ renderVertexBuffer(renderer, state, *ambientShadowVertexBuffer, 0, 0,
+ paint, VertexBufferRenderFlags::ShadowInterp);
+ }
+
+ uint8_t spotShadowAlpha = renderer.getLightInfo().spotShadowAlpha;
+ if (CC_UNLIKELY(Properties::overrideSpotShadowStrength >= 0)) {
+ spotShadowAlpha = Properties::overrideSpotShadowStrength;
+ }
+ if (spotShadowVertexBuffer && spotShadowAlpha > 0) {
+ paint.setAlpha((uint8_t)(casterAlpha * spotShadowAlpha));
+ renderVertexBuffer(renderer, state, *spotShadowVertexBuffer, 0, 0,
+ paint, VertexBufferRenderFlags::ShadowInterp);
+ }
+}
+
+void BakedOpDispatcher::onShadowOp(BakedOpRenderer& renderer, const ShadowOp& op, const BakedOpState& state) {
+ TessellationCache::vertexBuffer_pair_t buffers;
+ renderer.caches().tessellationCache.getShadowBuffers(&state.computedState.transform,
+ op.localClipRect, op.casterAlpha >= 1.0f, op.casterPath,
+ &op.shadowMatrixXY, &op.shadowMatrixZ,
+ op.lightCenter, renderer.getLightInfo().lightRadius,
+ buffers);
+
+ renderShadow(renderer, state, op.casterAlpha, buffers.first, buffers.second);
+}
+
+void BakedOpDispatcher::onSimpleRectsOp(BakedOpRenderer& renderer, const SimpleRectsOp& op, const BakedOpState& state) {
+ Glop glop;
+ GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
+ .setRoundRectClipState(state.roundRectClipState)
+ .setMeshIndexedQuads(&op.vertices[0], op.vertexCount / 4)
+ .setFillPaint(*op.paint, state.alpha)
+ .setTransform(state.computedState.transform, TransformFlags::None)
+ .setModelViewOffsetRect(0, 0, op.unmappedBounds)
+ .build();
+ renderer.renderGlop(state, glop);
+}
+
+static void renderTextShadow(BakedOpRenderer& renderer, FontRenderer& fontRenderer,
+ const TextOp& op, const BakedOpState& state) {
+ renderer.caches().textureState().activateTexture(0);
+
+ PaintUtils::TextShadow textShadow;
+ if (!PaintUtils::getTextShadow(op.paint, &textShadow)) {
+ LOG_ALWAYS_FATAL("failed to query shadow attributes");
+ }
+
+ renderer.caches().dropShadowCache.setFontRenderer(fontRenderer);
+ ShadowTexture* texture = renderer.caches().dropShadowCache.get(
+ op.paint, (const char*) op.glyphs,
+ op.glyphCount, textShadow.radius, op.positions);
+ // If the drop shadow exceeds the max texture size or couldn't be
+ // allocated, skip drawing
+ if (!texture) return;
+ const AutoTexture autoCleanup(texture);
+
+ const float sx = op.x - texture->left + textShadow.dx;
+ const float sy = op.y - texture->top + textShadow.dy;
+
+ Glop glop;
+ GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
+ .setRoundRectClipState(state.roundRectClipState)
+ .setMeshTexturedUnitQuad(nullptr)
+ .setFillShadowTexturePaint(*texture, textShadow.color, *op.paint, state.alpha)
+ .setTransform(state.computedState.transform, TransformFlags::None)
+ .setModelViewMapUnitToRect(Rect(sx, sy, sx + texture->width, sy + texture->height))
+ .build();
+ renderer.renderGlop(state, glop);
+}
+
+void BakedOpDispatcher::onTextOp(BakedOpRenderer& renderer, const TextOp& op, const BakedOpState& state) {
+ FontRenderer& fontRenderer = renderer.caches().fontRenderer.getFontRenderer();
+
+ if (CC_UNLIKELY(PaintUtils::hasTextShadow(op.paint))) {
+ fontRenderer.setFont(op.paint, SkMatrix::I());
+ renderTextShadow(renderer, fontRenderer, op, state);
+ }
+
+ float x = op.x;
+ float y = op.y;
+ const Matrix4& transform = state.computedState.transform;
+ const bool pureTranslate = transform.isPureTranslate();
+ if (CC_LIKELY(pureTranslate)) {
+ x = floorf(x + transform.getTranslateX() + 0.5f);
+ y = floorf(y + transform.getTranslateY() + 0.5f);
+ fontRenderer.setFont(op.paint, SkMatrix::I());
+ fontRenderer.setTextureFiltering(false);
+ } else if (CC_UNLIKELY(transform.isPerspective())) {
+ fontRenderer.setFont(op.paint, SkMatrix::I());
+ fontRenderer.setTextureFiltering(true);
+ } else {
+ // We only pass a partial transform to the font renderer. That partial
+ // matrix defines how glyphs are rasterized. Typically we want glyphs
+ // to be rasterized at their final size on screen, which means the partial
+ // matrix needs to take the scale factor into account.
+ // When a partial matrix is used to transform glyphs during rasterization,
+ // the mesh is generated with the inverse transform (in the case of scale,
+ // the mesh is generated at 1.0 / scale for instance.) This allows us to
+ // apply the full transform matrix at draw time in the vertex shader.
+ // Applying the full matrix in the shader is the easiest way to handle
+ // rotation and perspective and allows us to always generated quads in the
+ // font renderer which greatly simplifies the code, clipping in particular.
+ float sx, sy;
+ transform.decomposeScale(sx, sy);
+ fontRenderer.setFont(op.paint, SkMatrix::MakeScale(
+ roundf(std::max(1.0f, sx)),
+ roundf(std::max(1.0f, sy))));
+ fontRenderer.setTextureFiltering(true);
+ }
+
+ // TODO: Implement better clipping for scaled/rotated text
+ const Rect* clip = !pureTranslate ? nullptr : &state.computedState.clipRect;
+ Rect layerBounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f);
+
+ int alpha = PaintUtils::getAlphaDirect(op.paint) * state.alpha;
+ SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(op.paint);
+ TextDrawFunctor functor(&renderer, &state, x, y, pureTranslate, alpha, mode, op.paint);
+
+ bool hasActiveLayer = false; // TODO
+ fontRenderer.renderPosText(op.paint, clip, (const char*) op.glyphs, op.glyphCount, x, y,
+ op.positions, hasActiveLayer ? &layerBounds : nullptr, &functor, true); // TODO: merging
+}
+
+void BakedOpDispatcher::onLayerOp(BakedOpRenderer& renderer, const LayerOp& op, const BakedOpState& state) {
+ OffscreenBuffer* buffer = *op.layerHandle;
+
+ // TODO: extend this to handle HW layers & paint properties which
+ // reside in node.properties().layerProperties()
+ float layerAlpha = op.alpha * state.alpha;
+ Glop glop;
+ GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
+ .setRoundRectClipState(state.roundRectClipState)
+ .setMeshTexturedIndexedVbo(buffer->vbo, buffer->elementCount)
+ .setFillLayer(buffer->texture, op.colorFilter, layerAlpha, op.mode, Blend::ModeOrderSwap::NoSwap)
+ .setTransform(state.computedState.transform, TransformFlags::None)
+ .setModelViewOffsetRectSnap(op.unmappedBounds.left, op.unmappedBounds.top,
+ Rect(op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight()))
+ .build();
+ renderer.renderGlop(state, glop);
+
+ if (op.destroy) {
+ renderer.renderState().layerPool().putOrDelete(buffer);
+ }
+}
+
+} // namespace uirenderer
+} // namespace android
diff --git a/libs/hwui/BakedOpDispatcher.h b/libs/hwui/BakedOpDispatcher.h
new file mode 100644
index 0000000..caf14bf
--- /dev/null
+++ b/libs/hwui/BakedOpDispatcher.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef ANDROID_HWUI_BAKED_OP_DISPATCHER_H
+#define ANDROID_HWUI_BAKED_OP_DISPATCHER_H
+
+#include "BakedOpState.h"
+#include "RecordedOp.h"
+
+namespace android {
+namespace uirenderer {
+
+/**
+ * Provides all "onBitmapOp(...)" style static methods for every op type, which convert the
+ * RecordedOps and their state to Glops, and renders them with the provided BakedOpRenderer.
+ *
+ * This dispatcher is separate from the renderer so that the dispatcher / renderer interaction is
+ * minimal through public BakedOpRenderer APIs.
+ */
+class BakedOpDispatcher {
+public:
+ // Declares all "onBitmapOp(...)" style methods for every op type
+#define DISPATCH_METHOD(Type) \
+ static void on##Type(BakedOpRenderer& renderer, const Type& op, const BakedOpState& state);
+ MAP_OPS(DISPATCH_METHOD);
+};
+
+}; // namespace uirenderer
+}; // namespace android
+
+#endif // ANDROID_HWUI_BAKED_OP_DISPATCHER_H
diff --git a/libs/hwui/BakedOpRenderer.cpp b/libs/hwui/BakedOpRenderer.cpp
index 1aa291f..6cdc320 100644
--- a/libs/hwui/BakedOpRenderer.cpp
+++ b/libs/hwui/BakedOpRenderer.cpp
@@ -24,22 +24,20 @@
#include "utils/GLUtils.h"
#include "VertexBuffer.h"
+#include <algorithm>
+
namespace android {
namespace uirenderer {
-////////////////////////////////////////////////////////////////////////////////
-// BakedOpRenderer
-////////////////////////////////////////////////////////////////////////////////
-
OffscreenBuffer* BakedOpRenderer::startTemporaryLayer(uint32_t width, uint32_t height) {
LOG_ALWAYS_FATAL_IF(mRenderTarget.offscreenBuffer, "already has layer...");
OffscreenBuffer* buffer = mRenderState.layerPool().get(mRenderState, width, height);
- startRepaintLayer(buffer);
+ startRepaintLayer(buffer, Rect(width, height));
return buffer;
}
-void BakedOpRenderer::startRepaintLayer(OffscreenBuffer* offscreenBuffer) {
+void BakedOpRenderer::startRepaintLayer(OffscreenBuffer* offscreenBuffer, const Rect& repaintRect) {
LOG_ALWAYS_FATAL_IF(mRenderTarget.offscreenBuffer, "already has layer...");
mRenderTarget.offscreenBuffer = offscreenBuffer;
@@ -55,12 +53,10 @@
LOG_ALWAYS_FATAL_IF(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE,
"framebuffer incomplete!");
- // Clear the FBO
- mRenderState.scissor().setEnabled(false);
- glClear(GL_COLOR_BUFFER_BIT);
-
// Change the viewport & ortho projection
setViewport(offscreenBuffer->viewportWidth, offscreenBuffer->viewportHeight);
+
+ clearColorBuffer(repaintRect);
}
void BakedOpRenderer::endLayer() {
@@ -74,16 +70,13 @@
mRenderTarget.frameBufferId = -1;
}
-void BakedOpRenderer::startFrame(uint32_t width, uint32_t height) {
+void BakedOpRenderer::startFrame(uint32_t width, uint32_t height, const Rect& repaintRect) {
mRenderState.bindFramebuffer(0);
setViewport(width, height);
mCaches.clearGarbage();
if (!mOpaque) {
- // TODO: partial invalidate!
- mRenderState.scissor().setEnabled(false);
- glClear(GL_COLOR_BUFFER_BIT);
- mHasDrawn = true;
+ clearColorBuffer(repaintRect);
}
}
@@ -113,6 +106,20 @@
mRenderState.blend().syncEnabled();
}
+void BakedOpRenderer::clearColorBuffer(const Rect& rect) {
+ if (Rect(mRenderTarget.viewportWidth, mRenderTarget.viewportHeight).contains(rect)) {
+ // Full viewport is being cleared - disable scissor
+ mRenderState.scissor().setEnabled(false);
+ } else {
+ // Requested rect is subset of viewport - scissor to it to avoid over-clearing
+ mRenderState.scissor().setEnabled(true);
+ mRenderState.scissor().set(rect.left, mRenderTarget.viewportHeight - rect.bottom,
+ rect.getWidth(), rect.getHeight());
+ }
+ glClear(GL_COLOR_BUFFER_BIT);
+ if (!mRenderTarget.frameBufferId) mHasDrawn = true;
+}
+
Texture* BakedOpRenderer::getTexture(const SkBitmap* bitmap) {
Texture* texture = mRenderState.assetAtlas().getEntryTexture(bitmap);
if (!texture) {
@@ -136,153 +143,7 @@
mRenderTarget.offscreenBuffer->region.orSelf(dirty);
}
mRenderState.render(glop, mRenderTarget.orthoMatrix);
- mHasDrawn = true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static BakedOpDispatcher methods
-////////////////////////////////////////////////////////////////////////////////
-
-void BakedOpDispatcher::onRenderNodeOp(BakedOpRenderer&, const RenderNodeOp&, const BakedOpState&) {
- LOG_ALWAYS_FATAL("unsupported operation");
-}
-
-void BakedOpDispatcher::onBeginLayerOp(BakedOpRenderer& renderer, const BeginLayerOp& op, const BakedOpState& state) {
- LOG_ALWAYS_FATAL("unsupported operation");
-}
-
-void BakedOpDispatcher::onEndLayerOp(BakedOpRenderer& renderer, const EndLayerOp& op, const BakedOpState& state) {
- LOG_ALWAYS_FATAL("unsupported operation");
-}
-
-void BakedOpDispatcher::onBitmapOp(BakedOpRenderer& renderer, const BitmapOp& op, const BakedOpState& state) {
- renderer.caches().textureState().activateTexture(0); // TODO: should this be automatic, and/or elsewhere?
- Texture* texture = renderer.getTexture(op.bitmap);
- if (!texture) return;
- const AutoTexture autoCleanup(texture);
-
- const int textureFillFlags = (op.bitmap->colorType() == kAlpha_8_SkColorType)
- ? TextureFillFlags::IsAlphaMaskTexture : TextureFillFlags::None;
- Glop glop;
- GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
- .setRoundRectClipState(state.roundRectClipState)
- .setMeshTexturedUnitQuad(texture->uvMapper)
- .setFillTexturePaint(*texture, textureFillFlags, op.paint, state.alpha)
- .setTransform(state.computedState.transform, TransformFlags::None)
- .setModelViewMapUnitToRectSnap(Rect(0, 0, texture->width, texture->height))
- .build();
- renderer.renderGlop(state, glop);
-}
-
-void BakedOpDispatcher::onRectOp(BakedOpRenderer& renderer, const RectOp& op, const BakedOpState& state) {
- Glop glop;
- GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
- .setRoundRectClipState(state.roundRectClipState)
- .setMeshUnitQuad()
- .setFillPaint(*op.paint, state.alpha)
- .setTransform(state.computedState.transform, TransformFlags::None)
- .setModelViewMapUnitToRect(op.unmappedBounds)
- .build();
- renderer.renderGlop(state, glop);
-}
-
-namespace VertexBufferRenderFlags {
- enum {
- Offset = 0x1,
- ShadowInterp = 0x2,
- };
-}
-
-static void renderVertexBuffer(BakedOpRenderer& renderer, const BakedOpState& state,
- const VertexBuffer& vertexBuffer, float translateX, float translateY,
- SkPaint& paint, int vertexBufferRenderFlags) {
- if (CC_LIKELY(vertexBuffer.getVertexCount())) {
- bool shadowInterp = vertexBufferRenderFlags & VertexBufferRenderFlags::ShadowInterp;
- const int transformFlags = TransformFlags::OffsetByFudgeFactor;
- Glop glop;
- GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
- .setRoundRectClipState(state.roundRectClipState)
- .setMeshVertexBuffer(vertexBuffer, shadowInterp)
- .setFillPaint(paint, state.alpha)
- .setTransform(state.computedState.transform, transformFlags)
- .setModelViewOffsetRect(translateX, translateY, vertexBuffer.getBounds())
- .build();
- renderer.renderGlop(state, glop);
- }
-}
-
-static void renderShadow(BakedOpRenderer& renderer, const BakedOpState& state, float casterAlpha,
- const VertexBuffer* ambientShadowVertexBuffer, const VertexBuffer* spotShadowVertexBuffer) {
- SkPaint paint;
- paint.setAntiAlias(true); // want to use AlphaVertex
-
- // The caller has made sure casterAlpha > 0.
- uint8_t ambientShadowAlpha = 128u; //TODO: mAmbientShadowAlpha;
- if (CC_UNLIKELY(Properties::overrideAmbientShadowStrength >= 0)) {
- ambientShadowAlpha = Properties::overrideAmbientShadowStrength;
- }
- if (ambientShadowVertexBuffer && ambientShadowAlpha > 0) {
- paint.setAlpha((uint8_t)(casterAlpha * ambientShadowAlpha));
- renderVertexBuffer(renderer, state, *ambientShadowVertexBuffer, 0, 0,
- paint, VertexBufferRenderFlags::ShadowInterp);
- }
-
- uint8_t spotShadowAlpha = 128u; //TODO: mSpotShadowAlpha;
- if (CC_UNLIKELY(Properties::overrideSpotShadowStrength >= 0)) {
- spotShadowAlpha = Properties::overrideSpotShadowStrength;
- }
- if (spotShadowVertexBuffer && spotShadowAlpha > 0) {
- paint.setAlpha((uint8_t)(casterAlpha * spotShadowAlpha));
- renderVertexBuffer(renderer, state, *spotShadowVertexBuffer, 0, 0,
- paint, VertexBufferRenderFlags::ShadowInterp);
- }
-}
-
-void BakedOpDispatcher::onShadowOp(BakedOpRenderer& renderer, const ShadowOp& op, const BakedOpState& state) {
- TessellationCache::vertexBuffer_pair_t buffers;
- Vector3 lightCenter = { 300, 300, 300 }; // TODO!
- float lightRadius = 150; // TODO!
-
- renderer.caches().tessellationCache.getShadowBuffers(&state.computedState.transform,
- op.localClipRect, op.casterAlpha >= 1.0f, op.casterPath,
- &op.shadowMatrixXY, &op.shadowMatrixZ, lightCenter, lightRadius,
- buffers);
-
- renderShadow(renderer, state, op.casterAlpha, buffers.first, buffers.second);
-}
-
-void BakedOpDispatcher::onSimpleRectsOp(BakedOpRenderer& renderer, const SimpleRectsOp& op, const BakedOpState& state) {
- Glop glop;
- GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
- .setRoundRectClipState(state.roundRectClipState)
- .setMeshIndexedQuads(&op.vertices[0], op.vertexCount / 4)
- .setFillPaint(*op.paint, state.alpha)
- .setTransform(state.computedState.transform, TransformFlags::None)
- .setModelViewOffsetRect(0, 0, op.unmappedBounds)
- .build();
- renderer.renderGlop(state, glop);
-}
-
-void BakedOpDispatcher::onLayerOp(BakedOpRenderer& renderer, const LayerOp& op, const BakedOpState& state) {
- OffscreenBuffer* buffer = *op.layerHandle;
-
- // TODO: extend this to handle HW layers & paint properties which
- // reside in node.properties().layerProperties()
- float layerAlpha = op.alpha * state.alpha;
- Glop glop;
- GlopBuilder(renderer.renderState(), renderer.caches(), &glop)
- .setRoundRectClipState(state.roundRectClipState)
- .setMeshTexturedIndexedVbo(buffer->vbo, buffer->elementCount)
- .setFillLayer(buffer->texture, op.colorFilter, layerAlpha, op.mode, Blend::ModeOrderSwap::NoSwap)
- .setTransform(state.computedState.transform, TransformFlags::None)
- .setModelViewOffsetRectSnap(op.unmappedBounds.left, op.unmappedBounds.top,
- Rect(op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight()))
- .build();
- renderer.renderGlop(state, glop);
-
- if (op.destroy) {
- renderer.renderState().layerPool().putOrDelete(buffer);
- }
+ if (!mRenderTarget.frameBufferId) mHasDrawn = true;
}
} // namespace uirenderer
diff --git a/libs/hwui/BakedOpRenderer.h b/libs/hwui/BakedOpRenderer.h
index d6d9cb1..62d1838 100644
--- a/libs/hwui/BakedOpRenderer.h
+++ b/libs/hwui/BakedOpRenderer.h
@@ -39,27 +39,39 @@
*/
class BakedOpRenderer {
public:
- BakedOpRenderer(Caches& caches, RenderState& renderState, bool opaque)
+ /**
+ * Position agnostic shadow lighting info. Used with all shadow ops in scene.
+ */
+ struct LightInfo {
+ float lightRadius = 0;
+ uint8_t ambientShadowAlpha = 0;
+ uint8_t spotShadowAlpha = 0;
+ };
+
+ BakedOpRenderer(Caches& caches, RenderState& renderState, bool opaque, const LightInfo& lightInfo)
: mRenderState(renderState)
, mCaches(caches)
- , mOpaque(opaque) {
+ , mOpaque(opaque)
+ , mLightInfo(lightInfo) {
}
RenderState& renderState() { return mRenderState; }
Caches& caches() { return mCaches; }
- void startFrame(uint32_t width, uint32_t height);
+ void startFrame(uint32_t width, uint32_t height, const Rect& repaintRect);
void endFrame();
OffscreenBuffer* startTemporaryLayer(uint32_t width, uint32_t height);
- void startRepaintLayer(OffscreenBuffer* offscreenBuffer);
+ void startRepaintLayer(OffscreenBuffer* offscreenBuffer, const Rect& repaintRect);
void endLayer();
Texture* getTexture(const SkBitmap* bitmap);
+ const LightInfo& getLightInfo() { return mLightInfo; }
void renderGlop(const BakedOpState& state, const Glop& glop);
bool didDraw() { return mHasDrawn; }
private:
void setViewport(uint32_t width, uint32_t height);
+ void clearColorBuffer(const Rect& clearRect);
RenderState& mRenderState;
Caches& mCaches;
@@ -75,21 +87,8 @@
uint32_t viewportHeight = 0;
Matrix4 orthoMatrix;
} mRenderTarget;
-};
-/**
- * Provides all "onBitmapOp(...)" style static methods for every op type, which convert the
- * RecordedOps and their state to Glops, and renders them with the provided BakedOpRenderer.
- *
- * This dispatcher is separate from the renderer so that the dispatcher / renderer interaction is
- * minimal through public BakedOpRenderer APIs.
- */
-class BakedOpDispatcher {
-public:
- // Declares all "onBitmapOp(...)" style methods for every op type
-#define DISPATCH_METHOD(Type) \
- static void on##Type(BakedOpRenderer& renderer, const Type& op, const BakedOpState& state);
- MAP_OPS(DISPATCH_METHOD);
+ const LightInfo mLightInfo;
};
}; // namespace uirenderer
diff --git a/libs/hwui/Canvas.cpp b/libs/hwui/Canvas.cpp
new file mode 100644
index 0000000..bc88c81
--- /dev/null
+++ b/libs/hwui/Canvas.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "Canvas.h"
+
+#include <SkDrawFilter.h>
+
+namespace android {
+
+void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint& paint) {
+ uint32_t flags;
+ SkDrawFilter* drawFilter = getDrawFilter();
+ if (drawFilter) {
+ SkPaint paintCopy(paint);
+ drawFilter->filter(&paintCopy, SkDrawFilter::kText_Type);
+ flags = paintCopy.getFlags();
+ } else {
+ flags = paint.getFlags();
+ }
+ if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) {
+ // Same values used by Skia
+ const float kStdStrikeThru_Offset = (-6.0f / 21.0f);
+ const float kStdUnderline_Offset = (1.0f / 9.0f);
+ const float kStdUnderline_Thickness = (1.0f / 18.0f);
+
+ SkScalar left = x;
+ SkScalar right = x + length;
+ float textSize = paint.getTextSize();
+ float strokeWidth = fmax(textSize * kStdUnderline_Thickness, 1.0f);
+ if (flags & SkPaint::kUnderlineText_Flag) {
+ SkScalar top = y + textSize * kStdUnderline_Offset - 0.5f * strokeWidth;
+ SkScalar bottom = y + textSize * kStdUnderline_Offset + 0.5f * strokeWidth;
+ drawRect(left, top, right, bottom, paint);
+ }
+ if (flags & SkPaint::kStrikeThruText_Flag) {
+ SkScalar top = y + textSize * kStdStrikeThru_Offset - 0.5f * strokeWidth;
+ SkScalar bottom = y + textSize * kStdStrikeThru_Offset + 0.5f * strokeWidth;
+ drawRect(left, top, right, bottom, paint);
+ }
+ }
+}
+
+} // namespace android
diff --git a/libs/hwui/Canvas.h b/libs/hwui/Canvas.h
index 4bd4ac8..b585a27 100644
--- a/libs/hwui/Canvas.h
+++ b/libs/hwui/Canvas.h
@@ -149,16 +149,12 @@
// Text
/**
* drawText: count is of glyphs
- * totalAdvance is ignored in software renderering, used by hardware renderer for
- * text decorations (underlines, strikethroughs).
+ * totalAdvance: used to define width of text decorations (underlines, strikethroughs).
*/
virtual void drawText(const uint16_t* glyphs, const float* positions, int count,
const SkPaint& paint, float x, float y,
float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
float totalAdvance) = 0;
- /** drawPosText: count is of UTF16 characters, posCount is floats (2 * glyphs) */
- virtual void drawPosText(const uint16_t* text, const float* positions, int count,
- int posCount, const SkPaint& paint) = 0;
/** drawTextOnPath: count is of glyphs */
virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
float hOffset, float vOffset, const SkPaint& paint) = 0;
@@ -171,6 +167,9 @@
* to be added to each glyph's position to get its absolute position.
*/
virtual bool drawTextAbsolutePos() const = 0;
+
+protected:
+ void drawTextDecorations(float x, float y, float length, const SkPaint& paint);
};
}; // namespace android
diff --git a/libs/hwui/DeviceInfo.cpp b/libs/hwui/DeviceInfo.cpp
index 03b1706..4cfbb2a 100644
--- a/libs/hwui/DeviceInfo.cpp
+++ b/libs/hwui/DeviceInfo.cpp
@@ -18,6 +18,7 @@
#include "Extensions.h"
#include <GLES2/gl2.h>
+#include <log/log.h>
#include <thread>
#include <mutex>
@@ -29,6 +30,7 @@
static std::once_flag sInitializedFlag;
const DeviceInfo* DeviceInfo::get() {
+ LOG_ALWAYS_FATAL_IF(!sDeviceInfo, "DeviceInfo not yet initialized.");
return sDeviceInfo;
}
@@ -40,7 +42,6 @@
}
void DeviceInfo::load() {
- mExtensions.load();
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
}
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 00c4e2d..60cc7ba 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -132,7 +132,7 @@
DisplayList();
~DisplayList();
- // index of DisplayListOp restore, after which projected descendents should be drawn
+ // index of DisplayListOp restore, after which projected descendants should be drawn
int projectionReceiveIndex;
const LsaVector<Chunk>& getChunks() const { return chunks; }
diff --git a/libs/hwui/DisplayListCanvas.cpp b/libs/hwui/DisplayListCanvas.cpp
index f5e5735..759c12a 100644
--- a/libs/hwui/DisplayListCanvas.cpp
+++ b/libs/hwui/DisplayListCanvas.cpp
@@ -423,18 +423,6 @@
addDrawOp(op);
}
-void DisplayListCanvas::drawPosText(const uint16_t* text, const float* positions,
- int count, int posCount, const SkPaint& paint) {
- if (!text || count <= 0) return;
-
- int bytesCount = 2 * count;
- positions = refBuffer<float>(positions, count * 2);
-
- DrawOp* op = new (alloc()) DrawPosTextOp(refText((const char*) text, bytesCount),
- bytesCount, count, positions, refPaint(&paint));
- addDrawOp(op);
-}
-
void DisplayListCanvas::drawText(const uint16_t* glyphs, const float* positions,
int count, const SkPaint& paint, float x, float y,
float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
@@ -450,6 +438,7 @@
DrawOp* op = new (alloc()) DrawTextOp(text, bytesCount, count,
x, y, positions, refPaint(&paint), totalAdvance, bounds);
addDrawOp(op);
+ drawTextDecorations(x, y, totalAdvance, paint);
}
void DisplayListCanvas::drawRegion(const SkRegion& region, const SkPaint& paint) {
diff --git a/libs/hwui/DisplayListCanvas.h b/libs/hwui/DisplayListCanvas.h
index 609103b..72fc100 100644
--- a/libs/hwui/DisplayListCanvas.h
+++ b/libs/hwui/DisplayListCanvas.h
@@ -55,6 +55,7 @@
class DeferredLayerUpdater;
class DisplayListOp;
class DrawOp;
+class DrawRenderNodeOp;
class RenderNode;
class StateOp;
@@ -212,8 +213,6 @@
virtual void drawText(const uint16_t* glyphs, const float* positions, int count,
const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop,
float boundsRight, float boundsBottom, float totalAdvance) override;
- virtual void drawPosText(const uint16_t* text, const float* positions, int count,
- int posCount, const SkPaint& paint) override;
virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
float hOffset, float vOffset, const SkPaint& paint) override;
virtual bool drawTextAbsolutePos() const override { return false; }
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
index 772aa72..e7cc464 100644
--- a/libs/hwui/DisplayListOp.h
+++ b/libs/hwui/DisplayListOp.h
@@ -1278,24 +1278,6 @@
float mVOffset;
};
-class DrawPosTextOp : public DrawSomeTextOp {
-public:
- DrawPosTextOp(const char* text, int bytesCount, int count,
- const float* positions, const SkPaint* paint)
- : DrawSomeTextOp(text, bytesCount, count, paint), mPositions(positions) {
- /* TODO: inherit from DrawBounded and init mLocalBounds */
- }
-
- virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {
- renderer.drawPosText(mText, mBytesCount, mCount, mPositions, mPaint);
- }
-
- virtual const char* name() override { return "DrawPosText"; }
-
-private:
- const float* mPositions;
-};
-
class DrawTextOp : public DrawStrokableOp {
public:
DrawTextOp(const char* text, int bytesCount, int count, float x, float y,
@@ -1401,22 +1383,25 @@
friend class TestUtils;
public:
DrawRenderNodeOp(RenderNode* renderNode, const mat4& transformFromParent, bool clipIsSimple)
- : DrawBoundedOp(0, 0, renderNode->getWidth(), renderNode->getHeight(), nullptr)
+ : DrawBoundedOp(0, 0,
+ renderNode->stagingProperties().getWidth(),
+ renderNode->stagingProperties().getHeight(),
+ nullptr)
, renderNode(renderNode)
, mRecordedWithPotentialStencilClip(!clipIsSimple || !transformFromParent.isSimple())
- , mTransformFromParent(transformFromParent)
- , mSkipInOrderDraw(false) {}
+ , localMatrix(transformFromParent)
+ , skipInOrderDraw(false) {}
virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
bool useQuickReject) override {
- if (renderNode->isRenderable() && !mSkipInOrderDraw) {
+ if (renderNode->isRenderable() && !skipInOrderDraw) {
renderNode->defer(deferStruct, level + 1);
}
}
virtual void replay(ReplayStateStruct& replayStruct, int saveCount, int level,
bool useQuickReject) override {
- if (renderNode->isRenderable() && !mSkipInOrderDraw) {
+ if (renderNode->isRenderable() && !skipInOrderDraw) {
renderNode->replay(replayStruct, level + 1);
}
}
@@ -1457,7 +1442,7 @@
/**
* Records transform vs parent, used for computing total transform without rerunning DL contents
*/
- const mat4 mTransformFromParent;
+ const mat4 localMatrix;
/**
* Holds the transformation between the projection surface ViewGroup and this RenderNode
@@ -1467,8 +1452,8 @@
*
* Note: doesn't include transformation within the RenderNode, or its properties.
*/
- mat4 mTransformFromCompositingAncestor;
- bool mSkipInOrderDraw;
+ mat4 transformFromCompositingAncestor;
+ bool skipInOrderDraw;
};
/**
diff --git a/libs/hwui/Extensions.cpp b/libs/hwui/Extensions.cpp
index e257715..02caaa4 100644
--- a/libs/hwui/Extensions.cpp
+++ b/libs/hwui/Extensions.cpp
@@ -35,7 +35,7 @@
#endif
-void Extensions::load() {
+Extensions::Extensions() {
auto extensions = StringUtils::split((const char*) glGetString(GL_EXTENSIONS));
mHasNPot = extensions.has("GL_OES_texture_npot");
mHasFramebufferFetch = extensions.has("GL_NV_shader_framebuffer_fetch");
diff --git a/libs/hwui/Extensions.h b/libs/hwui/Extensions.h
index 8ccfabd..67cc747 100644
--- a/libs/hwui/Extensions.h
+++ b/libs/hwui/Extensions.h
@@ -31,7 +31,7 @@
class Extensions {
public:
- void load();
+ Extensions();
inline bool hasNPot() const { return mHasNPot; }
inline bool hasFramebufferFetch() const { return mHasFramebufferFetch; }
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index ccf0b48..47654f4 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -21,13 +21,21 @@
#include "Extensions.h"
#include "Glop.h"
#include "GlopBuilder.h"
-#include "OpenGLRenderer.h"
#include "PixelBuffer.h"
#include "Rect.h"
#include "renderstate/RenderState.h"
#include "utils/Blur.h"
#include "utils/Timing.h"
+
+#if HWUI_NEW_OPS
+#include "BakedOpDispatcher.h"
+#include "BakedOpRenderer.h"
+#include "BakedOpState.h"
+#else
+#include "OpenGLRenderer.h"
+#endif
+
#include <algorithm>
#include <cutils/properties.h>
#include <SkGlyph.h>
@@ -59,14 +67,25 @@
int transformFlags = pureTranslate
? TransformFlags::MeshIgnoresCanvasTransform : TransformFlags::None;
Glop glop;
+#if HWUI_NEW_OPS
+ GlopBuilder(renderer->renderState(), renderer->caches(), &glop)
+ .setRoundRectClipState(bakedState->roundRectClipState)
+ .setMeshTexturedIndexedQuads(texture.mesh(), texture.meshElementCount())
+ .setFillTexturePaint(texture.getTexture(), textureFillFlags, paint, bakedState->alpha)
+ .setTransform(bakedState->computedState.transform, transformFlags)
+ .setModelViewOffsetRect(0, 0, Rect(0, 0, 0, 0))
+ .build();
+ renderer->renderGlop(*bakedState, glop);
+#else
GlopBuilder(renderer->mRenderState, renderer->mCaches, &glop)
+ .setRoundRectClipState(renderer->currentSnapshot()->roundRectClipState)
.setMeshTexturedIndexedQuads(texture.mesh(), texture.meshElementCount())
.setFillTexturePaint(texture.getTexture(), textureFillFlags, paint, renderer->currentSnapshot()->alpha)
.setTransform(*(renderer->currentSnapshot()), transformFlags)
.setModelViewOffsetRect(0, 0, Rect(0, 0, 0, 0))
- .setRoundRectClipState(renderer->currentSnapshot()->roundRectClipState)
.build();
renderer->renderGlop(glop);
+#endif
}
///////////////////////////////////////////////////////////////////////////////
@@ -539,7 +558,7 @@
}
FontRenderer::DropShadow FontRenderer::renderDropShadow(const SkPaint* paint, const char *text,
- uint32_t startIndex, uint32_t len, int numGlyphs, float radius, const float* positions) {
+ int numGlyphs, float radius, const float* positions) {
checkInit();
DropShadow image;
@@ -558,7 +577,7 @@
mBounds = nullptr;
Rect bounds;
- mCurrentFont->measure(paint, text, startIndex, len, numGlyphs, &bounds, positions);
+ mCurrentFont->measure(paint, text, numGlyphs, &bounds, positions);
uint32_t intRadius = Blur::convertRadiusToInt(radius);
uint32_t paddedWidth = (uint32_t) (bounds.right - bounds.left) + 2 * intRadius;
@@ -590,7 +609,7 @@
// text has non-whitespace, so draw and blur to create the shadow
// NOTE: bounds.isEmpty() can't be used here, since vertical coordinates are inverted
// TODO: don't draw pure whitespace in the first place, and avoid needing this check
- mCurrentFont->render(paint, text, startIndex, len, numGlyphs, penX, penY,
+ mCurrentFont->render(paint, text, numGlyphs, penX, penY,
Font::BITMAP, dataBuffer, paddedWidth, paddedHeight, nullptr, positions);
// Unbind any PBO we might have used
@@ -635,15 +654,15 @@
}
bool FontRenderer::renderPosText(const SkPaint* paint, const Rect* clip, const char *text,
- uint32_t startIndex, uint32_t len, int numGlyphs, int x, int y,
- const float* positions, Rect* bounds, TextDrawFunctor* functor, bool forceFinish) {
+ int numGlyphs, int x, int y, const float* positions,
+ Rect* bounds, TextDrawFunctor* functor, bool forceFinish) {
if (!mCurrentFont) {
ALOGE("No font set");
return false;
}
initRender(clip, bounds, functor);
- mCurrentFont->render(paint, text, startIndex, len, numGlyphs, x, y, positions);
+ mCurrentFont->render(paint, text, numGlyphs, x, y, positions);
if (forceFinish) {
finishRender();
@@ -653,15 +672,15 @@
}
bool FontRenderer::renderTextOnPath(const SkPaint* paint, const Rect* clip, const char *text,
- uint32_t startIndex, uint32_t len, int numGlyphs, const SkPath* path,
- float hOffset, float vOffset, Rect* bounds, TextDrawFunctor* functor) {
+ int numGlyphs, const SkPath* path, float hOffset, float vOffset,
+ Rect* bounds, TextDrawFunctor* functor) {
if (!mCurrentFont) {
ALOGE("No font set");
return false;
}
initRender(clip, bounds, functor);
- mCurrentFont->render(paint, text, startIndex, len, numGlyphs, path, hOffset, vOffset);
+ mCurrentFont->render(paint, text, numGlyphs, path, hOffset, vOffset);
finishRender();
return mDrawn;
diff --git a/libs/hwui/FontRenderer.h b/libs/hwui/FontRenderer.h
index 8172312..87cfe7f 100644
--- a/libs/hwui/FontRenderer.h
+++ b/libs/hwui/FontRenderer.h
@@ -44,13 +44,28 @@
namespace android {
namespace uirenderer {
+#if HWUI_NEW_OPS
+class BakedOpState;
+class BakedOpRenderer;
+#else
class OpenGLRenderer;
+#endif
class TextDrawFunctor {
public:
- TextDrawFunctor(OpenGLRenderer* renderer, float x, float y, bool pureTranslate,
+ TextDrawFunctor(
+#if HWUI_NEW_OPS
+ BakedOpRenderer* renderer,
+ const BakedOpState* bakedState,
+#else
+ OpenGLRenderer* renderer,
+#endif
+ float x, float y, bool pureTranslate,
int alpha, SkXfermode::Mode mode, const SkPaint* paint)
: renderer(renderer)
+#if HWUI_NEW_OPS
+ , bakedState(bakedState)
+#endif
, x(x)
, y(y)
, pureTranslate(pureTranslate)
@@ -61,7 +76,12 @@
void draw(CacheTexture& texture, bool linearFiltering);
+#if HWUI_NEW_OPS
+ BakedOpRenderer* renderer;
+ const BakedOpState* bakedState;
+#else
OpenGLRenderer* renderer;
+#endif
float x;
float y;
bool pureTranslate;
@@ -83,15 +103,13 @@
void precache(const SkPaint* paint, const char* text, int numGlyphs, const SkMatrix& matrix);
void endPrecaching();
- // bounds is an out parameter
bool renderPosText(const SkPaint* paint, const Rect* clip, const char *text,
- uint32_t startIndex, uint32_t len, int numGlyphs, int x, int y, const float* positions,
- Rect* bounds, TextDrawFunctor* functor, bool forceFinish = true);
+ int numGlyphs, int x, int y, const float* positions,
+ Rect* outBounds, TextDrawFunctor* functor, bool forceFinish = true);
- // bounds is an out parameter
bool renderTextOnPath(const SkPaint* paint, const Rect* clip, const char *text,
- uint32_t startIndex, uint32_t len, int numGlyphs, const SkPath* path,
- float hOffset, float vOffset, Rect* bounds, TextDrawFunctor* functor);
+ int numGlyphs, const SkPath* path,
+ float hOffset, float vOffset, Rect* outBounds, TextDrawFunctor* functor);
struct DropShadow {
uint32_t width;
@@ -103,8 +121,8 @@
// After renderDropShadow returns, the called owns the memory in DropShadow.image
// and is responsible for releasing it when it's done with it
- DropShadow renderDropShadow(const SkPaint* paint, const char *text, uint32_t startIndex,
- uint32_t len, int numGlyphs, float radius, const float* positions);
+ DropShadow renderDropShadow(const SkPaint* paint, const char *text, int numGlyphs,
+ float radius, const float* positions);
void setTextureFiltering(bool linearFiltering) {
mLinearFiltering = linearFiltering;
diff --git a/libs/hwui/FrameInfoVisualizer.cpp b/libs/hwui/FrameInfoVisualizer.cpp
index b416615..b7dd3b7 100644
--- a/libs/hwui/FrameInfoVisualizer.cpp
+++ b/libs/hwui/FrameInfoVisualizer.cpp
@@ -16,6 +16,7 @@
#include "FrameInfoVisualizer.h"
#include "OpenGLRenderer.h"
+#include "utils/Color.h"
#include <cutils/compiler.h>
#include <array>
@@ -27,19 +28,19 @@
#define PROFILE_DRAW_THRESHOLD_STROKE_WIDTH 2
#define PROFILE_DRAW_DP_PER_MS 7
+namespace android {
+namespace uirenderer {
+
// Must be NUM_ELEMENTS in size
-static const SkColor THRESHOLD_COLOR = 0xff5faa4d;
-static const SkColor BAR_FAST_ALPHA = 0x8F000000;
-static const SkColor BAR_JANKY_ALPHA = 0xDF000000;
+static const SkColor THRESHOLD_COLOR = Color::Green_500;
+static const SkColor BAR_FAST_MASK = 0x8FFFFFFF;
+static const SkColor BAR_JANKY_MASK = 0xDFFFFFFF;
// We could get this from TimeLord and use the actual frame interval, but
// this is good enough
#define FRAME_THRESHOLD 16
#define FRAME_THRESHOLD_NS 16000000
-namespace android {
-namespace uirenderer {
-
struct BarSegment {
FrameInfoIndex start;
FrameInfoIndex end;
@@ -47,13 +48,13 @@
};
static const std::array<BarSegment,7> Bar {{
- { FrameInfoIndex::IntendedVsync, FrameInfoIndex::HandleInputStart, 0x00796B },
- { FrameInfoIndex::HandleInputStart, FrameInfoIndex::PerformTraversalsStart, 0x388E3C },
- { FrameInfoIndex::PerformTraversalsStart, FrameInfoIndex::DrawStart, 0x689F38},
- { FrameInfoIndex::DrawStart, FrameInfoIndex::SyncStart, 0x2196F3},
- { FrameInfoIndex::SyncStart, FrameInfoIndex::IssueDrawCommandsStart, 0x4FC3F7},
- { FrameInfoIndex::IssueDrawCommandsStart, FrameInfoIndex::SwapBuffers, 0xF44336},
- { FrameInfoIndex::SwapBuffers, FrameInfoIndex::FrameCompleted, 0xFF9800},
+ { FrameInfoIndex::IntendedVsync, FrameInfoIndex::HandleInputStart, Color::Teal_700 },
+ { FrameInfoIndex::HandleInputStart, FrameInfoIndex::PerformTraversalsStart, Color::Green_700 },
+ { FrameInfoIndex::PerformTraversalsStart, FrameInfoIndex::DrawStart, Color::LightGreen_700 },
+ { FrameInfoIndex::DrawStart, FrameInfoIndex::SyncStart, Color::Blue_500 },
+ { FrameInfoIndex::SyncStart, FrameInfoIndex::IssueDrawCommandsStart, Color::LightBlue_300 },
+ { FrameInfoIndex::IssueDrawCommandsStart, FrameInfoIndex::SwapBuffers, Color::Red_500},
+ { FrameInfoIndex::SwapBuffers, FrameInfoIndex::FrameCompleted, Color::Orange_500},
}};
static int dpToPx(int dp, float density) {
@@ -197,9 +198,9 @@
SkPaint paint;
for (size_t i = 0; i < Bar.size(); i++) {
nextBarSegment(Bar[i].start, Bar[i].end);
- paint.setColor(Bar[i].color | BAR_FAST_ALPHA);
+ paint.setColor(Bar[i].color & BAR_FAST_MASK);
canvas->drawRects(mFastRects.get(), mNumFastRects * 4, &paint);
- paint.setColor(Bar[i].color | BAR_JANKY_ALPHA);
+ paint.setColor(Bar[i].color & BAR_JANKY_MASK);
canvas->drawRects(mJankyRects.get(), mNumJankyRects * 4, &paint);
}
}
diff --git a/libs/hwui/OpReorderer.cpp b/libs/hwui/OpReorderer.cpp
index 80efaed..9cbd9c2d 100644
--- a/libs/hwui/OpReorderer.cpp
+++ b/libs/hwui/OpReorderer.cpp
@@ -18,12 +18,13 @@
#include "LayerUpdateQueue.h"
#include "RenderNode.h"
+#include "renderstate/OffscreenBufferPool.h"
#include "utils/FatVector.h"
#include "utils/PaintUtils.h"
+#include "utils/TraceUtils.h"
#include <SkCanvas.h>
#include <SkPathOps.h>
-#include <utils/Trace.h>
#include <utils/TypeHelpers.h>
namespace android {
@@ -33,8 +34,8 @@
public:
BatchBase(batchid_t batchId, BakedOpState* op, bool merging)
- : mBatchId(batchId)
- , mMerging(merging) {
+ : mBatchId(batchId)
+ , mMerging(merging) {
mBounds = op->computedState.clippedBounds;
mOps.push_back(op);
}
@@ -207,9 +208,10 @@
};
OpReorderer::LayerReorderer::LayerReorderer(uint32_t width, uint32_t height,
- const BeginLayerOp* beginLayerOp, RenderNode* renderNode)
+ const Rect& repaintRect, const BeginLayerOp* beginLayerOp, RenderNode* renderNode)
: width(width)
, height(height)
+ , repaintRect(repaintRect)
, offscreenBuffer(renderNode ? renderNode->getLayer() : nullptr)
, beginLayerOp(beginLayerOp)
, renderNode(renderNode) {}
@@ -309,28 +311,36 @@
OpReorderer::OpReorderer(const LayerUpdateQueue& layers, const SkRect& clip,
uint32_t viewportWidth, uint32_t viewportHeight,
- const std::vector< sp<RenderNode> >& nodes)
+ const std::vector< sp<RenderNode> >& nodes, const Vector3& lightCenter)
: mCanvasState(*this) {
ATRACE_NAME("prepare drawing commands");
- mLayerReorderers.emplace_back(viewportWidth, viewportHeight);
- mLayerStack.push_back(0);
+ mLayerReorderers.reserve(layers.entries().size());
+ mLayerStack.reserve(layers.entries().size());
+
+ // Prepare to defer Fbo0
+ mLayerReorderers.emplace_back(viewportWidth, viewportHeight, Rect(clip));
+ mLayerStack.push_back(0);
mCanvasState.initializeSaveStack(viewportWidth, viewportHeight,
clip.fLeft, clip.fTop, clip.fRight, clip.fBottom,
- Vector3());
+ lightCenter);
// Render all layers to be updated, in order. Defer in reverse order, so that they'll be
// updated in the order they're passed in (mLayerReorderers are issued to Renderer in reverse)
for (int i = layers.entries().size() - 1; i >= 0; i--) {
RenderNode* layerNode = layers.entries()[i].renderNode;
const Rect& layerDamage = layers.entries()[i].damage;
+ layerNode->computeOrdering();
- saveForLayer(layerNode->getWidth(), layerNode->getHeight(), nullptr, layerNode);
- mCanvasState.writableSnapshot()->setClip(
- layerDamage.left, layerDamage.top, layerDamage.right, layerDamage.bottom);
+ // map current light center into RenderNode's coordinate space
+ Vector3 lightCenter = mCanvasState.currentSnapshot()->getRelativeLightCenter();
+ layerNode->getLayer()->inverseTransformInWindow.mapPoint3d(lightCenter);
+
+ saveForLayer(layerNode->getWidth(), layerNode->getHeight(), 0, 0,
+ layerDamage, lightCenter, nullptr, layerNode);
if (layerNode->getDisplayList()) {
- deferImpl(*(layerNode->getDisplayList()));
+ deferNodeOps(*layerNode);
}
restoreForLayer();
}
@@ -338,6 +348,7 @@
// Defer Fbo0
for (const sp<RenderNode>& node : nodes) {
if (node->nothingToDraw()) continue;
+ node->computeOrdering();
int count = mCanvasState.save(SkCanvas::kClip_SaveFlag | SkCanvas::kMatrix_SaveFlag);
deferNodePropsAndOps(*node);
@@ -345,34 +356,104 @@
}
}
-OpReorderer::OpReorderer(int viewportWidth, int viewportHeight, const DisplayList& displayList)
- : mCanvasState(*this) {
- ATRACE_NAME("prepare drawing commands");
- mLayerReorderers.emplace_back(viewportWidth, viewportHeight);
- mLayerStack.push_back(0);
-
- mCanvasState.initializeSaveStack(viewportWidth, viewportHeight,
- 0, 0, viewportWidth, viewportHeight, Vector3());
- deferImpl(displayList);
-}
-
void OpReorderer::onViewportInitialized() {}
void OpReorderer::onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) {}
void OpReorderer::deferNodePropsAndOps(RenderNode& node) {
- if (node.applyViewProperties(mCanvasState, mAllocator)) {
- // not rejected so render
+ const RenderProperties& properties = node.properties();
+ const Outline& outline = properties.getOutline();
+ if (properties.getAlpha() <= 0
+ || (outline.getShouldClip() && outline.isEmpty())
+ || properties.getScaleX() == 0
+ || properties.getScaleY() == 0) {
+ return; // rejected
+ }
+
+ if (properties.getLeft() != 0 || properties.getTop() != 0) {
+ mCanvasState.translate(properties.getLeft(), properties.getTop());
+ }
+ if (properties.getStaticMatrix()) {
+ mCanvasState.concatMatrix(*properties.getStaticMatrix());
+ } else if (properties.getAnimationMatrix()) {
+ mCanvasState.concatMatrix(*properties.getAnimationMatrix());
+ }
+ if (properties.hasTransformMatrix()) {
+ if (properties.isTransformTranslateOnly()) {
+ mCanvasState.translate(properties.getTranslationX(), properties.getTranslationY());
+ } else {
+ mCanvasState.concatMatrix(*properties.getTransformMatrix());
+ }
+ }
+
+ const int width = properties.getWidth();
+ const int height = properties.getHeight();
+
+ Rect saveLayerBounds; // will be set to non-empty if saveLayer needed
+ const bool isLayer = properties.effectiveLayerType() != LayerType::None;
+ int clipFlags = properties.getClippingFlags();
+ if (properties.getAlpha() < 1) {
+ if (isLayer) {
+ clipFlags &= ~CLIP_TO_BOUNDS; // bounds clipping done by layer
+ }
+ if (CC_LIKELY(isLayer || !properties.getHasOverlappingRendering())) {
+ // simply scale rendering content's alpha
+ mCanvasState.scaleAlpha(properties.getAlpha());
+ } else {
+ // schedule saveLayer by initializing saveLayerBounds
+ saveLayerBounds.set(0, 0, width, height);
+ if (clipFlags) {
+ properties.getClippingRectForFlags(clipFlags, &saveLayerBounds);
+ clipFlags = 0; // all clipping done by savelayer
+ }
+ }
+
+ if (CC_UNLIKELY(ATRACE_ENABLED() && properties.promotedToLayer())) {
+ // pretend alpha always causes savelayer to warn about
+ // performance problem affecting old versions
+ ATRACE_FORMAT("%s alpha caused saveLayer %dx%d", node.getName(), width, height);
+ }
+ }
+ if (clipFlags) {
+ Rect clipRect;
+ properties.getClippingRectForFlags(clipFlags, &clipRect);
+ mCanvasState.clipRect(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom,
+ SkRegion::kIntersect_Op);
+ }
+
+ if (properties.getRevealClip().willClip()) {
+ Rect bounds;
+ properties.getRevealClip().getBounds(&bounds);
+ mCanvasState.setClippingRoundRect(mAllocator,
+ bounds, properties.getRevealClip().getRadius());
+ } else if (properties.getOutline().willClip()) {
+ mCanvasState.setClippingOutline(mAllocator, &(properties.getOutline()));
+ }
+
+ if (!mCanvasState.quickRejectConservative(0, 0, width, height)) {
+ // not rejected, so defer render as either Layer, or direct (possibly wrapped in saveLayer)
if (node.getLayer()) {
// HW layer
LayerOp* drawLayerOp = new (mAllocator) LayerOp(node);
BakedOpState* bakedOpState = tryBakeOpState(*drawLayerOp);
if (bakedOpState) {
- // Layer will be drawn into parent layer (which is now current, since we popped mLayerStack)
+ // Node's layer already deferred, schedule it to render into parent layer
currentLayer().deferUnmergeableOp(mAllocator, bakedOpState, OpBatchType::Bitmap);
}
+ } else if (CC_UNLIKELY(!saveLayerBounds.isEmpty())) {
+ // draw DisplayList contents within temporary, since persisted layer could not be used.
+ // (temp layers are clipped to viewport, since they don't persist offscreen content)
+ SkPaint saveLayerPaint;
+ saveLayerPaint.setAlpha(properties.getAlpha());
+ onBeginLayerOp(*new (mAllocator) BeginLayerOp(
+ saveLayerBounds,
+ Matrix4::identity(),
+ saveLayerBounds,
+ &saveLayerPaint));
+ deferNodeOps(node);
+ onEndLayerOp(*new (mAllocator) EndLayerOp());
} else {
- deferImpl(*(node.getDisplayList()));
+ deferNodeOps(node);
}
}
}
@@ -508,7 +589,8 @@
}
ShadowOp* shadowOp = new (mAllocator) ShadowOp(casterNodeOp, casterAlpha, casterPath,
- mCanvasState.getLocalClipBounds());
+ mCanvasState.getLocalClipBounds(),
+ mCanvasState.currentSnapshot()->getRelativeLightCenter());
BakedOpState* bakedOpState = BakedOpState::tryShadowOpConstruct(
mAllocator, *mCanvasState.currentSnapshot(), shadowOp);
if (CC_LIKELY(bakedOpState)) {
@@ -516,18 +598,53 @@
}
}
+void OpReorderer::deferProjectedChildren(const RenderNode& renderNode) {
+ const SkPath* projectionReceiverOutline = renderNode.properties().getOutline().getPath();
+ int count = mCanvasState.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
+
+ // can't be null, since DL=null node rejection happens before deferNodePropsAndOps
+ const DisplayList& displayList = *(renderNode.getDisplayList());
+
+ const RecordedOp* op = (displayList.getOps()[displayList.projectionReceiveIndex]);
+ const RenderNodeOp* backgroundOp = static_cast<const RenderNodeOp*>(op);
+ const RenderProperties& backgroundProps = backgroundOp->renderNode->properties();
+
+ // Transform renderer to match background we're projecting onto
+ // (by offsetting canvas by translationX/Y of background rendernode, since only those are set)
+ mCanvasState.translate(backgroundProps.getTranslationX(), backgroundProps.getTranslationY());
+
+ // If the projection receiver has an outline, we mask projected content to it
+ // (which we know, apriori, are all tessellated paths)
+ mCanvasState.setProjectionPathMask(mAllocator, projectionReceiverOutline);
+
+ // draw projected nodes
+ for (size_t i = 0; i < renderNode.mProjectedNodes.size(); i++) {
+ RenderNodeOp* childOp = renderNode.mProjectedNodes[i];
+
+ int restoreTo = mCanvasState.save(SkCanvas::kMatrix_SaveFlag);
+ mCanvasState.concatMatrix(childOp->transformFromCompositingAncestor);
+ deferRenderNodeOp(*childOp);
+ mCanvasState.restoreToCount(restoreTo);
+ }
+
+ mCanvasState.restoreToCount(count);
+}
+
/**
* Used to define a list of lambdas referencing private OpReorderer::onXXXXOp() methods.
*
- * This allows opIds embedded in the RecordedOps to be used for dispatching to these lambdas. E.g. a
- * BitmapOp op then would be dispatched to OpReorderer::onBitmapOp(const BitmapOp&)
+ * This allows opIds embedded in the RecordedOps to be used for dispatching to these lambdas.
+ * E.g. a BitmapOp op then would be dispatched to OpReorderer::onBitmapOp(const BitmapOp&)
*/
#define OP_RECEIVER(Type) \
[](OpReorderer& reorderer, const RecordedOp& op) { reorderer.on##Type(static_cast<const Type&>(op)); },
-void OpReorderer::deferImpl(const DisplayList& displayList) {
+void OpReorderer::deferNodeOps(const RenderNode& renderNode) {
static std::function<void(OpReorderer& reorderer, const RecordedOp&)> receivers[] = {
MAP_OPS(OP_RECEIVER)
};
+
+ // can't be null, since DL=null node rejection happens before deferNodePropsAndOps
+ const DisplayList& displayList = *(renderNode.getDisplayList());
for (const DisplayList::Chunk& chunk : displayList.getChunks()) {
FatVector<ZRenderNodeOpPair, 16> zTranslatedNodes;
buildZSortedChildList(&zTranslatedNodes, displayList, chunk);
@@ -536,6 +653,12 @@
for (size_t opIndex = chunk.beginOpIndex; opIndex < chunk.endOpIndex; opIndex++) {
const RecordedOp* op = displayList.getOps()[opIndex];
receivers[op->opId](*this, *op);
+
+ if (CC_UNLIKELY(!renderNode.mProjectedNodes.empty()
+ && displayList.projectionReceiveIndex >= 0
+ && static_cast<int>(opIndex) == displayList.projectionReceiveIndex)) {
+ deferProjectedChildren(renderNode);
+ }
}
defer3dChildren(ChildrenSelectMode::Positive, zTranslatedNodes);
}
@@ -577,6 +700,13 @@
currentLayer().deferMergeableOp(mAllocator, bakedStateOp, OpBatchType::Bitmap, mergeId);
}
+void OpReorderer::onLinesOp(const LinesOp& op) {
+ BakedOpState* bakedStateOp = tryBakeOpState(op);
+ if (!bakedStateOp) return; // quick rejected
+ currentLayer().deferUnmergeableOp(mAllocator, bakedStateOp, OpBatchType::Vertices);
+
+}
+
void OpReorderer::onRectOp(const RectOp& op) {
BakedOpState* bakedStateOp = tryBakeOpState(op);
if (!bakedStateOp) return; // quick rejected
@@ -589,17 +719,34 @@
currentLayer().deferUnmergeableOp(mAllocator, bakedStateOp, OpBatchType::Vertices);
}
-void OpReorderer::saveForLayer(uint32_t layerWidth, uint32_t layerHeight,
- const BeginLayerOp* beginLayerOp, RenderNode* renderNode) {
+void OpReorderer::onTextOp(const TextOp& op) {
+ BakedOpState* bakedStateOp = tryBakeOpState(op);
+ if (!bakedStateOp) return; // quick rejected
+ // TODO: better handling of shader (since we won't care about color then)
+ batchid_t batchId = op.paint->getColor() == SK_ColorBLACK
+ ? OpBatchType::Text : OpBatchType::ColorText;
+ mergeid_t mergeId = reinterpret_cast<mergeid_t>(op.paint->getColor());
+ currentLayer().deferMergeableOp(mAllocator, bakedStateOp, batchId, mergeId);
+}
+
+void OpReorderer::saveForLayer(uint32_t layerWidth, uint32_t layerHeight,
+ float contentTranslateX, float contentTranslateY,
+ const Rect& repaintRect,
+ const Vector3& lightCenter,
+ const BeginLayerOp* beginLayerOp, RenderNode* renderNode) {
mCanvasState.save(SkCanvas::kClip_SaveFlag | SkCanvas::kMatrix_SaveFlag);
- mCanvasState.writableSnapshot()->transform->loadIdentity();
mCanvasState.writableSnapshot()->initializeViewport(layerWidth, layerHeight);
mCanvasState.writableSnapshot()->roundRectClipState = nullptr;
+ mCanvasState.writableSnapshot()->setRelativeLightCenter(lightCenter);
+ mCanvasState.writableSnapshot()->transform->loadTranslate(
+ contentTranslateX, contentTranslateY, 0);
+ mCanvasState.writableSnapshot()->setClip(
+ repaintRect.left, repaintRect.top, repaintRect.right, repaintRect.bottom);
- // create a new layer, and push its index on the stack
+ // create a new layer repaint, and push its index on the stack
mLayerStack.push_back(mLayerReorderers.size());
- mLayerReorderers.emplace_back(layerWidth, layerHeight, beginLayerOp, renderNode);
+ mLayerReorderers.emplace_back(layerWidth, layerHeight, repaintRect, beginLayerOp, renderNode);
}
void OpReorderer::restoreForLayer() {
@@ -610,9 +757,48 @@
// TODO: test rejection at defer time, where the bounds become empty
void OpReorderer::onBeginLayerOp(const BeginLayerOp& op) {
- const uint32_t layerWidth = (uint32_t) op.unmappedBounds.getWidth();
- const uint32_t layerHeight = (uint32_t) op.unmappedBounds.getHeight();
- saveForLayer(layerWidth, layerHeight, &op, nullptr);
+ uint32_t layerWidth = (uint32_t) op.unmappedBounds.getWidth();
+ uint32_t layerHeight = (uint32_t) op.unmappedBounds.getHeight();
+
+ auto previous = mCanvasState.currentSnapshot();
+ Vector3 lightCenter = previous->getRelativeLightCenter();
+
+ // Combine all transforms used to present saveLayer content:
+ // parent content transform * canvas transform * bounds offset
+ Matrix4 contentTransform(*previous->transform);
+ contentTransform.multiply(op.localMatrix);
+ contentTransform.translate(op.unmappedBounds.left, op.unmappedBounds.top);
+
+ Matrix4 inverseContentTransform;
+ inverseContentTransform.loadInverse(contentTransform);
+
+ // map the light center into layer-relative space
+ inverseContentTransform.mapPoint3d(lightCenter);
+
+ // Clip bounds of temporary layer to parent's clip rect, so:
+ Rect saveLayerBounds(layerWidth, layerHeight);
+ // 1) transform Rect(width, height) into parent's space
+ // note: left/top offsets put in contentTransform above
+ contentTransform.mapRect(saveLayerBounds);
+ // 2) intersect with parent's clip
+ saveLayerBounds.doIntersect(previous->getRenderTargetClip());
+ // 3) and transform back
+ inverseContentTransform.mapRect(saveLayerBounds);
+ saveLayerBounds.doIntersect(Rect(layerWidth, layerHeight));
+ saveLayerBounds.roundOut();
+
+ // if bounds are reduced, will clip the layer's area by reducing required bounds...
+ layerWidth = saveLayerBounds.getWidth();
+ layerHeight = saveLayerBounds.getHeight();
+ // ...and shifting drawing content to account for left/top side clipping
+ float contentTranslateX = -saveLayerBounds.left;
+ float contentTranslateY = -saveLayerBounds.top;
+
+ saveForLayer(layerWidth, layerHeight,
+ contentTranslateX, contentTranslateY,
+ Rect(layerWidth, layerHeight),
+ lightCenter,
+ &op, nullptr);
}
void OpReorderer::onEndLayerOp(const EndLayerOp& /* ignored */) {
diff --git a/libs/hwui/OpReorderer.h b/libs/hwui/OpReorderer.h
index 2c30f0d..00df8b0 100644
--- a/libs/hwui/OpReorderer.h
+++ b/libs/hwui/OpReorderer.h
@@ -67,13 +67,13 @@
class LayerReorderer {
public:
// Create LayerReorderer for Fbo0
- LayerReorderer(uint32_t width, uint32_t height)
- : LayerReorderer(width, height, nullptr, nullptr) {};
+ LayerReorderer(uint32_t width, uint32_t height, const Rect& repaintRect)
+ : LayerReorderer(width, height, repaintRect, nullptr, nullptr) {};
// Create LayerReorderer for an offscreen layer, where beginLayerOp is present for a
// saveLayer, renderNode is present for a HW layer.
LayerReorderer(uint32_t width, uint32_t height,
- const BeginLayerOp* beginLayerOp, RenderNode* renderNode);
+ const Rect& repaintRect, const BeginLayerOp* beginLayerOp, RenderNode* renderNode);
// iterate back toward target to see if anything drawn since should overlap the new op
// if no target, merging ops still iterate to find similar batch to insert after
@@ -101,6 +101,7 @@
const uint32_t width;
const uint32_t height;
+ const Rect repaintRect;
OffscreenBuffer* offscreenBuffer;
const BeginLayerOp* beginLayerOp;
const RenderNode* renderNode;
@@ -116,14 +117,12 @@
// Maps batch ids to the most recent *non-merging* batch of that id
OpBatch* mBatchLookup[OpBatchType::Count] = { nullptr };
-
};
+
public:
OpReorderer(const LayerUpdateQueue& layers, const SkRect& clip,
uint32_t viewportWidth, uint32_t viewportHeight,
- const std::vector< sp<RenderNode> >& nodes);
-
- OpReorderer(int viewportWidth, int viewportHeight, const DisplayList& displayList);
+ const std::vector< sp<RenderNode> >& nodes, const Vector3& lightCenter);
virtual ~OpReorderer() {}
@@ -153,7 +152,7 @@
LayerReorderer& layer = mLayerReorderers[i];
if (layer.renderNode) {
// cached HW layer - can't skip layer if empty
- renderer.startRepaintLayer(layer.offscreenBuffer);
+ renderer.startRepaintLayer(layer.offscreenBuffer, layer.repaintRect);
layer.replayBakedOpsImpl((void*)&renderer, receivers);
renderer.endLayer();
} else if (!layer.empty()) { // save layer - skip entire layer if empty
@@ -164,7 +163,7 @@
}
const LayerReorderer& fbo0 = mLayerReorderers[0];
- renderer.startFrame(fbo0.width, fbo0.height);
+ renderer.startFrame(fbo0.width, fbo0.height, fbo0.repaintRect);
fbo0.replayBakedOpsImpl((void*)&renderer, receivers);
renderer.endFrame();
}
@@ -188,6 +187,9 @@
Positive
};
void saveForLayer(uint32_t layerWidth, uint32_t layerHeight,
+ float contentTranslateX, float contentTranslateY,
+ const Rect& repaintRect,
+ const Vector3& lightCenter,
const BeginLayerOp* beginLayerOp, RenderNode* renderNode);
void restoreForLayer();
@@ -197,16 +199,18 @@
return BakedOpState::tryConstruct(mAllocator, *mCanvasState.currentSnapshot(), recordedOp);
}
- // should always be surrounded by a save/restore pair
+ // should always be surrounded by a save/restore pair, and not called if DisplayList is null
void deferNodePropsAndOps(RenderNode& node);
- void deferShadow(const RenderNodeOp& casterOp);
-
- void deferImpl(const DisplayList& displayList);
-
template <typename V>
void defer3dChildren(ChildrenSelectMode mode, const V& zTranslatedNodes);
+ void deferShadow(const RenderNodeOp& casterOp);
+
+ void deferProjectedChildren(const RenderNode& renderNode);
+
+ void deferNodeOps(const RenderNode& renderNode);
+
void deferRenderNodeOp(const RenderNodeOp& op);
void replayBakedOpsImpl(void* arg, BakedOpDispatcher* receivers);
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 12c4607..e386b1c 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1950,7 +1950,7 @@
}
void OpenGLRenderer::drawTextShadow(const SkPaint* paint, const char* text,
- int bytesCount, int count, const float* positions,
+ int count, const float* positions,
FontRenderer& fontRenderer, int alpha, float x, float y) {
mCaches.textureState().activateTexture(0);
@@ -1963,7 +1963,7 @@
// if shader-based correction is enabled
mCaches.dropShadowCache.setFontRenderer(fontRenderer);
ShadowTexture* texture = mCaches.dropShadowCache.get(
- paint, text, bytesCount, count, textShadow.radius, positions);
+ paint, text, count, textShadow.radius, positions);
// If the drop shadow exceeds the max texture size or couldn't be
// allocated, skip drawing
if (!texture) return;
@@ -1991,57 +1991,6 @@
&& PaintUtils::getXfermode(paint->getXfermode()) == SkXfermode::kSrcOver_Mode;
}
-void OpenGLRenderer::drawPosText(const char* text, int bytesCount, int count,
- const float* positions, const SkPaint* paint) {
- if (text == nullptr || count == 0 || mState.currentlyIgnored() || canSkipText(paint)) {
- return;
- }
-
- // NOTE: Skia does not support perspective transform on drawPosText yet
- if (!currentTransform()->isSimple()) {
- return;
- }
-
- mRenderState.scissor().setEnabled(true);
-
- float x = 0.0f;
- float y = 0.0f;
- const bool pureTranslate = currentTransform()->isPureTranslate();
- if (pureTranslate) {
- x = floorf(x + currentTransform()->getTranslateX() + 0.5f);
- y = floorf(y + currentTransform()->getTranslateY() + 0.5f);
- }
-
- FontRenderer& fontRenderer = mCaches.fontRenderer.getFontRenderer();
- fontRenderer.setFont(paint, SkMatrix::I());
-
- int alpha = PaintUtils::getAlphaDirect(paint) * currentSnapshot()->alpha;
- SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(paint);
-
- if (CC_UNLIKELY(PaintUtils::hasTextShadow(paint))) {
- drawTextShadow(paint, text, bytesCount, count, positions, fontRenderer,
- alpha, 0.0f, 0.0f);
- }
-
- // Pick the appropriate texture filtering
- bool linearFilter = currentTransform()->changesBounds();
- if (pureTranslate && !linearFilter) {
- linearFilter = fabs(y - (int) y) > 0.0f || fabs(x - (int) x) > 0.0f;
- }
- fontRenderer.setTextureFiltering(linearFilter);
-
- const Rect& clip(pureTranslate ? writableSnapshot()->getRenderTargetClip() : writableSnapshot()->getLocalClip());
- Rect bounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f);
-
- TextDrawFunctor functor(this, x, y, pureTranslate, alpha, mode, paint);
- if (fontRenderer.renderPosText(paint, &clip, text, 0, bytesCount, count, x, y,
- positions, hasLayer() ? &bounds : nullptr, &functor)) {
- dirtyLayer(bounds.left, bounds.top, bounds.right, bounds.bottom, *currentTransform());
- mDirty = true;
- }
-
-}
-
bool OpenGLRenderer::findBestFontTransform(const mat4& transform, SkMatrix* outMatrix) const {
if (CC_LIKELY(transform.isPureTranslate())) {
outMatrix->setIdentity();
@@ -2166,7 +2115,7 @@
if (CC_UNLIKELY(PaintUtils::hasTextShadow(paint))) {
fontRenderer.setFont(paint, SkMatrix::I());
- drawTextShadow(paint, text, bytesCount, count, positions, fontRenderer,
+ drawTextShadow(paint, text, count, positions, fontRenderer,
alpha, oldX, oldY);
}
@@ -2195,17 +2144,22 @@
Rect layerBounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f);
bool status;
+#if HWUI_NEW_OPS
+ LOG_ALWAYS_FATAL("unsupported");
+ TextDrawFunctor functor(nullptr, nullptr, x, y, pureTranslate, alpha, mode, paint);
+#else
TextDrawFunctor functor(this, x, y, pureTranslate, alpha, mode, paint);
+#endif
// don't call issuedrawcommand, do it at end of batch
bool forceFinish = (drawOpMode != DrawOpMode::kDefer);
if (CC_UNLIKELY(paint->getTextAlign() != SkPaint::kLeft_Align)) {
SkPaint paintCopy(*paint);
paintCopy.setTextAlign(SkPaint::kLeft_Align);
- status = fontRenderer.renderPosText(&paintCopy, clip, text, 0, bytesCount, count, x, y,
+ status = fontRenderer.renderPosText(&paintCopy, clip, text, count, x, y,
positions, hasActiveLayer ? &layerBounds : nullptr, &functor, forceFinish);
} else {
- status = fontRenderer.renderPosText(paint, clip, text, 0, bytesCount, count, x, y,
+ status = fontRenderer.renderPosText(paint, clip, text, count, x, y,
positions, hasActiveLayer ? &layerBounds : nullptr, &functor, forceFinish);
}
@@ -2216,8 +2170,6 @@
dirtyLayerUnchecked(layerBounds, getRegion());
}
- drawTextDecorations(totalAdvance, oldX, oldY, paint);
-
mDirty = true;
}
@@ -2236,12 +2188,17 @@
int alpha = PaintUtils::getAlphaDirect(paint) * currentSnapshot()->alpha;
SkXfermode::Mode mode = PaintUtils::getXfermodeDirect(paint);
+#if HWUI_NEW_OPS
+ LOG_ALWAYS_FATAL("unsupported");
+ TextDrawFunctor functor(nullptr, nullptr, 0.0f, 0.0f, false, alpha, mode, paint);
+#else
TextDrawFunctor functor(this, 0.0f, 0.0f, false, alpha, mode, paint);
+#endif
const Rect* clip = &writableSnapshot()->getLocalClip();
Rect bounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f);
- if (fontRenderer.renderTextOnPath(paint, clip, text, 0, bytesCount, count, path,
+ if (fontRenderer.renderTextOnPath(paint, clip, text, count, path,
hOffset, vOffset, hasLayer() ? &bounds : nullptr, &functor)) {
dirtyLayer(bounds.left, bounds.top, bounds.right, bounds.bottom, *currentTransform());
mDirty = true;
@@ -2375,56 +2332,6 @@
renderGlop(glop);
}
-// Same values used by Skia
-#define kStdStrikeThru_Offset (-6.0f / 21.0f)
-#define kStdUnderline_Offset (1.0f / 9.0f)
-#define kStdUnderline_Thickness (1.0f / 18.0f)
-
-void OpenGLRenderer::drawTextDecorations(float underlineWidth, float x, float y,
- const SkPaint* paint) {
- // Handle underline and strike-through
- uint32_t flags = paint->getFlags();
- if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) {
- SkPaint paintCopy(*paint);
-
- if (CC_LIKELY(underlineWidth > 0.0f)) {
- const float textSize = paintCopy.getTextSize();
- const float strokeWidth = std::max(textSize * kStdUnderline_Thickness, 1.0f);
-
- const float left = x;
- float top = 0.0f;
-
- int linesCount = 0;
- if (flags & SkPaint::kUnderlineText_Flag) linesCount++;
- if (flags & SkPaint::kStrikeThruText_Flag) linesCount++;
-
- const int pointsCount = 4 * linesCount;
- float points[pointsCount];
- int currentPoint = 0;
-
- if (flags & SkPaint::kUnderlineText_Flag) {
- top = y + textSize * kStdUnderline_Offset;
- points[currentPoint++] = left;
- points[currentPoint++] = top;
- points[currentPoint++] = left + underlineWidth;
- points[currentPoint++] = top;
- }
-
- if (flags & SkPaint::kStrikeThruText_Flag) {
- top = y + textSize * kStdStrikeThru_Offset;
- points[currentPoint++] = left;
- points[currentPoint++] = top;
- points[currentPoint++] = left + underlineWidth;
- points[currentPoint++] = top;
- }
-
- paintCopy.setStrokeWidth(strokeWidth);
-
- drawLines(&points[0], pointsCount, &paintCopy);
- }
- }
-}
-
void OpenGLRenderer::drawRects(const float* rects, int count, const SkPaint* paint) {
if (mState.currentlyIgnored()) {
return;
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index 400c225..84bc9b0 100755
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -193,8 +193,6 @@
void drawPoints(const float* points, int count, const SkPaint* paint);
void drawTextOnPath(const char* text, int bytesCount, int count, const SkPath* path,
float hOffset, float vOffset, const SkPaint* paint);
- void drawPosText(const char* text, int bytesCount, int count,
- const float* positions, const SkPaint* paint);
void drawText(const char* text, int bytesCount, int count, float x, float y,
const float* positions, const SkPaint* paint, float totalAdvance, const Rect& bounds,
DrawOpMode drawOpMode = DrawOpMode::kImmediate);
@@ -637,24 +635,11 @@
*/
void drawConvexPath(const SkPath& path, const SkPaint* paint);
- /**
- * Draws text underline and strike-through if needed.
- *
- * @param text The text to decor
- * @param bytesCount The number of bytes in the text
- * @param totalAdvance The total advance in pixels, defines underline/strikethrough length
- * @param x The x coordinate where the text will be drawn
- * @param y The y coordinate where the text will be drawn
- * @param paint The paint to draw the text with
- */
- void drawTextDecorations(float totalAdvance, float x, float y, const SkPaint* paint);
-
/**
* Draws shadow layer on text (with optional positions).
*
* @param paint The paint to draw the shadow with
* @param text The text to draw
- * @param bytesCount The number of bytes in the text
* @param count The number of glyphs in the text
* @param positions The x, y positions of individual glyphs (or NULL)
* @param fontRenderer The font renderer object
@@ -662,7 +647,7 @@
* @param x The x coordinate where the shadow will be drawn
* @param y The y coordinate where the shadow will be drawn
*/
- void drawTextShadow(const SkPaint* paint, const char* text, int bytesCount, int count,
+ void drawTextShadow(const SkPaint* paint, const char* text, int count,
const float* positions, FontRenderer& fontRenderer, int alpha,
float x, float y);
diff --git a/libs/hwui/PathParser.cpp b/libs/hwui/PathParser.cpp
index 61b9d21..4e9ac9c 100644
--- a/libs/hwui/PathParser.cpp
+++ b/libs/hwui/PathParser.cpp
@@ -18,6 +18,7 @@
#include "jni.h"
+#include <errno.h>
#include <utils/Log.h>
#include <sstream>
#include <stdlib.h>
@@ -97,14 +98,31 @@
*outEndPosition = currentIndex;
}
+static float parseFloat(PathParser::ParseResult* result, const char* startPtr, size_t expectedLength) {
+ char* endPtr = NULL;
+ float currentValue = strtof(startPtr, &endPtr);
+ if ((currentValue == HUGE_VALF || currentValue == -HUGE_VALF) && errno == ERANGE) {
+ result->failureOccurred = true;
+ result->failureMessage = "Float out of range: ";
+ result->failureMessage.append(startPtr, expectedLength);
+ }
+ if (currentValue == 0 && endPtr == startPtr) {
+ // No conversion is done.
+ result->failureOccurred = true;
+ result->failureMessage = "Float format error when parsing: ";
+ result->failureMessage.append(startPtr, expectedLength);
+ }
+ return currentValue;
+}
+
/**
-* Parse the floats in the string.
-* This is an optimized version of parseFloat(s.split(",|\\s"));
-*
-* @param s the string containing a command and list of floats
-* @return array of floats
-*/
-static void getFloats(std::vector<float>* outPoints, const char* pathStr, int start, int end) {
+ * Parse the floats in the string.
+ *
+ * @param s the string containing a command and list of floats
+ * @return true on success
+ */
+static void getFloats(std::vector<float>* outPoints, PathParser::ParseResult* result,
+ const char* pathStr, int start, int end) {
if (pathStr[start] == 'z' || pathStr[start] == 'Z') {
return;
@@ -120,7 +138,12 @@
extract(&endPosition, &endWithNegOrDot, pathStr, startPosition, end);
if (startPosition < endPosition) {
- outPoints->push_back(strtof(&pathStr[startPosition], NULL));
+ float currentValue = parseFloat(result, &pathStr[startPosition],
+ end - startPosition);
+ if (result->failureOccurred) {
+ return;
+ }
+ outPoints->push_back(currentValue);
}
if (endWithNegOrDot) {
@@ -130,10 +153,14 @@
startPosition = endPosition + 1;
}
}
+ return;
}
-void PathParser::getPathDataFromString(PathData* data, const char* pathStr, size_t strLen) {
+void PathParser::getPathDataFromString(PathData* data, ParseResult* result,
+ const char* pathStr, size_t strLen) {
if (pathStr == NULL) {
+ result->failureOccurred = true;
+ result->failureMessage = "Path string cannot be NULL.";
return;
}
@@ -143,7 +170,10 @@
while (end < strLen) {
end = nextStart(pathStr, strLen, end);
std::vector<float> points;
- getFloats(&points, pathStr, start, end);
+ getFloats(&points, result, pathStr, start, end);
+ if (result->failureOccurred) {
+ return;
+ }
data->verbs.push_back(pathStr[start]);
data->verbSizes.push_back(points.size());
data->points.insert(data->points.end(), points.begin(), points.end());
@@ -151,16 +181,11 @@
end++;
}
- if ((end - start) == 1 && pathStr[start] != '\0') {
+ if ((end - start) == 1 && start < strLen) {
data->verbs.push_back(pathStr[start]);
data->verbSizes.push_back(0);
}
-
- int i = 0;
- while(pathStr[i] != '\0') {
- i++;
- }
-
+ return;
}
void PathParser::dump(const PathData& data) {
@@ -169,6 +194,7 @@
for (size_t i = 0; i < data.verbs.size(); i++) {
std::ostringstream os;
os << data.verbs[i];
+ os << ", verb size: " << data.verbSizes[i];
for (size_t j = 0; j < data.verbSizes[i]; j++) {
os << " " << data.points[start + j];
}
@@ -183,16 +209,20 @@
ALOGD("points are : %s", os.str().c_str());
}
-bool PathParser::parseStringForSkPath(SkPath* skPath, const char* pathStr, size_t strLen) {
+void PathParser::parseStringForSkPath(SkPath* skPath, ParseResult* result, const char* pathStr, size_t strLen) {
PathData pathData;
- getPathDataFromString(&pathData, pathStr, strLen);
-
+ getPathDataFromString(&pathData, result, pathStr, strLen);
+ if (result->failureOccurred) {
+ return;
+ }
// Check if there is valid data coming out of parsing the string.
if (pathData.verbs.size() == 0) {
- return false;
+ result->failureOccurred = true;
+ result->failureMessage = "No verbs found in the string for pathData";
+ return;
}
- VectorDrawablePath::verbsToPath(skPath, &pathData);
- return true;
+ VectorDrawableUtils::verbsToPath(skPath, pathData);
+ return;
}
}; // namespace uirenderer
diff --git a/libs/hwui/PathParser.h b/libs/hwui/PathParser.h
index d30bb0f..4c87b18 100644
--- a/libs/hwui/PathParser.h
+++ b/libs/hwui/PathParser.h
@@ -18,22 +18,31 @@
#define ANDROID_HWUI_PATHPARSER_H
#include "VectorDrawablePath.h"
+#include "utils/VectorDrawableUtils.h"
#include <jni.h>
#include <android/log.h>
#include <cutils/compiler.h>
+#include <string>
+
namespace android {
namespace uirenderer {
+
class PathParser {
public:
+ struct ANDROID_API ParseResult {
+ bool failureOccurred = false;
+ std::string failureMessage;
+ };
/**
* Parse the string literal and create a Skia Path. Return true on success.
*/
- ANDROID_API static bool parseStringForSkPath(SkPath* outPath, const char* pathStr,
- size_t strLength);
- static void getPathDataFromString(PathData* outData, const char* pathStr, size_t strLength);
+ ANDROID_API static void parseStringForSkPath(SkPath* outPath, ParseResult* result,
+ const char* pathStr, size_t strLength);
+ ANDROID_API static void getPathDataFromString(PathData* outData, ParseResult* result,
+ const char* pathStr, size_t strLength);
static void dump(const PathData& data);
};
diff --git a/libs/hwui/RecordedOp.h b/libs/hwui/RecordedOp.h
index bb7a0a7c..b4a201e 100644
--- a/libs/hwui/RecordedOp.h
+++ b/libs/hwui/RecordedOp.h
@@ -17,10 +17,12 @@
#ifndef ANDROID_HWUI_RECORDED_OP_H
#define ANDROID_HWUI_RECORDED_OP_H
-#include "utils/LinearAllocator.h"
-#include "Rect.h"
+#include "font/FontUtil.h"
#include "Matrix.h"
+#include "Rect.h"
#include "RenderNode.h"
+#include "utils/LinearAllocator.h"
+#include "Vector.h"
#include "SkXfermode.h"
@@ -41,10 +43,12 @@
*/
#define MAP_OPS(OP_FN) \
OP_FN(BitmapOp) \
+ OP_FN(LinesOp) \
OP_FN(RectOp) \
OP_FN(RenderNodeOp) \
OP_FN(ShadowOp) \
OP_FN(SimpleRectsOp) \
+ OP_FN(TextOp) \
OP_FN(BeginLayerOp) \
OP_FN(EndLayerOp) \
OP_FN(LayerOp)
@@ -93,10 +97,24 @@
RenderNodeOp(BASE_PARAMS_PAINTLESS, RenderNode* renderNode)
: SUPER_PAINTLESS(RenderNodeOp)
, renderNode(renderNode) {}
- RenderNode * renderNode; // not const, since drawing modifies it (somehow...)
+ RenderNode * renderNode; // not const, since drawing modifies it
+
+ /**
+ * Holds the transformation between the projection surface ViewGroup and this RenderNode
+ * drawing instance. Represents any translations / transformations done within the drawing of
+ * the compositing ancestor ViewGroup's draw, before the draw of the View represented by this
+ * DisplayList draw instance.
+ *
+ * Note: doesn't include transformation within the RenderNode, or its properties.
+ */
+ Matrix4 transformFromCompositingAncestor;
bool skipInOrderDraw = false;
};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Standard Ops
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
struct BitmapOp : RecordedOp {
BitmapOp(BASE_PARAMS, const SkBitmap* bitmap)
: SUPER(BitmapOp)
@@ -105,6 +123,15 @@
// TODO: asset atlas/texture id lookup?
};
+struct LinesOp : RecordedOp {
+ LinesOp(BASE_PARAMS, const float* points, const int floatCount)
+ : SUPER(LinesOp)
+ , points(points)
+ , floatCount(floatCount) {}
+ const float* points;
+ const int floatCount;
+};
+
struct RectOp : RecordedOp {
RectOp(BASE_PARAMS)
: SUPER(RectOp) {}
@@ -116,15 +143,17 @@
* Uses invalid/empty bounds and matrix since ShadowOp bounds aren't known at defer time,
* and are resolved dynamically, and transform isn't needed.
*
- * State construction handles these properties specially.
+ * State construction handles these properties specially, ignoring matrix/bounds.
*/
struct ShadowOp : RecordedOp {
- ShadowOp(const RenderNodeOp& casterOp, float casterAlpha, const SkPath* casterPath, const Rect& clipRect)
+ ShadowOp(const RenderNodeOp& casterOp, float casterAlpha, const SkPath* casterPath,
+ const Rect& clipRect, const Vector3& lightCenter)
: RecordedOp(RecordedOpId::ShadowOp, Rect(), Matrix4::identity(), clipRect, nullptr)
, shadowMatrixXY(casterOp.localMatrix)
, shadowMatrixZ(casterOp.localMatrix)
, casterAlpha(casterAlpha)
- , casterPath(casterPath) {
+ , casterPath(casterPath)
+ , lightCenter(lightCenter) {
const RenderNode& node = *casterOp.renderNode;
node.applyViewPropertyTransforms(shadowMatrixXY, false);
node.applyViewPropertyTransforms(shadowMatrixZ, true);
@@ -133,6 +162,7 @@
Matrix4 shadowMatrixZ;
const float casterAlpha;
const SkPath* casterPath;
+ const Vector3 lightCenter;
};
struct SimpleRectsOp : RecordedOp { // Filled, no AA (TODO: better name?)
@@ -144,6 +174,27 @@
const size_t vertexCount;
};
+struct TextOp : RecordedOp {
+ TextOp(BASE_PARAMS, const glyph_t* glyphs, const float* positions, int glyphCount,
+ float x, float y)
+ : SUPER(TextOp)
+ , glyphs(glyphs)
+ , positions(positions)
+ , glyphCount(glyphCount)
+ , x(x)
+ , y(y) {}
+ const glyph_t* glyphs;
+ const float* positions;
+ const int glyphCount;
+ const float x;
+ const float y;
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Layers
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
/**
* Stateful operation! denotes the creation of an off-screen layer,
* and that commands following will render into it.
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index e988555..69c686e 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -156,7 +156,7 @@
snapshot.flags |= Snapshot::kFlagFboTarget | Snapshot::kFlagIsFboLayer;
snapshot.initializeViewport(untransformedBounds.getWidth(), untransformedBounds.getHeight());
- snapshot.resetTransform(-untransformedBounds.left, -untransformedBounds.top, 0.0f);
+ snapshot.transform->loadTranslate(-untransformedBounds.left, -untransformedBounds.top, 0.0f);
Rect clip = layerBounds;
clip.translate(-untransformedBounds.left, -untransformedBounds.top);
@@ -230,12 +230,9 @@
void RecordingCanvas::drawPaint(const SkPaint& paint) {
// TODO: more efficient recording?
- Matrix4 identity;
- identity.loadIdentity();
-
addOp(new (alloc()) RectOp(
mState.getRenderTargetClipBounds(),
- identity,
+ Matrix4::identity(),
mState.getRenderTargetClipBounds(),
refPaint(&paint)));
}
@@ -244,9 +241,30 @@
void RecordingCanvas::drawPoints(const float* points, int count, const SkPaint& paint) {
LOG_ALWAYS_FATAL("TODO!");
}
-void RecordingCanvas::drawLines(const float* points, int count, const SkPaint& paint) {
- LOG_ALWAYS_FATAL("TODO!");
+
+void RecordingCanvas::drawLines(const float* points, int floatCount, const SkPaint& paint) {
+ if (floatCount < 4) return;
+ floatCount &= ~0x3; // round down to nearest four
+
+ Rect unmappedBounds(points[0], points[1], points[0], points[1]);
+ for (int i = 2; i < floatCount; i += 2) {
+ unmappedBounds.left = std::min(unmappedBounds.left, points[i]);
+ unmappedBounds.right = std::max(unmappedBounds.right, points[i]);
+ unmappedBounds.top = std::min(unmappedBounds.top, points[i + 1]);
+ unmappedBounds.bottom = std::max(unmappedBounds.bottom, points[i + 1]);
+ }
+
+ // since anything AA stroke with less than 1.0 pixel width is drawn with an alpha-reduced
+ // 1.0 stroke, treat 1.0 as minimum.
+ unmappedBounds.outset(std::max(paint.getStrokeWidth(), 1.0f) * 0.5f);
+
+ addOp(new (alloc()) LinesOp(
+ unmappedBounds,
+ *mState.currentSnapshot()->transform,
+ mState.getRenderTargetClipBounds(),
+ refPaint(&paint), refBuffer<float>(points, floatCount), floatCount));
}
+
void RecordingCanvas::drawRect(float left, float top, float right, float bottom, const SkPaint& paint) {
addOp(new (alloc()) RectOp(
Rect(left, top, right, bottom),
@@ -388,17 +406,24 @@
}
// Text
-void RecordingCanvas::drawText(const uint16_t* glyphs, const float* positions, int count,
+void RecordingCanvas::drawText(const uint16_t* glyphs, const float* positions, int glyphCount,
const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop,
float boundsRight, float boundsBottom, float totalAdvance) {
- LOG_ALWAYS_FATAL("TODO!");
+ if (!glyphs || !positions || glyphCount <= 0 || PaintUtils::paintWillNotDrawText(paint)) return;
+ glyphs = refBuffer<glyph_t>(glyphs, glyphCount);
+ positions = refBuffer<float>(positions, glyphCount * 2);
+
+ addOp(new (alloc()) TextOp(
+ Rect(boundsLeft, boundsTop, boundsRight, boundsBottom),
+ *(mState.currentSnapshot()->transform),
+ mState.getRenderTargetClipBounds(),
+ refPaint(&paint), glyphs, positions, glyphCount, x, y));
+ drawTextDecorations(x, y, totalAdvance, paint);
}
-void RecordingCanvas::drawPosText(const uint16_t* text, const float* positions, int count,
- int posCount, const SkPaint& paint) {
- LOG_ALWAYS_FATAL("TODO!");
-}
+
void RecordingCanvas::drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
float hOffset, float vOffset, const SkPaint& paint) {
+ // NOTE: can't use refPaint() directly, since it forces left alignment
LOG_ALWAYS_FATAL("TODO!");
}
@@ -410,8 +435,9 @@
refPaint(paint), refBitmap(*bitmap)));
}
void RecordingCanvas::drawRenderNode(RenderNode* renderNode) {
+ auto&& stagingProps = renderNode->stagingProperties();
RenderNodeOp* op = new (alloc()) RenderNodeOp(
- Rect(0, 0, renderNode->getWidth(), renderNode->getHeight()), // are these safe? they're theoretically dynamic
+ Rect(stagingProps.getWidth(), stagingProps.getHeight()),
*(mState.currentSnapshot()->transform),
mState.getRenderTargetClipBounds(),
renderNode);
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h
index f26b0c8..6d0e9e0 100644
--- a/libs/hwui/RecordingCanvas.h
+++ b/libs/hwui/RecordingCanvas.h
@@ -178,8 +178,6 @@
virtual void drawText(const uint16_t* glyphs, const float* positions, int count,
const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop,
float boundsRight, float boundsBottom, float totalAdvance) override;
- virtual void drawPosText(const uint16_t* text, const float* positions, int count,
- int posCount, const SkPaint& paint) override;
virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
float hOffset, float vOffset, const SkPaint& paint) override;
virtual bool drawTextAbsolutePos() const override { return false; }
@@ -207,10 +205,6 @@
return dstBuffer;
}
- inline char* refText(const char* text, size_t byteLength) {
- return (char*) refBuffer<uint8_t>((uint8_t*)text, byteLength);
- }
-
inline const SkPath* refPath(const SkPath* path) {
if (!path) return nullptr;
@@ -221,6 +215,10 @@
return cachedPath;
}
+ /**
+ * Returns a RenderThread-safe, const copy of the SkPaint parameter passed in
+ * (with deduping based on paint hash / equality check)
+ */
inline const SkPaint* refPaint(const SkPaint* paint) {
if (!paint) return nullptr;
@@ -240,9 +238,7 @@
// object equality check to ensure we don't erroneously dedup them.
if (cachedPaint == nullptr || *cachedPaint != *paint) {
cachedPaint = new SkPaint(*paint);
- std::unique_ptr<const SkPaint> copy(cachedPaint);
- mDisplayList->paints.push_back(std::move(copy));
-
+ mDisplayList->paints.emplace_back(cachedPaint);
// replaceValueFor() performs an add if the entry doesn't exist
mPaintMap.replaceValueFor(key, cachedPaint);
refBitmapsInShader(cachedPaint->getShader());
diff --git a/libs/hwui/Rect.h b/libs/hwui/Rect.h
index 50199db..472aad7 100644
--- a/libs/hwui/Rect.h
+++ b/libs/hwui/Rect.h
@@ -260,13 +260,6 @@
bottom = std::max(bottom, y);
}
- void expandToCoverRect(float otherLeft, float otherTop, float otherRight, float otherBottom) {
- left = std::min(left, otherLeft);
- top = std::min(top, otherTop);
- right = std::max(right, otherRight);
- bottom = std::max(bottom, otherBottom);
- }
-
SkRect toSkRect() const {
return SkRect::MakeLTRB(left, top, right, bottom);
}
@@ -276,7 +269,7 @@
}
void dump(const char* label = nullptr) const {
- ALOGD("%s[l=%f t=%f r=%f b=%f]", label ? label : "Rect", left, top, right, bottom);
+ ALOGD("%s[l=%.2f t=%.2f r=%.2f b=%.2f]", label ? label : "Rect", left, top, right, bottom);
}
}; // class Rect
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index e177f9a..ae690fd 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -288,6 +288,9 @@
bool transformUpdateNeeded = false;
if (!mLayer) {
mLayer = createLayer(info.canvasContext.getRenderState(), getWidth(), getHeight());
+#if !HWUI_NEW_OPS
+ applyLayerPropertiesToLayer(info);
+#endif
damageSelf(info);
transformUpdateNeeded = true;
} else if (!layerMatchesWidthAndHeight(mLayer, getWidth(), getHeight())) {
@@ -326,15 +329,11 @@
return;
}
- if (transformUpdateNeeded) {
+ if (transformUpdateNeeded && mLayer) {
// update the transform in window of the layer to reset its origin wrt light source position
Matrix4 windowTransform;
info.damageAccumulator->computeCurrentTransform(&windowTransform);
-#if HWUI_NEW_OPS
- // TODO: update layer transform (perhaps as part of enqueueLayerWithDamage)
-#else
mLayer->setWindowTransform(windowTransform);
-#endif
}
#if HWUI_NEW_OPS
@@ -488,7 +487,7 @@
info.damageAccumulator->pushTransform(&op->localMatrix);
bool childFunctorsNeedLayer = functorsNeedLayer; // TODO! || op->mRecordedWithPotentialStencilClip;
#else
- info.damageAccumulator->pushTransform(&op->mTransformFromParent);
+ info.damageAccumulator->pushTransform(&op->localMatrix);
bool childFunctorsNeedLayer = functorsNeedLayer
// Recorded with non-rect clip, or canvas-rotated by parent
|| op->mRecordedWithPotentialStencilClip;
@@ -528,76 +527,6 @@
}
}
-bool RenderNode::applyViewProperties(CanvasState& canvasState, LinearAllocator& allocator) const {
- const Outline& outline = properties().getOutline();
- if (properties().getAlpha() <= 0
- || (outline.getShouldClip() && outline.isEmpty())
- || properties().getScaleX() == 0
- || properties().getScaleY() == 0) {
- return false; // rejected
- }
-
- if (properties().getLeft() != 0 || properties().getTop() != 0) {
- canvasState.translate(properties().getLeft(), properties().getTop());
- }
- if (properties().getStaticMatrix()) {
- canvasState.concatMatrix(*properties().getStaticMatrix());
- } else if (properties().getAnimationMatrix()) {
- canvasState.concatMatrix(*properties().getAnimationMatrix());
- }
- if (properties().hasTransformMatrix()) {
- if (properties().isTransformTranslateOnly()) {
- canvasState.translate(properties().getTranslationX(), properties().getTranslationY());
- } else {
- canvasState.concatMatrix(*properties().getTransformMatrix());
- }
- }
-
- const bool isLayer = properties().effectiveLayerType() != LayerType::None;
- int clipFlags = properties().getClippingFlags();
- if (properties().getAlpha() < 1) {
- if (isLayer) {
- clipFlags &= ~CLIP_TO_BOUNDS; // bounds clipping done by layer
- }
- if (CC_LIKELY(isLayer || !properties().getHasOverlappingRendering())) {
- // simply scale rendering content's alpha
- canvasState.scaleAlpha(properties().getAlpha());
- } else {
- // savelayer needed to create an offscreen buffer
- Rect layerBounds(0, 0, getWidth(), getHeight());
- if (clipFlags) {
- properties().getClippingRectForFlags(clipFlags, &layerBounds);
- clipFlags = 0; // all clipping done by savelayer
- }
- LOG_ALWAYS_FATAL("TODO: savelayer");
- }
-
- if (CC_UNLIKELY(ATRACE_ENABLED() && properties().promotedToLayer())) {
- // pretend alpha always causes savelayer to warn about
- // performance problem affecting old versions
- ATRACE_FORMAT("%s alpha caused saveLayer %dx%d", getName(), getWidth(), getHeight());
- }
- }
- if (clipFlags) {
- Rect clipRect;
- properties().getClippingRectForFlags(clipFlags, &clipRect);
- canvasState.clipRect(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom,
- SkRegion::kIntersect_Op);
- }
-
- // TODO: support nesting round rect clips
- if (mProperties.getRevealClip().willClip()) {
- Rect bounds;
- mProperties.getRevealClip().getBounds(&bounds);
- canvasState.setClippingRoundRect(allocator,
- bounds, mProperties.getRevealClip().getRadius());
- } else if (mProperties.getOutline().willClip()) {
- canvasState.setClippingOutline(allocator, &(mProperties.getOutline()));
- }
- return !canvasState.quickRejectConservative(
- 0, 0, properties().getWidth(), properties().getHeight());
-}
-
/*
* For property operations, we pass a savecount of 0, since the operations aren't part of the
* displaylist, and thus don't have to compensate for the record-time/playback-time discrepancy in
@@ -729,7 +658,6 @@
* which are flagged to not draw in the standard draw loop.
*/
void RenderNode::computeOrdering() {
-#if !HWUI_NEW_OPS
ATRACE_CALL();
mProjectedNodes.clear();
@@ -737,43 +665,41 @@
// transform properties are applied correctly to top level children
if (mDisplayList == nullptr) return;
for (unsigned int i = 0; i < mDisplayList->getChildren().size(); i++) {
- DrawRenderNodeOp* childOp = mDisplayList->getChildren()[i];
+ renderNodeOp_t* childOp = mDisplayList->getChildren()[i];
childOp->renderNode->computeOrderingImpl(childOp, &mProjectedNodes, &mat4::identity());
}
-#endif
}
void RenderNode::computeOrderingImpl(
- DrawRenderNodeOp* opState,
- std::vector<DrawRenderNodeOp*>* compositedChildrenOfProjectionSurface,
+ renderNodeOp_t* opState,
+ std::vector<renderNodeOp_t*>* compositedChildrenOfProjectionSurface,
const mat4* transformFromProjectionSurface) {
-#if !HWUI_NEW_OPS
mProjectedNodes.clear();
if (mDisplayList == nullptr || mDisplayList->isEmpty()) return;
// TODO: should avoid this calculation in most cases
// TODO: just calculate single matrix, down to all leaf composited elements
Matrix4 localTransformFromProjectionSurface(*transformFromProjectionSurface);
- localTransformFromProjectionSurface.multiply(opState->mTransformFromParent);
+ localTransformFromProjectionSurface.multiply(opState->localMatrix);
if (properties().getProjectBackwards()) {
// composited projectee, flag for out of order draw, save matrix, and store in proj surface
- opState->mSkipInOrderDraw = true;
- opState->mTransformFromCompositingAncestor = localTransformFromProjectionSurface;
+ opState->skipInOrderDraw = true;
+ opState->transformFromCompositingAncestor = localTransformFromProjectionSurface;
compositedChildrenOfProjectionSurface->push_back(opState);
} else {
// standard in order draw
- opState->mSkipInOrderDraw = false;
+ opState->skipInOrderDraw = false;
}
if (mDisplayList->getChildren().size() > 0) {
const bool isProjectionReceiver = mDisplayList->projectionReceiveIndex >= 0;
bool haveAppliedPropertiesToProjection = false;
for (unsigned int i = 0; i < mDisplayList->getChildren().size(); i++) {
- DrawRenderNodeOp* childOp = mDisplayList->getChildren()[i];
+ renderNodeOp_t* childOp = mDisplayList->getChildren()[i];
RenderNode* child = childOp->renderNode;
- std::vector<DrawRenderNodeOp*>* projectionChildren = nullptr;
+ std::vector<renderNodeOp_t*>* projectionChildren = nullptr;
const mat4* projectionTransform = nullptr;
if (isProjectionReceiver && !child->properties().getProjectBackwards()) {
// if receiving projections, collect projecting descendant
@@ -794,7 +720,6 @@
child->computeOrderingImpl(childOp, projectionChildren, projectionTransform);
}
}
-#endif
}
class DeferOperationHandler {
@@ -864,10 +789,10 @@
if (!MathUtils::isZero(childZ) && chunk.reorderChildren) {
zTranslatedNodes.push_back(ZDrawRenderNodeOpPair(childZ, childOp));
- childOp->mSkipInOrderDraw = true;
+ childOp->skipInOrderDraw = true;
} else if (!child->properties().getProjectBackwards()) {
// regular, in order drawing DisplayList
- childOp->mSkipInOrderDraw = false;
+ childOp->skipInOrderDraw = false;
}
}
@@ -984,7 +909,7 @@
// attempt to render the shadow if the caster about to be drawn is its caster,
// OR if its caster's Z value is similar to the previous potential caster
if (shadowIndex == drawIndex || casterZ - lastCasterZ < SHADOW_DELTA) {
- caster->issueDrawShadowOperation(casterOp->mTransformFromParent, handler);
+ caster->issueDrawShadowOperation(casterOp->localMatrix, handler);
lastCasterZ = casterZ; // must do this even if current caster not casting a shadow
shadowIndex++;
@@ -998,10 +923,10 @@
DrawRenderNodeOp* childOp = zTranslatedNodes[drawIndex].value;
- renderer.concatMatrix(childOp->mTransformFromParent);
- childOp->mSkipInOrderDraw = false; // this is horrible, I'm so sorry everyone
+ renderer.concatMatrix(childOp->localMatrix);
+ childOp->skipInOrderDraw = false; // this is horrible, I'm so sorry everyone
handler(childOp, renderer.getSaveCount() - 1, properties().getClipToBounds());
- childOp->mSkipInOrderDraw = true;
+ childOp->skipInOrderDraw = true;
renderer.restoreToCount(restoreTo);
drawIndex++;
@@ -1038,14 +963,14 @@
// draw projected nodes
for (size_t i = 0; i < mProjectedNodes.size(); i++) {
- DrawRenderNodeOp* childOp = mProjectedNodes[i];
+ renderNodeOp_t* childOp = mProjectedNodes[i];
// matrix save, concat, and restore can be done safely without allocating operations
int restoreTo = renderer.save(SkCanvas::kMatrix_SaveFlag);
- renderer.concatMatrix(childOp->mTransformFromCompositingAncestor);
- childOp->mSkipInOrderDraw = false; // this is horrible, I'm so sorry everyone
+ renderer.concatMatrix(childOp->transformFromCompositingAncestor);
+ childOp->skipInOrderDraw = false; // this is horrible, I'm so sorry everyone
handler(childOp, renderer.getSaveCount() - 1, properties().getClipToBounds());
- childOp->mSkipInOrderDraw = true;
+ childOp->skipInOrderDraw = true;
renderer.restoreToCount(restoreTo);
}
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h
index bae5ebe..b6f50b1 100644
--- a/libs/hwui/RenderNode.h
+++ b/libs/hwui/RenderNode.h
@@ -51,20 +51,22 @@
class Rect;
class SkiaShader;
-
#if HWUI_NEW_OPS
class OffscreenBuffer;
+struct RenderNodeOp;
typedef OffscreenBuffer layer_t;
+typedef RenderNodeOp renderNodeOp_t;
#else
class Layer;
typedef Layer layer_t;
+typedef DrawRenderNodeOp renderNodeOp_t;
#endif
class ClipRectOp;
+class DrawRenderNodeOp;
class SaveLayerOp;
class SaveOp;
class RestoreToCountOp;
-class DrawRenderNodeOp;
class TreeInfo;
namespace proto {
@@ -85,6 +87,7 @@
*/
class RenderNode : public VirtualLightRefBase {
friend class TestUtils; // allow TestUtils to access syncDisplayList / syncProperties
+friend class OpReorderer;
public:
enum DirtyPropertyMask {
GENERIC = 1 << 1,
@@ -187,9 +190,6 @@
AnimatorManager& animators() { return mAnimatorManager; }
- // Returns false if the properties dictate the subtree contained in this RenderNode won't render
- bool applyViewProperties(CanvasState& canvasState, LinearAllocator& allocator) const;
-
void applyViewPropertyTransforms(mat4& matrix, bool true3dTransform = false) const;
bool nothingToDraw() const {
@@ -224,8 +224,8 @@
PositiveZChildren
};
- void computeOrderingImpl(DrawRenderNodeOp* opState,
- std::vector<DrawRenderNodeOp*>* compositedChildrenOfProjectionSurface,
+ void computeOrderingImpl(renderNodeOp_t* opState,
+ std::vector<renderNodeOp_t*>* compositedChildrenOfProjectionSurface,
const mat4* transformFromProjectionSurface);
template <class T>
@@ -308,7 +308,7 @@
*/
// for projection surfaces, contains a list of all children items
- std::vector<DrawRenderNodeOp*> mProjectedNodes;
+ std::vector<renderNodeOp_t*> mProjectedNodes;
// How many references our parent(s) have to us. Typically this should alternate
// between 2 and 1 (when a staging push happens we inc first then dec)
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h
index 0bd5b65..3952798 100644
--- a/libs/hwui/RenderProperties.h
+++ b/libs/hwui/RenderProperties.h
@@ -610,7 +610,6 @@
bool fitsOnLayer() const {
const DeviceInfo* deviceInfo = DeviceInfo::get();
- LOG_ALWAYS_FATAL_IF(!deviceInfo, "DeviceInfo uninitialized");
return mPrimitiveFields.mWidth <= deviceInfo->maxTextureSize()
&& mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize();
}
diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index 6d3dfac..96c1a7c 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -131,8 +131,6 @@
const SkPaint& paint, float x, float y,
float boundsLeft, float boundsTop, float boundsRight, float boundsBottom,
float totalAdvance) override;
- virtual void drawPosText(const uint16_t* text, const float* positions, int count,
- int posCount, const SkPaint& paint) override;
virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
float hOffset, float vOffset, const SkPaint& paint) override;
@@ -152,7 +150,6 @@
void drawPoints(const float* points, int count, const SkPaint& paint,
SkCanvas::PointMode mode);
- void drawTextDecorations(float x, float y, float length, const SkPaint& paint);
SkAutoTUnref<SkCanvas> mCanvas;
std::unique_ptr<SkDeque> mSaveStack; // lazily allocated, tracks partial saves.
@@ -712,22 +709,7 @@
static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");
mCanvas->drawPosText(text, count << 1, reinterpret_cast<const SkPoint*>(positions), paintCopy);
-}
-
-void SkiaCanvas::drawPosText(const uint16_t* text, const float* positions, int count, int posCount,
- const SkPaint& paint) {
- SkPoint* posPtr = posCount > 0 ? new SkPoint[posCount] : NULL;
- int indx;
- for (indx = 0; indx < posCount; indx++) {
- posPtr[indx].fX = positions[indx << 1];
- posPtr[indx].fY = positions[(indx << 1) + 1];
- }
-
- SkPaint paintCopy(paint);
- paintCopy.setTextEncoding(SkPaint::kUTF16_TextEncoding);
- mCanvas->drawPosText(text, count, posPtr, paintCopy);
-
- delete[] posPtr;
+ drawTextDecorations(x, y, totalAdvance, paint);
}
void SkiaCanvas::drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path,
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp
index 0a58f4b..2f535bb 100644
--- a/libs/hwui/Snapshot.cpp
+++ b/libs/hwui/Snapshot.cpp
@@ -130,6 +130,9 @@
///////////////////////////////////////////////////////////////////////////////
void Snapshot::resetTransform(float x, float y, float z) {
+#if HWUI_NEW_OPS
+ LOG_ALWAYS_FATAL("not supported - light center managed differently");
+#else
// before resetting, map current light pos with inverse of current transform
Vector3 center = mRelativeLightCenter;
mat4 inverse;
@@ -139,6 +142,7 @@
transform = &mTransformRoot;
transform->loadTranslate(x, y, z);
+#endif
}
void Snapshot::buildScreenSpaceTransform(Matrix4* outTransform) const {
diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp
index b7a76ba..996ac8e 100644
--- a/libs/hwui/TextDropShadowCache.cpp
+++ b/libs/hwui/TextDropShadowCache.cpp
@@ -30,8 +30,7 @@
///////////////////////////////////////////////////////////////////////////////
hash_t ShadowText::hash() const {
- uint32_t charCount = len / sizeof(char16_t);
- uint32_t hash = JenkinsHashMix(0, len);
+ uint32_t hash = JenkinsHashMix(0, glyphCount);
hash = JenkinsHashMix(hash, android::hash_type(radius));
hash = JenkinsHashMix(hash, android::hash_type(textSize));
hash = JenkinsHashMix(hash, android::hash_type(typeface));
@@ -40,10 +39,10 @@
hash = JenkinsHashMix(hash, android::hash_type(scaleX));
if (text) {
hash = JenkinsHashMixShorts(
- hash, reinterpret_cast<const uint16_t*>(text), charCount);
+ hash, reinterpret_cast<const uint16_t*>(text), glyphCount);
}
if (positions) {
- for (uint32_t i = 0; i < charCount * 2; i++) {
+ for (uint32_t i = 0; i < glyphCount * 2; i++) {
hash = JenkinsHashMix(hash, android::hash_type(positions[i]));
}
}
@@ -51,7 +50,7 @@
}
int ShadowText::compare(const ShadowText& lhs, const ShadowText& rhs) {
- int deltaInt = int(lhs.len) - int(rhs.len);
+ int deltaInt = int(lhs.glyphCount) - int(rhs.glyphCount);
if (deltaInt != 0) return deltaInt;
deltaInt = lhs.flags - rhs.flags;
@@ -76,7 +75,7 @@
if (!lhs.text) return -1;
if (!rhs.text) return +1;
- deltaInt = memcmp(lhs.text, rhs.text, lhs.len);
+ deltaInt = memcmp(lhs.text, rhs.text, lhs.glyphCount * sizeof(glyph_t));
if (deltaInt != 0) return deltaInt;
}
@@ -84,7 +83,7 @@
if (!lhs.positions) return -1;
if (!rhs.positions) return +1;
- return memcmp(lhs.positions, rhs.positions, lhs.len << 2);
+ return memcmp(lhs.positions, rhs.positions, lhs.glyphCount << 1);
}
return 0;
@@ -168,16 +167,16 @@
mCache.clear();
}
-ShadowTexture* TextDropShadowCache::get(const SkPaint* paint, const char* text, uint32_t len,
- int numGlyphs, float radius, const float* positions) {
- ShadowText entry(paint, radius, len, text, positions);
+ShadowTexture* TextDropShadowCache::get(const SkPaint* paint, const char* glyphs, int numGlyphs,
+ float radius, const float* positions) {
+ ShadowText entry(paint, radius, numGlyphs * 2, glyphs, positions);
ShadowTexture* texture = mCache.get(entry);
if (!texture) {
SkPaint paintCopy(*paint);
paintCopy.setTextAlign(SkPaint::kLeft_Align);
- FontRenderer::DropShadow shadow = mRenderer->renderDropShadow(&paintCopy, text, 0,
- len, numGlyphs, radius, positions);
+ FontRenderer::DropShadow shadow = mRenderer->renderDropShadow(&paintCopy, glyphs, numGlyphs,
+ radius, positions);
if (!shadow.image) {
return nullptr;
diff --git a/libs/hwui/TextDropShadowCache.h b/libs/hwui/TextDropShadowCache.h
index caf089f..c4f3c5d 100644
--- a/libs/hwui/TextDropShadowCache.h
+++ b/libs/hwui/TextDropShadowCache.h
@@ -34,14 +34,14 @@
class FontRenderer;
struct ShadowText {
- ShadowText(): len(0), radius(0.0f), textSize(0.0f), typeface(nullptr),
+ ShadowText(): glyphCount(0), radius(0.0f), textSize(0.0f), typeface(nullptr),
flags(0), italicStyle(0.0f), scaleX(0), text(nullptr), positions(nullptr) {
}
// len is the number of bytes in text
- ShadowText(const SkPaint* paint, float radius, uint32_t len, const char* srcText,
+ ShadowText(const SkPaint* paint, float radius, uint32_t glyphCount, const char* srcText,
const float* positions):
- len(len), radius(radius), positions(positions) {
+ glyphCount(glyphCount), radius(radius), positions(positions) {
// TODO: Propagate this through the API, we should not cast here
text = (const char16_t*) srcText;
@@ -73,17 +73,16 @@
}
void copyTextLocally() {
- uint32_t charCount = len / sizeof(char16_t);
- str.setTo((const char16_t*) text, charCount);
+ str.setTo((const char16_t*) text, glyphCount);
text = str.string();
if (positions != nullptr) {
positionsCopy.clear();
- positionsCopy.appendArray(positions, charCount * 2);
+ positionsCopy.appendArray(positions, glyphCount * 2);
positions = positionsCopy.array();
}
}
- uint32_t len;
+ uint32_t glyphCount;
float radius;
float textSize;
SkTypeface* typeface;
@@ -136,7 +135,7 @@
*/
void operator()(ShadowText& text, ShadowTexture*& texture) override;
- ShadowTexture* get(const SkPaint* paint, const char* text, uint32_t len,
+ ShadowTexture* get(const SkPaint* paint, const char* text,
int numGlyphs, float radius, const float* positions);
/**
diff --git a/libs/hwui/VectorDrawablePath.cpp b/libs/hwui/VectorDrawablePath.cpp
index 115435c..c9a54ca 100644
--- a/libs/hwui/VectorDrawablePath.cpp
+++ b/libs/hwui/VectorDrawablePath.cpp
@@ -17,6 +17,7 @@
#include "VectorDrawablePath.h"
#include "PathParser.h"
+#include "utils/VectorDrawableUtils.h"
#include <math.h>
#include <utils/Log.h>
@@ -24,473 +25,35 @@
namespace android {
namespace uirenderer {
-class PathResolver {
-public:
- float currentX = 0;
- float currentY = 0;
- float ctrlPointX = 0;
- float ctrlPointY = 0;
- float currentSegmentStartX = 0;
- float currentSegmentStartY = 0;
- void addCommand(SkPath* outPath, char previousCmd,
- char cmd, const std::vector<float>* points, size_t start, size_t end);
-};
VectorDrawablePath::VectorDrawablePath(const char* pathStr, size_t strLength) {
- PathParser::getPathDataFromString(&mData, pathStr, strLength);
- verbsToPath(&mSkPath, &mData);
+ PathParser::ParseResult result;
+ PathParser::getPathDataFromString(&mData, &result, pathStr, strLength);
+ if (!result.failureOccurred) {
+ VectorDrawableUtils::verbsToPath(&mSkPath, mData);
+ }
}
VectorDrawablePath::VectorDrawablePath(const PathData& data) {
mData = data;
// Now we need to construct a path
- verbsToPath(&mSkPath, &data);
+ VectorDrawableUtils::verbsToPath(&mSkPath, data);
}
VectorDrawablePath::VectorDrawablePath(const VectorDrawablePath& path) {
mData = path.mData;
- verbsToPath(&mSkPath, &mData);
+ VectorDrawableUtils::verbsToPath(&mSkPath, mData);
}
-bool VectorDrawablePath::canMorph(const PathData& morphTo) {
- if (mData.verbs.size() != morphTo.verbs.size()) {
- return false;
- }
- for (unsigned int i = 0; i < mData.verbs.size(); i++) {
- if (mData.verbs[i] != morphTo.verbs[i]
- || mData.verbSizes[i] != morphTo.verbSizes[i]) {
- return false;
- }
- }
- return true;
+bool VectorDrawablePath::canMorph(const PathData& morphTo) {
+ return VectorDrawableUtils::canMorph(mData, morphTo);
}
bool VectorDrawablePath::canMorph(const VectorDrawablePath& path) {
return canMorph(path.mData);
}
- /**
- * Convert an array of PathVerb to Path.
- */
-void VectorDrawablePath::verbsToPath(SkPath* outPath, const PathData* data) {
- PathResolver resolver;
- char previousCommand = 'm';
- size_t start = 0;
- outPath->reset();
- for (unsigned int i = 0; i < data->verbs.size(); i++) {
- size_t verbSize = data->verbSizes[i];
- resolver.addCommand(outPath, previousCommand, data->verbs[i], &data->points, start,
- start + verbSize - 1u);
- previousCommand = data->verbs[i];
- start += verbSize;
- }
-}
-/**
- * The current PathVerb will be interpolated between the
- * <code>nodeFrom</code> and <code>nodeTo</code> according to the
- * <code>fraction</code>.
- *
- * @param nodeFrom The start value as a PathVerb.
- * @param nodeTo The end value as a PathVerb
- * @param fraction The fraction to interpolate.
- */
-void VectorDrawablePath::interpolatePaths(PathData* outData,
- const PathData* from, const PathData* to, float fraction) {
- outData->points.resize(from->points.size());
- outData->verbSizes = from->verbSizes;
- outData->verbs = from->verbs;
-
- for (size_t i = 0; i < from->points.size(); i++) {
- outData->points[i] = from->points[i] * (1 - fraction) + to->points[i] * fraction;
- }
-}
-
-/**
- * Converts an arc to cubic Bezier segments and records them in p.
- *
- * @param p The target for the cubic Bezier segments
- * @param cx The x coordinate center of the ellipse
- * @param cy The y coordinate center of the ellipse
- * @param a The radius of the ellipse in the horizontal direction
- * @param b The radius of the ellipse in the vertical direction
- * @param e1x E(eta1) x coordinate of the starting point of the arc
- * @param e1y E(eta2) y coordinate of the starting point of the arc
- * @param theta The angle that the ellipse bounding rectangle makes with horizontal plane
- * @param start The start angle of the arc on the ellipse
- * @param sweep The angle (positive or negative) of the sweep of the arc on the ellipse
- */
-static void arcToBezier(SkPath* p,
- double cx,
- double cy,
- double a,
- double b,
- double e1x,
- double e1y,
- double theta,
- double start,
- double sweep) {
- // Taken from equations at: http://spaceroots.org/documents/ellipse/node8.html
- // and http://www.spaceroots.org/documents/ellipse/node22.html
-
- // Maximum of 45 degrees per cubic Bezier segment
- int numSegments = ceil(fabs(sweep * 4 / M_PI));
-
- double eta1 = start;
- double cosTheta = cos(theta);
- double sinTheta = sin(theta);
- double cosEta1 = cos(eta1);
- double sinEta1 = sin(eta1);
- double ep1x = (-a * cosTheta * sinEta1) - (b * sinTheta * cosEta1);
- double ep1y = (-a * sinTheta * sinEta1) + (b * cosTheta * cosEta1);
-
- double anglePerSegment = sweep / numSegments;
- for (int i = 0; i < numSegments; i++) {
- double eta2 = eta1 + anglePerSegment;
- double sinEta2 = sin(eta2);
- double cosEta2 = cos(eta2);
- double e2x = cx + (a * cosTheta * cosEta2) - (b * sinTheta * sinEta2);
- double e2y = cy + (a * sinTheta * cosEta2) + (b * cosTheta * sinEta2);
- double ep2x = -a * cosTheta * sinEta2 - b * sinTheta * cosEta2;
- double ep2y = -a * sinTheta * sinEta2 + b * cosTheta * cosEta2;
- double tanDiff2 = tan((eta2 - eta1) / 2);
- double alpha =
- sin(eta2 - eta1) * (sqrt(4 + (3 * tanDiff2 * tanDiff2)) - 1) / 3;
- double q1x = e1x + alpha * ep1x;
- double q1y = e1y + alpha * ep1y;
- double q2x = e2x - alpha * ep2x;
- double q2y = e2y - alpha * ep2y;
-
- p->cubicTo((float) q1x,
- (float) q1y,
- (float) q2x,
- (float) q2y,
- (float) e2x,
- (float) e2y);
- eta1 = eta2;
- e1x = e2x;
- e1y = e2y;
- ep1x = ep2x;
- ep1y = ep2y;
- }
-}
-
-inline double toRadians(float theta) { return theta * M_PI / 180;}
-
-static void drawArc(SkPath* p,
- float x0,
- float y0,
- float x1,
- float y1,
- float a,
- float b,
- float theta,
- bool isMoreThanHalf,
- bool isPositiveArc) {
-
- /* Convert rotation angle from degrees to radians */
- double thetaD = toRadians(theta);
- /* Pre-compute rotation matrix entries */
- double cosTheta = cos(thetaD);
- double sinTheta = sin(thetaD);
- /* Transform (x0, y0) and (x1, y1) into unit space */
- /* using (inverse) rotation, followed by (inverse) scale */
- double x0p = (x0 * cosTheta + y0 * sinTheta) / a;
- double y0p = (-x0 * sinTheta + y0 * cosTheta) / b;
- double x1p = (x1 * cosTheta + y1 * sinTheta) / a;
- double y1p = (-x1 * sinTheta + y1 * cosTheta) / b;
-
- /* Compute differences and averages */
- double dx = x0p - x1p;
- double dy = y0p - y1p;
- double xm = (x0p + x1p) / 2;
- double ym = (y0p + y1p) / 2;
- /* Solve for intersecting unit circles */
- double dsq = dx * dx + dy * dy;
- if (dsq == 0.0) {
- ALOGW("Points are coincident");
- return; /* Points are coincident */
- }
- double disc = 1.0 / dsq - 1.0 / 4.0;
- if (disc < 0.0) {
- ALOGW("Points are too far apart %f", dsq);
- float adjust = (float) (sqrt(dsq) / 1.99999);
- drawArc(p, x0, y0, x1, y1, a * adjust,
- b * adjust, theta, isMoreThanHalf, isPositiveArc);
- return; /* Points are too far apart */
- }
- double s = sqrt(disc);
- double sdx = s * dx;
- double sdy = s * dy;
- double cx;
- double cy;
- if (isMoreThanHalf == isPositiveArc) {
- cx = xm - sdy;
- cy = ym + sdx;
- } else {
- cx = xm + sdy;
- cy = ym - sdx;
- }
-
- double eta0 = atan2((y0p - cy), (x0p - cx));
-
- double eta1 = atan2((y1p - cy), (x1p - cx));
-
- double sweep = (eta1 - eta0);
- if (isPositiveArc != (sweep >= 0)) {
- if (sweep > 0) {
- sweep -= 2 * M_PI;
- } else {
- sweep += 2 * M_PI;
- }
- }
-
- cx *= a;
- cy *= b;
- double tcx = cx;
- cx = cx * cosTheta - cy * sinTheta;
- cy = tcx * sinTheta + cy * cosTheta;
-
- arcToBezier(p, cx, cy, a, b, x0, y0, thetaD, eta0, sweep);
-}
-
-
-void PathResolver::addCommand(SkPath* outPath, char previousCmd,
- char cmd, const std::vector<float>* points, size_t start, size_t end) {
-
- int incr = 2;
- float reflectiveCtrlPointX;
- float reflectiveCtrlPointY;
-
- switch (cmd) {
- case 'z':
- case 'Z':
- outPath->close();
- // Path is closed here, but we need to move the pen to the
- // closed position. So we cache the segment's starting position,
- // and restore it here.
- currentX = currentSegmentStartX;
- currentY = currentSegmentStartY;
- ctrlPointX = currentSegmentStartX;
- ctrlPointY = currentSegmentStartY;
- outPath->moveTo(currentX, currentY);
- break;
- case 'm':
- case 'M':
- case 'l':
- case 'L':
- case 't':
- case 'T':
- incr = 2;
- break;
- case 'h':
- case 'H':
- case 'v':
- case 'V':
- incr = 1;
- break;
- case 'c':
- case 'C':
- incr = 6;
- break;
- case 's':
- case 'S':
- case 'q':
- case 'Q':
- incr = 4;
- break;
- case 'a':
- case 'A':
- incr = 7;
- break;
- }
-
- for (unsigned int k = start; k <= end; k += incr) {
- switch (cmd) {
- case 'm': // moveto - Start a new sub-path (relative)
- currentX += points->at(k + 0);
- currentY += points->at(k + 1);
- if (k > start) {
- // According to the spec, if a moveto is followed by multiple
- // pairs of coordinates, the subsequent pairs are treated as
- // implicit lineto commands.
- outPath->rLineTo(points->at(k + 0), points->at(k + 1));
- } else {
- outPath->rMoveTo(points->at(k + 0), points->at(k + 1));
- currentSegmentStartX = currentX;
- currentSegmentStartY = currentY;
- }
- break;
- case 'M': // moveto - Start a new sub-path
- currentX = points->at(k + 0);
- currentY = points->at(k + 1);
- if (k > start) {
- // According to the spec, if a moveto is followed by multiple
- // pairs of coordinates, the subsequent pairs are treated as
- // implicit lineto commands.
- outPath->lineTo(points->at(k + 0), points->at(k + 1));
- } else {
- outPath->moveTo(points->at(k + 0), points->at(k + 1));
- currentSegmentStartX = currentX;
- currentSegmentStartY = currentY;
- }
- break;
- case 'l': // lineto - Draw a line from the current point (relative)
- outPath->rLineTo(points->at(k + 0), points->at(k + 1));
- currentX += points->at(k + 0);
- currentY += points->at(k + 1);
- break;
- case 'L': // lineto - Draw a line from the current point
- outPath->lineTo(points->at(k + 0), points->at(k + 1));
- currentX = points->at(k + 0);
- currentY = points->at(k + 1);
- break;
- case 'h': // horizontal lineto - Draws a horizontal line (relative)
- outPath->rLineTo(points->at(k + 0), 0);
- currentX += points->at(k + 0);
- break;
- case 'H': // horizontal lineto - Draws a horizontal line
- outPath->lineTo(points->at(k + 0), currentY);
- currentX = points->at(k + 0);
- break;
- case 'v': // vertical lineto - Draws a vertical line from the current point (r)
- outPath->rLineTo(0, points->at(k + 0));
- currentY += points->at(k + 0);
- break;
- case 'V': // vertical lineto - Draws a vertical line from the current point
- outPath->lineTo(currentX, points->at(k + 0));
- currentY = points->at(k + 0);
- break;
- case 'c': // curveto - Draws a cubic Bézier curve (relative)
- outPath->rCubicTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3),
- points->at(k + 4), points->at(k + 5));
-
- ctrlPointX = currentX + points->at(k + 2);
- ctrlPointY = currentY + points->at(k + 3);
- currentX += points->at(k + 4);
- currentY += points->at(k + 5);
-
- break;
- case 'C': // curveto - Draws a cubic Bézier curve
- outPath->cubicTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3),
- points->at(k + 4), points->at(k + 5));
- currentX = points->at(k + 4);
- currentY = points->at(k + 5);
- ctrlPointX = points->at(k + 2);
- ctrlPointY = points->at(k + 3);
- break;
- case 's': // smooth curveto - Draws a cubic Bézier curve (reflective cp)
- reflectiveCtrlPointX = 0;
- reflectiveCtrlPointY = 0;
- if (previousCmd == 'c' || previousCmd == 's'
- || previousCmd == 'C' || previousCmd == 'S') {
- reflectiveCtrlPointX = currentX - ctrlPointX;
- reflectiveCtrlPointY = currentY - ctrlPointY;
- }
- outPath->rCubicTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- points->at(k + 0), points->at(k + 1),
- points->at(k + 2), points->at(k + 3));
- ctrlPointX = currentX + points->at(k + 0);
- ctrlPointY = currentY + points->at(k + 1);
- currentX += points->at(k + 2);
- currentY += points->at(k + 3);
- break;
- case 'S': // shorthand/smooth curveto Draws a cubic Bézier curve(reflective cp)
- reflectiveCtrlPointX = currentX;
- reflectiveCtrlPointY = currentY;
- if (previousCmd == 'c' || previousCmd == 's'
- || previousCmd == 'C' || previousCmd == 'S') {
- reflectiveCtrlPointX = 2 * currentX - ctrlPointX;
- reflectiveCtrlPointY = 2 * currentY - ctrlPointY;
- }
- outPath->cubicTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3));
- ctrlPointX = points->at(k + 0);
- ctrlPointY = points->at(k + 1);
- currentX = points->at(k + 2);
- currentY = points->at(k + 3);
- break;
- case 'q': // Draws a quadratic Bézier (relative)
- outPath->rQuadTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3));
- ctrlPointX = currentX + points->at(k + 0);
- ctrlPointY = currentY + points->at(k + 1);
- currentX += points->at(k + 2);
- currentY += points->at(k + 3);
- break;
- case 'Q': // Draws a quadratic Bézier
- outPath->quadTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3));
- ctrlPointX = points->at(k + 0);
- ctrlPointY = points->at(k + 1);
- currentX = points->at(k + 2);
- currentY = points->at(k + 3);
- break;
- case 't': // Draws a quadratic Bézier curve(reflective control point)(relative)
- reflectiveCtrlPointX = 0;
- reflectiveCtrlPointY = 0;
- if (previousCmd == 'q' || previousCmd == 't'
- || previousCmd == 'Q' || previousCmd == 'T') {
- reflectiveCtrlPointX = currentX - ctrlPointX;
- reflectiveCtrlPointY = currentY - ctrlPointY;
- }
- outPath->rQuadTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- points->at(k + 0), points->at(k + 1));
- ctrlPointX = currentX + reflectiveCtrlPointX;
- ctrlPointY = currentY + reflectiveCtrlPointY;
- currentX += points->at(k + 0);
- currentY += points->at(k + 1);
- break;
- case 'T': // Draws a quadratic Bézier curve (reflective control point)
- reflectiveCtrlPointX = currentX;
- reflectiveCtrlPointY = currentY;
- if (previousCmd == 'q' || previousCmd == 't'
- || previousCmd == 'Q' || previousCmd == 'T') {
- reflectiveCtrlPointX = 2 * currentX - ctrlPointX;
- reflectiveCtrlPointY = 2 * currentY - ctrlPointY;
- }
- outPath->quadTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
- points->at(k + 0), points->at(k + 1));
- ctrlPointX = reflectiveCtrlPointX;
- ctrlPointY = reflectiveCtrlPointY;
- currentX = points->at(k + 0);
- currentY = points->at(k + 1);
- break;
- case 'a': // Draws an elliptical arc
- // (rx ry x-axis-rotation large-arc-flag sweep-flag x y)
- drawArc(outPath,
- currentX,
- currentY,
- points->at(k + 5) + currentX,
- points->at(k + 6) + currentY,
- points->at(k + 0),
- points->at(k + 1),
- points->at(k + 2),
- points->at(k + 3) != 0,
- points->at(k + 4) != 0);
- currentX += points->at(k + 5);
- currentY += points->at(k + 6);
- ctrlPointX = currentX;
- ctrlPointY = currentY;
- break;
- case 'A': // Draws an elliptical arc
- drawArc(outPath,
- currentX,
- currentY,
- points->at(k + 5),
- points->at(k + 6),
- points->at(k + 0),
- points->at(k + 1),
- points->at(k + 2),
- points->at(k + 3) != 0,
- points->at(k + 4) != 0);
- currentX = points->at(k + 5);
- currentY = points->at(k + 6);
- ctrlPointX = currentX;
- ctrlPointY = currentY;
- break;
- }
- previousCmd = cmd;
- }
-}
}; // namespace uirenderer
}; // namespace android
diff --git a/libs/hwui/VectorDrawablePath.h b/libs/hwui/VectorDrawablePath.h
index 40ce986..2e56349 100644
--- a/libs/hwui/VectorDrawablePath.h
+++ b/libs/hwui/VectorDrawablePath.h
@@ -17,15 +17,14 @@
#ifndef ANDROID_HWUI_VPATH_H
#define ANDROID_HWUI_VPATH_H
+#include <cutils/compiler.h>
#include "SkPath.h"
#include <vector>
namespace android {
namespace uirenderer {
-
-
-struct PathData {
+struct ANDROID_API PathData {
// TODO: Try using FatVector instead of std::vector and do a micro benchmark on the performance
// difference.
std::vector<char> verbs;
@@ -44,9 +43,7 @@
VectorDrawablePath(const char* path, size_t strLength);
bool canMorph(const PathData& path);
bool canMorph(const VectorDrawablePath& path);
- static void verbsToPath(SkPath* outPath, const PathData* data);
- static void interpolatePaths(PathData* outPathData, const PathData* from, const PathData* to,
- float fraction);
+
private:
PathData mData;
SkPath mSkPath;
diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp
index d680f99..dc82041 100644
--- a/libs/hwui/font/Font.cpp
+++ b/libs/hwui/font/Font.cpp
@@ -291,20 +291,18 @@
return cachedGlyph;
}
-void Font::render(const SkPaint* paint, const char *text, uint32_t start, uint32_t len,
+void Font::render(const SkPaint* paint, const char *text,
int numGlyphs, int x, int y, const float* positions) {
- render(paint, text, start, len, numGlyphs, x, y, FRAMEBUFFER, nullptr,
+ render(paint, text, numGlyphs, x, y, FRAMEBUFFER, nullptr,
0, 0, nullptr, positions);
}
-void Font::render(const SkPaint* paint, const char *text, uint32_t start, uint32_t len,
- int numGlyphs, const SkPath* path, float hOffset, float vOffset) {
- if (numGlyphs == 0 || text == nullptr || len == 0) {
+void Font::render(const SkPaint* paint, const char *text, int numGlyphs,
+ const SkPath* path, float hOffset, float vOffset) {
+ if (numGlyphs == 0 || text == nullptr) {
return;
}
- text += start;
-
int glyphsCount = 0;
SkFixed prevRsbDelta = 0;
@@ -317,7 +315,7 @@
float pathLength = SkScalarToFloat(measure.getLength());
if (paint->getTextAlign() != SkPaint::kLeft_Align) {
- float textWidth = SkScalarToFloat(paint->measureText(text, len));
+ float textWidth = SkScalarToFloat(paint->measureText(text, numGlyphs * 2));
float pathOffset = pathLength;
if (paint->getTextAlign() == SkPaint::kCenter_Align) {
textWidth *= 0.5f;
@@ -347,14 +345,14 @@
}
}
-void Font::measure(const SkPaint* paint, const char* text, uint32_t start, uint32_t len,
+void Font::measure(const SkPaint* paint, const char* text,
int numGlyphs, Rect *bounds, const float* positions) {
if (bounds == nullptr) {
ALOGE("No return rectangle provided to measure text");
return;
}
bounds->set(1e6, -1e6, -1e6, 1e6);
- render(paint, text, start, len, numGlyphs, 0, 0, MEASURE, nullptr, 0, 0, bounds, positions);
+ render(paint, text, numGlyphs, 0, 0, MEASURE, nullptr, 0, 0, bounds, positions);
}
void Font::precache(const SkPaint* paint, const char* text, int numGlyphs) {
@@ -378,10 +376,10 @@
}
}
-void Font::render(const SkPaint* paint, const char* text, uint32_t start, uint32_t len,
+void Font::render(const SkPaint* paint, const char* text,
int numGlyphs, int x, int y, RenderMode mode, uint8_t *bitmap,
uint32_t bitmapW, uint32_t bitmapH, Rect* bounds, const float* positions) {
- if (numGlyphs == 0 || text == nullptr || len == 0) {
+ if (numGlyphs == 0 || text == nullptr) {
return;
}
@@ -395,7 +393,6 @@
};
RenderGlyph render = gRenderGlyph[(mode << 1) + !mIdentityTransform];
- text += start;
int glyphsCount = 0;
while (glyphsCount < numGlyphs) {
diff --git a/libs/hwui/font/Font.h b/libs/hwui/font/Font.h
index 3119d73..59518a1 100644
--- a/libs/hwui/font/Font.h
+++ b/libs/hwui/font/Font.h
@@ -82,10 +82,10 @@
~Font();
- void render(const SkPaint* paint, const char* text, uint32_t start, uint32_t len,
+ void render(const SkPaint* paint, const char* text,
int numGlyphs, int x, int y, const float* positions);
- void render(const SkPaint* paint, const char* text, uint32_t start, uint32_t len,
+ void render(const SkPaint* paint, const char* text,
int numGlyphs, const SkPath* path, float hOffset, float vOffset);
const Font::FontDescription& getDescription() const {
@@ -113,11 +113,11 @@
void precache(const SkPaint* paint, const char* text, int numGlyphs);
- void render(const SkPaint* paint, const char *text, uint32_t start, uint32_t len,
+ void render(const SkPaint* paint, const char *text,
int numGlyphs, int x, int y, RenderMode mode, uint8_t *bitmap,
uint32_t bitmapW, uint32_t bitmapH, Rect *bounds, const float* positions);
- void measure(const SkPaint* paint, const char* text, uint32_t start, uint32_t len,
+ void measure(const SkPaint* paint, const char* text,
int numGlyphs, Rect *bounds, const float* positions);
void invalidateTextureCache(CacheTexture* cacheTexture = nullptr);
diff --git a/libs/hwui/microbench/DisplayListCanvasBench.cpp b/libs/hwui/microbench/DisplayListCanvasBench.cpp
index 7a62037..4be1f99 100644
--- a/libs/hwui/microbench/DisplayListCanvasBench.cpp
+++ b/libs/hwui/microbench/DisplayListCanvasBench.cpp
@@ -23,7 +23,7 @@
#include "DisplayListCanvas.h"
#endif
#include "microbench/MicroBench.h"
-#include "unit_tests/TestUtils.h"
+#include "utils/TestUtils.h"
using namespace android;
using namespace android::uirenderer;
diff --git a/libs/hwui/microbench/OpReordererBench.cpp b/libs/hwui/microbench/OpReordererBench.cpp
index 7b8d0e5..53b64c3 100644
--- a/libs/hwui/microbench/OpReordererBench.cpp
+++ b/libs/hwui/microbench/OpReordererBench.cpp
@@ -17,11 +17,14 @@
#include <benchmark/Benchmark.h>
#include "BakedOpState.h"
+#include "BakedOpDispatcher.h"
#include "BakedOpRenderer.h"
+#include "LayerUpdateQueue.h"
#include "OpReorderer.h"
#include "RecordedOp.h"
#include "RecordingCanvas.h"
-#include "unit_tests/TestUtils.h"
+#include "utils/TestUtils.h"
+#include "Vector.h"
#include "microbench/MicroBench.h"
#include <vector>
@@ -29,26 +32,38 @@
using namespace android;
using namespace android::uirenderer;
-auto sReorderingDisplayList = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
- SkBitmap bitmap = TestUtils::createSkBitmap(10, 10);
- SkPaint paint;
+const LayerUpdateQueue sEmptyLayerUpdateQueue;
+const Vector3 sLightCenter = {100, 100, 100};
- // Alternate between drawing rects and bitmaps, with bitmaps overlapping rects.
- // Rects don't overlap bitmaps, so bitmaps should be brought to front as a group.
- canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
- for (int i = 0; i < 30; i++) {
- canvas.translate(0, 10);
- canvas.drawRect(0, 0, 10, 10, paint);
- canvas.drawBitmap(bitmap, 5, 0, nullptr);
- }
- canvas.restore();
-});
+static std::vector<sp<RenderNode>> createTestNodeList() {
+ auto node = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ SkBitmap bitmap = TestUtils::createSkBitmap(10, 10);
+ SkPaint paint;
+
+ // Alternate between drawing rects and bitmaps, with bitmaps overlapping rects.
+ // Rects don't overlap bitmaps, so bitmaps should be brought to front as a group.
+ canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
+ for (int i = 0; i < 30; i++) {
+ canvas.translate(0, 10);
+ canvas.drawRect(0, 0, 10, 10, paint);
+ canvas.drawBitmap(bitmap, 5, 0, nullptr);
+ }
+ canvas.restore();
+ });
+ TestUtils::syncHierarchyPropertiesAndDisplayList(node);
+ std::vector<sp<RenderNode>> vec;
+ vec.emplace_back(node);
+ return vec;
+}
BENCHMARK_NO_ARG(BM_OpReorderer_defer);
void BM_OpReorderer_defer::Run(int iters) {
+ auto nodes = createTestNodeList();
StartBenchmarkTiming();
for (int i = 0; i < iters; i++) {
- OpReorderer reorderer(200, 200, *sReorderingDisplayList);
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200,
+ nodes, sLightCenter);
MicroBench::DoNotOptimize(&reorderer);
}
StopBenchmarkTiming();
@@ -57,13 +72,18 @@
BENCHMARK_NO_ARG(BM_OpReorderer_deferAndRender);
void BM_OpReorderer_deferAndRender::Run(int iters) {
TestUtils::runOnRenderThread([this, iters](renderthread::RenderThread& thread) {
+ auto nodes = createTestNodeList();
+ BakedOpRenderer::LightInfo lightInfo = {50.0f, 128, 128 };
+
RenderState& renderState = thread.renderState();
Caches& caches = Caches::getInstance();
+
StartBenchmarkTiming();
for (int i = 0; i < iters; i++) {
- OpReorderer reorderer(200, 200, *sReorderingDisplayList);
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200,
+ nodes, sLightCenter);
- BakedOpRenderer renderer(caches, renderState, true);
+ BakedOpRenderer renderer(caches, renderState, true, lightInfo);
reorderer.replayBakedOps<BakedOpDispatcher>(renderer);
MicroBench::DoNotOptimize(&renderer);
}
diff --git a/libs/hwui/microbench/PathParserBench.cpp b/libs/hwui/microbench/PathParserBench.cpp
index 198035e..3d9fafa 100644
--- a/libs/hwui/microbench/PathParserBench.cpp
+++ b/libs/hwui/microbench/PathParserBench.cpp
@@ -17,20 +17,35 @@
#include <benchmark/Benchmark.h>
#include "PathParser.h"
+#include "VectorDrawablePath.h"
#include <SkPath.h>
using namespace android;
using namespace android::uirenderer;
-BENCHMARK_NO_ARG(BM_PathParser_parseStringPath);
-void BM_PathParser_parseStringPath::Run(int iter) {
- const char* pathString = "M 1 1 m 2 2, l 3 3 L 3 3 H 4 h4 V5 v5, Q6 6 6 6 q 6 6 6 6t 7 7 T 7 7 C 8 8 8 8 8 8 c 8 8 8 8 8 8 S 9 9 9 9 s 9 9 9 9 A 10 10 0 1 1 10 10 a 10 10 0 1 1 10 10";
+static const char* sPathString = "M 1 1 m 2 2, l 3 3 L 3 3 H 4 h4 V5 v5, Q6 6 6 6 q 6 6 6 6t 7 7 T 7 7 C 8 8 8 8 8 8 c 8 8 8 8 8 8 S 9 9 9 9 s 9 9 9 9 A 10 10 0 1 1 10 10 a 10 10 0 1 1 10 10";
+
+BENCHMARK_NO_ARG(BM_PathParser_parseStringPathForSkPath);
+void BM_PathParser_parseStringPathForSkPath::Run(int iter) {
SkPath skPath;
- size_t length = strlen(pathString);
+ size_t length = strlen(sPathString);
+ PathParser::ParseResult result;
StartBenchmarkTiming();
for (int i = 0; i < iter; i++) {
- PathParser::parseStringForSkPath(&skPath, pathString, length);
+ PathParser::parseStringForSkPath(&skPath, &result, sPathString, length);
+ }
+ StopBenchmarkTiming();
+}
+
+BENCHMARK_NO_ARG(BM_PathParser_parseStringPathForPathData);
+void BM_PathParser_parseStringPathForPathData::Run(int iter) {
+ size_t length = strlen(sPathString);
+ PathData outData;
+ PathParser::ParseResult result;
+ StartBenchmarkTiming();
+ for (int i = 0; i < iter; i++) {
+ PathParser::getPathDataFromString(&outData, &result, sPathString, length);
}
StopBenchmarkTiming();
}
diff --git a/libs/hwui/renderstate/OffscreenBufferPool.h b/libs/hwui/renderstate/OffscreenBufferPool.h
index f0fd82d..fac6c35 100644
--- a/libs/hwui/renderstate/OffscreenBufferPool.h
+++ b/libs/hwui/renderstate/OffscreenBufferPool.h
@@ -34,6 +34,11 @@
* Lightweight alternative to Layer. Owns the persistent state of an offscreen render target, and
* encompasses enough information to draw it back on screen (minus paint properties, which are held
* by LayerOp).
+ *
+ * Has two distinct sizes - viewportWidth/viewportHeight describe content area,
+ * texture.width/.height are actual allocated texture size. Texture will tend to be larger than the
+ * viewport bounds, since textures are always allocated with width / height as a multiple of 64, for
+ * the purpose of improving reuse.
*/
class OffscreenBuffer {
public:
@@ -44,11 +49,17 @@
// must be called prior to rendering, to construct/update vertex buffer
void updateMeshFromRegion();
+ // Set by RenderNode for HW layers, TODO for clipped saveLayers
+ void setWindowTransform(const Matrix4& transform) {
+ inverseTransformInWindow.loadInverse(transform);
+ }
+
static uint32_t computeIdealDimension(uint32_t dimension);
uint32_t getSizeInBytes() { return texture.width * texture.height * 4; }
RenderState& renderState;
+
uint32_t viewportWidth;
uint32_t viewportHeight;
Texture texture;
@@ -56,6 +67,10 @@
// Portion of layer that has been drawn to. Used to minimize drawing area when
// drawing back to screen / parent FBO.
Region region;
+
+ Matrix4 inverseTransformInWindow;
+
+ // vbo / size of mesh
GLsizei elementCount = 0;
GLuint vbo = 0;
};
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index f094b2d..ca85dfb 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -31,7 +31,6 @@
#include "utils/TimeUtils.h"
#if HWUI_NEW_OPS
-#include "BakedOpRenderer.h"
#include "OpReorderer.h"
#endif
@@ -150,13 +149,23 @@
// TODO: don't pass viewport size, it's automatic via EGL
void CanvasContext::setup(int width, int height, float lightRadius,
uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
+#if HWUI_NEW_OPS
+ mLightInfo.lightRadius = lightRadius;
+ mLightInfo.ambientShadowAlpha = ambientShadowAlpha;
+ mLightInfo.spotShadowAlpha = spotShadowAlpha;
+#else
if (!mCanvas) return;
mCanvas->initLight(lightRadius, ambientShadowAlpha, spotShadowAlpha);
+#endif
}
void CanvasContext::setLightCenter(const Vector3& lightCenter) {
+#if HWUI_NEW_OPS
+ mLightCenter = lightCenter;
+#else
if (!mCanvas) return;
mCanvas->setLightCenter(lightCenter);
+#endif
}
void CanvasContext::setOpaque(bool opaque) {
@@ -228,7 +237,7 @@
if (CC_LIKELY(mSwapHistory.size())) {
nsecs_t latestVsync = mRenderThread.timeLord().latestVsync();
const SwapHistory& lastSwap = mSwapHistory.back();
- int vsyncDelta = std::abs(lastSwap.vsyncTime - latestVsync);
+ nsecs_t vsyncDelta = std::abs(lastSwap.vsyncTime - latestVsync);
// The slight fudge-factor is to deal with cases where
// the vsync was estimated due to being slow handling the signal.
// See the logic in TimeLord#computeFrameTimeNanos or in
@@ -340,9 +349,11 @@
mEglManager.damageFrame(frame, dirty);
#if HWUI_NEW_OPS
- OpReorderer reorderer(mLayerUpdateQueue, dirty, frame.width(), frame.height(), mRenderNodes);
+ OpReorderer reorderer(mLayerUpdateQueue, dirty, frame.width(), frame.height(),
+ mRenderNodes, mLightCenter);
mLayerUpdateQueue.clear();
- BakedOpRenderer renderer(Caches::getInstance(), mRenderThread.renderState(), mOpaque);
+ BakedOpRenderer renderer(Caches::getInstance(), mRenderThread.renderState(),
+ mOpaque, mLightInfo);
// TODO: profiler().draw(mCanvas);
reorderer.replayBakedOps<BakedOpDispatcher>(renderer);
@@ -576,8 +587,12 @@
// purposes when the frame is actually drawn
node->setPropertyFieldsDirty(RenderNode::GENERIC);
+#if HWUI_NEW_OPS
+ LOG_ALWAYS_FATAL("unsupported");
+#else
mCanvas->markLayersAsBuildLayers();
mCanvas->flushLayerUpdates();
+#endif
node->incStrong(nullptr);
mPrefetechedLayers.insert(node);
diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index d656014..d36ce99 100644
--- a/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@ -27,6 +27,11 @@
#include "renderthread/RenderTask.h"
#include "renderthread/RenderThread.h"
+#if HWUI_NEW_OPS
+#include "BakedOpDispatcher.h"
+#include "BakedOpRenderer.h"
+#endif
+
#include <cutils/compiler.h>
#include <EGL/egl.h>
#include <SkBitmap.h>
@@ -165,6 +170,11 @@
bool mOpaque;
OpenGLRenderer* mCanvas = nullptr;
+#if HWUI_NEW_OPS
+ BakedOpRenderer::LightInfo mLightInfo;
+ Vector3 mLightCenter = { 0, 0, 0 };
+#endif
+
bool mHaveNewSurface = false;
DamageAccumulator mDamageAccumulator;
LayerUpdateQueue mLayerUpdateQueue;
diff --git a/libs/hwui/tests/Benchmark.h b/libs/hwui/tests/Benchmark.h
index e16310e..3f87d7f 100644
--- a/libs/hwui/tests/Benchmark.h
+++ b/libs/hwui/tests/Benchmark.h
@@ -16,6 +16,8 @@
#ifndef TESTS_BENCHMARK_H
#define TESTS_BENCHMARK_H
+#include "TestScene.h"
+
#include <string>
#include <vector>
@@ -26,12 +28,17 @@
int count;
};
-typedef void (*BenchmarkFunctor)(const BenchmarkOptions&);
+typedef test::TestScene* (*CreateScene)(const BenchmarkOptions&);
+
+template <class T>
+test::TestScene* simpleCreateScene(const BenchmarkOptions&) {
+ return new T();
+}
struct BenchmarkInfo {
std::string name;
std::string description;
- BenchmarkFunctor functor;
+ CreateScene createScene;
};
class Benchmark {
diff --git a/libs/hwui/tests/TestScene.h b/libs/hwui/tests/TestScene.h
new file mode 100644
index 0000000..b5d8954
--- /dev/null
+++ b/libs/hwui/tests/TestScene.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+#ifndef TESTS_TESTSCENE_H
+#define TESTS_TESTSCENE_H
+
+namespace android {
+namespace uirenderer {
+class RenderNode;
+
+#if HWUI_NEW_OPS
+class RecordingCanvas;
+typedef RecordingCanvas TestCanvas;
+#else
+class DisplayListCanvas;
+typedef DisplayListCanvas TestCanvas;
+#endif
+
+namespace test {
+
+class TestScene {
+public:
+ virtual ~TestScene() {}
+ virtual void createContent(int width, int height, TestCanvas& renderer) = 0;
+ virtual void doFrame(int frameNr) = 0;
+};
+
+} // namespace test
+} // namespace uirenderer
+} // namespace android
+
+#endif /* TESTS_TESTSCENE_H */
diff --git a/libs/hwui/tests/TestSceneRunner.cpp b/libs/hwui/tests/TestSceneRunner.cpp
new file mode 100644
index 0000000..0376e10
--- /dev/null
+++ b/libs/hwui/tests/TestSceneRunner.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "AnimationContext.h"
+#include "Benchmark.h"
+#include "RenderNode.h"
+#include "TestContext.h"
+#include "scenes/TestSceneBase.h"
+#include "renderthread/RenderProxy.h"
+#include "renderthread/RenderTask.h"
+
+#include <cutils/log.h>
+#include <gui/Surface.h>
+#include <ui/PixelFormat.h>
+
+using namespace android;
+using namespace android::uirenderer;
+using namespace android::uirenderer::renderthread;
+using namespace android::uirenderer::test;
+
+class ContextFactory : public IContextFactory {
+public:
+ virtual AnimationContext* createAnimationContext(renderthread::TimeLord& clock) override {
+ return new AnimationContext(clock);
+ }
+};
+
+void run(const BenchmarkInfo& info, const BenchmarkOptions& opts) {
+ // Switch to the real display
+ gDisplay = getBuiltInDisplay();
+
+ std::unique_ptr<TestScene> scene(info.createScene(opts));
+
+ TestContext testContext;
+
+ // create the native surface
+ const int width = gDisplay.w;
+ const int height = gDisplay.h;
+ sp<Surface> surface = testContext.surface();
+
+ sp<RenderNode> rootNode = TestUtils::createNode(0, 0, width, height,
+ [&scene, width, height](RenderProperties& props, TestCanvas& canvas) {
+ props.setClipToBounds(false);
+ scene->createContent(width, height, canvas);
+ });
+
+ ContextFactory factory;
+ std::unique_ptr<RenderProxy> proxy(new RenderProxy(false,
+ rootNode.get(), &factory));
+ proxy->loadSystemProperties();
+ proxy->initialize(surface);
+ float lightX = width / 2.0;
+ proxy->setup(width, height, dp(800.0f), 255 * 0.075, 255 * 0.15);
+ proxy->setLightCenter((Vector3){lightX, dp(-200.0f), dp(800.0f)});
+
+ // Do a few cold runs then reset the stats so that the caches are all hot
+ for (int i = 0; i < 3; i++) {
+ testContext.waitForVsync();
+ nsecs_t vsync = systemTime(CLOCK_MONOTONIC);
+ UiFrameInfoBuilder(proxy->frameInfo()).setVsync(vsync, vsync);
+ proxy->syncAndDrawFrame();
+ }
+ proxy->resetProfileInfo();
+
+ for (int i = 0; i < opts.count; i++) {
+ testContext.waitForVsync();
+
+ ATRACE_NAME("UI-Draw Frame");
+ nsecs_t vsync = systemTime(CLOCK_MONOTONIC);
+ UiFrameInfoBuilder(proxy->frameInfo()).setVsync(vsync, vsync);
+ scene->doFrame(i);
+ proxy->syncAndDrawFrame();
+ }
+
+ proxy->dumpProfileInfo(STDOUT_FILENO, 0);
+}
diff --git a/libs/hwui/tests/TreeContentAnimation.cpp b/libs/hwui/tests/TreeContentAnimation.cpp
deleted file mode 100644
index 81bf9ed..0000000
--- a/libs/hwui/tests/TreeContentAnimation.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-#include <cutils/log.h>
-#include <gui/Surface.h>
-#include <ui/PixelFormat.h>
-
-#include <AnimationContext.h>
-#include <DisplayListCanvas.h>
-#include <RecordingCanvas.h>
-#include <RenderNode.h>
-#include <renderthread/RenderProxy.h>
-#include <renderthread/RenderTask.h>
-#include <unit_tests/TestUtils.h>
-
-#include "Benchmark.h"
-#include "TestContext.h"
-
-#include "protos/hwui.pb.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <vector>
-
-using namespace android;
-using namespace android::uirenderer;
-using namespace android::uirenderer::renderthread;
-using namespace android::uirenderer::test;
-
-#if HWUI_NEW_OPS
-typedef RecordingCanvas TestCanvas;
-#else
-typedef DisplayListCanvas TestCanvas;
-#endif
-
-
-class ContextFactory : public IContextFactory {
-public:
- virtual AnimationContext* createAnimationContext(renderthread::TimeLord& clock) override {
- return new AnimationContext(clock);
- }
-};
-
-static void recordNode(RenderNode& node, std::function<void(TestCanvas&)> contentCallback) {
- TestCanvas canvas(node.stagingProperties().getWidth(), node.stagingProperties().getHeight());
- contentCallback(canvas);
- node.setStagingDisplayList(canvas.finishRecording());
-}
-
-class TreeContentAnimation {
-public:
- virtual ~TreeContentAnimation() {}
- int frameCount = 150;
- virtual int getFrameCount() { return frameCount; }
- virtual void setFrameCount(int fc) {
- if (fc > 0) {
- frameCount = fc;
- }
- }
- virtual void createContent(int width, int height, TestCanvas* canvas) = 0;
- virtual void doFrame(int frameNr) = 0;
-
- template <class T>
- static void run(const BenchmarkOptions& opts) {
- // Switch to the real display
- gDisplay = getBuiltInDisplay();
-
- T animation;
- animation.setFrameCount(opts.count);
-
- TestContext testContext;
-
- // create the native surface
- const int width = gDisplay.w;
- const int height = gDisplay.h;
- sp<Surface> surface = testContext.surface();
-
- RenderNode* rootNode = new RenderNode();
- rootNode->incStrong(nullptr);
- rootNode->mutateStagingProperties().setLeftTopRightBottom(0, 0, width, height);
- rootNode->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- rootNode->mutateStagingProperties().setClipToBounds(false);
- rootNode->setPropertyFieldsDirty(RenderNode::GENERIC);
-
- ContextFactory factory;
- std::unique_ptr<RenderProxy> proxy(new RenderProxy(false, rootNode, &factory));
- proxy->loadSystemProperties();
- proxy->initialize(surface);
- float lightX = width / 2.0;
- proxy->setup(width, height, dp(800.0f), 255 * 0.075, 255 * 0.15);
- proxy->setLightCenter((Vector3){lightX, dp(-200.0f), dp(800.0f)});
-
- recordNode(*rootNode, [&animation, width, height](TestCanvas& canvas) {
- animation.createContent(width, height, &canvas); //TODO: no&
- });
-
- // Do a few cold runs then reset the stats so that the caches are all hot
- for (int i = 0; i < 3; i++) {
- testContext.waitForVsync();
- proxy->syncAndDrawFrame();
- }
- proxy->resetProfileInfo();
-
- for (int i = 0; i < animation.getFrameCount(); i++) {
- testContext.waitForVsync();
-
- ATRACE_NAME("UI-Draw Frame");
- nsecs_t vsync = systemTime(CLOCK_MONOTONIC);
- UiFrameInfoBuilder(proxy->frameInfo())
- .setVsync(vsync, vsync);
- animation.doFrame(i);
- proxy->syncAndDrawFrame();
- }
-
- proxy->dumpProfileInfo(STDOUT_FILENO, 0);
- rootNode->decStrong(nullptr);
- }
-};
-
-class ShadowGridAnimation : public TreeContentAnimation {
-public:
- std::vector< sp<RenderNode> > cards;
- void createContent(int width, int height, TestCanvas* canvas) override {
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
- canvas->insertReorderBarrier(true);
-
- for (int x = dp(16); x < (width - dp(116)); x += dp(116)) {
- for (int y = dp(16); y < (height - dp(116)); y += dp(116)) {
- sp<RenderNode> card = createCard(x, y, dp(100), dp(100));
- canvas->drawRenderNode(card.get());
- cards.push_back(card);
- }
- }
-
- canvas->insertReorderBarrier(false);
- }
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- for (size_t ci = 0; ci < cards.size(); ci++) {
- cards[ci]->mutateStagingProperties().setTranslationX(curFrame);
- cards[ci]->mutateStagingProperties().setTranslationY(curFrame);
- cards[ci]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- }
- }
-private:
- sp<RenderNode> createCard(int x, int y, int width, int height) {
- sp<RenderNode> node = new RenderNode();
- node->mutateStagingProperties().setLeftTopRightBottom(x, y, x + width, y + height);
- node->mutateStagingProperties().setElevation(dp(16));
- node->mutateStagingProperties().mutableOutline().setRoundRect(0, 0, width, height, dp(10), 1);
- node->mutateStagingProperties().mutableOutline().setShouldClip(true);
- node->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y | RenderNode::Z);
-
- recordNode(*node, [](TestCanvas& canvas) {
- canvas.drawColor(0xFFEEEEEE, SkXfermode::kSrcOver_Mode);
- });
- return node;
- }
-};
-static Benchmark _ShadowGrid(BenchmarkInfo{
- "shadowgrid",
- "A grid of rounded rects that cast a shadow. Simplified scenario of an "
- "Android TV-style launcher interface. High CPU/GPU load.",
- TreeContentAnimation::run<ShadowGridAnimation>
-});
-
-class ShadowGrid2Animation : public TreeContentAnimation {
-public:
- std::vector< sp<RenderNode> > cards;
- void createContent(int width, int height, TestCanvas* canvas) override {
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
- canvas->insertReorderBarrier(true);
-
- for (int x = dp(8); x < (width - dp(58)); x += dp(58)) {
- for (int y = dp(8); y < (height - dp(58)); y += dp(58)) {
- sp<RenderNode> card = createCard(x, y, dp(50), dp(50));
- canvas->drawRenderNode(card.get());
- cards.push_back(card);
- }
- }
-
- canvas->insertReorderBarrier(false);
- }
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- for (size_t ci = 0; ci < cards.size(); ci++) {
- cards[ci]->mutateStagingProperties().setTranslationX(curFrame);
- cards[ci]->mutateStagingProperties().setTranslationY(curFrame);
- cards[ci]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- }
- }
-private:
- sp<RenderNode> createCard(int x, int y, int width, int height) {
- sp<RenderNode> node = new RenderNode();
- node->mutateStagingProperties().setLeftTopRightBottom(x, y, x + width, y + height);
- node->mutateStagingProperties().setElevation(dp(16));
- node->mutateStagingProperties().mutableOutline().setRoundRect(0, 0, width, height, dp(6), 1);
- node->mutateStagingProperties().mutableOutline().setShouldClip(true);
- node->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y | RenderNode::Z);
-
- recordNode(*node, [](TestCanvas& canvas) {
- canvas.drawColor(0xFFEEEEEE, SkXfermode::kSrcOver_Mode);
- });
- return node;
- }
-};
-static Benchmark _ShadowGrid2(BenchmarkInfo{
- "shadowgrid2",
- "A dense grid of rounded rects that cast a shadow. This is a higher CPU load "
- "variant of shadowgrid. Very high CPU load, high GPU load.",
- TreeContentAnimation::run<ShadowGrid2Animation>
-});
-
-class RectGridAnimation : public TreeContentAnimation {
-public:
- sp<RenderNode> card = new RenderNode();
- void createContent(int width, int height, TestCanvas* canvas) override {
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
- canvas->insertReorderBarrier(true);
-
- card->mutateStagingProperties().setLeftTopRightBottom(50, 50, 250, 250);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- recordNode(*card, [](TestCanvas& canvas) {
- canvas.drawColor(0xFFFF00FF, SkXfermode::kSrcOver_Mode);
-
- SkRegion region;
- for (int xOffset = 0; xOffset < 200; xOffset+=2) {
- for (int yOffset = 0; yOffset < 200; yOffset+=2) {
- region.op(xOffset, yOffset, xOffset + 1, yOffset + 1, SkRegion::kUnion_Op);
- }
- }
-
- SkPaint paint;
- paint.setColor(0xff00ffff);
- canvas.drawRegion(region, paint);
- });
- canvas->drawRenderNode(card.get());
-
- canvas->insertReorderBarrier(false);
- }
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- card->mutateStagingProperties().setTranslationX(curFrame);
- card->mutateStagingProperties().setTranslationY(curFrame);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- }
-};
-static Benchmark _RectGrid(BenchmarkInfo{
- "rectgrid",
- "A dense grid of 1x1 rects that should visually look like a single rect. "
- "Low CPU/GPU load.",
- TreeContentAnimation::run<RectGridAnimation>
-});
-
-class OvalAnimation : public TreeContentAnimation {
-public:
- sp<RenderNode> card = new RenderNode();
- void createContent(int width, int height, TestCanvas* canvas) override {
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
- canvas->insertReorderBarrier(true);
-
- card->mutateStagingProperties().setLeftTopRightBottom(0, 0, 200, 200);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- recordNode(*card, [](TestCanvas& canvas) {
- SkPaint paint;
- paint.setAntiAlias(true);
- paint.setColor(0xFF000000);
- canvas.drawOval(0, 0, 200, 200, paint);
- });
- canvas->drawRenderNode(card.get());
-
- canvas->insertReorderBarrier(false);
- }
-
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- card->mutateStagingProperties().setTranslationX(curFrame);
- card->mutateStagingProperties().setTranslationY(curFrame);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- }
-};
-static Benchmark _Oval(BenchmarkInfo{
- "oval",
- "Draws 1 oval.",
- TreeContentAnimation::run<OvalAnimation>
-});
-
-class PartialDamageTest : public TreeContentAnimation {
-public:
- std::vector< sp<RenderNode> > cards;
- void createContent(int width, int height, TestCanvas* canvas) override {
- static SkColor COLORS[] = {
- 0xFFF44336,
- 0xFF9C27B0,
- 0xFF2196F3,
- 0xFF4CAF50,
- };
-
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
-
- for (int x = dp(16); x < (width - dp(116)); x += dp(116)) {
- for (int y = dp(16); y < (height - dp(116)); y += dp(116)) {
- sp<RenderNode> card = createCard(x, y, dp(100), dp(100),
- COLORS[static_cast<int>((y / dp(116))) % 4]);
- canvas->drawRenderNode(card.get());
- cards.push_back(card);
- }
- }
- }
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- cards[0]->mutateStagingProperties().setTranslationX(curFrame);
- cards[0]->mutateStagingProperties().setTranslationY(curFrame);
- cards[0]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
-
- recordNode(*cards[0], [curFrame](TestCanvas& canvas) {
- canvas.drawColor(interpolateColor(curFrame / 150.0f, 0xFFF44336, 0xFFF8BBD0),
- SkXfermode::kSrcOver_Mode);
- });
- }
-
- static SkColor interpolateColor(float fraction, SkColor start, SkColor end) {
- int startA = (start >> 24) & 0xff;
- int startR = (start >> 16) & 0xff;
- int startG = (start >> 8) & 0xff;
- int startB = start & 0xff;
-
- int endA = (end >> 24) & 0xff;
- int endR = (end >> 16) & 0xff;
- int endG = (end >> 8) & 0xff;
- int endB = end & 0xff;
-
- return (int)((startA + (int)(fraction * (endA - startA))) << 24) |
- (int)((startR + (int)(fraction * (endR - startR))) << 16) |
- (int)((startG + (int)(fraction * (endG - startG))) << 8) |
- (int)((startB + (int)(fraction * (endB - startB))));
- }
-private:
- sp<RenderNode> createCard(int x, int y, int width, int height, SkColor color) {
- sp<RenderNode> node = new RenderNode();
- node->mutateStagingProperties().setLeftTopRightBottom(x, y, x + width, y + height);
- node->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
-
- recordNode(*node, [color](TestCanvas& canvas) {
- canvas.drawColor(color, SkXfermode::kSrcOver_Mode);
- });
- return node;
- }
-};
-static Benchmark _PartialDamage(BenchmarkInfo{
- "partialdamage",
- "Tests the partial invalidation path. Draws a grid of rects and animates 1 "
- "of them, should be low CPU & GPU load if EGL_EXT_buffer_age or "
- "EGL_KHR_partial_update is supported by the device & are enabled in hwui.",
- TreeContentAnimation::run<PartialDamageTest>
-});
-
-
-class SaveLayerAnimation : public TreeContentAnimation {
-public:
- sp<RenderNode> card = new RenderNode();
- void createContent(int width, int height, TestCanvas* canvas) override {
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode); // background
-
- card->mutateStagingProperties().setLeftTopRightBottom(0, 0, 200, 200);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- recordNode(*card, [](TestCanvas& canvas) {
- canvas.saveLayerAlpha(0, 0, 200, 200, 128, SkCanvas::kClipToLayer_SaveFlag);
- canvas.drawColor(0xFF00FF00, SkXfermode::kSrcOver_Mode); // outer, unclipped
- canvas.saveLayerAlpha(50, 50, 150, 150, 128, SkCanvas::kClipToLayer_SaveFlag);
- canvas.drawColor(0xFF0000FF, SkXfermode::kSrcOver_Mode); // inner, clipped
- canvas.restore();
- canvas.restore();
- });
-
- canvas->drawRenderNode(card.get());
- }
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- card->mutateStagingProperties().setTranslationX(curFrame);
- card->mutateStagingProperties().setTranslationY(curFrame);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- }
-};
-static Benchmark _SaveLayer(BenchmarkInfo{
- "savelayer",
- "A nested pair of clipped saveLayer operations. "
- "Tests the clipped saveLayer codepath. Draws content into offscreen buffers and back again.",
- TreeContentAnimation::run<SaveLayerAnimation>
-});
-
-
-class HwLayerAnimation : public TreeContentAnimation {
-public:
- sp<RenderNode> card = TestUtils::createNode<TestCanvas>(0, 0, 200, 200, [] (TestCanvas& canvas) {
- canvas.drawColor(0xFF0000FF, SkXfermode::kSrcOver_Mode);
- }, TestUtils::getHwLayerSetupCallback());
- void createContent(int width, int height, TestCanvas* canvas) override {
- canvas->drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode); // background
- canvas->drawRenderNode(card.get());
- }
- void doFrame(int frameNr) override {
- int curFrame = frameNr % 150;
- card->mutateStagingProperties().setTranslationX(curFrame);
- card->mutateStagingProperties().setTranslationY(curFrame);
- card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- }
-};
-static Benchmark _HwLayer(BenchmarkInfo{
- "hwlayer",
- "A nested pair of nodes with LAYER_TYPE_HARDWARE set on each. "
- "Tests the hardware layer codepath.",
- TreeContentAnimation::run<HwLayerAnimation>
-});
diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp
index aee84de..48566e8 100644
--- a/libs/hwui/tests/main.cpp
+++ b/libs/hwui/tests/main.cpp
@@ -43,6 +43,8 @@
static int gRepeatCount = 1;
static std::vector<BenchmarkInfo> gRunTests;
+void run(const BenchmarkInfo& info, const BenchmarkOptions& opts);
+
static void printHelp() {
printf("\
USAGE: hwuitest [OPTIONS] <TESTNAME>\n\
@@ -186,7 +188,7 @@
opts.count = gFrameCount;
for (int i = 0; i < gRepeatCount; i++) {
for (auto&& test : gRunTests) {
- test.functor(opts);
+ run(test, opts);
}
}
printf("Success!\n");
diff --git a/libs/hwui/tests/scenes/HwLayerAnimation.cpp b/libs/hwui/tests/scenes/HwLayerAnimation.cpp
new file mode 100644
index 0000000..e316eca
--- /dev/null
+++ b/libs/hwui/tests/scenes/HwLayerAnimation.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+
+class HwLayerAnimation;
+
+static Benchmark _HwLayer(BenchmarkInfo{
+ "hwlayer",
+ "A nested pair of nodes with LAYER_TYPE_HARDWARE set on each. "
+ "Tests the hardware layer codepath.",
+ simpleCreateScene<HwLayerAnimation>
+});
+
+class HwLayerAnimation : public TestScene {
+public:
+ sp<RenderNode> card;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ card = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, TestCanvas& canvas) {
+ props.mutateLayerProperties().setType(LayerType::RenderLayer);
+ canvas.drawColor(0xFF0000FF, SkXfermode::kSrcOver_Mode);
+ });
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode); // background
+ canvas.drawRenderNode(card.get());
+ }
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ card->mutateStagingProperties().setTranslationX(curFrame);
+ card->mutateStagingProperties().setTranslationY(curFrame);
+ card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+ }
+};
diff --git a/libs/hwui/tests/scenes/ListViewAnimation.cpp b/libs/hwui/tests/scenes/ListViewAnimation.cpp
new file mode 100644
index 0000000..27adb12
--- /dev/null
+++ b/libs/hwui/tests/scenes/ListViewAnimation.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+#include "utils/Color.h"
+
+#include <cstdio>
+
+class ListViewAnimation;
+
+static Benchmark _ListView(BenchmarkInfo{
+ "listview",
+ "A mock ListView of scrolling content. Doesn't re-bind/re-record views as they are recycled, so"
+ "won't upload much content (either glyphs, or bitmaps).",
+ simpleCreateScene<ListViewAnimation>
+});
+
+class ListViewAnimation : public TestScene {
+public:
+ int cardHeight;
+ int cardSpacing;
+ int cardWidth;
+ int cardLeft;
+ sp<RenderNode> listView;
+ std::vector< sp<RenderNode> > cards;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ srand(0);
+ cardHeight = dp(60);
+ cardSpacing = dp(16);
+ cardWidth = std::min((height - cardSpacing * 2), (int)dp(300));
+ cardLeft = (width - cardWidth) / 2;
+
+ for (int y = 0; y < height + (cardHeight + cardSpacing - 1); y += (cardHeight + cardSpacing)) {
+ cards.push_back(createCard(cards.size(), y));
+ }
+ listView = TestUtils::createNode(0, 0, width, height,
+ [this](RenderProperties& props, TestCanvas& canvas) {
+ for (size_t ci = 0; ci < cards.size(); ci++) {
+ canvas.drawRenderNode(cards[ci].get());
+ }
+ });
+
+ canvas.drawColor(Color::Grey_500, SkXfermode::kSrcOver_Mode);
+ canvas.drawRenderNode(listView.get());
+ }
+
+ void doFrame(int frameNr) override {
+ int scrollPx = dp(frameNr) * 3;
+ int cardIndexOffset = scrollPx / (cardSpacing + cardHeight);
+ int pxOffset = -(scrollPx % (cardSpacing + cardHeight));
+
+ TestCanvas canvas(cardWidth, cardHeight);
+ for (size_t ci = 0; ci < cards.size(); ci++) {
+ // update card position
+ auto card = cards[(ci + cardIndexOffset) % cards.size()];
+ int top = ((int)ci) * (cardSpacing + cardHeight) + pxOffset;
+ card->mutateStagingProperties().setLeftTopRightBottom(
+ cardLeft, top, cardLeft + cardWidth, top + cardHeight);
+ card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+
+ // draw it to parent DisplayList
+ canvas.drawRenderNode(cards[ci].get());
+ }
+ listView->setStagingDisplayList(canvas.finishRecording());
+ }
+private:
+ SkBitmap createRandomCharIcon() {
+ int size = cardHeight - (dp(10) * 2);
+ SkBitmap bitmap = TestUtils::createSkBitmap(size, size);
+ SkCanvas canvas(bitmap);
+ canvas.clear(0);
+
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ SkColor randomColor = BrightColors[rand() % BrightColorsCount];
+ paint.setColor(randomColor);
+ canvas.drawCircle(size / 2, size / 2, size / 2, paint);
+
+ bool bgDark = SkColorGetR(randomColor) + SkColorGetG(randomColor) + SkColorGetB(randomColor)
+ < 128 * 3;
+ paint.setColor(bgDark ? Color::White : Color::Grey_700);
+ paint.setTextAlign(SkPaint::kCenter_Align);
+ paint.setTextSize(size / 2);
+ char charToShow = 'A' + (rand() % 26);
+ canvas.drawText(&charToShow, 1, size / 2, /*approximate centering*/ size * 0.7, paint);
+ return bitmap;
+ }
+
+ static SkBitmap createBoxBitmap(bool filled) {
+ int size = dp(20);
+ int stroke = dp(2);
+ SkBitmap bitmap = TestUtils::createSkBitmap(size, size);
+ SkCanvas canvas(bitmap);
+ canvas.clear(Color::Transparent);
+
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ paint.setColor(filled ? Color::Yellow_500 : Color::Grey_700);
+ paint.setStyle(filled ? SkPaint::kStrokeAndFill_Style : SkPaint::kStroke_Style);
+ paint.setStrokeWidth(stroke);
+ canvas.drawRect(SkRect::MakeLTRB(stroke, stroke, size - stroke, size - stroke), paint);
+ return bitmap;
+ }
+
+ sp<RenderNode> createCard(int cardId, int top) {
+ return TestUtils::createNode(cardLeft, top, cardLeft + cardWidth, top + cardHeight,
+ [this, cardId](RenderProperties& props, TestCanvas& canvas) {
+ static SkBitmap filledBox = createBoxBitmap(true);
+ static SkBitmap strokedBox = createBoxBitmap(false);
+
+ props.mutableOutline().setRoundRect(0, 0, cardWidth, cardHeight, dp(6), 1);
+ props.mutableOutline().setShouldClip(true);
+ canvas.drawColor(Color::White, SkXfermode::kSrcOver_Mode);
+
+ SkPaint textPaint;
+ textPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ textPaint.setColor(rand() % 2 ? Color::Black : Color::Grey_500);
+ textPaint.setTextSize(dp(20));
+ textPaint.setAntiAlias(true);
+ char buf[256];
+ snprintf(buf, sizeof(buf), "This card is #%d", cardId);
+ TestUtils::drawTextToCanvas(&canvas, buf, textPaint, cardHeight, dp(25));
+ textPaint.setTextSize(dp(15));
+ TestUtils::drawTextToCanvas(&canvas, "This is some more text on the card", textPaint,
+ cardHeight, dp(45));
+
+ canvas.drawBitmap(createRandomCharIcon(), dp(10), dp(10), nullptr);
+
+ const SkBitmap& boxBitmap = rand() % 2 ? filledBox : strokedBox;
+ canvas.drawBitmap(boxBitmap, cardWidth - dp(10) - boxBitmap.width(), dp(10), nullptr);
+ });
+ }
+};
diff --git a/libs/hwui/tests/scenes/OvalAnimation.cpp b/libs/hwui/tests/scenes/OvalAnimation.cpp
new file mode 100644
index 0000000..936aba1
--- /dev/null
+++ b/libs/hwui/tests/scenes/OvalAnimation.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+
+class OvalAnimation;
+
+static Benchmark _Oval(BenchmarkInfo{
+ "oval",
+ "Draws 1 oval.",
+ simpleCreateScene<OvalAnimation>
+});
+
+class OvalAnimation : public TestScene {
+public:
+ sp<RenderNode> card;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
+ card = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, TestCanvas& canvas) {
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ paint.setColor(0xFF000000);
+ canvas.drawOval(0, 0, 200, 200, paint);
+ });
+ canvas.drawRenderNode(card.get());
+ }
+
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ card->mutateStagingProperties().setTranslationX(curFrame);
+ card->mutateStagingProperties().setTranslationY(curFrame);
+ card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+ }
+};
diff --git a/libs/hwui/tests/scenes/PartialDamageAnimation.cpp b/libs/hwui/tests/scenes/PartialDamageAnimation.cpp
new file mode 100644
index 0000000..c31ddd1
--- /dev/null
+++ b/libs/hwui/tests/scenes/PartialDamageAnimation.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+
+class PartialDamageAnimation;
+
+static Benchmark _PartialDamage(BenchmarkInfo{
+ "partialdamage",
+ "Tests the partial invalidation path. Draws a grid of rects and animates 1 "
+ "of them, should be low CPU & GPU load if EGL_EXT_buffer_age or "
+ "EGL_KHR_partial_update is supported by the device & are enabled in hwui.",
+ simpleCreateScene<PartialDamageAnimation>
+});
+
+class PartialDamageAnimation : public TestScene {
+public:
+ std::vector< sp<RenderNode> > cards;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ static SkColor COLORS[] = {
+ 0xFFF44336,
+ 0xFF9C27B0,
+ 0xFF2196F3,
+ 0xFF4CAF50,
+ };
+
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
+
+ for (int x = dp(16); x < (width - dp(116)); x += dp(116)) {
+ for (int y = dp(16); y < (height - dp(116)); y += dp(116)) {
+ SkColor color = COLORS[static_cast<int>((y / dp(116))) % 4];
+ sp<RenderNode> card = TestUtils::createNode(x, y,
+ x + dp(100), y + dp(100),
+ [color](RenderProperties& props, TestCanvas& canvas) {
+ canvas.drawColor(color, SkXfermode::kSrcOver_Mode);
+ });
+ canvas.drawRenderNode(card.get());
+ cards.push_back(card);
+ }
+ }
+ }
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ cards[0]->mutateStagingProperties().setTranslationX(curFrame);
+ cards[0]->mutateStagingProperties().setTranslationY(curFrame);
+ cards[0]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+
+ TestUtils::recordNode(*cards[0], [curFrame](TestCanvas& canvas) {
+ SkColor color = TestUtils::interpolateColor(
+ curFrame / 150.0f, 0xFFF44336, 0xFFF8BBD0);
+ canvas.drawColor(color, SkXfermode::kSrcOver_Mode);
+ });
+ }
+};
diff --git a/libs/hwui/tests/scenes/RecentsAnimation.cpp b/libs/hwui/tests/scenes/RecentsAnimation.cpp
new file mode 100644
index 0000000..5d4ef96
--- /dev/null
+++ b/libs/hwui/tests/scenes/RecentsAnimation.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+#include "utils/Color.h"
+
+class RecentsAnimation;
+
+static Benchmark _Recents(BenchmarkInfo{
+ "recents",
+ "A recents-like scrolling list of textures. "
+ "Consists of updating a texture every frame",
+ simpleCreateScene<RecentsAnimation>
+});
+
+class RecentsAnimation : public TestScene {
+public:
+ void createContent(int width, int height, TestCanvas& renderer) override {
+ static SkColor COLORS[] = {
+ Color::Red_500,
+ Color::Purple_500,
+ Color::Blue_500,
+ Color::Green_500,
+ };
+
+ thumbnailSize = std::min(std::min(width, height) / 2, 720);
+ int cardsize = std::min(width, height) - dp(64);
+
+ renderer.drawColor(Color::White, SkXfermode::kSrcOver_Mode);
+ renderer.insertReorderBarrier(true);
+
+ int x = dp(32);
+ for (int i = 0; i < 4; i++) {
+ int y = (height / 4) * i;
+ SkBitmap thumb = TestUtils::createSkBitmap(thumbnailSize, thumbnailSize);
+ thumb.eraseColor(COLORS[i]);
+ sp<RenderNode> card = createCard(x, y, cardsize, cardsize, thumb);
+ card->mutateStagingProperties().setElevation(i * dp(8));
+ renderer.drawRenderNode(card.get());
+ mThumbnail = thumb;
+ mCards.push_back(card);
+ }
+
+ renderer.insertReorderBarrier(false);
+ }
+
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ for (size_t ci = 0; ci < mCards.size(); ci++) {
+ mCards[ci]->mutateStagingProperties().setTranslationY(curFrame);
+ mCards[ci]->setPropertyFieldsDirty(RenderNode::Y);
+ }
+ mThumbnail.eraseColor(TestUtils::interpolateColor(
+ curFrame / 150.0f, Color::Green_500, Color::DeepOrange_500));
+ }
+
+private:
+ sp<RenderNode> createCard(int x, int y, int width, int height,
+ const SkBitmap& thumb) {
+ return TestUtils::createNode(x, y, x + width, y + height,
+ [&thumb, width, height](RenderProperties& props, TestCanvas& canvas) {
+ props.setElevation(dp(16));
+ props.mutableOutline().setRoundRect(0, 0, width, height, dp(10), 1);
+ props.mutableOutline().setShouldClip(true);
+
+ canvas.drawColor(Color::Grey_200, SkXfermode::kSrcOver_Mode);
+ canvas.drawBitmap(thumb, 0, 0, thumb.width(), thumb.height(),
+ 0, 0, width, height, nullptr);
+ });
+ }
+
+ SkBitmap mThumbnail;
+ std::vector< sp<RenderNode> > mCards;
+ int thumbnailSize;
+};
diff --git a/libs/hwui/tests/scenes/RectGridAnimation.cpp b/libs/hwui/tests/scenes/RectGridAnimation.cpp
new file mode 100644
index 0000000..a1f04d6
--- /dev/null
+++ b/libs/hwui/tests/scenes/RectGridAnimation.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+
+#include "TestSceneBase.h"
+
+class RectGridAnimation;
+
+static Benchmark _RectGrid(BenchmarkInfo{
+ "rectgrid",
+ "A dense grid of 1x1 rects that should visually look like a single rect. "
+ "Low CPU/GPU load.",
+ simpleCreateScene<RectGridAnimation>
+});
+
+class RectGridAnimation : public TestScene {
+public:
+ sp<RenderNode> card;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
+ canvas.insertReorderBarrier(true);
+
+ card = TestUtils::createNode(50, 50, 250, 250,
+ [](RenderProperties& props, TestCanvas& canvas) {
+ canvas.drawColor(0xFFFF00FF, SkXfermode::kSrcOver_Mode);
+
+ SkRegion region;
+ for (int xOffset = 0; xOffset < 200; xOffset+=2) {
+ for (int yOffset = 0; yOffset < 200; yOffset+=2) {
+ region.op(xOffset, yOffset, xOffset + 1, yOffset + 1, SkRegion::kUnion_Op);
+ }
+ }
+
+ SkPaint paint;
+ paint.setColor(0xff00ffff);
+ canvas.drawRegion(region, paint);
+ });
+ canvas.drawRenderNode(card.get());
+
+ canvas.insertReorderBarrier(false);
+ }
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ card->mutateStagingProperties().setTranslationX(curFrame);
+ card->mutateStagingProperties().setTranslationY(curFrame);
+ card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+ }
+};
diff --git a/libs/hwui/tests/scenes/SaveLayerAnimation.cpp b/libs/hwui/tests/scenes/SaveLayerAnimation.cpp
new file mode 100644
index 0000000..c73e97b
--- /dev/null
+++ b/libs/hwui/tests/scenes/SaveLayerAnimation.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+
+class SaveLayerAnimation;
+
+static Benchmark _SaveLayer(BenchmarkInfo{
+ "savelayer",
+ "A nested pair of clipped saveLayer operations. "
+ "Tests the clipped saveLayer codepath. Draws content into offscreen buffers and back again.",
+ simpleCreateScene<SaveLayerAnimation>
+});
+
+class SaveLayerAnimation : public TestScene {
+public:
+ sp<RenderNode> card;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode); // background
+
+ card = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, TestCanvas& canvas) {
+ canvas.saveLayerAlpha(0, 0, 200, 200, 128, SkCanvas::kClipToLayer_SaveFlag);
+ canvas.drawColor(0xFF00FF00, SkXfermode::kSrcOver_Mode); // outer, unclipped
+ canvas.saveLayerAlpha(50, 50, 150, 150, 128, SkCanvas::kClipToLayer_SaveFlag);
+ canvas.drawColor(0xFF0000FF, SkXfermode::kSrcOver_Mode); // inner, clipped
+ canvas.restore();
+ canvas.restore();
+ });
+
+ canvas.drawRenderNode(card.get());
+ }
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ card->mutateStagingProperties().setTranslationX(curFrame);
+ card->mutateStagingProperties().setTranslationY(curFrame);
+ card->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+ }
+};
diff --git a/libs/hwui/tests/scenes/ShadowGrid2Animation.cpp b/libs/hwui/tests/scenes/ShadowGrid2Animation.cpp
new file mode 100644
index 0000000..26c86aa
--- /dev/null
+++ b/libs/hwui/tests/scenes/ShadowGrid2Animation.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+
+class ShadowGrid2Animation;
+
+static Benchmark _ShadowGrid2(BenchmarkInfo{
+ "shadowgrid2",
+ "A dense grid of rounded rects that cast a shadow. This is a higher CPU load "
+ "variant of shadowgrid. Very high CPU load, high GPU load.",
+ simpleCreateScene<ShadowGrid2Animation>
+});
+
+class ShadowGrid2Animation : public TestScene {
+public:
+ std::vector< sp<RenderNode> > cards;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
+ canvas.insertReorderBarrier(true);
+
+ for (int x = dp(8); x < (width - dp(58)); x += dp(58)) {
+ for (int y = dp(8); y < (height - dp(58)); y += dp(58)) {
+ sp<RenderNode> card = createCard(x, y, dp(50), dp(50));
+ canvas.drawRenderNode(card.get());
+ cards.push_back(card);
+ }
+ }
+
+ canvas.insertReorderBarrier(false);
+ }
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ for (size_t ci = 0; ci < cards.size(); ci++) {
+ cards[ci]->mutateStagingProperties().setTranslationX(curFrame);
+ cards[ci]->mutateStagingProperties().setTranslationY(curFrame);
+ cards[ci]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+ }
+ }
+private:
+ sp<RenderNode> createCard(int x, int y, int width, int height) {
+ return TestUtils::createNode(x, y, x + width, y + height,
+ [width, height](RenderProperties& props, TestCanvas& canvas) {
+ props.setElevation(dp(16));
+ props.mutableOutline().setRoundRect(0, 0, width, height, dp(6), 1);
+ props.mutableOutline().setShouldClip(true);
+ canvas.drawColor(0xFFEEEEEE, SkXfermode::kSrcOver_Mode);
+ });
+ }
+};
diff --git a/libs/hwui/tests/scenes/ShadowGridAnimation.cpp b/libs/hwui/tests/scenes/ShadowGridAnimation.cpp
new file mode 100644
index 0000000..ee3c590
--- /dev/null
+++ b/libs/hwui/tests/scenes/ShadowGridAnimation.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestSceneBase.h"
+
+class ShadowGridAnimation;
+
+static Benchmark _ShadowGrid(BenchmarkInfo{
+ "shadowgrid",
+ "A grid of rounded rects that cast a shadow. Simplified scenario of an "
+ "Android TV-style launcher interface. High CPU/GPU load.",
+ simpleCreateScene<ShadowGridAnimation>
+});
+
+class ShadowGridAnimation : public TestScene {
+public:
+ std::vector< sp<RenderNode> > cards;
+ void createContent(int width, int height, TestCanvas& canvas) override {
+ canvas.drawColor(0xFFFFFFFF, SkXfermode::kSrcOver_Mode);
+ canvas.insertReorderBarrier(true);
+
+ for (int x = dp(16); x < (width - dp(116)); x += dp(116)) {
+ for (int y = dp(16); y < (height - dp(116)); y += dp(116)) {
+ sp<RenderNode> card = createCard(x, y, dp(100), dp(100));
+ canvas.drawRenderNode(card.get());
+ cards.push_back(card);
+ }
+ }
+
+ canvas.insertReorderBarrier(false);
+ }
+ void doFrame(int frameNr) override {
+ int curFrame = frameNr % 150;
+ for (size_t ci = 0; ci < cards.size(); ci++) {
+ cards[ci]->mutateStagingProperties().setTranslationX(curFrame);
+ cards[ci]->mutateStagingProperties().setTranslationY(curFrame);
+ cards[ci]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
+ }
+ }
+private:
+ sp<RenderNode> createCard(int x, int y, int width, int height) {
+ return TestUtils::createNode(x, y, x + width, y + height,
+ [width, height](RenderProperties& props, TestCanvas& canvas) {
+ props.setElevation(dp(16));
+ props.mutableOutline().setRoundRect(0, 0, width, height, dp(6), 1);
+ props.mutableOutline().setShouldClip(true);
+ canvas.drawColor(0xFFEEEEEE, SkXfermode::kSrcOver_Mode);
+ });
+ }
+};
diff --git a/libs/hwui/tests/scenes/TestSceneBase.h b/libs/hwui/tests/scenes/TestSceneBase.h
new file mode 100644
index 0000000..a208509
--- /dev/null
+++ b/libs/hwui/tests/scenes/TestSceneBase.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+#ifndef TESTS_SCENES_TESTSCENEBASE_H
+#define TESTS_SCENES_TESTSCENEBASE_H
+
+#include "DisplayListCanvas.h"
+#include "RecordingCanvas.h"
+#include "RenderNode.h"
+#include "tests/Benchmark.h"
+#include "tests/TestContext.h"
+#include "tests/TestScene.h"
+#include "utils/TestUtils.h"
+
+#include <functional>
+
+using namespace android;
+using namespace android::uirenderer;
+using namespace android::uirenderer::renderthread;
+using namespace android::uirenderer::test;
+
+#endif /* TESTS_SCENES_TESTSCENEBASE_H_ */
diff --git a/libs/hwui/unit_tests/BakedOpStateTests.cpp b/libs/hwui/unit_tests/BakedOpStateTests.cpp
index 4e00fb3..7ad2f9b 100644
--- a/libs/hwui/unit_tests/BakedOpStateTests.cpp
+++ b/libs/hwui/unit_tests/BakedOpStateTests.cpp
@@ -18,7 +18,7 @@
#include <BakedOpState.h>
#include <RecordedOp.h>
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
namespace android {
namespace uirenderer {
diff --git a/libs/hwui/unit_tests/FatVectorTests.cpp b/libs/hwui/unit_tests/FatVectorTests.cpp
index 3ef329a..c6ccf4d 100644
--- a/libs/hwui/unit_tests/FatVectorTests.cpp
+++ b/libs/hwui/unit_tests/FatVectorTests.cpp
@@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include <utils/FatVector.h>
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
using namespace android;
using namespace android::uirenderer;
diff --git a/libs/hwui/unit_tests/LayerUpdateQueueTests.cpp b/libs/hwui/unit_tests/LayerUpdateQueueTests.cpp
index ef205ec..cc15cc6 100644
--- a/libs/hwui/unit_tests/LayerUpdateQueueTests.cpp
+++ b/libs/hwui/unit_tests/LayerUpdateQueueTests.cpp
@@ -19,7 +19,7 @@
#include <LayerUpdateQueue.h>
#include <RenderNode.h>
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
namespace android {
namespace uirenderer {
@@ -31,7 +31,7 @@
// sync node properties, so properties() reflects correct width and height
static sp<RenderNode> createSyncedNode(uint32_t width, uint32_t height) {
- sp<RenderNode> node = TestUtils::createNode(0, 0, width, height);
+ sp<RenderNode> node = TestUtils::createNode(0, 0, width, height, nullptr);
TestUtils::syncHierarchyPropertiesAndDisplayList(node);
return node;
}
diff --git a/libs/hwui/unit_tests/LinearAllocatorTests.cpp b/libs/hwui/unit_tests/LinearAllocatorTests.cpp
index 0f6b249..0591db6 100644
--- a/libs/hwui/unit_tests/LinearAllocatorTests.cpp
+++ b/libs/hwui/unit_tests/LinearAllocatorTests.cpp
@@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include <utils/LinearAllocator.h>
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
using namespace android;
using namespace android::uirenderer;
diff --git a/libs/hwui/unit_tests/OffscreenBufferPoolTests.cpp b/libs/hwui/unit_tests/OffscreenBufferPoolTests.cpp
index ba92157..de86aed 100644
--- a/libs/hwui/unit_tests/OffscreenBufferPoolTests.cpp
+++ b/libs/hwui/unit_tests/OffscreenBufferPoolTests.cpp
@@ -17,7 +17,7 @@
#include <gtest/gtest.h>
#include <renderstate/OffscreenBufferPool.h>
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
using namespace android;
using namespace android::uirenderer;
diff --git a/libs/hwui/unit_tests/OpReordererTests.cpp b/libs/hwui/unit_tests/OpReordererTests.cpp
index 07080a2..2ce1d0a 100644
--- a/libs/hwui/unit_tests/OpReordererTests.cpp
+++ b/libs/hwui/unit_tests/OpReordererTests.cpp
@@ -17,18 +17,26 @@
#include <gtest/gtest.h>
#include <BakedOpState.h>
+#include <LayerUpdateQueue.h>
#include <OpReorderer.h>
#include <RecordedOp.h>
#include <RecordingCanvas.h>
-#include <renderthread/CanvasContext.h> // todo: remove
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
#include <unordered_map>
namespace android {
namespace uirenderer {
-LayerUpdateQueue sEmptyLayerUpdateQueue;
+const LayerUpdateQueue sEmptyLayerUpdateQueue;
+const Vector3 sLightCenter = {100, 100, 100};
+
+static std::vector<sp<RenderNode>> createSyncedNodeList(sp<RenderNode>& node) {
+ TestUtils::syncHierarchyPropertiesAndDisplayList(node);
+ std::vector<sp<RenderNode>> vec;
+ vec.emplace_back(node);
+ return vec;
+}
/**
* Virtual class implemented by each test to redirect static operation / state transitions to
@@ -48,13 +56,13 @@
ADD_FAILURE() << "Layer creation not expected in this test";
return nullptr;
}
- virtual void startRepaintLayer(OffscreenBuffer*) {
+ virtual void startRepaintLayer(OffscreenBuffer*, const Rect& repaintRect) {
ADD_FAILURE() << "Layer repaint not expected in this test";
}
virtual void endLayer() {
ADD_FAILURE() << "Layer updates not expected in this test";
}
- virtual void startFrame(uint32_t width, uint32_t height) {}
+ virtual void startFrame(uint32_t width, uint32_t height, const Rect& repaintRect) {}
virtual void endFrame() {}
// define virtual defaults for direct
@@ -71,7 +79,7 @@
/**
* Dispatches all static methods to similar formed methods on renderer, which fail by default but
- * are overriden by subclasses per test.
+ * are overridden by subclasses per test.
*/
class TestDispatcher {
public:
@@ -87,7 +95,7 @@
TEST(OpReorderer, simple) {
class SimpleTestRenderer : public TestRendererBase {
public:
- void startFrame(uint32_t width, uint32_t height) override {
+ void startFrame(uint32_t width, uint32_t height, const Rect& repaintRect) override {
EXPECT_EQ(0, mIndex++);
EXPECT_EQ(100u, width);
EXPECT_EQ(200u, height);
@@ -103,50 +111,54 @@
}
};
- auto dl = TestUtils::createDisplayList<RecordingCanvas>(100, 200, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 100, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(25, 25);
canvas.drawRect(0, 0, 100, 200, SkPaint());
canvas.drawBitmap(bitmap, 10, 10, nullptr);
});
- OpReorderer reorderer(100, 200, *dl);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200,
+ createSyncedNodeList(node), sLightCenter);
SimpleTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(4, renderer.getIndex()); // 2 ops + start + end
}
TEST(OpReorderer, simpleRejection) {
- auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
canvas.clipRect(200, 200, 400, 400, SkRegion::kIntersect_Op); // intersection should be empty
canvas.drawRect(0, 0, 400, 400, SkPaint());
canvas.restore();
});
- OpReorderer reorderer(200, 200, *dl);
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(node), sLightCenter);
FailRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
}
TEST(OpReorderer, simpleBatching) {
- static int SIMPLE_BATCHING_LOOPS = 5;
+ const int LOOPS = 5;
class SimpleBatchingTestRenderer : public TestRendererBase {
public:
void onBitmapOp(const BitmapOp& op, const BakedOpState& state) override {
- EXPECT_TRUE(mIndex++ >= SIMPLE_BATCHING_LOOPS);
+ EXPECT_TRUE(mIndex++ >= LOOPS) << "Bitmaps should be above all rects";
}
void onRectOp(const RectOp& op, const BakedOpState& state) override {
- EXPECT_TRUE(mIndex++ < SIMPLE_BATCHING_LOOPS);
+ EXPECT_TRUE(mIndex++ < LOOPS) << "Rects should be below all bitmaps";
}
};
- auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(10, 10);
// Alternate between drawing rects and bitmaps, with bitmaps overlapping rects.
// Rects don't overlap bitmaps, so bitmaps should be brought to front as a group.
canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
- for (int i = 0; i < SIMPLE_BATCHING_LOOPS; i++) {
+ for (int i = 0; i < LOOPS; i++) {
canvas.translate(0, 10);
canvas.drawRect(0, 0, 10, 10, SkPaint());
canvas.drawBitmap(bitmap, 5, 0, nullptr);
@@ -154,11 +166,42 @@
canvas.restore();
});
- OpReorderer reorderer(200, 200, *dl);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(node), sLightCenter);
SimpleBatchingTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
- EXPECT_EQ(2 * SIMPLE_BATCHING_LOOPS, renderer.getIndex()); // 2 x loops ops, because no merging (TODO: force no merging)
+ EXPECT_EQ(2 * LOOPS, renderer.getIndex())
+ << "Expect number of ops = 2 * loop count"; // TODO: force no merging
+}
+
+TEST(OpReorderer, textStrikethroughBatching) {
+ const int LOOPS = 5;
+ class TextStrikethroughTestRenderer : public TestRendererBase {
+ public:
+ void onRectOp(const RectOp& op, const BakedOpState& state) override {
+ EXPECT_TRUE(mIndex++ >= LOOPS) << "Strikethrough rects should be above all text";
+ }
+ void onTextOp(const TextOp& op, const BakedOpState& state) override {
+ EXPECT_TRUE(mIndex++ < LOOPS) << "Text should be beneath all strikethrough rects";
+ }
+ };
+ auto node = TestUtils::createNode(0, 0, 200, 2000,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ SkPaint textPaint;
+ textPaint.setAntiAlias(true);
+ textPaint.setTextSize(20);
+ textPaint.setStrikeThruText(true);
+ textPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ for (int i = 0; i < LOOPS; i++) {
+ TestUtils::drawTextToCanvas(&canvas, "test text", textPaint, 10, 100 * (i + 1));
+ }
+ });
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 2000), 200, 2000,
+ createSyncedNodeList(node), sLightCenter);
+ TextStrikethroughTestRenderer renderer;
+ reorderer.replayBakedOps<TestDispatcher>(renderer);
+ EXPECT_EQ(2 * LOOPS, renderer.getIndex())
+ << "Expect number of ops = 2 * loop count"; // TODO: force no merging
}
TEST(OpReorderer, renderNode) {
@@ -180,14 +223,16 @@
}
};
- sp<RenderNode> child = TestUtils::createNode<RecordingCanvas>(10, 10, 110, 110, [](RecordingCanvas& canvas) {
+ auto child = TestUtils::createNode(10, 10, 110, 110,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
});
RenderNode* childPtr = child.get();
- sp<RenderNode> parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200, [childPtr](RecordingCanvas& canvas) {
+ auto parent = TestUtils::createNode(0, 0, 200, 200,
+ [childPtr](RenderProperties& props, RecordingCanvas& canvas) {
SkPaint paint;
paint.setColor(SK_ColorDKGRAY);
canvas.drawRect(0, 0, 200, 200, paint);
@@ -198,14 +243,8 @@
canvas.restore();
});
- TestUtils::syncHierarchyPropertiesAndDisplayList(parent);
-
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(parent.get());
-
- OpReorderer reorderer(sEmptyLayerUpdateQueue,
- SkRect::MakeWH(200, 200), 200, 200, nodes);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(parent), sLightCenter);
RenderNodeTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
}
@@ -221,18 +260,15 @@
}
};
- sp<RenderNode> node = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
SkBitmap bitmap = TestUtils::createSkBitmap(200, 200);
canvas.drawBitmap(bitmap, 0, 0, nullptr);
});
- TestUtils::syncHierarchyPropertiesAndDisplayList(node);
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(node.get());
OpReorderer reorderer(sEmptyLayerUpdateQueue,
SkRect::MakeLTRB(10, 20, 30, 40), // clip to small area, should see in receiver
- 200, 200, nodes);
-
+ 200, 200, createSyncedNodeList(node), sLightCenter);
ClippedTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
}
@@ -267,14 +303,14 @@
}
};
- auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(10, 10, 190, 190, 128, SkCanvas::kClipToLayer_SaveFlag);
canvas.drawRect(10, 10, 190, 190, SkPaint());
canvas.restore();
});
-
- OpReorderer reorderer(200, 200, *dl);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(node), sLightCenter);
SaveLayerSimpleTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(4, renderer.getIndex());
@@ -305,7 +341,7 @@
int index = mIndex++;
EXPECT_TRUE(index == 2 || index == 6);
}
- void startFrame(uint32_t width, uint32_t height) override {
+ void startFrame(uint32_t width, uint32_t height, const Rect& repaintRect) override {
EXPECT_EQ(7, mIndex++);
}
void endFrame() override {
@@ -331,7 +367,8 @@
}
};
- auto dl = TestUtils::createDisplayList<RecordingCanvas>(800, 800, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 800, 800,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
canvas.saveLayerAlpha(0, 0, 800, 800, 128, SkCanvas::kClipToLayer_SaveFlag);
{
canvas.drawRect(0, 0, 800, 800, SkPaint());
@@ -344,15 +381,16 @@
canvas.restore();
});
- OpReorderer reorderer(800, 800, *dl);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(800, 800), 800, 800,
+ createSyncedNodeList(node), sLightCenter);
SaveLayerNestedTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(10, renderer.getIndex());
}
TEST(OpReorderer, saveLayerContentRejection) {
- auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
canvas.clipRect(200, 200, 400, 400, SkRegion::kIntersect_Op);
canvas.saveLayerAlpha(200, 200, 400, 400, 128, SkCanvas::kClipToLayer_SaveFlag);
@@ -363,19 +401,22 @@
canvas.restore();
canvas.restore();
});
- OpReorderer reorderer(200, 200, *dl);
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(node), sLightCenter);
FailRenderer renderer;
// should see no ops, even within the layer, since the layer should be rejected
reorderer.replayBakedOps<TestDispatcher>(renderer);
}
-TEST(OpReorderer, hwLayerSimple) {
+RENDERTHREAD_TEST(OpReorderer, hwLayerSimple) {
class HwLayerSimpleTestRenderer : public TestRendererBase {
public:
- void startRepaintLayer(OffscreenBuffer* offscreenBuffer) override {
+ void startRepaintLayer(OffscreenBuffer* offscreenBuffer, const Rect& repaintRect) override {
EXPECT_EQ(0, mIndex++);
- EXPECT_EQ(offscreenBuffer, (OffscreenBuffer*) 0x0124);
+ EXPECT_EQ(100u, offscreenBuffer->viewportWidth);
+ EXPECT_EQ(100u, offscreenBuffer->viewportHeight);
+ EXPECT_EQ(Rect(25, 25, 75, 75), repaintRect);
}
void onRectOp(const RectOp& op, const BakedOpState& state) override {
EXPECT_EQ(1, mIndex++);
@@ -389,7 +430,7 @@
void endLayer() override {
EXPECT_EQ(2, mIndex++);
}
- void startFrame(uint32_t width, uint32_t height) override {
+ void startFrame(uint32_t width, uint32_t height, const Rect& repaintRect) override {
EXPECT_EQ(3, mIndex++);
}
void onLayerOp(const LayerOp& op, const BakedOpState& state) override {
@@ -400,34 +441,36 @@
}
};
- sp<RenderNode> node = TestUtils::createNode<RecordingCanvas>(10, 10, 110, 110, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(10, 10, 110, 110,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ props.mutateLayerProperties().setType(LayerType::RenderLayer);
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
- }, TestUtils::getHwLayerSetupCallback());
- OffscreenBuffer** bufferHandle = node->getLayerHandle();
- *bufferHandle = (OffscreenBuffer*) 0x0124;
+ });
+ OffscreenBuffer** layerHandle = node->getLayerHandle();
- TestUtils::syncHierarchyPropertiesAndDisplayList(node);
+ // create RenderNode's layer here in same way prepareTree would
+ OffscreenBuffer layer(renderThread.renderState(), Caches::getInstance(), 100, 100);
+ *layerHandle = &layer;
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(node.get());
+ auto syncedNodeList = createSyncedNodeList(node);
// only enqueue partial damage
- LayerUpdateQueue layerUpdateQueue;
+ LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid
layerUpdateQueue.enqueueLayerWithDamage(node.get(), Rect(25, 25, 75, 75));
- OpReorderer reorderer(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, nodes);
-
+ OpReorderer reorderer(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ syncedNodeList, sLightCenter);
HwLayerSimpleTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(6, renderer.getIndex());
// clean up layer pointer, so we can safely destruct RenderNode
- *bufferHandle = nullptr;
+ *layerHandle = nullptr;
}
-TEST(OpReorderer, hwLayerComplex) {
+RENDERTHREAD_TEST(OpReorderer, hwLayerComplex) {
/* parentLayer { greyRect, saveLayer { childLayer { whiteRect } } } will play back as:
* - startRepaintLayer(child), rect(grey), endLayer
* - startTemporaryLayer, drawLayer(child), endLayer
@@ -440,14 +483,16 @@
EXPECT_EQ(3, mIndex++); // savelayer first
return (OffscreenBuffer*)0xabcd;
}
- void startRepaintLayer(OffscreenBuffer* offscreenBuffer) override {
+ void startRepaintLayer(OffscreenBuffer* offscreenBuffer, const Rect& repaintRect) override {
int index = mIndex++;
if (index == 0) {
// starting inner layer
- EXPECT_EQ((OffscreenBuffer*)0x4567, offscreenBuffer);
+ EXPECT_EQ(100u, offscreenBuffer->viewportWidth);
+ EXPECT_EQ(100u, offscreenBuffer->viewportHeight);
} else if (index == 6) {
// starting outer layer
- EXPECT_EQ((OffscreenBuffer*)0x0123, offscreenBuffer);
+ EXPECT_EQ(200u, offscreenBuffer->viewportWidth);
+ EXPECT_EQ(200u, offscreenBuffer->viewportHeight);
} else { ADD_FAILURE(); }
}
void onRectOp(const RectOp& op, const BakedOpState& state) override {
@@ -464,17 +509,20 @@
int index = mIndex++;
EXPECT_TRUE(index == 2 || index == 5 || index == 9);
}
- void startFrame(uint32_t width, uint32_t height) override {
+ void startFrame(uint32_t width, uint32_t height, const Rect& repaintRect) override {
EXPECT_EQ(10, mIndex++);
}
void onLayerOp(const LayerOp& op, const BakedOpState& state) override {
+ OffscreenBuffer* layer = *op.layerHandle;
int index = mIndex++;
if (index == 4) {
- EXPECT_EQ((OffscreenBuffer*)0x4567, *op.layerHandle);
+ EXPECT_EQ(100u, layer->viewportWidth);
+ EXPECT_EQ(100u, layer->viewportHeight);
} else if (index == 8) {
EXPECT_EQ((OffscreenBuffer*)0xabcd, *op.layerHandle);
} else if (index == 11) {
- EXPECT_EQ((OffscreenBuffer*)0x0123, *op.layerHandle);
+ EXPECT_EQ(200u, layer->viewportWidth);
+ EXPECT_EQ(200u, layer->viewportHeight);
} else { ADD_FAILURE(); }
}
void endFrame() override {
@@ -482,17 +530,20 @@
}
};
- auto child = TestUtils::createNode<RecordingCanvas>(50, 50, 150, 150,
- [](RecordingCanvas& canvas) {
+ auto child = TestUtils::createNode(50, 50, 150, 150,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ props.mutateLayerProperties().setType(LayerType::RenderLayer);
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
- }, TestUtils::getHwLayerSetupCallback());
- *(child->getLayerHandle()) = (OffscreenBuffer*) 0x4567;
+ });
+ OffscreenBuffer childLayer(renderThread.renderState(), Caches::getInstance(), 100, 100);
+ *(child->getLayerHandle()) = &childLayer;
RenderNode* childPtr = child.get();
- auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
- [childPtr](RecordingCanvas& canvas) {
+ auto parent = TestUtils::createNode(0, 0, 200, 200,
+ [childPtr](RenderProperties& props, RecordingCanvas& canvas) {
+ props.mutateLayerProperties().setType(LayerType::RenderLayer);
SkPaint paint;
paint.setColor(SK_ColorDKGRAY);
canvas.drawRect(0, 0, 200, 200, paint);
@@ -500,20 +551,18 @@
canvas.saveLayerAlpha(50, 50, 150, 150, 128, SkCanvas::kClipToLayer_SaveFlag);
canvas.drawRenderNode(childPtr);
canvas.restore();
- }, TestUtils::getHwLayerSetupCallback());
- *(parent->getLayerHandle()) = (OffscreenBuffer*) 0x0123;
+ });
+ OffscreenBuffer parentLayer(renderThread.renderState(), Caches::getInstance(), 200, 200);
+ *(parent->getLayerHandle()) = &parentLayer;
- TestUtils::syncHierarchyPropertiesAndDisplayList(parent);
+ auto syncedList = createSyncedNodeList(parent);
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(parent.get());
-
- LayerUpdateQueue layerUpdateQueue;
+ LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid
layerUpdateQueue.enqueueLayerWithDamage(child.get(), Rect(100, 100));
layerUpdateQueue.enqueueLayerWithDamage(parent.get(), Rect(200, 200));
- OpReorderer reorderer(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, nodes);
-
+ OpReorderer reorderer(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ syncedList, sLightCenter);
HwLayerComplexTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(13, renderer.getIndex());
@@ -529,8 +578,8 @@
canvas->drawRect(0, 0, 100, 100, paint);
}
static void drawOrderedNode(RecordingCanvas* canvas, uint8_t expectedDrawOrder, float z) {
- auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
- [expectedDrawOrder](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 100, 100,
+ [expectedDrawOrder](RenderProperties& props, RecordingCanvas& canvas) {
drawOrderedRect(&canvas, expectedDrawOrder);
});
node->mutateStagingProperties().setTranslationZ(z);
@@ -546,8 +595,8 @@
}
};
- auto parent = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
- [](RecordingCanvas& canvas) {
+ auto parent = TestUtils::createNode(0, 0, 100, 100,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
drawOrderedNode(&canvas, 0, 10.0f); // in reorder=false at this point, so played inorder
drawOrderedRect(&canvas, 1);
canvas.insertReorderBarrier(true);
@@ -561,58 +610,260 @@
drawOrderedRect(&canvas, 8);
drawOrderedNode(&canvas, 9, -10.0f); // in reorder=false at this point, so played inorder
});
- TestUtils::syncHierarchyPropertiesAndDisplayList(parent);
-
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(parent.get());
- OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100, nodes);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100,
+ createSyncedNodeList(parent), sLightCenter);
ZReorderTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(10, renderer.getIndex());
};
+TEST(OpReorderer, projectionReorder) {
+ static const int scrollX = 5;
+ static const int scrollY = 10;
+ class ProjectionReorderTestRenderer : public TestRendererBase {
+ public:
+ void onRectOp(const RectOp& op, const BakedOpState& state) override {
+ const int index = mIndex++;
+
+ Matrix4 expectedMatrix;
+ switch (index) {
+ case 0:
+ EXPECT_EQ(Rect(100, 100), op.unmappedBounds);
+ EXPECT_EQ(SK_ColorWHITE, op.paint->getColor());
+ expectedMatrix.loadIdentity();
+ break;
+ case 1:
+ EXPECT_EQ(Rect(-10, -10, 60, 60), op.unmappedBounds);
+ EXPECT_EQ(SK_ColorDKGRAY, op.paint->getColor());
+ expectedMatrix.loadTranslate(50, 50, 0); // TODO: should scroll be respected here?
+ break;
+ case 2:
+ EXPECT_EQ(Rect(100, 50), op.unmappedBounds);
+ EXPECT_EQ(SK_ColorBLUE, op.paint->getColor());
+ expectedMatrix.loadTranslate(-scrollX, 50 - scrollY, 0);
+ break;
+ default:
+ ADD_FAILURE();
+ }
+ EXPECT_MATRIX_APPROX_EQ(expectedMatrix, state.computedState.transform);
+ }
+ };
+
+ /**
+ * Construct a tree of nodes, where the root (A) has a receiver background (B), and a child (C)
+ * with a projecting child (P) of its own. P would normally draw between B and C's "background"
+ * draw, but because it is projected backwards, it's drawn in between B and C.
+ *
+ * The parent is scrolled by scrollX/scrollY, but this does not affect the background
+ * (which isn't affected by scroll).
+ */
+ auto receiverBackground = TestUtils::createNode(0, 0, 100, 100,
+ [](RenderProperties& properties, RecordingCanvas& canvas) {
+ properties.setProjectionReceiver(true);
+ // scroll doesn't apply to background, so undone via translationX/Y
+ // NOTE: translationX/Y only! no other transform properties may be set for a proj receiver!
+ properties.setTranslationX(scrollX);
+ properties.setTranslationY(scrollY);
+
+ SkPaint paint;
+ paint.setColor(SK_ColorWHITE);
+ canvas.drawRect(0, 0, 100, 100, paint);
+ });
+ auto projectingRipple = TestUtils::createNode(50, 0, 100, 50,
+ [](RenderProperties& properties, RecordingCanvas& canvas) {
+ properties.setProjectBackwards(true);
+ properties.setClipToBounds(false);
+ SkPaint paint;
+ paint.setColor(SK_ColorDKGRAY);
+ canvas.drawRect(-10, -10, 60, 60, paint);
+ });
+ auto child = TestUtils::createNode(0, 50, 100, 100,
+ [&projectingRipple](RenderProperties& properties, RecordingCanvas& canvas) {
+ SkPaint paint;
+ paint.setColor(SK_ColorBLUE);
+ canvas.drawRect(0, 0, 100, 50, paint);
+ canvas.drawRenderNode(projectingRipple.get());
+ });
+ auto parent = TestUtils::createNode(0, 0, 100, 100,
+ [&receiverBackground, &child](RenderProperties& properties, RecordingCanvas& canvas) {
+ canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
+ canvas.translate(-scrollX, -scrollY); // Apply scroll (note: bg undoes this internally)
+ canvas.drawRenderNode(receiverBackground.get());
+ canvas.drawRenderNode(child.get());
+ canvas.restore();
+ });
+
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100,
+ createSyncedNodeList(parent), sLightCenter);
+ ProjectionReorderTestRenderer renderer;
+ reorderer.replayBakedOps<TestDispatcher>(renderer);
+ EXPECT_EQ(3, renderer.getIndex());
+}
+
+// creates a 100x100 shadow casting node with provided translationZ
+static sp<RenderNode> createWhiteRectShadowCaster(float translationZ) {
+ return TestUtils::createNode(0, 0, 100, 100,
+ [translationZ](RenderProperties& properties, RecordingCanvas& canvas) {
+ properties.setTranslationZ(translationZ);
+ properties.mutableOutline().setRoundRect(0, 0, 100, 100, 0.0f, 1.0f);
+ SkPaint paint;
+ paint.setColor(SK_ColorWHITE);
+ canvas.drawRect(0, 0, 100, 100, paint);
+ });
+}
+
TEST(OpReorderer, shadow) {
class ShadowTestRenderer : public TestRendererBase {
public:
void onShadowOp(const ShadowOp& op, const BakedOpState& state) override {
EXPECT_EQ(0, mIndex++);
+ EXPECT_FLOAT_EQ(1.0f, op.casterAlpha);
+ EXPECT_TRUE(op.casterPath->isRect(nullptr));
+ EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), op.shadowMatrixXY);
+
+ Matrix4 expectedZ;
+ expectedZ.loadTranslate(0, 0, 5);
+ EXPECT_MATRIX_APPROX_EQ(expectedZ, op.shadowMatrixZ);
}
void onRectOp(const RectOp& op, const BakedOpState& state) override {
EXPECT_EQ(1, mIndex++);
}
};
- sp<RenderNode> caster = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100,
- [](RecordingCanvas& canvas) {
- SkPaint paint;
- paint.setColor(SK_ColorWHITE);
- canvas.drawRect(0, 0, 100, 100, paint);
- }, [] (RenderProperties& properties) {
- properties.setTranslationZ(5.0f);
- properties.mutableOutline().setRoundRect(0, 0, 100, 100, 5, 1.0f);
- return RenderNode::GENERIC | RenderNode::TRANSLATION_Z;
- });
- sp<RenderNode> parent = TestUtils::createNode<RecordingCanvas>(0, 0, 200, 200,
- [&caster] (RecordingCanvas& canvas) {
+ auto parent = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
canvas.insertReorderBarrier(true);
- canvas.drawRenderNode(caster.get());
+ canvas.drawRenderNode(createWhiteRectShadowCaster(5.0f).get());
});
- TestUtils::syncHierarchyPropertiesAndDisplayList(parent);
-
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(parent.get());
-
- OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, nodes);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(parent), sLightCenter);
ShadowTestRenderer renderer;
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(2, renderer.getIndex());
}
-static void testProperty(
- TestUtils::PropSetupCallback propSetupCallback,
+TEST(OpReorderer, shadowSaveLayer) {
+ class ShadowSaveLayerTestRenderer : public TestRendererBase {
+ public:
+ OffscreenBuffer* startTemporaryLayer(uint32_t width, uint32_t height) override {
+ EXPECT_EQ(0, mIndex++);
+ return nullptr;
+ }
+ void onShadowOp(const ShadowOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(1, mIndex++);
+ EXPECT_FLOAT_EQ(50, op.lightCenter.x);
+ EXPECT_FLOAT_EQ(40, op.lightCenter.y);
+ }
+ void onRectOp(const RectOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(2, mIndex++);
+ }
+ void endLayer() override {
+ EXPECT_EQ(3, mIndex++);
+ }
+ void onLayerOp(const LayerOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(4, mIndex++);
+ }
+ };
+
+ auto parent = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ // save/restore outside of reorderBarrier, so they don't get moved out of place
+ canvas.translate(20, 10);
+ int count = canvas.saveLayerAlpha(30, 50, 130, 150, 128, SkCanvas::kClipToLayer_SaveFlag);
+ canvas.insertReorderBarrier(true);
+ canvas.drawRenderNode(createWhiteRectShadowCaster(5.0f).get());
+ canvas.insertReorderBarrier(false);
+ canvas.restoreToCount(count);
+ });
+
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(parent), (Vector3) { 100, 100, 100 });
+ ShadowSaveLayerTestRenderer renderer;
+ reorderer.replayBakedOps<TestDispatcher>(renderer);
+ EXPECT_EQ(5, renderer.getIndex());
+}
+
+RENDERTHREAD_TEST(OpReorderer, shadowHwLayer) {
+ class ShadowHwLayerTestRenderer : public TestRendererBase {
+ public:
+ void startRepaintLayer(OffscreenBuffer* offscreenBuffer, const Rect& repaintRect) override {
+ EXPECT_EQ(0, mIndex++);
+ }
+ void onShadowOp(const ShadowOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(1, mIndex++);
+ EXPECT_FLOAT_EQ(50, op.lightCenter.x);
+ EXPECT_FLOAT_EQ(40, op.lightCenter.y);
+ }
+ void onRectOp(const RectOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(2, mIndex++);
+ }
+ void endLayer() override {
+ EXPECT_EQ(3, mIndex++);
+ }
+ void onLayerOp(const LayerOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(4, mIndex++);
+ }
+ };
+
+ auto parent = TestUtils::createNode(50, 60, 150, 160,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ props.mutateLayerProperties().setType(LayerType::RenderLayer);
+ canvas.insertReorderBarrier(true);
+ canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
+ canvas.translate(20, 10);
+ canvas.drawRenderNode(createWhiteRectShadowCaster(5.0f).get());
+ canvas.restore();
+ });
+ OffscreenBuffer** layerHandle = parent->getLayerHandle();
+
+ // create RenderNode's layer here in same way prepareTree would, setting windowTransform
+ OffscreenBuffer layer(renderThread.renderState(), Caches::getInstance(), 100, 100);
+ Matrix4 windowTransform;
+ windowTransform.loadTranslate(50, 60, 0); // total transform of layer's origin
+ layer.setWindowTransform(windowTransform);
+ *layerHandle = &layer;
+
+ auto syncedList = createSyncedNodeList(parent);
+ LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid
+ layerUpdateQueue.enqueueLayerWithDamage(parent.get(), Rect(100, 100));
+ OpReorderer reorderer(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ syncedList, (Vector3) { 100, 100, 100 });
+ ShadowHwLayerTestRenderer renderer;
+ reorderer.replayBakedOps<TestDispatcher>(renderer);
+ EXPECT_EQ(5, renderer.getIndex());
+
+ // clean up layer pointer, so we can safely destruct RenderNode
+ *layerHandle = nullptr;
+}
+
+TEST(OpReorderer, shadowLayering) {
+ class ShadowLayeringTestRenderer : public TestRendererBase {
+ public:
+ void onShadowOp(const ShadowOp& op, const BakedOpState& state) override {
+ int index = mIndex++;
+ EXPECT_TRUE(index == 0 || index == 1);
+ }
+ void onRectOp(const RectOp& op, const BakedOpState& state) override {
+ int index = mIndex++;
+ EXPECT_TRUE(index == 2 || index == 3);
+ }
+ };
+ auto parent = TestUtils::createNode(0, 0, 200, 200,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ canvas.insertReorderBarrier(true);
+ canvas.drawRenderNode(createWhiteRectShadowCaster(5.0f).get());
+ canvas.drawRenderNode(createWhiteRectShadowCaster(5.0001f).get());
+ });
+
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
+ createSyncedNodeList(parent), sLightCenter);
+ ShadowLayeringTestRenderer renderer;
+ reorderer.replayBakedOps<TestDispatcher>(renderer);
+ EXPECT_EQ(4, renderer.getIndex());
+}
+
+static void testProperty(std::function<void(RenderProperties&)> propSetupCallback,
std::function<void(const RectOp&, const BakedOpState&)> opValidateCallback) {
class PropertyTestRenderer : public TestRendererBase {
public:
@@ -625,19 +876,16 @@
std::function<void(const RectOp&, const BakedOpState&)> mCallback;
};
- auto node = TestUtils::createNode<RecordingCanvas>(0, 0, 100, 100, [](RecordingCanvas& canvas) {
+ auto node = TestUtils::createNode(0, 0, 100, 100,
+ [propSetupCallback](RenderProperties& props, RecordingCanvas& canvas) {
+ propSetupCallback(props);
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
- }, propSetupCallback);
- TestUtils::syncHierarchyPropertiesAndDisplayList(node);
+ });
- std::vector< sp<RenderNode> > nodes;
- nodes.push_back(node.get());
-
- OpReorderer reorderer(sEmptyLayerUpdateQueue,
- SkRect::MakeWH(100, 100), 200, 200, nodes);
-
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 200, 200,
+ createSyncedNodeList(node), sLightCenter);
PropertyTestRenderer renderer(opValidateCallback);
reorderer.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(1, renderer.getIndex()) << "Should have seen one op";
@@ -647,7 +895,6 @@
testProperty([](RenderProperties& properties) {
properties.setAlpha(0.5f);
properties.setHasOverlappingRendering(false);
- return RenderNode::ALPHA | RenderNode::GENERIC;
}, [](const RectOp& op, const BakedOpState& state) {
EXPECT_EQ(0.5f, state.alpha) << "Alpha should be applied directly to op";
});
@@ -657,7 +904,6 @@
testProperty([](RenderProperties& properties) {
properties.setClipToBounds(true);
properties.setClipBounds(Rect(10, 20, 300, 400));
- return RenderNode::GENERIC;
}, [](const RectOp& op, const BakedOpState& state) {
EXPECT_EQ(Rect(10, 20, 100, 100), state.computedState.clippedBounds)
<< "Clip rect should be intersection of node bounds and clip bounds";
@@ -667,7 +913,6 @@
TEST(OpReorderer, renderPropRevealClip) {
testProperty([](RenderProperties& properties) {
properties.mutableRevealClip().set(true, 50, 50, 25);
- return RenderNode::GENERIC;
}, [](const RectOp& op, const BakedOpState& state) {
ASSERT_NE(nullptr, state.roundRectClipState);
EXPECT_TRUE(state.roundRectClipState->highPriority);
@@ -680,7 +925,6 @@
testProperty([](RenderProperties& properties) {
properties.mutableOutline().setShouldClip(true);
properties.mutableOutline().setRoundRect(10, 20, 30, 40, 5.0f, 0.5f);
- return RenderNode::GENERIC;
}, [](const RectOp& op, const BakedOpState& state) {
ASSERT_NE(nullptr, state.roundRectClipState);
EXPECT_FALSE(state.roundRectClipState->highPriority);
@@ -704,9 +948,6 @@
properties.setTranslationY(20);
properties.setScaleX(0.5f);
properties.setScaleY(0.7f);
- return RenderNode::GENERIC
- | RenderNode::TRANSLATION_X | RenderNode::TRANSLATION_Y
- | RenderNode::SCALE_X | RenderNode::SCALE_Y;
}, [](const RectOp& op, const BakedOpState& state) {
Matrix4 matrix;
matrix.loadTranslate(10, 10, 0); // left, top
@@ -725,5 +966,122 @@
});
}
+struct SaveLayerAlphaData {
+ uint32_t layerWidth = 0;
+ uint32_t layerHeight = 0;
+ Rect rectClippedBounds;
+ Matrix4 rectMatrix;
+};
+/**
+ * Constructs a view to hit the temporary layer alpha property implementation:
+ * a) 0 < alpha < 1
+ * b) too big for layer (larger than maxTextureSize)
+ * c) overlapping rendering content
+ * returning observed data about layer size and content clip/transform.
+ *
+ * Used to validate clipping behavior of temporary layer, where requested layer size is reduced
+ * (for efficiency, and to fit in layer size constraints) based on parent clip.
+ */
+void testSaveLayerAlphaClip(SaveLayerAlphaData* outObservedData,
+ std::function<void(RenderProperties&)> propSetupCallback) {
+ class SaveLayerAlphaClipTestRenderer : public TestRendererBase {
+ public:
+ SaveLayerAlphaClipTestRenderer(SaveLayerAlphaData* outData)
+ : mOutData(outData) {}
+
+ OffscreenBuffer* startTemporaryLayer(uint32_t width, uint32_t height) override {
+ EXPECT_EQ(0, mIndex++);
+ mOutData->layerWidth = width;
+ mOutData->layerHeight = height;
+ return nullptr;
+ }
+ void onRectOp(const RectOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(1, mIndex++);
+
+ mOutData->rectClippedBounds = state.computedState.clippedBounds;
+ mOutData->rectMatrix = state.computedState.transform;
+ }
+ void endLayer() override {
+ EXPECT_EQ(2, mIndex++);
+ }
+ void onLayerOp(const LayerOp& op, const BakedOpState& state) override {
+ EXPECT_EQ(3, mIndex++);
+ }
+ private:
+ SaveLayerAlphaData* mOutData;
+ };
+
+ ASSERT_GT(10000, DeviceInfo::get()->maxTextureSize())
+ << "Node must be bigger than max texture size to exercise saveLayer codepath";
+ auto node = TestUtils::createNode(0, 0, 10000, 10000,
+ [&propSetupCallback](RenderProperties& properties, RecordingCanvas& canvas) {
+ properties.setHasOverlappingRendering(true);
+ properties.setAlpha(0.5f); // force saveLayer, since too big for HW layer
+ // apply other properties
+ propSetupCallback(properties);
+
+ SkPaint paint;
+ paint.setColor(SK_ColorWHITE);
+ canvas.drawRect(0, 0, 10000, 10000, paint);
+ });
+ auto nodes = createSyncedNodeList(node); // sync before querying height
+
+ OpReorderer reorderer(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, nodes, sLightCenter);
+ SaveLayerAlphaClipTestRenderer renderer(outObservedData);
+ reorderer.replayBakedOps<TestDispatcher>(renderer);
+
+ // assert, since output won't be valid if we haven't seen a save layer triggered
+ ASSERT_EQ(4, renderer.getIndex()) << "Test must trigger saveLayer alpha behavior.";
+}
+
+TEST(OpReorderer, renderPropSaveLayerAlphaClipBig) {
+ SaveLayerAlphaData observedData;
+ testSaveLayerAlphaClip(&observedData, [](RenderProperties& properties) {
+ properties.setTranslationX(10); // offset rendering content
+ properties.setTranslationY(-2000); // offset rendering content
+ });
+ EXPECT_EQ(190u, observedData.layerWidth);
+ EXPECT_EQ(200u, observedData.layerHeight);
+ EXPECT_EQ(Rect(0, 0, 190, 200), observedData.rectClippedBounds)
+ << "expect content to be clipped to screen area";
+ Matrix4 expected;
+ expected.loadTranslate(0, -2000, 0);
+ EXPECT_MATRIX_APPROX_EQ(expected, observedData.rectMatrix)
+ << "expect content to be translated as part of being clipped";
+}
+
+TEST(OpReorderer, renderPropSaveLayerAlphaRotate) {
+ SaveLayerAlphaData observedData;
+ testSaveLayerAlphaClip(&observedData, [](RenderProperties& properties) {
+ // Translate and rotate the view so that the only visible part is the top left corner of
+ // the view. It will form an isosceles right triangle with a long side length of 200 at the
+ // bottom of the viewport.
+ properties.setTranslationX(100);
+ properties.setTranslationY(100);
+ properties.setPivotX(0);
+ properties.setPivotY(0);
+ properties.setRotation(45);
+ });
+ // ceil(sqrt(2) / 2 * 200) = 142
+ EXPECT_EQ(142u, observedData.layerWidth);
+ EXPECT_EQ(142u, observedData.layerHeight);
+ EXPECT_EQ(Rect(0, 0, 142, 142), observedData.rectClippedBounds);
+ EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), observedData.rectMatrix);
+}
+
+TEST(OpReorderer, renderPropSaveLayerAlphaScale) {
+ SaveLayerAlphaData observedData;
+ testSaveLayerAlphaClip(&observedData, [](RenderProperties& properties) {
+ properties.setPivotX(0);
+ properties.setPivotY(0);
+ properties.setScaleX(2);
+ properties.setScaleY(0.5f);
+ });
+ EXPECT_EQ(100u, observedData.layerWidth);
+ EXPECT_EQ(400u, observedData.layerHeight);
+ EXPECT_EQ(Rect(0, 0, 100, 400), observedData.rectClippedBounds);
+ EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), observedData.rectMatrix);
+}
+
} // namespace uirenderer
} // namespace android
diff --git a/libs/hwui/unit_tests/RecordingCanvasTests.cpp b/libs/hwui/unit_tests/RecordingCanvasTests.cpp
index 83b37ab..81f0851 100644
--- a/libs/hwui/unit_tests/RecordingCanvasTests.cpp
+++ b/libs/hwui/unit_tests/RecordingCanvasTests.cpp
@@ -18,7 +18,7 @@
#include <RecordedOp.h>
#include <RecordingCanvas.h>
-#include <unit_tests/TestUtils.h>
+#include <utils/TestUtils.h>
namespace android {
namespace uirenderer {
@@ -41,21 +41,118 @@
playbackOps(*dl, [](const RecordedOp& op) { ADD_FAILURE(); });
}
-TEST(RecordingCanvas, testSimpleRectRecord) {
+TEST(RecordingCanvas, drawLines) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(100, 200, [](RecordingCanvas& canvas) {
+ SkPaint paint;
+ paint.setStrokeWidth(20);
+ float points[] = { 0, 0, 20, 10, 30, 40, 90 }; // NB: only 1 valid line
+ canvas.drawLines(&points[0], 7, paint);
+ });
+
+ ASSERT_EQ(1u, dl->getOps().size()) << "Must be exactly one op";
+ auto op = dl->getOps()[0];
+ ASSERT_EQ(RecordedOpId::LinesOp, op->opId);
+ EXPECT_EQ(4, ((LinesOp*)op)->floatCount)
+ << "float count must be rounded down to closest multiple of 4";
+ EXPECT_EQ(Rect(-10, -10, 30, 20), op->unmappedBounds)
+ << "unmapped bounds must be size of line, outset by 1/2 stroke width";
+}
+
+TEST(RecordingCanvas, drawRect) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(100, 200, [](RecordingCanvas& canvas) {
canvas.drawRect(10, 20, 90, 180, SkPaint());
});
+ ASSERT_EQ(1u, dl->getOps().size()) << "Must be exactly one op";
+ auto op = *(dl->getOps()[0]);
+ ASSERT_EQ(RecordedOpId::RectOp, op.opId);
+ EXPECT_EQ(Rect(0, 0, 100, 200), op.localClipRect);
+ EXPECT_EQ(Rect(10, 20, 90, 180), op.unmappedBounds);
+}
+
+TEST(RecordingCanvas, drawText) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ paint.setTextSize(20);
+ paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25);
+ });
+
int count = 0;
playbackOps(*dl, [&count](const RecordedOp& op) {
count++;
- ASSERT_EQ(RecordedOpId::RectOp, op.opId);
- ASSERT_EQ(Rect(0, 0, 100, 200), op.localClipRect);
- ASSERT_EQ(Rect(10, 20, 90, 180), op.unmappedBounds);
+ ASSERT_EQ(RecordedOpId::TextOp, op.opId);
+ EXPECT_EQ(Rect(0, 0, 200, 200), op.localClipRect);
+ EXPECT_TRUE(op.localMatrix.isIdentity());
+ EXPECT_TRUE(op.unmappedBounds.contains(25, 15, 50, 25))
+ << "Op expected to be 25+ pixels wide, 10+ pixels tall";
});
ASSERT_EQ(1, count);
}
+TEST(RecordingCanvas, drawText_strikeThruAndUnderline) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ paint.setTextSize(20);
+ paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < 2; j++) {
+ paint.setUnderlineText(i != 0);
+ paint.setStrikeThruText(j != 0);
+ TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25);
+ }
+ }
+ });
+
+ auto ops = dl->getOps();
+ ASSERT_EQ(8u, ops.size());
+
+ int index = 0;
+ EXPECT_EQ(RecordedOpId::TextOp, ops[index++]->opId); // no underline or strikethrough
+
+ EXPECT_EQ(RecordedOpId::TextOp, ops[index++]->opId);
+ EXPECT_EQ(RecordedOpId::RectOp, ops[index++]->opId); // strikethrough only
+
+ EXPECT_EQ(RecordedOpId::TextOp, ops[index++]->opId);
+ EXPECT_EQ(RecordedOpId::RectOp, ops[index++]->opId); // underline only
+
+ EXPECT_EQ(RecordedOpId::TextOp, ops[index++]->opId);
+ EXPECT_EQ(RecordedOpId::RectOp, ops[index++]->opId); // underline
+ EXPECT_EQ(RecordedOpId::RectOp, ops[index++]->opId); // strikethrough
+}
+
+TEST(RecordingCanvas, drawText_forceAlignLeft) {
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ paint.setTextSize(20);
+ paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ paint.setTextAlign(SkPaint::kLeft_Align);
+ TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25);
+ paint.setTextAlign(SkPaint::kCenter_Align);
+ TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25);
+ paint.setTextAlign(SkPaint::kRight_Align);
+ TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25);
+ });
+
+ int count = 0;
+ float lastX = FLT_MAX;
+ playbackOps(*dl, [&count, &lastX](const RecordedOp& op) {
+ count++;
+ ASSERT_EQ(RecordedOpId::TextOp, op.opId);
+ EXPECT_EQ(SkPaint::kLeft_Align, op.paint->getTextAlign())
+ << "recorded drawText commands must force kLeft_Align on their paint";
+
+ // verify TestUtils alignment offsetting (TODO: move asserts to Canvas base class)
+ EXPECT_GT(lastX, ((const TextOp&)op).x)
+ << "x coordinate should reduce across each of the draw commands, from alignment";
+ lastX = ((const TextOp&)op).x;
+ });
+ ASSERT_EQ(3, count);
+}
+
TEST(RecordingCanvas, backgroundAndImage) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(100, 200, [](RecordingCanvas& canvas) {
SkBitmap bitmap;
@@ -109,7 +206,7 @@
ASSERT_EQ(2, count);
}
-TEST(RecordingCanvas, saveLayerSimple) {
+TEST(RecordingCanvas, saveLayer_simple) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.saveLayerAlpha(10, 20, 190, 180, 128, SkCanvas::kARGB_ClipLayer_SaveFlag);
canvas.drawRect(10, 20, 190, 180, SkPaint());
@@ -143,7 +240,7 @@
EXPECT_EQ(3, count);
}
-TEST(RecordingCanvas, saveLayerViewportCrop) {
+TEST(RecordingCanvas, saveLayer_viewportCrop) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
// shouldn't matter, since saveLayer will clip to its bounds
canvas.clipRect(-1000, -1000, 1000, 1000, SkRegion::kReplace_Op);
@@ -167,7 +264,7 @@
EXPECT_EQ(3, count);
}
-TEST(RecordingCanvas, saveLayerRotateUnclipped) {
+TEST(RecordingCanvas, saveLayer_rotateUnclipped) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
canvas.translate(100, 100);
@@ -193,7 +290,7 @@
EXPECT_EQ(3, count);
}
-TEST(RecordingCanvas, saveLayerRotateClipped) {
+TEST(RecordingCanvas, saveLayer_rotateClipped) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
canvas.translate(100, 100);
@@ -224,7 +321,50 @@
EXPECT_EQ(3, count);
}
-TEST(RecordingCanvas, testReorderBarrier) {
+TEST(RecordingCanvas, drawRenderNode_projection) {
+ sp<RenderNode> background = TestUtils::createNode(50, 50, 150, 150,
+ [](RenderProperties& props, RecordingCanvas& canvas) {
+ SkPaint paint;
+ paint.setColor(SK_ColorWHITE);
+ canvas.drawRect(0, 0, 100, 100, paint);
+ });
+ {
+ background->mutateStagingProperties().setProjectionReceiver(false);
+
+ // NO RECEIVER PRESENT
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200,
+ [&background](RecordingCanvas& canvas) {
+ canvas.drawRect(0, 0, 100, 100, SkPaint());
+ canvas.drawRenderNode(background.get());
+ canvas.drawRect(0, 0, 100, 100, SkPaint());
+ });
+ EXPECT_EQ(-1, dl->projectionReceiveIndex)
+ << "no projection receiver should have been observed";
+ }
+ {
+ background->mutateStagingProperties().setProjectionReceiver(true);
+
+ // RECEIVER PRESENT
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200,
+ [&background](RecordingCanvas& canvas) {
+ canvas.drawRect(0, 0, 100, 100, SkPaint());
+ canvas.drawRenderNode(background.get());
+ canvas.drawRect(0, 0, 100, 100, SkPaint());
+ });
+
+ ASSERT_EQ(3u, dl->getOps().size()) << "Must be three ops";
+ auto op = dl->getOps()[1];
+ EXPECT_EQ(RecordedOpId::RenderNodeOp, op->opId);
+ EXPECT_EQ(1, dl->projectionReceiveIndex)
+ << "correct projection receiver not identified";
+
+ // verify the behavior works even though projection receiver hasn't been sync'd yet
+ EXPECT_TRUE(background->stagingProperties().isProjectionReceiver());
+ EXPECT_FALSE(background->properties().isProjectionReceiver());
+ }
+}
+
+TEST(RecordingCanvas, insertReorderBarrier) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 400, 400, SkPaint());
canvas.insertReorderBarrier(true);
@@ -245,5 +385,39 @@
EXPECT_TRUE(chunks[1].reorderChildren);
}
+TEST(RecordingCanvas, refPaint) {
+ SkPaint paint;
+ paint.setAntiAlias(true);
+ paint.setTextSize(20);
+ paint.setTextAlign(SkPaint::kLeft_Align);
+ paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+
+ auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [&paint](RecordingCanvas& canvas) {
+ paint.setColor(SK_ColorBLUE);
+ // first three should use same paint
+ canvas.drawRect(0, 0, 200, 10, paint);
+ SkPaint paintCopy(paint);
+ canvas.drawRect(0, 10, 200, 20, paintCopy);
+ TestUtils::drawTextToCanvas(&canvas, "helloworld", paint, 50, 25);
+
+ // only here do we use different paint ptr
+ paint.setColor(SK_ColorRED);
+ canvas.drawRect(0, 20, 200, 30, paint);
+ });
+ auto ops = dl->getOps();
+ ASSERT_EQ(4u, ops.size());
+
+ // first three are the same
+ EXPECT_NE(nullptr, ops[0]->paint);
+ EXPECT_NE(&paint, ops[0]->paint);
+ EXPECT_EQ(ops[0]->paint, ops[1]->paint);
+ EXPECT_EQ(ops[0]->paint, ops[2]->paint);
+
+ // last is different, but still copied / non-null
+ EXPECT_NE(nullptr, ops[3]->paint);
+ EXPECT_NE(ops[0]->paint, ops[3]->paint);
+ EXPECT_NE(&paint, ops[3]->paint);
+}
+
} // namespace uirenderer
} // namespace android
diff --git a/libs/hwui/unit_tests/PathParserTests.cpp b/libs/hwui/unit_tests/VectorDrawableTests.cpp
similarity index 70%
rename from libs/hwui/unit_tests/PathParserTests.cpp
rename to libs/hwui/unit_tests/VectorDrawableTests.cpp
index 60ea219..77dd73a 100644
--- a/libs/hwui/unit_tests/PathParserTests.cpp
+++ b/libs/hwui/unit_tests/VectorDrawableTests.cpp
@@ -17,7 +17,8 @@
#include <gtest/gtest.h>
#include "PathParser.h"
-#include "VectorDrawablePath.h"
+#include "utils/MathUtils.h"
+#include "utils/VectorDrawableUtils.h"
#include <functional>
@@ -164,46 +165,125 @@
};
+struct StringPath {
+ const char* stringPath;
+ bool isValid;
+};
+
+const StringPath sStringPaths[] = {
+ {"3e...3", false},
+ {"L.M.F.A.O", false},
+ {"m 1 1", true},
+ {"z", true},
+ {"1-2e34567", false}
+};
+
+static bool hasSameVerbs(const PathData& from, const PathData& to) {
+ return from.verbs == to.verbs && from.verbSizes == to.verbSizes;
+}
+
TEST(PathParser, parseStringForData) {
for (TestData testData: sTestDataSet) {
+ PathParser::ParseResult result;
// Test generated path data against the given data.
PathData pathData;
size_t length = strlen(testData.pathString);
- PathParser::getPathDataFromString(&pathData, testData.pathString, length);
- PathParser::dump(pathData);
+ PathParser::getPathDataFromString(&pathData, &result, testData.pathString, length);
EXPECT_EQ(testData.pathData, pathData);
}
+ for (StringPath stringPath : sStringPaths) {
+ PathParser::ParseResult result;
+ PathData pathData;
+ SkPath skPath;
+ PathParser::getPathDataFromString(&pathData, &result,
+ stringPath.stringPath, strlen(stringPath.stringPath));
+ EXPECT_EQ(stringPath.isValid, !result.failureOccurred);
+ }
}
-TEST(PathParser, createSkPathFromPathData) {
+TEST(VectorDrawableUtils, createSkPathFromPathData) {
for (TestData testData: sTestDataSet) {
SkPath expectedPath;
testData.skPathLamda(&expectedPath);
SkPath actualPath;
- VectorDrawablePath::verbsToPath(&actualPath, &testData.pathData);
+ VectorDrawableUtils::verbsToPath(&actualPath, testData.pathData);
EXPECT_EQ(expectedPath, actualPath);
}
}
TEST(PathParser, parseStringForSkPath) {
for (TestData testData: sTestDataSet) {
+ PathParser::ParseResult result;
size_t length = strlen(testData.pathString);
// Check the return value as well as the SkPath generated.
SkPath actualPath;
- bool hasValidData = PathParser::parseStringForSkPath(&actualPath, testData.pathString,
- length);
+ PathParser::parseStringForSkPath(&actualPath, &result, testData.pathString, length);
+ bool hasValidData = !result.failureOccurred;
EXPECT_EQ(hasValidData, testData.pathData.verbs.size() > 0);
SkPath expectedPath;
testData.skPathLamda(&expectedPath);
EXPECT_EQ(expectedPath, actualPath);
}
- SkPath path;
- EXPECT_FALSE(PathParser::parseStringForSkPath(&path, "l", 1));
- EXPECT_FALSE(PathParser::parseStringForSkPath(&path, "1 1", 3));
- EXPECT_FALSE(PathParser::parseStringForSkPath(&path, "LMFAO", 5));
- EXPECT_TRUE(PathParser::parseStringForSkPath(&path, "m1 1", 4));
+
+ for (StringPath stringPath : sStringPaths) {
+ PathParser::ParseResult result;
+ SkPath skPath;
+ PathParser::parseStringForSkPath(&skPath, &result, stringPath.stringPath,
+ strlen(stringPath.stringPath));
+ EXPECT_EQ(stringPath.isValid, !result.failureOccurred);
+ }
}
+TEST(VectorDrawableUtils, morphPathData) {
+ for (TestData fromData: sTestDataSet) {
+ for (TestData toData: sTestDataSet) {
+ bool canMorph = VectorDrawableUtils::canMorph(fromData.pathData, toData.pathData);
+ if (fromData.pathData == toData.pathData) {
+ EXPECT_TRUE(canMorph);
+ } else {
+ bool expectedToMorph = hasSameVerbs(fromData.pathData, toData.pathData);
+ EXPECT_EQ(expectedToMorph, canMorph);
+ }
+ }
+ }
+}
+
+TEST(VectorDrawableUtils, interpolatePathData) {
+ // Interpolate path data with itself and every other path data
+ for (TestData fromData: sTestDataSet) {
+ for (TestData toData: sTestDataSet) {
+ PathData outData;
+ bool success = VectorDrawableUtils::interpolatePathData(&outData, fromData.pathData,
+ toData.pathData, 0.5);
+ bool expectedToMorph = hasSameVerbs(fromData.pathData, toData.pathData);
+ EXPECT_EQ(expectedToMorph, success);
+ }
+ }
+
+ float fractions[] = {0, 0.00001, 0.28, 0.5, 0.7777, 0.9999999, 1};
+ // Now try to interpolate with a slightly modified version of self and expect success
+ for (TestData fromData : sTestDataSet) {
+ PathData toPathData = fromData.pathData;
+ for (size_t i = 0; i < toPathData.points.size(); i++) {
+ toPathData.points[i]++;
+ }
+ const PathData& fromPathData = fromData.pathData;
+ PathData outData;
+ // Interpolate the two path data with different fractions
+ for (float fraction : fractions) {
+ bool success = VectorDrawableUtils::interpolatePathData(
+ &outData, fromPathData, toPathData, fraction);
+ EXPECT_TRUE(success);
+ for (size_t i = 0; i < outData.points.size(); i++) {
+ float expectedResult = fromPathData.points[i] * (1.0 - fraction) +
+ toPathData.points[i] * fraction;
+ EXPECT_TRUE(MathUtils::areEqual(expectedResult, outData.points[i]));
+ }
+ }
+ }
+}
+
+
}; // namespace uirenderer
}; // namespace android
diff --git a/libs/hwui/utils/Color.h b/libs/hwui/utils/Color.h
new file mode 100644
index 0000000..b5157f4
--- /dev/null
+++ b/libs/hwui/utils/Color.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+#ifndef COLOR_H
+#define COLOR_H
+
+#include <SkColor.h>
+
+namespace android {
+namespace uirenderer {
+ namespace Color {
+ enum Color {
+ Red_500 = 0xFFF44336,
+ Pink_500 = 0xFFE91E63,
+ Purple_500 = 0xFF9C27B0,
+ DeepPurple_500 = 0xFF673AB7,
+ Indigo_500 = 0xFF3F51B5,
+ Blue_500 = 0xFF2196F3,
+ LightBlue_300 = 0xFF4FC3F7,
+ LightBlue_500 = 0xFF03A9F4,
+ Cyan_500 = 0xFF00BCD4,
+ Teal_500 = 0xFF009688,
+ Teal_700 = 0xFF00796B,
+ Green_500 = 0xFF4CAF50,
+ Green_700 = 0xFF388E3C,
+ LightGreen_500 = 0xFF8BC34A,
+ LightGreen_700 = 0xFF689F38,
+ Lime_500 = 0xFFCDDC39,
+ Yellow_500 = 0xFFFFEB3B,
+ Amber_500 = 0xFFFFC107,
+ Orange_500 = 0xFFFF9800,
+ DeepOrange_500 = 0xFFFF5722,
+ Brown_500 = 0xFF795548,
+ Grey_200 = 0xFFEEEEEE,
+ Grey_500 = 0xFF9E9E9E,
+ Grey_700 = 0xFF616161,
+ BlueGrey_500 = 0xFF607D8B,
+ Transparent = 0x00000000,
+ Black = 0xFF000000,
+ White = 0xFFFFFFFF,
+ };
+ }
+
+ static_assert(Color::White == SK_ColorWHITE, "color format has changed");
+ static_assert(Color::Black == SK_ColorBLACK, "color format has changed");
+
+ // Array of bright (500 intensity) colors for synthetic content
+ static const Color::Color BrightColors[] = {
+ Color::Red_500,
+ Color::Pink_500,
+ Color::Purple_500,
+ Color::DeepPurple_500,
+ Color::Indigo_500,
+ Color::Blue_500,
+ Color::LightBlue_500,
+ Color::Cyan_500,
+ Color::Teal_500,
+ Color::Green_500,
+ Color::LightGreen_500,
+ Color::Lime_500,
+ Color::Yellow_500,
+ Color::Amber_500,
+ Color::Orange_500,
+ Color::DeepOrange_500,
+ Color::Brown_500,
+ Color::Grey_500,
+ Color::BlueGrey_500,
+ };
+ static constexpr int BrightColorsCount = sizeof(BrightColors) / sizeof(Color::Color);
+
+} /* namespace uirenderer */
+} /* namespace android */
+
+#endif /* TEST_UTILS_H */
diff --git a/libs/hwui/utils/TestUtils.cpp b/libs/hwui/utils/TestUtils.cpp
new file mode 100644
index 0000000..6cef852
--- /dev/null
+++ b/libs/hwui/utils/TestUtils.cpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "TestUtils.h"
+
+namespace android {
+namespace uirenderer {
+
+SkColor TestUtils::interpolateColor(float fraction, SkColor start, SkColor end) {
+ int startA = (start >> 24) & 0xff;
+ int startR = (start >> 16) & 0xff;
+ int startG = (start >> 8) & 0xff;
+ int startB = start & 0xff;
+
+ int endA = (end >> 24) & 0xff;
+ int endR = (end >> 16) & 0xff;
+ int endG = (end >> 8) & 0xff;
+ int endB = end & 0xff;
+
+ return (int)((startA + (int)(fraction * (endA - startA))) << 24)
+ | (int)((startR + (int)(fraction * (endR - startR))) << 16)
+ | (int)((startG + (int)(fraction * (endG - startG))) << 8)
+ | (int)((startB + (int)(fraction * (endB - startB))));
+}
+
+void TestUtils::drawTextToCanvas(TestCanvas* canvas, const char* text,
+ const SkPaint& paint, float x, float y) {
+ // drawing text requires GlyphID TextEncoding (which JNI layer would have done)
+ LOG_ALWAYS_FATAL_IF(paint.getTextEncoding() != SkPaint::kGlyphID_TextEncoding,
+ "must use glyph encoding");
+
+ SkMatrix identity;
+ identity.setIdentity();
+ SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);
+ SkAutoGlyphCacheNoGamma autoCache(paint, &surfaceProps, &identity);
+
+ float totalAdvance = 0;
+ std::vector<glyph_t> glyphs;
+ std::vector<float> positions;
+ Rect bounds;
+ while (*text != '\0') {
+ SkUnichar unichar = SkUTF8_NextUnichar(&text);
+ glyph_t glyph = autoCache.getCache()->unicharToGlyph(unichar);
+ autoCache.getCache()->unicharToGlyph(unichar);
+
+ // push glyph and its relative position
+ glyphs.push_back(glyph);
+ positions.push_back(totalAdvance);
+ positions.push_back(0);
+
+ // compute bounds
+ SkGlyph skGlyph = autoCache.getCache()->getUnicharMetrics(unichar);
+ Rect glyphBounds(skGlyph.fWidth, skGlyph.fHeight);
+ glyphBounds.translate(totalAdvance + skGlyph.fLeft, skGlyph.fTop);
+ bounds.unionWith(glyphBounds);
+
+ // advance next character
+ SkScalar skWidth;
+ paint.getTextWidths(&glyph, sizeof(glyph), &skWidth, NULL);
+ totalAdvance += skWidth;
+ }
+
+ // apply alignment via x parameter (which JNI layer would have done)
+ if (paint.getTextAlign() == SkPaint::kCenter_Align) {
+ x -= totalAdvance / 2;
+ } else if (paint.getTextAlign() == SkPaint::kRight_Align) {
+ x -= totalAdvance;
+ }
+
+ bounds.translate(x, y);
+
+ // Force left alignment, since alignment offset is already baked in
+ SkPaint alignPaintCopy(paint);
+ alignPaintCopy.setTextAlign(SkPaint::kLeft_Align);
+ canvas->drawText(glyphs.data(), positions.data(), glyphs.size(), alignPaintCopy, x, y,
+ bounds.left, bounds.top, bounds.right, bounds.bottom, totalAdvance);
+}
+
+} /* namespace uirenderer */
+} /* namespace android */
diff --git a/libs/hwui/unit_tests/TestUtils.h b/libs/hwui/utils/TestUtils.h
similarity index 68%
rename from libs/hwui/unit_tests/TestUtils.h
rename to libs/hwui/utils/TestUtils.h
index efa28ae..9c1c0b9 100644
--- a/libs/hwui/unit_tests/TestUtils.h
+++ b/libs/hwui/utils/TestUtils.h
@@ -27,8 +27,10 @@
#if HWUI_NEW_OPS
#include <RecordedOp.h>
+#include <RecordingCanvas.h>
#else
#include <DisplayListOp.h>
+#include <DisplayListCanvas.h>
#endif
#include <memory>
@@ -36,6 +38,12 @@
namespace android {
namespace uirenderer {
+#if HWUI_NEW_OPS
+typedef RecordingCanvas TestCanvas;
+#else
+typedef DisplayListCanvas TestCanvas;
+#endif
+
#define EXPECT_MATRIX_APPROX_EQ(a, b) \
EXPECT_TRUE(TestUtils::matricesAreApproxEqual(a, b))
@@ -45,6 +53,20 @@
&& MathUtils::areEqual(a.right, b.right) \
&& MathUtils::areEqual(a.bottom, b.bottom));
+/**
+ * Like gtest's TEST, but runs on the RenderThread, and 'renderThread' is passed, in top level scope
+ * (for e.g. accessing its RenderState)
+ */
+#define RENDERTHREAD_TEST(test_case_name, test_name) \
+ class test_case_name##_##test_name##_RenderThreadTest { \
+ public: \
+ static void doTheThing(renderthread::RenderThread& renderThread); \
+ }; \
+ TEST(test_case_name, test_name) { \
+ TestUtils::runOnRenderThread(test_case_name##_##test_name##_RenderThreadTest::doTheThing); \
+ }; \
+ void test_case_name##_##test_name##_RenderThreadTest::doTheThing(renderthread::RenderThread& renderThread)
+
class TestUtils {
public:
class SignalingDtor {
@@ -83,7 +105,8 @@
static SkBitmap createSkBitmap(int width, int height) {
SkBitmap bitmap;
- SkImageInfo info = SkImageInfo::MakeUnknown(width, height);
+ SkImageInfo info = SkImageInfo::Make(width, height,
+ kN32_SkColorType, kPremul_SkAlphaType);
bitmap.setInfo(info);
bitmap.allocPixels(info);
return bitmap;
@@ -97,18 +120,8 @@
return std::unique_ptr<DisplayList>(canvas.finishRecording());
}
- typedef std::function<int(RenderProperties&)> PropSetupCallback;
-
- static PropSetupCallback getHwLayerSetupCallback() {
- static PropSetupCallback sLayerSetupCallback = [] (RenderProperties& properties) {
- properties.mutateLayerProperties().setType(LayerType::RenderLayer);
- return RenderNode::GENERIC;
- };
- return sLayerSetupCallback;
- }
-
static sp<RenderNode> createNode(int left, int top, int right, int bottom,
- PropSetupCallback propSetupCallback = nullptr) {
+ std::function<void(RenderProperties& props, TestCanvas& canvas)> setup) {
#if HWUI_NULL_GPU
// if RenderNodes are being sync'd/used, device info will be needed, since
// DeviceInfo::maxTextureSize() affects layer property
@@ -116,27 +129,32 @@
#endif
sp<RenderNode> node = new RenderNode();
- node->mutateStagingProperties().setLeftTopRightBottom(left, top, right, bottom);
- node->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);
- if (propSetupCallback) {
- node->setPropertyFieldsDirty(propSetupCallback(node->mutateStagingProperties()));
+ RenderProperties& props = node->mutateStagingProperties();
+ props.setLeftTopRightBottom(left, top, right, bottom);
+ if (setup) {
+ TestCanvas canvas(props.getWidth(), props.getHeight());
+ setup(props, canvas);
+ node->setStagingDisplayList(canvas.finishRecording());
}
+ node->setPropertyFieldsDirty(0xFFFFFFFF);
return node;
}
- template<class CanvasType>
- static sp<RenderNode> createNode(int left, int top, int right, int bottom,
- std::function<void(CanvasType& canvas)> canvasCallback,
- PropSetupCallback propSetupCallback = nullptr) {
- sp<RenderNode> node = createNode(left, top, right, bottom, propSetupCallback);
-
- auto&& props = node->stagingProperties(); // staging, since not sync'd yet
- CanvasType canvas(props.getWidth(), props.getHeight());
- canvasCallback(canvas);
- node->setStagingDisplayList(canvas.finishRecording());
- return node;
+ static void recordNode(RenderNode& node,
+ std::function<void(TestCanvas&)> contentCallback) {
+ TestCanvas canvas(node.stagingProperties().getWidth(),
+ node.stagingProperties().getHeight());
+ contentCallback(canvas);
+ node.setStagingDisplayList(canvas.finishRecording());
}
+ /**
+ * Forces a sync of a tree of RenderNode, such that every descendant will have its staging
+ * properties and DisplayList moved to the render copies.
+ *
+ * Note: does not check dirtiness bits, so any non-staging DisplayLists will be discarded.
+ * For this reason, this should generally only be called once on a tree.
+ */
static void syncHierarchyPropertiesAndDisplayList(sp<RenderNode>& node) {
syncHierarchyPropertiesAndDisplayListImpl(node.get());
}
@@ -166,6 +184,12 @@
TestTask task(rtCallback);
renderthread::RenderThread::getInstance().queueAndWait(&task);
}
+
+ static SkColor interpolateColor(float fraction, SkColor start, SkColor end);
+
+ static void drawTextToCanvas(TestCanvas* canvas, const char* text,
+ const SkPaint& paint, float x, float y);
+
private:
static void syncHierarchyPropertiesAndDisplayListImpl(RenderNode* node) {
node->syncProperties();
diff --git a/libs/hwui/utils/VectorDrawableUtils.cpp b/libs/hwui/utils/VectorDrawableUtils.cpp
new file mode 100644
index 0000000..ca75c59
--- /dev/null
+++ b/libs/hwui/utils/VectorDrawableUtils.cpp
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "VectorDrawableUtils.h"
+
+#include "PathParser.h"
+
+#include <math.h>
+#include <utils/Log.h>
+
+namespace android {
+namespace uirenderer {
+
+class PathResolver {
+public:
+ float currentX = 0;
+ float currentY = 0;
+ float ctrlPointX = 0;
+ float ctrlPointY = 0;
+ float currentSegmentStartX = 0;
+ float currentSegmentStartY = 0;
+ void addCommand(SkPath* outPath, char previousCmd,
+ char cmd, const std::vector<float>* points, size_t start, size_t end);
+};
+
+bool VectorDrawableUtils::canMorph(const PathData& morphFrom, const PathData& morphTo) {
+ if (morphFrom.verbs.size() != morphTo.verbs.size()) {
+ return false;
+ }
+
+ for (unsigned int i = 0; i < morphFrom.verbs.size(); i++) {
+ if (morphFrom.verbs[i] != morphTo.verbs[i]
+ || morphFrom.verbSizes[i] != morphTo.verbSizes[i]) {
+ return false;
+ }
+ }
+ return true;
+}
+
+bool VectorDrawableUtils::interpolatePathData(PathData* outData, const PathData& morphFrom,
+ const PathData& morphTo, float fraction) {
+ if (!canMorph(morphFrom, morphTo)) {
+ return false;
+ }
+ interpolatePaths(outData, morphFrom, morphTo, fraction);
+ return true;
+}
+
+ /**
+ * Convert an array of PathVerb to Path.
+ */
+void VectorDrawableUtils::verbsToPath(SkPath* outPath, const PathData& data) {
+ PathResolver resolver;
+ char previousCommand = 'm';
+ size_t start = 0;
+ outPath->reset();
+ for (unsigned int i = 0; i < data.verbs.size(); i++) {
+ size_t verbSize = data.verbSizes[i];
+ resolver.addCommand(outPath, previousCommand, data.verbs[i], &data.points, start,
+ start + verbSize);
+ previousCommand = data.verbs[i];
+ start += verbSize;
+ }
+}
+
+/**
+ * The current PathVerb will be interpolated between the
+ * <code>nodeFrom</code> and <code>nodeTo</code> according to the
+ * <code>fraction</code>.
+ *
+ * @param nodeFrom The start value as a PathVerb.
+ * @param nodeTo The end value as a PathVerb
+ * @param fraction The fraction to interpolate.
+ */
+void VectorDrawableUtils::interpolatePaths(PathData* outData,
+ const PathData& from, const PathData& to, float fraction) {
+ outData->points.resize(from.points.size());
+ outData->verbSizes = from.verbSizes;
+ outData->verbs = from.verbs;
+
+ for (size_t i = 0; i < from.points.size(); i++) {
+ outData->points[i] = from.points[i] * (1 - fraction) + to.points[i] * fraction;
+ }
+}
+
+/**
+ * Converts an arc to cubic Bezier segments and records them in p.
+ *
+ * @param p The target for the cubic Bezier segments
+ * @param cx The x coordinate center of the ellipse
+ * @param cy The y coordinate center of the ellipse
+ * @param a The radius of the ellipse in the horizontal direction
+ * @param b The radius of the ellipse in the vertical direction
+ * @param e1x E(eta1) x coordinate of the starting point of the arc
+ * @param e1y E(eta2) y coordinate of the starting point of the arc
+ * @param theta The angle that the ellipse bounding rectangle makes with horizontal plane
+ * @param start The start angle of the arc on the ellipse
+ * @param sweep The angle (positive or negative) of the sweep of the arc on the ellipse
+ */
+static void arcToBezier(SkPath* p,
+ double cx,
+ double cy,
+ double a,
+ double b,
+ double e1x,
+ double e1y,
+ double theta,
+ double start,
+ double sweep) {
+ // Taken from equations at: http://spaceroots.org/documents/ellipse/node8.html
+ // and http://www.spaceroots.org/documents/ellipse/node22.html
+
+ // Maximum of 45 degrees per cubic Bezier segment
+ int numSegments = ceil(fabs(sweep * 4 / M_PI));
+
+ double eta1 = start;
+ double cosTheta = cos(theta);
+ double sinTheta = sin(theta);
+ double cosEta1 = cos(eta1);
+ double sinEta1 = sin(eta1);
+ double ep1x = (-a * cosTheta * sinEta1) - (b * sinTheta * cosEta1);
+ double ep1y = (-a * sinTheta * sinEta1) + (b * cosTheta * cosEta1);
+
+ double anglePerSegment = sweep / numSegments;
+ for (int i = 0; i < numSegments; i++) {
+ double eta2 = eta1 + anglePerSegment;
+ double sinEta2 = sin(eta2);
+ double cosEta2 = cos(eta2);
+ double e2x = cx + (a * cosTheta * cosEta2) - (b * sinTheta * sinEta2);
+ double e2y = cy + (a * sinTheta * cosEta2) + (b * cosTheta * sinEta2);
+ double ep2x = -a * cosTheta * sinEta2 - b * sinTheta * cosEta2;
+ double ep2y = -a * sinTheta * sinEta2 + b * cosTheta * cosEta2;
+ double tanDiff2 = tan((eta2 - eta1) / 2);
+ double alpha =
+ sin(eta2 - eta1) * (sqrt(4 + (3 * tanDiff2 * tanDiff2)) - 1) / 3;
+ double q1x = e1x + alpha * ep1x;
+ double q1y = e1y + alpha * ep1y;
+ double q2x = e2x - alpha * ep2x;
+ double q2y = e2y - alpha * ep2y;
+
+ p->cubicTo((float) q1x,
+ (float) q1y,
+ (float) q2x,
+ (float) q2y,
+ (float) e2x,
+ (float) e2y);
+ eta1 = eta2;
+ e1x = e2x;
+ e1y = e2y;
+ ep1x = ep2x;
+ ep1y = ep2y;
+ }
+}
+
+inline double toRadians(float theta) { return theta * M_PI / 180;}
+
+static void drawArc(SkPath* p,
+ float x0,
+ float y0,
+ float x1,
+ float y1,
+ float a,
+ float b,
+ float theta,
+ bool isMoreThanHalf,
+ bool isPositiveArc) {
+
+ /* Convert rotation angle from degrees to radians */
+ double thetaD = toRadians(theta);
+ /* Pre-compute rotation matrix entries */
+ double cosTheta = cos(thetaD);
+ double sinTheta = sin(thetaD);
+ /* Transform (x0, y0) and (x1, y1) into unit space */
+ /* using (inverse) rotation, followed by (inverse) scale */
+ double x0p = (x0 * cosTheta + y0 * sinTheta) / a;
+ double y0p = (-x0 * sinTheta + y0 * cosTheta) / b;
+ double x1p = (x1 * cosTheta + y1 * sinTheta) / a;
+ double y1p = (-x1 * sinTheta + y1 * cosTheta) / b;
+
+ /* Compute differences and averages */
+ double dx = x0p - x1p;
+ double dy = y0p - y1p;
+ double xm = (x0p + x1p) / 2;
+ double ym = (y0p + y1p) / 2;
+ /* Solve for intersecting unit circles */
+ double dsq = dx * dx + dy * dy;
+ if (dsq == 0.0) {
+ ALOGW("Points are coincident");
+ return; /* Points are coincident */
+ }
+ double disc = 1.0 / dsq - 1.0 / 4.0;
+ if (disc < 0.0) {
+ ALOGW("Points are too far apart %f", dsq);
+ float adjust = (float) (sqrt(dsq) / 1.99999);
+ drawArc(p, x0, y0, x1, y1, a * adjust,
+ b * adjust, theta, isMoreThanHalf, isPositiveArc);
+ return; /* Points are too far apart */
+ }
+ double s = sqrt(disc);
+ double sdx = s * dx;
+ double sdy = s * dy;
+ double cx;
+ double cy;
+ if (isMoreThanHalf == isPositiveArc) {
+ cx = xm - sdy;
+ cy = ym + sdx;
+ } else {
+ cx = xm + sdy;
+ cy = ym - sdx;
+ }
+
+ double eta0 = atan2((y0p - cy), (x0p - cx));
+
+ double eta1 = atan2((y1p - cy), (x1p - cx));
+
+ double sweep = (eta1 - eta0);
+ if (isPositiveArc != (sweep >= 0)) {
+ if (sweep > 0) {
+ sweep -= 2 * M_PI;
+ } else {
+ sweep += 2 * M_PI;
+ }
+ }
+
+ cx *= a;
+ cy *= b;
+ double tcx = cx;
+ cx = cx * cosTheta - cy * sinTheta;
+ cy = tcx * sinTheta + cy * cosTheta;
+
+ arcToBezier(p, cx, cy, a, b, x0, y0, thetaD, eta0, sweep);
+}
+
+
+
+// Use the given verb, and points in the range [start, end) to insert a command into the SkPath.
+void PathResolver::addCommand(SkPath* outPath, char previousCmd,
+ char cmd, const std::vector<float>* points, size_t start, size_t end) {
+
+ int incr = 2;
+ float reflectiveCtrlPointX;
+ float reflectiveCtrlPointY;
+
+ switch (cmd) {
+ case 'z':
+ case 'Z':
+ outPath->close();
+ // Path is closed here, but we need to move the pen to the
+ // closed position. So we cache the segment's starting position,
+ // and restore it here.
+ currentX = currentSegmentStartX;
+ currentY = currentSegmentStartY;
+ ctrlPointX = currentSegmentStartX;
+ ctrlPointY = currentSegmentStartY;
+ outPath->moveTo(currentX, currentY);
+ break;
+ case 'm':
+ case 'M':
+ case 'l':
+ case 'L':
+ case 't':
+ case 'T':
+ incr = 2;
+ break;
+ case 'h':
+ case 'H':
+ case 'v':
+ case 'V':
+ incr = 1;
+ break;
+ case 'c':
+ case 'C':
+ incr = 6;
+ break;
+ case 's':
+ case 'S':
+ case 'q':
+ case 'Q':
+ incr = 4;
+ break;
+ case 'a':
+ case 'A':
+ incr = 7;
+ break;
+ }
+
+ for (unsigned int k = start; k < end; k += incr) {
+ switch (cmd) {
+ case 'm': // moveto - Start a new sub-path (relative)
+ currentX += points->at(k + 0);
+ currentY += points->at(k + 1);
+ if (k > start) {
+ // According to the spec, if a moveto is followed by multiple
+ // pairs of coordinates, the subsequent pairs are treated as
+ // implicit lineto commands.
+ outPath->rLineTo(points->at(k + 0), points->at(k + 1));
+ } else {
+ outPath->rMoveTo(points->at(k + 0), points->at(k + 1));
+ currentSegmentStartX = currentX;
+ currentSegmentStartY = currentY;
+ }
+ break;
+ case 'M': // moveto - Start a new sub-path
+ currentX = points->at(k + 0);
+ currentY = points->at(k + 1);
+ if (k > start) {
+ // According to the spec, if a moveto is followed by multiple
+ // pairs of coordinates, the subsequent pairs are treated as
+ // implicit lineto commands.
+ outPath->lineTo(points->at(k + 0), points->at(k + 1));
+ } else {
+ outPath->moveTo(points->at(k + 0), points->at(k + 1));
+ currentSegmentStartX = currentX;
+ currentSegmentStartY = currentY;
+ }
+ break;
+ case 'l': // lineto - Draw a line from the current point (relative)
+ outPath->rLineTo(points->at(k + 0), points->at(k + 1));
+ currentX += points->at(k + 0);
+ currentY += points->at(k + 1);
+ break;
+ case 'L': // lineto - Draw a line from the current point
+ outPath->lineTo(points->at(k + 0), points->at(k + 1));
+ currentX = points->at(k + 0);
+ currentY = points->at(k + 1);
+ break;
+ case 'h': // horizontal lineto - Draws a horizontal line (relative)
+ outPath->rLineTo(points->at(k + 0), 0);
+ currentX += points->at(k + 0);
+ break;
+ case 'H': // horizontal lineto - Draws a horizontal line
+ outPath->lineTo(points->at(k + 0), currentY);
+ currentX = points->at(k + 0);
+ break;
+ case 'v': // vertical lineto - Draws a vertical line from the current point (r)
+ outPath->rLineTo(0, points->at(k + 0));
+ currentY += points->at(k + 0);
+ break;
+ case 'V': // vertical lineto - Draws a vertical line from the current point
+ outPath->lineTo(currentX, points->at(k + 0));
+ currentY = points->at(k + 0);
+ break;
+ case 'c': // curveto - Draws a cubic Bézier curve (relative)
+ outPath->rCubicTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3),
+ points->at(k + 4), points->at(k + 5));
+
+ ctrlPointX = currentX + points->at(k + 2);
+ ctrlPointY = currentY + points->at(k + 3);
+ currentX += points->at(k + 4);
+ currentY += points->at(k + 5);
+
+ break;
+ case 'C': // curveto - Draws a cubic Bézier curve
+ outPath->cubicTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3),
+ points->at(k + 4), points->at(k + 5));
+ currentX = points->at(k + 4);
+ currentY = points->at(k + 5);
+ ctrlPointX = points->at(k + 2);
+ ctrlPointY = points->at(k + 3);
+ break;
+ case 's': // smooth curveto - Draws a cubic Bézier curve (reflective cp)
+ reflectiveCtrlPointX = 0;
+ reflectiveCtrlPointY = 0;
+ if (previousCmd == 'c' || previousCmd == 's'
+ || previousCmd == 'C' || previousCmd == 'S') {
+ reflectiveCtrlPointX = currentX - ctrlPointX;
+ reflectiveCtrlPointY = currentY - ctrlPointY;
+ }
+ outPath->rCubicTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
+ points->at(k + 0), points->at(k + 1),
+ points->at(k + 2), points->at(k + 3));
+ ctrlPointX = currentX + points->at(k + 0);
+ ctrlPointY = currentY + points->at(k + 1);
+ currentX += points->at(k + 2);
+ currentY += points->at(k + 3);
+ break;
+ case 'S': // shorthand/smooth curveto Draws a cubic Bézier curve(reflective cp)
+ reflectiveCtrlPointX = currentX;
+ reflectiveCtrlPointY = currentY;
+ if (previousCmd == 'c' || previousCmd == 's'
+ || previousCmd == 'C' || previousCmd == 'S') {
+ reflectiveCtrlPointX = 2 * currentX - ctrlPointX;
+ reflectiveCtrlPointY = 2 * currentY - ctrlPointY;
+ }
+ outPath->cubicTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
+ points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3));
+ ctrlPointX = points->at(k + 0);
+ ctrlPointY = points->at(k + 1);
+ currentX = points->at(k + 2);
+ currentY = points->at(k + 3);
+ break;
+ case 'q': // Draws a quadratic Bézier (relative)
+ outPath->rQuadTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3));
+ ctrlPointX = currentX + points->at(k + 0);
+ ctrlPointY = currentY + points->at(k + 1);
+ currentX += points->at(k + 2);
+ currentY += points->at(k + 3);
+ break;
+ case 'Q': // Draws a quadratic Bézier
+ outPath->quadTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), points->at(k + 3));
+ ctrlPointX = points->at(k + 0);
+ ctrlPointY = points->at(k + 1);
+ currentX = points->at(k + 2);
+ currentY = points->at(k + 3);
+ break;
+ case 't': // Draws a quadratic Bézier curve(reflective control point)(relative)
+ reflectiveCtrlPointX = 0;
+ reflectiveCtrlPointY = 0;
+ if (previousCmd == 'q' || previousCmd == 't'
+ || previousCmd == 'Q' || previousCmd == 'T') {
+ reflectiveCtrlPointX = currentX - ctrlPointX;
+ reflectiveCtrlPointY = currentY - ctrlPointY;
+ }
+ outPath->rQuadTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
+ points->at(k + 0), points->at(k + 1));
+ ctrlPointX = currentX + reflectiveCtrlPointX;
+ ctrlPointY = currentY + reflectiveCtrlPointY;
+ currentX += points->at(k + 0);
+ currentY += points->at(k + 1);
+ break;
+ case 'T': // Draws a quadratic Bézier curve (reflective control point)
+ reflectiveCtrlPointX = currentX;
+ reflectiveCtrlPointY = currentY;
+ if (previousCmd == 'q' || previousCmd == 't'
+ || previousCmd == 'Q' || previousCmd == 'T') {
+ reflectiveCtrlPointX = 2 * currentX - ctrlPointX;
+ reflectiveCtrlPointY = 2 * currentY - ctrlPointY;
+ }
+ outPath->quadTo(reflectiveCtrlPointX, reflectiveCtrlPointY,
+ points->at(k + 0), points->at(k + 1));
+ ctrlPointX = reflectiveCtrlPointX;
+ ctrlPointY = reflectiveCtrlPointY;
+ currentX = points->at(k + 0);
+ currentY = points->at(k + 1);
+ break;
+ case 'a': // Draws an elliptical arc
+ // (rx ry x-axis-rotation large-arc-flag sweep-flag x y)
+ drawArc(outPath,
+ currentX,
+ currentY,
+ points->at(k + 5) + currentX,
+ points->at(k + 6) + currentY,
+ points->at(k + 0),
+ points->at(k + 1),
+ points->at(k + 2),
+ points->at(k + 3) != 0,
+ points->at(k + 4) != 0);
+ currentX += points->at(k + 5);
+ currentY += points->at(k + 6);
+ ctrlPointX = currentX;
+ ctrlPointY = currentY;
+ break;
+ case 'A': // Draws an elliptical arc
+ drawArc(outPath,
+ currentX,
+ currentY,
+ points->at(k + 5),
+ points->at(k + 6),
+ points->at(k + 0),
+ points->at(k + 1),
+ points->at(k + 2),
+ points->at(k + 3) != 0,
+ points->at(k + 4) != 0);
+ currentX = points->at(k + 5);
+ currentY = points->at(k + 6);
+ ctrlPointX = currentX;
+ ctrlPointY = currentY;
+ break;
+ default:
+ LOG_ALWAYS_FATAL("Unsupported command: %c", cmd);
+ break;
+ }
+ previousCmd = cmd;
+ }
+}
+
+} // namespace uirenderer
+} // namespace android
diff --git a/libs/hwui/utils/VectorDrawableUtils.h b/libs/hwui/utils/VectorDrawableUtils.h
new file mode 100644
index 0000000..21c1cdc
--- /dev/null
+++ b/libs/hwui/utils/VectorDrawableUtils.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef ANDROID_HWUI_VECTORDRAWABLE_UTILS_H
+#define ANDROID_HWUI_VECTORDRAWABLE_UTILS_H
+
+#include "VectorDrawablePath.h"
+
+#include <cutils/compiler.h>
+#include "SkPath.h"
+#include <vector>
+
+namespace android {
+namespace uirenderer {
+
+class VectorDrawableUtils {
+public:
+ ANDROID_API static bool canMorph(const PathData& morphFrom, const PathData& morphTo);
+ ANDROID_API static bool interpolatePathData(PathData* outData, const PathData& morphFrom,
+ const PathData& morphTo, float fraction);
+ ANDROID_API static void verbsToPath(SkPath* outPath, const PathData& data);
+ static void interpolatePaths(PathData* outPathData, const PathData& from, const PathData& to,
+ float fraction);
+};
+} // namespace uirenderer
+} // namespace android
+#endif /* ANDROID_HWUI_VECTORDRAWABLE_UTILS_H*/
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index c9586e4..bd6af78 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -86,6 +86,9 @@
mLocked.pointerIconChanged = false;
mLocked.requestedPointerShape = mPolicy->getDefaultPointerIconId();
+ mLocked.animationFrameIndex = 0;
+ mLocked.lastFrameUpdatedTime = 0;
+
mLocked.buttonState = 0;
loadResources();
@@ -239,7 +242,8 @@
AutoMutex _l(mLock);
if (presentation == PRESENTATION_POINTER && mLocked.additionalMouseResources.empty()) {
- mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources);
+ mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,
+ &mLocked.animationResources);
}
if (mLocked.presentation != presentation) {
@@ -402,7 +406,7 @@
updatePointerLocked();
}
-void PointerController::updatePointerShape(int iconId) {
+void PointerController::updatePointerShape(int32_t iconId) {
AutoMutex _l(mLock);
if (mLocked.requestedPointerShape != iconId) {
mLocked.requestedPointerShape = iconId;
@@ -462,8 +466,17 @@
void PointerController::doAnimate(nsecs_t timestamp) {
AutoMutex _l(mLock);
- bool keepAnimating = false;
mLocked.animationPending = false;
+
+ bool keepFading = doFadingAnimationLocked(timestamp);
+ bool keepBitmapFlipping = doBitmapAnimationLocked(timestamp);
+ if (keepFading || keepBitmapFlipping) {
+ startAnimationLocked();
+ }
+}
+
+bool PointerController::doFadingAnimationLocked(nsecs_t timestamp) {
+ bool keepAnimating = false;
nsecs_t frameDelay = timestamp - mLocked.animationTime;
// Animate pointer fade.
@@ -501,10 +514,32 @@
}
}
}
+ return keepAnimating;
+}
- if (keepAnimating) {
- startAnimationLocked();
+bool PointerController::doBitmapAnimationLocked(nsecs_t timestamp) {
+ std::map<int32_t, PointerAnimation>::const_iterator iter = mLocked.animationResources.find(
+ mLocked.requestedPointerShape);
+ if (iter == mLocked.animationResources.end()) {
+ return false;
}
+
+ if (timestamp - mLocked.lastFrameUpdatedTime > iter->second.durationPerFrame) {
+ mSpriteController->openTransaction();
+
+ int incr = (timestamp - mLocked.lastFrameUpdatedTime) / iter->second.durationPerFrame;
+ mLocked.animationFrameIndex += incr;
+ mLocked.lastFrameUpdatedTime += iter->second.durationPerFrame * incr;
+ while (mLocked.animationFrameIndex >= iter->second.animationFrames.size()) {
+ mLocked.animationFrameIndex -= iter->second.animationFrames.size();
+ }
+ mLocked.pointerSprite->setIcon(iter->second.animationFrames[mLocked.animationFrameIndex]);
+
+ mSpriteController->closeTransaction();
+ }
+
+ // Keep animating.
+ return true;
}
void PointerController::doInactivityTimeout() {
@@ -549,9 +584,16 @@
if (mLocked.requestedPointerShape == mPolicy->getDefaultPointerIconId()) {
mLocked.pointerSprite->setIcon(mLocked.pointerIcon);
} else {
- std::map<int, SpriteIcon>::const_iterator iter =
+ std::map<int32_t, SpriteIcon>::const_iterator iter =
mLocked.additionalMouseResources.find(mLocked.requestedPointerShape);
if (iter != mLocked.additionalMouseResources.end()) {
+ std::map<int32_t, PointerAnimation>::const_iterator anim_iter =
+ mLocked.animationResources.find(mLocked.requestedPointerShape);
+ if (anim_iter != mLocked.animationResources.end()) {
+ mLocked.animationFrameIndex = 0;
+ mLocked.lastFrameUpdatedTime = systemTime(SYSTEM_TIME_MONOTONIC);
+ startAnimationLocked();
+ }
mLocked.pointerSprite->setIcon(iter->second);
} else {
ALOGW("Can't find the resource for icon id %d", mLocked.requestedPointerShape);
diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h
index 6d840db..b6c01d2 100644
--- a/libs/input/PointerController.h
+++ b/libs/input/PointerController.h
@@ -20,6 +20,7 @@
#include "SpriteController.h"
#include <map>
+#include <vector>
#include <ui/DisplayInfo.h>
#include <input/Input.h>
@@ -30,8 +31,6 @@
#include <utils/String8.h>
#include <gui/DisplayEventReceiver.h>
-#include <SkBitmap.h>
-
namespace android {
/*
@@ -43,6 +42,11 @@
SpriteIcon spotAnchor;
};
+struct PointerAnimation {
+ std::vector<SpriteIcon> animationFrames;
+ nsecs_t durationPerFrame;
+};
+
/*
* Pointer controller policy interface.
*
@@ -59,7 +63,8 @@
public:
virtual void loadPointerResources(PointerResources* outResources) = 0;
- virtual void loadAdditionalMouseResources(std::map<int32_t, SpriteIcon>* outResources) = 0;
+ virtual void loadAdditionalMouseResources(std::map<int32_t, SpriteIcon>* outResources,
+ std::map<int32_t, PointerAnimation>* outAnimationResources) = 0;
virtual int32_t getDefaultPointerIconId() = 0;
};
@@ -98,7 +103,7 @@
const uint32_t* spotIdToIndex, BitSet32 spotIdBits);
virtual void clearSpots();
- void updatePointerShape(int iconId);
+ void updatePointerShape(int32_t iconId);
void setDisplayViewport(int32_t width, int32_t height, int32_t orientation);
void setPointerIcon(const SpriteIcon& icon);
void setInactivityTimeout(InactivityTimeout inactivityTimeout);
@@ -145,6 +150,9 @@
bool animationPending;
nsecs_t animationTime;
+ size_t animationFrameIndex;
+ nsecs_t lastFrameUpdatedTime;
+
int32_t displayWidth;
int32_t displayHeight;
int32_t displayOrientation;
@@ -162,7 +170,8 @@
SpriteIcon pointerIcon;
bool pointerIconChanged;
- std::map<int, SpriteIcon> additionalMouseResources;
+ std::map<int32_t, SpriteIcon> additionalMouseResources;
+ std::map<int32_t, PointerAnimation> animationResources;
int32_t requestedPointerShape;
@@ -178,6 +187,8 @@
void handleMessage(const Message& message);
int handleEvent(int fd, int events, void* data);
void doAnimate(nsecs_t timestamp);
+ bool doFadingAnimationLocked(nsecs_t timestamp);
+ bool doBitmapAnimationLocked(nsecs_t timestamp);
void doInactivityTimeout();
void startAnimationLocked();
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 50df556..c658675 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -2658,107 +2658,6 @@
rctlr.stopListeningToSessions();
}
- /**
- * @hide
- * Registers a remote control display that will be sent information by remote control clients.
- * Use this method if your IRemoteControlDisplay is not going to display artwork, otherwise
- * use {@link #registerRemoteControlDisplay(IRemoteControlDisplay, int, int)} to pass the
- * artwork size directly, or
- * {@link #remoteControlDisplayUsesBitmapSize(IRemoteControlDisplay, int, int)} later if artwork
- * is not yet needed.
- * <p>Registration requires the {@link Manifest.permission#MEDIA_CONTENT_CONTROL} permission.
- * @param rcd the IRemoteControlDisplay
- */
- public void registerRemoteControlDisplay(IRemoteControlDisplay rcd) {
- // passing a negative value for art work width and height as they are unknown at this stage
- registerRemoteControlDisplay(rcd, /*w*/-1, /*h*/ -1);
- }
-
- /**
- * @hide
- * Registers a remote control display that will be sent information by remote control clients.
- * <p>Registration requires the {@link Manifest.permission#MEDIA_CONTENT_CONTROL} permission.
- * @param rcd
- * @param w the maximum width of the expected bitmap. Negative values indicate it is
- * useless to send artwork.
- * @param h the maximum height of the expected bitmap. Negative values indicate it is
- * useless to send artwork.
- */
- public void registerRemoteControlDisplay(IRemoteControlDisplay rcd, int w, int h) {
- if (rcd == null) {
- return;
- }
- IAudioService service = getService();
- try {
- service.registerRemoteControlDisplay(rcd, w, h);
- } catch (RemoteException e) {
- Log.e(TAG, "Dead object in registerRemoteControlDisplay " + e);
- }
- }
-
- /**
- * @hide
- * Unregisters a remote control display that was sent information by remote control clients.
- * @param rcd
- */
- public void unregisterRemoteControlDisplay(IRemoteControlDisplay rcd) {
- if (rcd == null) {
- return;
- }
- IAudioService service = getService();
- try {
- service.unregisterRemoteControlDisplay(rcd);
- } catch (RemoteException e) {
- Log.e(TAG, "Dead object in unregisterRemoteControlDisplay " + e);
- }
- }
-
- /**
- * @hide
- * Sets the artwork size a remote control display expects when receiving bitmaps.
- * @param rcd
- * @param w the maximum width of the expected bitmap. Negative values indicate it is
- * useless to send artwork.
- * @param h the maximum height of the expected bitmap. Negative values indicate it is
- * useless to send artwork.
- */
- public void remoteControlDisplayUsesBitmapSize(IRemoteControlDisplay rcd, int w, int h) {
- if (rcd == null) {
- return;
- }
- IAudioService service = getService();
- try {
- service.remoteControlDisplayUsesBitmapSize(rcd, w, h);
- } catch (RemoteException e) {
- Log.e(TAG, "Dead object in remoteControlDisplayUsesBitmapSize " + e);
- }
- }
-
- /**
- * @hide
- * Controls whether a remote control display needs periodic checks of the RemoteControlClient
- * playback position to verify that the estimated position has not drifted from the actual
- * position. By default the check is not performed.
- * The IRemoteControlDisplay must have been previously registered for this to have any effect.
- * @param rcd the IRemoteControlDisplay for which the anti-drift mechanism will be enabled
- * or disabled. No effect is null.
- * @param wantsSync if true, RemoteControlClient instances which expose their playback position
- * to the framework will regularly compare the estimated playback position with the actual
- * position, and will update the IRemoteControlDisplay implementation whenever a drift is
- * detected.
- */
- public void remoteControlDisplayWantsPlaybackPositionSync(IRemoteControlDisplay rcd,
- boolean wantsSync) {
- if (rcd == null) {
- return;
- }
- IAudioService service = getService();
- try {
- service.remoteControlDisplayWantsPlaybackPositionSync(rcd, wantsSync);
- } catch (RemoteException e) {
- Log.e(TAG, "Dead object in remoteControlDisplayWantsPlaybackPositionSync " + e);
- }
- }
/**
* @hide
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 6bf5721..445ee6f 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -17,6 +17,8 @@
package android.media;
import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -128,6 +130,9 @@
// use sLock to serialize the accesses.
private static final Object sLock = new Object();
+ // Pattern to check non zero timestamp
+ private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*");
+
/**
* Reads Exif tags from the specified JPEG file.
*/
@@ -367,7 +372,8 @@
*/
public long getDateTime() {
String dateTimeString = mAttributes.get(TAG_DATETIME);
- if (dateTimeString == null) return -1;
+ if (dateTimeString == null
+ || !sNonZeroTimePattern.matcher(dateTimeString).matches()) return -1;
ParsePosition pos = new ParsePosition(0);
try {
@@ -402,7 +408,9 @@
public long getGpsDateTime() {
String date = mAttributes.get(TAG_GPS_DATESTAMP);
String time = mAttributes.get(TAG_GPS_TIMESTAMP);
- if (date == null || time == null) return -1;
+ if (date == null || time == null
+ || (!sNonZeroTimePattern.matcher(date).matches()
+ && !sNonZeroTimePattern.matcher(time).matches())) return -1;
String dateTimeString = date + ' ' + time;
diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl
index 8aebe11..693a519 100644
--- a/media/java/android/media/IAudioService.aidl
+++ b/media/java/android/media/IAudioService.aidl
@@ -23,9 +23,6 @@
import android.media.AudioRoutesInfo;
import android.media.IAudioFocusDispatcher;
import android.media.IAudioRoutesObserver;
-import android.media.IRemoteControlClient;
-import android.media.IRemoteControlDisplay;
-import android.media.IRemoteVolumeObserver;
import android.media.IRingtonePlayer;
import android.media.IVolumeController;
import android.media.Rating;
@@ -47,8 +44,6 @@
void setStreamVolume(int streamType, int index, int flags, String callingPackage);
- oneway void setRemoteStreamVolume(int index);
-
boolean isStreamMute(int streamType);
void forceRemoteSubmixFullVolume(boolean startForcing, IBinder cb);
@@ -121,59 +116,6 @@
int getCurrentAudioFocus();
- /**
- * Register an IRemoteControlDisplay.
- * Success of registration is subject to a check on
- * the android.Manifest.permission.MEDIA_CONTENT_CONTROL permission.
- * Notify all IRemoteControlClient of the new display and cause the RemoteControlClient
- * at the top of the stack to update the new display with its information.
- * @param rcd the IRemoteControlDisplay to register. No effect if null.
- * @param w the maximum width of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- * @param h the maximum height of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- */
- boolean registerRemoteControlDisplay(in IRemoteControlDisplay rcd, int w, int h);
-
- /**
- * Like registerRemoteControlDisplay, but with success being subject to a check on
- * the android.Manifest.permission.MEDIA_CONTENT_CONTROL permission, and if it fails,
- * success is subject to listenerComp being one of the ENABLED_NOTIFICATION_LISTENERS
- * components.
- */
- boolean registerRemoteController(in IRemoteControlDisplay rcd, int w, int h,
- in ComponentName listenerComp);
-
- /**
- * Unregister an IRemoteControlDisplay.
- * No effect if the IRemoteControlDisplay hasn't been successfully registered.
- * @param rcd the IRemoteControlDisplay to unregister. No effect if null.
- */
- oneway void unregisterRemoteControlDisplay(in IRemoteControlDisplay rcd);
- /**
- * Update the size of the artwork used by an IRemoteControlDisplay.
- * @param rcd the IRemoteControlDisplay with the new artwork size requirement
- * @param w the maximum width of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- * @param h the maximum height of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- */
- oneway void remoteControlDisplayUsesBitmapSize(in IRemoteControlDisplay rcd, int w, int h);
- /**
- * Controls whether a remote control display needs periodic checks of the RemoteControlClient
- * playback position to verify that the estimated position has not drifted from the actual
- * position. By default the check is not performed.
- * The IRemoteControlDisplay must have been previously registered for this to have any effect.
- * @param rcd the IRemoteControlDisplay for which the anti-drift mechanism will be enabled
- * or disabled. Not null.
- * @param wantsSync if true, RemoteControlClient instances which expose their playback position
- * to the framework will regularly compare the estimated playback position with the actual
- * position, and will update the IRemoteControlDisplay implementation whenever a drift is
- * detected.
- */
- oneway void remoteControlDisplayWantsPlaybackPositionSync(in IRemoteControlDisplay rcd,
- boolean wantsSync);
-
void startBluetoothSco(IBinder cb, int targetSdkVersion);
void startBluetoothScoVirtualCall(IBinder cb);
void stopBluetoothSco(IBinder cb);
diff --git a/media/java/android/media/IRemoteControlClient.aidl b/media/java/android/media/IRemoteControlClient.aidl
deleted file mode 100644
index aa142d6..0000000
--- a/media/java/android/media/IRemoteControlClient.aidl
+++ /dev/null
@@ -1,62 +0,0 @@
-/* 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.media;
-
-import android.graphics.Bitmap;
-import android.media.IRemoteControlDisplay;
-import android.media.Rating;
-
-/**
- * @hide
- * Interface registered by AudioManager to notify a source of remote control information
- * that information is requested to be displayed on the remote control (through
- * IRemoteControlDisplay).
- * {@see AudioManager#registerRemoteControlClient(RemoteControlClient)}.
- */
-oneway interface IRemoteControlClient
-{
- /**
- * Notifies a remote control client that information for the given generation ID is
- * requested. If the flags contains
- * {@link RemoteControlClient#FLAG_INFORMATION_REQUESTED_ALBUM_ART} then the width and height
- * parameters are valid.
- * @param generationId
- * @param infoFlags
- * FIXME: is infoFlags required? since the RCC pushes info, this might always be called
- * with RC_INFO_ALL
- */
- void onInformationRequested(int generationId, int infoFlags);
-
- /**
- * Notifies a remote control client that information for the given generation ID is
- * requested for the given IRemoteControlDisplay alone.
- * @param rcd the display to which current info should be sent
- */
- void informationRequestForDisplay(IRemoteControlDisplay rcd, int w, int h);
-
- /**
- * Sets the generation counter of the current client that is displayed on the remote control.
- */
- void setCurrentClientGenerationId(int clientGeneration);
-
- void plugRemoteControlDisplay(IRemoteControlDisplay rcd, int w, int h);
- void unplugRemoteControlDisplay(IRemoteControlDisplay rcd);
- void setBitmapSizeForDisplay(IRemoteControlDisplay rcd, int w, int h);
- void setWantsSyncForDisplay(IRemoteControlDisplay rcd, boolean wantsSync);
- void enableRemoteControlDisplay(IRemoteControlDisplay rcd, boolean enabled);
- void seekTo(int clientGeneration, long timeMs);
- void updateMetadata(int clientGeneration, int key, in Rating value);
-}
\ No newline at end of file
diff --git a/media/java/android/media/IRemoteControlDisplay.aidl b/media/java/android/media/IRemoteControlDisplay.aidl
deleted file mode 100644
index 1609030..0000000
--- a/media/java/android/media/IRemoteControlDisplay.aidl
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.media;
-
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-
-/**
- * @hide
- * Interface registered through AudioManager of an object that displays information
- * received from a remote control client.
- * {@see AudioManager#registerRemoteControlDisplay(IRemoteControlDisplay)}.
- */
-oneway interface IRemoteControlDisplay
-{
- /**
- * Sets the generation counter of the current client that is displayed on the remote control.
- * @param clientGeneration the new RemoteControlClient generation
- * @param clientMediaIntent the PendingIntent associated with the client.
- * May be null, which implies there is no registered media button event receiver.
- * @param clearing true if the new client generation value maps to a remote control update
- * where the display should be cleared.
- */
- void setCurrentClientId(int clientGeneration, in PendingIntent clientMediaIntent,
- boolean clearing);
-
- /**
- * Sets whether the controls of this display are enabled
- * @param if false, the display shouldn't any commands
- */
- void setEnabled(boolean enabled);
-
- /**
- * Sets the playback information (state, position and speed) of a client.
- * @param generationId the current generation ID as known by this client
- * @param state the current playback state, one of the following values:
- * {@link RemoteControlClient#PLAYSTATE_STOPPED},
- * {@link RemoteControlClient#PLAYSTATE_PAUSED},
- * {@link RemoteControlClient#PLAYSTATE_PLAYING},
- * {@link RemoteControlClient#PLAYSTATE_FAST_FORWARDING},
- * {@link RemoteControlClient#PLAYSTATE_REWINDING},
- * {@link RemoteControlClient#PLAYSTATE_SKIPPING_FORWARDS},
- * {@link RemoteControlClient#PLAYSTATE_SKIPPING_BACKWARDS},
- * {@link RemoteControlClient#PLAYSTATE_BUFFERING},
- * {@link RemoteControlClient#PLAYSTATE_ERROR}.
- * @param stateChangeTimeMs the time at which the client reported the playback information
- * @param currentPosMs a 0 or positive value for the current media position expressed in ms
- * Strictly negative values imply that position is not known:
- * a value of {@link RemoteControlClient#PLAYBACK_POSITION_INVALID} is intended to express
- * that an application doesn't know the position (e.g. listening to a live stream of a radio)
- * or that the position information is not applicable (e.g. when state
- * is {@link RemoteControlClient#PLAYSTATE_BUFFERING} and nothing had played yet);
- * a value of {@link RemoteControlClient#PLAYBACK_POSITION_ALWAYS_UNKNOWN} implies that the
- * application uses {@link RemoteControlClient#setPlaybackState(int)} (legacy API) and will
- * never pass a playback position.
- * @param speed a value expressed as a ratio of 1x playback: 1.0f is normal playback,
- * 2.0f is 2x, 0.5f is half-speed, -2.0f is rewind at 2x speed. 0.0f means nothing is
- * playing (e.g. when state is {@link RemoteControlClient#PLAYSTATE_ERROR}).
- */
- void setPlaybackState(int generationId, int state, long stateChangeTimeMs, long currentPosMs,
- float speed);
-
- /**
- * Sets the transport control flags and playback position capabilities of a client.
- * @param generationId the current generation ID as known by this client
- * @param transportControlFlags bitmask of the transport controls this client supports, see
- * {@link RemoteControlClient#setTransportControlFlags(int)}
- * @param posCapabilities a bit mask for playback position capabilities, see
- * {@link RemoteControlClient#MEDIA_POSITION_READABLE} and
- * {@link RemoteControlClient#MEDIA_POSITION_WRITABLE}
- */
- void setTransportControlInfo(int generationId, int transportControlFlags, int posCapabilities);
-
- void setMetadata(int generationId, in Bundle metadata);
-
- void setArtwork(int generationId, in Bitmap artwork);
-
- /**
- * To combine metadata text and artwork in one binder call
- */
- void setAllMetadata(int generationId, in Bundle metadata, in Bitmap artwork);
-}
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 1c2c940..f5b7a2e 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -36,6 +36,7 @@
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.SystemProperties;
import android.provider.Settings;
import android.system.ErrnoException;
import android.system.OsConstants;
@@ -1260,6 +1261,13 @@
*/
public void setWakeMode(Context context, int mode) {
boolean washeld = false;
+
+ /* Disable persistant wakelocks in media player based on property */
+ if (SystemProperties.getBoolean("audio.offload.ignore_setawake", false) == true) {
+ Log.w(TAG, "IGNORING setWakeMode " + mode);
+ return;
+ }
+
if (mWakeLock != null) {
if (mWakeLock.isHeld()) {
washeld = true;
diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index c9a86d8..6d32eff 100644
--- a/media/java/android/media/RemoteControlClient.java
+++ b/media/java/android/media/RemoteControlClient.java
@@ -349,16 +349,6 @@
*/
public RemoteControlClient(PendingIntent mediaButtonIntent) {
mRcMediaIntent = mediaButtonIntent;
-
- Looper looper;
- if ((looper = Looper.myLooper()) != null) {
- mEventHandler = new EventHandler(this, looper);
- } else if ((looper = Looper.getMainLooper()) != null) {
- mEventHandler = new EventHandler(this, looper);
- } else {
- mEventHandler = null;
- Log.e(TAG, "RemoteControlClient() couldn't find main application thread");
- }
}
/**
@@ -378,8 +368,6 @@
*/
public RemoteControlClient(PendingIntent mediaButtonIntent, Looper looper) {
mRcMediaIntent = mediaButtonIntent;
-
- mEventHandler = new EventHandler(this, looper);
}
/**
@@ -707,39 +695,6 @@
}
}
- // TODO investigate if we still need position drift checking
- private void onPositionDriftCheck() {
- if (DEBUG) { Log.d(TAG, "onPositionDriftCheck()"); }
- synchronized(mCacheLock) {
- if ((mEventHandler == null) || (mPositionProvider == null) || !mNeedsPositionSync) {
- return;
- }
- if ((mPlaybackPositionMs < 0) || (mPlaybackSpeed == 0.0f)) {
- if (DEBUG) { Log.d(TAG, " no valid position or 0 speed, no check needed"); }
- return;
- }
- long estPos = mPlaybackPositionMs + (long)
- ((SystemClock.elapsedRealtime() - mPlaybackStateChangeTimeMs) / mPlaybackSpeed);
- long actPos = mPositionProvider.onGetPlaybackPosition();
- if (actPos >= 0) {
- if (Math.abs(estPos - actPos) > POSITION_DRIFT_MAX_MS) {
- // drift happened, report the new position
- if (DEBUG) { Log.w(TAG, " drift detected: actual=" +actPos +" est=" +estPos); }
- setPlaybackState(mPlaybackState, actPos, mPlaybackSpeed);
- } else {
- if (DEBUG) { Log.d(TAG, " no drift: actual=" + actPos +" est=" + estPos); }
- // no drift, schedule the next drift check
- mEventHandler.sendMessageDelayed(
- mEventHandler.obtainMessage(MSG_POSITION_DRIFT_CHECK),
- getCheckPeriodFromSpeed(mPlaybackSpeed));
- }
- } else {
- // invalid position (negative value), can't check for drift
- mEventHandler.removeMessages(MSG_POSITION_DRIFT_CHECK);
- }
- }
- }
-
/**
* Sets the flags for the media transport control buttons that this client supports.
* @param transportControlFlags A combination of the following flags:
@@ -856,14 +811,6 @@
public void setOnGetPlaybackPositionListener(OnGetPlaybackPositionListener l) {
synchronized(mCacheLock) {
mPositionProvider = l;
- if ((mPositionProvider != null) && (mEventHandler != null)
- && playbackPositionShouldMove(mPlaybackState)) {
- // playback position is already moving, but now we have a position provider,
- // so schedule a drift check right now
- mEventHandler.sendMessageDelayed(
- mEventHandler.obtainMessage(MSG_POSITION_DRIFT_CHECK),
- 0 /*check now*/);
- }
}
}
@@ -1001,26 +948,6 @@
}
};
- private EventHandler mEventHandler;
- private final static int MSG_POSITION_DRIFT_CHECK = 11;
-
- private class EventHandler extends Handler {
- public EventHandler(RemoteControlClient rcc, Looper looper) {
- super(looper);
- }
-
- @Override
- public void handleMessage(Message msg) {
- switch(msg.what) {
- case MSG_POSITION_DRIFT_CHECK:
- onPositionDriftCheck();
- break;
- default:
- Log.e(TAG, "Unknown event " + msg.what + " in RemoteControlClient handler");
- }
- }
- }
-
//===========================================================
// Message handlers
diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java
index d84cf30..90f2163 100644
--- a/media/java/android/media/RemoteController.java
+++ b/media/java/android/media/RemoteController.java
@@ -17,8 +17,6 @@
package android.media;
import android.app.ActivityManager;
-import android.app.PendingIntent;
-import android.app.PendingIntent.CanceledException;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +30,6 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
-import android.os.SystemClock;
import android.os.UserHandle;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -61,15 +58,10 @@
@Deprecated public final class RemoteController
{
private final static int MAX_BITMAP_DIMENSION = 512;
- private final static int TRANSPORT_UNKNOWN = 0;
private final static String TAG = "RemoteController";
private final static boolean DEBUG = false;
- private final static boolean USE_SESSIONS = true;
- private final static Object mGenLock = new Object();
private final static Object mInfoLock = new Object();
- private final RcDisplay mRcd;
private final Context mContext;
- private final AudioManager mAudioManager;
private final int mMaxBitmapDimension;
private MetadataEditor mMetadataEditor;
@@ -78,15 +70,9 @@
private MediaController.Callback mSessionCb = new MediaControllerCallback();
/**
- * Synchronized on mGenLock
- */
- private int mClientGenerationIdCurrent = 0;
-
- /**
* Synchronized on mInfoLock
*/
private boolean mIsRegistered = false;
- private PendingIntent mClientPendingIntentCurrent;
private OnClientUpdateListener mOnClientUpdateListener;
private PlaybackInfo mLastPlaybackInfo;
private int mArtworkWidth = -1;
@@ -136,8 +122,6 @@
}
mOnClientUpdateListener = updateListener;
mContext = context;
- mRcd = new RcDisplay(this);
- mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mSessionManager = (MediaSessionManager) context
.getSystemService(Context.MEDIA_SESSION_SERVICE);
mSessionListener = new TopTransportSessionListener();
@@ -207,22 +191,6 @@
public void onClientMetadataUpdate(MetadataEditor metadataEditor);
};
-
- /**
- * @hide
- */
- public String getRemoteControlClientPackageName() {
- if (USE_SESSIONS) {
- synchronized (mInfoLock) {
- return mCurrentSession != null ? mCurrentSession.getPackageName()
- : null;
- }
- } else {
- return mClientPendingIntentCurrent != null ?
- mClientPendingIntentCurrent.getCreatorPackage() : null;
- }
- }
-
/**
* Return the estimated playback position of the current media track or a negative value
* if not available.
@@ -240,38 +208,13 @@
* @see OnClientUpdateListener#onClientPlaybackStateUpdate(int, long, long, float)
*/
public long getEstimatedMediaPosition() {
- if (USE_SESSIONS) {
- synchronized (mInfoLock) {
- if (mCurrentSession != null) {
- PlaybackState state = mCurrentSession.getPlaybackState();
- if (state != null) {
- return state.getPosition();
- }
+ synchronized (mInfoLock) {
+ if (mCurrentSession != null) {
+ PlaybackState state = mCurrentSession.getPlaybackState();
+ if (state != null) {
+ return state.getPosition();
}
}
- } else {
- final PlaybackInfo lastPlaybackInfo;
- synchronized (mInfoLock) {
- lastPlaybackInfo = mLastPlaybackInfo;
- }
- if (lastPlaybackInfo != null) {
- if (!RemoteControlClient.playbackPositionShouldMove(lastPlaybackInfo.mState)) {
- return lastPlaybackInfo.mCurrentPosMs;
- }
-
- // Take the current position at the time of state change and
- // estimate.
- final long thenPos = lastPlaybackInfo.mCurrentPosMs;
- if (thenPos < 0) {
- return -1;
- }
-
- final long now = SystemClock.elapsedRealtime();
- final long then = lastPlaybackInfo.mStateChangeTimeMs;
- final long sinceThen = now - then;
- final long scaledSinceThen = (long) (sinceThen * lastPlaybackInfo.mSpeed);
- return thenPos + scaledSinceThen;
- }
}
return -1;
}
@@ -308,42 +251,12 @@
if (!KeyEvent.isMediaKey(keyEvent.getKeyCode())) {
throw new IllegalArgumentException("not a media key event");
}
- if (USE_SESSIONS) {
- synchronized (mInfoLock) {
- if (mCurrentSession != null) {
- return mCurrentSession.dispatchMediaButtonEvent(keyEvent);
- }
- return false;
+ synchronized (mInfoLock) {
+ if (mCurrentSession != null) {
+ return mCurrentSession.dispatchMediaButtonEvent(keyEvent);
}
- } else {
- final PendingIntent pi;
- synchronized (mInfoLock) {
- if (!mIsRegistered) {
- Log.e(TAG,
- "Cannot use sendMediaKeyEvent() from an unregistered RemoteController");
- return false;
- }
- if (!mEnabled) {
- Log.e(TAG, "Cannot use sendMediaKeyEvent() from a disabled RemoteController");
- return false;
- }
- pi = mClientPendingIntentCurrent;
- }
- if (pi != null) {
- Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON);
- intent.putExtra(Intent.EXTRA_KEY_EVENT, keyEvent);
- try {
- pi.send(mContext, 0, intent);
- } catch (CanceledException e) {
- Log.e(TAG, "Error sending intent for media button down: ", e);
- return false;
- }
- } else {
- Log.i(TAG, "No-op when sending key click, no receiver right now");
- return false;
- }
+ return false;
}
- return true;
}
@@ -453,8 +366,7 @@
Log.e(TAG, "Cannot set synchronization mode on an unregistered RemoteController");
return false;
}
- mAudioManager.remoteControlDisplayWantsPlaybackPositionSync(mRcd,
- POSITION_SYNCHRONIZATION_CHECK == sync);
+ // deprecated, no-op
return true;
}
@@ -541,154 +453,6 @@
}
-
- //==================================================
- // Implementation of IRemoteControlDisplay interface
- private static class RcDisplay extends IRemoteControlDisplay.Stub {
- private final WeakReference<RemoteController> mController;
-
- RcDisplay(RemoteController rc) {
- mController = new WeakReference<RemoteController>(rc);
- }
-
- public void setCurrentClientId(int genId, PendingIntent clientMediaIntent,
- boolean clearing) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- boolean isNew = false;
- synchronized(mGenLock) {
- if (rc.mClientGenerationIdCurrent != genId) {
- rc.mClientGenerationIdCurrent = genId;
- isNew = true;
- }
- }
- if (clientMediaIntent != null) {
- sendMsg(rc.mEventHandler, MSG_NEW_PENDING_INTENT, SENDMSG_REPLACE,
- genId /*arg1*/, 0, clientMediaIntent /*obj*/, 0 /*delay*/);
- }
- if (isNew || clearing) {
- sendMsg(rc.mEventHandler, MSG_CLIENT_CHANGE, SENDMSG_REPLACE,
- genId /*arg1*/, clearing ? 1 : 0, null /*obj*/, 0 /*delay*/);
- }
- }
-
- public void setEnabled(boolean enabled) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- sendMsg(rc.mEventHandler, MSG_DISPLAY_ENABLE, SENDMSG_REPLACE,
- enabled ? 1 : 0 /*arg1*/, 0, null /*obj*/, 0 /*delay*/);
- }
-
- public void setPlaybackState(int genId, int state,
- long stateChangeTimeMs, long currentPosMs, float speed) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- if (DEBUG) {
- Log.d(TAG, "> new playback state: genId="+genId
- + " state="+ state
- + " changeTime="+ stateChangeTimeMs
- + " pos=" + currentPosMs
- + "ms speed=" + speed);
- }
-
- synchronized(mGenLock) {
- if (rc.mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- final PlaybackInfo playbackInfo =
- new PlaybackInfo(state, stateChangeTimeMs, currentPosMs, speed);
- sendMsg(rc.mEventHandler, MSG_NEW_PLAYBACK_INFO, SENDMSG_REPLACE,
- genId /*arg1*/, 0, playbackInfo /*obj*/, 0 /*delay*/);
-
- }
-
- public void setTransportControlInfo(int genId, int transportControlFlags,
- int posCapabilities) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- synchronized(mGenLock) {
- if (rc.mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- sendMsg(rc.mEventHandler, MSG_NEW_TRANSPORT_INFO, SENDMSG_REPLACE,
- genId /*arg1*/, transportControlFlags /*arg2*/,
- null /*obj*/, 0 /*delay*/);
- }
-
- public void setMetadata(int genId, Bundle metadata) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- if (DEBUG) { Log.e(TAG, "setMetadata("+genId+")"); }
- if (metadata == null) {
- return;
- }
- synchronized(mGenLock) {
- if (rc.mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- sendMsg(rc.mEventHandler, MSG_NEW_METADATA, SENDMSG_QUEUE,
- genId /*arg1*/, 0 /*arg2*/,
- metadata /*obj*/, 0 /*delay*/);
- }
-
- public void setArtwork(int genId, Bitmap artwork) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- if (DEBUG) { Log.v(TAG, "setArtwork("+genId+")"); }
- synchronized(mGenLock) {
- if (rc.mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- Bundle metadata = new Bundle(1);
- metadata.putParcelable(String.valueOf(MediaMetadataEditor.BITMAP_KEY_ARTWORK), artwork);
- sendMsg(rc.mEventHandler, MSG_NEW_METADATA, SENDMSG_QUEUE,
- genId /*arg1*/, 0 /*arg2*/,
- metadata /*obj*/, 0 /*delay*/);
- }
-
- public void setAllMetadata(int genId, Bundle metadata, Bitmap artwork) {
- final RemoteController rc = mController.get();
- if (rc == null) {
- return;
- }
- if (DEBUG) { Log.e(TAG, "setAllMetadata("+genId+")"); }
- if ((metadata == null) && (artwork == null)) {
- return;
- }
- synchronized(mGenLock) {
- if (rc.mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- if (metadata == null) {
- metadata = new Bundle(1);
- }
- if (artwork != null) {
- metadata.putParcelable(String.valueOf(MediaMetadataEditor.BITMAP_KEY_ARTWORK),
- artwork);
- }
- sendMsg(rc.mEventHandler, MSG_NEW_METADATA, SENDMSG_QUEUE,
- genId /*arg1*/, 0 /*arg2*/,
- metadata /*obj*/, 0 /*delay*/);
- }
- }
-
/**
* This receives updates when the current session changes. This is
* registered to receive the updates on the handler thread so it can call
@@ -734,14 +498,9 @@
//==================================================
// Event handling
private final EventHandler mEventHandler;
- private final static int MSG_NEW_PENDING_INTENT = 0;
- private final static int MSG_NEW_PLAYBACK_INFO = 1;
- private final static int MSG_NEW_TRANSPORT_INFO = 2;
- private final static int MSG_NEW_METADATA = 3; // msg always has non-null obj parameter
- private final static int MSG_CLIENT_CHANGE = 4;
- private final static int MSG_DISPLAY_ENABLE = 5;
- private final static int MSG_NEW_PLAYBACK_STATE = 6;
- private final static int MSG_NEW_MEDIA_METADATA = 7;
+ private final static int MSG_CLIENT_CHANGE = 0;
+ private final static int MSG_NEW_PLAYBACK_STATE = 1;
+ private final static int MSG_NEW_MEDIA_METADATA = 2;
private class EventHandler extends Handler {
@@ -752,26 +511,10 @@
@Override
public void handleMessage(Message msg) {
switch(msg.what) {
- case MSG_NEW_PENDING_INTENT:
- onNewPendingIntent(msg.arg1, (PendingIntent) msg.obj);
- break;
- case MSG_NEW_PLAYBACK_INFO:
- onNewPlaybackInfo(msg.arg1, (PlaybackInfo) msg.obj);
- break;
- case MSG_NEW_TRANSPORT_INFO:
- onNewTransportInfo(msg.arg1, msg.arg2);
- break;
- case MSG_NEW_METADATA:
- onNewMetadata(msg.arg1, (Bundle)msg.obj);
- break;
case MSG_CLIENT_CHANGE:
- onClientChange(msg.arg1, msg.arg2 == 1);
- break;
- case MSG_DISPLAY_ENABLE:
- onDisplayEnable(msg.arg1 == 1);
+ onClientChange(msg.arg2 == 1);
break;
case MSG_NEW_PLAYBACK_STATE:
- // same as new playback info but using new apis
onNewPlaybackState((PlaybackState) msg.obj);
break;
case MSG_NEW_MEDIA_METADATA:
@@ -835,100 +578,7 @@
handler.sendMessageDelayed(handler.obtainMessage(msg, arg1, arg2, obj), delayMs);
}
- ///////////// These calls are used by the old APIs with RCC and RCD //////////////////////
- private void onNewPendingIntent(int genId, PendingIntent pi) {
- synchronized(mGenLock) {
- if (mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- synchronized(mInfoLock) {
- mClientPendingIntentCurrent = pi;
- }
- }
-
- private void onNewPlaybackInfo(int genId, PlaybackInfo pi) {
- synchronized(mGenLock) {
- if (mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- final OnClientUpdateListener l;
- synchronized(mInfoLock) {
- l = this.mOnClientUpdateListener;
- mLastPlaybackInfo = pi;
- }
- if (l != null) {
- if (pi.mCurrentPosMs == RemoteControlClient.PLAYBACK_POSITION_ALWAYS_UNKNOWN) {
- l.onClientPlaybackStateUpdate(pi.mState);
- } else {
- l.onClientPlaybackStateUpdate(pi.mState, pi.mStateChangeTimeMs, pi.mCurrentPosMs,
- pi.mSpeed);
- }
- }
- }
-
- private void onNewTransportInfo(int genId, int transportControlFlags) {
- synchronized(mGenLock) {
- if (mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- final OnClientUpdateListener l;
- synchronized(mInfoLock) {
- l = mOnClientUpdateListener;
- }
- if (l != null) {
- l.onClientTransportControlUpdate(transportControlFlags);
- }
- }
-
- /**
- * @param genId
- * @param metadata guaranteed to be always non-null
- */
- private void onNewMetadata(int genId, Bundle metadata) {
- synchronized(mGenLock) {
- if (mClientGenerationIdCurrent != genId) {
- return;
- }
- }
- final OnClientUpdateListener l;
- final MetadataEditor metadataEditor;
- // prepare the received Bundle to be used inside a MetadataEditor
- final long editableKeys = metadata.getLong(
- String.valueOf(MediaMetadataEditor.KEY_EDITABLE_MASK), 0);
- if (editableKeys != 0) {
- metadata.remove(String.valueOf(MediaMetadataEditor.KEY_EDITABLE_MASK));
- }
- synchronized(mInfoLock) {
- l = mOnClientUpdateListener;
- if ((mMetadataEditor != null) && (mMetadataEditor.mEditorMetadata != null)) {
- if (mMetadataEditor.mEditorMetadata != metadata) {
- // existing metadata, merge existing and new
- mMetadataEditor.mEditorMetadata.putAll(metadata);
- }
-
- mMetadataEditor.putBitmap(MediaMetadataEditor.BITMAP_KEY_ARTWORK,
- (Bitmap)metadata.getParcelable(
- String.valueOf(MediaMetadataEditor.BITMAP_KEY_ARTWORK)));
- mMetadataEditor.cleanupBitmapFromBundle(MediaMetadataEditor.BITMAP_KEY_ARTWORK);
- } else {
- mMetadataEditor = new MetadataEditor(metadata, editableKeys);
- }
- metadataEditor = mMetadataEditor;
- }
- if (l != null) {
- l.onClientMetadataUpdate(metadataEditor);
- }
- }
-
- private void onClientChange(int genId, boolean clearing) {
- synchronized(mGenLock) {
- if (mClientGenerationIdCurrent != genId) {
- return;
- }
- }
+ private void onClientChange(boolean clearing) {
final OnClientUpdateListener l;
synchronized(mInfoLock) {
l = mOnClientUpdateListener;
@@ -939,39 +589,6 @@
}
}
- private void onDisplayEnable(boolean enabled) {
- final OnClientUpdateListener l;
- synchronized(mInfoLock) {
- mEnabled = enabled;
- l = this.mOnClientUpdateListener;
- }
- if (!enabled) {
- // when disabling, reset all info sent to the user
- final int genId;
- synchronized (mGenLock) {
- genId = mClientGenerationIdCurrent;
- }
- // send "stopped" state, happened "now", playback position is 0, speed 0.0f
- final PlaybackInfo pi = new PlaybackInfo(RemoteControlClient.PLAYSTATE_STOPPED,
- SystemClock.elapsedRealtime() /*stateChangeTimeMs*/,
- 0 /*currentPosMs*/, 0.0f /*speed*/);
- sendMsg(mEventHandler, MSG_NEW_PLAYBACK_INFO, SENDMSG_REPLACE,
- genId /*arg1*/, 0 /*arg2, ignored*/, pi /*obj*/, 0 /*delay*/);
- // send "blank" transport control info: no controls are supported
- sendMsg(mEventHandler, MSG_NEW_TRANSPORT_INFO, SENDMSG_REPLACE,
- genId /*arg1*/, 0 /*arg2, no flags*/,
- null /*obj, ignored*/, 0 /*delay*/);
- // send dummy metadata with empty string for title and artist, duration of 0
- Bundle metadata = new Bundle(3);
- metadata.putString(String.valueOf(MediaMetadataRetriever.METADATA_KEY_TITLE), "");
- metadata.putString(String.valueOf(MediaMetadataRetriever.METADATA_KEY_ARTIST), "");
- metadata.putLong(String.valueOf(MediaMetadataRetriever.METADATA_KEY_DURATION), 0);
- sendMsg(mEventHandler, MSG_NEW_METADATA, SENDMSG_QUEUE,
- genId /*arg1*/, 0 /*arg2, ignored*/, metadata /*obj*/, 0 /*delay*/);
- }
- }
-
- ///////////// These calls are used by the new APIs with Sessions //////////////////////
private void updateController(MediaController controller) {
if (DEBUG) {
Log.d(TAG, "Updating controller to " + controller + " previous controller is "
@@ -983,7 +600,7 @@
mCurrentSession.unregisterCallback(mSessionCb);
mCurrentSession = null;
sendMsg(mEventHandler, MSG_CLIENT_CHANGE, SENDMSG_REPLACE,
- 0 /* genId */, 1 /* clearing */, null /* obj */, 0 /* delay */);
+ 0 /* arg1 ignored */, 1 /* clearing */, null /* obj */, 0 /* delay */);
}
} else if (mCurrentSession == null
|| !controller.getSessionToken()
@@ -992,17 +609,17 @@
mCurrentSession.unregisterCallback(mSessionCb);
}
sendMsg(mEventHandler, MSG_CLIENT_CHANGE, SENDMSG_REPLACE,
- 0 /* genId */, 0 /* clearing */, null /* obj */, 0 /* delay */);
+ 0 /* arg1 ignored */, 0 /* clearing */, null /* obj */, 0 /* delay */);
mCurrentSession = controller;
mCurrentSession.registerCallback(mSessionCb, mEventHandler);
PlaybackState state = controller.getPlaybackState();
sendMsg(mEventHandler, MSG_NEW_PLAYBACK_STATE, SENDMSG_REPLACE,
- 0 /* genId */, 0, state /* obj */, 0 /* delay */);
+ 0 /* arg1 ignored */, 0 /* arg2 ignored */, state /* obj */, 0 /* delay */);
MediaMetadata metadata = controller.getMetadata();
sendMsg(mEventHandler, MSG_NEW_MEDIA_METADATA, SENDMSG_REPLACE,
- 0 /* arg1 */, 0 /* arg2 */, metadata /* obj */, 0 /* delay */);
+ 0 /* arg1 ignored */, 0 /* arg2 ignored*/, metadata /* obj */, 0 /*delay*/);
}
// else same controller, no need to update
}
@@ -1069,38 +686,6 @@
/**
* @hide
- * Used by AudioManager to mark this instance as registered.
- * @param registered
- */
- void setIsRegistered(boolean registered) {
- synchronized (mInfoLock) {
- mIsRegistered = registered;
- }
- }
-
- /**
- * @hide
- * Used by AudioManager to access binder to be registered/unregistered inside MediaFocusControl
- * @return
- */
- RcDisplay getRcDisplay() {
- return mRcd;
- }
-
- /**
- * @hide
- * Used by AudioManager to read the current artwork dimension
- * @return array containing width (index 0) and height (index 1) of currently set artwork size
- */
- int[] getArtworkSize() {
- synchronized (mInfoLock) {
- int[] size = { mArtworkWidth, mArtworkHeight };
- return size;
- }
- }
-
- /**
- * @hide
* Used by AudioManager to access user listener receiving the client update notifications
* @return
*/
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index 1355635..3164930 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -166,7 +166,7 @@
updateAppOpsPlayAudio();
// register a callback to monitor whether the OP_PLAY_AUDIO is still allowed
mAppOpsCallback = new IAppOpsCallback.Stub() {
- public void opChanged(int op, String packageName) {
+ public void opChanged(int op, int uid, String packageName) {
synchronized (mLock) {
if (op == AppOpsManager.OP_PLAY_AUDIO) {
updateAppOpsPlayAudio();
diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index e0a8026..be9fb47 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -44,7 +44,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference;
-import java.util.Collections;
import java.util.List;
/**
@@ -241,7 +240,7 @@
/**
* Gets the root id.
* <p>
- * Note that the root id may become invalid or change when when the
+ * Note that the root id may become invalid or change when the
* browser is disconnected.
* </p>
*
@@ -271,7 +270,7 @@
/**
* Gets the media session token associated with the media browser.
* <p>
- * Note that the session token may become invalid or change when when the
+ * Note that the session token may become invalid or change when the
* browser is disconnected.
* </p>
*
@@ -519,13 +518,10 @@
return;
}
- List<MediaItem> data = list.getList();
+ List<MediaItem> data = list == null ? null : list.getList();
if (DBG) {
Log.d(TAG, "onLoadChildren for " + mServiceComponent + " id=" + parentId);
}
- if (data == null) {
- data = Collections.emptyList();
- }
// Check that the subscription is still subscribed.
final Subscription subscription = mSubscriptions.get(parentId);
@@ -730,10 +726,9 @@
* Called when the list of children is loaded or updated.
*
* @param parentId The media id of the parent media item.
- * @param children The children which were loaded.
+ * @param children The children which were loaded, or null if the id is invalid.
*/
- public void onChildrenLoaded(@NonNull String parentId,
- @NonNull List<MediaItem> children) {
+ public void onChildrenLoaded(@NonNull String parentId, List<MediaItem> children) {
}
/**
diff --git a/media/java/android/media/tv/ITvInputSessionWrapper.java b/media/java/android/media/tv/ITvInputSessionWrapper.java
index 5ad1bce..f8c6f3f 100644
--- a/media/java/android/media/tv/ITvInputSessionWrapper.java
+++ b/media/java/android/media/tv/ITvInputSessionWrapper.java
@@ -87,7 +87,7 @@
return;
}
- long startTime = System.currentTimeMillis();
+ long startTime = System.nanoTime();
switch (msg.what) {
case DO_RELEASE: {
mTvInputSessionImpl.release();
@@ -185,18 +185,18 @@
break;
}
}
- long duration = System.currentTimeMillis() - startTime;
- if (duration > EXECUTE_MESSAGE_TIMEOUT_SHORT_MILLIS) {
+ long durationMs = (System.nanoTime() - startTime) / (1000 * 1000);
+ if (durationMs > EXECUTE_MESSAGE_TIMEOUT_SHORT_MILLIS) {
Log.w(TAG, "Handling message (" + msg.what + ") took too long time (duration="
- + duration + "ms)");
- if (msg.what == DO_TUNE && duration > EXECUTE_MESSAGE_TUNE_TIMEOUT_MILLIS) {
- throw new RuntimeException("Too much time to handle tune request. (" + duration
+ + durationMs + "ms)");
+ if (msg.what == DO_TUNE && durationMs > EXECUTE_MESSAGE_TUNE_TIMEOUT_MILLIS) {
+ throw new RuntimeException("Too much time to handle tune request. (" + durationMs
+ "ms > " + EXECUTE_MESSAGE_TUNE_TIMEOUT_MILLIS + "ms) "
+ "Consider handling the tune request in a separate thread.");
}
- if (duration > EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS) {
+ if (durationMs > EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS) {
throw new RuntimeException("Too much time to handle a request. (type=" + msg.what +
- ", " + duration + "ms > " + EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS + "ms).");
+ ", " + durationMs + "ms > " + EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS + "ms).");
}
}
}
diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java
index 043b80e..6197c70 100644
--- a/media/java/android/media/tv/TvContentRating.java
+++ b/media/java/android/media/tv/TvContentRating.java
@@ -931,9 +931,7 @@
*
* @param rating The {@link TvContentRating} to check.
* @return {@code true} if this object contains {@code rating}, {@code false} otherwise.
- * @hide
*/
- @SystemApi
public final boolean contains(@NonNull TvContentRating rating) {
Preconditions.checkNotNull(rating);
if (!rating.getMainRating().equals(mRating)) {
diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java
index 1bb99ff..f2c6a6c 100644
--- a/media/java/android/service/media/MediaBrowserService.java
+++ b/media/java/android/service/media/MediaBrowserService.java
@@ -469,10 +469,6 @@
= new Result<List<MediaBrowser.MediaItem>>(parentId) {
@Override
void onResultSent(List<MediaBrowser.MediaItem> list) {
- if (list == null) {
- throw new IllegalStateException("onLoadChildren sent null list for id "
- + parentId);
- }
if (mConnections.get(connection.callbacks.asBinder()) != connection) {
if (DBG) {
Log.d(TAG, "Not sending onLoadChildren result for connection that has"
@@ -481,7 +477,8 @@
return;
}
- final ParceledListSlice<MediaBrowser.MediaItem> pls = new ParceledListSlice(list);
+ final ParceledListSlice<MediaBrowser.MediaItem> pls =
+ list == null ? null : new ParceledListSlice(list);
try {
connection.callbacks.onLoadChildren(parentId, pls);
} catch (RemoteException ex) {
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index 090be88..70d651f 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -187,6 +187,17 @@
return mDecodeThread != NULL;
}
+sp<Sample> SoundPool::findSample(int sampleID)
+{
+ Mutex::Autolock lock(&mLock);
+ return findSample_l(sampleID);
+}
+
+sp<Sample> SoundPool::findSample_l(int sampleID)
+{
+ return mSamples.valueFor(sampleID);
+}
+
SoundChannel* SoundPool::findChannel(int channelID)
{
for (int i = 0; i < mMaxChannels; ++i) {
@@ -211,18 +222,21 @@
{
ALOGV("load: fd=%d, offset=%" PRId64 ", length=%" PRId64 ", priority=%d",
fd, offset, length, priority);
- Mutex::Autolock lock(&mLock);
- sp<Sample> sample = new Sample(++mNextSampleID, fd, offset, length);
- mSamples.add(sample->sampleID(), sample);
- doLoad(sample);
- return sample->sampleID();
-}
-
-void SoundPool::doLoad(sp<Sample>& sample)
-{
- ALOGV("doLoad: loading sample sampleID=%d", sample->sampleID());
- sample->startLoad();
- mDecodeThread->loadSample(sample->sampleID());
+ int sampleID;
+ {
+ Mutex::Autolock lock(&mLock);
+ sampleID = ++mNextSampleID;
+ sp<Sample> sample = new Sample(sampleID, fd, offset, length);
+ mSamples.add(sampleID, sample);
+ sample->startLoad();
+ }
+ // mDecodeThread->loadSample() must be called outside of mLock.
+ // mDecodeThread->loadSample() may block on mDecodeThread message queue space;
+ // the message queue emptying may block on SoundPool::findSample().
+ //
+ // It theoretically possible that sample loads might decode out-of-order.
+ mDecodeThread->loadSample(sampleID);
+ return sampleID;
}
bool SoundPool::unload(int sampleID)
@@ -237,7 +251,6 @@
{
ALOGV("play sampleID=%d, leftVolume=%f, rightVolume=%f, priority=%d, loop=%d, rate=%f",
sampleID, leftVolume, rightVolume, priority, loop, rate);
- sp<Sample> sample;
SoundChannel* channel;
int channelID;
@@ -247,7 +260,7 @@
return 0;
}
// is sample ready?
- sample = findSample(sampleID);
+ sp<Sample> sample(findSample_l(sampleID));
if ((sample == 0) || (sample->state() != Sample::READY)) {
ALOGW(" sample %d not READY", sampleID);
return 0;
diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h
index 4aacf53..98d2fa2 100644
--- a/media/jni/soundpool/SoundPool.h
+++ b/media/jni/soundpool/SoundPool.h
@@ -180,6 +180,7 @@
// called from SoundPoolThread
void sampleLoaded(int sampleID);
+ sp<Sample> findSample(int sampleID);
// called from AudioTrack thread
void done_l(SoundChannel* channel);
@@ -191,8 +192,7 @@
private:
SoundPool() {} // no default constructor
bool startThreads();
- void doLoad(sp<Sample>& sample);
- sp<Sample> findSample(int sampleID) { return mSamples.valueFor(sampleID); }
+ sp<Sample> findSample_l(int sampleID);
SoundChannel* findChannel (int channelID);
SoundChannel* findNextChannel (int channelID);
SoundChannel* allocateChannel_l(int priority, int sampleID);
diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml
index d45345e..60f5d60 100644
--- a/packages/DocumentsUI/AndroidManifest.xml
+++ b/packages/DocumentsUI/AndroidManifest.xml
@@ -39,7 +39,7 @@
</activity>
<activity
- android:name=".ManageRootActivity"
+ android:name=".DownloadsActivity"
android:theme="@style/DocumentsFullScreenTheme"
android:icon="@drawable/ic_doc_text">
<intent-filter>
@@ -71,7 +71,7 @@
<action android:name="android.intent.action.MAIN" />
</intent-filter>
<intent-filter>
- <action android:name="android.provider.action.BROWSE_DOCUMENT_ROOT" />
+ <action android:name="android.provider.action.BROWSE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="vnd.android.document/root" />
</intent-filter>
diff --git a/packages/DocumentsUI/res/drawable/ic_root_home.xml b/packages/DocumentsUI/res/drawable/ic_root_home.xml
new file mode 100644
index 0000000..0a258ac
--- /dev/null
+++ b/packages/DocumentsUI/res/drawable/ic_root_home.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20 6h-8l-2-2H4c-1.1 0-1.99 .9 -1.99 2L2 18c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V8c0-1.1-.9-2-2-2zm-5 3c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm4
+8h-8v-1c0-1.33 2.67-2 4-2s4 .67 4 2v1z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/packages/DocumentsUI/res/drawable/item_root_background.xml b/packages/DocumentsUI/res/drawable/item_root_background.xml
deleted file mode 100644
index c403159..0000000
--- a/packages/DocumentsUI/res/drawable/item_root_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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">
- <item android:state_focused="true" android:state_activated="true">
- <color android:color="@color/material_grey_300" />
- </item>
- <item android:state_focused="false" android:state_activated="true">
- <color android:color="@color/material_grey_300" />
- </item>
-</selector>
diff --git a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml
index 381e1c89..fe06eaf 100644
--- a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml
+++ b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml
@@ -17,7 +17,7 @@
<com.android.documentsui.ListItem xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_doc_list_background"
+ android:background="@color/item_doc_background"
android:orientation="horizontal"
android:focusable="true">
diff --git a/packages/DocumentsUI/res/layout/drawer_layout.xml b/packages/DocumentsUI/res/layout/drawer_layout.xml
index 0dac0d5..0146f14 100644
--- a/packages/DocumentsUI/res/layout/drawer_layout.xml
+++ b/packages/DocumentsUI/res/layout/drawer_layout.xml
@@ -61,7 +61,7 @@
android:layout_gravity="start"
android:orientation="vertical"
android:elevation="16dp"
- android:background="@*android:color/white">
+ android:background="@color/window_background">
<Toolbar
android:id="@+id/roots_toolbar"
diff --git a/packages/DocumentsUI/res/layout/fixed_layout.xml b/packages/DocumentsUI/res/layout/fixed_layout.xml
index 403c667..3135977 100644
--- a/packages/DocumentsUI/res/layout/fixed_layout.xml
+++ b/packages/DocumentsUI/res/layout/fixed_layout.xml
@@ -50,9 +50,7 @@
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal"
- android:baselineAligned="false"
- android:divider="?android:attr/dividerVertical"
- android:showDividers="middle">
+ android:baselineAligned="false">
<FrameLayout
android:id="@+id/container_roots"
@@ -62,8 +60,7 @@
<include layout="@layout/directory_cluster"
android:layout_width="0dp"
android:layout_weight="1"
- android:elevation="8dp"
- android:background="@color/material_grey_50" />
+ android:elevation="8dp" />
</LinearLayout>
diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml
index ada7f49..f9bbccb 100644
--- a/packages/DocumentsUI/res/layout/fragment_directory.xml
+++ b/packages/DocumentsUI/res/layout/fragment_directory.xml
@@ -17,7 +17,6 @@
<com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/material_grey_50"
android:orientation="vertical"
android:animateLayoutChanges="true">
@@ -78,8 +77,7 @@
android:paddingBottom="0dp"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"
- android:drawSelectorOnTop="true"
- android:background="@color/directory_background" />
+ android:drawSelectorOnTop="true" />
</FrameLayout>
diff --git a/packages/DocumentsUI/res/layout/item_doc_grid.xml b/packages/DocumentsUI/res/layout/item_doc_grid.xml
index 1dfb34a..dcd5cfd 100644
--- a/packages/DocumentsUI/res/layout/item_doc_grid.xml
+++ b/packages/DocumentsUI/res/layout/item_doc_grid.xml
@@ -18,101 +18,101 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/grid_item_margin"
- android:background="@color/item_doc_grid_background"
+ android:background="@color/item_doc_background"
android:focusable="true">
<!-- Main item thumbnail. Comprised of two overlapping images, the
visibility of which is controlled by code in
DirectoryFragment.java. -->
+
<FrameLayout
android:id="@+id/thumbnail"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="8dp">
-
+ android:layout_height="wrap_content">
+
<com.android.documentsui.GridItemThumbnail
android:id="@+id/icon_thumb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:contentDescription="@null" />
-
- <ImageView
+
+ <com.android.documentsui.GridItemThumbnail
android:id="@+id/icon_mime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerInside"
android:contentDescription="@null" />
-
+
</FrameLayout>
-
+
<!-- Item nameplate. Has a mime-type icon and some text fields (title,
size, mod-time, etc). -->
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/thumbnail"
- android:layout_toEndOf="@android:id/icon1"
- android:singleLine="true"
- android:ellipsize="middle"
- android:textAlignment="viewStart"
- android:paddingEnd="12dp"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="@*android:color/primary_text_default_material_light" />
- <TextView
- android:id="@+id/size"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/title"
- android:layout_toEndOf="@android:id/icon1"
- android:paddingEnd="4dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@*android:color/primary_text_default_material_light" />
-
- <TextView
- android:id="@+id/date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/title"
- android:layout_toEndOf="@id/size"
- android:paddingEnd="12dp"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- android:textColor="@*android:color/primary_text_default_material_light" />
-
- <ImageView
- android:id="@android:id/icon1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_below="@id/thumbnail"
- android:layout_alignParentLeft="true"
- android:layout_alignBottom="@id/size"
- android:layout_alignTop="@android:id/title"
- android:scaleType="centerInside"
- android:contentDescription="@null"
- android:paddingStart="12dp"
- android:paddingEnd="8dp"/>
-
- <!-- Use an explicit spacer so we can align things to it. -->
- <Space
- android:id="@+id/bottomPadding"
+ <RelativeLayout
+ android:id="@+id/nameplate"
android:layout_width="match_parent"
- android:layout_height="8dp"
- android:layout_below="@id/size" />
+ android:layout_height="wrap_content"
+ android:layout_below="@id/thumbnail"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
+ android:paddingLeft="12dp"
+ android:paddingRight="12dp">
+
+ <ImageView
+ android:id="@android:id/icon1"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="8dp"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:scaleType="centerInside"
+ android:contentDescription="@null"/>
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_toEndOf="@android:id/icon1"
+ android:singleLine="true"
+ android:ellipsize="middle"
+ android:textAlignment="viewStart"
+ android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+ android:textColor="@*android:color/primary_text_default_material_light" />
+
+ <TextView
+ android:id="@+id/size"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@android:id/icon1"
+ android:layout_below="@android:id/title"
+ android:layout_marginEnd="4dp"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textAlignment="viewStart"
+ android:textAppearance="@android:style/TextAppearance.Material.Caption"
+ android:textColor="@*android:color/primary_text_default_material_light" />
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_toEndOf="@id/size"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textAlignment="viewStart"
+ android:textAppearance="@android:style/TextAppearance.Material.Caption"
+ android:textColor="@*android:color/primary_text_default_material_light" />
+
+ </RelativeLayout>
<!-- An overlay that draws the item border when it is focused. -->
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignBottom="@id/bottomPadding"
+ android:layout_alignBottom="@id/nameplate"
android:layout_alignTop="@id/thumbnail"
android:layout_alignLeft="@id/thumbnail"
android:layout_alignRight="@id/thumbnail"
diff --git a/packages/DocumentsUI/res/layout/item_doc_list.xml b/packages/DocumentsUI/res/layout/item_doc_list.xml
index c409166..e068423 100644
--- a/packages/DocumentsUI/res/layout/item_doc_list.xml
+++ b/packages/DocumentsUI/res/layout/item_doc_list.xml
@@ -17,10 +17,10 @@
<com.android.documentsui.ListItem xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_doc_list_background"
+ android:background="@color/item_doc_background"
android:orientation="horizontal"
android:focusable="true">
-
+
<View
android:id="@+id/focus_indicator"
android:layout_width="4dp"
diff --git a/packages/DocumentsUI/res/layout/item_root.xml b/packages/DocumentsUI/res/layout/item_root.xml
index 90b1ff6..ff80d07 100644
--- a/packages/DocumentsUI/res/layout/item_root.xml
+++ b/packages/DocumentsUI/res/layout/item_root.xml
@@ -22,8 +22,7 @@
android:paddingEnd="@dimen/list_item_padding"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:baselineAligned="false"
- android:background="@drawable/item_root_background">
+ android:baselineAligned="false">
<FrameLayout
android:layout_width="@dimen/icon_size"
diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml
index 68c8b65..153c673 100644
--- a/packages/DocumentsUI/res/values/colors.xml
+++ b/packages/DocumentsUI/res/values/colors.xml
@@ -17,14 +17,20 @@
<resources>
<color name="material_grey_400">#ffbdbdbd</color>
+ <!-- This is the window background, but also the background for anything
+ else that needs to manually declare a background matching the "default"
+ app background (e.g. the drawer overlay). -->
+ <color name="window_background">#fff1f1f1</color>
+
<color name="primary_dark">@*android:color/primary_dark_material_dark</color>
<color name="primary">@*android:color/material_blue_grey_900</color>
<color name="accent">@*android:color/accent_material_light</color>
<color name="action_mode">@color/material_grey_400</color>
-
- <color name="directory_background">@*android:color/material_grey_300</color>
- <color name="item_doc_grid_background">@android:color/white</color>
- <color name="item_doc_grid_protect_background">@android:color/white</color>
+
<color name="band_select_background">#88ffffff</color>
<color name="band_select_border">#44000000</color>
+
+ <color name="item_doc_background">#fffafafa</color>
+ <color name="item_doc_background_selected">#ffe0f2f1</color>
+
</resources>
diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml
index 15d17cc..6712e2d 100644
--- a/packages/DocumentsUI/res/values/styles.xml
+++ b/packages/DocumentsUI/res/values/styles.xml
@@ -25,6 +25,7 @@
<item name="actionBarTheme">@style/ActionBarTheme</item>
<item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
+ <item name="android:windowBackground">@color/window_background</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>
@@ -44,6 +45,7 @@
<item name="actionBarTheme">@style/ActionBarTheme</item>
<item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
+ <item name="android:windowBackground">@color/window_background</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 0ee970d..abb08f5 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -260,8 +260,7 @@
} else if (id == R.id.menu_settings) {
final RootInfo root = getCurrentRoot();
final Intent intent = new Intent(DocumentsContract.ACTION_DOCUMENT_ROOT_SETTINGS);
- intent.setDataAndType(DocumentsContract.buildRootUri(root.authority, root.rootId),
- DocumentsContract.Root.MIME_TYPE_ITEM);
+ intent.setDataAndType(root.getUri(), DocumentsContract.Root.MIME_TYPE_ITEM);
startActivity(intent);
return true;
}
@@ -358,18 +357,6 @@
return mState;
}
- public static abstract class DocumentsIntent {
- /** Intent action name to open copy destination. */
- public static String ACTION_OPEN_COPY_DESTINATION =
- "com.android.documentsui.OPEN_COPY_DESTINATION";
-
- /**
- * Extra boolean flag for ACTION_OPEN_COPY_DESTINATION_STRING, which
- * specifies if the destination directory needs to create new directory or not.
- */
- public static String EXTRA_DIRECTORY_COPY = "com.android.documentsui.DIRECTORY_COPY";
- }
-
void setDisplayAdvancedDevices(boolean display) {
LocalPreferences.setDisplayAdvancedDevices(this, display);
mState.showAdvanced = mState.forceAdvanced | display;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
index 55a123f..b99c806 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java
@@ -39,13 +39,15 @@
import android.os.SystemClock;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
import android.support.design.widget.Snackbar;
import android.text.format.DateUtils;
import android.util.Log;
-import android.widget.Toast;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.DocumentStack;
+import com.android.documentsui.model.RootInfo;
import libcore.io.IoUtils;
@@ -72,6 +74,12 @@
// TODO: Move it to a shared file when more operations are implemented.
public static final int FAILURE_COPY = 1;
+ // Parameters of the copy job. Requests to an IntentService are serialized so this code only
+ // needs to deal with one job at a time.
+ // NOTE: This must be declared by concrete type as the concrete type
+ // is required by putParcelableArrayListExtra.
+ private final ArrayList<DocumentInfo> mFailedFiles = new ArrayList<>();
+
private PowerManager mPowerManager;
private NotificationManager mNotificationManager;
@@ -80,9 +88,6 @@
// Jobs are serialized but a job ID is used, to avoid mixing up cancellation requests.
private String mJobId;
private volatile boolean mIsCancelled;
- // Parameters of the copy job. Requests to an IntentService are serialized so this code only
- // needs to deal with one job at a time.
- private final ArrayList<DocumentInfo> mFailedFiles;
private long mBatchSize;
private long mBytesCopied;
private long mStartTime;
@@ -97,10 +102,11 @@
private ContentProviderClient mSrcClient;
private ContentProviderClient mDstClient;
+ // For testing only.
+ @Nullable private TestOnlyListener mJobFinishedListener;
+
public CopyService() {
super("CopyService");
-
- mFailedFiles = new ArrayList<DocumentInfo>();
}
/**
@@ -115,7 +121,11 @@
final Resources res = activity.getResources();
final Intent copyIntent = new Intent(activity, CopyService.class);
copyIntent.putParcelableArrayListExtra(
- EXTRA_SRC_LIST, new ArrayList<DocumentInfo>(srcDocs));
+ EXTRA_SRC_LIST,
+ // Don't create a copy unless absolutely necessary :)
+ srcDocs instanceof ArrayList
+ ? (ArrayList<DocumentInfo>) srcDocs
+ : new ArrayList<DocumentInfo>(srcDocs));
copyIntent.putExtra(Shared.EXTRA_STACK, (Parcelable) dstStack);
copyIntent.putExtra(EXTRA_TRANSFER_MODE, mode);
@@ -179,8 +189,7 @@
if (mFailedFiles.size() > 0) {
Log.e(TAG, mFailedFiles.size() + " files failed to copy");
final Context context = getApplicationContext();
- final Intent navigateIntent = new Intent(context, FilesActivity.class);
- navigateIntent.putExtra(Shared.EXTRA_STACK, (Parcelable) stack);
+ final Intent navigateIntent = buildNavigateIntent(context, stack);
navigateIntent.putExtra(EXTRA_FAILURE, FAILURE_COPY);
navigateIntent.putExtra(EXTRA_TRANSFER_MODE, transferMode);
navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, mFailedFiles);
@@ -199,6 +208,11 @@
.setAutoCancel(true);
mNotificationManager.notify(mJobId, 0, errorBuilder.build());
}
+
+ if (mJobFinishedListener != null) {
+ mJobFinishedListener.onFinished(mFailedFiles);
+ }
+
if (DEBUG) Log.d(TAG, "Done cleaning up");
}
}
@@ -228,8 +242,7 @@
mIsCancelled = false;
final Context context = getApplicationContext();
- final Intent navigateIntent = new Intent(context, FilesActivity.class);
- navigateIntent.putExtra(Shared.EXTRA_STACK, (Parcelable) stack);
+ final Intent navigateIntent = buildNavigateIntent(context, stack);
final String contentTitle = getString(copying ? R.string.copy_notification_title
: R.string.move_notification_title);
@@ -271,6 +284,26 @@
}
/**
+ * Sets a callback to be run when the next run job is finished.
+ * This is test ONLY instrumentation. The alternative is for us to add
+ * broadcast intents SOLELY for the purpose of testing.
+ * @param listener
+ */
+ @VisibleForTesting
+ void addFinishedListener(TestOnlyListener listener) {
+ this.mJobFinishedListener = listener;
+
+ }
+
+ /**
+ * Only used for testing. Is that obvious enough?
+ */
+ @VisibleForTesting
+ interface TestOnlyListener {
+ void onFinished(List<DocumentInfo> failed);
+ }
+
+ /**
* Calculates the cumulative size of all the documents in the list. Directories are recursed
* into and totaled up.
*
@@ -281,7 +314,7 @@
private long calculateFileSizes(List<DocumentInfo> srcs) throws RemoteException {
long result = 0;
for (DocumentInfo src : srcs) {
- if (Document.MIME_TYPE_DIR.equals(src.mimeType)) {
+ if (src.isDirectory()) {
// Directories need to be recursed into.
result += calculateFileSizesHelper(src.derivedUri);
} else {
@@ -414,8 +447,21 @@
*/
private void copy(DocumentInfo srcInfo, DocumentInfo dstDirInfo, int mode)
throws RemoteException {
- if (DEBUG) Log.d(TAG, "Copying " + srcInfo.displayName + " (" + srcInfo.derivedUri + ")" +
- " to " + dstDirInfo.displayName + " (" + dstDirInfo.derivedUri + ")");
+
+ String opDesc = mode == TRANSFER_MODE_COPY ? "copy" : "move";
+
+ // Guard unsupported recursive operation.
+ if (dstDirInfo.equals(srcInfo) || isDescendentOf(srcInfo, dstDirInfo)) {
+ if (DEBUG) Log.d(TAG,
+ "Skipping recursive " + opDesc + " of directory " + dstDirInfo.derivedUri);
+ mFailedFiles.add(srcInfo);
+ return;
+ }
+
+ if (DEBUG) Log.d(TAG,
+ "Performing " + opDesc + " of " + srcInfo.displayName
+ + " (" + srcInfo.derivedUri + ")" + " to " + dstDirInfo.displayName
+ + " (" + dstDirInfo.derivedUri + ")");
// When copying within the same provider, try to use optimized copying and moving.
// If not supported, then fallback to byte-by-byte copy/move.
@@ -452,7 +498,7 @@
return;
}
- if (Document.MIME_TYPE_DIR.equals(srcInfo.mimeType)) {
+ if (srcInfo.isDirectory()) {
copyDirectoryHelper(srcInfo.derivedUri, dstUri, mode);
} else {
copyFileHelper(srcInfo.derivedUri, dstUri, mode);
@@ -460,6 +506,17 @@
}
/**
+ * Returns true if {@code doc} is a descendant of {@code parentDoc}.
+ */
+ boolean isDescendentOf(DocumentInfo doc, DocumentInfo parentDoc) throws RemoteException {
+ if (parentDoc.isDirectory() && doc.authority.equals(parentDoc.authority)) {
+ return DocumentsContract.isChildDocument(
+ mDstClient, doc.derivedUri, parentDoc.derivedUri);
+ }
+ return false;
+ }
+
+ /**
* Handles recursion into a directory and copying its contents. Note that in linux terms, this
* does the equivalent of "cp src/* dst", not "cp -r src dst".
*
@@ -592,4 +649,14 @@
}
}
}
+
+ /**
+ * Creates an intent for navigating back to the destination directory.
+ */
+ private Intent buildNavigateIntent(Context context, DocumentStack stack) {
+ Intent intent = new Intent(context, FilesActivity.class);
+ intent.setAction(DocumentsContract.ACTION_BROWSE);
+ intent.putExtra(Shared.EXTRA_STACK, (Parcelable) stack);
+ return intent;
+ }
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
index c6425a6..f3c3f2f 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
@@ -32,6 +32,7 @@
import android.os.Bundle;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
+import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.util.Log;
import android.view.KeyEvent;
@@ -83,8 +84,10 @@
editText.setOnEditorActionListener(
new OnEditorActionListener() {
@Override
- public boolean onEditorAction(TextView view, int actionId, KeyEvent event) {
- if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
+ public boolean onEditorAction(
+ TextView view, int actionId, @Nullable KeyEvent event) {
+ if (event != null
+ && event.getKeyCode() == KeyEvent.KEYCODE_ENTER
&& event.hasNoModifiers()) {
createDirectory(editText.getText().toString());
dialog.dismiss();
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index 13c481c..4f4649c 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -19,7 +19,7 @@
import static com.android.documentsui.State.ACTION_CREATE;
import static com.android.documentsui.State.ACTION_GET_CONTENT;
import static com.android.documentsui.State.ACTION_OPEN;
-import static com.android.documentsui.State.ACTION_OPEN_COPY_DESTINATION;
+import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;
import static com.android.documentsui.State.ACTION_OPEN_TREE;
import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;
@@ -123,7 +123,7 @@
final String title = getIntent().getStringExtra(Intent.EXTRA_TITLE);
SaveFragment.show(getFragmentManager(), mimeType, title);
} else if (mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ mState.action == ACTION_PICK_COPY_DESTINATION) {
PickFragment.show(getFragmentManager());
}
@@ -135,7 +135,7 @@
} else if (mState.action == ACTION_OPEN ||
mState.action == ACTION_CREATE ||
mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ mState.action == ACTION_PICK_COPY_DESTINATION) {
RootsFragment.show(getFragmentManager(), null);
}
@@ -163,8 +163,8 @@
state.action = ACTION_GET_CONTENT;
} else if (Intent.ACTION_OPEN_DOCUMENT_TREE.equals(action)) {
state.action = ACTION_OPEN_TREE;
- } else if (DocumentsIntent.ACTION_OPEN_COPY_DESTINATION.equals(action)) {
- state.action = ACTION_OPEN_COPY_DESTINATION;
+ } else if (Shared.ACTION_PICK_COPY_DESTINATION.equals(action)) {
+ state.action = ACTION_PICK_COPY_DESTINATION;
}
if (state.action == ACTION_OPEN || state.action == ACTION_GET_CONTENT) {
@@ -172,9 +172,14 @@
Intent.EXTRA_ALLOW_MULTIPLE, false);
}
- if (state.action == ACTION_OPEN_COPY_DESTINATION) {
+ if (state.action == ACTION_OPEN || state.action == ACTION_GET_CONTENT
+ || state.action == ACTION_CREATE) {
+ state.openableOnly = intent.hasCategory(Intent.CATEGORY_OPENABLE);
+ }
+
+ if (state.action == ACTION_PICK_COPY_DESTINATION) {
state.directoryCopy = intent.getBooleanExtra(
- BaseActivity.DocumentsIntent.EXTRA_DIRECTORY_COPY, false);
+ Shared.EXTRA_DIRECTORY_COPY, false);
state.transferMode = intent.getIntExtra(CopyService.EXTRA_TRANSFER_MODE,
CopyService.TRANSFER_MODE_COPY);
}
@@ -257,7 +262,7 @@
mState.action == ACTION_OPEN_TREE) {
mRootsToolbar.setTitle(R.string.title_open);
} else if (mState.action == ACTION_CREATE ||
- mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ mState.action == ACTION_PICK_COPY_DESTINATION) {
mRootsToolbar.setTitle(R.string.title_save);
}
}
@@ -324,7 +329,7 @@
boolean recents = cwd == null;
boolean picking = mState.action == ACTION_CREATE
|| mState.action == ACTION_OPEN_TREE
- || mState.action == ACTION_OPEN_COPY_DESTINATION;
+ || mState.action == ACTION_PICK_COPY_DESTINATION;
createDir.setVisible(picking && !recents && cwd.isCreateSupported());
mSearchManager.showMenu(!picking);
@@ -361,7 +366,7 @@
// No directory means recents
if (mState.action == ACTION_CREATE ||
mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ mState.action == ACTION_PICK_COPY_DESTINATION) {
RecentsCreateFragment.show(fm);
} else {
DirectoryFragment.showRecentsOpen(fm, anim);
@@ -391,7 +396,7 @@
}
if (mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ mState.action == ACTION_PICK_COPY_DESTINATION) {
final PickFragment pick = PickFragment.get(fm);
if (pick != null) {
pick.setPickTarget(mState.action, mState.transferMode, cwd);
@@ -444,7 +449,7 @@
if (mState.action == ACTION_OPEN_TREE) {
result = DocumentsContract.buildTreeDocumentUri(
pickTarget.authority, pickTarget.documentId);
- } else if (mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ } else if (mState.action == ACTION_PICK_COPY_DESTINATION) {
result = pickTarget.derivedUri;
} else {
// Should not be reached.
@@ -461,7 +466,7 @@
final byte[] rawStack = DurableUtils.writeToArrayOrNull(mState.stack);
if (mState.action == ACTION_CREATE ||
mState.action == ACTION_OPEN_TREE ||
- mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ mState.action == ACTION_PICK_COPY_DESTINATION) {
// Remember stack for last create
values.clear();
values.put(RecentColumns.KEY, mState.stack.buildKey());
@@ -500,7 +505,7 @@
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
| Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
- } else if (mState.action == ACTION_OPEN_COPY_DESTINATION) {
+ } else if (mState.action == ACTION_PICK_COPY_DESTINATION) {
// Picking a copy destination is only used internally by us, so we
// don't need to extend permissions to the caller.
intent.putExtra(Shared.EXTRA_STACK, (Parcelable) mState.stack);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java
similarity index 95%
rename from packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java
rename to packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java
index 3045fa8..f224343 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java
@@ -50,8 +50,11 @@
import java.util.Arrays;
import java.util.List;
-public class ManageRootActivity extends BaseActivity {
- private static final String TAG = "ManageRootsActivity";
+// Let's face it. MANAGE_ROOT is used almost exclusively
+// for downloads, and is specialized for this purpose.
+// So it is now thusly christened.
+public class DownloadsActivity extends BaseActivity {
+ private static final String TAG = "DownloadsActivity";
private Toolbar mToolbar;
private Spinner mToolbarStack;
@@ -59,7 +62,7 @@
private ItemSelectedListener mStackListener;
private BaseAdapter mStackAdapter;
- public ManageRootActivity() {
+ public DownloadsActivity() {
super(R.layout.manage_roots_activity, TAG);
}
@@ -250,7 +253,7 @@
finish();
}
- public static ManageRootActivity get(Fragment fragment) {
- return (ManageRootActivity) fragment.getActivity();
+ public static DownloadsActivity get(Fragment fragment) {
+ return (DownloadsActivity) fragment.getActivity();
}
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java
index 120f610..23074f0 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java
@@ -37,7 +37,6 @@
implements DialogInterface.OnClickListener {
private static final String TAG = "FailureDialogFragment";
- private int mFailure;
private int mTransferMode;
private ArrayList<DocumentInfo> mFailedSrcList;
@@ -75,7 +74,6 @@
public Dialog onCreateDialog(Bundle inState) {
super.onCreate(inState);
- mFailure = getArguments().getInt(CopyService.EXTRA_FAILURE);
mTransferMode = getArguments().getInt(CopyService.EXTRA_TRANSFER_MODE);
mFailedSrcList = getArguments().getParcelableArrayList(CopyService.EXTRA_SRC_LIST);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java b/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java
index 48e28dc..bbf4682 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/PickFragment.java
@@ -110,7 +110,7 @@
mPick.setText(R.string.button_select);
mCancel.setVisibility(View.GONE);
break;
- case State.ACTION_OPEN_COPY_DESTINATION:
+ case State.ACTION_PICK_COPY_DESTINATION:
mPick.setText(R.string.button_copy);
mCancel.setVisibility(View.VISIBLE);
break;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
index 4fc3788..72ee6cbab 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
@@ -360,7 +360,7 @@
// Exclude read-only devices when creating
if (state.action == State.ACTION_CREATE && !supportsCreate) continue;
- if (state.action == State.ACTION_OPEN_COPY_DESTINATION && !supportsCreate) continue;
+ if (state.action == State.ACTION_PICK_COPY_DESTINATION && !supportsCreate) continue;
// Exclude roots that don't support directory picking
if (state.action == State.ACTION_OPEN_TREE && !supportsIsChild) continue;
// Exclude advanced devices when not requested
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
index beff196..4c844c4 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
@@ -297,7 +297,7 @@
for (final RootInfo root : roots) {
final RootItem item = new RootItem(root);
- if (root.isLibrary()) {
+ if (root.isLibrary() || root.isHome()) {
libraries.add(item);
} else {
others.add(item);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Shared.java b/packages/DocumentsUI/src/com/android/documentsui/Shared.java
index a4d6dc5..570c9bf 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/Shared.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/Shared.java
@@ -20,6 +20,16 @@
/** @hide */
public final class Shared {
+ /** Intent action name to pick a copy destination. */
+ public static final String ACTION_PICK_COPY_DESTINATION =
+ "com.android.documentsui.PICK_COPY_DESTINATION";
+
+ /**
+ * Extra boolean flag for {@link ACTION_PICK_COPY_DESTINATION}, which
+ * specifies if the destination directory needs to create new directory or not.
+ */
+ public static final String EXTRA_DIRECTORY_COPY = "com.android.documentsui.DIRECTORY_COPY";
+
public static final boolean DEBUG = true;
public static final String TAG = "Documents";
public static final String EXTRA_STACK = "com.android.documentsui.STACK";
diff --git a/packages/DocumentsUI/src/com/android/documentsui/State.java b/packages/DocumentsUI/src/com/android/documentsui/State.java
index 4306a0e..c81d4fb 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/State.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/State.java
@@ -52,6 +52,7 @@
public boolean stackTouched;
public boolean restored;
public boolean directoryCopy;
+ public boolean openableOnly;
/** Transfer mode for file copy/move operations. */
public int transferMode;
@@ -75,7 +76,7 @@
public static final int ACTION_OPEN_TREE = 4;
public static final int ACTION_MANAGE = 5;
public static final int ACTION_BROWSE = 6;
- public static final int ACTION_OPEN_COPY_DESTINATION = 8;
+ public static final int ACTION_PICK_COPY_DESTINATION = 8;
public static final int MODE_UNKNOWN = 0;
public static final int MODE_LIST = 1;
@@ -119,6 +120,7 @@
out.writeMap(dirState);
out.writeList(selectedDocumentsForCopy);
out.writeList(excludedAuthorities);
+ out.writeInt(openableOnly ? 1 : 0);
}
public static final Creator<State> CREATOR = new Creator<State>() {
@@ -142,6 +144,7 @@
in.readMap(state.dirState, null);
in.readList(state.selectedDocumentsForCopy, null);
in.readList(state.excludedAuthorities, null);
+ state.openableOnly = in.readInt() != 0;
return state;
}
@@ -150,4 +153,4 @@
return new State[size];
}
};
-}
\ No newline at end of file
+}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 21420c8..be3013b 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -111,8 +111,8 @@
import com.android.documentsui.State;
import com.android.documentsui.ThumbnailCache;
import com.android.documentsui.BaseActivity.DocumentContext;
-import com.android.documentsui.BaseActivity.DocumentsIntent;
import com.android.documentsui.ProviderExecutor.Preemptable;
+import com.android.documentsui.Shared;
import com.android.documentsui.RecentsProvider.StateColumns;
import com.android.documentsui.dirlist.MultiSelectManager.Callback;
import com.android.documentsui.dirlist.MultiSelectManager.Selection;
@@ -660,8 +660,7 @@
checkNotNull(cursor, "Cursor cannot be null.");
final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
- return mTuner.canSelectType(docMimeType)
- && mTuner.isDocumentEnabled(docMimeType, docFlags);
+ return mTuner.canSelectType(docMimeType, docFlags);
}
return true;
}
@@ -742,45 +741,45 @@
Selection selection = mSelectionManager.getSelection(new Selection());
- final int id = item.getItemId();
- if (id == R.id.menu_open) {
- openDocuments(selection);
- mode.finish();
- return true;
+ switch (item.getItemId()) {
+ case R.id.menu_open:
+ openDocuments(selection);
+ mode.finish();
+ return true;
- } else if (id == R.id.menu_share) {
- shareDocuments(selection);
- mode.finish();
- return true;
+ case R.id.menu_share:
+ shareDocuments(selection);
+ mode.finish();
+ return true;
- } else if (id == R.id.menu_delete) {
- // Exit selection mode first, so we avoid deselecting deleted documents.
- mode.finish();
- deleteDocuments(selection);
- return true;
+ case R.id.menu_delete:
+ // Exit selection mode first, so we avoid deselecting deleted documents.
+ mode.finish();
+ deleteDocuments(selection);
+ return true;
- } else if (id == R.id.menu_copy_to) {
- transferDocuments(selection, CopyService.TRANSFER_MODE_COPY);
- mode.finish();
- return true;
+ case R.id.menu_copy_to:
+ transferDocuments(selection, CopyService.TRANSFER_MODE_COPY);
+ mode.finish();
+ return true;
- } else if (id == R.id.menu_move_to) {
- // Exit selection mode first, so we avoid deselecting deleted documents.
- mode.finish();
- transferDocuments(selection, CopyService.TRANSFER_MODE_MOVE);
- return true;
+ case R.id.menu_move_to:
+ // Exit selection mode first, so we avoid deselecting deleted documents.
+ mode.finish();
+ transferDocuments(selection, CopyService.TRANSFER_MODE_MOVE);
+ return true;
- } else if (id == R.id.menu_copy_to_clipboard) {
- copySelectionToClipboard(selection);
- mode.finish();
- return true;
+ case R.id.menu_copy_to_clipboard:
+ copySelectionToClipboard(selection);
+ return true;
- } else if (id == R.id.menu_select_all) {
- selectAllFiles();
- return true;
+ case R.id.menu_select_all:
+ selectAllFiles();
+ return true;
- } else {
- return false;
+ default:
+ if (DEBUG) Log.d(TAG, "Unhandled menu item selected: " + item);
+ return false;
}
}
}
@@ -897,7 +896,7 @@
// Pop up a dialog to pick a destination. This is inadequate but works for now.
// TODO: Implement a picker that is to spec.
final Intent intent = new Intent(
- BaseActivity.DocumentsIntent.ACTION_OPEN_COPY_DESTINATION,
+ Shared.ACTION_PICK_COPY_DESTINATION,
Uri.EMPTY,
getActivity(),
DocumentsActivity.class);
@@ -914,7 +913,7 @@
break;
}
}
- intent.putExtra(BaseActivity.DocumentsIntent.EXTRA_DIRECTORY_COPY, directoryCopy);
+ intent.putExtra(Shared.EXTRA_DIRECTORY_COPY, directoryCopy);
intent.putExtra(CopyService.EXTRA_TRANSFER_MODE, mode);
startActivityForResult(intent, REQUEST_COPY_DESTINATION);
}
@@ -943,7 +942,6 @@
public void setSelected(boolean selected) {
itemView.setActivated(selected);
- itemView.setBackgroundColor(selected ? mSelectedItemColor : mDefaultItemColor);
}
@Override
@@ -1080,8 +1078,6 @@
holder.setSelected(isSelected(position));
- final View line2 = itemView.findViewById(R.id.line2);
-
final ImageView iconMime = (ImageView) itemView.findViewById(R.id.icon_mime);
final ImageView iconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
final TextView title = (TextView) itemView.findViewById(android.R.id.title);
@@ -1138,14 +1134,11 @@
getDocumentIcon(mContext, docAuthority, docId, docMimeType, docIcon, state));
}
- boolean hasLine2 = false;
-
- final boolean hideTitle = (state.derivedMode == MODE_GRID) && mHideGridTitles;
- if (!hideTitle) {
+ if ((state.derivedMode == MODE_GRID) && mHideGridTitles) {
+ title.setVisibility(View.GONE);
+ } else {
title.setText(docDisplayName);
title.setVisibility(View.VISIBLE);
- } else {
- title.setVisibility(View.GONE);
}
Drawable iconDrawable = null;
@@ -1161,7 +1154,6 @@
if (alwaysShowSummary) {
summary.setText(root.getDirectoryString());
summary.setVisibility(View.VISIBLE);
- hasLine2 = true;
} else {
if (iconDrawable != null && roots.isIconUniqueBlocking(root)) {
// No summary needed if icon speaks for itself
@@ -1170,7 +1162,6 @@
summary.setText(root.getDirectoryString());
summary.setVisibility(View.VISIBLE);
summary.setTextAlignment(TextView.TEXT_ALIGNMENT_TEXT_END);
- hasLine2 = true;
}
}
}
@@ -1187,48 +1178,37 @@
if (docSummary != null) {
summary.setText(docSummary);
summary.setVisibility(View.VISIBLE);
- hasLine2 = true;
} else {
summary.setVisibility(View.INVISIBLE);
}
}
}
- if (icon1 != null) icon1.setVisibility(View.GONE);
-
if (iconDrawable != null) {
icon1.setVisibility(View.VISIBLE);
icon1.setImageDrawable(iconDrawable);
+ } else {
+ icon1.setVisibility(View.GONE);
}
if (docLastModified == -1) {
date.setText(null);
} else {
date.setText(formatTime(mContext, docLastModified));
- hasLine2 = true;
}
- if (state.showSize) {
- size.setVisibility(View.VISIBLE);
- if (Document.MIME_TYPE_DIR.equals(docMimeType) || docSize == -1) {
- size.setText(null);
- } else {
- size.setText(Formatter.formatFileSize(mContext, docSize));
- hasLine2 = true;
- }
- } else {
+ if (!state.showSize || Document.MIME_TYPE_DIR.equals(docMimeType) || docSize == -1) {
size.setVisibility(View.GONE);
- }
-
- if (line2 != null) {
- line2.setVisibility(hasLine2 ? View.VISIBLE : View.GONE);
+ } else {
+ size.setVisibility(View.VISIBLE);
+ size.setText(Formatter.formatFileSize(mContext, docSize));
}
setEnabledRecursive(itemView, enabled);
iconMime.setAlpha(iconAlpha);
iconThumb.setAlpha(iconAlpha);
- if (icon1 != null) icon1.setAlpha(iconAlpha);
+ icon1.setAlpha(iconAlpha);
if (DEBUG_ENABLE_DND) {
setupDragAndDropOnDocumentView(itemView, cursor);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java
index 0963845..1135c21 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java
@@ -25,6 +25,8 @@
import android.support.v7.widget.RecyclerView;
import android.util.TypedValue;
+import com.android.documentsui.R;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -43,12 +45,8 @@
private final Integer mSelectedColor;
public DirectoryItemAnimator(Context context) {
- mDefaultColor = context.getResources().getColor(android.R.color.transparent);
- // Get the accent color.
- TypedValue selColor = new TypedValue();
- context.getTheme().resolveAttribute(android.R.attr.colorAccent, selColor, true);
- // Set the opacity to 10%.
- mSelectedColor = (selColor.data & 0x00ffffff) | 0x16000000;
+ mDefaultColor = context.getResources().getColor(R.color.item_doc_background);
+ mSelectedColor = context.getResources().getColor(R.color.item_doc_background_selected);
}
@Override
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
index a0ff165..ef6d2c9 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java
@@ -63,7 +63,7 @@
// Subtly different from isDocumentEnabled. The reason may be illuminated as follows.
// A folder is enabled such that it may be double clicked, even in settings
// when the folder itself cannot be selected. This may also be true of container types.
- public boolean canSelectType(String docMimeType) {
+ public boolean canSelectType(String docMimeType, int docFlags) {
return true;
}
@@ -85,31 +85,44 @@
}
@Override
- public boolean canSelectType(String docMimeType) {
- switch (mState.action) {
- case ACTION_OPEN:
- case ACTION_CREATE:
- case ACTION_GET_CONTENT:
- return !isDirectory(docMimeType);
- case ACTION_OPEN_TREE:
- // In this case nothing *ever* is selectable...the expected user behavior is
- // they navigate *into* a folder, then click a confirmation button indicating
- // that the current directory is the directory they are picking.
- return false;
+ public boolean canSelectType(String docMimeType, int docFlags) {
+ if (!isDocumentEnabled(docMimeType, docFlags)) {
+ return false;
}
+
+ if (isDirectory(docMimeType)) {
+ return false;
+ }
+
+ if (mState.action == ACTION_OPEN_TREE) {
+ // In this case nothing *ever* is selectable...the expected user behavior is
+ // they navigate *into* a folder, then click a confirmation button indicating
+ // that the current directory is the directory they are picking.
+ return false;
+ }
+
return true;
}
@Override
public boolean isDocumentEnabled(String docMimeType, int docFlags) {
- // Directories are always enabled
+ // Directories are always enabled.
if (isDirectory(docMimeType)) {
return true;
}
- // Read-only files are disabled when creating
- if (mState.action == ACTION_CREATE && (docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
- return false;
+ switch (mState.action) {
+ case ACTION_CREATE:
+ // Read-only files are disabled when creating.
+ if ((docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
+ return false;
+ }
+ case ACTION_OPEN:
+ case ACTION_GET_CONTENT:
+ final boolean isVirtual = (docFlags & Document.FLAG_VIRTUAL_DOCUMENT) != 0;
+ if (isVirtual && mState.openableOnly) {
+ return false;
+ }
}
return MimePredicate.mimeMatches(mState.acceptMimes, docMimeType);
@@ -163,7 +176,6 @@
final MenuItem moveTo = menu.findItem(R.id.menu_move_to);
open.setVisible(false);
- share.setVisible(false);
delete.setVisible(canDelete);
copyTo.setVisible(true);
copyTo.setEnabled(true);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
index cc981e1e..dfdc705 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
@@ -25,6 +25,7 @@
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
import android.provider.DocumentsProvider;
+import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import com.android.documentsui.DocumentsApplication;
@@ -204,13 +205,18 @@
}
}
- private void deriveFields() {
+ @VisibleForTesting
+ void deriveFields() {
derivedUri = DocumentsContract.buildDocumentUri(authority, documentId);
}
@Override
public String toString() {
- return "Document{docId=" + documentId + ", name=" + displayName + "}";
+ return "Document{"
+ + "docId=" + documentId
+ + ", name=" + displayName
+ + ", isDirectory=" + isDirectory()
+ + "}";
}
public boolean isCreateSupported() {
@@ -237,6 +243,22 @@
return (flags & Document.FLAG_DIR_HIDE_GRID_TITLES) != 0;
}
+ public int hashCode() {
+ return derivedUri.hashCode() + mimeType.hashCode();
+ }
+
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ } else if (!(other instanceof DocumentInfo)) {
+ return false;
+ }
+
+ DocumentInfo that = (DocumentInfo) other;
+ // Uri + mime type should be totally unique.
+ return derivedUri.equals(that.derivedUri) && mimeType.equals(that.mimeType);
+ }
+
public static String getCursorString(Cursor cursor, String columnName) {
final int index = cursor.getColumnIndex(columnName);
return (index != -1) ? cursor.getString(index) : null;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
index 723700d..4caa891 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
@@ -23,8 +23,10 @@
import android.content.Context;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
+import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
+import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Root;
import android.text.TextUtils;
@@ -52,7 +54,7 @@
public static final int TYPE_DOWNLOADS = 5;
public static final int TYPE_LOCAL = 6;
public static final int TYPE_MTP = 7;
- public static final int TYPE_CLOUD = 8;
+ public static final int TYPE_OTHER = 8;
public String authority;
public String rootId;
@@ -168,7 +170,10 @@
derivedMimeTypes = (mimeTypes != null) ? mimeTypes.split("\n") : null;
// TODO: remove these special case icons
- if (isExternalStorage()) {
+ if (isHome()) {
+ derivedIcon = R.drawable.ic_root_home;
+ derivedType = TYPE_LOCAL;
+ } else if (isExternalStorage()) {
derivedIcon = R.drawable.ic_root_sdcard;
derivedType = TYPE_LOCAL;
} else if (isDownloads()) {
@@ -188,14 +193,25 @@
} else if (isMtp()) {
derivedType = TYPE_MTP;
} else {
- derivedType = TYPE_CLOUD;
+ derivedType = TYPE_OTHER;
}
}
+ public Uri getUri() {
+ return DocumentsContract.buildRootUri(authority, rootId);
+ }
+
public boolean isRecents() {
return authority == null && rootId == null;
}
+ public boolean isHome() {
+ // Note that "home" is the expected root id for the auto-created
+ // user home directory on external storage. The "home" value should
+ // match ExternalStorageProvider.ROOT_ID_HOME.
+ return isExternalStorage() && "home".equals(rootId);
+ }
+
public boolean isExternalStorage() {
return "com.android.externalstorage.documents".equals(authority);
}
@@ -228,11 +244,6 @@
|| derivedType == TYPE_RECENTS || derivedType == TYPE_DOWNLOADS;
}
- @Override
- public String toString() {
- return "Root{authority=" + authority + ", rootId=" + rootId + ", title=" + title + "}";
- }
-
public Drawable loadIcon(Context context) {
if (derivedIcon != 0) {
return context.getDrawable(derivedIcon);
@@ -273,6 +284,11 @@
return Objects.hash(authority, rootId);
}
+ @Override
+ public String toString() {
+ return "Root{authority=" + authority + ", rootId=" + rootId + ", title=" + title + "}";
+ }
+
public String getDirectoryString() {
return !TextUtils.isEmpty(summary) ? summary : title;
}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/CopyServiceTest.java
similarity index 85%
rename from packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java
rename to packages/DocumentsUI/tests/src/com/android/documentsui/CopyServiceTest.java
index 6f1a89b..079d599 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/CopyServiceTest.java
@@ -28,10 +28,10 @@
import android.os.Parcelable;
import android.os.RemoteException;
import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
import android.test.MoreAsserts;
import android.test.ServiceTestCase;
import android.test.mock.MockContentResolver;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import com.android.documentsui.model.DocumentInfo;
@@ -46,15 +46,17 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-public class CopyTest extends ServiceTestCase<CopyService> {
+@MediumTest
+public class CopyServiceTest extends ServiceTestCase<CopyService> {
- public CopyTest() {
+ public CopyServiceTest() {
super(CopyService.class);
}
@@ -69,11 +71,13 @@
private DocumentsProviderHelper mDocHelper;
private StubProvider mStorage;
private Context mSystemContext;
+ private CopyJobListener mListener;
@Override
protected void setUp() throws Exception {
super.setUp();
+ mListener = new CopyJobListener();
setupTestContext();
mClient = mResolver.acquireContentProviderClient(AUTHORITY);
@@ -81,6 +85,8 @@
mStorage.clearCacheAndBuildRoots();
mDocHelper = new DocumentsProviderHelper(AUTHORITY, mClient);
+
+ assertDestFileCount(0);
}
@Override
@@ -89,23 +95,18 @@
super.tearDown();
}
- /**
- * Test copying a single file.
- */
public void testCopyFile() throws Exception {
String srcPath = "/test0.txt";
Uri testFile = mStorage.createFile(SRC_ROOT, srcPath, "text/plain",
"The five boxing wizards jump quickly".getBytes());
- assertDstFileCountEquals(0);
-
startService(createCopyIntent(Lists.newArrayList(testFile)));
// 2 operations: file creation, then writing data.
mResolver.waitForChanges(2);
// Verify that one file was copied; check file contents.
- assertDstFileCountEquals(1);
+ assertDestFileCount(1);
assertCopied(srcPath);
}
@@ -114,8 +115,6 @@
String testContent = "The five boxing wizards jump quickly";
Uri testFile = mStorage.createFile(SRC_ROOT, srcPath, "text/plain", testContent.getBytes());
- assertDstFileCountEquals(0);
-
Intent moveIntent = createCopyIntent(Lists.newArrayList(testFile));
moveIntent.putExtra(CopyService.EXTRA_TRANSFER_MODE, CopyService.TRANSFER_MODE_MOVE);
startService(moveIntent);
@@ -124,16 +123,13 @@
mResolver.waitForChanges(3);
// Verify that one file was moved; check file contents.
- assertDstFileCountEquals(1);
+ assertDestFileCount(1);
assertDoesNotExist(SRC_ROOT, srcPath);
byte[] dstContent = readFile(DST_ROOT, srcPath);
MoreAsserts.assertEquals("Moved file contents differ", testContent.getBytes(), dstContent);
}
- /**
- * Test copying multiple files.
- */
public void testCopyMultipleFiles() throws Exception {
String testContent[] = {
"The five boxing wizards jump quickly",
@@ -150,15 +146,13 @@
mStorage.createFile(SRC_ROOT, srcPaths[1], "text/plain", testContent[1].getBytes()),
mStorage.createFile(SRC_ROOT, srcPaths[2], "text/plain", testContent[2].getBytes()));
- assertDstFileCountEquals(0);
-
// Copy all the test files.
startService(createCopyIntent(testFiles));
// 3 file creations, 3 file writes.
mResolver.waitForChanges(6);
- assertDstFileCountEquals(3);
+ assertDestFileCount(3);
for (String path : srcPaths) {
assertCopied(path);
}
@@ -166,29 +160,54 @@
public void testCopyEmptyDir() throws Exception {
String srcPath = "/emptyDir";
- Uri testDir = mStorage.createFile(SRC_ROOT, srcPath, DocumentsContract.Document.MIME_TYPE_DIR,
- null);
-
- assertDstFileCountEquals(0);
+ Uri testDir = createTestDirectory(srcPath);
startService(createCopyIntent(Lists.newArrayList(testDir)));
// Just 1 operation: Directory creation.
mResolver.waitForChanges(1);
- assertDstFileCountEquals(1);
+ assertDestFileCount(1);
// Verify that the dst exists and is a directory.
File dst = mStorage.getFile(DST_ROOT, srcPath);
assertTrue(dst.isDirectory());
}
+ public void testNoCopyDirToSelf() throws Exception {
+ Uri testDir = createTestDirectory("/someDir");
+
+ Intent intent = createCopyIntent(Lists.newArrayList(testDir), testDir);
+ startService(intent);
+
+ getService().addFinishedListener(mListener);
+
+ mListener.waitForFinished();
+ mListener.assertFailedCount(1);
+ mListener.assertFileFailed("someDir");
+
+ assertDestFileCount(0);
+ }
+
+ public void testNoCopyDirToDescendent() throws Exception {
+ Uri testDir = createTestDirectory("/someDir");
+ Uri descDir = createTestDirectory("/someDir/theDescendent");
+
+ Intent intent = createCopyIntent(Lists.newArrayList(testDir), descDir);
+ startService(intent);
+
+ getService().addFinishedListener(mListener);
+
+ mListener.waitForFinished();
+ mListener.assertFailedCount(1);
+ mListener.assertFileFailed("someDir");
+
+ assertDestFileCount(0);
+ }
+
public void testMoveEmptyDir() throws Exception {
String srcPath = "/emptyDir";
- Uri testDir = mStorage.createFile(SRC_ROOT, srcPath, DocumentsContract.Document.MIME_TYPE_DIR,
- null);
-
- assertDstFileCountEquals(0);
+ Uri testDir = createTestDirectory(srcPath);
Intent moveIntent = createCopyIntent(Lists.newArrayList(testDir));
moveIntent.putExtra(CopyService.EXTRA_TRANSFER_MODE, CopyService.TRANSFER_MODE_MOVE);
@@ -197,7 +216,7 @@
// 2 operations: Directory creation, and removal of the original.
mResolver.waitForChanges(2);
- assertDstFileCountEquals(1);
+ assertDestFileCount(1);
// Verify that the dst exists and is a directory.
File dst = mStorage.getFile(DST_ROOT, srcPath);
@@ -220,8 +239,7 @@
srcDir + "/test2.txt"
};
// Create test dir; put some files in it.
- Uri testDir = mStorage.createFile(SRC_ROOT, srcDir, DocumentsContract.Document.MIME_TYPE_DIR,
- null);
+ Uri testDir = createTestDirectory(srcDir);
mStorage.createFile(SRC_ROOT, srcFiles[0], "text/plain", testContent[0].getBytes());
mStorage.createFile(SRC_ROOT, srcFiles[1], "text/plain", testContent[1].getBytes());
mStorage.createFile(SRC_ROOT, srcFiles[2], "text/plain", testContent[2].getBytes());
@@ -255,8 +273,6 @@
Uri testFile = mStorage.createFile(SRC_ROOT, srcPath, "text/plain",
"The five boxing wizards jump quickly".getBytes());
- assertDstFileCountEquals(0);
-
mStorage.simulateReadErrorsForFile(testFile);
startService(createCopyIntent(Lists.newArrayList(testFile)));
@@ -265,7 +281,7 @@
mResolver.waitForChanges(3);
// Verify that the failed copy was cleaned up.
- assertDstFileCountEquals(0);
+ assertDestFileCount(0);
}
public void testMoveFileWithReadErrors() throws Exception {
@@ -273,8 +289,6 @@
Uri testFile = mStorage.createFile(SRC_ROOT, srcPath, "text/plain",
"The five boxing wizards jump quickly".getBytes());
- assertDstFileCountEquals(0);
-
mStorage.simulateReadErrorsForFile(testFile);
Intent moveIntent = createCopyIntent(Lists.newArrayList(testFile));
@@ -291,7 +305,7 @@
return;
} finally {
// Verify that the failed copy was cleaned up, and the src file wasn't removed.
- assertDstFileCountEquals(0);
+ assertDestFileCount(0);
assertExists(SRC_ROOT, srcPath);
}
// The asserts above didn't fail, but the CopyService did something unexpected.
@@ -311,8 +325,7 @@
srcDir + "/test2.txt"
};
// Create test dir; put some files in it.
- Uri testDir = mStorage.createFile(SRC_ROOT, srcDir, DocumentsContract.Document.MIME_TYPE_DIR,
- null);
+ Uri testDir = createTestDirectory(srcDir);
mStorage.createFile(SRC_ROOT, srcFiles[0], "text/plain", testContent[0].getBytes());
Uri errFile = mStorage
.createFile(SRC_ROOT, srcFiles[1], "text/plain", testContent[1].getBytes());
@@ -349,33 +362,37 @@
assertExists(SRC_ROOT, srcFiles[1]);
}
- /**
- * Copies the given files to a pre-determined destination.
- *
- * @throws FileNotFoundException
- */
+ private Uri createTestDirectory(String dir) throws IOException {
+ return mStorage.createFile(
+ SRC_ROOT, dir, DocumentsContract.Document.MIME_TYPE_DIR, null);
+ }
+
private Intent createCopyIntent(List<Uri> srcs) throws Exception {
+ RootInfo root = mDocHelper.getRoot(DST_ROOT);
+ final Uri dst = DocumentsContract.buildDocumentUri(AUTHORITY, root.documentId);
+
+ return createCopyIntent(srcs, dst);
+ }
+
+ private Intent createCopyIntent(List<Uri> srcs, Uri dst) throws Exception {
final ArrayList<DocumentInfo> srcDocs = Lists.newArrayList();
for (Uri src : srcs) {
srcDocs.add(DocumentInfo.fromUri(mResolver, src));
}
- RootInfo root = mDocHelper.getRoot(DST_ROOT);
- final Uri dst = DocumentsContract.buildDocumentUri(AUTHORITY, root.documentId);
DocumentStack stack = new DocumentStack();
stack.push(DocumentInfo.fromUri(mResolver, dst));
final Intent copyIntent = new Intent(mContext, CopyService.class);
copyIntent.putParcelableArrayListExtra(CopyService.EXTRA_SRC_LIST, srcDocs);
copyIntent.putExtra(Shared.EXTRA_STACK, (Parcelable) stack);
- // startService(copyIntent);
return copyIntent;
}
/**
* Returns a count of the files in the given directory.
*/
- private void assertDstFileCountEquals(int expected) throws RemoteException {
+ private void assertDestFileCount(int expected) throws RemoteException {
RootInfo dest = mDocHelper.getRoot(DST_ROOT);
final Uri queryUri = DocumentsContract.buildChildDocumentsUri(AUTHORITY,
dest.documentId);
@@ -452,6 +469,34 @@
mResolver.addProvider(AUTHORITY, mStorage);
}
+ private final class CopyJobListener implements CopyService.TestOnlyListener {
+
+ final CountDownLatch latch = new CountDownLatch(1);
+ final List<DocumentInfo> failedDocs = new ArrayList<>();
+ @Override
+ public void onFinished(List<DocumentInfo> failed) {
+ failedDocs.addAll(failed);
+ latch.countDown();
+ }
+
+ public void assertFileFailed(String expectedName) {
+ for (DocumentInfo failed : failedDocs) {
+ if (expectedName.equals(failed.displayName)) {
+ return;
+ }
+ }
+ fail("Couldn't find failed file: " + expectedName);
+ }
+
+ public void waitForFinished() throws InterruptedException {
+ latch.await(500, TimeUnit.MILLISECONDS);
+ }
+
+ public void assertFailedCount(int expected) {
+ assertEquals(expected, failedDocs.size());
+ }
+ }
+
/**
* A test resolver that enables this test suite to listen for notifications that mark when copy
* operations are done.
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java
new file mode 100644
index 0000000..737a8b6
--- /dev/null
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2015 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.documentsui;
+
+import static com.android.documentsui.StubProvider.DEFAULT_AUTHORITY;
+import static com.android.documentsui.StubProvider.ROOT_0_ID;
+
+import android.app.Instrumentation;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.DocumentsContract;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Configurator;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
+import android.view.MotionEvent;
+
+import com.android.documentsui.model.RootInfo;
+
+@LargeTest
+public class DownloadsActivityUiTest extends InstrumentationTestCase {
+
+ private static final int TIMEOUT = 5000;
+ private static final String TAG = "DownloadsActivityUiTest";
+ private static final String TARGET_PKG = "com.android.documentsui";
+ private static final String LAUNCHER_PKG = "com.android.launcher";
+
+ private UiBot mBot;
+ private UiDevice mDevice;
+ private Context mContext;
+ private ContentResolver mResolver;
+ private DocumentsProviderHelper mDocsHelper;
+ private ContentProviderClient mClient;
+ private RootInfo mRoot;
+
+ public void setUp() throws Exception {
+ // Initialize UiDevice instance.
+ Instrumentation instrumentation = getInstrumentation();
+
+ mDevice = UiDevice.getInstance(instrumentation);
+
+ Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_MOUSE);
+
+ // Start from the home screen.
+ mDevice.pressHome();
+ mDevice.wait(Until.hasObject(By.pkg(LAUNCHER_PKG).depth(0)), TIMEOUT);
+
+ // NOTE: Must be the "target" context, else security checks in content provider will fail.
+ mContext = instrumentation.getTargetContext();
+ mResolver = mContext.getContentResolver();
+
+ mClient = mResolver.acquireUnstableContentProviderClient(DEFAULT_AUTHORITY);
+ mDocsHelper = new DocumentsProviderHelper(DEFAULT_AUTHORITY, mClient);
+
+ mRoot = mDocsHelper.getRoot(ROOT_0_ID);
+
+ // Open the Downloads activity on our stub provider root.
+ Intent intent = new Intent(DocumentsContract.ACTION_MANAGE_ROOT);
+ intent.setDataAndType(mRoot.getUri(), DocumentsContract.Root.MIME_TYPE_ITEM);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ mContext.startActivity(intent);
+
+ // Wait for the app to appear.
+ mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT);
+ mDevice.waitForIdle();
+
+ mBot = new UiBot(mDevice, TIMEOUT);
+
+ resetStorage(); // Just in case a test failed and tearDown didn't happen.
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Need to kill off the task we started.
+ super.tearDown();
+ Log.d(TAG, "Resetting storage from setUp");
+ resetStorage();
+ mClient.release();
+ }
+
+ private void resetStorage() throws RemoteException {
+ mClient.call("clear", null, null);
+ // TODO: Would be nice to have an event to wait on here.
+ mDevice.waitForIdle();
+ }
+
+ private void initTestFiles() throws RemoteException {
+ mDocsHelper.createDocument(mRoot, "text/plain", "file0.log");
+ mDocsHelper.createDocument(mRoot, "image/png", "file1.png");
+ mDocsHelper.createDocument(mRoot, "text/csv", "file2.csv");
+ }
+
+ public void testWindowTitle() throws Exception {
+ initTestFiles();
+
+ mBot.assertWindowTitle(ROOT_0_ID);
+ }
+
+ public void testFilesListed() throws Exception {
+ initTestFiles();
+
+ mBot.assertHasDocuments("file0.log", "file1.png", "file2.csv");
+ }
+
+ public void testFilesList_LiveUpdate() throws Exception {
+ initTestFiles();
+
+ mDocsHelper.createDocument(mRoot, "yummers/sandwich", "Ham & Cheese.sandwich");
+ mBot.assertHasDocuments("file0.log", "file1.png", "file2.csv", "Ham & Cheese.sandwich");
+ }
+
+ public void testDeleteDocument() throws Exception {
+ initTestFiles();
+
+ mBot.clickDocument("file1.png");
+ mDevice.waitForIdle();
+ mBot.menuDelete().click();
+
+ mBot.waitForDeleteSnackbar();
+ assertFalse(mBot.hasDocuments("file1.png"));
+
+ mBot.waitForDeleteSnackbarGone();
+ assertFalse(mBot.hasDocuments("file1.png"));
+ }
+
+ public void testSupportsShare() throws Exception {
+ initTestFiles();
+
+ mBot.clickDocument("file1.png");
+ mDevice.waitForIdle();
+ assertNotNull(mBot.menuShare());
+ }
+}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
index 9060516..71d8b34 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
@@ -31,11 +31,13 @@
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.Until;
import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.MotionEvent;
import com.android.documentsui.model.RootInfo;
+@LargeTest
public class FilesActivityUiTest extends InstrumentationTestCase {
private static final int TIMEOUT = 5000;
@@ -123,6 +125,7 @@
"Videos",
"Audio",
"Downloads",
+ "Home",
ROOT_0_ID,
ROOT_1_ID);
}
@@ -134,6 +137,13 @@
mBot.assertHasDocuments("file0.log", "file1.png", "file2.csv");
}
+ public void testRootClickSetsWindowTitle() throws Exception {
+ initTestFiles();
+
+ mBot.openRoot("Home");
+ mBot.assertWindowTitle("Home");
+ }
+
public void testFilesList_LiveUpdate() throws Exception {
initTestFiles();
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java b/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java
index 2d42ddc..7a75503 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java
@@ -226,6 +226,12 @@
}
@Override
+ public Cursor queryChildDocumentsForManage(String parentDocumentId, String[] projection,
+ String sortOrder) throws FileNotFoundException {
+ return queryChildDocuments(parentDocumentId, projection, sortOrder);
+ }
+
+ @Override
public Cursor queryChildDocuments(String parentDocumentId, String[] projection, String sortOrder)
throws FileNotFoundException {
final StubDocument parentDocument = mStorage.get(parentDocumentId);
@@ -531,6 +537,16 @@
this.rootInfo = rootInfo;
mStorage.put(this.documentId, this);
}
+ @Override
+ public String toString() {
+ return "StubDocument{"
+ + "path:" + file.getPath()
+ + ", mimeType:" + mimeType
+ + ", rootInfo:" + rootInfo
+ + ", documentId:" + documentId
+ + ", parentId:" + parentId
+ + "}";
+ }
}
private static String getDocumentIdForFile(File file) {
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java
index 5c09794..68cdf12 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/UiBot.java
@@ -16,6 +16,8 @@
package com.android.documentsui;
+import static junit.framework.Assert.assertEquals;
+
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.BySelector;
import android.support.test.uiautomator.UiDevice;
@@ -80,6 +82,20 @@
mDevice.waitForIdle();
}
+ void assertWindowTitle(String expected) {
+ // Turns out the title field on a window does not have
+ // an id associated with it at runtime (which confuses the hell out of me)
+ // In code we address this via "android.R.id.title".
+ UiObject2 o = find(By.text(expected));
+ // It's a bit of a conceit that we then *assert* that the title
+ // is the value that we used to identify the UiObject2.
+ // If the preceeding lookup fails, this'll choke with an NPE.
+ // But given the issue described in the comment above, we're
+ // going to do it anyway. Because we shouldn't be looking up
+ // the uiobject by it's expected content :|
+ assertEquals(expected, o.getText());
+ }
+
void assertHasRoots(String... labels) throws UiObjectNotFoundException {
List<String> missing = new ArrayList<>();
for (String label : labels) {
@@ -163,6 +179,10 @@
return find(By.res("com.android.documentsui:id/menu_delete"));
}
+ UiObject2 menuShare() {
+ return find(By.res("com.android.documentsui:id/menu_share"));
+ }
+
private UiObject2 find(BySelector selector) {
mDevice.wait(Until.findObject(selector), mTimeout);
return mDevice.findObject(selector);
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java
index 746e2117..b250e5d 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java
@@ -25,6 +25,7 @@
import android.support.v7.widget.RecyclerView;
import android.test.AndroidTestCase;
import android.test.mock.MockContentResolver;
+import android.test.suitebuilder.annotation.SmallTest;
import android.view.ViewGroup;
import com.android.documentsui.DirectoryResult;
@@ -34,6 +35,7 @@
import java.util.List;
+@SmallTest
public class DirectoryFragmentModelTest extends AndroidTestCase {
private static final int ITEM_COUNT = 5;
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java
index d1ce564..b3d45ae 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java
@@ -18,6 +18,7 @@
import android.support.v7.widget.RecyclerView;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.SparseBooleanArray;
import android.view.View;
import android.view.ViewGroup;
@@ -32,6 +33,7 @@
import java.util.List;
import java.util.Set;
+@SmallTest
public class MultiSelectManagerTest extends AndroidTestCase {
private static final List<String> items;
@@ -163,7 +165,6 @@
assertRangeSelection(14, 17);
}
-
public void testSingleTapUp_ShiftReversesSelectionDirection() {
longPress(7);
shiftTap(17);
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java
index c4b6ce5..c856b22 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java
@@ -20,11 +20,13 @@
import android.graphics.Rect;
import android.support.v7.widget.RecyclerView.OnScrollListener;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.SparseBooleanArray;
import android.view.View;
import com.android.documentsui.dirlist.MultiSelectManager.GridModel;
+@SmallTest
public class MultiSelectManager_GridModelTest extends AndroidTestCase {
private static final int VIEW_PADDING_PX = 5;
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
index 64da750..72fc108 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
@@ -17,10 +17,11 @@
package com.android.documentsui.dirlist;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-
+@SmallTest
public class MultiSelectManager_SelectionTest extends AndroidTestCase{
private Selection selection;
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/model/DocumentInfoTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/model/DocumentInfoTest.java
new file mode 100644
index 0000000..a6aba7b
--- /dev/null
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/model/DocumentInfoTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 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.documentsui.model;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+@SmallTest
+public class DocumentInfoTest extends AndroidTestCase {
+
+ public void testEquals() throws Exception {
+ DocumentInfo doc = createDocInfo("authority.a", "doc.1", "text/plain");
+ assertEquals(doc, doc);
+ }
+
+ public void testNotEquals_differentAuthority() throws Exception {
+ DocumentInfo docA = createDocInfo("authority.a", "doc.1", "text/plain");
+ DocumentInfo docB = createDocInfo("authority.b", "doc.1", "text/plain");
+ assertFalse(docA.equals(docB));
+ }
+
+ public void testNotEquals_differentDocId() throws Exception {
+ DocumentInfo docA = createDocInfo("authority.a", "doc.1", "text/plain");
+ DocumentInfo docB = createDocInfo("authority.a", "doc.2", "text/plain");
+ assertFalse(docA.equals(docB));
+ }
+
+ public void testNotEquals_differentMimetype() throws Exception {
+ DocumentInfo docA = createDocInfo("authority.a", "doc.1", "text/plain");
+ DocumentInfo docB = createDocInfo("authority.a", "doc.1", "image/png");
+ assertFalse(docA.equals(docB));
+ }
+
+ private DocumentInfo createDocInfo(String authority, String docId, String mimeType) {
+ DocumentInfo doc = new DocumentInfo();
+ doc.authority = authority;
+ doc.documentId = docId;
+ doc.mimeType = mimeType;
+ doc.deriveFields();
+ return doc;
+ }
+}
diff --git a/packages/ExternalStorageProvider/res/values-af/strings.xml b/packages/ExternalStorageProvider/res/values-af/strings.xml
index 1de881d..b5a159d 100644
--- a/packages/ExternalStorageProvider/res/values-af/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-af/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Eksterne berging"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Interne berging"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumente"</string>
+ <string name="root_home" msgid="7931555396767513359">"Tuis"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-am/strings.xml b/packages/ExternalStorageProvider/res/values-am/strings.xml
index 230fb06..f4f296d 100644
--- a/packages/ExternalStorageProvider/res/values-am/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-am/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ውጫዊ ማከማቻ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ውስጣዊ ማከማቻ"</string>
- <string name="root_documents" msgid="4051252304075469250">"ሰነዶች"</string>
+ <string name="root_home" msgid="7931555396767513359">"መነሻ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ar/strings.xml b/packages/ExternalStorageProvider/res/values-ar/strings.xml
index b20a056..4eee3e8 100644
--- a/packages/ExternalStorageProvider/res/values-ar/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ar/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"وحدة تخزين خارجية"</string>
<string name="root_internal_storage" msgid="827844243068584127">"وحدة تخزين داخلية"</string>
- <string name="root_documents" msgid="4051252304075469250">"مستندات"</string>
+ <string name="root_home" msgid="7931555396767513359">"الرئيسية"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml b/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
index cd5ba2f..f7e5f8b 100644
--- a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Xarici Yaddaş"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Daxili yaddaş"</string>
- <string name="root_documents" msgid="4051252304075469250">"Sənədlər"</string>
+ <string name="root_home" msgid="7931555396767513359">"Əsas səhifə"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-bg/strings.xml b/packages/ExternalStorageProvider/res/values-bg/strings.xml
index f5dce31..7081b17 100644
--- a/packages/ExternalStorageProvider/res/values-bg/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-bg/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Външно хранилище"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Вътрешно хранилище"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документи"</string>
+ <string name="root_home" msgid="7931555396767513359">"Начална директория"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-bn-rBD/strings.xml b/packages/ExternalStorageProvider/res/values-bn-rBD/strings.xml
index 3668065..842aed4 100644
--- a/packages/ExternalStorageProvider/res/values-bn-rBD/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-bn-rBD/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"বাহ্যিক সঞ্চয়স্থান"</string>
<string name="root_internal_storage" msgid="827844243068584127">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
- <string name="root_documents" msgid="4051252304075469250">"দস্তাবেজগুলি"</string>
+ <string name="root_home" msgid="7931555396767513359">"হোম"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ca/strings.xml b/packages/ExternalStorageProvider/res/values-ca/strings.xml
index 15e9d46..b3fd9f7 100644
--- a/packages/ExternalStorageProvider/res/values-ca/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ca/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Emmagatzematge extern"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Emmagatzematge intern"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="root_home" msgid="7931555396767513359">"Inici"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-cs/strings.xml b/packages/ExternalStorageProvider/res/values-cs/strings.xml
index b68a928..2eab596 100644
--- a/packages/ExternalStorageProvider/res/values-cs/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-cs/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Externí úložiště"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Interní úložiště"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenty"</string>
+ <string name="root_home" msgid="7931555396767513359">"Výchozí adresář"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-da/strings.xml b/packages/ExternalStorageProvider/res/values-da/strings.xml
index dc565ae..d008f0e 100644
--- a/packages/ExternalStorageProvider/res/values-da/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-da/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Ekstern lagerplads"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Intern lagerplads"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenter"</string>
+ <string name="root_home" msgid="7931555396767513359">"Hjem"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-de/strings.xml b/packages/ExternalStorageProvider/res/values-de/strings.xml
index 318634a..50fc680 100644
--- a/packages/ExternalStorageProvider/res/values-de/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-de/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Externer Speicher"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Interner Speicher"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumente"</string>
+ <string name="root_home" msgid="7931555396767513359">"Zuhause"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-el/strings.xml b/packages/ExternalStorageProvider/res/values-el/strings.xml
index b3aa792..9537afd 100644
--- a/packages/ExternalStorageProvider/res/values-el/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-el/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Εξωτερικός αποθηκευτικός χώρος"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Εσωτερικός αποθηκευτικός χώρος"</string>
- <string name="root_documents" msgid="4051252304075469250">"Έγγραφα"</string>
+ <string name="root_home" msgid="7931555396767513359">"Αρχική οθόνη"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-en-rAU/strings.xml b/packages/ExternalStorageProvider/res/values-en-rAU/strings.xml
index f88eb9e..be7aebc 100644
--- a/packages/ExternalStorageProvider/res/values-en-rAU/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-en-rAU/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"External Storage"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Internal storage"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="root_home" msgid="7931555396767513359">"Home"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-en-rGB/strings.xml b/packages/ExternalStorageProvider/res/values-en-rGB/strings.xml
index f88eb9e..be7aebc 100644
--- a/packages/ExternalStorageProvider/res/values-en-rGB/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-en-rGB/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"External Storage"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Internal storage"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="root_home" msgid="7931555396767513359">"Home"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-en-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-en-rIN/strings.xml
index f88eb9e..be7aebc 100644
--- a/packages/ExternalStorageProvider/res/values-en-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-en-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"External Storage"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Internal storage"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="root_home" msgid="7931555396767513359">"Home"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-es-rUS/strings.xml b/packages/ExternalStorageProvider/res/values-es-rUS/strings.xml
index e7e38b5..64a042d 100644
--- a/packages/ExternalStorageProvider/res/values-es-rUS/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-es-rUS/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Almacenamiento externo"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Almacenamiento interno"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+ <string name="root_home" msgid="7931555396767513359">"Casa"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-es/strings.xml b/packages/ExternalStorageProvider/res/values-es/strings.xml
index e7e38b5..d59755e 100644
--- a/packages/ExternalStorageProvider/res/values-es/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-es/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Almacenamiento externo"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Almacenamiento interno"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+ <string name="root_home" msgid="7931555396767513359">"Inicio"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-et-rEE/strings.xml b/packages/ExternalStorageProvider/res/values-et-rEE/strings.xml
index 6824e9d..7ea2caa 100644
--- a/packages/ExternalStorageProvider/res/values-et-rEE/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-et-rEE/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Väline talletusruum"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Sisemine salvestusruum"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumendid"</string>
+ <string name="root_home" msgid="7931555396767513359">"Kodu"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-eu-rES/strings.xml b/packages/ExternalStorageProvider/res/values-eu-rES/strings.xml
index 5881bf2..2f94acb 100644
--- a/packages/ExternalStorageProvider/res/values-eu-rES/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-eu-rES/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Kanpoko memoria"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Barneko memoria"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumentuak"</string>
+ <string name="root_home" msgid="7931555396767513359">"Etxea"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-fa/strings.xml b/packages/ExternalStorageProvider/res/values-fa/strings.xml
index 9ae8a47..c8c49a5 100644
--- a/packages/ExternalStorageProvider/res/values-fa/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-fa/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"حافظه خارجی"</string>
<string name="root_internal_storage" msgid="827844243068584127">"حافظهٔ داخلی"</string>
- <string name="root_documents" msgid="4051252304075469250">"اسناد"</string>
+ <string name="root_home" msgid="7931555396767513359">"صفحه اصلی"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-fi/strings.xml b/packages/ExternalStorageProvider/res/values-fi/strings.xml
index 9d1fbaa..660228a 100644
--- a/packages/ExternalStorageProvider/res/values-fi/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-fi/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Ulkoinen tallennustila"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Sisäinen tallennustila"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumentit"</string>
+ <string name="root_home" msgid="7931555396767513359">"Koti"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-fr-rCA/strings.xml b/packages/ExternalStorageProvider/res/values-fr-rCA/strings.xml
index b3fdd48..b94682f 100644
--- a/packages/ExternalStorageProvider/res/values-fr-rCA/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-fr-rCA/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Stockage externe"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Mémoire de stockage interne"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="root_home" msgid="7931555396767513359">"Accueil"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-fr/strings.xml b/packages/ExternalStorageProvider/res/values-fr/strings.xml
index b3fdd48..6a84bb4 100644
--- a/packages/ExternalStorageProvider/res/values-fr/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-fr/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Stockage externe"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Mémoire de stockage interne"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="root_home" msgid="7931555396767513359">"Répertoire de base"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-gl-rES/strings.xml b/packages/ExternalStorageProvider/res/values-gl-rES/strings.xml
index 780213f..d51eae9 100644
--- a/packages/ExternalStorageProvider/res/values-gl-rES/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-gl-rES/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Almacenamento externo"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Almacenamento interno"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+ <string name="root_home" msgid="7931555396767513359">"Inicio"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-gu-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-gu-rIN/strings.xml
index ec8a0bd..3bcc72d 100644
--- a/packages/ExternalStorageProvider/res/values-gu-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-gu-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"બાહ્ય સંગ્રહ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"આંતરિક સંગ્રહ"</string>
- <string name="root_documents" msgid="4051252304075469250">"દસ્તાવેજો"</string>
+ <string name="root_home" msgid="7931555396767513359">"હોમ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-hi/strings.xml b/packages/ExternalStorageProvider/res/values-hi/strings.xml
index 8538081..93cc712 100644
--- a/packages/ExternalStorageProvider/res/values-hi/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-hi/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"बाहरी मेमोरी"</string>
<string name="root_internal_storage" msgid="827844243068584127">"मोबाइल मेमोरी"</string>
- <string name="root_documents" msgid="4051252304075469250">"दस्तावेज़"</string>
+ <string name="root_home" msgid="7931555396767513359">"होम"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-hr/strings.xml b/packages/ExternalStorageProvider/res/values-hr/strings.xml
index a74f8e8..c866351 100644
--- a/packages/ExternalStorageProvider/res/values-hr/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-hr/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Vanjska pohrana"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Unutarnja pohrana"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenti"</string>
+ <string name="root_home" msgid="7931555396767513359">"Početna"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-hu/strings.xml b/packages/ExternalStorageProvider/res/values-hu/strings.xml
index 3f72b41..db1c7db 100644
--- a/packages/ExternalStorageProvider/res/values-hu/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-hu/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Külső tárhely"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Belső tárhely"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumentumok"</string>
+ <string name="root_home" msgid="7931555396767513359">"Otthon"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-hy-rAM/strings.xml b/packages/ExternalStorageProvider/res/values-hy-rAM/strings.xml
index 5360124..0e1de49 100644
--- a/packages/ExternalStorageProvider/res/values-hy-rAM/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-hy-rAM/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Արտաքին պահոց"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Ներքին պահոց"</string>
- <string name="root_documents" msgid="4051252304075469250">"Փաստաթղթեր"</string>
+ <string name="root_home" msgid="7931555396767513359">"Գլխավոր էջ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-in/strings.xml b/packages/ExternalStorageProvider/res/values-in/strings.xml
index 42acde7..ca7f823 100644
--- a/packages/ExternalStorageProvider/res/values-in/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-in/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Penyimpanan Eksternal"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Penyimpanan internal"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumen"</string>
+ <string name="root_home" msgid="7931555396767513359">"Rumah"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-is-rIS/strings.xml b/packages/ExternalStorageProvider/res/values-is-rIS/strings.xml
index 0306165..ad04002 100644
--- a/packages/ExternalStorageProvider/res/values-is-rIS/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-is-rIS/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Ytri geymsla"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Innbyggð geymsla"</string>
- <string name="root_documents" msgid="4051252304075469250">"Skjöl"</string>
+ <string name="root_home" msgid="7931555396767513359">"Heim"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-it/strings.xml b/packages/ExternalStorageProvider/res/values-it/strings.xml
index 957b5ff..686ee1a 100644
--- a/packages/ExternalStorageProvider/res/values-it/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-it/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Archivio esterno"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Memoria interna"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documenti"</string>
+ <string name="root_home" msgid="7931555396767513359">"Home"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-iw/strings.xml b/packages/ExternalStorageProvider/res/values-iw/strings.xml
index 775506a..b45fb5c 100644
--- a/packages/ExternalStorageProvider/res/values-iw/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-iw/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"אחסון חיצוני"</string>
<string name="root_internal_storage" msgid="827844243068584127">"אחסון פנימי"</string>
- <string name="root_documents" msgid="4051252304075469250">"מסמכים"</string>
+ <string name="root_home" msgid="7931555396767513359">"דף הבית"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ja/strings.xml b/packages/ExternalStorageProvider/res/values-ja/strings.xml
index 188fca2..5c09bf4 100644
--- a/packages/ExternalStorageProvider/res/values-ja/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ja/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"外部ストレージ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"内部ストレージ"</string>
- <string name="root_documents" msgid="4051252304075469250">"ドキュメント"</string>
+ <string name="root_home" msgid="7931555396767513359">"ホーム"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ka-rGE/strings.xml b/packages/ExternalStorageProvider/res/values-ka-rGE/strings.xml
index cc04860..c1bc5c7 100644
--- a/packages/ExternalStorageProvider/res/values-ka-rGE/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ka-rGE/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"გარე მეხსიერება"</string>
<string name="root_internal_storage" msgid="827844243068584127">"შიდა მეხსიერება"</string>
- <string name="root_documents" msgid="4051252304075469250">"დოკუმენტები"</string>
+ <string name="root_home" msgid="7931555396767513359">"მთავარი"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-kk-rKZ/strings.xml b/packages/ExternalStorageProvider/res/values-kk-rKZ/strings.xml
index ad49036..cf05782 100644
--- a/packages/ExternalStorageProvider/res/values-kk-rKZ/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-kk-rKZ/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Сыртқы жад"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Ішкі жад"</string>
- <string name="root_documents" msgid="4051252304075469250">"Құжаттар"</string>
+ <string name="root_home" msgid="7931555396767513359">"Негізгі бет"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-km-rKH/strings.xml b/packages/ExternalStorageProvider/res/values-km-rKH/strings.xml
index 9cf76d4..a2e926f 100644
--- a/packages/ExternalStorageProvider/res/values-km-rKH/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-km-rKH/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ឧបករណ៍ផ្ទុកខាងក្រៅ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
- <string name="root_documents" msgid="4051252304075469250">"ឯកសារ"</string>
+ <string name="root_home" msgid="7931555396767513359">"ដើម"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-kn-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-kn-rIN/strings.xml
index e32b1d3..1f0cfbf 100644
--- a/packages/ExternalStorageProvider/res/values-kn-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-kn-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
- <string name="root_documents" msgid="4051252304075469250">"ಡಾಕ್ಯುಮೆಂಟ್ಗಳು"</string>
+ <string name="root_home" msgid="7931555396767513359">"ಮುಖಪುಟ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ko/strings.xml b/packages/ExternalStorageProvider/res/values-ko/strings.xml
index 849d37e..365648d 100644
--- a/packages/ExternalStorageProvider/res/values-ko/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ko/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"외부 저장소"</string>
<string name="root_internal_storage" msgid="827844243068584127">"내부 저장소"</string>
- <string name="root_documents" msgid="4051252304075469250">"문서"</string>
+ <string name="root_home" msgid="7931555396767513359">"홈"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ky-rKG/strings.xml b/packages/ExternalStorageProvider/res/values-ky-rKG/strings.xml
index d3ccf7f1..4a0f211 100644
--- a/packages/ExternalStorageProvider/res/values-ky-rKG/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ky-rKG/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Тышкы сактагыч"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Ички сактагыч"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документтер"</string>
+ <string name="root_home" msgid="7931555396767513359">"Башкы бет"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-lo-rLA/strings.xml b/packages/ExternalStorageProvider/res/values-lo-rLA/strings.xml
index cecd9f5..9de6519 100644
--- a/packages/ExternalStorageProvider/res/values-lo-rLA/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-lo-rLA/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍນອກ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="root_documents" msgid="4051252304075469250">"ເອກະສານ"</string>
+ <string name="root_home" msgid="7931555396767513359">"ໜ້າຫຼັກ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-lt/strings.xml b/packages/ExternalStorageProvider/res/values-lt/strings.xml
index 240ea89..84ca2d4 100644
--- a/packages/ExternalStorageProvider/res/values-lt/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-lt/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Išorinė atmintinė"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Vidinė atmintinė"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumentai"</string>
+ <string name="root_home" msgid="7931555396767513359">"Pagrindinis katalogas"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-lv/strings.xml b/packages/ExternalStorageProvider/res/values-lv/strings.xml
index d308fe8..7eff0b9 100644
--- a/packages/ExternalStorageProvider/res/values-lv/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-lv/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Ārējā krātuve"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Iekšējā atmiņa"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenti"</string>
+ <string name="root_home" msgid="7931555396767513359">"Sākumdirektorijs"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-mk-rMK/strings.xml b/packages/ExternalStorageProvider/res/values-mk-rMK/strings.xml
index 8943d23..fe6b753 100644
--- a/packages/ExternalStorageProvider/res/values-mk-rMK/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-mk-rMK/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Надворешна меморија"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Внатрешна меморија"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документи"</string>
+ <string name="root_home" msgid="7931555396767513359">"Почетна страница"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml
index 08e6dae..5369ec9 100644
--- a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ബാഹ്യ സ്റ്റോറേജ്"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ആന്തരിക സ്റ്റോറേജ്"</string>
- <string name="root_documents" msgid="4051252304075469250">"പ്രമാണങ്ങൾ"</string>
+ <string name="root_home" msgid="7931555396767513359">"വീട്"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-mn-rMN/strings.xml b/packages/ExternalStorageProvider/res/values-mn-rMN/strings.xml
index 3d7b7f7..4604f32 100644
--- a/packages/ExternalStorageProvider/res/values-mn-rMN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-mn-rMN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Гадаад сан"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Дотоод сан"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документүүд"</string>
+ <string name="root_home" msgid="7931555396767513359">"Нүүр хуудас"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-mr-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-mr-rIN/strings.xml
index a7e7fbb..1310b0e 100644
--- a/packages/ExternalStorageProvider/res/values-mr-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-mr-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"बाह्य संचयन"</string>
<string name="root_internal_storage" msgid="827844243068584127">"अंतर्गत संचयन"</string>
- <string name="root_documents" msgid="4051252304075469250">"दस्तऐवज"</string>
+ <string name="root_home" msgid="7931555396767513359">"निवास"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ms-rMY/strings.xml b/packages/ExternalStorageProvider/res/values-ms-rMY/strings.xml
index cb4d736..007a1be 100644
--- a/packages/ExternalStorageProvider/res/values-ms-rMY/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ms-rMY/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Storan Luaran"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Storan dalaman"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumen"</string>
+ <string name="root_home" msgid="7931555396767513359">"Rumah"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-my-rMM/strings.xml b/packages/ExternalStorageProvider/res/values-my-rMM/strings.xml
index dc9d684..2df9a33 100644
--- a/packages/ExternalStorageProvider/res/values-my-rMM/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-my-rMM/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ပြင်ပသိုလှောင်ရာပစ္စည်း"</string>
<string name="root_internal_storage" msgid="827844243068584127">"စက်တွင်း သိုလှောင်ထားမှု"</string>
- <string name="root_documents" msgid="4051252304075469250">"စာရွက်စာတန်းများ"</string>
+ <string name="root_home" msgid="7931555396767513359">"ပင်မ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-nb/strings.xml b/packages/ExternalStorageProvider/res/values-nb/strings.xml
index a9ecb69..315d932 100644
--- a/packages/ExternalStorageProvider/res/values-nb/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-nb/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Ekstern lagring"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Intern lagring"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenter"</string>
+ <string name="root_home" msgid="7931555396767513359">"Hjem"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ne-rNP/strings.xml b/packages/ExternalStorageProvider/res/values-ne-rNP/strings.xml
index 5294043..4a9a8cd 100644
--- a/packages/ExternalStorageProvider/res/values-ne-rNP/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ne-rNP/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"बाह्य भण्डारण"</string>
<string name="root_internal_storage" msgid="827844243068584127">"आन्तरिक भण्डारण"</string>
- <string name="root_documents" msgid="4051252304075469250">"कागजातहरू"</string>
+ <string name="root_home" msgid="7931555396767513359">"गृह"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-nl/strings.xml b/packages/ExternalStorageProvider/res/values-nl/strings.xml
index bde6166..0ae88ce 100644
--- a/packages/ExternalStorageProvider/res/values-nl/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-nl/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Externe opslag"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Interne opslag"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documenten"</string>
+ <string name="root_home" msgid="7931555396767513359">"Startscherm"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-pa-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-pa-rIN/strings.xml
index 0e91589..a805dd8 100644
--- a/packages/ExternalStorageProvider/res/values-pa-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-pa-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ਬਾਹਰੀ ਸਟੋਰੇਜ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
- <string name="root_documents" msgid="4051252304075469250">"ਦਸਤਾਵੇਜ਼"</string>
+ <string name="root_home" msgid="7931555396767513359">"ਘਰ"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-pl/strings.xml b/packages/ExternalStorageProvider/res/values-pl/strings.xml
index 6c5e7d7..66d83c7 100644
--- a/packages/ExternalStorageProvider/res/values-pl/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-pl/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Pamięć zewnętrzna"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Pamięć wewnętrzna"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenty"</string>
+ <string name="root_home" msgid="7931555396767513359">"Katalog domowy"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml b/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml
index 77c89b8..958eef4 100644
--- a/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Armazenamento externo"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Armazenamento interno"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+ <string name="root_home" msgid="7931555396767513359">"Página inicial"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-pt-rPT/strings.xml b/packages/ExternalStorageProvider/res/values-pt-rPT/strings.xml
index 77c89b8..c8865e1 100644
--- a/packages/ExternalStorageProvider/res/values-pt-rPT/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-pt-rPT/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Armazenamento externo"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Armazenamento interno"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+ <string name="root_home" msgid="7931555396767513359">"Casa"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-pt/strings.xml b/packages/ExternalStorageProvider/res/values-pt/strings.xml
index 77c89b8..958eef4 100644
--- a/packages/ExternalStorageProvider/res/values-pt/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-pt/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Armazenamento externo"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Armazenamento interno"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+ <string name="root_home" msgid="7931555396767513359">"Página inicial"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ro/strings.xml b/packages/ExternalStorageProvider/res/values-ro/strings.xml
index abd0b98..5bb4a7c 100644
--- a/packages/ExternalStorageProvider/res/values-ro/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ro/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Stocare externă"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Stocare internă"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documente"</string>
+ <string name="root_home" msgid="7931555396767513359">"Director principal"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ru/strings.xml b/packages/ExternalStorageProvider/res/values-ru/strings.xml
index 740272f..a651371 100644
--- a/packages/ExternalStorageProvider/res/values-ru/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ru/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Внешний накопитель"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Внутренний накопитель"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документы"</string>
+ <string name="root_home" msgid="7931555396767513359">"Мои файлы"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-si-rLK/strings.xml b/packages/ExternalStorageProvider/res/values-si-rLK/strings.xml
index 15334bb..5292403 100644
--- a/packages/ExternalStorageProvider/res/values-si-rLK/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-si-rLK/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"බාහිර ආචයනය"</string>
<string name="root_internal_storage" msgid="827844243068584127">"අභ්යන්තර ආචයනය"</string>
- <string name="root_documents" msgid="4051252304075469250">"ලේඛන"</string>
+ <string name="root_home" msgid="7931555396767513359">"මුල් පිටුව"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sk/strings.xml b/packages/ExternalStorageProvider/res/values-sk/strings.xml
index 9be7b79..5157888 100644
--- a/packages/ExternalStorageProvider/res/values-sk/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-sk/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Externý ukladací priestor"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Interné úložisko"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenty"</string>
+ <string name="root_home" msgid="7931555396767513359">"Predvolený adresár"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sl/strings.xml b/packages/ExternalStorageProvider/res/values-sl/strings.xml
index 6ffa698..dd2cc24 100644
--- a/packages/ExternalStorageProvider/res/values-sl/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-sl/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Zunanja shramba"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Notranja shramba"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumenti"</string>
+ <string name="root_home" msgid="7931555396767513359">"Korenska mapa"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sq-rAL/strings.xml b/packages/ExternalStorageProvider/res/values-sq-rAL/strings.xml
index dc346ea..3aafd1c 100644
--- a/packages/ExternalStorageProvider/res/values-sq-rAL/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-sq-rAL/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Hapësirë e jashtme ruajtjeje"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Hapësira e brendshme ruajtëse"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokumente"</string>
+ <string name="root_home" msgid="7931555396767513359">"Kreu"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sr/strings.xml b/packages/ExternalStorageProvider/res/values-sr/strings.xml
index 54238a4..2d987ef 100644
--- a/packages/ExternalStorageProvider/res/values-sr/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-sr/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Спољна меморија"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Интерна меморија"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документи"</string>
+ <string name="root_home" msgid="7931555396767513359">"Почетни"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sv/strings.xml b/packages/ExternalStorageProvider/res/values-sv/strings.xml
index 6eac11e..bc4788a 100644
--- a/packages/ExternalStorageProvider/res/values-sv/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-sv/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Extern lagring"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Intern lagring"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokument"</string>
+ <string name="root_home" msgid="7931555396767513359">"Hem"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-sw/strings.xml b/packages/ExternalStorageProvider/res/values-sw/strings.xml
index 0d0e483..dcca92a 100644
--- a/packages/ExternalStorageProvider/res/values-sw/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-sw/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Hifadhi ya Nje"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Hifadhi ya ndani"</string>
- <string name="root_documents" msgid="4051252304075469250">"Hati"</string>
+ <string name="root_home" msgid="7931555396767513359">"Mwanzo"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ta-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-ta-rIN/strings.xml
index d7bafbc..b859e7a 100644
--- a/packages/ExternalStorageProvider/res/values-ta-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ta-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"வெளிப்புறச் சேமிப்பிடம்"</string>
<string name="root_internal_storage" msgid="827844243068584127">"அகச் சேமிப்பிடம்"</string>
- <string name="root_documents" msgid="4051252304075469250">"ஆவணங்கள்"</string>
+ <string name="root_home" msgid="7931555396767513359">"முகப்பு"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-te-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-te-rIN/strings.xml
index 800d18e..934877e 100644
--- a/packages/ExternalStorageProvider/res/values-te-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-te-rIN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"బాహ్య నిల్వ"</string>
<string name="root_internal_storage" msgid="827844243068584127">"అంతర్గత నిల్వ"</string>
- <string name="root_documents" msgid="4051252304075469250">"పత్రాలు"</string>
+ <string name="root_home" msgid="7931555396767513359">"హోమ్"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-th/strings.xml b/packages/ExternalStorageProvider/res/values-th/strings.xml
index 796635e..957d6b7 100644
--- a/packages/ExternalStorageProvider/res/values-th/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-th/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"ที่จัดเก็บข้อมูลภายนอก"</string>
<string name="root_internal_storage" msgid="827844243068584127">"ที่จัดเก็บข้อมูลภายใน"</string>
- <string name="root_documents" msgid="4051252304075469250">"เอกสาร"</string>
+ <string name="root_home" msgid="7931555396767513359">"Home"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-tl/strings.xml b/packages/ExternalStorageProvider/res/values-tl/strings.xml
index 529cdc2..be7aebc 100644
--- a/packages/ExternalStorageProvider/res/values-tl/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-tl/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"External Storage"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Internal storage"</string>
- <string name="root_documents" msgid="4051252304075469250">"Mga Dokumento"</string>
+ <string name="root_home" msgid="7931555396767513359">"Home"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-tr/strings.xml b/packages/ExternalStorageProvider/res/values-tr/strings.xml
index d6bd52a..2ce1411 100644
--- a/packages/ExternalStorageProvider/res/values-tr/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-tr/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Harici Depolama"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Dahili depolama"</string>
- <string name="root_documents" msgid="4051252304075469250">"Dokümanlar"</string>
+ <string name="root_home" msgid="7931555396767513359">"Ev"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-uk/strings.xml b/packages/ExternalStorageProvider/res/values-uk/strings.xml
index b8206e0..0033bca 100644
--- a/packages/ExternalStorageProvider/res/values-uk/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-uk/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Зовнішня пам’ять"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Внутрішня пам’ять"</string>
- <string name="root_documents" msgid="4051252304075469250">"Документи"</string>
+ <string name="root_home" msgid="7931555396767513359">"Головний екран"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ur-rPK/strings.xml b/packages/ExternalStorageProvider/res/values-ur-rPK/strings.xml
index 02454bc..df46fb0 100644
--- a/packages/ExternalStorageProvider/res/values-ur-rPK/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ur-rPK/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"بیرونی اسٹوریج"</string>
<string name="root_internal_storage" msgid="827844243068584127">"داخلی اسٹوریج"</string>
- <string name="root_documents" msgid="4051252304075469250">"دستاویزات"</string>
+ <string name="root_home" msgid="7931555396767513359">"ہوم"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-uz-rUZ/strings.xml b/packages/ExternalStorageProvider/res/values-uz-rUZ/strings.xml
index 07cc14c..069e137 100644
--- a/packages/ExternalStorageProvider/res/values-uz-rUZ/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-uz-rUZ/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Tashqi xotira"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Ichki xotira"</string>
- <string name="root_documents" msgid="4051252304075469250">"Hujjatlar"</string>
+ <string name="root_home" msgid="7931555396767513359">"Mening fayllarim"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-vi/strings.xml b/packages/ExternalStorageProvider/res/values-vi/strings.xml
index b171c93..39e9c6c 100644
--- a/packages/ExternalStorageProvider/res/values-vi/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-vi/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Bộ nhớ ngoài"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Bộ nhớ trong"</string>
- <string name="root_documents" msgid="4051252304075469250">"Tài liệu"</string>
+ <string name="root_home" msgid="7931555396767513359">"Nhà riêng"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-zh-rCN/strings.xml b/packages/ExternalStorageProvider/res/values-zh-rCN/strings.xml
index 7df77dd..ea20dce 100644
--- a/packages/ExternalStorageProvider/res/values-zh-rCN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-zh-rCN/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"外部存储设备"</string>
<string name="root_internal_storage" msgid="827844243068584127">"内部存储空间"</string>
- <string name="root_documents" msgid="4051252304075469250">"文档"</string>
+ <string name="root_home" msgid="7931555396767513359">"主目录"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-zh-rHK/strings.xml b/packages/ExternalStorageProvider/res/values-zh-rHK/strings.xml
index 62d8afb..27f1f0a 100644
--- a/packages/ExternalStorageProvider/res/values-zh-rHK/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-zh-rHK/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"外部儲存空間"</string>
<string name="root_internal_storage" msgid="827844243068584127">"內部儲存空間"</string>
- <string name="root_documents" msgid="4051252304075469250">"文件"</string>
+ <string name="root_home" msgid="7931555396767513359">"主目錄"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-zh-rTW/strings.xml b/packages/ExternalStorageProvider/res/values-zh-rTW/strings.xml
index 62d8afb..b2d764a 100644
--- a/packages/ExternalStorageProvider/res/values-zh-rTW/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-zh-rTW/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"外部儲存空間"</string>
<string name="root_internal_storage" msgid="827844243068584127">"內部儲存空間"</string>
- <string name="root_documents" msgid="4051252304075469250">"文件"</string>
+ <string name="root_home" msgid="7931555396767513359">"主畫面"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values-zu/strings.xml b/packages/ExternalStorageProvider/res/values-zu/strings.xml
index 4a0a845..8a7c7df 100644
--- a/packages/ExternalStorageProvider/res/values-zu/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-zu/strings.xml
@@ -18,5 +18,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="7123375275748530234">"Isitoreji sangaphandle"</string>
<string name="root_internal_storage" msgid="827844243068584127">"Isitoreji sangaphakathi"</string>
- <string name="root_documents" msgid="4051252304075469250">"Amadokhumenti"</string>
+ <string name="root_home" msgid="7931555396767513359">"Ekhaya"</string>
</resources>
diff --git a/packages/ExternalStorageProvider/res/values/strings.xml b/packages/ExternalStorageProvider/res/values/strings.xml
index f1c1ade..e48436e 100644
--- a/packages/ExternalStorageProvider/res/values/strings.xml
+++ b/packages/ExternalStorageProvider/res/values/strings.xml
@@ -20,6 +20,6 @@
<!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
<string name="root_internal_storage">Internal storage</string>
- <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
- <string name="root_documents">Documents</string>
+ <!-- Title for user home dir. [CHAR LIMIT=24] -->
+ <string name="root_home">Home</string>
</resources>
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index fcd45f2..2cedc72 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -85,9 +85,11 @@
public String docId;
public File visiblePath;
public File path;
+ public boolean reportAvailableBytes = true;
}
private static final String ROOT_ID_PRIMARY_EMULATED = "primary";
+ private static final String ROOT_ID_HOME = "home";
private StorageManager mStorageManager;
private Handler mHandler;
@@ -118,6 +120,7 @@
private void updateVolumesLocked() {
mRoots.clear();
+ VolumeInfo primaryVolume = null;
final int userId = UserHandle.myUserId();
final List<VolumeInfo> volumes = mStorageManager.getVolumes();
for (VolumeInfo volume : volumes) {
@@ -126,6 +129,9 @@
final String rootId;
final String title;
if (volume.getType() == VolumeInfo.TYPE_EMULATED) {
+ // save off the primary volume for subsequent "Home" dir initialization.
+ primaryVolume = volume;
+
// We currently only support a single emulated volume mounted at
// a time, and it's always considered the primary
rootId = ROOT_ID_PRIMARY_EMULATED;
@@ -152,25 +158,58 @@
continue;
}
+ final RootInfo root = new RootInfo();
+ mRoots.put(rootId, root);
+
+ root.rootId = rootId;
+ root.flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED
+ | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD;
+
+ // Dunno when this would NOT be the case, but never hurts to be correct.
+ if (volume.isMountedWritable()) {
+ root.flags |= Root.FLAG_SUPPORTS_CREATE;
+ }
+ root.title = title;
+ if (volume.getType() == VolumeInfo.TYPE_PUBLIC) {
+ root.flags |= Root.FLAG_HAS_SETTINGS;
+ }
+ if (volume.isVisibleForRead(userId)) {
+ root.visiblePath = volume.getPathForUser(userId);
+ } else {
+ root.visiblePath = null;
+ }
+ root.path = volume.getInternalPathForUser(userId);
try {
- final RootInfo root = new RootInfo();
- mRoots.put(rootId, root);
-
- root.rootId = rootId;
- root.flags = Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED
- | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD;
- root.title = title;
- if (volume.getType() == VolumeInfo.TYPE_PUBLIC) {
- root.flags |= Root.FLAG_HAS_SETTINGS;
- }
- if (volume.isVisibleForRead(userId)) {
- root.visiblePath = volume.getPathForUser(userId);
- } else {
- root.visiblePath = null;
- }
- root.path = volume.getInternalPathForUser(userId);
root.docId = getDocIdForFile(root.path);
+ } catch (FileNotFoundException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ // Finally, if primary storage is available we add the "Home" directory,
+ // creating it as needed.
+ if (primaryVolume != null && primaryVolume.isVisible()) {
+ final RootInfo root = new RootInfo();
+ root.rootId = ROOT_ID_HOME;
+ mRoots.put(root.rootId, root);
+ root.title = getContext().getString(R.string.root_home);
+
+ // Only report bytes on *volumes*...as a matter of policy.
+ root.reportAvailableBytes = false;
+ root.flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_SEARCH
+ | Root.FLAG_SUPPORTS_IS_CHILD;
+
+ // Dunno when this would NOT be the case, but never hurts to be correct.
+ if (primaryVolume.isMountedWritable()) {
+ root.flags |= Root.FLAG_SUPPORTS_CREATE;
+ }
+
+ root.visiblePath = new File(
+ primaryVolume.getPathForUser(userId), root.rootId);
+ root.path = new File(
+ primaryVolume.getInternalPathForUser(userId), root.rootId);
+ try {
+ root.docId = getDocIdForFile(root.path);
} catch (FileNotFoundException e) {
throw new IllegalStateException(e);
}
@@ -312,7 +351,8 @@
row.add(Root.COLUMN_FLAGS, root.flags);
row.add(Root.COLUMN_TITLE, root.title);
row.add(Root.COLUMN_DOCUMENT_ID, root.docId);
- row.add(Root.COLUMN_AVAILABLE_BYTES, root.path.getFreeSpace());
+ row.add(Root.COLUMN_AVAILABLE_BYTES,
+ root.reportAvailableBytes ? root.path.getFreeSpace() : -1);
}
}
return result;
diff --git a/packages/Keyguard/res/values-ja/strings.xml b/packages/Keyguard/res/values-ja/strings.xml
index cea4319..3230beb 100644
--- a/packages/Keyguard/res/values-ja/strings.xml
+++ b/packages/Keyguard/res/values-ja/strings.xml
@@ -110,8 +110,8 @@
<string name="keyguard_carrier_default" msgid="8700650403054042153">"通信サービスはありません。"</string>
<string name="accessibility_ime_switch_button" msgid="5032926134740456424">"入力方法の切り替えボタン。"</string>
<string name="airplane_mode" msgid="3122107900897202805">"機内モード"</string>
- <string name="kg_prompt_reason_restart_pattern" msgid="489430505491862444">"端末を再起動するにはパターンが必要です。"</string>
- <string name="kg_prompt_reason_restart_pin" msgid="994878216570694974">"端末を再起動するにはPINが必要です。"</string>
+ <string name="kg_prompt_reason_restart_pattern" msgid="489430505491862444">"端末を再起動した時にはパターンが必要です。"</string>
+ <string name="kg_prompt_reason_restart_pin" msgid="994878216570694974">"端末を再起動した時にはPINが必要です。"</string>
<string name="kg_prompt_reason_restart_password" msgid="2375742919528461664">"端末を再起動した時にはパスワードが必要です。"</string>
<string name="kg_prompt_reason_timeout_pattern" msgid="8930047492617900785">"セキュリティを強化するため、パターンが必要です。"</string>
<string name="kg_prompt_reason_timeout_pin" msgid="7470468607947726377">"セキュリティを強化するため、PINが必要です。"</string>
diff --git a/packages/Keyguard/res/values/config.xml b/packages/Keyguard/res/values/config.xml
index b398ab2..bde6ed5 100644
--- a/packages/Keyguard/res/values/config.xml
+++ b/packages/Keyguard/res/values/config.xml
@@ -23,9 +23,9 @@
<!-- Allow the menu hard key to be disabled in LockScreen on some devices [DO NOT TRANSLATE] -->
<bool name="config_disableMenuKeyInLockScreen">false</bool>
- <!-- Threshold in micro amperes below which a charger is rated as "slow" -->
- <integer name="config_chargingSlowlyThreshold">1000000</integer>
+ <!-- Threshold in micro watts below which a charger is rated as "slow"; 1A @ 5V -->
+ <integer name="config_chargingSlowlyThreshold">5000000</integer>
- <!-- Threshold in micro amperes above which a charger is rated as "fast" -->
- <integer name="config_chargingFastThreshold">1500000</integer>
+ <!-- Threshold in micro watts above which a charger is rated as "fast"; 1.5A @ 5V -->
+ <integer name="config_chargingFastThreshold">7500000</integer>
</resources>
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 3d78028..8102c34 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -75,6 +75,7 @@
import static android.os.BatteryManager.EXTRA_HEALTH;
import static android.os.BatteryManager.EXTRA_LEVEL;
import static android.os.BatteryManager.EXTRA_MAX_CHARGING_CURRENT;
+import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;
import static android.os.BatteryManager.EXTRA_PLUGGED;
import static android.os.BatteryManager.EXTRA_STATUS;
@@ -155,6 +156,8 @@
*/
private static final int FINGERPRINT_STATE_CANCELLING_RESTARTING = 3;
+ private static final int DEFAULT_CHARGING_VOLTAGE_MICRO_VOLT = 5000000;
+
private static KeyguardUpdateMonitor sInstance;
private final Context mContext;
@@ -617,10 +620,25 @@
final int plugged = intent.getIntExtra(EXTRA_PLUGGED, 0);
final int level = intent.getIntExtra(EXTRA_LEVEL, 0);
final int health = intent.getIntExtra(EXTRA_HEALTH, BATTERY_HEALTH_UNKNOWN);
- final int maxChargingCurrent = intent.getIntExtra(EXTRA_MAX_CHARGING_CURRENT, -1);
+
+ final int maxChargingMicroAmp = intent.getIntExtra(EXTRA_MAX_CHARGING_CURRENT, -1);
+ int maxChargingMicroVolt = intent.getIntExtra(EXTRA_MAX_CHARGING_VOLTAGE, -1);
+ final int maxChargingMicroWatt;
+
+ if (maxChargingMicroVolt <= 0) {
+ maxChargingMicroVolt = DEFAULT_CHARGING_VOLTAGE_MICRO_VOLT;
+ }
+ if (maxChargingMicroAmp > 0) {
+ // Calculating muW = muA * muV / (10^6 mu^2 / mu); splitting up the divisor
+ // to maintain precision equally on both factors.
+ maxChargingMicroWatt = (maxChargingMicroAmp / 1000)
+ * (maxChargingMicroVolt / 1000);
+ } else {
+ maxChargingMicroWatt = -1;
+ }
final Message msg = mHandler.obtainMessage(
MSG_BATTERY_UPDATE, new BatteryStatus(status, level, plugged, health,
- maxChargingCurrent));
+ maxChargingMicroWatt));
mHandler.sendMessage(msg);
} else if (TelephonyIntents.ACTION_SIM_STATE_CHANGED.equals(action)) {
SimData args = SimData.fromIntent(intent);
@@ -806,13 +824,14 @@
public final int level;
public final int plugged;
public final int health;
- public final int maxChargingCurrent;
- public BatteryStatus(int status, int level, int plugged, int health, int maxChargingCurrent) {
+ public final int maxChargingWattage;
+ public BatteryStatus(int status, int level, int plugged, int health,
+ int maxChargingWattage) {
this.status = status;
this.level = level;
this.plugged = plugged;
this.health = health;
- this.maxChargingCurrent = maxChargingCurrent;
+ this.maxChargingWattage = maxChargingWattage;
}
/**
@@ -844,9 +863,9 @@
}
public final int getChargingSpeed(int slowThreshold, int fastThreshold) {
- return maxChargingCurrent <= 0 ? CHARGING_UNKNOWN :
- maxChargingCurrent < slowThreshold ? CHARGING_SLOWLY :
- maxChargingCurrent > fastThreshold ? CHARGING_FAST :
+ return maxChargingWattage <= 0 ? CHARGING_UNKNOWN :
+ maxChargingWattage < slowThreshold ? CHARGING_SLOWLY :
+ maxChargingWattage > fastThreshold ? CHARGING_FAST :
CHARGING_REGULAR;
}
}
@@ -1422,7 +1441,7 @@
}
// change in charging current while plugged in
- if (nowPluggedIn && current.maxChargingCurrent != old.maxChargingCurrent) {
+ if (nowPluggedIn && current.maxChargingWattage != old.maxChargingWattage) {
return true;
}
diff --git a/packages/MtpDocumentsProvider/res/drawable-hdpi/ic_root_mtp.png b/packages/MtpDocumentsProvider/res/drawable-hdpi/ic_root_mtp.png
new file mode 100644
index 0000000..7691433
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/drawable-hdpi/ic_root_mtp.png
Binary files differ
diff --git a/packages/MtpDocumentsProvider/res/drawable-mdpi/ic_root_mtp.png b/packages/MtpDocumentsProvider/res/drawable-mdpi/ic_root_mtp.png
new file mode 100644
index 0000000..1cf7b3a
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/drawable-mdpi/ic_root_mtp.png
Binary files differ
diff --git a/packages/MtpDocumentsProvider/res/drawable-xhdpi/ic_root_mtp.png b/packages/MtpDocumentsProvider/res/drawable-xhdpi/ic_root_mtp.png
new file mode 100644
index 0000000..27e3542
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/drawable-xhdpi/ic_root_mtp.png
Binary files differ
diff --git a/packages/MtpDocumentsProvider/res/drawable-xxhdpi/ic_root_mtp.png b/packages/MtpDocumentsProvider/res/drawable-xxhdpi/ic_root_mtp.png
new file mode 100644
index 0000000..3df2578b
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/drawable-xxhdpi/ic_root_mtp.png
Binary files differ
diff --git a/packages/MtpDocumentsProvider/res/drawable-xxxhdpi/ic_root_mtp.png b/packages/MtpDocumentsProvider/res/drawable-xxxhdpi/ic_root_mtp.png
new file mode 100644
index 0000000..fd2b795
--- /dev/null
+++ b/packages/MtpDocumentsProvider/res/drawable-xxxhdpi/ic_root_mtp.png
Binary files differ
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java b/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java
deleted file mode 100644
index 844b216..0000000
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2015 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.mtp;
-
-import android.content.res.Resources;
-import android.database.MatrixCursor;
-import android.media.MediaFile;
-import android.mtp.MtpConstants;
-import android.mtp.MtpObjectInfo;
-import android.provider.DocumentsContract;
-import android.provider.DocumentsContract.Document;
-
-/**
- * TODO Remove this class after we switch to use MtpDatabase.
- */
-final class CursorHelper {
- static final int DUMMY_HANDLE_FOR_ROOT = 0;
-
- private CursorHelper() {
- }
-
- static void addToCursor(Resources resources, MtpRoot root, MatrixCursor.RowBuilder builder) {
- final Identifier identifier = new Identifier(
- root.mDeviceId, root.mStorageId, DUMMY_HANDLE_FOR_ROOT);
- builder.add(Document.COLUMN_DOCUMENT_ID, identifier.toDocumentId());
- builder.add(Document.COLUMN_DISPLAY_NAME, root.getRootName(resources));
- builder.add(Document.COLUMN_MIME_TYPE, DocumentsContract.Document.MIME_TYPE_DIR);
- builder.add(Document.COLUMN_LAST_MODIFIED, null);
- builder.add(Document.COLUMN_FLAGS, 0);
- builder.add(Document.COLUMN_SIZE,
- (int) Math.min(root.mMaxCapacity - root.mFreeSpace, Integer.MAX_VALUE));
- }
-
- static void addToCursor(MtpObjectInfo objectInfo, Identifier rootIdentifier,
- MatrixCursor.RowBuilder builder) {
- final Identifier identifier = new Identifier(
- rootIdentifier.mDeviceId, rootIdentifier.mStorageId, objectInfo.getObjectHandle());
- final String mimeType = formatTypeToMimeType(objectInfo.getFormat());
-
- int flag = 0;
- if (objectInfo.getProtectionStatus() == 0) {
- flag |= DocumentsContract.Document.FLAG_SUPPORTS_DELETE |
- DocumentsContract.Document.FLAG_SUPPORTS_WRITE;
- if (mimeType == DocumentsContract.Document.MIME_TYPE_DIR) {
- flag |= DocumentsContract.Document.FLAG_DIR_SUPPORTS_CREATE;
- }
- }
- if (objectInfo.getThumbCompressedSize() > 0) {
- flag |= DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL;
- }
-
- builder.add(Document.COLUMN_DOCUMENT_ID, identifier.toDocumentId());
- builder.add(Document.COLUMN_DISPLAY_NAME, objectInfo.getName());
- builder.add(Document.COLUMN_MIME_TYPE, mimeType);
- builder.add(
- Document.COLUMN_LAST_MODIFIED,
- objectInfo.getDateModified() != 0 ? objectInfo.getDateModified() : null);
- builder.add(Document.COLUMN_FLAGS, flag);
- builder.add(Document.COLUMN_SIZE, objectInfo.getCompressedSize());
- }
-
- static String formatTypeToMimeType(int format) {
- if (format == MtpConstants.FORMAT_ASSOCIATION) {
- return DocumentsContract.Document.MIME_TYPE_DIR;
- } else {
- return MediaFile.getMimeTypeForFormatCode(format);
- }
- }
-
- static int mimeTypeToFormatType(String fileName, String mimeType) {
- if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- return MtpConstants.FORMAT_ASSOCIATION;
- } else {
- return MediaFile.getFormatCode(fileName, mimeType);
- }
- }
-}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java b/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java
index 0d4265a..6fa0df2 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java
@@ -18,14 +18,14 @@
import android.content.ContentResolver;
import android.database.Cursor;
-import android.database.MatrixCursor;
+import android.database.sqlite.SQLiteException;
import android.mtp.MtpObjectInfo;
import android.net.Uri;
import android.os.Bundle;
import android.os.Process;
import android.provider.DocumentsContract;
-import android.util.Log;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
@@ -44,12 +44,14 @@
private final MtpManager mMtpManager;
private final ContentResolver mResolver;
+ private final MtpDatabase mDatabase;
private final TaskList mTaskList = new TaskList();
private boolean mHasBackgroundThread = false;
- DocumentLoader(MtpManager mtpManager, ContentResolver resolver) {
+ DocumentLoader(MtpManager mtpManager, ContentResolver resolver, MtpDatabase database) {
mMtpManager = mtpManager;
mResolver = resolver;
+ mDatabase = database;
}
private static MtpObjectInfo[] loadDocuments(MtpManager manager, int deviceId, int[] handles)
@@ -65,13 +67,23 @@
throws IOException {
LoaderTask task = mTaskList.findTask(parent);
if (task == null) {
+ if (parent.mDocumentId == null) {
+ throw new FileNotFoundException("Parent not found.");
+ }
+
int parentHandle = parent.mObjectHandle;
// Need to pass the special value MtpManager.OBJECT_HANDLE_ROOT_CHILDREN to
// getObjectHandles if we would like to obtain children under the root.
- if (parentHandle == CursorHelper.DUMMY_HANDLE_FOR_ROOT) {
+ if (parentHandle == Identifier.DUMMY_HANDLE_FOR_ROOT) {
parentHandle = MtpManager.OBJECT_HANDLE_ROOT_CHILDREN;
}
- task = new LoaderTask(parent, mMtpManager.getObjectHandles(
+ // TODO: Handle nit race around here.
+ // 1. getObjectHandles.
+ // 2. putNewDocument.
+ // 3. startAddingChildDocuemnts.
+ // 4. stopAddingChildDocuments - It removes the new document added at the step 2,
+ // because it is not updated between start/stopAddingChildDocuments.
+ task = new LoaderTask(mDatabase, parent, mMtpManager.getObjectHandles(
parent.mDeviceId, parent.mStorageId, parentHandle));
task.fillDocuments(loadDocuments(
mMtpManager,
@@ -83,11 +95,10 @@
}
mTaskList.addFirst(task);
- if (!task.completed() && !mHasBackgroundThread) {
+ if (task.getState() == LoaderTask.STATE_LOADING && !mHasBackgroundThread) {
mHasBackgroundThread = true;
new BackgroundLoaderThread().start();
}
-
return task.createCursor(mResolver, columnNames);
}
@@ -120,26 +131,20 @@
deviceId = task.mIdentifier.mDeviceId;
handles = task.getUnloadedObjectHandles(NUM_LOADING_ENTRIES);
}
- MtpObjectInfo[] objectInfos;
+
try {
- objectInfos = loadDocuments(mMtpManager, deviceId, handles);
- } catch (IOException exception) {
- objectInfos = null;
- Log.d(MtpDocumentsProvider.TAG, exception.getMessage());
- }
- synchronized (DocumentLoader.this) {
- if (objectInfos != null) {
- task.fillDocuments(objectInfos);
- final boolean shouldNotify =
- task.mLastNotified.getTime() <
- new Date().getTime() - NOTIFY_PERIOD_MS ||
- task.completed();
- if (shouldNotify) {
- task.notify(mResolver);
- }
- } else {
- mTaskList.remove(task);
+ final MtpObjectInfo[] objectInfos =
+ loadDocuments(mMtpManager, deviceId, handles);
+ task.fillDocuments(objectInfos);
+ final boolean shouldNotify =
+ task.mLastNotified.getTime() <
+ new Date().getTime() - NOTIFY_PERIOD_MS ||
+ task.getState() != LoaderTask.STATE_LOADING;
+ if (shouldNotify) {
+ task.notify(mResolver);
}
+ } catch (IOException exception) {
+ task.setError(exception);
}
}
}
@@ -156,7 +161,7 @@
LoaderTask findRunningTask() {
for (int i = 0; i < size(); i++) {
- if (!get(i).completed())
+ if (get(i).getState() == LoaderTask.STATE_LOADING)
return get(i);
}
return null;
@@ -165,7 +170,7 @@
void clearCompletedTasks() {
int i = 0;
while (i < size()) {
- if (get(i).completed()) {
+ if (get(i).getState() == LoaderTask.STATE_COMPLETED) {
remove(i);
} else {
i++;
@@ -186,36 +191,51 @@
}
private static class LoaderTask {
+ static final int STATE_LOADING = 0;
+ static final int STATE_COMPLETED = 1;
+ static final int STATE_ERROR = 2;
+
+ final MtpDatabase mDatabase;
final Identifier mIdentifier;
final int[] mObjectHandles;
- final MtpObjectInfo[] mObjectInfos;
Date mLastNotified;
int mNumLoaded;
+ Exception mError;
- LoaderTask(Identifier identifier, int[] objectHandles) {
+ LoaderTask(MtpDatabase database, Identifier identifier, int[] objectHandles) {
+ mDatabase = database;
mIdentifier = identifier;
mObjectHandles = objectHandles;
- mObjectInfos = new MtpObjectInfo[mObjectHandles.length];
mNumLoaded = 0;
mLastNotified = new Date();
}
- Cursor createCursor(ContentResolver resolver, String[] columnNames) {
- final MatrixCursor cursor = new MatrixCursor(columnNames);
- final Identifier rootIdentifier = new Identifier(
- mIdentifier.mDeviceId, mIdentifier.mStorageId);
- for (int i = 0; i < mNumLoaded; i++) {
- CursorHelper.addToCursor(mObjectInfos[i], rootIdentifier, cursor.newRow());
- }
+ Cursor createCursor(ContentResolver resolver, String[] columnNames) throws IOException {
final Bundle extras = new Bundle();
- extras.putBoolean(DocumentsContract.EXTRA_LOADING, !completed());
+ switch (getState()) {
+ case STATE_LOADING:
+ extras.putBoolean(DocumentsContract.EXTRA_LOADING, true);
+ break;
+ case STATE_ERROR:
+ throw new IOException(mError);
+ }
+
+ final Cursor cursor =
+ mDatabase.queryChildDocuments(columnNames, mIdentifier.mDocumentId);
cursor.setNotificationUri(resolver, createUri());
cursor.respond(extras);
+
return cursor;
}
- boolean completed() {
- return mNumLoaded == mObjectInfos.length;
+ int getState() {
+ if (mError != null) {
+ return STATE_ERROR;
+ } else if (mNumLoaded == mObjectHandles.length) {
+ return STATE_COMPLETED;
+ } else {
+ return STATE_LOADING;
+ }
}
int[] getUnloadedObjectHandles(int count) {
@@ -230,15 +250,38 @@
mLastNotified = new Date();
}
- void fillDocuments(MtpObjectInfo[] objectInfos) {
- for (int i = 0; i < objectInfos.length; i++) {
- mObjectInfos[mNumLoaded++] = objectInfos[i];
+ void fillDocuments(MtpObjectInfo[] objectInfoList) {
+ if (objectInfoList.length == 0 || getState() != STATE_LOADING) {
+ return;
+ }
+ if (mNumLoaded == 0) {
+ mDatabase.getMapper().startAddingChildDocuments(mIdentifier.mDocumentId);
+ }
+ try {
+ mDatabase.getMapper().putChildDocuments(
+ mIdentifier.mDeviceId, mIdentifier.mDocumentId, objectInfoList);
+ mNumLoaded += objectInfoList.length;
+ } catch (SQLiteException exp) {
+ mError = exp;
+ mNumLoaded = 0;
+ }
+ if (getState() != STATE_LOADING) {
+ mDatabase.getMapper().stopAddingChildDocuments(mIdentifier.mDocumentId);
+ }
+ }
+
+ void setError(Exception message) {
+ final int lastState = getState();
+ mError = message;
+ mNumLoaded = 0;
+ if (lastState == STATE_LOADING) {
+ mDatabase.getMapper().stopAddingChildDocuments(mIdentifier.mDocumentId);
}
}
private Uri createUri() {
return DocumentsContract.buildChildDocumentsUri(
- MtpDocumentsProvider.AUTHORITY, mIdentifier.toDocumentId());
+ MtpDocumentsProvider.AUTHORITY, mIdentifier.mDocumentId);
}
}
}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java b/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java
index ae29f52..20b3bf5 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/Identifier.java
@@ -16,48 +16,24 @@
package com.android.mtp;
+import java.util.Objects;
+
/**
* Static utilities for ID.
*/
class Identifier {
+ final static int DUMMY_HANDLE_FOR_ROOT = 0;
+
final int mDeviceId;
final int mStorageId;
final int mObjectHandle;
+ final String mDocumentId;
- static Identifier createFromRootId(String rootId) {
- final String[] components = rootId.split("_");
- return new Identifier(
- Integer.parseInt(components[0]),
- Integer.parseInt(components[1]));
- }
-
- static Identifier createFromDocumentId(String documentId) {
- final String[] components = documentId.split("_");
- return new Identifier(
- Integer.parseInt(components[0]),
- Integer.parseInt(components[1]),
- Integer.parseInt(components[2]));
- }
-
-
- Identifier(int deviceId, int storageId) {
- this(deviceId, storageId, CursorHelper.DUMMY_HANDLE_FOR_ROOT);
- }
-
- Identifier(int deviceId, int storageId, int objectHandle) {
+ Identifier(int deviceId, int storageId, int objectHandle, String documentId) {
mDeviceId = deviceId;
mStorageId = storageId;
mObjectHandle = objectHandle;
- }
-
- // TODO: Make the ID persistent.
- String toRootId() {
- return String.format("%d_%d", mDeviceId, mStorageId);
- }
-
- // TODO: Make the ID persistent.
- String toDocumentId() {
- return String.format("%d_%d_%d", mDeviceId, mStorageId, mObjectHandle);
+ mDocumentId = documentId;
}
@Override
@@ -71,6 +47,6 @@
@Override
public int hashCode() {
- return (mDeviceId << 16) ^ (mStorageId << 8) ^ mObjectHandle;
+ return Objects.hash(mDeviceId, mStorageId, mObjectHandle, mDocumentId);
}
}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java b/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java
new file mode 100644
index 0000000..0d9d60c
--- /dev/null
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java
@@ -0,0 +1,513 @@
+/*
+ * Copyright (C) 2015 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.mtp;
+
+import static com.android.mtp.MtpDatabaseConstants.*;
+
+import android.content.ContentValues;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+import android.mtp.MtpObjectInfo;
+import android.provider.DocumentsContract.Document;
+import android.provider.DocumentsContract.Root;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.Preconditions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.android.mtp.MtpDatabase.strings;
+
+
+/**
+ * Mapping operations for MtpDatabase.
+ * Also see the comments of {@link MtpDatabase}.
+ */
+class Mapper {
+ private final MtpDatabase mDatabase;
+
+ /**
+ * Mapping mode for roots/documents where we start adding child documents.
+ * Methods operate the state needs to be synchronized.
+ */
+ private final Map<String, Integer> mMappingMode = new HashMap<>();
+
+ Mapper(MtpDatabase database) {
+ mDatabase = database;
+ }
+
+ /**
+ * Invokes {@link #startAddingDocuments} for root documents.
+ * @param deviceId Device ID.
+ */
+ synchronized void startAddingRootDocuments(int deviceId) {
+ final String mappingStateKey = getRootDocumentsMappingStateKey(deviceId);
+ Preconditions.checkState(!mMappingMode.containsKey(mappingStateKey));
+ mMappingMode.put(
+ mappingStateKey,
+ startAddingDocuments(
+ SELECTION_ROOT_DOCUMENTS, Integer.toString(deviceId)));
+ }
+
+ /**
+ * Invokes {@link #startAddingDocuments} for child of specific documents.
+ * @param parentDocumentId Document ID for parent document.
+ */
+ @VisibleForTesting
+ synchronized void startAddingChildDocuments(String parentDocumentId) {
+ final String mappingStateKey = getChildDocumentsMappingStateKey(parentDocumentId);
+ Preconditions.checkState(!mMappingMode.containsKey(mappingStateKey));
+ mMappingMode.put(
+ mappingStateKey,
+ startAddingDocuments(SELECTION_CHILD_DOCUMENTS, parentDocumentId));
+ }
+
+ /**
+ * Puts root information to database.
+ * @param deviceId Device ID
+ * @param resources Resources required to localize root name.
+ * @param roots List of root information.
+ * @return If roots are added or removed from the database.
+ */
+ synchronized boolean putRootDocuments(int deviceId, Resources resources, MtpRoot[] roots) {
+ final SQLiteDatabase database = mDatabase.getSQLiteDatabase();
+ database.beginTransaction();
+ try {
+ final boolean heuristic;
+ final String mapColumn;
+ final String key = getRootDocumentsMappingStateKey(deviceId);
+ Preconditions.checkState(mMappingMode.containsKey(key));
+ switch (mMappingMode.get(key)) {
+ case MAP_BY_MTP_IDENTIFIER:
+ heuristic = false;
+ mapColumn = COLUMN_STORAGE_ID;
+ break;
+ case MAP_BY_NAME:
+ heuristic = true;
+ mapColumn = Document.COLUMN_DISPLAY_NAME;
+ break;
+ default:
+ throw new Error("Unexpected map mode.");
+ }
+ final ContentValues[] valuesList = new ContentValues[roots.length];
+ for (int i = 0; i < roots.length; i++) {
+ if (roots[i].mDeviceId != deviceId) {
+ throw new IllegalArgumentException();
+ }
+ valuesList[i] = new ContentValues();
+ MtpDatabase.getRootDocumentValues(valuesList[i], resources, roots[i]);
+ }
+ final boolean changed = putDocuments(
+ valuesList,
+ SELECTION_ROOT_DOCUMENTS,
+ Integer.toString(deviceId),
+ heuristic,
+ mapColumn);
+ final ContentValues values = new ContentValues();
+ int i = 0;
+ for (final MtpRoot root : roots) {
+ // Use the same value for the root ID and the corresponding document ID.
+ final String documentId = valuesList[i++].getAsString(Document.COLUMN_DOCUMENT_ID);
+ // If it fails to insert/update documents, the document ID will be set with -1.
+ // In this case we don't insert/update root extra information neither.
+ if (documentId == null) {
+ continue;
+ }
+ values.put(Root.COLUMN_ROOT_ID, documentId);
+ values.put(
+ Root.COLUMN_FLAGS,
+ Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE);
+ values.put(Root.COLUMN_AVAILABLE_BYTES, root.mFreeSpace);
+ values.put(Root.COLUMN_CAPACITY_BYTES, root.mMaxCapacity);
+ values.put(Root.COLUMN_MIME_TYPES, "");
+ database.replace(TABLE_ROOT_EXTRA, null, values);
+ }
+ database.setTransactionSuccessful();
+ return changed;
+ } finally {
+ database.endTransaction();
+ }
+ }
+
+ /**
+ * Puts document information to database.
+ * @param deviceId Device ID
+ * @param parentId Parent document ID.
+ * @param documents List of document information.
+ */
+ synchronized void putChildDocuments(int deviceId, String parentId, MtpObjectInfo[] documents) {
+ final boolean heuristic;
+ final String mapColumn;
+ final String key = getChildDocumentsMappingStateKey(parentId);
+ Preconditions.checkState(mMappingMode.containsKey(key));
+ switch (mMappingMode.get(key)) {
+ case MAP_BY_MTP_IDENTIFIER:
+ heuristic = false;
+ mapColumn = COLUMN_OBJECT_HANDLE;
+ break;
+ case MAP_BY_NAME:
+ heuristic = true;
+ mapColumn = Document.COLUMN_DISPLAY_NAME;
+ break;
+ default:
+ throw new Error("Unexpected map mode.");
+ }
+ final ContentValues[] valuesList = new ContentValues[documents.length];
+ for (int i = 0; i < documents.length; i++) {
+ valuesList[i] = new ContentValues();
+ MtpDatabase.getChildDocumentValues(
+ valuesList[i], deviceId, parentId, documents[i]);
+ }
+ putDocuments(
+ valuesList, SELECTION_CHILD_DOCUMENTS, parentId, heuristic, mapColumn);
+ }
+
+ /**
+ * Stops adding root documents.
+ * @param deviceId Device ID.
+ * @return True if new rows are added/removed.
+ */
+ synchronized boolean stopAddingRootDocuments(int deviceId) {
+ final String key = getRootDocumentsMappingStateKey(deviceId);
+ Preconditions.checkState(mMappingMode.containsKey(key));
+ switch (mMappingMode.get(key)) {
+ case MAP_BY_MTP_IDENTIFIER:
+ mMappingMode.remove(key);
+ return stopAddingDocuments(
+ SELECTION_ROOT_DOCUMENTS,
+ Integer.toString(deviceId),
+ COLUMN_STORAGE_ID);
+ case MAP_BY_NAME:
+ mMappingMode.remove(key);
+ return stopAddingDocuments(
+ SELECTION_ROOT_DOCUMENTS,
+ Integer.toString(deviceId),
+ Document.COLUMN_DISPLAY_NAME);
+ default:
+ throw new Error("Unexpected mapping state.");
+ }
+ }
+
+ /**
+ * Stops adding documents under the parent.
+ * @param parentId Document ID of the parent.
+ */
+ synchronized void stopAddingChildDocuments(String parentId) {
+ final String key = getChildDocumentsMappingStateKey(parentId);
+ Preconditions.checkState(mMappingMode.containsKey(key));
+ switch (mMappingMode.get(key)) {
+ case MAP_BY_MTP_IDENTIFIER:
+ stopAddingDocuments(
+ SELECTION_CHILD_DOCUMENTS,
+ parentId,
+ COLUMN_OBJECT_HANDLE);
+ break;
+ case MAP_BY_NAME:
+ stopAddingDocuments(
+ SELECTION_CHILD_DOCUMENTS,
+ parentId,
+ Document.COLUMN_DISPLAY_NAME);
+ break;
+ default:
+ throw new Error("Unexpected mapping state.");
+ }
+ mMappingMode.remove(key);
+ }
+
+ @VisibleForTesting
+ void clearMapping() {
+ final SQLiteDatabase database = mDatabase.getSQLiteDatabase();
+ database.beginTransaction();
+ try {
+ mDatabase.deleteDocumentsAndRootsRecursively(
+ COLUMN_ROW_STATE + " = ?", strings(ROW_STATE_PENDING));
+ final ContentValues values = new ContentValues();
+ values.putNull(COLUMN_OBJECT_HANDLE);
+ values.putNull(COLUMN_STORAGE_ID);
+ values.put(COLUMN_ROW_STATE, ROW_STATE_INVALIDATED);
+ database.update(TABLE_DOCUMENTS, values, null, null);
+ database.setTransactionSuccessful();
+ mMappingMode.clear();
+ } finally {
+ database.endTransaction();
+ }
+ }
+
+ /**
+ * Starts adding new documents.
+ * The methods decides mapping mode depends on if all documents under the given parent have MTP
+ * identifier or not. If all the documents have MTP identifier, it uses the identifier to find
+ * a corresponding existing row. Otherwise it does heuristic.
+ *
+ * @param selection Query matches valid documents.
+ * @param arg Argument for selection.
+ * @return Mapping mode.
+ */
+ private int startAddingDocuments(String selection, String arg) {
+ final SQLiteDatabase database = mDatabase.getSQLiteDatabase();
+ database.beginTransaction();
+ try {
+ // Delete all pending rows.
+ mDatabase.deleteDocumentsAndRootsRecursively(
+ selection + " AND " + COLUMN_ROW_STATE + "=?", strings(arg, ROW_STATE_PENDING));
+
+ // Set all documents as invalidated.
+ final ContentValues values = new ContentValues();
+ values.put(COLUMN_ROW_STATE, ROW_STATE_INVALIDATED);
+ database.update(TABLE_DOCUMENTS, values, selection, new String[] { arg });
+
+ // If we have rows that does not have MTP identifier, do heuristic mapping by name.
+ final boolean useNameForResolving = DatabaseUtils.queryNumEntries(
+ database,
+ TABLE_DOCUMENTS,
+ selection + " AND " + COLUMN_STORAGE_ID + " IS NULL",
+ new String[] { arg }) > 0;
+ database.setTransactionSuccessful();
+ return useNameForResolving ? MAP_BY_NAME : MAP_BY_MTP_IDENTIFIER;
+ } finally {
+ database.endTransaction();
+ }
+ }
+
+ /**
+ * Puts the documents into the database.
+ * If the mapping mode is not heuristic, it just adds the rows to the database or updates the
+ * existing rows with the new values. If the mapping mode is heuristic, it adds some new rows as
+ * 'pending' state when that rows may be corresponding to existing 'invalidated' rows. Then
+ * {@link #stopAddingDocuments(String, String, String)} turns the pending rows into 'valid'
+ * rows. If the methods adds rows to database, it updates valueList with correct document ID.
+ *
+ * @param valuesList Values for documents to be stored in the database.
+ * @param selection SQL where closure to select rows that shares the same parent.
+ * @param arg Argument for selection SQL.
+ * @param heuristic Whether the mapping mode is heuristic.
+ * @return Whether the method adds new rows.
+ */
+ private boolean putDocuments(
+ ContentValues[] valuesList,
+ String selection,
+ String arg,
+ boolean heuristic,
+ String mappingKey) {
+ final SQLiteDatabase database = mDatabase.getSQLiteDatabase();
+ boolean added = false;
+ database.beginTransaction();
+ try {
+ for (final ContentValues values : valuesList) {
+ final Cursor candidateCursor = database.query(
+ TABLE_DOCUMENTS,
+ strings(Document.COLUMN_DOCUMENT_ID),
+ selection + " AND " +
+ COLUMN_ROW_STATE + "=? AND " +
+ mappingKey + "=?",
+ strings(arg, ROW_STATE_INVALIDATED, values.getAsString(mappingKey)),
+ null,
+ null,
+ null,
+ "1");
+ try {
+ final long rowId;
+ if (candidateCursor.getCount() == 0) {
+ rowId = database.insert(TABLE_DOCUMENTS, null, values);
+ if (rowId == -1) {
+ throw new SQLiteException("Failed to put a document into database.");
+ }
+ added = true;
+ } else if (!heuristic) {
+ candidateCursor.moveToNext();
+ final String documentId = candidateCursor.getString(0);
+ rowId = database.update(
+ TABLE_DOCUMENTS,
+ values,
+ SELECTION_DOCUMENT_ID,
+ strings(documentId));
+ } else {
+ values.put(COLUMN_ROW_STATE, ROW_STATE_PENDING);
+ rowId = database.insert(TABLE_DOCUMENTS, null, values);
+ }
+ // Document ID is a primary integer key of the table. So the returned row
+ // IDs should be same with the document ID.
+ values.put(Document.COLUMN_DOCUMENT_ID, rowId);
+ } finally {
+ candidateCursor.close();
+ }
+ }
+
+ database.setTransactionSuccessful();
+ return added;
+ } finally {
+ database.endTransaction();
+ }
+ }
+
+ /**
+ * Maps 'pending' document and 'invalidated' document that shares the same column of groupKey.
+ * If the database does not find corresponding 'invalidated' document, it just removes
+ * 'invalidated' document from the database.
+ * @param selection Query to select rows for resolving.
+ * @param arg Argument for selection SQL.
+ * @param groupKey Column name used to find corresponding rows.
+ * @return Whether the methods adds or removed visible rows.
+ */
+ private boolean stopAddingDocuments(String selection, String arg, String groupKey) {
+ final SQLiteDatabase database = mDatabase.getSQLiteDatabase();
+ database.beginTransaction();
+ try {
+ // Get 1-to-1 mapping of invalidated document and pending document.
+ final String invalidatedIdQuery = createStateFilter(
+ ROW_STATE_INVALIDATED, Document.COLUMN_DOCUMENT_ID);
+ final String pendingIdQuery = createStateFilter(
+ ROW_STATE_PENDING, Document.COLUMN_DOCUMENT_ID);
+ // SQL should be like:
+ // SELECT group_concat(CASE WHEN raw_state = 1 THEN document_id ELSE NULL END),
+ // group_concat(CASE WHEN raw_state = 2 THEN document_id ELSE NULL END)
+ // WHERE device_id = ? AND parent_document_id IS NULL
+ // GROUP BY display_name
+ // HAVING count(CASE WHEN raw_state = 1 THEN document_id ELSE NULL END) = 1 AND
+ // count(CASE WHEN raw_state = 2 THEN document_id ELSE NULL END) = 1
+ final Cursor mergingCursor = database.query(
+ TABLE_DOCUMENTS,
+ new String[] {
+ "group_concat(" + invalidatedIdQuery + ")",
+ "group_concat(" + pendingIdQuery + ")"
+ },
+ selection,
+ strings(arg),
+ groupKey,
+ "count(" + invalidatedIdQuery + ") = 1 AND count(" + pendingIdQuery + ") = 1",
+ null);
+
+ final ContentValues values = new ContentValues();
+ while (mergingCursor.moveToNext()) {
+ final String invalidatedId = mergingCursor.getString(0);
+ final String pendingId = mergingCursor.getString(1);
+
+ // Obtain the new values including the latest object handle from mapping row.
+ getFirstRow(
+ TABLE_DOCUMENTS,
+ SELECTION_DOCUMENT_ID,
+ new String[] { pendingId },
+ values);
+ values.remove(Document.COLUMN_DOCUMENT_ID);
+ values.put(COLUMN_ROW_STATE, ROW_STATE_VALID);
+ database.update(
+ TABLE_DOCUMENTS,
+ values,
+ SELECTION_DOCUMENT_ID,
+ new String[] { invalidatedId });
+
+ getFirstRow(
+ TABLE_ROOT_EXTRA,
+ SELECTION_ROOT_ID,
+ new String[] { pendingId },
+ values);
+ if (values.size() > 0) {
+ values.remove(Root.COLUMN_ROOT_ID);
+ database.update(
+ TABLE_ROOT_EXTRA,
+ values,
+ SELECTION_ROOT_ID,
+ new String[] { invalidatedId });
+ }
+
+ // Delete 'pending' row.
+ mDatabase.deleteDocumentsAndRootsRecursively(
+ SELECTION_DOCUMENT_ID, new String[] { pendingId });
+ }
+ mergingCursor.close();
+
+ boolean changed = false;
+
+ // Delete all invalidated rows that cannot be mapped.
+ if (mDatabase.deleteDocumentsAndRootsRecursively(
+ COLUMN_ROW_STATE + " = ? AND " + selection,
+ strings(ROW_STATE_INVALIDATED, arg))) {
+ changed = true;
+ }
+
+ // The database cannot find old document ID for the pending rows.
+ // Turn the all pending rows into valid state, which means the rows become to be
+ // valid with new document ID.
+ values.clear();
+ values.put(COLUMN_ROW_STATE, ROW_STATE_VALID);
+ if (database.update(
+ TABLE_DOCUMENTS,
+ values,
+ COLUMN_ROW_STATE + " = ? AND " + selection,
+ strings(ROW_STATE_PENDING, arg)) != 0) {
+ changed = true;
+ }
+ database.setTransactionSuccessful();
+ return changed;
+ } finally {
+ database.endTransaction();
+ }
+ }
+
+ /**
+ * Obtains values of the first row for the query.
+ * @param values ContentValues that the values are stored to.
+ * @param table Target table.
+ * @param selection Query to select rows.
+ * @param args Argument for query.
+ */
+ private void getFirstRow(String table, String selection, String[] args, ContentValues values) {
+ final SQLiteDatabase database = mDatabase.getSQLiteDatabase();
+ values.clear();
+ final Cursor cursor = database.query(table, null, selection, args, null, null, null, "1");
+ if (cursor.getCount() == 0) {
+ return;
+ }
+ cursor.moveToNext();
+ DatabaseUtils.cursorRowToContentValues(cursor, values);
+ cursor.close();
+ }
+
+ /**
+ * Gets SQL expression that represents the given value or NULL depends on the row state.
+ * You must pass static constants to this methods otherwise you may be suffered from SQL
+ * injections.
+ * @param state Expected row state.
+ * @param a SQL value.
+ * @return Expression that represents a if the row state is expected one, and represents NULL
+ * otherwise.
+ */
+ private static String createStateFilter(int state, String a) {
+ return "CASE WHEN " + COLUMN_ROW_STATE + " = " + Integer.toString(state) +
+ " THEN " + a + " ELSE NULL END";
+ }
+
+ /**
+ * @param deviceId Device ID.
+ * @return Key for {@link #mMappingMode}.
+ */
+ private static String getRootDocumentsMappingStateKey(int deviceId) {
+ return "RootDocuments/" + deviceId;
+ }
+
+ /**
+ * @param parentDocumentId Document ID for the parent document.
+ * @return Key for {@link #mMappingMode}.
+ */
+ private static String getChildDocumentsMappingStateKey(String parentDocumentId) {
+ return "ChildDocuments/" + parentDocumentId;
+ }
+}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
index e3be534..51c0281 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
@@ -22,14 +22,22 @@
import android.content.Context;
import android.content.res.Resources;
import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.media.MediaFile;
+import android.mtp.MtpConstants;
import android.mtp.MtpObjectInfo;
+import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
import android.provider.DocumentsContract.Root;
import com.android.internal.annotations.VisibleForTesting;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Objects;
/**
* Database for MTP objects.
@@ -45,13 +53,13 @@
* by comparing the directory structure and object name.
*
* To start putting documents into the database, the client needs to call
- * {@link #startAddingChildDocuments(String)} with the parent document ID. Also it needs to call
- * {@link #stopAddingChildDocuments(String)} after putting all child documents to the database.
- * (All explanations are same for root documents)
+ * {@link Mapper#startAddingChildDocuments(String)} with the parent document ID. Also it
+ * needs to call {@link Mapper#stopAddingChildDocuments(String)} after putting all child
+ * documents to the database. (All explanations are same for root documents)
*
- * database.startAddingChildDocuments();
- * database.putChildDocuments();
- * database.stopAddingChildDocuments();
+ * database.getMapper().startAddingChildDocuments();
+ * database.getMapper().putChildDocuments();
+ * database.getMapper().stopAddingChildDocuments();
*
* To update the existing documents, the client code can repeat to call the three methods again.
* The newly added rows update corresponding existing rows that have same MTP identifier like
@@ -65,180 +73,315 @@
* the database tries to find corresponding rows by using document's name instead of MTP identifier
* at the next update cycle.
*
- * TODO: Remove @VisibleForTesting annotation when we start to use this class.
* TODO: Improve performance by SQL optimization.
*/
-@VisibleForTesting
class MtpDatabase {
- private final MtpDatabaseInternal mDatabase;
- private final Map<String, Integer> mMappingMode = new HashMap<>();
+ private final SQLiteDatabase mDatabase;
+ private final Mapper mMapper;
- @VisibleForTesting
- MtpDatabase(Context context) {
- mDatabase = new MtpDatabaseInternal(context);
+ SQLiteDatabase getSQLiteDatabase() {
+ return mDatabase;
}
- @VisibleForTesting
+ MtpDatabase(Context context, int flags) {
+ final OpenHelper helper = new OpenHelper(context, flags);
+ mDatabase = helper.getWritableDatabase();
+ mMapper = new Mapper(this);
+ }
+
+ void close() {
+ mDatabase.close();
+ }
+
+ /**
+ * Returns operations for mapping.
+ * @return Mapping operations.
+ */
+ Mapper getMapper() {
+ return mMapper;
+ }
+
+ /**
+ * Queries roots information.
+ * @param columnNames Column names defined in {@link android.provider.DocumentsContract.Root}.
+ * @return Database cursor.
+ */
Cursor queryRoots(String[] columnNames) {
- return mDatabase.queryRoots(columnNames);
+ return mDatabase.query(
+ VIEW_ROOTS,
+ columnNames,
+ COLUMN_ROW_STATE + " IN (?, ?)",
+ strings(ROW_STATE_VALID, ROW_STATE_INVALIDATED),
+ null,
+ null,
+ null);
}
+ /**
+ * Queries root documents information.
+ * @param columnNames Column names defined in
+ * {@link android.provider.DocumentsContract.Document}.
+ * @return Database cursor.
+ */
@VisibleForTesting
Cursor queryRootDocuments(String[] columnNames) {
- return mDatabase.queryRootDocuments(columnNames);
+ return mDatabase.query(
+ TABLE_DOCUMENTS,
+ columnNames,
+ COLUMN_ROW_STATE + " IN (?, ?)",
+ strings(ROW_STATE_VALID, ROW_STATE_INVALIDATED),
+ null,
+ null,
+ null);
}
- @VisibleForTesting
+ /**
+ * Queries documents information.
+ * @param columnNames Column names defined in
+ * {@link android.provider.DocumentsContract.Document}.
+ * @return Database cursor.
+ */
Cursor queryChildDocuments(String[] columnNames, String parentDocumentId) {
- return mDatabase.queryChildDocuments(columnNames, parentDocumentId);
+ return mDatabase.query(
+ TABLE_DOCUMENTS,
+ columnNames,
+ COLUMN_ROW_STATE + " IN (?, ?) AND " + COLUMN_PARENT_DOCUMENT_ID + " = ?",
+ strings(ROW_STATE_VALID, ROW_STATE_INVALIDATED, parentDocumentId),
+ null,
+ null,
+ null);
}
- @VisibleForTesting
- void startAddingRootDocuments(int deviceId) {
- final String mappingStateKey = getRootDocumentsMappingStateKey(deviceId);
- if (mMappingMode.containsKey(mappingStateKey)) {
- throw new Error("Mapping for the root has already started.");
+ /**
+ * Queries a single document.
+ * @param documentId
+ * @param projection
+ * @return Database cursor.
+ */
+ public Cursor queryDocument(String documentId, String[] projection) {
+ return mDatabase.query(
+ TABLE_DOCUMENTS,
+ projection,
+ SELECTION_DOCUMENT_ID,
+ strings(documentId),
+ null,
+ null,
+ null,
+ "1");
+ }
+
+ /**
+ * Remove all rows belong to a device.
+ * @param deviceId Device ID.
+ */
+ void removeDeviceRows(int deviceId) {
+ // Call non-recursive version because it anyway deletes all rows in the devices.
+ deleteDocumentsAndRoots(COLUMN_DEVICE_ID + "=?", strings(deviceId));
+ }
+
+ /**
+ * Obtains parent document ID.
+ * @param documentId
+ * @return parent document ID.
+ * @throws FileNotFoundException
+ */
+ String getParentId(String documentId) throws FileNotFoundException {
+ final Cursor cursor = mDatabase.query(
+ TABLE_DOCUMENTS,
+ strings(COLUMN_PARENT_DOCUMENT_ID),
+ SELECTION_DOCUMENT_ID,
+ strings(documentId),
+ null,
+ null,
+ null,
+ "1");
+ try {
+ if (cursor.moveToNext()) {
+ return cursor.getString(0);
+ } else {
+ throw new FileNotFoundException("Cannot find a row having ID=" + documentId);
+ }
+ } finally {
+ cursor.close();
}
- mMappingMode.put(
- mappingStateKey,
- mDatabase.startAddingDocuments(
- SELECTION_ROOT_DOCUMENTS, Integer.toString(deviceId)));
}
- @VisibleForTesting
- void startAddingChildDocuments(String parentDocumentId) {
- final String mappingStateKey = getChildDocumentsMappingStateKey(parentDocumentId);
- if (mMappingMode.containsKey(mappingStateKey)) {
- throw new Error("Mapping for the root has already started.");
- }
- mMappingMode.put(
- mappingStateKey,
- mDatabase.startAddingDocuments(SELECTION_CHILD_DOCUMENTS, parentDocumentId));
- }
-
- @VisibleForTesting
- void putRootDocuments(int deviceId, Resources resources, MtpRoot[] roots) {
+ /**
+ * Adds new document under the parent.
+ * The method does not affect invalidated and pending documents because we know the document is
+ * newly added and never mapped with existing ones.
+ * @param parentDocumentId
+ * @param info
+ * @return Document ID of added document.
+ */
+ String putNewDocument(int deviceId, String parentDocumentId, MtpObjectInfo info) {
+ final ContentValues values = new ContentValues();
+ getChildDocumentValues(values, deviceId, parentDocumentId, info);
mDatabase.beginTransaction();
try {
- final ContentValues[] valuesList = new ContentValues[roots.length];
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].mDeviceId != deviceId) {
- throw new IllegalArgumentException();
- }
- valuesList[i] = new ContentValues();
- getRootDocumentValues(valuesList[i], resources, roots[i]);
- }
- boolean heuristic;
- String mapColumn;
- switch (mMappingMode.get(getRootDocumentsMappingStateKey(deviceId))) {
- case MAP_BY_MTP_IDENTIFIER:
- heuristic = false;
- mapColumn = COLUMN_STORAGE_ID;
- break;
- case MAP_BY_NAME:
- heuristic = true;
- mapColumn = Document.COLUMN_DISPLAY_NAME;
- break;
- default:
- throw new Error("Unexpected map mode.");
- }
- final long[] documentIds = mDatabase.putDocuments(
- valuesList,
- SELECTION_ROOT_DOCUMENTS,
- Integer.toString(deviceId),
- heuristic,
- mapColumn);
- final ContentValues values = new ContentValues();
- int i = 0;
- for (final MtpRoot root : roots) {
- // Use the same value for the root ID and the corresponding document ID.
- values.put(Root.COLUMN_ROOT_ID, documentIds[i++]);
- values.put(
- Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE);
- values.put(Root.COLUMN_AVAILABLE_BYTES, root.mFreeSpace);
- values.put(Root.COLUMN_CAPACITY_BYTES, root.mMaxCapacity);
- values.put(Root.COLUMN_MIME_TYPES, "");
- mDatabase.putRootExtra(values);
- }
+ final long id = mDatabase.insert(TABLE_DOCUMENTS, null, values);
mDatabase.setTransactionSuccessful();
+ return Long.toString(id);
} finally {
mDatabase.endTransaction();
}
}
- @VisibleForTesting
- void putChildDocuments(int deviceId, String parentId, MtpObjectInfo[] documents) {
- final ContentValues[] valuesList = new ContentValues[documents.length];
- for (int i = 0; i < documents.length; i++) {
- valuesList[i] = new ContentValues();
- getChildDocumentValues(valuesList[i], deviceId, parentId, documents[i]);
+ /**
+ * Deletes document and its children.
+ * @param documentId
+ */
+ void deleteDocument(String documentId) {
+ deleteDocumentsAndRootsRecursively(SELECTION_DOCUMENT_ID, strings(documentId));
+ }
+
+ /**
+ * Gets identifier from document ID.
+ * @param documentId Document ID.
+ * @return Identifier.
+ * @throws FileNotFoundException
+ */
+ Identifier createIdentifier(String documentId) throws FileNotFoundException {
+ // Currently documentId is old format.
+ final Cursor cursor = mDatabase.query(
+ TABLE_DOCUMENTS,
+ strings(COLUMN_DEVICE_ID, COLUMN_STORAGE_ID, COLUMN_OBJECT_HANDLE),
+ SELECTION_DOCUMENT_ID,
+ strings(documentId),
+ null,
+ null,
+ null,
+ "1");
+ try {
+ if (cursor.getCount() == 0) {
+ throw new FileNotFoundException("ID is not found.");
+ } else {
+ cursor.moveToNext();
+ return new Identifier(
+ cursor.getInt(0),
+ cursor.getInt(1),
+ cursor.isNull(2) ? Identifier.DUMMY_HANDLE_FOR_ROOT : cursor.getInt(2),
+ documentId);
+ }
+ } finally {
+ cursor.close();
}
- boolean heuristic;
- String mapColumn;
- switch (mMappingMode.get(getChildDocumentsMappingStateKey(parentId))) {
- case MAP_BY_MTP_IDENTIFIER:
- heuristic = false;
- mapColumn = COLUMN_STORAGE_ID;
- break;
- case MAP_BY_NAME:
- heuristic = true;
- mapColumn = Document.COLUMN_DISPLAY_NAME;
- break;
- default:
- throw new Error("Unexpected map mode.");
+ }
+
+ /**
+ * Deletes a document, and its root information if the document is a root document.
+ * @param selection Query to select documents.
+ * @param args Arguments for selection.
+ * @return Whether the method deletes rows.
+ */
+ boolean deleteDocumentsAndRootsRecursively(String selection, String[] args) {
+ mDatabase.beginTransaction();
+ try {
+ boolean changed = false;
+ final Cursor cursor = mDatabase.query(
+ TABLE_DOCUMENTS,
+ strings(Document.COLUMN_DOCUMENT_ID),
+ selection,
+ args,
+ null,
+ null,
+ null);
+ try {
+ while (cursor.moveToNext()) {
+ if (deleteDocumentsAndRootsRecursively(
+ COLUMN_PARENT_DOCUMENT_ID + "=?",
+ strings(cursor.getString(0)))) {
+ changed = true;
+ }
+ }
+ } finally {
+ cursor.close();
+ }
+ if (deleteDocumentsAndRoots(selection, args)) {
+ changed = true;
+ }
+ mDatabase.setTransactionSuccessful();
+ return changed;
+ } finally {
+ mDatabase.endTransaction();
}
- mDatabase.putDocuments(
- valuesList, SELECTION_CHILD_DOCUMENTS, parentId, heuristic, mapColumn);
+ }
+
+ /**
+ * Returns the set of device ID stored in the database.
+ */
+ int[] getDeviceIds() {
+ final Cursor cursor = mDatabase.query(
+ true,
+ TABLE_DOCUMENTS,
+ strings(COLUMN_DEVICE_ID),
+ null,
+ null,
+ null,
+ null,
+ null,
+ null);
+ try {
+ final int[] ids = new int[cursor.getCount()];
+ for (int i = 0; i < ids.length; i++) {
+ cursor.moveToNext();
+ ids[i] = cursor.getInt(0);
+ }
+ return ids;
+ } finally {
+ cursor.close();
+ }
+ }
+
+ private boolean deleteDocumentsAndRoots(String selection, String[] args) {
+ mDatabase.beginTransaction();
+ try {
+ int deleted = 0;
+ deleted += mDatabase.delete(
+ TABLE_ROOT_EXTRA,
+ Root.COLUMN_ROOT_ID + " IN (" + SQLiteQueryBuilder.buildQueryString(
+ false,
+ TABLE_DOCUMENTS,
+ new String[] { Document.COLUMN_DOCUMENT_ID },
+ selection,
+ null,
+ null,
+ null,
+ null) + ")",
+ args);
+ deleted += mDatabase.delete(TABLE_DOCUMENTS, selection, args);
+ mDatabase.setTransactionSuccessful();
+ // TODO Remove mappingState.
+ return deleted != 0;
+ } finally {
+ mDatabase.endTransaction();
+ }
+ }
+
+ private static class OpenHelper extends SQLiteOpenHelper {
+ public OpenHelper(Context context, int flags) {
+ super(context,
+ flags == FLAG_DATABASE_IN_MEMORY ? null : DATABASE_NAME,
+ null,
+ DATABASE_VERSION);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ db.execSQL(QUERY_CREATE_DOCUMENTS);
+ db.execSQL(QUERY_CREATE_ROOT_EXTRA);
+ db.execSQL(QUERY_CREATE_VIEW_ROOTS);
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ throw new UnsupportedOperationException();
+ }
}
@VisibleForTesting
- void clearMapping() {
- mDatabase.clearMapping();
- mMappingMode.clear();
- }
-
- @VisibleForTesting
- void stopAddingRootDocuments(int deviceId) {
- final String mappingModeKey = getRootDocumentsMappingStateKey(deviceId);
- switch (mMappingMode.get(mappingModeKey)) {
- case MAP_BY_MTP_IDENTIFIER:
- mDatabase.stopAddingDocuments(
- SELECTION_ROOT_DOCUMENTS,
- Integer.toString(deviceId),
- COLUMN_STORAGE_ID);
- break;
- case MAP_BY_NAME:
- mDatabase.stopAddingDocuments(
- SELECTION_ROOT_DOCUMENTS,
- Integer.toString(deviceId),
- Document.COLUMN_DISPLAY_NAME);
- break;
- default:
- throw new Error("Unexpected mapping state.");
- }
- mMappingMode.remove(mappingModeKey);
- }
-
- @VisibleForTesting
- void stopAddingChildDocuments(String parentId) {
- final String mappingModeKey = getChildDocumentsMappingStateKey(parentId);
- switch (mMappingMode.get(mappingModeKey)) {
- case MAP_BY_MTP_IDENTIFIER:
- mDatabase.stopAddingDocuments(
- SELECTION_CHILD_DOCUMENTS,
- parentId,
- COLUMN_OBJECT_HANDLE);
- break;
- case MAP_BY_NAME:
- mDatabase.stopAddingDocuments(
- SELECTION_CHILD_DOCUMENTS,
- parentId,
- Document.COLUMN_DISPLAY_NAME);
- break;
- default:
- throw new Error("Unexpected mapping state.");
- }
- mMappingMode.remove(mappingModeKey);
+ static void deleteDatabase(Context context) {
+ context.deleteDatabase(DATABASE_NAME);
}
/**
@@ -247,8 +390,7 @@
* @param resources Resources used to get localized root name.
* @param root Root to be converted {@link ContentValues}.
*/
- private static void getRootDocumentValues(
- ContentValues values, Resources resources, MtpRoot root) {
+ static void getRootDocumentValues(ContentValues values, Resources resources, MtpRoot root) {
values.clear();
values.put(COLUMN_DEVICE_ID, root.mDeviceId);
values.put(COLUMN_STORAGE_ID, root.mStorageId);
@@ -259,7 +401,7 @@
values.put(Document.COLUMN_DISPLAY_NAME, root.getRootName(resources));
values.putNull(Document.COLUMN_SUMMARY);
values.putNull(Document.COLUMN_LAST_MODIFIED);
- values.putNull(Document.COLUMN_ICON);
+ values.put(Document.COLUMN_ICON, R.drawable.ic_root_mtp);
values.put(Document.COLUMN_FLAGS, 0);
values.put(Document.COLUMN_SIZE,
(int) Math.min(root.mMaxCapacity - root.mFreeSpace, Integer.MAX_VALUE));
@@ -272,10 +414,12 @@
* @param parentId Parent document ID of the object.
* @param info MTP object info.
*/
- private void getChildDocumentValues(
+ static void getChildDocumentValues(
ContentValues values, int deviceId, String parentId, MtpObjectInfo info) {
values.clear();
- final String mimeType = CursorHelper.formatTypeToMimeType(info.getFormat());
+ final String mimeType = info.getFormat() == MtpConstants.FORMAT_ASSOCIATION ?
+ DocumentsContract.Document.MIME_TYPE_DIR :
+ MediaFile.getMimeTypeForFormatCode(info.getFormat());
int flag = 0;
if (info.getProtectionStatus() == 0) {
flag |= Document.FLAG_SUPPORTS_DELETE |
@@ -303,11 +447,11 @@
values.put(Document.COLUMN_SIZE, info.getCompressedSize());
}
- private String getRootDocumentsMappingStateKey(int deviceId) {
- return "RootDocuments/" + deviceId;
- }
-
- private String getChildDocumentsMappingStateKey(String parentDocumentId) {
- return "ChildDocuments/" + parentDocumentId;
+ static String[] strings(Object... args) {
+ final String[] results = new String[args.length];
+ for (int i = 0; i < args.length; i++) {
+ results[i] = Objects.toString(args[i]);
+ }
+ return results;
}
}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java
index 5fb16ec..0ead2d5 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java
@@ -24,7 +24,10 @@
*/
class MtpDatabaseConstants {
static final int DATABASE_VERSION = 1;
- static final String DATABASE_NAME = null;
+ static final String DATABASE_NAME = "database";
+
+ static final int FLAG_DATABASE_IN_MEMORY = 1;
+ static final int FLAG_DATABASE_IN_FILE = 0;
/**
* Table representing documents including root documents.
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseInternal.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseInternal.java
deleted file mode 100644
index 730012d..0000000
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseInternal.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (C) 2015 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.mtp;
-
-import static com.android.mtp.MtpDatabaseConstants.*;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsContract.Root;
-
-import java.util.Objects;
-
-/**
- * Class that provides operations processing SQLite database directly.
- */
-class MtpDatabaseInternal {
- private static class OpenHelper extends SQLiteOpenHelper {
- public OpenHelper(Context context) {
- super(context, DATABASE_NAME, null, DATABASE_VERSION);
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- db.execSQL(QUERY_CREATE_DOCUMENTS);
- db.execSQL(QUERY_CREATE_ROOT_EXTRA);
- db.execSQL(QUERY_CREATE_VIEW_ROOTS);
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- throw new UnsupportedOperationException();
- }
- }
-
- private final SQLiteDatabase mDatabase;
-
- MtpDatabaseInternal(Context context) {
- final OpenHelper helper = new OpenHelper(context);
- mDatabase = helper.getWritableDatabase();
- }
-
- Cursor queryRoots(String[] columnNames) {
- return mDatabase.query(
- VIEW_ROOTS,
- columnNames,
- COLUMN_ROW_STATE + " IN (?, ?)",
- strings(ROW_STATE_VALID, ROW_STATE_INVALIDATED),
- null,
- null,
- null);
- }
-
- Cursor queryRootDocuments(String[] columnNames) {
- return mDatabase.query(
- TABLE_DOCUMENTS,
- columnNames,
- COLUMN_ROW_STATE + " IN (?, ?)",
- strings(ROW_STATE_VALID, ROW_STATE_INVALIDATED),
- null,
- null,
- null);
- }
-
- Cursor queryChildDocuments(String[] columnNames, String parentDocumentId) {
- return mDatabase.query(
- TABLE_DOCUMENTS,
- columnNames,
- COLUMN_ROW_STATE + " IN (?, ?) AND " + COLUMN_PARENT_DOCUMENT_ID + " = ?",
- strings(ROW_STATE_VALID, ROW_STATE_INVALIDATED, parentDocumentId),
- null,
- null,
- null);
- }
-
- /**
- * Starts adding new documents.
- * The methods decides mapping mode depends on if all documents under the given parent have MTP
- * identifier or not. If all the documents have MTP identifier, it uses the identifier to find
- * a corresponding existing row. Otherwise it does heuristic.
- *
- * @param selection Query matches valid documents.
- * @param arg Argument for selection.
- * @return Mapping mode.
- */
- int startAddingDocuments(String selection, String arg) {
- mDatabase.beginTransaction();
- try {
- // Delete all pending rows.
- deleteDocumentsAndRoots(
- selection + " AND " + COLUMN_ROW_STATE + "=?", strings(arg, ROW_STATE_PENDING));
-
- // Set all documents as invalidated.
- final ContentValues values = new ContentValues();
- values.put(COLUMN_ROW_STATE, ROW_STATE_INVALIDATED);
- mDatabase.update(TABLE_DOCUMENTS, values, selection, new String[] { arg });
-
- // If we have rows that does not have MTP identifier, do heuristic mapping by name.
- final boolean useNameForResolving = DatabaseUtils.queryNumEntries(
- mDatabase,
- TABLE_DOCUMENTS,
- selection + " AND " + COLUMN_STORAGE_ID + " IS NULL",
- new String[] { arg }) > 0;
- mDatabase.setTransactionSuccessful();
- return useNameForResolving ? MAP_BY_NAME : MAP_BY_MTP_IDENTIFIER;
- } finally {
- mDatabase.endTransaction();
- }
- }
-
- /**
- * Puts the documents into the database.
- * If the mapping mode is not heuristic, it just adds the rows to the database or updates the
- * existing rows with the new values. If the mapping mode is heuristic, it adds some new rows as
- * 'pending' state when that rows may be corresponding to existing 'invalidated' rows. Then
- * {@link #stopAddingDocuments(String, String, String)} turns the pending rows into 'valid'
- * rows.
- *
- * @param valuesList Values that are stored in the database.
- * @param selection SQL where closure to select rows that shares the same parent.
- * @param arg Argument for selection SQL.
- * @param heuristic Whether the mapping mode is heuristic.
- * @return List of Document ID inserted to the table.
- */
- long[] putDocuments(
- ContentValues[] valuesList,
- String selection,
- String arg,
- boolean heuristic,
- String mappingKey) {
- mDatabase.beginTransaction();
- try {
- final long[] documentIds = new long[valuesList.length];
- int i = 0;
- for (final ContentValues values : valuesList) {
- final Cursor candidateCursor = mDatabase.query(
- TABLE_DOCUMENTS,
- strings(Document.COLUMN_DOCUMENT_ID),
- selection + " AND " +
- COLUMN_ROW_STATE + "=? AND " +
- mappingKey + "=?",
- strings(arg, ROW_STATE_INVALIDATED, values.getAsString(mappingKey)),
- null,
- null,
- null,
- "1");
- final long rowId;
- if (candidateCursor.getCount() == 0) {
- rowId = mDatabase.insert(TABLE_DOCUMENTS, null, values);
- } else if (!heuristic) {
- candidateCursor.moveToNext();
- final String documentId = candidateCursor.getString(0);
- rowId = mDatabase.update(
- TABLE_DOCUMENTS, values, SELECTION_DOCUMENT_ID, strings(documentId));
- } else {
- values.put(COLUMN_ROW_STATE, ROW_STATE_PENDING);
- rowId = mDatabase.insert(TABLE_DOCUMENTS, null, values);
- }
- // Document ID is a primary integer key of the table. So the returned row
- // IDs should be same with the document ID.
- documentIds[i++] = rowId;
- candidateCursor.close();
- }
-
- mDatabase.setTransactionSuccessful();
- return documentIds;
- } finally {
- mDatabase.endTransaction();
- }
- }
-
- void putRootExtra(ContentValues values) {
- mDatabase.replace(TABLE_ROOT_EXTRA, null, values);
- }
-
- /**
- * Maps 'pending' document and 'invalidated' document that shares the same column of groupKey.
- * If the database does not find corresponding 'invalidated' document, it just removes
- * 'invalidated' document from the database.
- * @param selection Query to select rows for resolving.
- * @param arg Argument for selection SQL.
- * @param groupKey Column name used to find corresponding rows.
- */
- void stopAddingDocuments(String selection, String arg, String groupKey) {
- mDatabase.beginTransaction();
- try {
- // Get 1-to-1 mapping of invalidated document and pending document.
- final String invalidatedIdQuery = createStateFilter(
- ROW_STATE_INVALIDATED, Document.COLUMN_DOCUMENT_ID);
- final String pendingIdQuery = createStateFilter(
- ROW_STATE_PENDING, Document.COLUMN_DOCUMENT_ID);
- // SQL should be like:
- // SELECT group_concat(CASE WHEN raw_state = 1 THEN document_id ELSE NULL END),
- // group_concat(CASE WHEN raw_state = 2 THEN document_id ELSE NULL END)
- // WHERE device_id = ? AND parent_document_id IS NULL
- // GROUP BY display_name
- // HAVING count(CASE WHEN raw_state = 1 THEN document_id ELSE NULL END) = 1 AND
- // count(CASE WHEN raw_state = 2 THEN document_id ELSE NULL END) = 1
- final Cursor mergingCursor = mDatabase.query(
- TABLE_DOCUMENTS,
- new String[] {
- "group_concat(" + invalidatedIdQuery + ")",
- "group_concat(" + pendingIdQuery + ")"
- },
- selection,
- strings(arg),
- groupKey,
- "count(" + invalidatedIdQuery + ") = 1 AND count(" + pendingIdQuery + ") = 1",
- null);
-
- final ContentValues values = new ContentValues();
- while (mergingCursor.moveToNext()) {
- final String invalidatedId = mergingCursor.getString(0);
- final String pendingId = mergingCursor.getString(1);
-
- // Obtain the new values including the latest object handle from mapping row.
- getFirstRow(
- TABLE_DOCUMENTS,
- SELECTION_DOCUMENT_ID,
- new String[] { pendingId },
- values);
- values.remove(Document.COLUMN_DOCUMENT_ID);
- values.put(COLUMN_ROW_STATE, ROW_STATE_VALID);
- mDatabase.update(
- TABLE_DOCUMENTS,
- values,
- SELECTION_DOCUMENT_ID,
- new String[] { invalidatedId });
-
- getFirstRow(
- TABLE_ROOT_EXTRA,
- SELECTION_ROOT_ID,
- new String[] { pendingId },
- values);
- if (values.size() > 0) {
- values.remove(Root.COLUMN_ROOT_ID);
- mDatabase.update(
- TABLE_ROOT_EXTRA,
- values,
- SELECTION_ROOT_ID,
- new String[] { invalidatedId });
- }
-
- // Delete 'pending' row.
- deleteDocumentsAndRoots(SELECTION_DOCUMENT_ID, new String[] { pendingId });
- }
- mergingCursor.close();
-
- // Delete all invalidated rows that cannot be mapped.
- deleteDocumentsAndRoots(
- COLUMN_ROW_STATE + " = ? AND " + selection,
- strings(ROW_STATE_INVALIDATED, arg));
-
- // The database cannot find old document ID for the pending rows.
- // Turn the all pending rows into valid state, which means the rows become to be
- // valid with new document ID.
- values.clear();
- values.put(COLUMN_ROW_STATE, ROW_STATE_VALID);
- mDatabase.update(
- TABLE_DOCUMENTS,
- values,
- COLUMN_ROW_STATE + " = ? AND " + selection,
- strings(ROW_STATE_PENDING, arg));
- mDatabase.setTransactionSuccessful();
- } finally {
- mDatabase.endTransaction();
- }
- }
-
- /**
- * Clears MTP related identifier.
- * It clears MTP's object handle and storage ID that are not stable over MTP sessions and mark
- * the all documents as 'invalidated'. It also remove 'pending' rows as adding is cancelled
- * now.
- */
- void clearMapping() {
- mDatabase.beginTransaction();
- try {
- deleteDocumentsAndRoots(COLUMN_ROW_STATE + " = ?", strings(ROW_STATE_PENDING));
- final ContentValues values = new ContentValues();
- values.putNull(COLUMN_OBJECT_HANDLE);
- values.putNull(COLUMN_STORAGE_ID);
- values.put(COLUMN_ROW_STATE, ROW_STATE_INVALIDATED);
- mDatabase.update(TABLE_DOCUMENTS, values, null, null);
- mDatabase.setTransactionSuccessful();
- } finally {
- mDatabase.endTransaction();
- }
- }
-
- void beginTransaction() {
- mDatabase.beginTransaction();
- }
-
- void setTransactionSuccessful() {
- mDatabase.setTransactionSuccessful();
- }
-
- void endTransaction() {
- mDatabase.endTransaction();
- }
-
- /**
- * Deletes a document, and its root information if the document is a root document.
- * @param selection Query to select documents.
- * @param args Arguments for selection.
- */
- private void deleteDocumentsAndRoots(String selection, String[] args) {
- mDatabase.beginTransaction();
- try {
- mDatabase.delete(
- TABLE_ROOT_EXTRA,
- Root.COLUMN_ROOT_ID + " IN (" + SQLiteQueryBuilder.buildQueryString(
- false,
- TABLE_DOCUMENTS,
- new String[] { Document.COLUMN_DOCUMENT_ID },
- selection,
- null,
- null,
- null,
- null) + ")",
- args);
- mDatabase.delete(TABLE_DOCUMENTS, selection, args);
- mDatabase.setTransactionSuccessful();
- } finally {
- mDatabase.endTransaction();
- }
- }
-
- /**
- * Obtains values of the first row for the query.
- * @param values ContentValues that the values are stored to.
- * @param table Target table.
- * @param selection Query to select rows.
- * @param args Argument for query.
- */
- private void getFirstRow(String table, String selection, String[] args, ContentValues values) {
- values.clear();
- final Cursor cursor = mDatabase.query(table, null, selection, args, null, null, null, "1");
- if (cursor.getCount() == 0) {
- return;
- }
- cursor.moveToNext();
- DatabaseUtils.cursorRowToContentValues(cursor, values);
- cursor.close();
- }
-
- /**
- * Gets SQL expression that represents the given value or NULL depends on the row state.
- * @param state Expected row state.
- * @param a SQL value.
- * @return Expression that represents a if the row state is expected one, and represents NULL
- * otherwise.
- */
- private static String createStateFilter(int state, String a) {
- return "CASE WHEN " + COLUMN_ROW_STATE + " = " + Integer.toString(state) +
- " THEN " + a + " ELSE NULL END";
- }
-
- /**
- * Converts values into string array.
- * @param args Values converted into string array.
- * @return String array.
- */
- private static String[] strings(Object... args) {
- final String[] results = new String[args.length];
- for (int i = 0; i < args.length; i++) {
- results[i] = Objects.toString(args[i]);
- }
- return results;
- }
-}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
index 7883e61..9511e15 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
@@ -20,8 +20,9 @@
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
import android.database.Cursor;
-import android.database.MatrixCursor;
import android.graphics.Point;
+import android.media.MediaFile;
+import android.mtp.MtpConstants;
import android.mtp.MtpObjectInfo;
import android.os.CancellationSignal;
import android.os.ParcelFileDescriptor;
@@ -31,6 +32,7 @@
import android.provider.DocumentsProvider;
import android.util.Log;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import java.io.FileNotFoundException;
@@ -55,13 +57,17 @@
Document.COLUMN_FLAGS, Document.COLUMN_SIZE,
};
+ private final Object mDeviceListLock = new Object();
+
private static MtpDocumentsProvider sSingleton;
private MtpManager mMtpManager;
private ContentResolver mResolver;
+ @GuardedBy("mDeviceListLock")
private Map<Integer, DeviceToolkit> mDeviceToolkits;
private RootScanner mRootScanner;
private Resources mResources;
+ private MtpDatabase mDatabase;
/**
* Provides singleton instance to MtpDocumentsService.
@@ -77,17 +83,25 @@
mMtpManager = new MtpManager(getContext());
mResolver = getContext().getContentResolver();
mDeviceToolkits = new HashMap<Integer, DeviceToolkit>();
- mRootScanner = new RootScanner(mResolver, mMtpManager);
+ mDatabase = new MtpDatabase(getContext(), MtpDatabaseConstants.FLAG_DATABASE_IN_FILE);
+ mRootScanner = new RootScanner(mResolver, mResources, mMtpManager, mDatabase);
+ resume();
return true;
}
@VisibleForTesting
- void onCreateForTesting(Resources resources, MtpManager mtpManager, ContentResolver resolver) {
+ void onCreateForTesting(
+ Resources resources,
+ MtpManager mtpManager,
+ ContentResolver resolver,
+ MtpDatabase database) {
mResources = resources;
mMtpManager = mtpManager;
mResolver = resolver;
mDeviceToolkits = new HashMap<Integer, DeviceToolkit>();
- mRootScanner = new RootScanner(mResolver, mMtpManager);
+ mDatabase = database;
+ mRootScanner = new RootScanner(mResolver, mResources, mMtpManager, mDatabase);
+ resume();
}
@Override
@@ -95,17 +109,7 @@
if (projection == null) {
projection = MtpDocumentsProvider.DEFAULT_ROOT_PROJECTION;
}
- final MatrixCursor cursor = new MatrixCursor(projection);
- final MtpRoot[] roots = mRootScanner.getRoots();
- for (final MtpRoot root : roots) {
- final Identifier rootIdentifier = new Identifier(root.mDeviceId, root.mStorageId);
- final MatrixCursor.RowBuilder builder = cursor.newRow();
- builder.add(Root.COLUMN_ROOT_ID, rootIdentifier.toRootId());
- builder.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE);
- builder.add(Root.COLUMN_TITLE, root.getRootName(mResources));
- builder.add(Root.COLUMN_DOCUMENT_ID, rootIdentifier.toDocumentId());
- builder.add(Root.COLUMN_AVAILABLE_BYTES , root.mFreeSpace);
- }
+ final Cursor cursor = mDatabase.queryRoots(projection);
cursor.setNotificationUri(
mResolver, DocumentsContract.buildRootsUri(MtpDocumentsProvider.AUTHORITY));
return cursor;
@@ -117,39 +121,7 @@
if (projection == null) {
projection = MtpDocumentsProvider.DEFAULT_DOCUMENT_PROJECTION;
}
- final Identifier identifier = Identifier.createFromDocumentId(documentId);
-
- if (identifier.mObjectHandle != CursorHelper.DUMMY_HANDLE_FOR_ROOT) {
- MtpObjectInfo objectInfo;
- try {
- objectInfo = mMtpManager.getObjectInfo(
- identifier.mDeviceId, identifier.mObjectHandle);
- } catch (IOException e) {
- throw new FileNotFoundException(e.getMessage());
- }
- final MatrixCursor cursor = new MatrixCursor(projection);
- CursorHelper.addToCursor(
- objectInfo,
- new Identifier(identifier.mDeviceId, identifier.mStorageId),
- cursor.newRow());
- return cursor;
- } else {
- MtpRoot[] roots;
- try {
- roots = mMtpManager.getRoots(identifier.mDeviceId);
- } catch (IOException e) {
- throw new FileNotFoundException(e.getMessage());
- }
- for (final MtpRoot root : roots) {
- if (identifier.mStorageId != root.mStorageId)
- continue;
- final MatrixCursor cursor = new MatrixCursor(projection);
- CursorHelper.addToCursor(mResources, root, cursor.newRow());
- return cursor;
- }
- }
-
- throw new FileNotFoundException();
+ return mDatabase.queryDocument(documentId, projection);
}
@Override
@@ -158,7 +130,7 @@
if (projection == null) {
projection = MtpDocumentsProvider.DEFAULT_DOCUMENT_PROJECTION;
}
- final Identifier parentIdentifier = Identifier.createFromDocumentId(parentDocumentId);
+ final Identifier parentIdentifier = mDatabase.createIdentifier(parentDocumentId);
try {
return getDocumentLoader(parentIdentifier).queryChildDocuments(
projection, parentIdentifier);
@@ -171,7 +143,7 @@
public ParcelFileDescriptor openDocument(
String documentId, String mode, CancellationSignal signal)
throws FileNotFoundException {
- final Identifier identifier = Identifier.createFromDocumentId(documentId);
+ final Identifier identifier = mDatabase.createIdentifier(documentId);
try {
switch (mode) {
case "r":
@@ -196,7 +168,7 @@
String documentId,
Point sizeHint,
CancellationSignal signal) throws FileNotFoundException {
- final Identifier identifier = Identifier.createFromDocumentId(documentId);
+ final Identifier identifier = mDatabase.createIdentifier(documentId);
try {
return new AssetFileDescriptor(
getPipeManager(identifier).readThumbnail(mMtpManager, identifier),
@@ -210,43 +182,51 @@
@Override
public void deleteDocument(String documentId) throws FileNotFoundException {
try {
- final Identifier identifier = Identifier.createFromDocumentId(documentId);
- final int parentHandle =
- mMtpManager.getParent(identifier.mDeviceId, identifier.mObjectHandle);
+ final Identifier identifier = mDatabase.createIdentifier(documentId);
+ final Identifier parentIdentifier =
+ mDatabase.createIdentifier(mDatabase.getParentId(documentId));
mMtpManager.deleteDocument(identifier.mDeviceId, identifier.mObjectHandle);
- final Identifier parentIdentifier = new Identifier(
- identifier.mDeviceId, identifier.mStorageId, parentHandle);
+ mDatabase.deleteDocument(documentId);
getDocumentLoader(parentIdentifier).clearTask(parentIdentifier);
- notifyChildDocumentsChange(parentIdentifier.toDocumentId());
+ notifyChildDocumentsChange(parentIdentifier.mDocumentId);
} catch (IOException error) {
+ for (final StackTraceElement element : error.getStackTrace()) {
+ Log.e("hirono", element.toString());
+ }
throw new FileNotFoundException(error.getMessage());
}
}
@Override
public void onTrimMemory(int level) {
- for (final DeviceToolkit toolkit : mDeviceToolkits.values()) {
- toolkit.mDocumentLoader.clearCompletedTasks();
- }
+ synchronized (mDeviceListLock) {
+ for (final DeviceToolkit toolkit : mDeviceToolkits.values()) {
+ toolkit.mDocumentLoader.clearCompletedTasks();
+ }
+ }
}
@Override
public String createDocument(String parentDocumentId, String mimeType, String displayName)
throws FileNotFoundException {
try {
- final Identifier parentId = Identifier.createFromDocumentId(parentDocumentId);
+ final Identifier parentId = mDatabase.createIdentifier(parentDocumentId);
final ParcelFileDescriptor pipe[] = ParcelFileDescriptor.createReliablePipe();
pipe[0].close(); // 0 bytes for a new document.
- final int objectHandle = mMtpManager.createDocument(
- parentId.mDeviceId,
- new MtpObjectInfo.Builder()
- .setStorageId(parentId.mStorageId)
- .setParent(parentId.mObjectHandle)
- .setFormat(CursorHelper.mimeTypeToFormatType(displayName, mimeType))
- .setName(displayName)
- .build(), pipe[1]);
- final String documentId = new Identifier(parentId.mDeviceId, parentId.mStorageId,
- objectHandle).toDocumentId();
+ final int formatCode = Document.MIME_TYPE_DIR.equals(mimeType) ?
+ MtpConstants.FORMAT_ASSOCIATION :
+ MediaFile.getFormatCode(displayName, mimeType);
+ final MtpObjectInfo info = new MtpObjectInfo.Builder()
+ .setStorageId(parentId.mStorageId)
+ .setParent(parentId.mObjectHandle)
+ .setFormat(formatCode)
+ .setName(displayName)
+ .build();
+ final int objectHandle = mMtpManager.createDocument(parentId.mDeviceId, info, pipe[1]);
+ final MtpObjectInfo infoWithHandle =
+ new MtpObjectInfo.Builder(info).setObjectHandle(objectHandle).build();
+ final String documentId = mDatabase.putNewDocument(
+ parentId.mDeviceId, parentDocumentId, infoWithHandle);
getDocumentLoader(parentId).clearTask(parentId);
notifyChildDocumentsChange(parentDocumentId);
return documentId;
@@ -257,37 +237,46 @@
}
void openDevice(int deviceId) throws IOException {
- mMtpManager.openDevice(deviceId);
- mDeviceToolkits.put(deviceId, new DeviceToolkit(mMtpManager, mResolver));
- mRootScanner.scanNow();
+ synchronized (mDeviceListLock) {
+ mMtpManager.openDevice(deviceId);
+ mDeviceToolkits.put(
+ deviceId, new DeviceToolkit(mMtpManager, mResolver, mDatabase));
+ }
+ mRootScanner.resume();
}
- void closeDevice(int deviceId) throws IOException {
- // TODO: Flush the device before closing (if not closed externally).
- getDeviceToolkit(deviceId).mDocumentLoader.clearTasks();
- mDeviceToolkits.remove(deviceId);
- mMtpManager.closeDevice(deviceId);
- mRootScanner.scanNow();
- }
-
- void closeAllDevices() {
- boolean closed = false;
- for (int deviceId : mMtpManager.getOpenedDeviceIds()) {
- try {
- mMtpManager.closeDevice(deviceId);
- getDeviceToolkit(deviceId).mDocumentLoader.clearTasks();
- closed = true;
- } catch (IOException d) {
- Log.d(TAG, "Failed to close the MTP device: " + deviceId);
- }
+ void closeDevice(int deviceId) throws IOException, InterruptedException {
+ synchronized (mDeviceListLock) {
+ closeDeviceInternal(deviceId);
+ mDatabase.removeDeviceRows(deviceId);
}
- if (closed) {
- mRootScanner.scanNow();
- }
+ mRootScanner.notifyChange();
}
boolean hasOpenedDevices() {
- return mMtpManager.getOpenedDeviceIds().length != 0;
+ synchronized (mDeviceListLock) {
+ return mMtpManager.getOpenedDeviceIds().length != 0;
+ }
+ }
+
+ /**
+ * Finalize the content provider for unit tests.
+ */
+ @Override
+ public void shutdown() {
+ synchronized (mDeviceListLock) {
+ try {
+ for (final int id : mMtpManager.getOpenedDeviceIds()) {
+ closeDeviceInternal(id);
+ }
+ } catch (InterruptedException|IOException e) {
+ // It should fail unit tests by throwing runtime exception.
+ throw new RuntimeException(e);
+ } finally {
+ mDatabase.close();
+ super.shutdown();
+ }
+ }
}
private void notifyChildDocumentsChange(String parentDocumentId) {
@@ -297,12 +286,41 @@
false);
}
- private DeviceToolkit getDeviceToolkit(int deviceId) throws FileNotFoundException {
- final DeviceToolkit toolkit = mDeviceToolkits.get(deviceId);
- if (toolkit == null) {
- throw new FileNotFoundException();
+ /**
+ * Reopens MTP devices based on database state.
+ */
+ private void resume() {
+ synchronized (mDeviceListLock) {
+ mDatabase.getMapper().clearMapping();
+ final int[] ids = mDatabase.getDeviceIds();
+ for (final int id : ids) {
+ try {
+ openDevice(id);
+ } catch (IOException exception) {
+ mDatabase.removeDeviceRows(id);
+ }
+ }
}
- return toolkit;
+ }
+
+ private void closeDeviceInternal(int deviceId) throws IOException, InterruptedException {
+ // TODO: Flush the device before closing (if not closed externally).
+ getDeviceToolkit(deviceId).mDocumentLoader.clearTasks();
+ mDeviceToolkits.remove(deviceId);
+ mMtpManager.closeDevice(deviceId);
+ if (!hasOpenedDevices()) {
+ mRootScanner.pause();
+ }
+ }
+
+ private DeviceToolkit getDeviceToolkit(int deviceId) throws FileNotFoundException {
+ synchronized (mDeviceListLock) {
+ final DeviceToolkit toolkit = mDeviceToolkits.get(deviceId);
+ if (toolkit == null) {
+ throw new FileNotFoundException();
+ }
+ return toolkit;
+ }
}
private PipeManager getPipeManager(Identifier identifier) throws FileNotFoundException {
@@ -317,9 +335,9 @@
public final PipeManager mPipeManager;
public final DocumentLoader mDocumentLoader;
- public DeviceToolkit(MtpManager manager, ContentResolver resolver) {
+ public DeviceToolkit(MtpManager manager, ContentResolver resolver, MtpDatabase database) {
mPipeManager = new PipeManager();
- mDocumentLoader = new DocumentLoader(manager, resolver);
+ mDocumentLoader = new DocumentLoader(manager, resolver, database);
}
}
}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java
index 328f618..9b3c20f 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java
@@ -55,22 +55,20 @@
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- if (intent == null) {
- // If intent is null, the service was restarted.
- // TODO: Recover opened devices here.
- return START_STICKY;
- }
- if (intent.getAction().equals(ACTION_OPEN_DEVICE)) {
- final UsbDevice device = intent.<UsbDevice>getParcelableExtra(EXTRA_DEVICE);
- try {
- final MtpDocumentsProvider provider = MtpDocumentsProvider.getInstance();
- provider.openDevice(device.getDeviceId());
- return START_STICKY;
- } catch (IOException error) {
- Log.d(MtpDocumentsProvider.TAG, error.getMessage());
+ // If intent is null, the service was restarted.
+ if (intent != null) {
+ if (intent.getAction().equals(ACTION_OPEN_DEVICE)) {
+ final UsbDevice device = intent.<UsbDevice>getParcelableExtra(EXTRA_DEVICE);
+ try {
+ final MtpDocumentsProvider provider = MtpDocumentsProvider.getInstance();
+ provider.openDevice(device.getDeviceId());
+ return START_STICKY;
+ } catch (IOException error) {
+ Log.e(MtpDocumentsProvider.TAG, error.getMessage());
+ }
+ } else {
+ Log.e(MtpDocumentsProvider.TAG, "Received unknown intent action.");
}
- } else {
- Log.d(MtpDocumentsProvider.TAG, "Received unknown intent action.");
}
stopSelfIfNeeded();
return Service.START_NOT_STICKY;
@@ -78,8 +76,6 @@
@Override
public void onDestroy() {
- final MtpDocumentsProvider provider = MtpDocumentsProvider.getInstance();
- provider.closeAllDevices();
unregisterReceiver(mReceiver);
mReceiver = null;
super.onDestroy();
@@ -101,8 +97,8 @@
final MtpDocumentsProvider provider = MtpDocumentsProvider.getInstance();
try {
provider.closeDevice(device.getDeviceId());
- } catch (IOException error) {
- Log.d(MtpDocumentsProvider.TAG, error.getMessage());
+ } catch (IOException | InterruptedException error) {
+ Log.e(MtpDocumentsProvider.TAG, error.getMessage());
}
stopSelfIfNeeded();
}
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
index 714936d..cd52f31 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
@@ -32,6 +32,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.ArrayList;
/**
* The model wrapping android.mtp API.
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java
index affaebd..16523bc 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/PipeManager.java
@@ -22,10 +22,8 @@
import android.util.Log;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java b/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java
index ffab176..df2ab01 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java
@@ -1,14 +1,18 @@
package com.android.mtp;
import android.content.ContentResolver;
+import android.content.res.Resources;
+import android.database.sqlite.SQLiteException;
import android.net.Uri;
import android.os.Process;
import android.provider.DocumentsContract;
import android.util.Log;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
final class RootScanner {
/**
@@ -27,79 +31,119 @@
*/
private final static long SHORT_POLLING_TIMES = 10;
- final ContentResolver mResolver;
- final MtpManager mManager;
- MtpRoot[] mLastRoots = new MtpRoot[0];
- int mPollingCount;
- boolean mHasBackgroundTask = false;
+ /**
+ * Milliseconds we wait for background thread when pausing.
+ */
+ private final static long AWAIT_TERMINATION_TIMEOUT = 2000;
- RootScanner(ContentResolver resolver, MtpManager manager) {
+ final ContentResolver mResolver;
+ final Resources mResources;
+ final MtpManager mManager;
+ final MtpDatabase mDatabase;
+
+ ExecutorService mExecutor;
+ FutureTask<Void> mCurrentTask;
+
+ RootScanner(
+ ContentResolver resolver,
+ Resources resources,
+ MtpManager manager,
+ MtpDatabase database) {
mResolver = resolver;
+ mResources = resources;
mManager = manager;
+ mDatabase = database;
}
- synchronized MtpRoot[] getRoots() {
- return mLastRoots;
+ /**
+ * Notifies a change of the roots list via ContentResolver.
+ */
+ void notifyChange() {
+ final Uri uri =
+ DocumentsContract.buildRootsUri(MtpDocumentsProvider.AUTHORITY);
+ mResolver.notifyChange(uri, null, false);
}
/**
* Starts to check new changes right away.
* If the background thread has already gone, it restarts another background thread.
*/
- synchronized void scanNow() {
- mPollingCount = 0;
- if (!mHasBackgroundTask) {
- mHasBackgroundTask = true;
- new BackgroundLoaderThread().start();
- } else {
- notify();
+ synchronized void resume() {
+ if (mExecutor == null) {
+ // Only single thread updates the database.
+ mExecutor = Executors.newSingleThreadExecutor();
}
+ if (mCurrentTask != null) {
+ // Cancel previous task.
+ mCurrentTask.cancel(true);
+ }
+ mCurrentTask = new FutureTask<Void>(new UpdateRootsRunnable(), null);
+ mExecutor.submit(mCurrentTask);
}
- private MtpRoot[] createRoots(int[] deviceIds) {
- final ArrayList<MtpRoot> roots = new ArrayList<>();
- for (final int deviceId : deviceIds) {
- try {
- roots.addAll(Arrays.asList(mManager.getRoots(deviceId)));
- } catch (IOException error) {
- // Skip device that return error.
- Log.d(MtpDocumentsProvider.TAG, error.getMessage());
- }
+ /**
+ * Stops background thread and wait for its termination.
+ * @throws InterruptedException
+ */
+ synchronized void pause() throws InterruptedException {
+ if (mExecutor == null) {
+ return;
}
- return roots.toArray(new MtpRoot[roots.size()]);
+ mExecutor.shutdownNow();
+ if (!mExecutor.awaitTermination(AWAIT_TERMINATION_TIMEOUT, TimeUnit.MILLISECONDS)) {
+ Log.e(MtpDocumentsProvider.TAG, "Failed to terminate RootScanner's background thread.");
+ }
+ mExecutor = null;
}
- private final class BackgroundLoaderThread extends Thread {
+ /**
+ * Runnable to scan roots and update the database information.
+ */
+ private final class UpdateRootsRunnable implements Runnable {
@Override
public void run() {
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
- synchronized (RootScanner.this) {
- while (true) {
- final int[] deviceIds = mManager.getOpenedDeviceIds();
- final MtpRoot[] newRoots = createRoots(deviceIds);
- if (!Arrays.equals(mLastRoots, newRoots)) {
- final Uri uri =
- DocumentsContract.buildRootsUri(MtpDocumentsProvider.AUTHORITY);
- mResolver.notifyChange(uri, null, false);
- mLastRoots = newRoots;
- }
- if (deviceIds.length == 0) {
- break;
- }
- mPollingCount++;
+ int pollingCount = 0;
+ while (!Thread.interrupted()) {
+ final int[] deviceIds = mManager.getOpenedDeviceIds();
+ if (deviceIds.length == 0) {
+ return;
+ }
+ boolean changed = false;
+ for (int deviceId : deviceIds) {
try {
- // Use SHORT_POLLING_PERIOD for the first SHORT_POLLING_TIMES because it is
- // more likely to add new root just after the device is added.
- // TODO: Use short interval only for a device that is just added.
- RootScanner.this.wait(
- mPollingCount > SHORT_POLLING_TIMES ?
- LONG_POLLING_INTERVAL : SHORT_POLLING_INTERVAL);
- } catch (InterruptedException exception) {
- break;
+ final MtpRoot[] roots = mManager.getRoots(deviceId);
+ mDatabase.getMapper().startAddingRootDocuments(deviceId);
+ try {
+ if (mDatabase.getMapper().putRootDocuments(
+ deviceId, mResources, roots)) {
+ changed = true;
+ }
+ } finally {
+ if (mDatabase.getMapper().stopAddingRootDocuments(deviceId)) {
+ changed = true;
+ }
+ }
+ } catch (IOException | SQLiteException exception) {
+ // The error may happen on the device. We would like to continue getting
+ // roots for other devices.
+ Log.e(MtpDocumentsProvider.TAG, exception.getMessage());
}
}
-
- mHasBackgroundTask = false;
+ if (changed) {
+ notifyChange();
+ }
+ pollingCount++;
+ try {
+ // Use SHORT_POLLING_PERIOD for the first SHORT_POLLING_TIMES because it is
+ // more likely to add new root just after the device is added.
+ // TODO: Use short interval only for a device that is just added.
+ Thread.sleep(pollingCount > SHORT_POLLING_TIMES ?
+ LONG_POLLING_INTERVAL : SHORT_POLLING_INTERVAL);
+ } catch (InterruptedException exp) {
+ // The while condition handles the interrupted flag.
+ continue;
+ }
}
}
}
diff --git a/packages/MtpDocumentsProvider/tests/AndroidManifest.xml b/packages/MtpDocumentsProvider/tests/AndroidManifest.xml
index 28ad3f4..e1307e9 100644
--- a/packages/MtpDocumentsProvider/tests/AndroidManifest.xml
+++ b/packages/MtpDocumentsProvider/tests/AndroidManifest.xml
@@ -18,7 +18,4 @@
<instrumentation android:name="com.android.mtp.TestResultInstrumentation"
android:targetPackage="com.android.mtp"
android:label="Tests for MtpDocumentsProvider with the UI for output." />
- <instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.mtp"
- android:label="Tests for MtpDocumentsProvider." />
</manifest>
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java
index a012d7f..f0b4343 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java
@@ -22,31 +22,42 @@
import android.net.Uri;
import android.provider.DocumentsContract;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.test.suitebuilder.annotation.MediumTest;
import java.io.IOException;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-@SmallTest
+@MediumTest
public class DocumentLoaderTest extends AndroidTestCase {
+ private MtpDatabase mDatabase;
private BlockableTestMtpManager mManager;
private TestContentResolver mResolver;
private DocumentLoader mLoader;
- final private Identifier mParentIdentifier = new Identifier(0, 0, 0);
+ final private Identifier mParentIdentifier = new Identifier(0, 0, 0, "1");
@Override
public void setUp() {
+ mDatabase = new MtpDatabase(getContext(), MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, new TestResources(), new MtpRoot[] {
+ new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "")
+ });
+ mDatabase.getMapper().stopAddingRootDocuments(0);
mManager = new BlockableTestMtpManager(getContext());
mResolver = new TestContentResolver();
- mLoader = new DocumentLoader(mManager, mResolver);
+ mLoader = new DocumentLoader(mManager, mResolver, mDatabase);
+ }
+
+ @Override
+ public void tearDown() {
+ mDatabase.close();
}
public void testBasic() throws Exception {
final Uri uri = DocumentsContract.buildChildDocumentsUri(
- MtpDocumentsProvider.AUTHORITY, mParentIdentifier.toDocumentId());
+ MtpDocumentsProvider.AUTHORITY, mParentIdentifier.mDocumentId);
setUpDocument(mManager, 40);
mManager.blockDocument(0, 15);
mManager.blockDocument(0, 35);
@@ -88,6 +99,7 @@
childDocuments[i] = objectHandle;
manager.setObjectInfo(0, new MtpObjectInfo.Builder()
.setObjectHandle(objectHandle)
+ .setName(Integer.toString(i))
.build());
}
manager.setObjectHandles(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, childDocuments);
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
index 05345e1..67b0672 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
@@ -20,10 +20,15 @@
import android.mtp.MtpConstants;
import android.mtp.MtpObjectInfo;
import android.provider.DocumentsContract;
+import android.provider.DocumentsContract.Document;
import android.provider.DocumentsContract.Root;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import java.io.FileNotFoundException;
+
+import static com.android.mtp.MtpDatabase.strings;
+
@SmallTest
public class MtpDatabaseTest extends AndroidTestCase {
private final String[] COLUMN_NAMES = new String[] {
@@ -41,18 +46,29 @@
};
private final TestResources resources = new TestResources();
+ MtpDatabase mDatabase;
+
+ @Override
+ public void setUp() {
+ mDatabase = new MtpDatabase(getContext(), MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
+ }
+
+ @Override
+ public void tearDown() {
+ mDatabase.close();
+ mDatabase = null;
+ }
public void testPutRootDocuments() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 1, "Device", "Storage", 1000, 2000, ""),
new MtpRoot(0, 2, "Device", "Storage", 2000, 4000, ""),
new MtpRoot(0, 3, "Device", "/@#%&<>Storage", 3000, 6000,"")
});
{
- final Cursor cursor = database.queryRootDocuments(COLUMN_NAMES);
+ final Cursor cursor = mDatabase.queryRootDocuments(COLUMN_NAMES);
assertEquals(3, cursor.getCount());
cursor.moveToNext();
@@ -64,7 +80,7 @@
assertEquals("displayName", "Device Storage", cursor.getString(5));
assertTrue("summary", cursor.isNull(6));
assertTrue("lastModified", cursor.isNull(7));
- assertTrue("icon", cursor.isNull(8));
+ assertEquals("icon", R.drawable.ic_root_mtp, cursor.getInt(8));
assertEquals("flag", 0, cursor.getInt(9));
assertEquals("size", 1000, cursor.getInt(10));
@@ -80,7 +96,7 @@
}
{
- final Cursor cursor = database.queryRoots(new String [] {
+ final Cursor cursor = mDatabase.queryRoots(new String [] {
Root.COLUMN_ROOT_ID,
Root.COLUMN_FLAGS,
Root.COLUMN_ICON,
@@ -95,7 +111,7 @@
cursor.moveToNext();
assertEquals(1, cursor.getInt(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1));
- assertTrue(cursor.isNull(2));
+ assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device Storage", cursor.getString(3));
assertTrue(cursor.isNull(4));
assertEquals(1, cursor.getInt(5));
@@ -105,7 +121,7 @@
cursor.moveToNext();
assertEquals(2, cursor.getInt(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1));
- assertTrue(cursor.isNull(2));
+ assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device Storage", cursor.getString(3));
assertTrue(cursor.isNull(4));
assertEquals(2, cursor.getInt(5));
@@ -115,7 +131,7 @@
cursor.moveToNext();
assertEquals(3, cursor.getInt(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1));
- assertTrue(cursor.isNull(2));
+ assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device /@#%&<>Storage", cursor.getString(3));
assertTrue(cursor.isNull(4));
assertEquals(3, cursor.getInt(5));
@@ -136,15 +152,14 @@
}
public void testPutChildDocuments() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
- database.startAddingChildDocuments("parentId");
- database.putChildDocuments(0, "parentId", new MtpObjectInfo[] {
+ mDatabase.getMapper().startAddingChildDocuments("parentId");
+ mDatabase.getMapper().putChildDocuments(0, "parentId", new MtpObjectInfo[] {
createDocument(100, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
createDocument(101, "image.jpg", MtpConstants.FORMAT_EXIF_JPEG, 2 * 1024 * 1024),
createDocument(102, "music.mp3", MtpConstants.FORMAT_MP3, 3 * 1024 * 1024)
});
- final Cursor cursor = database.queryChildDocuments(COLUMN_NAMES, "parentId");
+ final Cursor cursor = mDatabase.queryChildDocuments(COLUMN_NAMES, "parentId");
assertEquals(3, cursor.getCount());
cursor.moveToNext();
@@ -202,7 +217,6 @@
}
public void testRestoreIdForRootDocuments() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_STORAGE_ID,
@@ -212,14 +226,15 @@
Root.COLUMN_ROOT_ID,
Root.COLUMN_AVAILABLE_BYTES
};
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage A", 1000, 0, ""),
new MtpRoot(0, 101, "Device", "Storage B", 1001, 0, "")
});
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -233,7 +248,7 @@
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -244,10 +259,10 @@
cursor.close();
}
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -261,7 +276,7 @@
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -272,14 +287,14 @@
cursor.close();
}
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 200, "Device", "Storage A", 2000, 0, ""),
new MtpRoot(0, 202, "Device", "Storage C", 2002, 0, "")
});
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(3, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -297,7 +312,7 @@
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(3, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -311,10 +326,10 @@
cursor.close();
}
- database.stopAddingRootDocuments(0);
+ mDatabase.getMapper().stopAddingRootDocuments(0);
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -328,7 +343,7 @@
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -341,22 +356,21 @@
}
public void testRestoreIdForChildDocuments() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_OBJECT_HANDLE,
DocumentsContract.Document.COLUMN_DISPLAY_NAME
};
- database.startAddingChildDocuments("parentId");
- database.putChildDocuments(0, "parentId", new MtpObjectInfo[] {
+ mDatabase.getMapper().startAddingChildDocuments("parentId");
+ mDatabase.getMapper().putChildDocuments(0, "parentId", new MtpObjectInfo[] {
createDocument(100, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
createDocument(101, "image.jpg", MtpConstants.FORMAT_EXIF_JPEG, 2 * 1024 * 1024),
createDocument(102, "music.mp3", MtpConstants.FORMAT_MP3, 3 * 1024 * 1024)
});
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
{
- final Cursor cursor = database.queryChildDocuments(columns, "parentId");
+ final Cursor cursor = mDatabase.queryChildDocuments(columns, "parentId");
assertEquals(3, cursor.getCount());
cursor.moveToNext();
@@ -377,14 +391,14 @@
cursor.close();
}
- database.startAddingChildDocuments("parentId");
- database.putChildDocuments(0, "parentId", new MtpObjectInfo[] {
+ mDatabase.getMapper().startAddingChildDocuments("parentId");
+ mDatabase.getMapper().putChildDocuments(0, "parentId", new MtpObjectInfo[] {
createDocument(200, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
createDocument(203, "video.mp4", MtpConstants.FORMAT_MP4_CONTAINER, 1024),
});
{
- final Cursor cursor = database.queryChildDocuments(columns, "parentId");
+ final Cursor cursor = mDatabase.queryChildDocuments(columns, "parentId");
assertEquals(4, cursor.getCount());
cursor.moveToPosition(3);
@@ -395,10 +409,10 @@
cursor.close();
}
- database.stopAddingChildDocuments("parentId");
+ mDatabase.getMapper().stopAddingChildDocuments("parentId");
{
- final Cursor cursor = database.queryChildDocuments(columns, "parentId");
+ final Cursor cursor = mDatabase.queryChildDocuments(columns, "parentId");
assertEquals(2, cursor.getCount());
cursor.moveToNext();
@@ -415,7 +429,6 @@
}
public void testRestoreIdForDifferentDevices() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_STORAGE_ID,
@@ -425,17 +438,17 @@
Root.COLUMN_ROOT_ID,
Root.COLUMN_AVAILABLE_BYTES
};
- database.startAddingRootDocuments(0);
- database.startAddingRootDocuments(1);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().startAddingRootDocuments(1);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage", 0, 0, "")
});
- database.putRootDocuments(1, resources, new MtpRoot[] {
+ mDatabase.getMapper().putRootDocuments(1, resources, new MtpRoot[] {
new MtpRoot(1, 100, "Device", "Storage", 0, 0, "")
});
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -449,7 +462,7 @@
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -460,21 +473,21 @@
cursor.close();
}
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
- database.startAddingRootDocuments(0);
- database.startAddingRootDocuments(1);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().startAddingRootDocuments(1);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 200, "Device", "Storage", 2000, 0, "")
});
- database.putRootDocuments(1, resources, new MtpRoot[] {
+ mDatabase.getMapper().putRootDocuments(1, resources, new MtpRoot[] {
new MtpRoot(1, 300, "Device", "Storage", 3000, 0, "")
});
- database.stopAddingRootDocuments(0);
- database.stopAddingRootDocuments(1);
+ mDatabase.getMapper().stopAddingRootDocuments(0);
+ mDatabase.getMapper().stopAddingRootDocuments(1);
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -488,7 +501,7 @@
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -501,34 +514,33 @@
}
public void testRestoreIdForDifferentParents() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_OBJECT_HANDLE
};
- database.startAddingChildDocuments("parentId1");
- database.startAddingChildDocuments("parentId2");
- database.putChildDocuments(0, "parentId1", new MtpObjectInfo[] {
+ mDatabase.getMapper().startAddingChildDocuments("parentId1");
+ mDatabase.getMapper().startAddingChildDocuments("parentId2");
+ mDatabase.getMapper().putChildDocuments(0, "parentId1", new MtpObjectInfo[] {
createDocument(100, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
});
- database.putChildDocuments(0, "parentId2", new MtpObjectInfo[] {
+ mDatabase.getMapper().putChildDocuments(0, "parentId2", new MtpObjectInfo[] {
createDocument(101, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
});
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
- database.startAddingChildDocuments("parentId1");
- database.startAddingChildDocuments("parentId2");
- database.putChildDocuments(0, "parentId1", new MtpObjectInfo[] {
+ mDatabase.getMapper().startAddingChildDocuments("parentId1");
+ mDatabase.getMapper().startAddingChildDocuments("parentId2");
+ mDatabase.getMapper().putChildDocuments(0, "parentId1", new MtpObjectInfo[] {
createDocument(200, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
});
- database.putChildDocuments(0, "parentId2", new MtpObjectInfo[] {
+ mDatabase.getMapper().putChildDocuments(0, "parentId2", new MtpObjectInfo[] {
createDocument(201, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
});
- database.stopAddingChildDocuments("parentId1");
+ mDatabase.getMapper().stopAddingChildDocuments("parentId1");
{
- final Cursor cursor = database.queryChildDocuments(columns, "parentId1");
+ final Cursor cursor = mDatabase.queryChildDocuments(columns, "parentId1");
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -536,7 +548,7 @@
cursor.close();
}
{
- final Cursor cursor = database.queryChildDocuments(columns, "parentId2");
+ final Cursor cursor = mDatabase.queryChildDocuments(columns, "parentId2");
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 2, cursor.getInt(0));
@@ -546,7 +558,6 @@
}
public void testClearMtpIdentifierBeforeResolveRootDocuments() {
- final MtpDatabase database = new MtpDatabase(getContext());
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_STORAGE_ID,
@@ -557,26 +568,26 @@
Root.COLUMN_AVAILABLE_BYTES
};
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage", 0, 0, ""),
});
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 200, "Device", "Storage", 2000, 0, ""),
});
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 300, "Device", "Storage", 3000, 0, ""),
});
- database.stopAddingRootDocuments(0);
+ mDatabase.getMapper().stopAddingRootDocuments(0);
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -585,7 +596,7 @@
cursor.close();
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -595,7 +606,6 @@
}
public void testPutSameNameRootsAfterClearing() throws Exception {
- final MtpDatabase database = new MtpDatabase(getContext());
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_STORAGE_ID,
@@ -606,21 +616,21 @@
Root.COLUMN_AVAILABLE_BYTES
};
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage", 0, 0, ""),
});
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 200, "Device", "Storage", 2000, 0, ""),
new MtpRoot(0, 201, "Device", "Storage", 2001, 0, ""),
});
- database.stopAddingRootDocuments(0);
+ mDatabase.getMapper().stopAddingRootDocuments(0);
{
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 2, cursor.getInt(0));
@@ -633,7 +643,7 @@
cursor.close();
}
{
- final Cursor cursor = database.queryRoots(rootColumns);
+ final Cursor cursor = mDatabase.queryRoots(rootColumns);
assertEquals(2, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 2, cursor.getInt(0));
@@ -646,27 +656,26 @@
}
public void testReplaceExistingRoots() {
- // The client code should be able to replace exisitng rows with new information.
- final MtpDatabase database = new MtpDatabase(getContext());
+ // The client code should be able to replace existing rows with new information.
// Add one.
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""),
});
- database.stopAddingRootDocuments(0);
+ mDatabase.getMapper().stopAddingRootDocuments(0);
// Replace it.
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage B", 1000, 1000, ""),
});
- database.stopAddingRootDocuments(0);
+ mDatabase.getMapper().stopAddingRootDocuments(0);
{
final String[] columns = new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID,
MtpDatabaseConstants.COLUMN_STORAGE_ID,
DocumentsContract.Document.COLUMN_DISPLAY_NAME
};
- final Cursor cursor = database.queryRootDocuments(columns);
+ final Cursor cursor = mDatabase.queryRootDocuments(columns);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("documentId", 1, cursor.getInt(0));
@@ -679,7 +688,7 @@
Root.COLUMN_ROOT_ID,
Root.COLUMN_AVAILABLE_BYTES
};
- final Cursor cursor = database.queryRoots(columns);
+ final Cursor cursor = mDatabase.queryRoots(columns);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
assertEquals("rootId", 1, cursor.getInt(0));
@@ -688,27 +697,155 @@
}
}
- public void _testFailToReplaceExisitingUnmappedRoots() {
+ public void testFailToReplaceExisitingUnmappedRoots() {
// The client code should not be able to replace rows before resolving 'unmapped' rows.
- final MtpDatabase database = new MtpDatabase(getContext());
// Add one.
- database.startAddingRootDocuments(0);
- database.putRootDocuments(0, resources, new MtpRoot[] {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""),
});
- database.clearMapping();
+ mDatabase.getMapper().clearMapping();
+ final Cursor oldCursor = mDatabase.queryRoots(strings(Root.COLUMN_ROOT_ID));
+ assertEquals(1, oldCursor.getCount());
+
// Add one.
- database.putRootDocuments(0, resources, new MtpRoot[] {
- new MtpRoot(0, 100, "Device", "Storage B", 1000, 1000, ""),
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
+ new MtpRoot(0, 101, "Device", "Storage B", 1000, 1000, ""),
});
// Add one more before resolving unmapped documents.
- try {
- database.putRootDocuments(0, resources, new MtpRoot[] {
- new MtpRoot(0, 100, "Device", "Storage B", 1000, 1000, ""),
- });
- fail();
- } catch (Throwable e) {
- assertTrue(e instanceof Error);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
+ new MtpRoot(0, 102, "Device", "Storage B", 1000, 1000, ""),
+ });
+ mDatabase.getMapper().stopAddingRootDocuments(0);
+
+ // Because the roots shares the same name, the roots should have new IDs.
+ final Cursor newCursor = mDatabase.queryRoots(strings(Root.COLUMN_ROOT_ID));
+ assertEquals(2, newCursor.getCount());
+ oldCursor.moveToNext();
+ newCursor.moveToNext();
+ assertFalse(oldCursor.getString(0).equals(newCursor.getString(0)));
+ newCursor.moveToNext();
+ assertFalse(oldCursor.getString(0).equals(newCursor.getString(0)));
+
+ oldCursor.close();
+ newCursor.close();
+ }
+
+ public void testQueryDocument() {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
+ new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""),
+ });
+ mDatabase.getMapper().stopAddingRootDocuments(0);
+
+ final Cursor cursor = mDatabase.queryDocument("1", strings(Document.COLUMN_DISPLAY_NAME));
+ assertEquals(1, cursor.getCount());
+ cursor.moveToNext();
+ assertEquals("Device Storage A", cursor.getString(0));
+ cursor.close();
+ }
+
+ public void testGetParentId() throws FileNotFoundException {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
+ new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""),
+ });
+ mDatabase.getMapper().stopAddingRootDocuments(0);
+
+ mDatabase.getMapper().startAddingChildDocuments("1");
+ mDatabase.getMapper().putChildDocuments(
+ 0,
+ "1",
+ new MtpObjectInfo[] {
+ createDocument(200, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
+ });
+ mDatabase.getMapper().stopAddingChildDocuments("1");
+
+ assertEquals("1", mDatabase.getParentId("2"));
+ }
+
+ public void testDeleteDocument() {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
+ new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""),
+ });
+ mDatabase.getMapper().stopAddingRootDocuments(0);
+
+ mDatabase.getMapper().startAddingChildDocuments("1");
+ mDatabase.getMapper().putChildDocuments(
+ 0,
+ "1",
+ new MtpObjectInfo[] {
+ createDocument(200, "dir", MtpConstants.FORMAT_ASSOCIATION, 1024),
+ });
+ mDatabase.getMapper().stopAddingChildDocuments("1");
+
+ mDatabase.getMapper().startAddingChildDocuments("2");
+ mDatabase.getMapper().putChildDocuments(
+ 0,
+ "2",
+ new MtpObjectInfo[] {
+ createDocument(200, "note.txt", MtpConstants.FORMAT_TEXT, 1024),
+ });
+ mDatabase.getMapper().stopAddingChildDocuments("2");
+
+ mDatabase.deleteDocument("2");
+
+ {
+ // Do not query deleted documents.
+ final Cursor cursor =
+ mDatabase.queryChildDocuments(strings(Document.COLUMN_DOCUMENT_ID), "1");
+ assertEquals(0, cursor.getCount());
+ cursor.close();
+ }
+
+ {
+ // Child document should be deleted also.
+ final Cursor cursor =
+ mDatabase.queryDocument("3", strings(Document.COLUMN_DOCUMENT_ID));
+ assertEquals(0, cursor.getCount());
+ cursor.close();
+ }
+ }
+
+ public void testPutNewDocument() {
+ mDatabase.getMapper().startAddingRootDocuments(0);
+ mDatabase.getMapper().putRootDocuments(0, resources, new MtpRoot[] {
+ new MtpRoot(0, 100, "Device", "Storage A", 0, 0, ""),
+ });
+ mDatabase.getMapper().stopAddingRootDocuments(0);
+
+ assertEquals(
+ "2",
+ mDatabase.putNewDocument(
+ 0, "1", createDocument(200, "note.txt", MtpConstants.FORMAT_TEXT, 1024)));
+
+ {
+ final Cursor cursor =
+ mDatabase.queryChildDocuments(strings(Document.COLUMN_DOCUMENT_ID), "1");
+ assertEquals(1, cursor.getCount());
+ cursor.moveToNext();
+ assertEquals("2", cursor.getString(0));
+ cursor.close();
+ }
+
+ // The new document should not be mapped with existing invalidated document.
+ mDatabase.getMapper().clearMapping();
+ mDatabase.getMapper().startAddingChildDocuments("1");
+ mDatabase.putNewDocument(
+ 0,
+ "1",
+ createDocument(201, "note.txt", MtpConstants.FORMAT_TEXT, 1024));
+ mDatabase.getMapper().stopAddingChildDocuments("1");
+
+ {
+ final Cursor cursor =
+ mDatabase.queryChildDocuments(strings(Document.COLUMN_DOCUMENT_ID), "1");
+ assertEquals(1, cursor.getCount());
+ cursor.moveToNext();
+ assertEquals("3", cursor.getString(0));
+ cursor.close();
}
}
}
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
index 5765f0a..dc6f79e 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
@@ -23,10 +23,14 @@
import android.provider.DocumentsContract.Root;
import android.provider.DocumentsContract;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.concurrent.TimeoutException;
+
+import static com.android.mtp.MtpDatabase.strings;
@SmallTest
public class MtpDocumentsProviderTest extends AndroidTestCase {
@@ -36,16 +40,22 @@
private MtpDocumentsProvider mProvider;
private TestMtpManager mMtpManager;
private final TestResources mResources = new TestResources();
+ private MtpDatabase mDatabase;
@Override
public void setUp() throws IOException {
mResolver = new TestContentResolver();
mMtpManager = new TestMtpManager(getContext());
- mProvider = new MtpDocumentsProvider();
- mProvider.onCreateForTesting(mResources, mMtpManager, mResolver);
+ }
+
+ @Override
+ public void tearDown() {
+ mProvider.shutdown();
+ MtpDatabase.deleteDatabase(getContext());
}
public void testOpenAndCloseDevice() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mMtpManager.setRoots(0, new MtpRoot[] {
new MtpRoot(
@@ -66,6 +76,7 @@
}
public void testOpenAndCloseErrorDevice() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
try {
mProvider.openDevice(1);
fail();
@@ -96,27 +107,8 @@
mResolver.waitForNotification(ROOTS_URI, 1);
}
- public void testCloseAllDevices() throws Exception {
- mMtpManager.addValidDevice(0);
- mMtpManager.setRoots(0, new MtpRoot[] {
- new MtpRoot(
- 0 /* deviceId */,
- 1 /* storageId */,
- "Device A" /* device model name */,
- "Storage A" /* volume description */,
- 1024 /* free space */,
- 2048 /* total space */,
- "" /* no volume identifier */)
- });
- mProvider.closeAllDevices();
- mProvider.openDevice(0);
- mResolver.waitForNotification(ROOTS_URI, 1);
-
- mProvider.closeAllDevices();
- mResolver.waitForNotification(ROOTS_URI, 2);
- }
-
public void testQueryRoots() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mMtpManager.addValidDevice(1);
mMtpManager.setRoots(0, new MtpRoot[] {
@@ -146,12 +138,11 @@
final Cursor cursor = mProvider.queryRoots(null);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
- assertEquals("0_1", cursor.getString(0));
+ assertEquals("1", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1));
- // TODO: Add storage icon for MTP devices.
- assertTrue(cursor.isNull(2) /* icon */);
+ assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device A Storage A", cursor.getString(3));
- assertEquals("0_1_0", cursor.getString(4));
+ assertEquals("1", cursor.getString(4));
assertEquals(1024, cursor.getInt(5));
}
@@ -162,24 +153,17 @@
assertEquals(2, cursor.getCount());
cursor.moveToNext();
cursor.moveToNext();
- assertEquals("1_1", cursor.getString(0));
+ assertEquals("2", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1));
- // TODO: Add storage icon for MTP devices.
- assertTrue(cursor.isNull(2) /* icon */);
+ assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device B Storage B", cursor.getString(3));
- assertEquals("1_1_0", cursor.getString(4));
+ assertEquals("2", cursor.getString(4));
assertEquals(2048, cursor.getInt(5));
}
-
- {
- mProvider.closeAllDevices();
- mResolver.waitForNotification(ROOTS_URI, 3);
- final Cursor cursor = mProvider.queryRoots(null);
- assertEquals(0, cursor.getCount());
- }
}
public void testQueryRoots_error() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mMtpManager.addValidDevice(1);
// Not set roots for device 0 so that MtpManagerMock#getRoots throws IOException.
@@ -201,32 +185,43 @@
final Cursor cursor = mProvider.queryRoots(null);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
- assertEquals("1_1", cursor.getString(0));
+ assertEquals("1", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1));
- // TODO: Add storage icon for MTP devices.
- assertTrue(cursor.isNull(2) /* icon */);
+ assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device B Storage B", cursor.getString(3));
- assertEquals("1_1_0", cursor.getString(4));
+ assertEquals("1", cursor.getString(4));
assertEquals(2048, cursor.getInt(5));
}
}
- public void testQueryDocument() throws IOException {
+ public void testQueryDocument() throws IOException, InterruptedException, TimeoutException {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
- mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
- .setObjectHandle(2)
- .setFormat(MtpConstants.FORMAT_EXIF_JPEG)
- .setName("image.jpg")
- .setDateModified(1422716400000L)
- .setCompressedSize(1024 * 1024 * 5)
- .setThumbCompressedSize(1024 * 50)
- .build());
- final Cursor cursor = mProvider.queryDocument("0_1_2", null);
+
+ setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") });
+ setupDocuments(
+ 0,
+ 0,
+ MtpManager.OBJECT_HANDLE_ROOT_CHILDREN,
+ "1",
+ new MtpObjectInfo[] {
+ new MtpObjectInfo.Builder()
+ .setObjectHandle(100)
+ .setFormat(MtpConstants.FORMAT_EXIF_JPEG)
+ .setName("image.jpg")
+ .setDateModified(1422716400000L)
+ .setCompressedSize(1024 * 1024 * 5)
+ .setThumbCompressedSize(50 * 1024)
+ .build()
+ });
+
+ final Cursor cursor = mProvider.queryDocument("2", null);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
- assertEquals("0_1_2", cursor.getString(0));
+
+ assertEquals("2", cursor.getString(0));
assertEquals("image/jpeg", cursor.getString(1));
assertEquals("image.jpg", cursor.getString(2));
assertEquals(1422716400000L, cursor.getLong(3));
@@ -238,20 +233,33 @@
assertEquals(1024 * 1024 * 5, cursor.getInt(5));
}
- public void testQueryDocument_directory() throws IOException {
+ public void testQueryDocument_directory()
+ throws IOException, InterruptedException, TimeoutException {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
- mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
- .setObjectHandle(2)
- .setFormat(MtpConstants.FORMAT_ASSOCIATION)
- .setName("directory")
- .setDateModified(1422716400000L)
- .build());
- final Cursor cursor = mProvider.queryDocument("0_1_2", null);
+
+ setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") });
+ setupDocuments(
+ 0,
+ 0,
+ MtpManager.OBJECT_HANDLE_ROOT_CHILDREN,
+ "1",
+ new MtpObjectInfo[] {
+ new MtpObjectInfo.Builder()
+ .setObjectHandle(2)
+ .setStorageId(1)
+ .setFormat(MtpConstants.FORMAT_ASSOCIATION)
+ .setName("directory")
+ .setDateModified(1422716400000L)
+ .build()
+ });
+
+ final Cursor cursor = mProvider.queryDocument("2", null);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
- assertEquals("0_1_2", cursor.getString(0));
+ assertEquals("2", cursor.getString(0));
assertEquals(DocumentsContract.Document.MIME_TYPE_DIR, cursor.getString(1));
assertEquals("directory", cursor.getString(2));
assertEquals(1422716400000L, cursor.getLong(3));
@@ -263,10 +271,13 @@
assertEquals(0, cursor.getInt(5));
}
- public void testQueryDocument_forRoot() throws IOException {
+ public void testQueryDocument_forRoot()
+ throws IOException, InterruptedException, TimeoutException {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
- mMtpManager.setRoots(0, new MtpRoot[] {
+
+ setupRoots(0, new MtpRoot[] {
new MtpRoot(
0 /* deviceId */,
1 /* storageId */,
@@ -276,11 +287,11 @@
4096 /* total space */,
"" /* no volume identifier */)
});
- final Cursor cursor = mProvider.queryDocument("0_1_0", null);
+ final Cursor cursor = mProvider.queryDocument("1", null);
assertEquals(1, cursor.getCount());
cursor.moveToNext();
- assertEquals("0_1_0", cursor.getString(0));
+ assertEquals("1", cursor.getString(0));
assertEquals(DocumentsContract.Document.MIME_TYPE_DIR, cursor.getString(1));
assertEquals("Device A Storage A", cursor.getString(2));
assertTrue(cursor.isNull(3));
@@ -289,38 +300,47 @@
}
public void testQueryChildDocuments() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
- mMtpManager.setObjectHandles(0, 0, -1, new int[] { 1 });
- mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
- .setObjectHandle(1)
- .setFormat(MtpConstants.FORMAT_EXIF_JPEG)
- .setName("image.jpg")
- .setCompressedSize(1024 * 1024 * 5)
- .setThumbCompressedSize(5 * 1024)
- .setProtectionStatus(MtpConstants.PROTECTION_STATUS_READ_ONLY)
- .build());
+ setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") });
+ setupDocuments(
+ 0,
+ 0,
+ MtpManager.OBJECT_HANDLE_ROOT_CHILDREN,
+ "1",
+ new MtpObjectInfo[] {
+ new MtpObjectInfo.Builder()
+ .setObjectHandle(100)
+ .setFormat(MtpConstants.FORMAT_EXIF_JPEG)
+ .setName("image.jpg")
+ .setCompressedSize(1024 * 1024 * 5)
+ .setThumbCompressedSize(5 * 1024)
+ .setProtectionStatus(MtpConstants.PROTECTION_STATUS_READ_ONLY)
+ .build()
+ });
- final Cursor cursor = mProvider.queryChildDocuments("0_0_0", null, null);
+ final Cursor cursor = mProvider.queryChildDocuments("1", null, null);
assertEquals(1, cursor.getCount());
assertTrue(cursor.moveToNext());
- assertEquals("0_0_1", cursor.getString(0));
+ assertEquals("2", cursor.getString(0));
assertEquals("image/jpeg", cursor.getString(1));
assertEquals("image.jpg", cursor.getString(2));
assertEquals(0, cursor.getLong(3));
assertEquals(DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL, cursor.getInt(4));
assertEquals(1024 * 1024 * 5, cursor.getInt(5));
- assertFalse(cursor.moveToNext());
+ cursor.close();
}
public void testQueryChildDocuments_cursorError() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
try {
- mProvider.queryChildDocuments("0_0_0", null, null);
+ mProvider.queryChildDocuments("1", null, null);
fail();
} catch (Throwable error) {
assertTrue(error instanceof FileNotFoundException);
@@ -328,44 +348,134 @@
}
public void testQueryChildDocuments_documentError() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
+ setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 1000, 1000, "") });
mMtpManager.setObjectHandles(0, 0, -1, new int[] { 1 });
try {
- mProvider.queryChildDocuments("0_0_0", null, null);
+ mProvider.queryChildDocuments("1", null, null);
fail();
} catch (Throwable error) {
assertTrue(error instanceof FileNotFoundException);
}
}
- public void testDeleteDocument() throws IOException {
+ public void testDeleteDocument() throws IOException, InterruptedException, TimeoutException {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
- mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
- .setObjectHandle(1)
- .setParent(2)
- .build());
- mProvider.deleteDocument("0_0_1");
+ setupRoots(0, new MtpRoot[] {
+ new MtpRoot(0, 0, "Device", "Storage", 0, 0, "")
+ });
+ setupDocuments(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, "1", new MtpObjectInfo[] {
+ new MtpObjectInfo.Builder()
+ .setName("test.txt")
+ .setObjectHandle(1)
+ .setParent(-1)
+ .build()
+ });
+
+ mProvider.deleteDocument("2");
assertEquals(1, mResolver.getChangeCount(
DocumentsContract.buildChildDocumentsUri(
- MtpDocumentsProvider.AUTHORITY, "0_0_2")));
+ MtpDocumentsProvider.AUTHORITY, "1")));
}
- public void testDeleteDocument_error() throws IOException {
+ public void testDeleteDocument_error()
+ throws IOException, InterruptedException, TimeoutException {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY);
mMtpManager.addValidDevice(0);
mProvider.openDevice(0);
- mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
- .setObjectHandle(2)
- .build());
+ setupRoots(0, new MtpRoot[] {
+ new MtpRoot(0, 0, "Device", "Storage", 0, 0, "")
+ });
+ setupDocuments(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, "1", new MtpObjectInfo[] {
+ new MtpObjectInfo.Builder()
+ .setName("test.txt")
+ .setObjectHandle(1)
+ .setParent(-1)
+ .build()
+ });
try {
- mProvider.deleteDocument("0_0_1");
+ mProvider.deleteDocument("3");
fail();
} catch (Throwable e) {
assertTrue(e instanceof IOException);
}
assertEquals(0, mResolver.getChangeCount(
DocumentsContract.buildChildDocumentsUri(
- MtpDocumentsProvider.AUTHORITY, "0_0_2")));
+ MtpDocumentsProvider.AUTHORITY, "1")));
+ }
+
+ @MediumTest
+ public void testPauseAndResume() throws Exception {
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_FILE);
+ mMtpManager.addValidDevice(0);
+ mProvider.openDevice(0);
+ setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Device", "Storage", 0, 0, "")});
+
+ {
+ final Cursor cursor = mProvider.queryRoots(
+ strings(DocumentsContract.Root.COLUMN_ROOT_ID));
+ cursor.moveToNext();
+ assertEquals(1, cursor.getInt(0));
+ }
+
+ mProvider.shutdown();
+ setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_FILE);
+
+ {
+ // We can still fetch roots after relaunching the provider.
+ final Cursor cursor = mProvider.queryRoots(
+ strings(DocumentsContract.Root.COLUMN_ROOT_ID));
+ assertEquals(1, cursor.getCount());
+ cursor.moveToNext();
+ assertEquals(1, cursor.getInt(0));
+ assertEquals(1, mMtpManager.getOpenedDeviceIds().length);
+ }
+ }
+
+ private void setupProvider(int flag) {
+ mDatabase = new MtpDatabase(getContext(), flag);
+ mProvider = new MtpDocumentsProvider();
+ mProvider.onCreateForTesting(mResources, mMtpManager, mResolver, mDatabase);
+ }
+
+ private String[] getStrings(Cursor cursor) {
+ try {
+ final String[] results = new String[cursor.getCount()];
+ for (int i = 0; cursor.moveToNext(); i++) {
+ results[i] = cursor.getString(0);
+ }
+ return results;
+ } finally {
+ cursor.close();
+ }
+ }
+
+ private String[] setupRoots(int deviceId, MtpRoot[] roots)
+ throws FileNotFoundException, InterruptedException, TimeoutException {
+ final int changeCount = mResolver.getChangeCount(ROOTS_URI);
+ mMtpManager.setRoots(deviceId, roots);
+ mResolver.waitForNotification(ROOTS_URI, changeCount + 1);
+ return getStrings(mProvider.queryRoots(strings(DocumentsContract.Root.COLUMN_ROOT_ID)));
+ }
+
+ private String[] setupDocuments(
+ int deviceId,
+ int storageId,
+ int parentHandle,
+ String parentDocumentId,
+ MtpObjectInfo[] objects) throws FileNotFoundException {
+ final int[] handles = new int[objects.length];
+ int i = 0;
+ for (final MtpObjectInfo info : objects) {
+ handles[i] = info.getObjectHandle();
+ mMtpManager.setObjectInfo(deviceId, info);
+ }
+ mMtpManager.setObjectHandles(deviceId, storageId, parentHandle, handles);
+ return getStrings(mProvider.queryChildDocuments(
+ parentDocumentId, strings(DocumentsContract.Document.COLUMN_DOCUMENT_ID), null));
}
}
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
index 5547771..a045d06 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
@@ -16,26 +16,18 @@
package com.android.mtp;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbDeviceConnection;
import android.hardware.usb.UsbManager;
import android.os.CancellationSignal;
import android.os.OperationCanceledException;
import android.test.InstrumentationTestCase;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.concurrent.CountDownLatch;
@RealDeviceTest
public class MtpManagerTest extends InstrumentationTestCase {
- private static final String ACTION_USB_PERMISSION =
- "com.android.mtp.USB_PERMISSION";
+
private static final int TIMEOUT_MS = 1000;
UsbManager mUsbManager;
MtpManager mManager;
@@ -45,10 +37,8 @@
@Override
public void setUp() throws Exception {
mUsbManager = getContext().getSystemService(UsbManager.class);
- mUsbDevice = findDevice();
mManager = new MtpManager(getContext());
- mManager.openDevice(mUsbDevice.getDeviceId());
- waitForStorages(mManager, mUsbDevice.getDeviceId());
+ mUsbDevice = TestUtil.setupMtpDevice(getInstrumentation(), mUsbManager, mManager);
}
@Override
@@ -56,6 +46,11 @@
mManager.closeDevice(mUsbDevice.getDeviceId());
}
+ @Override
+ public TestResultInstrumentation getInstrumentation() {
+ return (TestResultInstrumentation) super.getInstrumentation();
+ }
+
public void testCancelEvent() throws Exception {
final CancellationSignal signal = new CancellationSignal();
final Thread thread = new Thread() {
@@ -64,7 +59,7 @@
try {
mManager.readEvent(mUsbDevice.getDeviceId(), signal);
} catch (OperationCanceledException | IOException e) {
- show(e.getMessage());
+ getInstrumentation().show(e.getMessage());
}
}
};
@@ -74,72 +69,6 @@
thread.join(TIMEOUT_MS);
}
- private void requestPermission(UsbDevice device) throws InterruptedException {
- if (mUsbManager.hasPermission(device)) {
- return;
- }
- final CountDownLatch latch = new CountDownLatch(1);
- final BroadcastReceiver receiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- latch.countDown();
- getInstrumentation().getTargetContext().unregisterReceiver(this);
- }
- };
- getInstrumentation().getTargetContext().registerReceiver(
- receiver, new IntentFilter(ACTION_USB_PERMISSION));
- mUsbManager.requestPermission(device, PendingIntent.getBroadcast(
- getInstrumentation().getTargetContext(),
- 0 /* requstCode */,
- new Intent(ACTION_USB_PERMISSION),
- 0 /* flags */));
- latch.await();
- assertTrue(mUsbManager.hasPermission(device));
- }
-
- private UsbDevice findDevice() throws InterruptedException {
- while (true) {
- final HashMap<String,UsbDevice> devices = mUsbManager.getDeviceList();
- if (devices.size() == 0) {
- show("Wait for devices.");
- Thread.sleep(1000);
- continue;
- }
- final UsbDevice device = devices.values().iterator().next();
- requestPermission(device);
- final UsbDeviceConnection connection = mUsbManager.openDevice(device);
- if (connection == null) {
- fail("Cannot open USB connection.");
- }
- for (int i = 0; i < device.getInterfaceCount(); i++) {
- // Since the test runs real environment, we need to call claim interface with
- // force = true to rob interfaces from other applications.
- connection.claimInterface(device.getInterface(i), true);
- connection.releaseInterface(device.getInterface(i));
- }
- connection.close();
- return device;
- }
- }
-
- private void waitForStorages(MtpManager manager, int deviceId) throws Exception {
- while (true) {
- if (manager.getRoots(deviceId).length == 0) {
- show("Wait for storages.");
- Thread.sleep(1000);
- continue;
- }
- return;
- }
- }
-
- private void show(String message) {
- if (!(getInstrumentation() instanceof TestResultInstrumentation)) {
- return;
- }
- ((TestResultInstrumentation) getInstrumentation()).show(message);
- }
-
private Context getContext() {
return getInstrumentation().getContext();
}
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java
index 53018cc..ccdea03 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/PipeManagerTest.java
@@ -19,15 +19,14 @@
import android.mtp.MtpObjectInfo;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.test.suitebuilder.annotation.MediumTest;
import java.io.IOException;
-import java.util.Date;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-@SmallTest
+@MediumTest
public class PipeManagerTest extends AndroidTestCase {
private static final byte[] HELLO_BYTES = new byte[] { 'h', 'e', 'l', 'l', 'o' };
@@ -45,13 +44,13 @@
public void testReadDocument_basic() throws Exception {
mtpManager.setImportFileBytes(0, 1, HELLO_BYTES);
final ParcelFileDescriptor descriptor = mPipeManager.readDocument(
- mtpManager, new Identifier(0, 0, 1));
+ mtpManager, new Identifier(0, 0, 1, null));
assertDescriptor(descriptor, HELLO_BYTES);
}
public void testReadDocument_error() throws Exception {
final ParcelFileDescriptor descriptor =
- mPipeManager.readDocument(mtpManager, new Identifier(0, 0, 1));
+ mPipeManager.readDocument(mtpManager, new Identifier(0, 0, 1, null));
assertDescriptorError(descriptor);
}
@@ -63,7 +62,7 @@
// Upload testing bytes.
final ParcelFileDescriptor descriptor = mPipeManager.writeDocument(
- getContext(), mtpManager, new Identifier(0, 0, 1));
+ getContext(), mtpManager, new Identifier(0, 0, 1, null));
final ParcelFileDescriptor.AutoCloseOutputStream outputStream =
new ParcelFileDescriptor.AutoCloseOutputStream(descriptor);
outputStream.write(HELLO_BYTES, 0, HELLO_BYTES.length);
@@ -95,13 +94,13 @@
public void testReadThumbnail_basic() throws Exception {
mtpManager.setThumbnail(0, 1, HELLO_BYTES);
final ParcelFileDescriptor descriptor = mPipeManager.readThumbnail(
- mtpManager, new Identifier(0, 0, 1));
+ mtpManager, new Identifier(0, 0, 1, null));
assertDescriptor(descriptor, HELLO_BYTES);
}
public void testReadThumbnail_error() throws Exception {
final ParcelFileDescriptor descriptor =
- mPipeManager.readThumbnail(mtpManager, new Identifier(0, 0, 1));
+ mPipeManager.readThumbnail(mtpManager, new Identifier(0, 0, 1, null));
assertDescriptorError(descriptor);
}
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java
index 3d92cc2..3833799 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java
@@ -96,7 +96,7 @@
if (mRoots.containsKey(deviceId)) {
return mRoots.get(deviceId);
} else {
- throw new IOException("getRoots error");
+ throw new IOException("getRoots error: " + Integer.toString(deviceId));
}
}
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResultInstrumentation.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResultInstrumentation.java
index a243375..3e64f9a2 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResultInstrumentation.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestResultInstrumentation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 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.mtp;
import android.os.Bundle;
@@ -12,8 +28,20 @@
@Override
public void onCreate(Bundle arguments) {
+ if (arguments == null) {
+ arguments = new Bundle();
+ }
+ final boolean includeRealDeviceTest =
+ Boolean.parseBoolean(arguments.getString("realDeviceTest", "false"));
+ if (!includeRealDeviceTest) {
+ arguments.putString("notAnnotation", "com.android.mtp.RealDeviceTest");
+ }
super.onCreate(arguments);
- addTestListener(this);
+ if (includeRealDeviceTest) {
+ // Show the test result by using activity because we need to disconnect USB cable
+ // from adb host while testing with real MTP device.
+ addTestListener(this);
+ }
}
@Override
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestUtil.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestUtil.java
new file mode 100644
index 0000000..e6c12cb
--- /dev/null
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestUtil.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2015 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.mtp;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbManager;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.concurrent.CountDownLatch;
+import junit.framework.Assert;
+
+/**
+ * Static utility methods for testing.
+ */
+class TestUtil {
+ private static final String ACTION_USB_PERMISSION =
+ "com.android.mtp.USB_PERMISSION";
+
+ private TestUtil() {}
+
+ /**
+ * Requests permission for a MTP device and returns the first MTP device that has at least one
+ * storage.
+ * @throws Exception
+ */
+ static UsbDevice setupMtpDevice(
+ TestResultInstrumentation instrumentation,
+ UsbManager usbManager,
+ MtpManager manager) throws Exception {
+ for (int i = 0; i < 2; i++) {
+ final UsbDevice device = findMtpDevice(instrumentation, usbManager);
+ manager.openDevice(device.getDeviceId());
+ try {
+ waitForStorages(instrumentation, manager, device.getDeviceId());
+ return device;
+ } catch (IOException exp) {
+ // When the MTP device is Android, and it changes the USB device type from
+ // "Charging" to "MTP", the device ID will be updated. We need to find a device
+ // again.
+ continue;
+ }
+ }
+ throw new IOException("Failed to obtain MTP devices");
+ }
+
+ private static UsbDevice findMtpDevice(
+ TestResultInstrumentation instrumentation,
+ UsbManager usbManager) throws InterruptedException {
+ while (true) {
+ final HashMap<String,UsbDevice> devices = usbManager.getDeviceList();
+ if (devices.size() == 0) {
+ instrumentation.show("Wait for devices.");
+ Thread.sleep(1000);
+ continue;
+ }
+ final UsbDevice device = devices.values().iterator().next();
+ requestPermission(instrumentation, usbManager, device);
+ final UsbDeviceConnection connection = usbManager.openDevice(device);
+ if (connection == null) {
+ Assert.fail("Cannot open USB connection.");
+ return null;
+ }
+ for (int i = 0; i < device.getInterfaceCount(); i++) {
+ // Since the test runs real environment, we need to call claim interface with
+ // force = true to rob interfaces from other applications.
+ connection.claimInterface(device.getInterface(i), true);
+ connection.releaseInterface(device.getInterface(i));
+ }
+ connection.close();
+ return device;
+ }
+ }
+
+ private static void requestPermission(
+ final TestResultInstrumentation instrumentation,
+ UsbManager usbManager,
+ UsbDevice device) throws InterruptedException {
+ if (usbManager.hasPermission(device)) {
+ return;
+ }
+ final CountDownLatch latch = new CountDownLatch(1);
+ final BroadcastReceiver receiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ latch.countDown();
+ instrumentation.getTargetContext().unregisterReceiver(this);
+ }
+ };
+ instrumentation.getTargetContext().registerReceiver(
+ receiver, new IntentFilter(ACTION_USB_PERMISSION));
+ usbManager.requestPermission(device, PendingIntent.getBroadcast(
+ instrumentation.getTargetContext(),
+ 0 /* requstCode */,
+ new Intent(ACTION_USB_PERMISSION),
+ 0 /* flags */));
+ latch.await();
+ Assert.assertTrue(usbManager.hasPermission(device));
+ }
+
+ private static void waitForStorages(
+ TestResultInstrumentation instrumentation,
+ MtpManager manager,
+ int deviceId) throws Exception {
+ while (true) {
+ if (manager.getRoots(deviceId).length == 0) {
+ instrumentation.show("Wait for storages.");
+ Thread.sleep(1000);
+ continue;
+ }
+ return;
+ }
+ }
+}
diff --git a/packages/PrintSpooler/AndroidManifest.xml b/packages/PrintSpooler/AndroidManifest.xml
index c7cf61a..5a6f1d1 100644
--- a/packages/PrintSpooler/AndroidManifest.xml
+++ b/packages/PrintSpooler/AndroidManifest.xml
@@ -61,7 +61,7 @@
<activity
android:name=".ui.PrintActivity"
- android:configChanges="orientation|screenSize"
+ android:configChanges="screenSize|smallestScreenSize|orientation"
android:permission="android.permission.BIND_PRINT_SPOOLER_SERVICE"
android:theme="@style/PrintActivity">
<intent-filter>
diff --git a/core/res/res/drawable/non_client_decor_title.xml b/packages/PrintSpooler/res/drawable/ic_add.xml
similarity index 67%
copy from core/res/res/drawable/non_client_decor_title.xml
copy to packages/PrintSpooler/res/drawable/ic_add.xml
index e50daea..1442b1b 100644
--- a/core/res/res/drawable/non_client_decor_title.xml
+++ b/packages/PrintSpooler/res/drawable/ic_add.xml
@@ -14,8 +14,12 @@
limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_window_focused="true"
- android:drawable="@drawable/non_client_decor_title_focused" />
- <item android:drawable="@drawable/non_client_decor_title_unfocused" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+ android:fillColor="#FFFFFF"/>
+</vector>
\ No newline at end of file
diff --git a/packages/PrintSpooler/res/drawable/ic_search.xml b/packages/PrintSpooler/res/drawable/ic_search.xml
deleted file mode 100644
index 991fa38b..0000000
--- a/packages/PrintSpooler/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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:autoMirrored="true">
-
- <item
- android:state_checked="true">
- <bitmap
- android:src="@*android:drawable/ic_menu_search"
- android:tint="?android:attr/colorControlActivated">
- </bitmap>
- </item>
-
- <item
- android:state_pressed="true">
- <bitmap
- android:src="@*android:drawable/ic_menu_search"
- android:tint="?android:attr/colorControlActivated">
- </bitmap>
- </item>
-
- <item>
- <bitmap
- android:src="@*android:drawable/ic_menu_search"
- android:tint="?android:attr/colorControlNormal">
- </bitmap>
- </item>
-
-</selector>
diff --git a/packages/PrintSpooler/res/layout/printer_dropdown_prompt.xml b/packages/PrintSpooler/res/layout/printer_dropdown_prompt.xml
new file mode 100644
index 0000000..11fef2d
--- /dev/null
+++ b/packages/PrintSpooler/res/layout/printer_dropdown_prompt.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textIsSelectable="false"
+ android:textColor="?android:attr/textColorPrimary"
+ android:paddingStart="20dip"
+ android:paddingEnd="8dip"
+ android:minHeight="56dip"
+ android:orientation="horizontal"
+ android:text="@string/destination_default_text"
+ android:gravity="start|center_vertical" />
diff --git a/packages/PrintSpooler/res/menu/select_printer_activity.xml b/packages/PrintSpooler/res/menu/select_printer_activity.xml
index 8da5769..15cc139 100644
--- a/packages/PrintSpooler/res/menu/select_printer_activity.xml
+++ b/packages/PrintSpooler/res/menu/select_printer_activity.xml
@@ -19,7 +19,7 @@
<item
android:id="@+id/action_search"
android:title="@string/search"
- android:icon="@*android:drawable/ic_search"
+ android:icon="@*android:drawable/ic_search_api_material"
android:actionViewClass="android.widget.SearchView"
android:showAsAction="ifRoom|collapseActionView"
android:alphabeticShortcut="f"
@@ -29,7 +29,7 @@
<item
android:id="@+id/action_add_printer"
android:title="@string/print_add_printer"
- android:icon="@*android:drawable/create_contact"
+ android:icon="@drawable/ic_add"
android:showAsAction="ifRoom"
android:alphabeticShortcut="a">
</item>
diff --git a/packages/PrintSpooler/res/values-af/strings.xml b/packages/PrintSpooler/res/values-af/strings.xml
index 1c39a7d..f263af7 100644
--- a/packages/PrintSpooler/res/values-af/strings.xml
+++ b/packages/PrintSpooler/res/values-af/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Tweesydig"</string>
<string name="label_orientation" msgid="2853142581990496477">"Oriëntasie"</string>
<string name="label_pages" msgid="7768589729282182230">"Bladsye"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Kies \'n drukker"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Al <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Omvang van <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"bv. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Kies drukdiens"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Soek tans vir drukkers"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Geen drukdienste is geaktiveer nie"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Geen drukkers gekry nie"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Druk tans <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Kanselleer tans <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-am/strings.xml b/packages/PrintSpooler/res/values-am/strings.xml
index 4d8b85e..a93e0a9 100644
--- a/packages/PrintSpooler/res/values-am/strings.xml
+++ b/packages/PrintSpooler/res/values-am/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"ባለ ሁለት-ጎን"</string>
<string name="label_orientation" msgid="2853142581990496477">"አቀማመጠ ገፅ"</string>
<string name="label_pages" msgid="7768589729282182230">"ገፆች"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"አንድ አታሚ ይምረጡ"</string>
<string name="template_all_pages" msgid="3322235982020148762">"ሁሉም <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"የ<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ክልል"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ለምሳሌ፦ 1–5,8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"የህትመት አገልግሎት ይምረጡ"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"አታሚዎችን በመፈለግ ላይ"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ምንም የህትመት አገልግሎቶች አልነቁም"</string>
<string name="print_no_printers" msgid="4869403323900054866">"ምንም አታሚዎች አልተገኙም"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ን በማተም ላይ"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ን በመተው ላይ"</string>
diff --git a/packages/PrintSpooler/res/values-ar/strings.xml b/packages/PrintSpooler/res/values-ar/strings.xml
index 0fa6ec2..c9a6a395 100644
--- a/packages/PrintSpooler/res/values-ar/strings.xml
+++ b/packages/PrintSpooler/res/values-ar/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"الجانبان"</string>
<string name="label_orientation" msgid="2853142581990496477">"الاتجاه"</string>
<string name="label_pages" msgid="7768589729282182230">"الصفحات"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"اختر طابعة"</string>
<string name="template_all_pages" msgid="3322235982020148762">"جميع الصفحات وعددها <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"النطاق <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"على سبيل المثال، 1—5،8،11—13"</string>
@@ -64,6 +65,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"اختر خدمة طباعة"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"البحث عن طابعات"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"لم يتم تمكين أي خدمات طباعة"</string>
<string name="print_no_printers" msgid="4869403323900054866">"لم يتم العثور على طابعات"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"جارٍ طباعة <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"جارٍ إلغاء <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-az-rAZ/strings.xml b/packages/PrintSpooler/res/values-az-rAZ/strings.xml
index 1837db4..5aeb7bb 100644
--- a/packages/PrintSpooler/res/values-az-rAZ/strings.xml
+++ b/packages/PrintSpooler/res/values-az-rAZ/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"İkitərəfli"</string>
<string name="label_orientation" msgid="2853142581990496477">"Oriyentasiya"</string>
<string name="label_pages" msgid="7768589729282182230">"Səhifələr"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Printer seçin"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Bütün <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> diapazonu"</string>
<string name="pages_range_example" msgid="8558694453556945172">"məsələn, 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Çap xidmətini seçin"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Printer axtarılır"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Heç bir çap xidməti aktiv edilməyib"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Heç bir printer tapılmadı"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> çap edilir"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ləğv edilir"</string>
diff --git a/packages/PrintSpooler/res/values-bg/strings.xml b/packages/PrintSpooler/res/values-bg/strings.xml
index 9a8ccef..93feea5 100644
--- a/packages/PrintSpooler/res/values-bg/strings.xml
+++ b/packages/PrintSpooler/res/values-bg/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Двустранно"</string>
<string name="label_orientation" msgid="2853142581990496477">"Ориентация"</string>
<string name="label_pages" msgid="7768589729282182230">"Страници"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Избиране на принтер"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Всички <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Обхват от <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"напр. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Избиране на услуга за отпечатване"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Търсене на принтери"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Няма активирани услуги за отпечатване"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Няма намерени принтери"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"„<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>“ се отпечатва"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"„<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>“ се анулира"</string>
diff --git a/packages/PrintSpooler/res/values-bn-rBD/strings.xml b/packages/PrintSpooler/res/values-bn-rBD/strings.xml
index 4f1646d..0eed9aa 100644
--- a/packages/PrintSpooler/res/values-bn-rBD/strings.xml
+++ b/packages/PrintSpooler/res/values-bn-rBD/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"দ্বিভুজ"</string>
<string name="label_orientation" msgid="2853142581990496477">"সজ্জা"</string>
<string name="label_pages" msgid="7768589729282182230">"পৃষ্ঠাগুলি"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"একটি মুদ্রক নির্বাচন করুন"</string>
<string name="template_all_pages" msgid="3322235982020148762">"সমস্ত <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> এর পরিসর"</string>
<string name="pages_range_example" msgid="8558694453556945172">"যেমন, ১—৫,৮,১১—১৩"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"মুদ্রণ পরিষেবা চয়ন করুন"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"মুদ্রকগুলি অনুসন্ধান করা হচ্ছে"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"মুদ্রণ পরিষেবা সক্ষম নেই"</string>
<string name="print_no_printers" msgid="4869403323900054866">"কোনো মুদ্রক পাওয়া যায়নি"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> মুদ্রণ করা হচ্ছে"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> বাতিল করা হচ্ছে"</string>
diff --git a/packages/PrintSpooler/res/values-ca/strings.xml b/packages/PrintSpooler/res/values-ca/strings.xml
index fa34c52..03d3060 100644
--- a/packages/PrintSpooler/res/values-ca/strings.xml
+++ b/packages/PrintSpooler/res/values-ca/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"De dues cares"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientació"</string>
<string name="label_pages" msgid="7768589729282182230">"Pàgines"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Tria una impressora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Totes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Interval de: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"p. ex. 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Selecció del servei d\'impressió"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Cerca d\'impressores"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No hi ha cap servei d\'impressió activat"</string>
<string name="print_no_printers" msgid="4869403323900054866">"No s\'ha trobat cap impressora"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"S\'està imprimint <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"S\'està cancel·lant <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-cs/strings.xml b/packages/PrintSpooler/res/values-cs/strings.xml
index 5c98d616..414abf9 100644
--- a/packages/PrintSpooler/res/values-cs/strings.xml
+++ b/packages/PrintSpooler/res/values-cs/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Oboustranně"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientace"</string>
<string name="label_pages" msgid="7768589729282182230">"Stránky"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Vyberte tiskárnu"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Vše: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Rozsah: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"např. 1–5, 8, 11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Zvolte službu tisku"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Vyhledávání tiskáren"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nejsou aktivovány žádné tiskové služby"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nebyly nalezeny žádné tiskárny"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Tisk úlohy <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Rušení úlohy <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-da/strings.xml b/packages/PrintSpooler/res/values-da/strings.xml
index e57d435..893c991 100644
--- a/packages/PrintSpooler/res/values-da/strings.xml
+++ b/packages/PrintSpooler/res/values-da/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Tosidet"</string>
<string name="label_orientation" msgid="2853142581990496477">"Retning"</string>
<string name="label_pages" msgid="7768589729282182230">"Sider"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Vælg en printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Interval på <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"f.eks. 1-5,8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Vælg udskriftstjeneste"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Søger efter printere"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ingen udskrivningstjenester er aktiveret"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Der blev ikke fundet nogen printere"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> udskrives"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> annulleres"</string>
diff --git a/packages/PrintSpooler/res/values-de/strings.xml b/packages/PrintSpooler/res/values-de/strings.xml
index 1005b45..f6f53ea 100644
--- a/packages/PrintSpooler/res/values-de/strings.xml
+++ b/packages/PrintSpooler/res/values-de/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Zweiseitig"</string>
<string name="label_orientation" msgid="2853142581990496477">"Ausrichtung"</string>
<string name="label_pages" msgid="7768589729282182230">"Seiten"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Drucker auswählen"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Auswahl von <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"z. B. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Druckdienst auswählen"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Suche nach Druckern"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Keine Druckdienste aktiviert"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Keine Drucker gefunden"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> wird gedruckt..."</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> wird abgebrochen..."</string>
diff --git a/packages/PrintSpooler/res/values-el/strings.xml b/packages/PrintSpooler/res/values-el/strings.xml
index 75b8447..10ddf62 100644
--- a/packages/PrintSpooler/res/values-el/strings.xml
+++ b/packages/PrintSpooler/res/values-el/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Δύο όψεων"</string>
<string name="label_orientation" msgid="2853142581990496477">"Προσανατολισμός"</string>
<string name="label_pages" msgid="7768589729282182230">"Σελίδες"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Επιλέξτε εκτυπωτή"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Και οι <xliff:g id="PAGE_COUNT">%1$s</xliff:g> σελίδες"</string>
<string name="template_page_range" msgid="428638530038286328">"Εύρος σελίδων από <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"π.χ. 1-5,8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Επιλέξτε υπηρεσία εκτύπωσης"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Αναζήτηση για εκτυπωτές"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Δεν έχουν ενεργοποιηθεί υπηρεσίες εκτύπωσης"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Δεν βρέθηκαν εκτυπωτές"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Εκτύπωση <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Ακύρωση <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-en-rAU/strings.xml b/packages/PrintSpooler/res/values-en-rAU/strings.xml
index 87349c2..a540ac5 100644
--- a/packages/PrintSpooler/res/values-en-rAU/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rAU/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
<string name="label_pages" msgid="7768589729282182230">"Pages"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Select a printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Range of <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"e.g. 1–5,8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Choose print service"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No print services enabled"</string>
<string name="print_no_printers" msgid="4869403323900054866">"No printers found"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Printing <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelling <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-en-rGB/strings.xml b/packages/PrintSpooler/res/values-en-rGB/strings.xml
index 87349c2..a540ac5 100644
--- a/packages/PrintSpooler/res/values-en-rGB/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rGB/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
<string name="label_pages" msgid="7768589729282182230">"Pages"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Select a printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Range of <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"e.g. 1–5,8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Choose print service"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No print services enabled"</string>
<string name="print_no_printers" msgid="4869403323900054866">"No printers found"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Printing <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelling <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-en-rIN/strings.xml b/packages/PrintSpooler/res/values-en-rIN/strings.xml
index 87349c2..a540ac5 100644
--- a/packages/PrintSpooler/res/values-en-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
<string name="label_pages" msgid="7768589729282182230">"Pages"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Select a printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Range of <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"e.g. 1–5,8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Choose print service"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No print services enabled"</string>
<string name="print_no_printers" msgid="4869403323900054866">"No printers found"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Printing <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelling <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-es-rUS/strings.xml b/packages/PrintSpooler/res/values-es-rUS/strings.xml
index ffd4d79..8929aa8 100644
--- a/packages/PrintSpooler/res/values-es-rUS/strings.xml
+++ b/packages/PrintSpooler/res/values-es-rUS/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Ambos lados"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
<string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Seleccionar una impresora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Todas (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Rango de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"Ej.: 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Elegir servicio de impresión"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Buscando impresoras"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No hay servicios de impresión habilitados"</string>
<string name="print_no_printers" msgid="4869403323900054866">"No se encontraron impresoras"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Imprimiendo <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-es/strings.xml b/packages/PrintSpooler/res/values-es/strings.xml
index 5660d1b..7cfd92a 100644
--- a/packages/PrintSpooler/res/values-es/strings.xml
+++ b/packages/PrintSpooler/res/values-es/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dos caras"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
<string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Elige una impresora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Todas (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervalo de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"p. ej.: 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Seleccionar servicio de impresión"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Buscando impresoras"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No hay servicios de impresión habilitados"</string>
<string name="print_no_printers" msgid="4869403323900054866">"No se encontraron impresoras"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Imprimiendo <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-et-rEE/strings.xml b/packages/PrintSpooler/res/values-et-rEE/strings.xml
index fb0f320..ee93bcf 100644
--- a/packages/PrintSpooler/res/values-et-rEE/strings.xml
+++ b/packages/PrintSpooler/res/values-et-rEE/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Kahepoolne"</string>
<string name="label_orientation" msgid="2853142581990496477">"Suund"</string>
<string name="label_pages" msgid="7768589729282182230">"Lehed"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Printeri valimine"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Kõik <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Vahemik <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"nt 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Prinditeenuse valimine"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Printerite otsimine"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ühtegi printimisteenust pole lubatud"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Printereid ei leitud"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Prinditöö <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> printimine"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Prinditöö <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> tühistamine"</string>
diff --git a/packages/PrintSpooler/res/values-eu-rES/strings.xml b/packages/PrintSpooler/res/values-eu-rES/strings.xml
index 8402a9c..882e888 100644
--- a/packages/PrintSpooler/res/values-eu-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-eu-rES/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Bi aldekoa"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientazioa"</string>
<string name="label_pages" msgid="7768589729282182230">"Orriak"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Hautatu inprimagailua"</string>
<string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> orriak"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> orriko tartea"</string>
<string name="pages_range_example" msgid="8558694453556945172">"adib., 1-5, 8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Aukeratu inprimatze-zerbitzua"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Inprimagailuak bilatzen"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ez dago gaituta inprimatzeko zerbitzurik"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Ez da inprimagailurik aurkitu"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> inprimatzen"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> bertan behera uzten"</string>
@@ -75,7 +77,7 @@
<string name="reason_unknown" msgid="5507940196503246139">"ezezaguna"</string>
<string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>: ez dago erabilgarri"</string>
<string name="print_service_security_warning_title" msgid="2160752291246775320">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili nahi duzu?"</string>
- <string name="print_service_security_warning_summary" msgid="1427434625361692006">"Baliteke dokumentuak zerbitzari bat edo gehiagotan zehar igarotzea inprimagailurako bidean."</string>
+ <string name="print_service_security_warning_summary" msgid="1427434625361692006">"Baliteke dokumentuak zerbitzari batean edo gehiagotan zehar igarotzea inprimagailurako bidean."</string>
<string-array name="color_mode_labels">
<item msgid="7602948745415174937">"Zuri-beltza"</item>
<item msgid="2762241247228983754">"Koloretakoa"</item>
diff --git a/packages/PrintSpooler/res/values-fa/strings.xml b/packages/PrintSpooler/res/values-fa/strings.xml
index ba78460..10743e7 100644
--- a/packages/PrintSpooler/res/values-fa/strings.xml
+++ b/packages/PrintSpooler/res/values-fa/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"دوطرفه"</string>
<string name="label_orientation" msgid="2853142581990496477">"جهت"</string>
<string name="label_pages" msgid="7768589729282182230">"صفحهها"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"چاپگری انتخاب کنید"</string>
<string name="template_all_pages" msgid="3322235982020148762">"همه <xliff:g id="PAGE_COUNT">%1$s</xliff:g> صفحه"</string>
<string name="template_page_range" msgid="428638530038286328">"محدوده <xliff:g id="PAGE_COUNT">%1$s</xliff:g> صفحه"</string>
<string name="pages_range_example" msgid="8558694453556945172">"مثلاً ۱—۵،۹،۷—۱۰"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"انتخاب سرویس چاپ"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"درحال جستجوی چاپگرها"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"هیچ خدمات چاپی فعال نیست"</string>
<string name="print_no_printers" msgid="4869403323900054866">"هیچ چاپگری یافت نشد"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"در حال چاپ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"در حال لغو <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-fi/strings.xml b/packages/PrintSpooler/res/values-fi/strings.xml
index 3a82702..ee35c41 100644
--- a/packages/PrintSpooler/res/values-fi/strings.xml
+++ b/packages/PrintSpooler/res/values-fi/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Kaksipuolinen"</string>
<string name="label_orientation" msgid="2853142581990496477">"Suunta"</string>
<string name="label_pages" msgid="7768589729282182230">"Sivut"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Valitse tulostin"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Kaikki <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Sivumäärä: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"esim. 1–5,8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Valitse tulostuspalvelu"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Etsitään tulostimia"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ei käytössä olevia tulostuspalveluita"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Tulostimia ei löydy"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Tulostetaan <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Peruutetaan työ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-fr-rCA/strings.xml b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
index f49885a..eb99441 100644
--- a/packages/PrintSpooler/res/values-fr-rCA/strings.xml
+++ b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Recto verso"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
<string name="label_pages" msgid="7768589729282182230">"Pages"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Sélectionnez une imprimante"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Toutes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Plage de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"p. ex. 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Sélectionner le service d\'impression"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Recherche d\'imprimantes en cours..."</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Aucun service d\'impression activé"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Aucune imprimante trouvée"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Impression de <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> en cours…"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Annulation de « <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> »…"</string>
diff --git a/packages/PrintSpooler/res/values-fr/strings.xml b/packages/PrintSpooler/res/values-fr/strings.xml
index 4dcfa65..c0eecfb 100644
--- a/packages/PrintSpooler/res/values-fr/strings.xml
+++ b/packages/PrintSpooler/res/values-fr/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Recto verso"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
<string name="label_pages" msgid="7768589729282182230">"Pages"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Sélect. imprimante"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Toutes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Plage de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ex. : 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Sélectionner le service d\'impression"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Recherche d\'imprimantes en cours"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Aucun service d\'impression activé"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Aucune imprimante trouvée"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Impression de \"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>\" en cours…"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Annulation de \"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>\" en cours…"</string>
diff --git a/packages/PrintSpooler/res/values-gl-rES/strings.xml b/packages/PrintSpooler/res/values-gl-rES/strings.xml
index c805e30..b4a1ec6 100644
--- a/packages/PrintSpooler/res/values-gl-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-gl-rES/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dual"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
<string name="label_pages" msgid="7768589729282182230">"Páxinas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Escoller impresora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"As <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervalo de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ex.: 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Escoller servizo de impresión"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Busca de impresoras"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Non hai servizos de impresión activados"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Non se atopou ningunha impresora"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Imprimindo <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-gu-rIN/strings.xml b/packages/PrintSpooler/res/values-gu-rIN/strings.xml
index 51820f2..8f77953 100644
--- a/packages/PrintSpooler/res/values-gu-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-gu-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"દ્વિભુજ"</string>
<string name="label_orientation" msgid="2853142581990496477">"ઓરિએન્ટેશન"</string>
<string name="label_pages" msgid="7768589729282182230">"પૃષ્ઠો"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"પ્રિન્ટર પસંદ કરો"</string>
<string name="template_all_pages" msgid="3322235982020148762">"તમામ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ની શ્રેણી"</string>
<string name="pages_range_example" msgid="8558694453556945172">"દા.ત. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"પ્રિન્ટ સેવા પસંદ કરો"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"પ્રિન્ટર્સ માટે શોધી રહ્યું છે"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"કોઈ છાપ સેવાઓ સક્ષમ કરેલ નથી"</string>
<string name="print_no_printers" msgid="4869403323900054866">"કોઈ પ્રિન્ટર મળ્યા નથી"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> છાપી રહ્યાં છે"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ને રદ કરી રહ્યું છે"</string>
diff --git a/packages/PrintSpooler/res/values-hi/strings.xml b/packages/PrintSpooler/res/values-hi/strings.xml
index e2bc012..4c11323 100644
--- a/packages/PrintSpooler/res/values-hi/strings.xml
+++ b/packages/PrintSpooler/res/values-hi/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"दो-तरफ़ा"</string>
<string name="label_orientation" msgid="2853142581990496477">"अभिविन्यास"</string>
<string name="label_pages" msgid="7768589729282182230">"पृष्ठ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"कोई प्रिंटर चुनें"</string>
<string name="template_all_pages" msgid="3322235982020148762">"सभी <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"पृष्ठ संख्या <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"उदा. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"प्रिंट सेवा चुनें"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"प्रिंटर खोज रहा है"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"कोई भी प्रिंट सेवा सक्षम नहीं है"</string>
<string name="print_no_printers" msgid="4869403323900054866">"कोई प्रिंटर नहीं मिले"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट हो रहा है"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द हो रहा है"</string>
diff --git a/packages/PrintSpooler/res/values-hr/strings.xml b/packages/PrintSpooler/res/values-hr/strings.xml
index 64c4a58..4cec3ba 100644
--- a/packages/PrintSpooler/res/values-hr/strings.xml
+++ b/packages/PrintSpooler/res/values-hr/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Obostrano"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orijentacija"</string>
<string name="label_pages" msgid="7768589729282182230">"Stranice"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Odaberite pisač"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Sve stranice (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Raspon od <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"npr. 1 – 5,8,11 – 13"</string>
@@ -61,6 +62,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Odaberite uslugu ispisa"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Traženje pisača"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nije omogućena nijedna usluga ispisa"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nije pronađen nijedan pisač"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Ispisivanje <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Otkazivanje zadatka <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-hu/strings.xml b/packages/PrintSpooler/res/values-hu/strings.xml
index 58e7852..ac1ba6e 100644
--- a/packages/PrintSpooler/res/values-hu/strings.xml
+++ b/packages/PrintSpooler/res/values-hu/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Kétoldalas"</string>
<string name="label_orientation" msgid="2853142581990496477">"Tájolás"</string>
<string name="label_pages" msgid="7768589729282182230">"Oldalak"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Válasszon ki egy nyomtatót"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Összes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> oldalas tartomány"</string>
<string name="pages_range_example" msgid="8558694453556945172">"pl. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Nyomtatási szolgáltatás kiválasztása"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Nyomtatók keresése"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nincs engedélyezett nyomtatási szolgáltatás"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nem található nyomtató"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"A(z) <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> nyomtatása"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"A(z) <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> törlése"</string>
diff --git a/packages/PrintSpooler/res/values-hy-rAM/strings.xml b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
index 88e9192..dda6745 100644
--- a/packages/PrintSpooler/res/values-hy-rAM/strings.xml
+++ b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Երկկողմանի"</string>
<string name="label_orientation" msgid="2853142581990496477">"Դիրքավորում"</string>
<string name="label_pages" msgid="7768589729282182230">"Էջեր"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Ընտրել տպիչ"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Բոլորը՝ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Միջակայքը՝ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"օր.՝ 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Ընտրեք տպելու ծառայությունը"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Տպիչների որոնում"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ակտիվացված տպման ծառայություններ չկան"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Տպիչներ չեն գտնվել"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Տպվում է՝ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>-ը չեղարկվում է"</string>
diff --git a/packages/PrintSpooler/res/values-in/strings.xml b/packages/PrintSpooler/res/values-in/strings.xml
index de76536..b203e2b 100644
--- a/packages/PrintSpooler/res/values-in/strings.xml
+++ b/packages/PrintSpooler/res/values-in/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Bersisi ganda"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientasi"</string>
<string name="label_pages" msgid="7768589729282182230">"Halaman"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Pilih printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Semua dari <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Rentang dari <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"misalnya 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Pilih layanan cetak"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Mencari printer"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Tidak ada layanan cetak yang aktif"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Tidak ditemukan printer"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Mencetak <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Membatalkan <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-is-rIS/strings.xml b/packages/PrintSpooler/res/values-is-rIS/strings.xml
index 3f8aa65..6dfdabc 100644
--- a/packages/PrintSpooler/res/values-is-rIS/strings.xml
+++ b/packages/PrintSpooler/res/values-is-rIS/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Tvíhliða"</string>
<string name="label_orientation" msgid="2853142581990496477">"Stefna"</string>
<string name="label_pages" msgid="7768589729282182230">"Síður"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Veldu prentara"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Allar <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"t.d. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Veldu prentþjónustu"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Leitar að prentara"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Engin prentþjónusta er virk"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Engir prentarar fundust"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Prentar <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Hættir við <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-it/strings.xml b/packages/PrintSpooler/res/values-it/strings.xml
index 394dc88..fd5473a 100644
--- a/packages/PrintSpooler/res/values-it/strings.xml
+++ b/packages/PrintSpooler/res/values-it/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Con doppia funzione"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientamento"</string>
<string name="label_pages" msgid="7768589729282182230">"Pagine"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Seleziona stampante"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Tutte e <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervallo di <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"Es.: 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Scegli servizio di stampa"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Ricerca di stampanti"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Non è stato attivato alcun servizio di stampa"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nessuna stampante trovata"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Stampa di <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Annullamento di <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-iw/strings.xml b/packages/PrintSpooler/res/values-iw/strings.xml
index 5c5e5d9..dd062a3 100644
--- a/packages/PrintSpooler/res/values-iw/strings.xml
+++ b/packages/PrintSpooler/res/values-iw/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"דו-צדדי"</string>
<string name="label_orientation" msgid="2853142581990496477">"כיוון"</string>
<string name="label_pages" msgid="7768589729282182230">"עמודים"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"בחר מדפסת"</string>
<string name="template_all_pages" msgid="3322235982020148762">"הכל <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"טווח של <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"למשל 1–5,8,11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"בחר שירות הדפסה"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"מחפש מדפסות"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"לא הופעלו שירותי הדפסה"</string>
<string name="print_no_printers" msgid="4869403323900054866">"לא נמצאו מדפסות"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"מדפיס את <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"מבטל את <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ja/strings.xml b/packages/PrintSpooler/res/values-ja/strings.xml
index 6a396b3..23e4809 100644
--- a/packages/PrintSpooler/res/values-ja/strings.xml
+++ b/packages/PrintSpooler/res/values-ja/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"両面"</string>
<string name="label_orientation" msgid="2853142581990496477">"方向"</string>
<string name="label_pages" msgid="7768589729282182230">"ページ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"プリンタを選択"</string>
<string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>ページすべて"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>ページ分"</string>
<string name="pages_range_example" msgid="8558694453556945172">"例: 1-5,8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"印刷サービスの選択"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"プリンタの検索中"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"使用できる印刷サービスがありません"</string>
<string name="print_no_printers" msgid="4869403323900054866">"プリンタが見つかりません"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>を印刷しています"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>をキャンセルしています"</string>
diff --git a/packages/PrintSpooler/res/values-ka-rGE/strings.xml b/packages/PrintSpooler/res/values-ka-rGE/strings.xml
index 44e77d7..9f86f05 100644
--- a/packages/PrintSpooler/res/values-ka-rGE/strings.xml
+++ b/packages/PrintSpooler/res/values-ka-rGE/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"ორმხრივი"</string>
<string name="label_orientation" msgid="2853142581990496477">"ორიენტაცია"</string>
<string name="label_pages" msgid="7768589729282182230">"გვერდები"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"პრინტერის არჩევა"</string>
<string name="template_all_pages" msgid="3322235982020148762">"ყველა <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>-ის არეალი"</string>
<string name="pages_range_example" msgid="8558694453556945172">"მაგ. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"აირჩიეთ ბეჭდვის სერვისი"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"მიმდინარეობს პრინტერების ძიება"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ბეჭდვის სერვისები გააქტიურებული არ არის"</string>
<string name="print_no_printers" msgid="4869403323900054866">"პრინტერები ვერ მოიძებნა"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"იბეჭდება <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"მიმდინარეობს <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>-ის გაუქმება"</string>
diff --git a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
index a79a511..05c300e 100644
--- a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
+++ b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Екі жақты"</string>
<string name="label_orientation" msgid="2853142581990496477">"Бағыты"</string>
<string name="label_pages" msgid="7768589729282182230">"Беттер"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Принтерді таңдау"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Барлық <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ауқымы"</string>
<string name="pages_range_example" msgid="8558694453556945172">"мысалы, 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Принтер қызметін таңдау"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Принтерлерді іздеу"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Басып шығару қызметтері қосылмаған"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Ешқандай принтер табылмады"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> басып шығарылуда"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> жұмысын тоқтатуда"</string>
diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km-rKH/strings.xml
index 87f4fde..0861e59 100644
--- a/packages/PrintSpooler/res/values-km-rKH/strings.xml
+++ b/packages/PrintSpooler/res/values-km-rKH/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"សងខាង"</string>
<string name="label_orientation" msgid="2853142581990496477">"ទិស"</string>
<string name="label_pages" msgid="7768589729282182230">"ទំព័រ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ជ្រើសម៉ាស៊ីនបោះពុម្ព"</string>
<string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ទាំងអស់"</string>
<string name="template_page_range" msgid="428638530038286328">"ជួរនៃ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ឧ. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"ជ្រើសសេវាបោះពុម្ព"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"ស្វែងរកម៉ាស៊ីនបោះពុម្ព"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"គ្មានការបើកដំណើរការសេវាបោះពុម្ពទេ"</string>
<string name="print_no_printers" msgid="4869403323900054866">"រកមិនឃើញម៉ាស៊ីនបោះពុម្ព"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"កំពុងបោះពុម្ព <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"ការបោះបង់ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-kn-rIN/strings.xml b/packages/PrintSpooler/res/values-kn-rIN/strings.xml
index eff1127..71b098d 100644
--- a/packages/PrintSpooler/res/values-kn-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-kn-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"ಎರಡು ಬದಿ"</string>
<string name="label_orientation" msgid="2853142581990496477">"ಓರಿಯಂಟೇಶನ್"</string>
<string name="label_pages" msgid="7768589729282182230">"ಪುಟಗಳು"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ಪ್ರಿಂಟರ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
<string name="template_all_pages" msgid="3322235982020148762">"ಎಲ್ಲಾ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ನ ಶ್ರೇಣಿ"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ಉದಾ. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"ಮುದ್ರಣ ಸೇವೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"ಪ್ರಿಂಟರ್ಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ಯಾವುದೇ ಮುದ್ರಣ ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ"</string>
<string name="print_no_printers" msgid="4869403323900054866">"ಯಾವುದೇ ಮುದ್ರಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ಮುದ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ರದ್ದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
diff --git a/packages/PrintSpooler/res/values-ko/strings.xml b/packages/PrintSpooler/res/values-ko/strings.xml
index 7613ad7..451ab58 100644
--- a/packages/PrintSpooler/res/values-ko/strings.xml
+++ b/packages/PrintSpooler/res/values-ko/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"양면"</string>
<string name="label_orientation" msgid="2853142581990496477">"방향"</string>
<string name="label_pages" msgid="7768589729282182230">"페이지"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"프린터 선택"</string>
<string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>페이지 모두"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>페이지 범위"</string>
<string name="pages_range_example" msgid="8558694453556945172">"예: 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"인쇄 서비스 선택"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"프린터 검색 중"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"사용 가능한 프린트 서비스 없음"</string>
<string name="print_no_printers" msgid="4869403323900054866">"프린터 없음"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> 인쇄 중"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> 취소 중"</string>
diff --git a/packages/PrintSpooler/res/values-ky-rKG/strings.xml b/packages/PrintSpooler/res/values-ky-rKG/strings.xml
index 2ea1b57..98da08c 100644
--- a/packages/PrintSpooler/res/values-ky-rKG/strings.xml
+++ b/packages/PrintSpooler/res/values-ky-rKG/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Эки тараптуу"</string>
<string name="label_orientation" msgid="2853142581990496477">"Багыттоо"</string>
<string name="label_pages" msgid="7768589729282182230">"Баракчалар"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Принтер тандаңыз"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Бардыгы <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> аралыгы"</string>
<string name="pages_range_example" msgid="8558694453556945172">"мис. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Принтер кызматын тандоо"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Принтерлер изделүүдө"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Принтер-кызматтары иштетилген эмес"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Принтерлер табылган жок"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> басылууда"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> токтотулууда"</string>
diff --git a/packages/PrintSpooler/res/values-lo-rLA/strings.xml b/packages/PrintSpooler/res/values-lo-rLA/strings.xml
index 511a72f..2029fdf 100644
--- a/packages/PrintSpooler/res/values-lo-rLA/strings.xml
+++ b/packages/PrintSpooler/res/values-lo-rLA/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"ສອງດ້ານ"</string>
<string name="label_orientation" msgid="2853142581990496477">"ລວງ"</string>
<string name="label_pages" msgid="7768589729282182230">"ໜ້າ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ເລືອກເຄື່ອງພິມ"</string>
<string name="template_all_pages" msgid="3322235982020148762">"ທັງໝົດ <xliff:g id="PAGE_COUNT">%1$s</xliff:g> ໜ້າ"</string>
<string name="template_page_range" msgid="428638530038286328">"ໄລຍະ <xliff:g id="PAGE_COUNT">%1$s</xliff:g> ໜ້າ"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ຕົວຢ່າງ: 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"ເລືອກບໍລິການການພິມ"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"ກຳລັງຊອກຫາເຄື່ອງພິມ"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ບໍ່ມີການບໍລິການພິມເປີດໃຊ້ງານໄວ້"</string>
<string name="print_no_printers" msgid="4869403323900054866">"ບໍ່ພົບເຄື່ອງພິມ"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"ກຳລັງພິມ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"ກຳລັງຍົກເລີກ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-lt/strings.xml b/packages/PrintSpooler/res/values-lt/strings.xml
index ce912be..972abb5 100644
--- a/packages/PrintSpooler/res/values-lt/strings.xml
+++ b/packages/PrintSpooler/res/values-lt/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dvipusis"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientacija"</string>
<string name="label_pages" msgid="7768589729282182230">"Puslapiai"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Spausdint. pasirink."</string>
<string name="template_all_pages" msgid="3322235982020148762">"Visi <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Diapazonas: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"pvz., 1–5, 8, 11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Pasirinkite spausdinimo paslaugą"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Ieškoma spausdintuvų"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Neįgalinta jokių spausdinimo paslaugų"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nerasta spausdintuvų"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Spausdinama: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Atšaukiama: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-lv/strings.xml b/packages/PrintSpooler/res/values-lv/strings.xml
index bfba6c8..f565b23 100644
--- a/packages/PrintSpooler/res/values-lv/strings.xml
+++ b/packages/PrintSpooler/res/values-lv/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Divpusējs"</string>
<string name="label_orientation" msgid="2853142581990496477">"Virziens"</string>
<string name="label_pages" msgid="7768589729282182230">"Lapas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Atlasīt printeri"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Visas <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Diapazons: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"piem., 1–5,8,11–13"</string>
@@ -61,6 +62,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Izvēlieties drukāšanas pakalpojumu"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Printeru meklēšana"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nav iespējots neviens drukas pakalpojums"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Netika atrasts neviens printeris."</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Notiek darba <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> drukāšana…"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Pārtrauc drukas darbu <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>…"</string>
diff --git a/packages/PrintSpooler/res/values-mk-rMK/strings.xml b/packages/PrintSpooler/res/values-mk-rMK/strings.xml
index a81db01..f5c06d1 100644
--- a/packages/PrintSpooler/res/values-mk-rMK/strings.xml
+++ b/packages/PrintSpooler/res/values-mk-rMK/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Двостран"</string>
<string name="label_orientation" msgid="2853142581990496477">"Ориентација"</string>
<string name="label_pages" msgid="7768589729282182230">"Страници"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Избери печатач"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Сите <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Опсег од <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"на пр.: 1-5,8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Избери услуга печатење"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Пребарување печатачи"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Нема овозможени услуги за печатење"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Не се пронајдени печатачи"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> се печати"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> се откажува"</string>
diff --git a/packages/PrintSpooler/res/values-ml-rIN/strings.xml b/packages/PrintSpooler/res/values-ml-rIN/strings.xml
index c14c5ad..2d45ce5 100644
--- a/packages/PrintSpooler/res/values-ml-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-ml-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"രണ്ട് വശങ്ങളുള്ളത്"</string>
<string name="label_orientation" msgid="2853142581990496477">"ഓറിയന്റേഷന്"</string>
<string name="label_pages" msgid="7768589729282182230">"പേജുകൾ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ഒരു പ്രിന്റർ തിരഞ്ഞെടുക്കുക"</string>
<string name="template_all_pages" msgid="3322235982020148762">"എല്ലാ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> എന്നതിന്റെ പരിധി"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ഉദാ. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"പ്രിന്റ് സേവനം തിരഞ്ഞെടുക്കുക"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"പ്രിന്ററുകൾക്കായി തിരയുന്നു"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"പ്രിന്റ് സേവനങ്ങളൊന്നും പ്രവർത്തനക്ഷമാക്കിയിട്ടില്ല"</string>
<string name="print_no_printers" msgid="4869403323900054866">"പ്രിന്ററുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> പ്രിന്റുചെയ്യുന്നു"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> റദ്ദാക്കുന്നു"</string>
diff --git a/packages/PrintSpooler/res/values-mn-rMN/strings.xml b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
index 789f085..f2c7b73 100644
--- a/packages/PrintSpooler/res/values-mn-rMN/strings.xml
+++ b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Хоёр талт"</string>
<string name="label_orientation" msgid="2853142581990496477">"Чиглэл"</string>
<string name="label_pages" msgid="7768589729282182230">"Хуудас"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Хэвлэгчийг сонгоно уу"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Нийт <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Хүрээ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ж.нь. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Хэвлэх үйлчилгээг сонгох"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Принтер хайж байна"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Хэвлэх үйлчилгээг идэвхжүүлээгүй"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Принтер олдсонгүй"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Хэвлэж байна <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Цуцлаж байна <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-mr-rIN/strings.xml b/packages/PrintSpooler/res/values-mr-rIN/strings.xml
index 1d859cf..1c079dc 100644
--- a/packages/PrintSpooler/res/values-mr-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-mr-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"दोन्ही बाजूंनी"</string>
<string name="label_orientation" msgid="2853142581990496477">"अभिमुखता"</string>
<string name="label_pages" msgid="7768589729282182230">"पृष्ठे"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"प्रिंटर निवडा"</string>
<string name="template_all_pages" msgid="3322235982020148762">"सर्व <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ची श्रेणी"</string>
<string name="pages_range_example" msgid="8558694453556945172">"उदा. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"मुद्रण सेवा निवडा"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"प्रिंटर शोधत आहे"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"कोणत्याही मुद्रण सेवा सक्षम केलेल्या नाहीत"</string>
<string name="print_no_printers" msgid="4869403323900054866">"कोणतेही प्रिंटर आढळले नाही"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> मुद्रण करीत आहे"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करीत आहे"</string>
diff --git a/packages/PrintSpooler/res/values-ms-rMY/strings.xml b/packages/PrintSpooler/res/values-ms-rMY/strings.xml
index c86d0bf..d6b5ea7 100644
--- a/packages/PrintSpooler/res/values-ms-rMY/strings.xml
+++ b/packages/PrintSpooler/res/values-ms-rMY/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dua sisi"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientasi"</string>
<string name="label_pages" msgid="7768589729282182230">"Halaman"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Pilih pencetak"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Semua <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Julat <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"cth. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Pilih perkhidmatan cetak"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Mencari pencetak"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Perkhidmatan cetak tidak didayakan"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Tiada pencetak ditemui"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Mencetak <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Membatalkan <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my-rMM/strings.xml
index 9b2760a..c3dc490 100644
--- a/packages/PrintSpooler/res/values-my-rMM/strings.xml
+++ b/packages/PrintSpooler/res/values-my-rMM/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"နှစ်ဖက်လှ"</string>
<string name="label_orientation" msgid="2853142581990496477">"အနေအထား"</string>
<string name="label_pages" msgid="7768589729282182230">"စာမျက်နှာများ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ပုံနှိပ်စက်ကို ရွေးပါ"</string>
<string name="template_all_pages" msgid="3322235982020148762">"အားလုံး <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>ဘောင် ထဲမှာ"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ဥပမာ ၁-၅၊ ၈၊ ၁၁-၁၃"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"စာထုတ်ရန် ဝန်ဆောင်မှုကို ရွေးချယ်ပါ"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"စာထုတ်စက်များကို ရှာနေပါသည်"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ပုံနှိပ်ထုတ်ယူရေး ဝန်ဆောင်မှုများ ဖွင့်မထားပါ"</string>
<string name="print_no_printers" msgid="4869403323900054866">"စာထုတ်စက် တစ်ခုမှ မတွေ့ရှိပါ"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ကို စာထုတ်နေပါသည်"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ကို ပယ်ဖျက်နေပါသည်"</string>
diff --git a/packages/PrintSpooler/res/values-nb/strings.xml b/packages/PrintSpooler/res/values-nb/strings.xml
index cdec56f..945bbea 100644
--- a/packages/PrintSpooler/res/values-nb/strings.xml
+++ b/packages/PrintSpooler/res/values-nb/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Tosidig"</string>
<string name="label_orientation" msgid="2853142581990496477">"Retning"</string>
<string name="label_pages" msgid="7768589729282182230">"Sider"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Velg en skriver"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Område på <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"f.eks. 1–5, 8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Velg utskriftstjeneste"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Søker etter skrivere"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ingen utskriftstjenester er slått på"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Fant ingen skrivere"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Skriver ut <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Avbryter <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ne-rNP/strings.xml b/packages/PrintSpooler/res/values-ne-rNP/strings.xml
index 427a9ae..45bcc95 100644
--- a/packages/PrintSpooler/res/values-ne-rNP/strings.xml
+++ b/packages/PrintSpooler/res/values-ne-rNP/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"दुई-पक्षीय"</string>
<string name="label_orientation" msgid="2853142581990496477">"अभिमुखिकरण"</string>
<string name="label_pages" msgid="7768589729282182230">"पृष्ठहरू"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"कुनै मुद्रक चयन गर्नुहोस्"</string>
<string name="template_all_pages" msgid="3322235982020148762">"सबै <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> को सीमा"</string>
<string name="pages_range_example" msgid="8558694453556945172">"उदाहरण १-५,८,११-१३"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"प्रिन्ट सेवा छनौट गर्नुहोस्"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"प्रिन्टरहरू खोज्दै"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"कुनै पनि मुद्रण सेवाहरू सक्रिय छैनन्"</string>
<string name="print_no_printers" msgid="4869403323900054866">"कुनै प्रिन्टरहरू भेटाइएन"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"प्रिन्ट गरिँदै <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"रद्द गरिँदै <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-nl/strings.xml b/packages/PrintSpooler/res/values-nl/strings.xml
index 12d52f9..76c8656 100644
--- a/packages/PrintSpooler/res/values-nl/strings.xml
+++ b/packages/PrintSpooler/res/values-nl/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dubbelzijdig"</string>
<string name="label_orientation" msgid="2853142581990496477">"Stand"</string>
<string name="label_pages" msgid="7768589729282182230">"Pagina\'s"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Printer selecteren"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Bereik van <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"bijv. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Afdrukservice kiezen"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Printers zoeken"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Geen afdrukservices ingeschakeld"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Geen printers gevonden"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> afdrukken"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> annuleren"</string>
diff --git a/packages/PrintSpooler/res/values-pa-rIN/strings.xml b/packages/PrintSpooler/res/values-pa-rIN/strings.xml
index b8d0602..45fa460 100644
--- a/packages/PrintSpooler/res/values-pa-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-pa-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"ਦੋ-ਪਾਸੇ ਦਾ"</string>
<string name="label_orientation" msgid="2853142581990496477">"ਅਨੁਕੂਲਨ"</string>
<string name="label_pages" msgid="7768589729282182230">"ਸਫ਼ੇ"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ਇੱਕ ਪ੍ਰਿੰਟਰ ਚੁਣੋ"</string>
<string name="template_all_pages" msgid="3322235982020148762">"ਸਾਰੇ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ਦੀ ਰੇਂਜ"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ਉਦਾਹਰਨ ਲਈ 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"ਪ੍ਰਿੰਟ ਸੇਵਾ ਚੁਣੋ"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"ਪ੍ਰਿੰਟਰ ਖੋਜ ਰਿਹਾ ਹੈ"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ ਯੋਗ ਨਹੀਂ ਬਣਾਈਆਂ ਗਈਆਂ"</string>
<string name="print_no_printers" msgid="4869403323900054866">"ਕੋਈ ਪ੍ਰਿੰਟਰ ਨਹੀਂ ਮਿਲੇ"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ਨੂੰ ਪ੍ਰਿੰਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ਨੂੰ ਰੱਦ ਕਰ ਰਿਹਾ ਹੈ"</string>
diff --git a/packages/PrintSpooler/res/values-pl/strings.xml b/packages/PrintSpooler/res/values-pl/strings.xml
index dac4b0822..df3ee924 100644
--- a/packages/PrintSpooler/res/values-pl/strings.xml
+++ b/packages/PrintSpooler/res/values-pl/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dwustronny"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientacja"</string>
<string name="label_pages" msgid="7768589729282182230">"Strony"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Wybierz drukarkę"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Wszystkie <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Zakres <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"np. 1-5, 8, 11-13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Wybierz usługę drukowania"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Szukanie drukarek"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Brak włączonych usług drukowania"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nie znaleziono drukarek"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Drukowanie: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Anulowanie: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-pt-rBR/strings.xml b/packages/PrintSpooler/res/values-pt-rBR/strings.xml
index b073ce1..90da72b 100644
--- a/packages/PrintSpooler/res/values-pt-rBR/strings.xml
+++ b/packages/PrintSpooler/res/values-pt-rBR/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dois lados"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
<string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Selec. impressora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Todas as <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervalo de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"Ex.: 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Selecione o serviço de impressão"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Procurando impressoras"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nenhum serviço de impressão ativado"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nenhuma impressora encontrada"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Imprimindo <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-pt-rPT/strings.xml b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
index da512b1..99bbd81 100644
--- a/packages/PrintSpooler/res/values-pt-rPT/strings.xml
+++ b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dois lados"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
<string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Selec. impressora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Todas as <xliff:g id="PAGE_COUNT">%1$s</xliff:g> páginas"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervalo de <xliff:g id="PAGE_COUNT">%1$s</xliff:g> pág."</string>
<string name="pages_range_example" msgid="8558694453556945172">"p. ex. 1-5, 8, 11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Escolher o serviço de impressão"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"A procurar impressoras"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nenhum serviço de impressão ativado"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nenhuma impressora encontrada"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"A imprimir <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"A cancelar <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-pt/strings.xml b/packages/PrintSpooler/res/values-pt/strings.xml
index b073ce1..90da72b 100644
--- a/packages/PrintSpooler/res/values-pt/strings.xml
+++ b/packages/PrintSpooler/res/values-pt/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dois lados"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
<string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Selec. impressora"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Todas as <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervalo de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"Ex.: 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Selecione o serviço de impressão"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Procurando impressoras"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nenhum serviço de impressão ativado"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nenhuma impressora encontrada"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Imprimindo <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ro/strings.xml b/packages/PrintSpooler/res/values-ro/strings.xml
index 1a44182..4cfb8ab 100644
--- a/packages/PrintSpooler/res/values-ro/strings.xml
+++ b/packages/PrintSpooler/res/values-ro/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Față-verso"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientare"</string>
<string name="label_pages" msgid="7768589729282182230">"Pagini"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Selectați imprimanta"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Toate cele <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervalul de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"de ex. 1-5, 8, 11-13"</string>
@@ -61,6 +62,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Alegeți serviciul de printare"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Se caută imprimante"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Niciun serviciu de printare activat"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nu au fost găsite imprimante"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Se printează <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Se anulează <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ru/strings.xml b/packages/PrintSpooler/res/values-ru/strings.xml
index a6ef092..fb49330 100644
--- a/packages/PrintSpooler/res/values-ru/strings.xml
+++ b/packages/PrintSpooler/res/values-ru/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Двусторонний"</string>
<string name="label_orientation" msgid="2853142581990496477">"Ориентация"</string>
<string name="label_pages" msgid="7768589729282182230">"Страницы"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Выберите принтер"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Все <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Диапазон <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"напр., 1–5, 8, 11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Выберите службу печати"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Поиск принтеров…"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Службы печати недоступны"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Ничего не найдено"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Печать задания \"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>\"…"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Отмена задания <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>…"</string>
diff --git a/packages/PrintSpooler/res/values-si-rLK/strings.xml b/packages/PrintSpooler/res/values-si-rLK/strings.xml
index 7520459..fb6f145 100644
--- a/packages/PrintSpooler/res/values-si-rLK/strings.xml
+++ b/packages/PrintSpooler/res/values-si-rLK/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"පැති-දෙකක"</string>
<string name="label_orientation" msgid="2853142581990496477">"දිශානතිය"</string>
<string name="label_pages" msgid="7768589729282182230">"පිටු"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"මුද්රණ යන්ත්රයක් තෝරන්න"</string>
<string name="template_all_pages" msgid="3322235982020148762">"සියලුම <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> පරාසය"</string>
<string name="pages_range_example" msgid="8558694453556945172">"උ.දා. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"මුද්රණ සේවාව තෝරන්න"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"මුද්රණ යන්ත්ර සොයමින්"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"මුද්රණ සේවා සබල නැත"</string>
<string name="print_no_printers" msgid="4869403323900054866">"මුද්රණ යන්ත්ර සොයා නොගැනුණි"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> මුද්රණය වේ"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"අවලංගු කෙරේ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sk/strings.xml b/packages/PrintSpooler/res/values-sk/strings.xml
index 4575040..605237b 100644
--- a/packages/PrintSpooler/res/values-sk/strings.xml
+++ b/packages/PrintSpooler/res/values-sk/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Obojstranné"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientácia"</string>
<string name="label_pages" msgid="7768589729282182230">"Strany"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Výber tlačiarne"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Všetky: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Rozsah: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"napr. 1–5, 8, 11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Výber tlačovej služby"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Vyhľadávanie tlačiarní"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Žiadne tlačové služby nie sú aktivované"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nenašli sa žiadne tlačiarne"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Prebieha tlač úlohy <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Prebieha zrušenie úlohy <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sl/strings.xml b/packages/PrintSpooler/res/values-sl/strings.xml
index c0dfdb4..48d2e1d 100644
--- a/packages/PrintSpooler/res/values-sl/strings.xml
+++ b/packages/PrintSpooler/res/values-sl/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dvostransko"</string>
<string name="label_orientation" msgid="2853142581990496477">"Postavitev"</string>
<string name="label_pages" msgid="7768589729282182230">"Strani"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Izberite tiskalnik"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Vse (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Obseg strani: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"npr. 1–5, 8, 11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Izberite tiskalno storitev"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Iskanje tiskalnikov"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ni omogočenih tiskalnih storitev"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Tiskalnikov ni mogoče najti"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Tiskanje: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Preklic: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sq-rAL/strings.xml b/packages/PrintSpooler/res/values-sq-rAL/strings.xml
index dbbf238..5ba72ff 100644
--- a/packages/PrintSpooler/res/values-sq-rAL/strings.xml
+++ b/packages/PrintSpooler/res/values-sq-rAL/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Në dy anë"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientimi"</string>
<string name="label_pages" msgid="7768589729282182230">"Faqe"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Zgjidh një printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Të <xliff:g id="PAGE_COUNT">%1$s</xliff:g> faqet"</string>
<string name="template_page_range" msgid="428638530038286328">"Gama e faqeve: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"p.sh. 1 - 5,8,11 - 13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Zgjidh shërbimin e printimit"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Po kërkon për printerë"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Nuk ka shërbime printimi të aktivizuara"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Nuk u gjet asnjë printer"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Po printon <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Po anulon <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sr/strings.xml b/packages/PrintSpooler/res/values-sr/strings.xml
index 5589298..7a04b8d 100644
--- a/packages/PrintSpooler/res/values-sr/strings.xml
+++ b/packages/PrintSpooler/res/values-sr/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Двострано"</string>
<string name="label_orientation" msgid="2853142581990496477">"Положај"</string>
<string name="label_pages" msgid="7768589729282182230">"Странице"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Изаберите штампач"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Све странице (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"Опсег од <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"нпр. 1–5, 8, 11–13"</string>
@@ -61,6 +62,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Изаберите услугу штампања"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Претрага штампача"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Ниједна услуга штампања није омогућена"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Није пронађен ниједан штампач"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Штампа се <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Отказује се <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sv/strings.xml b/packages/PrintSpooler/res/values-sv/strings.xml
index a97430e..ec4ad30 100644
--- a/packages/PrintSpooler/res/values-sv/strings.xml
+++ b/packages/PrintSpooler/res/values-sv/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Dubbelsidig"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientering"</string>
<string name="label_pages" msgid="7768589729282182230">"Sidor"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Välj skrivare"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Alla <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Intervall på <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"t.ex. 1–5,8,11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Välj utskriftstjänst"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Söker efter skrivare"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Inga utskriftstjänster har aktiverats"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Det gick inte att hitta några skrivare"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Skriver ut <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Avbryter <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sw/strings.xml b/packages/PrintSpooler/res/values-sw/strings.xml
index f4d51bf..eed3356 100644
--- a/packages/PrintSpooler/res/values-sw/strings.xml
+++ b/packages/PrintSpooler/res/values-sw/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Yenye pande mbili"</string>
<string name="label_orientation" msgid="2853142581990496477">"Mkao"</string>
<string name="label_pages" msgid="7768589729282182230">"Kurasa"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Chagua printa"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Kurasa zote <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Mfululizo wa <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"k.m. 1–5, 8, 11–13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Chagua huduma ya printa"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Inatafuta printa"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Huduma za kuchapisha hazijawashwa"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Hakuna printa zilizopatikana"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Inachapisha <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Inaghairi <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ta-rIN/strings.xml b/packages/PrintSpooler/res/values-ta-rIN/strings.xml
index 4e292d2..a9879c3 100644
--- a/packages/PrintSpooler/res/values-ta-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-ta-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"இரு பக்க முறை"</string>
<string name="label_orientation" msgid="2853142581990496477">"திசையமைப்பு"</string>
<string name="label_pages" msgid="7768589729282182230">"பக்கங்கள்"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"பிரிண்டரை தேர்ந்தெடு"</string>
<string name="template_all_pages" msgid="3322235982020148762">"எல்லாம்: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"வரம்பில்: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"எ.கா. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"அச்சுப் பொறியைத் தேர்வுசெய்யவும்"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"அச்சுப்பொறிகளைத் தேடுகிறது"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"அச்சுப் பொறிகள் இல்லை"</string>
<string name="print_no_printers" msgid="4869403323900054866">"பிரிண்டர்கள் எதுவுமில்லை"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ஐ அச்சிடுகிறது"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ஐ ரத்துசெய்கிறது"</string>
diff --git a/packages/PrintSpooler/res/values-te-rIN/strings.xml b/packages/PrintSpooler/res/values-te-rIN/strings.xml
index 8cb5aa6..909cb90 100644
--- a/packages/PrintSpooler/res/values-te-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-te-rIN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"రెండు వైపుల"</string>
<string name="label_orientation" msgid="2853142581990496477">"దృగ్విన్యాసం"</string>
<string name="label_pages" msgid="7768589729282182230">"పేజీలు"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ప్రింటర్ ఎంచుకోండి"</string>
<string name="template_all_pages" msgid="3322235982020148762">"మొత్తం <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> పరిధి"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ఉదా. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"ముద్రణ సేవను ఎంచుకోండి"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"ప్రింటర్ల కోసం శోధిస్తోంది"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ముద్రణ సేవలు ఏవీ ప్రారంభించలేదు"</string>
<string name="print_no_printers" msgid="4869403323900054866">"ప్రింటర్లు కనుగొనబడలేదు"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ను ముద్రిస్తోంది"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ను రద్దు చేస్తోంది"</string>
diff --git a/packages/PrintSpooler/res/values-th/strings.xml b/packages/PrintSpooler/res/values-th/strings.xml
index c501cf9..c33a759 100644
--- a/packages/PrintSpooler/res/values-th/strings.xml
+++ b/packages/PrintSpooler/res/values-th/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"2 ด้าน"</string>
<string name="label_orientation" msgid="2853142581990496477">"การวางแนว"</string>
<string name="label_pages" msgid="7768589729282182230">"หน้า"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"เลือกเครื่องพิมพ์"</string>
<string name="template_all_pages" msgid="3322235982020148762">"ทั้ง <xliff:g id="PAGE_COUNT">%1$s</xliff:g> หน้า"</string>
<string name="template_page_range" msgid="428638530038286328">"ช่วง <xliff:g id="PAGE_COUNT">%1$s</xliff:g> หน้า"</string>
<string name="pages_range_example" msgid="8558694453556945172">"เช่น 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"เลือกบริการพิมพ์"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"กำลังค้นหาเครื่องพิมพ์"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"ไม่ได้เปิดใช้บริการพิมพ์"</string>
<string name="print_no_printers" msgid="4869403323900054866">"ไม่พบเครื่องพิมพ์"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"กำลังพิมพ์ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"กำลังยกเลิก <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-tl/strings.xml b/packages/PrintSpooler/res/values-tl/strings.xml
index 18942e2..545bda4 100644
--- a/packages/PrintSpooler/res/values-tl/strings.xml
+++ b/packages/PrintSpooler/res/values-tl/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
<string name="label_orientation" msgid="2853142581990496477">"Oryentasyon"</string>
<string name="label_pages" msgid="7768589729282182230">"Mga Page"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Pumili ng printer"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Lahat ng <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Hanay ng <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"hal. 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Pumili ng serbisyo ng pag-print"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Naghahanap ng mga printer"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Walang mga naka-enable na serbisyo sa pag-print"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Walang mga printer na nakita"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Pini-print ang <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Kinakansela ang <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-tr/strings.xml b/packages/PrintSpooler/res/values-tr/strings.xml
index a7ef18c..a13f2df 100644
--- a/packages/PrintSpooler/res/values-tr/strings.xml
+++ b/packages/PrintSpooler/res/values-tr/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Çift taraflı"</string>
<string name="label_orientation" msgid="2853142581990496477">"Sayfa yönü"</string>
<string name="label_pages" msgid="7768589729282182230">"Sayfa"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Yazıcı seçin"</string>
<string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> sayfanın tamamı"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> sayfalık aralık"</string>
<string name="pages_range_example" msgid="8558694453556945172">"ör. 1-5,8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Yazdırma hizmetini seçin"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Yazıcılar aranıyor"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Etkin yazıcı hizmeti yok"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Yazıcı bulunamadı"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> yazdırılıyor"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> iptal ediliyor"</string>
diff --git a/packages/PrintSpooler/res/values-uk/strings.xml b/packages/PrintSpooler/res/values-uk/strings.xml
index 1e21c06..def21ab 100644
--- a/packages/PrintSpooler/res/values-uk/strings.xml
+++ b/packages/PrintSpooler/res/values-uk/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Двосторонній друк"</string>
<string name="label_orientation" msgid="2853142581990496477">"Орієнтація"</string>
<string name="label_pages" msgid="7768589729282182230">"Сторінки"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Виберіть принтер"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Усі <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Діапазон <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"напр.,1–5, 8, 11–13"</string>
@@ -62,6 +63,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Вибрати службу друку"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Пошук принтерів"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Немає служб друку"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Принтери не знайдено"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Завдання \"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>\" друкується"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Завдання \"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>\" скасовується"</string>
diff --git a/packages/PrintSpooler/res/values-ur-rPK/strings.xml b/packages/PrintSpooler/res/values-ur-rPK/strings.xml
index 7356cdb..c031aba 100644
--- a/packages/PrintSpooler/res/values-ur-rPK/strings.xml
+++ b/packages/PrintSpooler/res/values-ur-rPK/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"دو طرف"</string>
<string name="label_orientation" msgid="2853142581990496477">"سمت بندی"</string>
<string name="label_pages" msgid="7768589729282182230">"صفحات"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"ایک پرنٹر منتخب کریں"</string>
<string name="template_all_pages" msgid="3322235982020148762">"سبھی <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> کی رینج"</string>
<string name="pages_range_example" msgid="8558694453556945172">"مثلاً 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"پرنٹ سروس منتخب کریں"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"پرنٹرز تلاش کر رہا ہے"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"کوئی پرنٹ سروس فعال نہیں"</string>
<string name="print_no_printers" msgid="4869403323900054866">"کوئی پرنٹرز نہيں ملے"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> پرنٹ کررہا ہے"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> کو منسوخ کر رہا ہے"</string>
diff --git a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml b/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
index 4b11608..59dcca9 100644
--- a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
+++ b/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Ikki tomonlama"</string>
<string name="label_orientation" msgid="2853142581990496477">"Joylashuv"</string>
<string name="label_pages" msgid="7768589729282182230">"Sahifalar"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Printerni tanlang"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Barchasi (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="template_page_range" msgid="428638530038286328">"O‘zgarish chegarasi (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="8558694453556945172">"masalan: 1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Chop etish xizmatini tanlang"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Printerlar qidirilmoqda"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Hech qaysi chop etish xizmati yoqilmagan"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Printerlar topilmadi"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Chop etilmoqda: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> bekor qilinmoqda"</string>
diff --git a/packages/PrintSpooler/res/values-vi/strings.xml b/packages/PrintSpooler/res/values-vi/strings.xml
index af237a4..0167823 100644
--- a/packages/PrintSpooler/res/values-vi/strings.xml
+++ b/packages/PrintSpooler/res/values-vi/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Hai mặt"</string>
<string name="label_orientation" msgid="2853142581990496477">"Hướng"</string>
<string name="label_pages" msgid="7768589729282182230">"Trang"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Chọn máy in"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Tất cả <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Phạm vi <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"Ví dụ: 1—5, 8, 11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Chọn dịch vụ in"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Đang tìm kiếm máy in"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Chưa kích hoạt dịch vụ in nào"</string>
<string name="print_no_printers" msgid="4869403323900054866">"Không tìm thấy máy in"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"In <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Hủy <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rCN/strings.xml b/packages/PrintSpooler/res/values-zh-rCN/strings.xml
index 9e8e166..a74e994 100644
--- a/packages/PrintSpooler/res/values-zh-rCN/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rCN/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"双面"</string>
<string name="label_orientation" msgid="2853142581990496477">"方向"</string>
<string name="label_pages" msgid="7768589729282182230">"页数"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"选择打印机"</string>
<string name="template_all_pages" msgid="3322235982020148762">"全部<xliff:g id="PAGE_COUNT">%1$s</xliff:g>页"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>页"</string>
<string name="pages_range_example" msgid="8558694453556945172">"例如：1-5、8、11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"选择打印服务"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"正在搜索打印机"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"未启用任何打印服务"</string>
<string name="print_no_printers" msgid="4869403323900054866">"找不到打印机"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"正在打印“<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>”"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"正在取消打印“<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>”"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rHK/strings.xml b/packages/PrintSpooler/res/values-zh-rHK/strings.xml
index 41a9f8e..35643f3 100644
--- a/packages/PrintSpooler/res/values-zh-rHK/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rHK/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"雙面"</string>
<string name="label_orientation" msgid="2853142581990496477">"方向"</string>
<string name="label_pages" msgid="7768589729282182230">"頁數"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"選擇打印機"</string>
<string name="template_all_pages" msgid="3322235982020148762">"全部 <xliff:g id="PAGE_COUNT">%1$s</xliff:g> 頁"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> 頁"</string>
<string name="pages_range_example" msgid="8558694453556945172">"例如：1-5,8,11-13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"選擇列印服務"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"正在搜尋打印機"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"沒有已啟用的列印服務"</string>
<string name="print_no_printers" msgid="4869403323900054866">"找不到打印機"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"正在列印 <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"正在取消 <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rTW/strings.xml b/packages/PrintSpooler/res/values-zh-rTW/strings.xml
index 5e391fa..40c44ff 100644
--- a/packages/PrintSpooler/res/values-zh-rTW/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rTW/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"雙面"</string>
<string name="label_orientation" msgid="2853142581990496477">"方向"</string>
<string name="label_pages" msgid="7768589729282182230">"頁面"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"選取印表機"</string>
<string name="template_all_pages" msgid="3322235982020148762">"全部 <xliff:g id="PAGE_COUNT">%1$s</xliff:g> 頁"</string>
<string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> 頁"</string>
<string name="pages_range_example" msgid="8558694453556945172">"例如：1—5,8,11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"選擇列印服務"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"正在搜尋印表機"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"未啟用任何列印服務"</string>
<string name="print_no_printers" msgid="4869403323900054866">"找不到印表機"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"正在列印 <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"正在取消 <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-zu/strings.xml b/packages/PrintSpooler/res/values-zu/strings.xml
index a2c3172..e0f6f34 100644
--- a/packages/PrintSpooler/res/values-zu/strings.xml
+++ b/packages/PrintSpooler/res/values-zu/strings.xml
@@ -27,6 +27,7 @@
<string name="label_duplex" msgid="5370037254347072243">"Inezinhlangothi ezimbili"</string>
<string name="label_orientation" msgid="2853142581990496477">"Umumo"</string>
<string name="label_pages" msgid="7768589729282182230">"Amakhasi"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Khetha iphrinta"</string>
<string name="template_all_pages" msgid="3322235982020148762">"Konke <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="template_page_range" msgid="428638530038286328">"Ibanga le-<xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
<string name="pages_range_example" msgid="8558694453556945172">"isb. 1—5, 8, 11—13"</string>
@@ -60,6 +61,7 @@
</plurals>
<string name="choose_print_service" msgid="3740309762324459694">"Khetha isevisi yephrinta"</string>
<string name="print_searching_for_printers" msgid="6550424555079932867">"Isesha amaphrinta"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"Amasevisi ephrinta akavuliwe."</string>
<string name="print_no_printers" msgid="4869403323900054866">"Awekho amaphrinta atholiwe"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Iphrinta i-<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Ikhansela i-<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values/strings.xml b/packages/PrintSpooler/res/values/strings.xml
index 70abdf4..6d81788 100644
--- a/packages/PrintSpooler/res/values/strings.xml
+++ b/packages/PrintSpooler/res/values/strings.xml
@@ -49,6 +49,9 @@
<!-- Label of the page selection widget. [CHAR LIMIT=20] -->
<string name="label_pages">Pages</string>
+ <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+ <string name="destination_default_text">Select a printer</string>
+
<!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
<string name="template_all_pages">All <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java
index 33db831..82fd512 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java
@@ -16,7 +16,10 @@
package com.android.printspooler.model;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.Notification;
+import android.app.Notification.Action;
import android.app.Notification.InboxStyle;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -24,6 +27,7 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.PowerManager;
@@ -114,68 +118,82 @@
}
}
- private void createPrintingNotification(PrintJobInfo printJob) {
+ /**
+ * Create an {@link Action} that cancels a {@link PrintJobInfo print job}.
+ *
+ * @param printJob The {@link PrintJobInfo print job} to cancel
+ *
+ * @return An {@link Action} that will cancel a print job
+ */
+ private Action createCancelAction(PrintJobInfo printJob) {
+ return new Action.Builder(
+ Icon.createWithResource(mContext, R.drawable.stat_notify_cancelling),
+ mContext.getString(R.string.cancel), createCancelIntent(printJob)).build();
+ }
+
+ /**
+ * Create a notification for a print job.
+ *
+ * @param printJob the job the notification is for
+ * @param firstAction the first action shown in the notification
+ * @param secondAction the second action shown in the notification
+ */
+ private void createNotification(@NonNull PrintJobInfo printJob, @Nullable Action firstAction,
+ @Nullable Action secondAction) {
Notification.Builder builder = new Notification.Builder(mContext)
.setContentIntent(createContentIntent(printJob.getId()))
.setSmallIcon(computeNotificationIcon(printJob))
.setContentTitle(computeNotificationTitle(printJob))
- .addAction(R.drawable.stat_notify_cancelling, mContext.getString(R.string.cancel),
- createCancelIntent(printJob))
- .setContentText(printJob.getPrinterName())
.setWhen(System.currentTimeMillis())
.setOngoing(true)
.setShowWhen(true)
.setColor(mContext.getColor(
com.android.internal.R.color.system_notification_accent_color));
+
+ if (firstAction != null) {
+ builder.addAction(firstAction);
+ }
+
+ if (secondAction != null) {
+ builder.addAction(secondAction);
+ }
+
+ if (printJob.getState() == PrintJobInfo.STATE_STARTED) {
+ float progress = printJob.getProgress();
+ if (progress >= 0) {
+ builder.setProgress(Integer.MAX_VALUE, (int)(Integer.MAX_VALUE * progress),
+ false);
+ }
+ }
+
+ CharSequence status = printJob.getStatus();
+ if (status != null) {
+ builder.setContentText(status);
+ } else {
+ builder.setContentText(printJob.getPrinterName());
+ }
+
mNotificationManager.notify(0, builder.build());
}
+ private void createPrintingNotification(PrintJobInfo printJob) {
+ createNotification(printJob, createCancelAction(printJob), null);
+ }
+
private void createFailedNotification(PrintJobInfo printJob) {
- Notification.Builder builder = new Notification.Builder(mContext)
- .setContentIntent(createContentIntent(printJob.getId()))
- .setSmallIcon(computeNotificationIcon(printJob))
- .setContentTitle(computeNotificationTitle(printJob))
- .addAction(R.drawable.stat_notify_cancelling, mContext.getString(R.string.cancel),
- createCancelIntent(printJob))
- .addAction(R.drawable.ic_restart, mContext.getString(R.string.restart),
- createRestartIntent(printJob.getId()))
- .setContentText(printJob.getPrinterName())
- .setWhen(System.currentTimeMillis())
- .setOngoing(true)
- .setShowWhen(true)
- .setColor(mContext.getColor(
- com.android.internal.R.color.system_notification_accent_color));
- mNotificationManager.notify(0, builder.build());
+ Action.Builder restartActionBuilder = new Action.Builder(
+ Icon.createWithResource(mContext, R.drawable.ic_restart),
+ mContext.getString(R.string.restart), createRestartIntent(printJob.getId()));
+
+ createNotification(printJob, createCancelAction(printJob), restartActionBuilder.build());
}
private void createBlockedNotification(PrintJobInfo printJob) {
- Notification.Builder builder = new Notification.Builder(mContext)
- .setContentIntent(createContentIntent(printJob.getId()))
- .setSmallIcon(computeNotificationIcon(printJob))
- .setContentTitle(computeNotificationTitle(printJob))
- .addAction(R.drawable.stat_notify_cancelling, mContext.getString(R.string.cancel),
- createCancelIntent(printJob))
- .setContentText(printJob.getPrinterName())
- .setWhen(System.currentTimeMillis())
- .setOngoing(true)
- .setShowWhen(true)
- .setColor(mContext.getColor(
- com.android.internal.R.color.system_notification_accent_color));
- mNotificationManager.notify(0, builder.build());
+ createNotification(printJob, createCancelAction(printJob), null);
}
private void createCancellingNotification(PrintJobInfo printJob) {
- Notification.Builder builder = new Notification.Builder(mContext)
- .setContentIntent(createContentIntent(printJob.getId()))
- .setSmallIcon(computeNotificationIcon(printJob))
- .setContentTitle(computeNotificationTitle(printJob))
- .setContentText(printJob.getPrinterName())
- .setWhen(System.currentTimeMillis())
- .setOngoing(true)
- .setShowWhen(true)
- .setColor(mContext.getColor(
- com.android.internal.R.color.system_notification_accent_color));
- mNotificationManager.notify(0, builder.build());
+ createNotification(printJob, null, null);
}
private void createStackedNotification(List<PrintJobInfo> printJobs) {
@@ -196,7 +214,7 @@
PrintJobInfo printJob = printJobs.get(i);
if (i == printJobCount - 1) {
builder.setLargeIcon(((BitmapDrawable) mContext.getResources().getDrawable(
- computeNotificationIcon(printJob))).getBitmap());
+ computeNotificationIcon(printJob), null)).getBitmap());
builder.setSmallIcon(computeNotificationIcon(printJob));
builder.setContentTitle(computeNotificationTitle(printJob));
builder.setContentText(printJob.getPrinterName());
@@ -301,6 +319,7 @@
}
public static final class NotificationBroadcastReceiver extends BroadcastReceiver {
+ @SuppressWarnings("hiding")
private static final String LOG_TAG = "NotificationBroadcastReceiver";
@Override
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
index 7adcfec..90eef83 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
@@ -16,6 +16,9 @@
package com.android.printspooler.model;
+import android.annotation.FloatRange;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.Service;
import android.content.ComponentName;
import android.content.Context;
@@ -497,7 +500,7 @@
success = true;
printJob.setState(state);
- printJob.setStateReason(error);
+ printJob.setStatus(error);
printJob.setCancelling(false);
if (DEBUG_PRINT_JOB_LIFECYCLE) {
@@ -547,6 +550,35 @@
return success;
}
+ /**
+ * Set the progress for a print job.
+ *
+ * @param printJobId ID of the print job to update
+ * @param progress the new progress
+ */
+ public void setProgress(@NonNull PrintJobId printJobId,
+ @FloatRange(from=0.0, to=1.0) float progress) {
+ synchronized (mLock) {
+ getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY).setProgress(progress);
+
+ mNotificationController.onUpdateNotifications(mPrintJobs);
+ }
+ }
+
+ /**
+ * Set the status for a print job.
+ *
+ * @param printJobId ID of the print job to update
+ * @param status the new status
+ */
+ public void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) {
+ synchronized (mLock) {
+ getPrintJobInfo(printJobId, PrintManager.APP_ID_ANY).setStatus(status);
+
+ mNotificationController.onUpdateNotifications(mPrintJobs);
+ }
+ }
+
public boolean hasActivePrintJobsLocked() {
final int printJobCount = mPrintJobs.size();
for (int i = 0; i < printJobCount; i++) {
@@ -693,6 +725,8 @@
private static final String ATTR_COPIES = "copies";
private static final String ATTR_PRINTER_NAME = "printerName";
private static final String ATTR_STATE_REASON = "stateReason";
+ private static final String ATTR_STATUS = "status";
+ private static final String ATTR_PROGRESS = "progress";
private static final String ATTR_CANCELLING = "cancelling";
private static final String TAG_ADVANCED_OPTIONS = "advancedOptions";
@@ -801,13 +835,19 @@
if (!TextUtils.isEmpty(printerName)) {
serializer.attribute(null, ATTR_PRINTER_NAME, printerName);
}
- String stateReason = printJob.getStateReason();
- if (!TextUtils.isEmpty(stateReason)) {
- serializer.attribute(null, ATTR_STATE_REASON, stateReason);
- }
serializer.attribute(null, ATTR_CANCELLING, String.valueOf(
printJob.isCancelling()));
+ float progress = printJob.getProgress();
+ if (progress != Float.NaN) {
+ serializer.attribute(null, ATTR_PROGRESS, String.valueOf(progress));
+ }
+
+ CharSequence status = printJob.getStatus();
+ if (!TextUtils.isEmpty(status)) {
+ serializer.attribute(null, ATTR_STATUS, status.toString());
+ }
+
PrinterId printerId = printJob.getPrinterId();
if (printerId != null) {
serializer.startTag(null, TAG_PRINTER_ID);
@@ -1025,8 +1065,25 @@
printJob.setCopies(Integer.parseInt(copies));
String printerName = parser.getAttributeValue(null, ATTR_PRINTER_NAME);
printJob.setPrinterName(printerName);
+
+ String progressString = parser.getAttributeValue(null, ATTR_PROGRESS);
+ if (progressString != null) {
+ float progress = Float.parseFloat(progressString);
+
+ if (progress != -1) {
+ printJob.setProgress(progress);
+ }
+ }
+
+ CharSequence status = parser.getAttributeValue(null, ATTR_STATUS);
+ printJob.setStatus(status);
+
+ // stateReason is deprecated, but might be used by old print jobs
String stateReason = parser.getAttributeValue(null, ATTR_STATE_REASON);
- printJob.setStateReason(stateReason);
+ if (stateReason != null) {
+ printJob.setStatus(stateReason);
+ }
+
String cancelling = parser.getAttributeValue(null, ATTR_CANCELLING);
printJob.setCancelling(!TextUtils.isEmpty(cancelling)
? Boolean.parseBoolean(cancelling) : false);
@@ -1323,6 +1380,18 @@
.removeApprovedService(serviceToRemove);
}
+ @Override
+ public void setProgress(@NonNull PrintJobId printJobId,
+ @FloatRange(from=0.0, to=1.0) float progress) throws RemoteException {
+ PrintSpoolerService.this.setProgress(printJobId, progress);
+ }
+
+ @Override
+ public void setStatus(@NonNull PrintJobId printJobId,
+ @Nullable CharSequence status) throws RemoteException {
+ PrintSpoolerService.this.setStatus(printJobId, status);
+ }
+
public PrintSpoolerService getService() {
return PrintSpoolerService.this;
}
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index f409fd4..6521565 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -64,6 +64,7 @@
import android.util.ArrayMap;
import android.util.Log;
import android.view.KeyEvent;
+import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnFocusChangeListener;
@@ -125,6 +126,8 @@
private static final String FRAGMENT_TAG = "FRAGMENT_TAG";
+ private static final String HAS_PRINTED_PREF = "has_printed";
+
private static final int ORIENTATION_PORTRAIT = 0;
private static final int ORIENTATION_LANDSCAPE = 1;
@@ -187,6 +190,7 @@
private Spinner mDestinationSpinner;
private DestinationAdapter mDestinationSpinnerAdapter;
+ private boolean mShowDestinationPrompt;
private Spinner mMediaSizeSpinner;
private ArrayAdapter<SpinnerItem<MediaSize>> mMediaSizeSpinnerAdapter;
@@ -332,8 +336,8 @@
}
@Override
- public void onResume() {
- super.onResume();
+ public void onStart() {
+ super.onStart();
if (mState != STATE_INITIALIZING && mCurrentPrinter != null) {
mPrinterRegistry.setTrackedPrinter(mCurrentPrinter.getId());
}
@@ -375,10 +379,15 @@
}
}
+ super.onPause();
+ }
+
+ @Override
+ protected void onStop() {
mPrinterAvailabilityDetector.cancel();
mPrinterRegistry.setTrackedPrinter(null);
- super.onPause();
+ super.onStop();
}
@Override
@@ -547,8 +556,7 @@
// Make sure the IME is not on the way of preview as
// the user may have used it to type copies or range.
- InputMethodManager imm = (InputMethodManager) getSystemService(
- Context.INPUT_METHOD_SERVICE);
+ InputMethodManager imm = getSystemService(InputMethodManager.class);
imm.hideSoftInputFromWindow(mDestinationSpinner.getWindowToken(), 0);
}
@@ -969,7 +977,7 @@
if (newFragment != null) {
transaction.add(R.id.embedded_content_container, newFragment, FRAGMENT_TAG);
}
- transaction.commit();
+ transaction.commitAllowingStateLoss();
getFragmentManager().executePendingTransactions();
}
@@ -1093,6 +1101,7 @@
updateOptionsUi();
addCurrentPrinterToHistory();
+ setUserPrinted();
PageRange[] selectedPages = computeSelectedPages();
if (!Arrays.equals(mSelectedPages, selectedPages)) {
@@ -1195,6 +1204,29 @@
// Print button
mPrintButton = (ImageView) findViewById(R.id.print_button);
mPrintButton.setOnClickListener(clickListener);
+
+ // Special prompt instead of destination spinner for the first time the user printed
+ if (!hasUserEverPrinted()) {
+ mShowDestinationPrompt = true;
+
+ mSummaryCopies.setEnabled(false);
+ mSummaryPaperSize.setEnabled(false);
+
+ mDestinationSpinner.setOnTouchListener(new View.OnTouchListener() {
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ mShowDestinationPrompt = false;
+ mSummaryCopies.setEnabled(true);
+ mSummaryPaperSize.setEnabled(true);
+ updateOptionsUi();
+
+ mDestinationSpinner.setOnTouchListener(null);
+ mDestinationSpinnerAdapter.notifyDataSetChanged();
+
+ return false;
+ }
+ });
+ }
}
/**
@@ -1332,6 +1364,22 @@
&& printer.getStatus() != PrinterInfo.STATUS_UNAVAILABLE;
}
+ /**
+ * Disable all options UI elements, beside the {@link #mDestinationSpinner}
+ */
+ private void disableOptionsUi() {
+ mCopiesEditText.setEnabled(false);
+ mCopiesEditText.setFocusable(false);
+ mMediaSizeSpinner.setEnabled(false);
+ mColorModeSpinner.setEnabled(false);
+ mDuplexModeSpinner.setEnabled(false);
+ mOrientationSpinner.setEnabled(false);
+ mRangeOptionsSpinner.setEnabled(false);
+ mPageRangeEditText.setEnabled(false);
+ mPrintButton.setVisibility(View.GONE);
+ mMoreOptionsButton.setEnabled(false);
+ }
+
void updateOptionsUi() {
// Always update the summary.
updateSummary();
@@ -1346,32 +1394,14 @@
if (mState != STATE_PRINTER_UNAVAILABLE) {
mDestinationSpinner.setEnabled(false);
}
- mCopiesEditText.setEnabled(false);
- mCopiesEditText.setFocusable(false);
- mMediaSizeSpinner.setEnabled(false);
- mColorModeSpinner.setEnabled(false);
- mDuplexModeSpinner.setEnabled(false);
- mOrientationSpinner.setEnabled(false);
- mRangeOptionsSpinner.setEnabled(false);
- mPageRangeEditText.setEnabled(false);
- mPrintButton.setVisibility(View.GONE);
- mMoreOptionsButton.setEnabled(false);
+ disableOptionsUi();
return;
}
// If no current printer, or it has no capabilities, or it is not
// available, we disable all print options except the destination.
if (mCurrentPrinter == null || !canPrint(mCurrentPrinter)) {
- mCopiesEditText.setEnabled(false);
- mCopiesEditText.setFocusable(false);
- mMediaSizeSpinner.setEnabled(false);
- mColorModeSpinner.setEnabled(false);
- mDuplexModeSpinner.setEnabled(false);
- mOrientationSpinner.setEnabled(false);
- mRangeOptionsSpinner.setEnabled(false);
- mPageRangeEditText.setEnabled(false);
- mPrintButton.setVisibility(View.GONE);
- mMoreOptionsButton.setEnabled(false);
+ disableOptionsUi();
return;
}
@@ -1679,6 +1709,10 @@
mCopiesEditText.setText(MIN_COPIES_STRING);
mCopiesEditText.requestFocus();
}
+
+ if (mShowDestinationPrompt) {
+ disableOptionsUi();
+ }
}
private void updateSummary() {
@@ -1980,6 +2014,32 @@
}
}
+
+ /**
+ * Check if the user has ever printed a document
+ *
+ * @return true iff the user has ever printed a document
+ */
+ private boolean hasUserEverPrinted() {
+ SharedPreferences preferences = getSharedPreferences(HAS_PRINTED_PREF, MODE_PRIVATE);
+
+ return preferences.getBoolean(HAS_PRINTED_PREF, false);
+ }
+
+ /**
+ * Remember that the user printed a document
+ */
+ private void setUserPrinted() {
+ SharedPreferences preferences = getSharedPreferences(HAS_PRINTED_PREF, MODE_PRIVATE);
+
+ if (!preferences.getBoolean(HAS_PRINTED_PREF, false)) {
+ SharedPreferences.Editor edit = preferences.edit();
+
+ edit.putBoolean(HAS_PRINTED_PREF, true);
+ edit.apply();
+ }
+ }
+
private final class DestinationAdapter extends BaseAdapter
implements PrinterRegistry.OnPrintersChangeListener {
private final List<PrinterHolder> mPrinterHolders = new ArrayList<>();
@@ -1988,6 +2048,11 @@
private boolean mHistoricalPrintersLoaded;
+ /**
+ * Has the {@link #mDestinationSpinner} ever used a view from printer_dropdown_prompt
+ */
+ private boolean hadPromptView;
+
public DestinationAdapter() {
mHistoricalPrintersLoaded = mPrinterRegistry.areHistoricalPrintersLoaded();
if (mHistoricalPrintersLoaded) {
@@ -2098,9 +2163,20 @@
@Override
public View getView(int position, View convertView, ViewGroup parent) {
- if (convertView == null) {
- convertView = getLayoutInflater().inflate(
- R.layout.printer_dropdown_item, parent, false);
+ if (mShowDestinationPrompt) {
+ if (convertView == null) {
+ convertView = getLayoutInflater().inflate(
+ R.layout.printer_dropdown_prompt, parent, false);
+ hadPromptView = true;
+ }
+
+ return convertView;
+ } else {
+ // We don't know if we got an recyled printer_dropdown_prompt, hence do not use it
+ if (hadPromptView || convertView == null) {
+ convertView = getLayoutInflater().inflate(
+ R.layout.printer_dropdown_item, parent, false);
+ }
}
CharSequence title = null;
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
index f4c15bd..ab0b2f1 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
@@ -33,10 +33,12 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
+import android.database.ContentObserver;
import android.database.DataSetObserver;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
+import android.os.Handler;
import android.print.PrintManager;
import android.print.PrinterId;
import android.print.PrinterInfo;
@@ -84,9 +86,7 @@
private static final String EXTRA_PRINTER_ID = "EXTRA_PRINTER_ID";
- /**
- * If there are any enabled print services
- */
+ /** If there are any enabled print services */
private boolean mHasEnabledPrintServices;
private final ArrayList<PrintServiceInfo> mAddPrinterServices =
@@ -98,6 +98,9 @@
private AnnounceFilterResult mAnnounceFilterResult;
+ /** Monitor if new print services get enabled or disabled */
+ private ContentObserver mPrintServicesObserver;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -227,14 +230,50 @@
return false;
}
- @Override
- public void onResume() {
- super.onResume();
+ /**
+ * Adjust the UI if the enabled print services changed.
+ */
+ private synchronized void onPrintServicesUpdate() {
updateServicesWithAddPrinterActivity();
updateEmptyView((DestinationAdapter)mListView.getAdapter());
invalidateOptionsMenu();
}
+ /**
+ * Register listener for changes to the enabled print services.
+ */
+ private void registerServiceMonitor() {
+ mPrintServicesObserver = new ContentObserver(new Handler()) {
+ @Override
+ public void onChange(boolean selfChange) {
+ onPrintServicesUpdate();
+ }
+ };
+
+ getContentResolver().registerContentObserver(
+ Settings.Secure.getUriFor(Settings.Secure.ENABLED_PRINT_SERVICES), false,
+ mPrintServicesObserver);
+ }
+
+ /**
+ * Unregister {@link #mPrintServicesObserver listener for changes to the enabled print services}
+ * or nothing if the listener is not registered.
+ */
+ private void unregisterServiceMonitorIfNeeded() {
+ if (mPrintServicesObserver != null) {
+ getContentResolver().unregisterContentObserver(mPrintServicesObserver);
+
+ mPrintServicesObserver = null;
+ }
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ registerServiceMonitor();
+ onPrintServicesUpdate();
+ }
+
@Override
public void onPause() {
if (mAnnounceFilterResult != null) {
@@ -244,6 +283,12 @@
}
@Override
+ public void onStop() {
+ unregisterServiceMonitorIfNeeded();
+ super.onStop();
+ }
+
+ @Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.action_add_printer) {
showAddPrinterSelectionDialog();
diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml
index 8fa5abf..98a171e 100644
--- a/packages/SettingsLib/res/values-pl/strings.xml
+++ b/packages/SettingsLib/res/values-pl/strings.xml
@@ -72,7 +72,7 @@
<string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sparuj"</string>
<string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SPARUJ"</string>
<string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anuluj"</string>
- <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Parowanie spowoduje przyznanie dostępu do historii połączeń i Twoich kontaktów w trakcie połączenia."</string>
+ <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Sparowanie powoduje przyznanie dostępu do historii połączeń i Twoich kontaktów w trakcie połączenia."</string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ze względu na błędny kod PIN lub klucz."</string>
<string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nie można skomunikować się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml
index 029962e..c3c287c 100644
--- a/packages/SettingsLib/res/values-th/strings.xml
+++ b/packages/SettingsLib/res/values-th/strings.xml
@@ -38,7 +38,7 @@
<string name="bluetooth_disconnecting" msgid="8913264760027764974">"กำลังตัดการเชื่อมต่อ..."</string>
<string name="bluetooth_connecting" msgid="8555009514614320497">"กำลังเชื่อมต่อ…"</string>
<string name="bluetooth_connected" msgid="6038755206916626419">"เชื่อมต่อแล้ว"</string>
- <string name="bluetooth_pairing" msgid="1426882272690346242">"กำลังกำหนดค่าอุปกรณ์ให้ตรงกัน..."</string>
+ <string name="bluetooth_pairing" msgid="1426882272690346242">"กำลังจับคู่อุปกรณ์..."</string>
<string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"เชื่อมต่อแล้ว (ยกเว้นเสียงโทรศัพท์)"</string>
<string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"เชื่อมต่อแล้ว (ยกเว้นเสียงสื่อ)"</string>
<string name="bluetooth_connected_no_map" msgid="6504436917057479986">"เชื่อมต่อแล้ว (ไม่มีการเข้าถึงข้อความ)"</string>
@@ -69,14 +69,14 @@
<string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ใช้สำหรับระบบเสียงของโทรศัพท์"</string>
<string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ใช้สำหรับการโอนไฟล์"</string>
<string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ใช้สำหรับการป้อนข้อมูล"</string>
- <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"กำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
+ <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"จับคู่อุปกรณ์"</string>
<string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"จับคู่อุปกรณ์"</string>
<string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ยกเลิก"</string>
<string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"การจับคู่อุปกรณ์จะให้สิทธิ์การเข้าถึงที่อยู่ติดต่อและประวัติการโทรเมื่อเชื่อมต่อแล้ว"</string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"ไม่สามารถจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ไม่สามารถจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ได้เพราะ PIN หรือรหัสผ่านไม่ถูกต้อง"</string>
<string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ไม่สามารถเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"การกำหนดค่าอุปกรณ์ให้ตรงกันถูกปฏิเสธโดย <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ปฏิเสธการจับคู่อุปกรณ์"</string>
<string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi ปิดอยู่"</string>
<string name="accessibility_no_wifi" msgid="8834610636137374508">"ไม่ได้เชื่อมต่อ Wi-Fi"</string>
<string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"สัญญาณ Wi-Fi 1 ขีด"</string>
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 9e48849..a37196e 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -348,4 +348,7 @@
<!-- Header for items under the work user [CHAR LIMIT=30] -->
<string name="category_work">Work</string>
+ <!-- Full package name of OEM preferred device feedback reporter. Leave this blank, overlaid in Settings/TvSettings [DO NOT TRANSLATE] -->
+ <string name="oem_preferred_feedback_reporter" translatable="false" />
+
</resources>
diff --git a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
new file mode 100644
index 0000000..ff1c866
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2015 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.settingslib;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Build;
+import android.text.TextUtils;
+import android.text.format.DateFormat;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DeviceInfoUtils {
+ private static final String TAG = "DeviceInfoUtils";
+
+ private static final String FILENAME_PROC_VERSION = "/proc/version";
+ private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";
+
+ /**
+ * Reads a line from the specified file.
+ * @param filename the file to read from
+ * @return the first line, if any.
+ * @throws IOException if the file couldn't be read
+ */
+ private static String readLine(String filename) throws IOException {
+ BufferedReader reader = new BufferedReader(new FileReader(filename), 256);
+ try {
+ return reader.readLine();
+ } finally {
+ reader.close();
+ }
+ }
+
+ public static String getFormattedKernelVersion() {
+ try {
+ return formatKernelVersion(readLine(FILENAME_PROC_VERSION));
+ } catch (IOException e) {
+ Log.e(TAG, "IO Exception when getting kernel version for Device Info screen",
+ e);
+
+ return "Unavailable";
+ }
+ }
+
+ public static String formatKernelVersion(String rawKernelVersion) {
+ // Example (see tests for more):
+ // Linux version 3.0.31-g6fb96c9 (android-build@xxx.xxx.xxx.xxx.com) \
+ // (gcc version 4.6.x-xxx 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT \
+ // Thu Jun 28 11:02:39 PDT 2012
+
+ final String PROC_VERSION_REGEX =
+ "Linux version (\\S+) " + /* group 1: "3.0.31-g6fb96c9" */
+ "\\((\\S+?)\\) " + /* group 2: "x@y.com" (kernel builder) */
+ "(?:\\(gcc.+? \\)) " + /* ignore: GCC version information */
+ "(#\\d+) " + /* group 3: "#1" */
+ "(?:.*?)?" + /* ignore: optional SMP, PREEMPT, and any CONFIG_FLAGS */
+ "((Sun|Mon|Tue|Wed|Thu|Fri|Sat).+)"; /* group 4: "Thu Jun 28 11:02:39 PDT 2012" */
+
+ Matcher m = Pattern.compile(PROC_VERSION_REGEX).matcher(rawKernelVersion);
+ if (!m.matches()) {
+ Log.e(TAG, "Regex did not match on /proc/version: " + rawKernelVersion);
+ return "Unavailable";
+ } else if (m.groupCount() < 4) {
+ Log.e(TAG, "Regex match on /proc/version only returned " + m.groupCount()
+ + " groups");
+ return "Unavailable";
+ }
+ return m.group(1) + "\n" + // 3.0.31-g6fb96c9
+ m.group(2) + " " + m.group(3) + "\n" + // x@y.com #1
+ m.group(4); // Thu Jun 28 11:02:39 PDT 2012
+ }
+
+ /**
+ * Returns " (ENGINEERING)" if the msv file has a zero value, else returns "".
+ * @return a string to append to the model number description.
+ */
+ public static String getMsvSuffix() {
+ // Production devices should have a non-zero value. If we can't read it, assume it's a
+ // production device so that we don't accidentally show that it's an ENGINEERING device.
+ try {
+ String msv = readLine(FILENAME_MSV);
+ // Parse as a hex number. If it evaluates to a zero, then it's an engineering build.
+ if (Long.parseLong(msv, 16) == 0) {
+ return " (ENGINEERING)";
+ }
+ } catch (IOException|NumberFormatException e) {
+ // Fail quietly, as the file may not exist on some devices, or may be unreadable
+ }
+ return "";
+ }
+
+ public static String getFeedbackReporterPackage(Context context) {
+ final String feedbackReporter =
+ context.getResources().getString(R.string.oem_preferred_feedback_reporter);
+ if (TextUtils.isEmpty(feedbackReporter)) {
+ // Reporter not configured. Return.
+ return feedbackReporter;
+ }
+ // Additional checks to ensure the reporter is on system image, and reporter is
+ // configured to listen to the intent. Otherwise, dont show the "send feedback" option.
+ final Intent intent = new Intent(Intent.ACTION_BUG_REPORT);
+
+ PackageManager pm = context.getPackageManager();
+ List<ResolveInfo> resolvedPackages =
+ pm.queryIntentActivities(intent, PackageManager.GET_RESOLVED_FILTER);
+ for (ResolveInfo info : resolvedPackages) {
+ if (info.activityInfo != null) {
+ if (!TextUtils.isEmpty(info.activityInfo.packageName)) {
+ try {
+ ApplicationInfo ai =
+ pm.getApplicationInfo(info.activityInfo.packageName, 0);
+ if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+ // Package is on the system image
+ if (TextUtils.equals(
+ info.activityInfo.packageName, feedbackReporter)) {
+ return feedbackReporter;
+ }
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ // No need to do anything here.
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ public static String getSecurityPatch() {
+ String patch = Build.VERSION.SECURITY_PATCH;
+ if (!"".equals(patch)) {
+ try {
+ SimpleDateFormat template = new SimpleDateFormat("yyyy-MM-dd");
+ Date patchDate = template.parse(patch);
+ String format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "dMMMMyyyy");
+ patch = DateFormat.format(format, patchDate).toString();
+ } catch (ParseException e) {
+ // broken parse; fall through and use the raw string
+ }
+ return patch;
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/accounts/AuthenticatorHelper.java b/packages/SettingsLib/src/com/android/settingslib/accounts/AuthenticatorHelper.java
new file mode 100644
index 0000000..ef511bb
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/accounts/AuthenticatorHelper.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2015 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.settingslib.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SyncAdapterType;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.UserHandle;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Helper class for monitoring accounts on the device for a given user.
+ *
+ * Classes using this helper should implement {@link OnAccountsUpdateListener}.
+ * {@link OnAccountsUpdateListener#onAccountsUpdate(UserHandle)} will then be
+ * called once accounts get updated. For setting up listening for account
+ * updates, {@link #listenToAccountUpdates()} and
+ * {@link #stopListeningToAccountUpdates()} should be used.
+ */
+final public class AuthenticatorHelper extends BroadcastReceiver {
+ private static final String TAG = "AuthenticatorHelper";
+
+ private final Map<String, AuthenticatorDescription> mTypeToAuthDescription = new HashMap<>();
+ private final ArrayList<String> mEnabledAccountTypes = new ArrayList<>();
+ private final Map<String, Drawable> mAccTypeIconCache = new HashMap<>();
+ private final HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = new HashMap<>();
+
+ private final UserHandle mUserHandle;
+ private final Context mContext;
+ private final OnAccountsUpdateListener mListener;
+ private boolean mListeningToAccountUpdates;
+
+ public interface OnAccountsUpdateListener {
+ void onAccountsUpdate(UserHandle userHandle);
+ }
+
+ public AuthenticatorHelper(Context context, UserHandle userHandle,
+ OnAccountsUpdateListener listener) {
+ mContext = context;
+ mUserHandle = userHandle;
+ mListener = listener;
+ // This guarantees that the helper is ready to use once constructed: the account types and
+ // authorities are initialized
+ onAccountsUpdated(null);
+ }
+
+ public String[] getEnabledAccountTypes() {
+ return mEnabledAccountTypes.toArray(new String[mEnabledAccountTypes.size()]);
+ }
+
+ public void preloadDrawableForType(final Context context, final String accountType) {
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ getDrawableForType(context, accountType);
+ return null;
+ }
+ }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+ }
+
+ /**
+ * Gets an icon associated with a particular account type. If none found, return null.
+ * @param accountType the type of account
+ * @return a drawable for the icon or a default icon returned by
+ * {@link PackageManager#getDefaultActivityIcon} if one cannot be found.
+ */
+ public Drawable getDrawableForType(Context context, final String accountType) {
+ Drawable icon = null;
+ synchronized (mAccTypeIconCache) {
+ if (mAccTypeIconCache.containsKey(accountType)) {
+ return mAccTypeIconCache.get(accountType);
+ }
+ }
+ if (mTypeToAuthDescription.containsKey(accountType)) {
+ try {
+ AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+ Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
+ mUserHandle);
+ icon = mContext.getPackageManager().getUserBadgedIcon(
+ authContext.getDrawable(desc.iconId), mUserHandle);
+ synchronized (mAccTypeIconCache) {
+ mAccTypeIconCache.put(accountType, icon);
+ }
+ } catch (PackageManager.NameNotFoundException|Resources.NotFoundException e) {
+ // Ignore
+ }
+ }
+ if (icon == null) {
+ icon = context.getPackageManager().getDefaultActivityIcon();
+ }
+ return icon;
+ }
+
+ /**
+ * Gets the label associated with a particular account type. If none found, return null.
+ * @param accountType the type of account
+ * @return a CharSequence for the label or null if one cannot be found.
+ */
+ public CharSequence getLabelForType(Context context, final String accountType) {
+ CharSequence label = null;
+ if (mTypeToAuthDescription.containsKey(accountType)) {
+ try {
+ AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+ Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
+ mUserHandle);
+ label = authContext.getResources().getText(desc.labelId);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "No label name for account type " + accountType);
+ } catch (Resources.NotFoundException e) {
+ Log.w(TAG, "No label icon for account type " + accountType);
+ }
+ }
+ return label;
+ }
+
+ /**
+ * Gets the package associated with a particular account type. If none found, return null.
+ * @param accountType the type of account
+ * @return the package name or null if one cannot be found.
+ */
+ public String getPackageForType(final String accountType) {
+ if (mTypeToAuthDescription.containsKey(accountType)) {
+ AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+ return desc.packageName;
+ }
+ return null;
+ }
+
+ /**
+ * Gets the resource id of the label associated with a particular account type. If none found,
+ * return -1.
+ * @param accountType the type of account
+ * @return a resource id for the label or -1 if none found;
+ */
+ public int getLabelIdForType(final String accountType) {
+ if (mTypeToAuthDescription.containsKey(accountType)) {
+ AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+ return desc.labelId;
+ }
+ return -1;
+ }
+
+ /**
+ * Updates provider icons. Subclasses should call this in onCreate()
+ * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
+ */
+ public void updateAuthDescriptions(Context context) {
+ AuthenticatorDescription[] authDescs = AccountManager.get(context)
+ .getAuthenticatorTypesAsUser(mUserHandle.getIdentifier());
+ for (int i = 0; i < authDescs.length; i++) {
+ mTypeToAuthDescription.put(authDescs[i].type, authDescs[i]);
+ }
+ }
+
+ public boolean containsAccountType(String accountType) {
+ return mTypeToAuthDescription.containsKey(accountType);
+ }
+
+ public AuthenticatorDescription getAccountTypeDescription(String accountType) {
+ return mTypeToAuthDescription.get(accountType);
+ }
+
+ public boolean hasAccountPreferences(final String accountType) {
+ if (containsAccountType(accountType)) {
+ AuthenticatorDescription desc = getAccountTypeDescription(accountType);
+ if (desc != null && desc.accountPreferencesId != 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void onAccountsUpdated(Account[] accounts) {
+ updateAuthDescriptions(mContext);
+ if (accounts == null) {
+ accounts = AccountManager.get(mContext).getAccountsAsUser(mUserHandle.getIdentifier());
+ }
+ mEnabledAccountTypes.clear();
+ mAccTypeIconCache.clear();
+ for (int i = 0; i < accounts.length; i++) {
+ final Account account = accounts[i];
+ if (!mEnabledAccountTypes.contains(account.type)) {
+ mEnabledAccountTypes.add(account.type);
+ }
+ }
+ buildAccountTypeToAuthoritiesMap();
+ if (mListeningToAccountUpdates) {
+ mListener.onAccountsUpdate(mUserHandle);
+ }
+ }
+
+ @Override
+ public void onReceive(final Context context, final Intent intent) {
+ // TODO: watch for package upgrades to invalidate cache; see http://b/7206643
+ final Account[] accounts = AccountManager.get(mContext)
+ .getAccountsAsUser(mUserHandle.getIdentifier());
+ onAccountsUpdated(accounts);
+ }
+
+ public void listenToAccountUpdates() {
+ if (!mListeningToAccountUpdates) {
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
+ // At disk full, certain actions are blocked (such as writing the accounts to storage).
+ // It is useful to also listen for recovery from disk full to avoid bugs.
+ intentFilter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);
+ mContext.registerReceiverAsUser(this, mUserHandle, intentFilter, null, null);
+ mListeningToAccountUpdates = true;
+ }
+ }
+
+ public void stopListeningToAccountUpdates() {
+ if (mListeningToAccountUpdates) {
+ mContext.unregisterReceiver(this);
+ mListeningToAccountUpdates = false;
+ }
+ }
+
+ public ArrayList<String> getAuthoritiesForAccountType(String type) {
+ return mAccountTypeToAuthorities.get(type);
+ }
+
+ private void buildAccountTypeToAuthoritiesMap() {
+ mAccountTypeToAuthorities.clear();
+ SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(
+ mUserHandle.getIdentifier());
+ for (int i = 0, n = syncAdapters.length; i < n; i++) {
+ final SyncAdapterType sa = syncAdapters[i];
+ ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
+ if (authorities == null) {
+ authorities = new ArrayList<String>();
+ mAccountTypeToAuthorities.put(sa.accountType, authorities);
+ }
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, "Added authority " + sa.authority + " to accountType "
+ + sa.accountType);
+ }
+ authorities.add(sa.authority);
+ }
+ }
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardTile.java b/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardTile.java
index 6fef134..347e9f7 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardTile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardTile.java
@@ -74,6 +74,11 @@
*/
public int priority;
+ /**
+ * The metaData from the activity that defines this tile.
+ */
+ public Bundle metaData;
+
public DashboardTile() {
// Empty
}
@@ -107,6 +112,7 @@
dest.writeBundle(extras);
dest.writeString(category);
dest.writeInt(priority);
+ dest.writeBundle(metaData);
}
public void readFromParcel(Parcel in) {
@@ -125,6 +131,7 @@
extras = in.readBundle();
category = in.readString();
priority = in.readInt();
+ metaData = in.readBundle();
}
DashboardTile(Parcel in) {
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
index 6102bef..581c810 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -18,9 +18,15 @@
import android.annotation.LayoutRes;
import android.annotation.Nullable;
import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.res.TypedArray;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
+import android.util.Log;
import android.util.Pair;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -33,21 +39,30 @@
import android.widget.Toolbar;
import com.android.settingslib.R;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
public class SettingsDrawerActivity extends Activity {
+ protected static final boolean DEBUG_TIMING = false;
+ private static final String TAG = "SettingsDrawerActivity";
+
+ private static List<DashboardCategory> sDashboardCategories;
+ private static HashMap<Pair<String, String>, DashboardTile> sTileCache;
+
+ private final PackageReceiver mPackageReceiver = new PackageReceiver();
+ private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
+
private SettingsDrawerAdapter mDrawerAdapter;
- // Hold on to a cache of tiles to avoid loading the info multiple times.
- private final HashMap<Pair<String, String>, DashboardTile> mTileCache = new HashMap<>();
- private List<DashboardCategory> mDashboardCategories;
private DrawerLayout mDrawerLayout;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ long startTime = System.currentTimeMillis();
+
requestWindowFeature(Window.FEATURE_NO_TITLE);
super.setContentView(R.layout.settings_with_drawer);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -62,6 +77,10 @@
mDrawerLayout = null;
return;
}
+ if (sDashboardCategories == null) {
+ sTileCache = new HashMap<>();
+ sDashboardCategories = TileUtils.getCategories(this, sTileCache);
+ }
setActionBar(toolbar);
mDrawerAdapter = new SettingsDrawerAdapter(this);
ListView listView = (ListView) findViewById(R.id.left_drawer);
@@ -72,6 +91,8 @@
onTileClicked(mDrawerAdapter.getTile(position));
};
});
+ if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+ + " ms");
}
@Override
@@ -88,7 +109,29 @@
protected void onResume() {
super.onResume();
- updateDrawer();
+ final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+ filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+ filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+ filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+ filter.addDataScheme("package");
+ registerReceiver(mPackageReceiver, filter);
+
+ new CategoriesUpdater().execute();
+ }
+
+ @Override
+ protected void onPause() {
+ unregisterReceiver(mPackageReceiver);
+
+ super.onPause();
+ }
+
+ public void addCategoryListener(CategoryListener listener) {
+ mCategoryListeners.add(listener);
+ }
+
+ public void remCategoryListener(CategoryListener listener) {
+ mCategoryListeners.remove(listener);
}
public void openDrawer() {
@@ -134,15 +177,23 @@
}
}
- public List<DashboardCategory> getDashboardCategories(boolean force) {
- if (force) {
- mDashboardCategories = TileUtils.getCategories(this, mTileCache);
+ public List<DashboardCategory> getDashboardCategories() {
+ return sDashboardCategories;
+ }
+
+ protected void onCategoriesChanged() {
+ updateDrawer();
+ final int N = mCategoryListeners.size();
+ for (int i = 0; i < N; i++) {
+ mCategoryListeners.get(i).onCategoriesChanged();
}
- return mDashboardCategories;
}
public boolean openTile(DashboardTile tile) {
closeDrawer();
+ if (tile == null) {
+ return false;
+ }
int numUserHandles = tile.userHandle.size();
if (numUserHandles > 1) {
ProfileSelectDialog.show(getFragmentManager(), tile);
@@ -164,4 +215,28 @@
public void onProfileTileOpen() {
finish();
}
+
+ public interface CategoryListener {
+ void onCategoriesChanged();
+ }
+
+ private class CategoriesUpdater extends AsyncTask<Void, Void, List<DashboardCategory>> {
+ @Override
+ protected List<DashboardCategory> doInBackground(Void... params) {
+ return TileUtils.getCategories(SettingsDrawerActivity.this, sTileCache);
+ }
+
+ @Override
+ protected void onPostExecute(List<DashboardCategory> dashboardCategories) {
+ sDashboardCategories = dashboardCategories;
+ onCategoriesChanged();
+ }
+ }
+
+ private class PackageReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ new CategoriesUpdater().execute();
+ }
+ }
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerAdapter.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerAdapter.java
index fef716c..24c6ae8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerAdapter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerAdapter.java
@@ -38,7 +38,7 @@
}
void updateCategories() {
- List<DashboardCategory> categories = mActivity.getDashboardCategories(true);
+ List<DashboardCategory> categories = mActivity.getDashboardCategories();
mItems.clear();
for (int i = 0; i < categories.size(); i++) {
Item category = new Item();
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
index 18e8d31..6b36680 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
@@ -14,6 +14,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
@@ -35,6 +36,7 @@
public class TileUtils {
private static final boolean DEBUG = false;
+ private static final boolean DEBUG_TIMING = true;
private static final String LOG_TAG = "TileUtils";
@@ -105,12 +107,9 @@
private static final String SETTING_PKG = "com.android.settings";
- public static List<DashboardCategory> getCategories(Context context) {
- return getCategories(context, new HashMap<Pair<String, String>, DashboardTile>());
- }
-
public static List<DashboardCategory> getCategories(Context context,
HashMap<Pair<String, String>, DashboardTile> cache) {
+ final long startTime = System.currentTimeMillis();
ArrayList<DashboardTile> tiles = new ArrayList<>();
UserManager userManager = UserManager.get(context);
for (UserHandle user : userManager.getUserProfiles()) {
@@ -143,6 +142,8 @@
Collections.sort(category.tiles, TILE_COMPARATOR);
}
Collections.sort(categories, CATEGORY_COMPARATOR);
+ if (DEBUG_TIMING) Log.d(LOG_TAG, "getCategories took "
+ + (System.currentTimeMillis() - startTime) + " ms");
return categories;
}
@@ -207,7 +208,9 @@
activityInfo.packageName, activityInfo.name);
tile.category = categoryKey;
tile.priority = requireSettings ? resolved.priority : 0;
- updateTileData(context, tile);
+ tile.metaData = activityInfo.metaData;
+ updateTileData(context, tile, activityInfo, activityInfo.applicationInfo,
+ pm);
if (DEBUG) Log.d(LOG_TAG, "Adding tile " + tile.title);
addedCache.put(key, tile);
@@ -231,64 +234,52 @@
return null;
}
- private static boolean updateTileData(Context context, DashboardTile tile) {
- Intent intent = tile.intent;
- if (intent != null) {
- // Find the activity that is in the system image
- PackageManager pm = context.getPackageManager();
- List<ResolveInfo> list = tile.userHandle.size() != 0
- ? pm.queryIntentActivitiesAsUser(intent, PackageManager.GET_META_DATA,
- tile.userHandle.get(0).getIdentifier())
- : pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
- int listSize = list.size();
- for (int i = 0; i < listSize; i++) {
- ResolveInfo resolveInfo = list.get(i);
- if (resolveInfo.activityInfo.applicationInfo.isSystemApp()) {
- int icon = 0;
- CharSequence title = null;
- String summary = null;
+ private static boolean updateTileData(Context context, DashboardTile tile,
+ ActivityInfo activityInfo, ApplicationInfo applicationInfo, PackageManager pm) {
+ if (applicationInfo.isSystemApp()) {
+ int icon = 0;
+ CharSequence title = null;
+ String summary = null;
- // Get the activity's meta-data
- try {
- Resources res = pm.getResourcesForApplication(
- resolveInfo.activityInfo.packageName);
- Bundle metaData = resolveInfo.activityInfo.metaData;
+ // Get the activity's meta-data
+ try {
+ Resources res = pm.getResourcesForApplication(
+ applicationInfo.packageName);
+ Bundle metaData = activityInfo.metaData;
- if (res != null && metaData != null) {
- if (metaData.containsKey(META_DATA_PREFERENCE_ICON)) {
- icon = metaData.getInt(META_DATA_PREFERENCE_ICON);
- }
- if (metaData.containsKey(META_DATA_PREFERENCE_TITLE)) {
- title = metaData.getString(META_DATA_PREFERENCE_TITLE);
- }
- if (metaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {
- summary = metaData.getString(META_DATA_PREFERENCE_SUMMARY);
- }
- }
- } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {
- if (DEBUG) Log.d(LOG_TAG, "Couldn't find info", e);
+ if (res != null && metaData != null) {
+ if (metaData.containsKey(META_DATA_PREFERENCE_ICON)) {
+ icon = metaData.getInt(META_DATA_PREFERENCE_ICON);
}
-
- // Set the preference title to the activity's label if no
- // meta-data is found
- if (TextUtils.isEmpty(title)) {
- title = resolveInfo.loadLabel(pm).toString();
+ if (metaData.containsKey(META_DATA_PREFERENCE_TITLE)) {
+ title = metaData.getString(META_DATA_PREFERENCE_TITLE);
}
- if (icon == 0) {
- icon = resolveInfo.activityInfo.icon;
+ if (metaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {
+ summary = metaData.getString(META_DATA_PREFERENCE_SUMMARY);
}
-
- // Set icon, title and summary for the preference
- tile.icon = Icon.createWithResource(resolveInfo.activityInfo.packageName, icon);
- tile.title = title;
- tile.summary = summary;
- // Replace the intent with this specific activity
- tile.intent = new Intent().setClassName(resolveInfo.activityInfo.packageName,
- resolveInfo.activityInfo.name);
-
- return true;
}
+ } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {
+ if (DEBUG) Log.d(LOG_TAG, "Couldn't find info", e);
}
+
+ // Set the preference title to the activity's label if no
+ // meta-data is found
+ if (TextUtils.isEmpty(title)) {
+ title = activityInfo.loadLabel(pm).toString();
+ }
+ if (icon == 0) {
+ icon = activityInfo.icon;
+ }
+
+ // Set icon, title and summary for the preference
+ tile.icon = Icon.createWithResource(activityInfo.packageName, icon);
+ tile.title = title;
+ tile.summary = summary;
+ // Replace the intent with this specific activity
+ tile.intent = new Intent().setClassName(activityInfo.packageName,
+ activityInfo.name);
+
+ return true;
}
return false;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java b/packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java
similarity index 92%
rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java
rename to packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java
index a7fdadc..642b60e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileDataControllerImpl.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/MobileDataController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2015 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.
@@ -14,14 +14,7 @@
* limitations under the License.
*/
-package com.android.systemui.statusbar.policy;
-
-import static android.net.ConnectivityManager.TYPE_MOBILE;
-import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
-import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
-import static android.telephony.TelephonyManager.SIM_STATE_READY;
-import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
-import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
+package com.android.settingslib.net;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -42,7 +35,14 @@
import java.util.Date;
import java.util.Locale;
-public class MobileDataControllerImpl implements NetworkController.MobileDataController {
+import static android.net.ConnectivityManager.TYPE_MOBILE;
+import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
+import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
+import static android.telephony.TelephonyManager.SIM_STATE_READY;
+import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
+import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
+
+public class MobileDataController {
private static final String TAG = "MobileDataController";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -60,9 +60,9 @@
private INetworkStatsSession mSession;
private Callback mCallback;
- private NetworkControllerImpl mNetworkController;
+ private NetworkNameProvider mNetworkController;
- public MobileDataControllerImpl(Context context) {
+ public MobileDataController(Context context) {
mContext = context;
mTelephonyManager = TelephonyManager.from(context);
mConnectivityManager = ConnectivityManager.from(context);
@@ -71,7 +71,7 @@
mPolicyManager = NetworkPolicyManager.from(mContext);
}
- public void setNetworkController(NetworkControllerImpl networkController) {
+ public void setNetworkController(NetworkNameProvider networkController) {
mNetworkController = networkController;
}
@@ -161,7 +161,7 @@
} else {
usage.warningLevel = DEFAULT_WARNING_LEVEL;
}
- if (usage != null) {
+ if (usage != null && mNetworkController != null) {
usage.carrier = mNetworkController.getMobileDataNetworkName();
}
return usage;
@@ -231,6 +231,18 @@
}
}
+ public interface NetworkNameProvider {
+ String getMobileDataNetworkName();
+ }
+
+ public static class DataUsageInfo {
+ public String carrier;
+ public String period;
+ public long limitLevel;
+ public long warningLevel;
+ public long usageLevel;
+ }
+
public interface Callback {
void onMobileDataEnabled(boolean enabled);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/AnimatedImageView.java b/packages/SettingsLib/src/com/android/settingslib/widget/AnimatedImageView.java
new file mode 100644
index 0000000..f5e39be
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/widget/AnimatedImageView.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2015 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.settingslib.widget;
+
+import android.content.Context;
+import android.graphics.drawable.AnimatedRotateDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+public class AnimatedImageView extends ImageView {
+ private AnimatedRotateDrawable mDrawable;
+ private boolean mAnimating;
+
+ public AnimatedImageView(Context context) {
+ super(context);
+ }
+
+ public AnimatedImageView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ private void updateDrawable() {
+ if (isShown() && mDrawable != null) {
+ mDrawable.stop();
+ }
+ final Drawable drawable = getDrawable();
+ if (drawable instanceof AnimatedRotateDrawable) {
+ mDrawable = (AnimatedRotateDrawable) drawable;
+ // TODO: define in drawable xml once we have public attrs.
+ mDrawable.setFramesCount(56);
+ mDrawable.setFramesDuration(32);
+ if (isShown() && mAnimating) {
+ mDrawable.start();
+ }
+ } else {
+ mDrawable = null;
+ }
+ }
+
+ private void updateAnimating() {
+ if (mDrawable != null) {
+ if (isShown() && mAnimating) {
+ mDrawable.start();
+ } else {
+ mDrawable.stop();
+ }
+ }
+ }
+
+ @Override
+ public void setImageDrawable(Drawable drawable) {
+ super.setImageDrawable(drawable);
+ updateDrawable();
+ }
+
+ @Override
+ public void setImageResource(int resid) {
+ super.setImageResource(resid);
+ updateDrawable();
+ }
+
+ @Override
+ public void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ updateAnimating();
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ updateAnimating();
+ }
+
+ public void setAnimating(boolean animating) {
+ mAnimating = animating;
+ updateAnimating();
+ }
+
+ @Override
+ protected void onVisibilityChanged(View changedView, int vis) {
+ super.onVisibilityChanged(changedView, vis);
+ updateAnimating();
+ }
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
new file mode 100644
index 0000000..fabae57
--- /dev/null
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2015 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.settingslib.wifi;
+
+import android.content.Intent;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+
+import java.util.List;
+
+public class WifiStatusTracker {
+
+ private final WifiManager mWifiManager;
+ public boolean enabled;
+ public boolean connected;
+ public String ssid;
+ public int rssi;
+ public int level;
+
+ public WifiStatusTracker(WifiManager wifiManager) {
+ mWifiManager = wifiManager;
+ }
+
+ public void handleBroadcast(Intent intent) {
+ String action = intent.getAction();
+ if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
+ enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
+ WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED;
+ } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
+ final NetworkInfo networkInfo = (NetworkInfo)
+ intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
+ connected = networkInfo != null && networkInfo.isConnected();
+ // If Connected grab the signal strength and ssid.
+ if (connected) {
+ // try getting it out of the intent first
+ WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null
+ ? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO)
+ : mWifiManager.getConnectionInfo();
+ if (info != null) {
+ ssid = getSsid(info);
+ } else {
+ ssid = null;
+ }
+ } else if (!connected) {
+ ssid = null;
+ }
+ } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
+ // Default to -200 as its below WifiManager.MIN_RSSI.
+ rssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
+ level = WifiManager.calculateSignalLevel(rssi, 5);
+ }
+ }
+
+ private String getSsid(WifiInfo info) {
+ String ssid = info.getSSID();
+ if (ssid != null) {
+ return ssid;
+ }
+ // OK, it's not in the connectionInfo; we have to go hunting for it
+ List<WifiConfiguration> networks = mWifiManager.getConfiguredNetworks();
+ int length = networks.size();
+ for (int i = 0; i < length; i++) {
+ if (networks.get(i).networkId == info.getNetworkId()) {
+ return networks.get(i).SSID;
+ }
+ }
+ return null;
+ }
+}
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index e28b2e5..2b1c66d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -19,8 +19,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
+import android.net.NetworkRequest;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
@@ -62,6 +66,9 @@
private final Context mContext;
private final WifiManager mWifiManager;
private final IntentFilter mFilter;
+ private final ConnectivityManager mConnectivityManager;
+ private final NetworkRequest mNetworkRequest;
+ private WifiTrackerNetworkCallback mNetworkCallback;
private final AtomicBoolean mConnected = new AtomicBoolean(false);
private final WifiListener mListener;
@@ -104,13 +111,15 @@
public WifiTracker(Context context, WifiListener wifiListener, Looper workerLooper,
boolean includeSaved, boolean includeScans, boolean includePasspoints) {
this(context, wifiListener, workerLooper, includeSaved, includeScans, includePasspoints,
- (WifiManager) context.getSystemService(Context.WIFI_SERVICE), Looper.myLooper());
+ context.getSystemService(WifiManager.class),
+ context.getSystemService(ConnectivityManager.class), Looper.myLooper());
}
@VisibleForTesting
WifiTracker(Context context, WifiListener wifiListener, Looper workerLooper,
boolean includeSaved, boolean includeScans, boolean includePasspoints,
- WifiManager wifiManager, Looper currentLooper) {
+ WifiManager wifiManager, ConnectivityManager connectivityManager,
+ Looper currentLooper) {
if (!includeSaved && !includeScans) {
throw new IllegalArgumentException("Must include either saved or scans");
}
@@ -127,6 +136,7 @@
mIncludeScans = includeScans;
mIncludePasspoints = includePasspoints;
mListener = wifiListener;
+ mConnectivityManager = connectivityManager;
// check if verbose logging has been turned on or off
sVerboseLogging = mWifiManager.getVerboseLoggingLevel();
@@ -139,7 +149,11 @@
mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
- mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
+
+ mNetworkRequest = new NetworkRequest.Builder()
+ .clearCapabilities()
+ .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+ .build();
}
/**
@@ -192,6 +206,9 @@
resumeScanning();
if (!mRegistered) {
mContext.registerReceiver(mReceiver, mFilter);
+ // NetworkCallback objects cannot be reused. http://b/20701525 .
+ mNetworkCallback = new WifiTrackerNetworkCallback();
+ mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback);
mRegistered = true;
}
}
@@ -207,6 +224,7 @@
mWorkHandler.removeMessages(WorkHandler.MSG_UPDATE_ACCESS_POINTS);
mWorkHandler.removeMessages(WorkHandler.MSG_UPDATE_NETWORK_INFO);
mContext.unregisterReceiver(mReceiver);
+ mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
mRegistered = false;
}
pauseScanning();
@@ -461,12 +479,12 @@
mMainHandler.sendEmptyMessage(MainHandler.MSG_RESUME_SCANNING);
}
- mLastInfo = mWifiManager.getConnectionInfo();
if (networkInfo != null) {
mLastNetworkInfo = networkInfo;
}
WifiConfiguration connectionConfig = null;
+ mLastInfo = mWifiManager.getConnectionInfo();
if (mLastInfo != null) {
connectionConfig = getWifiConfigurationForNetworkId(mLastInfo.getNetworkId());
}
@@ -532,12 +550,21 @@
mWorkHandler.sendEmptyMessage(WorkHandler.MSG_UPDATE_ACCESS_POINTS);
mWorkHandler.obtainMessage(WorkHandler.MSG_UPDATE_NETWORK_INFO, info)
.sendToTarget();
- } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
- mWorkHandler.sendEmptyMessage(WorkHandler.MSG_UPDATE_NETWORK_INFO);
}
}
};
+ private final class WifiTrackerNetworkCallback extends ConnectivityManager.NetworkCallback {
+ public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
+ if (network.equals(mWifiManager.getCurrentNetwork())) {
+ // We don't send a NetworkInfo object along with this message, because even if we
+ // fetch one from ConnectivityManager, it might be older than the most recent
+ // NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.
+ mWorkHandler.sendEmptyMessage(WorkHandler.MSG_UPDATE_NETWORK_INFO);
+ }
+ }
+ }
+
private final class MainHandler extends Handler {
private static final int MSG_CONNECTED_CHANGED = 0;
private static final int MSG_WIFI_STATE_CHANGED = 1;
diff --git a/packages/SettingsProvider/res/values-it/strings.xml b/packages/SettingsProvider/res/values-it/strings.xml
index 40735cc..ba1431d 100644
--- a/packages/SettingsProvider/res/values-it/strings.xml
+++ b/packages/SettingsProvider/res/values-it/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="4567566098528588863">"Archiviazione impostazioni"</string>
+ <string name="app_label" msgid="4567566098528588863">"Memoria impostazioni"</string>
</resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
index b9a9c24..2e96f18 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -159,6 +159,7 @@
String key_mgmt = "";
boolean certUsed = false;
boolean hasWepKey = false;
+ boolean isEap = false;
final ArrayList<String> rawLines = new ArrayList<String>();
public static Network readFromStream(BufferedReader in) {
@@ -189,6 +190,9 @@
ssid = line;
} else if (line.startsWith("key_mgmt=")) {
key_mgmt = line;
+ if (line.contains("EAP")) {
+ isEap = true;
+ }
} else if (line.startsWith("client_cert=")) {
certUsed = true;
} else if (line.startsWith("ca_cert=")) {
@@ -197,6 +201,8 @@
certUsed = true;
} else if (line.startsWith("wep_")) {
hasWepKey = true;
+ } else if (line.startsWith("eap=")) {
+ isEap = true;
}
}
@@ -325,6 +331,13 @@
continue;
}
}
+ // Don't propagate EAP network definitions
+ if (net.isEap) {
+ if (DEBUG_BACKUP) {
+ Log.v(TAG, "Skipping EAP network " + net.ssid + " / " + net.key_mgmt);
+ }
+ continue;
+ }
if (! mKnownNetworks.contains(net)) {
if (DEBUG_BACKUP) {
Log.v(TAG, "Adding " + net.ssid + " / " + net.key_mgmt);
@@ -353,6 +366,12 @@
continue;
}
+ if (net.isEap) {
+ // Similarly, omit EAP network definitions to avoid propagating
+ // controlled enterprise network definitions.
+ continue;
+ }
+
net.write(w);
}
}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 8b1caf9..fbf8a2b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -54,7 +54,6 @@
import android.os.UserManager;
import android.provider.Settings;
import android.text.TextUtils;
-import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Slog;
import android.util.SparseArray;
@@ -70,7 +69,6 @@
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
@@ -148,22 +146,6 @@
private static final Bundle NULL_SETTING = Bundle.forPair(Settings.NameValueTable.VALUE, null);
- // Per user settings that cannot be modified if associated user restrictions are enabled.
- private static final Map<String, String> sSettingToUserRestrictionMap = new ArrayMap<>();
- static {
- sSettingToUserRestrictionMap.put(Settings.Secure.LOCATION_MODE,
- UserManager.DISALLOW_SHARE_LOCATION);
- sSettingToUserRestrictionMap.put(Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
- UserManager.DISALLOW_SHARE_LOCATION);
- sSettingToUserRestrictionMap.put(Settings.Secure.INSTALL_NON_MARKET_APPS,
- UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
- sSettingToUserRestrictionMap.put(Settings.Global.ADB_ENABLED,
- UserManager.DISALLOW_DEBUGGING_FEATURES);
- sSettingToUserRestrictionMap.put(Settings.Global.PACKAGE_VERIFIER_ENABLE,
- UserManager.ENSURE_VERIFY_APPS);
- sSettingToUserRestrictionMap.put(Settings.Global.PREFERRED_NETWORK_MODE,
- UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
- }
// Per user secure settings that moved to the for all users global settings.
static final Set<String> sSecureMovedToGlobalSettings = new ArraySet<>();
@@ -647,8 +629,9 @@
// Resolve the userId on whose behalf the call is made.
final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId);
- // If this is a setting that is currently restricted for this user, done.
- if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId)) {
+ // If this is a setting that is currently restricted for this user, do not allow
+ // unrestricting changes.
+ if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value)) {
return false;
}
@@ -772,8 +755,9 @@
// Resolve the userId on whose behalf the call is made.
final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId);
- // If this is a setting that is currently restricted for this user, done.
- if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId)) {
+ // If this is a setting that is currently restricted for this user, do not allow
+ // unrestricting changes.
+ if (isGlobalOrSecureSettingRestrictedForUser(name, callingUserId, value)) {
return false;
}
@@ -904,12 +888,12 @@
}
}
- // Enforce what the calling package can mutate the system settings.
- enforceRestrictedSystemSettingsMutationForCallingPackage(operation, name, runAsUserId);
-
// Resolve the userId on whose behalf the call is made.
final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(runAsUserId);
+ // Enforce what the calling package can mutate the system settings.
+ enforceRestrictedSystemSettingsMutationForCallingPackage(operation, name, callingUserId);
+
// Determine the owning user as some profile settings are cloned from the parent.
final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId, name);
@@ -978,12 +962,59 @@
return false;
}
- private boolean isGlobalOrSecureSettingRestrictedForUser(String setting, int userId) {
- String restriction = sSettingToUserRestrictionMap.get(setting);
- if (restriction == null) {
- return false;
+ /**
+ * Checks whether changing a setting to a value is prohibited by the corresponding user
+ * restriction.
+ *
+ * <p>See also {@link com.android.server.pm.UserRestrictionsUtils#applyUserRestrictionLR},
+ * which should be in sync with this method.
+ *
+ * @return true if the change is prohibited, false if the change is allowed.
+ */
+ private boolean isGlobalOrSecureSettingRestrictedForUser(String setting, int userId,
+ String value) {
+ String restriction;
+ switch (setting) {
+ case Settings.Secure.LOCATION_MODE:
+ // Note LOCATION_MODE will be converted into LOCATION_PROVIDERS_ALLOWED
+ // in android.provider.Settings.Secure.putStringForUser(), so we shouldn't come
+ // here normally, but we still protect it here from a direct provider write.
+ if (String.valueOf(Settings.Secure.LOCATION_MODE_OFF).equals(value)) return false;
+ restriction = UserManager.DISALLOW_SHARE_LOCATION;
+ break;
+
+ case Settings.Secure.LOCATION_PROVIDERS_ALLOWED:
+ // See SettingsProvider.updateLocationProvidersAllowedLocked. "-" is to disable
+ // a provider, which should be allowed even if the user restriction is set.
+ if (value != null && value.startsWith("-")) return false;
+ restriction = UserManager.DISALLOW_SHARE_LOCATION;
+ break;
+
+ case Settings.Secure.INSTALL_NON_MARKET_APPS:
+ if ("0".equals(value)) return false;
+ restriction = UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
+ break;
+
+ case Settings.Global.ADB_ENABLED:
+ if ("0".equals(value)) return false;
+ restriction = UserManager.DISALLOW_DEBUGGING_FEATURES;
+ break;
+
+ case Settings.Global.PACKAGE_VERIFIER_ENABLE:
+ case Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB:
+ if ("1".equals(value)) return false;
+ restriction = UserManager.ENSURE_VERIFY_APPS;
+ break;
+
+ case Settings.Global.PREFERRED_NETWORK_MODE:
+ restriction = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
+ break;
+
+ default:
+ return false;
}
- return mUserManager.hasUserRestriction(restriction, new UserHandle(userId));
+
+ return mUserManager.hasUserRestriction(restriction, UserHandle.of(userId));
}
private int resolveOwningUserIdForSecureSettingLocked(int userId, String setting) {
@@ -1094,6 +1125,9 @@
* But helper functions in android.providers.Settings can enable or disable
* a single provider by using a "+" or "-" prefix before the provider name.
*
+ * <p>See also {@link #isGlobalOrSecureSettingRestrictedForUser()}. If DISALLOW_SHARE_LOCATION
+ * is set, the said method will only allow values with the "-" prefix.
+ *
* @returns whether the enabled location providers changed.
*/
private boolean updateLocationProvidersAllowedLocked(String value, int owningUserId) {
diff --git a/packages/Shell/Android.mk b/packages/Shell/Android.mk
index 5bd48c6..f8c13d6 100644
--- a/packages/Shell/Android.mk
+++ b/packages/Shell/Android.mk
@@ -3,7 +3,7 @@
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
@@ -12,3 +12,5 @@
LOCAL_PRIVILEGED_MODULE := true
include $(BUILD_PACKAGE)
+
+include $(LOCAL_PATH)/tests/Android.mk
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 8c39ee6..25346ac 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
- * Copyright (c) 2014 Google Inc.
+ * Copyright (C) 2015 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.
@@ -144,8 +144,13 @@
android:name=".BugreportReceiver"
android:permission="android.permission.DUMP">
<intent-filter>
+ <action android:name="android.intent.action.BUGREPORT_STARTED" />
<action android:name="android.intent.action.BUGREPORT_FINISHED" />
</intent-filter>
</receiver>
+
+ <service
+ android:name=".BugreportProgressService"
+ android:exported="false"/>
</application>
</manifest>
diff --git a/packages/Shell/res/values-af/strings.xml b/packages/Shell/res/values-af/strings.xml
index 43beb57..8430bf0 100644
--- a/packages/Shell/res/values-af/strings.xml
+++ b/packages/Shell/res/values-af/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Tuisskerm"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Besig met foutverslag"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Foutverslag vasgevang"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swiep na links om jou foutverslag te deel"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Raak om jou foutverslag te deel"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Foutverslae bevat data van die stelsel se verskillende loglêers af, insluitend persoonlike en private inligting. Deel foutverslae net met programme en mense wat jy vertrou."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Wys hierdie boodskap volgende keer"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Foutverslae"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Foutverslaglêer kon nie gelees word nie"</string>
</resources>
diff --git a/packages/Shell/res/values-am/strings.xml b/packages/Shell/res/values-am/strings.xml
index e86ecf8..9400f37 100644
--- a/packages/Shell/res/values-am/strings.xml
+++ b/packages/Shell/res/values-am/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"ቀፎ"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"የሳንካ ሪፓርት በሂደት ላይ"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"የሳንካ ሪፖርት ተይዟል"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"የሳንካ ሪፖርትዎን ለማጋራት ወደ ግራ ያንሸራትቱ"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"የሳንካ ሪፖርትዎን ለማጋራት ይንክኩ"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"የሳንካ ሪፖርቶች የግል መረጃን ጨምሮ ከበርካታ የስርዓቱ ምዝግብ ማስታወሻዎች የመጣ ውሂብን ይዟል። የሳንካ ሪፖርቶች ለሚያምኗቸው መተግበሪያዎችን እና ሰዎችን ብቻ ያጋሩ።"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ይህን መልዕክት በሚቀጥለው ጊዜ አሳይ"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"የሳንካ ሪፖርቶች"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"የሳንካ ሪፖርት ፋይል ሊነበብ አልተቻለም"</string>
</resources>
diff --git a/packages/Shell/res/values-ar/strings.xml b/packages/Shell/res/values-ar/strings.xml
index 0fcf019..2161a76 100644
--- a/packages/Shell/res/values-ar/strings.xml
+++ b/packages/Shell/res/values-ar/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"تقرير الخطأ قيد التقدم"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"تم الحصول على تقرير الأخطاء"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"مرر بسرعة لليمين لمشاركة تقرير الخطأ"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"المس لمشاركة تقرير الأخطاء"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"تحتوي تقارير الأخطاء على بيانات من ملفات سجلات النظام المتنوعة، بما في ذلك معلومات شخصية وخاصة. لا تشارك تقارير الأخطاء إلا مع التطبيقات والأشخاص الموثوق بهم."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"إظهار هذه الرسالة في المرة القادمة"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"تقارير الأخطاء"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"تعذرت قراءة ملف تقرير الخطأ."</string>
</resources>
diff --git a/packages/Shell/res/values-az-rAZ/strings.xml b/packages/Shell/res/values-az-rAZ/strings.xml
index e235eb8..76ee4bf 100644
--- a/packages/Shell/res/values-az-rAZ/strings.xml
+++ b/packages/Shell/res/values-az-rAZ/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Baq hesabatı davam edir"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Baq raport alındı"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Baq raportunu paylaşmaq üçün sola sürüşdürün"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Xətanı şikayətini paylaşmaq üçün toxunun"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Baq raportları sistemin müxtəlif jurnal fayllarından data içərir ki, buna şəxsi və konfidensial məlumatlar da aiddir. Yalnız inandığınız adamlarla baq raportlarını paylaşın."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Bu mesajı növbəti dəfə göstər"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Baq hesabatları"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Baq hesabat faylı oxunmur"</string>
</resources>
diff --git a/packages/Shell/res/values-bg/strings.xml b/packages/Shell/res/values-bg/strings.xml
index 381d5d8..bbfae69 100644
--- a/packages/Shell/res/values-bg/strings.xml
+++ b/packages/Shell/res/values-bg/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Команден ред"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Отчетът за програмни грешки е записан"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Прекарайте пръст наляво, за да споделите сигнала си за програмна грешка"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Докоснете, за да споделите отчета си за програмни грешки"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Отчетите за програмни грешки съдържат данни от различни регистрационни файлове на системата, включително лична и поверителна информация. Споделяйте ги само с приложения и хора, на които имате доверие."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Това съобщение да се показва следващия път"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Отчети за прогр. грешки"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Файлът със сигнал за програмна грешка не можа да бъде прочетен"</string>
</resources>
diff --git a/packages/Shell/res/values-bn-rBD/strings.xml b/packages/Shell/res/values-bn-rBD/strings.xml
index 76da84b..5ca5835 100644
--- a/packages/Shell/res/values-bn-rBD/strings.xml
+++ b/packages/Shell/res/values-bn-rBD/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"শেল"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ত্রুটির প্রতিবেদন করা হচ্ছে"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"ত্রুটির প্রতিবেদন নেওয়া হয়েছে"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"আপনার বাগ রিপোর্ট শেয়ার করতে বামে সোয়াইপ করুন"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"আপনার ত্রুটির প্রতিবেদন ভাগ করতে স্পর্শ করুন"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"ত্রুটির প্রতিবেদনগুলিতে থাকা ডেটা, সিস্টেমের বিভিন্ন লগ ফাইলগুলি থেকে আসে, যাতে ব্যক্তিগত এবং গোপনীয় তথ্য অন্তর্ভুক্ত থাকে৷ আপনি বিশ্বাস করেন শুধুমাত্র এমন অ্যাপ্লিকেশান এবং ব্যক্তিদের সাথে ত্রুটির প্রতিবেদনগুলি ভাগ করুন৷"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"এই বার্তাটি পরের বার দেখান"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"ত্রুটির প্রতিবেদনগুলি"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ত্রুটির প্রতিবেদনের ফাইলটি পড়া যায়নি"</string>
</resources>
diff --git a/packages/Shell/res/values-ca/strings.xml b/packages/Shell/res/values-ca/strings.xml
index b07bafd..1e6ec53 100644
--- a/packages/Shell/res/values-ca/strings.xml
+++ b/packages/Shell/res/values-ca/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Protecció"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe d\'errors en curs"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"S\'ha registrat l\'informe d\'error"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Llisca cap a l\'esquerra per compartir l\'informe d\'errors."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca aquí per compartir el teu informe d\'error."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Els informes d\'error contenen dades dels diferents fitxers de registre del sistema, inclosa informació privada i personal. Comparteix els informes d\'error només amb les aplicacions i amb les persones en qui confies."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostra aquest missatge la propera vegada"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Informes d\'error"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"No s\'ha pogut llegir el fitxer de l\'informe d\'errors"</string>
</resources>
diff --git a/packages/Shell/res/values-cs/strings.xml b/packages/Shell/res/values-cs/strings.xml
index 3e36c6f..336c21f 100644
--- a/packages/Shell/res/values-cs/strings.xml
+++ b/packages/Shell/res/values-cs/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Probíhá zpracování zprávy o chybě"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Bylo vytvořeno chybové hlášení"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Chcete-li hlášení chyby sdílet, přejeďte doleva."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Chybové hlášení můžete sdílet klepnutím."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Chybová hlášení obsahují data z různých souborů protokolů systému včetně osobních a soukromých informací. Chybová hlášení sdílejte pouze s aplikacemi a uživateli, kterým důvěřujete."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Zobrazit tuto zprávu příště"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Zprávy o chybách"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Soubor chybové zprávy nelze načíst"</string>
</resources>
diff --git a/packages/Shell/res/values-da/strings.xml b/packages/Shell/res/values-da/strings.xml
index 8925b85..6f65894 100644
--- a/packages/Shell/res/values-da/strings.xml
+++ b/packages/Shell/res/values-da/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Fejlrapporten er under udførelse"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Fejlrapporten er registreret"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Stryg til venstre for at dele din fejlrapport"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tryk for at dele din fejlrapport"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Fejlrapporter indeholder data fra systemets forskellige logfiler, f.eks. personlige og private oplysninger. Del kun fejlrapporter med apps og personer, du har tillid til."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Vis denne underretning næste gang"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Fejlrapporter"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Fejlrapportfilen kunne ikke læses"</string>
</resources>
diff --git a/packages/Shell/res/values-de/strings.xml b/packages/Shell/res/values-de/strings.xml
index 19d58fe..03c6166 100644
--- a/packages/Shell/res/values-de/strings.xml
+++ b/packages/Shell/res/values-de/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Fehlerbericht in Bearbeitung"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Fehlerbericht erfasst"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Wischen Sie nach links, um Ihren Fehlerbericht zu teilen."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tippen, um Fehlerbericht zu teilen"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Fehlerberichte enthalten Daten aus verschiedenen Protokolldateien des Systems, darunter auch personenbezogene und private Daten. Teilen Sie Fehlerberichte nur mit Apps und Personen, denen Sie vertrauen."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Diese Nachricht nächstes Mal zeigen"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Fehlerberichte"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Fehlerberichtdatei konnte nicht gelesen werden."</string>
</resources>
diff --git a/packages/Shell/res/values-el/strings.xml b/packages/Shell/res/values-el/strings.xml
index 5fadaa4..ceec189 100644
--- a/packages/Shell/res/values-el/strings.xml
+++ b/packages/Shell/res/values-el/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Κέλυφος"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Αναφορά σφάλματος σε εξέλιξη"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Η λήψη της αναφοράς ήταν επιτυχής"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Σύρετε προς τα αριστερά για κοινή χρήση της αναφοράς σφαλμάτων"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Αγγίξτε για να μοιραστείτε τη αναφορά σφαλμάτων"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Οι αναφορές σφαλμάτων περιέχουν δεδομένα από τα διάφορα αρχεία καταγραφής του συστήματος, συμπεριλαμβανομένων προσωπικών και ιδιωτικών πληροφοριών. Να μοιράζεστε αναφορές σφαλμάτων μόνο με εφαρμογές και άτομα που εμπιστεύεστε."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Εμφάνιση αυτού του μηνύματος την επόμενη φορά"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Αναφορές σφαλμάτων"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Δεν ήταν δυνατή η ανάγνωση του αρχείου της αναφοράς σφαλμάτων"</string>
</resources>
diff --git a/packages/Shell/res/values-en-rAU/strings.xml b/packages/Shell/res/values-en-rAU/strings.xml
index b50fc2a..99c9f4f 100644
--- a/packages/Shell/res/values-en-rAU/strings.xml
+++ b/packages/Shell/res/values-en-rAU/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bug report in progress"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Bug report captured"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Touch to share your bug report"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Bug reports contain data from the system\'s various log files, including personal and private information. Only share bug reports with apps and people that you trust."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Show this message next time"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Bug reports"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bug report file could not be read"</string>
</resources>
diff --git a/packages/Shell/res/values-en-rGB/strings.xml b/packages/Shell/res/values-en-rGB/strings.xml
index b50fc2a..99c9f4f 100644
--- a/packages/Shell/res/values-en-rGB/strings.xml
+++ b/packages/Shell/res/values-en-rGB/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bug report in progress"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Bug report captured"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Touch to share your bug report"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Bug reports contain data from the system\'s various log files, including personal and private information. Only share bug reports with apps and people that you trust."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Show this message next time"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Bug reports"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bug report file could not be read"</string>
</resources>
diff --git a/packages/Shell/res/values-en-rIN/strings.xml b/packages/Shell/res/values-en-rIN/strings.xml
index b50fc2a..99c9f4f 100644
--- a/packages/Shell/res/values-en-rIN/strings.xml
+++ b/packages/Shell/res/values-en-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bug report in progress"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Bug report captured"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swipe left to share your bug report"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Touch to share your bug report"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Bug reports contain data from the system\'s various log files, including personal and private information. Only share bug reports with apps and people that you trust."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Show this message next time"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Bug reports"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bug report file could not be read"</string>
</resources>
diff --git a/packages/Shell/res/values-es-rUS/strings.xml b/packages/Shell/res/values-es-rUS/strings.xml
index 06edfdc..263459e 100644
--- a/packages/Shell/res/values-es-rUS/strings.xml
+++ b/packages/Shell/res/values-es-rUS/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe de errores en progreso"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Informe de errores capturado"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Desliza el dedo hacia la izquierda para compartir el informe de errores."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca para compartir tu informe de errores."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Los informes de errores contienen datos de los distintos archivos de registro del sistema, incluida la información personal y privada. Comparte los informes de errores únicamente con aplicaciones y personas en las que confíes."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar este mensaje la próxima vez"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Informes de errores"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"No se pudo leer el archivo de informe de errores"</string>
</resources>
diff --git a/packages/Shell/res/values-es/strings.xml b/packages/Shell/res/values-es/strings.xml
index 3398ca3..3b37d40 100644
--- a/packages/Shell/res/values-es/strings.xml
+++ b/packages/Shell/res/values-es/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe de errores en curso"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Informe de error registrado"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Desliza el dedo hacia la izquierda para compartir el informe de error"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca para compartir tu informe de error"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Los informes de errores contienen datos de los distintos archivos de registro del sistema, incluida información personal y privada. Comparte los informes de errores únicamente con aplicaciones y usuarios en los que confíes."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar este mensaje la próxima vez"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Informes de error"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"No se ha podido leer el archivo del informe de errores"</string>
</resources>
diff --git a/packages/Shell/res/values-et-rEE/strings.xml b/packages/Shell/res/values-et-rEE/strings.xml
index 549ee26..652de64 100644
--- a/packages/Shell/res/values-et-rEE/strings.xml
+++ b/packages/Shell/res/values-et-rEE/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Kest"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Veaaruande töötlemine on pooleli"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Veaaruanne jäädvustati"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veaaruande jagamiseks pühkige vasakule"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Veaaruande jagamiseks puudutage"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Veaaruanded sisaldavad andmeid erinevatest süsteemi logifailidest, sh isiklikku ja privaatset teavet. Jagage veaaruandeid ainult usaldusväärsete rakenduste ja inimestega."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Kuva see sõnum järgmisel korral"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Veaaruanded"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Veaaruande faili ei õnnestunud lugeda"</string>
</resources>
diff --git a/packages/Shell/res/values-eu-rES/strings.xml b/packages/Shell/res/values-eu-rES/strings.xml
index 048ab8e..3234786 100644
--- a/packages/Shell/res/values-eu-rES/strings.xml
+++ b/packages/Shell/res/values-eu-rES/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell-interfazea"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Abian da akatsen txostena egiteko prozesua"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Akatsen txostena jaso da"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Programa-akatsen txostena partekatzeko, pasatu hatza ezkerrera"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Akatsen txostena partekatzeko, ukitu"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Akatsen txostenek sistemaren erregistro-fitxategietako datuak dauzkate, informazio pertsonala eta pribatua barne. Akatsen txostenak partekatzen badituzu, partekatu soilik aplikazio eta pertsona fidagarriekin."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Erakutsi mezu hau hurrengoan"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Akatsen txostenak"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Ezin izan da irakurri akatsen txostena"</string>
</resources>
diff --git a/packages/Shell/res/values-fa/strings.xml b/packages/Shell/res/values-fa/strings.xml
index f42ba81..ff58c25 100644
--- a/packages/Shell/res/values-fa/strings.xml
+++ b/packages/Shell/res/values-fa/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"گزارش اشکال در حال انجام است"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"گزارش اشکال دریافت شد"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"برای اشتراکگذاری گزارش اشکال، به تندی آن را به چپ بکشید"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"جهت اشتراکگذاری گزارش اشکال خود لمس کنید"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"گزارشهای اشکال حاوی دادههایی از فایلهای گزارش مختلف در سیستم هستند، شامل اطلاعات شخصی و خصوصی. گزارشهای اشکال را فقط با افراد و برنامههای مورد اعتماد خود به اشتراک بگذارید."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"دفعه بعد این پیام نشان داده شود"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"گزارش اشکال"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"فایل گزارش اشکال خوانده نشد"</string>
</resources>
diff --git a/packages/Shell/res/values-fi/strings.xml b/packages/Shell/res/values-fi/strings.xml
index 26003b3..df6851c 100644
--- a/packages/Shell/res/values-fi/strings.xml
+++ b/packages/Shell/res/values-fi/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Komentotulkki"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Virheraportti käynnissä"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Virheraportti tallennettu"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Jaa virheraportti pyyhkäisemällä vasemmalle"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Jaa virheraportti koskettamalla tätä"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Virheraportit sisältävät järjestelmän lokitietoja, ja niihin voi sisältyä henkilökohtaisia ja yksityisiä tietoja. Jaa virheraportteja vain luotettaville sovelluksille ja käyttäjille."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Näytä tämä viesti seuraavalla kerralla"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Virheraportit"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Virheraporttitiedostoa ei voi lukea."</string>
</resources>
diff --git a/packages/Shell/res/values-fr-rCA/strings.xml b/packages/Shell/res/values-fr-rCA/strings.xml
index b4b81ec..5f58164 100644
--- a/packages/Shell/res/values-fr-rCA/strings.xml
+++ b/packages/Shell/res/values-fr-rCA/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Création du rapport de bogue en cours..."</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Rapport de bogue enregistré"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Faites glisser le doigt vers la gauche pour partager votre rapport de bogue."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Appuyer ici pour partager votre rapport de bogue"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Les rapports de bogue contiennent des données des fichiers journaux du système, y compris des informations personnelles et privées. Ne partagez les rapports de bogue qu\'avec les applications et les personnes que vous estimez fiables."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Afficher ce message la prochaine fois"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Rapports de bogues"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Impossible de lire le fichier du rapport de bogue"</string>
</resources>
diff --git a/packages/Shell/res/values-fr/strings.xml b/packages/Shell/res/values-fr/strings.xml
index e801054..9562c6c 100644
--- a/packages/Shell/res/values-fr/strings.xml
+++ b/packages/Shell/res/values-fr/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Rapport de bug en cours"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Rapport de bug enregistré"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Faites glisser le doigt vers la gauche pour partager votre rapport d\'erreur."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Appuyez ici pour partager le rapport de bug"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Les rapports de bug contiennent des données des fichiers journaux du système, y compris des informations personnelles et privées. Ne partagez les rapports de bug qu\'avec les applications et les personnes que vous estimez fiables."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Afficher ce message la prochaine fois"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Rapports d\'erreur"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Impossible de lire le fichier de rapport de bug."</string>
</resources>
diff --git a/packages/Shell/res/values-gl-rES/strings.xml b/packages/Shell/res/values-gl-rES/strings.xml
index 5690c9e..1f8da5d 100644
--- a/packages/Shell/res/values-gl-rES/strings.xml
+++ b/packages/Shell/res/values-gl-rES/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Informe de erro en curso"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Informe de erros rexistrado"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Pasa o dedo á esquerda para compartir o teu informe de erros"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca aquí para compartir o teu informe de erros"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Os informes de erros conteñen datos dos distintos ficheiros de rexistro do sistema, incluída información persoal e privada. Comparte os informes de erros unicamente con aplicacións e persoas de confianza."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar esta mensaxe a próxima vez"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Informes de erros"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Non se puido ler o ficheiro de informe de erros"</string>
</resources>
diff --git a/packages/Shell/res/values-gu-rIN/strings.xml b/packages/Shell/res/values-gu-rIN/strings.xml
index e9fdfdb..7a94dd7 100644
--- a/packages/Shell/res/values-gu-rIN/strings.xml
+++ b/packages/Shell/res/values-gu-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"શેલ"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"બગ રિપોર્ટ ચાલુ છે"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"બગ રિપોર્ટ કેપ્ચર કરી"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"તમારી બગ રિપોર્ટ શેર કરવા માટે ડાબે સ્વાઇપ કરો"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"તમારી બગ રિપોર્ટ શેર કરવા માટે ટચ કરો"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"બગ રિપોર્ટ્સ વ્યક્તિગત અને ખાનગી માહિતી સહિત, સિસ્ટમની વિભિન્ન લૉગ ફાઇલોનો ડેટા ધરાવે છે. બગ રિપોર્ટ્સ ફક્ત તમે વિશ્વાસ કરતા હો તે એપ્લિકેશનો અને લોકો સાથે જ શેર કરો."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"આગલી વખતે આ સંદેશ બતાવો"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"બગ રિપોર્ટ્સ"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"બગ રીપોર્ટ ફાઇલ વાંચી શકાઇ નથી"</string>
</resources>
diff --git a/packages/Shell/res/values-hi/strings.xml b/packages/Shell/res/values-hi/strings.xml
index aee1121..273b484 100644
--- a/packages/Shell/res/values-hi/strings.xml
+++ b/packages/Shell/res/values-hi/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"शेल"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"बग रिपोर्ट प्रगति में है"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"बग रिपोर्ट कैप्चर कर ली गई"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"अपनी बग रिपोर्ट साझा करने के लिए बाएं स्वाइप करें"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"अपनी बग रिपोर्ट साझा करने के लिए स्पर्श करें"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"बग रिपोर्ट में व्यक्तिगत और निजी जानकारी सहित, सिस्टम की विभिन्न लॉग फ़ाइलों का डेटा होता है. बग रिपोर्ट केवल विश्वसनीय ऐप्स और व्यक्तियों से ही साझा करें."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"यह संदेश अगली बार दिखाएं"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"बग रिपोर्ट"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"बग रिपोर्ट फ़ाइल नहीं पढ़ी जा सकी"</string>
</resources>
diff --git a/packages/Shell/res/values-hr/strings.xml b/packages/Shell/res/values-hr/strings.xml
index a2cb3b0..3836edb 100644
--- a/packages/Shell/res/values-hr/strings.xml
+++ b/packages/Shell/res/values-hr/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Ljuska"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Izvješće o programskoj pogrešci u tijeku"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Prijava programske pogreške snimljena je"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prijeđite prstom ulijevo da biste poslali izvješće o programskim pogreškama"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Dodirnite za dijeljenje prijave programske pogreške"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Prijave programskih pogrešaka sadržavaju podatke iz različitih datoteka zapisnika sustava, uključujući osobne i privatne informacije. Prijave programskih pogrešaka dijelite samo s aplikacijama i osobama koje smatrate pouzdanima."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Prikaži tu poruku sljedeći put"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Izvj. o prog. pogreš."</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Izvješće o programskoj pogrešci nije pročitano"</string>
</resources>
diff --git a/packages/Shell/res/values-hu/strings.xml b/packages/Shell/res/values-hu/strings.xml
index f0bc227..9191e02 100644
--- a/packages/Shell/res/values-hu/strings.xml
+++ b/packages/Shell/res/values-hu/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Héj"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Hibajelentés folyamatban"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Programhiba-jelentés rögzítve"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Húzza ujját balra a hibajelentés megosztásához"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Érintse meg a programhiba-jelentés megosztásához"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"A programhiba-jelentések a rendszer különféle naplófájljaiból származó adatokat tartalmaznak, köztük személyes és magánjellegű információkat is. Csak olyan alkalmazásokkal és személyekkel osszon meg programhiba-jelentéseket, amelyekben vagy akikben megbízik."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Üzenet mutatása legközelebb"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Hibajelentések"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"A hibajelentési fájlt nem sikerült beolvasni"</string>
</resources>
diff --git a/packages/Shell/res/values-hy-rAM/strings.xml b/packages/Shell/res/values-hy-rAM/strings.xml
index 6a5358b..bfa9b04 100644
--- a/packages/Shell/res/values-hy-rAM/strings.xml
+++ b/packages/Shell/res/values-hy-rAM/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Խեցի"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Վրիպակի զեկույց է ստացվել"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Սահեցրեք ձախ՝ սխալի հաշվետվությունը համօգտագործելու համար"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Հպեք` ձեր վրիպակի մասին զեկույցը տարածելու համար"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Վրիպակի զեկույցները պարունակում են տվյալներ համակարգի տարբեր մուտքի ֆայլերից, այդ թվում նաև անհատական և գաղտնի տեղեկություններ: Վրիպակի զեկույցները կիսեք միայն այն հավելվածների և մարդկանց հետ, որոնց վստահում եք:"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Այս հաղորդագրությունը ցույց տալ հաջորդ անգամ"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Վրիպակների հաշվետվություններ"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Հնարավոր չէ կարդալ վրիպակների զեկույցի ֆայլը"</string>
</resources>
diff --git a/packages/Shell/res/values-in/strings.xml b/packages/Shell/res/values-in/strings.xml
index 627fc5e..9a13d8b 100644
--- a/packages/Shell/res/values-in/strings.xml
+++ b/packages/Shell/res/values-in/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Kerangka"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Laporan bug sedang berlangsung"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Laporan bug tercatat"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Gesek ke kiri untuk membagikan laporan bug Anda"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Sentuh untuk membagikan laporan bug Anda"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Laporan bug berisi data dari berbagai file log sistem, termasuk informasi pribadi dan rahasia. Hanya bagikan laporan bug dengan aplikasi dan orang yang Anda percaya."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Tampilkan pesan ini lain kali"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Laporan bug"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"File laporan bug tidak dapat dibaca"</string>
</resources>
diff --git a/packages/Shell/res/values-is-rIS/strings.xml b/packages/Shell/res/values-is-rIS/strings.xml
index dbd39c4..4304c8e 100644
--- a/packages/Shell/res/values-is-rIS/strings.xml
+++ b/packages/Shell/res/values-is-rIS/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Skipanalína"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Verið er að útbúa villutilkynningu"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Villutilkynning útbúin"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Strjúktu til vinstri til að deila villuskýrslunni"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Snertu til að deila villutilkynningunni"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Villutilkynningar innihalda gögn úr hinum ýmsu annálsskrám kerfisins, þ. á m. persónuleg gögn og trúnaðarupplýsingar. Deildu villutilkynningum eingöngu með forritum og fólki sem þú treystir."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Sýna þessi skilaboð næst"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Villutilkynningar"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Ekki var hægt að lesa úr villuskýrslunni"</string>
</resources>
diff --git a/packages/Shell/res/values-it/strings.xml b/packages/Shell/res/values-it/strings.xml
index cd63891..63d39d0 100644
--- a/packages/Shell/res/values-it/strings.xml
+++ b/packages/Shell/res/values-it/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Segnalazione di bug in corso"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Segnalazione di bug acquisita"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Scorri verso sinistra per condividere il rapporto sui bug"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tocca per condividere la segnalazione di bug"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Le segnalazioni di bug contengono dati da vari file di log del sistema, incluse informazioni personali e private. Condividi le segnalazioni di bug solo con app e persone attendibili."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostra questo messaggio la prossima volta"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Rapporti sui bug"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Impossibile leggere il file relativo alla segnalazione di bug"</string>
</resources>
diff --git a/packages/Shell/res/values-iw/strings.xml b/packages/Shell/res/values-iw/strings.xml
index 39c784f..94a167f 100644
--- a/packages/Shell/res/values-iw/strings.xml
+++ b/packages/Shell/res/values-iw/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"מעטפת"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"הדוח על הבאג מתבצע כעת"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"דוח הבאגים צולם"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"החלק שמאלה כדי לשתף את דוח הבאגים"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"גע כדי לשתף את דוח הבאגים שלך"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"דוחות על באגים כוללים נתונים מקובצי היומן השונים במערכת, כולל מידע אישי ופרטי. שתף דוחות באגים רק עם אפליקציות ואנשים שאתה סומך עליהם."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"הצג את ההודעה הזו בפעם הבאה"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"דוחות באגים"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"לא ניתן היה לקרוא את קובץ הדוח על הבאג"</string>
</resources>
diff --git a/packages/Shell/res/values-ja/strings.xml b/packages/Shell/res/values-ja/strings.xml
index 48be802..77adb37 100644
--- a/packages/Shell/res/values-ja/strings.xml
+++ b/packages/Shell/res/values-ja/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"シェル"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"バグレポートを処理しています"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"バグレポートが記録されました"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"バグレポートを共有するには左にスワイプ"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"バグレポートを共有するにはタップします"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"バグレポートには、個人の非公開情報など、システムのさまざまなログファイルのデータが含まれます。共有する場合は信頼するアプリとユーザーのみを選択してください。"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"このメッセージを次回も表示する"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"バグレポート"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"バグレポート ファイルを読み取ることができませんでした"</string>
</resources>
diff --git a/packages/Shell/res/values-ka-rGE/strings.xml b/packages/Shell/res/values-ka-rGE/strings.xml
index bb539d0..2521d3e 100644
--- a/packages/Shell/res/values-ka-rGE/strings.xml
+++ b/packages/Shell/res/values-ka-rGE/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"გარეკანი"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"ანგარიში ხარვეზების შესახებ შექმნილია"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"გაასრიალეთ მარცხნივ თქვენი ხარვეზის შეტყობინების გასაზიარებლად"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"შეეხეთ თქვენი ხარვეზების ანგარიშის გასაზიარებლად"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"ხარვეზის ანგარიშები მოიცავს მონაცემებს სხვადასხვა სისტემური ჟურნალის ფაილებიდან, მათ შორის პირად და კონფიდენციალურ ინფორმაციას."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"შემდგომში აჩვენე ეს შეტყობინება"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"შეცდომების ანგარიშები"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ხარვეზების შესახებ ანგარიშის წაკითხვა ვერ მოხერხდა"</string>
</resources>
diff --git a/packages/Shell/res/values-kk-rKZ/strings.xml b/packages/Shell/res/values-kk-rKZ/strings.xml
index b22ca45..5ce7815a 100644
--- a/packages/Shell/res/values-kk-rKZ/strings.xml
+++ b/packages/Shell/res/values-kk-rKZ/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Қабыршық"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Вирус туралы баянат қабылданды"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Қате туралы есепті бөлісу үшін солға жанаңыз"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Бөліс үшін, вирус туралы баянатты түртіңіз."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Вирус туралы баянатта жүйеде тіркелген әртүрлі файлдар туралы деректер болады, оған жеке және құпия ақпарат та кіреді. Вирус баянаттарын сенімді қолданбалар және сенімді адамдармен ғана бөлісіңіз."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Бұл хабарды келесі жолы көрсетіңіз"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Қате туралы баяндамалар"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Қате туралы есеп файлын оқу мүмкін болмады"</string>
</resources>
diff --git a/packages/Shell/res/values-km-rKH/strings.xml b/packages/Shell/res/values-km-rKH/strings.xml
index 50c893b..2814a73 100644
--- a/packages/Shell/res/values-km-rKH/strings.xml
+++ b/packages/Shell/res/values-km-rKH/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"សែល"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"កំពុងដំណើរការរបាយការណ៍កំហុស"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"បានចាប់យករបាយការណ៍កំហុស"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"អូសទៅឆ្វេង ដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នក"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ប៉ះ ដើម្បីចែករំលែករបាយការណ៍កំហុសរបស់អ្នក"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"របាយការណ៍កំហុសរួមមានឯកសារកំណត់ហេតុផ្សេងៗរបស់ប្រព័ន្ធ រួមមានព័ត៌មានផ្ទាល់ខ្លួន និងឯកជន។ ចែករំលែករបាយការណ៍កំហុសជាមួយកម្មវិធី និងមនុស្សដែលអ្នកទុកចិត្ត។"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"បង្ហាញសារនេះពេលក្រោយ"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"រាយការណ៍ពីកំហុស"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"មិនអាចអានឯកសាររបាយកាណ៍កំហុសបានទេ"</string>
</resources>
diff --git a/packages/Shell/res/values-kn-rIN/strings.xml b/packages/Shell/res/values-kn-rIN/strings.xml
index 7ab6abf..be34c85 100644
--- a/packages/Shell/res/values-kn-rIN/strings.xml
+++ b/packages/Shell/res/values-kn-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"ಶೆಲ್"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ದೋಷ ವರದಿ ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"ದೋಷದ ವರದಿಯನ್ನು ಸೆರೆಹಿಡಿಯಲಾಗಿದೆ"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ನಿಮ್ಮ ದೋಷ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಎಡಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ನಿಮ್ಮ ದೋಷದ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಸ್ಪರ್ಶಿಸಿ"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"ವೈಯಕ್ತಿಕ ಮತ್ತು ಖಾಸಗಿ ಮಾಹಿತಿಯು ಸೇರಿದಂತೆ, ಸಿಸ್ಟಂನ ಹಲವಾರು ಲಾಗ್ ಫೈಲ್ಗಳಿಂದ ಡೇಟಾವನ್ನು ದೋಷದ ವರದಿಗಳು ಒಳಗೊಂಡಿವೆ. ನೀವು ನಂಬುವಂತಹ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ಜನರೊಂದಿಗೆ ಮಾತ್ರ ದೋಷದ ವರದಿಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ಈ ಸಂದೇಶವನ್ನು ಮುಂದಿನ ಬಾರಿ ತೋರಿಸಿ"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"ದೋಷ ವರದಿಗಳು"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ಬಗ್ ವರದಿ ಫೈಲ್ ಅನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
</resources>
diff --git a/packages/Shell/res/values-ko/strings.xml b/packages/Shell/res/values-ko/strings.xml
index da0b31f..46c0daa 100644
--- a/packages/Shell/res/values-ko/strings.xml
+++ b/packages/Shell/res/values-ko/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"셸"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"버그 신고서 캡처됨"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"왼쪽으로 스와이프하여 버그 신고서를 공유하세요."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"버그 신고서를 공유하려면 터치하세요."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"버그 신고서는 시스템의 다양한 로그 파일 데이터(예: 개인 및 비공개 정보)를 포함합니다. 신뢰할 수 있는 앱과 사용자에게만 버그 신고서를 공유하세요."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"다음에 이 메시지 표시"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"버그 신고"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"버그 신고 파일을 읽을 수 없습니다."</string>
</resources>
diff --git a/packages/Shell/res/values-ky-rKG/strings.xml b/packages/Shell/res/values-ky-rKG/strings.xml
index 7183f77..aa8c538 100644
--- a/packages/Shell/res/values-ky-rKG/strings.xml
+++ b/packages/Shell/res/values-ky-rKG/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Командалык кабык"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Ката тууралуу билдирүү түзүлдү"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Ката жөнүндө кабар менен бөлүшүү үчүн солго серпип коюңуз"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Ката тууралуу билдирүүңүздү жөнөтүш үчүн, тийиңиз"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Ката тууралуу билдирүүлөр системанын ар кандай лог файлдарынын берилиштерин камтыйт, аларга өздүк жана купуя маалыматтар дагы кирет. Ката тууралуу билдирүүлөрдү сиз ишенген колдонмолор жана адамдар менен гана бөлүшүңүз."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Бул билдирүү кийин көрсөтүлсүн"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Мүчүлүштүктөрдү кабарлоолор"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Мүчүлүштүк тууралуу кабарлаган файл окулбай койду"</string>
</resources>
diff --git a/packages/Shell/res/values-lo-rLA/strings.xml b/packages/Shell/res/values-lo-rLA/strings.xml
index fcc58e9..caf11c4 100644
--- a/packages/Shell/res/values-lo-rLA/strings.xml
+++ b/packages/Shell/res/values-lo-rLA/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"ລາຍງານຈຸດບົກພ່ອງຖືກເກັບກຳແລ້ວ"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ປັດໄປຊ້າຍເພື່ອສົ່ງລາຍງານຂໍ້ຜິດພາດຂອງທ່ານ"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ແຕະເພື່ອສົ່ງການລາຍງານປັນຫາຂອງທ່ານ"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"ການລາຍງານຂໍ້ຜິດພາດປະກອບມີ ຂໍ້ມູນຈາກໄຟລ໌ບັນທຶກຂອງລະບົບຫຼາຍໄຟລ໌, ຮວມທັງຂໍ້ມູນສ່ວນໂຕນຳ. ທ່ານຕ້ອງແບ່ງປັນລາຍງານຂໍ້ຜິດພາດໃຫ້ແອັບຯ ແລະຄົນທີ່ທ່ານເຊື່ອຖືໄດ້ເທົ່ານັ້ນ."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ສະແດງຂໍ້ຄວາມນີ້ອີກໃນເທື່ອຕໍ່ໄປ"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"ລາຍງານບັນຫາ"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ບໍ່ສາມາດອ່ານໄຟລ໌ລາຍງານຂໍ້ຜິດພາດໄດ້"</string>
</resources>
diff --git a/packages/Shell/res/values-lt/strings.xml b/packages/Shell/res/values-lt/strings.xml
index 51655a4..e70cf9f 100644
--- a/packages/Shell/res/values-lt/strings.xml
+++ b/packages/Shell/res/values-lt/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Apvalkalas"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Riktų ataskaita užfiksuota"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Perbraukite kairėn, kad bendrintumėte rikto ataskaitą"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Palieskite, kad bendrintumėte riktų ataskaitą"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Riktų ataskaitose pateikiami duomenys iš įvairių sistemos žurnalo failų, įskaitant asmeninę ir privačią informaciją. Riktų ataskaitas bendrinkite tik su patikimomis programomis ir žmonėmis."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Rodyti šį pranešimą kitą kartą"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Riktų ataskaitos"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Nepavyko sukurti pranešimo apie riktą failo"</string>
</resources>
diff --git a/packages/Shell/res/values-lv/strings.xml b/packages/Shell/res/values-lv/strings.xml
index cf1a75a..c5d10bb 100644
--- a/packages/Shell/res/values-lv/strings.xml
+++ b/packages/Shell/res/values-lv/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Aizsargs"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Izveidots kļūdu pārskats"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Velciet pa kreisi, lai kopīgotu savu kļūdu ziņojumu."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Pieskarieties, lai kopīgotu kļūdu pārskatu."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Kļūdu pārskatā ir iekļauti dati no dažādiem sistēmas žurnālfailiem, tostarp personas dati un privāta informācija. Kļūdu pārskatus ieteicams kopīgot tikai ar uzticamām lietotnēm un lietotājiem."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Rādīt šo ziņojumu nākamajā reizē"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Kļūdu ziņojumi"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Nevarēja nolasīt kļūdas pārskata failu."</string>
</resources>
diff --git a/packages/Shell/res/values-mk-rMK/strings.xml b/packages/Shell/res/values-mk-rMK/strings.xml
index 785a841..4baa86a 100644
--- a/packages/Shell/res/values-mk-rMK/strings.xml
+++ b/packages/Shell/res/values-mk-rMK/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Обвивка"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Извештајот за грешка е во тек"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Извештајот за грешка е снимен"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Повлечете налево за да споделите пријава за грешка"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Допри да се сподели твојот извештај за грешка"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Извештаите за грешка содржат податоци од разни датотеки за евиденција на системот, вклучувајќи лични и приватни информации. Извештаите за грешка споделувајте ги само со апликации и луѓе на коишто им верувате."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Прикажи ја поракава следниот пат"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Извештаи за грешки"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Датотеката со извештај за грешка не можеше да се прочита"</string>
</resources>
diff --git a/packages/Shell/res/values-ml-rIN/strings.xml b/packages/Shell/res/values-ml-rIN/strings.xml
index 8fa6d67c..5dd7763 100644
--- a/packages/Shell/res/values-ml-rIN/strings.xml
+++ b/packages/Shell/res/values-ml-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"ഷെൽ"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"ബഗ് റിപ്പോർട്ട് ക്യാപ്ചർ ചെയ്തു"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടുന്നതിന് ഇടത്തേയ്ക്ക് സ്വൈപ്പുചെയ്യുക"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"നിങ്ങളുടെ ബഗ് റിപ്പോർട്ട് പങ്കിടാൻ സ്പർശിക്കുക"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"വ്യക്തിഗതവും സ്വകാര്യവുമായ വിവരങ്ങൾ ഉൾപ്പെടെ, സിസ്റ്റത്തിന്റെ നിരവധി ലോഗ് ഫയലുകളിൽ നിന്നുള്ള ഡാറ്റ, ബഗ് റിപ്പോർട്ടുകളിൽ അടങ്ങിയിരിക്കുന്നു. നിങ്ങൾ വിശ്വസിക്കുന്ന അപ്ലിക്കേഷനുകൾക്കും ആളുകൾക്കും മാത്രം ബഗ് റിപ്പോർട്ടുകൾ പങ്കിടുക."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ഈ സന്ദേശം അടുത്ത തവണ ദൃശ്യമാക്കുക"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"ബഗ് റിപ്പോർട്ടുകൾ"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ബഗ് റിപ്പോർട്ട് ഫയൽ വായിക്കാനായില്ല"</string>
</resources>
diff --git a/packages/Shell/res/values-mn-rMN/strings.xml b/packages/Shell/res/values-mn-rMN/strings.xml
index 4010072..f7a9688 100644
--- a/packages/Shell/res/values-mn-rMN/strings.xml
+++ b/packages/Shell/res/values-mn-rMN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Шел"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Алдааны тайлан үргэлжилж байна"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Алдааны мэдээлэл хүлээн авав"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Өөрийн согог репортыг хуваалцахын тулд зүүн шудрана уу"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Та алдааны мэдэгдлийг хуваалцах бол хүрнэ үү"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Алдааны репорт нь хувийн болон нууц мэдээлэл зэргийг агуулсан системийн төрөл бүрийн лог файлын датаг агуулна. Алдааны репортыг зөвхөн итгэлтэй апп болон хүмүүст хуваалцана уу."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Энэ мессежийг дараагийн удаа харуулах"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Гэмтлийн тухай тайлан"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Алдааны тайлангийн файлыг уншиж чадахгүй байна"</string>
</resources>
diff --git a/packages/Shell/res/values-mr-rIN/strings.xml b/packages/Shell/res/values-mr-rIN/strings.xml
index c4993fc..e0db42b 100644
--- a/packages/Shell/res/values-mr-rIN/strings.xml
+++ b/packages/Shell/res/values-mr-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"शेल"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"दोष अहवाल प्रगतीपथावर आहे"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"दोष अहवाल कॅप्चर केला"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"आपला दोष अहवाल सामायिक करण्यासाठी डावीकडे स्वाइप करा"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"आपला दोष अहवाल सामायिक करण्यासाठी स्पर्श करा"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"दोष अहवालांमध्ये वैयक्तिक आणि खाजगी माहितीसह, सिस्टमच्या अनेक लॉग फायलींमधील डेटा असतो. केवळ आपला विश्वास असलेल्या अॅप्स आणि लोकांसह दोष अहवाल सामायिक करा."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"पुढील वेळी हा संदेश दर्शवा"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"दोष अहवाल"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"दोष अहवाल फाईल वाचणे शक्य झाले नाही"</string>
</resources>
diff --git a/packages/Shell/res/values-ms-rMY/strings.xml b/packages/Shell/res/values-ms-rMY/strings.xml
index f3e4f7e..bbbb42a 100644
--- a/packages/Shell/res/values-ms-rMY/strings.xml
+++ b/packages/Shell/res/values-ms-rMY/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"Laporan pepijat telah ditangkap"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Leret ke kiri untuk berkongsi laporan pepijat anda"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Sentuh untuk berkongsi laporan pepijat anda"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Laporan pepijat mengandungi data dari pelbagai fail log sistem, termasuk maklumat peribadi dan sulit. Kongsikan laporan pepijat hanya dengan apl dan orang yang anda percayai."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Tunjukkan mesej ini pada masa akan datang"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Laporan pepijat"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Fail laporan pepijat tidak dapat dibaca"</string>
</resources>
diff --git a/packages/Shell/res/values-my-rMM/strings.xml b/packages/Shell/res/values-my-rMM/strings.xml
index d223bd9..d49dc15 100644
--- a/packages/Shell/res/values-my-rMM/strings.xml
+++ b/packages/Shell/res/values-my-rMM/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"အခွံ"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ချွတ်ယွင်းချက် အစီရင်ခံစာ ပြုလုပ်ဆဲ"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"အမှားအယွင်းမှတ်တမ်းကို အောင်မြင်စွာ သိမ်းဆည်းပြီး"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"သင်၏ ဘာဂ် အစီရင်ခံစာကို မျှပေးရန် ဘယ်ဘက်သို့ ပွတ်ဆွဲရန်"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"အမှားအယွင်း မှတ်တမ်းကို မျှဝေရန် ထိလိုက်ပါ"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"အမှားအယွင်း မှတ်တမ်းမှာ ပါရှိသော အချက်အလက်များမှာ ကိုယ်ရေးကိုယ်တာ နဲ့ လုံခြုံရေး အချက်အလက်များပါဝင်သော စနစ်မှ ပြုလုပ်မှု မှတ်တမ်းများ ဖြစ်ပါသည်၊ အမှားအယွင်း မှတ်တမ်းများကို ယုံကြည်ရသော အပလီကေးရှင်းများနဲ့ လူများကိုသာ ပေးဝေပြသမှု လုပ်ပါရန်။"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ဤစာတန်းကို နောက်တစ်ခါတွင် ပြရန်"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"ချို့ယွင်းမှု အစီရင်ခံစာများ"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ချွတ်ယွင်းချက် အစီရင်ခံစာကို ဖတ်၍မရပါ"</string>
</resources>
diff --git a/packages/Shell/res/values-nb/strings.xml b/packages/Shell/res/values-nb/strings.xml
index c00e2d0..d3aafdd 100644
--- a/packages/Shell/res/values-nb/strings.xml
+++ b/packages/Shell/res/values-nb/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Kommandoliste"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Feilrapport pågår"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Feilrapporten er lagret"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Sveip til venstre for å dele feilrapporten din"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Trykk for å dele feilrapporten din"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Feilrapporter inkluderer data fra systemets forskjellige loggfiler. Dette omfatter personlig og privat informasjon. Du bør bare dele feilrapporter med apper og folk du stoler på."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Vis denne meldingen neste gang"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Feilrapporter"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Feilrapportfilen kunne ikke leses"</string>
</resources>
diff --git a/packages/Shell/res/values-ne-rNP/strings.xml b/packages/Shell/res/values-ne-rNP/strings.xml
index 7344889..fb81e55 100644
--- a/packages/Shell/res/values-ne-rNP/strings.xml
+++ b/packages/Shell/res/values-ne-rNP/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"सेल"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"बग प्रतिवेदन समातियो"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"तपाईँको बग रिपोर्ट साझेदारी गर्न बायाँ स्वाइप गर्नुहोस्"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"तपाईंको बग रिपोर्ट साझेदारी गर्न छुनुहोस्"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"बग रिपोर्टहरूमा प्रणालीका विभिन्न लग फाइलहरूबाट व्यक्तिगत तथा नीजि सूचनासहितको डेटा रहन्छ। बग रिपोर्टहरू अनुप्रयोगहरू र तपाईँले विश्वास गरेका व्यक्तिहरूसँग मात्र साझेदारी गर्नुहोस्।"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"यो सन्देश अर्को पटक देखाउनुहोस्"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"बग रिपोर्टहरू"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"बग रिपोर्ट फाइल पढ्न सकिएन"</string>
</resources>
diff --git a/packages/Shell/res/values-nl/strings.xml b/packages/Shell/res/values-nl/strings.xml
index b0dba4d..a097fea 100644
--- a/packages/Shell/res/values-nl/strings.xml
+++ b/packages/Shell/res/values-nl/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Bugrapport wordt uitgevoerd"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Foutenrapport vastgelegd"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veeg naar links om je bugmelding te delen"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Raak aan om je foutenrapport te delen"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Foutenrapporten bevatten gegevens uit de verschillende logbestanden van het systeem, waaronder persoonlijke en privégegevens. Deel foutenrapporten alleen met apps en mensen die u vertrouwt."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Dit bericht de volgende keer weergeven"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Foutenrapporten"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bestand met bugrapport kan niet worden gelezen"</string>
</resources>
diff --git a/packages/Shell/res/values-pa-rIN/strings.xml b/packages/Shell/res/values-pa-rIN/strings.xml
index a0c4cda..54e30d6 100644
--- a/packages/Shell/res/values-pa-rIN/strings.xml
+++ b/packages/Shell/res/values-pa-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"ਸ਼ੈਲ"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"ਬੱਗ ਰਿਪੋਰਟ \'ਤੇ ਕਾਰਵਾਈ ਹੋ ਰਹੀ ਹੈ"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"ਬਗ ਰਿਪੋਰਟ ਕੈਪਚਰ ਕੀਤੀ"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ਤੁਹਾਡੀ ਬਗ ਰਿਪੋਰਟ ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਖੱਬੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ਆਪਣੀ ਬਗ ਰਿਪੋਰਟ ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਛੋਹਵੋ"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"ਬਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਸਿਸਟਮ ਦੀਆਂ ਭਿੰਨ ਲੌਗ ਫਾਈਲਾਂ ਦਾ ਡਾਟਾ ਹੁੰਦਾ ਹੈ, ਨਿੱਜੀ ਅਤੇ ਪ੍ਰਾਈਵੇਟ ਜਾਣਕਾਰੀ ਸਮੇਤ। ਕੇਵਲ ਉਹਨਾਂ ਐਪਸ ਅਤੇ ਲੋਕਾਂ ਨਾਲ ਬਗ ਰਿਪੋਰਟਾਂ ਸ਼ੇਅਰ ਕਰੋ, ਜਿਹਨਾਂ ਤੇ ਤੁਸੀਂ ਭਰੋਸਾ ਕਰਦੇ ਹੋ।"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ਅਗਲੀ ਵਾਰ ਇਹ ਸੁਨੇਹਾ ਦਿਖਾਓ"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"ਬਗ ਰਿਪੋਰਟਾਂ"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ਬਗ ਰਿਪੋਰਟ ਫ਼ਾਈਲ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"</string>
</resources>
diff --git a/packages/Shell/res/values-pl/strings.xml b/packages/Shell/res/values-pl/strings.xml
index 96b8f2a..599f8c1 100644
--- a/packages/Shell/res/values-pl/strings.xml
+++ b/packages/Shell/res/values-pl/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Powłoka"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Trwa zgłaszanie błędu"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Raport o błędach został zapisany"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Przesuń palcem w lewo, by udostępnić swoje zgłoszenie błędu"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Kliknij, by udostępnić raport o błędach"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Raporty o błędach zawierają dane z różnych plików dzienników systemu, w tym dane osobowe i prywatne. Udostępniaj je tylko aplikacjom i osobom, którym ufasz."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Pokaż ten komunikat następnym razem"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Raporty o błędach"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Nie można odczytać raportu o błędzie"</string>
</resources>
diff --git a/packages/Shell/res/values-pt-rBR/strings.xml b/packages/Shell/res/values-pt-rBR/strings.xml
index e04d600..a1a9ad1 100644
--- a/packages/Shell/res/values-pt-rBR/strings.xml
+++ b/packages/Shell/res/values-pt-rBR/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Relatório de bugs em andamento"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de bugs capturado"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para compartilhar seu relatório de bugs"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Os relatórios de bugs contêm dados de diversos arquivos de registro do sistema, inclusive informações pessoais e particulares. Compartilhe relatórios de bugs somente com apps e pessoas nos quais você confia."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar esta mensagem da próxima vez"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Relatórios de bugs"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Não foi possível ler o arquivo de relatório de bug"</string>
</resources>
diff --git a/packages/Shell/res/values-pt-rPT/strings.xml b/packages/Shell/res/values-pt-rPT/strings.xml
index 648ef94..2e25f8c 100644
--- a/packages/Shell/res/values-pt-rPT/strings.xml
+++ b/packages/Shell/res/values-pt-rPT/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Relatório de erro em curso"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de erros capturado"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslizar rapidamente para a esquerda para partilhar o seu relatório de erros"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para partilhar o relatório de erros"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Os relatórios de erros incluem dados de vários ficheiros de registo do sistema, nomeadamente informações pessoais e privadas. Partilhe relatórios de erros apenas com aplicações e pessoas fidedignas."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar esta mensagem da próxima vez"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Relatórios de erros"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Não foi possível ler o ficheiro de relatório de erro"</string>
</resources>
diff --git a/packages/Shell/res/values-pt/strings.xml b/packages/Shell/res/values-pt/strings.xml
index e04d600..a1a9ad1 100644
--- a/packages/Shell/res/values-pt/strings.xml
+++ b/packages/Shell/res/values-pt/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Relatório de bugs em andamento"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de bugs capturado"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para compartilhar seu relatório de bugs"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Os relatórios de bugs contêm dados de diversos arquivos de registro do sistema, inclusive informações pessoais e particulares. Compartilhe relatórios de bugs somente com apps e pessoas nos quais você confia."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar esta mensagem da próxima vez"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Relatórios de bugs"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Não foi possível ler o arquivo de relatório de bug"</string>
</resources>
diff --git a/packages/Shell/res/values-ro/strings.xml b/packages/Shell/res/values-ro/strings.xml
index aab29b7..d8a3b92 100644
--- a/packages/Shell/res/values-ro/strings.xml
+++ b/packages/Shell/res/values-ro/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Raportul de eroare se creează"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Raportul despre erori a fost creat"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Glisați la stânga pentru a trimite raportul de erori"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Atingeți pentru a permite accesul la raportul despre erori"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Rapoartele despre erori conțin date din diferite fișiere de jurnal ale sistemului, inclusiv informații private și personale. Permiteți accesul la rapoartele despre erori numai aplicațiilor și persoanelor în care aveți încredere."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Afișați acest mesaj data viitoare"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Rapoarte de erori"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Fișierul cu raportul de eroare nu a putut fi citit"</string>
</resources>
diff --git a/packages/Shell/res/values-ru/strings.xml b/packages/Shell/res/values-ru/strings.xml
index 1f1444d..436a590 100644
--- a/packages/Shell/res/values-ru/strings.xml
+++ b/packages/Shell/res/values-ru/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Оболочка"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Отправка сообщения об ошибке..."</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Отчет об ошибке сохранен"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Проведите влево, чтобы отправить отчет"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Нажмите, чтобы отправить отчет об ошибках"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Отчеты об ошибках содержат данные различных системных журналов и могут включать личную информацию. Рекомендуем открывать к ним доступ только лицам и приложениям, заслуживающим доверие."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Показать это сообщение в следующий раз"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Отчеты об ошибках"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Не удалось открыть отчет об ошибке"</string>
</resources>
diff --git a/packages/Shell/res/values-si-rLK/strings.xml b/packages/Shell/res/values-si-rLK/strings.xml
index 4244f2b..a0bc5f6 100644
--- a/packages/Shell/res/values-si-rLK/strings.xml
+++ b/packages/Shell/res/values-si-rLK/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"ෂෙල්"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"දෝෂය වාර්තා කිරීම සිදු කරමින් පවතී"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"දෝෂ වාර්තාව ලබාගන්නා ලදි"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"ඔබගේ දෝෂ වාර්තාව බෙදාගැනීමට වමට ස්වයිප් කරන්න"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"ඔබගේ දෝෂ වාර්තාව බෙදා ගැනීමට ස්පර්ශ කරන්න"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"පුද්ගලික සහ පෞද්ගලික තොරතුරු ඇතුළත්ව පද්ධතියේ විවිධ ලොග් ගොනු වල දත්ත දෝෂ වාර්තාවේ අඩංගු වේ. ඔබට විශ්වාසවන්ත යෙදුම් සහ පුද්ගලයින් සමඟ පමණක් දෝෂ වාර්තා බෙදා ගන්න."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"ඊළඟ වෙලාවේ මෙම පණිවිඩය පෙන්වන්න"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"දෝෂ වාර්තා"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"දෝෂ වාර්තා ගොනුව කියවීමට නොහැකි විය"</string>
</resources>
diff --git a/packages/Shell/res/values-sk/strings.xml b/packages/Shell/res/values-sk/strings.xml
index 4228dd3..e568946 100644
--- a/packages/Shell/res/values-sk/strings.xml
+++ b/packages/Shell/res/values-sk/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Prostredie"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Prebieha hlásenie chyby"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Hlásenie o chybách bolo vytvorené"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Ak chcete hlásenie o chybe zdieľať, prejdite prstom doľava."</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Hlásenie o chybách môžete zdielať klepnutím"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Správy o chybách obsahujú údaje z rôznych súborov denníkov systému vrátane osobných a súkromných informácií. Zdieľajte ich iba s dôveryhodnými aplikáciami a ľuďmi."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Zobraziť túto správu nabudúce"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Hlásenia chýb"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Súbor s hlásením chyby sa nepodarilo prečítať"</string>
</resources>
diff --git a/packages/Shell/res/values-sl/strings.xml b/packages/Shell/res/values-sl/strings.xml
index 8c3bedc..6ac5ac8c 100644
--- a/packages/Shell/res/values-sl/strings.xml
+++ b/packages/Shell/res/values-sl/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Lupina"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Poročanje o napakah poteka"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Poročilo o napaki je posneto"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Povlecite v levo, če želite poslati sporočilo o napaki"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Dotaknite se, če želite deliti sporočilo o napaki z drugimi"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Poročila o napakah vsebujejo podatke iz različnih dnevniških datotek sistema, vključno z osebnimi in zasebnimi podatki. Poročila o napakah delite samo z aplikacijami in ljudmi, ki jim zaupate."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Pokaži to sporočilo naslednjič"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Poročila o napakah"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Datoteke s poročilom o napakah ni bilo mogoče prebrati"</string>
</resources>
diff --git a/packages/Shell/res/values-sq-rAL/strings.xml b/packages/Shell/res/values-sq-rAL/strings.xml
index 8f252a0..54f2aad 100644
--- a/packages/Shell/res/values-sq-rAL/strings.xml
+++ b/packages/Shell/res/values-sq-rAL/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Guaska"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Raporti i gabimeve në kod është në progres"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Raporti i defektit në kod u regjistrua"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Rrëshqit majtas për të ndarë raportin e defektit në kod"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Prek për të ndarë raportin e defektit në kod"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Raportet e gabimeve përmbajnë të dhëna nga skedarë të ndryshëm ditarësh sistemi, përfshi informacione personale dhe private. Shpërndaji publikisht raportet e gabimeve vetëm me aplikacionet dhe personat që iu beson."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Tregoje këtë mesazh herën tjetër"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Raportet e gabimeve"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Skedari i raportimit të defektit në kod nuk mund të lexohej."</string>
</resources>
diff --git a/packages/Shell/res/values-sr/strings.xml b/packages/Shell/res/values-sr/strings.xml
index 763bd2b..81cde00 100644
--- a/packages/Shell/res/values-sr/strings.xml
+++ b/packages/Shell/res/values-sr/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Прављење извештаја о грешци је у току"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Извештај о грешци је снимљен"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Превуците улево да бисте делили извештај о грешкама"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Додирните да бисте делили извештај о грешци"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Извештаји о грешкама садрже податке из различитих системских датотека евиденције, укључујући личне и приватне податке. Делите извештаје о грешкама само са апликацијама и људима у које имате поверења."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Прикажи ову поруку следећи пут"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Извештаји о грешкама"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Датотека извештаја о грешци не може да се прочита"</string>
</resources>
diff --git a/packages/Shell/res/values-sv/strings.xml b/packages/Shell/res/values-sv/strings.xml
index 8b72938..2287319 100644
--- a/packages/Shell/res/values-sv/strings.xml
+++ b/packages/Shell/res/values-sv/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Skal"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Felrapportering pågår"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Felrapporten har skapats"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Svep åt vänster om du vill dela felrapporten"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Tryck om du vill dela felrapporten"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Felrapporter innehåller data från systemets olika loggfiler, inklusive personliga och privata uppgifter. Dela bara felrapporter med personer du litar på."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Visa det här meddelandet nästa gång"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Felrapporter"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Det gick inte att läsa felrapporten"</string>
</resources>
diff --git a/packages/Shell/res/values-sw/strings.xml b/packages/Shell/res/values-sw/strings.xml
index 0d12cc9..adb97dd 100644
--- a/packages/Shell/res/values-sw/strings.xml
+++ b/packages/Shell/res/values-sw/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Ganda"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Mchakato wa kuripoti hitilafu unaendelea"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Ripoti ya hitilafu imenaswa"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Telezesha kidole kushoto ili ushiriki ripoti yako ya hitilafu"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Gusa ili ushiriki ripoti yako ya hitilafu"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Ripoti ya hitilafu ina data kutoka kwenye faili za kumbukumbu mbalimbali za mfumo, pamoja na maelezo ya kibinafsi na faragha. Shiriki ripoti ya hitilafu na programu na watu unaowaamini pekee."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Onyesha ujumbe huu wakati mwingine"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Ripoti za hitilafu"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Faili ya ripoti ya hitilafu haikusomwa"</string>
</resources>
diff --git a/packages/Shell/res/values-ta-rIN/strings.xml b/packages/Shell/res/values-ta-rIN/strings.xml
index cd0462b..15a6242 100644
--- a/packages/Shell/res/values-ta-rIN/strings.xml
+++ b/packages/Shell/res/values-ta-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"ஷெல்"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"பிழை அறிக்கை செயலிலுள்ளது"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"பிழை அறிக்கைகள் படமெடுக்கப்பட்டன"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"பிழை அறிக்கையைப் பகிர இடது புறமாகத் தேய்க்கவும்"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"உங்கள் பிழை அறிக்கையைப் பகிர, தொடவும்"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"பிழை அறிக்கைகளில், சொந்த வாழ்க்கை மற்றும் தனிப்பட்ட தகவல் உள்பட கணினியின் பல்வேறு பதிவுகளில் உள்ள தரவு இருக்கும். நீங்கள் நம்பும் பயன்பாடுகள் மற்றும் நபர்களுடன் மட்டும் பிழை அறிக்கைகளைப் பகிரவும்."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"இந்தச் செய்தியை அடுத்த முறைக் காட்டு"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"பிழை அறிக்கைகள்"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"பிழை அறிக்கையைப் படிக்க முடியவில்லை"</string>
</resources>
diff --git a/packages/Shell/res/values-te-rIN/strings.xml b/packages/Shell/res/values-te-rIN/strings.xml
index 127f602..cd951a2 100644
--- a/packages/Shell/res/values-te-rIN/strings.xml
+++ b/packages/Shell/res/values-te-rIN/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"షెల్"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"బగ్ నివేదిక ప్రోగ్రెస్లో ఉంది"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"బగ్ నివేదిక క్యాప్చర్ చేయబడింది"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"మీ బగ్ నివేదికను భాగస్వామ్యం చేయడానికి ఎడమవైపుకు స్వైప్ చేయండి"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"మీ బగ్ నివేదికను భాగస్వామ్యం చేయడానికి తాకండి"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"బగ్ నివేదికలు వ్యక్తిగతమైన మరియు రహస్యమైన సమాచారంతో సహా సిస్టమ్ యొక్క విభిన్న లాగ్ ఫైల్ల్లోని డేటాను కలిగి ఉంటాయి. కనుక బగ్ నివేదికలను మీరు విశ్వసించే అనువర్తనాలు మరియు వ్యక్తులతో మాత్రమే భాగస్వామ్యం చేయండి."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"తదుపరిసారి ఈ సందేశాన్ని చూపు"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"బగ్ నివేదికలు"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"బగ్ నివేదిక ఫైల్ను చదవడం సాధ్యపడలేదు"</string>
</resources>
diff --git a/packages/Shell/res/values-th/strings.xml b/packages/Shell/res/values-th/strings.xml
index 2bc8f0d..c61ffeb 100644
--- a/packages/Shell/res/values-th/strings.xml
+++ b/packages/Shell/res/values-th/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"รายงานข้อบกพร่องอยู่ระหว่างดำเนินการ"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"จับภาพรายงานข้อบกพร่องแล้ว"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"กวาดไปทางซ้ายเพื่อแชร์รายงานข้อบกพร่อง"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"แตะเพื่อแชร์รายงานข้อบกพร่องของคุณ"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"รายงานข้อบกพร่องมีข้อมูลจากไฟล์บันทึกต่างๆ ของระบบ รวมถึงข้อมูลส่วนตัว แชร์รายงานข้อบกพร่องกับแอปและบุคคลที่คุณไว้ใจเท่านั้น"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"แสดงข้อความนี้ในครั้งต่อไป"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"รายงานข้อบกพร่อง"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"ไม่สามารถอ่านไฟล์รายงานข้อบกพร่อง"</string>
</resources>
diff --git a/packages/Shell/res/values-tl/strings.xml b/packages/Shell/res/values-tl/strings.xml
index a5c0e8a..3e9a68d 100644
--- a/packages/Shell/res/values-tl/strings.xml
+++ b/packages/Shell/res/values-tl/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Kasalukuyang ginagawa ang ulat ng bug"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Na-capture ang ulat ng bug"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Mag-swipe pakaliwa upang ibahagi ang iyong ulat ng bug"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Pindutin upang ibahagi ang iyong ulat ng bug"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Naglalaman ang mga ulat ng bug ng data mula sa iba\'t ibang file ng log ng system, kabilang ang personal at pribadong impormasyon. Magbahagi lang ng mga ulat ng bug sa apps at mga tao na pinagkakatiwalaan mo."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Ipakita ang mensaheng ito sa susunod"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Mga ulat sa bug"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Hindi mabasa ang file ng pag-uulat ng bug"</string>
</resources>
diff --git a/packages/Shell/res/values-tr/strings.xml b/packages/Shell/res/values-tr/strings.xml
index 67390b7..f90dae0 100644
--- a/packages/Shell/res/values-tr/strings.xml
+++ b/packages/Shell/res/values-tr/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Kabuk"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Hata raporu hazırlanıyor"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Hata raporu kaydedildi"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Hata raporunuzu paylaşmak için hızlıca sola kaydırın"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Hata raporunuzu paylaşmak için dokunun"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Hata raporları, kişisel ve özel bilgiler dahil olmak üzere sistemin çeşitli günlük dosyalarından veriler içerir. Hata raporlarını sadece güvendiğiniz uygulamalar ve kişilerle paylaşın."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Bir dahaki sefere bu iletiyi göster"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Hata raporları"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Hata raporu dosyası okunamadı"</string>
</resources>
diff --git a/packages/Shell/res/values-uk/strings.xml b/packages/Shell/res/values-uk/strings.xml
index f8f1798..dac4fe0 100644
--- a/packages/Shell/res/values-uk/strings.xml
+++ b/packages/Shell/res/values-uk/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Оболонка"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Генерується повідомлення про помилку"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Звіт про помилки створено"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Проведіть пальцем ліворуч, щоб надіслати звіт про помилки"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Торкніться, щоб надіслати звіт про помилки"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Звіти про помилки містять дані з різних файлів журналу системи, зокрема особисті та конфіденційні. Надсилайте звіт про помилки лише тим, кому довіряєте."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Показати це повідомлення наступного разу"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Звіти про помилки"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Не вдалося прочитати звіт про помилки"</string>
</resources>
diff --git a/packages/Shell/res/values-ur-rPK/strings.xml b/packages/Shell/res/values-ur-rPK/strings.xml
index 73d6877..206f02a 100644
--- a/packages/Shell/res/values-ur-rPK/strings.xml
+++ b/packages/Shell/res/values-ur-rPK/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"شیل"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"بگ رپورٹ پر پیشرفت جاری ہے"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"بَگ رپورٹ کیپچر کر لی گئی"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"اپنی بگ رپورٹ کا اشتراک کرنے کیلئے بائیں سوائپ کریں"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"اپنی بَگ رپورٹ کا اشتراک کرنے کیلئے ٹچ کریں"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"بَگ رپورٹس میں سسٹم کی مختلف لاگ فائلوں سے ڈیٹا شامل ہوتا ہے، بشمول ذاتی اور نجی معلومات۔ بَگ رپورٹس کا اشتراک صرف اپنے بھروسے مند ایپس اور لوگوں کے ساتھ کریں۔"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"یہ پیغام اگلی بار دکھائیں"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"بگ رپورٹس"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"بگ رپورٹ فائل پڑھی نہیں جا سکی"</string>
</resources>
diff --git a/packages/Shell/res/values-uz-rUZ/strings.xml b/packages/Shell/res/values-uz-rUZ/strings.xml
index b221171..0b8c1fb 100644
--- a/packages/Shell/res/values-uz-rUZ/strings.xml
+++ b/packages/Shell/res/values-uz-rUZ/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Terminal"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Xatoliklar hisoboti yuborilmoqda…"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Xatolik hisobotini yozib olindi"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Xatolik hisobotini yuborish uchun barmog‘ingiz bilan chapga suring"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Xatolik hisobotini bo‘lishish uchun barmog‘ingizni tegizing."</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Xatolik hisobotlari tizimdagi har xil jurnal fayllardagi ma’lumotlarni, shuningdek, shaxsiy hamda maxfiy ma’lumotlarni o‘z ichiga oladi. Xatolik hisobotlarini faqat ishonchli dasturlar va odamlar bilan bo‘lishing."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Ushbu xabar keyingi safar ko‘rsatilsin"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Xatoliklar hisoboti"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Xatoliklar hisoboti faylini o‘qib bo‘lmadi"</string>
</resources>
diff --git a/packages/Shell/res/values-vi/strings.xml b/packages/Shell/res/values-vi/strings.xml
index 16a7df9..9ef7cf9 100644
--- a/packages/Shell/res/values-vi/strings.xml
+++ b/packages/Shell/res/values-vi/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Đang tiến hành báo cáo lỗi"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Báo cáo lỗi đã được chụp"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Vuốt sang trái để chia sẻ báo cáo lỗi của bạn"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Chạm để chia sẻ báo cáo lỗi của bạn"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Các báo cáo lỗi chứa dữ liệu từ nhiều tệp nhật ký khác nhau của hệ thống, bao gồm cả thông tin cá nhân và riêng tư. Chỉ chia sẻ báo cáo lỗi với các ứng dụng và những người mà bạn tin tưởng."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Hiển thị thông báo này vào lần tới"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Báo cáo lỗi"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Không thể đọc tệp báo cáo lỗi"</string>
</resources>
diff --git a/packages/Shell/res/values-zh-rCN/strings.xml b/packages/Shell/res/values-zh-rCN/strings.xml
index 17fdedd..0928bb3 100644
--- a/packages/Shell/res/values-zh-rCN/strings.xml
+++ b/packages/Shell/res/values-zh-rCN/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"已抓取错误报告"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑动即可分享错误报告"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"触摸即可分享您的错误报告"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"错误报告包含的数据来自于系统的各个日志文件，其中包含个人信息和隐私信息。请务必只与您信任的应用和用户分享错误报告。"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"下次再显示这条讯息"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"错误报告"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"无法读取错误报告文件"</string>
</resources>
diff --git a/packages/Shell/res/values-zh-rHK/strings.xml b/packages/Shell/res/values-zh-rHK/strings.xml
index 0f70bab..26a84c3 100644
--- a/packages/Shell/res/values-zh-rHK/strings.xml
+++ b/packages/Shell/res/values-zh-rHK/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"命令介面"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"已擷取錯誤報告"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑動即可分享錯誤報告"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"輕觸即可分享您的錯誤報告"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"錯誤報告中有來自系統各個記錄檔案的資料，包括個人和私人資料。請只與您信任的應用程式和使用者分享錯誤報告。"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"下次再顯示這則訊息"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"錯誤報告"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"無法讀取錯誤報告檔案"</string>
</resources>
diff --git a/packages/Shell/res/values-zh-rTW/strings.xml b/packages/Shell/res/values-zh-rTW/strings.xml
index d7f7507..f79e58e 100644
--- a/packages/Shell/res/values-zh-rTW/strings.xml
+++ b/packages/Shell/res/values-zh-rTW/strings.xml
@@ -17,10 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"殼層"</string>
+ <!-- no translation found for bugreport_in_progress_title (6125357428413919520) -->
+ <skip />
<string name="bugreport_finished_title" msgid="2293711546892863898">"已擷取錯誤報告"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"向左滑動即可分享錯誤報告"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"輕觸即可分享您的錯誤報告"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"錯誤報告的資料來自系統各個紀錄檔，包括個人和私密資訊。請務必只與您信任的應用程式和使用者分享錯誤報告。"</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"下次仍顯示這則訊息"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"錯誤報告"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"無法讀取錯誤報告檔案"</string>
</resources>
diff --git a/packages/Shell/res/values-zu/strings.xml b/packages/Shell/res/values-zu/strings.xml
index c82fb93..2e209e1 100644
--- a/packages/Shell/res/values-zu/strings.xml
+++ b/packages/Shell/res/values-zu/strings.xml
@@ -17,10 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3701846017049540910">"I-Shell"</string>
+ <string name="bugreport_in_progress_title" msgid="6125357428413919520">"Umbiko wesiphazamisi uyaqhubeka"</string>
<string name="bugreport_finished_title" msgid="2293711546892863898">"Umbiko wesiphazamisi uthwetshuliwe"</string>
<string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Swayiphela kwesokunxele ukuze wabelane umbiko wesiphazamiso sakho"</string>
<string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Thinta ukuze wabelane ngombiko wakho wesiphazamisi"</string>
<string name="bugreport_confirm" msgid="5130698467795669780">"Imibiko yeziphazamisi iqukethe idatha yamafayela wokungena ahlukile wesistimu, afaka ulwazi lomuntu siqu noma lobumfihlo. Yabelana kuphela ngemibiko yeziphazamisi nezinhlelo zokusebenza nabantu obathembayo."</string>
<string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Bonisa lo mlayezo ngesikhathi esilandelayo"</string>
<string name="bugreport_storage_title" msgid="5332488144740527109">"Imibiko yeziphazamiso"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Ifayela lombiko wesiphazamso alikwazanga ukufundwa"</string>
</resources>
diff --git a/packages/Shell/res/values/strings.xml b/packages/Shell/res/values/strings.xml
index 3db0848..cff36f7 100644
--- a/packages/Shell/res/values/strings.xml
+++ b/packages/Shell/res/values/strings.xml
@@ -17,6 +17,8 @@
<resources>
<string name="app_label">Shell</string>
+ <!-- Title of notification indicating a bugreport process is in progress. [CHAR LIMIT=50] -->
+ <string name="bugreport_in_progress_title">Bug report in progress</string>
<!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
<string name="bugreport_finished_title">Bug report captured</string>
@@ -33,4 +35,8 @@
<!-- Title for documents backend that offers bugreports. -->
<string name="bugreport_storage_title">Bug reports</string>
+
+ <!-- Toast message sent when the bugreport file could be read. -->
+ <string name="bugreport_unreadable_text">Bug report file could not be read</string>
+
</resources>
diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
new file mode 100644
index 0000000..f41f52c
--- /dev/null
+++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java
@@ -0,0 +1,661 @@
+/*
+ * Copyright (C) 2015 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.shell;
+
+import static com.android.shell.BugreportPrefs.STATE_SHOW;
+import static com.android.shell.BugreportPrefs.getWarningState;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import libcore.io.Streams;
+
+import com.google.android.collect.Lists;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Notification;
+import android.app.Notification.Action;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Parcelable;
+import android.os.Process;
+import android.os.SystemProperties;
+import android.support.v4.content.FileProvider;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.util.Patterns;
+import android.util.SparseArray;
+import android.widget.Toast;
+
+/**
+ * Service used to keep progress of bug reports processes ({@code dumpstate}).
+ * <p>
+ * The workflow is:
+ * <ol>
+ * <li>When {@code dumpstate} starts, it sends a {@code BUGREPORT_STARTED} with its pid and the
+ * estimated total effort.
+ * <li>{@link BugreportReceiver} receives the intent and delegates it to this service.
+ * <li>Upon start, this service:
+ * <ol>
+ * <li>Issues a system notification so user can watch the progresss (which is 0% initially).
+ * <li>Polls the {@link SystemProperties} for updates on the {@code dumpstate} progress.
+ * <li>If the progress changed, it updates the system notification.
+ * </ol>
+ * <li>As {@code dumpstate} progresses, it updates the system property.
+ * <li>When {@code dumpstate} finishes, it sends a {@code BUGREPORT_FINISHED} intent.
+ * <li>{@link BugreportReceiver} receives the intent and delegates it to this service, which in
+ * turn:
+ * <ol>
+ * <li>Updates the system notification so user can share the bug report.
+ * <li>Stops monitoring that {@code dumpstate} process.
+ * <li>Stops itself if it doesn't have any process left to monitor.
+ * </ol>
+ * </ol>
+ */
+public class BugreportProgressService extends Service {
+ private static final String TAG = "Shell";
+ private static final boolean DEBUG = false;
+
+ private static final String AUTHORITY = "com.android.shell";
+
+ static final String INTENT_BUGREPORT_STARTED = "android.intent.action.BUGREPORT_STARTED";
+ static final String INTENT_BUGREPORT_FINISHED = "android.intent.action.BUGREPORT_FINISHED";
+ static final String INTENT_BUGREPORT_CANCEL = "android.intent.action.BUGREPORT_CANCEL";
+
+ static final String EXTRA_BUGREPORT = "android.intent.extra.BUGREPORT";
+ static final String EXTRA_SCREENSHOT = "android.intent.extra.SCREENSHOT";
+ static final String EXTRA_PID = "android.intent.extra.PID";
+ static final String EXTRA_MAX = "android.intent.extra.MAX";
+ static final String EXTRA_NAME = "android.intent.extra.NAME";
+ static final String EXTRA_ORIGINAL_INTENT = "android.intent.extra.ORIGINAL_INTENT";
+
+ private static final int MSG_SERVICE_COMMAND = 1;
+ private static final int MSG_POLL = 2;
+
+ /** Polling frequency, in milliseconds. */
+ private static final long POLLING_FREQUENCY = 500;
+
+ /** How long (in ms) a dumpstate process will be monitored if it didn't show progress. */
+ private static final long INACTIVITY_TIMEOUT = 3 * DateUtils.MINUTE_IN_MILLIS;
+
+ /** System property used for monitoring progress. */
+ private static final String PROPERTY_TEMPLATE_PROGRESS = "dumpstate.%d.progress";
+
+ /** System property (and value) used for stop dumpstate. */
+ private static final String PROPERTY_CTL_STOP = "ctl.stop";
+ private static final String BUGREPORT_SERVICE = "bugreport";
+
+ /** Managed dumpstate processes (keyed by pid) */
+ private final SparseArray<BugreportInfo> mProcesses = new SparseArray<>();
+
+ private Looper mServiceLooper;
+ private ServiceHandler mServiceHandler;
+
+ @Override
+ public void onCreate() {
+ HandlerThread thread = new HandlerThread("BugreportProgressServiceThread",
+ Process.THREAD_PRIORITY_BACKGROUND);
+ thread.start();
+
+ mServiceLooper = thread.getLooper();
+ mServiceHandler = new ServiceHandler(mServiceLooper);
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ if (intent != null) {
+ // Handle it in a separate thread.
+ Message msg = mServiceHandler.obtainMessage();
+ msg.what = MSG_SERVICE_COMMAND;
+ msg.obj = intent;
+ mServiceHandler.sendMessage(msg);
+ }
+
+ // If service is killed it cannot be recreated because it would not know which
+ // dumpstate PIDs it would have to watch.
+ return START_NOT_STICKY;
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ @Override
+ public void onDestroy() {
+ mServiceLooper.quit();
+ super.onDestroy();
+ }
+
+ @Override
+ protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+ writer.printf("Monitored dumpstate processes: \n");
+ synchronized (mProcesses) {
+ for (int i = 0; i < mProcesses.size(); i++) {
+ writer.printf("\t%s\n", mProcesses.valueAt(i));
+ }
+ }
+ }
+
+ private final class ServiceHandler extends Handler {
+ public ServiceHandler(Looper looper) {
+ super(looper);
+ pollProgress();
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ if (msg.what == MSG_POLL) {
+ pollProgress();
+ return;
+ }
+
+ if (msg.what != MSG_SERVICE_COMMAND) {
+ // Sanity check.
+ Log.e(TAG, "Invalid message type: " + msg.what);
+ return;
+ }
+
+ // At this point it's handling onStartCommand(), whose intent contains the extras
+ // originally received by BugreportReceiver.
+ if (!(msg.obj instanceof Intent)) {
+ // Sanity check.
+ Log.e(TAG, "Internal error: invalid msg.obj: " + msg.obj);
+ return;
+ }
+ final Parcelable parcel = ((Intent) msg.obj).getParcelableExtra(EXTRA_ORIGINAL_INTENT);
+ if (!(parcel instanceof Intent)) {
+ // Sanity check.
+ Log.e(TAG, "Internal error: msg.obj is missing extra " + EXTRA_ORIGINAL_INTENT);
+ return;
+ }
+
+ final Intent intent = (Intent) parcel;
+ final String action = intent.getAction();
+ int pid = intent.getIntExtra(EXTRA_PID, 0);
+ int max = intent.getIntExtra(EXTRA_MAX, -1);
+ String name = intent.getStringExtra(EXTRA_NAME);
+
+ if (DEBUG) Log.v(TAG, "action: " + action + ", name: " + name + ", pid: " + pid
+ + ", max: "+ max);
+ switch (action) {
+ case INTENT_BUGREPORT_STARTED:
+ if (!startProgress(name, pid, max)) {
+ stopSelfWhenDone();
+ return;
+ }
+ break;
+ case INTENT_BUGREPORT_FINISHED:
+ if (pid == -1) {
+ // Shouldn't happen, unless BUGREPORT_FINISHED is received from a legacy,
+ // out-of-sync dumpstate process.
+ Log.w(TAG, "Missing " + EXTRA_PID + " on intent " + intent);
+ }
+ stopProgress(pid, intent);
+ break;
+ case INTENT_BUGREPORT_CANCEL:
+ cancel(pid);
+ break;
+ default:
+ Log.w(TAG, "Unsupported intent: " + action);
+ }
+ return;
+
+ }
+
+ /**
+ * Creates the {@link BugreportInfo} for a process and issue a system notification to
+ * indicate its progress.
+ *
+ * @return whether it succeeded or not.
+ */
+ private boolean startProgress(String name, int pid, int max) {
+ if (name == null) {
+ Log.w(TAG, "Missing " + EXTRA_NAME + " on start intent");
+ name = "N/A";
+ }
+ if (pid == -1) {
+ Log.e(TAG, "Missing " + EXTRA_PID + " on start intent");
+ return false;
+ }
+ if (max <= 0) {
+ Log.e(TAG, "Invalid value for extra " + EXTRA_MAX + ": " + max);
+ return false;
+ }
+
+ final BugreportInfo info = new BugreportInfo(pid, name, max);
+ synchronized (mProcesses) {
+ if (mProcesses.indexOfKey(pid) >= 0) {
+ Log.w(TAG, "PID " + pid + " already watched");
+ } else {
+ mProcesses.put(info.pid, info);
+ }
+ }
+ updateProgress(info);
+ return true;
+ }
+
+ /**
+ * Updates the system notification for a given bug report.
+ */
+ private void updateProgress(BugreportInfo info) {
+ if (info.max <= 0 || info.progress < 0 || info.name == null) {
+ Log.e(TAG, "Invalid progress values for " + info);
+ return;
+ }
+
+ final Context context = getApplicationContext();
+ final NumberFormat nf = NumberFormat.getPercentInstance();
+ nf.setMinimumFractionDigits(2);
+ nf.setMaximumFractionDigits(2);
+ final String percentText = nf.format((double) info.progress / info.max);
+
+ final Intent cancelIntent = new Intent(context, BugreportReceiver.class);
+ cancelIntent.setAction(INTENT_BUGREPORT_CANCEL);
+ cancelIntent.putExtra(EXTRA_PID, info.pid);
+ final Action cancelAction = new Action.Builder(null,
+ context.getString(com.android.internal.R.string.cancel),
+ PendingIntent.getBroadcast(context, info.pid, cancelIntent,
+ PendingIntent.FLAG_CANCEL_CURRENT)).build();
+
+ final String title = context.getString(R.string.bugreport_in_progress_title);
+ final Notification notification = new Notification.Builder(context)
+ .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)
+ .setContentTitle(title)
+ .setTicker(title)
+ .setContentText(info.name)
+ .setContentInfo(percentText)
+ .setProgress(info.max, info.progress, false)
+ .setOngoing(true)
+ .setLocalOnly(true)
+ .setColor(context.getColor(
+ com.android.internal.R.color.system_notification_accent_color))
+ .addAction(cancelAction)
+ .build();
+
+ NotificationManager.from(context).notify(TAG, info.pid, notification);
+ }
+
+ /**
+ * Finalizes the progress on a given process and sends the finished intent.
+ */
+ private void stopProgress(int pid, Intent intent) {
+ synchronized (mProcesses) {
+ if (mProcesses.indexOfKey(pid) < 0) {
+ Log.w(TAG, "PID not watched: " + pid);
+ } else {
+ mProcesses.remove(pid);
+ }
+ stopSelfWhenDone();
+ }
+ if (DEBUG) Log.v(TAG, "stopProgress(" + pid + "): cancel notification");
+ NotificationManager.from(getApplicationContext()).cancel(TAG, pid);
+ if (intent != null) {
+ // Bug report finished fine: send a new, different notification.
+ if (DEBUG) Log.v(TAG, "stopProgress(" + pid + "): finish bug report");
+ onBugreportFinished(pid, intent);
+ }
+ }
+
+ /**
+ * Cancels a bugreport upon user's request.
+ */
+ private void cancel(int pid) {
+ Log.i(TAG, "Cancelling PID " + pid + " on user's request");
+ SystemProperties.set(PROPERTY_CTL_STOP, BUGREPORT_SERVICE);
+ stopProgress(pid, null);
+ }
+
+ /**
+ * Poll {@link SystemProperties} to get the progress on each monitored process.
+ */
+ private void pollProgress() {
+ synchronized (mProcesses) {
+ if (mProcesses.size() == 0) {
+ Log.d(TAG, "No process to poll progress.");
+ }
+ for (int i = 0; i < mProcesses.size(); i++) {
+ int pid = mProcesses.keyAt(i);
+ String property = String.format(PROPERTY_TEMPLATE_PROGRESS, pid);
+ int progress = SystemProperties.getInt(property, 0);
+ if (progress == 0) {
+ Log.v(TAG, "System property " + property + " is not set yet");
+ continue;
+ }
+
+ BugreportInfo info = mProcesses.valueAt(i);
+
+ if (progress != info.progress) {
+ if (DEBUG) Log.v(TAG, "Updating progress for PID " + pid + " from "
+ + info.progress + " to " + progress);
+ info.progress = progress;
+ info.lastUpdate = System.currentTimeMillis();
+ updateProgress(info);
+ } else {
+ long inactiveTime = System.currentTimeMillis() - info.lastUpdate;
+ if (inactiveTime >= INACTIVITY_TIMEOUT) {
+ Log.w(TAG, "No progress update for process " + pid + " since "
+ + info.getFormattedLastUpdate());
+ stopProgress(info.pid, null);
+ }
+ }
+ }
+ // Keep polling...
+ sendEmptyMessageDelayed(MSG_POLL, POLLING_FREQUENCY);
+ }
+ }
+
+ /**
+ * Finishes the service when it's not monitoring any more processes.
+ */
+ private void stopSelfWhenDone() {
+ synchronized (mProcesses) {
+ if (mProcesses.size() > 0) {
+ if (DEBUG) Log.v(TAG, "Staying alive, waiting for pids " + mProcesses);
+ return;
+ }
+ Log.v(TAG, "No more pids to handle, shutting down");
+ stopSelf();
+ }
+ }
+
+ private void onBugreportFinished(int pid, Intent intent) {
+ final Context context = getApplicationContext();
+ final Configuration conf = context.getResources().getConfiguration();
+ final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT);
+ final File screenshotFile = getFileExtra(intent, EXTRA_SCREENSHOT);
+
+ if ((conf.uiMode & Configuration.UI_MODE_TYPE_MASK) != Configuration.UI_MODE_TYPE_WATCH) {
+ triggerLocalNotification(context, pid, bugreportFile, screenshotFile);
+ }
+ }
+ }
+
+ /**
+ * Responsible for triggering a notification that allows the user to start a "share" intent with
+ * the bug report. On watches we have other methods to allow the user to start this intent
+ * (usually by triggering it on another connected device); we don't need to display the
+ * notification in this case.
+ */
+ private static void triggerLocalNotification(final Context context, final int pid,
+ final File bugreportFile, final File screenshotFile) {
+ if (!bugreportFile.exists() || !bugreportFile.canRead()) {
+ Log.e(TAG, "Could not read bugreport file " + bugreportFile);
+ Toast.makeText(context, context.getString(R.string.bugreport_unreadable_text),
+ Toast.LENGTH_LONG).show();
+ return;
+ }
+
+ boolean isPlainText = bugreportFile.getName().toLowerCase().endsWith(".txt");
+ if (!isPlainText) {
+ // Already zipped, send it right away.
+ sendBugreportNotification(context, pid, bugreportFile, screenshotFile);
+ } else {
+ // Asynchronously zip the file first, then send it.
+ sendZippedBugreportNotification(context, pid, bugreportFile, screenshotFile);
+ }
+ }
+
+ private static Intent buildWarningIntent(Context context, Intent sendIntent) {
+ final Intent intent = new Intent(context, BugreportWarningActivity.class);
+ intent.putExtra(Intent.EXTRA_INTENT, sendIntent);
+ return intent;
+ }
+
+ /**
+ * Build {@link Intent} that can be used to share the given bugreport.
+ */
+ private static Intent buildSendIntent(Context context, Uri bugreportUri, Uri screenshotUri) {
+ final Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
+ final String mimeType = "application/vnd.android.bugreport";
+ intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ intent.addCategory(Intent.CATEGORY_DEFAULT);
+ intent.setType(mimeType);
+
+ intent.putExtra(Intent.EXTRA_SUBJECT, bugreportUri.getLastPathSegment());
+
+ // EXTRA_TEXT should be an ArrayList, but some clients are expecting a single String.
+ // So, to avoid an exception on Intent.migrateExtraStreamToClipData(), we need to manually
+ // create the ClipData object with the attachments URIs.
+ String messageBody = String.format("Build info: %s\nSerial number:%s",
+ SystemProperties.get("ro.build.description"), SystemProperties.get("ro.serialno"));
+ intent.putExtra(Intent.EXTRA_TEXT, messageBody);
+ final ClipData clipData = new ClipData(null, new String[] { mimeType },
+ new ClipData.Item(null, null, null, bugreportUri));
+ final ArrayList<Uri> attachments = Lists.newArrayList(bugreportUri);
+ if (screenshotUri != null) {
+ clipData.addItem(new ClipData.Item(null, null, null, screenshotUri));
+ attachments.add(screenshotUri);
+ }
+ intent.setClipData(clipData);
+ intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, attachments);
+
+ final Account sendToAccount = findSendToAccount(context);
+ if (sendToAccount != null) {
+ intent.putExtra(Intent.EXTRA_EMAIL, new String[] { sendToAccount.name });
+ }
+
+ return intent;
+ }
+
+ /**
+ * Sends a bugreport notitication.
+ */
+ private static void sendBugreportNotification(Context context, int pid, File bugreportFile,
+ File screenshotFile) {
+ // Files are kept on private storage, so turn into Uris that we can
+ // grant temporary permissions for.
+ final Uri bugreportUri = getUri(context, bugreportFile);
+ final Uri screenshotUri = getUri(context, screenshotFile);
+
+ Intent sendIntent = buildSendIntent(context, bugreportUri, screenshotUri);
+ Intent notifIntent;
+
+ // Send through warning dialog by default
+ if (getWarningState(context, STATE_SHOW) == STATE_SHOW) {
+ notifIntent = buildWarningIntent(context, sendIntent);
+ } else {
+ notifIntent = sendIntent;
+ }
+ notifIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ final String title = context.getString(R.string.bugreport_finished_title);
+ final Notification.Builder builder = new Notification.Builder(context)
+ .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)
+ .setContentTitle(title)
+ .setTicker(title)
+ .setContentText(context.getString(R.string.bugreport_finished_text))
+ .setContentIntent(PendingIntent.getActivity(
+ context, 0, notifIntent, PendingIntent.FLAG_CANCEL_CURRENT))
+ .setAutoCancel(true)
+ .setLocalOnly(true)
+ .setColor(context.getColor(
+ com.android.internal.R.color.system_notification_accent_color));
+
+ NotificationManager.from(context).notify(TAG, pid, builder.build());
+ }
+
+ /**
+ * Sends a zipped bugreport notification.
+ */
+ private static void sendZippedBugreportNotification(final Context context,
+ final int pid, final File bugreportFile, final File screenshotFile) {
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ File zippedFile = zipBugreport(bugreportFile);
+ sendBugreportNotification(context, pid, zippedFile, screenshotFile);
+ return null;
+ }
+ }.execute();
+ }
+
+ /**
+ * Zips a bugreport file, returning the path to the new file (or to the
+ * original in case of failure).
+ */
+ private static File zipBugreport(File bugreportFile) {
+ String bugreportPath = bugreportFile.getAbsolutePath();
+ String zippedPath = bugreportPath.replace(".txt", ".zip");
+ Log.v(TAG, "zipping " + bugreportPath + " as " + zippedPath);
+ File bugreportZippedFile = new File(zippedPath);
+ try (InputStream is = new FileInputStream(bugreportFile);
+ ZipOutputStream zos = new ZipOutputStream(
+ new BufferedOutputStream(new FileOutputStream(bugreportZippedFile)))) {
+ ZipEntry entry = new ZipEntry(bugreportFile.getName());
+ entry.setTime(bugreportFile.lastModified());
+ zos.putNextEntry(entry);
+ int totalBytes = Streams.copy(is, zos);
+ Log.v(TAG, "size of original bugreport: " + totalBytes + " bytes");
+ zos.closeEntry();
+ // Delete old file;
+ boolean deleted = bugreportFile.delete();
+ if (deleted) {
+ Log.v(TAG, "deleted original bugreport (" + bugreportPath + ")");
+ } else {
+ Log.e(TAG, "could not delete original bugreport (" + bugreportPath + ")");
+ }
+ return bugreportZippedFile;
+ } catch (IOException e) {
+ Log.e(TAG, "exception zipping file " + zippedPath, e);
+ return bugreportFile; // Return original.
+ }
+ }
+
+ /**
+ * Find the best matching {@link Account} based on build properties.
+ */
+ private static Account findSendToAccount(Context context) {
+ final AccountManager am = (AccountManager) context.getSystemService(
+ Context.ACCOUNT_SERVICE);
+
+ String preferredDomain = SystemProperties.get("sendbug.preferred.domain");
+ if (!preferredDomain.startsWith("@")) {
+ preferredDomain = "@" + preferredDomain;
+ }
+
+ final Account[] accounts = am.getAccounts();
+ Account foundAccount = null;
+ for (Account account : accounts) {
+ if (Patterns.EMAIL_ADDRESS.matcher(account.name).matches()) {
+ if (!preferredDomain.isEmpty()) {
+ // if we have a preferred domain and it matches, return; otherwise keep
+ // looking
+ if (account.name.endsWith(preferredDomain)) {
+ return account;
+ } else {
+ foundAccount = account;
+ }
+ // if we don't have a preferred domain, just return since it looks like
+ // an email address
+ } else {
+ return account;
+ }
+ }
+ }
+ return foundAccount;
+ }
+
+ private static Uri getUri(Context context, File file) {
+ return file != null ? FileProvider.getUriForFile(context, AUTHORITY, file) : null;
+ }
+
+ static File getFileExtra(Intent intent, String key) {
+ final String path = intent.getStringExtra(key);
+ if (path != null) {
+ return new File(path);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Information about a bug report process while its in progress.
+ */
+ private static final class BugreportInfo {
+ /**
+ * {@code pid} of the {@code dumpstate} process generating the bug report.
+ */
+ final int pid;
+
+ /**
+ * Name of the bug report, will be used to rename the final files.
+ * <p>
+ * Initial value is the bug report filename reported by {@code dumpstate}, but user can
+ * change it later to a more meaningful name.
+ */
+ final String name;
+
+ /**
+ * Maximum progress of the bug report generation.
+ */
+ final int max;
+
+ /**
+ * Current progress of the bug report generation.
+ */
+ int progress;
+
+ /**
+ * Time of the last progress update.
+ */
+ long lastUpdate = System.currentTimeMillis();
+
+ BugreportInfo(int pid, String name, int max) {
+ this.pid = pid;
+ this.name = name;
+ this.max = max;
+ }
+
+ String getFormattedLastUpdate() {
+ return SimpleDateFormat.getDateTimeInstance().format(new Date(lastUpdate));
+ }
+
+ @Override
+ public String toString() {
+ final float percent = ((float) progress * 100 / max);
+ return String.format("Progress for %s (pid=%d): %d/%d (%2.2f%%) Last update: %s", name,
+ pid, progress, max, percent,
+ getFormattedLastUpdate());
+ }
+ }
+}
diff --git a/packages/Shell/src/com/android/shell/BugreportReceiver.java b/packages/Shell/src/com/android/shell/BugreportReceiver.java
index e90a3b5..5133162 100644
--- a/packages/Shell/src/com/android/shell/BugreportReceiver.java
+++ b/packages/Shell/src/com/android/shell/BugreportReceiver.java
@@ -16,52 +16,25 @@
package com.android.shell;
-import static com.android.shell.BugreportPrefs.STATE_SHOW;
-import static com.android.shell.BugreportPrefs.getWarningState;
+import static com.android.shell.BugreportProgressService.EXTRA_BUGREPORT;
+import static com.android.shell.BugreportProgressService.EXTRA_ORIGINAL_INTENT;
+import static com.android.shell.BugreportProgressService.INTENT_BUGREPORT_FINISHED;
+import static com.android.shell.BugreportProgressService.getFileExtra;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
+import java.io.File;
+
import android.content.BroadcastReceiver;
-import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Configuration;
-import android.net.Uri;
import android.os.AsyncTask;
import android.os.FileUtils;
-import android.os.SystemProperties;
-import android.support.v4.content.FileProvider;
import android.text.format.DateUtils;
-import android.util.Log;
-import android.util.Patterns;
-
-import com.google.android.collect.Lists;
-import libcore.io.Streams;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-import java.util.ArrayList;
/**
* Receiver that handles finished bugreports, usually by attaching them to an
- * {@link Intent#ACTION_SEND}.
+ * {@link Intent#ACTION_SEND_MULTIPLE}.
*/
public class BugreportReceiver extends BroadcastReceiver {
- private static final String TAG = "Shell";
-
- private static final String AUTHORITY = "com.android.shell";
-
- private static final String EXTRA_BUGREPORT = "android.intent.extra.BUGREPORT";
- private static final String EXTRA_SCREENSHOT = "android.intent.extra.SCREENSHOT";
/**
* Always keep the newest 8 bugreport files; 4 reports and 4 screenshots are
@@ -76,15 +49,20 @@
@Override
public void onReceive(Context context, Intent intent) {
- final Configuration conf = context.getResources().getConfiguration();
- final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT);
- final File screenshotFile = getFileExtra(intent, EXTRA_SCREENSHOT);
-
- if ((conf.uiMode & Configuration.UI_MODE_TYPE_MASK) != Configuration.UI_MODE_TYPE_WATCH) {
- triggerLocalNotification(context, bugreportFile, screenshotFile);
- }
-
// Clean up older bugreports in background
+ cleanupOldFiles(intent);
+
+ // Delegate intent handling to service.
+ Intent serviceIntent = new Intent(context, BugreportProgressService.class);
+ serviceIntent.putExtra(EXTRA_ORIGINAL_INTENT, intent);
+ context.startService(serviceIntent);
+ }
+
+ private void cleanupOldFiles(Intent intent) {
+ if (!INTENT_BUGREPORT_FINISHED.equals(intent.getAction())) {
+ return;
+ }
+ final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT);
final PendingResult result = goAsync();
new AsyncTask<Void, Void, Void>() {
@Override
@@ -96,188 +74,4 @@
}
}.execute();
}
-
- /**
- * Responsible for triggering a notification that allows the user to start a
- * "share" intent with the bug report. On watches we have other methods to allow the user to
- * start this intent (usually by triggering it on another connected device); we don't need to
- * display the notification in this case.
- */
- private void triggerLocalNotification(final Context context, final File bugreportFile,
- final File screenshotFile) {
- boolean isPlainText = bugreportFile.getName().toLowerCase().endsWith(".txt");
- if (!isPlainText) {
- // Already zipped, send it right away.
- sendBugreportNotification(context, bugreportFile, screenshotFile);
- } else {
- // Asynchronously zip the file first, then send it.
- sendZippedBugreportNotification(context, bugreportFile, screenshotFile);
- }
- }
-
- private static Intent buildWarningIntent(Context context, Intent sendIntent) {
- final Intent intent = new Intent(context, BugreportWarningActivity.class);
- intent.putExtra(Intent.EXTRA_INTENT, sendIntent);
- return intent;
- }
-
- /**
- * Build {@link Intent} that can be used to share the given bugreport.
- */
- private static Intent buildSendIntent(Context context, Uri bugreportUri, Uri screenshotUri) {
- final Intent intent = new Intent(Intent.ACTION_SEND_MULTIPLE);
- final String mimeType = "application/vnd.android.bugreport";
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
- intent.setType(mimeType);
-
- intent.putExtra(Intent.EXTRA_SUBJECT, bugreportUri.getLastPathSegment());
-
- // EXTRA_TEXT should be an ArrayList, but some clients are expecting a single String.
- // So, to avoid an exception on Intent.migrateExtraStreamToClipData(), we need to manually
- // create the ClipData object with the attachments URIs.
- String messageBody = String.format("Build info: %s\nSerial number:%s",
- SystemProperties.get("ro.build.description"), SystemProperties.get("ro.serialno"));
- intent.putExtra(Intent.EXTRA_TEXT, messageBody);
- final ClipData clipData = new ClipData(null, new String[] { mimeType },
- new ClipData.Item(null, null, null, bugreportUri));
- clipData.addItem(new ClipData.Item(null, null, null, screenshotUri));
- intent.setClipData(clipData);
-
- final ArrayList<Uri> attachments = Lists.newArrayList(bugreportUri, screenshotUri);
- intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, attachments);
-
- final Account sendToAccount = findSendToAccount(context);
- if (sendToAccount != null) {
- intent.putExtra(Intent.EXTRA_EMAIL, new String[] { sendToAccount.name });
- }
-
- return intent;
- }
-
- /**
- * Sends a bugreport notitication.
- */
- private static void sendBugreportNotification(Context context, File bugreportFile,
- File screenshotFile) {
- // Files are kept on private storage, so turn into Uris that we can
- // grant temporary permissions for.
- final Uri bugreportUri = FileProvider.getUriForFile(context, AUTHORITY, bugreportFile);
- final Uri screenshotUri = FileProvider.getUriForFile(context, AUTHORITY, screenshotFile);
-
- Intent sendIntent = buildSendIntent(context, bugreportUri, screenshotUri);
- Intent notifIntent;
-
- // Send through warning dialog by default
- if (getWarningState(context, STATE_SHOW) == STATE_SHOW) {
- notifIntent = buildWarningIntent(context, sendIntent);
- } else {
- notifIntent = sendIntent;
- }
- notifIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
- final Notification.Builder builder = new Notification.Builder(context)
- .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)
- .setContentTitle(context.getString(R.string.bugreport_finished_title))
- .setTicker(context.getString(R.string.bugreport_finished_title))
- .setContentText(context.getString(R.string.bugreport_finished_text))
- .setContentIntent(PendingIntent.getActivity(
- context, 0, notifIntent, PendingIntent.FLAG_CANCEL_CURRENT))
- .setAutoCancel(true)
- .setLocalOnly(true)
- .setColor(context.getColor(
- com.android.internal.R.color.system_notification_accent_color));
-
- NotificationManager.from(context).notify(TAG, 0, builder.build());
- }
-
- /**
- * Sends a zipped bugreport notification.
- */
- private static void sendZippedBugreportNotification(final Context context,
- final File bugreportFile, final File screenshotFile) {
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... params) {
- File zippedFile = zipBugreport(bugreportFile);
- sendBugreportNotification(context, zippedFile, screenshotFile);
- return null;
- }
- }.execute();
- }
-
- /**
- * Zips a bugreport file, returning the path to the new file (or to the
- * original in case of failure).
- */
- private static File zipBugreport(File bugreportFile) {
- String bugreportPath = bugreportFile.getAbsolutePath();
- String zippedPath = bugreportPath.replace(".txt", ".zip");
- Log.v(TAG, "zipping " + bugreportPath + " as " + zippedPath);
- File bugreportZippedFile = new File(zippedPath);
- try (InputStream is = new FileInputStream(bugreportFile);
- ZipOutputStream zos = new ZipOutputStream(
- new BufferedOutputStream(new FileOutputStream(bugreportZippedFile)))) {
- ZipEntry entry = new ZipEntry(bugreportFile.getName());
- entry.setTime(bugreportFile.lastModified());
- zos.putNextEntry(entry);
- int totalBytes = Streams.copy(is, zos);
- Log.v(TAG, "size of original bugreport: " + totalBytes + " bytes");
- zos.closeEntry();
- // Delete old file;
- boolean deleted = bugreportFile.delete();
- if (deleted) {
- Log.v(TAG, "deleted original bugreport (" + bugreportPath + ")");
- } else {
- Log.e(TAG, "could not delete original bugreport (" + bugreportPath + ")");
- }
- return bugreportZippedFile;
- } catch (IOException e) {
- Log.e(TAG, "exception zipping file " + zippedPath, e);
- return bugreportFile; // Return original.
- }
- }
-
- /**
- * Find the best matching {@link Account} based on build properties.
- */
- private static Account findSendToAccount(Context context) {
- final AccountManager am = (AccountManager) context.getSystemService(
- Context.ACCOUNT_SERVICE);
-
- String preferredDomain = SystemProperties.get("sendbug.preferred.domain");
- if (!preferredDomain.startsWith("@")) {
- preferredDomain = "@" + preferredDomain;
- }
-
- final Account[] accounts = am.getAccounts();
- Account foundAccount = null;
- for (Account account : accounts) {
- if (Patterns.EMAIL_ADDRESS.matcher(account.name).matches()) {
- if (!preferredDomain.isEmpty()) {
- // if we have a preferred domain and it matches, return; otherwise keep
- // looking
- if (account.name.endsWith(preferredDomain)) {
- return account;
- } else {
- foundAccount = account;
- }
- // if we don't have a preferred domain, just return since it looks like
- // an email address
- } else {
- return account;
- }
- }
- }
- return foundAccount;
- }
-
- private static File getFileExtra(Intent intent, String key) {
- final String path = intent.getStringExtra(key);
- if (path != null) {
- return new File(path);
- } else {
- return null;
- }
- }
}
diff --git a/packages/Shell/tests/Android.mk b/packages/Shell/tests/Android.mk
new file mode 100644
index 0000000..62a37bc
--- /dev/null
+++ b/packages/Shell/tests/Android.mk
@@ -0,0 +1,20 @@
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+# TODO: update and/or remove
+LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator
+#LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 mockito-target ub-uiautomator
+
+LOCAL_PACKAGE_NAME := ShellTests
+LOCAL_INSTRUMENTATION_FOR := Shell
+
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
diff --git a/packages/Shell/tests/AndroidManifest.xml b/packages/Shell/tests/AndroidManifest.xml
new file mode 100644
index 0000000..54b0802
--- /dev/null
+++ b/packages/Shell/tests/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 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.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.shell.tests">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+
+ <activity
+ android:name="com.android.shell.ActionSendMultipleConsumerActivity"
+ android:label="ActionSendMultipleConsumer"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:noHistory="true"
+ android:excludeFromRecents="true">
+ <intent-filter>
+ <action android:name="android.intent.action.SEND_MULTIPLE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="*/*" />
+ </intent-filter>
+ </activity>
+ </application>
+
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.shell"
+ android:label="Tests for Shell" />
+
+</manifest>
diff --git a/packages/Shell/tests/src/com/android/shell/ActionSendMultipleConsumerActivity.java b/packages/Shell/tests/src/com/android/shell/ActionSendMultipleConsumerActivity.java
new file mode 100644
index 0000000..e3e99b0
--- /dev/null
+++ b/packages/Shell/tests/src/com/android/shell/ActionSendMultipleConsumerActivity.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2015 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.shell;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+
+/**
+ * Activity responsible for handling ACTION_SEND_MULTIPLE intents and passing them back to the test
+ * case class (through a {@link CustomActionSendMultipleListener}).
+ */
+public class ActionSendMultipleConsumerActivity extends Activity {
+
+ private static final String CUSTOM_ACTION_SEND_MULTIPLE_INTENT =
+ "com.android.shell.tests.CUSTOM_ACTION_SEND_MULTIPLE";
+
+ private static CustomActionSendMultipleListener sListener;
+
+ static final String UI_NAME = "ActionSendMultipleConsumer";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // The original intent cannot be broadcasted, it will fail due to security violations.
+ // Since the test case is only interested in the extras, we need to create a new custom
+ // intent with just them.
+ final Intent intent = getIntent();
+ final Intent customIntent = new Intent(CUSTOM_ACTION_SEND_MULTIPLE_INTENT);
+ customIntent.putExtras(intent.getExtras());
+
+ getApplicationContext().sendBroadcast(customIntent);
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ /*
+ * TODO: if finish() is not called, app will crash with an exception such as:
+ * AndroidRuntime: java.lang.RuntimeException: Unable to resume activity
+ * {com.android.shell.tests/com.android.shell.SendMultipleActivity}:
+ * java.lang.IllegalStateException: Activity
+ * {com.android.shell.tests/com.android.shell.SendMultipleActivity} did not call finish()
+ * prior to onResume() completing. That seems to be a problem on M:
+ * https://code.google.com/p/android-developer-preview/issues/detail?id=2353
+ */
+ finish();
+ }
+
+ /**
+ * Gets the {@link CustomActionSendMultipleListener} singleton.
+ */
+ static CustomActionSendMultipleListener getListener(Context context) {
+ synchronized (ActionSendMultipleConsumerActivity.class) {
+ if (sListener == null) {
+ sListener = new CustomActionSendMultipleListener(context);
+ }
+ }
+ return sListener;
+ }
+
+ /**
+ * Listener of custom ACTION_SEND_MULTIPLE_INTENTS.
+ */
+ static class CustomActionSendMultipleListener {
+
+ private static final int TIMEOUT = 10;
+ private final BlockingQueue<Bundle> mQueue = new SynchronousQueue<>();
+
+ public CustomActionSendMultipleListener(Context context) {
+ BroadcastReceiver receiver = new BroadcastReceiver() {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ try {
+ mQueue.put(intent.getExtras());
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ };
+
+ final IntentFilter filter = new IntentFilter();
+ filter.addAction(CUSTOM_ACTION_SEND_MULTIPLE_INTENT);
+ context.registerReceiver(receiver, filter);
+ }
+
+ /**
+ * Gets the extras from the custom intent, blocking until it's received.
+ */
+ Bundle getExtras() {
+ Bundle bundle = null;
+ try {
+ bundle = mQueue.poll(TIMEOUT, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ if (bundle == null) {
+ throw new IllegalStateException("Intent not received after " + TIMEOUT + "s");
+ }
+ return bundle;
+ }
+ }
+}
diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
new file mode 100644
index 0000000..33c4ef1
--- /dev/null
+++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2015 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.shell;
+
+import static android.test.MoreAsserts.assertContainsRegex;
+import static com.android.shell.ActionSendMultipleConsumerActivity.UI_NAME;
+import static com.android.shell.BugreportProgressService.EXTRA_BUGREPORT;
+import static com.android.shell.BugreportProgressService.EXTRA_MAX;
+import static com.android.shell.BugreportProgressService.EXTRA_NAME;
+import static com.android.shell.BugreportProgressService.EXTRA_PID;
+import static com.android.shell.BugreportProgressService.EXTRA_SCREENSHOT;
+import static com.android.shell.BugreportProgressService.INTENT_BUGREPORT_FINISHED;
+import static com.android.shell.BugreportProgressService.INTENT_BUGREPORT_STARTED;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import libcore.io.Streams;
+import android.app.Instrumentation;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.service.notification.StatusBarNotification;
+import android.support.test.uiautomator.UiDevice;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+
+import com.android.shell.ActionSendMultipleConsumerActivity.CustomActionSendMultipleListener;
+
+/**
+ * Integration tests for {@link BugreportReceiver}.
+ * <p>
+ * These tests don't mock any component and rely on external UI components (like the notification
+ * bar and activity chooser), which can make them unreliable and slow.
+ * <p>
+ * The general workflow is:
+ * <ul>
+ * <li>creates the bug report files
+ * <li>generates the BUGREPORT_FINISHED intent
+ * <li>emulate user actions to share the intent with a custom activity
+ * <li>asserts the extras received by the custom activity
+ * </ul>
+ * <p>
+ * TODO: currently, these tests only work if the bug report sharing warning is disabled and the
+ * device screen is unlocked.
+ */
+public class BugreportReceiverTest extends InstrumentationTestCase {
+
+ private static final String TAG = "BugreportReceiverTest";
+
+ // Timeout for UI operations, in milliseconds.
+ private static final int TIMEOUT = 1000;
+
+ private static final String ROOT_DIR = "/data/data/com.android.shell/files/bugreports";
+ private static final String BUGREPORT_FILE = "test_bugreport.txt";
+ private static final String ZIP_FILE = "test_bugreport.zip";
+ private static final String PLAIN_TEXT_PATH = ROOT_DIR + "/" + BUGREPORT_FILE;
+ private static final String ZIP_PATH = ROOT_DIR + "/" + ZIP_FILE;
+ private static final String SCREENSHOT_PATH = ROOT_DIR + "/test_screenshot.png";
+
+ private static final String BUGREPORT_CONTENT = "Dump, might as well dump!\n";
+ private static final String SCREENSHOT_CONTENT = "A picture is worth a thousand words!\n";
+
+ private Context mContext;
+ private UiBot mUiBot;
+ private CustomActionSendMultipleListener mListener;
+
+ @Override
+ protected void setUp() throws Exception {
+ Instrumentation instrumentation = getInstrumentation();
+ mContext = instrumentation.getTargetContext();
+ mUiBot = new UiBot(UiDevice.getInstance(instrumentation), TIMEOUT);
+ mListener = ActionSendMultipleConsumerActivity.getListener(mContext);
+ cancelExistingNotifications();
+ }
+
+ public void testFullWorkflow() throws Exception {
+ final String name = "BUG, Y U NO REPORT?";
+ // TODO: call method to remove property instead
+ SystemProperties.set("dumpstate.42.progress", "-1");
+
+ Intent intent = new Intent(INTENT_BUGREPORT_STARTED);
+ intent.putExtra(EXTRA_PID, 42);
+ intent.putExtra(EXTRA_NAME, name);
+ intent.putExtra(EXTRA_MAX, 1000);
+ mContext.sendBroadcast(intent);
+
+ assertProgressNotification(name, "0.00%");
+
+ SystemProperties.set("dumpstate.42.progress", "108");
+ assertProgressNotification(name, "10.80%");
+
+ SystemProperties.set("dumpstate.42.progress", "500");
+ assertProgressNotification(name, "50.00%");
+
+ createTextFile(PLAIN_TEXT_PATH, BUGREPORT_CONTENT);
+ createTextFile(SCREENSHOT_PATH, SCREENSHOT_CONTENT);
+ Bundle extras = sendBugreportFinishedIntent(42, PLAIN_TEXT_PATH, SCREENSHOT_PATH);
+ assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT);
+
+ // TODO: assert service is down
+ }
+
+ public void testBugreportFinished_plainBugreportAndScreenshot() throws Exception {
+ createTextFile(PLAIN_TEXT_PATH, BUGREPORT_CONTENT);
+ createTextFile(SCREENSHOT_PATH, SCREENSHOT_CONTENT);
+ Bundle extras = sendBugreportFinishedIntent(PLAIN_TEXT_PATH, SCREENSHOT_PATH);
+ assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT);
+ }
+
+ public void testBugreportFinished_zippedBugreportAndScreenshot() throws Exception {
+ createZipFile(ZIP_PATH, BUGREPORT_FILE, BUGREPORT_CONTENT);
+ createTextFile(SCREENSHOT_PATH, SCREENSHOT_CONTENT);
+ Bundle extras = sendBugreportFinishedIntent(ZIP_PATH, SCREENSHOT_PATH);
+ assertActionSendMultiple(extras, BUGREPORT_CONTENT, SCREENSHOT_CONTENT);
+ }
+
+ public void testBugreportFinished_plainBugreportAndNoScreenshot() throws Exception {
+ createTextFile(PLAIN_TEXT_PATH, BUGREPORT_CONTENT);
+ Bundle extras = sendBugreportFinishedIntent(PLAIN_TEXT_PATH, null);
+ assertActionSendMultiple(extras, BUGREPORT_CONTENT, null);
+ }
+
+ public void testBugreportFinished_zippedBugreportAndNoScreenshot() throws Exception {
+ createZipFile(ZIP_PATH, BUGREPORT_FILE, BUGREPORT_CONTENT);
+ Bundle extras = sendBugreportFinishedIntent(ZIP_PATH, null);
+ assertActionSendMultiple(extras, BUGREPORT_CONTENT, null);
+ }
+
+ private void cancelExistingNotifications() {
+ NotificationManager nm = NotificationManager.from(mContext);
+ for (StatusBarNotification notification : nm.getActiveNotifications()) {
+ int id = notification.getId();
+ Log.i(TAG, "Canceling existing notification (id=" + id + ")");
+ nm.cancel(id);
+ }
+ }
+
+ private void assertProgressNotification(String name, String percent) {
+ // TODO: it current looks for 3 distinct objects, without taking advantage of their
+ // relationship.
+ String title = mContext.getString(R.string.bugreport_in_progress_title);
+ Log.v(TAG, "Looking for progress notification title: '" + title+ "'");
+ mUiBot.getNotification(title);
+ Log.v(TAG, "Looking for progress notification details: '" + name + "-" + percent + "'");
+ mUiBot.getObject(name);
+ mUiBot.getObject(percent);
+ }
+
+ /**
+ * Sends a "bugreport finished" intent and waits for the result.
+ *
+ * @return extras sent to the bugreport finished consumer.
+ */
+ private Bundle sendBugreportFinishedIntent(String bugreportPath, String screenshotPath) {
+ return sendBugreportFinishedIntent(null, bugreportPath, screenshotPath);
+ }
+
+ private Bundle sendBugreportFinishedIntent(Integer pid, String bugreportPath,
+ String screenshotPath) {
+ Intent intent = new Intent(INTENT_BUGREPORT_FINISHED);
+ if (pid != null) {
+ intent.putExtra(EXTRA_PID, pid);
+ }
+ if (bugreportPath != null) {
+ intent.putExtra(EXTRA_BUGREPORT, bugreportPath);
+ }
+ if (screenshotPath != null) {
+ intent.putExtra(EXTRA_SCREENSHOT, screenshotPath);
+ }
+
+ mContext.sendBroadcast(intent);
+
+ mUiBot.clickOnNotification(mContext.getString(R.string.bugreport_finished_title));
+ mUiBot.chooseActivity(UI_NAME);
+ return mListener.getExtras();
+ }
+
+ /**
+ * Asserts the proper ACTION_SEND_MULTIPLE intent was sent.
+ */
+ private void assertActionSendMultiple(Bundle extras, String bugreportContent,
+ String screenshotContent) throws IOException {
+ String body = extras.getString(Intent.EXTRA_TEXT);
+ assertContainsRegex("missing build info",
+ SystemProperties.get("ro.build.description"), body);
+ assertContainsRegex("missing serial number",
+ SystemProperties.get("ro.serialno"), body);
+
+ assertEquals("wrong subject", ZIP_FILE, extras.getString(Intent.EXTRA_SUBJECT));
+
+ List<Uri> attachments = extras.getParcelableArrayList(Intent.EXTRA_STREAM);
+ int expectedSize = screenshotContent != null ? 2 : 1;
+ assertEquals("wrong number of attachments", expectedSize, attachments.size());
+
+ // Need to interact through all attachments, since order is not guaranteed.
+ Uri zipUri = null, screenshotUri = null;
+ for (Uri attachment : attachments) {
+ if (attachment.getPath().endsWith(".zip")) {
+ zipUri = attachment;
+ }
+ if (attachment.getPath().endsWith(".png")) {
+ screenshotUri = attachment;
+ }
+ }
+ assertNotNull("did not get .zip attachment", zipUri);
+ assertZipContent(zipUri, BUGREPORT_FILE, BUGREPORT_CONTENT);
+
+ if (screenshotContent != null) {
+ assertNotNull("did not get .png attachment", screenshotUri);
+ assertContent(screenshotUri, SCREENSHOT_CONTENT);
+ } else {
+ assertNull("should not have .png attachment", screenshotUri);
+ }
+ }
+
+ private void assertContent(Uri uri, String expectedContent) throws IOException {
+ Log.v(TAG, "assertContents(uri=" + uri);
+ try (InputStream is = mContext.getContentResolver().openInputStream(uri)) {
+ String actualContent = new String(Streams.readFully(is));
+ assertEquals("wrong content for '" + uri + "'", expectedContent, actualContent);
+ }
+ }
+
+ private void assertZipContent(Uri uri, String entryName, String expectedContent)
+ throws IOException, IOException {
+ Log.v(TAG, "assertZipEntry(uri=" + uri + ", entryName=" + entryName);
+ try (ZipInputStream zis = new ZipInputStream(mContext.getContentResolver().openInputStream(
+ uri))) {
+ ZipEntry entry;
+ while ((entry = zis.getNextEntry()) != null) {
+ Log.v(TAG, "Zip entry: " + entry.getName());
+ if (entry.getName().equals(entryName)) {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ Streams.copy(zis, bos);
+ String actualContent = new String(bos.toByteArray(), "UTF-8");
+ bos.close();
+ assertEquals("wrong content for zip entry'" + entryName + "' on '" + uri + "'",
+ expectedContent, actualContent);
+ return;
+ }
+ }
+ }
+ fail("Did not find entry '" + entryName + "' on file '" + uri + "'");
+ }
+
+ private static void createTextFile(String path, String content) throws IOException {
+ Log.v(TAG, "createFile(" + path + ")");
+ try (Writer writer = new BufferedWriter(new OutputStreamWriter(
+ new FileOutputStream(path)))) {
+ writer.write(content);
+ }
+ }
+
+ private void createZipFile(String path, String entryName, String content) throws IOException {
+ Log.v(TAG, "createZipFile(" + path + ", " + entryName + ")");
+ try (ZipOutputStream zos = new ZipOutputStream(
+ new BufferedOutputStream(new FileOutputStream(path)))) {
+ ZipEntry entry = new ZipEntry(entryName);
+ zos.putNextEntry(entry);
+ byte[] data = content.getBytes();
+ zos.write(data, 0, data.length);
+ zos.closeEntry();
+ }
+ }
+}
diff --git a/packages/Shell/tests/src/com/android/shell/UiBot.java b/packages/Shell/tests/src/com/android/shell/UiBot.java
new file mode 100644
index 0000000..fa1714e
--- /dev/null
+++ b/packages/Shell/tests/src/com/android/shell/UiBot.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2015 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.shell;
+
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.Until;
+import android.util.Log;
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * A helper class for UI-related testing tasks.
+ */
+final class UiBot {
+
+ private static final String TAG = "UiBot";
+ private static final String SYSTEMUI_PACKAGED = "com.android.systemui";
+
+ private final UiDevice mDevice;
+ private final int mTimeout;
+
+ public UiBot(UiDevice device, int timeout) {
+ mDevice = device;
+ mTimeout = timeout;
+ }
+
+ /**
+ * Opens the system notification and gets a given notification.
+ *
+ * @param text Notificaton's text as displayed by the UI.
+ * @return notification object.
+ */
+ public UiObject getNotification(String text) {
+ boolean opened = mDevice.openNotification();
+ Log.v(TAG, "openNotification(): " + opened);
+ boolean gotIt = mDevice.wait(Until.hasObject(By.pkg(SYSTEMUI_PACKAGED)), mTimeout);
+ assertTrue("could not get system ui (" + SYSTEMUI_PACKAGED + ")", gotIt);
+
+ return getObject(text);
+ }
+
+ /**
+ * Opens the system notification and clicks a given notification.
+ *
+ * @param text Notificaton's text as displayed by the UI.
+ */
+ public void clickOnNotification(String text) {
+ UiObject notification = getNotification(text);
+ click(notification, "bug report notification");
+ }
+
+ /**
+ * Gets an object that might not yet be available in current UI.
+ *
+ * @param text Object's text as displayed by the UI.
+ */
+ public UiObject getObject(String text) {
+ boolean gotIt = mDevice.wait(Until.hasObject(By.text(text)), mTimeout);
+ assertTrue("object with text '(" + text + "') not visible yet", gotIt);
+ return getVisibleObject(text);
+ }
+
+ /**
+ * Gets an object which is guaranteed to be present in the current UI.
+ *
+ * @param text Object's text as displayed by the UI.
+ */
+ public UiObject getVisibleObject(String text) {
+ UiObject uiObject = mDevice.findObject(new UiSelector().text(text));
+ assertTrue("could not find object with text '" + text + "'", uiObject.exists());
+ return uiObject;
+ }
+
+ /**
+ * Clicks on a UI element.
+ *
+ * @param uiObject UI element to be clicked.
+ * @param description Elements's description used on logging statements.
+ */
+ public void click(UiObject uiObject, String description) {
+ try {
+ boolean clicked = uiObject.click();
+ // TODO: assertion below fails sometimes, even though the click succeeded,
+ // (specially when clicking the "Just Once" button), so it's currently just logged.
+ // assertTrue("could not click on object '" + description + "'", clicked);
+
+ Log.v(TAG, "onClick for " + description + ": " + clicked);
+ } catch (UiObjectNotFoundException e) {
+ throw new IllegalStateException("exception when clicking on object '" + description
+ + "'", e);
+ }
+ }
+
+ /**
+ * Chooses a given activity to handle an Intent, using the "Just Once" button.
+ *
+ * @param name name of the activity as displayed in the UI (typically the value set by
+ * {@code android:label} in the manifest).
+ */
+ // TODO: UI Automator should provide such logic.
+ public void chooseActivity(String name) {
+ // First select activity if it's not the default option.
+ boolean gotIt = mDevice.wait(Until.hasObject(By.text(name)), mTimeout);
+ // TODO: if the activity is indeed the default option, call above will timeout, which will
+ // make the tests run slower. It might be better to change the logic to assume the default
+ // first.
+ if (gotIt) {
+ Log.v(TAG, "Found activity " + name + ", it's not default action");
+ UiObject activityChooser = getVisibleObject(name);
+ click(activityChooser, "activity chooser");
+ } else {
+ String text = String.format("Share with %s", name);
+ Log.v(TAG, "Didn't find activity " + name
+ + ", assuming it's the default action and search for '" + text + "'");
+ gotIt = mDevice.wait(Until.hasObject(By.text(text)), mTimeout);
+ assertTrue("did not find text '" + text + "'", gotIt);
+ }
+
+ // Then clicks the "Just Once" button.
+ gotIt = mDevice
+ .wait(Until.hasObject(By.res("android", "button_once")), mTimeout);
+ assertTrue("'Just Once' button not visible yet", gotIt);
+
+ UiObject justOnce = mDevice
+ .findObject(new UiSelector().resourceId("android:id/button_once"));
+ assertTrue("'Just Once' button not found", justOnce.exists());
+
+ click(justOnce, "Just Once");
+ }
+}
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index 0cc2a67..ece34fb 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -6,7 +6,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under,src) $(call all-Iaidl-files-under, src) \
src/com/android/systemui/EventLogTags.logtags
-LOCAL_STATIC_JAVA_LIBRARIES := Keyguard
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ Keyguard \
+ android-support-v7-recyclerview
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_PACKAGE_NAME := SystemUI
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 6fda2c6..2f79adf 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -87,6 +87,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_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.REGISTER_WINDOW_MANAGER_LISTENERS" />
<uses-permission android:name="android.permission.SET_ORIENTATION" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index 368f9f7..75e7959 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -12,12 +12,18 @@
-keep class com.android.systemui.statusbar.phone.PhoneStatusBar
-keep class com.android.systemui.statusbar.tv.TvStatusBar
--keep class com.android.systemui.recents.*
-keepclassmembers class ** {
public void onBusEvent(**);
public void onInterprocessBusEvent(**);
}
-keepclassmembers class ** extends **.EventBus$InterprocessEvent {
- public <init>(android.os.Bundle);
-}
\ No newline at end of file
+ public <init>(android.os.Bundle);
+}
+
+-keep class com.android.systemui.recents.views.TaskView {
+ public int getDim();
+ public void setDim(int);
+ public float getTaskProgress();
+ public void setTaskProgress(float);
+}
diff --git a/packages/SystemUI/res/anim/recents_fast_toggle_app_home_exit.xml b/packages/SystemUI/res/anim/recents_fast_toggle_app_home_exit.xml
new file mode 100644
index 0000000..69edcc7
--- /dev/null
+++ b/packages/SystemUI/res/anim/recents_fast_toggle_app_home_exit.xml
@@ -0,0 +1,27 @@
+<?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.
+*/
+-->
+<!-- Recents Activity -->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shareInterpolator="false"
+ android:zAdjustment="top">
+ <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
+ android:fillEnabled="true"
+ android:fillBefore="true" android:fillAfter="true"
+ android:duration="250"/>
+</set>
diff --git a/packages/SystemUI/res/drawable/ic_send.xml b/packages/SystemUI/res/drawable/ic_send.xml
new file mode 100644
index 0000000..b1c7914
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_send.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="48.0"
+ android:viewportHeight="48.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M4.02,42.0L46.0,24.0 4.02,6.0 4.0,20.0l30.0,4.0 -30.0,4.0z"/>
+ <path
+ android:pathData="M0 0h48v48H0z"
+ android:fillColor="#00000000"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/notification_expand_more.xml b/packages/SystemUI/res/drawable/notification_expand_more.xml
index 5aa7937..430fb0d 100644
--- a/packages/SystemUI/res/drawable/notification_expand_more.xml
+++ b/packages/SystemUI/res/drawable/notification_expand_more.xml
@@ -12,7 +12,7 @@
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.
+ limitations under the License._more
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22.0dp"
diff --git a/packages/SystemUI/res/layout/notification_header.xml b/packages/SystemUI/res/layout/notification_header.xml
deleted file mode 100644
index 3475d00..0000000
--- a/packages/SystemUI/res/layout/notification_header.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 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.systemui.statusbar.notification.NotificationHeaderView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/notification_header_height"
- android:clipChildren="false">
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/notification_header_height"
- android:layout_gravity="start"
- android:gravity="center_vertical"
- android:paddingStart="@dimen/notification_content_margin_start">
- <ImageView
- android:id="@+id/header_notification_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_marginEnd="4dp"
- />
- <TextView
- android:id="@+id/number_of_children"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@*android:style/TextAppearance.Material.Notification"
- android:layout_marginEnd="2dp"
- android:layout_marginStart="1dp"
- />
- <TextView
- android:id="@+id/app_name_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Material.Notification.HeaderTitle"
- android:layout_marginStart="4dp"
- android:layout_marginEnd="8dp"
- />
- <TextView
- android:id="@+id/app_title_sub_text_divider"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Material.Notification.HeaderTitle"
- android:layout_marginEnd="8dp"
- android:text="@string/notification_header_divider_symbol"/>
- <TextView
- android:id="@+id/title_sub_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Material.Notification.HeaderTitle"
- android:layout_marginEnd="8dp" />
- <TextView
- android:id="@+id/post_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end|center_vertical"
- android:textAppearance="@*android:style/TextAppearance.Material.Notification.Time"
- android:paddingEnd="8dp"
- />
- </LinearLayout>
- <ImageButton
- android:id="@+id/notification_expand_button"
- android:background="@null"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_gravity="end|center_vertical"
- android:src="@drawable/notification_expand_more"
- android:layout_marginEnd="8dp"
- />
-</com.android.systemui.statusbar.notification.NotificationHeaderView>
diff --git a/packages/SystemUI/res/layout/recents.xml b/packages/SystemUI/res/layout/recents.xml
index 064d225..2c010dd 100644
--- a/packages/SystemUI/res/layout/recents.xml
+++ b/packages/SystemUI/res/layout/recents.xml
@@ -39,6 +39,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
+ <!-- History View -->
+ <ViewStub android:id="@+id/history_view_stub"
+ android:layout="@layout/recents_history"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
<!-- Nav Bar Scrim View -->
<ImageView
android:id="@+id/nav_bar_scrim"
diff --git a/packages/SystemUI/res/layout/recents_dismiss_button.xml b/packages/SystemUI/res/layout/recents_dismiss_button.xml
deleted file mode 100644
index 6a2f782..0000000
--- a/packages/SystemUI/res/layout/recents_dismiss_button.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-<!-- Extends Framelayout -->
-<com.android.systemui.statusbar.DismissView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/recents_dismiss_all_button_size"
- android:visibility="gone"
- android:clipChildren="false"
- android:clipToPadding="false">
- <com.android.systemui.statusbar.DismissViewButton
- android:id="@+id/dismiss_text"
- android:layout_width="@dimen/recents_dismiss_all_button_size"
- android:layout_height="@dimen/recents_dismiss_all_button_size"
- android:layout_gravity="end"
- android:alpha="1.0"
- android:background="@drawable/recents_button_bg"
- android:contentDescription="@string/recents_dismiss_all_message"/>
-</com.android.systemui.statusbar.DismissView>
diff --git a/packages/SystemUI/res/layout/recents_history.xml b/packages/SystemUI/res/layout/recents_history.xml
new file mode 100644
index 0000000..b65a5c5
--- /dev/null
+++ b/packages/SystemUI/res/layout/recents_history.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.systemui.recents.history.RecentsHistoryView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#99000000"
+ android:orientation="vertical">
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+</com.android.systemui.recents.history.RecentsHistoryView>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/recents_history_button.xml b/packages/SystemUI/res/layout/recents_history_button.xml
new file mode 100644
index 0000000..601c5ed
--- /dev/null
+++ b/packages/SystemUI/res/layout/recents_history_button.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="start|center_vertical"
+ android:text="@string/recents_show_history_button_label"
+ android:textSize="14sp"
+ android:textColor="#FFFFFF"
+ android:textAllCaps="true"
+ android:shadowColor="#99000000"
+ android:shadowDx="0"
+ android:shadowDy="2"
+ android:shadowRadius="5"
+ android:fontFamily="sans-serif-medium"
+ android:visibility="invisible" />
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/recents_history_date.xml b/packages/SystemUI/res/layout/recents_history_date.xml
new file mode 100644
index 0000000..6d6a9ee
--- /dev/null
+++ b/packages/SystemUI/res/layout/recents_history_date.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:theme="@android:style/Theme.Material"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="12dp"
+ android:gravity="start"
+ android:textSize="14sp"
+ android:textColor="#009688"
+ android:textAllCaps="true"
+ android:fontFamily="sans-serif-medium"
+ android:background="?android:selectableItemBackground"
+ android:alpha="1" />
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/recents_history_task.xml b/packages/SystemUI/res/layout/recents_history_task.xml
new file mode 100644
index 0000000..b9de156
--- /dev/null
+++ b/packages/SystemUI/res/layout/recents_history_task.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:theme="@android:style/Theme.Material"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:paddingLeft="32dp"
+ android:gravity="start|center_vertical"
+ android:textSize="14sp"
+ android:textColor="#FFFFFF"
+ android:fontFamily="sans-serif-medium"
+ android:background="?android:selectableItemBackground"
+ android:alpha="1" />
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/remote_input.xml b/packages/SystemUI/res/layout/remote_input.xml
index 8ca5634..74092c1 100644
--- a/packages/SystemUI/res/layout/remote_input.xml
+++ b/packages/SystemUI/res/layout/remote_input.xml
@@ -16,31 +16,61 @@
~ limitations under the License
-->
-<!-- FrameLayout -->
+<!-- LinearLayout -->
<com.android.systemui.statusbar.policy.RemoteInputView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:theme="@style/systemui_theme_light"
+ android:theme="@style/systemui_theme_remote_input"
+ android:id="@+id/remote_input"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:paddingStart="4dp"
- android:paddingEnd="2dp"
+ android:paddingStart="16dp"
+ android:paddingEnd="12dp"
android:paddingBottom="4dp"
android:paddingTop="2dp">
<view class="com.android.systemui.statusbar.policy.RemoteInputView$RemoteEditText"
android:id="@+id/remote_input_text"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:paddingEnd="12dp"
+ android:gravity="start|center_vertical"
+ android:textAppearance="?android:attr/textAppearance"
+ android:textColor="#deffffff"
+ android:textSize="16sp"
+ android:background="@null"
android:singleLine="true"
+ android:ellipsize="start"
android:imeOptions="actionSend" />
- <ProgressBar
- android:id="@+id/remote_input_progress"
- android:layout_width="match_parent"
+ <FrameLayout
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:visibility="invisible"
- android:indeterminate="true"
- style="?android:attr/progressBarStyleHorizontal" />
+ android:layout_gravity="center_vertical">
+
+ <ImageButton
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:paddingStart="12dp"
+ android:paddingEnd="12dp"
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp"
+ android:id="@+id/remote_input_send"
+ android:src="@drawable/ic_send"
+ android:tint="@android:color/white"
+ android:tintMode="src_atop"
+ android:background="@drawable/ripple_drawable" />
+
+ <ProgressBar
+ android:id="@+id/remote_input_progress"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:visibility="invisible"
+ android:indeterminate="true"
+ style="?android:attr/progressBarStyleSmall" />
+
+ </FrameLayout>
</com.android.systemui.statusbar.policy.RemoteInputView>
diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml
index b9088ec..0cea7ae 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_row.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml
@@ -61,14 +61,6 @@
/>
<ViewStub
- android:layout="@layout/notification_header"
- android:id="@+id/notification_header_stub"
- android:inflatedId="@+id/notification_header"
- android:layout_width="match_parent"
- android:layout_height="@dimen/notification_header_height"
- />
-
- <ViewStub
android:layout="@layout/notification_guts"
android:id="@+id/notification_guts_stub"
android:inflatedId="@+id/notification_guts"
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index 01d5e05..7006d43 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skermvaspen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"soek"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Kon nie <xliff:g id="APP">%s</xliff:g> begin nie."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Maak alle programme toe"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Meer"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Geskiedenis"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Verdeel horisontaal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Verdeel vertikaal"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Verdeel gepasmaak"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Wys batteryvlakpersentasie binne die statusbalkikoon wanneer dit nie laai nie"</string>
<string name="quick_settings" msgid="10042998191725428">"Kitsinstellings"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusbalk"</string>
+ <string name="overview" msgid="4018602013895926956">"Oorsig"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demonstrasiemodus"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Aktiveer demonstrasiemodus"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Wys demonstrasiemodus"</string>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 8999d7c..948c538 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ማያ ገጽ መሰካት"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ፈልግ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ን መጀመር አልተቻለም።"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"ሁሉንም ማመልከቻዎች አሰናብት"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"ተጨማሪ"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ታሪክ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"አግድም ክፈል"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ቁልቁል ክፈል"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"በብጁ ክፈል"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ኃይል በማይሞላበት ጊዜ በሁነታ አሞሌ አዶ ውስጥ የባትሪ ደረጃ መቶኛን አሳይ"</string>
<string name="quick_settings" msgid="10042998191725428">"ፈጣን ቅንብሮች"</string>
<string name="status_bar" msgid="4877645476959324760">"የሁኔታ አሞሌ"</string>
+ <string name="overview" msgid="4018602013895926956">"አጠቃላይ እይታ"</string>
<string name="demo_mode" msgid="2389163018533514619">"የቅንጭብ ማሳያ ሁነታ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"የማሳያ ሁነታውን ያንቁ"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ማሳያ ሁነታን አሳይ"</string>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index f677972..e272364 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -298,7 +298,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"تثبيت الشاشة"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"بحث"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"تعذر بدء <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"تجاهل كل التطبيقات"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"المزيد"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"السجلّ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"تقسيم أفقي"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"تقسيم رأسي"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"تقسيم مخصص"</string>
@@ -413,6 +414,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"عرض نسبة مستوى البطارية داخل رمز شريط الحالة أثناء عدم الشحن"</string>
<string name="quick_settings" msgid="10042998191725428">"الإعدادات السريعة"</string>
<string name="status_bar" msgid="4877645476959324760">"شريط الحالة"</string>
+ <string name="overview" msgid="4018602013895926956">"نظرة عامة"</string>
<string name="demo_mode" msgid="2389163018533514619">"الوضع التجريبي"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"تمكين الوضع التجريبي"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"عرض الوضع التجريبي"</string>
diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml
index fb92d6b..7f2a6b07 100644
--- a/packages/SystemUI/res/values-az-rAZ/strings.xml
+++ b/packages/SystemUI/res/values-az-rAZ/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sancağı"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"axtarış"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> başlana bilmir."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Bütün tətbiqləri kənarlaşdırın"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Daha çox"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Tarixçə"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Üfüqi Böl"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Şaquli Böl"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Fərdi Böl"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Elektrik şəbəsinə qoşulu olmayan zaman batareya səviyyəsini status paneli ikonası daxilində göstərin"</string>
<string name="quick_settings" msgid="10042998191725428">"Sürətli Ayarlar"</string>
<string name="status_bar" msgid="4877645476959324760">"Status paneli"</string>
+ <string name="overview" msgid="4018602013895926956">"İcmal"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo rejimi"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demo rejimini aktiv edin"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Demo rejimini göstərin"</string>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index b7f96a1..6ed2adb 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"фиксиране на екрана"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"търсене"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> не можа да стартира."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Отхвърляне на всички приложения"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Още"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"История"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Хоризонтално разделяне"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Вертикално разделяне"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Персонализирано разделяне"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Показване на процента на нивото на батерията в иконата на лентата на състоянието, когато не се зарежда"</string>
<string name="quick_settings" msgid="10042998191725428">"Бързи настройки"</string>
<string name="status_bar" msgid="4877645476959324760">"Лента на състоянието"</string>
+ <string name="overview" msgid="4018602013895926956">"Общ преглед"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демонстрационен режим"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Активиране на демонстрационния режим"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Показване на демонстрационния режим"</string>
diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml
index 6a93724..20e2c35 100644
--- a/packages/SystemUI/res/values-bn-rBD/strings.xml
+++ b/packages/SystemUI/res/values-bn-rBD/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"স্ক্রীন পিন করা"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"অনুসন্ধান"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> শুরু করা যায়নি৷"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"সমস্ত অ্যাপ্লিকেশন খারিজ করুন"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"আরো"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ইতিহাস"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"অনুভূমিক স্প্লিট"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"উল্লম্ব স্প্লিট"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"কাস্টম স্প্লিট করুন"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"যখন চার্জ করা হবে না তখন স্থিতি দন্ডের আইকনের ভিতরে ব্যাটারি স্তরের শতকার হার দেখায়"</string>
<string name="quick_settings" msgid="10042998191725428">"দ্রুত সেটিংস"</string>
<string name="status_bar" msgid="4877645476959324760">"স্থিতি দন্ড"</string>
+ <string name="overview" msgid="4018602013895926956">"এক নজরে"</string>
<string name="demo_mode" msgid="2389163018533514619">"ডেমো মোড"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ডেমো মোড সক্ষম করুন"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ডেমো মোড দেখান"</string>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 0da503a..0bb4826 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixació de pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"No s\'ha pogut iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Ignora totes les aplicacions"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Més"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historial"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisió horitzontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisió vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisió personalitzada"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostra el percentatge del nivell de bateria dins de la icona de la barra d\'estat quan no s\'estigui carregant"</string>
<string name="quick_settings" msgid="10042998191725428">"Configuració ràpida"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra d\'estat"</string>
+ <string name="overview" msgid="4018602013895926956">"Visió general"</string>
<string name="demo_mode" msgid="2389163018533514619">"Mode de demostració"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Activa el mode de demostració"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostra el mode de demostració"</string>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index c9e8a83..63a16ad 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"připnutí obrazovky"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"vyhledat"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikaci <xliff:g id="APP">%s</xliff:g> nelze spustit."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Odstranit všechny aplikace"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Další"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historie"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Vodorovné rozdělení"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikální rozdělení"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Vlastní rozdělení"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Když neprobíhá nabíjení, zobrazit v ikoně na stavovém řádku procento nabití baterie"</string>
<string name="quick_settings" msgid="10042998191725428">"Rychlé nastavení"</string>
<string name="status_bar" msgid="4877645476959324760">"Stavový řádek"</string>
+ <string name="overview" msgid="4018602013895926956">"Přehled"</string>
<string name="demo_mode" msgid="2389163018533514619">"Ukázkový režim"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Zapnout ukázkový režim"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Zobrazit ukázkový režim"</string>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index a9931ce..eb8053d 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"bliv i app"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"søg"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> kunne ikke startes."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Luk alle applikationer"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mere"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historik"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Opdel vandret"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Opdel lodret"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Opdel brugerdefineret"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Vis procenttallet for batteriniveauet i ikonet for statusbjælken, når der ikke oplades"</string>
<string name="quick_settings" msgid="10042998191725428">"Hurtige indstillinger"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusbjælke"</string>
+ <string name="overview" msgid="4018602013895926956">"Oversigt"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demotilstand"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Aktivér Demotilstand"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Vis Demotilstand"</string>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 8a7fa5e..e156c92 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Bildschirmfixierung"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Suche"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> konnte nicht gestartet werden."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Alle Apps entfernen"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mehr"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Verlauf"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Geteilte Schaltfläche – horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Geteilte Schaltfläche – vertikal"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Geteilte Schaltfläche – benutzerdefiniert"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Prozentzahl für Akkustand in Statusleistensymbol anzeigen, wenn das Gerät nicht geladen wird"</string>
<string name="quick_settings" msgid="10042998191725428">"Schnelleinstellungen"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusleiste"</string>
+ <string name="overview" msgid="4018602013895926956">"Übersicht"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demomodus"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demomodus aktivieren"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Demomodus anzeigen"</string>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 47eb46f..b0dcc40 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"καρφίτσωμα οθόνης"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"αναζήτηση"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Δεν ήταν δυνατή η εκκίνηση της εφαρμογής <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Παράβλεψη όλων των εφαρμογών"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Περισσότερα"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Ιστορικό"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Οριζόντιος διαχωρισμός"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Κάθετος διαχωρισμός"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Προσαρμοσμένος διαχωρισμός"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Εμφάνιση ποσοστού επιπέδου μπαταρίας μέσα στο εικονίδιο της γραμμής κατάστασης όταν δεν γίνεται φόρτιση"</string>
<string name="quick_settings" msgid="10042998191725428">"Γρήγορες ρυθμίσεις"</string>
<string name="status_bar" msgid="4877645476959324760">"Γραμμή κατάστασης"</string>
+ <string name="overview" msgid="4018602013895926956">"Επισκόπηση"</string>
<string name="demo_mode" msgid="2389163018533514619">"Λειτουργία επίδειξης"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Ενεργοποίηση λειτουργίας επίδειξης"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Εμφάνιση λειτουργίας επίδειξης"</string>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index f257c7f..84f1785 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Dismiss all applications"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"More"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"History"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Show battery level percentage inside the status bar icon when not charging"</string>
<string name="quick_settings" msgid="10042998191725428">"Quick Settings"</string>
<string name="status_bar" msgid="4877645476959324760">"Status bar"</string>
+ <string name="overview" msgid="4018602013895926956">"Overview"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo mode"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Enable demo mode"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Show demo mode"</string>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index f257c7f..84f1785 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Dismiss all applications"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"More"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"History"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Show battery level percentage inside the status bar icon when not charging"</string>
<string name="quick_settings" msgid="10042998191725428">"Quick Settings"</string>
<string name="status_bar" msgid="4877645476959324760">"Status bar"</string>
+ <string name="overview" msgid="4018602013895926956">"Overview"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo mode"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Enable demo mode"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Show demo mode"</string>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index f257c7f..84f1785 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Dismiss all applications"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"More"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"History"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Show battery level percentage inside the status bar icon when not charging"</string>
<string name="quick_settings" msgid="10042998191725428">"Quick Settings"</string>
<string name="status_bar" msgid="4877645476959324760">"Status bar"</string>
+ <string name="overview" msgid="4018602013895926956">"Overview"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo mode"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Enable demo mode"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Show demo mode"</string>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 608f73c..c9af193 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Fijar pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"No se pudo iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Descartar todas las aplicaciones"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Más"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historial"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"División horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"División vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"División personalizada"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar porcentaje del nivel de batería en el ícono de la barra de estado cuando no se está cargando"</string>
<string name="quick_settings" msgid="10042998191725428">"Configuración rápida"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra de estado"</string>
+ <string name="overview" msgid="4018602013895926956">"Recientes"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modo demostración"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Activar el modo de demostración"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Ver en modo de demostración"</string>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index aa4fd56..51984bf 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fijación de pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"No se ha podido iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Ignorar todas las aplicaciones"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Más"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historial"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"División horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"División vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"División personalizada"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar el porcentaje del nivel de batería en el icono de la barra de estado cuando no se esté cargando"</string>
<string name="quick_settings" msgid="10042998191725428">"Ajustes rápidos"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra de estado"</string>
+ <string name="overview" msgid="4018602013895926956">"Visión general"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modo de demostración"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Habilitar modo de demostración"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostrar modo de demostración"</string>
diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml
index 655ee5b..b527b9f 100644
--- a/packages/SystemUI/res/values-et-rEE/strings.xml
+++ b/packages/SystemUI/res/values-et-rEE/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekraanikuva kinnitamine"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"otsing"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Rakendust <xliff:g id="APP">%s</xliff:g> ei saanud käivitada."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Loobu kõikidest rakendustest"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Rohkem"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Ajalugu"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horisontaalne poolitamine"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikaalne poolitamine"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Kohandatud poolitamine"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Akutaseme protsendi kuvamine olekuriba ikoonil, kui akut ei laeta"</string>
<string name="quick_settings" msgid="10042998191725428">"Kiirseaded"</string>
<string name="status_bar" msgid="4877645476959324760">"Olekuriba"</string>
+ <string name="overview" msgid="4018602013895926956">"Ülevaade"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demorežiim"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demorežiimi lubamine"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Kuva demorežiim"</string>
diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml
index 5ac93c6..b7cfb2a2 100644
--- a/packages/SystemUI/res/values-eu-rES/strings.xml
+++ b/packages/SystemUI/res/values-eu-rES/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pantaila-ainguratzea"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"bilatu"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Ezin izan da hasi <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Baztertu aplikazio guztiak"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Gehiago"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historia"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Banaketa horizontala"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Banaketa bertikala"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Banaketa pertsonalizatua"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Erakutsi bateria-mailaren ehunekoa egoera-barraren ikonoan, kargatzen ari ez denean"</string>
<string name="quick_settings" msgid="10042998191725428">"Ezarpen bizkorrak"</string>
<string name="status_bar" msgid="4877645476959324760">"Egoera-barra"</string>
+ <string name="overview" msgid="4018602013895926956">"Ikuspegi orokorra"</string>
<string name="demo_mode" msgid="2389163018533514619">"Proba modua"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Gaitu proba modua"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Erakutsi proba modua"</string>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index 837b727..b3d8216 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"پین کردن صفحه"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"جستجو"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> شروع نشد."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"رد کردن همه برنامهها"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"بیشتر"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"سابقه"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"تقسیم افقی"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"تقسیم عمودی"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"سفارشی کردن تقسیم"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"نمایش درصد سطح باتری در نماد نوار وضعیت، هنگامی که باتری شارژ نمیشود"</string>
<string name="quick_settings" msgid="10042998191725428">"تنظیمات سریع"</string>
<string name="status_bar" msgid="4877645476959324760">"نوار وضعیت"</string>
+ <string name="overview" msgid="4018602013895926956">"نمای کلی"</string>
<string name="demo_mode" msgid="2389163018533514619">"حالت نمایشی"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"فعال کردن حالت نمایشی"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"نمایش حالت نمایشی"</string>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index ef6a064..235eef0 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"näytön kiinnitys"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"haku"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Sovelluksen <xliff:g id="APP">%s</xliff:g> käynnistäminen epäonnistui."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Hylkää kaikki sovellukset"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Lisää"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historia"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Vaakasuuntainen jako"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Pystysuuntainen jako"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Muokattu jako"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Näyttää akun varausprosentin tilapalkin kuvakkeessa, kun laitetta ei ladata."</string>
<string name="quick_settings" msgid="10042998191725428">"Pika-asetukset"</string>
<string name="status_bar" msgid="4877645476959324760">"Tilapalkki"</string>
+ <string name="overview" msgid="4018602013895926956">"Yleiskatsaus"</string>
<string name="demo_mode" msgid="2389163018533514619">"Esittelytila"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Ota esittelytila käyttöön"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Näytä esittelytila"</string>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index 52d2e2a..3493067 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Impossible de lancer <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Supprimer toutes les applications"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Plus"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historique"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Séparation horizontale"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Séparation verticale"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Séparation personnalisée"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Afficher le pourcentage correspondant au niveau de la pile dans l\'icône de la barre d\'état lorsque l\'appareil n\'est pas en charge."</string>
<string name="quick_settings" msgid="10042998191725428">"Paramètres rapides"</string>
<string name="status_bar" msgid="4877645476959324760">"Barre d\'état"</string>
+ <string name="overview" msgid="4018602013895926956">"Aperçu"</string>
<string name="demo_mode" msgid="2389163018533514619">"Mode Démonstration"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Activer le mode Démonstration"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Afficher le mode Démonstration"</string>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index 39a8dbc..ebed6e9 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Impossible de lancer <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Supprimer toutes les applications"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Plus"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historique"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Séparation horizontale"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Séparation verticale"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Séparation personnalisée"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Affichez le pourcentage correspondant au niveau de la batterie dans l\'icône de la barre d\'état lorsque l\'appareil n\'est pas en charge."</string>
<string name="quick_settings" msgid="10042998191725428">"Configuration rapide"</string>
<string name="status_bar" msgid="4877645476959324760">"Barre d\'état"</string>
+ <string name="overview" msgid="4018602013895926956">"Aperçu"</string>
<string name="demo_mode" msgid="2389163018533514619">"Mode de démonstration"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Activer le mode de démonstration"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Afficher le mode de démonstration"</string>
diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml
index 398a055..a9648b9 100644
--- a/packages/SystemUI/res/values-gl-rES/strings.xml
+++ b/packages/SystemUI/res/values-gl-rES/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixación de pantalla"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Non foi posible iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Rexeitar todas as aplicacións"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Máis"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historial"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Dividir en horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dividir en vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Dividir de xeito personalizado"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar porcentaxe do nivel de batería na icona da barra de estado cando non está en carga"</string>
<string name="quick_settings" msgid="10042998191725428">"Configuración rápida"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra de estado"</string>
+ <string name="overview" msgid="4018602013895926956">"Visión xeral"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modo de demostración"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Activar modo de demostración"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostrar modo de demostración"</string>
diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml
index 9ecaa75..804a940 100644
--- a/packages/SystemUI/res/values-gu-rIN/strings.xml
+++ b/packages/SystemUI/res/values-gu-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"સ્ક્રીન પિનિંગ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"શોધ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> પ્રારંભ કરી શકાયું નથી."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"તમામ એપ્લિકેશનો કાઢી નાખો"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"વધુ"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ઇતિહાસ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"આડું વિભક્ત કરો"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ઊભું વિભક્ત કરો"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"કસ્ટમ વિભક્ત કરો"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"જ્યારે ચાર્જ ન થઈ રહ્યું હોય ત્યારે સ્થિતિ બાર આયકનની અંદર બૅટરી સ્તર ટકા બતાવો"</string>
<string name="quick_settings" msgid="10042998191725428">"ઝડપી સેટિંગ્સ"</string>
<string name="status_bar" msgid="4877645476959324760">"સ્થિતિ બાર"</string>
+ <string name="overview" msgid="4018602013895926956">"વિહંગાવલોકન"</string>
<string name="demo_mode" msgid="2389163018533514619">"ડેમો મોડ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ડેમો મોડ સક્ષમ કરો"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ડેમો મોડ બતાવો"</string>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 62ef606..354de04 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करना"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"खोज"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> प्रारंभ नहीं किया जा सका."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"सभी ऐप्लिकेशन ख़ारिज करें"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"अधिक"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"इतिहास"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज रूप से विभाजित करें"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"लम्बवत रूप से विभाजित करें"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"कस्टम रूप से विभाजित करें"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"जब चार्ज नहीं किया जा रहा हो तब स्थिति बार आइकन में बैटरी स्तर का प्रतिशत दिखाएं"</string>
<string name="quick_settings" msgid="10042998191725428">"तेज़ सेटिंग"</string>
<string name="status_bar" msgid="4877645476959324760">"स्थिति बार"</string>
+ <string name="overview" msgid="4018602013895926956">"अवलोकन"</string>
<string name="demo_mode" msgid="2389163018533514619">"डेमो मोड"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"डेमो मोड सक्षम करें"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"डेमो मोड दिखाएं"</string>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index dafc96f..b35360e 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -295,7 +295,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"prikvačivanje zaslona"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikacija <xliff:g id="APP">%s</xliff:g> nije pokrenuta."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Odbaci sve aplikacije"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Više"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Povijest"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podijeli vodoravno"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podijeli okomito"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Podijeli prilagođeno"</string>
@@ -410,6 +411,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Prikazivanje postotka razine baterije na ikoni trake statusa kada se ne puni"</string>
<string name="quick_settings" msgid="10042998191725428">"Brze postavke"</string>
<string name="status_bar" msgid="4877645476959324760">"Traka statusa"</string>
+ <string name="overview" msgid="4018602013895926956">"Pregled"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo način"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Omogući demo način"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Prikaži demo način"</string>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index cf08b55..7956a21 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"képernyő rögzítése"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"keresés"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nem lehet elindítani a következőt: <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Összes alkalmazás elvetése"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Továbbiak"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Előzmények"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Osztott vízszintes"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Osztott függőleges"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Osztott egyéni"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Az akkumulátor töltöttségi szintjének megjelenítése az állapotsori ikonban, amikor az eszköz nem töltődik"</string>
<string name="quick_settings" msgid="10042998191725428">"Gyorsbeállítások"</string>
<string name="status_bar" msgid="4877645476959324760">"Állapotsor"</string>
+ <string name="overview" msgid="4018602013895926956">"Áttekintés"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demó mód"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demó mód engedélyezése"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Demó mód megjelenítése"</string>
diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml
index b4a265d..de70fec 100644
--- a/packages/SystemUI/res/values-hy-rAM/strings.xml
+++ b/packages/SystemUI/res/values-hy-rAM/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"էկրանի ամրակցում"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"որոնել"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Հնարավոր չէ գործարկել <xliff:g id="APP">%s</xliff:g>-ը:"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Հեռացնել բոլոր հավելվածները"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Ավելին"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Պատմություն"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Հորիզոնական տրոհում"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Ուղղահայաց տրոհում"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Հատուկ տրոհում"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Ցուցադրել մարտկոցի լիցքավորման տոկոսայնությունը կարգավիճակի գոտու պատկերակի վրա, երբ այն չի լիցքավորվում"</string>
<string name="quick_settings" msgid="10042998191725428">"Արագ կարգավորումներ"</string>
<string name="status_bar" msgid="4877645476959324760">"Կարգավիճակի գոտի"</string>
+ <string name="overview" msgid="4018602013895926956">"Համատեսք"</string>
<string name="demo_mode" msgid="2389163018533514619">"Ցուցադրական ռեժիմ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Ցուցադրական ռեժիմի միացում"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Ցուցադրական ռեժիմի ցուցադրում"</string>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 6d6c1c7..51ddcc0 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pin ke layar"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"telusuri"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Tidak dapat memulai <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Tutup semua aplikasi"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Lainnya"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Riwayat"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Pisahkan Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Pisahkan Vertikal"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Pisahkan Khusus"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Tampilkan persentase tingkat baterai dalam ikon bilah status saat tidak mengisi daya"</string>
<string name="quick_settings" msgid="10042998191725428">"Setelan Cepat"</string>
<string name="status_bar" msgid="4877645476959324760">"Bilah status"</string>
+ <string name="overview" msgid="4018602013895926956">"Ringkasan"</string>
<string name="demo_mode" msgid="2389163018533514619">"Mode demo"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Aktifkan mode demo"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Tampilkan mode demo"</string>
diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml
index 8e7711e4..20d8693 100644
--- a/packages/SystemUI/res/values-is-rIS/strings.xml
+++ b/packages/SystemUI/res/values-is-rIS/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skjáfesting"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"leita"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Ekki var hægt að ræsa <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Fjarlægja öll forrit"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Meira"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Ferill"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Lárétt skipting"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Lóðrétt skipting"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Sérsniðin skipting"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Sýna rafhlöðustöðuna í stöðustikunni þegar tækið er ekki í hleðslu"</string>
<string name="quick_settings" msgid="10042998191725428">"Flýtistillingar"</string>
<string name="status_bar" msgid="4877645476959324760">"Stöðustika"</string>
+ <string name="overview" msgid="4018602013895926956">"Yfirlit"</string>
<string name="demo_mode" msgid="2389163018533514619">"Prufustilling"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Kveikja á prufustillingu"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Sýna prufustillingu"</string>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index f12e626..87267995 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"blocco su schermo"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Impossibile avviare <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Rimuovi tutte le applicazioni"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Altro"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Cronologia"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisione in orizzontale"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisione in verticale"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisione personalizzata"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostra la percentuale di carica della batteria nell\'icona della barra di stato quando non è in carica"</string>
<string name="quick_settings" msgid="10042998191725428">"Impostazioni rapide"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra di stato"</string>
+ <string name="overview" msgid="4018602013895926956">"Panoramica"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modalità demo"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Attiva modalità demo"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostra modalità demo"</string>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index c168f7d..a28dc2a 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"הצמדת מסך"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"חפש"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"לא ניתן היה להפעיל את <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"סגור את כל האפליקציות"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"עוד"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"היסטוריה"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"פיצול אופקי"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"פיצול אנכי"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"פיצול מותאם אישית"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"הצג את אחוז עוצמת הסוללה בתוך הסמל שבשורת הסטטוס כשהמכשיר אינו בטעינה"</string>
<string name="quick_settings" msgid="10042998191725428">"הגדרות מהירות"</string>
<string name="status_bar" msgid="4877645476959324760">"שורת סטטוס"</string>
+ <string name="overview" msgid="4018602013895926956">"סקירה"</string>
<string name="demo_mode" msgid="2389163018533514619">"מצב הדגמה"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"הפעל מצב הדגמה"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"הצג מצב הדגמה"</string>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index f053ee4..13217a0 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"画面固定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"検索"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>を開始できません。"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"すべてのアプリケーションを消去"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"もっと見る"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"履歴"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"横に分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"縦に分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"分割（カスタム）"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"充電していないときには電池残量の割合をステータスバーアイコンに表示する"</string>
<string name="quick_settings" msgid="10042998191725428">"クイック設定"</string>
<string name="status_bar" msgid="4877645476959324760">"ステータスバー"</string>
+ <string name="overview" msgid="4018602013895926956">"概要"</string>
<string name="demo_mode" msgid="2389163018533514619">"デモモード"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"デモモードを有効にする"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"デモモードを表示"</string>
diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml
index 8d754c4..c4e84a8 100644
--- a/packages/SystemUI/res/values-ka-rGE/strings.xml
+++ b/packages/SystemUI/res/values-ka-rGE/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ეკრანზე ჩამაგრება"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ძიება"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>-ის გამოძახება ვერ მოხერხდა."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"ყველა აპლიკაციის გაუქმება"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"მეტი"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ისტორია"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ჰორიზონტალური გაყოფა"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ვერტიკალური გაყოფა"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ინდივიდუალური გაყობა"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ბატარეის დონის პროცენტის ჩვენება სტატუსის ზოლის ხატულას შიგნით, როდესაც არ იტენება"</string>
<string name="quick_settings" msgid="10042998191725428">"სწრაფი პარამეტრები"</string>
<string name="status_bar" msgid="4877645476959324760">"სტატუსის ზოლი"</string>
+ <string name="overview" msgid="4018602013895926956">"მიმოხილვა"</string>
<string name="demo_mode" msgid="2389163018533514619">"დემო-რეჟიმი"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"დემო-რეჟიმის ჩართვა"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"დემო-რეჟიმის ჩვენება"</string>
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml
index d0bd8bb..2133170 100644
--- a/packages/SystemUI/res/values-kk-rKZ/strings.xml
+++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"экранды бекіту"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"іздеу"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> іске қосу мүмкін болмады."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Барлық қолданбаларды қабылдамау"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Қосымша"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Тарих"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Бөлінген көлденең"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Бөлінген тік"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Бөлінген теңшелетін"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Зарядталмай тұрғанда, күй жолағы белгішесінің ішінде батарея деңгейінің пайыздық шамасын көрсетеді"</string>
<string name="quick_settings" msgid="10042998191725428">"Жылдам параметрлер"</string>
<string name="status_bar" msgid="4877645476959324760">"Күйін көрсету жолағы"</string>
+ <string name="overview" msgid="4018602013895926956">"Шолу"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демо режимі"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Демо режимін қосу"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Демо режимін көрсету"</string>
diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml
index d77f480..6fbb325 100644
--- a/packages/SystemUI/res/values-km-rKH/strings.xml
+++ b/packages/SystemUI/res/values-km-rKH/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ការភ្ជាប់អេក្រង់"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ស្វែងរក"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"មិនអាចចាប់ផ្ដើម <xliff:g id="APP">%s</xliff:g> ទេ។"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"បោះបង់កម្មវិធីទាំងអស់"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"ច្រើនទៀត"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ប្រវត្តិ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"បំបែកផ្តេក"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"បំបែកបញ្ឈរ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"បំបែកផ្ទាល់ខ្លួន"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"បង្ហាញភាគរយនៃកម្រិតថាមពលថ្មនៅក្នុងរូបតំណាងរបារស្ថានភាពនៅពេលមិនសាកថ្ម"</string>
<string name="quick_settings" msgid="10042998191725428">"ការកំណត់រហ័ស"</string>
<string name="status_bar" msgid="4877645476959324760">"របារស្ថានភាព"</string>
+ <string name="overview" msgid="4018602013895926956">"ទិដ្ឋភាព"</string>
<string name="demo_mode" msgid="2389163018533514619">"របៀបសាកល្បង"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"បើករបៀបសាកល្បង"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"បង្ហាញរបៀបសាកល្បង"</string>
diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml
index 3b9dfc2..c8fc91d 100644
--- a/packages/SystemUI/res/values-kn-rIN/strings.xml
+++ b/packages/SystemUI/res/values-kn-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ಹುಡುಕಾಟ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ಪ್ರಾರಂಭಿಸಲು ಸಾದ್ಯವಿಲ್ಲ."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ವಜಾಗೊಳಿಸಿ"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"ಇನ್ನಷ್ಟು"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ಇತಿಹಾಸ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ಅಡ್ಡಲಾಗಿ ವಿಭಜಿಸಿದ"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ಲಂಬವಾಗಿ ವಿಭಜಿಸಿದ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ಕಸ್ಟಮ್ ವಿಭಜಿಸಿದ"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ಚಾರ್ಜ್ ಮಾಡದಿರುವಾಗ ಸ್ಥಿತಿ ಪಟ್ಟಿ ಐಕಾನ್ ಒಳಗೆ ಬ್ಯಾಟರಿ ಮಟ್ಟದ ಶೇಕಡಾವನ್ನು ತೋರಿಸಿ"</string>
<string name="quick_settings" msgid="10042998191725428">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="status_bar" msgid="4877645476959324760">"ಸ್ಥಿತಿ ಪಟ್ಟಿ"</string>
+ <string name="overview" msgid="4018602013895926956">"ಸಮಗ್ರ ನೋಟ"</string>
<string name="demo_mode" msgid="2389163018533514619">"ಡೆಮೊ ಮೋಡ್"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ಡೆಮೊ ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ಡೆಮೊ ಮೋಡ್ ತೋರಿಸು"</string>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index a5f14e4..1296d21 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"화면 고정"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"검색"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>을(를) 시작할 수 없습니다."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"모든 애플리케이션 닫기"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"더보기"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"기록"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"수평 분할"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"수직 분할"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"맞춤 분할"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"충전 중이 아닌 경우 상태 표시줄 아이콘 내에 배터리 잔량 비율 표시"</string>
<string name="quick_settings" msgid="10042998191725428">"빠른 설정"</string>
<string name="status_bar" msgid="4877645476959324760">"상태 표시줄"</string>
+ <string name="overview" msgid="4018602013895926956">"개요"</string>
<string name="demo_mode" msgid="2389163018533514619">"데모 모드"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"데모 모드 사용"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"데모 모드 표시"</string>
diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml
index 2d6dc6f..ead55c7 100644
--- a/packages/SystemUI/res/values-ky-rKG/strings.xml
+++ b/packages/SystemUI/res/values-ky-rKG/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"экран кадоо"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"издөө"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> баштай алган жок."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Бардык колдонмолорду көз жаздымда калтыруу"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Дагы"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Таржымал"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Туурасынан бөлүү"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Тигинен бөлүү"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Ыңгайлаштырылган бөлүү"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Түзмөк кубаттанбай турганда, батареянын деңгээли статус тилкесинде көрүнүп турат"</string>
<string name="quick_settings" msgid="10042998191725428">"Ыкчам жөндөөлөр"</string>
<string name="status_bar" msgid="4877645476959324760">"Абал тилкеси"</string>
+ <string name="overview" msgid="4018602013895926956">"Көз жүгүртүү"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демо режими"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Демо режимин иштетүү"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Демо режимин көрсөтүү"</string>
diff --git a/packages/SystemUI/res/values-land/config.xml b/packages/SystemUI/res/values-land/config.xml
index f7e2344..43e7bac 100644
--- a/packages/SystemUI/res/values-land/config.xml
+++ b/packages/SystemUI/res/values-land/config.xml
@@ -28,4 +28,14 @@
<!-- We have only space for one notification on phone landscape layouts. -->
<integer name="keyguard_max_notification_count">1</integer>
+
+ <!-- Recents: The relative range of visible tasks from the current scroll position
+ while the stack is focused. -->
+ <item name="recents_layout_focused_range_min" format="float" type="integer">-3</item>
+ <item name="recents_layout_focused_range_max" format="float" type="integer">2</item>
+
+ <!-- Recents: The relative range of visible tasks from the current scroll position
+ while the stack is not focused. -->
+ <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item>
+ <item name="recents_layout_unfocused_range_max" format="float" type="integer">1.5</item>
</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml
index 82a82e6..c0689c3 100644
--- a/packages/SystemUI/res/values-lo-rLA/strings.xml
+++ b/packages/SystemUI/res/values-lo-rLA/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ການປັກໝຸດໜ້າຈໍ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ຊອກຫາ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"ບໍ່ສາມາດເລີ່ມ <xliff:g id="APP">%s</xliff:g> ໄດ້."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"ປ່ອຍທຸກແອັບພລິເຄ"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"ເພີ່ມເຕີມ"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ປະຫວັດ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ການແຍກລວງຂວາງ"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ການແຍກລວງຕັ້ງ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ການແຍກກຳນົດເອງ"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ສະແດງເປີເຊັນລະດັບແບັດເຕີຣີຢູ່ດ້ານໃນໄອຄອນແຖບສະຖານະ ເມື່ອບໍ່ສາກຢູ່"</string>
<string name="quick_settings" msgid="10042998191725428">"ການຕັ້ງຄ່າດ່ວນ"</string>
<string name="status_bar" msgid="4877645476959324760">"ແຖບສະຖານະ"</string>
+ <string name="overview" msgid="4018602013895926956">"ພາບຮວມ"</string>
<string name="demo_mode" msgid="2389163018533514619">"ໂໝດສາທິດ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ເປີດໃຊ້ໂໝດສາທິດ"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ສະແດງໂຫມດສາທິດ"</string>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index 2341e5a..4425d31 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekrano prisegimas"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"paieška"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nepavyko paleisti <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Atsisakyti visų programų"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Daugiau"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Istorija"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontalus skaidymas"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikalus skaidymas"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tinkintas skaidymas"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Rodyti akumuliatoriaus įkrovos lygio procentinę vertę būsenos juostos piktogramoje, kai įrenginys nėra įkraunamas"</string>
<string name="quick_settings" msgid="10042998191725428">"Spartieji nustatymai"</string>
<string name="status_bar" msgid="4877645476959324760">"Būsenos juosta"</string>
+ <string name="overview" msgid="4018602013895926956">"Apžvalga"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demonstracinis režimas"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Įgalinti demonstracinį režimą"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Rodyti demonstraciniu režimu"</string>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index 27663bd..eca57a6 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -295,7 +295,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Piespraust ekrānu"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Meklēt"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nevarēja palaist lietotni <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Noņemt visas lietojumprogrammas"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Vairāk"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Vēsture"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontāls dalījums"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikāls dalījums"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Pielāgots dalījums"</string>
@@ -410,6 +411,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Rādīt akumulatora uzlādes līmeni procentos statusa joslas ikonā, kad netiek veikta uzlāde"</string>
<string name="quick_settings" msgid="10042998191725428">"Ātrie iestatījumi"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusa josla"</string>
+ <string name="overview" msgid="4018602013895926956">"Pārskats"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demonstrācijas režīms"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Iespējot demonstrācijas režīmu"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Rādīt demonstrācijas režīmu"</string>
diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml
index 7162a5c..038c669 100644
--- a/packages/SystemUI/res/values-mk-rMK/strings.xml
+++ b/packages/SystemUI/res/values-mk-rMK/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"прикачување екран"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"пребарај"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> не може да се вклучи."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Отфрли ги сите апликации"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Повеќе"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Историја"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Раздели хоризонтално"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Раздели вертикално"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Раздели прилагодено"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Прикажи процент на ниво на батеријата во внатрешноста на иконата со статусна лента кога не се полни"</string>
<string name="quick_settings" msgid="10042998191725428">"Брзи поставки"</string>
<string name="status_bar" msgid="4877645476959324760">"Статусна лента"</string>
+ <string name="overview" msgid="4018602013895926956">"Краток преглед"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демо-режим"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Овозможи демо-режим"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Прикажи демо-режим"</string>
diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml
index 5df98ec..f4964d0 100644
--- a/packages/SystemUI/res/values-ml-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ml-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"സ്ക്രീൻ പിൻ ചെയ്യൽ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"തിരയുക"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ആരംഭിക്കാനായില്ല."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"എല്ലാ അപ്ലിക്കേഷനുകളും നിരസിക്കുക"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"കൂടുതൽ"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ചരിത്രം"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"തിരശ്ചീനമായി വേർതിരിക്കുക"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ലംബമായി വേർതിരിക്കുക"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ഇഷ്ടാനുസൃതമായി വേർതിരിക്കുക"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ചാർജ്ജുചെയ്യാതിരിക്കുമ്പോൾ സ്റ്റാറ്റസ് ബാർ ഐക്കണിൽ ബാറ്ററി ലെവൽ ശതമാനം കാണിക്കുക"</string>
<string name="quick_settings" msgid="10042998191725428">"ദ്രുത ക്രമീകരണം"</string>
<string name="status_bar" msgid="4877645476959324760">"സ്റ്റാറ്റസ് ബാർ"</string>
+ <string name="overview" msgid="4018602013895926956">"ചുരുക്കവിവരണം"</string>
<string name="demo_mode" msgid="2389163018533514619">"ഡെമോ മോഡ്"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ഡെമോ മോഡ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ഡെമോ മോഡ് കാണിക്കുക"</string>
diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml
index f960dfa..122068c 100644
--- a/packages/SystemUI/res/values-mn-rMN/strings.xml
+++ b/packages/SystemUI/res/values-mn-rMN/strings.xml
@@ -292,7 +292,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"дэлгэц тогтоох"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"хайх"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>-г эхлүүлж чадсангүй."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Бүх програмыг арилгах"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Илүү"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Түүх"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Хэвтээ чиглэлд хуваах"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Босоо чиглэлд хуваах"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Хүссэн хэлбэрээр хуваах"</string>
@@ -407,6 +408,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Тэжээлийн хувийг цэнэглээгүй байх үед статусын хэсэгт харуулна уу"</string>
<string name="quick_settings" msgid="10042998191725428">"Түргэвчилсэн Tохиргоо"</string>
<string name="status_bar" msgid="4877645476959324760">"Статус самбар"</string>
+ <string name="overview" msgid="4018602013895926956">"Тойм"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демо горим"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Демо горимыг идэвхжүүлэх"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Демо горимыг харуулах"</string>
diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml
index f599aca..6415adb 100644
--- a/packages/SystemUI/res/values-mr-rIN/strings.xml
+++ b/packages/SystemUI/res/values-mr-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करणे"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"शोधा"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> प्रारंभ करणे शक्य झाले नाही."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"सर्व अनुप्रयोग डिसमिस करा"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"अधिक"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"इतिहास"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज विभाजित करा"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"अनुलंब विभाजित करा"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"सानुकूल विभाजित करा"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"चार्ज होत नसताना स्टेटस बार चिन्हामध्ये बॅटरी पातळी टक्केवारी दर्शवा"</string>
<string name="quick_settings" msgid="10042998191725428">"दृत सेटिंग्ज"</string>
<string name="status_bar" msgid="4877645476959324760">"स्टेटस बार"</string>
+ <string name="overview" msgid="4018602013895926956">"विहंगावलोकन"</string>
<string name="demo_mode" msgid="2389163018533514619">"डेमो मोड"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"डेमो मोड सक्षम करा"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"डेमो मोड दर्शवा"</string>
diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml
index 6511d30..ceefc29 100644
--- a/packages/SystemUI/res/values-ms-rMY/strings.xml
+++ b/packages/SystemUI/res/values-ms-rMY/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"penyematan skrin"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"cari"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Tidak dapat memulakan <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Ketepikan semua aplikasi"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Lagi"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Sejarah"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Mendatar Terpisah"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Menegak Terpisah"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tersuai Terpisah"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Tunjukkan peratusan aras bateri dalam ikon bar status semasa tidak mengecas"</string>
<string name="quick_settings" msgid="10042998191725428">"Tetapan Pantas"</string>
<string name="status_bar" msgid="4877645476959324760">"Bar status"</string>
+ <string name="overview" msgid="4018602013895926956">"Ikhtisar"</string>
<string name="demo_mode" msgid="2389163018533514619">"Mod tunjuk cara"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Dayakan mod tunjuk cara"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Tunjukkan mod tunjuk cara"</string>
diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml
index c8551b7..81c0932 100644
--- a/packages/SystemUI/res/values-my-rMM/strings.xml
+++ b/packages/SystemUI/res/values-my-rMM/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"မျက်နှာပြင် ပင်ထိုးမှု"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ရှာဖွေရန်"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ကို မစနိုင်ပါ။"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"အပလီကေးရှင်းများအားလုံး ဖယ်ထုတ်မည်"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"နောက်ထပ်"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"မှတ်တမ်း"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ရေပြင်ညီ ပိုင်းမည်"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ဒေါင်လိုက်ပိုင်းမည်"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"စိတ်ကြိုက် ပိုင်းမည်"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"အားမသွင်းနေစဉ်တွင် ဘတ်ထရီအဆင့် ရာခိုင်နှုန်းကို အခြေနေပြဘား အိုင်ကွန်တွင် ပြပါ"</string>
<string name="quick_settings" msgid="10042998191725428">"အမြန် ဆက်တင်များ"</string>
<string name="status_bar" msgid="4877645476959324760">"အခြေအနေပြနေရာ"</string>
+ <string name="overview" msgid="4018602013895926956">"ခြုံငုံသုံးသပ်ချက်"</string>
<string name="demo_mode" msgid="2389163018533514619">"သရုပ်ပြ မုဒ်"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"သရုပ်ပြမုဒ်ကို ဖွင့်ရန်"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"သရုပ်ပြမုဒ် ပြရန်"</string>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index 7cfcbe2..7f6895e 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"én-appsmodus"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"Søk"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Kunne ikke starte <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Avvis alle apper"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mer"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Logg"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Del horisontalt"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Del vertikalt"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Del tilpasset"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Vis batterinivåprosenten inni statusfeltikonet når du ikke lader"</string>
<string name="quick_settings" msgid="10042998191725428">"Hurtiginnstillinger"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusrad"</string>
+ <string name="overview" msgid="4018602013895926956">"Oversikt"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo-modus"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Slå på demo-modus"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Vis demo-modus"</string>
diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml
index 078f783..51e8a16 100644
--- a/packages/SystemUI/res/values-ne-rNP/strings.xml
+++ b/packages/SystemUI/res/values-ne-rNP/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रिन पिन गर्दै"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"खोजी गर्नुहोस्"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"सुरु गर्न सकिएन <xliff:g id="APP">%s</xliff:g>।"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"सबै अनुप्रयोगहरू खारेज गर्नुहोस्"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"थप"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"इतिहास"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"तेर्सो रूपमा विभाजन गर्नुहोस्"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ठाडो रूपमा विभाजन गर्नुहोस्"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"अनुकूलन विभाजन गर्नुहोस्"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"चार्ज नगरेको बेला वस्तुस्थिति पट्टी आइकन भित्र ब्याट्री प्रतिशत स्तर देखाउनुहोस्"</string>
<string name="quick_settings" msgid="10042998191725428">"द्रुत सेटिङहरू"</string>
<string name="status_bar" msgid="4877645476959324760">"स्थिति पट्टी"</string>
+ <string name="overview" msgid="4018602013895926956">"परिदृश्य"</string>
<string name="demo_mode" msgid="2389163018533514619">"डेमो मोड"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"डेमो मोड सक्षम गर्नुहोस्"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"डेमो मोड देखाउनुहोस्"</string>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index de4e58a..88d0b4b 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -283,7 +283,7 @@
<string name="quick_settings_notifications_label" msgid="4818156442169154523">"Meldingen"</string>
<string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Zaklamp"</string>
<string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"Mobiele gegevens"</string>
- <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Gegevensgebruik"</string>
+ <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datagebruik"</string>
<string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Resterende gegevens"</string>
<string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"Limiet overschreden"</string>
<string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> gebruikt"</string>
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"scherm vastzetten"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"zoeken"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Kan <xliff:g id="APP">%s</xliff:g> niet starten."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Alle apps sluiten"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Meer"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Geschiedenis"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontaal splitsen"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Verticaal splitsen"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Aangepast splitsen"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Accupercentage weergeven in het pictogram op de statusbalk wanneer er niet wordt opgeladen"</string>
<string name="quick_settings" msgid="10042998191725428">"Snelle instellingen"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusbalk"</string>
+ <string name="overview" msgid="4018602013895926956">"Overzicht"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demomodus"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demomodus inschakelen"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Demomodus weergeven"</string>
diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml
index e5cbf1f..df6c473af 100644
--- a/packages/SystemUI/res/values-pa-rIN/strings.xml
+++ b/packages/SystemUI/res/values-pa-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ਖੋਜੋ"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"ਸਾਰੇ ਐਪਲੀਕੇਸ਼ਨ ਰੱਦ ਕਰੋ"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"ਹੋਰ"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ਇਤਿਹਾਸ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ਹੌਰੀਜ਼ੌਂਟਲ ਸਪਲਿਟ"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ਵਰਟੀਕਲ ਸਪਲਿਟ"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ਕਸਟਮ ਸਪਲਿਟ"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ਜਦੋਂ ਚਾਰਜ ਨਾ ਹੋ ਰਹੀ ਹੋਵੇ ਤਾਂ ਸਥਿਤੀ ਬਾਰ ਦੇ ਅੰਦਰ ਬੈਟਰੀ ਪੱਧਰ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string>
<string name="quick_settings" msgid="10042998191725428">"ਤਤਕਾਲ ਸੈੱਟਿੰਗਜ਼"</string>
<string name="status_bar" msgid="4877645476959324760">"ਸਥਿਤੀ ਬਾਰ"</string>
+ <string name="overview" msgid="4018602013895926956">"ਰੂਪ-ਰੇਖਾ"</string>
<string name="demo_mode" msgid="2389163018533514619">"ਡੈਮੋ ਮੋਡ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ਡੈਮੋ ਮੋਡ ਸਮਰੱਥ ਬਣਾਓ"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ਡੈਮੋ ਮੋਡ ਦੇਖੋ"</string>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index 65d19bb..694132b 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"przypinanie ekranu"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"szukaj"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Nie udało się uruchomić aplikacji <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Zamknij wszystkie aplikacje"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Więcej"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historia"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podziel poziomo"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podziel pionowo"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Podziel niestandardowo"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Pokaż procent naładowania baterii w ikonie na pasku stanu, gdy telefon się nie ładuje"</string>
<string name="quick_settings" msgid="10042998191725428">"Szybkie ustawienia"</string>
<string name="status_bar" msgid="4877645476959324760">"Pasek stanu"</string>
+ <string name="overview" msgid="4018602013895926956">"Przegląd"</string>
<string name="demo_mode" msgid="2389163018533514619">"Tryb demonstracyjny"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Włącz tryb demonstracyjny"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Pokaż tryb demonstracyjny"</string>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index 8448717..e806bfc 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação de tela"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Dispensar todos os apps"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mais"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Histórico"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar porcentagem de nível de bateria dentro do ícone da barra de status quando não estiver carregando"</string>
<string name="quick_settings" msgid="10042998191725428">"Configurações rápidas"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra de status"</string>
+ <string name="overview" msgid="4018602013895926956">"Visão geral"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modo de demonstração"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Ativar modo de demonstração"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostrar modo de demonstração"</string>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index 6abe9a9..468c75d 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação no ecrã"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar o <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Ignorar todas as aplicações"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mais"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Histórico"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar a percentagem do nível da bateria no ícone da barra de estado quando não estiver a carregar"</string>
<string name="quick_settings" msgid="10042998191725428">"Definições rápidas"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra de estado"</string>
+ <string name="overview" msgid="4018602013895926956">"Vista geral"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modo de demonstração"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Ativar o modo de demonstração"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostrar modo de demonstração"</string>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index 8448717..e806bfc 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação de tela"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Dispensar todos os apps"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mais"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Histórico"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar porcentagem de nível de bateria dentro do ícone da barra de status quando não estiver carregando"</string>
<string name="quick_settings" msgid="10042998191725428">"Configurações rápidas"</string>
<string name="status_bar" msgid="4877645476959324760">"Barra de status"</string>
+ <string name="overview" msgid="4018602013895926956">"Visão geral"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modo de demonstração"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Ativar modo de demonstração"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Mostrar modo de demonstração"</string>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index b45347f..1b8e8de 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -295,7 +295,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixare pe ecran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"căutare"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> nu a putut porni."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Închideți toate aplicațiile"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mai mult"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Istoric"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divizare pe orizontală"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divizare pe verticală"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divizare personalizată"</string>
@@ -410,6 +411,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Afișați procentajul cu nivelul bateriei în interiorul pictogramei din bara de stare, atunci când nu se încarcă"</string>
<string name="quick_settings" msgid="10042998191725428">"Setări rapide"</string>
<string name="status_bar" msgid="4877645476959324760">"Bară de stare"</string>
+ <string name="overview" msgid="4018602013895926956">"Recente"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modul demonstrativ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Activați modul demonstrativ"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Afișați modul demonstrativ"</string>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index 96971ea..9068e0b 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Заблокировать в приложении"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"поиск"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Не удалось запустить приложение \"<xliff:g id="APP">%s</xliff:g>\""</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Закрыть все приложения"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Ещё"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Журнал"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Разделить по горизонтали"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Разделить по вертикали"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Разделить по-другому"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Когда устройство работает в автономном режиме, процент заряда батареи показан в строке состояния"</string>
<string name="quick_settings" msgid="10042998191725428">"Быстрые настройки"</string>
<string name="status_bar" msgid="4877645476959324760">"Строка состояния"</string>
+ <string name="overview" msgid="4018602013895926956">"Обзор"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демонстрация"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Включить демонстрационный режим"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Перейти в демонстрационный режим"</string>
diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml
index 64d460e..3be3718 100644
--- a/packages/SystemUI/res/values-si-rLK/strings.xml
+++ b/packages/SystemUI/res/values-si-rLK/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"තිර ඇමිණීම"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"සෙවීම"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ආරම්භ කළ නොහැක."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"සියලුම යෙදුම් අස් කරන්න"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"තවත්"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ඉතිහාසය"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"තිරස්ව වෙන් කරන්න"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"සිරස්ව වෙන් කරන්න"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"අභිමත ලෙස වෙන් කරන්න"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ආරෝපණය නොවන විට තත්ත්ව තීරු නිරූපකය ඇතුළත බැටරි මට්ටම් ප්රතිශතය පෙන්වන්න"</string>
<string name="quick_settings" msgid="10042998191725428">"ඉක්මන් සැකසීම්"</string>
<string name="status_bar" msgid="4877645476959324760">"තත්ත්ව තීරුව"</string>
+ <string name="overview" msgid="4018602013895926956">"දළ විශ්ලේෂණය"</string>
<string name="demo_mode" msgid="2389163018533514619">"ආදර්ශන ප්රකාරය"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ආදර්ශන ප්රකාරය සබල කරන්න"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ආදර්ශන ප්රකාරය පෙන්වන්න"</string>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index def49e9..d96194c 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripnutie k obrazovke"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"hľadať"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikáciu <xliff:g id="APP">%s</xliff:g> sa nepodarilo spustiť"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Odmietnuť všetky aplikácie"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Viac"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"História"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Rozdeliť vodorovné"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Rozdeliť zvislé"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Rozdeliť vlastné"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Percentuálne zobrazenie nabitia batérie vnútri ikony v stavovom riadku, keď neprebieha nabíjanie"</string>
<string name="quick_settings" msgid="10042998191725428">"Rýchle nastavenia"</string>
<string name="status_bar" msgid="4877645476959324760">"Stavový riadok"</string>
+ <string name="overview" msgid="4018602013895926956">"Prehľad"</string>
<string name="demo_mode" msgid="2389163018533514619">"Režim ukážky"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Povoliť režim ukážky"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Zobraziť režim ukážky"</string>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index 14d3bdb..f3d3b39 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripenjanje zaslona"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"iskanje"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikacije <xliff:g id="APP">%s</xliff:g> ni bilo mogoče zagnati."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Opusti vse aplikacije"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Več"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Zgodovina"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Razdeli vodoravno"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Razdeli navpično"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Razdeli po meri"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Prikaz odstotka napolnjenosti akumulatorja znotraj ikone v vrstici stanja, ko se ne polni"</string>
<string name="quick_settings" msgid="10042998191725428">"Hitre nastavitve"</string>
<string name="status_bar" msgid="4877645476959324760">"Vrstica stanja"</string>
+ <string name="overview" msgid="4018602013895926956">"Pregled"</string>
<string name="demo_mode" msgid="2389163018533514619">"Predstavitveni način"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Omogočanje predstavitvenega načina"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Prikaz predstavitvenega načina"</string>
diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml
index 0316c24..afad772 100644
--- a/packages/SystemUI/res/values-sq-rAL/strings.xml
+++ b/packages/SystemUI/res/values-sq-rAL/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"gozhdimi i ekranit"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"kërko"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> nuk mundi të nisej."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Largo të gjitha aplikacionet"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Më shumë"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historiku"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Ndaje horizontalisht"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Ndaj vertikalisht"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Ndaj të personalizuarën"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Shfaq përqindjen e nivelit të baterisë brenda ikonës së shiritit të statusit kur nuk është duke u ngarkuar."</string>
<string name="quick_settings" msgid="10042998191725428">"Cilësimet e shpejta"</string>
<string name="status_bar" msgid="4877645476959324760">"Shiriti i statusit"</string>
+ <string name="overview" msgid="4018602013895926956">"Përmbledhje"</string>
<string name="demo_mode" msgid="2389163018533514619">"Modaliteti i demonstrimit"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Aktivizo modalitetin e demonstrimit"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Shfaq modalitetin e demonstrimit"</string>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index 2139441..ad14d26 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -295,7 +295,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"качење екрана"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"претражи"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Покретање апликације <xliff:g id="APP">%s</xliff:g> није успело."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Одбаци све апликације"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Још"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Историја"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Подели хоризонтално"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Подели вертикално"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Прилагођено дељење"</string>
@@ -410,6 +411,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Приказивање нивоа напуњености батерије у процентима унутар иконе на статусној траци када се батерија не пуни"</string>
<string name="quick_settings" msgid="10042998191725428">"Брза подешавања"</string>
<string name="status_bar" msgid="4877645476959324760">"Статусна трака"</string>
+ <string name="overview" msgid="4018602013895926956">"Преглед"</string>
<string name="demo_mode" msgid="2389163018533514619">"Режим демонстрације"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Омогући режим демонстрације"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Прикажи режим демонстрације"</string>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index ad7bffd..15e8b12 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fästa skärmen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"sök"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Det gick inte att starta appen <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Ta bort alla appar"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Mer"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historik"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Dela horisontellt"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dela vertikalt"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Dela anpassad"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Visa batterinivå i procent i statusfältsikonen när enheten inte laddas"</string>
<string name="quick_settings" msgid="10042998191725428">"Snabbinställningar"</string>
<string name="status_bar" msgid="4877645476959324760">"Statusfält"</string>
+ <string name="overview" msgid="4018602013895926956">"Översikt"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demoläge"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Aktivera demoläge"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Visa demoläge"</string>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index 244e58d..1d231fc 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kudumisha programu moja"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"tafuta"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Haikuweza kuanzisha <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Ondoa programu zote"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Zaidi"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Historia"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Gawanya Mlalo"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Gawanya Wima"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Maalum Iliyogawanywa"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Onyesha asilimia ya kiwango cha betri ndani ya aikoni ya sehemu ya arifa inapokuwa haichaji"</string>
<string name="quick_settings" msgid="10042998191725428">"Mipangilio ya Haraka"</string>
<string name="status_bar" msgid="4877645476959324760">"Sehemu ya kuonyesha hali"</string>
+ <string name="overview" msgid="4018602013895926956">"Muhtasari"</string>
<string name="demo_mode" msgid="2389163018533514619">"Hali ya onyesho"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Washa hali ya onyesho"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Onyesha hali ya onyesho"</string>
diff --git a/packages/SystemUI/res/values-sw600dp/config.xml b/packages/SystemUI/res/values-sw600dp/config.xml
index 4f6d209..6795da4 100644
--- a/packages/SystemUI/res/values-sw600dp/config.xml
+++ b/packages/SystemUI/res/values-sw600dp/config.xml
@@ -32,4 +32,14 @@
<!-- Set to true to enable the user switcher on the keyguard. -->
<bool name="config_keyguardUserSwitcher">true</bool>
+
+ <!-- Recents: The relative range of visible tasks from the current scroll position
+ while the stack is focused. -->
+ <item name="recents_layout_focused_range_min" format="float" type="integer">-4</item>
+ <item name="recents_layout_focused_range_max" format="float" type="integer">3</item>
+
+ <!-- Recents: The relative range of visible tasks from the current scroll position
+ while the stack is not focused. -->
+ <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item>
+ <item name="recents_layout_unfocused_range_max" format="float" type="integer">2.5</item>
</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml
index 9bd280d..c41494b 100644
--- a/packages/SystemUI/res/values-ta-rIN/strings.xml
+++ b/packages/SystemUI/res/values-ta-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"திரையை பின் செய்தல்"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"தேடு"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ஐத் தொடங்க முடியவில்லை."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"எல்லா பயன்பாடுகளையும் விலக்கு"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"மேலும்"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"வரலாறு"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"கிடைமட்டமாகப் பிரி"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"செங்குத்தாகப் பிரி"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"தனிவிருப்பத்தில் பிரி"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"சார்ஜ் செய்யாத போது, நிலைப் பட்டி ஐகானின் உள்ளே பேட்டரி அளவு சதவீதத்தைக் காட்டும்"</string>
<string name="quick_settings" msgid="10042998191725428">"உடனடி அமைப்புகள்"</string>
<string name="status_bar" msgid="4877645476959324760">"நிலைப் பட்டி"</string>
+ <string name="overview" msgid="4018602013895926956">"மேலோட்டப் பார்வை"</string>
<string name="demo_mode" msgid="2389163018533514619">"டெமோ முறை"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"டெமோ முறையை இயக்கு"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"டெமோ முறையைக் காட்டு"</string>
diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml
index 6e16a95..a628ef7 100644
--- a/packages/SystemUI/res/values-te-rIN/strings.xml
+++ b/packages/SystemUI/res/values-te-rIN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"స్క్రీన్ పిన్నింగ్"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"శోధించు"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ని ప్రారంభించడం సాధ్యపడలేదు."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"అన్ని అనువర్తనాలను తీసివేయి"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"మరింత"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"చరిత్ర"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"సమతలంగా విభజించు"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"లంబంగా విభజించు"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"అనుకూలంగా విభజించు"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"ఛార్జింగ్లో లేనప్పుడు స్థితి పట్టీ చిహ్నం లోపల బ్యాటరీ స్థాయి శాతం చూపుతుంది"</string>
<string name="quick_settings" msgid="10042998191725428">"శీఘ్ర సెట్టింగ్లు"</string>
<string name="status_bar" msgid="4877645476959324760">"స్థితి పట్టీ"</string>
+ <string name="overview" msgid="4018602013895926956">"స్థూలదృష్టి"</string>
<string name="demo_mode" msgid="2389163018533514619">"డెమో మోడ్"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"డెమో మోడ్ ప్రారంభించండి"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"డెమో మోడ్ చూపు"</string>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index 256b497..44ad1fa 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"การตรึงหน้าจอ"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ค้นหา"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"ไม่สามารถเริ่มใช้ <xliff:g id="APP">%s</xliff:g>"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"ปิดแอปพลิเคชันทั้งหมด"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"เพิ่มเติม"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"ประวัติ"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"แยกในแนวนอน"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"แยกในแนวตั้ง"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"แยกแบบกำหนดเอง"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"แสดงเปอร์เซ็นต์ของระดับแบตเตอรี่ภายในไอคอนแถบสถานะเมื่อไม่มีการชาร์จ"</string>
<string name="quick_settings" msgid="10042998191725428">"การตั้งค่าด่วน"</string>
<string name="status_bar" msgid="4877645476959324760">"แถบสถานะ"</string>
+ <string name="overview" msgid="4018602013895926956">"ภาพรวม"</string>
<string name="demo_mode" msgid="2389163018533514619">"โหมดสาธิต"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"เปิดใช้โหมดสาธิต"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"แสดงโหมดสาธิต"</string>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index 66b0b6b..c1bb85c 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pagpi-pin sa screen"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"maghanap"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Hindi masimulan <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"I-dismiss ang lahat ng application"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Higit pa"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"History"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Custom"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Ipakita ang porsyento ng antas ng baterya na nasa icon ng status bar kapag nagcha-charge"</string>
<string name="quick_settings" msgid="10042998191725428">"Mga Maikling Setting"</string>
<string name="status_bar" msgid="4877645476959324760">"Status bar"</string>
+ <string name="overview" msgid="4018602013895926956">"Pangkalahatang-ideya"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo mode"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"I-enable ang demo mode"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Ipakita ang demo mode"</string>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index 5a6e5db..854f850 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sabitleme"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"ara"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> başlatılamadı."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Tüm uygulamaları kapat"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Diğer"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Geçmiş"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Yatay Ayırma"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dikey Ayırma"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Özel Ayırma"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Şarj olmazken durum çubuğu simgesinin içinde pil düzeyi yüzdesini göster"</string>
<string name="quick_settings" msgid="10042998191725428">"Hızlı Ayarlar"</string>
<string name="status_bar" msgid="4877645476959324760">"Durum çubuğu"</string>
+ <string name="overview" msgid="4018602013895926956">"Genel Bakış"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo modu"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demo modunu etkinleştir"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Demo modunu göster"</string>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index afa9077..5347d93 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -296,7 +296,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"закріпити екран"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"пошук"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Не вдалося запустити <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Закрити всі додатки"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Більше"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Історія"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Розділити горизонтально"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Розділити вертикально"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Розділити (власний варіант)"</string>
@@ -411,6 +412,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Показувати заряд акумулятора у відсотках в рядку стану, коли пристрій не заряджається"</string>
<string name="quick_settings" msgid="10042998191725428">"Швидкі налаштування"</string>
<string name="status_bar" msgid="4877645476959324760">"Рядок стану"</string>
+ <string name="overview" msgid="4018602013895926956">"Огляд"</string>
<string name="demo_mode" msgid="2389163018533514619">"Демонстраційний режим"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Увімкнути демонстраційний режим"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Показати демонстраційний режим"</string>
diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml
index 75160cd9..b9da6e3 100644
--- a/packages/SystemUI/res/values-ur-rPK/strings.xml
+++ b/packages/SystemUI/res/values-ur-rPK/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"اسکرین کو پن کرنا"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"تلاش کریں"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> کو شروع نہیں کیا جا سکا۔"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"سبھی ایپلیکیشنز کو برخاست کریں"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"مزید"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"سرگزشت"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"بلحاظ افقی الگ کریں"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"بلحاظ عمودی الگ کریں"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"بلحاظ حسب ضرورت الگ کریں"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"جب چارج نہ ہو رہا ہو تو بیٹری کی سطح کی فیصد اسٹیٹس بار آئیکن کے اندر دکھائیں"</string>
<string name="quick_settings" msgid="10042998191725428">"فوری ترتیبات"</string>
<string name="status_bar" msgid="4877645476959324760">"اسٹیٹس بار"</string>
+ <string name="overview" msgid="4018602013895926956">"مجموعی جائزہ"</string>
<string name="demo_mode" msgid="2389163018533514619">"ڈیمو موڈ"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"ڈیمو موڈ فعال کریں"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"ڈیمو موڈ دکھائیں"</string>
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml
index 5ddd115..67cd123 100644
--- a/packages/SystemUI/res/values-uz-rUZ/strings.xml
+++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"o‘zgarmas ekran"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"qidirish"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"“<xliff:g id="APP">%s</xliff:g>” ilovasini ishga tushirib bo‘lmadi."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Barcha ilovalarni olib tashlash"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Ko‘proq"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Jurnal"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Gorizontal yo‘nalishda bo‘lish"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikal yo‘nalishda bo‘lish"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Boshqa usulda bo‘lish"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Batareya quvvat olmayotgan vaqtda uning foizi holat qatorida ko‘rsatilsin"</string>
<string name="quick_settings" msgid="10042998191725428">"Tezkor sozlamalar"</string>
<string name="status_bar" msgid="4877645476959324760">"Holat qatori"</string>
+ <string name="overview" msgid="4018602013895926956">"Umumiy ma’lumot"</string>
<string name="demo_mode" msgid="2389163018533514619">"Demo rejim"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Demo rejimni yoqish"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Demo rejimni ko‘rsatish"</string>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index 1a5cc8b..aa81068 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"khóa màn hình"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"tìm kiếm"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Không thể khởi động <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Bỏ qua tất cả các ứng dụng"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Thêm"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Lịch sử"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Phân tách ngang"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Phân tách dọc"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tùy chỉnh phân tách"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Hiển thị tỷ lệ phần trăm mức pin bên trong biểu tượng thanh trạng thái khi không sạc"</string>
<string name="quick_settings" msgid="10042998191725428">"Cài đặt nhanh"</string>
<string name="status_bar" msgid="4877645476959324760">"Thanh trạng thái"</string>
+ <string name="overview" msgid="4018602013895926956">"Tổng quan"</string>
<string name="demo_mode" msgid="2389163018533514619">"Chế độ trình diễn"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Bật chế độ trình diễn"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Hiển thị chế độ trình diễn"</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 0c6b2c9..fa69975 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"固定屏幕"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"无法启动<xliff:g id="APP">%s</xliff:g>。"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"关闭所有应用"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"更多"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"历史记录"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自定义分割"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"未充电时在状态栏图标内显示电池电量百分比"</string>
<string name="quick_settings" msgid="10042998191725428">"快速设置"</string>
<string name="status_bar" msgid="4877645476959324760">"状态栏"</string>
+ <string name="overview" msgid="4018602013895926956">"概览"</string>
<string name="demo_mode" msgid="2389163018533514619">"演示模式"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"启用演示模式"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"显示演示模式"</string>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index ff97841..7375a92 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"螢幕固定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"無法啟動「<xliff:g id="APP">%s</xliff:g>」。"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"關閉所有應用程式"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"更多"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"記錄"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自訂分割"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"非充電時，在狀態列圖示顯示電量百分比"</string>
<string name="quick_settings" msgid="10042998191725428">"快速設定"</string>
<string name="status_bar" msgid="4877645476959324760">"狀態列"</string>
+ <string name="overview" msgid="4018602013895926956">"概覽"</string>
<string name="demo_mode" msgid="2389163018533514619">"示範模式"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"啟用示範模式"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"顯示示範模式"</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index 8d238d5..5edda84 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"螢幕固定"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"無法啟動「<xliff:g id="APP">%s</xliff:g>」。"</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"關閉所有應用程式"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"更多"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"紀錄"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自訂分割"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"未充電時在狀態列圖示中顯示電量百分比"</string>
<string name="quick_settings" msgid="10042998191725428">"快速設定"</string>
<string name="status_bar" msgid="4877645476959324760">"狀態列"</string>
+ <string name="overview" msgid="4018602013895926956">"總覽"</string>
<string name="demo_mode" msgid="2389163018533514619">"示範模式"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"啟用示範模式"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"顯示示範模式"</string>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index f77e01a..51c4389 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -294,7 +294,8 @@
<string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ukuphina isikrini"</string>
<string name="recents_search_bar_label" msgid="8074997400187836677">"sesha"</string>
<string name="recents_launch_error_message" msgid="2969287838120550506">"Ayikwazanga ukuqala i-<xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_dismiss_all_message" msgid="8495275386693095768">"Cashisa zonke izinhlelo zokusebenza"</string>
+ <string name="recents_show_history_button_label" msgid="7062088196449747245">"Okuningi"</string>
+ <string name="recents_history_label" msgid="3076213823382198287">"Umlando"</string>
<string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Hlukanisa okuvundlile"</string>
<string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Hlukanisa okumile"</string>
<string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Hlukanisa kwezifiso"</string>
@@ -409,6 +410,7 @@
<string name="show_battery_percentage_summary" msgid="3215025775576786037">"Bonisa amaphesenti eleveli yebhethri ngaphakathi kwesithonjana sebha yesimo uma kungashajwa"</string>
<string name="quick_settings" msgid="10042998191725428">"Izilungiselelo ezisheshayo"</string>
<string name="status_bar" msgid="4877645476959324760">"Ibha yesimo"</string>
+ <string name="overview" msgid="4018602013895926956">"Okufingqiwe"</string>
<string name="demo_mode" msgid="2389163018533514619">"Imodi yedemo"</string>
<string name="enable_demo_mode" msgid="4844205668718636518">"Nika amandla imodi yedemo"</string>
<string name="show_demo_mode" msgid="2018336697782464029">"Bonisa imodi yedemo"</string>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 26a0577..bfd8af9 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -109,7 +109,6 @@
<color name="assist_orb_color">#ffffff</color>
<color name="keyguard_user_switcher_background_gradient_color">#77000000</color>
- <color name="doze_small_icon_background_color">#ff434343</color>
<!-- The color of the navigation bar icons. Need to be in sync with ic_sysbar_* -->
<color name="navigation_bar_icon_color">#E5FFFFFF</color>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 0c638a2..902db26 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -138,12 +138,6 @@
<!-- The duration in seconds to wait before the dismiss buttons are shown. -->
<integer name="recents_task_bar_dismiss_delay_seconds">1000</integer>
- <!-- The min animation duration for animating views that are currently visible. -->
- <integer name="recents_filter_animate_current_views_duration">250</integer>
-
- <!-- The min animation duration for animating views that are newly visible. -->
- <integer name="recents_filter_animate_new_views_duration">250</integer>
-
<!-- The duration of the window transition when coming to Recents from an app.
In order to defer the in-app animations until after the transition is complete,
we also need to use this value as the starting delay when animating the first
@@ -183,6 +177,9 @@
<!-- The animation duration for scrolling the stack to a particular item. -->
<integer name="recents_animate_task_stack_scroll_duration">225</integer>
+ <!-- The animation duration for entering and exiting the history. -->
+ <integer name="recents_history_transition_duration">250</integer>
+
<!-- The minimum alpha for the dim applied to cards that go deeper into the stack. -->
<integer name="recents_max_task_stack_view_dim">96</integer>
@@ -192,6 +189,16 @@
<!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. -->
<integer name="recents_svelte_level">0</integer>
+ <!-- Recents: The relative range of visible tasks from the current scroll position
+ while the stack is focused. -->
+ <item name="recents_layout_focused_range_min" format="float" type="integer">-4</item>
+ <item name="recents_layout_focused_range_max" format="float" type="integer">3</item>
+
+ <!-- Recents: The relative range of visible tasks from the current scroll position
+ while the stack is not focused. -->
+ <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item>
+ <item name="recents_layout_unfocused_range_max" format="float" type="integer">2.5</item>
+
<!-- Whether to enable KeyguardService or not -->
<bool name="config_enableKeyguardService">true</bool>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 73f63a9..086e9f4 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -48,11 +48,14 @@
<!-- Height of a single line notification in the status bar -->
<dimen name="notification_single_line_height">32sp</dimen>
- <!-- Height of a small notification in the status bar -->
- <dimen name="notification_min_height">64dp</dimen>
+ <!-- Height of a small notification in the status bar-->
+ <dimen name="notification_min_height">84dp</dimen>
+
+ <!-- Height of a small notification in the status bar which was used before android N -->
+ <dimen name="notification_min_height_legacy">64dp</dimen>
<!-- Height of a large notification in the status bar -->
- <dimen name="notification_max_height">256dp</dimen>
+ <dimen name="notification_max_height">276dp</dimen>
<!-- Height of a medium notification in the status bar -->
<dimen name="notification_mid_height">128dp</dimen>
@@ -214,9 +217,6 @@
<!-- The amount to offset when animating into an affiliate group. -->
<dimen name="recents_task_view_affiliate_group_enter_offset">64dp</dimen>
- <!-- The alpha to apply to a task thumbnail. -->
- <item name="recents_task_view_thumbnail_alpha" format="float" type="dimen">0.9</item>
-
<!-- The height of a task view bar. -->
<dimen name="recents_task_bar_height">56dp</dimen>
@@ -247,6 +247,12 @@
<!-- The amount to allow the stack to overscroll. -->
<dimen name="recents_stack_overscroll">24dp</dimen>
+ <!-- The size of the peek area at the top of the stack. -->
+ <dimen name="recents_layout_focused_peek_size">@dimen/recents_history_button_height</dimen>
+
+ <!-- The height of the history button. -->
+ <dimen name="recents_history_button_height">48dp</dimen>
+
<!-- Space reserved for the cards behind the top card in the top stack -->
<dimen name="top_stack_peek_amount">12dp</dimen>
@@ -255,7 +261,7 @@
<!-- bottom_stack_peek_amount + notification_min_height
+ notification_collapse_second_card_padding -->
- <dimen name="min_stack_height">84dp</dimen>
+ <dimen name="min_stack_height">104dp</dimen>
<!-- The height of the area before the bottom stack in which the notifications slow down -->
<dimen name="bottom_stack_slow_down_length">12dp</dimen>
@@ -273,7 +279,7 @@
<dimen name="notification_padding_dimmed">0dp</dimen>
<!-- The padding between the individual notification cards. -->
- <dimen name="notification_padding">4dp</dimen>
+ <dimen name="notification_padding">2dp</dimen>
<!-- The minimum amount of top overscroll to go to the quick settings. -->
<dimen name="min_top_overscroll_to_qs">36dp</dimen>
@@ -293,7 +299,7 @@
<!-- Falsing threshold used when dismissing notifications from the lockscreen. -->
<dimen name="swipe_helper_falsing_threshold">70dp</dimen>
- <dimen name="notifications_top_padding">8dp</dimen>
+ <dimen name="notifications_top_padding">4dp</dimen>
<!-- Minimum distance the user has to drag down to go to the full shade. -->
<dimen name="keyguard_drag_down_min_distance">100dp</dimen>
@@ -345,9 +351,6 @@
<!-- radius of the corners of the material rounded rect background but negative-->
<dimen name="notification_material_rounded_rect_radius_negative">-2dp</dimen>
- <!-- height of notification header view if present -->
- <dimen name="notification_header_height">32dp</dimen>
-
<!-- The padding between notification children -->
<dimen name="notification_children_padding">2dp</dimen>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index d5f9557e..d6a361c 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -698,8 +698,10 @@
<string name="recents_search_bar_label">search</string>
<!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
<string name="recents_launch_error_message">Could not start <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
- <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
- <string name="recents_dismiss_all_message">Dismiss all applications</string>
+ <!-- Recents: Show history string. [CHAR LIMIT=NONE] -->
+ <string name="recents_show_history_button_label">More</string>
+ <!-- Recents: The history of recents. [CHAR LIMIT=NONE] -->
+ <string name="recents_history_label">History</string>
<!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
<string name="recents_multistack_add_stack_dialog_split_horizontal">Split Horizontal</string>
@@ -751,9 +753,6 @@
<!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
<string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string>
- <!-- The divider symbol between different parts of the notification header. not translatable [CHAR LIMIT=1] -->
- <string name="notification_header_divider_symbol" translatable="false">•</string>
-
<!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
<string name="speed_bump_explanation">Less urgent notifications below</string>
@@ -1067,6 +1066,9 @@
<!-- Name of status bar -->
<string name="status_bar">Status bar</string>
+ <!-- Name of overview -->
+ <string name="overview">Overview</string>
+
<!-- Name of demo mode (mode with preset icons for screenshots) -->
<string name="demo_mode">Demo mode</string>
@@ -1156,6 +1158,26 @@
<!-- Option to use new paging layout in quick settings [CHAR LIMIT=60] -->
<string name="qs_paging" translatable="false">Use the new Quick Settings</string>
+ <!-- Toggles paging recents via the recents button. DO NOT TRANSLATE -->
+ <string name="overview_page_on_toggle">Enable paging</string>
+ <!-- Description for the toggle for fast-toggling recents via the recents button. DO NOT TRANSLATE -->
+ <string name="overview_page_on_toggle_desc">Enable paging via the Overview button</string>
+
+ <!-- Toggles fast-toggling recents via the recents button. DO NOT TRANSLATE -->
+ <string name="overview_fast_toggle_via_button">Enable fast toggle</string>
+ <!-- Description for the toggle for fast-toggling recents via the recents button. DO NOT TRANSLATE -->
+ <string name="overview_fast_toggle_via_button_desc">Enable launch timeout while paging</string>
+
+ <!-- Toggles fullscreen screenshots. DO NOT TRANSLATE -->
+ <string name="overview_fullscreen_thumbnails">Enable fullscreen screenshots</string>
+ <!-- Description for the toggle for fullscreen screenshots. DO NOT TRANSLATE -->
+ <string name="overview_fullscreen_thumbnails_desc">Enable fullscreen screenshots in Overview</string>
+
+ <!-- Toggle to show the history view in Overview. DO NOT TRANSLATE -->
+ <string name="overview_show_history">Show History</string>
+ <!-- Description for the toggle to show the history view in Overview. DO NOT TRANSLATE -->
+ <string name="overview_show_history_desc">Enables the history view to see more recent tasks</string>
+
<!-- Category in the System UI Tuner settings, where new/experimental
settings are -->
<string name="experimental">Experimental</string>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 4462a03..2fd0fe5 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -220,9 +220,8 @@
<item name="android:colorControlActivated">@color/system_accent_color</item>
</style>
- <style name="systemui_theme_light" parent="@android:style/Theme.DeviceDefault.Light">
- <item name="android:colorPrimary">@color/system_primary_color</item>
- <item name="android:colorControlActivated">@color/system_accent_color</item>
+ <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault">
+ <item name="android:colorControlActivated">@android:color/white</item>
</style>
<style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog">
diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml
index 5980108..f398af3 100644
--- a/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@ -21,10 +21,6 @@
<PreferenceScreen
android:title="@string/quick_settings">
- <Preference
- android:key="qs_tuner"
- android:title="@string/qs_rearrange" />
-
<PreferenceCategory
android:title="@string/experimental">
@@ -87,6 +83,32 @@
</PreferenceScreen>
+
+ <PreferenceScreen
+ android:title="@string/overview" >
+
+ <com.android.systemui.tuner.TunerSwitch
+ android:key="overview_page_on_toggle"
+ android:title="@string/overview_page_on_toggle"
+ android:summary="@string/overview_page_on_toggle_desc" />
+
+ <com.android.systemui.tuner.TunerSwitch
+ android:key="overview_fast_toggle"
+ android:title="@string/overview_fast_toggle_via_button"
+ android:summary="@string/overview_fast_toggle_via_button_desc" />
+
+ <com.android.systemui.tuner.TunerSwitch
+ android:key="overview_fullscreen_thumbnails"
+ android:title="@string/overview_fullscreen_thumbnails"
+ android:summary="@string/overview_fullscreen_thumbnails_desc" />
+
+ <com.android.systemui.tuner.TunerSwitch
+ android:key="overview_show_history"
+ android:title="@string/overview_show_history"
+ android:summary="@string/overview_show_history_desc" />
+
+ </PreferenceScreen>
+
<SwitchPreference
android:key="battery_pct"
android:title="@string/show_battery_percentage"
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index d9f7a46..051921a 100644
--- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
@@ -509,7 +509,7 @@
if (canBeExpanded) {
if (DEBUG) Log.d(TAG, "working on an expandable child");
mNaturalHeight = mScaler.getNaturalHeight();
- mSmallSize = v.getMinHeight();
+ mSmallSize = v.getMinExpandHeight();
} else {
if (DEBUG) Log.d(TAG, "working on a non-expandable child");
mNaturalHeight = mOldHeight;
diff --git a/packages/SystemUI/src/com/android/systemui/Prefs.java b/packages/SystemUI/src/com/android/systemui/Prefs.java
index 3657cf2..7933cc6 100644
--- a/packages/SystemUI/src/com/android/systemui/Prefs.java
+++ b/packages/SystemUI/src/com/android/systemui/Prefs.java
@@ -30,7 +30,9 @@
@Retention(RetentionPolicy.SOURCE)
@StringDef({
- Key.SEARCH_APP_WIDGET_ID,
+ Key.OVERVIEW_SEARCH_APP_WIDGET_ID,
+ Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE,
+ Key.OVERVIEW_LAST_STACK_TASK_ACTIVE_TIME,
Key.DEBUG_MODE_ENABLED,
Key.HOTSPOT_TILE_LAST_USED,
Key.COLOR_INVERSION_TILE_LAST_USED,
@@ -43,8 +45,9 @@
Key.DND_FAVORITE_ZEN,
})
public @interface Key {
- String SEARCH_APP_WIDGET_ID = "searchAppWidgetId";
- String SEARCH_APP_WIDGET_PACKAGE = "searchAppWidgetPackage";
+ String OVERVIEW_SEARCH_APP_WIDGET_ID = "searchAppWidgetId";
+ String OVERVIEW_SEARCH_APP_WIDGET_PACKAGE = "searchAppWidgetPackage";
+ String OVERVIEW_LAST_STACK_TASK_ACTIVE_TIME = "OverviewLastStackTaskActiveTime";
String DEBUG_MODE_ENABLED = "debugModeEnabled";
String HOTSPOT_TILE_LAST_USED = "HotspotTileLastUsed";
String COLOR_INVERSION_TILE_LAST_USED = "ColorInversionTileLastUsed";
diff --git a/packages/SystemUI/src/com/android/systemui/RecentsComponent.java b/packages/SystemUI/src/com/android/systemui/RecentsComponent.java
index 9a4cd93..4cb8a3c 100644
--- a/packages/SystemUI/src/com/android/systemui/RecentsComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/RecentsComponent.java
@@ -16,6 +16,7 @@
package com.android.systemui;
+import android.graphics.Rect;
import android.view.Display;
import android.view.View;
@@ -31,5 +32,20 @@
/**
* Docks the top-most task and opens recents.
*/
- void dockTopTask();
+ void dockTopTask(boolean draggingInRecents, Rect initialBounds);
+
+ /**
+ * Called during a drag-from-navbar-in gesture.
+ *
+ * @param distanceFromTop the distance of the current drag in gesture from the top of the
+ * screen
+ */
+ void onDraggingInRecents(float distanceFromTop);
+
+ /**
+ * Called when the gesture to drag in recents ended.
+ *
+ * @param velocity the velocity of the finger when releasing it in pixels per second
+ */
+ void onDraggingInRecentsEnded(float velocity);
}
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
index 949efc5..19e299254 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
@@ -48,12 +48,12 @@
com.android.systemui.keyguard.KeyguardViewMediator.class,
com.android.systemui.recents.Recents.class,
com.android.systemui.volume.VolumeUI.class,
+ Divider.class,
com.android.systemui.statusbar.SystemBars.class,
com.android.systemui.usb.StorageNotification.class,
com.android.systemui.power.PowerUI.class,
com.android.systemui.media.RingtonePlayer.class,
com.android.systemui.keyboard.KeyboardUI.class,
- Divider.class
};
/**
diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
index eddf2b1..5b8d3d6 100644
--- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
@@ -26,6 +26,8 @@
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
+import java.util.ArrayList;
+
/**
* Helper to invert the colors of views and fade between the states.
*/
@@ -33,14 +35,24 @@
private final Paint mDarkPaint = new Paint();
private final Interpolator mLinearOutSlowInInterpolator;
- private final View mTarget;
+ private final ArrayList<View> mTargets;
private final ColorMatrix mMatrix = new ColorMatrix();
private final ColorMatrix mGrayscaleMatrix = new ColorMatrix();
private final long mFadeDuration;
public ViewInvertHelper(View target, long fadeDuration) {
- mTarget = target;
- mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(mTarget.getContext(),
+ this(constructArray(target), fadeDuration);
+ }
+
+ private static ArrayList<View> constructArray(View target) {
+ final ArrayList<View> views = new ArrayList<>();
+ views.add(target);
+ return views;
+ }
+
+ public ViewInvertHelper(ArrayList<View> targets, long fadeDuration) {
+ mTargets = targets;
+ mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(mTargets.get(0).getContext(),
android.R.interpolator.linear_out_slow_in);
mFadeDuration = fadeDuration;
}
@@ -53,14 +65,18 @@
@Override
public void onAnimationUpdate(ValueAnimator animation) {
updateInvertPaint((Float) animation.getAnimatedValue());
- mTarget.setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
+ for (int i = 0; i < mTargets.size(); i++) {
+ mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
+ }
}
});
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
if (!invert) {
- mTarget.setLayerType(View.LAYER_TYPE_NONE, null);
+ for (int i = 0; i < mTargets.size(); i++) {
+ mTargets.get(i).setLayerType(View.LAYER_TYPE_NONE, null);
+ }
}
}
});
@@ -73,16 +89,16 @@
public void update(boolean invert) {
if (invert) {
updateInvertPaint(1f);
- mTarget.setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
+ for (int i = 0; i < mTargets.size(); i++) {
+ mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
+ }
} else {
- mTarget.setLayerType(View.LAYER_TYPE_NONE, null);
+ for (int i = 0; i < mTargets.size(); i++) {
+ mTargets.get(i).setLayerType(View.LAYER_TYPE_NONE, null);
+ }
}
}
- public View getTarget() {
- return mTarget;
- }
-
private void updateInvertPaint(float intensity) {
float components = 1 - 2 * intensity;
final float[] invert = {
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
index 96ee397..d931856 100644
--- a/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
+++ b/packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java
@@ -180,7 +180,7 @@
mProfileManager = bluetoothManager.getProfileManager();
bluetoothManager.getEventManager().registerCallback(new BluetoothCallbackHandler());
- InputManager im = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
+ InputManager im = context.getSystemService(InputManager.class);
im.registerOnTabletModeChangedListener(this, mHandler);
mInTabletMode = im.isInTabletMode();
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
index a12a3f1..19b65f7 100644
--- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
@@ -36,7 +36,6 @@
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog;
-import android.view.View;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.PhoneStatusBar;
@@ -162,9 +161,6 @@
.setColor(mContext.getColor(
com.android.internal.R.color.system_notification_accent_color));
final Notification n = nb.build();
- if (n.headsUpContentView != null) {
- n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE);
- }
mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
}
@@ -200,9 +196,6 @@
mPlaySound = false;
}
final Notification n = nb.build();
- if (n.headsUpContentView != null) {
- n.headsUpContentView.setViewVisibility(com.android.internal.R.id.right_icon, View.GONE);
- }
mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
index 47189b0..6d8b476 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
@@ -111,7 +111,9 @@
private void handleRefreshState() {
mIsIconVisible = mSecurityController.isVpnEnabled();
- if (mSecurityController.hasDeviceOwner()) {
+ // If the device has device owner, show "Device may be monitored", but --
+ // TODO See b/25779452 -- device owner doesn't actually have monitoring power.
+ if (mSecurityController.isDeviceManaged()) {
mFooterTextId = R.string.device_owned_footer;
mIsVisible = true;
} else {
@@ -156,6 +158,8 @@
private String getMessage(String deviceOwner, String profileOwner, String primaryVpn,
String profileVpn, boolean primaryUserIsManaged) {
+ // Show a special warning when the device has device owner, but --
+ // TODO See b/25779452 -- device owner doesn't actually have monitoring power.
if (deviceOwner != null) {
if (primaryVpn != null) {
return mContext.getString(R.string.monitoring_description_vpn_app_device_owned,
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 049754e..bb2b8fc 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -77,9 +77,9 @@
private Record mDetailRecord;
private Callback mCallback;
private BrightnessController mBrightnessController;
- private QSTileHost mHost;
+ protected QSTileHost mHost;
- private QSFooter mFooter;
+ protected QSFooter mFooter;
private boolean mGridContentVisible = true;
protected LinearLayout mQsContainer;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index 5d928d6..7f45545 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -44,8 +44,8 @@
* state update pass on tile looper.
*/
public abstract class QSTile<TState extends State> implements Listenable {
- protected final String TAG = "QSTile." + getClass().getSimpleName();
- protected static final boolean DEBUG = Log.isLoggable("QSTile", Log.DEBUG);
+ protected final String TAG = "Tile." + getClass().getSimpleName();
+ protected static final boolean DEBUG = Log.isLoggable("Tile", Log.DEBUG);
protected final Host mHost;
protected final Context mContext;
@@ -332,7 +332,7 @@
Looper getLooper();
Context getContext();
Collection<QSTile<?>> getTiles();
- void setCallback(Callback callback);
+ void addCallback(Callback callback);
BluetoothController getBluetoothController();
LocationController getLocationController();
RotationLockController getRotationLockController();
@@ -453,9 +453,9 @@
public static class State {
public boolean visible;
public Icon icon;
- public String label;
- public String contentDescription;
- public String dualLabelContentDescription;
+ public CharSequence label;
+ public CharSequence contentDescription;
+ public CharSequence dualLabelContentDescription;
public boolean autoMirrorDrawable = true;
public boolean copyTo(State other) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileServiceWrapper.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileServiceWrapper.java
new file mode 100644
index 0000000..55f4736
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileServiceWrapper.java
@@ -0,0 +1,76 @@
+package com.android.systemui.qs;
+
+import android.os.IBinder;
+import android.service.quicksettings.IQSTileService;
+import android.service.quicksettings.Tile;
+import android.util.Log;
+
+
+public class QSTileServiceWrapper implements IQSTileService {
+ private static final String TAG = "IQSTileServiceWrapper";
+
+ private final IQSTileService mService;
+
+ public QSTileServiceWrapper(IQSTileService service) {
+ mService = service;
+ }
+
+ @Override
+ public IBinder asBinder() {
+ return mService.asBinder();
+ }
+
+ @Override
+ public void setQSTile(Tile tile) {
+ try {
+ mService.setQSTile(tile);
+ } catch (Exception e) {
+ Log.d(TAG, "Caught exception from QSTileService", e);
+ }
+ }
+
+ @Override
+ public void onTileAdded() {
+ try {
+ mService.onTileAdded();
+ } catch (Exception e) {
+ Log.d(TAG, "Caught exception from QSTileService", e);
+ }
+ }
+
+ @Override
+ public void onTileRemoved() {
+ try {
+ mService.onTileRemoved();
+ } catch (Exception e) {
+ Log.d(TAG, "Caught exception from QSTileService", e);
+ }
+ }
+
+ @Override
+ public void onStartListening() {
+ try {
+ mService.onStartListening();
+ } catch (Exception e) {
+ Log.d(TAG, "Caught exception from QSTileService", e);
+ }
+ }
+
+ @Override
+ public void onStopListening() {
+ try {
+ mService.onStopListening();
+ } catch (Exception e) {
+ Log.d(TAG, "Caught exception from QSTileService", e);
+ }
+ }
+
+ @Override
+ public void onClick() {
+ try {
+ mService.onClick();
+ } catch (Exception e) {
+ Log.d(TAG, "Caught exception from QSTileService", e);
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
index cc264a0..4cc2b8d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
@@ -17,6 +17,7 @@
package com.android.systemui.qs;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
@@ -24,22 +25,16 @@
import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.RippleDrawable;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
import android.util.MathUtils;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
-import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.TextView;
-
import com.android.systemui.FontSizeUtils;
import com.android.systemui.R;
import com.android.systemui.qs.QSTile.AnimationIcon;
-import com.android.systemui.qs.QSTile.State;
import java.util.Objects;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java
new file mode 100644
index 0000000..a4ff685
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/BlankCustomTile.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2015 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.systemui.qs.customize;
+
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.systemui.qs.QSTile;
+
+public class BlankCustomTile extends QSTile<QSTile.State> {
+ public static final String PREFIX = "custom(";
+
+ private final ComponentName mComponent;
+
+ private BlankCustomTile(Host host, String action) {
+ super(host);
+ mComponent = ComponentName.unflattenFromString(action);
+ }
+
+ public static QSTile<?> create(Host host, String spec) {
+ if (spec == null || !spec.startsWith(PREFIX) || !spec.endsWith(")")) {
+ throw new IllegalArgumentException("Bad custom tile spec: " + spec);
+ }
+ final String action = spec.substring(PREFIX.length(), spec.length() - 1);
+ if (action.isEmpty()) {
+ throw new IllegalArgumentException("Empty custom tile spec action");
+ }
+ return new BlankCustomTile(host, action);
+ }
+
+ @Override
+ public void setListening(boolean listening) {
+ }
+
+ @Override
+ protected State newTileState() {
+ return new State();
+ }
+
+ @Override
+ protected void handleUserSwitch(int newUserId) {
+ super.handleUserSwitch(newUserId);
+ }
+
+ @Override
+ protected void handleClick() {
+ MetricsLogger.action(mContext, getMetricsCategory(), mComponent.getPackageName());
+ }
+
+ @Override
+ protected void handleLongClick() {
+ }
+
+ @Override
+ protected void handleUpdateState(State state, Object arg) {
+ try {
+ PackageManager pm = mContext.getPackageManager();
+ ServiceInfo info = pm.getServiceInfo(mComponent, 0);
+ state.visible = true;
+ state.icon = new DrawableIcon(info.loadIcon(pm));
+ state.label = info.loadLabel(pm).toString();
+ state.contentDescription = state.label;
+ } catch (Exception e) {
+ state.visible = false;
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsLogger.QS_INTENT;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java
index 8866e55..422ae4d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java
@@ -15,16 +15,34 @@
*/
package com.android.systemui.qs.customize;
+import android.app.ActivityManager;
+import android.app.Service;
import android.content.ClipData;
+import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.UserHandle;
+import android.provider.Settings.Secure;
+import android.service.quicksettings.IQSTileService;
+import android.text.TextUtils;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.qs.QSTile;
+import com.android.systemui.qs.QSTileServiceWrapper;
+import com.android.systemui.qs.tiles.CustomTile;
import com.android.systemui.statusbar.phone.QSTileHost;
+import com.android.systemui.tuner.TunerService;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
/**
* A version of QSPanel that allows tiles to be dragged around rather than
@@ -32,8 +50,14 @@
* and the saving/ordering is handled by the CustomQSTileHost.
*/
public class CustomQSPanel extends QSPanel {
+
+ private static final String TAG = "CustomQSPanel";
- private CustomQSTileHost mCustomHost;
+ private List<String> mSavedTiles;
+ private ArrayList<String> mStash;
+ private List<String> mTiles = new ArrayList<>();
+
+ private ArrayList<QSTile<?>> mCurrentTiles = new ArrayList<>();
public CustomQSPanel(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -41,12 +65,9 @@
.inflate(R.layout.qs_customize_layout, mQsContainer, false);
mQsContainer.addView((View) mTileLayout, 1 /* Between brightness and footer */);
((NonPagedTileLayout) mTileLayout).setCustomQsPanel(this);
- }
+ removeView(mFooter.getView());
- @Override
- public void setHost(QSTileHost host) {
- super.setHost(host);
- mCustomHost = (CustomQSTileHost) host;
+ TunerService.get(mContext).addTunable(this, QSTileHost.TILES_SETTING);
}
@Override
@@ -55,17 +76,16 @@
// No Brightness for you.
super.onTuningChanged(key, "0");
}
- }
-
- public CustomQSTileHost getCustomHost() {
- return mCustomHost;
+ if (QSTileHost.TILES_SETTING.equals(key)) {
+ mSavedTiles = QSTileHost.loadTileSpecs(mContext, newValue);
+ }
}
public void tileSelected(QSTile<?> tile, ClipData currentClip) {
String sourceSpec = getSpec(currentClip);
String destSpec = tile.getTileSpec();
if (!sourceSpec.equals(destSpec)) {
- mCustomHost.moveTo(sourceSpec, destSpec);
+ moveTo(sourceSpec, destSpec);
}
}
@@ -79,4 +99,124 @@
public String getSpec(ClipData data) {
return data.getItemAt(0).getText().toString();
}
+
+ public void setSavedTiles() {
+ setTiles(mSavedTiles);
+ }
+
+ public void saveCurrentTiles() {
+ for (int i = 0; i < mSavedTiles.size(); i++) {
+ String tileSpec = mSavedTiles.get(i);
+ if (!tileSpec.startsWith(CustomTile.PREFIX)) continue;
+ if (!mTiles.contains(tileSpec)) {
+ mContext.bindServiceAsUser(
+ new Intent().setComponent(CustomTile.getComponentFromSpec(tileSpec)),
+ new ServiceConnection() {
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ }
+
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ QSTileServiceWrapper wrapper = new QSTileServiceWrapper(
+ IQSTileService.Stub.asInterface(service));
+ wrapper.onStopListening();
+ wrapper.onTileRemoved();
+ mContext.unbindService(this);
+ }
+ }, Service.BIND_AUTO_CREATE,
+ new UserHandle(ActivityManager.getCurrentUser()));
+ }
+ }
+ for (int i = 0; i < mTiles.size(); i++) {
+ String tileSpec = mTiles.get(i);
+ if (!tileSpec.startsWith(CustomTile.PREFIX)) continue;
+ if (!mSavedTiles.contains(tileSpec)) {
+ mContext.bindServiceAsUser(
+ new Intent().setComponent(CustomTile.getComponentFromSpec(tileSpec)),
+ new ServiceConnection() {
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ }
+
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ QSTileServiceWrapper wrapper = new QSTileServiceWrapper(
+ IQSTileService.Stub.asInterface(service));
+ wrapper.onTileAdded();
+ mContext.unbindService(this);
+ }
+ }, Service.BIND_AUTO_CREATE,
+ new UserHandle(ActivityManager.getCurrentUser()));
+ }
+ }
+ Secure.putStringForUser(getContext().getContentResolver(), QSTileHost.TILES_SETTING,
+ TextUtils.join(",", mTiles), ActivityManager.getCurrentUser());
+ }
+
+ public void stashCurrentTiles() {
+ mStash = new ArrayList<>(mTiles);
+ }
+
+ public void unstashTiles() {
+ setTiles(mStash);
+ }
+
+ @Override
+ public void setTiles(Collection<QSTile<?>> tiles) {
+ setTilesInternal();
+ }
+
+ private void setTilesInternal() {
+ for (int i = 0; i < mCurrentTiles.size(); i++) {
+ mCurrentTiles.get(i).destroy();
+ }
+ mCurrentTiles.clear();
+ for (int i = 0; i < mTiles.size(); i++) {
+ if (mTiles.get(i).startsWith(CustomTile.PREFIX)) {
+ mCurrentTiles.add(BlankCustomTile.create(mHost, mTiles.get(i)));
+ } else {
+ mCurrentTiles.add(mHost.createTile(mTiles.get(i)));
+ }
+ mCurrentTiles.get(mCurrentTiles.size() - 1).setTileSpec(mTiles.get(i));
+ }
+ super.setTiles(mCurrentTiles);
+ }
+
+ public void addTile(String spec) {
+ mTiles.add(spec);
+ setTilesInternal();
+ }
+
+ public void moveTo(String from, String to) {
+ int fromIndex = mTiles.indexOf(from);
+ if (fromIndex < 0) {
+ Log.e(TAG, "Unknown from tile " + from);
+ return;
+ }
+ int index = mTiles.indexOf(to);
+ if (index < 0) {
+ Log.e(TAG, "Unknown to tile " + to);
+ return;
+ }
+ mTiles.remove(fromIndex);
+ mTiles.add(index, from);
+ setTilesInternal();
+ }
+
+ public void remove(String spec) {
+ if (!mTiles.remove(spec)) {
+ Log.e(TAG, "Unknown remove spec " + spec);
+ }
+ setTilesInternal();
+ }
+
+ public void setTiles(List<String> tiles) {
+ mTiles = new ArrayList<>(tiles);
+ setTilesInternal();
+ }
+
+ public Collection<QSTile<?>> getTiles() {
+ return mCurrentTiles;
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSTileHost.java
deleted file mode 100644
index 3f85982..0000000
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSTileHost.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2015 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.systemui.qs.customize;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.provider.Settings.Secure;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.systemui.qs.QSTile;
-import com.android.systemui.statusbar.phone.QSTileHost;
-import com.android.systemui.statusbar.policy.SecurityController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @see CustomQSPanel
- */
-public class CustomQSTileHost extends QSTileHost {
-
- private static final String TAG = "CustomHost";
- private List<String> mTiles;
- private List<String> mSavedTiles;
- private ArrayList<String> mStash;
-
- public CustomQSTileHost(Context context, QSTileHost host) {
- super(context, null, host.getBluetoothController(), host.getLocationController(),
- host.getRotationLockController(), host.getNetworkController(),
- host.getZenModeController(), host.getHotspotController(), host.getCastController(),
- host.getFlashlightController(), host.getUserSwitcherController(),
- host.getUserInfoController(), host.getKeyguardMonitor(),
- new BlankSecurityController(), host.getBatteryController());
- }
-
- @Override
- public QSTile<?> createTile(String tileSpec) {
- QSTile<?> tile = super.createTile(tileSpec);
- tile.setTileSpec(tileSpec);
- return tile;
- }
-
- @Override
- public void onTuningChanged(String key, String newValue) {
- // No Tunings For You.
- if (TILES_SETTING.equals(key)) {
- mSavedTiles = super.loadTileSpecs(newValue);
- }
- }
-
- public void setSavedTiles() {
- setTiles(mSavedTiles);
- }
-
- public void saveCurrentTiles() {
- Secure.putStringForUser(getContext().getContentResolver(), TILES_SETTING,
- TextUtils.join(",", mTiles), ActivityManager.getCurrentUser());
- }
-
- public void stashCurrentTiles() {
- mStash = new ArrayList<>(mTiles);
- }
-
- public void unstashTiles() {
- setTiles(mStash);
- }
-
- public void moveTo(String from, String to) {
- int fromIndex = mTiles.indexOf(from);
- if (fromIndex < 0) {
- Log.e(TAG, "Unknown from tile " + from);
- return;
- }
- int index = mTiles.indexOf(to);
- if (index < 0) {
- Log.e(TAG, "Unknown to tile " + to);
- return;
- }
- mTiles.remove(fromIndex);
- mTiles.add(index, from);
- super.onTuningChanged(TILES_SETTING, null);
- }
-
- public void remove(String spec) {
- if (!mTiles.remove(spec)) {
- Log.e(TAG, "Unknown remove spec " + spec);
- }
- super.onTuningChanged(TILES_SETTING, null);
- }
-
- public void setTiles(List<String> tiles) {
- mTiles = new ArrayList<>(tiles);
- super.onTuningChanged(TILES_SETTING, null);
- }
-
- @Override
- protected List<String> loadTileSpecs(String tileList) {
- return mTiles;
- }
-
- public void addTile(String spec) {
- mTiles.add(spec);
- super.onTuningChanged(TILES_SETTING, null);
- }
-
- public void replace(String oldTile, String newTile) {
- if (oldTile.equals(newTile)) {
- return;
- }
- MetricsLogger.action(getContext(), MetricsLogger.TUNER_QS_REORDER, oldTile + ","
- + newTile);
- List<String> order = new ArrayList<>(mTileSpecs);
- int index = order.indexOf(oldTile);
- if (index < 0) {
- Log.e(TAG, "Can't find " + oldTile);
- return;
- }
- order.remove(newTile);
- order.add(index, newTile);
- setTiles(order);
- }
-
- /**
- * Blank so that the customizing QS view doesn't show any security messages in the footer.
- */
- private static class BlankSecurityController implements SecurityController {
- @Override
- public boolean hasDeviceOwner() {
- return false;
- }
-
- @Override
- public boolean hasProfileOwner() {
- return false;
- }
-
- @Override
- public String getDeviceOwnerName() {
- return null;
- }
-
- @Override
- public String getProfileOwnerName() {
- return null;
- }
-
- @Override
- public boolean isVpnEnabled() {
- return false;
- }
-
- @Override
- public boolean isVpnRestricted() {
- return false;
- }
-
- @Override
- public String getPrimaryVpnName() {
- return null;
- }
-
- @Override
- public String getProfileVpnName() {
- return null;
- }
-
- @Override
- public void onUserSwitched(int newUserId) {
- }
-
- @Override
- public void addCallback(SecurityControllerCallback callback) {
- }
-
- @Override
- public void removeCallback(SecurityControllerCallback callback) {
- }
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java
index 1669278..d0d5b54 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/NonPagedTileLayout.java
@@ -83,8 +83,8 @@
record.tileView.setVisibility(View.VISIBLE);
record.tileView.init(null, null, null);
record.tileView.setOnTouchListener(this);
- if (mCurrentClip != null
- && mCurrentClip.getItemAt(0).getText().toString().equals(record.tile.getTileSpec())) {
+ if (mCurrentClip != null && mCurrentClip.getItemAt(0)
+ .getText().toString().equals(record.tile.getTileSpec())) {
record.tileView.setAlpha(.3f);
mCurrentView = record.tileView;
}
@@ -180,7 +180,7 @@
case MotionEvent.ACTION_DOWN:
// Stash the current tiles, in case the drop is on info, that we can restore
// the previous state.
- mPanel.getCustomHost().stashCurrentTiles();
+ mPanel.stashCurrentTiles();
mCurrentView = v;
mCurrentClip = mPanel.getClip((QSTile<?>) v.getTag());
View.DragShadowBuilder shadow = new View.DragShadowBuilder(v);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
index b5a885c..baad370 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
@@ -22,6 +22,7 @@
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnDismissListener;
import android.util.AttributeSet;
+import android.util.Log;
import android.util.TypedValue;
import android.view.ContextThemeWrapper;
import android.view.DragEvent;
@@ -71,11 +72,11 @@
private CustomQSPanel mQsPanel;
private boolean isShown;
- private CustomQSTileHost mHost;
private DropButton mInfoButton;
private DropButton mRemoveButton;
private FloatingActionButton mFab;
private SystemUIDialog mDialog;
+ private QSTileHost mHost;
public QSCustomizer(Context context, AttributeSet attrs) {
super(new ContextThemeWrapper(context, android.R.style.Theme_Material), attrs);
@@ -85,11 +86,11 @@
}
public void setHost(QSTileHost host) {
- mHost = new CustomQSTileHost(mContext, host);
- mHost.setCallback(this);
+ mHost = host;
+ mHost.addCallback(this);
mQsPanel.setTiles(mHost.getTiles());
mQsPanel.setHost(mHost);
- mHost.setSavedTiles();
+ mQsPanel.setSavedTiles();
}
@Override
@@ -129,7 +130,7 @@
public void show(int x, int y) {
isShown = true;
- mHost.setSavedTiles();
+ mQsPanel.setSavedTiles();
mPhoneStatusBar.getStatusBarWindow().addView(this);
mQsPanel.setListening(true);
mClipper.animateCircularClip(x, y, true, this);
@@ -150,7 +151,7 @@
for (String tile : QSPagingSwitch.QS_PAGE_TILES.split(",")) {
tiles.add(tile);
}
- mHost.setTiles(tiles);
+ mQsPanel.setTiles(tiles);
}
private void setDragging(boolean dragging) {
@@ -158,7 +159,8 @@
}
private void save() {
- mHost.saveCurrentTiles();
+ Log.d("CustomQSPanel", "Save!");
+ mQsPanel.saveCurrentTiles();
// TODO: At save button.
hide(0, 0);
}
@@ -167,6 +169,7 @@
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case MENU_SAVE:
+ Log.d("CustomQSPanel", "Save...");
save();
break;
case MENU_RESET:
@@ -179,7 +182,7 @@
@Override
public void onTileSelected(String spec) {
if (mDialog != null) {
- mHost.addTile(spec);
+ mQsPanel.addTile(spec);
mDialog.dismiss();
}
}
@@ -203,9 +206,9 @@
public void onDrop(View v, ClipData data) {
if (v == mRemoveButton) {
- mHost.remove(mQsPanel.getSpec(data));
+ mQsPanel.remove(mQsPanel.getSpec(data));
} else if (v == mInfoButton) {
- mHost.unstashTiles();
+ mQsPanel.unstashTiles();
SystemUIDialog dialog = new SystemUIDialog(mContext);
dialog.setTitle(mQsPanel.getSpec(data));
dialog.setPositiveButton(R.string.ok, null);
@@ -220,7 +223,7 @@
android.R.style.Theme_Material_Dialog);
View view = LayoutInflater.from(mContext).inflate(R.layout.qs_add_tiles_list, null);
ListView listView = (ListView) view.findViewById(android.R.id.list);
- TileAdapter adapter = new TileAdapter(mContext, mHost.getTiles(), mHost);
+ TileAdapter adapter = new TileAdapter(mContext, mQsPanel.getTiles(), mHost);
adapter.setListener(this);
listView.setDivider(null);
listView.setDividerHeight(0);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
index 579f58d..144b202 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -27,6 +27,7 @@
import android.os.AsyncTask;
import android.os.Handler;
import android.os.Looper;
+import android.service.quicksettings.TileService;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -82,8 +83,10 @@
continue;
}
if (tileSpecs.contains(spec)) {
+ Log.d(TAG, "Skipping " + spec);
continue;
}
+ Log.d(TAG, "Trying " + spec);
final QSTile<?> tile = host.createTile(spec);
// Bad, bad, very bad.
tile.setListening(true);
@@ -156,7 +159,7 @@
Log.d(TAG, "Added " + mLabel);
}
- private void addTile(String spec, Drawable icon, String label) {
+ private void addTile(String spec, Drawable icon, CharSequence label) {
TileInfo info = new TileInfo();
info.label = label;
info.drawable = icon;
@@ -164,7 +167,7 @@
mTiles.add(info);
}
- private void addTile(String spec, Icon icon, String label, Context context) {
+ private void addTile(String spec, Icon icon, CharSequence label, Context context) {
addTile(spec, icon.getDrawable(context), label);
}
@@ -208,19 +211,17 @@
private static class TileInfo {
private String spec;
private Drawable drawable;
- private String label;
+ private CharSequence label;
}
private class QueryTilesTask extends AsyncTask<Void, Void, Collection<TileGroup>> {
- // TODO: Become non-prototype and an API.
- private static final String TILE_ACTION = "android.intent.action.QS_TILE";
-
@Override
protected Collection<TileGroup> doInBackground(Void... params) {
HashMap<String, TileGroup> pkgMap = new HashMap<>();
PackageManager pm = mContext.getPackageManager();
// TODO: Handle userness.
- List<ResolveInfo> services = pm.queryIntentServices(new Intent(TILE_ACTION), 0);
+ List<ResolveInfo> services = pm.queryIntentServices(
+ new Intent(TileService.ACTION_QS_TILE), 0);
for (ResolveInfo info : services) {
String packageName = info.serviceInfo.packageName;
ComponentName componentName = new ComponentName(packageName, info.serviceInfo.name);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index fd70d02..7f07ddc 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -133,7 +133,7 @@
R.string.accessibility_quick_settings_bluetooth_off);
}
- String bluetoothName = state.label;
+ CharSequence bluetoothName = state.label;
if (connected) {
bluetoothName = state.dualLabelContentDescription = mContext.getString(
R.string.accessibility_bluetooth_name, state.label);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
index e2d2ffb..a0bbbe3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
@@ -23,16 +23,14 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-
import com.android.internal.logging.MetricsLogger;
+import com.android.settingslib.net.MobileDataController;
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;
import com.android.systemui.qs.QSTileBaseView;
import com.android.systemui.qs.SignalTileView;
import com.android.systemui.statusbar.policy.NetworkController;
import com.android.systemui.statusbar.policy.NetworkController.IconState;
-import com.android.systemui.statusbar.policy.NetworkController.MobileDataController;
-import com.android.systemui.statusbar.policy.NetworkController.MobileDataController.DataUsageInfo;
import com.android.systemui.statusbar.policy.SignalCallbackAdapter;
/** Quick settings tile: Cellular **/
@@ -247,7 +245,7 @@
final DataUsageDetailView v = (DataUsageDetailView) (convertView != null
? convertView
: LayoutInflater.from(mContext).inflate(R.layout.data_usage, parent, false));
- final DataUsageInfo info = mDataController.getDataUsageInfo();
+ final MobileDataController.DataUsageInfo info = mDataController.getDataUsageInfo();
if (info == null) return v;
v.bind(info);
return v;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java
index cf76ed4..d26e8d6 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java
@@ -16,36 +16,94 @@
package com.android.systemui.qs.tiles;
+import android.app.ActivityManager;
+import android.app.Service;
import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
+import android.graphics.drawable.Drawable;
+import android.os.IBinder;
+import android.os.UserHandle;
+import android.service.quicksettings.IQSTileService;
+import android.service.quicksettings.Tile;
+import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.qs.QSTile;
+import com.android.systemui.qs.QSTileServiceWrapper;
+import com.android.systemui.statusbar.phone.QSTileHost;
public class CustomTile extends QSTile<QSTile.State> {
public static final String PREFIX = "custom(";
- private final ComponentName mComponent;
+ // We don't want to thrash binding and unbinding if the user opens and closes the panel a lot.
+ // So instead we have a period of waiting.
+ private static final long UNBIND_DELAY = 30000;
- private CustomTile(Host host, String action) {
+ private final ComponentName mComponent;
+ private final Tile mTile;
+
+ private QSTileServiceWrapper mService;
+ private boolean mListening;
+ private boolean mBound;
+
+ private CustomTile(QSTileHost host, String action) {
super(host);
mComponent = ComponentName.unflattenFromString(action);
+ mTile = new Tile(mComponent, host);
+ try {
+ PackageManager pm = mContext.getPackageManager();
+ ServiceInfo info = pm.getServiceInfo(mComponent, 0);
+ mTile.setIcon(android.graphics.drawable.Icon
+ .createWithResource(mComponent.getPackageName(), info.icon));
+ mTile.setLabel(info.loadLabel(pm));
+ } catch (Exception e) {
+ }
}
- public static QSTile<?> create(Host host, String spec) {
- if (spec == null || !spec.startsWith(PREFIX) || !spec.endsWith(")")) {
- throw new IllegalArgumentException("Bad intent tile spec: " + spec);
- }
- final String action = spec.substring(PREFIX.length(), spec.length() - 1);
- if (action.isEmpty()) {
- throw new IllegalArgumentException("Empty intent tile spec action");
- }
- return new CustomTile(host, action);
+ public ComponentName getComponent() {
+ return mComponent;
+ }
+
+ public Tile getQsTile() {
+ return mTile;
+ }
+
+ public void updateState(Tile tile) {
+ Log.d("TileService", "Setting state " + tile.getLabel());
+ mTile.setIcon(tile.getIcon());
+ mTile.setLabel(tile.getLabel());
+ mTile.setContentDescription(tile.getContentDescription());
}
@Override
public void setListening(boolean listening) {
+ if (mListening == listening) return;
+ mListening = listening;
+ if (listening) {
+ mHandler.removeCallbacks(mUnbind);
+ if (!mBound) {
+ // TODO: Guarantee re-bind on user-switch.
+ mContext.bindServiceAsUser(new Intent().setComponent(mComponent),
+ mServiceConnection, Service.BIND_AUTO_CREATE,
+ new UserHandle(ActivityManager.getCurrentUser()));
+ mBound = true;
+ }
+ } else {
+ if (mService!= null) {
+ mService.onStopListening();
+ }
+ mHandler.postDelayed(mUnbind, UNBIND_DELAY);
+ }
+ }
+
+ @Override
+ protected void handleDestroy() {
+ super.handleDestroy();
+ mHandler.removeCallbacks(mUnbind);
+ mUnbind.run();
}
@Override
@@ -60,6 +118,11 @@
@Override
protected void handleClick() {
+ if (mService != null) {
+ mService.onClick();
+ } else {
+ Log.e(TAG, "Click with no service " + getTileSpec());
+ }
MetricsLogger.action(mContext, getMetricsCategory(), mComponent.getPackageName());
}
@@ -69,16 +132,15 @@
@Override
protected void handleUpdateState(State state, Object arg) {
- // TODO: Actual things.
- try {
- PackageManager pm = mContext.getPackageManager();
- ServiceInfo info = pm.getServiceInfo(mComponent, 0);
- state.visible = true;
- state.icon = new DrawableIcon(info.loadIcon(pm));
- state.label = info.loadLabel(pm).toString();
+ state.visible = true;
+ Drawable drawable = mTile.getIcon().loadDrawable(mContext);
+ drawable.setTint(mContext.getColor(android.R.color.white));
+ state.icon = new DrawableIcon(drawable);
+ state.label = mTile.getLabel();
+ if (mTile.getContentDescription() != null) {
+ state.contentDescription = mTile.getContentDescription();
+ } else {
state.contentDescription = state.label;
- } catch (Exception e) {
- state.visible = false;
}
}
@@ -86,4 +148,48 @@
public int getMetricsCategory() {
return MetricsLogger.QS_INTENT;
}
+
+ private final ServiceConnection mServiceConnection = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ mService = new QSTileServiceWrapper(IQSTileService.Stub.asInterface(service));
+ if (mListening) {
+ mService.setQSTile(mTile);
+ mService.onStartListening();
+ } else {
+ mService.onStopListening();
+ }
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ }
+ };
+
+ private final Runnable mUnbind = new Runnable() {
+ @Override
+ public void run() {
+ mContext.unbindService(mServiceConnection);
+ mBound = false;
+ }
+ };
+
+ public static ComponentName getComponentFromSpec(String spec) {
+ final String action = spec.substring(PREFIX.length(), spec.length() - 1);
+ if (action.isEmpty()) {
+ throw new IllegalArgumentException("Empty custom tile spec action");
+ }
+ return ComponentName.unflattenFromString(action);
+ }
+
+ public static QSTile<?> create(QSTileHost host, String spec) {
+ if (spec == null || !spec.startsWith(PREFIX) || !spec.endsWith(")")) {
+ throw new IllegalArgumentException("Bad custom tile spec: " + spec);
+ }
+ final String action = spec.substring(PREFIX.length(), spec.length() - 1);
+ if (action.isEmpty()) {
+ throw new IllegalArgumentException("Empty custom tile spec action");
+ }
+ return new CustomTile(host, action);
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
index d0ae383..d814b1c2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
@@ -23,11 +23,10 @@
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
-
+import com.android.settingslib.net.MobileDataController;
import com.android.systemui.FontSizeUtils;
import com.android.systemui.R;
import com.android.systemui.qs.DataUsageGraph;
-import com.android.systemui.statusbar.policy.NetworkController;
import java.text.DecimalFormat;
@@ -60,7 +59,7 @@
R.dimen.qs_data_usage_text_size);
}
- public void bind(NetworkController.MobileDataController.DataUsageInfo info) {
+ public void bind(MobileDataController.DataUsageInfo info) {
final Resources res = mContext.getResources();
final int titleId;
final long bytes;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index 3763618..7f4442a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -166,7 +166,7 @@
state.contentDescription = mContext.getString(
R.string.accessibility_quick_settings_wifi,
signalContentDescription);
- String wifiName = state.label;
+ CharSequence wifiName = state.label;
if (state.connected) {
wifiName = r.getString(R.string.accessibility_wifi_name, state.label);
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Constants.java b/packages/SystemUI/src/com/android/systemui/recents/Constants.java
index a429447..c08fb05 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Constants.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Constants.java
@@ -29,34 +29,4 @@
public static final int DismissSourceHeaderButton = 2;
}
- // TODO: Move into RecentsDebugFlags
- public static class DebugFlags {
-
- public static class App {
- // Enables debug drawing for the transition thumbnail
- public static final boolean EnableTransitionThumbnailDebugMode = false;
- // Enables the filtering of tasks according to their grouping
- public static final boolean EnableTaskFiltering = false;
- // Enables dismiss-all
- public static final boolean EnableDismissAll = false;
- // Enables fast-toggling by just tapping on the recents button
- public static final boolean EnableFastToggleRecents = false;
- // Enables the thumbnail alpha on the front-most task
- public static final boolean EnableThumbnailAlphaOnFrontmost = false;
- // This disables the search bar integration
- public static final boolean DisableSearchBar = true;
- // This disables the bitmap and icon caches
- public static final boolean DisableBackgroundCache = false;
- // Enables the simulated task affiliations
- public static final boolean EnableSimulatedTaskGroups = false;
- // Defines the number of mock task affiliations per group
- public static final int TaskAffiliationsGroupCount = 12;
- // Enables us to create mock recents tasks
- public static final boolean EnableSystemServicesProxy = false;
- // Defines the number of mock recents packages to create
- public static final int SystemServicesProxyMockPackageCount = 3;
- // Defines the number of mock recents tasks to create
- public static final int SystemServicesProxyMockTaskCount = 100;
- }
- }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/ExitRecentsWindowFirstAnimationFrameEvent.java b/packages/SystemUI/src/com/android/systemui/recents/ExitRecentsWindowFirstAnimationFrameEvent.java
new file mode 100644
index 0000000..8ae8c53
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/ExitRecentsWindowFirstAnimationFrameEvent.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * Event sent when the exit animation is started.
+ *
+ * This is sent so parts of UI can synchronize on this event and adjust their appearance. An example
+ * of that is hiding the tasks when the launched application window becomes visible.
+ */
+public class ExitRecentsWindowFirstAnimationFrameEvent extends EventBus.Event {
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl b/packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl
index 79eca30d..b36b95a 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl
+++ b/packages/SystemUI/src/com/android/systemui/recents/IRecentsNonSystemUserCallbacks.aidl
@@ -24,8 +24,11 @@
oneway interface IRecentsNonSystemUserCallbacks {
void preloadRecents();
void cancelPreloadingRecents();
- void showRecents(boolean triggeredFromAltTab);
+ void showRecents(boolean triggeredFromAltTab, boolean draggingInRecents, boolean animate,
+ boolean reloadTasks);
void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);
void toggleRecents();
void onConfigurationChanged();
+ void onDraggingInRecents(float distanceFromTop);
+ void onDraggingInRecentsEnded(float velocity);
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
index 95f1eb2..c98ecb5 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
@@ -21,6 +21,7 @@
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.res.Configuration;
+import android.graphics.Rect;
import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
@@ -62,6 +63,7 @@
private final static String ACTION_TOGGLE_RECENTS = "com.android.systemui.recents.ACTION_TOGGLE";
private static SystemServicesProxy sSystemServicesProxy;
+ private static RecentsDebugFlags sDebugFlags;
private static RecentsTaskLoader sTaskLoader;
private static RecentsConfiguration sConfiguration;
@@ -72,6 +74,7 @@
private Handler mHandler;
private RecentsImpl mImpl;
+ private int mDraggingInRecentsCurrentUser;
// Only For system user, this is the callbacks instance we return to each secondary user
private RecentsSystemUser mSystemUserCallbacks;
@@ -148,8 +151,13 @@
return sConfiguration;
}
+ public static RecentsDebugFlags getDebugFlags() {
+ return sDebugFlags;
+ }
+
@Override
public void start() {
+ sDebugFlags = new RecentsDebugFlags(mContext);
sSystemServicesProxy = new SystemServicesProxy(mContext);
sTaskLoader = new RecentsTaskLoader(mContext);
sConfiguration = new RecentsConfiguration(mContext);
@@ -166,6 +174,7 @@
// Register with the event bus
EventBus.getDefault().register(this, EVENT_BUS_PRIORITY);
+ EventBus.getDefault().register(sSystemServicesProxy, EVENT_BUS_PRIORITY);
EventBus.getDefault().register(sTaskLoader, EVENT_BUS_PRIORITY);
// Due to the fact that RecentsActivity is per-user, we need to establish and interface for
@@ -206,14 +215,16 @@
int currentUser = sSystemServicesProxy.getCurrentUser();
if (sSystemServicesProxy.isSystemUser(currentUser)) {
- mImpl.showRecents(triggeredFromAltTab);
+ mImpl.showRecents(triggeredFromAltTab, false /* draggingInRecents */,
+ true /* animate */, false /* reloadTasks */);
} else {
if (mSystemUserCallbacks != null) {
IRecentsNonSystemUserCallbacks callbacks =
mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser);
if (callbacks != null) {
try {
- callbacks.showRecents(triggeredFromAltTab);
+ callbacks.showRecents(triggeredFromAltTab, false /* draggingInRecents */,
+ true /* animate */, false /* reloadTasks */);
} catch (RemoteException e) {
Log.e(TAG, "Callback failed", e);
}
@@ -354,8 +365,57 @@
}
@Override
- public void dockTopTask() {
- mImpl.dockTopTask();
+ public void dockTopTask(boolean draggingInRecents, Rect initialBounds) {
+ mImpl.dockTopTask(draggingInRecents, initialBounds);
+ if (draggingInRecents) {
+ mDraggingInRecentsCurrentUser = sSystemServicesProxy.getCurrentUser();
+ }
+ }
+
+ @Override
+ public void onDraggingInRecents(float distanceFromTop) {
+ if (sSystemServicesProxy.isSystemUser(mDraggingInRecentsCurrentUser)) {
+ mImpl.onDraggingInRecents(distanceFromTop);
+ } else {
+ if (mSystemUserCallbacks != null) {
+ IRecentsNonSystemUserCallbacks callbacks =
+ mSystemUserCallbacks.getNonSystemUserRecentsForUser(
+ mDraggingInRecentsCurrentUser);
+ if (callbacks != null) {
+ try {
+ callbacks.onDraggingInRecents(distanceFromTop);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Callback failed", e);
+ }
+ } else {
+ Log.e(TAG, "No SystemUI callbacks found for user: "
+ + mDraggingInRecentsCurrentUser);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onDraggingInRecentsEnded(float velocity) {
+ if (sSystemServicesProxy.isSystemUser(mDraggingInRecentsCurrentUser)) {
+ mImpl.onDraggingInRecentsEnded(velocity);
+ } else {
+ if (mSystemUserCallbacks != null) {
+ IRecentsNonSystemUserCallbacks callbacks =
+ mSystemUserCallbacks.getNonSystemUserRecentsForUser(
+ mDraggingInRecentsCurrentUser);
+ if (callbacks != null) {
+ try {
+ callbacks.onDraggingInRecentsEnded(velocity);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Callback failed", e);
+ }
+ } else {
+ Log.e(TAG, "No SystemUI callbacks found for user: "
+ + mDraggingInRecentsCurrentUser);
+ }
+ }
+ }
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 3ae8827..a0c481a 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -37,29 +37,37 @@
import android.view.View;
import android.view.ViewStub;
import android.view.ViewTreeObserver;
+import android.view.WindowManager;
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.R;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.AppWidgetProviderChangedEvent;
import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent;
+import com.android.systemui.recents.events.activity.DebugFlagsChangedEvent;
import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent;
import com.android.systemui.recents.events.activity.EnterRecentsWindowLastAnimationFrameEvent;
+import com.android.systemui.recents.events.activity.HideHistoryEvent;
import com.android.systemui.recents.events.activity.HideRecentsEvent;
import com.android.systemui.recents.events.activity.IterateRecentsEvent;
import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent;
import com.android.systemui.recents.events.activity.LaunchTaskSucceededEvent;
+import com.android.systemui.recents.events.activity.ShowHistoryEvent;
import com.android.systemui.recents.events.activity.ToggleRecentsEvent;
import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
import com.android.systemui.recents.events.component.ScreenPinningRequestEvent;
+import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent;
import com.android.systemui.recents.events.ui.DismissTaskViewEvent;
import com.android.systemui.recents.events.ui.ResizeTaskEvent;
import com.android.systemui.recents.events.ui.ShowApplicationInfoEvent;
+import com.android.systemui.recents.events.ui.StackViewScrolledEvent;
+import com.android.systemui.recents.events.ui.UpdateFreeformTaskViewVisibilityEvent;
import com.android.systemui.recents.events.ui.UserInteractionEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent;
import com.android.systemui.recents.events.ui.focus.DismissFocusedTaskViewEvent;
import com.android.systemui.recents.events.ui.focus.FocusNextTaskViewEvent;
import com.android.systemui.recents.events.ui.focus.FocusPreviousTaskViewEvent;
+import com.android.systemui.recents.history.RecentsHistoryView;
import com.android.systemui.recents.misc.DozeTrigger;
import com.android.systemui.recents.misc.ReferenceCountedTrigger;
import com.android.systemui.recents.misc.SystemServicesProxy;
@@ -77,40 +85,42 @@
/**
* The main Recents activity that is started from AlternateRecentsComponent.
*/
-public class RecentsActivity extends Activity implements RecentsView.RecentsViewCallbacks,
- ViewTreeObserver.OnPreDrawListener {
+public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreDrawListener {
private final static String TAG = "RecentsActivity";
private final static boolean DEBUG = false;
public final static int EVENT_BUS_PRIORITY = Recents.EVENT_BUS_PRIORITY + 1;
- RecentsPackageMonitor mPackageMonitor;
- long mLastTabKeyEventTime;
- boolean mFinishedOnStartup;
+ private RecentsPackageMonitor mPackageMonitor;
+ private long mLastTabKeyEventTime;
+ private boolean mFinishedOnStartup;
+ private boolean mIgnoreAltTabRelease;
// Top level views
- RecentsView mRecentsView;
- SystemBarScrimViews mScrimViews;
- ViewStub mEmptyViewStub;
- View mEmptyView;
+ private RecentsView mRecentsView;
+ private SystemBarScrimViews mScrimViews;
+ private ViewStub mEmptyViewStub;
+ private View mEmptyView;
+ private ViewStub mHistoryViewStub;
+ private RecentsHistoryView mHistoryView;
// Resize task debug
- RecentsResizeTaskDialog mResizeTaskDebugDialog;
+ private RecentsResizeTaskDialog mResizeTaskDebugDialog;
// Search AppWidget
- AppWidgetProviderInfo mSearchWidgetInfo;
- RecentsAppWidgetHost mAppWidgetHost;
- RecentsAppWidgetHostView mSearchWidgetHostView;
+ private AppWidgetProviderInfo mSearchWidgetInfo;
+ private RecentsAppWidgetHost mAppWidgetHost;
+ private RecentsAppWidgetHostView mSearchWidgetHostView;
// Runnables to finish the Recents activity
- FinishRecentsRunnable mFinishLaunchHomeRunnable;
+ private FinishRecentsRunnable mFinishLaunchHomeRunnable;
// The trigger to automatically launch the current task
- DozeTrigger mIterateTrigger = new DozeTrigger(500, new Runnable() {
+ private DozeTrigger mIterateTrigger = new DozeTrigger(500, new Runnable() {
@Override
public void run() {
- dismissRecentsToFocusedTask(false);
+ dismissRecentsToFocusedTask();
}
});
@@ -191,14 +201,12 @@
TaskStack stack = plan.getTaskStack();
launchState.launchedWithNoRecentTasks = !plan.hasTasks();
- if (!launchState.launchedWithNoRecentTasks) {
- mRecentsView.setTaskStack(stack);
- }
+ mRecentsView.setTaskStack(stack);
// Mark the task that is the launch target
int launchTaskIndexInStack = 0;
if (launchState.launchedToTaskId != -1) {
- ArrayList<Task> tasks = stack.getTasks();
+ ArrayList<Task> tasks = stack.getStackTasks();
int taskCount = tasks.size();
for (int j = 0; j < taskCount; j++) {
Task t = tasks.get(j);
@@ -216,14 +224,14 @@
mEmptyView = mEmptyViewStub.inflate();
}
mEmptyView.setVisibility(View.VISIBLE);
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
mRecentsView.setSearchBarVisibility(View.GONE);
}
} else {
if (mEmptyView != null) {
mEmptyView.setVisibility(View.GONE);
}
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
if (mRecentsView.hasValidSearchBar()) {
mRecentsView.setSearchBarVisibility(View.VISIBLE);
} else {
@@ -250,19 +258,28 @@
MetricsLogger.count(this, "overview_source_home", 1);
}
// Keep track of the total stack task count
- int taskCount = stack.getTaskCount();
+ int taskCount = stack.getStackTaskCount();
MetricsLogger.histogram(this, "overview_task_count", taskCount);
}
/**
+ * Dismisses the history view back into the stack view.
+ */
+ boolean dismissHistory() {
+ // Try and hide the history view first
+ if (mHistoryView != null && mHistoryView.isVisible()) {
+ EventBus.getDefault().send(new HideHistoryEvent(true /* animate */));
+ return true;
+ }
+ return false;
+ }
+
+ /**
* Dismisses recents if we are already visible and the intent is to toggle the recents view.
*/
- boolean dismissRecentsToFocusedTask(boolean checkFilteredStackState) {
+ boolean dismissRecentsToFocusedTask() {
SystemServicesProxy ssp = Recents.getSystemServices();
if (ssp.isRecentsTopMost(ssp.getTopMostTask(), null)) {
- // If we currently have filtered stacks, then unfilter those first
- if (checkFilteredStackState &&
- mRecentsView.unfilterFilteredStacks()) return true;
// If we have a focused Task, launch that Task now
if (mRecentsView.launchFocusedTask()) return true;
}
@@ -272,12 +289,9 @@
/**
* Dismisses recents if we are already visible and the intent is to toggle the recents view.
*/
- boolean dismissRecentsToFocusedTaskOrHome(boolean checkFilteredStackState) {
+ boolean dismissRecentsToFocusedTaskOrHome() {
SystemServicesProxy ssp = Recents.getSystemServices();
if (ssp.isRecentsTopMost(ssp.getTopMostTask(), null)) {
- // If we currently have filtered stacks, then unfilter those first
- if (checkFilteredStackState &&
- mRecentsView.unfilterFilteredStacks()) return true;
// If we have a focused Task, launch that Task now
if (mRecentsView.launchFocusedTask()) return true;
// If none of the other cases apply, then just go Home
@@ -337,7 +351,7 @@
EventBus.getDefault().register(this, EVENT_BUS_PRIORITY);
// Initialize the widget host (the host id is static and does not change)
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
mAppWidgetHost = new RecentsAppWidgetHost(this, RecentsAppWidgetHost.HOST_ID);
}
mPackageMonitor = new RecentsPackageMonitor();
@@ -346,12 +360,14 @@
// Set the Recents layout
setContentView(R.layout.recents);
mRecentsView = (RecentsView) findViewById(R.id.recents_view);
- mRecentsView.setCallbacks(this);
mRecentsView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
mEmptyViewStub = (ViewStub) findViewById(R.id.empty_view_stub);
+ mHistoryViewStub = (ViewStub) findViewById(R.id.history_view_stub);
mScrimViews = new SystemBarScrimViews(this);
+ getWindow().getAttributes().privateFlags |=
+ WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;
// Create the home intent runnable
Intent homeIntent = new Intent(Intent.ACTION_MAIN, null);
@@ -361,14 +377,14 @@
mFinishLaunchHomeRunnable = new FinishRecentsRunnable(homeIntent);
// Bind the search app widget when we first start up
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
mSearchWidgetInfo = ssp.getOrBindSearchAppWidget(this, mAppWidgetHost);
}
// Register the broadcast receiver to handle messages when the screen is turned off
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SCREEN_OFF);
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
filter.addAction(SearchManager.INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED);
}
registerReceiver(mSystemBroadcastReceiver, filter);
@@ -410,17 +426,6 @@
}
@Override
- protected void onResume() {
- super.onResume();
-
- final RecentsActivityLaunchState state = Recents.getConfiguration().getLaunchState();
- if (state.startHidden) {
- state.startHidden = false;
- mRecentsView.setStackViewVisibility(View.INVISIBLE);
- }
- }
-
- @Override
public void onEnterAnimationComplete() {
super.onEnterAnimationComplete();
EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());
@@ -430,12 +435,8 @@
protected void onPause() {
super.onPause();
- if (Constants.DebugFlags.App.EnableFastToggleRecents) {
- // Stop the fast-toggle dozer
- mIterateTrigger.stopDozing();
- }
-
- if (Constants.DebugFlags.App.EnableFastToggleRecents) {
+ RecentsDebugFlags flags = Recents.getDebugFlags();
+ if (flags.isFastToggleRecentsEnabled()) {
// Stop the fast-toggle dozer
mIterateTrigger.stopDozing();
}
@@ -445,6 +446,12 @@
protected void onStop() {
super.onStop();
+ // Reset some states
+ mIgnoreAltTabRelease = false;
+ if (mHistoryView != null) {
+ EventBus.getDefault().send(new HideHistoryEvent(false /* animate */));
+ }
+
// Notify that recents is now hidden
SystemServicesProxy ssp = Recents.getSystemServices();
EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, ssp, false));
@@ -460,6 +467,7 @@
launchState.launchedToTaskId = -1;
launchState.launchedWithAltTab = false;
launchState.launchedHasConfigurationChanged = false;
+ launchState.launchedViaDragGesture = false;
MetricsLogger.hidden(this, MetricsLogger.OVERVIEW_ACTIVITY);
}
@@ -480,7 +488,7 @@
mPackageMonitor.unregister();
// Stop listening for widget package changes if there was one bound
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
mAppWidgetHost.stopListening();
}
@@ -515,10 +523,6 @@
boolean hasRepKeyTimeElapsed = (SystemClock.elapsedRealtime() -
mLastTabKeyEventTime) > altTabKeyDelay;
if (event.getRepeatCount() <= 0 || hasRepKeyTimeElapsed) {
- // As we iterate to the next/previous task, cancel any current/lagging window
- // transition animations
- EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null));
-
// Focus the next task in the stack
final boolean backward = event.isShiftPressed();
if (backward) {
@@ -527,6 +531,11 @@
EventBus.getDefault().send(new FocusNextTaskViewEvent());
}
mLastTabKeyEventTime = SystemClock.elapsedRealtime();
+
+ // In the case of another ALT event, don't ignore the next release
+ if (event.isAltPressed()) {
+ mIgnoreAltTabRelease = false;
+ }
}
return true;
}
@@ -560,8 +569,9 @@
@Override
public void onBackPressed() {
- // Dismiss Recents to the focused Task or Home
- dismissRecentsToFocusedTaskOrHome(true);
+ if (!dismissHistory()) {
+ dismissRecentsToFocusedTaskOrHome();
+ }
}
/**** RecentsResizeTaskDialog ****/
@@ -573,23 +583,27 @@
return mResizeTaskDebugDialog;
}
- /**** RecentsView.RecentsViewCallbacks Implementation ****/
-
- @Override
- public void onAllTaskViewsDismissed() {
- mFinishLaunchHomeRunnable.run();
- }
-
/**** EventBus events ****/
public final void onBusEvent(ToggleRecentsEvent event) {
- dismissRecentsToFocusedTaskOrHome(true /* checkFilteredStackState */);
+ if (!dismissHistory()) {
+ dismissRecentsToFocusedTaskOrHome();
+ }
}
public final void onBusEvent(IterateRecentsEvent event) {
// Focus the next task
EventBus.getDefault().send(new FocusNextTaskViewEvent());
- mIterateTrigger.poke();
+
+ // Start dozing after the recents button is clicked
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
+ if (debugFlags.isFastToggleRecentsEnabled()) {
+ if (!mIterateTrigger.isDozing()) {
+ mIterateTrigger.startDozing();
+ } else {
+ mIterateTrigger.poke();
+ }
+ }
}
public final void onBusEvent(UserInteractionEvent event) {
@@ -599,10 +613,26 @@
public final void onBusEvent(HideRecentsEvent event) {
if (event.triggeredFromAltTab) {
// If we are hiding from releasing Alt-Tab, dismiss Recents to the focused app
- dismissRecentsToFocusedTaskOrHome(false /* checkFilteredStackState */);
+ if (!mIgnoreAltTabRelease) {
+ dismissRecentsToFocusedTaskOrHome();
+ }
} else if (event.triggeredFromHomeKey) {
// Otherwise, dismiss Recents to Home
- dismissRecentsToHome(true /* checkFilteredStackState */);
+ if (mHistoryView != null && mHistoryView.isVisible()) {
+ ReferenceCountedTrigger t = new ReferenceCountedTrigger(this, null, null, null);
+ t.increment();
+ t.addLastDecrementRunnable(new Runnable() {
+ @Override
+ public void run() {
+ dismissRecentsToHome(true /* animated */);
+ }
+ });
+ EventBus.getDefault().send(new HideHistoryEvent(true, t));
+ t.decrement();
+
+ } else {
+ dismissRecentsToHome(true /* animated */);
+ }
} else {
// Do nothing
}
@@ -614,7 +644,7 @@
ViewAnimation.TaskViewEnterContext ctx = new ViewAnimation.TaskViewEnterContext(t);
ctx.postAnimationTrigger.increment();
if (mSearchWidgetInfo != null) {
- if (!Constants.DebugFlags.App.DisableSearchBar) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar) {
ctx.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
@Override
public void run() {
@@ -626,26 +656,22 @@
});
}
}
- ctx.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
- @Override
- public void run() {
- // If we are not launching with alt-tab and fast-toggle is enabled, then start
- // the dozer now
- RecentsConfiguration config = Recents.getConfiguration();
- RecentsActivityLaunchState launchState = config.getLaunchState();
- if (Constants.DebugFlags.App.EnableFastToggleRecents &&
- !launchState.launchedWithAltTab) {
- mIterateTrigger.startDozing();
- }
- }
- });
mRecentsView.startEnterRecentsAnimation(ctx);
ctx.postAnimationTrigger.decrement();
}
public final void onBusEvent(EnterRecentsWindowLastAnimationFrameEvent event) {
- mRecentsView.setStackViewVisibility(View.VISIBLE);
+ EventBus.getDefault().send(new UpdateFreeformTaskViewVisibilityEvent(true));
mRecentsView.getViewTreeObserver().addOnPreDrawListener(this);
+ mRecentsView.invalidate();
+ }
+
+ public final void onBusEvent(ExitRecentsWindowFirstAnimationFrameEvent event) {
+ if (mRecentsView.isLastTaskLaunchedFreeform()) {
+ EventBus.getDefault().send(new UpdateFreeformTaskViewVisibilityEvent(false));
+ }
+ mRecentsView.getViewTreeObserver().addOnPreDrawListener(this);
+ mRecentsView.invalidate();
}
public final void onBusEvent(CancelEnterRecentsWindowAnimationEvent event) {
@@ -686,22 +712,18 @@
ssp.removeTask(event.task.key.id);
}
+ public final void onBusEvent(AllTaskViewsDismissedEvent event) {
+ // Just go straight home (no animation necessary because there are no more task views)
+ dismissRecentsToHome(false /* animated */);
+
+ // Keep track of all-deletions
+ MetricsLogger.count(this, "overview_task_all_dismissed", 1);
+ }
+
public final void onBusEvent(ResizeTaskEvent event) {
getResizeTaskDebugDialog().showResizeTaskDialog(event.task, mRecentsView);
}
- public final void onBusEvent(DragStartEvent event) {
- // Lock the orientation while dragging
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
-
- // TODO: docking requires custom accessibility actions
- }
-
- public final void onBusEvent(DragEndEvent event) {
- // Unlock the orientation when dragging completes
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_BEHIND);
- }
-
public final void onBusEvent(LaunchTaskSucceededEvent event) {
MetricsLogger.histogram(this, "overview_task_launch_index", event.taskIndexFromStackFront);
}
@@ -717,6 +739,34 @@
MetricsLogger.count(this, "overview_screen_pinned", 1);
}
+ public final void onBusEvent(DebugFlagsChangedEvent event) {
+ // Just finish recents so that we can reload the flags anew on the next instantiation
+ finish();
+ }
+
+ public final void onBusEvent(StackViewScrolledEvent event) {
+ // Once the user has scrolled while holding alt-tab, then we should ignore the release of
+ // the key
+ mIgnoreAltTabRelease = true;
+ }
+
+ public final void onBusEvent(ShowHistoryEvent event) {
+ if (mHistoryView == null) {
+ mHistoryView = (RecentsHistoryView) mHistoryViewStub.inflate();
+ // Since this history view is inflated by a view stub after the insets have already
+ // been applied, we have to set them ourselves initial from the insets that were last
+ // provided.
+ mHistoryView.setSystemInsets(mRecentsView.getSystemInsets());
+ }
+ mHistoryView.show(mRecentsView.getTaskStack());
+ }
+
+ public final void onBusEvent(HideHistoryEvent event) {
+ if (mHistoryView != null) {
+ mHistoryView.hide(event.animate, event.postAnimationTrigger);
+ }
+ }
+
private void refreshSearchWidgetView() {
if (mSearchWidgetInfo != null) {
SystemServicesProxy ssp = Recents.getSystemServices();
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java
index 01ffd2a..43db666 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java
@@ -34,7 +34,7 @@
public boolean launchedFromSearchHome;
public boolean launchedReuseTaskStackViews;
public boolean launchedHasConfigurationChanged;
- public boolean startHidden;
+ public boolean launchedViaDragGesture;
public int launchedToTaskId;
public int launchedNumVisibleTasks;
public int launchedNumVisibleThumbnails;
@@ -46,6 +46,7 @@
launchedReuseTaskStackViews = false;
// Set this flag to indicate that the configuration has changed since Recents last launched
launchedHasConfigurationChanged = true;
+ launchedViaDragGesture = false;
}
/** Returns whether the status bar scrim should be animated when shown for the first time. */
@@ -74,13 +75,18 @@
* Returns the task to focus given the current launch state.
*/
public int getInitialFocusTaskIndex(int numTasks) {
- if (Constants.DebugFlags.App.EnableFastToggleRecents && !launchedWithAltTab) {
+ RecentsDebugFlags flags = Recents.getDebugFlags();
+ if (flags.isPageOnToggleEnabled() && !launchedWithAltTab) {
// If we are fast toggling, then focus the next task depending on when you are on home
// or coming in from another app
if (launchedFromHome) {
return numTasks - 1;
} else {
- return numTasks - 2;
+ if (flags.isFastToggleRecentsEnabled()) {
+ return numTasks - 1;
+ } else {
+ return numTasks - 2;
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
index a73f323..cdfad18 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
@@ -69,7 +69,6 @@
public final int smallestWidth;
/** Misc **/
- public boolean hasDockedTasks;
public boolean useHardwareLayers;
public boolean fakeShadows;
public int svelteLevel;
@@ -112,7 +111,6 @@
// settings or via multi window
lockToAppEnabled = !ssp.hasFreeformWorkspaceSupport() &&
ssp.getSystemSetting(context, Settings.System.LOCK_TO_APP_ENABLED) != 0;
- hasDockedTasks = ssp.hasDockedTask();
// Recompute some values based on the given state, since we can not rely on the resource
// system to get certain values.
@@ -154,7 +152,7 @@
int swInset = getInsetToSmallestWidth(windowBounds.right - windowBounds.left);
int top = searchBarBounds.isEmpty() ? topInset : 0;
taskStackBounds.set(windowBounds.left + swInset, searchBarBounds.bottom + top,
- windowBounds.right - swInset, windowBounds.bottom);
+ windowBounds.right - swInset - rightInset, windowBounds.bottom);
}
}
@@ -180,7 +178,8 @@
* Constrain the width of the landscape stack to the smallest width of the device.
*/
private int getInsetToSmallestWidth(int availableWidth) {
- if (availableWidth > smallestWidth) {
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
+ if (!debugFlags.isFullscreenThumbnailsEnabled() && (availableWidth > smallestWidth)) {
return (availableWidth - smallestWidth) / 2;
}
return 0;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java
new file mode 100644
index 0000000..e8b8816
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2014 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.systemui.recents;
+
+import android.content.Context;
+import com.android.systemui.recents.events.EventBus;
+import com.android.systemui.recents.events.activity.DebugFlagsChangedEvent;
+import com.android.systemui.tuner.TunerService;
+
+/**
+ * Tunable debug flags
+ */
+public class RecentsDebugFlags implements TunerService.Tunable {
+
+ private static final String KEY_FAST_TOGGLE = "overview_fast_toggle";
+ private static final String KEY_PAGE_ON_TOGGLE = "overview_page_on_toggle";
+ private static final String KEY_FULLSCREEN_THUMBNAILS = "overview_fullscreen_thumbnails";
+ private static final String KEY_SHOW_HISTORY = "overview_show_history";
+
+ public static class Static {
+ // Enables debug drawing for the transition thumbnail
+ public static final boolean EnableTransitionThumbnailDebugMode = false;
+ // This disables the search bar integration
+ public static final boolean DisableSearchBar = true;
+ // This disables the bitmap and icon caches
+ public static final boolean DisableBackgroundCache = false;
+ // Enables the simulated task affiliations
+ public static final boolean EnableSimulatedTaskGroups = false;
+ // Defines the number of mock task affiliations per group
+ public static final int TaskAffiliationsGroupCount = 12;
+ // Enables us to create mock recents tasks
+ public static final boolean EnableSystemServicesProxy = false;
+ // Defines the number of mock recents packages to create
+ public static final int SystemServicesProxyMockPackageCount = 3;
+ // Defines the number of mock recents tasks to create
+ public static final int SystemServicesProxyMockTaskCount = 100;
+ }
+
+ private boolean mFastToggleRecents;
+ private boolean mPageOnToggle;
+ private boolean mUseFullscreenThumbnails;
+ private boolean mShowHistory;
+
+ /**
+ * We read the prefs once when we start the activity, then update them as the tuner changes
+ * the flags.
+ */
+ public RecentsDebugFlags(Context context) {
+ // Register all our flags, this will also call onTuningChanged() for each key, which will
+ // initialize the current state of each flag
+ TunerService.get(context).addTunable(this, KEY_FAST_TOGGLE, KEY_PAGE_ON_TOGGLE,
+ KEY_FULLSCREEN_THUMBNAILS, KEY_SHOW_HISTORY);
+ }
+
+ /**
+ * @return whether we are enabling fast toggling.
+ */
+ public boolean isFastToggleRecentsEnabled() {
+ return mPageOnToggle && mFastToggleRecents;
+ }
+
+ /**
+ * @return whether the recents button toggles pages.
+ */
+ public boolean isPageOnToggleEnabled() {
+ return mPageOnToggle;
+ }
+
+ /**
+ * @return whether we should show fullscreen thumbnails
+ */
+ public boolean isFullscreenThumbnailsEnabled() {
+ return mUseFullscreenThumbnails;
+ }
+
+ /**
+ * @return whether we should show the history
+ */
+ public boolean isHistoryEnabled() {
+ return mShowHistory;
+ }
+
+ @Override
+ public void onTuningChanged(String key, String newValue) {
+ switch (key) {
+ case KEY_FAST_TOGGLE:
+ mFastToggleRecents = (newValue != null) &&
+ (Integer.parseInt(newValue) != 0);
+ break;
+ case KEY_PAGE_ON_TOGGLE:
+ mPageOnToggle = (newValue != null) &&
+ (Integer.parseInt(newValue) != 0);
+ break;
+ case KEY_FULLSCREEN_THUMBNAILS:
+ mUseFullscreenThumbnails = (newValue != null) &&
+ (Integer.parseInt(newValue) != 0);
+ break;
+ case KEY_SHOW_HISTORY:
+ mShowHistory = (newValue != null) &&
+ (Integer.parseInt(newValue) != 0);
+ break;
+ }
+ EventBus.getDefault().send(new DebugFlagsChangedEvent());
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
index 6fe6909..0f82cce 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
@@ -35,6 +35,7 @@
import android.view.AppTransitionAnimationSpec;
import android.view.LayoutInflater;
import android.view.View;
+
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.Prefs;
import com.android.systemui.R;
@@ -46,6 +47,8 @@
import com.android.systemui.recents.events.activity.ToggleRecentsEvent;
import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
import com.android.systemui.recents.events.component.ScreenPinningRequestEvent;
+import com.android.systemui.recents.events.ui.DraggingInRecentsEndedEvent;
+import com.android.systemui.recents.events.ui.DraggingInRecentsEvent;
import com.android.systemui.recents.misc.DozeTrigger;
import com.android.systemui.recents.misc.ForegroundThread;
import com.android.systemui.recents.misc.SystemServicesProxy;
@@ -68,8 +71,8 @@
* An implementation of the Recents component for the current user. For secondary users, this can
* be called remotely from the system user.
*/
-public class RecentsImpl extends IRecentsNonSystemUserCallbacks.Stub
- implements ActivityOptions.OnAnimationFinishedListener {
+public class RecentsImpl extends IRecentsNonSystemUserCallbacks.Stub implements
+ ActivityOptions.OnAnimationFinishedListener {
private final static String TAG = "RecentsImpl";
private final static boolean DEBUG = false;
@@ -140,6 +143,8 @@
RecentsAppWidgetHost mAppWidgetHost;
boolean mBootCompleted;
boolean mCanReuseTaskStackViews = true;
+ boolean mDraggingInRecents;
+ boolean mReloadTasks;
// Task launching
Rect mSearchBarBounds = new Rect();
@@ -164,14 +169,14 @@
public void run() {
// When this fires, then the user has not released alt-tab for at least
// FAST_ALT_TAB_DELAY_MS milliseconds
- showRecents(mTriggeredFromAltTab);
+ showRecents(mTriggeredFromAltTab, false /* draggingInRecents */, true /* animate */,
+ false /* reloadTasks */);
}
});
Bitmap mThumbnailTransitionBitmapCache;
Task mThumbnailTransitionBitmapCacheKey;
-
public RecentsImpl(Context context) {
mContext = context;
mHandler = new Handler();
@@ -248,8 +253,11 @@
}
@Override
- public void showRecents(boolean triggeredFromAltTab) {
+ public void showRecents(boolean triggeredFromAltTab, boolean draggingInRecents,
+ boolean animate, boolean reloadTasks) {
mTriggeredFromAltTab = triggeredFromAltTab;
+ mDraggingInRecents = draggingInRecents;
+ mReloadTasks = reloadTasks;
if (mFastAltTabTrigger.hasTriggered()) {
// We are calling this from the doze trigger, so just fall through to show Recents
mFastAltTabTrigger.resetTrigger();
@@ -280,7 +288,7 @@
ActivityManager.RunningTaskInfo topTask = ssp.getTopMostTask();
MutableBoolean isTopTaskHome = new MutableBoolean(true);
if (topTask == null || !ssp.isRecentsTopMost(topTask, isTopTaskHome)) {
- startRecentsActivity(topTask, isTopTaskHome.value);
+ startRecentsActivity(topTask, isTopTaskHome.value, animate);
}
} catch (ActivityNotFoundException e) {
Log.e(TAG, "Failed to launch RecentsActivity", e);
@@ -315,6 +323,7 @@
return;
}
+ mDraggingInRecents = false;
mTriggeredFromAltTab = false;
try {
@@ -324,8 +333,8 @@
if (topTask != null && ssp.isRecentsTopMost(topTask, isTopTaskHome)) {
RecentsConfiguration config = Recents.getConfiguration();
RecentsActivityLaunchState launchState = config.getLaunchState();
- if (Constants.DebugFlags.App.EnableFastToggleRecents &&
- !launchState.launchedWithAltTab) {
+ RecentsDebugFlags flags = Recents.getDebugFlags();
+ if (flags.isPageOnToggleEnabled() && !launchState.launchedWithAltTab) {
// Notify recents to move onto the next task
EventBus.getDefault().post(new IterateRecentsEvent());
} else {
@@ -351,7 +360,7 @@
}
// Otherwise, start the recents activity
- startRecentsActivity(topTask, isTopTaskHome.value);
+ startRecentsActivity(topTask, isTopTaskHome.value, true /* animate */);
mLastToggleTime = SystemClock.elapsedRealtime();
}
} catch (ActivityNotFoundException e) {
@@ -372,7 +381,7 @@
sInstanceLoadPlan.preloadRawTasks(topTaskHome.value);
loader.preloadTasks(sInstanceLoadPlan, topTaskHome.value);
TaskStack stack = sInstanceLoadPlan.getTaskStack();
- if (stack.getTaskCount() > 0) {
+ if (stack.getStackTaskCount() > 0) {
// We try and draw the thumbnail transition bitmap in parallel before
// toggle/show recents is called
preCacheThumbnailTransitionBitmapAsync(topTask, stack, mDummyStackView);
@@ -385,6 +394,16 @@
// Do nothing
}
+ @Override
+ public void onDraggingInRecents(float distanceFromTop) {
+ EventBus.getDefault().sendOntoMainThread(new DraggingInRecentsEvent(distanceFromTop));
+ }
+
+ @Override
+ public void onDraggingInRecentsEnded(float velocity) {
+ EventBus.getDefault().sendOntoMainThread(new DraggingInRecentsEndedEvent(velocity));
+ }
+
/**
* Transitions to the next recent task in the stack.
*/
@@ -396,22 +415,27 @@
TaskStack focusedStack = plan.getTaskStack();
// Return early if there are no tasks in the focused stack
- if (focusedStack == null || focusedStack.getTaskCount() == 0) return;
+ if (focusedStack == null || focusedStack.getStackTaskCount() == 0) return;
ActivityManager.RunningTaskInfo runningTask = ssp.getTopMostTask();
// Return early if there is no running task
if (runningTask == null) return;
- // Return early if the running task is in the home stack (optimization)
- if (SystemServicesProxy.isHomeStack(runningTask.stackId)) return;
// Find the task in the recents list
- ArrayList<Task> tasks = focusedStack.getTasks();
+ boolean isTopTaskHome = SystemServicesProxy.isHomeStack(runningTask.stackId);
+ ArrayList<Task> tasks = focusedStack.getStackTasks();
Task toTask = null;
ActivityOptions launchOpts = null;
int taskCount = tasks.size();
for (int i = taskCount - 1; i >= 1; i--) {
Task task = tasks.get(i);
- if (task.key.id == runningTask.id) {
+ if (isTopTaskHome) {
+ toTask = tasks.get(i - 1);
+ launchOpts = ActivityOptions.makeCustomAnimation(mContext,
+ R.anim.recents_launch_next_affiliated_task_target,
+ R.anim.recents_fast_toggle_app_home_exit);
+ break;
+ } else if (task.key.id == runningTask.id) {
toTask = tasks.get(i - 1);
launchOpts = ActivityOptions.makeCustomAnimation(mContext,
R.anim.recents_launch_prev_affiliated_task_target,
@@ -443,7 +467,7 @@
TaskStack focusedStack = plan.getTaskStack();
// Return early if there are no tasks in the focused stack
- if (focusedStack == null || focusedStack.getTaskCount() == 0) return;
+ if (focusedStack == null || focusedStack.getStackTaskCount() == 0) return;
ActivityManager.RunningTaskInfo runningTask = ssp.getTopMostTask();
// Return early if there is no running task (can't determine affiliated tasks in this case)
@@ -452,7 +476,7 @@
if (SystemServicesProxy.isHomeStack(runningTask.stackId)) return;
// Find the task in the recents list
- ArrayList<Task> tasks = focusedStack.getTasks();
+ ArrayList<Task> tasks = focusedStack.getStackTasks();
Task toTask = null;
ActivityOptions launchOpts = null;
int taskCount = tasks.size();
@@ -516,13 +540,14 @@
showRelativeAffiliatedTask(false);
}
- public void dockTopTask() {
+ public void dockTopTask(boolean draggingInRecents, Rect initialBounds) {
SystemServicesProxy ssp = Recents.getSystemServices();
ActivityManager.RunningTaskInfo topTask = ssp.getTopMostTask();
if (topTask != null && !SystemServicesProxy.isHomeStack(topTask.stackId)) {
- ssp.startTaskInDockedMode(topTask.id,
- ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT);
- showRecents(false /* triggeredFromAltTab */);
+ ssp.moveTaskToDockedStack(topTask.id,
+ ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT, initialBounds);
+ showRecents(false /* triggeredFromAltTab */, draggingInRecents, false /* animate */,
+ true /* reloadTasks*/);
}
}
@@ -550,7 +575,7 @@
// Update the configuration for the current state
config.update(mContext, ssp, ssp.getWindowRect());
- if (!Constants.DebugFlags.App.DisableSearchBar && tryAndBindSearchWidget) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar && tryAndBindSearchWidget) {
// Try and pre-emptively bind the search widget on startup to ensure that we
// have the right thumbnail bounds to animate to.
// Note: We have to reload the widget id before we get the task stack bounds below
@@ -660,10 +685,10 @@
if (topTask.stackId == FREEFORM_WORKSPACE_STACK_ID) {
ArrayList<AppTransitionAnimationSpec> specs = new ArrayList<>();
stackView.getScroller().setStackScrollToInitialState();
- ArrayList<Task> tasks = stack.getTasks();
+ ArrayList<Task> tasks = stack.getStackTasks();
for (int i = tasks.size() - 1; i >= 0; i--) {
Task task = tasks.get(i);
- if (SystemServicesProxy.isFreeformStack(task.key.stackId)) {
+ if (task.isFreeformTask()) {
mTmpTransform = stackView.getStackAlgorithm().getStackTransform(task,
stackView.getScroller().getStackScroll(), mTmpTransform, null);
Rect toTaskRect = new Rect();
@@ -716,7 +741,7 @@
TaskStackView stackView, int runningTaskId, Task runningTaskOut) {
// Find the running task in the TaskStack
Task task = null;
- ArrayList<Task> tasks = stack.getTasks();
+ ArrayList<Task> tasks = stack.getStackTasks();
if (runningTaskId != -1) {
// Otherwise, try and find the task with the
int taskCount = tasks.size();
@@ -753,7 +778,7 @@
int toHeaderHeight = (int) (mHeaderBar.getMeasuredHeight() * toTransform.scale);
thumbnail = Bitmap.createBitmap(toHeaderWidth, toHeaderHeight,
Bitmap.Config.ARGB_8888);
- if (Constants.DebugFlags.App.EnableTransitionThumbnailDebugMode) {
+ if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) {
thumbnail.eraseColor(0xFFff0000);
} else {
Canvas c = new Canvas(thumbnail);
@@ -772,18 +797,20 @@
* Shows the recents activity
*/
private void startRecentsActivity(ActivityManager.RunningTaskInfo topTask,
- boolean isTopTaskHome) {
+ boolean isTopTaskHome, boolean animate) {
RecentsTaskLoader loader = Recents.getTaskLoader();
// Update the header bar if necessary
reloadHeaderBarLayout(false /* tryAndBindSearchWidget */);
- if (sInstanceLoadPlan == null) {
- // Create a new load plan if onPreloadRecents() was never triggered
+ // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we
+ // should always preload the tasks now. If we are dragging in recents, reload them as
+ // the stacks might have changed.
+ if (mReloadTasks || mTriggeredFromAltTab ||sInstanceLoadPlan == null) {
+ // Create a new load plan if preloadRecents() was never triggered
sInstanceLoadPlan = loader.createLoadPlan(mContext);
}
-
- if (!sInstanceLoadPlan.hasTasks()) {
+ if (mReloadTasks || mTriggeredFromAltTab || !sInstanceLoadPlan.hasTasks()) {
loader.preloadTasks(sInstanceLoadPlan, isTopTaskHome);
}
TaskStack stack = sInstanceLoadPlan.getTaskStack();
@@ -792,7 +819,15 @@
mDummyStackView.updateLayoutForStack(stack);
TaskStackLayoutAlgorithm.VisibilityReport stackVr =
mDummyStackView.computeStackVisibilityReport();
- boolean hasRecentTasks = stack.getTaskCount() > 0;
+
+ if (!animate) {
+ ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext, -1, -1);
+ startRecentsActivity(topTask, opts, false /* fromHome */,
+ false /* fromSearchHome */, false /* fromThumbnail*/, stackVr);
+ return;
+ }
+
+ boolean hasRecentTasks = stack.getStackTaskCount() > 0;
boolean useThumbnailTransition = (topTask != null) && !isTopTaskHome && hasRecentTasks;
if (useThumbnailTransition) {
@@ -811,11 +846,11 @@
if (!useThumbnailTransition) {
// If there is no thumbnail transition, but is launching from home into recents, then
// use a quick home transition and do the animation from home
- if (!Constants.DebugFlags.App.DisableSearchBar && hasRecentTasks) {
+ if (!RecentsDebugFlags.Static.DisableSearchBar && hasRecentTasks) {
SystemServicesProxy ssp = Recents.getSystemServices();
String homeActivityPackage = ssp.getHomeActivityPackageName();
String searchWidgetPackage = Prefs.getString(mContext,
- Prefs.Key.SEARCH_APP_WIDGET_PACKAGE, null);
+ Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE, null);
// Determine whether we are coming from a search owned home activity
boolean fromSearchHome = (homeActivityPackage != null) &&
@@ -851,7 +886,7 @@
launchState.launchedNumVisibleTasks = vr.numVisibleTasks;
launchState.launchedNumVisibleThumbnails = vr.numVisibleThumbnails;
launchState.launchedHasConfigurationChanged = false;
- launchState.startHidden = topTask != null && topTask.stackId == FREEFORM_WORKSPACE_STACK_ID;
+ launchState.launchedViaDragGesture = mDraggingInRecents;
Intent intent = new Intent();
intent.setClassName(RECENTS_PACKAGE, RECENTS_ACTIVITY);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java b/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
index b091f05..eb81e80 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
@@ -502,6 +502,19 @@
queueEvent(event);
}
+ /**
+ * If this method is called from the main thread, it will be handled directly. If this method
+ * is not called from the main thread, it will be posted onto the main thread.
+ */
+ public void sendOntoMainThread(Event event) {
+ long callingThreadId = Thread.currentThread().getId();
+ if (callingThreadId != mHandler.getLooper().getThread().getId()) {
+ post(event);
+ } else {
+ send(event);
+ }
+ }
+
/** Prevent post()ing an InterprocessEvent */
@Deprecated
public void post(InterprocessEvent event) {
@@ -748,7 +761,7 @@
} catch (IllegalAccessException e) {
Log.e(TAG, "Failed to invoke method", e.getCause());
} catch (InvocationTargetException e) {
- Log.e(TAG, "Failed to invoke method", e.getCause());
+ throw new RuntimeException("Failed to invoke method", e);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/DebugFlagsChangedEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/DebugFlagsChangedEvent.java
new file mode 100644
index 0000000..fe3bf26
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/DebugFlagsChangedEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.activity;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent when the SystemUI tuner changes a flag.
+ */
+public class DebugFlagsChangedEvent extends EventBus.Event {
+ // Simple event
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/HideHistoryButtonEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/HideHistoryButtonEvent.java
new file mode 100644
index 0000000..6c767e4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/HideHistoryButtonEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.activity;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent when the history view button should be hidden.
+ */
+public class HideHistoryButtonEvent extends EventBus.Event {
+ // Simple event
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/HideHistoryEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/HideHistoryEvent.java
new file mode 100644
index 0000000..34c35a7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/HideHistoryEvent.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.activity;
+
+import com.android.systemui.recents.events.EventBus;
+import com.android.systemui.recents.misc.ReferenceCountedTrigger;
+
+/**
+ * This is sent when the history view will be closed.
+ */
+public class HideHistoryEvent extends EventBus.Event {
+
+ public final boolean animate;
+ public final ReferenceCountedTrigger postAnimationTrigger;
+
+ public HideHistoryEvent(boolean animate) {
+ this(animate, null);
+ }
+
+ public HideHistoryEvent(boolean animate, ReferenceCountedTrigger postAnimationTrigger) {
+ this.animate = animate;
+ this.postAnimationTrigger = postAnimationTrigger;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/ShowHistoryButtonEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/ShowHistoryButtonEvent.java
new file mode 100644
index 0000000..7042537
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/ShowHistoryButtonEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.activity;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent when the history view button should be shown.
+ */
+public class ShowHistoryButtonEvent extends EventBus.Event {
+ // Simple event
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/ShowHistoryEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/ShowHistoryEvent.java
new file mode 100644
index 0000000..870119d
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/ShowHistoryEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.activity;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent when the history view button is clicked.
+ */
+public class ShowHistoryEvent extends EventBus.Event {
+ // Simple event
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java
index 9d96d8e..f9ccfc8 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/component/ScreenPinningRequestEvent.java
@@ -18,7 +18,6 @@
import android.content.Context;
import com.android.systemui.recents.events.EventBus;
-import com.android.systemui.recents.misc.SystemServicesProxy;
/**
* This is sent when we want to start screen pinning.
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java
new file mode 100644
index 0000000..cf74519
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.ui;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent whenever all the task views in a stack have been dismissed.
+ */
+public class AllTaskViewsDismissedEvent extends EventBus.Event {
+ // Simple event
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/DraggingInRecentsEndedEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/DraggingInRecentsEndedEvent.java
new file mode 100644
index 0000000..9be8eb1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/DraggingInRecentsEndedEvent.java
@@ -0,0 +1,15 @@
+package com.android.systemui.recents.events.ui;
+
+import com.android.systemui.recents.events.EventBus.Event;
+
+/**
+ * This event is sent when the user finished dragging in recents.
+ */
+public class DraggingInRecentsEndedEvent extends Event {
+
+ public final float velocity;
+
+ public DraggingInRecentsEndedEvent(float velocity) {
+ this.velocity = velocity;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/DraggingInRecentsEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/DraggingInRecentsEvent.java
new file mode 100644
index 0000000..5e8bfd4
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/DraggingInRecentsEvent.java
@@ -0,0 +1,15 @@
+package com.android.systemui.recents.events.ui;
+
+import com.android.systemui.recents.events.EventBus.Event;
+
+/**
+ * This event is sent when the user changed how far they are dragging in recents.
+ */
+public class DraggingInRecentsEvent extends Event {
+
+ public final float distanceFromTop;
+
+ public DraggingInRecentsEvent(float distanceFromTop) {
+ this.distanceFromTop = distanceFromTop;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java
new file mode 100644
index 0000000..cb5011a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/StackViewScrolledEvent.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.ui;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent whenever a new scroll gesture happens on a stack view.
+ */
+public class StackViewScrolledEvent extends EventBus.Event {
+
+ public final int yMovement;
+
+ public StackViewScrolledEvent(int yMovement) {
+ this.yMovement = yMovement;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/UpdateFreeformTaskViewVisibilityEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/UpdateFreeformTaskViewVisibilityEvent.java
new file mode 100644
index 0000000..b42da9c
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/UpdateFreeformTaskViewVisibilityEvent.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.events.ui;
+
+import com.android.systemui.recents.events.EventBus;
+
+/**
+ * This is sent to update the visibility of all visible freeform task views.
+ */
+public class UpdateFreeformTaskViewVisibilityEvent extends EventBus.Event {
+
+ public final boolean visible;
+
+ public UpdateFreeformTaskViewVisibilityEvent(boolean visible) {
+ this.visible = visible;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java
index 957da94..3deeb47 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragEndEvent.java
@@ -19,7 +19,6 @@
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.misc.ReferenceCountedTrigger;
import com.android.systemui.recents.model.Task;
-import com.android.systemui.recents.views.DragView;
import com.android.systemui.recents.views.DropTarget;
import com.android.systemui.recents.views.TaskView;
@@ -30,15 +29,13 @@
public final Task task;
public final TaskView taskView;
- public final DragView dragView;
public final DropTarget dropTarget;
public final ReferenceCountedTrigger postAnimationTrigger;
- public DragEndEvent(Task task, TaskView taskView, DragView dragView, DropTarget dropTarget,
+ public DragEndEvent(Task task, TaskView taskView, DropTarget dropTarget,
ReferenceCountedTrigger postAnimationTrigger) {
this.task = task;
this.taskView = taskView;
- this.dragView = dragView;
this.dropTarget = dropTarget;
this.postAnimationTrigger = postAnimationTrigger;
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java
index 2d42a0e..b81c10c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/dragndrop/DragStartEvent.java
@@ -16,9 +16,9 @@
package com.android.systemui.recents.events.ui.dragndrop;
+import android.graphics.Point;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.model.Task;
-import com.android.systemui.recents.views.DragView;
import com.android.systemui.recents.views.TaskView;
/**
@@ -28,11 +28,11 @@
public final Task task;
public final TaskView taskView;
- public final DragView dragView;
+ public final Point tlOffset;
- public DragStartEvent(Task task, TaskView taskView, DragView dragView) {
+ public DragStartEvent(Task task, TaskView taskView, Point tlOffset) {
this.task = task;
this.taskView = taskView;
- this.dragView = dragView;
+ this.tlOffset = tlOffset;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java
new file mode 100644
index 0000000..913d427
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.history;
+
+import android.app.ActivityOptions;
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.v7.widget.RecyclerView;
+import android.text.format.DateFormat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import com.android.systemui.R;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.misc.SystemServicesProxy;
+import com.android.systemui.recents.model.Task;
+import com.android.systemui.recents.model.TaskStack;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+
+/**
+ * An adapter for the list of recent tasks in the history view.
+ */
+public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAdapter.ViewHolder> {
+
+ private static final String TAG = "RecentsHistoryView";
+ private static final boolean DEBUG = false;
+
+ static final int DATE_ROW_VIEW_TYPE = 0;
+ static final int TASK_ROW_VIEW_TYPE = 1;
+
+ /**
+ * View holder implementation.
+ */
+ public static class ViewHolder extends RecyclerView.ViewHolder {
+ public View mContent;
+
+ public ViewHolder(View v) {
+ super(v);
+ mContent = v;
+ }
+ }
+
+ /**
+ * A single row of content.
+ */
+ private interface Row {
+ int getViewType();
+ }
+
+ /**
+ * A date row.
+ */
+ private static class DateRow implements Row {
+
+ public final String date;
+
+ public DateRow(String date) {
+ this.date = date;
+ }
+
+ @Override
+ public int getViewType() {
+ return RecentsHistoryAdapter.DATE_ROW_VIEW_TYPE;
+ }
+ }
+
+ /**
+ * A task row.
+ */
+ private static class TaskRow implements Row, View.OnClickListener {
+
+ public final String description;
+ private final int mTaskId;
+
+ public TaskRow(Task task) {
+ mTaskId = task.key.id;
+ description = task.activityLabel;
+ }
+
+ @Override
+ public void onClick(View v) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.startActivityFromRecents(v.getContext(), mTaskId, description,
+ ActivityOptions.makeBasic());
+ }
+
+ @Override
+ public int getViewType() {
+ return RecentsHistoryAdapter.TASK_ROW_VIEW_TYPE;
+ }
+ }
+
+ private LayoutInflater mLayoutInflater;
+ private final List<Row> mRows = new ArrayList<>();
+
+ public RecentsHistoryAdapter(Context context) {
+ mLayoutInflater = LayoutInflater.from(context);
+ }
+
+ /**
+ * Updates this adapter with the given tasks.
+ */
+ public void updateTasks(Context context, List<Task> tasks) {
+ final Locale l = context.getResources().getConfiguration().locale;
+ final String dateFormatStr = DateFormat.getBestDateTimePattern(l, "EEEEMMMMd");
+ final List<Task> tasksMostRecent = new ArrayList<>(tasks);
+ Collections.reverse(tasksMostRecent);
+ int prevDayKey = -1;
+ mRows.clear();
+ for (Task task : tasksMostRecent) {
+ if (task.isFreeformTask()) {
+ continue;
+ }
+
+ Calendar cal = Calendar.getInstance(l);
+ cal.setTimeInMillis(task.key.lastActiveTime);
+ int dayKey = Objects.hash(cal.get(Calendar.YEAR), cal.get(Calendar.DAY_OF_YEAR));
+ if (dayKey != prevDayKey) {
+ prevDayKey = dayKey;
+ mRows.add(new DateRow(DateFormat.format(dateFormatStr, cal).toString()));
+ }
+ mRows.add(new TaskRow(task));
+ }
+ notifyDataSetChanged();
+ }
+
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ switch (viewType) {
+ case DATE_ROW_VIEW_TYPE:
+ return new ViewHolder(mLayoutInflater.inflate(R.layout.recents_history_date, parent,
+ false));
+ case TASK_ROW_VIEW_TYPE:
+ return new ViewHolder(mLayoutInflater.inflate(R.layout.recents_history_task, parent,
+ false));
+ default:
+ return new ViewHolder(null);
+ }
+ }
+
+ @Override
+ public void onBindViewHolder(ViewHolder holder, int position) {
+ Row row = mRows.get(position);
+ int viewType = mRows.get(position).getViewType();
+ switch (viewType) {
+ case DATE_ROW_VIEW_TYPE: {
+ TextView tv = (TextView) holder.mContent;
+ tv.setText(((DateRow) row).date);
+ break;
+ }
+ case TASK_ROW_VIEW_TYPE: {
+ TextView tv = (TextView) holder.mContent;
+ TaskRow taskRow = (TaskRow) row;
+ tv.setText(taskRow.description);
+ tv.setOnClickListener(taskRow);
+ break;
+ }
+ }
+ }
+
+ @Override
+ public int getItemCount() {
+ return mRows.size();
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return mRows.get(position).getViewType();
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java
new file mode 100644
index 0000000..9d3a99f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryView.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.history;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Rect;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+import android.widget.LinearLayout;
+
+import com.android.systemui.R;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.misc.ReferenceCountedTrigger;
+import com.android.systemui.recents.model.TaskStack;
+
+/**
+ * A list of the recent tasks that are not in the stack.
+ */
+public class RecentsHistoryView extends LinearLayout {
+
+ private static final String TAG = "RecentsHistoryView";
+ private static final boolean DEBUG = false;
+
+ private RecyclerView mRecyclerView;
+ private RecentsHistoryAdapter mAdapter;
+ private boolean mIsVisible;
+ private Rect mSystemInsets = new Rect();
+
+ private Interpolator mFastOutSlowInInterpolator;
+ private Interpolator mFastOutLinearInInterpolator;
+ private int mHistoryTransitionDuration;
+
+ public RecentsHistoryView(Context context) {
+ super(context);
+ }
+
+ public RecentsHistoryView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public RecentsHistoryView(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public RecentsHistoryView(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ Resources res = context.getResources();
+ mAdapter = new RecentsHistoryAdapter(context);
+ mHistoryTransitionDuration = res.getInteger(R.integer.recents_history_transition_duration);
+ mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
+ com.android.internal.R.interpolator.fast_out_slow_in);
+ mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
+ com.android.internal.R.interpolator.fast_out_linear_in);
+ }
+
+ /**
+ * Updates this history view with the recent tasks, and then shows it.
+ */
+ public void show(TaskStack stack) {
+ setVisibility(View.VISIBLE);
+ setAlpha(0f);
+ animate()
+ .alpha(1f)
+ .setDuration(mHistoryTransitionDuration)
+ .setInterpolator(mFastOutSlowInInterpolator)
+ .withLayer()
+ .start();
+
+ mAdapter.updateTasks(getContext(), stack.computeAllTasksList());
+ mIsVisible = true;
+ }
+
+ /**
+ * Hides this history view.
+ */
+ public void hide(boolean animate, final ReferenceCountedTrigger postAnimationTrigger) {
+ if (animate) {
+ animate()
+ .alpha(0f)
+ .setDuration(mHistoryTransitionDuration)
+ .setInterpolator(mFastOutLinearInInterpolator)
+ .withEndAction(new Runnable() {
+ @Override
+ public void run() {
+ setVisibility(View.INVISIBLE);
+ if (postAnimationTrigger != null) {
+ postAnimationTrigger.decrement();
+ }
+ }
+ })
+ .withLayer()
+ .start();
+ if (postAnimationTrigger != null) {
+ postAnimationTrigger.increment();
+ }
+ } else {
+ setAlpha(0f);
+ setVisibility(View.INVISIBLE);
+ }
+ mIsVisible = false;
+ }
+
+ /**
+ * Updates the system insets of this history view to the provided values.
+ */
+ public void setSystemInsets(Rect systemInsets) {
+ mSystemInsets.set(systemInsets.left, systemInsets.top, systemInsets.right, systemInsets.bottom);
+ requestLayout();
+ }
+
+ /**
+ * Returns whether this view is visible.
+ */
+ public boolean isVisible() {
+ return mIsVisible;
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ mRecyclerView = (RecyclerView) findViewById(R.id.list);
+ mRecyclerView.setAdapter(mAdapter);
+ mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ RecentsConfiguration config = Recents.getConfiguration();
+ int width = MeasureSpec.getSize(widthMeasureSpec);
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+
+ // Pad the view to align the history with the stack layout
+ Rect taskStackBounds = new Rect();
+ config.getTaskStackBounds(new Rect(0, 0, width, height), mSystemInsets.top,
+ mSystemInsets.right, new Rect() /* searchBarSpaceBounds */, taskStackBounds);
+ int stackWidthPadding = (int) (config.taskStackWidthPaddingPct * taskStackBounds.width());
+ int stackHeightPadding = mContext.getResources().getDimensionPixelSize(
+ R.dimen.recents_stack_top_padding);
+ mRecyclerView.setPadding(stackWidthPadding + mSystemInsets.left,
+ stackHeightPadding + mSystemInsets.top,
+ stackWidthPadding + mSystemInsets.right, mSystemInsets.bottom);
+
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+ setSystemInsets(insets.getSystemWindowInsets());
+ return insets;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/FreePathInterpolator.java b/packages/SystemUI/src/com/android/systemui/recents/misc/FreePathInterpolator.java
new file mode 100644
index 0000000..720c952
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/FreePathInterpolator.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2015 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.systemui.recents.misc;
+
+import android.graphics.Path;
+import android.view.animation.BaseInterpolator;
+import android.view.animation.Interpolator;
+
+/**
+ * An interpolator that can traverse a Path. The x coordinate along the <code>Path</code>
+ * is the input value and the output is the y coordinate of the line at that point.
+ * This means that the Path must conform to a function <code>y = f(x)</code>.
+ *
+ * <p>The <code>Path</code> must not have gaps in the x direction and must not
+ * loop back on itself such that there can be two points sharing the same x coordinate.
+ * It is alright to have a disjoint line in the vertical direction:</p>
+ * <p><blockquote><pre>
+ * Path path = new Path();
+ * path.lineTo(0.25f, 0.25f);
+ * path.moveTo(0.25f, 0.5f);
+ * path.lineTo(1f, 1f);
+ * </pre></blockquote></p>
+ */
+public class FreePathInterpolator extends BaseInterpolator {
+
+ // This governs how accurate the approximation of the Path is.
+ private static final float PRECISION = 0.002f;
+
+ private float[] mX;
+ private float[] mY;
+ private float mArcLength;
+
+ /**
+ * Create an interpolator for an arbitrary <code>Path</code>.
+ *
+ * @param path The <code>Path</code> to use to make the line representing the interpolator.
+ */
+ public FreePathInterpolator(Path path) {
+ initPath(path);
+ }
+
+ private void initPath(Path path) {
+ float[] pointComponents = path.approximate(PRECISION);
+
+ int numPoints = pointComponents.length / 3;
+
+ mX = new float[numPoints];
+ mY = new float[numPoints];
+ mArcLength = 0;
+ float prevX = 0;
+ float prevY = 0;
+ float prevFraction = 0;
+ int componentIndex = 0;
+ for (int i = 0; i < numPoints; i++) {
+ float fraction = pointComponents[componentIndex++];
+ float x = pointComponents[componentIndex++];
+ float y = pointComponents[componentIndex++];
+ if (fraction == prevFraction && x != prevX) {
+ throw new IllegalArgumentException(
+ "The Path cannot have discontinuity in the X axis.");
+ }
+ if (x < prevX) {
+ throw new IllegalArgumentException("The Path cannot loop back on itself.");
+ }
+ mX[i] = x;
+ mY[i] = y;
+ mArcLength += Math.hypot(x - prevX, y - prevY);
+ prevX = x;
+ prevY = y;
+ prevFraction = fraction;
+ }
+ }
+
+ /**
+ * Using the line in the Path in this interpolator that can be described as
+ * <code>y = f(x)</code>, finds the y coordinate of the line given <code>t</code>
+ * as the x coordinate.
+ *
+ * @param t Treated as the x coordinate along the line.
+ * @return The y coordinate of the Path along the line where x = <code>t</code>.
+ * @see Interpolator#getInterpolation(float)
+ */
+ @Override
+ public float getInterpolation(float t) {
+ int startIndex = 0;
+ int endIndex = mX.length - 1;
+
+ // Return early if out of bounds
+ if (t <= 0) {
+ return mY[startIndex];
+ } else if (t >= 1) {
+ return mY[endIndex];
+ }
+
+ // Do a binary search for the correct x to interpolate between.
+ while (endIndex - startIndex > 1) {
+ int midIndex = (startIndex + endIndex) / 2;
+ if (t < mX[midIndex]) {
+ endIndex = midIndex;
+ } else {
+ startIndex = midIndex;
+ }
+ }
+
+ float xRange = mX[endIndex] - mX[startIndex];
+ if (xRange == 0) {
+ return mY[startIndex];
+ }
+
+ float tInRange = t - mX[startIndex];
+ float fraction = tInRange / xRange;
+
+ float startY = mY[startIndex];
+ float endY = mY[endIndex];
+ return startY + (fraction * (endY - startY));
+ }
+
+ /**
+ * Finds the x that provides the given <code>y = f(x)</code>.
+ *
+ * @param y a value from (0,1) that is in this path.
+ */
+ public float getX(float y) {
+ int startIndex = 0;
+ int endIndex = mY.length - 1;
+
+ // Return early if out of bounds
+ if (y <= 0) {
+ return mX[endIndex];
+ } else if (y >= 1) {
+ return mX[startIndex];
+ }
+
+ // Do a binary search for index that bounds the y
+ while (endIndex - startIndex > 1) {
+ int midIndex = (startIndex + endIndex) / 2;
+ if (y < mY[midIndex]) {
+ startIndex = midIndex;
+ } else {
+ endIndex = midIndex;
+ }
+ }
+
+ float yRange = mY[endIndex] - mY[startIndex];
+ if (yRange == 0) {
+ return mX[startIndex];
+ }
+
+ float tInRange = y - mY[startIndex];
+ float fraction = tInRange / yRange;
+
+ float startX = mX[startIndex];
+ float endX = mX[endIndex];
+ return startX + (fraction * (endX - startX));
+ }
+
+ /**
+ * Returns the arclength of the path we are interpolating.
+ */
+ public float getArcLength() {
+ return mArcLength;
+ }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/ParametricCurve.java b/packages/SystemUI/src/com/android/systemui/recents/misc/ParametricCurve.java
deleted file mode 100644
index 515c3bd..0000000
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/ParametricCurve.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2014 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.systemui.recents.misc;
-
-import android.graphics.Rect;
-import android.os.SystemClock;
-import android.util.Log;
-
-/**
- * Represents a 2d curve that is parameterized along the arc length of the curve (p), and allows the
- * conversions of x->p and p->x.
- */
-public class ParametricCurve {
-
- private static final boolean DEBUG = false;
- private static final String TAG = "ParametricCurve";
-
- private static final int PrecisionSteps = 250;
-
- /**
- * A 2d function, representing the curve.
- */
- public interface CurveFunction {
- float f(float x);
- float invF(float y);
- }
-
- /**
- * A function that returns a value given a parametric value.
- */
- public interface ParametricCurveFunction {
- float f(float p);
- }
-
- float[] xp;
- float[] px;
- float mLength;
-
- CurveFunction mFn;
- ParametricCurveFunction mScaleFn;
-
- public ParametricCurve(CurveFunction fn, ParametricCurveFunction scaleFn) {
- long t1;
- if (DEBUG) {
- t1 = SystemClock.currentThreadTimeMicro();
- Log.d(TAG, "initializeCurve");
- }
- mFn = fn;
- mScaleFn = scaleFn;
- xp = new float[PrecisionSteps + 1];
- px = new float[PrecisionSteps + 1];
-
- // Approximate f(x)
- float[] fx = new float[PrecisionSteps + 1];
- float step = 1f / PrecisionSteps;
- float x = 0;
- for (int xStep = 0; xStep <= PrecisionSteps; xStep++) {
- fx[xStep] = fn.f(x);
- x += step;
- }
- // Calculate the arc length for x:1->0
- float pLength = 0;
- float[] dx = new float[PrecisionSteps + 1];
- dx[0] = 0;
- for (int xStep = 1; xStep < PrecisionSteps; xStep++) {
- dx[xStep] = (float) Math.hypot(fx[xStep] - fx[xStep - 1], step);
- pLength += dx[xStep];
- }
- mLength = pLength;
- // Approximate p(x), a function of cumulative progress with x, normalized to 0..1
- float p = 0;
- px[0] = 0f;
- px[PrecisionSteps] = 1f;
- if (DEBUG) {
- Log.d(TAG, "p[0]=0");
- Log.d(TAG, "p[" + PrecisionSteps + "]=1");
- }
- for (int xStep = 1; xStep < PrecisionSteps; xStep++) {
- p += Math.abs(dx[xStep] / pLength);
- px[xStep] = p;
- if (DEBUG) {
- Log.d(TAG, "p[" + xStep + "]=" + p);
- }
- }
- // Given p(x), calculate the inverse function x(p). This assumes that x(p) is also a valid
- // function.
- int xStep = 0;
- p = 0;
- xp[0] = 0f;
- xp[PrecisionSteps] = 1f;
- if (DEBUG) {
- Log.d(TAG, "x[0]=0");
- Log.d(TAG, "x[" + PrecisionSteps + "]=1");
- }
- for (int pStep = 0; pStep < PrecisionSteps; pStep++) {
- // Walk forward in px and find the x where px <= p && p < px+1
- while (xStep < PrecisionSteps) {
- if (px[xStep] > p) break;
- xStep++;
- }
- // Now, px[xStep-1] <= p < px[xStep]
- if (xStep == 0) {
- xp[pStep] = 0;
- } else {
- // Find x such that proportionally, x is correct
- float fraction = (p - px[xStep - 1]) / (px[xStep] - px[xStep - 1]);
- x = (xStep - 1 + fraction) * step;
- xp[pStep] = x;
- }
- if (DEBUG) {
- Log.d(TAG, "x[" + pStep + "]=" + xp[pStep]);
- }
- p += step;
- }
- if (DEBUG) {
- Log.d(TAG, "\t1t: " + (SystemClock.currentThreadTimeMicro() - t1) + "microsecs");
- }
- }
-
- /**
- * Converts from the progress along the arc-length of the curve to a coordinate within the
- * bounds. Note, p=0 represents the top of the bounds, and p=1 represents the bottom.
- */
- public int pToX(float p, Rect bounds) {
- int top = bounds.top;
- int height = bounds.height();
-
- if (p <= 0f) return top;
- if (p >= 1f) return top + (int) (p * height);
-
- float pIndex = p * PrecisionSteps;
- int pFloorIndex = (int) Math.floor(pIndex);
- int pCeilIndex = (int) Math.ceil(pIndex);
- float x = xp[pFloorIndex];
- if (pFloorIndex < PrecisionSteps && (pCeilIndex != pFloorIndex)) {
- // Interpolate between the two precalculated positions
- x += (xp[pCeilIndex] - xp[pFloorIndex]) * (pIndex - pFloorIndex);
- }
- return top + (int) (x * height);
- }
-
- /**
- * Converts from the progress along the arc-length of the curve to a scale.
- */
- public float pToScale(float p) {
- return mScaleFn.f(p);
- }
-
- /**
- * Converts from a bounds coordinate to the progress along the arc-length of the curve.
- * Note, p=0 represents the top of the bounds, and p=1 represents the bottom.
- */
- public float xToP(int x, Rect bounds) {
- int top = bounds.top;
-
- float xf = (float) (x - top) / bounds.height();
- if (xf <= 0f) return 0f;
- if (xf >= 1f) return xf;
-
- float xIndex = xf * PrecisionSteps;
- int xFloorIndex = (int) Math.floor(xIndex);
- int xCeilIndex = (int) Math.ceil(xIndex);
- float p = px[xFloorIndex];
- if (xFloorIndex < PrecisionSteps && (xCeilIndex != xFloorIndex)) {
- // Interpolate between the two precalculated positions
- p += (px[xCeilIndex] - px[xFloorIndex]) * (xIndex - xFloorIndex);
- }
- return p;
- }
-
- /**
- * Computes the progress offset from the bottom of the curve (p=1) such that the given height
- * is visible when scaled at the that progress.
- */
- public float computePOffsetForScaledHeight(int height, Rect bounds) {
- int top = bounds.top;
- int bottom = bounds.bottom;
- height = Math.min(height, bottom - top);
-
- if (bounds.height() == 0) {
- return 0;
- }
-
- // Find the next p(x) such that (bottom-x) == scale(p(x))*height
- int minX = top;
- int maxX = bottom;
- long t1;
- if (DEBUG) {
- t1 = SystemClock.currentThreadTimeMicro();
- Log.d(TAG, "computePOffsetForScaledHeight: " + height);
- }
- while (minX <= maxX) {
- int midX = minX + ((maxX - minX) / 2);
- float pMidX = xToP(midX, bounds);
- float scaleMidX = mScaleFn.f(pMidX);
- int scaledHeight = (int) (scaleMidX * height);
- if ((bottom - midX) < scaledHeight) {
- maxX = midX - 1;
- } else if ((bottom - midX) > scaledHeight) {
- minX = midX + 1;
- } else {
- if (DEBUG) {
- Log.d(TAG, "\t1t: " + (SystemClock.currentThreadTimeMicro() - t1) + "microsecs");
- }
- return 1f - pMidX;
- }
- }
- if (DEBUG) {
- Log.d(TAG, "\t2t: " + (SystemClock.currentThreadTimeMicro() - t1) + "microsecs");
- }
- return 1f - xToP(maxX, bounds);
- }
-
- /**
- * Computes the progress offset from the bottom of the curve (p=1) that allows the given height,
- * unscaled at the progress, will be visible.
- */
- public float computePOffsetForHeight(int height, Rect bounds) {
- int top = bounds.top;
- int bottom = bounds.bottom;
- height = Math.min(height, bottom - top);
-
- if (bounds.height() == 0) {
- return 0;
- }
-
- // Find the next p(x) such that (bottom-x) == height
- int minX = top;
- int maxX = bottom;
- long t1;
- if (DEBUG) {
- t1 = SystemClock.currentThreadTimeMicro();
- Log.d(TAG, "computePOffsetForHeight: " + height);
- }
- while (minX <= maxX) {
- int midX = minX + ((maxX - minX) / 2);
- if ((bottom - midX) < height) {
- maxX = midX - 1;
- } else if ((bottom - midX) > height) {
- minX = midX + 1;
- } else {
- if (DEBUG) {
- Log.d(TAG, "\t1t: " + (SystemClock.currentThreadTimeMicro() - t1) + "microsecs");
- }
- return 1f - xToP(midX, bounds);
- }
- }
- if (DEBUG) {
- Log.d(TAG, "\t2t: " + (SystemClock.currentThreadTimeMicro() - t1) + "microsecs");
- }
- return 1f - xToP(maxX, bounds);
- }
-
- /**
- * Returns the length of this curve.
- */
- public float getArcLength() {
- return mLength;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index 0432ac9..2b20c07 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@ -56,6 +56,7 @@
import android.util.MutableBoolean;
import android.util.Pair;
import android.view.Display;
+import android.view.IDockDividerVisibilityListener;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager;
@@ -63,7 +64,8 @@
import com.android.internal.os.BackgroundThread;
import com.android.systemui.Prefs;
import com.android.systemui.R;
-import com.android.systemui.recents.Constants;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.RecentsImpl;
import java.io.IOException;
@@ -113,6 +115,7 @@
/** Private constructor */
public SystemServicesProxy(Context context) {
+ RecentsDebugFlags flags = Recents.getDebugFlags();
mAccm = AccessibilityManager.getInstance(context);
mAm = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
mIam = ActivityManagerNative.getDefault();
@@ -124,8 +127,8 @@
mUm = UserManager.get(context);
mDisplay = mWm.getDefaultDisplay();
mRecentsPackage = context.getPackageName();
- mHasFreeformWorkspaceSupport = false && mPm.hasSystemFeature(
- PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT);
+ mHasFreeformWorkspaceSupport = false &&
+ mPm.hasSystemFeature(PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT);
// Get the dummy thumbnail width/heights
Resources res = context.getResources();
@@ -143,7 +146,7 @@
// Resolve the assist intent
mAssistComponent = mAssistUtils.getAssistComponentForUser(UserHandle.myUserId());
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) {
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) {
// Create a dummy icon
mDummyIcon = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
mDummyIcon.eraseColor(0xFF999999);
@@ -156,13 +159,13 @@
if (mAm == null) return null;
// If we are mocking, then create some recent tasks
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) {
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) {
ArrayList<ActivityManager.RecentTaskInfo> tasks =
new ArrayList<ActivityManager.RecentTaskInfo>();
- int count = Math.min(numLatestTasks, Constants.DebugFlags.App.SystemServicesProxyMockTaskCount);
+ int count = Math.min(numLatestTasks, RecentsDebugFlags.Static.SystemServicesProxyMockTaskCount);
for (int i = 0; i < count; i++) {
// Create a dummy component name
- int packageIndex = i % Constants.DebugFlags.App.SystemServicesProxyMockPackageCount;
+ int packageIndex = i % RecentsDebugFlags.Static.SystemServicesProxyMockPackageCount;
ComponentName cn = new ComponentName("com.android.test" + packageIndex,
"com.android.test" + i + ".Activity");
String description = "" + i + " - " +
@@ -309,6 +312,18 @@
}
}
+ /** Docks an already resumed task to the side of the screen. */
+ public void moveTaskToDockedStack(int taskId, int createMode, Rect initialBounds) {
+ if (mIam == null) return;
+
+ try {
+ mIam.moveTaskToDockedStack(taskId, createMode, true /* onTop */, false /* animate */,
+ initialBounds);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
+
/** Returns the focused stack id. */
public int getFocusedStack() {
if (mIam == null) return -1;
@@ -329,6 +344,13 @@
}
/**
+ * Returns whether the given stack id is the docked stack id.
+ */
+ public static boolean isDockedStack(int stackId) {
+ return stackId == DOCKED_STACK_ID;
+ }
+
+ /**
* Returns whether the given stack id is the freeform workspace stack id.
*/
public static boolean isFreeformStack(int stackId) {
@@ -381,14 +403,14 @@
if (mAm == null) return null;
// If we are mocking, then just return a dummy thumbnail
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) {
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) {
Bitmap thumbnail = Bitmap.createBitmap(mDummyThumbnailWidth, mDummyThumbnailHeight,
Bitmap.Config.ARGB_8888);
thumbnail.eraseColor(0xff333333);
return thumbnail;
}
- Bitmap thumbnail = SystemServicesProxy.getThumbnail(mAm, taskId);
+ Bitmap thumbnail = getThumbnail(taskId);
if (thumbnail != null) {
thumbnail.setHasAlpha(false);
// We use a dumb heuristic for now, if the thumbnail is purely transparent in the top
@@ -408,8 +430,12 @@
/**
* Returns a task thumbnail from the activity manager
*/
- public static Bitmap getThumbnail(ActivityManager activityManager, int taskId) {
- ActivityManager.TaskThumbnail taskThumbnail = activityManager.getTaskThumbnail(taskId);
+ public Bitmap getThumbnail(int taskId) {
+ if (mAm == null) {
+ return null;
+ }
+
+ ActivityManager.TaskThumbnail taskThumbnail = mAm.getTaskThumbnail(taskId);
if (taskThumbnail == null) return null;
Bitmap thumbnail = taskThumbnail.mainThumbnail;
@@ -443,7 +469,7 @@
/** Moves a task to the front with the specified activity options. */
public void moveTaskToFront(int taskId, ActivityOptions opts) {
if (mAm == null) return;
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) return;
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) return;
if (opts != null) {
mAm.moveTaskToFront(taskId, ActivityManager.MOVE_TASK_WITH_HOME,
@@ -456,7 +482,7 @@
/** Removes the task */
public void removeTask(final int taskId) {
if (mAm == null) return;
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) return;
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) return;
// Remove the task.
BackgroundThread.getHandler().post(new Runnable() {
@@ -475,7 +501,7 @@
*/
public ActivityInfo getActivityInfo(ComponentName cn, int userId) {
if (mIpm == null) return null;
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) return new ActivityInfo();
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) return new ActivityInfo();
try {
return mIpm.getActivityInfo(cn, PackageManager.GET_META_DATA, userId);
@@ -492,7 +518,7 @@
*/
public ActivityInfo getActivityInfo(ComponentName cn) {
if (mPm == null) return null;
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) return new ActivityInfo();
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) return new ActivityInfo();
try {
return mPm.getActivityInfo(cn, PackageManager.GET_META_DATA);
@@ -507,7 +533,7 @@
if (mPm == null) return null;
// If we are mocking, then return a mock label
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) {
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) {
return "Recent Task";
}
@@ -519,7 +545,7 @@
if (mPm == null) return null;
// If we are mocking, then return a mock label
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) {
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) {
return "Recent Task";
}
@@ -549,7 +575,7 @@
if (mPm == null) return null;
// If we are mocking, then return a mock label
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) {
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) {
return new ColorDrawable(0xFF666666);
}
@@ -580,7 +606,7 @@
/** Returns the package name of the home activity. */
public String getHomeActivityPackageName() {
if (mPm == null) return null;
- if (Constants.DebugFlags.App.EnableSystemServicesProxy) return null;
+ if (RecentsDebugFlags.Static.EnableSystemServicesProxy) return null;
ArrayList<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
ComponentName defaultHomeActivity = mPm.getHomeActivities(homeActivities);
@@ -623,22 +649,22 @@
* Returns the current search widget id.
*/
public int getSearchAppWidgetId(Context context) {
- return Prefs.getInt(context, Prefs.Key.SEARCH_APP_WIDGET_ID, -1);
+ return Prefs.getInt(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_ID, -1);
}
/**
* Returns the current search widget info, binding a new one if necessary.
*/
public AppWidgetProviderInfo getOrBindSearchAppWidget(Context context, AppWidgetHost host) {
- int searchWidgetId = Prefs.getInt(context, Prefs.Key.SEARCH_APP_WIDGET_ID, -1);
+ int searchWidgetId = Prefs.getInt(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_ID, -1);
AppWidgetProviderInfo searchWidgetInfo = mAwm.getAppWidgetInfo(searchWidgetId);
AppWidgetProviderInfo resolvedSearchWidgetInfo = resolveSearchAppWidget();
// Return the search widget info if it hasn't changed
if (searchWidgetInfo != null && resolvedSearchWidgetInfo != null &&
searchWidgetInfo.provider.equals(resolvedSearchWidgetInfo.provider)) {
- if (Prefs.getString(context, Prefs.Key.SEARCH_APP_WIDGET_PACKAGE, null) == null) {
- Prefs.putString(context, Prefs.Key.SEARCH_APP_WIDGET_PACKAGE,
+ if (Prefs.getString(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE, null) == null) {
+ Prefs.putString(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE,
searchWidgetInfo.provider.getPackageName());
}
return searchWidgetInfo;
@@ -654,16 +680,16 @@
Pair<Integer, AppWidgetProviderInfo> widgetInfo = bindSearchAppWidget(host,
resolvedSearchWidgetInfo);
if (widgetInfo != null) {
- Prefs.putInt(context, Prefs.Key.SEARCH_APP_WIDGET_ID, widgetInfo.first);
- Prefs.putString(context, Prefs.Key.SEARCH_APP_WIDGET_PACKAGE,
+ Prefs.putInt(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_ID, widgetInfo.first);
+ Prefs.putString(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE,
widgetInfo.second.provider.getPackageName());
return widgetInfo.second;
}
}
// If we fall through here, then there is no resolved search widget, so clear the state
- Prefs.remove(context, Prefs.Key.SEARCH_APP_WIDGET_ID);
- Prefs.remove(context, Prefs.Key.SEARCH_APP_WIDGET_PACKAGE);
+ Prefs.remove(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_ID);
+ Prefs.remove(context, Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE);
return null;
}
@@ -826,4 +852,15 @@
e.printStackTrace();
}
}
+
+ public void registerDockDividerVisibilityListener(IDockDividerVisibilityListener listener) {
+ if (mWm == null) return;
+
+ try {
+ WindowManagerGlobal.getWindowManagerService().registerDockDividerVisibilityListener(
+ listener);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
index 7b04493..3bb89a3 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
@@ -23,8 +23,10 @@
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.util.Log;
+import com.android.systemui.Prefs;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.misc.SystemServicesProxy;
import java.util.ArrayList;
@@ -45,7 +47,8 @@
private static String TAG = "RecentsTaskLoadPlan";
private static boolean DEBUG = false;
- private static int INVALID_TASK_ID = -1;
+ private static int MIN_NUM_TASKS = 5;
+ private static int SESSION_BEGIN_TIME = 60 /* s/min */ * 60 /* min/hr */ * 6 /* hrs */;
/** The set of conditions to load tasks. */
public static class Options {
@@ -99,6 +102,7 @@
public synchronized void preloadPlan(RecentsTaskLoader loader, boolean isTopTaskHome) {
if (DEBUG) Log.d(TAG, "preloadPlan");
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
RecentsConfiguration config = Recents.getConfiguration();
SystemServicesProxy ssp = Recents.getSystemServices();
Resources res = mContext.getResources();
@@ -107,6 +111,10 @@
if (mRawTasks == null) {
preloadRawTasks(isTopTaskHome);
}
+
+ long lastStackActiveTime = Prefs.getLong(mContext,
+ Prefs.Key.OVERVIEW_LAST_STACK_TASK_ACTIVE_TIME, 0);
+ long newLastStackActiveTime = -1;
int taskCount = mRawTasks.size();
for (int i = 0; i < taskCount; i++) {
ActivityManager.RecentTaskInfo t = mRawTasks.get(i);
@@ -115,13 +123,27 @@
Task.TaskKey taskKey = new Task.TaskKey(t.persistentId, t.stackId, t.baseIntent,
t.userId, t.firstActiveTime, t.lastActiveTime);
+ // This task is only shown in the stack if it statisfies the historical time or min
+ // number of tasks constraints. Freeform tasks are also always shown.
+ boolean isStackTask = true;
+ if (debugFlags.isHistoryEnabled()) {
+ boolean isFreeformTask = SystemServicesProxy.isFreeformStack(t.stackId);
+ isStackTask = isFreeformTask || (!isHistoricalTask(t) ||
+ (t.lastActiveTime >= lastStackActiveTime &&
+ i >= (taskCount - MIN_NUM_TASKS)));
+ if (isStackTask && newLastStackActiveTime < 0) {
+ newLastStackActiveTime = t.lastActiveTime;
+ }
+ }
+
// Load the label, icon, and color
String activityLabel = loader.getAndUpdateActivityLabel(taskKey, t.taskDescription,
ssp);
String contentDescription = loader.getAndUpdateContentDescription(taskKey,
activityLabel, ssp, res);
- Drawable activityIcon = loader.getAndUpdateActivityIcon(taskKey, t.taskDescription, ssp,
- res, false);
+ Drawable activityIcon = isStackTask
+ ? loader.getAndUpdateActivityIcon(taskKey, t.taskDescription, ssp, res, false)
+ : null;
int activityColor = loader.getActivityPrimaryColor(t.taskDescription);
Bitmap icon = t.taskDescription != null
@@ -132,7 +154,7 @@
// Add the task to the stack
Task task = new Task(taskKey, t.affiliatedTaskId, t.affiliatedTaskColor, activityLabel,
contentDescription, activityIcon, activityColor, (i == (taskCount - 1)),
- config.lockToAppEnabled, icon, iconFilename, t.bounds);
+ config.lockToAppEnabled, !isStackTask, icon, iconFilename, t.bounds);
task.thumbnail = loader.getAndUpdateThumbnail(taskKey, ssp, false);
if (DEBUG) {
Log.d(TAG, activityLabel + " bounds: " + t.bounds);
@@ -144,6 +166,10 @@
stackTasks.add(task);
}
}
+ if (debugFlags.isHistoryEnabled() && newLastStackActiveTime != -1) {
+ Prefs.putLong(mContext, Prefs.Key.OVERVIEW_LAST_STACK_TASK_ACTIVE_TIME,
+ newLastStackActiveTime);
+ }
// Initialize the stacks
ArrayList<Task> allTasks = new ArrayList<>();
@@ -168,7 +194,7 @@
Resources res = mContext.getResources();
// Iterate through each of the tasks and load them according to the load conditions.
- ArrayList<Task> tasks = mStack.getTasks();
+ ArrayList<Task> tasks = mStack.getStackTasks();
int taskCount = tasks.size();
for (int i = 0; i < taskCount; i++) {
ActivityManager.RecentTaskInfo t = mRawTasks.get(i);
@@ -214,8 +240,15 @@
/** Returns whether there are any tasks in any stacks. */
public boolean hasTasks() {
if (mStack != null) {
- return mStack.getTaskCount() > 0;
+ return mStack.getStackTaskCount() > 0;
}
return false;
}
+
+ /**
+ * Returns whether this task is considered a task to be shown in the history.
+ */
+ private boolean isHistoricalTask(ActivityManager.RecentTaskInfo t) {
+ return t.lastActiveTime < (System.currentTimeMillis() - SESSION_BEGIN_TIME);
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
index bba453a..965e7a67 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
@@ -30,9 +30,9 @@
import android.util.Log;
import android.util.LruCache;
import com.android.systemui.R;
-import com.android.systemui.recents.Constants;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.events.activity.PackagesChangedEvent;
import com.android.systemui.recents.misc.SystemServicesProxy;
@@ -239,7 +239,8 @@
SystemServicesProxy ssp, Resources res) {
Bitmap tdIcon = iconBitmap != null
? iconBitmap
- : ActivityManager.TaskDescription.loadTaskDescriptionIcon(iconFilename);
+ : ActivityManager.TaskDescription.loadTaskDescriptionIcon(iconFilename,
+ taskKey.userId);
if (tdIcon != null) {
return ssp.getBadgedIcon(new BitmapDrawable(res, tdIcon), taskKey.userId);
}
@@ -283,9 +284,9 @@
res.getColor(R.color.recents_task_bar_default_background_color);
mMaxThumbnailCacheSize = res.getInteger(R.integer.config_recents_max_thumbnail_count);
mMaxIconCacheSize = res.getInteger(R.integer.config_recents_max_icon_count);
- int iconCacheSize = Constants.DebugFlags.App.DisableBackgroundCache ? 1 :
+ int iconCacheSize = RecentsDebugFlags.Static.DisableBackgroundCache ? 1 :
mMaxIconCacheSize;
- int thumbnailCacheSize = Constants.DebugFlags.App.DisableBackgroundCache ? 1 :
+ int thumbnailCacheSize = RecentsDebugFlags.Static.DisableBackgroundCache ? 1 :
mMaxThumbnailCacheSize;
// Create the default assets
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/Task.java b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
index 67e18f3..60bedae 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
@@ -105,6 +105,7 @@
public Bitmap thumbnail;
public boolean lockToThisTask;
public boolean lockToTaskEnabled;
+ public boolean isHistorical;
public Bitmap icon;
public String iconFilename;
public Rect bounds;
@@ -117,8 +118,8 @@
public Task(TaskKey key, int taskAffiliation, int taskAffiliationColor,
String activityTitle, String contentDescription, Drawable activityIcon,
- int colorPrimary, boolean lockToThisTask, boolean lockToTaskEnabled, Bitmap icon,
- String iconFilename, Rect bounds) {
+ int colorPrimary, boolean lockToThisTask, boolean lockToTaskEnabled,
+ boolean isHistorical, Bitmap icon, String iconFilename, Rect bounds) {
boolean isInAffiliationGroup = (taskAffiliation != key.id);
boolean hasAffiliationGroupColor = isInAffiliationGroup && (taskAffiliationColor != 0);
this.key = key;
@@ -132,6 +133,7 @@
Color.WHITE) > 3f;
this.lockToThisTask = lockToTaskEnabled && lockToThisTask;
this.lockToTaskEnabled = lockToTaskEnabled;
+ this.isHistorical = isHistorical;
this.icon = icon;
this.iconFilename = iconFilename;
this.bounds = bounds;
@@ -149,6 +151,10 @@
this.useLightOnPrimaryColor = o.useLightOnPrimaryColor;
this.lockToThisTask = o.lockToThisTask;
this.lockToTaskEnabled = o.lockToTaskEnabled;
+ this.isHistorical = o.isHistorical;
+ this.icon = o.icon;
+ this.iconFilename = o.iconFilename;
+ this.bounds = o.bounds;
}
/** Set the callbacks */
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
index 6734012..cd0a46f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
@@ -24,8 +24,8 @@
import android.graphics.RectF;
import android.graphics.drawable.ColorDrawable;
import com.android.systemui.R;
-import com.android.systemui.recents.Constants;
import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.misc.NamedCounter;
import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.misc.Utilities;
@@ -59,7 +59,7 @@
class FilteredTaskList {
private static final String TAG = "FilteredTaskList";
- private static final boolean DEBUG = true;
+ private static final boolean DEBUG = false;
ArrayList<Task> mTasks = new ArrayList<>();
ArrayList<Task> mFilteredTasks = new ArrayList<>();
@@ -74,18 +74,17 @@
if (!prevFilteredTasks.equals(mFilteredTasks)) {
return true;
} else {
- // If the tasks are exactly the same pre/post filter, then just reset it
- mFilter = null;
return false;
}
}
- /** Resets this FilteredTaskList. */
+ /**
+ * Resets the task list, but does not remove the filter.
+ */
void reset() {
mTasks.clear();
mFilteredTasks.clear();
mTaskIndices.clear();
- mFilter = null;
}
/** Removes the task filter and returns the previous touch state */
@@ -199,20 +198,14 @@
/** Task stack callbacks */
public interface TaskStackCallbacks {
- /* Notifies when a task has been added to the stack */
- public void onStackTaskAdded(TaskStack stack, Task t);
/* Notifies when a task has been removed from the stack */
- public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
+ void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
Task newFrontMostTask);
- /* Notifies when all task has been removed from the stack */
- public void onStackAllTasksRemoved(TaskStack stack, ArrayList<Task> removedTasks);
- /** Notifies when the stack was filtered */
- public void onStackFiltered(TaskStack newStack, ArrayList<Task> curTasks, Task t);
- /** Notifies when the stack was un-filtered */
- public void onStackUnfiltered(TaskStack newStack, ArrayList<Task> curTasks);
}
-
+ /**
+ * The various possible dock states when dragging and dropping a task.
+ */
public enum DockState implements DropTarget {
NONE(-1, 96, null, null),
LEFT(DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT, 192,
@@ -294,14 +287,39 @@
}
}
+ // A comparator that sorts tasks by their last active time
+ private Comparator<Task> LAST_ACTIVE_TIME_COMPARATOR = new Comparator<Task>() {
+ @Override
+ public int compare(Task o1, Task o2) {
+ return Long.compare(o1.key.lastActiveTime, o2.key.lastActiveTime);
+ }
+ };
+
// The task offset to apply to a task id as a group affiliation
static final int IndividualTaskIdOffset = 1 << 16;
- FilteredTaskList mTaskList = new FilteredTaskList();
+ FilteredTaskList mStackTaskList = new FilteredTaskList();
+ FilteredTaskList mHistoryTaskList = new FilteredTaskList();
TaskStackCallbacks mCb;
- ArrayList<TaskGrouping> mGroups = new ArrayList<TaskGrouping>();
- HashMap<Integer, TaskGrouping> mAffinitiesGroups = new HashMap<Integer, TaskGrouping>();
+ ArrayList<TaskGrouping> mGroups = new ArrayList<>();
+ HashMap<Integer, TaskGrouping> mAffinitiesGroups = new HashMap<>();
+
+ public TaskStack() {
+ // Ensure that we only show non-docked tasks
+ mStackTaskList.setFilter(new TaskFilter() {
+ @Override
+ public boolean acceptTask(Task t, int index) {
+ return !t.isHistorical && !SystemServicesProxy.isDockedStack(t.key.stackId);
+ }
+ });
+ mHistoryTaskList.setFilter(new TaskFilter() {
+ @Override
+ public boolean acceptTask(Task t, int index) {
+ return t.isHistorical && !SystemServicesProxy.isDockedStack(t.key.stackId);
+ }
+ });
+ }
/** Sets the callbacks for this task stack. */
public void setCallbacks(TaskStackCallbacks cb) {
@@ -311,29 +329,22 @@
/** Resets this TaskStack. */
public void reset() {
mCb = null;
- mTaskList.reset();
+ mStackTaskList.reset();
+ mHistoryTaskList.reset();
mGroups.clear();
mAffinitiesGroups.clear();
}
- /** Adds a new task */
- public void addTask(Task t) {
- mTaskList.add(t);
- if (mCb != null) {
- mCb.onStackTaskAdded(this, t);
- }
- }
-
/**
* Moves the given task to either the front of the freeform workspace or the stack.
*/
public void moveTaskToStack(Task task, int newStackId) {
// Find the index to insert into
- ArrayList<Task> taskList = mTaskList.getTasks();
+ ArrayList<Task> taskList = mStackTaskList.getTasks();
int taskCount = taskList.size();
if (!task.isFreeformTask() && (newStackId == FREEFORM_WORKSPACE_STACK_ID)) {
// Insert freeform tasks at the front
- mTaskList.moveTaskToStack(task, taskCount, newStackId);
+ mStackTaskList.moveTaskToStack(task, taskCount, newStackId);
} else if (task.isFreeformTask() && (newStackId == FULLSCREEN_WORKSPACE_STACK_ID)) {
// Insert after the first stacked task
int insertIndex = 0;
@@ -343,14 +354,14 @@
break;
}
}
- mTaskList.moveTaskToStack(task, insertIndex, newStackId);
+ mStackTaskList.moveTaskToStack(task, insertIndex, newStackId);
}
}
/** Does the actual work associated with removing the task. */
- void removeTaskImpl(Task t) {
+ void removeTaskImpl(FilteredTaskList taskList, Task t) {
// Remove the task from the list
- mTaskList.remove(t);
+ taskList.remove(t);
// Remove it from the group as well, and if it is empty, remove the group
TaskGrouping group = t.group;
group.removeTask(t);
@@ -363,10 +374,10 @@
/** Removes a task */
public void removeTask(Task t) {
- if (mTaskList.contains(t)) {
- boolean wasFrontMostTask = (getFrontMostTask() == t);
- removeTaskImpl(t);
- Task newFrontMostTask = getFrontMostTask();
+ if (mStackTaskList.contains(t)) {
+ boolean wasFrontMostTask = (getStackFrontMostTask() == t);
+ removeTaskImpl(mStackTaskList, t);
+ Task newFrontMostTask = getStackFrontMostTask();
if (newFrontMostTask != null && newFrontMostTask.lockToTaskEnabled) {
newFrontMostTask.lockToThisTask = true;
}
@@ -374,75 +385,88 @@
// Notify that a task has been removed
mCb.onStackTaskRemoved(this, t, wasFrontMostTask, newFrontMostTask);
}
- }
- }
-
- /** Removes all tasks */
- public void removeAllTasks() {
- ArrayList<Task> taskList = new ArrayList<Task>(mTaskList.getTasks());
- int taskCount = taskList.size();
- for (int i = taskCount - 1; i >= 0; i--) {
- Task t = taskList.get(i);
- removeTaskImpl(t);
- }
- if (mCb != null) {
- // Notify that all tasks have been removed
- mCb.onStackAllTasksRemoved(this, taskList);
- }
- }
-
- /** Sets a few tasks in one go */
- public void setTasks(List<Task> tasks) {
- ArrayList<Task> taskList = mTaskList.getTasks();
- int taskCount = taskList.size();
- for (int i = taskCount - 1; i >= 0; i--) {
- Task t = taskList.get(i);
- removeTaskImpl(t);
+ } else if (mHistoryTaskList.contains(t)) {
+ removeTaskImpl(mHistoryTaskList, t);
if (mCb != null) {
// Notify that a task has been removed
mCb.onStackTaskRemoved(this, t, false, null);
}
}
- mTaskList.set(tasks);
- for (Task t : tasks) {
- if (mCb != null) {
- mCb.onStackTaskAdded(this, t);
+ }
+
+ /**
+ * Sets a few tasks in one go, without calling any callbacks.
+ */
+ public void setTasks(List<Task> tasks) {
+ ArrayList<Task> stackTasks = new ArrayList<>();
+ ArrayList<Task> historyTasks = new ArrayList<>();
+ for (Task task : tasks) {
+ if (task.isHistorical) {
+ historyTasks.add(task);
+ } else {
+ stackTasks.add(task);
}
}
+ mStackTaskList.set(stackTasks);
+ mHistoryTaskList.set(historyTasks);
}
/** Gets the front task */
- public Task getFrontMostTask() {
- if (mTaskList.size() == 0) return null;
- return mTaskList.getTasks().get(mTaskList.size() - 1);
+ public Task getStackFrontMostTask() {
+ if (mStackTaskList.size() == 0) return null;
+ return mStackTaskList.getTasks().get(mStackTaskList.size() - 1);
}
/** Gets the task keys */
public ArrayList<Task.TaskKey> getTaskKeys() {
- ArrayList<Task.TaskKey> taskKeys = new ArrayList<Task.TaskKey>();
- ArrayList<Task> tasks = mTaskList.getTasks();
+ ArrayList<Task.TaskKey> taskKeys = new ArrayList<>();
+ ArrayList<Task> tasks = computeAllTasksList();
int taskCount = tasks.size();
for (int i = 0; i < taskCount; i++) {
- taskKeys.add(tasks.get(i).key);
+ Task task = tasks.get(i);
+ taskKeys.add(task.key);
}
return taskKeys;
}
- /** Gets the tasks */
- public ArrayList<Task> getTasks() {
- return mTaskList.getTasks();
- }
-
- /** Gets the number of tasks */
- public int getTaskCount() {
- return mTaskList.size();
+ /**
+ * Returns the set of "active" (non-historical) tasks in the stack that have been used recently.
+ */
+ public ArrayList<Task> getStackTasks() {
+ return mStackTaskList.getTasks();
}
/**
- * Returns the task in this stack which is the launch target.
+ * Returns the set of tasks that are inactive. These tasks will be presented in a separate
+ * history view.
+ */
+ public ArrayList<Task> getHistoricalTasks() {
+ return mHistoryTaskList.getTasks();
+ }
+
+ /**
+ * Computes a set of all the active and historical tasks ordered by their last active time.
+ */
+ public ArrayList<Task> computeAllTasksList() {
+ ArrayList<Task> tasks = new ArrayList<>();
+ tasks.addAll(mStackTaskList.getTasks());
+ tasks.addAll(mHistoryTaskList.getTasks());
+ Collections.sort(tasks, LAST_ACTIVE_TIME_COMPARATOR);
+ return tasks;
+ }
+
+ /**
+ * Returns the number of tasks in the active stack.
+ */
+ public int getStackTaskCount() {
+ return mStackTaskList.size();
+ }
+
+ /**
+ * Returns the task in stack tasks which is the launch target.
*/
public Task getLaunchTarget() {
- ArrayList<Task> tasks = mTaskList.getTasks();
+ ArrayList<Task> tasks = mStackTaskList.getTasks();
int taskCount = tasks.size();
for (int i = 0; i < taskCount; i++) {
Task task = tasks.get(i);
@@ -454,16 +478,14 @@
}
/** Returns the index of this task in this current task stack */
- public int indexOfTask(Task t) {
- return mTaskList.indexOf(t);
+ public int indexOfStackTask(Task t) {
+ return mStackTaskList.indexOf(t);
}
/** Finds the task with the specified task id. */
public Task findTaskWithId(int taskId) {
- ArrayList<Task> tasks = mTaskList.getTasks();
- int taskCount = tasks.size();
- for (int i = 0; i < taskCount; i++) {
- Task task = tasks.get(i);
+ ArrayList<Task> tasks = computeAllTasksList();
+ for (Task task : tasks) {
if (task.key.id == taskId) {
return task;
}
@@ -471,56 +493,6 @@
return null;
}
- /**
- * Returns whether this stack has freeform tasks.
- */
- public boolean hasFreeformTasks() {
- ArrayList<Task> tasks = mTaskList.getTasks();
- int taskCount = tasks.size();
- for (int i = 0; i < taskCount; i++) {
- Task task = tasks.get(i);
- if (task.isFreeformTask()) {
- return true;
- }
- }
- return false;
- }
-
- /******** Filtering ********/
-
- /** Filters the stack into tasks similar to the one specified */
- public void filterTasks(final Task t) {
- ArrayList<Task> oldStack = new ArrayList<Task>(mTaskList.getTasks());
-
- // Set the task list filter
- boolean filtered = mTaskList.setFilter(new TaskFilter() {
- @Override
- public boolean acceptTask(Task at, int i) {
- return t.key.getComponent().getPackageName().equals(
- at.key.getComponent().getPackageName());
- }
- });
- if (filtered && mCb != null) {
- mCb.onStackFiltered(this, oldStack, t);
- }
- }
-
- /** Unfilters the current stack */
- public void unfilterTasks() {
- ArrayList<Task> oldStack = new ArrayList<Task>(mTaskList.getTasks());
-
- // Unset the filter, then update the virtual scroll
- mTaskList.removeFilter();
- if (mCb != null) {
- mCb.onStackUnfiltered(this, oldStack);
- }
- }
-
- /** Returns whether tasks are currently filtered */
- public boolean hasFilteredTasks() {
- return mTaskList.hasFilter();
- }
-
/******** Grouping ********/
/** Adds a group to the set */
@@ -543,10 +515,10 @@
* Temporary: This method will simulate affiliation groups by
*/
public void createAffiliatedGroupings(Context context) {
- if (Constants.DebugFlags.App.EnableSimulatedTaskGroups) {
+ if (RecentsDebugFlags.Static.EnableSimulatedTaskGroups) {
HashMap<Task.TaskKey, Task> taskMap = new HashMap<Task.TaskKey, Task>();
// Sort all tasks by increasing firstActiveTime of the task
- ArrayList<Task> tasks = mTaskList.getTasks();
+ ArrayList<Task> tasks = mStackTaskList.getTasks();
Collections.sort(tasks, new Comparator<Task>() {
@Override
public int compare(Task task, Task task2) {
@@ -559,7 +531,7 @@
String prevPackage = "";
int prevAffiliation = -1;
Random r = new Random();
- int groupCountDown = Constants.DebugFlags.App.TaskAffiliationsGroupCount;
+ int groupCountDown = RecentsDebugFlags.Static.TaskAffiliationsGroupCount;
for (int i = 0; i < taskCount; i++) {
Task t = tasks.get(i);
String packageName = t.key.getComponent().getPackageName();
@@ -574,7 +546,7 @@
addGroup(group);
prevAffiliation = affiliation;
prevPackage = packageName;
- groupCountDown = Constants.DebugFlags.App.TaskAffiliationsGroupCount;
+ groupCountDown = RecentsDebugFlags.Static.TaskAffiliationsGroupCount;
}
group.addTask(t);
taskMap.put(t.key, t);
@@ -606,11 +578,11 @@
taskIndex++;
}
}
- mTaskList.set(tasks);
+ mStackTaskList.set(tasks);
} else {
// Create the task groups
HashMap<Task.TaskKey, Task> tasksMap = new HashMap<Task.TaskKey, Task>();
- ArrayList<Task> tasks = mTaskList.getTasks();
+ ArrayList<Task> tasks = mStackTaskList.getTasks();
int taskCount = tasks.size();
for (int i = 0; i < taskCount; i++) {
Task t = tasks.get(i);
@@ -682,8 +654,12 @@
@Override
public String toString() {
- String str = "Tasks:\n";
- for (Task t : mTaskList.getTasks()) {
+ String str = "Stack Tasks:\n";
+ for (Task t : mStackTaskList.getTasks()) {
+ str += " " + t.toString() + "\n";
+ }
+ str += "Historical Tasks:\n";
+ for (Task t : mHistoryTaskList.getTasks()) {
str += " " + t.toString() + "\n";
}
return str;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/AnimateableViewBounds.java b/packages/SystemUI/src/com/android/systemui/recents/views/AnimateableViewBounds.java
index 70370ec..271a2a0 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/AnimateableViewBounds.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/AnimateableViewBounds.java
@@ -18,25 +18,59 @@
import android.graphics.Outline;
import android.graphics.Rect;
+import android.util.IntProperty;
+import android.util.Property;
import android.view.View;
import android.view.ViewOutlineProvider;
-import com.android.systemui.recents.Recents;
-import com.android.systemui.recents.RecentsConfiguration;
/* An outline provider that has a clip and outline that can be animated. */
public class AnimateableViewBounds extends ViewOutlineProvider {
- TaskView mSourceView;
+ View mSourceView;
Rect mClipRect = new Rect();
Rect mClipBounds = new Rect();
int mCornerRadius;
float mAlpha = 1f;
final float mMinAlpha = 0.25f;
- public AnimateableViewBounds(TaskView source, int cornerRadius) {
+ public static final Property<AnimateableViewBounds, Integer> CLIP_BOTTOM =
+ new IntProperty<AnimateableViewBounds>("clipBottom") {
+ @Override
+ public void setValue(AnimateableViewBounds object, int clip) {
+ object.setClipBottom(clip, false /* force */);
+ }
+
+ @Override
+ public Integer get(AnimateableViewBounds object) {
+ return object.getClipBottom();
+ }
+ };
+
+ public static final Property<AnimateableViewBounds, Integer> CLIP_RIGHT =
+ new IntProperty<AnimateableViewBounds>("clipRight") {
+ @Override
+ public void setValue(AnimateableViewBounds object, int clip) {
+ object.setClipRight(clip, false /* force */);
+ }
+
+ @Override
+ public Integer get(AnimateableViewBounds object) {
+ return object.getClipRight();
+ }
+ };
+
+ public AnimateableViewBounds(View source, int cornerRadius) {
mSourceView = source;
mCornerRadius = cornerRadius;
- setClipBottom(getClipBottom(), false /* force */);
+ }
+
+ /**
+ * Resets the right and bottom clip for this view.
+ */
+ public void reset() {
+ mClipRect.setEmpty();
+ mSourceView.invalidateOutline();
+ updateClipBounds();
}
@Override
@@ -62,12 +96,6 @@
mClipRect.bottom = bottom;
mSourceView.invalidateOutline();
updateClipBounds();
-
- RecentsConfiguration config = Recents.getConfiguration();
- if (!config.useHardwareLayers) {
- mSourceView.mThumbnailView.updateThumbnailVisibility(
- bottom - mSourceView.getPaddingBottom());
- }
}
}
@@ -76,6 +104,20 @@
return mClipRect.bottom;
}
+ /** Sets the right clip. */
+ public void setClipRight(int right, boolean force) {
+ if (right != mClipRect.right || force) {
+ mClipRect.right = right;
+ mSourceView.invalidateOutline();
+ updateClipBounds();
+ }
+ }
+
+ /** Returns the right clip. */
+ public int getClipRight() {
+ return mClipRect.right;
+ }
+
private void updateClipBounds() {
mClipBounds.set(mClipRect.left, mClipRect.top,
mSourceView.getWidth() - mClipRect.right,
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/DragView.java b/packages/SystemUI/src/com/android/systemui/recents/views/DragView.java
deleted file mode 100644
index 96dfaac..0000000
--- a/packages/SystemUI/src/com/android/systemui/recents/views/DragView.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014 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.systemui.recents.views;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Point;
-import android.widget.ImageView;
-
-public class DragView extends ImageView {
-
- // The offset from the top-left of the dragBitmap
- Point mTopLeftOffset;
-
- public DragView(Context context, Bitmap dragBitmap, Point tlOffset) {
- super(context);
-
- mTopLeftOffset = tlOffset;
- setImageBitmap(dragBitmap);
- }
-
- public Point getTopLeftOffset() {
- return mTopLeftOffset;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java
index 765f686..a70b66d 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/FreeformWorkspaceLayoutAlgorithm.java
@@ -16,6 +16,7 @@
package com.android.systemui.recents.views;
+import android.graphics.Rect;
import android.util.Log;
import com.android.systemui.recents.misc.Utilities;
import com.android.systemui.recents.model.Task;
@@ -52,8 +53,8 @@
int numFreeformTasks = stackLayout.mNumFreeformTasks;
if (!freeformTasks.isEmpty()) {
// Calculate the cell width/height depending on the number of freeform tasks
- mFreeformCellXCount = Math.max(2, (int) Math.ceil(Math.sqrt(numFreeformTasks)));
- mFreeformCellYCount = Math.max(2, (int) Math.ceil((float) numFreeformTasks /
+ mFreeformCellXCount = Math.max(1, (int) Math.ceil(Math.sqrt(numFreeformTasks)));
+ mFreeformCellYCount = Math.max(1, (int) Math.ceil((float) numFreeformTasks /
mFreeformCellXCount));
// For now, make the cells square
mFreeformCellWidth = Math.min(stackLayout.mFreeformRect.width() / mFreeformCellXCount,
@@ -94,15 +95,21 @@
public TaskViewTransform getTransform(Task task, TaskViewTransform transformOut,
TaskStackLayoutAlgorithm stackLayout) {
if (mTaskIndexMap.containsKey(task.key)) {
- // This is a freeform task, so lay it out in the freeform workspace
+ Rect taskRect = stackLayout.mTaskRect;
int taskIndex = mTaskIndexMap.get(task.key);
- int topOffset = (stackLayout.mFreeformRect.top - stackLayout.mTaskRect.top);
+ int topOffset = (stackLayout.mFreeformRect.top - taskRect.top);
int x = taskIndex % mFreeformCellXCount;
int y = taskIndex / mFreeformCellXCount;
- float scale = (float) mFreeformCellWidth / stackLayout.mTaskRect.width();
- int scaleXOffset = (int) (((1f - scale) * stackLayout.mTaskRect.width()) / 2);
- int scaleYOffset = (int) (((1f - scale) * stackLayout.mTaskRect.height()) / 2);
- transformOut.scale = scale * 0.9f;
+
+ int bitmapWidth = task.thumbnail.getWidth();
+ int bitmapHeight = task.thumbnail.getHeight();
+ float thumbnailScale = Math.min((float) mFreeformCellWidth / bitmapWidth,
+ (float) mFreeformCellHeight / bitmapHeight);
+ float thumbnailWidth = bitmapWidth * thumbnailScale;
+ float thumbnailHeight = bitmapHeight * thumbnailScale;
+ int scaleXOffset = (int) (((1f - thumbnailScale) * thumbnailWidth) / 2);
+ int scaleYOffset = (int) (((1f - thumbnailScale) * thumbnailHeight) / 2);
+ transformOut.scale = thumbnailScale * 0.9f;
transformOut.translationX = x * mFreeformCellWidth - scaleXOffset;
transformOut.translationY = topOffset + y * mFreeformCellHeight - scaleYOffset;
transformOut.translationZ = stackLayout.mMaxTranslationZ;
@@ -110,12 +117,11 @@
transformOut.rect.offset(transformOut.translationX, transformOut.translationY);
Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale);
transformOut.visible = true;
- transformOut.p = 0;
+ transformOut.p = 1f;
if (DEBUG) {
Log.d(TAG, "getTransform: " + task.key + ", " + transformOut);
}
-
return transformOut;
}
return null;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
index 85b8fcf..736020f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java
@@ -17,6 +17,7 @@
package com.android.systemui.recents.views;
import android.annotation.Nullable;
+import android.app.ActivityManager.StackId;
import android.app.ActivityOptions;
import android.content.Context;
import android.graphics.Bitmap;
@@ -27,13 +28,13 @@
import android.os.IRemoteCallback;
import android.os.RemoteException;
import android.util.Log;
-import android.util.SparseArray;
import android.view.AppTransitionAnimationSpec;
import android.view.IAppTransitionAnimationSpecsFuture;
import android.view.WindowManagerGlobal;
import com.android.internal.annotations.GuardedBy;
-import com.android.systemui.recents.Constants;
+import com.android.systemui.recents.ExitRecentsWindowFirstAnimationFrameEvent;
import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent;
import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent;
@@ -92,7 +93,7 @@
final boolean lockToTask, final Rect bounds, int destinationStack) {
final ActivityOptions opts = ActivityOptions.makeBasic();
if (bounds != null) {
- opts.setBounds(bounds.isEmpty() ? null : bounds);
+ opts.setLaunchBounds(bounds.isEmpty() ? null : bounds);
}
final ActivityOptions.OnAnimationStartedListener animStartedListener;
@@ -106,6 +107,7 @@
// If we are launching into another task, cancel the previous task's
// window transition
EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task));
+ EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent());
if (lockToTask) {
// Request screen pinning after the animation runs
@@ -116,7 +118,12 @@
} else {
// This is only the case if the task is not on screen (scrolled offscreen for example)
transitionFuture = null;
- animStartedListener = null;
+ animStartedListener = new ActivityOptions.OnAnimationStartedListener() {
+ @Override
+ public void onAnimationStarted() {
+ EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent());
+ }
+ };
}
if (taskView == null) {
@@ -153,9 +160,9 @@
if (ssp.startActivityFromRecents(mContext, task.key.id, task.activityLabel, opts)) {
// Keep track of the index of the task launch
int taskIndexFromFront = 0;
- int taskIndex = stack.indexOfTask(task);
+ int taskIndex = stack.indexOfStackTask(task);
if (taskIndex > -1) {
- taskIndexFromFront = stack.getTaskCount() - taskIndex - 1;
+ taskIndexFromFront = stack.getStackTaskCount() - taskIndex - 1;
}
EventBus.getDefault().send(new LaunchTaskSucceededEvent(taskIndexFromFront));
} else {
@@ -183,6 +190,9 @@
};
}
try {
+ synchronized (this) {
+ mAppTransitionAnimationSpecs = SPECS_WAITING;
+ }
WindowManagerGlobal.getWindowManagerService()
.overridePendingAppTransitionMultiThumbFuture(transitionFuture,
callback, true /* scaleUp */);
@@ -237,8 +247,7 @@
// Ensure we have a valid target stack id
final int targetStackId = destinationStack != INVALID_STACK_ID ?
destinationStack : task.key.stackId;
- if (targetStackId != FREEFORM_WORKSPACE_STACK_ID
- && targetStackId != FULLSCREEN_WORKSPACE_STACK_ID) {
+ if (!StackId.useAnimationSpecForAppTransition(targetStackId)) {
return null;
}
@@ -266,7 +275,7 @@
// Otherwise, for freeform tasks, create a new animation spec for each task we have to
// launch
TaskStack stack = stackView.getStack();
- ArrayList<Task> tasks = stack.getTasks();
+ ArrayList<Task> tasks = stack.getStackTasks();
int taskCount = tasks.size();
for (int i = taskCount - 1; i >= 0; i--) {
Task t = tasks.get(i);
@@ -313,7 +322,7 @@
b = Bitmap.createBitmap(fromHeaderWidth, fromHeaderHeight,
Bitmap.Config.ARGB_8888);
- if (Constants.DebugFlags.App.EnableTransitionThumbnailDebugMode) {
+ if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) {
b.eraseColor(0xFFff0000);
} else {
Canvas c = new Canvas(b);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index e37b7dc..551f067 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -17,13 +17,13 @@
package com.android.systemui.recents.views;
import android.content.Context;
+import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.util.ArraySet;
import android.util.AttributeSet;
-import android.view.AppTransitionAnimationSpec;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -31,16 +31,24 @@
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.FrameLayout;
-import com.android.internal.annotations.GuardedBy;
-import com.android.internal.logging.MetricsLogger;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
+import com.android.systemui.recents.RecentsActivityLaunchState;
import com.android.systemui.recents.RecentsAppWidgetHostView;
import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent;
+import com.android.systemui.recents.events.activity.DebugFlagsChangedEvent;
import com.android.systemui.recents.events.activity.DismissRecentsToHomeAnimationStarted;
+import com.android.systemui.recents.events.activity.HideHistoryButtonEvent;
+import com.android.systemui.recents.events.activity.HideHistoryEvent;
+import com.android.systemui.recents.events.activity.ShowHistoryButtonEvent;
+import com.android.systemui.recents.events.activity.ShowHistoryEvent;
+import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
+import com.android.systemui.recents.events.ui.DraggingInRecentsEndedEvent;
+import com.android.systemui.recents.events.ui.DraggingInRecentsEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragDropTargetChangedEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent;
@@ -62,24 +70,17 @@
private static final String TAG = "RecentsView";
private static final boolean DEBUG = false;
- private int mStackViewVisibility = View.VISIBLE;
-
- /** The RecentsView callbacks */
- public interface RecentsViewCallbacks {
- public void onAllTaskViewsDismissed();
- }
-
- LayoutInflater mInflater;
Handler mHandler;
- ArrayList<TaskStack> mStacks;
+ TaskStack mStack;
TaskStackView mTaskStackView;
RecentsAppWidgetHostView mSearchBar;
- RecentsViewCallbacks mCb;
+ View mHistoryButton;
+ boolean mAwaitingFirstLayout = true;
+ boolean mLastTaskLaunchedWasFreeform;
RecentsTransitionHelper mTransitionHelper;
RecentsViewTouchHandler mTouchHandler;
- DragView mDragView;
TaskStack.DockState[] mVisibleDockStates = {
TaskStack.DockState.LEFT,
TaskStack.DockState.TOP,
@@ -87,7 +88,9 @@
TaskStack.DockState.BOTTOM,
};
- Interpolator mFastOutSlowInInterpolator;
+ private Interpolator mFastOutSlowInInterpolator;
+ private Interpolator mFastOutLinearInInterpolator;
+ private int mHistoryTransitionDuration;
Rect mSystemInsets = new Rect();
@@ -105,23 +108,31 @@
public RecentsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
+ Resources res = context.getResources();
setWillNotDraw(false);
- mInflater = LayoutInflater.from(context);
mHandler = new Handler();
mTransitionHelper = new RecentsTransitionHelper(getContext(), mHandler);
mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
com.android.internal.R.interpolator.fast_out_slow_in);
+ mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
+ com.android.internal.R.interpolator.fast_out_linear_in);
+ mHistoryTransitionDuration = res.getInteger(R.integer.recents_history_transition_duration);
mTouchHandler = new RecentsViewTouchHandler(this);
- }
- /** Sets the callbacks */
- public void setCallbacks(RecentsViewCallbacks cb) {
- mCb = cb;
+ LayoutInflater inflater = LayoutInflater.from(context);
+ mHistoryButton = inflater.inflate(R.layout.recents_history_button, this, false);
+ mHistoryButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ EventBus.getDefault().send(new ShowHistoryEvent());
+ }
+ });
}
/** Set/get the bsp root node */
public void setTaskStack(TaskStack stack) {
RecentsConfiguration config = Recents.getConfiguration();
+ mStack = stack;
if (config.getLaunchState().launchedReuseTaskStackViews) {
if (mTaskStackView != null) {
// If onRecentsHidden is not triggered, we need to the stack view again here
@@ -140,19 +151,37 @@
mTaskStackView.setCallbacks(this);
addView(mTaskStackView);
}
- mTaskStackView.setVisibility(mStackViewVisibility);
+ if (indexOfChild(mHistoryButton) == -1) {
+ addView(mHistoryButton);
+ } else {
+ mHistoryButton.bringToFront();
+ }
// Trigger a new layout
requestLayout();
}
+ /**
+ * Returns whether the last task launched was in the freeform stack or not.
+ */
+ public boolean isLastTaskLaunchedFreeform() {
+ return mLastTaskLaunchedWasFreeform;
+ }
+
+ /**
+ * Returns the currently set task stack.
+ */
+ public TaskStack getTaskStack() {
+ return mStack;
+ }
+
/** Gets the next task in the stack - or if the last - the top task */
public Task getNextTaskOrTopTask(Task taskToSearch) {
Task returnTask = null;
boolean found = false;
if (mTaskStackView != null) {
TaskStack stack = mTaskStackView.getStack();
- ArrayList<Task> taskList = stack.getTasks();
+ ArrayList<Task> taskList = stack.getStackTasks();
// Iterate the stack views and try and find the focused task
for (int j = taskList.size() - 1; j >= 0; --j) {
Task task = taskList.get(j);
@@ -224,10 +253,15 @@
}
ctx.postAnimationTrigger.decrement();
+ // Hide the history button
+ int taskViewExitToHomeDuration = getResources().getInteger(
+ R.integer.recents_task_exit_to_home_duration);
+ hideHistoryButton(taskViewExitToHomeDuration);
+
// If we are going home, cancel the previous task's window transition
EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null));
- // Notify of the exit animation
+ // Notify sof the exit animation
EventBus.getDefault().send(new DismissRecentsToHomeAnimationStarted());
}
@@ -258,6 +292,13 @@
}
}
+ /**
+ * Returns the last known system insets.
+ */
+ public Rect getSystemInsets() {
+ return mSystemInsets;
+ }
+
@Override
protected void onAttachedToWindow() {
EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1);
@@ -299,13 +340,13 @@
mTaskStackView.measure(widthMeasureSpec, heightMeasureSpec);
}
- if (mDragView != null) {
- Rect taskRect = mTaskStackView.mLayoutAlgorithm.mTaskRect;
- mDragView.measure(
- MeasureSpec.makeMeasureSpec(taskRect.width(), MeasureSpec.AT_MOST),
- MeasureSpec.makeMeasureSpec(taskRect.height(), MeasureSpec.AT_MOST));
- }
-
+ // Measure the history button with the full space above the stack, but width-constrained
+ // to the stack
+ Rect historyButtonRect = mTaskStackView.mLayoutAlgorithm.mHistoryButtonRect;
+ measureChild(mHistoryButton,
+ MeasureSpec.makeMeasureSpec(historyButtonRect.width(), MeasureSpec.EXACTLY),
+ MeasureSpec.makeMeasureSpec(historyButtonRect.height(),
+ MeasureSpec.EXACTLY));
setMeasuredDimension(width, height);
}
@@ -330,9 +371,21 @@
mTaskStackView.layout(left, top, left + getMeasuredWidth(), top + getMeasuredHeight());
}
- if (mDragView != null) {
- mDragView.layout(left, top, left + mDragView.getMeasuredWidth(),
- top + mDragView.getMeasuredHeight());
+ // Layout the history button left-aligned with the stack, but offset from the top of the
+ // view
+ Rect historyButtonRect = mTaskStackView.mLayoutAlgorithm.mHistoryButtonRect;
+ mHistoryButton.layout(historyButtonRect.left, historyButtonRect.top,
+ historyButtonRect.right, historyButtonRect.bottom);
+
+ if (mAwaitingFirstLayout) {
+ mAwaitingFirstLayout = false;
+
+ // If launched via dragging from the nav bar, then we should translate the whole view
+ // down offscreen
+ RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
+ if (launchState.launchedViaDragGesture) {
+ setTranslationY(getMeasuredHeight());
+ }
}
}
@@ -340,7 +393,7 @@
public WindowInsets onApplyWindowInsets(WindowInsets insets) {
mSystemInsets.set(insets.getSystemWindowInsets());
requestLayout();
- return insets.consumeSystemWindowInsets();
+ return insets;
}
@Override
@@ -375,24 +428,6 @@
return super.verifyDrawable(who);
}
- /** Unfilters any filtered stacks */
- public boolean unfilterFilteredStacks() {
- if (mStacks != null) {
- // Check if there are any filtered stacks and unfilter them before we back out of Recents
- boolean stacksUnfiltered = false;
- int numStacks = mStacks.size();
- for (int i = 0; i < numStacks; i++) {
- TaskStack stack = mStacks.get(i);
- if (stack.hasFilteredTasks()) {
- stack.unfilterTasks();
- stacksUnfiltered = true;
- }
- }
- return stacksUnfiltered;
- }
- return false;
- }
-
public void disableLayersForOneFrame() {
if (mTaskStackView != null) {
mTaskStackView.disableLayersForOneFrame();
@@ -405,66 +440,14 @@
public void onTaskViewClicked(final TaskStackView stackView, final TaskView tv,
final TaskStack stack, final Task task, final boolean lockToTask,
final Rect bounds, int destinationStack) {
+ mLastTaskLaunchedWasFreeform = task.isFreeformTask();
mTransitionHelper.launchTaskFromRecents(stack, task, stackView, tv, lockToTask, bounds,
destinationStack);
}
- @Override
- public void onAllTaskViewsDismissed(ArrayList<Task> removedTasks) {
- /* TODO: Not currently enabled
- if (removedTasks != null) {
- int taskCount = removedTasks.size();
- for (int i = 0; i < taskCount; i++) {
- onTaskViewDismissed(removedTasks.get(i));
- }
- }
- */
-
- mCb.onAllTaskViewsDismissed();
-
- // Keep track of all-deletions
- MetricsLogger.count(getContext(), "overview_task_all_dismissed", 1);
- }
-
- @Override
- public void onTaskStackFilterTriggered() {
- // Hide the search bar
- if (mSearchBar != null) {
- int filterDuration = getResources().getInteger(
- R.integer.recents_filter_animate_current_views_duration);
- mSearchBar.animate()
- .alpha(0f)
- .setStartDelay(0)
- .setInterpolator(mFastOutSlowInInterpolator)
- .setDuration(filterDuration)
- .withLayer()
- .start();
- }
- }
-
- @Override
- public void onTaskStackUnfilterTriggered() {
- // Show the search bar
- if (mSearchBar != null) {
- int filterDuration = getResources().getInteger(
- R.integer.recents_filter_animate_new_views_duration);
- mSearchBar.animate()
- .alpha(1f)
- .setStartDelay(0)
- .setInterpolator(mFastOutSlowInInterpolator)
- .setDuration(filterDuration)
- .withLayer()
- .start();
- }
- }
-
/**** EventBus Events ****/
public final void onBusEvent(DragStartEvent event) {
- // Add the drag view
- mDragView = event.dragView;
- addView(mDragView);
-
updateVisibleDockRegions(mTouchHandler.getDockStatesForCurrentOrientation(),
TaskStack.DockState.NONE.viewState.dockAreaAlpha);
}
@@ -480,68 +463,110 @@
}
public final void onBusEvent(final DragEndEvent event) {
- final Runnable cleanUpRunnable = new Runnable() {
- @Override
- public void run() {
- // Remove the drag view
- removeView(mDragView);
- mDragView = null;
- }
- };
-
// Animate the overlay alpha back to 0
updateVisibleDockRegions(null, -1);
- if (event.dropTarget == null) {
- // No drop targets for hit, so just animate the task back to its place
- event.postAnimationTrigger.increment();
- event.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
- @Override
- public void run() {
- cleanUpRunnable.run();
- }
- });
- // Animate the task back to where it was before then clean up afterwards
- TaskViewTransform taskTransform = new TaskViewTransform();
- TaskStackLayoutAlgorithm layoutAlgorithm = mTaskStackView.getStackAlgorithm();
- layoutAlgorithm.getStackTransform(event.task,
- mTaskStackView.getScroller().getStackScroll(), taskTransform, null);
- event.dragView.animate()
- .scaleX(taskTransform.scale)
- .scaleY(taskTransform.scale)
- .translationX((layoutAlgorithm.mTaskRect.left - event.dragView.getLeft())
- + taskTransform.translationX)
- .translationY((layoutAlgorithm.mTaskRect.top - event.dragView.getTop())
- + taskTransform.translationY)
- .setDuration(175)
- .setInterpolator(mFastOutSlowInInterpolator)
- .withEndAction(event.postAnimationTrigger.decrementAsRunnable())
- .start();
-
- } else if (event.dropTarget instanceof TaskStack.DockState) {
+ // Handle the case where we drop onto a dock region
+ if (event.dropTarget instanceof TaskStack.DockState) {
final TaskStack.DockState dockState = (TaskStack.DockState) event.dropTarget;
- // For now, just remove the drag view and the original task
- // TODO: Animate the task to the drop target rect before launching it above
- cleanUpRunnable.run();
+ // Remove the task after it is docked
+ if (event.taskView.isFocusedTask()) {
+ mTaskStackView.resetFocusedTask();
+ }
+ event.taskView.animate()
+ .alpha(0f)
+ .setDuration(150)
+ .setInterpolator(mFastOutLinearInInterpolator)
+ .setUpdateListener(null)
+ .setListener(null)
+ .withEndAction(new Runnable() {
+ @Override
+ public void run() {
+ mTaskStackView.getStack().removeTask(event.task);
+ }
+ })
+ .withLayer()
+ .start();
// Dock the task and launch it
SystemServicesProxy ssp = Recents.getSystemServices();
ssp.startTaskInDockedMode(event.task.key.id, dockState.createMode);
launchTask(event.task, null, INVALID_STACK_ID);
-
- } else {
- // We dropped on another drop target, so just add the cleanup to the post animation
- // trigger
- event.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
- @Override
- public void run() {
- cleanUpRunnable.run();
- }
- });
}
}
+ public final void onBusEvent(DraggingInRecentsEvent event) {
+ if (mTaskStackView.getTaskViews().size() > 0) {
+ setTranslationY(event.distanceFromTop - mTaskStackView.getTaskViews().get(0).getY());
+ }
+ }
+
+ public final void onBusEvent(DraggingInRecentsEndedEvent event) {
+ animate().translationY(0f);
+ }
+
+ public final void onBusEvent(ShowHistoryEvent event) {
+ // Hide the history button when the history view is shown
+ hideHistoryButton(mHistoryTransitionDuration);
+ }
+
+ public final void onBusEvent(HideHistoryEvent event) {
+ // Show the history button when the history view is hidden
+ showHistoryButton(mHistoryTransitionDuration);
+ }
+
+ public final void onBusEvent(ShowHistoryButtonEvent event) {
+ showHistoryButton(150);
+ }
+
+ public final void onBusEvent(HideHistoryButtonEvent event) {
+ hideHistoryButton(100);
+ }
+
+ public final void onBusEvent(DebugFlagsChangedEvent event) {
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
+ if (!debugFlags.isHistoryEnabled()) {
+ hideHistoryButton(100);
+ }
+ }
+
+ /**
+ * Shows the history button.
+ */
+ private void showHistoryButton(int duration) {
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
+ if (!debugFlags.isHistoryEnabled()) {
+ return;
+ }
+
+ mHistoryButton.setVisibility(View.VISIBLE);
+ mHistoryButton.animate()
+ .alpha(1f)
+ .setDuration(duration)
+ .setInterpolator(mFastOutSlowInInterpolator)
+ .withLayer()
+ .start();
+ }
+
+ /**
+ * Hides the history button.
+ */
+ private void hideHistoryButton(int duration) {
+ mHistoryButton.animate()
+ .alpha(0f)
+ .setDuration(duration)
+ .setInterpolator(mFastOutLinearInInterpolator)
+ .withEndAction(new Runnable() {
+ @Override
+ public void run() {
+ mHistoryButton.setVisibility(View.INVISIBLE);
+ }
+ })
+ .withLayer()
+ .start();
+ }
+
/**
* Updates the dock region to match the specified dock state.
*/
@@ -568,11 +593,11 @@
}
}
- public void setStackViewVisibility(int stackViewVisibility) {
- mStackViewVisibility = stackViewVisibility;
- if (mTaskStackView != null) {
- mTaskStackView.setVisibility(stackViewVisibility);
- invalidate();
+ public final void onBusEvent(RecentsVisibilityChangedEvent event) {
+ if (!event.visible) {
+ // Reset the view state
+ mAwaitingFirstLayout = true;
+ mLastTaskLaunchedWasFreeform = false;
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
index c7edc92..2920295 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
@@ -27,6 +27,7 @@
import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragStartInitializeDropTargetsEvent;
import com.android.systemui.recents.misc.ReferenceCountedTrigger;
+import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.model.Task;
import com.android.systemui.recents.model.TaskStack;
@@ -64,8 +65,8 @@
private Task mDragTask;
private TaskView mTaskView;
- private DragView mDragView;
+ private Point mTaskViewOffset = new Point();
private Point mDownPos = new Point();
private boolean mDragging;
@@ -111,20 +112,24 @@
/**** Events ****/
public final void onBusEvent(DragStartEvent event) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
mRv.getParent().requestDisallowInterceptTouchEvent(true);
mDragging = true;
mDragTask = event.task;
mTaskView = event.taskView;
- mDragView = event.dragView;
mDropTargets.clear();
- float x = mDownPos.x - mDragView.getTopLeftOffset().x;
- float y = mDownPos.y - mDragView.getTopLeftOffset().y;
- mDragView.setTranslationX(x);
- mDragView.setTranslationY(y);
+ int[] recentsViewLocation = new int[2];
+ mRv.getLocationInWindow(recentsViewLocation);
+ mTaskViewOffset.set(mTaskView.getLeft() - recentsViewLocation[0] + event.tlOffset.x,
+ mTaskView.getTop() - recentsViewLocation[1] + event.tlOffset.y);
+ float x = mDownPos.x - mTaskViewOffset.x;
+ float y = mDownPos.y - mTaskViewOffset.y;
+ mTaskView.setTranslationX(x);
+ mTaskView.setTranslationY(y);
RecentsConfiguration config = Recents.getConfiguration();
- if (!config.hasDockedTasks) {
+ if (!ssp.hasDockedTask()) {
// Add the dock state drop targets (these take priority)
TaskStack.DockState[] dockStates = getDockStatesForCurrentOrientation();
for (TaskStack.DockState dockState : dockStates) {
@@ -140,7 +145,6 @@
mDragging = false;
mDragTask = null;
mTaskView = null;
- mDragView = null;
mLastDropTarget = null;
}
@@ -160,8 +164,8 @@
int height = mRv.getMeasuredHeight();
float evX = ev.getX();
float evY = ev.getY();
- float x = evX - mDragView.getTopLeftOffset().x;
- float y = evY - mDragView.getTopLeftOffset().y;
+ float x = evX - mTaskViewOffset.x;
+ float y = evY - mTaskViewOffset.y;
DropTarget currentDropTarget = null;
for (DropTarget target : mDropTargets) {
@@ -176,8 +180,8 @@
currentDropTarget));
}
- mDragView.setTranslationX(x);
- mDragView.setTranslationY(y);
+ mTaskView.setTranslationX(x);
+ mTaskView.setTranslationY(y);
}
break;
}
@@ -187,7 +191,7 @@
ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(
mRv.getContext(), null, null, null);
postAnimationTrigger.increment();
- EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView, mDragView,
+ EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView,
mLastDropTarget, postAnimationTrigger));
postAnimationTrigger.decrement();
break;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
index 51091c3..6af2ada 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
@@ -16,14 +16,22 @@
package com.android.systemui.recents.views;
+import android.animation.ObjectAnimator;
import android.content.Context;
import android.content.res.Resources;
+import android.graphics.Path;
import android.graphics.Rect;
+import android.util.FloatProperty;
import android.util.Log;
+import android.util.Property;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
import com.android.systemui.R;
import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.RecentsActivityLaunchState;
import com.android.systemui.recents.RecentsConfiguration;
-import com.android.systemui.recents.misc.ParametricCurve;
+import com.android.systemui.recents.RecentsDebugFlags;
+import com.android.systemui.recents.misc.FreePathInterpolator;
import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.misc.Utilities;
import com.android.systemui.recents.model.Task;
@@ -32,21 +40,96 @@
import java.util.ArrayList;
import java.util.HashMap;
+/**
+ * Used to describe a visible range that can be normalized to [0, 1].
+ */
+class Range {
+ final float relativeMin;
+ final float relativeMax;
+ float origin;
+ float min;
+ float max;
+
+ public Range(float relMin, float relMax) {
+ min = relativeMin = relMin;
+ max = relativeMax = relMax;
+ }
+
+ /**
+ * Offsets this range to a given absolute position.
+ */
+ public void offset(float x) {
+ this.origin = x;
+ min = x + relativeMin;
+ max = x + relativeMax;
+ }
+
+ /**
+ * Returns x normalized to the range 0 to 1 such that 0 = min, 0.5 = origin and 1 = max
+ *
+ * @param x is an absolute value in the same domain as origin
+ */
+ public float getNormalizedX(float x) {
+ if (x < origin) {
+ return 0.5f + 0.5f * (x - origin) / -relativeMin;
+ } else {
+ return 0.5f + 0.5f * (x - origin) / relativeMax;
+ }
+ }
+
+ /**
+ * Given a normalized {@param x} value in this range, projected onto the full range to get an
+ * absolute value about the given {@param origin}.
+ */
+ public float getAbsoluteX(float normX) {
+ if (normX < 0.5f) {
+ return (normX - 0.5f) / 0.5f * -relativeMin;
+ } else {
+ return (normX - 0.5f) / 0.5f * relativeMax;
+ }
+ }
+
+ /**
+ * Returns whether a value at an absolute x would be within range.
+ */
+ public boolean isInRange(float absX) {
+ return (absX >= Math.floor(min)) && (absX <= Math.ceil(max));
+ }
+}
/**
- * The layout logic for a TaskStackView.
+ * The layout logic for a TaskStackView. This layout can have two states focused and unfocused,
+ * and in the focused state, there is a task that is displayed more prominently in the stack.
*/
public class TaskStackLayoutAlgorithm {
private static final String TAG = "TaskStackViewLayoutAlgorithm";
private static final boolean DEBUG = false;
- // The min scale of the last task at the top of the curve
- private static final float STACK_PEEK_MIN_SCALE = 0.85f;
- // The scale of the last task
- private static final float SINGLE_TASK_SCALE = 0.95f;
- // The percentage of height of task to show between tasks
- private static final float VISIBLE_TASK_HEIGHT_BETWEEN_TASKS = 0.5f;
+ // The scale factor to apply to the user movement in the stack to unfocus it
+ private static final float UNFOCUS_MULTIPLIER = 0.8f;
+
+ // The various focus states
+ public static final float STATE_FOCUSED = 1f;
+ public static final float STATE_UNFOCUSED = 0f;
+
+ /**
+ * A Property wrapper around the <code>focusState</code> functionality handled by the
+ * {@link TaskStackLayoutAlgorithm#setFocusState(float)} and
+ * {@link TaskStackLayoutAlgorithm#getFocusState()} methods.
+ */
+ private static final Property<TaskStackLayoutAlgorithm, Float> FOCUS_STATE =
+ new FloatProperty<TaskStackLayoutAlgorithm>("focusState") {
+ @Override
+ public void setValue(TaskStackLayoutAlgorithm object, float value) {
+ object.setFocusState(value);
+ }
+
+ @Override
+ public Float get(TaskStackLayoutAlgorithm object) {
+ return object.getFocusState();
+ }
+ };
// A report of the visibility state of the stack
public class VisibilityReport {
@@ -61,6 +144,8 @@
}
Context mContext;
+ private TaskStackView mStackView;
+ private Interpolator mFastOutSlowInInterpolator;
// The task bounds (untransformed) for layout. This rect is anchored at mTaskRoot.
public Rect mTaskRect = new Rect();
@@ -74,9 +159,39 @@
private Rect mStackRect = new Rect();
// The current stack rect, can either by mFreeformStackRect or mStackRect depending on whether
// there is a freeform workspace
- public Rect mCurrentStackRect;
+ public Rect mCurrentStackRect = new Rect();
// This is the current system insets
public Rect mSystemInsets = new Rect();
+ // This is the bounds of the history button above the stack rect
+ public Rect mHistoryButtonRect = new Rect();
+
+ // The visible ranges when the stack is focused and unfocused
+ private Range mUnfocusedRange;
+ private Range mFocusedRange;
+
+ // The offset from the top when scrolled to the top of the stack
+ private int mFocusedPeekHeight;
+
+ // The offset from the top of the stack to the top of the bounds when the stack is scrolled to
+ // the end
+ private int mStackTopOffset;
+
+ // The offset from the bottom of the stack to the bottom of the bounds when the stack is
+ // scrolled to the front
+ private int mStackBottomOffset;
+
+ // The paths defining the motion of the tasks when the stack is focused and unfocused
+ private Path mUnfocusedCurve;
+ private Path mFocusedCurve;
+ private FreePathInterpolator mUnfocusedCurveInterpolator;
+ private FreePathInterpolator mFocusedCurveInterpolator;
+
+ // The state of the stack focus (0..1), which controls the transition of the stack from the
+ // focused to non-focused state
+ private float mFocusState;
+
+ // The animator used to reset the focused state
+ private ObjectAnimator mFocusStateAnimator;
// The smallest scroll progress, at this value, the back most task will be visible
float mMinScrollP;
@@ -88,78 +203,45 @@
// The task progress for the front-most task in the stack
float mFrontMostTaskP;
- // The relative progress to ensure that the height between affiliated tasks is respected
- float mWithinAffiliationPOffset;
- // The relative progress to ensure that the height between non-affiliated tasks is
- // respected
- float mBetweenAffiliationPOffset;
- // The relative progress to ensure that the task height is respected
- float mTaskHeightPOffset;
- // The relative progress to ensure that the half task height is respected
- float mTaskHalfHeightPOffset;
- // The front-most task bottom offset
- int mStackBottomOffset;
- // The relative progress to ensure that the offset from the bottom of the stack to the bottom
- // of the task is respected
- float mStackBottomPOffset;
-
// The last computed task counts
int mNumStackTasks;
int mNumFreeformTasks;
+
// The min/max z translations
int mMinTranslationZ;
int mMaxTranslationZ;
- // Optimization, allows for quick lookup of task -> progress
- HashMap<Task.TaskKey, Float> mTaskProgressMap = new HashMap<>();
+ // Optimization, allows for quick lookup of task -> index
+ private HashMap<Task.TaskKey, Integer> mTaskIndexMap = new HashMap<>();
// The freeform workspace layout
FreeformWorkspaceLayoutAlgorithm mFreeformLayoutAlgorithm;
- // Log function
- static ParametricCurve sCurve;
-
- public TaskStackLayoutAlgorithm(Context context) {
+ public TaskStackLayoutAlgorithm(Context context, TaskStackView stackView) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
Resources res = context.getResources();
+ mStackView = stackView;
+
+ mFocusedRange = new Range(res.getFloat(R.integer.recents_layout_focused_range_min),
+ res.getFloat(R.integer.recents_layout_focused_range_max));
+ mUnfocusedRange = new Range(res.getFloat(R.integer.recents_layout_unfocused_range_min),
+ res.getFloat(R.integer.recents_layout_unfocused_range_max));
+ mFocusState = getDefaultFocusState();
+ mFocusedPeekHeight = res.getDimensionPixelSize(R.dimen.recents_layout_focused_peek_size);
+
mMinTranslationZ = res.getDimensionPixelSize(R.dimen.recents_task_view_z_min);
mMaxTranslationZ = res.getDimensionPixelSize(R.dimen.recents_task_view_z_max);
mContext = context;
mFreeformLayoutAlgorithm = new FreeformWorkspaceLayoutAlgorithm();
- if (sCurve == null) {
- sCurve = new ParametricCurve(new ParametricCurve.CurveFunction() {
- // The large the XScale, the longer the flat area of the curve
- private static final float XScale = 1.75f;
- private static final float LogBase = 3000;
+ mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
+ com.android.internal.R.interpolator.fast_out_slow_in);
+ }
- float reverse(float x) {
- return (-x * XScale) + 1;
- }
-
- @Override
- public float f(float x) {
- return 1f - (float) (Math.pow(LogBase, reverse(x))) / (LogBase);
- }
-
- @Override
- public float invF(float y) {
- return (float) (Math.log(1f - reverse(y)) / (-Math.log(LogBase) * XScale));
- }
- }, new ParametricCurve.ParametricCurveFunction() {
- @Override
- public float f(float p) {
- SystemServicesProxy ssp = Recents.getSystemServices();
- if (ssp.hasFreeformWorkspaceSupport()) {
- return 1f;
- }
-
- if (p < 0) return STACK_PEEK_MIN_SCALE;
- if (p > 1) return 1f;
- float scaleRange = (1f - STACK_PEEK_MIN_SCALE);
- float scale = STACK_PEEK_MIN_SCALE + (p * scaleRange);
- return scale;
- }
- });
- }
+ /**
+ * Resets this layout when the stack view is reset.
+ */
+ public void reset() {
+ setFocusState(getDefaultFocusState());
}
/**
@@ -173,19 +255,36 @@
}
/**
+ * Sets the focused state.
+ */
+ public void setFocusState(float focusState) {
+ mFocusState = focusState;
+ mStackView.requestSynchronizeStackViewsWithModel();
+ }
+
+ /**
+ * Gets the focused state.
+ */
+ public float getFocusState() {
+ return mFocusState;
+ }
+
+ /**
* Computes the stack and task rects. The given task stack bounds is the whole bounds not
* including the search bar.
*/
public void initialize(Rect taskStackBounds) {
SystemServicesProxy ssp = Recents.getSystemServices();
-
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
RecentsConfiguration config = Recents.getConfiguration();
int widthPadding = (int) (config.taskStackWidthPaddingPct * taskStackBounds.width());
int heightPadding = mContext.getResources().getDimensionPixelSize(
R.dimen.recents_stack_top_padding);
+ Rect lastStackRect = new Rect(mCurrentStackRect);
// The freeform height is the visible height (not including system insets) - padding above
// freeform and below stack - gap between the freeform and stack
+ mStackTopOffset = mFocusedPeekHeight + heightPadding;
mStackBottomOffset = mSystemInsets.bottom + heightPadding;
int ffHeight = (taskStackBounds.height() - 2 * heightPadding - mStackBottomOffset) / 2;
mFreeformRect.set(taskStackBounds.left + widthPadding,
@@ -200,43 +299,40 @@
taskStackBounds.top + heightPadding,
taskStackBounds.right - widthPadding,
taskStackBounds.bottom);
- // Anchor the task rect to the top-center of the non-freeform stack rect
- int size = Math.min(mStackRect.width(), mStackRect.height() - mStackBottomOffset);
- mTaskRect.set(mStackRect.left, mStackRect.top,
- mStackRect.left + size, mStackRect.top + size);
mCurrentStackRect = ssp.hasFreeformWorkspaceSupport() ? mFreeformStackRect : mStackRect;
+ mHistoryButtonRect.set(mCurrentStackRect.left, mCurrentStackRect.top - heightPadding,
+ mCurrentStackRect.right, mCurrentStackRect.top + mFocusedPeekHeight);
- // Compute the progress offsets
- int withinAffiliationOffset = mContext.getResources().getDimensionPixelSize(
- R.dimen.recents_task_bar_height);
- int betweenAffiliationOffset = (int) (VISIBLE_TASK_HEIGHT_BETWEEN_TASKS * mTaskRect.height());
- mWithinAffiliationPOffset = sCurve.computePOffsetForScaledHeight(withinAffiliationOffset,
- mCurrentStackRect);
- mBetweenAffiliationPOffset = sCurve.computePOffsetForScaledHeight(betweenAffiliationOffset,
- mCurrentStackRect);
- mTaskHeightPOffset = sCurve.computePOffsetForScaledHeight(mTaskRect.height(),
- mCurrentStackRect);
- mTaskHalfHeightPOffset = sCurve.computePOffsetForScaledHeight(mTaskRect.height() / 2,
- mCurrentStackRect);
- mStackBottomPOffset = sCurve.computePOffsetForHeight(mStackBottomOffset, mCurrentStackRect);
+ // Anchor the task rect to the top-center of the non-freeform stack rect
+ float aspect = (float) (taskStackBounds.width() - mSystemInsets.left - mSystemInsets.right)
+ / (taskStackBounds.height() - mSystemInsets.bottom);
+ int width = mStackRect.width();
+ int minHeight = mCurrentStackRect.height() - mFocusedPeekHeight - mStackBottomOffset;
+ int height = debugFlags.isFullscreenThumbnailsEnabled()
+ ? (int) Math.min(width / aspect, minHeight)
+ : width;
+ mTaskRect.set(mStackRect.left, mStackRect.top,
+ mStackRect.left + width, mStackRect.top + height);
+
+ // Short circuit here if the stack rects haven't changed so we don't do all the work below
+ if (lastStackRect.equals(mCurrentStackRect)) {
+ return;
+ }
+
+ // Reinitialize the focused and unfocused curves
+ mUnfocusedCurve = constructUnfocusedCurve();
+ mUnfocusedCurveInterpolator = new FreePathInterpolator(mUnfocusedCurve);
+ mFocusedCurve = constructFocusedCurve();
+ mFocusedCurveInterpolator = new FreePathInterpolator(mFocusedCurve);
if (DEBUG) {
Log.d(TAG, "initialize");
- Log.d(TAG, "\tarclength: " + sCurve.getArcLength());
Log.d(TAG, "\tmFreeformRect: " + mFreeformRect);
Log.d(TAG, "\tmFreeformStackRect: " + mFreeformStackRect);
Log.d(TAG, "\tmStackRect: " + mStackRect);
+ Log.d(TAG, "\tmCurrentStackRect: " + mCurrentStackRect);
Log.d(TAG, "\tmTaskRect: " + mTaskRect);
Log.d(TAG, "\tmSystemInsets: " + mSystemInsets);
-
- Log.d(TAG, "\tpWithinAffiliateOffset: " + mWithinAffiliationPOffset);
- Log.d(TAG, "\tpBetweenAffiliateOffset: " + mBetweenAffiliationPOffset);
- Log.d(TAG, "\tmTaskHeightPOffset: " + mTaskHeightPOffset);
- Log.d(TAG, "\tmTaskHalfHeightPOffset: " + mTaskHalfHeightPOffset);
- Log.d(TAG, "\tmStackBottomPOffset: " + mStackBottomPOffset);
-
- Log.d(TAG, "\ty at p=0: " + sCurve.pToX(0f, mCurrentStackRect));
- Log.d(TAG, "\ty at p=1: " + sCurve.pToX(1f, mCurrentStackRect));
}
}
@@ -248,10 +344,10 @@
SystemServicesProxy ssp = Recents.getSystemServices();
// Clear the progress map
- mTaskProgressMap.clear();
+ mTaskIndexMap.clear();
// Return early if we have no tasks
- ArrayList<Task> tasks = stack.getTasks();
+ ArrayList<Task> tasks = stack.getStackTasks();
if (tasks.isEmpty()) {
mFrontMostTaskP = 0;
mMinScrollP = mMaxScrollP = 0;
@@ -273,41 +369,28 @@
mNumStackTasks = stackTasks.size();
mNumFreeformTasks = freeformTasks.size();
- float pAtBackMostTaskTop = 0;
- float pAtFrontMostTaskTop = pAtBackMostTaskTop;
- if (!stackTasks.isEmpty()) {
- // Update the for each task from back to front.
- int taskCount = stackTasks.size();
- for (int i = 0; i < taskCount; i++) {
- Task task = stackTasks.get(i);
- mTaskProgressMap.put(task.key, pAtFrontMostTaskTop);
+ // Put each of the tasks in the progress map at a fixed index (does not need to actually
+ // map to a scroll position, just by index)
+ int taskCount = stackTasks.size();
+ for (int i = 0; i < taskCount; i++) {
+ Task task = stackTasks.get(i);
+ mTaskIndexMap.put(task.key, i);
+ }
- if (DEBUG) {
- Log.d(TAG, "Update: " + task.activityLabel + " p: " + pAtFrontMostTaskTop);
- }
-
- if (i < (taskCount - 1)) {
- // Increment the peek height
- float pPeek = task.group == null || task.group.isFrontMostTask(task) ?
- mBetweenAffiliationPOffset : mWithinAffiliationPOffset;
- pAtFrontMostTaskTop += pPeek;
- }
- }
-
- mFrontMostTaskP = pAtFrontMostTaskTop;
- if (mNumStackTasks > 1) {
- // Set the stack end scroll progress to the point at which the bottom of the front-most
- // task is aligned to the bottom of the stack
- mMaxScrollP = alignToStackBottom(pAtFrontMostTaskTop,
- mStackBottomPOffset + (ssp.hasFreeformWorkspaceSupport() ?
- mTaskHalfHeightPOffset : mTaskHeightPOffset));
- // Basically align the back-most task such that the last two tasks would be visible
- mMinScrollP = alignToStackBottom(pAtBackMostTaskTop,
- mStackBottomPOffset + (ssp.hasFreeformWorkspaceSupport() ?
- mTaskHalfHeightPOffset : mTaskHeightPOffset));
- } else {
- // When there is a single item, then just make all the stack progresses the same
+ // Calculate the min/max scroll
+ if (getDefaultFocusState() > 0f) {
+ mMinScrollP = 0;
+ mMaxScrollP = Math.max(mMinScrollP, mNumStackTasks - 1);
+ } else {
+ if (!ssp.hasFreeformWorkspaceSupport() && mNumStackTasks == 1) {
mMinScrollP = mMaxScrollP = 0;
+ } else {
+ float bottomOffsetPct = (float) (mStackBottomOffset + mTaskRect.height()) /
+ mCurrentStackRect.height();
+ float normX = mUnfocusedCurveInterpolator.getX(bottomOffsetPct);
+ mMinScrollP = 0;
+ mMaxScrollP = Math.max(mMinScrollP,
+ (mNumStackTasks - 1) - Math.max(0, mUnfocusedRange.getAbsoluteX(normX)));
}
}
@@ -315,7 +398,20 @@
mFreeformLayoutAlgorithm.update(freeformTasks, this);
mInitialScrollP = mMaxScrollP;
} else {
- mInitialScrollP = Math.max(mMinScrollP, mMaxScrollP - mTaskHalfHeightPOffset);
+ if (!ssp.hasFreeformWorkspaceSupport() && mNumStackTasks == 1) {
+ mInitialScrollP = mMinScrollP;
+ } else if (getDefaultFocusState() > 0f) {
+ RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
+ if (launchState.launchedFromHome) {
+ mInitialScrollP = Math.max(mMinScrollP, mNumStackTasks - 1);
+ } else {
+ mInitialScrollP = Math.max(mMinScrollP, mNumStackTasks - 2);
+ }
+ } else {
+ float offsetPct = (float) (mTaskRect.height() / 2) / mCurrentStackRect.height();
+ float normX = mUnfocusedCurveInterpolator.getX(offsetPct);
+ mInitialScrollP = (mNumStackTasks - 1) - mUnfocusedRange.getAbsoluteX(normX);
+ }
}
if (DEBUG) {
@@ -327,8 +423,45 @@
}
/**
- * Computes the maximum number of visible tasks and thumbnails. Requires that
- * update() is called first.
+ * Updates this stack when a scroll happens.
+ */
+ public void updateFocusStateOnScroll(int yMovement) {
+ Utilities.cancelAnimationWithoutCallbacks(mFocusStateAnimator);
+ if (mFocusState > STATE_UNFOCUSED) {
+ float delta = (float) yMovement / (UNFOCUS_MULTIPLIER * mCurrentStackRect.height());
+ mFocusState -= Math.min(mFocusState, Math.abs(delta));
+ }
+ }
+
+ /**
+ * Aniamtes the focused state back to its orginal state.
+ */
+ public void animateFocusState(float newState) {
+ Utilities.cancelAnimationWithoutCallbacks(mFocusStateAnimator);
+ if (Float.compare(newState, getFocusState()) != 0) {
+ mFocusStateAnimator = ObjectAnimator.ofFloat(this, FOCUS_STATE, getFocusState(),
+ newState);
+ mFocusStateAnimator.setDuration(200);
+ mFocusStateAnimator.setInterpolator(mFastOutSlowInInterpolator);
+ mFocusStateAnimator.start();
+ }
+ }
+
+ /**
+ * Returns the default focus state.
+ */
+ public float getDefaultFocusState() {
+ RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
+ if (debugFlags.isPageOnToggleEnabled() || launchState.launchedWithAltTab) {
+ return 1f;
+ }
+ return 0f;
+ }
+
+ /**
+ * Computes the maximum number of visible tasks and thumbnails when the scroll is at the initial
+ * stack scroll. Requires that update() is called first.
*/
public VisibilityReport computeStackVisibilityReport(ArrayList<Task> tasks) {
// Ensure minimum visibility count
@@ -344,29 +477,32 @@
// Otherwise, walk backwards in the stack and count the number of tasks and visible
// thumbnails and add that to the total freeform task count
- int taskHeight = mTaskRect.height();
+ TaskViewTransform tmpTransform = new TaskViewTransform();
+ Range currentRange = getDefaultFocusState() > 0f ? mFocusedRange : mUnfocusedRange;
+ currentRange.offset(mInitialScrollP);
int taskBarHeight = mContext.getResources().getDimensionPixelSize(
R.dimen.recents_task_bar_height);
int numVisibleTasks = Math.max(mNumFreeformTasks, 1);
int numVisibleThumbnails = Math.max(mNumFreeformTasks, 1);
- Task firstNonFreeformTask = tasks.get(tasks.size() - mNumFreeformTasks - 1);
- float progress = mTaskProgressMap.get(firstNonFreeformTask.key) - mInitialScrollP;
- int prevScreenY = sCurve.pToX(progress, mCurrentStackRect);
- for (int i = tasks.size() - 2; i >= 0; i--) {
+ float prevScreenY = Integer.MAX_VALUE;
+ for (int i = tasks.size() - 1; i >= 0; i--) {
Task task = tasks.get(i);
+
+ // Skip freeform
if (task.isFreeformTask()) {
continue;
}
- progress = mTaskProgressMap.get(task.key) - mInitialScrollP;
- if (progress < 0) {
- break;
+ // Skip invisible
+ float taskProgress = getStackScrollForTask(task);
+ if (!currentRange.isInRange(taskProgress)) {
+ continue;
}
+
boolean isFrontMostTaskInGroup = task.group == null || task.group.isFrontMostTask(task);
if (isFrontMostTaskInGroup) {
- float scaleAtP = sCurve.pToScale(progress);
- int scaleYOffsetAtP = (int) (((1f - scaleAtP) * taskHeight) / 2);
- int screenY = sCurve.pToX(progress, mCurrentStackRect) + scaleYOffsetAtP;
+ getStackTransform(taskProgress, mInitialScrollP, tmpTransform, null);
+ float screenY = tmpTransform.rect.top;
boolean hasVisibleThumbnail = (prevScreenY - screenY) > taskBarHeight;
if (hasVisibleThumbnail) {
numVisibleThumbnails++;
@@ -374,12 +510,12 @@
prevScreenY = screenY;
} else {
// Once we hit the next front most task that does not have a visible thumbnail,
- // w alk through remaining visible set
+ // walk through remaining visible set
for (int j = i; j >= 0; j--) {
numVisibleTasks++;
- progress = mTaskProgressMap.get(tasks.get(j).key) - mInitialScrollP;
- if (progress < 0) {
- break;
+ taskProgress = getStackScrollForTask(tasks.get(j));
+ if (!currentRange.isInRange(taskProgress)) {
+ continue;
}
}
break;
@@ -397,86 +533,82 @@
* is what the view is measured and laid out with.
*/
public TaskViewTransform getStackTransform(Task task, float stackScroll,
- TaskViewTransform transformOut, TaskViewTransform prevTransform) {
+ TaskViewTransform transformOut, TaskViewTransform frontTransform) {
if (mFreeformLayoutAlgorithm.isTransformAvailable(task, this)) {
mFreeformLayoutAlgorithm.getTransform(task, transformOut, this);
return transformOut;
} else {
// Return early if we have an invalid index
- if (task == null || !mTaskProgressMap.containsKey(task.key)) {
+ if (task == null || !mTaskIndexMap.containsKey(task.key)) {
transformOut.reset();
return transformOut;
}
- return getStackTransform(mTaskProgressMap.get(task.key), stackScroll, transformOut,
- prevTransform);
+ return getStackTransform(mTaskIndexMap.get(task.key), stackScroll, transformOut,
+ frontTransform);
}
}
/** Update/get the transform */
public TaskViewTransform getStackTransform(float taskProgress, float stackScroll,
- TaskViewTransform transformOut, TaskViewTransform prevTransform) {
+ TaskViewTransform transformOut, TaskViewTransform frontTransform) {
SystemServicesProxy ssp = Recents.getSystemServices();
- if (!ssp.hasFreeformWorkspaceSupport() && mNumStackTasks == 1) {
- // Center the task in the stack, changing the scale will not follow the curve, but just
- // modulate some values directly
- float pTaskRelative = mMinScrollP - stackScroll;
- float scale = ssp.hasFreeformWorkspaceSupport() ? 1f : SINGLE_TASK_SCALE;
- int topOffset = (mCurrentStackRect.top - mTaskRect.top) +
- (mCurrentStackRect.height() - mTaskRect.height()) / 2;
- transformOut.scale = scale;
- transformOut.translationX = (mStackRect.width() - mTaskRect.width()) / 2;
- transformOut.translationY = (int) (topOffset + (pTaskRelative * mCurrentStackRect.height()));
- transformOut.translationZ = mMaxTranslationZ;
- transformOut.rect.set(mTaskRect);
- transformOut.rect.offset(transformOut.translationX, transformOut.translationY);
- Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale);
- transformOut.visible = true;
- transformOut.p = pTaskRelative;
- return transformOut;
+ // Compute the focused and unfocused offset
+ mUnfocusedRange.offset(stackScroll);
+ float p = mUnfocusedRange.getNormalizedX(taskProgress);
+ float yp = mUnfocusedCurveInterpolator.getInterpolation(p);
+ float unfocusedP = p;
+ int unFocusedY = (int) (Math.max(0f, (1f - yp)) * mCurrentStackRect.height());
+ boolean unfocusedVisible = mUnfocusedRange.isInRange(taskProgress);
+ int focusedY = 0;
+ boolean focusedVisible = true;
+ if (mFocusState > 0f) {
+ mFocusedRange.offset(stackScroll);
+ p = mFocusedRange.getNormalizedX(taskProgress);
+ yp = mFocusedCurveInterpolator.getInterpolation(p);
+ focusedY = (int) (Math.max(0f, (1f - yp)) * mCurrentStackRect.height());
+ focusedVisible = mFocusedRange.isInRange(taskProgress);
+ }
- } else {
- float pTaskRelative = taskProgress - stackScroll;
- float pBounded = Math.max(0, Math.min(pTaskRelative, 1f));
- if (DEBUG) {
- Log.d(TAG, "getStackTransform (normal): " + taskProgress + ", " + stackScroll);
- }
-
- // If the task top is outside of the bounds below the screen, then immediately reset it
- if (pTaskRelative > 1f) {
- transformOut.reset();
- transformOut.rect.set(mTaskRect);
- return transformOut;
- }
- // The check for the top is trickier, since we want to show the next task if it is at
- // all visible, even if p < 0.
- if (pTaskRelative < 0f) {
- if (prevTransform != null && Float.compare(prevTransform.p, 0f) <= 0) {
- transformOut.reset();
- transformOut.rect.set(mTaskRect);
- return transformOut;
- }
- }
- float scale = sCurve.pToScale(pBounded);
- int scaleYOffset = (int) (((1f - scale) * mTaskRect.height()) / 2);
- transformOut.scale = scale;
- transformOut.translationX = (mStackRect.width() - mTaskRect.width()) / 2;
- transformOut.translationY = (mCurrentStackRect.top - mTaskRect.top) +
- (sCurve.pToX(pBounded, mCurrentStackRect) - mCurrentStackRect.top) -
- scaleYOffset;
- transformOut.translationZ = Math.max(mMinTranslationZ,
- mMinTranslationZ + (pBounded * (mMaxTranslationZ - mMinTranslationZ)));
- transformOut.rect.set(mTaskRect);
- transformOut.rect.offset(transformOut.translationX, transformOut.translationY);
- Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale);
- transformOut.visible = true;
- transformOut.p = pTaskRelative;
- if (DEBUG) {
- Log.d(TAG, "\t" + transformOut);
- }
-
+ // Skip if the task is not visible
+ if (!unfocusedVisible && !focusedVisible) {
+ transformOut.reset();
return transformOut;
}
+
+ int y;
+ float z;
+ float relP;
+ if (!ssp.hasFreeformWorkspaceSupport() && mNumStackTasks == 1) {
+ // When there is exactly one task, then decouple the task from the stack and just move
+ // in screen space
+ p = (mMinScrollP - stackScroll) / mNumStackTasks;
+ int centerYOffset = (mCurrentStackRect.top - mTaskRect.top) +
+ (mCurrentStackRect.height() - mTaskRect.height()) / 2;
+ y = centerYOffset + getYForDeltaP(p, 0);
+ z = mMaxTranslationZ;
+ relP = 1f;
+
+ } else {
+ // Otherwise, update the task to the stack layout
+ y = unFocusedY + (int) (mFocusState * (focusedY - unFocusedY));
+ y += (mCurrentStackRect.top - mTaskRect.top);
+ z = Math.max(mMinTranslationZ, Math.min(mMaxTranslationZ,
+ mMinTranslationZ + (p * (mMaxTranslationZ - mMinTranslationZ))));
+ relP = unfocusedP;
+ }
+
+ // Fill out the transform
+ transformOut.scale = 1f;
+ transformOut.translationX = (mCurrentStackRect.width() - mTaskRect.width()) / 2;
+ transformOut.translationY = y;
+ transformOut.translationZ = z;
+ transformOut.rect.set(mTaskRect);
+ transformOut.rect.offset(transformOut.translationX, transformOut.translationY);
+ Utilities.scaleRectAboutCenter(transformOut.rect, transformOut.scale);
+ transformOut.visible = true;
+ transformOut.p = relP;
+ return transformOut;
}
/**
@@ -491,8 +623,8 @@
* stack.
*/
float getStackScrollForTask(Task t) {
- if (!mTaskProgressMap.containsKey(t.key)) return 0f;
- return mTaskProgressMap.get(t.key);
+ if (!mTaskIndexMap.containsKey(t.key)) return 0f;
+ return mTaskIndexMap.get(t.key);
}
/**
@@ -501,7 +633,8 @@
* screen along the arc-length proportionally (1/arclength).
*/
public float getDeltaPForY(int downY, int y) {
- float deltaP = (float) (y - downY) / mCurrentStackRect.height() * (1f / sCurve.getArcLength());
+ float deltaP = (float) (y - downY) / mCurrentStackRect.height() *
+ mUnfocusedCurveInterpolator.getArcLength();
return -deltaP;
}
@@ -510,18 +643,52 @@
* of the curve, map back to the screen y.
*/
public int getYForDeltaP(float downScrollP, float p) {
- int y = (int) ((p - downScrollP) * mCurrentStackRect.height() * sCurve.getArcLength());
+ int y = (int) ((p - downScrollP) * mCurrentStackRect.height() *
+ (1f / mUnfocusedCurveInterpolator.getArcLength()));
return -y;
}
- private float alignToStackTop(float p) {
- // At scroll progress == p, then p is at the top of the stack
+ /**
+ * Creates a new path for the focused curve.
+ */
+ private Path constructFocusedCurve() {
+ int taskBarHeight = mContext.getResources().getDimensionPixelSize(
+ R.dimen.recents_task_bar_height);
+
+ // Initialize the focused curve. This curve is a piecewise curve composed of several
+ // quadradic beziers that goes from (0,1) through (0.5, peek height offset),
+ // (0.667, next task offset), (0.833, bottom task offset), and (1,0).
+ float peekHeightPct = (float) mFocusedPeekHeight / mCurrentStackRect.height();
+ Path p = new Path();
+ p.moveTo(0f, 1f);
+ p.lineTo(0.5f, 1f - peekHeightPct);
+ p.lineTo(0.66666667f, (float) (taskBarHeight * 3) / mCurrentStackRect.height());
+ p.lineTo(0.83333333f, (float) (taskBarHeight / 2) / mCurrentStackRect.height());
+ p.lineTo(1f, 0f);
return p;
}
- private float alignToStackBottom(float p, float pOffsetFromBottom) {
- // At scroll progress == p, then p is at the top of the stack
- // At scroll progress == p + 1, then p is at the bottom of the stack
- return p - (1 - pOffsetFromBottom);
+ /**
+ * Creates a new path for the unfocused curve.
+ */
+ private Path constructUnfocusedCurve() {
+ // Initialize the unfocused curve. This curve is a piecewise curve composed of two quadradic
+ // beziers that goes from (0,1) through (0.5, peek height offset) and ends at (1,0). This
+ // ensures that we match the range, at which 0.5 represents the stack scroll at the current
+ // task progress. Because the height offset can change depending on a resource, we compute
+ // the control point of the second bezier such that between it and a first known point,
+ // there is a tangent at (0.5, peek height offset).
+ float cpoint1X = 0.4f;
+ float cpoint1Y = 1f;
+ float peekHeightPct = (float) mFocusedPeekHeight / mCurrentStackRect.height();
+ float slope = ((1f - peekHeightPct) - cpoint1Y) / (0.5f - cpoint1X);
+ float b = 1f - slope * cpoint1X;
+ float cpoint2X = 0.75f;
+ float cpoint2Y = slope * cpoint2X + b;
+ Path p = new Path();
+ p.moveTo(0f, 1f);
+ p.cubicTo(0f, 1f, cpoint1X, 1f, 0.5f, 1f - peekHeightPct);
+ p.cubicTo(0.5f, 1f - peekHeightPct, cpoint2X, cpoint2Y, 1f, 0f);
+ return p;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index a57ac9d..0395e99 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -16,6 +16,10 @@
package com.android.systemui.recents.views;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.content.ComponentName;
import android.content.Context;
@@ -38,10 +42,21 @@
import com.android.systemui.recents.RecentsActivity;
import com.android.systemui.recents.RecentsActivityLaunchState;
import com.android.systemui.recents.RecentsConfiguration;
+import com.android.systemui.recents.RecentsDebugFlags;
import com.android.systemui.recents.events.EventBus;
+import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent;
+import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationCompletedEvent;
+import com.android.systemui.recents.events.activity.HideHistoryButtonEvent;
+import com.android.systemui.recents.events.activity.HideHistoryEvent;
+import com.android.systemui.recents.events.activity.IterateRecentsEvent;
import com.android.systemui.recents.events.activity.PackagesChangedEvent;
+import com.android.systemui.recents.events.activity.ShowHistoryButtonEvent;
+import com.android.systemui.recents.events.activity.ShowHistoryEvent;
import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent;
+import com.android.systemui.recents.events.ui.AllTaskViewsDismissedEvent;
import com.android.systemui.recents.events.ui.DismissTaskViewEvent;
+import com.android.systemui.recents.events.ui.StackViewScrolledEvent;
+import com.android.systemui.recents.events.ui.UpdateFreeformTaskViewVisibilityEvent;
import com.android.systemui.recents.events.ui.UserInteractionEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragDropTargetChangedEvent;
import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent;
@@ -60,7 +75,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
@@ -76,18 +90,18 @@
private final static String TAG = "TaskStackView";
private final static boolean DEBUG = false;
+ // The thresholds at which to show/hide the history button.
+ private static final float SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD = 0.3f;
+ private static final float HIDE_HISTORY_BUTTON_SCROLL_THRESHOLD = 0.3f;
+
/** The TaskView callbacks */
interface TaskStackViewCallbacks {
public void onTaskViewClicked(TaskStackView stackView, TaskView tv, TaskStack stack, Task t,
boolean lockToTask, Rect bounds, int destinationStack);
- public void onAllTaskViewsDismissed(ArrayList<Task> removedTasks);
- public void onTaskStackFilterTriggered();
- public void onTaskStackUnfilterTriggered();
}
TaskStack mStack;
TaskStackLayoutAlgorithm mLayoutAlgorithm;
- TaskStackViewFilterAlgorithm mFilterAlgorithm;
TaskStackViewScroller mStackScroller;
TaskStackViewTouchHandler mTouchHandler;
TaskStackViewCallbacks mCb;
@@ -101,6 +115,7 @@
boolean mStackViewsDirty = true;
boolean mStackViewsClipDirty = true;
boolean mAwaitingFirstLayout = true;
+ boolean mEnterAnimationComplete = false;
boolean mStartEnterAnimationRequestedAfterLayout;
ViewAnimation.TaskViewEnterContext mStartEnterAnimationContext;
@@ -114,6 +129,7 @@
HashMap<Task, TaskView> mTmpTaskViewMap = new HashMap<>();
ArrayList<TaskView> mTaskViews = new ArrayList<>();
List<TaskView> mImmutableTaskViews = new ArrayList<>();
+ List<TaskView> mTmpTaskViews = new ArrayList<>();
LayoutInflater mInflater;
boolean mLayersDisabled;
boolean mTouchExplorationEnabled;
@@ -150,8 +166,7 @@
setStack(stack);
mViewPool = new ViewPool<>(context, this);
mInflater = LayoutInflater.from(context);
- mLayoutAlgorithm = new TaskStackLayoutAlgorithm(context);
- mFilterAlgorithm = new TaskStackViewFilterAlgorithm(this, mViewPool);
+ mLayoutAlgorithm = new TaskStackLayoutAlgorithm(context, this);
mStackScroller = new TaskStackViewScroller(context, mLayoutAlgorithm);
mStackScroller.setCallbacks(this);
mTouchHandler = new TaskStackViewTouchHandler(context, this, mStackScroller);
@@ -279,14 +294,9 @@
}
// Mark each task view for relayout
- if (mViewPool != null) {
- Iterator<TaskView> iter = mViewPool.poolViewIterator();
- if (iter != null) {
- while (iter.hasNext()) {
- TaskView tv = iter.next();
- tv.reset();
- }
- }
+ List<TaskView> poolViews = mViewPool.getViews();
+ for (TaskView tv : poolViews) {
+ tv.reset();
}
// Reset the stack state
@@ -294,11 +304,14 @@
mStackViewsDirty = true;
mStackViewsClipDirty = true;
mAwaitingFirstLayout = true;
+ mEnterAnimationComplete = false;
if (mUIDozeTrigger != null) {
mUIDozeTrigger.stopDozing();
mUIDozeTrigger.resetTrigger();
}
mStackScroller.reset();
+ mLayoutAlgorithm.reset();
+ requestLayout();
}
/** Requests that the views be synchronized with the model */
@@ -357,7 +370,7 @@
}
// Update the stack transforms
- TaskViewTransform prevTransform = null;
+ TaskViewTransform frontTransform = null;
for (int i = taskCount - 1; i >= 0; i--) {
Task task = tasks.get(i);
if (task.isFreeformTask()) {
@@ -365,7 +378,7 @@
}
TaskViewTransform transform = mLayoutAlgorithm.getStackTransform(task, stackScroll,
- taskTransforms.get(i), prevTransform);
+ taskTransforms.get(i), frontTransform);
if (DEBUG) {
Log.d(TAG, "updateStackTransform: " + i + ", " + transform.visible);
}
@@ -390,7 +403,7 @@
transform.translationY = Math.min(transform.translationY,
mLayoutAlgorithm.mCurrentStackRect.bottom);
}
- prevTransform = transform;
+ frontTransform = transform;
}
if (visibleRangeOut != null) {
visibleRangeOut[0] = frontMostVisibleIndex;
@@ -403,7 +416,7 @@
boolean synchronizeStackViewsWithModel() {
if (mStackViewsDirty) {
// Get all the task transforms
- ArrayList<Task> tasks = mStack.getTasks();
+ ArrayList<Task> tasks = mStack.getStackTasks();
float stackScroll = mStackScroller.getStackScroll();
int[] visibleStackRange = mTmpVisibleRange;
boolean isValidVisibleStackRange = updateStackTransforms(mCurrentTaskTransforms, tasks,
@@ -423,7 +436,7 @@
for (int i = taskViewCount - 1; i >= 0; i--) {
TaskView tv = taskViews.get(i);
Task task = tv.getTask();
- int taskIndex = mStack.indexOfTask(task);
+ int taskIndex = mStack.indexOfStackTask(task);
if (task.isFreeformTask() ||
visibleStackRange[1] <= taskIndex && taskIndex <= visibleStackRange[0]) {
mTmpTaskViewMap.put(task, tv);
@@ -442,7 +455,7 @@
// Pick up all the freeform tasks
int firstVisStackIndex = isValidVisibleStackRange ? visibleStackRange[0] : 0;
- for (int i = mStack.getTaskCount() - 1; i >= firstVisStackIndex; i--) {
+ for (int i = mStack.getStackTaskCount() - 1; i >= firstVisStackIndex; i--) {
Task task = tasks.get(i);
if (!task.isFreeformTask()) {
continue;
@@ -467,12 +480,12 @@
// Reattach it in the right z order
detachViewFromParent(tv);
int insertIndex = -1;
- int taskIndex = mStack.indexOfTask(task);
+ int taskIndex = mStack.indexOfStackTask(task);
taskViews = getTaskViews();
taskViewCount = taskViews.size();
for (int j = 0; j < taskViewCount; j++) {
Task tvTask = taskViews.get(j).getTask();
- if (taskIndex < mStack.indexOfTask(tvTask)) {
+ if (taskIndex < mStack.indexOfStackTask(tvTask)) {
insertIndex = j;
break;
}
@@ -542,6 +555,8 @@
* Updates the clip for each of the task views from back to front.
*/
void clipTaskViews(boolean forceUpdate) {
+ RecentsConfiguration config = Recents.getConfiguration();
+
// Update the clip on each task child
List<TaskView> taskViews = getTaskViews();
TaskView tmpTv = null;
@@ -579,6 +594,9 @@
}
}
tv.getViewBounds().setClipBottom(clipBottom, forceUpdate);
+ if (!config.useHardwareLayers) {
+ tv.mThumbnailView.updateThumbnailVisibility(clipBottom - tv.getPaddingBottom());
+ }
}
mStackViewsClipDirty = false;
}
@@ -609,30 +627,35 @@
/**
* Sets the focused task to the provided (bounded taskIndex).
+ *
+ * @return whether or not the stack will scroll as a part of this focus change
*/
- private void setFocusedTask(int taskIndex, boolean scrollToTask, final boolean animated) {
- setFocusedTask(taskIndex, scrollToTask, animated, true);
+ private boolean setFocusedTask(int taskIndex, boolean scrollToTask, final boolean animated) {
+ return setFocusedTask(taskIndex, scrollToTask, animated, true);
}
/**
* Sets the focused task to the provided (bounded taskIndex).
+ *
+ * @return whether or not the stack will scroll as a part of this focus change
*/
- private void setFocusedTask(int taskIndex, boolean scrollToTask, final boolean animated,
+ private boolean setFocusedTask(int taskIndex, boolean scrollToTask, final boolean animated,
final boolean requestViewFocus) {
// Find the next task to focus
- int newFocusedTaskIndex = mStack.getTaskCount() > 0 ?
- Math.max(0, Math.min(mStack.getTaskCount() - 1, taskIndex)) : -1;
+ int newFocusedTaskIndex = mStack.getStackTaskCount() > 0 ?
+ Math.max(0, Math.min(mStack.getStackTaskCount() - 1, taskIndex)) : -1;
final Task newFocusedTask = (newFocusedTaskIndex != -1) ?
- mStack.getTasks().get(newFocusedTaskIndex) : null;
+ mStack.getStackTasks().get(newFocusedTaskIndex) : null;
// Reset the last focused task state if changed
if (mFocusedTaskIndex != -1) {
- Task focusedTask = mStack.getTasks().get(mFocusedTaskIndex);
+ Task focusedTask = mStack.getStackTasks().get(mFocusedTaskIndex);
if (focusedTask != newFocusedTask) {
resetFocusedTask();
}
}
+ boolean willScroll = false;
mFocusedTaskIndex = newFocusedTaskIndex;
if (mFocusedTaskIndex != -1) {
Runnable focusTaskRunnable = new Runnable() {
@@ -647,19 +670,39 @@
if (scrollToTask) {
// TODO: Center the newly focused task view, only if not freeform
- float newScroll = mLayoutAlgorithm.getStackScrollForTask(newFocusedTask) - 0.5f;
+ RecentsDebugFlags debugFlags = Recents.getDebugFlags();
+ float newScroll = mLayoutAlgorithm.getStackScrollForTask(newFocusedTask);
+ if (!debugFlags.isFullscreenThumbnailsEnabled()) {
+ newScroll -= 0.5f;
+ }
newScroll = mStackScroller.getBoundedStackScroll(newScroll);
- mStackScroller.animateScroll(mStackScroller.getStackScroll(), newScroll,
- focusTaskRunnable);
+ if (Float.compare(newScroll, mStackScroller.getStackScroll()) != 0) {
+ mStackScroller.animateScroll(mStackScroller.getStackScroll(), newScroll,
+ focusTaskRunnable);
+ willScroll = true;
+
+ // Cancel any running enter animations at this point when we scroll as well
+ if (!mEnterAnimationComplete) {
+ final List<TaskView> taskViews = getTaskViews();
+ for (TaskView tv : taskViews) {
+ tv.cancelEnterRecentsAnimation();
+ }
+ }
+ } else {
+ focusTaskRunnable.run();
+ }
+ mLayoutAlgorithm.animateFocusState(TaskStackLayoutAlgorithm.STATE_FOCUSED);
} else {
focusTaskRunnable.run();
}
}
+ return willScroll;
}
/**
* Sets the focused task relative to the currently focused task.
*
+ * @param forward whether to go to the next task in the stack (along the curve) or the previous
* @param stackTasksOnly if set, will ensure that the traversal only goes along stack tasks, and
* if the currently focused task is not a stack task, will set the focus
* to the first visible stack task
@@ -667,17 +710,34 @@
* focus.
*/
public void setRelativeFocusedTask(boolean forward, boolean stackTasksOnly, boolean animated) {
+ setRelativeFocusedTask(forward, stackTasksOnly, animated, false);
+ }
+
+ /**
+ * Sets the focused task relative to the currently focused task.
+ *
+ * @param forward whether to go to the next task in the stack (along the curve) or the previous
+ * @param stackTasksOnly if set, will ensure that the traversal only goes along stack tasks, and
+ * if the currently focused task is not a stack task, will set the focus
+ * to the first visible stack task
+ * @param animated determines whether to actually draw the highlight along with the change in
+ * focus.
+ * @param cancelWindowAnimations if set, will attempt to cancel window animations if a scroll
+ * happens
+ */
+ public void setRelativeFocusedTask(boolean forward, boolean stackTasksOnly, boolean animated,
+ boolean cancelWindowAnimations) {
int newIndex = -1;
if (mFocusedTaskIndex != -1) {
if (stackTasksOnly) {
- List<Task> tasks = mStack.getTasks();
+ List<Task> tasks = mStack.getStackTasks();
newIndex = mFocusedTaskIndex;
Task task = tasks.get(mFocusedTaskIndex);
if (task.isFreeformTask()) {
// Try and focus the front most stack task
TaskView tv = getFrontMostTaskView(stackTasksOnly);
if (tv != null) {
- newIndex = mStack.indexOfTask(tv.getTask());
+ newIndex = mStack.indexOfStackTask(tv.getTask());
}
} else {
// Try the next task if it is a stack task
@@ -690,18 +750,25 @@
}
}
} else {
- // No restrictions, lets just move to the new task
- newIndex = mFocusedTaskIndex + (forward ? -1 : 1);
+ // No restrictions, lets just move to the new task (looping forward/backwards if
+ // necessary)
+ int taskCount = mStack.getStackTaskCount();
+ newIndex = (mFocusedTaskIndex + (forward ? -1 : 1) + taskCount) % taskCount;
}
} else {
// We don't have a focused task, so focus the first visible task view
TaskView tv = getFrontMostTaskView(stackTasksOnly);
if (tv != null) {
- newIndex = mStack.indexOfTask(tv.getTask());
+ newIndex = mStack.indexOfStackTask(tv.getTask());
}
}
if (newIndex != -1) {
- setFocusedTask(newIndex, true, animated);
+ boolean willScroll = setFocusedTask(newIndex, true, animated);
+ if (willScroll && cancelWindowAnimations) {
+ // As we iterate to the next/previous task, cancel any current/lagging window
+ // transition animations
+ EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null));
+ }
}
}
@@ -710,7 +777,7 @@
*/
void resetFocusedTask() {
if (mFocusedTaskIndex != -1) {
- Task t = mStack.getTasks().get(mFocusedTaskIndex);
+ Task t = mStack.getStackTasks().get(mFocusedTaskIndex);
TaskView tv = getChildViewForTask(t);
if (tv != null) {
tv.setFocusedState(false, false /* animated */, false /* requestViewFocus */);
@@ -724,7 +791,7 @@
*/
Task getFocusedTask() {
if (mFocusedTaskIndex != -1) {
- return mStack.getTasks().get(mFocusedTaskIndex);
+ return mStack.getStackTasks().get(mFocusedTaskIndex);
}
return null;
}
@@ -737,11 +804,11 @@
if (taskViewCount > 0) {
TaskView backMostTask = taskViews.get(0);
TaskView frontMostTask = taskViews.get(taskViewCount - 1);
- event.setFromIndex(mStack.indexOfTask(backMostTask.getTask()));
- event.setToIndex(mStack.indexOfTask(frontMostTask.getTask()));
+ event.setFromIndex(mStack.indexOfStackTask(backMostTask.getTask()));
+ event.setToIndex(mStack.indexOfStackTask(frontMostTask.getTask()));
event.setContentDescription(frontMostTask.getTask().activityLabel);
}
- event.setItemCount(mStack.getTaskCount());
+ event.setItemCount(mStack.getStackTaskCount());
event.setScrollY(mStackScroller.mScroller.getCurrY());
event.setMaxScrollY(mStackScroller.progressToScrollRange(mLayoutAlgorithm.mMaxScrollP));
}
@@ -756,7 +823,7 @@
if (mFocusedTaskIndex > 0) {
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
}
- if (mFocusedTaskIndex < mStack.getTaskCount() - 1) {
+ if (mFocusedTaskIndex < mStack.getStackTaskCount() - 1) {
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
}
}
@@ -833,7 +900,7 @@
* updateLayoutForStack() is called first.
*/
public TaskStackLayoutAlgorithm.VisibilityReport computeStackVisibilityReport() {
- return mLayoutAlgorithm.computeStackVisibilityReport(mStack.getTasks());
+ return mLayoutAlgorithm.computeStackVisibilityReport(mStack.getStackTasks());
}
public void setTaskStackBounds(Rect taskStackBounds, Rect systemInsets) {
@@ -862,10 +929,12 @@
}
// Measure each of the TaskViews
- List<TaskView> taskViews = getTaskViews();
- int taskViewCount = taskViews.size();
+ mTmpTaskViews.clear();
+ mTmpTaskViews.addAll(getTaskViews());
+ mTmpTaskViews.addAll(mViewPool.getViews());
+ int taskViewCount = mTmpTaskViews.size();
for (int i = 0; i < taskViewCount; i++) {
- TaskView tv = taskViews.get(i);
+ TaskView tv = mTmpTaskViews.get(i);
if (tv.getBackground() != null) {
tv.getBackground().getPadding(mTmpRect);
} else {
@@ -891,10 +960,12 @@
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
// Layout each of the TaskViews
- List<TaskView> taskViews = getTaskViews();
- int taskViewCount = taskViews.size();
+ mTmpTaskViews.clear();
+ mTmpTaskViews.addAll(getTaskViews());
+ mTmpTaskViews.addAll(mViewPool.getViews());
+ int taskViewCount = mTmpTaskViews.size();
for (int i = 0; i < taskViewCount; i++) {
- TaskView tv = taskViews.get(i);
+ TaskView tv = mTmpTaskViews.get(i);
if (tv.getBackground() != null) {
tv.getBackground().getPadding(mTmpRect);
} else {
@@ -911,6 +982,9 @@
}
if (changed) {
+ if (mStackScroller.isScrollOutOfBounds()) {
+ mStackScroller.boundScroll();
+ }
requestSynchronizeStackViewsWithModel();
synchronizeStackViewsWithModel();
clipTaskViews(true /* forceUpdate */);
@@ -930,9 +1004,15 @@
for (int i = taskViewCount - 1; i >= 0; i--) {
TaskView tv = taskViews.get(i);
Task task = tv.getTask();
- boolean occludesLaunchTarget = (launchTargetTask != null) &&
- launchTargetTask.group.isTaskAboveTask(task, launchTargetTask);
- tv.prepareEnterRecentsAnimation(task.isLaunchTarget, occludesLaunchTarget,
+ boolean hideTask = false;
+ boolean occludesLaunchTarget = false;
+ if (launchTargetTask != null) {
+ occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(task,
+ launchTargetTask);
+ hideTask = SystemServicesProxy.isFreeformStack(launchTargetTask.key.stackId) &&
+ SystemServicesProxy.isFreeformStack(task.key.stackId);
+ }
+ tv.prepareEnterRecentsAnimation(task.isLaunchTarget, hideTask, occludesLaunchTarget,
offscreenY);
}
@@ -948,12 +1028,17 @@
// until after the enter-animation
RecentsConfiguration config = Recents.getConfiguration();
RecentsActivityLaunchState launchState = config.getLaunchState();
- int focusedTaskIndex = launchState.getInitialFocusTaskIndex(mStack.getTaskCount());
+ int focusedTaskIndex = launchState.getInitialFocusTaskIndex(mStack.getStackTaskCount());
if (focusedTaskIndex != -1) {
setFocusedTask(focusedTaskIndex, false /* scrollToTask */, false /* animated */,
false /* requestViewFocus */);
}
+ // Update the history button visibility
+ if (mStackScroller.getStackScroll() < SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD) {
+ EventBus.getDefault().send(new ShowHistoryButtonEvent());
+ }
+
// Start dozing
mUIDozeTrigger.startDozing();
}
@@ -967,7 +1052,7 @@
return;
}
- if (mStack.getTaskCount() > 0) {
+ if (mStack.getStackTaskCount() > 0) {
// Find the launch target task
Task launchTargetTask = mStack.getLaunchTarget();
List<TaskView> taskViews = getTaskViews();
@@ -1027,20 +1112,6 @@
}
}
- /** Requests this task stack to start it's dismiss-all animation. */
- public void startDismissAllAnimation(final Runnable postAnimationRunnable) {
- // Clear the focused task
- resetFocusedTask();
- List<TaskView> taskViews = getTaskViews();
- int taskViewCount = taskViews.size();
- int count = 0;
- for (int i = taskViewCount - 1; i >= 0; i--) {
- TaskView tv = taskViews.get(i);
- tv.startDeleteTaskAnimation(i > 0 ? null : postAnimationRunnable, count * 50);
- count++;
- }
- }
-
/** Animates a task view in this stack as it launches. */
public void startLaunchTaskAnimation(TaskView tv, Runnable r, boolean lockToTask) {
Task launchTargetTask = tv.getTask();
@@ -1068,8 +1139,11 @@
mLayersDisabled = false;
// Draw the freeform workspace background
- if (mFreeformWorkspaceBackground.getAlpha() > 0) {
- mFreeformWorkspaceBackground.draw(canvas);
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (ssp.hasFreeformWorkspaceSupport()) {
+ if (mFreeformWorkspaceBackground.getAlpha() > 0) {
+ mFreeformWorkspaceBackground.draw(canvas);
+ }
}
super.dispatchDraw(canvas);
@@ -1087,7 +1161,7 @@
* Launches the freeform tasks.
*/
public boolean launchFreeformTasks() {
- Task frontTask = mStack.getFrontMostTask();
+ Task frontTask = mStack.getStackFrontMostTask();
if (frontTask != null && frontTask.isFreeformTask()) {
onTaskViewClicked(getChildViewForTask(frontTask), frontTask, false);
return true;
@@ -1098,11 +1172,6 @@
/**** TaskStackCallbacks Implementation ****/
@Override
- public void onStackTaskAdded(TaskStack stack, Task t) {
- requestSynchronizeStackViewsWithModel();
- }
-
- @Override
public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
Task newFrontMostTask) {
if (!removedTask.isFreeformTask()) {
@@ -1113,13 +1182,13 @@
mViewPool.returnViewToPool(tv);
}
- // Get the stack scroll of the task to anchor to (since we are removing something, the front
- // most task will be our anchor task)
+ // Get the stack scroll of the task to anchor to (since we are removing something, the
+ // front most task will be our anchor task)
Task anchorTask = null;
float prevAnchorTaskScroll = 0;
- boolean pullStackForward = stack.getTaskCount() > 0;
+ boolean pullStackForward = stack.getStackTaskCount() > 0;
if (pullStackForward) {
- anchorTask = mStack.getFrontMostTask();
+ anchorTask = mStack.getStackFrontMostTask();
prevAnchorTaskScroll = mLayoutAlgorithm.getStackScrollForTask(anchorTask);
}
@@ -1131,11 +1200,16 @@
// to ensure that the new front most task is now fully visible
mStackScroller.setStackScroll(mLayoutAlgorithm.mMaxScrollP);
} else if (pullStackForward) {
- // Otherwise, offset the scroll by half the movement of the anchor task to allow the
- // tasks behind the removed task to move forward, and the tasks in front to move back
+ // Otherwise, offset the scroll by the movement of the anchor task
float anchorTaskScroll = mLayoutAlgorithm.getStackScrollForTask(anchorTask);
- mStackScroller.setStackScroll(mStackScroller.getStackScroll() + (anchorTaskScroll
- - prevAnchorTaskScroll) / 2);
+ float newStackScroll = mStackScroller.getStackScroll() +
+ (anchorTaskScroll - prevAnchorTaskScroll);
+ if (mLayoutAlgorithm.getFocusState() != TaskStackLayoutAlgorithm.STATE_FOCUSED) {
+ // If we are focused, we don't want the front task to move, but otherwise, we
+ // allow the back task to move up, and the front task to move back
+ newStackScroll /= 2;
+ }
+ mStackScroller.setStackScroll(newStackScroll);
mStackScroller.boundScroll();
}
@@ -1166,99 +1240,15 @@
}
}
- // If there are no remaining tasks, then either unfilter the current stack, or just close
- // the activity if there are no filtered stacks
- if (mStack.getTaskCount() == 0) {
- boolean shouldFinishActivity = true;
- if (mStack.hasFilteredTasks()) {
- mStack.unfilterTasks();
- shouldFinishActivity = (mStack.getTaskCount() == 0);
- }
+ // If there are no remaining tasks, then just close recents
+ if (mStack.getStackTaskCount() == 0) {
+ boolean shouldFinishActivity = (mStack.getStackTaskCount() == 0);
if (shouldFinishActivity) {
- mCb.onAllTaskViewsDismissed(null);
+ EventBus.getDefault().send(new AllTaskViewsDismissedEvent());
}
}
}
- @Override
- public void onStackAllTasksRemoved(TaskStack stack, final ArrayList<Task> removedTasks) {
- // Announce for accessibility
- String msg = getContext().getString(R.string.accessibility_recents_all_items_dismissed);
- announceForAccessibility(msg);
-
- startDismissAllAnimation(new Runnable() {
- @Override
- public void run() {
- // Notify that all tasks have been removed
- mCb.onAllTaskViewsDismissed(removedTasks);
- }
- });
- }
-
- @Override
- public void onStackFiltered(TaskStack newStack, final ArrayList<Task> curTasks,
- Task filteredTask) {
- /*
- // Stash the scroll and filtered task for us to restore to when we unfilter
- mStashedScroll = getStackScroll();
-
- // Calculate the current task transforms
- ArrayList<TaskViewTransform> curTaskTransforms =
- getStackTransforms(curTasks, getStackScroll(), null, true);
-
- // Update the task offsets
- mLayoutAlgorithm.updateTaskOffsets(mStack.getTasks());
-
- // Scroll the item to the top of the stack (sans-peek) rect so that we can see it better
- updateLayout(false);
- float overlapHeight = mLayoutAlgorithm.getTaskOverlapHeight();
- setStackScrollRaw((int) (newStack.indexOfTask(filteredTask) * overlapHeight));
- boundScrollRaw();
-
- // Compute the transforms of the items in the new stack after setting the new scroll
- final ArrayList<Task> tasks = mStack.getTasks();
- final ArrayList<TaskViewTransform> taskTransforms =
- getStackTransforms(mStack.getTasks(), getStackScroll(), null, true);
-
- // Animate
- mFilterAlgorithm.startFilteringAnimation(curTasks, curTaskTransforms, tasks, taskTransforms);
-
- // Notify any callbacks
- mCb.onTaskStackFilterTriggered();
- */
- }
-
- @Override
- public void onStackUnfiltered(TaskStack newStack, final ArrayList<Task> curTasks) {
- /*
- // Calculate the current task transforms
- final ArrayList<TaskViewTransform> curTaskTransforms =
- getStackTransforms(curTasks, getStackScroll(), null, true);
-
- // Update the task offsets
- mLayoutAlgorithm.updateTaskOffsets(mStack.getTasks());
-
- // Restore the stashed scroll
- updateLayout(false);
- setStackScrollRaw(mStashedScroll);
- boundScrollRaw();
-
- // Compute the transforms of the items in the new stack after restoring the stashed scroll
- final ArrayList<Task> tasks = mStack.getTasks();
- final ArrayList<TaskViewTransform> taskTransforms =
- getStackTransforms(tasks, getStackScroll(), null, true);
-
- // Animate
- mFilterAlgorithm.startFilteringAnimation(curTasks, curTaskTransforms, tasks, taskTransforms);
-
- // Clear the saved vars
- mStashedScroll = 0;
-
- // Notify any callbacks
- mCb.onTaskStackUnfilterTriggered();
- */
- }
-
/**** ViewPoolConsumer Implementation ****/
@Override
@@ -1302,13 +1292,13 @@
// Find the index where this task should be placed in the stack
int insertIndex = -1;
- int taskIndex = mStack.indexOfTask(task);
+ int taskIndex = mStack.indexOfStackTask(task);
if (taskIndex != -1) {
List<TaskView> taskViews = getTaskViews();
int taskViewCount = taskViews.size();
for (int i = 0; i < taskViewCount; i++) {
Task tvTask = taskViews.get(i).getTask();
- if (taskIndex < mStack.indexOfTask(tvTask)) {
+ if (taskIndex < mStack.indexOfStackTask(tvTask)) {
insertIndex = i;
break;
}
@@ -1360,10 +1350,18 @@
/**** TaskStackViewScroller.TaskStackViewScrollerCallbacks ****/
@Override
- public void onScrollChanged(float p) {
+ public void onScrollChanged(float prevScroll, float curScroll) {
mUIDozeTrigger.poke();
requestSynchronizeStackViewsWithModel();
postInvalidateOnAnimation();
+
+ if (prevScroll > SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD &&
+ curScroll <= SHOW_HISTORY_BUTTON_SCROLL_THRESHOLD) {
+ EventBus.getDefault().send(new ShowHistoryButtonEvent());
+ } else if (prevScroll < HIDE_HISTORY_BUTTON_SCROLL_THRESHOLD &&
+ curScroll >= HIDE_HISTORY_BUTTON_SCROLL_THRESHOLD) {
+ EventBus.getDefault().send(new HideHistoryButtonEvent());
+ }
}
/**** EventBus Events ****/
@@ -1374,7 +1372,7 @@
event.packageName, event.userId);
// For other tasks, just remove them directly if they no longer exist
- ArrayList<Task> tasks = mStack.getTasks();
+ ArrayList<Task> tasks = mStack.getStackTasks();
for (int i = tasks.size() - 1; i >= 0; i--) {
final Task t = tasks.get(i);
if (removedComponents.contains(t.key.getComponent())) {
@@ -1409,7 +1407,7 @@
public final void onBusEvent(DismissFocusedTaskViewEvent event) {
if (mFocusedTaskIndex != -1) {
- Task t = mStack.getTasks().get(mFocusedTaskIndex);
+ Task t = mStack.getStackTasks().get(mFocusedTaskIndex);
TaskView tv = getChildViewForTask(t);
tv.dismissTask();
}
@@ -1426,7 +1424,12 @@
}
}
+ private AnimatorSet mDropAnimation;
+
public final void onBusEvent(DragStartEvent event) {
+ // Cancel the existing drop animation
+ Utilities.cancelAnimationWithoutCallbacks(mDropAnimation);
+
if (event.task.isFreeformTask()) {
// Animate to the front of the stack
mStackScroller.animateScroll(mStackScroller.getStackScroll(),
@@ -1447,56 +1450,138 @@
}
public final void onBusEvent(final DragEndEvent event) {
- if (event.dropTarget != mFreeformWorkspaceDropTarget &&
- event.dropTarget != mStackDropTarget) {
- return;
- }
- if (event.task.isFreeformTask() && event.dropTarget == mFreeformWorkspaceDropTarget) {
- // TODO: Animate back into view
- return;
- }
- if (!event.task.isFreeformTask() && event.dropTarget == mStackDropTarget) {
- // TODO: Animate back into view
+ // We don't handle drops on the dock regions
+ if (event.dropTarget instanceof TaskStack.DockState) {
return;
}
- // Move the task to the right position in the stack (ie. the front of the stack if freeform
- // or the front of the stack if fullscreen). Note, we MUST move the tasks before we update
- // their stack ids, otherwise, the keys will have changed.
- if (event.dropTarget == mFreeformWorkspaceDropTarget) {
- mStack.moveTaskToStack(event.task, FREEFORM_WORKSPACE_STACK_ID);
- updateLayout(true);
- } else if (event.dropTarget == mStackDropTarget) {
- mStack.moveTaskToStack(event.task, FULLSCREEN_WORKSPACE_STACK_ID);
- updateLayout(true);
+ boolean isFreeformTask = event.task.isFreeformTask();
+ boolean hasChangedStacks =
+ (!isFreeformTask && event.dropTarget == mFreeformWorkspaceDropTarget) ||
+ (isFreeformTask && event.dropTarget == mStackDropTarget);
+ if (hasChangedStacks) {
+ ArrayList<Animator> animations = new ArrayList<>();
+
+ // Move the task to the right position in the stack (ie. the front of the stack if
+ // freeform or the front of the stack if fullscreen). Note, we MUST move the tasks
+ // before we update their stack ids, otherwise, the keys will have changed.
+ if (event.dropTarget == mFreeformWorkspaceDropTarget) {
+ mStack.moveTaskToStack(event.task, FREEFORM_WORKSPACE_STACK_ID);
+ updateLayout(true);
+
+ // Update the clipping to match the scaled bitmap rect
+ TaskViewThumbnail thumbnailView = event.taskView.mThumbnailView;
+ float thumbnailScale = thumbnailView.computeThumbnailScale(true);
+ RectF bitmapRect = thumbnailView.getScaledBitmapRect(thumbnailScale);
+ AnimateableViewBounds viewBounds = event.taskView.getViewBounds();
+ int clipRight = (int) (thumbnailView.getMeasuredWidth() - bitmapRect.width());
+ int clipBottom = (int) (thumbnailView.getMeasuredHeight() - bitmapRect.height());
+ animations.add(ObjectAnimator.ofFloat(thumbnailView, TaskViewThumbnail.BITMAP_SCALE,
+ thumbnailView.getBitmapScale(), thumbnailScale));
+ animations.add(ObjectAnimator.ofInt(viewBounds, AnimateableViewBounds.CLIP_BOTTOM,
+ viewBounds.getClipBottom(), clipBottom));
+ animations.add(ObjectAnimator.ofInt(viewBounds, AnimateableViewBounds.CLIP_RIGHT,
+ viewBounds.getClipRight(), clipRight));
+ } else if (event.dropTarget == mStackDropTarget) {
+ mStack.moveTaskToStack(event.task, FULLSCREEN_WORKSPACE_STACK_ID);
+ updateLayout(true);
+
+ // Reset the clipping when animating to the stack
+ TaskViewThumbnail thumbnailView = event.taskView.mThumbnailView;
+ float thumbnailScale = thumbnailView.computeThumbnailScale(false);
+ AnimateableViewBounds viewBounds = event.taskView.getViewBounds();
+ animations.add(ObjectAnimator.ofFloat(thumbnailView, TaskViewThumbnail.BITMAP_SCALE,
+ thumbnailView.getBitmapScale(), thumbnailScale));
+ animations.add(ObjectAnimator.ofInt(viewBounds, AnimateableViewBounds.CLIP_BOTTOM,
+ viewBounds.getClipBottom(), 0));
+ animations.add(ObjectAnimator.ofInt(viewBounds, AnimateableViewBounds.CLIP_RIGHT,
+ viewBounds.getClipRight(), 0));
+ }
+
+ // Move the task to the new stack in the system after the animation completes
+ event.postAnimationTrigger.increment();
+ event.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
+ @Override
+ public void run() {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.moveTaskToStack(event.task.key.id, event.task.key.stackId);
+ }
+ });
+
+ // Animate the normal properties of the view
+ mDropAnimation = new AnimatorSet();
+ mDropAnimation.playTogether(animations);
+ mDropAnimation.setDuration(250);
+ mDropAnimation.setInterpolator(mFastOutSlowInInterpolator);
+ mDropAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ event.postAnimationTrigger.decrement();
+ }
+ });
+ mDropAnimation.start();
}
event.postAnimationTrigger.increment();
- event.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
- @Override
- public void run() {
- SystemServicesProxy ssp = Recents.getSystemServices();
- ssp.moveTaskToStack(event.task.key.id, event.task.key.stackId);
+ event.taskView.animate()
+ .withEndAction(event.postAnimationTrigger.decrementAsRunnable());
+
+ // Animate the tack view back into position
+ requestSynchronizeStackViewsWithModel(250);
+ }
+
+ public final void onBusEvent(StackViewScrolledEvent event) {
+ mLayoutAlgorithm.updateFocusStateOnScroll(event.yMovement);
+ }
+
+ public final void onBusEvent(IterateRecentsEvent event) {
+ mLayoutAlgorithm.animateFocusState(mLayoutAlgorithm.getDefaultFocusState());
+ }
+
+ public final void onBusEvent(EnterRecentsWindowAnimationCompletedEvent event) {
+ mEnterAnimationComplete = true;
+ }
+
+ public final void onBusEvent(UpdateFreeformTaskViewVisibilityEvent event) {
+ List<TaskView> taskViews = getTaskViews();
+ int taskViewCount = taskViews.size();
+ for (int i = 0; i < taskViewCount; i++) {
+ TaskView tv = taskViews.get(i);
+ Task task = tv.getTask();
+ if (SystemServicesProxy.isFreeformStack(task.key.stackId)) {
+ tv.setVisibility(event.visible ? View.VISIBLE : View.INVISIBLE);
}
- });
+ }
+ }
- // Animate the drag view to the new position
- mLayoutAlgorithm.getStackTransform(event.task, mStackScroller.getStackScroll(),
- mTmpTransform, null);
- event.dragView.animate()
- .scaleX(mTmpTransform.scale)
- .scaleY(mTmpTransform.scale)
- .translationX((mLayoutAlgorithm.mTaskRect.left - event.dragView.getLeft())
- + mTmpTransform.translationX)
- .translationY((mLayoutAlgorithm.mTaskRect.top - event.dragView.getTop())
- + mTmpTransform.translationY)
- .setDuration(175)
- .setInterpolator(mFastOutSlowInInterpolator)
- .withEndAction(event.postAnimationTrigger.decrementAsRunnable())
- .start();
+ public final void onBusEvent(ShowHistoryEvent event) {
+ List<TaskView> taskViews = getTaskViews();
+ int taskViewCount = taskViews.size();
+ for (int i = taskViewCount - 1; i >= 0; i--) {
+ TaskView tv = taskViews.get(i);
+ tv.animate()
+ .alpha(0f)
+ .setDuration(200)
+ .setUpdateListener(null)
+ .setListener(null)
+ .withLayer()
+ .start();
+ }
+ }
- // Animate the other views into place
- requestSynchronizeStackViewsWithModel(175);
+ public final void onBusEvent(HideHistoryEvent event) {
+ List<TaskView> taskViews = getTaskViews();
+ int taskViewCount = taskViews.size();
+ for (int i = taskViewCount - 1; i >= 0; i--) {
+ TaskView tv = taskViews.get(i);
+ tv.animate()
+ .alpha(1f)
+ .setDuration(200)
+ .setUpdateListener(null)
+ .setListener(null)
+ .withLayer()
+ .start();
+ }
}
/**
@@ -1504,13 +1589,12 @@
* removed TaskView was focused.
*/
private void removeTaskViewFromStack(TaskView tv) {
- SystemServicesProxy ssp = Recents.getSystemServices();
Task task = tv.getTask();
- int taskIndex = mStack.indexOfTask(task);
- boolean taskWasFocused = tv.isFocusedTask();
// Reset the previously focused task before it is removed from the stack
- resetFocusedTask();
+ if (tv.isFocusedTask()) {
+ resetFocusedTask();
+ }
// Announce for accessibility
tv.announceForAccessibility(getContext().getString(
@@ -1518,16 +1602,5 @@
// Remove the task from the stack
mStack.removeTask(task);
-
- if (taskWasFocused || ssp.isTouchExplorationEnabled()) {
- // If the dismissed task was focused or if we are in touch exploration mode, then focus
- // the next task
- RecentsConfiguration config = Recents.getConfiguration();
- RecentsActivityLaunchState launchState = config.getLaunchState();
- boolean isFreeformTask = taskIndex > 0 ?
- mStack.getTasks().get(taskIndex - 1).isFreeformTask() : false;
- setFocusedTask(taskIndex - 1, !isFreeformTask /* scrollToTask */,
- launchState.launchedWithAltTab);
- }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewFilterAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewFilterAlgorithm.java
deleted file mode 100644
index 45f573d..0000000
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewFilterAlgorithm.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2014 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.systemui.recents.views;
-
-import com.android.systemui.R;
-import com.android.systemui.recents.model.Task;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/* The layout logic for a TaskStackView */
-public class TaskStackViewFilterAlgorithm {
-
- TaskStackView mStackView;
- ViewPool<TaskView, Task> mViewPool;
-
- public TaskStackViewFilterAlgorithm(TaskStackView stackView, ViewPool<TaskView, Task> viewPool) {
- mStackView = stackView;
- mViewPool = viewPool;
- }
-
- /** Orchestrates the animations of the current child views and any new views. */
- void startFilteringAnimation(ArrayList<Task> curTasks,
- ArrayList<TaskViewTransform> curTaskTransforms,
- final ArrayList<Task> tasks,
- final ArrayList<TaskViewTransform> taskTransforms) {
- // Calculate the transforms to animate out all the existing views if they are not in the
- // new visible range (or to their final positions in the stack if they are)
- final ArrayList<TaskView> childrenToRemove = new ArrayList<TaskView>();
- final HashMap<TaskView, TaskViewTransform> childViewTransforms =
- new HashMap<TaskView, TaskViewTransform>();
- int duration = getExitTransformsForFilterAnimation(curTasks, curTaskTransforms, tasks,
- taskTransforms, childViewTransforms, childrenToRemove);
-
- // If all the current views are in the visible range of the new stack, then don't wait for
- // views to animate out and animate all the new views into their place
- final boolean unifyNewViewAnimation = childrenToRemove.isEmpty();
- if (unifyNewViewAnimation) {
- int inDuration = getEnterTransformsForFilterAnimation(tasks, taskTransforms,
- childViewTransforms);
- duration = Math.max(duration, inDuration);
- }
-
- // Animate all the views to their final transforms
- for (final TaskView tv : childViewTransforms.keySet()) {
- TaskViewTransform t = childViewTransforms.get(tv);
- tv.animate().cancel();
- tv.animate()
- .withEndAction(new Runnable() {
- @Override
- public void run() {
- childViewTransforms.remove(tv);
- if (childViewTransforms.isEmpty()) {
- // Return all the removed children to the view pool
- for (TaskView tv : childrenToRemove) {
- mViewPool.returnViewToPool(tv);
- }
-
- if (!unifyNewViewAnimation) {
- // For views that are not already visible, animate them in
- childViewTransforms.clear();
- int duration = getEnterTransformsForFilterAnimation(tasks,
- taskTransforms, childViewTransforms);
- for (final TaskView tv : childViewTransforms.keySet()) {
- TaskViewTransform t = childViewTransforms.get(tv);
- tv.updateViewPropertiesToTaskTransform(t, duration);
- }
- }
- }
- }
- });
- tv.updateViewPropertiesToTaskTransform(t, duration);
- }
- }
-
- /**
- * Creates the animations for all the children views that need to be animated in when we are
- * un/filtering a stack, and returns the duration for these animations.
- */
- int getEnterTransformsForFilterAnimation(ArrayList<Task> tasks,
- ArrayList<TaskViewTransform> taskTransforms,
- HashMap<TaskView, TaskViewTransform> childViewTransformsOut) {
- int offset = 0;
- int movement = 0;
- int taskCount = tasks.size();
- for (int i = taskCount - 1; i >= 0; i--) {
- Task task = tasks.get(i);
- TaskViewTransform toTransform = taskTransforms.get(i);
- if (toTransform.visible) {
- TaskView tv = mStackView.getChildViewForTask(task);
- if (tv == null) {
- // For views that are not already visible, animate them in
- tv = mViewPool.pickUpViewFromPool(task, task);
-
- // Compose a new transform to fade and slide the new task in
- TaskViewTransform fromTransform = new TaskViewTransform(toTransform);
- tv.prepareTaskTransformForFilterTaskHidden(fromTransform);
- tv.updateViewPropertiesToTaskTransform(fromTransform, 0);
-
- toTransform.startDelay = offset * 25;
- childViewTransformsOut.put(tv, toTransform);
-
- // Use the movement of the new views to calculate the duration of the animation
- movement = Math.max(movement,
- Math.abs(toTransform.translationY - fromTransform.translationY));
- offset++;
- }
- }
- }
- return mStackView.getResources().getInteger(
- R.integer.recents_filter_animate_new_views_duration);
- }
-
- /**
- * Creates the animations for all the children views that need to be removed or to move views
- * to their un/filtered position when we are un/filtering a stack, and returns the duration
- * for these animations.
- */
- int getExitTransformsForFilterAnimation(ArrayList<Task> curTasks,
- ArrayList<TaskViewTransform> curTaskTransforms,
- ArrayList<Task> tasks, ArrayList<TaskViewTransform> taskTransforms,
- HashMap<TaskView, TaskViewTransform> childViewTransformsOut,
- ArrayList<TaskView> childrenToRemoveOut) {
- // Animate all of the existing views out of view (if they are not in the visible range in
- // the new stack) or to their final positions in the new stack
- int offset = 0;
- int movement = 0;
- List<TaskView> taskViews = mStackView.getTaskViews();
- int taskViewCount = taskViews.size();
- for (int i = 0; i < taskViewCount; i++) {
- TaskView tv = taskViews.get(i);
- Task task = tv.getTask();
- int taskIndex = tasks.indexOf(task);
- TaskViewTransform toTransform;
-
- // If the view is no longer visible, then we should just animate it out
- boolean willBeInvisible = taskIndex < 0 || !taskTransforms.get(taskIndex).visible;
- if (willBeInvisible) {
- if (taskIndex < 0) {
- toTransform = curTaskTransforms.get(curTasks.indexOf(task));
- } else {
- toTransform = new TaskViewTransform(taskTransforms.get(taskIndex));
- }
- tv.prepareTaskTransformForFilterTaskVisible(toTransform);
- childrenToRemoveOut.add(tv);
- } else {
- toTransform = taskTransforms.get(taskIndex);
- // Use the movement of the visible views to calculate the duration of the animation
- movement = Math.max(movement, Math.abs(toTransform.translationY -
- (int) tv.getTranslationY()));
- }
-
- toTransform.startDelay = offset * 25;
- childViewTransformsOut.put(tv, toTransform);
- offset++;
- }
- return mStackView.getResources().getInteger(
- R.integer.recents_filter_animate_current_views_duration);
- }
-
-}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java
index 3a2ed0f..90b73fe 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewScroller.java
@@ -35,7 +35,7 @@
private static final boolean DEBUG = false;
public interface TaskStackViewScrollerCallbacks {
- void onScrollChanged(float p);
+ void onScrollChanged(float prevScroll, float curScroll);
}
Context mContext;
@@ -78,9 +78,10 @@
/** Sets the current stack scroll */
public void setStackScroll(float s) {
+ float prevStackScroll = mStackScrollP;
mStackScrollP = s;
if (mCb != null) {
- mCb.onScrollChanged(mStackScrollP);
+ mCb.onScrollChanged(prevStackScroll, mStackScrollP);
}
}
@@ -166,12 +167,6 @@
mScrollAnimator.setDuration(mContext.getResources().getInteger(
R.integer.recents_animate_task_stack_scroll_duration));
mScrollAnimator.setInterpolator(mLinearOutSlowInInterpolator);
- mScrollAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- setStackScroll((Float) animation.getAnimatedValue());
- }
- });
mScrollAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
index 81c89a1..907ed2f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
@@ -31,10 +31,10 @@
import com.android.systemui.R;
import com.android.systemui.recents.Constants;
import com.android.systemui.recents.Recents;
-import com.android.systemui.recents.RecentsActivityLaunchState;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.HideRecentsEvent;
import com.android.systemui.recents.events.ui.DismissTaskViewEvent;
+import com.android.systemui.recents.events.ui.StackViewScrolledEvent;
import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.recents.misc.Utilities;
import com.android.systemui.statusbar.FlingAnimationUtils;
@@ -59,6 +59,7 @@
boolean mIsScrolling;
float mDownScrollP;
int mDownX, mDownY;
+ int mLastY;
int mActivePointerId = INACTIVE_POINTER_ID;
int mOverscrollSize;
TaskView mActiveTaskView = null;
@@ -150,11 +151,6 @@
if (mSv.getTaskViews().size() == 0) {
return false;
}
- // Short circuit while we are alt-tabbing
- RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
- if (launchState.launchedWithAltTab) {
- return false;
- }
final TaskStackLayoutAlgorithm layoutAlgorithm = mSv.mLayoutAlgorithm;
int action = ev.getAction();
@@ -163,6 +159,7 @@
// Save the touch down info
mDownX = (int) ev.getX();
mDownY = (int) ev.getY();
+ mLastY = mDownY;
mDownScrollP = mScroller.getStackScroll();
mActivePointerId = ev.getPointerId(0);
mActiveTaskView = findViewAtPoint(mDownX, mDownY);
@@ -181,6 +178,7 @@
final int index = ev.getActionIndex();
mDownX = (int) ev.getX();
mDownY = (int) ev.getY();
+ mLastY = mDownY;
mDownScrollP = mScroller.getStackScroll();
mActivePointerId = ev.getPointerId(index);
mVelocityTracker.addMovement(ev);
@@ -209,8 +207,10 @@
if (DEBUG) {
Log.d(TAG, "scroll: " + curScrollP);
}
+ EventBus.getDefault().send(new StackViewScrolledEvent(y - mLastY));
}
+ mLastY = y;
mVelocityTracker.addMovement(ev);
break;
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
index cb7465d..f2c89e6 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -17,19 +17,17 @@
package com.android.systemui.recents.views;
import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Outline;
import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
-import android.graphics.Rect;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
@@ -40,7 +38,6 @@
import android.view.animation.Interpolator;
import android.widget.FrameLayout;
import com.android.systemui.R;
-import com.android.systemui.recents.Constants;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
import com.android.systemui.recents.RecentsActivityLaunchState;
@@ -72,7 +69,7 @@
ObjectAnimator mTaskProgressAnimator;
float mMaxDimScale;
int mDimAlpha;
- AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1f);
+ AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(3f);
PorterDuffColorFilter mDimColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.SRC_ATOP);
Paint mDimLayerPaint = new Paint();
float mActionButtonTranslationZ;
@@ -154,7 +151,7 @@
}
/** Gets the task */
- Task getTask() {
+ public Task getTask() {
return mTask;
}
@@ -199,7 +196,7 @@
// Measure the content
mContent.measure(MeasureSpec.makeMeasureSpec(widthWithoutPadding, MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(widthWithoutPadding, MeasureSpec.EXACTLY));
+ MeasureSpec.makeMeasureSpec(heightWithoutPadding, MeasureSpec.EXACTLY));
// Measure the bar view, and action button
mHeaderView.measure(MeasureSpec.makeMeasureSpec(widthWithoutPadding, MeasureSpec.EXACTLY),
@@ -210,7 +207,7 @@
// Measure the thumbnail to be square
mThumbnailView.measure(
MeasureSpec.makeMeasureSpec(widthWithoutPadding, MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(widthWithoutPadding, MeasureSpec.EXACTLY));
+ MeasureSpec.makeMeasureSpec(heightWithoutPadding, MeasureSpec.EXACTLY));
mThumbnailView.updateClipToTaskBar(mHeaderView);
setMeasuredDimension(width, height);
invalidateOutline();
@@ -245,6 +242,8 @@
void resetViewProperties() {
setDim(0);
setLayerType(View.LAYER_TYPE_NONE, null);
+ setVisibility(View.VISIBLE);
+ getViewBounds().reset();
TaskViewTransform.reset(this);
if (mActionButtonView != null) {
mActionButtonView.setScaleX(1f);
@@ -254,34 +253,16 @@
}
}
- /**
- * When we are un/filtering, this method will set up the transform that we are animating to,
- * in order to hide the task.
- */
- void prepareTaskTransformForFilterTaskHidden(TaskViewTransform toTransform) {
- // Fade the view out and slide it away
- toTransform.alpha = 0f;
- toTransform.translationY += 200;
- toTransform.translationZ = 0;
- }
-
- /**
- * When we are un/filtering, this method will setup the transform that we are animating from,
- * in order to show the task.
- */
- void prepareTaskTransformForFilterTaskVisible(TaskViewTransform fromTransform) {
- // Fade the view in
- fromTransform.alpha = 0f;
- }
-
/** Prepares this task view for the enter-recents animations. This is called earlier in the
* first layout because the actual animation into recents may take a long time. */
- void prepareEnterRecentsAnimation(boolean isTaskViewLaunchTargetTask,
- boolean occludesLaunchTarget, int offscreenY) {
+ void prepareEnterRecentsAnimation(boolean isTaskViewLaunchTargetTask, boolean hideTask,
+ boolean occludesLaunchTarget, int offscreenY) {
RecentsConfiguration config = Recents.getConfiguration();
RecentsActivityLaunchState launchState = config.getLaunchState();
int initialDim = getDim();
- if (launchState.launchedHasConfigurationChanged) {
+ if (hideTask) {
+ setVisibility(View.INVISIBLE);
+ } else if (launchState.launchedHasConfigurationChanged) {
// Just load the views as-is
} else if (launchState.launchedFromAppWithThumbnail) {
if (isTaskViewLaunchTargetTask) {
@@ -303,8 +284,6 @@
}
// Apply the current dim
setDim(initialDim);
- // Prepare the thumbnail view alpha
- mThumbnailView.prepareEnterRecentsAnimation(isTaskViewLaunchTargetTask);
}
/** Animates this task view as it enters recents */
@@ -324,22 +303,9 @@
if (launchState.launchedFromAppWithThumbnail) {
if (mTask.isLaunchTarget) {
- // Animate the dim/overlay
- if (Constants.DebugFlags.App.EnableThumbnailAlphaOnFrontmost) {
- // Animate the thumbnail alpha before the dim animation (to prevent updating the
- // hardware layer)
- mThumbnailView.startEnterRecentsAnimation(new Runnable() {
- @Override
- public void run() {
- animateDimToProgress(taskViewEnterFromAppDuration,
- ctx.postAnimationTrigger.decrementOnAnimationEnd());
- }
- });
- } else {
- // Immediately start the dim animation
- animateDimToProgress(taskViewEnterFromAppDuration,
- ctx.postAnimationTrigger.decrementOnAnimationEnd());
- }
+ // Immediately start the dim animation
+ animateDimToProgress(taskViewEnterFromAppDuration,
+ ctx.postAnimationTrigger.decrementOnAnimationEnd());
ctx.postAnimationTrigger.increment();
// Animate the action button in
@@ -352,15 +318,21 @@
animate().alpha(1f)
.translationY(transform.translationY)
.setUpdateListener(null)
- .setInterpolator(mFastOutSlowInInterpolator)
- .setDuration(taskViewEnterFromHomeDuration)
- .withEndAction(new Runnable() {
+ .setListener(new AnimatorListenerAdapter() {
+ private boolean hasEnded;
+
+ // We use the animation listener instead of withEndAction() to
+ // ensure that onAnimationEnd() is called when the animator is
+ // cancelled
@Override
- public void run() {
- // Decrement the post animation trigger
+ public void onAnimationEnd(Animator animation) {
+ if (hasEnded) return;
ctx.postAnimationTrigger.decrement();
+ hasEnded = true;
}
})
+ .setInterpolator(mFastOutSlowInInterpolator)
+ .setDuration(taskViewEnterFromHomeDuration)
.start();
ctx.postAnimationTrigger.increment();
}
@@ -380,21 +352,30 @@
.translationY(transform.translationY)
.setStartDelay(delay)
.setUpdateListener(ctx.updateListener)
+ .setListener(new AnimatorListenerAdapter() {
+ private boolean hasEnded;
+
+ // We use the animation listener instead of withEndAction() to ensure that
+ // onAnimationEnd() is called when the animator is cancelled
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ if (hasEnded) return;
+ ctx.postAnimationTrigger.decrement();
+ hasEnded = true;
+ }
+ })
.setInterpolator(mQuintOutInterpolator)
.setDuration(taskViewEnterFromHomeDuration +
frontIndex * taskViewEnterFromHomeStaggerDelay)
- .withEndAction(new Runnable() {
- @Override
- public void run() {
- // Decrement the post animation trigger
- ctx.postAnimationTrigger.decrement();
- }
- })
.start();
ctx.postAnimationTrigger.increment();
}
}
+ public void cancelEnterRecentsAnimation() {
+ animate().cancel();
+ }
+
public void fadeInActionButton(int duration) {
// Hide the action button
mActionButtonView.setAlpha(0f);
@@ -414,6 +395,7 @@
.translationY(ctx.offscreenTranslationY)
.setStartDelay(0)
.setUpdateListener(null)
+ .setListener(null)
.setInterpolator(mFastOutLinearInInterpolator)
.setDuration(taskViewExitToHomeDuration)
.withEndAction(ctx.postAnimationTrigger.decrementAsRunnable())
@@ -421,11 +403,6 @@
ctx.postAnimationTrigger.increment();
}
- /** Animates this task view away when dismissing all tasks. */
- void startDismissAllAnimation() {
- dismissTask();
- }
-
/** Animates this task view as it exits recents */
void startLaunchTaskAnimation(final Runnable postAnimRunnable, boolean isLaunchingTask,
boolean occludesLaunchTarget, boolean lockToTask) {
@@ -435,9 +412,6 @@
R.dimen.recents_task_view_affiliate_group_enter_offset);
if (isLaunchingTask) {
- // Animate the thumbnail alpha back into full opacity for the window animation out
- mThumbnailView.startLaunchTaskAnimation(postAnimRunnable);
-
// Animate the dim
if (mDimAlpha > 0) {
ObjectAnimator anim = ObjectAnimator.ofInt(this, "dim", 0);
@@ -458,10 +432,11 @@
.setStartDelay(0)
.setDuration(taskViewExitToAppDuration)
.setInterpolator(mFastOutLinearInInterpolator)
+ .withEndAction(postAnimRunnable)
.start();
} else {
// Hide the dismiss button
- mHeaderView.startLaunchTaskDismissAnimation();
+ mHeaderView.startLaunchTaskDismissAnimation(postAnimRunnable);
// If this is another view in the task grouping and is in front of the launch task,
// animate it away first
if (occludesLaunchTarget) {
@@ -469,6 +444,7 @@
.translationY(getTranslationY() + taskViewAffiliateGroupEnterOffset)
.setStartDelay(0)
.setUpdateListener(null)
+ .setListener(null)
.setInterpolator(mFastOutLinearInInterpolator)
.setDuration(taskViewExitToAppDuration)
.start();
@@ -490,6 +466,7 @@
.alpha(0f)
.setStartDelay(delay)
.setUpdateListener(null)
+ .setListener(null)
.setInterpolator(mFastOutSlowInInterpolator)
.setDuration(taskViewRemoveAnimDuration)
.withEndAction(new Runnable() {
@@ -618,12 +595,11 @@
/** Compute the dim as a function of the scale of this view. */
int getDimFromTaskProgress() {
- // TODO: Temporarily disable the dim on the stack
- /*
- float dim = mMaxDimScale * mDimInterpolator.getInterpolation(1f - mTaskProgress);
+ float x = mTaskProgress < 0
+ ? 1f
+ : mDimInterpolator.getInterpolation(1f - mTaskProgress);
+ float dim = mMaxDimScale * x;
return (int) (dim * 255);
- */
- return 0;
}
/** Update the dim as a function of the scale of this view. */
@@ -631,21 +607,6 @@
setDim(getDimFromTaskProgress());
}
-
- @Override
- protected void dispatchDraw(Canvas canvas) {
- super.dispatchDraw(canvas);
- if (Constants.DebugFlags.App.EnableFastToggleRecents && mIsFocused) {
- Paint tmpPaint = new Paint();
- Rect tmpRect = new Rect();
- tmpRect.set(0, 0, getWidth(), getHeight());
- tmpPaint.setColor(0xFFFF0000);
- tmpPaint.setStrokeWidth(35);
- tmpPaint.setStyle(Paint.Style.STROKE);
- canvas.drawRect(tmpRect, tmpPaint);
- }
- }
-
/**** View focus state ****/
/**
@@ -663,7 +624,6 @@
mIsFocused = isFocused;
mIsFocusAnimated = animated;
mHeaderView.onTaskViewFocusChanged(isFocused, animated);
- mThumbnailView.onFocusChanged(isFocused);
if (isFocused) {
if (requestViewFocus && !isFocused()) {
requestFocus();
@@ -676,9 +636,6 @@
clearAccessibilityFocus();
}
}
- if (Constants.DebugFlags.App.EnableFastToggleRecents) {
- invalidate();
- }
}
/**
@@ -717,21 +674,13 @@
@Override
public void onTaskDataLoaded() {
SystemServicesProxy ssp = Recents.getSystemServices();
- RecentsConfiguration config = Recents.getConfiguration();
if (mThumbnailView != null && mHeaderView != null) {
// Bind each of the views to the new task data
mThumbnailView.rebindToTask(mTask);
mHeaderView.rebindToTask(mTask);
// Rebind any listeners
mActionButtonView.setOnClickListener(this);
-
- // Only enable long-click if we have a freeform workspace to drag to/from, or if we
- // aren't already docked
- if (ssp.hasFreeformWorkspaceSupport() || !config.hasDockedTasks) {
- setOnLongClickListener(this);
- } else {
- setOnLongClickListener(null);
- }
+ setOnLongClickListener(this);
}
mTaskDataLoaded = true;
}
@@ -771,58 +720,27 @@
@Override
public boolean onLongClick(View v) {
- if (v == this) {
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ if (v == this && !ssp.hasDockedTask()) {
// Start listening for drag events
setClipViewInStack(false);
+ // Enlarge the view slightly
final float finalScale = getScaleX() * 1.05f;
- final int width = getWidth();
- final int height = getHeight();
- Bitmap dragBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
- Canvas c = new Canvas(dragBitmap);
- mThumbnailView.draw(c);
- mHeaderView.draw(c);
- c.setBitmap(null);
+ animate()
+ .scaleX(finalScale)
+ .scaleY(finalScale)
+ .setDuration(175)
+ .setUpdateListener(null)
+ .setListener(null)
+ .setInterpolator(mFastOutSlowInInterpolator)
+ .start();
- // The downTouchPos is relative to the currently transformed TaskView, but we will be
- // dragging a copy of the full task view, which makes it easier for us to animate them
- // when the user drops
- mDownTouchPos.x += ((1f - getScaleX()) * width) / 2;
- mDownTouchPos.y += ((1f - getScaleY()) * height) / 2;
+ mDownTouchPos.x += ((1f - getScaleX()) * getWidth()) / 2;
+ mDownTouchPos.y += ((1f - getScaleY()) * getHeight()) / 2;
- // Initiate the drag
- final DragView dragView = new DragView(getContext(), dragBitmap, mDownTouchPos);
- dragView.setOutlineProvider(new ViewOutlineProvider() {
- @Override
- public void getOutline(View view, Outline outline) {
- outline.setRect(0, 0, width, height);
- }
- });
- dragView.setScaleX(getScaleX());
- dragView.setScaleY(getScaleY());
- dragView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
- @Override
- public void onViewAttachedToWindow(View v) {
- // Hide this task view after the drag view is attached
- setVisibility(View.INVISIBLE);
- // Animate the alpha slightly to indicate dragging
- dragView.setElevation(getElevation());
- dragView.setTranslationZ(getTranslationZ());
- dragView.animate()
- .scaleX(finalScale)
- .scaleY(finalScale)
- .setDuration(175)
- .setInterpolator(mFastOutSlowInInterpolator)
- .start();
- }
-
- @Override
- public void onViewDetachedFromWindow(View v) {
- // Do nothing
- }
- });
EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1);
- EventBus.getDefault().send(new DragStartEvent(mTask, this, dragView));
+ EventBus.getDefault().send(new DragStartEvent(mTask, this, mDownTouchPos));
return true;
}
return false;
@@ -835,9 +753,6 @@
event.postAnimationTrigger.addLastDecrementRunnable(new Runnable() {
@Override
public void run() {
- // Show this task view
- setVisibility(View.VISIBLE);
-
// Animate the drag view back from where it is, to the view location, then after
// it returns, update the clip state
setClipViewInStack(true);
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
index 649199e..85b4b9b 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -16,12 +16,7 @@
package com.android.systemui.recents.views;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ArgbEvaluator;
import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Canvas;
@@ -69,16 +64,13 @@
TextView mActivityDescription;
// Header drawables
- boolean mCurrentPrimaryColorIsDark;
- int mCurrentPrimaryColor;
- int mBackgroundColor;
int mCornerRadius;
int mHighlightHeight;
Drawable mLightDismissDrawable;
Drawable mDarkDismissDrawable;
RippleDrawable mBackground;
GradientDrawable mBackgroundColorDrawable;
- AnimatorSet mFocusAnimator;
+ ObjectAnimator mFocusAnimator;
String mDismissContentDescription;
// Static highlight that we draw at the top of each view
@@ -223,15 +215,12 @@
((ColorDrawable) getBackground()).getColor() : 0;
if (existingBgColor != t.colorPrimary) {
mBackgroundColorDrawable.setColor(t.colorPrimary);
- mBackgroundColor = t.colorPrimary;
}
int taskBarViewLightTextColor = getResources().getColor(
R.color.recents_task_bar_light_text_color);
int taskBarViewDarkTextColor = getResources().getColor(
R.color.recents_task_bar_dark_text_color);
- mCurrentPrimaryColor = t.colorPrimary;
- mCurrentPrimaryColorIsDark = t.useLightOnPrimaryColor;
mActivityDescription.setTextColor(t.useLightOnPrimaryColor ?
taskBarViewLightTextColor : taskBarViewDarkTextColor);
mDismissButton.setImageDrawable(t.useLightOnPrimaryColor ?
@@ -258,7 +247,6 @@
// Stop any focus animations
Utilities.cancelAnimationWithoutCallbacks(mFocusAnimator);
- mBackground.jumpToCurrentState();
}
/** Updates the resize task bar button. */
@@ -296,7 +284,7 @@
}
/** Animates this task bar dismiss button when launching a task. */
- void startLaunchTaskDismissAnimation() {
+ void startLaunchTaskDismissAnimation(final Runnable postAnimationRunanble) {
if (mDismissButton.getVisibility() == View.VISIBLE) {
int taskViewExitToAppDuration = mContext.getResources().getInteger(
R.integer.recents_task_exit_to_app_duration);
@@ -306,6 +294,7 @@
.setStartDelay(0)
.setInterpolator(mFastOutSlowInInterpolator)
.setDuration(taskViewExitToAppDuration)
+ .withEndAction(postAnimationRunanble)
.start();
}
}
@@ -376,84 +365,22 @@
isRunning = mFocusAnimator.isRunning();
}
Utilities.cancelAnimationWithoutCallbacks(mFocusAnimator);
- mBackground.jumpToCurrentState();
if (focused) {
// If we are not animating the visible state, just return
if (!animateFocusedState) return;
- int currentColor = mBackgroundColor;
- int secondaryColor = getSecondaryColor(mCurrentPrimaryColor, mCurrentPrimaryColorIsDark);
- int[][] states = new int[][] {
- new int[] {},
- new int[] { android.R.attr.state_enabled },
- new int[] { android.R.attr.state_pressed }
- };
- int[] newStates = new int[]{
- 0,
- android.R.attr.state_enabled,
- android.R.attr.state_pressed
- };
- int[] colors = new int[] {
- currentColor,
- secondaryColor,
- secondaryColor
- };
- mBackground.setColor(new ColorStateList(states, colors));
- mBackground.setState(newStates);
- // Pulse the background color
- int lightPrimaryColor = getSecondaryColor(mCurrentPrimaryColor, mCurrentPrimaryColorIsDark);
- ValueAnimator backgroundColor = ValueAnimator.ofObject(new ArgbEvaluator(),
- currentColor, lightPrimaryColor);
- backgroundColor.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationStart(Animator animation) {
- mBackground.setState(new int[]{});
- }
- });
- backgroundColor.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- int color = (int) animation.getAnimatedValue();
- mBackgroundColorDrawable.setColor(color);
- mBackgroundColor = color;
- }
- });
- backgroundColor.setRepeatCount(ValueAnimator.INFINITE);
- backgroundColor.setRepeatMode(ValueAnimator.REVERSE);
- // Pulse the translation
- ObjectAnimator translation = ObjectAnimator.ofFloat(this, "translationZ", 15f);
- translation.setRepeatCount(ValueAnimator.INFINITE);
- translation.setRepeatMode(ValueAnimator.REVERSE);
-
- mFocusAnimator = new AnimatorSet();
- mFocusAnimator.playTogether(backgroundColor, translation);
- mFocusAnimator.setStartDelay(150);
- mFocusAnimator.setDuration(750);
+ // Bump up the translation
+ mFocusAnimator = ObjectAnimator.ofFloat(this, "translationZ", 8f);
+ mFocusAnimator.setDuration(200);
mFocusAnimator.start();
} else {
if (isRunning) {
- // Restore the background color
- int currentColor = mBackgroundColor;
- ValueAnimator backgroundColor = ValueAnimator.ofObject(new ArgbEvaluator(),
- currentColor, mCurrentPrimaryColor);
- backgroundColor.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- int color = (int) animation.getAnimatedValue();
- mBackgroundColorDrawable.setColor(color);
- mBackgroundColor = color;
- }
- });
// Restore the translation
- ObjectAnimator translation = ObjectAnimator.ofFloat(this, "translationZ", 0f);
-
- mFocusAnimator = new AnimatorSet();
- mFocusAnimator.playTogether(backgroundColor, translation);
+ mFocusAnimator = ObjectAnimator.ofFloat(this, "translationZ", 0f);
mFocusAnimator.setDuration(150);
mFocusAnimator.start();
} else {
- mBackground.setState(new int[] {});
setTranslationZ(0f);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
index bc50846..c288afb 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java
@@ -16,9 +16,6 @@
package com.android.systemui.recents.views;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ValueAnimator;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapShader;
@@ -31,11 +28,12 @@
import android.graphics.RectF;
import android.graphics.Shader;
import android.util.AttributeSet;
+import android.util.FloatProperty;
+import android.util.Property;
import android.view.View;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import com.android.systemui.R;
-import com.android.systemui.recents.misc.Utilities;
import com.android.systemui.recents.model.Task;
@@ -45,6 +43,21 @@
*/
public class TaskViewThumbnail extends View {
+ public static final Property<TaskViewThumbnail, Float> BITMAP_SCALE =
+ new FloatProperty<TaskViewThumbnail>("bitmapScale") {
+ @Override
+ public void setValue(TaskViewThumbnail object, float scale) {
+ object.setBitmapScale(scale);
+ }
+
+ @Override
+ public Float get(TaskViewThumbnail object) {
+ return object.getBitmapScale();
+ }
+ };
+
+ private Task mTask;
+
// Drawing
int mCornerRadius;
float mDimAlpha;
@@ -52,23 +65,12 @@
Paint mDrawPaint = new Paint();
RectF mBitmapRect = new RectF();
RectF mLayoutRect = new RectF();
+ float mBitmapScale = 1f;
BitmapShader mBitmapShader;
LightingColorFilter mLightingColorFilter = new LightingColorFilter(0xffffffff, 0);
Interpolator mFastOutSlowInInterpolator;
- // Thumbnail alpha
- float mThumbnailAlpha;
- ValueAnimator mThumbnailAlphaAnimator;
- ValueAnimator.AnimatorUpdateListener mThumbnailAlphaUpdateListener
- = new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- mThumbnailAlpha = (float) animation.getAnimatedValue();
- updateThumbnailPaintFilter();
- }
- };
-
// Task bar clipping, the top of this thumbnail can be clipped against the opaque header
// bar that overlaps this thumbnail
View mTaskBar;
@@ -102,17 +104,11 @@
}
@Override
- protected void onFinishInflate() {
- mThumbnailAlpha = getResources().getFloat(R.dimen.recents_task_view_thumbnail_alpha);
- updateThumbnailPaintFilter();
- }
-
- @Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
if (changed) {
mLayoutRect.set(0, 0, getWidth(), getHeight());
- updateThumbnailScale();
+ setBitmapScale(computeThumbnailScale(mTask != null ? mTask.isFreeformTask() : false));
}
}
@@ -134,12 +130,15 @@
Shader.TileMode.CLAMP);
mDrawPaint.setShader(mBitmapShader);
mBitmapRect.set(0, 0, bm.getWidth(), bm.getHeight());
- updateThumbnailScale();
} else {
mBitmapShader = null;
mDrawPaint.setShader(null);
}
- updateThumbnailPaintFilter();
+ if (mTask != null) {
+ setBitmapScale(computeThumbnailScale(mTask != null ? mTask.isFreeformTask() : false));
+ } else {
+ setBitmapScale(1f);
+ }
}
/** Updates the paint to draw the thumbnail. */
@@ -147,27 +146,61 @@
if (mInvisible) {
return;
}
- int mul = (int) ((1.0f - mDimAlpha) * mThumbnailAlpha * 255);
- int add = (int) ((1.0f - mDimAlpha) * (1 - mThumbnailAlpha) * 255);
+ int mul = (int) ((1.0f - mDimAlpha) * 255);
if (mBitmapShader != null) {
mLightingColorFilter.setColorMultiply(Color.argb(255, mul, mul, mul));
- mLightingColorFilter.setColorAdd(Color.argb(0, add, add, add));
mDrawPaint.setColorFilter(mLightingColorFilter);
mDrawPaint.setColor(0xffffffff);
} else {
- int grey = mul + add;
+ int grey = mul;
mDrawPaint.setColorFilter(null);
mDrawPaint.setColor(Color.argb(255, grey, grey, grey));
}
invalidate();
}
- /** Updates the thumbnail shader's scale transform. */
- void updateThumbnailScale() {
+ /**
+ * Returns the scale to apply to a thumbnail bitmap relative to this view rect.
+ */
+ public float computeThumbnailScale(boolean isFreeformTask) {
+ if (isFreeformTask) {
+ // For freeform tasks, we scale the bitmap rect to fit in the layout rect
+ return Math.min(mLayoutRect.width() / mBitmapRect.width(),
+ mLayoutRect.height() / mBitmapRect.height());
+ } else {
+ // For stack tasks, we scale the bitmap to fit the width
+ return Math.max(1f, mLayoutRect.width() / mBitmapRect.width());
+ }
+ }
+
+ /**
+ * Returns the scaled bitmap rect.
+ */
+ public RectF getScaledBitmapRect(float scale) {
+ RectF scaledBitmapRect = new RectF(mBitmapRect);
+ scaledBitmapRect.left *= scale;
+ scaledBitmapRect.top *= scale;
+ scaledBitmapRect.right *= scale;
+ scaledBitmapRect.bottom *= scale;
+ return scaledBitmapRect;
+ }
+
+ /**
+ * Sets the scale of the bitmap relative to this view.
+ */
+ public void setBitmapScale(float scale) {
if (mBitmapShader != null) {
- mScaleMatrix.setRectToRect(mBitmapRect, mLayoutRect, Matrix.ScaleToFit.FILL);
+ mBitmapScale = scale;
+ mScaleMatrix.setScale(mBitmapScale, mBitmapScale);
mBitmapShader.setLocalMatrix(mScaleMatrix);
}
+ if (!mInvisible) {
+ invalidate();
+ }
+ }
+
+ public float getBitmapScale() {
+ return mBitmapScale;
}
/** Updates the clip rect based on the given task bar. */
@@ -202,6 +235,7 @@
/** Binds the thumbnail view to the task */
void rebindToTask(Task t) {
+ mTask = t;
if (t.thumbnail != null) {
setThumbnail(t.thumbnail);
} else {
@@ -211,69 +245,7 @@
/** Unbinds the thumbnail view from the task */
void unbindFromTask() {
+ mTask = null;
setThumbnail(null);
}
-
- /** Handles focus changes. */
- void onFocusChanged(boolean focused) {
- if (focused) {
- if (Float.compare(getAlpha(), 1f) != 0) {
- startFadeAnimation(1f, 150, null);
- }
- } else {
- float taskViewThumbnailAlpha = getResources().getFloat(
- R.dimen.recents_task_view_thumbnail_alpha);
- if (Float.compare(getAlpha(), taskViewThumbnailAlpha) != 0) {
- startFadeAnimation(taskViewThumbnailAlpha, 150, null);
- }
- }
- }
-
- /**
- * Prepares for the enter recents animation, this gets called before the the view
- * is first visible and will be followed by a startEnterRecentsAnimation() call.
- */
- void prepareEnterRecentsAnimation(boolean isTaskViewLaunchTargetTask) {
- if (isTaskViewLaunchTargetTask) {
- mThumbnailAlpha = 1f;
- } else {
- mThumbnailAlpha = getResources().getFloat(
- R.dimen.recents_task_view_thumbnail_alpha);
- }
- updateThumbnailPaintFilter();
- }
-
- /** Animates this task thumbnail as it enters Recents. */
- void startEnterRecentsAnimation(Runnable postAnimRunnable) {
- float taskViewThumbnailAlpha = getResources().getFloat(
- R.dimen.recents_task_view_thumbnail_alpha);
- startFadeAnimation(taskViewThumbnailAlpha,
- getResources().getInteger(R.integer.recents_task_enter_from_app_duration),
- postAnimRunnable);
- }
-
- /** Animates this task thumbnail as it exits Recents. */
- void startLaunchTaskAnimation(Runnable postAnimRunnable) {
- int taskViewExitToAppDuration = mContext.getResources().getInteger(
- R.integer.recents_task_exit_to_app_duration);
- startFadeAnimation(1f, taskViewExitToAppDuration, postAnimRunnable);
- }
-
- /** Starts a new thumbnail alpha animation. */
- void startFadeAnimation(float finalAlpha, int duration, final Runnable postAnimRunnable) {
- Utilities.cancelAnimationWithoutCallbacks(mThumbnailAlphaAnimator);
- mThumbnailAlphaAnimator = ValueAnimator.ofFloat(mThumbnailAlpha, finalAlpha);
- mThumbnailAlphaAnimator.setDuration(duration);
- mThumbnailAlphaAnimator.setInterpolator(mFastOutSlowInInterpolator);
- mThumbnailAlphaAnimator.addUpdateListener(mThumbnailAlphaUpdateListener);
- if (postAnimRunnable != null) {
- mThumbnailAlphaAnimator.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- postAnimRunnable.run();
- }
- });
- }
- mThumbnailAlphaAnimator.start();
- }
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java
index 174ff33..6d43f9c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewTransform.java
@@ -122,6 +122,7 @@
} else {
anim.setUpdateListener(null);
}
+ anim.setListener(null);
anim.setStartDelay(startDelay)
.setDuration(duration)
.setInterpolator(interp)
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/ViewPool.java b/packages/SystemUI/src/com/android/systemui/recents/views/ViewPool.java
index 12b91af..31fbd3e 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/ViewPool.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/ViewPool.java
@@ -20,6 +20,7 @@
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
/* A view pool to manage more views than we can visibly handle */
@@ -76,11 +77,10 @@
return v;
}
- /** Returns an iterator to the list of the views in the pool. */
- Iterator<V> poolViewIterator() {
- if (mPool != null) {
- return mPool.iterator();
- }
- return null;
+ /**
+ * Returns the list of views in the pool.
+ */
+ List<V> getViews() {
+ return mPool;
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index 9e3cf37..e6a291c 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -594,7 +594,9 @@
// Setup the animation with the screenshot just taken
if (mScreenshotAnimation != null) {
- mScreenshotAnimation.end();
+ if (mScreenshotAnimation.isStarted()) {
+ mScreenshotAnimation.end();
+ }
mScreenshotAnimation.removeAllListeners();
}
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index dd894ce..6ff7a3e 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -17,10 +17,14 @@
package com.android.systemui.stackdivider;
import android.content.res.Configuration;
+import android.view.IDockDividerVisibilityListener;
import android.view.LayoutInflater;
+import android.view.View;
import com.android.systemui.R;
import com.android.systemui.SystemUI;
+import com.android.systemui.recents.Recents;
+import com.android.systemui.recents.misc.SystemServicesProxy;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -32,6 +36,9 @@
private static final String TAG = "Divider";
private int mDividerWindowWidth;
private DividerWindowManager mWindowManager;
+ private DividerView mView;
+ private DockDividerVisibilityListener mDockDividerVisibilityListener;
+ private boolean mVisible = false;
@Override
public void start() {
@@ -39,6 +46,10 @@
mDividerWindowWidth = mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.docked_stack_divider_thickness);
update(mContext.getResources().getConfiguration());
+ putComponent(Divider.class, this);
+ mDockDividerVisibilityListener = new DockDividerVisibilityListener();
+ SystemServicesProxy ssp = Recents.getSystemServices();
+ ssp.registerDockDividerVisibilityListener(mDockDividerVisibilityListener);
}
@Override
@@ -47,14 +58,19 @@
update(newConfig);
}
+ public DividerView getView() {
+ return mView;
+ }
+
private void addDivider(Configuration configuration) {
- DividerView view = (DividerView)
+ mView = (DividerView)
LayoutInflater.from(mContext).inflate(R.layout.docked_stack_divider, null);
+ mView.setVisibility(mVisible ? View.VISIBLE : View.INVISIBLE);
final boolean landscape = configuration.orientation == ORIENTATION_LANDSCAPE;
final int width = landscape ? mDividerWindowWidth : MATCH_PARENT;
final int height = landscape ? MATCH_PARENT : mDividerWindowWidth;
- mWindowManager.add(view, width, height);
- view.setWindowManager(mWindowManager);
+ mWindowManager.add(mView, width, height);
+ mView.setWindowManager(mWindowManager);
}
private void removeDivider() {
@@ -65,4 +81,23 @@
removeDivider();
addDivider(configuration);
}
+
+ private void updateVisibility(final boolean visible) {
+ mView.post(new Runnable() {
+ @Override
+ public void run() {
+ if (mVisible != visible) {
+ mVisible = visible;
+ mView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
+ }
+ }
+ });
+ }
+
+ class DockDividerVisibilityListener extends IDockDividerVisibilityListener.Stub {
+ @Override
+ public void onDockDividerVisibilityChanged(boolean visible) {
+ updateVisibility(visible);
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java
index 5f983c5..69e90cc 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java
@@ -98,10 +98,10 @@
// TODO: Better calculation
targets.add(new SnapTarget(-mDividerSize, SnapTarget.FLAG_DISMISS_START));
- targets.add(new SnapTarget((int) (0.35f * dividerMax) - mDividerSize / 2,
+ targets.add(new SnapTarget((int) (0.38f * dividerMax) - mDividerSize / 2,
SnapTarget.FLAG_NONE));
targets.add(new SnapTarget(dividerMax / 2 - mDividerSize / 2, SnapTarget.FLAG_NONE));
- targets.add(new SnapTarget((int) (0.65f * dividerMax) - mDividerSize / 2,
+ targets.add(new SnapTarget((int) (0.62f * dividerMax) - mDividerSize / 2,
SnapTarget.FLAG_NONE));
targets.add(new SnapTarget(dividerMax, SnapTarget.FLAG_DISMISS_END));
return targets;
diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
index a520a33..98f3f0c 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
@@ -127,6 +127,28 @@
mWindowManager = windowManager;
}
+ public WindowManagerProxy getWindowManagerProxy() {
+ return mWindowManagerProxy;
+ }
+
+ public boolean startDragging() {
+ mDockSide = mWindowManagerProxy.getDockSide();
+ if (mDockSide != WindowManager.DOCKED_INVALID) {
+ mWindowManagerProxy.setResizing(true);
+ mWindowManager.setSlippery(false);
+ liftBackground();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public void stopDragging(int position, float velocity) {
+ fling(position, velocity);
+ mWindowManager.setSlippery(true);
+ releaseBackground();
+ }
+
@Override
public boolean onTouch(View v, MotionEvent event) {
convertToScreenCoordinates(event);
@@ -138,20 +160,13 @@
mStartX = (int) event.getX();
mStartY = (int) event.getY();
getLocationOnScreen(mTempInt2);
- mDockSide = mWindowManagerProxy.getDockSide();
+ boolean result = startDragging();
if (isHorizontalDivision()) {
mStartPosition = mTempInt2[1] + mDividerInsets;
} else {
mStartPosition = mTempInt2[0] + mDividerInsets;
}
- if (mDockSide != WindowManager.DOCKED_INVALID) {
- mWindowManagerProxy.setResizing(true);
- mWindowManager.setSlippery(false);
- liftBackground();
- return true;
- } else {
- return false;
- }
+ return result;
case MotionEvent.ACTION_MOVE:
mVelocityTracker.addMovement(event);
int x = (int) event.getX();
@@ -168,10 +183,9 @@
y = (int) event.getRawY();
mVelocityTracker.computeCurrentVelocity(1000);
- fling(x, y, mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity());
-
- mWindowManager.setSlippery(true);
- releaseBackground();
+ int position = calculatePosition(x, y);
+ stopDragging(position, isHorizontalDivision() ? mVelocityTracker.getYVelocity()
+ : mVelocityTracker.getXVelocity());
break;
}
return true;
@@ -181,9 +195,7 @@
event.setLocation(event.getRawX(), event.getRawY());
}
- private void fling(int x, int y, float xVelocity, float yVelocity) {
- int position = calculatePosition(x, y);
- float velocity = isHorizontalDivision() ? yVelocity : xVelocity;
+ private void fling(int position, float velocity) {
final SnapTarget snapTarget = new DividerSnapAlgorithm(getContext(), mFlingAnimationUtils,
mDividerSize, isHorizontalDivision()).calculateSnapTarget(position, velocity);
@@ -277,9 +289,8 @@
return isHorizontalDivision() ? calculateYPosition(touchY) : calculateXPosition(touchX);
}
- private boolean isHorizontalDivision() {
- return mDockSide == WindowManager.DOCKED_TOP
- || mDockSide == WindowManager.DOCKED_BOTTOM;
+ public boolean isHorizontalDivision() {
+ return getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
}
private int calculateXPosition(int touchX) {
@@ -290,22 +301,38 @@
return mStartPosition + touchY - mStartY;
}
- private void resizeStack(int position) {
- mTmpRect.set(0, 0, mDisplayWidth, mDisplayHeight);
- switch (mDockSide) {
+ public void calculateBoundsForPosition(int position, int dockSide, Rect outRect) {
+ outRect.set(0, 0, mDisplayWidth, mDisplayHeight);
+ switch (dockSide) {
case WindowManager.DOCKED_LEFT:
- mTmpRect.right = position;
+ outRect.right = position;
break;
case WindowManager.DOCKED_TOP:
- mTmpRect.bottom = position;
+ outRect.bottom = position;
break;
case WindowManager.DOCKED_RIGHT:
- mTmpRect.left = position + mDividerWindowWidth - 2 * mDividerInsets;
+ outRect.left = position + mDividerWindowWidth - 2 * mDividerInsets;
break;
case WindowManager.DOCKED_BOTTOM:
- mTmpRect.top = position + mDividerWindowWidth - 2 * mDividerInsets;
+ outRect.top = position + mDividerWindowWidth - 2 * mDividerInsets;
break;
}
+ if (outRect.left > outRect.right) {
+ outRect.left = outRect.right;
+ }
+ if (outRect.top > outRect.bottom) {
+ outRect.top = outRect.bottom;
+ }
+ if (outRect.right < outRect.left) {
+ outRect.right = outRect.left;
+ }
+ if (outRect.bottom < outRect.top) {
+ outRect.bottom = outRect.top;
+ }
+ }
+
+ public void resizeStack(int position) {
+ calculateBoundsForPosition(position, mDockSide, mTmpRect);
if (mTmpRect.equals(mLastResizeRect)) {
return;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
index 6f8cd8c..da3cd54 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
@@ -130,6 +130,7 @@
private final int mLowPriorityColor;
private boolean mIsBelowSpeedBump;
private FalsingManager mFalsingManager;
+ private boolean mTrackTouch;
public ActivatableNotificationView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -175,15 +176,30 @@
};
@Override
- public boolean onTouchEvent(MotionEvent event) {
- if (mDimmed) {
+ public boolean dispatchTouchEvent(MotionEvent event) {
+ if (mDimmed && !mActivated) {
return handleTouchEventDimmed(event);
} else {
- return super.onTouchEvent(event);
+ return super.dispatchTouchEvent(event);
}
}
@Override
+ public boolean onTouchEvent(MotionEvent event) {
+ boolean result;
+ if (mDimmed && mActivated) {
+ result = handleTouchEventDimmed(event);
+ } else {
+ result = super.onTouchEvent(event);
+ }
+ if (mActivated && result && event.getAction() == MotionEvent.ACTION_UP) {
+ mFalsingManager.onNotificationDoubleTap();
+ removeCallbacks(mTapTimeoutRunnable);
+ }
+ return result;
+ }
+
+ @Override
public void drawableHotspotChanged(float x, float y) {
if (!mDimmed){
mBackgroundNormal.drawableHotspotChanged(x, y);
@@ -206,14 +222,15 @@
case MotionEvent.ACTION_DOWN:
mDownX = event.getX();
mDownY = event.getY();
+ mTrackTouch = true;
if (mDownY > getActualHeight()) {
- return false;
+ mTrackTouch = false;
}
break;
case MotionEvent.ACTION_MOVE:
if (!isWithinTouchSlop(event)) {
makeInactive(true /* animate */);
- return false;
+ mTrackTouch = false;
}
break;
case MotionEvent.ACTION_UP:
@@ -222,23 +239,23 @@
makeActive();
postDelayed(mTapTimeoutRunnable, DOUBLETAP_TIMEOUT_MS);
} else {
- mFalsingManager.onNotificationDoubleTap();
- boolean performed = performClick();
- if (performed) {
- removeCallbacks(mTapTimeoutRunnable);
+ if (!performClick()) {
+ return false;
}
}
} else {
makeInactive(true /* animate */);
+ mTrackTouch = false;
}
break;
case MotionEvent.ACTION_CANCEL:
makeInactive(true /* animate */);
+ mTrackTouch = false;
break;
default:
break;
}
- return true;
+ return mTrackTouch;
}
private void makeActive() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 3f0000e..3c7ff7f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -40,7 +40,6 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.ContentObserver;
-import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.AsyncTask;
@@ -62,6 +61,7 @@
import android.service.notification.NotificationListenerService.RankingMap;
import android.service.notification.StatusBarNotification;
import android.text.TextUtils;
+import android.util.ArraySet;
import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
@@ -79,6 +79,7 @@
import android.view.accessibility.AccessibilityManager;
import android.view.animation.AnimationUtils;
import android.widget.DateTimeView;
+import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RemoteViews;
import android.widget.TextView;
@@ -115,7 +116,8 @@
public abstract class BaseStatusBar extends SystemUI implements
CommandQueue.Callbacks, ActivatableNotificationView.OnActivatedListener,
- ExpandableNotificationRow.ExpansionLogger, NotificationData.Environment {
+ ExpandableNotificationRow.ExpansionLogger, NotificationData.Environment,
+ ExpandableNotificationRow.OnExpandClickListener {
public static final String TAG = "StatusBar";
public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
public static final boolean MULTIUSER_DEBUG = false;
@@ -175,6 +177,7 @@
protected boolean mDeviceInteractive;
protected boolean mVisible;
+ protected ArraySet<Entry> mHeadsUpEntriesToRemoveOnSwitch = new ArraySet<>();
// mScreenOnFromKeyguard && mVisible.
private boolean mVisibleToUser;
@@ -190,6 +193,7 @@
protected IDreamManager mDreamManager;
PowerManager mPowerManager;
protected StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
+ protected int mRowMinHeightLegacy;
protected int mRowMinHeight;
protected int mRowMaxHeight;
@@ -278,6 +282,10 @@
@Override
public boolean onClickHandler(
final View view, final PendingIntent pendingIntent, final Intent fillInIntent) {
+ if (handleRemoteInput(view, pendingIntent, fillInIntent)) {
+ return true;
+ }
+
if (DEBUG) {
Log.v(TAG, "Notification click handler invoked for intent: " + pendingIntent);
}
@@ -366,6 +374,65 @@
Intent fillInIntent) {
return super.onClickHandler(view, pendingIntent, fillInIntent);
}
+
+ private boolean handleRemoteInput(View view, PendingIntent pendingIntent, Intent fillInIntent) {
+ Object tag = view.getTag(com.android.internal.R.id.remote_input_tag);
+ RemoteInput[] inputs = null;
+ if (tag instanceof RemoteInput[]) {
+ inputs = (RemoteInput[]) tag;
+ }
+
+ if (inputs == null) {
+ return false;
+ }
+
+ RemoteInput input = null;
+
+ for (RemoteInput i : inputs) {
+ if (i.getAllowFreeFormInput()) {
+ input = i;
+ }
+ }
+
+ if (input == null) {
+ return false;
+ }
+
+ ViewParent p = view.getParent();
+ RemoteInputView riv = null;
+ while (p != null) {
+ if (p instanceof View) {
+ View pv = (View) p;
+ if (pv.isRootNamespace()) {
+ riv = (RemoteInputView) pv.findViewWithTag(RemoteInputView.VIEW_TAG);
+ break;
+ }
+ }
+ p = p.getParent();
+ }
+
+ if (riv == null) {
+ return false;
+ }
+
+ riv.setVisibility(View.VISIBLE);
+ int cx = view.getLeft() + view.getWidth() / 2;
+ int cy = view.getTop() + view.getHeight() / 2;
+ int w = riv.getWidth();
+ int h = riv.getHeight();
+ int r = Math.max(
+ Math.max(cx + cy, cx + (h - cy)),
+ Math.max((w - cx) + cy, (w - cx) + (h - cy)));
+ ViewAnimationUtils.createCircularReveal(riv, cx, cy, 0, r)
+ .start();
+
+ riv.setPendingIntent(pendingIntent);
+ riv.setRemoteInput(inputs, input);
+ riv.focus();
+
+ return true;
+ }
+
};
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@@ -468,7 +535,6 @@
processForRemoteInput(sbn.getNotification());
String key = sbn.getKey();
boolean isUpdate = mNotificationData.get(key) != null;
-
// In case we don't allow child notifications, we ignore children of
// notifications that have a summary, since we're not going to show them
// anyway. This is true also when the summary is canceled,
@@ -822,15 +888,6 @@
entry.row.setShowingLegacyBackground(true);
entry.legacy = true;
}
- } else {
- // Using platform templates
- final int color = sbn.getNotification().color;
- if (isMediaNotification(entry)) {
- entry.row.setTintColor(color == Notification.COLOR_DEFAULT
- ? mContext.getColor(
- R.color.notification_material_background_media_default_color)
- : color);
- }
}
if (entry.icon != null) {
@@ -1234,6 +1291,22 @@
}
}
+ /**
+ * Called when the panel was layouted expanded for the first time after being collapsed.
+ */
+ public void onPanelExpandedAndLayouted() {
+ if (mState == StatusBarState.KEYGUARD) {
+ // Since the number of notifications is determined based on the height of the view, we
+ // need to update them.
+ updateRowStates();
+ mStackScroller.onHeightChanged(null, false);
+ }
+ }
+
+ @Override
+ public void onExpandClicked(View clickedView, boolean nowExpanded) {
+ }
+
protected class H extends Handler {
public void handleMessage(Message m) {
switch (m.what) {
@@ -1272,7 +1345,6 @@
PackageManager pmUser = getPackageManagerForUser(mContext,
entry.notification.getUser().getIdentifier());
- int maxHeight = mRowMaxHeight;
final StatusBarNotification sbn = entry.notification;
entry.cacheContentViews(mContext, null);
@@ -1315,6 +1387,7 @@
parent, false);
row.setExpansionLogger(this, entry.notification.getKey());
row.setGroupManager(mGroupManager);
+ row.setOnExpandClickListener(this);
}
workAroundBadLayerDrawableOpacity(row);
@@ -1433,18 +1506,6 @@
Drawable iconDrawable = StatusBarIconView.getIcon(mContext, ic);
icon.setImageDrawable(iconDrawable);
- if (entry.targetSdk >= Build.VERSION_CODES.LOLLIPOP
- || mNotificationColorUtil.isGrayscaleIcon(iconDrawable)) {
- icon.setBackgroundResource(
- com.android.internal.R.drawable.notification_icon_legacy_bg);
- int padding = mContext.getResources().getDimensionPixelSize(
- com.android.internal.R.dimen.notification_large_icon_circle_padding);
- icon.setPadding(padding, padding, padding, padding);
- if (sbn.getNotification().color != Notification.COLOR_DEFAULT) {
- icon.getBackground().setColorFilter(
- sbn.getNotification().color, PorterDuff.Mode.SRC_ATOP);
- }
- }
if (profileBadge != null) {
Drawable profileDrawable = mContext.getPackageManager().getUserBadgeForDensity(
@@ -1471,11 +1532,6 @@
R.style.TextAppearance_Material_Notification_Parenthetical);
}
- int topPadding = Notification.Builder.calculateTopPadding(mContext,
- false /* hasThreeLines */,
- mContext.getResources().getConfiguration().fontScale);
- title.setPadding(0, topPadding, 0, 0);
-
contentContainerPublic.setContractedChild(publicViewLocal);
entry.autoRedacted = true;
}
@@ -1488,7 +1544,7 @@
}
}
entry.row = row;
- entry.row.setHeightRange(mRowMinHeight, maxHeight);
+ updateNotificationHeightRange(entry);
entry.row.setOnActivatedListener(this);
entry.row.setExpandable(bigContentViewLocal != null);
@@ -1501,11 +1557,19 @@
row.setUserExpanded(userExpanded);
}
row.setUserLocked(userLocked);
- row.setEntry(entry);
+ row.updateStatusBarNotification(entry.notification);
applyRemoteInput(entry);
return true;
}
+ private void updateNotificationHeightRange(Entry entry) {
+ boolean customView = entry.getContentView().getId()
+ != com.android.internal.R.id.status_bar_latest_event_content;
+ boolean beforeN = entry.targetSdk < Build.VERSION_CODES.N;
+ int minHeight = customView && beforeN ? mRowMinHeightLegacy : mRowMinHeight;
+ entry.row.setHeightRange(minHeight, mRowMaxHeight);
+ }
+
/**
* Adds RemoteInput actions from the WearableExtender; to be removed once more apps support this
* via first-class API.
@@ -1550,15 +1614,15 @@
RemoteInput remoteInput = null;
- // See if the notification has exactly one action and this action allows free-form input
- // TODO: relax restrictions once we support more than one remote input action.
Notification.Action[] actions = entry.notification.getNotification().actions;
- if (actions != null && actions.length == 1) {
- if (actions[0].getRemoteInputs() != null) {
- for (RemoteInput ri : actions[0].getRemoteInputs()) {
- if (ri.getAllowFreeFormInput()) {
- remoteInput = ri;
- break;
+ if (actions != null) {
+ for (Notification.Action a : actions) {
+ if (a.getRemoteInputs() != null) {
+ for (RemoteInput ri : a.getRemoteInputs()) {
+ if (ri.getAllowFreeFormInput()) {
+ remoteInput = ri;
+ break;
+ }
}
}
}
@@ -1568,32 +1632,36 @@
if (remoteInput != null) {
View bigContentView = entry.getExpandedContentView();
if (bigContentView != null) {
- inflateRemoteInput(bigContentView, entry, remoteInput, actions);
+ inflateRemoteInput(bigContentView, entry);
}
View headsUpContentView = entry.getHeadsUpContentView();
if (headsUpContentView != null) {
- inflateRemoteInput(headsUpContentView, entry, remoteInput, actions);
+ inflateRemoteInput(headsUpContentView, entry);
}
}
}
- private void inflateRemoteInput(View view, Entry entry, RemoteInput remoteInput,
- Notification.Action[] actions) {
- View actionContainerCandidate = view.findViewById(com.android.internal.R.id.actions);
- if (actionContainerCandidate instanceof ViewGroup) {
- ViewGroup actionContainer = (ViewGroup) actionContainerCandidate;
- RemoteInputView riv = inflateRemoteInputView(actionContainer, entry,
- actions[0], remoteInput);
+ private RemoteInputView inflateRemoteInput(View view, Entry entry) {
+ View actionContainerCandidate = view.findViewById(
+ com.android.internal.R.id.actions_container);
+ if (actionContainerCandidate instanceof FrameLayout) {
+ ViewGroup actionContainer = (FrameLayout) actionContainerCandidate;
+ RemoteInputView riv = inflateRemoteInputView(actionContainer, entry);
if (riv != null) {
- actionContainer.removeAllViews();
- actionContainer.addView(riv);
+ riv.setVisibility(View.INVISIBLE);
+ actionContainer.addView(riv, new FrameLayout.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT)
+ );
+ riv.setBackgroundColor(entry.notification.getNotification().color);
+ return riv;
}
}
+ return null;
}
- protected RemoteInputView inflateRemoteInputView(ViewGroup root, Entry entry,
- Notification.Action action, RemoteInput remoteInput) {
+ protected RemoteInputView inflateRemoteInputView(ViewGroup root, Entry entry) {
return null;
}
@@ -1664,7 +1732,10 @@
return;
}
- final PendingIntent intent = sbn.getNotification().contentIntent;
+ Notification notification = sbn.getNotification();
+ final PendingIntent intent = notification.contentIntent != null
+ ? notification.contentIntent
+ : notification.fullScreenIntent;
final String notificationKey = sbn.getKey();
// Mark notification for one frame.
@@ -1746,8 +1817,8 @@
}
public void register(ExpandableNotificationRow row, StatusBarNotification sbn) {
- final PendingIntent contentIntent = sbn.getNotification().contentIntent;
- if (contentIntent != null) {
+ Notification notification = sbn.getNotification();
+ if (notification.contentIntent != null || notification.fullScreenIntent != null) {
row.setOnClickListener(this);
} else {
row.setOnClickListener(null);
@@ -1910,15 +1981,15 @@
}
/**
+ * @param recompute wheter the number should be recomputed
* @return The number of notifications we show on Keyguard.
*/
- protected abstract int getMaxKeyguardNotifications();
+ protected abstract int getMaxKeyguardNotifications(boolean recompute);
/**
* Updates expanded, dimmed and locked states of notification rows.
*/
protected void updateRowStates() {
- int maxKeyguardNotifications = getMaxKeyguardNotifications();
mKeyguardIconOverflowContainer.getIconsView().removeAllViews();
ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
@@ -1926,6 +1997,10 @@
int visibleNotifications = 0;
boolean onKeyguard = mState == StatusBarState.KEYGUARD;
+ int maxNotifications = 0;
+ if (onKeyguard) {
+ maxNotifications = getMaxKeyguardNotifications(true /* recompute */);
+ }
for (int i = 0; i < N; i++) {
NotificationData.Entry entry = activeNotifications.get(i);
if (onKeyguard) {
@@ -1941,7 +2016,7 @@
== View.VISIBLE;
boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification);
if ((isLockscreenPublicMode() && !mShowLockscreenNotifications) ||
- (onKeyguard && (visibleNotifications >= maxKeyguardNotifications
+ (onKeyguard && (visibleNotifications >= maxNotifications
&& !childWithVisibleSummary
|| !showOnKeyguard))) {
entry.row.setVisibility(View.GONE);
@@ -2013,11 +2088,14 @@
Entry entry = mNotificationData.get(key);
if (entry == null) {
return;
+ } else if (mHeadsUpEntriesToRemoveOnSwitch.contains(entry)) {
+ mHeadsUpEntriesToRemoveOnSwitch.remove(entry);
}
Notification n = notification.getNotification();
+ mNotificationData.updateRanking(ranking);
- boolean applyInPlace = !entry.cacheContentViews(mContext, notification.getNotification());
+ boolean applyInPlace = entry.cacheContentViews(mContext, notification.getNotification());
boolean shouldInterrupt = shouldInterrupt(entry, notification);
boolean alertAgain = alertAgain(entry, n);
if (DEBUG) {
@@ -2070,7 +2148,6 @@
inflateViews(entry, mStackScroller);
}
updateHeadsUp(key, entry, shouldInterrupt, alertAgain);
- mNotificationData.updateRanking(ranking);
updateNotifications();
// Update the veto button accordingly (and as a result, whether this row is
@@ -2114,8 +2191,7 @@
// update the contentIntent
mNotificationClicker.register(entry.row, sbn);
- entry.row.setEntry(entry);
- entry.row.notifyContentUpdated();
+ entry.row.updateStatusBarNotification(entry.notification);
entry.row.resetHeight();
applyRemoteInput(entry);
@@ -2155,20 +2231,17 @@
boolean isHighPriority = sbn.getScore() >= INTERRUPTION_THRESHOLD;
boolean isFullscreen = notification.fullScreenIntent != null;
boolean hasTicker = mHeadsUpTicker && !TextUtils.isEmpty(notification.tickerText);
- boolean isAllowed = notification.extras.getInt(Notification.EXTRA_AS_HEADS_UP,
- Notification.HEADS_UP_ALLOWED) != Notification.HEADS_UP_NEVER;
boolean accessibilityForcesLaunch = isFullscreen
&& mAccessibilityManager.isTouchExplorationEnabled();
boolean justLaunchedFullScreenIntent = entry.hasJustLaunchedFullScreenIntent();
-
boolean interrupt = (isFullscreen || (isHighPriority && (isNoisy || hasTicker)))
- && isAllowed
&& !accessibilityForcesLaunch
&& !justLaunchedFullScreenIntent
&& mPowerManager.isScreenOn()
&& (!mStatusBarKeyguardViewManager.isShowing()
|| mStatusBarKeyguardViewManager.isOccluded())
- && !mStatusBarKeyguardViewManager.isInputRestricted();
+ && !mStatusBarKeyguardViewManager.isInputRestricted()
+ && !mNotificationData.shouldSuppressPeek(sbn.getKey());
try {
interrupt = interrupt && !mDreamManager.isDreaming();
} catch (RemoteException e) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
index 14051916..8570198 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
@@ -120,12 +120,12 @@
if (mLastHeight > mMinDragDistance) {
if (!mDraggedFarEnough) {
mDraggedFarEnough = true;
- mDragDownCallback.onThresholdReached();
+ mDragDownCallback.onCrossedThreshold(true);
}
} else {
if (mDraggedFarEnough) {
mDraggedFarEnough = false;
- mDragDownCallback.onDragDownReset();
+ mDragDownCallback.onCrossedThreshold(false);
}
}
return true;
@@ -236,7 +236,12 @@
*/
boolean onDraggedDown(View startingChild, int dragLengthY);
void onDragDownReset();
- void onThresholdReached();
+
+ /**
+ * The user has dragged either above or below the threshold
+ * @param above whether he dragged above it
+ */
+ void onCrossedThreshold(boolean above);
void onTouchSlopExceeded();
void setEmptyDragAmount(float amount);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index 3603900..7a94a58 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -25,16 +25,17 @@
import android.service.notification.StatusBarNotification;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import android.view.NotificationHeaderView;
import android.view.View;
import android.view.ViewStub;
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.LinearInterpolator;
import android.widget.Chronometer;
import android.widget.ImageView;
+import android.widget.RemoteViews;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
-import com.android.systemui.statusbar.notification.NotificationHeaderView;
import com.android.systemui.statusbar.phone.NotificationGroupManager;
import com.android.systemui.statusbar.stack.NotificationChildrenContainer;
import com.android.systemui.statusbar.stack.StackScrollState;
@@ -89,22 +90,37 @@
private boolean mIsHeadsUp;
private boolean mLastChronometerRunning = true;
private NotificationHeaderView mNotificationHeader;
- private ViewStub mNotificationHeaderStub;
private ViewStub mChildrenContainerStub;
private NotificationGroupManager mGroupManager;
private boolean mChildrenExpanded;
private boolean mIsSummaryWithChildren;
private NotificationChildrenContainer mChildrenContainer;
private ViewStub mGutsStub;
- private boolean mHasNotificationHeader;
private boolean mIsSystemChildExpanded;
private boolean mIsPinned;
private FalsingManager mFalsingManager;
private boolean mJustClicked;
- private NotificationData.Entry mEntry;
+ private boolean mIconAnimationRunning;
private boolean mShowNoBackground;
private ExpandableNotificationRow mNotificationParent;
+ private OnExpandClickListener mOnExpandClickListener;
+ private OnClickListener mExpandClickListener = new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mGroupManager.isSummaryOfGroup(mStatusBarNotification)) {
+ mGroupManager.toggleGroupExpansion(mStatusBarNotification);
+ mOnExpandClickListener.onExpandClicked(ExpandableNotificationRow.this,
+ mGroupManager.isGroupExpanded(mStatusBarNotification));
+ } else {
+ boolean nowExpanded = !isExpanded();
+ setUserExpanded(nowExpanded);
+ notifyHeightChanged(true);
+ mOnExpandClickListener.onExpandClicked(ExpandableNotificationRow.this,
+ nowExpanded);
+ }
+ }
+ };
public NotificationContentView getPrivateLayout() {
return mPrivateLayout;
@@ -117,6 +133,16 @@
public void setIconAnimationRunning(boolean running) {
setIconAnimationRunning(running, mPublicLayout);
setIconAnimationRunning(running, mPrivateLayout);
+ setIconAnimationRunningForChild(running, mNotificationHeader);
+ if (mIsSummaryWithChildren) {
+ List<ExpandableNotificationRow> notificationChildren =
+ mChildrenContainer.getNotificationChildren();
+ for (int i = 0; i < notificationChildren.size(); i++) {
+ ExpandableNotificationRow child = notificationChildren.get(i);
+ child.setIconAnimationRunning(running);
+ }
+ }
+ mIconAnimationRunning = running;
}
private void setIconAnimationRunning(boolean running, NotificationContentView layout) {
@@ -161,10 +187,17 @@
}
}
- private void setStatusBarNotification(StatusBarNotification statusBarNotification) {
+ public void updateStatusBarNotification(StatusBarNotification statusBarNotification) {
mStatusBarNotification = statusBarNotification;
- mPrivateLayout.setStatusBarNotification(statusBarNotification);
+ mPrivateLayout.onNotificationUpdated(statusBarNotification);
+ mPublicLayout.onNotificationUpdated(statusBarNotification);
updateVetoButton();
+ if (mIsSummaryWithChildren) {
+ recreateNotificationHeader();
+ }
+ if (mIconAnimationRunning) {
+ setIconAnimationRunning(true);
+ }
onChildrenCountChanged();
}
@@ -381,11 +414,6 @@
}
}
- public void setEntry(NotificationData.Entry entry) {
- mEntry = entry;
- setStatusBarNotification(entry.notification);
- }
-
public CharSequence getSubText() {
Notification notification = mStatusBarNotification.getNotification();
CharSequence subText = notification.extras.getCharSequence(Notification.EXTRA_SUMMARY_TEXT);
@@ -399,6 +427,10 @@
mPrivateLayout.setSubTextVisible(visible);
}
+ public void setOnExpandClickListener(OnExpandClickListener onExpandClickListener) {
+ mOnExpandClickListener = onExpandClickListener;
+ }
+
public interface ExpansionLogger {
public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
}
@@ -452,6 +484,8 @@
super.onFinishInflate();
mPublicLayout = (NotificationContentView) findViewById(R.id.expandedPublic);
mPrivateLayout = (NotificationContentView) findViewById(R.id.expanded);
+ mPrivateLayout.setExpandClickListener(mExpandClickListener);
+ mPublicLayout.setExpandClickListener(mExpandClickListener);
mGutsStub = (ViewStub) findViewById(R.id.notification_guts_stub);
mGutsStub.setOnInflateListener(new ViewStub.OnInflateListener() {
@Override
@@ -462,15 +496,6 @@
mGutsStub = null;
}
});
- mNotificationHeaderStub = (ViewStub) findViewById(R.id.notification_header_stub);
- mNotificationHeaderStub.setOnInflateListener(new ViewStub.OnInflateListener() {
- @Override
- public void onInflate(ViewStub stub, View inflated) {
- mNotificationHeader = (NotificationHeaderView) inflated;
- mNotificationHeader.setGroupManager(mGroupManager);
- mNotificationHeader.bind(mEntry);
- }
- });
mChildrenContainerStub = (ViewStub) findViewById(R.id.child_container_stub);
mChildrenContainerStub.setOnInflateListener(new ViewStub.OnInflateListener() {
@@ -494,6 +519,7 @@
return;
}
mChildrenContainer.setVisibility(mIsSummaryWithChildren ? VISIBLE : INVISIBLE);
+ mNotificationHeader.setVisibility(mIsSummaryWithChildren ? VISIBLE : INVISIBLE);
mPrivateLayout.setVisibility(!mIsSummaryWithChildren ? VISIBLE : INVISIBLE);
}
@@ -523,6 +549,8 @@
public void setHeightRange(int rowMinHeight, int rowMaxHeight) {
mRowMinHeight = rowMinHeight;
mMaxViewHeight = rowMaxHeight;
+ mPrivateLayout.setSmallHeight(mRowMinHeight);
+ mPublicLayout.setSmallHeight(mRowMinHeight);
}
public boolean isExpandable() {
@@ -534,6 +562,7 @@
public void setExpandable(boolean expandable) {
mExpandable = expandable;
+ mPrivateLayout.updateExpandButtons(isExpandable());
}
/**
@@ -654,8 +683,7 @@
if (mSensitive && mHideSensitiveForIntrinsicHeight) {
return mRowMinHeight;
} else if (mIsSummaryWithChildren && !mOnKeyguard) {
- return mChildrenContainer.getIntrinsicHeight()
- + mNotificationHeader.getHeight();
+ return mChildrenContainer.getIntrinsicHeight();
} else if (mIsHeadsUp) {
if (inExpansionState) {
return Math.max(mMaxExpandHeight, mHeadsUpHeight);
@@ -681,12 +709,18 @@
}
private void onChildrenCountChanged() {
- mIsSummaryWithChildren = BaseStatusBar.ENABLE_CHILD_NOTIFICATIONS
+ mIsSummaryWithChildren = BaseStatusBar.ENABLE_CHILD_NOTIFICATIONS
&& mGroupManager.hasGroupChildren(mStatusBarNotification);
- if (mIsSummaryWithChildren && mChildrenContainer == null) {
- mChildrenContainerStub.inflate();
+ if (mIsSummaryWithChildren) {
+ if (mChildrenContainer == null) {
+ mChildrenContainerStub.inflate();
+ }
+ if (mNotificationHeader == null) {
+ recreateNotificationHeader();
+ }
}
- updateNotificationHeader();
+ mPrivateLayout.updateExpandButtons(isExpandable());
+ updateHeaderChildCount();
updateChildrenVisibility(true);
}
@@ -771,6 +805,7 @@
animateShowingPublic(delay, duration);
}
+ mPrivateLayout.updateExpandButtons(isExpandable());
updateVetoButton();
mShowingPublicInitialized = true;
}
@@ -811,23 +846,11 @@
}
}
- public void updateNotificationHeader() {
- boolean hasHeader = hasNotificationHeader();
- if (hasHeader != mHasNotificationHeader) {
- if (hasHeader) {
- if (mNotificationHeader == null) {
- mNotificationHeaderStub.inflate();
- }
- mNotificationHeader.setVisibility(View.VISIBLE);
- } else if (mNotificationHeader != null) {
- mNotificationHeader.setVisibility(View.GONE);
- }
- notifyHeightChanged(true /* needsAnimation */);
+ public void updateHeaderChildCount() {
+ if (mIsSummaryWithChildren) {
+ mNotificationHeader.setChildCount(
+ mChildrenContainer.getNotificationChildren().size());
}
- if (hasHeader) {
- mNotificationHeader.bind(mEntry);
- }
- mHasNotificationHeader = hasHeader;
}
public static void applyTint(View v, int color) {
@@ -876,8 +899,7 @@
@Override
public int getMaxContentHeight() {
if (mIsSummaryWithChildren && !mShowingPublic) {
- return mChildrenContainer.getMaxContentHeight()
- + mNotificationHeader.getHeight();
+ return mChildrenContainer.getMaxContentHeight();
}
NotificationContentView showingLayout = getShowingLayout();
return showingLayout.getMaxHeight();
@@ -885,15 +907,19 @@
@Override
public int getMinHeight() {
- if (mIsSummaryWithChildren && !mOnKeyguard) {
- return mChildrenContainer.getMinHeight()
- + mNotificationHeader.getHeight();
- }
NotificationContentView showingLayout = getShowingLayout();
return showingLayout.getMinHeight();
}
@Override
+ public int getMinExpandHeight() {
+ if (mIsSummaryWithChildren && !mOnKeyguard) {
+ return mChildrenContainer.getMinHeight();
+ }
+ return getMinHeight();
+ }
+
+ @Override
protected boolean shouldLimitViewHeight() {
return !mIsSummaryWithChildren;
}
@@ -908,9 +934,21 @@
}
}
- public void notifyContentUpdated() {
- mPublicLayout.notifyContentUpdated();
- mPrivateLayout.notifyContentUpdated();
+ private void recreateNotificationHeader() {
+ final Notification.Builder builder = Notification.Builder.recoverBuilder(getContext(),
+ getStatusBarNotification().getNotification());
+ final RemoteViews header = builder.makeNotificationHeader();
+ if (mNotificationHeader == null) {
+ mNotificationHeader = (NotificationHeaderView) header.apply(getContext(), this);
+ final View expandButton = mNotificationHeader.findViewById(
+ com.android.internal.R.id.expand_button);
+ expandButton.setVisibility(VISIBLE);
+ mNotificationHeader.setOnClickListener(mExpandClickListener);
+ addView(mNotificationHeader);
+ } else {
+ header.reapply(getContext(), mNotificationHeader);
+ }
+ updateHeaderChildCount();
}
public boolean isMaxExpandHeightInitialized() {
@@ -958,4 +996,8 @@
mLogger.logNotificationExpansion(mLoggingKey, userAction, nowExpanded) ;
}
}
+
+ public interface OnExpandClickListener {
+ void onExpandClicked(View clickedView, boolean nowExpanded);
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
index af59ac7..51602e7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
@@ -195,6 +195,15 @@
}
/**
+ * @return The minimum height this child chan be expanded to. Note that this might be different
+ * than {@link #getMinHeight()} because some elements can't be collapsed by an expand gesture
+ * to it's absolute minimal height
+ */
+ public int getMinExpandHeight() {
+ return getHeight();
+ }
+
+ /**
* Sets the notification as dimmed. The default implementation does nothing.
*
* @param dimmed Whether the notification should be dimmed.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 6d13947..71904fa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -48,8 +48,8 @@
*/
public class KeyguardIndicationController {
- private static final String TAG = "KeyguardIndicationController";
- private static final boolean DEBUG_CHARGING_CURRENT = false;
+ private static final String TAG = "KeyguardIndication";
+ private static final boolean DEBUG_CHARGING_SPEED = false;
private static final int MSG_HIDE_TRANSIENT = 1;
private static final int MSG_CLEAR_FP_MSG = 2;
@@ -72,7 +72,7 @@
private boolean mPowerPluggedIn;
private boolean mPowerCharged;
private int mChargingSpeed;
- private int mChargingCurrent;
+ private int mChargingWattage;
private String mMessageToShowOnScreenOn;
public KeyguardIndicationController(Context context, KeyguardIndicationTextView textView,
@@ -173,8 +173,8 @@
}
if (mPowerPluggedIn) {
String indication = computePowerIndication();
- if (DEBUG_CHARGING_CURRENT) {
- indication += ", " + (mChargingCurrent / 1000) + " mA";
+ if (DEBUG_CHARGING_SPEED) {
+ indication += ", " + (mChargingWattage / 1000) + " mW";
}
return indication;
}
@@ -231,7 +231,7 @@
|| status.status == BatteryManager.BATTERY_STATUS_FULL;
mPowerPluggedIn = status.isPluggedIn() && isChargingOrFull;
mPowerCharged = status.isCharged();
- mChargingCurrent = status.maxChargingCurrent;
+ mChargingWattage = status.maxChargingWattage;
mChargingSpeed = status.getChargingSpeed(mSlowThreshold, mFastThreshold);
updateIndication();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBigMediaNarrowViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBigMediaNarrowViewWrapper.java
deleted file mode 100644
index 91e5404..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBigMediaNarrowViewWrapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 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.systemui.statusbar;
-
-import android.content.Context;
-import android.view.View;
-
-/**
- * Wraps a big media narrow notification template layout.
- */
-public class NotificationBigMediaNarrowViewWrapper extends NotificationMediaViewWrapper {
-
- protected NotificationBigMediaNarrowViewWrapper(Context ctx,
- View view) {
- super(ctx, view);
- }
-
- @Override
- public boolean needsRoundRectClipping() {
- return true;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBigPictureViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBigPictureViewWrapper.java
deleted file mode 100644
index ffe0cd1..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBigPictureViewWrapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2015 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.systemui.statusbar;
-
-import android.content.Context;
-import android.view.View;
-
-/**
- * Wraps a notification view inflated from a big picture style template.
- */
-public class NotificationBigPictureViewWrapper extends NotificationTemplateViewWrapper {
-
- protected NotificationBigPictureViewWrapper(Context ctx, View view) {
- super(ctx, view);
- }
-
- @Override
- public boolean needsRoundRectClipping() {
- return true;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 5aedaf1..fb8086c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -24,6 +24,7 @@
import android.graphics.Rect;
import android.service.notification.StatusBarNotification;
import android.util.AttributeSet;
+import android.view.NotificationHeaderView;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
@@ -52,7 +53,6 @@
private final Rect mClipBounds = new Rect();
private final int mSingleLineHeight;
- private final int mSmallHeight;
private final int mHeadsUpHeight;
private final int mRoundRectRadius;
private final Interpolator mLinearInterpolator = new LinearInterpolator();
@@ -77,7 +77,9 @@
private boolean mIsHeadsUp;
private boolean mShowingLegacyBackground;
private boolean mIsChildInGroup;
+ private int mSmallHeight;
private StatusBarNotification mStatusBarNotification;
+ private NotificationGroupManager mGroupManager;
private final ViewTreeObserver.OnPreDrawListener mEnableAnimationPredrawListener
= new ViewTreeObserver.OnPreDrawListener() {
@@ -96,7 +98,7 @@
mRoundRectRadius);
}
};
- private NotificationGroupManager mGroupManager;
+ private OnClickListener mExpandClickListener;
public NotificationContentView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -104,7 +106,6 @@
mFadePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.ADD));
mSingleLineHeight = getResources().getDimensionPixelSize(
R.dimen.notification_single_line_height);
- mSmallHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height);
mHeadsUpHeight = getResources().getDimensionPixelSize(R.dimen.notification_mid_height);
mRoundRectRadius = getResources().getDimensionPixelSize(
R.dimen.notification_material_rounded_rect_radius);
@@ -114,6 +115,10 @@
setOutlineProvider(mOutlineProvider);
}
+ public void setSmallHeight(int smallHeight) {
+ mSmallHeight = smallHeight;
+ }
+
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int heightMode = MeasureSpec.getMode(heightMeasureSpec);
@@ -426,6 +431,11 @@
*/
private int calculateVisibleType() {
boolean noExpandedChild = mExpandedChild == null;
+
+ if (!noExpandedChild && mContentHeight == mExpandedChild.getHeight()) {
+ return VISIBLE_TYPE_EXPANDED;
+ }
+
if (mIsHeadsUp && mHeadsUpChild != null) {
if (mContentHeight <= mHeadsUpChild.getHeight() || noExpandedChild) {
return VISIBLE_TYPE_HEADSUP;
@@ -443,19 +453,6 @@
}
}
- public void notifyContentUpdated() {
- updateSingleLineView();
- selectLayout(false /* animate */, true /* force */);
- if (mContractedChild != null) {
- mContractedWrapper.notifyContentUpdated();
- mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);
- }
- if (mExpandedChild != null) {
- mExpandedWrapper.notifyContentUpdated();
- }
- updateRoundRectClipping();
- }
-
public boolean isContentExpandable() {
return mExpandedChild != null;
}
@@ -488,9 +485,21 @@
updateSingleLineView();
}
- public void setStatusBarNotification(StatusBarNotification statusBarNotification) {
+ public void onNotificationUpdated(StatusBarNotification statusBarNotification) {
mStatusBarNotification = statusBarNotification;
updateSingleLineView();
+ selectLayout(false /* animate */, true /* force */);
+ if (mContractedChild != null) {
+ mContractedWrapper.notifyContentUpdated();
+ mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);
+ }
+ if (mExpandedChild != null) {
+ mExpandedWrapper.notifyContentUpdated();
+ }
+ if (mHeadsUpChild != null) {
+ mHeadsUpWrapper.notifyContentUpdated();
+ }
+ updateRoundRectClipping();
}
private void updateSingleLineView() {
@@ -515,4 +524,20 @@
public void setGroupManager(NotificationGroupManager groupManager) {
mGroupManager = groupManager;
}
+
+ public void setExpandClickListener(OnClickListener expandClickListener) {
+ mExpandClickListener = expandClickListener;
+ }
+
+ public void updateExpandButtons(boolean expandable) {
+ if (mExpandedChild != null) {
+ mExpandedWrapper.updateExpandability(expandable, mExpandClickListener);
+ }
+ if (mContractedChild != null) {
+ mContractedWrapper.updateExpandability(expandable, mExpandClickListener);
+ }
+ if (mHeadsUpChild != null) {
+ mHeadsUpWrapper.updateExpandability(expandable, mExpandClickListener);
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
index 6a90d8e..89edae3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
@@ -59,6 +59,7 @@
public RemoteViews cachedBigContentView;
public RemoteViews cachedHeadsUpContentView;
public RemoteViews cachedPublicContentView;
+ public CharSequence remoteInputText;
public Entry(StatusBarNotification n, StatusBarIconView ic) {
this.key = n.getKey();
@@ -105,36 +106,29 @@
}
public boolean cacheContentViews(Context ctx, Notification updatedNotification) {
- boolean cached = false;
+ boolean applyInPlace = false;
if (updatedNotification != null) {
final Notification.Builder updatedNotificationBuilder
= Notification.Builder.recoverBuilder(ctx, updatedNotification);
final RemoteViews newContentView = updatedNotificationBuilder.makeContentView();
- if (!compareRemoteViews(cachedContentView, newContentView)) {
- cachedContentView = newContentView;
- cached |= true;
- }
final RemoteViews newBigContentView =
updatedNotificationBuilder.makeBigContentView();
- if (!compareRemoteViews(cachedBigContentView, newBigContentView)) {
- cachedBigContentView = newBigContentView;
- cached |= true;
- }
final RemoteViews newHeadsUpContentView =
updatedNotificationBuilder.makeHeadsUpContentView();
- if (!compareRemoteViews(cachedHeadsUpContentView, newBigContentView)) {
- cachedHeadsUpContentView = newHeadsUpContentView;
- cached |= true;
- }
final Notification updatedPublicNotification = updatedNotification.publicVersion;
final RemoteViews newPubContentView = (updatedPublicNotification != null)
? Notification.Builder.recoverBuilder(
ctx, updatedPublicNotification).makeContentView()
: null;
- if (!compareRemoteViews(cachedPublicContentView, newPubContentView)) {
- cachedPublicContentView = newPubContentView;
- cached |= true;
- }
+
+ applyInPlace = compareRemoteViews(cachedContentView, newContentView)
+ && compareRemoteViews(cachedBigContentView, newBigContentView)
+ && compareRemoteViews(cachedHeadsUpContentView, newHeadsUpContentView)
+ && compareRemoteViews(cachedPublicContentView, newPubContentView);
+ cachedPublicContentView = newPubContentView;
+ cachedHeadsUpContentView = newHeadsUpContentView;
+ cachedBigContentView = newBigContentView;
+ cachedContentView = newContentView;
} else {
final Notification.Builder builder
= Notification.Builder.recoverBuilder(ctx, notification.getNotification());
@@ -150,9 +144,9 @@
= Notification.Builder.recoverBuilder(ctx, publicNotification);
cachedPublicContentView = publicBuilder.makeContentView();
}
- cached = true;
+ applyInPlace = false;
}
- return cached;
+ return applyInPlace;
}
// Returns true if the RemoteViews are the same.
@@ -292,6 +286,15 @@
return NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE;
}
+ public boolean shouldSuppressPeek(String key) {
+ if (mRankingMap != null) {
+ mRankingMap.getRanking(key, mTmpRanking);
+ return (mTmpRanking.getSuppressedVisualEffects()
+ & NotificationListenerService.SUPPRESSED_EFFECT_PEEK) != 0;
+ }
+ return false;
+ }
+
private void updateRankingAndSort(RankingMap ranking) {
if (ranking != null) {
mRankingMap = ranking;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaViewWrapper.java
deleted file mode 100644
index 953c373..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaViewWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 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.systemui.statusbar;
-
-import android.content.Context;
-import android.view.View;
-
-/**
- * Wraps a media notification.
- */
-public class NotificationMediaViewWrapper extends NotificationTemplateViewWrapper {
-
- protected NotificationMediaViewWrapper(Context ctx, View view) {
- super(ctx, view);
- }
-
- @Override
- public void setDark(boolean dark, boolean fade, long delay) {
-
- // Only update the large icon, because the rest is already inverted.
- setPictureGrayscale(dark, fade, delay);
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java
index af6ccd8..f20ccd5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java
@@ -20,24 +20,32 @@
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
+import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
+import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.ImageView;
+import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.systemui.R;
import com.android.systemui.ViewInvertHelper;
import com.android.systemui.statusbar.phone.NotificationPanelView;
+import java.util.ArrayList;
+
/**
* Wraps a notification view inflated from a template.
*/
@@ -47,69 +55,64 @@
private final PorterDuffColorFilter mIconColorFilter = new PorterDuffColorFilter(
0, PorterDuff.Mode.SRC_ATOP);
private final int mIconDarkAlpha;
- private final int mIconBackgroundDarkColor;
+ private final int mIconDarkColor = 0xffffffff;
+ private final int mDarkProgressTint = 0xffffffff;
private final Interpolator mLinearOutSlowInInterpolator;
- private int mIconBackgroundColor;
+ private int mColor;
private ViewInvertHelper mInvertHelper;
private ImageView mIcon;
protected ImageView mPicture;
- /** Whether the icon needs to be forced grayscale when in dark mode. */
- private boolean mIconForceGraysaleWhenDark;
private TextView mSubText;
- private TextView mInfoText;
- private View mProfileBadge;
- private View mThirdLineDivider;
- private View mThirdLine;
+ private View mSubTextDivider;
+ private ImageView mExpandButton;
+ private ViewGroup mNotificationHeader;
+ private ProgressBar mProgressBar;
protected NotificationTemplateViewWrapper(Context ctx, View view) {
super(view);
mIconDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
- mIconBackgroundDarkColor =
- ctx.getColor(R.color.doze_small_icon_background_color);
mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(ctx,
android.R.interpolator.linear_out_slow_in);
+
resolveViews();
}
private void resolveViews() {
View mainColumn = mView.findViewById(com.android.internal.R.id.notification_main_column);
- mInvertHelper = mainColumn != null
- ? new ViewInvertHelper(mainColumn, NotificationPanelView.DOZE_ANIMATION_DURATION)
- : null;
- ImageView largeIcon = (ImageView) mView.findViewById(com.android.internal.R.id.icon);
- ImageView rightIcon = (ImageView) mView.findViewById(com.android.internal.R.id.right_icon);
- mIcon = resolveIcon(largeIcon, rightIcon);
- mPicture = resolvePicture(largeIcon);
- mIconBackgroundColor = resolveBackgroundColor(mIcon);
- mSubText = (TextView) mView.findViewById(com.android.internal.R.id.text);
- mInfoText = (TextView) mView.findViewById(com.android.internal.R.id.info);
- mProfileBadge = mView.findViewById(com.android.internal.R.id.profile_badge_line3);
- mThirdLineDivider = mView.findViewById(com.android.internal.R.id.overflow_divider);
- mThirdLine = mView.findViewById(com.android.internal.R.id.line3);
-
- // If the icon already has a color filter, we assume that we already forced the icon to be
- // white when we created the notification.
- final Drawable iconDrawable = mIcon != null ? mIcon.getDrawable() : null;
- mIconForceGraysaleWhenDark = iconDrawable != null && iconDrawable.getColorFilter() != null;
+ mIcon = (ImageView) mView.findViewById(com.android.internal.R.id.icon);
+ mPicture = (ImageView) mView.findViewById(com.android.internal.R.id.right_icon);
+ mSubText = (TextView) mView.findViewById(com.android.internal.R.id.header_sub_text);
+ mSubTextDivider = mView.findViewById(com.android.internal.R.id.sub_text_divider);
+ mExpandButton = (ImageView) mView.findViewById(com.android.internal.R.id.expand_button);
+ mColor = resolveColor(mExpandButton);
+ final View progress = mView.findViewById(com.android.internal.R.id.progress);
+ if (progress instanceof ProgressBar) {
+ mProgressBar = (ProgressBar) progress;
+ } else {
+ // It's still a viewstub
+ mProgressBar = null;
+ }
+ mNotificationHeader = (ViewGroup) mView.findViewById(
+ com.android.internal.R.id.notification_header);
+ ArrayList<View> viewsToInvert = new ArrayList<>();
+ if (mainColumn != null) {
+ viewsToInvert.add(mainColumn);
+ }
+ for (int i = 0; i < mNotificationHeader.getChildCount(); i++) {
+ View child = mNotificationHeader.getChildAt(i);
+ if (child != mIcon) {
+ viewsToInvert.add(child);
+ }
+ }
+ mInvertHelper = new ViewInvertHelper(viewsToInvert,
+ NotificationPanelView.DOZE_ANIMATION_DURATION);
}
- private ImageView resolveIcon(ImageView largeIcon, ImageView rightIcon) {
- return largeIcon != null && largeIcon.getBackground() != null ? largeIcon
- : rightIcon != null && rightIcon.getVisibility() == View.VISIBLE ? rightIcon
- : null;
- }
-
- private ImageView resolvePicture(ImageView largeIcon) {
- return largeIcon != null && largeIcon.getBackground() == null
- ? largeIcon
- : null;
- }
-
- private int resolveBackgroundColor(ImageView icon) {
- if (icon != null && icon.getBackground() != null) {
- ColorFilter filter = icon.getBackground().getColorFilter();
+ private int resolveColor(ImageView icon) {
+ if (icon != null && icon.getDrawable() != null) {
+ ColorFilter filter = icon.getDrawable().getColorFilter();
if (filter instanceof PorterDuffColorFilter) {
return ((PorterDuffColorFilter) filter).getColor();
}
@@ -138,18 +141,43 @@
if (fade) {
fadeIconColorFilter(mIcon, dark, delay);
fadeIconAlpha(mIcon, dark, delay);
- if (!mIconForceGraysaleWhenDark) {
- fadeGrayscale(mIcon, dark, delay);
- }
} else {
updateIconColorFilter(mIcon, dark);
updateIconAlpha(mIcon, dark);
- if (!mIconForceGraysaleWhenDark) {
- updateGrayscale(mIcon, dark);
- }
}
}
setPictureGrayscale(dark, fade, delay);
+ setProgressBarDark(dark, fade, delay);
+ }
+
+ private void setProgressBarDark(boolean dark, boolean fade, long delay) {
+ if (mProgressBar != null) {
+ if (fade) {
+ fadeProgressDark(mProgressBar, dark, delay);
+ } else {
+ updateProgressDark(mProgressBar, dark);
+ }
+ }
+ }
+
+ private void fadeProgressDark(final ProgressBar target, final boolean dark, long delay) {
+ startIntensityAnimation(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ float t = (float) animation.getAnimatedValue();
+ updateProgressDark(target, t);
+ }
+ }, dark, delay, null /* listener */);
+ }
+
+ private void updateProgressDark(ProgressBar target, float intensity) {
+ int color = interpolateColor(mColor, mDarkProgressTint, intensity);
+ target.getIndeterminateDrawable().mutate().setTint(color);
+ target.getProgressDrawable().mutate().setTint(color);
+ }
+
+ private void updateProgressDark(ProgressBar target, boolean dark) {
+ updateProgressDark(target, dark ? 1f : 0f);
}
protected void setPictureGrayscale(boolean grayscale, boolean fade, long delay) {
@@ -218,14 +246,14 @@
}
private void updateIconColorFilter(ImageView target, float intensity) {
- int color = interpolateColor(mIconBackgroundColor, mIconBackgroundDarkColor, intensity);
+ int color = interpolateColor(mColor, mIconDarkColor, intensity);
mIconColorFilter.setColor(color);
- Drawable background = target.getBackground();
+ Drawable iconDrawable = target.getDrawable();
- // The background might be null for legacy notifications. Also, the notification might have
- // been modified during the animation, so background might be null here.
- if (background != null) {
- background.mutate().setColorFilter(mIconColorFilter);
+ // Also, the notification might have been modified during the animation, so background
+ // might be null here.
+ if (iconDrawable != null) {
+ iconDrawable.mutate().setColorFilter(mIconColorFilter);
}
}
@@ -250,33 +278,17 @@
boolean subTextAvailable = !TextUtils.isEmpty(mSubText.getText());
if (visible && subTextAvailable) {
mSubText.setVisibility(View.VISIBLE);
+ mSubTextDivider.setVisibility(View.VISIBLE);
} else {
mSubText.setVisibility(View.GONE);
+ mSubTextDivider.setVisibility(View.GONE);
}
- // TODO: figure out what to do with the number (same place as contentInfo)
- // work profile badge. For now we hide it since it looks nicer.
- boolean infoAvailable = !TextUtils.isEmpty(mInfoText.getText());
- if (visible && infoAvailable) {
- mInfoText.setVisibility(View.VISIBLE);
- } else {
- mInfoText.setVisibility(View.GONE);
- }
- boolean showThirdLine = (visible && (infoAvailable || subTextAvailable))
- || mProfileBadge.getVisibility() == View.VISIBLE;
- if (mThirdLineDivider != null) {
- if (showThirdLine) {
- mThirdLineDivider.setVisibility(View.VISIBLE);
- } else {
- mThirdLineDivider.setVisibility(View.GONE);
- }
- }
- if (mThirdLine != null) {
- if (showThirdLine) {
- mThirdLine.setVisibility(View.VISIBLE);
- } else {
- mThirdLine.setVisibility(View.GONE);
- }
- }
+ }
+
+ @Override
+ public void updateExpandability(boolean expandable, View.OnClickListener onClickListener) {
+ mExpandButton.setVisibility(expandable ? View.VISIBLE : View.GONE);
+ mNotificationHeader.setOnClickListener(expandable ? onClickListener : null);
}
private void updateGrayscaleMatrix(float intensity) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewWrapper.java
index 9bce548..e83ecb7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewWrapper.java
@@ -34,15 +34,7 @@
public static NotificationViewWrapper wrap(Context ctx, View v) {
if (v.getId() == com.android.internal.R.id.status_bar_latest_event_content) {
- if (TAG_BIG_MEDIA_NARROW.equals(v.getTag())) {
- return new NotificationBigMediaNarrowViewWrapper(ctx, v);
- } else if (TAG_MEDIA.equals(v.getTag())) {
- return new NotificationMediaViewWrapper(ctx, v);
- } else if (TAG_BIG_PICTURE.equals(v.getTag())) {
- return new NotificationBigMediaNarrowViewWrapper(ctx, v);
- } else {
- return new NotificationTemplateViewWrapper(ctx, v);
- }
+ return new NotificationTemplateViewWrapper(ctx, v);
} else {
return new NotificationCustomViewWrapper(v);
}
@@ -83,4 +75,12 @@
public void setSubTextVisible(boolean visible) {
mSubTextVisible = visible;
}
+
+ /**
+ * Update the appearance of the expand button.
+ *
+ * @param expandable should this view be expandable
+ * @param onClickListener the listener to invoke when the expand affordance is clicked on
+ */
+ public void updateExpandability(boolean expandable, View.OnClickListener onClickListener) {}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderView.java
deleted file mode 100644
index ec26cc4..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderView.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2015 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.systemui.statusbar.notification;
-
-import android.annotation.Nullable;
-import android.app.Notification;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.service.notification.StatusBarNotification;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.internal.util.NotificationColorUtil;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.BaseStatusBar;
-import com.android.systemui.statusbar.ExpandableNotificationRow;
-import com.android.systemui.statusbar.NotificationData;
-import com.android.systemui.statusbar.phone.NotificationGroupManager;
-
-import java.util.List;
-
-/**
- * A header for a notification view
- */
-public class NotificationHeaderView extends FrameLayout {
-
- private static final int DEFAULT_ICON_TINT_COLOR = 0xff616161;
- private final NotificationColorUtil mNotificationColorUtil;
- private NotificationData.Entry mNotificationEntry;
- private ImageView mIconView;
- private TextView mAppName;
- private TextView mPostTime;
- private TextView mChildCount;
- private TextView mSubTextDivider;
- private TextView mSubText;
- private NotificationGroupManager mGroupManager;
- private ImageButton mExpandButton;
-
- public NotificationHeaderView(Context context) {
- this(context, null);
- }
-
- public NotificationHeaderView(Context context, @Nullable AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public NotificationHeaderView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
- this(context, attrs, defStyleAttr, 0);
- }
-
- public NotificationHeaderView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
- int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- mNotificationColorUtil = NotificationColorUtil.getInstance(context);
- }
-
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
- mIconView = (ImageView) findViewById(R.id.header_notification_icon);
- mAppName = (TextView) findViewById(R.id.app_name_text);
- mSubTextDivider = (TextView) findViewById(R.id.app_title_sub_text_divider);
- mSubText = (TextView) findViewById(R.id.title_sub_text);
- mPostTime = (TextView) findViewById(R.id.post_time);
- mChildCount = (TextView) findViewById(R.id.number_of_children);
- mExpandButton = (ImageButton) findViewById(R.id.notification_expand_button);
- mExpandButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mGroupManager.toggleGroupExpansion(mNotificationEntry.notification);
- }
- });
- }
-
- public void bind(NotificationData.Entry notificationEntry) {
- mNotificationEntry = notificationEntry;
- StatusBarNotification sbn = notificationEntry.notification;
- int notificationColor = getNotificationColor(sbn);
- bindIcon(notificationColor);
- bindNumber(notificationColor);
- bindAppName(sbn);
- bindSubText();
- bindTime(sbn);
- bindExpandButton(sbn);
- }
-
- private void bindExpandButton(StatusBarNotification sbn) {
- boolean summaryOfGroup = mGroupManager.isSummaryOfGroup(sbn);
- mExpandButton.setVisibility(summaryOfGroup ? VISIBLE : GONE);
- }
-
- private void bindSubText() {
- List<ExpandableNotificationRow> notificationChildren =
- mNotificationEntry.row.getNotificationChildren();
- CharSequence subText = null;
- if (notificationChildren != null) {
- for (int i = 0; i < notificationChildren.size(); i++) {
- ExpandableNotificationRow row = notificationChildren.get(i);
- CharSequence rowSubText = row.getSubText();
- if (TextUtils.isEmpty(rowSubText)
- || (subText != null && !subText.equals(rowSubText))) {
- // The children don't have a common subText
- subText = null;
- break;
- } else if (subText == null) {
- subText = rowSubText;
- }
- }
- };
- setSubText(subText);
- }
-
- private void setSubText(CharSequence subText) {
- boolean goneInHeader = TextUtils.isEmpty(subText);
- if (goneInHeader) {
- mSubText.setVisibility(GONE);
- mSubTextDivider.setVisibility(GONE);
- } else {
- mSubText.setVisibility(VISIBLE);
- mSubText.setText(subText);
- mSubTextDivider.setVisibility(VISIBLE);
- }
- List<ExpandableNotificationRow> notificationChildren =
- mNotificationEntry.row.getNotificationChildren();
- if (notificationChildren != null) {
- for (int i = 0; i < notificationChildren.size(); i++) {
- ExpandableNotificationRow row = notificationChildren.get(i);
- row.setContentSubTextVisible(goneInHeader);
- }
- }
- }
-
- private int getNotificationColor(StatusBarNotification sbn) {
- int color = sbn.getNotification().color;
- if (color == Notification.COLOR_DEFAULT) {
- return DEFAULT_ICON_TINT_COLOR;
- }
- return color;
- }
-
- private void bindNumber(int notificationColor) {
- int numberOfNotificationChildren = mNotificationEntry.row.getNumberOfNotificationChildren();
- boolean visible = numberOfNotificationChildren > 0;
- if (visible) {
- mChildCount.setText("(" + numberOfNotificationChildren + ")");
- mChildCount.setTextColor(notificationColor);
- mChildCount.setVisibility(VISIBLE);
- } else {
- mChildCount.setVisibility(GONE);
- }
- }
-
- private void bindTime(StatusBarNotification sbn) {
-
- }
-
- private void bindIcon(int notificationColor) {
- Drawable icon = mNotificationEntry.icon.getDrawable().getConstantState()
- .newDrawable(getResources()).mutate();
- mIconView.setImageDrawable(icon);
- if (NotificationUtils.isGrayscale(mIconView, mNotificationColorUtil)) {
- icon.setTint(notificationColor);
- }
- }
-
- private void bindAppName(StatusBarNotification sbn) {
- PackageManager pmUser = BaseStatusBar.getPackageManagerForUser(getContext(),
- sbn.getUser().getIdentifier());
- final String pkg = sbn.getPackageName();
- String appname = pkg;
- try {
- final ApplicationInfo info = pmUser.getApplicationInfo(pkg,
- PackageManager.GET_UNINSTALLED_PACKAGES
- | PackageManager.GET_DISABLED_COMPONENTS);
- if (info != null) {
- appname = String.valueOf(pmUser.getApplicationLabel(info));
-
- }
- } catch (PackageManager.NameNotFoundException e) {
- // app is gone, just show package name
- }
- mAppName.setText(appname);
- }
-
- public void setGroupManager(NotificationGroupManager groupManager) {
- mGroupManager = groupManager;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
index a15d35e..784cb48 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
@@ -96,6 +96,11 @@
mEmptyDragAmount = emptyDragAmount;
}
+ public float getMinStackScrollerPadding(int height, int keyguardStatusHeight) {
+ return mClockYFractionMin * height + keyguardStatusHeight / 2
+ + mClockNotificationsMarginMin;
+ }
+
public void run(Result result) {
int y = getClockY() - mKeyguardStatusHeight / 2;
float clockAdjustment = getClockYExpansionAdjustment();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
new file mode 100644
index 0000000..d91bfb9
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2014 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.systemui.statusbar.phone;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Rect;
+import android.os.SystemProperties;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.ViewConfiguration;
+import android.view.WindowManager;
+
+import com.android.systemui.R;
+import com.android.systemui.RecentsComponent;
+import com.android.systemui.stackdivider.Divider;
+import com.android.systemui.statusbar.BaseStatusBar;
+
+import static android.view.WindowManager.*;
+
+/**
+ * Class to detect gestures on the navigation bar.
+ */
+public class NavigationBarGestureHelper extends GestureDetector.SimpleOnGestureListener {
+
+ private static final String DOCK_WINDOW_GESTURE_ENABLED_PROP = "persist.dock_gesture_enabled";
+
+ /**
+ * When dragging from the navigation bar, we drag in recents.
+ */
+ private static final int DRAG_MODE_RECENTS = 0;
+
+ /**
+ * When dragging from the navigation bar, we drag the divider.
+ */
+ private static final int DRAG_MODE_DIVIDER = 1;
+
+ private RecentsComponent mRecentsComponent;
+ private Divider mDivider;
+ private boolean mIsVertical;
+ private boolean mIsRTL;
+
+ private final GestureDetector mTaskSwitcherDetector;
+ private final int mScrollTouchSlop;
+ private final int mTouchSlop;
+ private final int mMinFlingVelocity;
+ private int mTouchDownX;
+ private int mTouchDownY;
+ private VelocityTracker mVelocityTracker;
+
+ private boolean mDockWindowEnabled;
+ private boolean mDockWindowTouchSlopExceeded;
+ private int mDragMode;
+
+ public NavigationBarGestureHelper(Context context) {
+ ViewConfiguration configuration = ViewConfiguration.get(context);
+ Resources r = context.getResources();
+ mScrollTouchSlop = r.getDimensionPixelSize(R.dimen.navigation_bar_min_swipe_distance);
+ mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+ mMinFlingVelocity = configuration.getScaledMinimumFlingVelocity();
+ mTaskSwitcherDetector = new GestureDetector(context, this);
+ mDockWindowEnabled = SystemProperties.getBoolean(DOCK_WINDOW_GESTURE_ENABLED_PROP, false);
+ }
+
+ public void setComponents(RecentsComponent recentsComponent, Divider divider) {
+ mRecentsComponent = recentsComponent;
+ mDivider = divider;
+ }
+
+ public void setBarState(boolean isVertical, boolean isRTL) {
+ mIsVertical = isVertical;
+ mIsRTL = isRTL;
+ }
+
+ public boolean onInterceptTouchEvent(MotionEvent event) {
+ // If we move more than a fixed amount, then start capturing for the
+ // task switcher detector
+ mTaskSwitcherDetector.onTouchEvent(event);
+ int action = event.getAction();
+ switch (action & MotionEvent.ACTION_MASK) {
+ case MotionEvent.ACTION_DOWN: {
+ mTouchDownX = (int) event.getX();
+ mTouchDownY = (int) event.getY();
+ break;
+ }
+ case MotionEvent.ACTION_MOVE: {
+ int x = (int) event.getX();
+ int y = (int) event.getY();
+ int xDiff = Math.abs(x - mTouchDownX);
+ int yDiff = Math.abs(y - mTouchDownY);
+ boolean exceededTouchSlop = !mIsVertical
+ ? xDiff > mScrollTouchSlop && xDiff > yDiff
+ : yDiff > mScrollTouchSlop && yDiff > xDiff;
+ if (exceededTouchSlop) {
+ return true;
+ }
+ break;
+ }
+ case MotionEvent.ACTION_CANCEL:
+ case MotionEvent.ACTION_UP:
+ break;
+ }
+ return mDockWindowEnabled && interceptDockWindowEvent(event);
+ }
+
+ private boolean interceptDockWindowEvent(MotionEvent event) {
+ switch (event.getActionMasked()) {
+ case MotionEvent.ACTION_DOWN:
+ handleDragActionDownEvent(event);
+ break;
+ case MotionEvent.ACTION_MOVE:
+ return handleDragActionMoveEvent(event);
+ case MotionEvent.ACTION_UP:
+ case MotionEvent.ACTION_CANCEL:
+ handleDragActionUpEvent(event);
+ break;
+ }
+ return false;
+ }
+
+ private boolean handleDockWindowEvent(MotionEvent event) {
+ switch (event.getActionMasked()) {
+ case MotionEvent.ACTION_DOWN:
+ handleDragActionDownEvent(event);
+ break;
+ case MotionEvent.ACTION_MOVE:
+ handleDragActionMoveEvent(event);
+ break;
+ case MotionEvent.ACTION_UP:
+ case MotionEvent.ACTION_CANCEL:
+ handleDragActionUpEvent(event);
+ break;
+ }
+ return true;
+ }
+
+ private void handleDragActionDownEvent(MotionEvent event) {
+ mVelocityTracker = VelocityTracker.obtain();
+ mVelocityTracker.addMovement(event);
+ mDockWindowTouchSlopExceeded = false;
+ mTouchDownX = (int) event.getX();
+ mTouchDownY = (int) event.getY();
+ }
+
+ private boolean handleDragActionMoveEvent(MotionEvent event) {
+ mVelocityTracker.addMovement(event);
+ int x = (int) event.getX();
+ int y = (int) event.getY();
+ int xDiff = Math.abs(x - mTouchDownX);
+ int yDiff = Math.abs(y - mTouchDownY);
+ if (!mDockWindowTouchSlopExceeded) {
+ boolean touchSlopExceeded = !mIsVertical
+ ? yDiff > mTouchSlop && yDiff > xDiff
+ : xDiff > mTouchSlop && xDiff > yDiff;
+ if (touchSlopExceeded && mDivider.getView().getWindowManagerProxy().getDockSide()
+ == DOCKED_INVALID) {
+ mDragMode = calculateDragMode();
+ Rect initialBounds = null;
+ if (mDragMode == DRAG_MODE_DIVIDER) {
+ initialBounds = new Rect();
+ mDivider.getView().calculateBoundsForPosition(mIsVertical
+ ? (int) event.getRawX()
+ : (int) event.getRawY(),
+ mDivider.getView().isHorizontalDivision()
+ ? DOCKED_TOP
+ : DOCKED_LEFT,
+ initialBounds);
+ }
+ mRecentsComponent.dockTopTask(mDragMode == DRAG_MODE_RECENTS, initialBounds);
+ if (mDragMode == DRAG_MODE_DIVIDER) {
+ mDivider.getView().startDragging();
+ }
+ mDockWindowTouchSlopExceeded = true;
+ return true;
+ }
+ } else {
+ if (mDragMode == DRAG_MODE_DIVIDER) {
+ mDivider.getView().resizeStack(
+ !mIsVertical ? (int) event.getRawY() : (int) event.getRawX());
+ } else if (mDragMode == DRAG_MODE_RECENTS) {
+ mRecentsComponent.onDraggingInRecents(event.getRawY());
+ }
+ }
+ return false;
+ }
+
+ private void handleDragActionUpEvent(MotionEvent event) {
+ mVelocityTracker.addMovement(event);
+ mVelocityTracker.computeCurrentVelocity(1000);
+ if (mDockWindowTouchSlopExceeded) {
+ if (mDragMode == DRAG_MODE_DIVIDER) {
+ mDivider.getView().stopDragging(mIsVertical
+ ? (int) event.getRawX()
+ : (int) event.getRawY(),
+ mIsVertical
+ ? mVelocityTracker.getXVelocity()
+ : mVelocityTracker.getYVelocity());
+ } else if (mDragMode == DRAG_MODE_RECENTS) {
+ mRecentsComponent.onDraggingInRecentsEnded(mVelocityTracker.getYVelocity());
+ }
+ }
+ mVelocityTracker.recycle();
+ mVelocityTracker = null;
+ }
+
+ private int calculateDragMode() {
+ if (mIsVertical && !mDivider.getView().isHorizontalDivision()) {
+ return DRAG_MODE_DIVIDER;
+ }
+ if (!mIsVertical && mDivider.getView().isHorizontalDivision()) {
+ return DRAG_MODE_DIVIDER;
+ }
+ return DRAG_MODE_RECENTS;
+ }
+
+ public boolean onTouchEvent(MotionEvent event) {
+ boolean result = mTaskSwitcherDetector.onTouchEvent(event);
+ if (mDockWindowEnabled) {
+ result |= handleDockWindowEvent(event);
+ }
+ return result;
+ }
+
+ @Override
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+ float absVelX = Math.abs(velocityX);
+ float absVelY = Math.abs(velocityY);
+ boolean isValidFling = absVelX > mMinFlingVelocity &&
+ mIsVertical ? (absVelY > absVelX) : (absVelX > absVelY);
+ if (isValidFling) {
+ boolean showNext;
+ if (!mIsRTL) {
+ showNext = mIsVertical ? (velocityY < 0) : (velocityX < 0);
+ } else {
+ // In RTL, vertical is still the same, but horizontal is flipped
+ showNext = mIsVertical ? (velocityY < 0) : (velocityX > 0);
+ }
+ if (showNext) {
+ mRecentsComponent.showNextAffiliatedTask();
+ } else {
+ mRecentsComponent.showPrevAffiliatedTask();
+ }
+ }
+ return true;
+ }
+}
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 33e514d..cddb1fc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -40,7 +40,6 @@
import android.view.Surface;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewRootImpl;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
@@ -48,6 +47,8 @@
import android.widget.LinearLayout;
import com.android.systemui.R;
+import com.android.systemui.RecentsComponent;
+import com.android.systemui.stackdivider.Divider;
import com.android.systemui.statusbar.policy.DeadZone;
import com.android.systemui.statusbar.policy.KeyButtonView;
@@ -78,7 +79,7 @@
private Drawable mRecentIcon;
private Drawable mRecentLandIcon;
- private NavigationBarViewTaskSwitchHelper mTaskSwitchHelper;
+ private NavigationBarGestureHelper mGestureHelper;
private DeadZone mDeadZone;
private final NavigationBarTransitions mBarTransitions;
@@ -142,7 +143,7 @@
private final OnClickListener mImeSwitcherClickListener = new OnClickListener() {
@Override
public void onClick(View view) {
- ((InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE))
+ mContext.getSystemService(InputMethodManager.class)
.showInputMethodPicker(true /* showAuxiliarySubtypes */);
}
};
@@ -180,7 +181,7 @@
mBarSize = res.getDimensionPixelSize(R.dimen.navigation_bar_size);
mVertical = false;
mShowMenu = false;
- mTaskSwitchHelper = new NavigationBarViewTaskSwitchHelper(context);
+ mGestureHelper = new NavigationBarGestureHelper(context);
getIcons(res);
@@ -191,8 +192,8 @@
return mBarTransitions;
}
- public void setBar(PhoneStatusBar phoneStatusBar) {
- mTaskSwitchHelper.setBar(phoneStatusBar);
+ public void setComponents(RecentsComponent recentsComponent, Divider divider) {
+ mGestureHelper.setComponents(recentsComponent, divider);
}
public void setOnVerticalChangedListener(OnVerticalChangedListener onVerticalChangedListener) {
@@ -202,7 +203,7 @@
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (mTaskSwitchHelper.onTouchEvent(event)) {
+ if (mGestureHelper.onTouchEvent(event)) {
return true;
}
if (mDeadZone != null && event.getAction() == MotionEvent.ACTION_OUTSIDE) {
@@ -213,7 +214,7 @@
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
- return mTaskSwitchHelper.onInterceptTouchEvent(event);
+ return mGestureHelper.onInterceptTouchEvent(event);
}
public void abortCurrentGesture() {
@@ -488,7 +489,7 @@
private void updateTaskSwitchHelper() {
boolean isRtl = (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL);
- mTaskSwitchHelper.setBarState(mVertical, isRtl);
+ mGestureHelper.setBarState(mVertical, isRtl);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarViewTaskSwitchHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarViewTaskSwitchHelper.java
deleted file mode 100644
index fdfcdfb..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarViewTaskSwitchHelper.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2014 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.systemui.statusbar.phone;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import com.android.systemui.R;
-import com.android.systemui.statusbar.BaseStatusBar;
-
-public class NavigationBarViewTaskSwitchHelper extends GestureDetector.SimpleOnGestureListener {
-
- private BaseStatusBar mBar;
- private boolean mIsVertical;
- private boolean mIsRTL;
-
- private final GestureDetector mTaskSwitcherDetector;
- private final int mScrollTouchSlop;
- private final int mMinFlingVelocity;
- private int mTouchDownX;
- private int mTouchDownY;
-
- public NavigationBarViewTaskSwitchHelper(Context context) {
- ViewConfiguration configuration = ViewConfiguration.get(context);
- Resources r = context.getResources();
- mScrollTouchSlop = r.getDimensionPixelSize(R.dimen.navigation_bar_min_swipe_distance);
- mMinFlingVelocity = configuration.getScaledMinimumFlingVelocity();
- mTaskSwitcherDetector = new GestureDetector(context, this);
- }
-
- public void setBar(BaseStatusBar phoneStatusBar) {
- mBar = phoneStatusBar;
- }
-
- public void setBarState(boolean isVertical, boolean isRTL) {
- mIsVertical = isVertical;
- mIsRTL = isRTL;
- }
-
- public boolean onInterceptTouchEvent(MotionEvent event) {
- // If we move more than a fixed amount, then start capturing for the
- // task switcher detector
- mTaskSwitcherDetector.onTouchEvent(event);
- int action = event.getAction();
- boolean intercepted = false;
- switch (action & MotionEvent.ACTION_MASK) {
- case MotionEvent.ACTION_DOWN: {
- mTouchDownX = (int) event.getX();
- mTouchDownY = (int) event.getY();
- break;
- }
- case MotionEvent.ACTION_MOVE: {
- int x = (int) event.getX();
- int y = (int) event.getY();
- int xDiff = Math.abs(x - mTouchDownX);
- int yDiff = Math.abs(y - mTouchDownY);
- boolean exceededTouchSlop = !mIsVertical
- ? xDiff > mScrollTouchSlop && xDiff > yDiff
- : yDiff > mScrollTouchSlop && yDiff > xDiff;
- if (exceededTouchSlop) {
- return true;
- }
- break;
- }
- case MotionEvent.ACTION_CANCEL:
- case MotionEvent.ACTION_UP:
- break;
- }
- return intercepted;
- }
-
- public boolean onTouchEvent(MotionEvent event) {
- return mTaskSwitcherDetector.onTouchEvent(event);
- }
-
- @Override
- public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
- float absVelX = Math.abs(velocityX);
- float absVelY = Math.abs(velocityY);
- boolean isValidFling = absVelX > mMinFlingVelocity &&
- mIsVertical ? (absVelY > absVelX) : (absVelX > absVelY);
- if (isValidFling) {
- boolean showNext;
- if (!mIsRTL) {
- showNext = mIsVertical ? (velocityY < 0) : (velocityX < 0);
- } else {
- // In RTL, vertical is still the same, but horizontal is flipped
- showNext = mIsVertical ? (velocityY < 0) : (velocityX > 0);
- }
- if (showNext) {
- mBar.showNextAffiliatedTask();
- } else {
- mBar.showPreviousAffiliatedTask();
- }
- }
- return true;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
index bbef1c0..08da0d3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
@@ -84,16 +84,14 @@
// the close future. See b/23676310 for reference.
return;
}
- if (notif.isGroupSummary()) {
- group.summary = null;
- } else {
+ if (notif.isGroupChild()) {
group.children.remove(removed);
+ } else {
+ group.summary = null;
}
if (group.children.isEmpty()) {
if (group.summary == null) {
mGroupMap.remove(groupKey);
- } else if (!group.expanded) {
- group.summary.row.updateNotificationHeader();
}
}
}
@@ -107,17 +105,14 @@
group = new NotificationGroup();
mGroupMap.put(groupKey, group);
}
- if (notif.isGroupSummary()) {
+ if (notif.isGroupChild()) {
+ group.children.add(added);
+ } else {
group.summary = added;
group.expanded = added.row.areChildrenExpanded();
if (!group.children.isEmpty()) {
mListener.onGroupCreatedFromChildren(group);
}
- } else {
- group.children.add(added);
- if (group.summary != null && group.children.size() == 1 && !group.expanded) {
- group.summary.row.updateNotificationHeader();
- }
}
}
@@ -169,7 +164,7 @@
* @return whether a given notification is a summary in a group which has children
*/
public boolean isSummaryOfGroup(StatusBarNotification sbn) {
- if (sbn.getNotification().isGroupChild()) {
+ if (!sbn.getNotification().isGroupSummary()) {
return false;
}
NotificationGroup group = mGroupMap.get(sbn.getGroupKey());
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 79701ed..73ee363 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -44,6 +44,7 @@
import android.view.animation.PathInterpolator;
import android.widget.FrameLayout;
import android.widget.TextView;
+
import com.android.internal.logging.MetricsLogger;
import com.android.keyguard.KeyguardStatusView;
import com.android.systemui.DejankUtils;
@@ -448,6 +449,36 @@
requestScrollerTopPaddingUpdate(animate);
}
+ /**
+ * @param maximum the maximum to return at most
+ * @return the maximum keyguard notifications that can fit on the screen
+ */
+ public int computeMaxKeyguardNotifications(int maximum) {
+ float minPadding = mClockPositionAlgorithm.getMinStackScrollerPadding(getHeight(),
+ mKeyguardStatusView.getHeight());
+ int keyguardPadding = getResources().getDimensionPixelSize(
+ R.dimen.notification_padding_dimmed);
+ final int overflowheight = getResources().getDimensionPixelSize(
+ R.dimen.notification_summary_height);
+ float bottomStackSize = mNotificationStackScroller.getKeyguardBottomStackSize();
+ float availableSpace = mNotificationStackScroller.getHeight() - minPadding - overflowheight
+ - bottomStackSize;
+ int count = 0;
+ for (int i = 0; i < mNotificationStackScroller.getChildCount(); i++) {
+ ExpandableView child = (ExpandableView) mNotificationStackScroller.getChildAt(i);
+ if (!(child instanceof ExpandableNotificationRow)) {
+ continue;
+ }
+ availableSpace -= child.getMinHeight() + keyguardPadding;
+ if (availableSpace >= 0 && count < maximum) {
+ count++;
+ } else {
+ return count;
+ }
+ }
+ return count;
+ }
+
private void startClockAnimation(int y) {
if (mClockAnimationTarget == y) {
return;
@@ -924,15 +955,7 @@
mQsTracking = false;
mTrackingPointer = -1;
trackMovement(event);
- float fraction = getQsExpansionFraction();
- if ((fraction != 0f || y >= mInitialTouchY)
- && (fraction != 1f || y <= mInitialTouchY)) {
- flingQsWithCurrentVelocity(y,
- event.getActionMasked() == MotionEvent.ACTION_CANCEL);
- } else {
- logQsSwipeDown(y);
- mScrollYOverride = -1;
- }
+ flingQsWithCurrentVelocity(y, event.getActionMasked() == MotionEvent.ACTION_CANCEL);
if (mVelocityTracker != null) {
mVelocityTracker.recycle();
mVelocityTracker = null;
@@ -1663,7 +1686,7 @@
}
private float getFadeoutAlpha() {
- float alpha = (getNotificationsTopY() + mNotificationStackScroller.getItemHeight())
+ float alpha = (getNotificationsTopY() + mNotificationStackScroller.getFirstItemMinHeight())
/ (mQsMinExpansionHeight + mNotificationStackScroller.getBottomStackPeekSize()
- mNotificationStackScroller.getCollapseSecondCardPadding());
alpha = Math.max(0, Math.min(alpha, 1));
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index fafedc3..21d803d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -36,9 +36,7 @@
import com.android.systemui.EventLogConstants;
import com.android.systemui.EventLogTags;
import com.android.systemui.R;
-import com.android.systemui.classifier.Classifier;
import com.android.systemui.classifier.FalsingManager;
-import com.android.systemui.classifier.HumanInteractionClassifier;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.statusbar.FlingAnimationUtils;
import com.android.systemui.statusbar.StatusBarState;
@@ -891,6 +889,7 @@
if (mStatusBar.getStatusBarWindow().getHeight()
!= mStatusBar.getStatusBarHeight()) {
getViewTreeObserver().removeOnGlobalLayoutListener(this);
+ mStatusBar.onPanelExpandedAndLayouted();
if (animate) {
mBar.startOpeningPanel(PanelView.this);
notifyExpandingStarted();
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 3e52515..685c4e5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -25,7 +25,6 @@
import android.app.IActivityManager;
import android.app.Notification;
import android.app.PendingIntent;
-import android.app.RemoteInput;
import android.app.StatusBarManager;
import android.content.BroadcastReceiver;
import android.content.ComponentCallbacks2;
@@ -110,13 +109,14 @@
import com.android.systemui.EventLogTags;
import com.android.systemui.Prefs;
import com.android.systemui.R;
-import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.assist.AssistManager;
+import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.doze.DozeHost;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.recents.ScreenPinningRequest;
+import com.android.systemui.stackdivider.Divider;
import com.android.systemui.statusbar.ActivatableNotificationView;
import com.android.systemui.statusbar.BackDropView;
import com.android.systemui.statusbar.BaseStatusBar;
@@ -170,7 +170,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
@@ -337,7 +336,7 @@
private long mKeyguardFadingAwayDelay;
private long mKeyguardFadingAwayDuration;
- int mKeyguardMaxNotificationCount;
+ int mMaxAllowedKeyguardNotifications;
boolean mExpandedVisible;
@@ -427,6 +426,7 @@
private boolean mAutohideSuspended;
private int mStatusBarMode;
private int mNavigationBarMode;
+ private int mMaxKeyguardNotifications;
private ViewMediatorCallback mKeyguardViewMediatorCallback;
private ScrimController mScrimController;
@@ -617,7 +617,6 @@
};
private HashMap<ExpandableNotificationRow, List<ExpandableNotificationRow>> mTmpChildOrderMap
= new HashMap<>();
- private HashSet<Entry> mHeadsUpEntriesToRemoveOnSwitch = new HashSet<>();
private RankingMap mLatestRankingMap;
private boolean mNoAnimationOnNextBarModeChange;
private FalsingManager mFalsingManager;
@@ -740,7 +739,7 @@
context, R.layout.navigation_bar, null);
}
mNavigationBarView.setDisabledFlags(mDisabled1);
- mNavigationBarView.setBar(this);
+ mNavigationBarView.setComponents(mRecents, getComponent(Divider.class));
mNavigationBarView.setOnVerticalChangedListener(
new NavigationBarView.OnVerticalChangedListener() {
@Override
@@ -928,7 +927,7 @@
mBrightnessMirrorController = new BrightnessMirrorController(mStatusBarWindow);
mQSPanel.setBrightnessMirror(mBrightnessMirrorController);
mHeader.setQSPanel(mQSPanel);
- qsh.setCallback(new QSTileHost.Callback() {
+ qsh.addCallback(new QSTileHost.Callback() {
@Override
public void onTilesChanged() {
mQSPanel.setTiles(qsh.getTiles());
@@ -1102,10 +1101,8 @@
}
@Override
- protected RemoteInputView inflateRemoteInputView(ViewGroup root, Entry entry,
- Notification.Action action, RemoteInput remoteInput) {
- return RemoteInputView.inflate(mContext, root, entry, action, remoteInput,
- mRemoteInputController);
+ protected RemoteInputView inflateRemoteInputView(ViewGroup root, Entry entry) {
+ return RemoteInputView.inflate(mContext, root, entry, mRemoteInputController);
}
public int getStatusBarHeight() {
@@ -1136,7 +1133,7 @@
@Override
public boolean onLongClick(View v) {
if (mRecents != null) {
- mRecents.dockTopTask();
+ mRecents.dockTopTask(false /* draggingInRecents */, null /* initialBounds */);
return true;
}
return false;
@@ -1262,6 +1259,7 @@
Entry oldEntry) {
if (DEBUG) Log.d(TAG, "addNotification key=" + notification.getKey());
+ mNotificationData.updateRanking(ranking);
Entry shadeEntry = createNotificationViews(notification);
if (shadeEntry == null) {
return;
@@ -3130,10 +3128,11 @@
mNaturalBarHeight = res.getDimensionPixelSize(
com.android.internal.R.dimen.status_bar_height);
+ mRowMinHeightLegacy = res.getDimensionPixelSize(R.dimen.notification_min_height_legacy);
mRowMinHeight = res.getDimensionPixelSize(R.dimen.notification_min_height);
mRowMaxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height);
- mKeyguardMaxNotificationCount = res.getInteger(R.integer.keyguard_max_notification_count);
+ mMaxAllowedKeyguardNotifications = res.getInteger(R.integer.keyguard_max_notification_count);
if (DEBUG) Log.v(TAG, "updateResources");
}
@@ -3914,8 +3913,18 @@
}
@Override
- protected int getMaxKeyguardNotifications() {
- return mKeyguardMaxNotificationCount;
+ protected int getMaxKeyguardNotifications(boolean recompute) {
+ if (recompute) {
+ mMaxKeyguardNotifications = Math.max(1,
+ mNotificationPanel.computeMaxKeyguardNotifications(
+ mMaxAllowedKeyguardNotifications));
+ return mMaxKeyguardNotifications;
+ }
+ return mMaxKeyguardNotifications;
+ }
+
+ public int getMaxKeyguardNotifications() {
+ return getMaxKeyguardNotifications(false /* recompute */);
}
public NavigationBarView getNavigationBarView() {
@@ -3945,11 +3954,12 @@
@Override
public void onDragDownReset() {
mStackScroller.setDimmed(true /* dimmed */, true /* animated */);
+ mStackScroller.resetScrollPosition();
}
@Override
- public void onThresholdReached() {
- mStackScroller.setDimmed(false /* dimmed */, true /* animate */);
+ public void onCrossedThreshold(boolean above) {
+ mStackScroller.setDimmed(!above /* dimmed */, true /* animate */);
}
@Override
@@ -3988,6 +3998,13 @@
}
}
+ @Override
+ public void onExpandClicked(View clickedView, boolean nowExpanded) {
+ if (mState == StatusBarState.KEYGUARD && nowExpanded) {
+ goToLockedShade(clickedView);
+ }
+ }
+
/**
* Goes back to the keyguard after hanging around in {@link StatusBarState#SHADE_LOCKED}.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index fa9c4bb..83edc96 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -383,6 +383,12 @@
@Override
public void onUserSwitching(int newUserId, IRemoteCallback reply) {
mUserInfoController.reloadUserInfo();
+ if (reply != null) {
+ try {
+ reply.sendResult(null);
+ } catch (RemoteException e) {
+ }
+ }
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
index 96b919e..57c2648 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -17,18 +17,56 @@
package com.android.systemui.statusbar.phone;
import android.app.PendingIntent;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
+import android.os.Binder;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Process;
+import android.os.RemoteException;
+import android.service.quicksettings.IQSService;
+import android.service.quicksettings.Tile;
import android.util.Log;
import com.android.systemui.R;
import com.android.systemui.qs.QSTile;
-import com.android.systemui.qs.tiles.*;
-import com.android.systemui.statusbar.policy.*;
+import com.android.systemui.qs.tiles.AirplaneModeTile;
+import com.android.systemui.qs.tiles.BatteryTile;
+import com.android.systemui.qs.tiles.BluetoothTile;
+import com.android.systemui.qs.tiles.CastTile;
+import com.android.systemui.qs.tiles.CellularTile;
+import com.android.systemui.qs.tiles.ColorInversionTile;
+import com.android.systemui.qs.tiles.CustomTile;
+import com.android.systemui.qs.tiles.DndTile;
+import com.android.systemui.qs.tiles.FlashlightTile;
+import com.android.systemui.qs.tiles.HotspotTile;
+import com.android.systemui.qs.tiles.IntentTile;
+import com.android.systemui.qs.tiles.LocationTile;
+import com.android.systemui.qs.tiles.QAirplaneTile;
+import com.android.systemui.qs.tiles.QBluetoothTile;
+import com.android.systemui.qs.tiles.QFlashlightTile;
+import com.android.systemui.qs.tiles.QLockTile;
+import com.android.systemui.qs.tiles.QRotationLockTile;
+import com.android.systemui.qs.tiles.QWifiTile;
+import com.android.systemui.qs.tiles.RotationLockTile;
+import com.android.systemui.qs.tiles.UserTile;
+import com.android.systemui.qs.tiles.WifiTile;
+import com.android.systemui.statusbar.policy.BatteryController;
+import com.android.systemui.statusbar.policy.BluetoothController;
+import com.android.systemui.statusbar.policy.CastController;
+import com.android.systemui.statusbar.policy.FlashlightController;
+import com.android.systemui.statusbar.policy.HotspotController;
+import com.android.systemui.statusbar.policy.KeyguardMonitor;
+import com.android.systemui.statusbar.policy.LocationController;
+import com.android.systemui.statusbar.policy.NetworkController;
+import com.android.systemui.statusbar.policy.RotationLockController;
+import com.android.systemui.statusbar.policy.SecurityController;
+import com.android.systemui.statusbar.policy.UserInfoController;
+import com.android.systemui.statusbar.policy.UserSwitcherController;
+import com.android.systemui.statusbar.policy.ZenModeController;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerService.Tunable;
@@ -40,7 +78,7 @@
import java.util.Map;
/** Platform implementation of the quick settings tile host **/
-public class QSTileHost implements QSTile.Host, Tunable {
+public final class QSTileHost extends IQSService.Stub implements QSTile.Host, Tunable {
private static final String TAG = "QSTileHost";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -65,7 +103,7 @@
private final SecurityController mSecurity;
private final BatteryController mBattery;
- private Callback mCallback;
+ private final List<Callback> mCallbacks = new ArrayList<>();
public QSTileHost(Context context, PhoneStatusBar statusBar,
BluetoothController bluetooth, LocationController location,
@@ -107,8 +145,8 @@
}
@Override
- public void setCallback(Callback callback) {
- mCallback = callback;
+ public void addCallback(Callback callback) {
+ mCallbacks.add(callback);
}
@Override
@@ -209,14 +247,14 @@
public SecurityController getSecurityController() {
return mSecurity;
}
-
+
@Override
public void onTuningChanged(String key, String newValue) {
if (!TILES_SETTING.equals(key)) {
return;
}
if (DEBUG) Log.d(TAG, "Recreating tiles");
- final List<String> tileSpecs = loadTileSpecs(newValue);
+ final List<String> tileSpecs = loadTileSpecs(mContext, newValue);
if (tileSpecs.equals(mTileSpecs)) return;
for (Map.Entry<String, QSTile<?>> tile : mTiles.entrySet()) {
if (!tileSpecs.contains(tile.getKey())) {
@@ -227,11 +265,15 @@
final LinkedHashMap<String, QSTile<?>> newTiles = new LinkedHashMap<>();
for (String tileSpec : tileSpecs) {
if (mTiles.containsKey(tileSpec)) {
- newTiles.put(tileSpec, mTiles.get(tileSpec));
+ QSTile<?> tile = mTiles.get(tileSpec);
+ if (DEBUG) Log.d(TAG, "Adding " + tile);
+ newTiles.put(tileSpec, tile);
} else {
if (DEBUG) Log.d(TAG, "Creating tile: " + tileSpec);
try {
- newTiles.put(tileSpec, createTile(tileSpec));
+ QSTile<?> tile = createTile(tileSpec);
+ tile.setTileSpec(tileSpec);
+ newTiles.put(tileSpec, tile);
} catch (Throwable t) {
Log.w(TAG, "Error creating tile for spec: " + tileSpec, t);
}
@@ -241,11 +283,46 @@
mTileSpecs.addAll(tileSpecs);
mTiles.clear();
mTiles.putAll(newTiles);
- if (mCallback != null) {
- mCallback.onTilesChanged();
+ for (int i = 0; i < mCallbacks.size(); i++) {
+ mCallbacks.get(i).onTilesChanged();
}
}
+ @Override
+ public void updateQsTile(Tile tile) throws RemoteException {
+ verifyCaller(tile.getComponentName().getPackageName());
+ CustomTile customTile = getTileForComponent(tile.getComponentName());
+ if (customTile != null) {
+ Log.d("TileService", "Got tile update for " + tile.getComponentName());
+ customTile.updateState(tile);
+ customTile.refreshState();
+ }
+ }
+
+ private void verifyCaller(String packageName) {
+ try {
+ int uid = mContext.getPackageManager().getPackageUid(packageName,
+ Binder.getCallingUserHandle().getIdentifier());
+ if (Binder.getCallingUid() != uid) {
+ throw new SecurityException("Component outside caller's uid");
+ }
+ } catch (NameNotFoundException e) {
+ throw new SecurityException(e);
+ }
+ }
+
+ private CustomTile getTileForComponent(ComponentName component) {
+ // TODO: Build map for easier lookup.
+ for (QSTile<?> qsTile : mTiles.values()) {
+ if (qsTile instanceof CustomTile) {
+ if (((CustomTile) qsTile).getComponent().equals(component)) {
+ return (CustomTile) qsTile;
+ }
+ }
+ }
+ return null;
+ }
+
public QSTile<?> createTile(String tileSpec) {
if (tileSpec.equals("wifi")) return new WifiTile(this, false);
else if (tileSpec.equals("bt")) return new BluetoothTile(this, false);
@@ -276,8 +353,8 @@
else throw new IllegalArgumentException("Bad tile spec: " + tileSpec);
}
- protected List<String> loadTileSpecs(String tileList) {
- final Resources res = mContext.getResources();
+ public static List<String> loadTileSpecs(Context context, String tileList) {
+ final Resources res = context.getResources();
final String defaultTileList = res.getString(R.string.quick_settings_tiles_default);
if (tileList == null) {
tileList = res.getString(R.string.quick_settings_tiles);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
index 662dbd9..cc9f5c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
@@ -192,7 +192,7 @@
host.getBatteryController());
mHeaderQsPanel.setHost(myHost);
mHeaderQsPanel.setTiles(myHost.getTiles());
- myHost.setCallback(new QSTile.Host.Callback() {
+ myHost.addCallback(new QSTile.Host.Callback() {
@Override
public void onTilesChanged() {
mHeaderQsPanel.setTiles(myHost.getTiles());
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
index dc9f5e8..5cfd174 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
@@ -458,7 +458,10 @@
mReleaseOnExpandFinish = false;
} else {
for (NotificationData.Entry entry : mEntriesToRemoveAfterExpand) {
- removeHeadsUpEntry(entry);
+ if (isHeadsUp(entry.key)) {
+ // Maybe the heads-up was removed already
+ removeHeadsUpEntry(entry);
+ }
}
}
mEntriesToRemoveAfterExpand.clear();
@@ -596,6 +599,9 @@
postTime = Math.max(postTime, currentTime);
}
removeAutoRemovalCallbacks();
+ if (mEntriesToRemoveAfterExpand.contains(entry)) {
+ mEntriesToRemoveAfterExpand.remove(entry);
+ }
if (!hasFullScreenIntent(entry) && !mRemoteInputActive) {
long finishTime = postTime + mHeadsUpNotificationDecay;
long removeDelay = Math.max(finishTime - currentTime, mMinimumDisplayTime);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
index 4d268ce..ba284c9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -52,6 +52,7 @@
private boolean mSupportsLongpress = true;
private AudioManager mAudioManager;
private boolean mGestureAborted;
+ private boolean mLongClicked;
private final Runnable mCheckLongPress = new Runnable() {
public void run() {
@@ -60,9 +61,11 @@
if (isLongClickable()) {
// Just an old-fashioned ImageView
performLongClick();
+ mLongClicked = true;
} else if (mSupportsLongpress) {
sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
+ mLongClicked = true;
}
}
}
@@ -155,6 +158,7 @@
switch (action) {
case MotionEvent.ACTION_DOWN:
mDownTime = SystemClock.uptimeMillis();
+ mLongClicked = false;
setPressed(true);
if (mCode != 0) {
sendEvent(KeyEvent.ACTION_DOWN, 0, mDownTime);
@@ -181,7 +185,7 @@
removeCallbacks(mCheckLongPress);
break;
case MotionEvent.ACTION_UP:
- final boolean doIt = isPressed();
+ final boolean doIt = isPressed() && !mLongClicked;
setPressed(false);
if (mCode != 0) {
if (doIt) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
index 93a8fd8..0917528 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
@@ -110,7 +110,7 @@
// When enabling location, a user consent dialog will pop up, and the
// setting won't be fully enabled until the user accepts the agreement.
int mode = enabled
- ? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY : Settings.Secure.LOCATION_MODE_OFF;
+ ? Settings.Secure.LOCATION_MODE_PREVIOUS : Settings.Secure.LOCATION_MODE_OFF;
// QuickSettings always runs as the owner, so specifically set the settings
// for the current foreground user.
return Settings.Secure
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index 38656ee..f8c72b3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.Intent;
import android.telephony.SubscriptionInfo;
-
+import com.android.settingslib.net.MobileDataController;
import com.android.settingslib.wifi.AccessPoint;
import java.util.List;
@@ -85,22 +85,4 @@
void onSettingsActivityTriggered(Intent settingsIntent);
}
}
-
- /**
- * Tracks mobile data support and usage.
- */
- public interface MobileDataController {
- boolean isMobileDataSupported();
- boolean isMobileDataEnabled();
- void setMobileDataEnabled(boolean enabled);
- DataUsageInfo getDataUsageInfo();
-
- public static class DataUsageInfo {
- public String carrier;
- public String period;
- public long limitLevel;
- public long warningLevel;
- public long usageLevel;
- }
- }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 2996808..909f497 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -16,8 +16,6 @@
package com.android.systemui.statusbar.policy;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
-
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -39,10 +37,10 @@
import android.text.TextUtils;
import android.util.Log;
import android.util.MathUtils;
-
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
+import com.android.settingslib.net.MobileDataController;
import com.android.systemui.DemoMode;
import com.android.systemui.R;
@@ -57,9 +55,11 @@
import java.util.Locale;
import java.util.Map;
+import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
+
/** Platform implementation of the network controller. **/
public class NetworkControllerImpl extends BroadcastReceiver
- implements NetworkController, DemoMode {
+ implements NetworkController, DemoMode, MobileDataController.NetworkNameProvider {
// debug
static final String TAG = "NetworkController";
static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -94,7 +94,7 @@
// SIM for most actions. This may be null if there aren't any SIMs around.
private MobileSignalController mDefaultSignalController;
private final AccessPointControllerImpl mAccessPoints;
- private final MobileDataControllerImpl mMobileDataController;
+ private final MobileDataController mMobileDataController;
private boolean mInetCondition; // Used for Logging and demo.
@@ -139,7 +139,7 @@
SubscriptionManager.from(context), Config.readConfig(context), bgLooper,
new CallbackHandler(),
new AccessPointControllerImpl(context, bgLooper),
- new MobileDataControllerImpl(context),
+ new MobileDataController(context),
new SubscriptionDefaults());
mReceiverHandler.post(mRegisterListeners);
}
@@ -150,7 +150,7 @@
SubscriptionManager subManager, Config config, Looper bgLooper,
CallbackHandler callbackHandler,
AccessPointControllerImpl accessPointController,
- MobileDataControllerImpl mobileDataController,
+ MobileDataController mobileDataController,
SubscriptionDefaults defaultsHandler) {
mContext = context;
mConfig = config;
@@ -174,7 +174,7 @@
mMobileDataController = mobileDataController;
mMobileDataController.setNetworkController(this);
// TODO: Find a way to move this into MobileDataController.
- mMobileDataController.setCallback(new MobileDataControllerImpl.Callback() {
+ mMobileDataController.setCallback(new MobileDataController.Callback() {
@Override
public void onMobileDataEnabled(boolean enabled) {
mCallbackHandler.setMobileDataEnabled(enabled);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index 2ad9287..22c0cb9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -34,11 +34,13 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
-import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -47,16 +49,21 @@
/**
* Host for the remote input.
*/
-public class RemoteInputView extends FrameLayout implements View.OnClickListener {
+public class RemoteInputView extends LinearLayout implements View.OnClickListener {
private static final String TAG = "RemoteInput";
+ // A marker object that let's us easily find views of this class.
+ public static final Object VIEW_TAG = new Object();
+
private RemoteEditText mEditText;
+ private ImageButton mSendButton;
private ProgressBar mProgressBar;
private PendingIntent mPendingIntent;
+ private RemoteInput[] mRemoteInputs;
private RemoteInput mRemoteInput;
- private Notification.Action mAction;
private RemoteInputController mController;
+
private NotificationData.Entry mEntry;
public RemoteInputView(Context context, AttributeSet attrs) {
@@ -69,6 +76,9 @@
mProgressBar = (ProgressBar) findViewById(R.id.remote_input_progress);
+ mSendButton = (ImageButton) findViewById(R.id.remote_input_send);
+ mSendButton.setOnClickListener(this);
+
mEditText = (RemoteEditText) getChildAt(0);
mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
@@ -99,10 +109,11 @@
Bundle results = new Bundle();
results.putString(mRemoteInput.getResultKey(), mEditText.getText().toString());
Intent fillInIntent = new Intent().addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
- RemoteInput.addResultsToIntent(mAction.getRemoteInputs(), fillInIntent,
+ RemoteInput.addResultsToIntent(mRemoteInputs, fillInIntent,
results);
mEditText.setEnabled(false);
+ mSendButton.setVisibility(INVISIBLE);
mProgressBar.setVisibility(VISIBLE);
try {
@@ -113,17 +124,13 @@
}
public static RemoteInputView inflate(Context context, ViewGroup root,
- NotificationData.Entry entry, Notification.Action action, RemoteInput remoteInput,
+ NotificationData.Entry entry,
RemoteInputController controller) {
RemoteInputView v = (RemoteInputView)
LayoutInflater.from(context).inflate(R.layout.remote_input, root, false);
-
- v.mEditText.setHint(action.title);
- v.mPendingIntent = action.actionIntent;
- v.mRemoteInput = remoteInput;
- v.mAction = action;
v.mController = controller;
v.mEntry = entry;
+ v.setTag(VIEW_TAG);
return v;
}
@@ -132,15 +139,17 @@
public void onClick(View v) {
if (v == mEditText) {
if (!mEditText.isFocusable()) {
- mEditText.setInnerFocusable(true);
- mController.addRemoteInput(mEntry);
- mEditText.mShowImeOnInputConnection = true;
+ focus();
}
+ } else if (v == mSendButton) {
+ sendRemoteInput();
}
}
public void onDefocus() {
mController.removeRemoteInput(mEntry);
+ mEntry.remoteInputText = mEditText.getText();
+ setVisibility(INVISIBLE);
}
@Override
@@ -149,6 +158,25 @@
mController.removeRemoteInput(mEntry);
}
+ public void setPendingIntent(PendingIntent pendingIntent) {
+ mPendingIntent = pendingIntent;
+ }
+
+ public void setRemoteInput(RemoteInput[] remoteInputs, RemoteInput remoteInput) {
+ mRemoteInputs = remoteInputs;
+ mRemoteInput = remoteInput;
+ mEditText.setHint(mRemoteInput.getLabel());
+ }
+
+ public void focus() {
+ mEditText.setInnerFocusable(true);
+ mController.addRemoteInput(mEntry);
+ mEditText.mShowImeOnInputConnection = true;
+ mEditText.setText(mEntry.remoteInputText);
+ mEditText.setSelection(mEditText.getText().length());
+ mEditText.requestFocus();
+ }
+
/**
* An EditText that changes appearance based on whether it's focusable and becomes
* un-focusable whenever the user navigates away from it or it becomes invisible.
@@ -191,8 +219,11 @@
@Override
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK) {
+ if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
defocusIfNeeded();
+ final InputMethodManager imm = InputMethodManager.getInstance();
+ imm.hideSoftInputFromWindow(getWindowToken(), 0);
+ return true;
}
return super.onKeyPreIme(keyCode, event);
}
@@ -220,6 +251,13 @@
return inputConnection;
}
+ @Override
+ public void onCommitCompletion(CompletionInfo text) {
+ clearComposingText();
+ setText(text.getText());
+ setSelection(getText().length());
+ }
+
void setInnerFocusable(boolean focusable) {
setFocusableInTouchMode(focusable);
setFocusable(focusable);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java
index f06e5d3..a22f988 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java
@@ -16,8 +16,8 @@
package com.android.systemui.statusbar.policy;
public interface SecurityController {
-
- boolean hasDeviceOwner();
+ /** Whether the device has device owner, even if not on this user. */
+ boolean isDeviceManaged();
boolean hasProfileOwner();
String getDeviceOwnerName();
String getProfileOwnerName();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
index 88f028f..6ddd7a3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
@@ -102,13 +102,13 @@
}
@Override
- public boolean hasDeviceOwner() {
- return !TextUtils.isEmpty(mDevicePolicyManager.getDeviceOwner());
+ public boolean isDeviceManaged() {
+ return mDevicePolicyManager.isDeviceManaged();
}
@Override
public String getDeviceOwnerName() {
- return mDevicePolicyManager.getDeviceOwnerName();
+ return mDevicePolicyManager.getDeviceOwnerNameOnAnyUser();
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index e00b890..b010761 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -342,7 +342,7 @@
private void stopUserId(int id) {
try {
- ActivityManagerNative.getDefault().stopUser(id, null);
+ ActivityManagerNative.getDefault().stopUser(id, /* force= */ false, null);
} catch (RemoteException e) {
Log.e(TAG, "Couldn't stop user.", e);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
index 9b1e72a..eab6e13 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
@@ -18,20 +18,16 @@
import android.content.Context;
import android.content.Intent;
import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.os.Message;
import android.os.Messenger;
import android.util.Log;
-
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.AsyncChannel;
+import com.android.settingslib.wifi.WifiStatusTracker;
import com.android.systemui.statusbar.policy.NetworkController.IconState;
-import java.util.List;
import java.util.Objects;
@@ -40,12 +36,14 @@
private final WifiManager mWifiManager;
private final AsyncChannel mWifiChannel;
private final boolean mHasMobileData;
+ private final WifiStatusTracker mWifiTracker;
public WifiSignalController(Context context, boolean hasMobileData,
CallbackHandler callbackHandler, NetworkControllerImpl networkController) {
super("WifiSignalController", context, NetworkCapabilities.TRANSPORT_WIFI,
callbackHandler, networkController);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ mWifiTracker = new WifiStatusTracker(mWifiManager);
mHasMobileData = hasMobileData;
Handler handler = new WifiHandler();
mWifiChannel = new AsyncChannel();
@@ -93,54 +91,15 @@
* Extract wifi state directly from broadcasts about changes in wifi state.
*/
public void handleBroadcast(Intent intent) {
- String action = intent.getAction();
- if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
- mCurrentState.enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
- WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED;
- } else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
- final NetworkInfo networkInfo = (NetworkInfo)
- intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
- mCurrentState.connected = networkInfo != null && networkInfo.isConnected();
- // If Connected grab the signal strength and ssid.
- if (mCurrentState.connected) {
- // try getting it out of the intent first
- WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null
- ? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO)
- : mWifiManager.getConnectionInfo();
- if (info != null) {
- mCurrentState.ssid = getSsid(info);
- } else {
- mCurrentState.ssid = null;
- }
- } else if (!mCurrentState.connected) {
- mCurrentState.ssid = null;
- }
- } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
- // Default to -200 as its below WifiManager.MIN_RSSI.
- mCurrentState.rssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200);
- mCurrentState.level = WifiManager.calculateSignalLevel(
- mCurrentState.rssi, WifiIcons.WIFI_LEVEL_COUNT);
- }
-
+ mWifiTracker.handleBroadcast(intent);
+ mCurrentState.enabled = mWifiTracker.enabled;
+ mCurrentState.connected = mWifiTracker.connected;
+ mCurrentState.ssid = mWifiTracker.ssid;
+ mCurrentState.rssi = mWifiTracker.rssi;
+ mCurrentState.level = mWifiTracker.level;
notifyListenersIfNecessary();
}
- private String getSsid(WifiInfo info) {
- String ssid = info.getSSID();
- if (ssid != null) {
- return ssid;
- }
- // OK, it's not in the connectionInfo; we have to go hunting for it
- List<WifiConfiguration> networks = mWifiManager.getConfiguredNetworks();
- int length = networks.size();
- for (int i = 0; i < length; i++) {
- if (networks.get(i).networkId == info.getNetworkId()) {
- return networks.get(i).SSID;
- }
- }
- return null;
- }
-
@VisibleForTesting
void setActivity(int wifiActivity) {
mCurrentState.activityIn = wifiActivity == WifiManager.DATA_ACTIVITY_INOUT
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
index c9ebc84..77a9871 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
@@ -78,7 +78,7 @@
mNotificationAppearDistance = getResources().getDimensionPixelSize(
R.dimen.notification_appear_distance);
mNotificationHeaderHeight = getResources().getDimensionPixelSize(
- R.dimen.notification_header_height);
+ com.android.internal.R.dimen.notification_header_height);
mHeaderTopPaddingSubstraction = 2 * getResources().getDisplayMetrics().density;
mCollapsedBottompadding = 10 * getResources().getDisplayMetrics().density;
mHybridViewManager = new HybridNotificationViewManager(getContext(), this);
@@ -246,7 +246,7 @@
* in @param maxAllowedVisibleChildren
*/
private int getIntrinsicHeight(float maxAllowedVisibleChildren) {
- int intrinsicHeight = 0;
+ int intrinsicHeight = mNotificationHeaderHeight;;
int visibleChildren = 0;
int childCount = mChildren.size();
for (int i = 0; i < childCount; i++) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index aeca97c..ae6b729 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -272,7 +272,7 @@
@Override
protected void onDraw(Canvas canvas) {
if (DEBUG) {
- int y = mCollapsedSize;
+ int y = mTopPadding;
canvas.drawLine(0, y, getWidth(), y, mDebugPaint);
y = (int) (getLayoutHeight() - mBottomStackPeekSize
- mBottomStackSlowDownHeight);
@@ -550,8 +550,9 @@
return Math.min(mMaxLayoutHeight, mCurrentStackHeight);
}
- public int getItemHeight() {
- return mCollapsedSize;
+ public int getFirstItemMinHeight() {
+ final ExpandableView firstChild = getFirstChildNotGone();
+ return firstChild != null ? firstChild.getMinHeight() : mCollapsedSize;
}
public int getBottomStackPeekSize() {
@@ -1321,14 +1322,14 @@
ExpandableView firstChild = (ExpandableView) getFirstChildNotGone();
if (firstChild != null) {
int contentHeight = getContentHeight();
- int firstChildMaxExpandHeight = getMaxExpandHeight(firstChild);
scrollRange = Math.max(0, contentHeight - mMaxLayoutHeight + mBottomStackPeekSize
+ mBottomStackSlowDownHeight);
if (scrollRange > 0) {
- View lastChild = getLastChildNotGone();
+ int firstChildMaxExpandHeight = getMaxExpandHeight(firstChild);
// We want to at least be able collapse the first item and not ending in a weird
// end state.
- scrollRange = Math.max(scrollRange, firstChildMaxExpandHeight - mCollapsedSize);
+ scrollRange = Math.max(scrollRange, firstChildMaxExpandHeight
+ - firstChild.getMinHeight());
}
}
return scrollRange;
@@ -1337,12 +1338,12 @@
/**
* @return the first child which has visibility unequal to GONE
*/
- private View getFirstChildNotGone() {
+ private ExpandableView getFirstChildNotGone() {
int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
View child = getChildAt(i);
if (child.getVisibility() != View.GONE) {
- return child;
+ return (ExpandableView) child;
}
}
return null;
@@ -1504,7 +1505,10 @@
}
public int getMinStackHeight() {
- return mCollapsedSize + mBottomStackPeekSize + mCollapseSecondCardPadding;
+ final ExpandableView firstChild = getFirstChildNotGone();
+ final int firstChildMinHeight = firstChild != null ? (int) firstChild.getMinHeight()
+ : mCollapsedSize;
+ return firstChildMinHeight + mBottomStackPeekSize + mCollapseSecondCardPadding;
}
public float getTopPaddingOverflow() {
@@ -1512,7 +1516,10 @@
}
public int getPeekHeight() {
- return mIntrinsicPadding + mCollapsedSize + mBottomStackPeekSize
+ final ExpandableView firstChild = getFirstChildNotGone();
+ final int firstChildMinHeight = firstChild != null ? (int) firstChild.getMinHeight()
+ : mCollapsedSize;
+ return mIntrinsicPadding + firstChildMinHeight + mBottomStackPeekSize
+ mCollapseSecondCardPadding;
}
@@ -1860,7 +1867,7 @@
}
mNeedsAnimation = true;
}
- if (isHeadsUp(child)) {
+ if (isHeadsUp(child) && !mChangePositionInProgress) {
mAddedHeadsUpChildren.add(child);
mChildrenToAddAnimated.remove(child);
}
@@ -2266,6 +2273,11 @@
return Math.max(emptyMargin, 0);
}
+ public float getKeyguardBottomStackSize() {
+ return mBottomStackPeekSize + getResources().getDimensionPixelSize(
+ R.dimen.bottom_stack_slow_down_length);
+ }
+
public void onExpansionStarted() {
mIsExpansionChanging = true;
mStackScrollAlgorithm.onExpansionStarted(mCurrentStackScrollState);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index 65ca95b..953f287 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -42,7 +42,7 @@
private static final int MAX_ITEMS_IN_BOTTOM_STACK = 3;
private static final int MAX_ITEMS_IN_TOP_STACK = 3;
- public static final float DIMMED_SCALE = 0.95f;
+ public static final float DIMMED_SCALE = 0.98f;
private int mPaddingBetweenElements;
private int mCollapsedSize;
@@ -72,6 +72,7 @@
private int mMaxNotificationHeight;
private boolean mScaleDimmed;
private HeadsUpManager mHeadsUpManager;
+ private int mFirstChildMinHeight;
public StackScrollAlgorithm(Context context) {
initConstants(context);
@@ -155,7 +156,7 @@
// Due to the overScroller, the stackscroller can have negative scroll state. This is
// already accounted for by the top padding and doesn't need an additional adaption
scrollY = Math.max(0, scrollY);
- algorithmState.scrollY = (int) (scrollY + mCollapsedSize + bottomOverScroll);
+ algorithmState.scrollY = (int) (scrollY + mFirstChildMinHeight + bottomOverScroll);
updateVisibleChildren(resultState, algorithmState);
@@ -424,7 +425,8 @@
float yPositionInScrollViewAfterElement = yPositionInScrollView
+ childHeight
+ mPaddingBetweenElements;
- float scrollOffset = yPositionInScrollView - algorithmState.scrollY + mCollapsedSize;
+ float scrollOffset = yPositionInScrollView - algorithmState.scrollY +
+ mFirstChildMinHeight;
if (i == algorithmState.lastTopStackIndex + 1) {
// Normally the position of this child is the position in the regular scrollview,
@@ -451,10 +453,10 @@
>= bottomStackStart && !mIsExpansionChanging && i != 0 && mIsSmallScreen) {
// we just collapse this element slightly
int newSize = (int) Math.max(bottomStackStart - mPaddingBetweenElements -
- childViewState.yTranslation, mCollapsedSize);
+ childViewState.yTranslation, child.getMinHeight());
childViewState.height = newSize;
updateStateForChildTransitioningInBottom(algorithmState, bottomStackStart,
- bottomPeekStart, childViewState.yTranslation, childViewState,
+ child, childViewState.yTranslation, childViewState,
childHeight);
}
clampPositionToBottomStackStart(childViewState, childViewState.height,
@@ -471,7 +473,7 @@
// According to the regular scroll view we are currently translating out of /
// into the bottom of the screen
updateStateForChildTransitioningInBottom(algorithmState,
- bottomStackStart, bottomPeekStart, currentYPosition,
+ bottomStackStart, child, currentYPosition,
childViewState, childHeight);
}
} else {
@@ -484,12 +486,13 @@
// The first card is always rendered.
if (i == 0) {
childViewState.alpha = 1.0f;
- childViewState.yTranslation = Math.max(mCollapsedSize - algorithmState.scrollY, 0);
+ childViewState.yTranslation = Math.max(
+ mFirstChildMinHeight - algorithmState.scrollY, 0);
if (childViewState.yTranslation + childViewState.height
> bottomPeekStart - mCollapseSecondCardPadding) {
childViewState.height = (int) Math.max(
bottomPeekStart - mCollapseSecondCardPadding
- - childViewState.yTranslation, mCollapsedSize);
+ - childViewState.yTranslation, mFirstChildMinHeight);
}
childViewState.location = StackViewState.LOCATION_FIRST_CARD;
}
@@ -501,7 +504,8 @@
if (ambientState.isShadeExpanded() && topHeadsUpEntry != null
&& child != topHeadsUpEntry) {
- childViewState.yTranslation += topHeadsUpEntry.getHeadsUpHeight() - mCollapsedSize;
+ childViewState.yTranslation += topHeadsUpEntry.getHeadsUpHeight() -
+ mFirstChildMinHeight;
}
childViewState.yTranslation += ambientState.getTopPadding()
+ ambientState.getStackTranslation();
@@ -528,7 +532,7 @@
boolean isTopEntry = topHeadsUpEntry == row;
if (mIsExpanded) {
if (isTopEntry) {
- childState.height += row.getHeadsUpHeight() - mCollapsedSize;
+ childState.height += row.getHeadsUpHeight() - mFirstChildMinHeight;
}
childState.height = Math.max(childState.height, row.getHeadsUpHeight());
// Ensure that the heads up is always visible even when scrolled off from the bottom
@@ -588,7 +592,7 @@
private void clampPositionToTopStackEnd(StackViewState childViewState,
int childHeight) {
childViewState.yTranslation = Math.max(childViewState.yTranslation,
- mCollapsedSize - childHeight);
+ mFirstChildMinHeight - childHeight);
}
private int getMaxAllowedChildHeight(View child, AmbientState ambientState) {
@@ -597,7 +601,7 @@
if (ambientState == null && row.isHeadsUp()
|| ambientState != null && ambientState.getTopHeadsUpEntry() == child) {
int extraSize = row.getIntrinsicHeight() - row.getHeadsUpHeight();
- return mCollapsedSize + extraSize;
+ return mFirstChildMinHeight + extraSize;
}
return row.getIntrinsicHeight();
} else if (child instanceof ExpandableView) {
@@ -608,7 +612,7 @@
}
private void updateStateForChildTransitioningInBottom(StackScrollAlgorithmState algorithmState,
- float transitioningPositionStart, float bottomPeakStart, float currentYPosition,
+ float transitioningPositionStart, ExpandableView child, float currentYPosition,
StackViewState childViewState, int childHeight) {
// This is the transitioning element on top of bottom stack, calculate how far we are in.
@@ -620,9 +624,10 @@
float offset = mBottomStackIndentationFunctor.getValue(algorithmState.partialInBottom);
algorithmState.itemsInBottomStack += algorithmState.partialInBottom;
int newHeight = childHeight;
- if (childHeight > mCollapsedSize && mIsSmallScreen) {
+ if (childHeight > child.getMinHeight() && mIsSmallScreen) {
newHeight = (int) Math.max(Math.min(transitioningPositionStart + offset -
- mPaddingBetweenElements - currentYPosition, childHeight), mCollapsedSize);
+ mPaddingBetweenElements - currentYPosition, childHeight),
+ child.getMinHeight());
childViewState.height = newHeight;
}
childViewState.yTranslation = transitioningPositionStart + offset - newHeight
@@ -689,7 +694,7 @@
numItemsBefore = algorithmState.itemsInTopStack - i;
}
// The end position of the current child
- float currentChildEndY = mCollapsedSize + mTopStackTotalSize
+ float currentChildEndY = mFirstChildMinHeight + mTopStackTotalSize
- mTopStackIndentationFunctor.getValue(numItemsBefore);
childViewState.yTranslation = currentChildEndY - childHeight;
}
@@ -701,7 +706,7 @@
// We are hidden behind the top card and faded out, so we can hide ourselves.
childViewState.alpha = 0.0f;
}
- childViewState.yTranslation = mCollapsedSize - childHeight;
+ childViewState.yTranslation = mFirstChildMinHeight - childHeight;
childViewState.location = StackViewState.LOCATION_TOP_STACK_HIDDEN;
}
@@ -730,7 +735,7 @@
+ childHeight
+ mPaddingBetweenElements;
if (yPositionInScrollView < algorithmState.scrollY) {
- if (i == 0 && algorithmState.scrollY <= mCollapsedSize) {
+ if (i == 0 && algorithmState.scrollY <= mFirstChildMinHeight) {
// The starting position of the bottom stack peek
int bottomPeekStart = ambientState.getInnerHeight() - mBottomStackPeekSize -
@@ -740,14 +745,14 @@
? mFirstChildMaxHeight
: childHeight;
childViewState.height = (int) Math.max(Math.min(bottomPeekStart, maxHeight),
- mCollapsedSize);
+ mFirstChildMinHeight);
algorithmState.itemsInTopStack = 1.0f;
} else if (yPositionInScrollViewAfterElement < algorithmState.scrollY) {
// According to the regular scroll view we are fully off screen
algorithmState.itemsInTopStack += 1.0f;
if (i == 0) {
- childViewState.height = mCollapsedSize;
+ childViewState.height = child.getMinHeight();
}
} else {
// According to the regular scroll view we are partially off screen
@@ -766,8 +771,8 @@
// If it is expanded we have to collapse it to a new size
float newSize = yPositionInScrollViewAfterElement
- mPaddingBetweenElements
- - algorithmState.scrollY + mCollapsedSize;
- newSize = Math.max(mCollapsedSize, newSize);
+ - algorithmState.scrollY + mFirstChildMinHeight;
+ newSize = Math.max(mFirstChildMinHeight, newSize);
algorithmState.itemsInTopStack = 1.0f;
childViewState.height = (int) newSize;
}
@@ -809,7 +814,7 @@
// Interpolate the index from 0 to 2 while the second item is
// translating in.
stackIndex -= 1.0f;
- if (algorithmState.scrollY > mCollapsedSize) {
+ if (algorithmState.scrollY > mFirstChildMinHeight) {
// Since there is a shadow treshhold, we cant just interpolate from 0 to
// 2 but we interpolate from 0.1f to 2.0f when scrolled in. The jump in
@@ -863,7 +868,7 @@
ExpandableNotificationRow row =
(ExpandableNotificationRow) mFirstChildWhileExpanding;
if (row.isHeadsUp()) {
- mFirstChildMaxHeight += mCollapsedSize - row.getHeadsUpHeight();
+ mFirstChildMaxHeight += mFirstChildMinHeight - row.getHeadsUpHeight();
}
}
} else {
@@ -927,7 +932,11 @@
this.mIsExpanded = isExpanded;
}
- public void notifyChildrenChanged(final ViewGroup hostView) {
+ public void notifyChildrenChanged(final NotificationStackScrollLayout hostView) {
+ int firstItemMinHeight = hostView.getFirstItemMinHeight();
+ if (firstItemMinHeight != mFirstChildMinHeight) {
+ mFirstChildMinHeight = firstItemMinHeight;
+ }
if (mIsExpansionChanging) {
hostView.post(new Runnable() {
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
index bbe5dd9..39a2986 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java
@@ -130,7 +130,7 @@
}
@Override
- protected int getMaxKeyguardNotifications() {
+ protected int getMaxKeyguardNotifications(boolean recompute) {
return 0;
}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
deleted file mode 100644
index 05e3fd5..0000000
--- a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Copyright (C) 2015 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.systemui.tuner;
-
-import android.app.ActivityManager;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.ClipData;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.provider.Settings.Secure;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.DragEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnDragListener;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ScrollView;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.systemui.R;
-import com.android.systemui.qs.QSPanel;
-import com.android.systemui.qs.QSTile;
-import com.android.systemui.qs.QSTile.Host.Callback;
-import com.android.systemui.qs.QSTile.ResourceIcon;
-import com.android.systemui.qs.QSTileBaseView;
-import com.android.systemui.qs.QSTileView;
-import com.android.systemui.qs.tiles.IntentTile;
-import com.android.systemui.statusbar.phone.QSTileHost;
-import com.android.systemui.statusbar.policy.SecurityController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class QsTuner extends Fragment implements Callback {
-
- private static final String TAG = "QsTuner";
-
- private static final int MENU_RESET = Menu.FIRST;
-
- private DraggableQsPanel mQsPanel;
- private CustomHost mTileHost;
-
- private FrameLayout mDropTarget;
-
- private ScrollView mScrollRoot;
-
- private FrameLayout mAddTarget;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setHasOptionsMenu(true);
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- menu.add(0, MENU_RESET, 0, com.android.internal.R.string.reset);
- }
-
- public void onResume() {
- super.onResume();
- MetricsLogger.visibility(getContext(), MetricsLogger.TUNER_QS, true);
- }
-
- public void onPause() {
- super.onPause();
- MetricsLogger.visibility(getContext(), MetricsLogger.TUNER_QS, false);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case MENU_RESET:
- mTileHost.reset();
- break;
- case android.R.id.home:
- getFragmentManager().popBackStack();
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- mScrollRoot = (ScrollView) inflater.inflate(R.layout.tuner_qs, container, false);
-
- mQsPanel = new DraggableQsPanel(getContext());
- mTileHost = new CustomHost(getContext());
- mTileHost.setCallback(this);
- mQsPanel.setTiles(mTileHost.getTiles());
- mQsPanel.setHost(mTileHost);
- mQsPanel.refreshAllTiles();
- ((ViewGroup) mScrollRoot.findViewById(R.id.all_details)).addView(mQsPanel, 0);
-
- mDropTarget = (FrameLayout) mScrollRoot.findViewById(R.id.remove_target);
- setupDropTarget();
- mAddTarget = (FrameLayout) mScrollRoot.findViewById(R.id.add_target);
- setupAddTarget();
- return mScrollRoot;
- }
-
- @Override
- public void onDestroyView() {
- mTileHost.destroy();
- super.onDestroyView();
- }
-
- private void setupDropTarget() {
- QSTileView tileView = new QSTileView(getContext());
- QSTile.State state = new QSTile.State();
- state.visible = true;
- state.icon = ResourceIcon.get(R.drawable.ic_delete);
- state.label = getString(com.android.internal.R.string.delete);
- tileView.onStateChanged(state);
- mDropTarget.addView(tileView);
- mDropTarget.setVisibility(View.GONE);
- new DragHelper(tileView, new DropListener() {
- @Override
- public void onDrop(String sourceText) {
- mTileHost.remove(sourceText);
- }
- });
- }
-
- private void setupAddTarget() {
- QSTileView tileView = new QSTileView(getContext());
- QSTile.State state = new QSTile.State();
- state.visible = true;
- state.icon = ResourceIcon.get(R.drawable.ic_add_circle_qs);
- state.label = getString(R.string.add_tile);
- tileView.onStateChanged(state);
- mAddTarget.addView(tileView);
- tileView.setClickable(true);
- tileView.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mTileHost.showAddDialog();
- }
- });
- }
-
- public void onStartDrag() {
- mDropTarget.post(new Runnable() {
- @Override
- public void run() {
- mDropTarget.setVisibility(View.VISIBLE);
- mAddTarget.setVisibility(View.GONE);
- }
- });
- }
-
- public void stopDrag() {
- mDropTarget.post(new Runnable() {
- @Override
- public void run() {
- mDropTarget.setVisibility(View.GONE);
- mAddTarget.setVisibility(View.VISIBLE);
- }
- });
- }
-
- @Override
- public void onTilesChanged() {
- mQsPanel.setTiles(mTileHost.getTiles());
- }
-
- private static int getLabelResource(String spec) {
- if (spec.equals("wifi")) return R.string.quick_settings_wifi_label;
- else if (spec.equals("bt")) return R.string.quick_settings_bluetooth_label;
- else if (spec.equals("inversion")) return R.string.quick_settings_inversion_label;
- else if (spec.equals("cell")) return R.string.quick_settings_cellular_detail_title;
- else if (spec.equals("airplane")) return R.string.airplane_mode;
- else if (spec.equals("dnd")) return R.string.quick_settings_dnd_label;
- else if (spec.equals("rotation")) return R.string.quick_settings_rotation_locked_label;
- else if (spec.equals("flashlight")) return R.string.quick_settings_flashlight_label;
- else if (spec.equals("location")) return R.string.quick_settings_location_label;
- else if (spec.equals("cast")) return R.string.quick_settings_cast_title;
- else if (spec.equals("hotspot")) return R.string.quick_settings_hotspot_label;
- return 0;
- }
-
- private static class CustomHost extends QSTileHost {
-
- public CustomHost(Context context) {
- super(context, null, null, null, null, null, null, null, null, null, null,
- null, null, new BlankSecurityController(), null);
- }
-
- @Override
- public QSTile<?> createTile(String tileSpec) {
- return new DraggableTile(this, tileSpec);
- }
-
- public void replace(String oldTile, String newTile) {
- if (oldTile.equals(newTile)) {
- return;
- }
- MetricsLogger.action(getContext(), MetricsLogger.TUNER_QS_REORDER, oldTile + ","
- + newTile);
- List<String> order = new ArrayList<>(mTileSpecs);
- int index = order.indexOf(oldTile);
- if (index < 0) {
- Log.e(TAG, "Can't find " + oldTile);
- return;
- }
- order.remove(newTile);
- order.add(index, newTile);
- setTiles(order);
- }
-
- public void remove(String tile) {
- MetricsLogger.action(getContext(), MetricsLogger.TUNER_QS_REMOVE, tile);
- List<String> tiles = new ArrayList<>(mTileSpecs);
- tiles.remove(tile);
- setTiles(tiles);
- }
-
- public void add(String tile) {
- MetricsLogger.action(getContext(), MetricsLogger.TUNER_QS_ADD, tile);
- List<String> tiles = new ArrayList<>(mTileSpecs);
- tiles.add(tile);
- setTiles(tiles);
- }
-
- public void reset() {
- Secure.putStringForUser(getContext().getContentResolver(),
- TILES_SETTING, "default", ActivityManager.getCurrentUser());
- }
-
- private void setTiles(List<String> tiles) {
- Secure.putStringForUser(getContext().getContentResolver(), TILES_SETTING,
- TextUtils.join(",", tiles), ActivityManager.getCurrentUser());
- }
-
- public void showAddDialog() {
- List<String> tiles = mTileSpecs;
- int numBroadcast = 0;
- for (int i = 0; i < tiles.size(); i++) {
- if (tiles.get(i).startsWith(IntentTile.PREFIX)) {
- numBroadcast++;
- }
- }
- String[] defaults =
- getContext().getString(R.string.quick_settings_tiles_default).split(",");
- final String[] available = new String[defaults.length + 1
- - (tiles.size() - numBroadcast)];
- final String[] availableTiles = new String[available.length];
- int index = 0;
- for (int i = 0; i < defaults.length; i++) {
- if (tiles.contains(defaults[i])) {
- continue;
- }
- int resource = getLabelResource(defaults[i]);
- if (resource != 0) {
- availableTiles[index] = defaults[i];
- available[index++] = getContext().getString(resource);
- } else {
- availableTiles[index] = defaults[i];
- available[index++] = defaults[i];
- }
- }
- available[index++] = getContext().getString(R.string.broadcast_tile);
- new AlertDialog.Builder(getContext())
- .setTitle(R.string.add_tile)
- .setItems(available, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- if (which < available.length - 1) {
- add(availableTiles[which]);
- } else {
- showBroadcastTileDialog();
- }
- }
- }).show();
- }
-
- public void showBroadcastTileDialog() {
- final EditText editText = new EditText(getContext());
- new AlertDialog.Builder(getContext())
- .setTitle(R.string.broadcast_tile)
- .setView(editText)
- .setNegativeButton(android.R.string.cancel, null)
- .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- String action = editText.getText().toString();
- if (isValid(action)) {
- add(IntentTile.PREFIX + action + ')');
- }
- }
- }).show();
- }
-
- private boolean isValid(String action) {
- for (int i = 0; i < action.length(); i++) {
- char c = action.charAt(i);
- if (!Character.isAlphabetic(c) && !Character.isDigit(c) && c != '.') {
- return false;
- }
- }
- return true;
- }
-
- private static class BlankSecurityController implements SecurityController {
- @Override
- public boolean hasDeviceOwner() {
- return false;
- }
-
- @Override
- public boolean hasProfileOwner() {
- return false;
- }
-
- @Override
- public String getDeviceOwnerName() {
- return null;
- }
-
- @Override
- public String getProfileOwnerName() {
- return null;
- }
-
- @Override
- public boolean isVpnEnabled() {
- return false;
- }
-
- @Override
- public boolean isVpnRestricted() {
- return false;
- }
-
- @Override
- public String getPrimaryVpnName() {
- return null;
- }
-
- @Override
- public String getProfileVpnName() {
- return null;
- }
-
- @Override
- public void onUserSwitched(int newUserId) {
- }
-
- @Override
- public void addCallback(SecurityControllerCallback callback) {
- }
-
- @Override
- public void removeCallback(SecurityControllerCallback callback) {
- }
- }
- }
-
- private static class DraggableTile extends QSTile<QSTile.State>
- implements DropListener {
- private String mSpec;
- private QSTileBaseView mView;
-
- protected DraggableTile(QSTile.Host host, String tileSpec) {
- super(host);
- Log.d(TAG, "Creating tile " + tileSpec);
- mSpec = tileSpec;
- }
-
- @Override
- public QSTileBaseView createTileView(Context context) {
- mView = super.createTileView(context);
- return mView;
- }
-
- @Override
- public int getTileType() {
- return "wifi".equals(mSpec) || "bt".equals(mSpec) ? QSTileView.QS_TYPE_DUAL
- : QSTileView.QS_TYPE_NORMAL;
- }
-
- @Override
- public void setListening(boolean listening) {
- }
-
- @Override
- protected QSTile.State newTileState() {
- return new QSTile.State();
- }
-
- @Override
- protected void handleClick() {
- }
-
- @Override
- protected void handleUpdateState(QSTile.State state, Object arg) {
- state.visible = true;
- state.icon = ResourceIcon.get(getIcon());
- state.label = getLabel();
- }
-
- private String getLabel() {
- int resource = getLabelResource(mSpec);
- if (resource != 0) {
- return mContext.getString(resource);
- }
- if (mSpec.startsWith(IntentTile.PREFIX)) {
- int lastDot = mSpec.lastIndexOf('.');
- if (lastDot >= 0) {
- return mSpec.substring(lastDot + 1, mSpec.length() - 1);
- } else {
- return mSpec.substring(IntentTile.PREFIX.length(), mSpec.length() - 1);
- }
- }
- return mSpec;
- }
-
- private int getIcon() {
- if (mSpec.equals("wifi")) return R.drawable.ic_qs_wifi_full_3;
- else if (mSpec.equals("bt")) return R.drawable.ic_qs_bluetooth_connected;
- else if (mSpec.equals("inversion")) return R.drawable.ic_invert_colors_enable;
- else if (mSpec.equals("cell")) return R.drawable.ic_qs_signal_full_3;
- else if (mSpec.equals("airplane")) return R.drawable.ic_signal_airplane_enable;
- else if (mSpec.equals("dnd")) return R.drawable.ic_qs_dnd_on;
- else if (mSpec.equals("rotation")) return R.drawable.ic_portrait_from_auto_rotate;
- else if (mSpec.equals("flashlight")) return R.drawable.ic_signal_flashlight_enable;
- else if (mSpec.equals("location")) return R.drawable.ic_signal_location_enable;
- else if (mSpec.equals("cast")) return R.drawable.ic_qs_cast_on;
- else if (mSpec.equals("hotspot")) return R.drawable.ic_hotspot_enable;
- return R.drawable.android;
- }
-
- @Override
- public int getMetricsCategory() {
- return 20000;
- }
-
- @Override
- public boolean equals(Object o) {
- if (o instanceof DraggableTile) {
- return mSpec.equals(((DraggableTile) o).mSpec);
- }
- return false;
- }
-
- @Override
- public void onDrop(String sourceText) {
- ((CustomHost) mHost).replace(mSpec, sourceText);
- }
-
- }
-
- private class DragHelper implements OnDragListener {
-
- private final View mView;
- private final DropListener mListener;
-
- public DragHelper(View view, DropListener dropListener) {
- mView = view;
- mListener = dropListener;
- mView.setOnDragListener(this);
- }
-
- @Override
- public boolean onDrag(View v, DragEvent event) {
- switch (event.getAction()) {
- case DragEvent.ACTION_DRAG_ENTERED:
- mView.setBackgroundColor(0x77ffffff);
- break;
- case DragEvent.ACTION_DRAG_ENDED:
- stopDrag();
- case DragEvent.ACTION_DRAG_EXITED:
- mView.setBackgroundColor(0x0);
- break;
- case DragEvent.ACTION_DROP:
- stopDrag();
- String text = event.getClipData().getItemAt(0).getText().toString();
- mListener.onDrop(text);
- break;
- }
- return true;
- }
-
- }
-
- public interface DropListener {
- void onDrop(String sourceText);
- }
-
- private class DraggableQsPanel extends QSPanel implements OnTouchListener {
- public DraggableQsPanel(Context context) {
- super(context);
- mBrightnessView.setVisibility(View.GONE);
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- for (TileRecord r : mRecords) {
- new DragHelper(r.tileView, (DraggableTile) r.tile);
- r.tileView.setTag(r.tile);
- r.tileView.setOnTouchListener(this);
-
- for (int i = 0; i < r.tileView.getChildCount(); i++) {
- r.tileView.getChildAt(i).setClickable(false);
- }
- }
- }
-
- @Override
- public boolean onTouch(View v, MotionEvent event) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN:
- String tileSpec = (String) ((DraggableTile) v.getTag()).mSpec;
- ClipData data = ClipData.newPlainText(tileSpec, tileSpec);
- v.startDrag(data, new View.DragShadowBuilder(v), null, 0);
- onStartDrag();
- return true;
- }
- return false;
- }
- }
-
-}
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
index dc7c967..b620b50b 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java
@@ -59,8 +59,6 @@
private SwitchPreference mBatteryPct;
- private Preference mQsTuner;
-
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -68,17 +66,6 @@
getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
setHasOptionsMenu(true);
- mQsTuner = findPreference(KEY_QS_TUNER);
- mQsTuner.setOnPreferenceClickListener(new OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- FragmentTransaction ft = getFragmentManager().beginTransaction();
- ft.replace(android.R.id.content, new QsTuner(), "QsTuner");
- ft.addToBackStack(null);
- ft.commit();
- return true;
- }
- });
findPreference(KEY_DEMO_MODE).setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
@@ -96,13 +83,6 @@
new TunerWarningFragment().show(getFragmentManager(), WARNING_TAG);
}
}
- TunerService.get(getContext()).addTunable(mQsPaging, QSPanel.QS_THE_NEW_QS);
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- TunerService.get(getContext()).removeTunable(mQsPaging);
}
@Override
@@ -175,14 +155,6 @@
}
};
- private final Tunable mQsPaging = new Tunable() {
- @Override
- public void onTuningChanged(String key, String newValue) {
- // Only enable QS rearranging when paging is off, because its very broken.
- mQsTuner.setEnabled(newValue == null || Integer.parseInt(newValue) == 0);
- }
- };
-
public static class TunerWarningFragment extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index fdc2543..9cf64d3 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -37,7 +37,10 @@
LOCAL_PACKAGE_NAME := SystemUITests
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target Keyguard
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ mockito-target \
+ Keyguard \
+ android-support-v7-recyclerview
# sign this with platform cert, so this test is allowed to inject key events into
# UI it doesn't own. This is necessary to allow screenshots to be taken
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
index 30c08cd..13fc47d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
@@ -33,6 +33,7 @@
import android.util.Log;
import com.android.internal.telephony.cdma.EriInfo;
+import com.android.settingslib.net.MobileDataController;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.policy.NetworkController.IconState;
import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config;
@@ -95,7 +96,7 @@
mCallbackHandler = mock(CallbackHandler.class);
mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,
mConfig, Looper.getMainLooper(), mCallbackHandler,
- mock(AccessPointControllerImpl.class), mock(MobileDataControllerImpl.class),
+ mock(AccessPointControllerImpl.class), mock(MobileDataController.class),
mMockSubDefaults);
setupNetworkController();
@@ -136,7 +137,7 @@
= new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,
mConfig, Looper.getMainLooper(), mCallbackHandler,
mock(AccessPointControllerImpl.class),
- mock(MobileDataControllerImpl.class), mMockSubDefaults);
+ mock(MobileDataController.class), mMockSubDefaults);
setupNetworkController();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java
index 0ec8802..587e2b5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java
@@ -4,6 +4,7 @@
import android.telephony.TelephonyManager;
import android.test.suitebuilder.annotation.SmallTest;
+import com.android.settingslib.net.MobileDataController;
import org.mockito.Mockito;
@SmallTest
@@ -87,7 +88,7 @@
mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,
mConfig, Looper.getMainLooper(), mCallbackHandler,
Mockito.mock(AccessPointControllerImpl.class),
- Mockito.mock(MobileDataControllerImpl.class), mMockSubDefaults);
+ Mockito.mock(MobileDataController.class), mMockSubDefaults);
setupNetworkController();
setupDefaultSignal();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
index 660fd9c..760aa9a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
@@ -29,6 +29,7 @@
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
+import com.android.settingslib.net.MobileDataController;
import com.android.systemui.R;
import org.mockito.ArgumentCaptor;
@@ -46,7 +47,7 @@
// Create a new NetworkController as this is currently handled in constructor.
mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,
mConfig, Looper.getMainLooper(), mCallbackHandler,
- mock(AccessPointControllerImpl.class), mock(MobileDataControllerImpl.class),
+ mock(AccessPointControllerImpl.class), mock(MobileDataController.class),
mMockSubDefaults);
setupNetworkController();
@@ -95,7 +96,7 @@
// Create a new NetworkController as this is currently handled in constructor.
mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, mMockSm,
mConfig, Looper.getMainLooper(), mCallbackHandler,
- mock(AccessPointControllerImpl.class), mock(MobileDataControllerImpl.class),
+ mock(AccessPointControllerImpl.class), mock(MobileDataController.class),
mMockSubDefaults);
setupNetworkController();
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
index 76b2346..2fe6648 100644
--- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
+++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.net.IConnectivityManager;
+import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.ServiceManager;
@@ -50,8 +51,8 @@
private Handler mHandler;
@Override
- protected void onResume() {
- super.onResume();
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
if (getCallingPackage() != null) {
Log.e(TAG, getCallingPackage() + " cannot start this activity");
@@ -108,11 +109,11 @@
}
@Override
- protected void onPause() {
- super.onPause();
+ protected void onDestroy() {
if (!isFinishing()) {
finish();
}
+ super.onDestroy();
}
@Override
diff --git a/preloaded-classes b/preloaded-classes
index d6b4ec9..2301c41 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -1566,6 +1566,7 @@
android.security.keystore.AndroidKeyStoreKey
android.security.keystore.AndroidKeyStoreProvider
android.security.keystore.KeyStoreCryptoOperation
+android.security.net.config.NetworkSecurityConfigProvider
android.service.persistentdata.PersistentDataBlockManager
android.system.ErrnoException
android.system.GaiException
@@ -1764,6 +1765,7 @@
android.util.SuperNotCalledException
android.util.TypedValue
android.util.Xml
+android.util.jar.StrictJarFile
android.view.AbsSavedState
android.view.AbsSavedState$1
android.view.AbsSavedState$2
@@ -3360,9 +3362,6 @@
java.util.jar.JarEntry
java.util.jar.JarFile
java.util.jar.JarFile$JarFileEnumerator
-java.util.jar.Manifest
-java.util.jar.ManifestReader
-java.util.jar.StrictJarFile
java.util.logging.ConsoleHandler
java.util.logging.ErrorManager
java.util.logging.Filter
@@ -3559,11 +3558,6 @@
org.apache.harmony.security.asn1.BerOutputStream
org.apache.harmony.security.asn1.DerInputStream
org.apache.harmony.security.asn1.DerOutputStream
-org.apache.harmony.security.fortress.Engine
-org.apache.harmony.security.fortress.Engine$ServiceCacheEntry
-org.apache.harmony.security.fortress.Engine$SpiAndProvider
-org.apache.harmony.security.fortress.SecurityAccess
-org.apache.harmony.security.fortress.Services
org.apache.harmony.security.provider.crypto.CryptoProvider
org.apache.harmony.security.utils.AlgNameMapper
org.apache.harmony.security.utils.AlgNameMapperSource
diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java
index 54180f4..9bbacbc 100644
--- a/rs/java/android/renderscript/ScriptGroup.java
+++ b/rs/java/android/renderscript/ScriptGroup.java
@@ -278,6 +278,8 @@
public ValueAndSize(RenderScript rs, Object obj) {
if (obj instanceof Allocation) {
value = ((Allocation)obj).getID(rs);
+ // Special value for size to tell the runtime and driver that
+ // the value is an Allocation
size = -1;
} else if (obj instanceof Boolean) {
value = ((Boolean)obj).booleanValue() ? 1 : 0;
@@ -289,10 +291,10 @@
value = ((Long)obj).longValue();
size = 8;
} else if (obj instanceof Float) {
- value = ((Float)obj).longValue();
+ value = Float.floatToRawIntBits(((Float)obj).floatValue());
size = 4;
} else if (obj instanceof Double) {
- value = ((Double)obj).longValue();
+ value = Double.doubleToRawLongBits(((Double)obj).doubleValue());
size = 8;
}
}
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index be7071e..113241d 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -393,7 +393,6 @@
size_t numValues, numDependencies;
RsScriptFieldID* fieldIDs;
- uintptr_t* values;
RsClosure* depClosures;
RsScriptFieldID* depFieldIDs;
@@ -430,15 +429,6 @@
fieldIDs[i] = (RsScriptFieldID)jFieldIDs[i];
}
- values = (uintptr_t*)alloca(sizeof(uintptr_t) * numValues);
- if (values == nullptr) {
- goto exit;
- }
-
- for (size_t i = 0; i < numValues; i++) {
- values[i] = (uintptr_t)jValues[i];
- }
-
depClosures = (RsClosure*)alloca(sizeof(RsClosure) * numDependencies);
if (depClosures == nullptr) {
goto exit;
@@ -459,7 +449,7 @@
ret = (jlong)(uintptr_t)rsClosureCreate(
(RsContext)con, (RsScriptKernelID)kernelID, (RsAllocation)returnValue,
- fieldIDs, numValues, values, numValues,
+ fieldIDs, numValues, jValues, numValues,
(int*)jSizes, numValues,
depClosures, numDependencies,
depFieldIDs, numDependencies);
@@ -511,7 +501,6 @@
size_t numValues;
RsScriptFieldID* fieldIDs;
- uintptr_t* values;
if (fieldIDs_length != values_length || values_length != sizes_length) {
ALOGE("Unmatched field IDs, values, and sizes in closure creation.");
@@ -534,18 +523,9 @@
fieldIDs[i] = (RsScriptFieldID)jFieldIDs[i];
}
- values = (uintptr_t*)alloca(sizeof(uintptr_t) * numValues);
- if (values == nullptr) {
- goto exit;
- }
-
- for (size_t i = 0; i < numValues; i++) {
- values[i] = (uintptr_t)jValues[i];
- }
-
ret = (jlong)(uintptr_t)rsInvokeClosureCreate(
(RsContext)con, (RsScriptInvokeID)invokeID, jParams, jParamLength,
- fieldIDs, numValues, values, numValues,
+ fieldIDs, numValues, jValues, numValues,
(int*)jSizes, numValues);
exit:
@@ -561,15 +541,17 @@
static void
nClosureSetArg(JNIEnv *_env, jobject _this, jlong con, jlong closureID,
jint index, jlong value, jint size) {
+ // Size is signed with -1 indicating the value is an Allocation
rsClosureSetArg((RsContext)con, (RsClosure)closureID, (uint32_t)index,
- (uintptr_t)value, (size_t)size);
+ (uintptr_t)value, size);
}
static void
nClosureSetGlobal(JNIEnv *_env, jobject _this, jlong con, jlong closureID,
jlong fieldID, jlong value, jint size) {
+ // Size is signed with -1 indicating the value is an Allocation
rsClosureSetGlobal((RsContext)con, (RsClosure)closureID,
- (RsScriptFieldID)fieldID, (uintptr_t)value, (size_t)size);
+ (RsScriptFieldID)fieldID, (int64_t)value, size);
}
static long
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
index b52687a..5f6cbf9 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
@@ -21,7 +21,6 @@
import android.util.Pools.SimplePool;
import android.util.Slog;
import android.view.Choreographer;
-import android.view.Display;
import android.view.InputDevice;
import android.view.InputEvent;
import android.view.InputFilter;
@@ -103,7 +102,7 @@
private TouchExplorer mTouchExplorer;
- private ScreenMagnifier mScreenMagnifier;
+ private MagnificationGestureHandler mMagnificationGestureHandler;
private AutoclickController mAutoclickController;
@@ -363,14 +362,13 @@
}
if ((mEnabledFeatures & FLAG_FEATURE_SCREEN_MAGNIFIER) != 0) {
- mScreenMagnifier = new ScreenMagnifier(mContext, mUserId,
- Display.DEFAULT_DISPLAY, mAms);
- addFirstEventHandler(mScreenMagnifier);
+ mMagnificationGestureHandler = new MagnificationGestureHandler(mContext, mAms);
+ addFirstEventHandler(mMagnificationGestureHandler);
}
if ((mEnabledFeatures & FLAG_FEATURE_FILTER_KEY_EVENTS) != 0) {
- mKeyboardInterceptor = new KeyboardInterceptor(mAms);
- addFirstEventHandler(mKeyboardInterceptor);
+ mKeyboardInterceptor = new KeyboardInterceptor(mAms);
+ addFirstEventHandler(mKeyboardInterceptor);
}
}
@@ -398,9 +396,9 @@
mTouchExplorer.onDestroy();
mTouchExplorer = null;
}
- if (mScreenMagnifier != null) {
- mScreenMagnifier.onDestroy();
- mScreenMagnifier = null;
+ if (mMagnificationGestureHandler != null) {
+ mMagnificationGestureHandler.onDestroy();
+ mMagnificationGestureHandler = null;
}
if (mKeyboardInterceptor != null) {
mKeyboardInterceptor.onDestroy();
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 535a8ef..11fdbb5 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -23,6 +23,7 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.IAccessibilityServiceClient;
import android.accessibilityservice.IAccessibilityServiceConnection;
+import android.annotation.NonNull;
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.app.StatusBarManager;
@@ -63,21 +64,17 @@
import android.provider.Settings;
import android.text.TextUtils;
import android.text.TextUtils.SimpleStringSplitter;
-import android.util.Pools.Pool;
-import android.util.Pools.SimplePool;
import android.util.Slog;
import android.util.SparseArray;
import android.view.Display;
import android.view.IWindow;
import android.view.InputDevice;
-import android.view.InputEventConsistencyVerifier;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.MagnificationSpec;
import android.view.WindowInfo;
import android.view.WindowManager;
import android.view.WindowManagerInternal;
-import android.view.WindowManagerPolicy;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityInteractionClient;
import android.view.accessibility.AccessibilityManager;
@@ -90,6 +87,7 @@
import com.android.internal.R;
import com.android.internal.content.PackageMonitor;
+import com.android.internal.os.SomeArgs;
import com.android.internal.statusbar.IStatusBarService;
import com.android.server.LocalServices;
@@ -144,8 +142,6 @@
private static final int OWN_PROCESS_ID = android.os.Process.myPid();
- private static final int MAX_POOL_SIZE = 10;
-
private static final int WINDOW_ID_UNKNOWN = -1;
private static int sIdCounter = 0;
@@ -156,9 +152,6 @@
private final Object mLock = new Object();
- private final Pool<PendingEvent> mPendingEventPool =
- new SimplePool<>(MAX_POOL_SIZE);
-
private final SimpleStringSplitter mStringColonSplitter =
new SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
@@ -181,6 +174,8 @@
private MagnificationController mMagnificationController;
+ private boolean mUnregisterMagnificationOnReset;
+
private InteractionBridge mInteractionBridge;
private AlertDialog mEnableTouchExplorationDialog;
@@ -189,6 +184,8 @@
private boolean mHasInputFilter;
+ private KeyEventDispatcher mKeyEventDispatcher;
+
private final Set<ComponentName> mTempComponentNameSet = new HashSet<>();
private final List<AccessibilityServiceInfo> mTempAccessibilityServiceInfoList =
@@ -436,7 +433,6 @@
AccessibilityEvent.obtain(event)).sendToTarget();
}
event.recycle();
- getUserStateLocked(resolvedUserId).mHandledFeedbackTypes = 0;
}
return (OWN_PROCESS_ID != Binder.getCallingPid());
}
@@ -752,12 +748,33 @@
boolean notifyKeyEvent(KeyEvent event, int policyFlags) {
synchronized (mLock) {
- KeyEvent localClone = KeyEvent.obtain(event);
- boolean handled = notifyKeyEventLocked(localClone, policyFlags, false);
- if (!handled) {
- handled = notifyKeyEventLocked(localClone, policyFlags, true);
+ List<Service> boundServices = getCurrentUserStateLocked().mBoundServices;
+ if (boundServices.isEmpty()) {
+ return false;
}
- return handled;
+ return getKeyEventDispatcher().notifyKeyEventLocked(event, policyFlags, boundServices);
+ }
+ }
+
+ /**
+ * Called by the MagnificationController when the state of display
+ * magnification changes.
+ *
+ * @param region the new magnified region, may be empty if
+ * magnification is not enabled (e.g. scale is 1)
+ * @param scale the new scale
+ * @param centerX the new screen-relative center X coordinate
+ * @param centerY the new screen-relative center Y coordinate
+ */
+ void notifyMagnificationChanged(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ synchronized (mLock) {
+ notifyMagnificationChangedLocked(region, scale, centerX, centerY);
+
+ if (mUnregisterMagnificationOnReset && scale == 1.0f) {
+ mUnregisterMagnificationOnReset = false;
+ mMagnificationController.unregister();
+ }
}
}
@@ -909,31 +926,6 @@
return false;
}
- private boolean notifyKeyEventLocked(KeyEvent event, int policyFlags, boolean isDefault) {
- // TODO: Now we are giving the key events to the last enabled
- // service that can handle them Ideally, the user should
- // make the call which service handles key events. However,
- // only one service should handle key events to avoid user
- // frustration when different behavior is observed from
- // different combinations of enabled accessibility services.
- UserState state = getCurrentUserStateLocked();
- for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
- Service service = state.mBoundServices.get(i);
- // Key events are handled only by services that declared
- // this capability and requested to filter key events.
- if (!service.mRequestFilterKeyEvents ||
- (service.mAccessibilityServiceInfo.getCapabilities() & AccessibilityServiceInfo
- .CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS) == 0) {
- continue;
- }
- if (service.mIsDefault == isDefault) {
- service.notifyKeyEvent(event, policyFlags);
- return true;
- }
- }
- return false;
- }
-
private void notifyClearAccessibilityCacheLocked() {
UserState state = getCurrentUserStateLocked();
for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
@@ -942,6 +934,15 @@
}
}
+ private void notifyMagnificationChangedLocked(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ final UserState state = getCurrentUserStateLocked();
+ for (int i = state.mBoundServices.size() - 1; i >= 0; i--) {
+ final Service service = state.mBoundServices.get(i);
+ service.notifyMagnificationChanged(region, scale, centerX, centerY);
+ }
+ }
+
/**
* Removes an AccessibilityInteractionConnection.
*
@@ -1049,9 +1050,7 @@
Service service = state.mBoundServices.get(i);
if (service.mIsDefault == isDefault) {
- if (canDispatchEventToServiceLocked(service, event,
- state.mHandledFeedbackTypes)) {
- state.mHandledFeedbackTypes |= service.mFeedbackType;
+ if (canDispatchEventToServiceLocked(service, event)) {
service.notifyAccessibilityEvent(event);
}
}
@@ -1086,19 +1085,14 @@
/**
* Determines if given event can be dispatched to a service based on the package of the
- * event source and already notified services for that event type. Specifically, a
- * service is notified if it is interested in events from the package and no other service
- * providing the same feedback type has been notified. Exception are services the
- * provide generic feedback (feedback type left as a safety net for unforeseen feedback
- * types) which are always notified.
+ * event source. Specifically, a service is notified if it is interested in events from the
+ * package.
*
* @param service The potential receiver.
* @param event The event.
- * @param handledFeedbackTypes The feedback types for which services have been notified.
* @return True if the listener should be notified, false otherwise.
*/
- private boolean canDispatchEventToServiceLocked(Service service, AccessibilityEvent event,
- int handledFeedbackTypes) {
+ private boolean canDispatchEventToServiceLocked(Service service, AccessibilityEvent event) {
if (!service.canReceiveEventsLocked()) {
return false;
@@ -1119,15 +1113,7 @@
String packageName = (event.getPackageName() != null)
? event.getPackageName().toString() : null;
- if (packageNames.isEmpty() || packageNames.contains(packageName)) {
- int feedbackType = service.mFeedbackType;
- if ((handledFeedbackTypes & feedbackType) != feedbackType
- || feedbackType == AccessibilityServiceInfo.FEEDBACK_GENERIC) {
- return true;
- }
- }
-
- return false;
+ return (packageNames.isEmpty() || packageNames.contains(packageName));
}
private void unbindAllServicesLocked(UserState userState) {
@@ -1363,6 +1349,11 @@
}
}
+ /**
+ * Called when any property of the user state has changed.
+ *
+ * @param userState the new user state
+ */
private void onUserStateChangedLocked(UserState userState) {
// TODO: Remove this hack
mInitialized = true;
@@ -1374,6 +1365,7 @@
updateTouchExplorationLocked(userState);
updateEnhancedWebAccessibilityLocked(userState);
updateDisplayColorAdjustmentSettingsLocked(userState);
+ updateMagnificationLocked(userState);
scheduleUpdateInputFilter(userState);
scheduleUpdateClientsIfNeededLocked(userState);
}
@@ -1663,6 +1655,44 @@
DisplayAdjustmentUtils.applyAdjustments(mContext, userState.mUserId);
}
+ private void updateMagnificationLocked(UserState userState) {
+ final int userId = userState.mUserId;
+ if (userId == mCurrentUserId && mMagnificationController != null) {
+ if (userHasMagnificationServicesLocked(userState)) {
+ mMagnificationController.setUserId(userState.mUserId);
+ } else {
+ // If the user no longer has any magnification-controlling
+ // services and is not using magnification gestures, then
+ // reset the state to normal.
+ if (!userState.mIsDisplayMagnificationEnabled
+ && mMagnificationController.resetIfNeeded(true)) {
+ // Animations are still running, so wait until we receive a
+ // callback verifying that we've reset magnification.
+ mUnregisterMagnificationOnReset = true;
+ } else {
+ mUnregisterMagnificationOnReset = false;
+ mMagnificationController.unregister();
+ mMagnificationController = null;
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns whether the specified user has any services that are capable of
+ * controlling magnification.
+ */
+ private boolean userHasMagnificationServicesLocked(UserState userState) {
+ final List<Service> services = userState.mBoundServices;
+ for (int i = 0, count = services.size(); i < count; i++) {
+ final Service service = services.get(i);
+ if (mSecurityPolicy.canControlMagnification(service)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private MagnificationSpec getCompatibleMagnificationSpecLocked(int windowId) {
IBinder windowToken = mGlobalWindowTokens.get(windowId);
if (windowToken == null) {
@@ -1675,6 +1705,14 @@
return null;
}
+ private KeyEventDispatcher getKeyEventDispatcher() {
+ if (mKeyEventDispatcher == null) {
+ mKeyEventDispatcher = new KeyEventDispatcher(
+ mMainHandler, MainHandler.MSG_SEND_KEY_EVENT_TO_INPUT_FILTER, mLock);
+ }
+ return mKeyEventDispatcher;
+ }
+
@Override
public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {
mSecurityPolicy.enforceCallingPermission(Manifest.permission.DUMP, FUNCTION_DUMP);
@@ -1875,22 +1913,6 @@
}
}
- private PendingEvent obtainPendingEventLocked(KeyEvent event, int policyFlags, int sequence) {
- PendingEvent pendingEvent = mPendingEventPool.acquire();
- if (pendingEvent == null) {
- pendingEvent = new PendingEvent();
- }
- pendingEvent.event = event;
- pendingEvent.policyFlags = policyFlags;
- pendingEvent.sequence = sequence;
- return pendingEvent;
- }
-
- private void recyclePendingEventLocked(PendingEvent pendingEvent) {
- pendingEvent.clear();
- mPendingEventPool.release(pendingEvent);
- }
-
private int findWindowIdLocked(IBinder token) {
final int globalIndex = mGlobalWindowTokens.indexOfValue(token);
if (globalIndex >= 0) {
@@ -1938,10 +1960,14 @@
}
MagnificationController getMagnificationController() {
- if (mMagnificationController == null) {
- mMagnificationController = new MagnificationController(mContext, this);
+ synchronized (mLock) {
+ if (mMagnificationController == null) {
+ mMagnificationController = new MagnificationController(mContext, this);
+ mMagnificationController.register();
+ mMagnificationController.setUserId(mCurrentUserId);
+ }
+ return mMagnificationController;
}
- return mMagnificationController;
}
/**
@@ -1999,8 +2025,6 @@
final SparseArray<AccessibilityEvent> mPendingEvents =
new SparseArray<>();
- final KeyEventDispatcher mKeyEventDispatcher = new KeyEventDispatcher();
-
boolean mWasConnectedAndDied;
// Handler only for dispatching accessibility events since we use event
@@ -2112,7 +2136,7 @@
return false;
}
UserState userState = getUserStateLocked(mUserId);
- mKeyEventDispatcher.flush();
+ getKeyEventDispatcher().flush(this);
if (!mIsAutomation) {
mContext.unbindService(this);
} else {
@@ -2129,7 +2153,7 @@
@Override
public void setOnKeyEventResult(boolean handled, int sequence) {
- mKeyEventDispatcher.setOnKeyEventResult(handled, sequence);
+ getKeyEventDispatcher().setOnKeyEventResult(this, handled, sequence);
}
@Override
@@ -2625,6 +2649,149 @@
}
@Override
+ public float getMagnificationScale() {
+ synchronized (mLock) {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(
+ UserHandle.USER_CURRENT);
+ if (resolvedUserId != mCurrentUserId) {
+ return 1.0f;
+ }
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return getMagnificationController().getScale();
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ @Override
+ public Region getMagnifiedRegion() {
+ synchronized (mLock) {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(
+ UserHandle.USER_CURRENT);
+ if (resolvedUserId != mCurrentUserId) {
+ return Region.obtain();
+ }
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ final Region region = Region.obtain();
+ getMagnificationController().getMagnifiedRegion(region);
+ return region;
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ @Override
+ public float getMagnificationCenterX() {
+ synchronized (mLock) {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(
+ UserHandle.USER_CURRENT);
+ if (resolvedUserId != mCurrentUserId) {
+ return 0.0f;
+ }
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return getMagnificationController().getCenterX();
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ @Override
+ public float getMagnificationCenterY() {
+ synchronized (mLock) {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(
+ UserHandle.USER_CURRENT);
+ if (resolvedUserId != mCurrentUserId) {
+ return 0.0f;
+ }
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return getMagnificationController().getCenterY();
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ @Override
+ public boolean resetMagnification(boolean animate) {
+ synchronized (mLock) {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(
+ UserHandle.USER_CURRENT);
+ if (resolvedUserId != mCurrentUserId) {
+ return false;
+ }
+ final boolean permissionGranted = mSecurityPolicy.canControlMagnification(this);
+ if (!permissionGranted) {
+ return false;
+ }
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return getMagnificationController().reset(animate);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ @Override
+ public boolean setMagnificationScaleAndCenter(float scale, float centerX, float centerY,
+ boolean animate) {
+ synchronized (mLock) {
+ // We treat calls from a profile as if made by its parent as profiles
+ // share the accessibility state of the parent. The call below
+ // performs the current profile parent resolution.
+ final int resolvedUserId = mSecurityPolicy
+ .resolveCallingUserIdEnforcingPermissionsLocked(
+ UserHandle.USER_CURRENT);
+ if (resolvedUserId != mCurrentUserId) {
+ return false;
+ }
+ final boolean permissionGranted = mSecurityPolicy.canControlMagnification(this);
+ if (!permissionGranted) {
+ return false;
+ }
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return getMagnificationController().setScaleAndCenter(
+ scale, centerX, centerY, animate);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ @Override
+ public void setMagnificationCallbackEnabled(boolean enabled) {
+ mInvocationHandler.setMagnificationCallbackEnabled(enabled);
+ }
+
+ @Override
public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {
mSecurityPolicy.enforceCallingPermission(Manifest.permission.DUMP, FUNCTION_DUMP);
synchronized (mLock) {
@@ -2700,7 +2867,7 @@
return;
}
mWasConnectedAndDied = true;
- mKeyEventDispatcher.flush();
+ getKeyEventDispatcher().flush(this);
UserState userState = getUserStateLocked(mUserId);
// The death recipient is unregistered in removeServiceLocked
removeServiceLocked(this, userState);
@@ -2809,16 +2976,35 @@
gestureId, 0).sendToTarget();
}
- public void notifyKeyEvent(KeyEvent event, int policyFlags) {
- mInvocationHandler.obtainMessage(InvocationHandler.MSG_ON_KEY_EVENT,
- policyFlags, 0, event).sendToTarget();
- }
-
public void notifyClearAccessibilityNodeInfoCache() {
mInvocationHandler.sendEmptyMessage(
InvocationHandler.MSG_CLEAR_ACCESSIBILITY_CACHE);
}
+ public void notifyMagnificationChanged(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ mInvocationHandler.notifyMagnificationChanged(region, scale, centerX, centerY);
+ }
+
+ /**
+ * Called by the invocation handler to notify the service that the
+ * state of magnification has changed.
+ */
+ private void notifyMagnificationChangedInternal(@NonNull Region region,
+ float scale, float centerX, float centerY) {
+ final IAccessibilityServiceClient listener;
+ synchronized (mLock) {
+ listener = mServiceInterface;
+ }
+ if (listener != null) {
+ try {
+ listener.onMagnificationChanged(region, scale, centerX, centerY);
+ } catch (RemoteException re) {
+ Slog.e(LOG_TAG, "Error sending magnification changes to " + mService, re);
+ }
+ }
+ }
+
private void notifyGestureInternal(int gestureId) {
final IAccessibilityServiceClient listener;
synchronized (mLock) {
@@ -2834,10 +3020,6 @@
}
}
- private void notifyKeyEventInternal(KeyEvent event, int policyFlags) {
- mKeyEventDispatcher.notifyKeyEvent(event, policyFlags);
- }
-
private void notifyClearAccessibilityCacheInternal() {
final IAccessibilityServiceClient listener;
synchronized (mLock) {
@@ -2955,9 +3137,11 @@
private final class InvocationHandler extends Handler {
public static final int MSG_ON_GESTURE = 1;
- public static final int MSG_ON_KEY_EVENT = 2;
- public static final int MSG_CLEAR_ACCESSIBILITY_CACHE = 3;
- public static final int MSG_ON_KEY_EVENT_TIMEOUT = 4;
+ public static final int MSG_CLEAR_ACCESSIBILITY_CACHE = 2;
+
+ private static final int MSG_ON_MAGNIFICATION_CHANGED = 5;
+
+ private boolean mIsMagnificationCallbackEnabled = false;
public InvocationHandler(Looper looper) {
super(looper, null, true);
@@ -2972,19 +3156,17 @@
notifyGestureInternal(gestureId);
} break;
- case MSG_ON_KEY_EVENT: {
- KeyEvent event = (KeyEvent) message.obj;
- final int policyFlags = message.arg1;
- notifyKeyEventInternal(event, policyFlags);
- } break;
-
case MSG_CLEAR_ACCESSIBILITY_CACHE: {
notifyClearAccessibilityCacheInternal();
} break;
- case MSG_ON_KEY_EVENT_TIMEOUT: {
- PendingEvent eventState = (PendingEvent) message.obj;
- setOnKeyEventResult(false, eventState.sequence);
+ case MSG_ON_MAGNIFICATION_CHANGED: {
+ final SomeArgs args = (SomeArgs) message.obj;
+ final Region region = (Region) args.arg1;
+ final float scale = (float) args.arg2;
+ final float centerX = (float) args.arg3;
+ final float centerY = (float) args.arg4;
+ notifyMagnificationChangedInternal(region, scale, centerX, centerY);
} break;
default: {
@@ -2992,142 +3174,29 @@
}
}
}
- }
- private final class KeyEventDispatcher {
-
- private static final long ON_KEY_EVENT_TIMEOUT_MILLIS = 500;
-
- private PendingEvent mPendingEvents;
-
- private final InputEventConsistencyVerifier mSentEventsVerifier =
- InputEventConsistencyVerifier.isInstrumentationEnabled()
- ? new InputEventConsistencyVerifier(
- this, 0, KeyEventDispatcher.class.getSimpleName()) : null;
-
- public void notifyKeyEvent(KeyEvent event, int policyFlags) {
- final PendingEvent pendingEvent;
-
- synchronized (mLock) {
- pendingEvent = addPendingEventLocked(event, policyFlags);
+ public void notifyMagnificationChanged(@NonNull Region region, float scale,
+ float centerX, float centerY) {
+ if (!mIsMagnificationCallbackEnabled) {
+ // Callback is disabled, don't bother packing args.
+ return;
}
- Message message = mInvocationHandler.obtainMessage(
- InvocationHandler.MSG_ON_KEY_EVENT_TIMEOUT, pendingEvent);
- mInvocationHandler.sendMessageDelayed(message, ON_KEY_EVENT_TIMEOUT_MILLIS);
+ final SomeArgs args = SomeArgs.obtain();
+ args.arg1 = region;
+ args.arg2 = scale;
+ args.arg3 = centerX;
+ args.arg4 = centerY;
- try {
- // Accessibility services are exclusively not in the system
- // process, therefore no need to clone the motion event to
- // prevent tampering. It will be cloned in the IPC call.
- mServiceInterface.onKeyEvent(pendingEvent.event, pendingEvent.sequence);
- } catch (RemoteException re) {
- setOnKeyEventResult(false, pendingEvent.sequence);
- }
+ final Message msg = obtainMessage(MSG_ON_MAGNIFICATION_CHANGED, args);
+ msg.sendToTarget();
}
- public void setOnKeyEventResult(boolean handled, int sequence) {
- synchronized (mLock) {
- PendingEvent pendingEvent = removePendingEventLocked(sequence);
- if (pendingEvent != null) {
- mInvocationHandler.removeMessages(
- InvocationHandler.MSG_ON_KEY_EVENT_TIMEOUT,
- pendingEvent);
- pendingEvent.handled = handled;
- finishPendingEventLocked(pendingEvent);
- }
- }
- }
-
- public void flush() {
- synchronized (mLock) {
- cancelAllPendingEventsLocked();
- if (mSentEventsVerifier != null) {
- mSentEventsVerifier.reset();
- }
- }
- }
-
- private PendingEvent addPendingEventLocked(KeyEvent event, int policyFlags) {
- final int sequence = event.getSequenceNumber();
- PendingEvent pendingEvent = obtainPendingEventLocked(event, policyFlags, sequence);
- pendingEvent.next = mPendingEvents;
- mPendingEvents = pendingEvent;
- return pendingEvent;
- }
-
- private PendingEvent removePendingEventLocked(int sequence) {
- PendingEvent previous = null;
- PendingEvent current = mPendingEvents;
-
- while (current != null) {
- if (current.sequence == sequence) {
- if (previous != null) {
- previous.next = current.next;
- } else {
- mPendingEvents = current.next;
- }
- current.next = null;
- return current;
- }
- previous = current;
- current = current.next;
- }
- return null;
- }
-
- private void finishPendingEventLocked(PendingEvent pendingEvent) {
- if (!pendingEvent.handled) {
- sendKeyEventToInputFilter(pendingEvent.event, pendingEvent.policyFlags);
- }
- // Nullify the event since we do not want it to be
- // recycled yet. It will be sent to the input filter.
- pendingEvent.event = null;
- recyclePendingEventLocked(pendingEvent);
- }
-
- private void sendKeyEventToInputFilter(KeyEvent event, int policyFlags) {
- if (DEBUG) {
- Slog.i(LOG_TAG, "Injecting event: " + event);
- }
- if (mSentEventsVerifier != null) {
- mSentEventsVerifier.onKeyEvent(event, 0);
- }
- policyFlags |= WindowManagerPolicy.FLAG_PASS_TO_USER;
- mMainHandler.obtainMessage(MainHandler.MSG_SEND_KEY_EVENT_TO_INPUT_FILTER,
- policyFlags, 0, event).sendToTarget();
- }
-
- private void cancelAllPendingEventsLocked() {
- while (mPendingEvents != null) {
- PendingEvent pendingEvent = removePendingEventLocked(mPendingEvents.sequence);
- pendingEvent.handled = false;
- mInvocationHandler.removeMessages(InvocationHandler.MSG_ON_KEY_EVENT_TIMEOUT,
- pendingEvent);
- finishPendingEventLocked(pendingEvent);
- }
+ public void setMagnificationCallbackEnabled(boolean enabled) {
+ mIsMagnificationCallbackEnabled = enabled;
}
}
- }
- private static final class PendingEvent {
- PendingEvent next;
-
- KeyEvent event;
- int policyFlags;
- int sequence;
- boolean handled;
-
- public void clear() {
- if (event != null) {
- event.recycle();
- event = null;
- }
- next = null;
- policyFlags = 0;
- sequence = 0;
- handled = false;
- }
}
final class WindowsForAccessibilityCallback implements
@@ -3660,6 +3729,11 @@
& AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT) != 0;
}
+ public boolean canControlMagnification(Service service) {
+ return (service.mAccessibilityServiceInfo.getCapabilities()
+ & AccessibilityServiceInfo.CAPABILITY_CAN_CONTROL_MAGNIFICATION) != 0;
+ }
+
private int resolveProfileParentLocked(int userId) {
if (userId != mCurrentUserId) {
final long identity = Binder.clearCallingIdentity();
@@ -3796,8 +3870,6 @@
public final Set<ComponentName> mTouchExplorationGrantedServices =
new HashSet<>();
- public int mHandledFeedbackTypes = 0;
-
public int mLastSentClientState = -1;
public boolean mIsAccessibilityEnabled;
@@ -3860,7 +3932,6 @@
mBindingServices.clear();
// Clear event management state.
- mHandledFeedbackTypes = 0;
mLastSentClientState = -1;
// Clear state persisted in settings.
diff --git a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
new file mode 100644
index 0000000..3469565
--- /dev/null
+++ b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
@@ -0,0 +1,285 @@
+/*
+ ** Copyright 2015, 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.server.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+import android.util.ArrayMap;
+import android.util.Pools;
+import android.util.Pools.Pool;
+import android.util.Slog;
+import android.view.InputEventConsistencyVerifier;
+import android.view.KeyEvent;
+import android.view.WindowManagerPolicy;
+
+import com.android.server.accessibility.AccessibilityManagerService.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Dispatcher to send KeyEvents to all accessibility services that are able to process them.
+ * Events that are handled by one or more services are consumed. Events that are not processed
+ * by any service (or time out before a service reports them as handled) are passed along to
+ * the rest of the system.
+ *
+ * The class assumes that services report their return values in order, which is valid because
+ * they process each call to {@code AccessibilityService.onKeyEvent} on a single thread, and so
+ * don't see the N+1th event until they have processed the Nth event.
+ */
+public class KeyEventDispatcher {
+ // Debugging
+ private static final String LOG_TAG = "KeyEventDispatcher";
+ private static final boolean DEBUG = false;
+ /* KeyEvents must be processed in this time interval */
+ private static final long ON_KEY_EVENT_TIMEOUT_MILLIS = 500;
+ private static final int MSG_ON_KEY_EVENT_TIMEOUT = 1;
+ private static final int MAX_POOL_SIZE = 10;
+
+ private final Pool<PendingKeyEvent> mPendingEventPool = new Pools.SimplePool<>(MAX_POOL_SIZE);
+ private final Object mLock;
+
+ /*
+ * Track events sent to each service. If a KeyEvent is to be sent to at least one service,
+ * a corresponding PendingKeyEvent is created for it. This PendingKeyEvent is placed in
+ * the list for each service its KeyEvent is sent to. It is removed from the list when
+ * the service calls setOnKeyEventResult, or when we time out waiting for the service to
+ * respond.
+ */
+ private final Map<Service, ArrayList<PendingKeyEvent>> mPendingEventsMap = new ArrayMap<>();
+
+ private final InputEventConsistencyVerifier mSentEventsVerifier;
+ private final Handler mHandlerToSendKeyEventsToInputFilter;
+ private final int mMessageTypeForSendKeyEvent;
+ private final Handler mKeyEventTimeoutHandler;
+
+ /**
+ * @param handlerToSendKeyEventsToInputFilter The handler to which to post {@code KeyEvent}s
+ * that have not been handled by any accessibility service.
+ * @param messageTypeForSendKeyEvent The field to populate {@code message.what} for the
+ * message that carries a {@code KeyEvent} to be sent to the input filter
+ * @param lock The lock used for all synchronization in this package. This lock must be held
+ * when calling {@code notifyKeyEventLocked}
+ */
+ public KeyEventDispatcher(Handler handlerToSendKeyEventsToInputFilter,
+ int messageTypeForSendKeyEvent, Object lock) {
+ if (InputEventConsistencyVerifier.isInstrumentationEnabled()) {
+ mSentEventsVerifier = new InputEventConsistencyVerifier(
+ this, 0, KeyEventDispatcher.class.getSimpleName());
+ } else {
+ mSentEventsVerifier = null;
+ }
+ mHandlerToSendKeyEventsToInputFilter = handlerToSendKeyEventsToInputFilter;
+ mMessageTypeForSendKeyEvent = messageTypeForSendKeyEvent;
+ mKeyEventTimeoutHandler =
+ new Handler(mHandlerToSendKeyEventsToInputFilter.getLooper(), new Callback());
+ mLock = lock;
+ }
+
+ /**
+ * Notify that a new KeyEvent is available to accessibility services. Must be called with the
+ * lock used to construct this object held. The boundServices list must also be protected
+ * by a lock.
+ *
+ * @param event The new key event
+ * @param policyFlags Flags for the event
+ * @param boundServices A list of currently bound AccessibilityServices
+ *
+ * @return {@code true} if the event was passed to at least one AccessibilityService,
+ * {@code false} otherwise.
+ */
+ // TODO: The locking policy for boundServices needs some thought.
+ public boolean notifyKeyEventLocked(
+ KeyEvent event, int policyFlags, List<Service> boundServices) {
+ PendingKeyEvent pendingKeyEvent = null;
+ KeyEvent localClone = KeyEvent.obtain(event);
+ for (int i = 0; i < boundServices.size(); i++) {
+ Service service = boundServices.get(i);
+ // Key events are handled only by services that declared
+ // this capability and requested to filter key events.
+ if (!service.mRequestFilterKeyEvents) {
+ continue;
+ }
+ int filterKeyEventBit = service.mAccessibilityServiceInfo.getCapabilities()
+ & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS;
+ if (filterKeyEventBit == 0) {
+ continue;
+ }
+
+ try {
+ // The event will be cloned in the IPC call, so it doesn't need to be here.
+ service.mServiceInterface.onKeyEvent(localClone, localClone.getSequenceNumber());
+ } catch (RemoteException re) {
+ continue;
+ }
+
+ if (pendingKeyEvent == null) {
+ pendingKeyEvent = obtainPendingEventLocked(localClone, policyFlags);
+ }
+ ArrayList<PendingKeyEvent> pendingEventList = mPendingEventsMap.get(service);
+ if (pendingEventList == null) {
+ pendingEventList = new ArrayList<>();
+ mPendingEventsMap.put(service, pendingEventList);
+ }
+ pendingEventList.add(pendingKeyEvent);
+ pendingKeyEvent.referenceCount++;
+ }
+
+ if (pendingKeyEvent == null) {
+ localClone.recycle();
+ return false;
+ }
+
+ Message message = mKeyEventTimeoutHandler.obtainMessage(
+ MSG_ON_KEY_EVENT_TIMEOUT, pendingKeyEvent);
+ mKeyEventTimeoutHandler.sendMessageDelayed(message, ON_KEY_EVENT_TIMEOUT_MILLIS);
+ return true;
+ }
+
+ /**
+ * Set the result from onKeyEvent from one service.
+ *
+ * @param service The service setting the result
+ * @param handled {@code true} if the service handled the {@code KeyEvent}
+ * @param sequence The sequence number of the {@code KeyEvent}
+ */
+ public void setOnKeyEventResult(Service service, boolean handled, int sequence) {
+ synchronized (mLock) {
+ PendingKeyEvent pendingEvent =
+ removeEventFromListLocked(mPendingEventsMap.get(service), sequence);
+ if (pendingEvent != null) {
+ pendingEvent.handled |= handled;
+ removeReferenceToPendingEventLocked(pendingEvent);
+ }
+ }
+ }
+
+ /**
+ * Flush all pending key events for a service, treating all of them as unhandled
+ *
+ * @param service The service for which to flush events
+ */
+ public void flush(Service service) {
+ synchronized (mLock) {
+ List<PendingKeyEvent> pendingEvents = mPendingEventsMap.get(service);
+ if (pendingEvents != null) {
+ for (int i = 0; i < pendingEvents.size(); i++) {
+ PendingKeyEvent pendingEvent = pendingEvents.get(i);
+ removeReferenceToPendingEventLocked(pendingEvent);
+ }
+ mPendingEventsMap.remove(service);
+ }
+ }
+ }
+
+ private PendingKeyEvent obtainPendingEventLocked(KeyEvent event, int policyFlags) {
+ PendingKeyEvent pendingEvent = mPendingEventPool.acquire();
+ if (pendingEvent == null) {
+ pendingEvent = new PendingKeyEvent();
+ }
+ pendingEvent.event = event;
+ pendingEvent.policyFlags = policyFlags;
+ pendingEvent.referenceCount = 0;
+ pendingEvent.handled = false;
+ return pendingEvent;
+ }
+
+ private static PendingKeyEvent removeEventFromListLocked(
+ List<PendingKeyEvent> listOfEvents, int sequence) {
+ /* In normal operation, the event should be first */
+ for (int i = 0; i < listOfEvents.size(); i++) {
+ PendingKeyEvent pendingKeyEvent = listOfEvents.get(i);
+ if (pendingKeyEvent.event.getSequenceNumber() == sequence) {
+ /*
+ * Removing the first element of the ArrayList can be slow if there are a lot
+ * of events backed up, but for a handful of events it's better than incurring
+ * the fixed overhead of LinkedList. An ArrayList optimized for removing the
+ * first element (by treating the underlying array as a circular buffer) would
+ * be ideal.
+ */
+ listOfEvents.remove(pendingKeyEvent);
+ return pendingKeyEvent;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @param pendingEvent The event whose reference count should be decreased
+ * @return {@code true} if the event was release, {@code false} if not.
+ */
+ private boolean removeReferenceToPendingEventLocked(PendingKeyEvent pendingEvent) {
+ if (--pendingEvent.referenceCount > 0) {
+ return false;
+ }
+ mKeyEventTimeoutHandler.removeMessages(MSG_ON_KEY_EVENT_TIMEOUT, pendingEvent);
+ if (!pendingEvent.handled) {
+ /* Pass event to input filter */
+ if (DEBUG) {
+ Slog.i(LOG_TAG, "Injecting event: " + pendingEvent.event);
+ }
+ if (mSentEventsVerifier != null) {
+ mSentEventsVerifier.onKeyEvent(pendingEvent.event, 0);
+ }
+ int policyFlags = pendingEvent.policyFlags | WindowManagerPolicy.FLAG_PASS_TO_USER;
+ mHandlerToSendKeyEventsToInputFilter
+ .obtainMessage(mMessageTypeForSendKeyEvent, policyFlags, 0, pendingEvent.event)
+ .sendToTarget();
+ } else {
+ pendingEvent.event.recycle();
+ }
+ mPendingEventPool.release(pendingEvent);
+ return true;
+ }
+
+ private static final class PendingKeyEvent {
+ /* Event and policyFlag provided in notifyKeyEventLocked */
+ KeyEvent event;
+ int policyFlags;
+ /*
+ * The referenceCount optimizes the process of determining the number of services
+ * still holding a KeyEvent. It must be equal to the number of times the PendingEvent
+ * appears in mPendingEventsMap, or PendingEvents will leak.
+ */
+ int referenceCount;
+ /* Whether or not at least one service had handled this event */
+ boolean handled;
+ }
+
+ private class Callback implements Handler.Callback {
+ @Override
+ public boolean handleMessage(Message message) {
+ if (message.what != MSG_ON_KEY_EVENT_TIMEOUT) {
+ throw new IllegalArgumentException("Unknown message: " + message.what);
+ }
+ PendingKeyEvent pendingKeyEvent = (PendingKeyEvent) message.obj;
+ synchronized (mLock) {
+ for (ArrayList<PendingKeyEvent> listForService : mPendingEventsMap.values()) {
+ if (listForService.remove(pendingKeyEvent)) {
+ if(removeReferenceToPendingEventLocked(pendingKeyEvent)) {
+ break;
+ }
+ }
+ }
+ }
+ return true;
+ }
+ }
+}
diff --git a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java
index 781d134..a093d92 100644
--- a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java
+++ b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java
@@ -17,20 +17,36 @@
package com.android.server.accessibility;
import com.android.internal.R;
+import com.android.internal.os.SomeArgs;
import com.android.server.LocalServices;
import android.animation.ObjectAnimator;
import android.animation.TypeEvaluator;
import android.animation.ValueAnimator;
+import android.annotation.NonNull;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.graphics.Rect;
import android.graphics.Region;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.MathUtils;
import android.util.Property;
import android.util.Slog;
import android.view.MagnificationSpec;
+import android.view.View;
import android.view.WindowManagerInternal;
import android.view.animation.DecelerateInterpolator;
+import java.util.Locale;
+
/**
* This class is used to control and query the state of display magnification
* from the accessibility manager and related classes. It is responsible for
@@ -38,37 +54,71 @@
* communication between the accessibility manager and window manager.
*/
class MagnificationController {
- private static final String LOG_TAG = ScreenMagnifier.class.getSimpleName();
+ private static final String LOG_TAG = "MagnificationController";
private static final boolean DEBUG_SET_MAGNIFICATION_SPEC = false;
- private static final boolean DEBUG_MAGNIFICATION_CONTROLLER = false;
- private static final String PROPERTY_NAME_MAGNIFICATION_SPEC = "magnificationSpec";
+ private static final int DEFAULT_SCREEN_MAGNIFICATION_AUTO_UPDATE = 1;
- private final MagnificationSpec mSentMagnificationSpec = MagnificationSpec.obtain();
+ private static final float DEFAULT_MAGNIFICATION_SCALE = 2.0f;
+
+ private static final float MIN_SCALE = 1.0f;
+ private static final float MAX_SCALE = 5.0f;
+
+ /**
+ * The minimum scaling factor that can be persisted to secure settings.
+ * This must be > 1.0 to ensure that magnification is actually set to an
+ * enabled state when the scaling factor is restored from settings.
+ */
+ private static final float MIN_PERSISTED_SCALE = 2.0f;
+
+ private final Object mLock = new Object();
+
+ /**
+ * The current magnification spec. If an animation is running, this
+ * reflects the end state.
+ */
private final MagnificationSpec mCurrentMagnificationSpec = MagnificationSpec.obtain();
- private final Region mMagnifiedBounds = new Region();
+ private final Region mMagnifiedRegion = Region.obtain();
+ private final Region mAvailableRegion = Region.obtain();
+ private final Rect mMagnifiedBounds = new Rect();
+
private final Rect mTempRect = new Rect();
+ private final Rect mTempRect1 = new Rect();
private final AccessibilityManagerService mAms;
- private final WindowManagerInternal mWindowManager;
- private final ValueAnimator mTransformationAnimator;
+ private final ContentResolver mContentResolver;
+
+ private final ScreenStateObserver mScreenStateObserver;
+ private final WindowStateObserver mWindowStateObserver;
+
+ private final SpecAnimationBridge mSpecAnimationBridge;
+
+ private int mUserId;
public MagnificationController(Context context, AccessibilityManagerService ams) {
mAms = ams;
- mWindowManager = LocalServices.getService(WindowManagerInternal.class);
+ mContentResolver = context.getContentResolver();
+ mScreenStateObserver = new ScreenStateObserver(context, this);
+ mWindowStateObserver = new WindowStateObserver(context, this);
+ mSpecAnimationBridge = new SpecAnimationBridge(context);
+ }
- final Property<MagnificationController, MagnificationSpec> property =
- Property.of(MagnificationController.class, MagnificationSpec.class,
- PROPERTY_NAME_MAGNIFICATION_SPEC);
- final MagnificationSpecEvaluator evaluator = new MagnificationSpecEvaluator();
- final long animationDuration = context.getResources().getInteger(
- R.integer.config_longAnimTime);
- mTransformationAnimator = ObjectAnimator.ofObject(this, property, evaluator,
- mSentMagnificationSpec, mCurrentMagnificationSpec);
- mTransformationAnimator.setDuration(animationDuration);
- mTransformationAnimator.setInterpolator(new DecelerateInterpolator(2.5f));
+ /**
+ * Registers magnification-related observers.
+ */
+ public void register() {
+ mScreenStateObserver.register();
+ mWindowStateObserver.register();
+ }
+
+ /**
+ * Unregisters magnification-related observers.
+ */
+ public void unregister() {
+ mScreenStateObserver.unregister();
+ mWindowStateObserver.unregister();
}
/**
@@ -80,26 +130,33 @@
}
/**
- * Sets the magnified region.
+ * Sets the magnified and available regions.
*
- * @param region the region to set
- * @param updateSpec {@code true} to update the scale and center based on
- * the region bounds, {@code false} to leave them as-is
+ * @param magnified the magnified region
+ * @param available the region available for magnification
+ * @param updateSpec {@code true} to update the scale and center based on
+ * the region bounds, {@code false} to leave them as-is
*/
- public void setMagnifiedRegion(Region region, boolean updateSpec) {
- mMagnifiedBounds.set(region);
+ public void setMagnifiedRegion(Region magnified, Region available, boolean updateSpec) {
+ synchronized (mLock) {
+ mMagnifiedRegion.set(magnified);
+ mMagnifiedRegion.getBounds(mMagnifiedBounds);
+ mAvailableRegion.set(available);
- if (updateSpec) {
- final Rect magnifiedFrame = mTempRect;
- region.getBounds(magnifiedFrame);
- final float scale = mSentMagnificationSpec.scale;
- final float offsetX = mSentMagnificationSpec.offsetX;
- final float offsetY = mSentMagnificationSpec.offsetY;
- final float centerX = (-offsetX + magnifiedFrame.width() / 2) / scale;
- final float centerY = (-offsetY + magnifiedFrame.height() / 2) / scale;
- setScaleAndMagnifiedRegionCenter(scale, centerX, centerY, false);
- } else {
- mAms.onMagnificationStateChanged();
+ final MagnificationSpec sentSpec = mSpecAnimationBridge.mSentMagnificationSpec;
+ final float scale = sentSpec.scale;
+ final float offsetX = sentSpec.offsetX;
+ final float offsetY = sentSpec.offsetY;
+
+ // Compute the new center and update spec as needed.
+ final float centerX = (mMagnifiedBounds.width() / 2.0f - offsetX) / scale;
+ final float centerY = (mMagnifiedBounds.height() / 2.0f - offsetY) / scale;
+ if (updateSpec) {
+ setScaleAndCenter(scale, centerX, centerY, false);
+ } else {
+ mAms.onMagnificationStateChanged();
+ mAms.notifyMagnificationChanged(mMagnifiedRegion, scale, centerX, centerY);
+ }
}
}
@@ -113,18 +170,51 @@
* magnified region, or {@code false} otherwise
*/
public boolean magnifiedRegionContains(float x, float y) {
- return mMagnifiedBounds.contains((int) x, (int) y);
+ synchronized (mLock) {
+ return mMagnifiedRegion.contains((int) x, (int) y);
+ }
}
/**
- * Populates the specified rect with the bounds of the magnified
- * region.
+ * Returns whether the region available for magnification contains the
+ * specified screen-relative coordinates.
+ *
+ * @param x the screen-relative X coordinate to check
+ * @param y the screen-relative Y coordinate to check
+ * @return {@code true} if the coordinate is contained within the
+ * region available for magnification, or {@code false} otherwise
+ */
+ private boolean availableRegionContains(float x, float y) {
+ synchronized (mLock) {
+ return mAvailableRegion.contains((int) x, (int) y);
+ }
+ }
+
+ /**
+ * Populates the specified rect with the screen-relative bounds of the
+ * magnified region. If magnification is not enabled, the returned
+ * bounds will be empty.
*
* @param outBounds rect to populate with the bounds of the magnified
* region
*/
- public void getMagnifiedBounds(Rect outBounds) {
- mMagnifiedBounds.getBounds(outBounds);
+ public void getMagnifiedBounds(@NonNull Rect outBounds) {
+ synchronized (mLock) {
+ outBounds.set(mMagnifiedBounds);
+ }
+ }
+
+ /**
+ * Populates the specified region with the screen-relative magnified
+ * region. If magnification is not enabled, then the returned region
+ * will be empty.
+ *
+ * @param outRegion the region to populate
+ */
+ public void getMagnifiedRegion(@NonNull Region outRegion) {
+ synchronized (mLock) {
+ outRegion.set(mMagnifiedRegion);
+ }
}
/**
@@ -147,6 +237,19 @@
return mCurrentMagnificationSpec.offsetX;
}
+
+ /**
+ * Returns the screen-relative X coordinate of the center of the
+ * magnification viewport.
+ *
+ * @return the X coordinate
+ */
+ public float getCenterX() {
+ synchronized (mLock) {
+ return (mMagnifiedBounds.width() / 2.0f - getOffsetX()) / getScale();
+ }
+ }
+
/**
* Returns the Y offset of the magnification viewport. If an animation
* is in progress, this reflects the end state of the animation.
@@ -158,6 +261,18 @@
}
/**
+ * Returns the screen-relative Y coordinate of the center of the
+ * magnification viewport.
+ *
+ * @return the Y coordinate
+ */
+ public float getCenterY() {
+ synchronized (mLock) {
+ return (mMagnifiedBounds.height() / 2.0f - getOffsetY()) / getScale();
+ }
+ }
+
+ /**
* Returns the scale currently used by the window manager. If an
* animation is in progress, this reflects the current state of the
* animation.
@@ -165,7 +280,7 @@
* @return the scale currently used by the window manager
*/
public float getSentScale() {
- return mSentMagnificationSpec.scale;
+ return mSpecAnimationBridge.mSentMagnificationSpec.scale;
}
/**
@@ -176,7 +291,7 @@
* @return the X offset currently used by the window manager
*/
public float getSentOffsetX() {
- return mSentMagnificationSpec.offsetX;
+ return mSpecAnimationBridge.mSentMagnificationSpec.offsetX;
}
/**
@@ -187,7 +302,7 @@
* @return the Y offset currently used by the window manager
*/
public float getSentOffsetY() {
- return mSentMagnificationSpec.offsetY;
+ return mSpecAnimationBridge.mSentMagnificationSpec.offsetY;
}
/**
@@ -196,21 +311,24 @@
*
* @param animate {@code true} to animate the transition, {@code false}
* to transition immediately
+ * @return {@code true} if the magnification spec changed, {@code false} if
+ * the spec did not change
*/
- public void reset(boolean animate) {
- if (mTransformationAnimator.isRunning()) {
- mTransformationAnimator.cancel();
+ public boolean reset(boolean animate) {
+ synchronized (mLock) {
+ return resetLocked(animate);
}
- mCurrentMagnificationSpec.clear();
- if (animate) {
- animateMagnificationSpec(mSentMagnificationSpec,
- mCurrentMagnificationSpec);
- } else {
- setMagnificationSpec(mCurrentMagnificationSpec);
+ }
+
+ private boolean resetLocked(boolean animate) {
+ final MagnificationSpec spec = mCurrentMagnificationSpec;
+ final boolean changed = !spec.isNop();
+ if (changed) {
+ spec.clear();
}
- final Rect bounds = mTempRect;
- bounds.setEmpty();
- mAms.onMagnificationStateChanged();
+
+ mSpecAnimationBridge.updateSentSpec(spec, animate);
+ return changed;
}
/**
@@ -219,23 +337,32 @@
* transition is immediate.
*
* @param scale the target scale, must be >= 1
+ * @param pivotX the screen-relative X coordinate around which to scale
+ * @param pivotY the screen-relative Y coordinate around which to scale
* @param animate {@code true} to animate the transition, {@code false}
* to transition immediately
+ * @return {@code true} if the magnification spec changed, {@code false} if
+ * the spec did not change
*/
- public void setScale(float scale, float pivotX, float pivotY, boolean animate) {
- final Rect magnifiedFrame = mTempRect;
- mMagnifiedBounds.getBounds(magnifiedFrame);
- final MagnificationSpec spec = mCurrentMagnificationSpec;
- final float oldScale = spec.scale;
- final float oldCenterX = (-spec.offsetX + magnifiedFrame.width() / 2) / oldScale;
- final float oldCenterY = (-spec.offsetY + magnifiedFrame.height() / 2) / oldScale;
- final float normPivotX = (-spec.offsetX + pivotX) / oldScale;
- final float normPivotY = (-spec.offsetY + pivotY) / oldScale;
- final float offsetX = (oldCenterX - normPivotX) * (oldScale / scale);
- final float offsetY = (oldCenterY - normPivotY) * (oldScale / scale);
- final float centerX = normPivotX + offsetX;
- final float centerY = normPivotY + offsetY;
- setScaleAndMagnifiedRegionCenter(scale, centerX, centerY, animate);
+ public boolean setScale(float scale, float pivotX, float pivotY, boolean animate) {
+ synchronized (mLock) {
+ // Constrain scale immediately for use in the pivot calculations.
+ scale = MathUtils.constrain(scale, MIN_SCALE, MAX_SCALE);
+
+ final Rect viewport = mTempRect;
+ mMagnifiedRegion.getBounds(viewport);
+ final MagnificationSpec spec = mCurrentMagnificationSpec;
+ final float oldScale = spec.scale;
+ final float oldCenterX = (viewport.width() / 2.0f - spec.offsetX) / oldScale;
+ final float oldCenterY = (viewport.height() / 2.0f - spec.offsetY) / oldScale;
+ final float normPivotX = (pivotX - spec.offsetX) / oldScale;
+ final float normPivotY = (pivotY - spec.offsetY) / oldScale;
+ final float offsetX = (oldCenterX - normPivotX) * (oldScale / scale);
+ final float offsetY = (oldCenterY - normPivotY) * (oldScale / scale);
+ final float centerX = normPivotX + offsetX;
+ final float centerY = normPivotY + offsetY;
+ return setScaleAndCenterLocked(scale, centerX, centerY, animate);
+ }
}
/**
@@ -248,10 +375,13 @@
* center
* @param animate {@code true} to animate the transition, {@code false}
* to transition immediately
+ * @return {@code true} if the magnification spec changed, {@code false} if
+ * the spec did not change
*/
- public void setMagnifiedRegionCenter(float centerX, float centerY, boolean animate) {
- setScaleAndMagnifiedRegionCenter(mCurrentMagnificationSpec.scale, centerX, centerY,
- animate);
+ public boolean setCenter(float centerX, float centerY, boolean animate) {
+ synchronized (mLock) {
+ return setScaleAndCenterLocked(Float.NaN, centerX, centerY, animate);
+ }
}
/**
@@ -259,35 +389,27 @@
* animating the transition. If animation is disabled, the transition
* is immediate.
*
- * @param scale the target scale, must be >= 1
+ * @param scale the target scale, or {@link Float#NaN} to leave unchanged
* @param centerX the screen-relative X coordinate around which to
- * center and scale
+ * center and scale, or {@link Float#NaN} to leave unchanged
* @param centerY the screen-relative Y coordinate around which to
- * center and scale
+ * center and scale, or {@link Float#NaN} to leave unchanged
* @param animate {@code true} to animate the transition, {@code false}
* to transition immediately
+ * @return {@code true} if the magnification spec changed, {@code false} if
+ * the spec did not change
*/
- public void setScaleAndMagnifiedRegionCenter(float scale, float centerX, float centerY,
- boolean animate) {
- if (Float.compare(mCurrentMagnificationSpec.scale, scale) == 0
- && Float.compare(mCurrentMagnificationSpec.offsetX, centerX) == 0
- && Float.compare(mCurrentMagnificationSpec.offsetY, centerY) == 0) {
- return;
+ public boolean setScaleAndCenter(float scale, float centerX, float centerY, boolean animate) {
+ synchronized (mLock) {
+ return setScaleAndCenterLocked(scale, centerX, centerY, animate);
}
- if (mTransformationAnimator.isRunning()) {
- mTransformationAnimator.cancel();
- }
- if (DEBUG_MAGNIFICATION_CONTROLLER) {
- Slog.i(LOG_TAG, "scale: " + scale + " offsetX: " + centerX + " offsetY: " + centerY);
- }
- updateMagnificationSpec(scale, centerX, centerY);
- if (animate) {
- animateMagnificationSpec(mSentMagnificationSpec,
- mCurrentMagnificationSpec);
- } else {
- setMagnificationSpec(mCurrentMagnificationSpec);
- }
- mAms.onMagnificationStateChanged();
+ }
+
+ private boolean setScaleAndCenterLocked(
+ float scale, float centerX, float centerY, boolean animate) {
+ final boolean changed = updateMagnificationSpecLocked(scale, centerX, centerY);
+ mSpecAnimationBridge.updateSentSpec(mCurrentMagnificationSpec, animate);
+ return changed;
}
/**
@@ -297,75 +419,504 @@
* @param offsetY the amount in pixels to offset the Y center
*/
public void offsetMagnifiedRegionCenter(float offsetX, float offsetY) {
- final float nonNormOffsetX = mCurrentMagnificationSpec.offsetX - offsetX;
- mCurrentMagnificationSpec.offsetX = Math.min(Math.max(nonNormOffsetX,
- getMinOffsetX()), 0);
- final float nonNormOffsetY = mCurrentMagnificationSpec.offsetY - offsetY;
- mCurrentMagnificationSpec.offsetY = Math.min(Math.max(nonNormOffsetY,
- getMinOffsetY()), 0);
- setMagnificationSpec(mCurrentMagnificationSpec);
+ synchronized (mLock) {
+ final MagnificationSpec currSpec = mCurrentMagnificationSpec;
+ final float nonNormOffsetX = currSpec.offsetX - offsetX;
+ currSpec.offsetX = MathUtils.constrain(nonNormOffsetX, getMinOffsetXLocked(), 0);
+ final float nonNormOffsetY = currSpec.offsetY - offsetY;
+ currSpec.offsetY = MathUtils.constrain(nonNormOffsetY, getMinOffsetYLocked(), 0);
+ mSpecAnimationBridge.updateSentSpec(currSpec, false);
+ }
}
- private void updateMagnificationSpec(float scale, float magnifiedCenterX,
- float magnifiedCenterY) {
- final Rect magnifiedFrame = mTempRect;
- mMagnifiedBounds.getBounds(magnifiedFrame);
- mCurrentMagnificationSpec.scale = scale;
- final int viewportWidth = magnifiedFrame.width();
- final float nonNormOffsetX = viewportWidth / 2 - magnifiedCenterX * scale;
- mCurrentMagnificationSpec.offsetX = Math.min(Math.max(nonNormOffsetX,
- getMinOffsetX()), 0);
- final int viewportHeight = magnifiedFrame.height();
- final float nonNormOffsetY = viewportHeight / 2 - magnifiedCenterY * scale;
- mCurrentMagnificationSpec.offsetY = Math.min(Math.max(nonNormOffsetY,
- getMinOffsetY()), 0);
+ /**
+ * Persists the current magnification scale to the current user's settings.
+ */
+ public void persistScale() {
+ final float scale = mCurrentMagnificationSpec.scale;
+ final int userId = mUserId;
+
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ Settings.Secure.putFloatForUser(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, scale, userId);
+ return null;
+ }
+ }.execute();
}
- private float getMinOffsetX() {
- final Rect magnifiedFrame = mTempRect;
- mMagnifiedBounds.getBounds(magnifiedFrame);
- final float viewportWidth = magnifiedFrame.width();
+ /**
+ * Retrieves a previously persisted magnification scale from the current
+ * user's settings.
+ *
+ * @return the previously persisted magnification scale, or the default
+ * scale if none is available
+ */
+ public float getPersistedScale() {
+ return Settings.Secure.getFloatForUser(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
+ DEFAULT_MAGNIFICATION_SCALE, mUserId);
+ }
+
+ /**
+ * Updates the current magnification spec.
+ *
+ * @param scale the magnification scale
+ * @param centerX the unscaled, screen-relative X coordinate of the center
+ * of the viewport, or {@link Float#NaN} to leave unchanged
+ * @param centerY the unscaled, screen-relative Y coordinate of the center
+ * of the viewport, or {@link Float#NaN} to leave unchanged
+ * @return {@code true} if the magnification spec changed or {@code false}
+ * otherwise
+ */
+ private boolean updateMagnificationSpecLocked(float scale, float centerX, float centerY) {
+ if (!availableRegionContains(centerX, centerY)) {
+ return false;
+ }
+
+ boolean changed = false;
+
+ final MagnificationSpec currSpec = mCurrentMagnificationSpec;
+
+ // Handle scale.
+ if (Float.isNaN(scale)) {
+ scale = getScale();
+ }
+
+ final float normScale = MathUtils.constrain(scale, MIN_SCALE, MAX_SCALE);
+ if (Float.compare(currSpec.scale, normScale) != 0) {
+ currSpec.scale = normScale;
+ changed = true;
+ }
+
+ // Handle X offset.
+ if (Float.isNaN(centerX)) {
+ centerX = getCenterX();
+ }
+
+ final float nonNormOffsetX = mMagnifiedBounds.width() / 2.0f - centerX * scale;
+ final float offsetX = MathUtils.constrain(nonNormOffsetX, getMinOffsetXLocked(), 0);
+ if (Float.compare(currSpec.offsetX, offsetX) != 0) {
+ currSpec.offsetX = offsetX;
+ changed = true;
+ }
+
+ // Handle Y offset.
+ if (Float.isNaN(centerY)) {
+ centerY = getCenterY();
+ }
+
+ final float nonNormOffsetY = mMagnifiedBounds.height() / 2.0f - centerY * scale;
+ final float offsetY = MathUtils.constrain(nonNormOffsetY, getMinOffsetYLocked(), 0);
+ if (Float.compare(currSpec.offsetY, offsetY) != 0) {
+ currSpec.offsetY = offsetY;
+ changed = true;
+ }
+
+ return changed;
+ }
+
+ private float getMinOffsetXLocked() {
+ final float viewportWidth = mMagnifiedBounds.width();
return viewportWidth - viewportWidth * mCurrentMagnificationSpec.scale;
}
- private float getMinOffsetY() {
- final Rect magnifiedFrame = mTempRect;
- mMagnifiedBounds.getBounds(magnifiedFrame);
- final float viewportHeight = magnifiedFrame.height();
+ private float getMinOffsetYLocked() {
+ final float viewportHeight = mMagnifiedBounds.height();
return viewportHeight - viewportHeight * mCurrentMagnificationSpec.scale;
}
- private void animateMagnificationSpec(MagnificationSpec fromSpec,
- MagnificationSpec toSpec) {
- mTransformationAnimator.setObjectValues(fromSpec, toSpec);
- mTransformationAnimator.start();
- }
+ /**
+ * Sets the currently active user ID.
+ *
+ * @param userId the currently active user ID
+ */
+ public void setUserId(int userId) {
+ if (mUserId != userId) {
+ mUserId = userId;
- public void setMagnificationSpec(MagnificationSpec spec) {
- if (DEBUG_SET_MAGNIFICATION_SPEC) {
- Slog.i(LOG_TAG, "Sending: " + spec);
+ synchronized (mLock) {
+ if (isMagnifying()) {
+ reset(false);
+ }
+ }
}
- mSentMagnificationSpec.scale = spec.scale;
- mSentMagnificationSpec.offsetX = spec.offsetX;
- mSentMagnificationSpec.offsetY = spec.offsetY;
- mWindowManager.setMagnificationSpec(MagnificationSpec.obtain(spec));
}
- public MagnificationSpec getMagnificationSpec() {
- return mSentMagnificationSpec;
+ private boolean isScreenMagnificationAutoUpdateEnabled() {
+ return (Settings.Secure.getInt(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
+ DEFAULT_SCREEN_MAGNIFICATION_AUTO_UPDATE) == 1);
}
- private static class MagnificationSpecEvaluator implements TypeEvaluator<MagnificationSpec> {
- private final MagnificationSpec mTempTransformationSpec = MagnificationSpec.obtain();
+ /**
+ * Resets magnification if magnification and auto-update are both enabled.
+ *
+ * @param animate whether the animate the transition
+ * @return {@code true} if magnification was reset to the disabled state,
+ * {@code false} if magnification is still active
+ */
+ boolean resetIfNeeded(boolean animate) {
+ synchronized (mLock) {
+ if (isMagnifying() && isScreenMagnificationAutoUpdateEnabled()) {
+ reset(animate);
+ return true;
+ }
+ return false;
+ }
+ }
+
+ private void getMagnifiedFrameInContentCoordsLocked(Rect outFrame) {
+ final float scale = getSentScale();
+ final float offsetX = getSentOffsetX();
+ final float offsetY = getSentOffsetY();
+ getMagnifiedBounds(outFrame);
+ outFrame.offset((int) -offsetX, (int) -offsetY);
+ outFrame.scale(1.0f / scale);
+ }
+
+ private void requestRectangleOnScreen(int left, int top, int right, int bottom) {
+ synchronized (mLock) {
+ final Rect magnifiedFrame = mTempRect;
+ getMagnifiedBounds(magnifiedFrame);
+ if (!magnifiedFrame.intersects(left, top, right, bottom)) {
+ return;
+ }
+
+ final Rect magnifFrameInScreenCoords = mTempRect1;
+ getMagnifiedFrameInContentCoordsLocked(magnifFrameInScreenCoords);
+
+ final float scrollX;
+ final float scrollY;
+ if (right - left > magnifFrameInScreenCoords.width()) {
+ final int direction = TextUtils
+ .getLayoutDirectionFromLocale(Locale.getDefault());
+ if (direction == View.LAYOUT_DIRECTION_LTR) {
+ scrollX = left - magnifFrameInScreenCoords.left;
+ } else {
+ scrollX = right - magnifFrameInScreenCoords.right;
+ }
+ } else if (left < magnifFrameInScreenCoords.left) {
+ scrollX = left - magnifFrameInScreenCoords.left;
+ } else if (right > magnifFrameInScreenCoords.right) {
+ scrollX = right - magnifFrameInScreenCoords.right;
+ } else {
+ scrollX = 0;
+ }
+
+ if (bottom - top > magnifFrameInScreenCoords.height()) {
+ scrollY = top - magnifFrameInScreenCoords.top;
+ } else if (top < magnifFrameInScreenCoords.top) {
+ scrollY = top - magnifFrameInScreenCoords.top;
+ } else if (bottom > magnifFrameInScreenCoords.bottom) {
+ scrollY = bottom - magnifFrameInScreenCoords.bottom;
+ } else {
+ scrollY = 0;
+ }
+
+ final float scale = getScale();
+ offsetMagnifiedRegionCenter(scrollX * scale, scrollY * scale);
+ }
+ }
+
+ /**
+ * Class responsible for animating spec on the main thread and sending spec
+ * updates to the window manager.
+ */
+ private static class SpecAnimationBridge {
+ private static final int ACTION_UPDATE_SPEC = 1;
+
+ private final Handler mHandler;
+ private final WindowManagerInternal mWindowManager;
+
+ /**
+ * The magnification spec that was sent to the window manager. This should
+ * only be accessed and modified on the main (e.g. animation) thread.
+ */
+ private final MagnificationSpec mSentMagnificationSpec = MagnificationSpec.obtain();
+
+ /**
+ * The animator that updates the sent spec. This should only be accessed
+ * and modified on the main (e.g. animation) thread.
+ */
+ private final ValueAnimator mTransformationAnimator;
+
+ private final long mMainThreadId;
+
+ private SpecAnimationBridge(Context context) {
+ final Looper mainLooper = context.getMainLooper();
+ mMainThreadId = mainLooper.getThread().getId();
+
+ mHandler = new UpdateHandler(context);
+ mWindowManager = LocalServices.getService(WindowManagerInternal.class);
+
+ final MagnificationSpecProperty property = new MagnificationSpecProperty();
+ final MagnificationSpecEvaluator evaluator = new MagnificationSpecEvaluator();
+ final long animationDuration = context.getResources().getInteger(
+ R.integer.config_longAnimTime);
+ mTransformationAnimator = ObjectAnimator.ofObject(this, property, evaluator,
+ mSentMagnificationSpec);
+ mTransformationAnimator.setDuration(animationDuration);
+ mTransformationAnimator.setInterpolator(new DecelerateInterpolator(2.5f));
+ }
+
+ public void updateSentSpec(MagnificationSpec spec, boolean animate) {
+ if (Thread.currentThread().getId() == mMainThreadId) {
+ // Already on the main thread, don't bother proxying.
+ updateSentSpecInternal(spec, animate);
+ } else {
+ mHandler.obtainMessage(ACTION_UPDATE_SPEC,
+ animate ? 1 : 0, 0, spec).sendToTarget();
+ }
+ }
+
+ /**
+ * Updates the sent spec.
+ */
+ private void updateSentSpecInternal(MagnificationSpec spec, boolean animate) {
+ if (mTransformationAnimator.isRunning()) {
+ mTransformationAnimator.cancel();
+ }
+
+ // If the current and sent specs don't match, update the sent spec.
+ final boolean changed = !mSentMagnificationSpec.equals(spec);
+ if (changed) {
+ if (animate) {
+ animateMagnificationSpec(spec);
+ } else {
+ setMagnificationSpec(spec);
+ }
+ }
+ }
+
+ private void animateMagnificationSpec(MagnificationSpec toSpec) {
+ mTransformationAnimator.setObjectValues(mSentMagnificationSpec, toSpec);
+ mTransformationAnimator.start();
+ }
+
+ private void setMagnificationSpec(MagnificationSpec spec) {
+ if (DEBUG_SET_MAGNIFICATION_SPEC) {
+ Slog.i(LOG_TAG, "Sending: " + spec);
+ }
+
+ mSentMagnificationSpec.setTo(spec);
+ mWindowManager.setMagnificationSpec(spec);
+ }
+
+ private class UpdateHandler extends Handler {
+ public UpdateHandler(Context context) {
+ super(context.getMainLooper());
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case ACTION_UPDATE_SPEC:
+ final boolean animate = msg.arg1 == 1;
+ final MagnificationSpec spec = (MagnificationSpec) msg.obj;
+ updateSentSpecInternal(spec, animate);
+ break;
+ }
+ }
+ }
+
+ private static class MagnificationSpecProperty
+ extends Property<SpecAnimationBridge, MagnificationSpec> {
+ public MagnificationSpecProperty() {
+ super(MagnificationSpec.class, "spec");
+ }
+
+ @Override
+ public MagnificationSpec get(SpecAnimationBridge object) {
+ return object.mSentMagnificationSpec;
+ }
+
+ @Override
+ public void set(SpecAnimationBridge object, MagnificationSpec value) {
+ object.setMagnificationSpec(value);
+ }
+ }
+
+ private static class MagnificationSpecEvaluator
+ implements TypeEvaluator<MagnificationSpec> {
+ private final MagnificationSpec mTempSpec = MagnificationSpec.obtain();
+
+ @Override
+ public MagnificationSpec evaluate(float fraction, MagnificationSpec fromSpec,
+ MagnificationSpec toSpec) {
+ final MagnificationSpec result = mTempSpec;
+ result.scale = fromSpec.scale + (toSpec.scale - fromSpec.scale) * fraction;
+ result.offsetX = fromSpec.offsetX + (toSpec.offsetX - fromSpec.offsetX) * fraction;
+ result.offsetY = fromSpec.offsetY + (toSpec.offsetY - fromSpec.offsetY) * fraction;
+ return result;
+ }
+ }
+ }
+
+ private static class ScreenStateObserver extends BroadcastReceiver {
+ private static final int MESSAGE_ON_SCREEN_STATE_CHANGE = 1;
+
+ private final Context mContext;
+ private final MagnificationController mController;
+ private final Handler mHandler;
+
+ public ScreenStateObserver(Context context, MagnificationController controller) {
+ mContext = context;
+ mController = controller;
+ mHandler = new StateChangeHandler(context);
+ }
+
+ public void register() {
+ mContext.registerReceiver(this, new IntentFilter(Intent.ACTION_SCREEN_OFF));
+ }
+
+ public void unregister() {
+ mContext.unregisterReceiver(this);
+ }
@Override
- public MagnificationSpec evaluate(float fraction, MagnificationSpec fromSpec,
- MagnificationSpec toSpec) {
- final MagnificationSpec result = mTempTransformationSpec;
- result.scale = fromSpec.scale + (toSpec.scale - fromSpec.scale) * fraction;
- result.offsetX = fromSpec.offsetX + (toSpec.offsetX - fromSpec.offsetX) * fraction;
- result.offsetY = fromSpec.offsetY + (toSpec.offsetY - fromSpec.offsetY) * fraction;
- return result;
+ public void onReceive(Context context, Intent intent) {
+ mHandler.obtainMessage(MESSAGE_ON_SCREEN_STATE_CHANGE,
+ intent.getAction()).sendToTarget();
+ }
+
+ private void handleOnScreenStateChange() {
+ mController.resetIfNeeded(false);
+ }
+
+ private class StateChangeHandler extends Handler {
+ public StateChangeHandler(Context context) {
+ super(context.getMainLooper());
+ }
+
+ @Override
+ public void handleMessage(Message message) {
+ switch (message.what) {
+ case MESSAGE_ON_SCREEN_STATE_CHANGE:
+ handleOnScreenStateChange();
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * This class handles the screen magnification when accessibility is enabled.
+ */
+ private static class WindowStateObserver
+ implements WindowManagerInternal.MagnificationCallbacks {
+ private static final int MESSAGE_ON_MAGNIFIED_BOUNDS_CHANGED = 1;
+ private static final int MESSAGE_ON_RECTANGLE_ON_SCREEN_REQUESTED = 2;
+ private static final int MESSAGE_ON_USER_CONTEXT_CHANGED = 3;
+ private static final int MESSAGE_ON_ROTATION_CHANGED = 4;
+
+ private final Rect mTempRect = new Rect();
+ private final Rect mTempRect1 = new Rect();
+
+ private final MagnificationController mController;
+ private final WindowManagerInternal mWindowManager;
+ private final Handler mHandler;
+
+ private boolean mSpecIsDirty;
+
+ public WindowStateObserver(Context context, MagnificationController controller) {
+ mController = controller;
+ mWindowManager = LocalServices.getService(WindowManagerInternal.class);
+ mHandler = new CallbackHandler(context);
+ }
+
+ public void register() {
+ mWindowManager.setMagnificationCallbacks(this);
+ }
+
+ public void unregister() {
+ mWindowManager.setMagnificationCallbacks(null);
+ }
+
+ @Override
+ public void onMagnifiedBoundsChanged(Region magnified, Region available) {
+ final SomeArgs args = SomeArgs.obtain();
+ args.arg1 = Region.obtain(magnified);
+ args.arg2 = Region.obtain(available);
+ mHandler.obtainMessage(MESSAGE_ON_MAGNIFIED_BOUNDS_CHANGED, args).sendToTarget();
+ }
+
+ private void handleOnMagnifiedBoundsChanged(Region magnified, Region available) {
+ mController.setMagnifiedRegion(magnified, available, mSpecIsDirty);
+ mSpecIsDirty = false;
+ }
+
+ @Override
+ public void onRectangleOnScreenRequested(int left, int top, int right, int bottom) {
+ final SomeArgs args = SomeArgs.obtain();
+ args.argi1 = left;
+ args.argi2 = top;
+ args.argi3 = right;
+ args.argi4 = bottom;
+ mHandler.obtainMessage(MESSAGE_ON_RECTANGLE_ON_SCREEN_REQUESTED, args).sendToTarget();
+ }
+
+ private void handleOnRectangleOnScreenRequested(int left, int top, int right, int bottom) {
+ mController.requestRectangleOnScreen(left, top, right, bottom);
+ }
+
+ @Override
+ public void onRotationChanged(int rotation) {
+ mHandler.obtainMessage(MESSAGE_ON_ROTATION_CHANGED, rotation, 0).sendToTarget();
+ }
+
+ private void handleOnRotationChanged() {
+ // If there was a rotation and magnification is still enabled,
+ // we'll need to rewrite the spec to reflect the new screen
+ // configuration. Conveniently, we'll receive a callback from
+ // the window manager with updated bounds for the magnified
+ // region.
+ mSpecIsDirty = !mController.resetIfNeeded(true);
+ }
+
+ @Override
+ public void onUserContextChanged() {
+ mHandler.sendEmptyMessage(MESSAGE_ON_USER_CONTEXT_CHANGED);
+ }
+
+ private void handleOnUserContextChanged() {
+ mController.resetIfNeeded(true);
+ }
+
+ private class CallbackHandler extends Handler {
+ public CallbackHandler(Context context) {
+ super(context.getMainLooper());
+ }
+
+ @Override
+ public void handleMessage(Message message) {
+ switch (message.what) {
+ case MESSAGE_ON_MAGNIFIED_BOUNDS_CHANGED: {
+ final SomeArgs args = (SomeArgs) message.obj;
+ final Region magnifiedBounds = (Region) args.arg1;
+ final Region availableBounds = (Region) args.arg2;
+ handleOnMagnifiedBoundsChanged(magnifiedBounds, availableBounds);
+ magnifiedBounds.recycle();
+ availableBounds.recycle();
+ } break;
+ case MESSAGE_ON_RECTANGLE_ON_SCREEN_REQUESTED: {
+ final SomeArgs args = (SomeArgs) message.obj;
+ final int left = args.argi1;
+ final int top = args.argi2;
+ final int right = args.argi3;
+ final int bottom = args.argi4;
+ handleOnRectangleOnScreenRequested(left, top, right, bottom);
+ args.recycle();
+ } break;
+ case MESSAGE_ON_USER_CONTEXT_CHANGED: {
+ handleOnUserContextChanged();
+ } break;
+ case MESSAGE_ON_ROTATION_CHANGED: {
+ handleOnRotationChanged();
+ } break;
+ }
+ }
}
}
}
diff --git a/services/accessibility/java/com/android/server/accessibility/ScreenMagnifier.java b/services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java
similarity index 65%
rename from services/accessibility/java/com/android/server/accessibility/ScreenMagnifier.java
rename to services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java
index 8feb167..51c8ab5 100644
--- a/services/accessibility/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2015 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,18 +16,10 @@
package com.android.server.accessibility;
-import android.content.BroadcastReceiver;
import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.os.AsyncTask;
-import android.os.Binder;
import android.os.Handler;
import android.os.Message;
-import android.provider.Settings;
-import android.text.TextUtils;
+import android.util.MathUtils;
import android.util.Slog;
import android.util.TypedValue;
import android.view.GestureDetector;
@@ -39,18 +31,12 @@
import android.view.MotionEvent.PointerProperties;
import android.view.ScaleGestureDetector;
import android.view.ScaleGestureDetector.OnScaleGestureListener;
-import android.view.View;
import android.view.ViewConfiguration;
-import android.view.WindowManagerInternal;
import android.view.accessibility.AccessibilityEvent;
-import com.android.internal.os.SomeArgs;
-import com.android.server.LocalServices;
-
-import java.util.Locale;
-
/**
- * This class handles the screen magnification when accessibility is enabled.
+ * This class handles magnification in response to touch events.
+ *
* The behavior is as follows:
*
* 1. Triple tap toggles permanent screen magnification which is magnifying
@@ -88,10 +74,8 @@
*
* 6. The magnification scale will be persisted in settings and in the cloud.
*/
-public final class ScreenMagnifier implements WindowManagerInternal.MagnificationCallbacks,
- EventStreamTransformation {
-
- private static final String LOG_TAG = ScreenMagnifier.class.getSimpleName();
+class MagnificationGestureHandler implements EventStreamTransformation {
+ private static final String LOG_TAG = "MagnificationEventHandler";
private static final boolean DEBUG_STATE_TRANSITIONS = false;
private static final boolean DEBUG_DETECTING = false;
@@ -103,40 +87,19 @@
private static final int STATE_VIEWPORT_DRAGGING = 3;
private static final int STATE_MAGNIFIED_INTERACTION = 4;
- private static final float DEFAULT_MAGNIFICATION_SCALE = 2.0f;
+ private static final float MIN_SCALE = 2.0f;
+ private static final float MAX_SCALE = 5.0f;
- private static final int MESSAGE_ON_MAGNIFIED_BOUNDS_CHANGED = 1;
- private static final int MESSAGE_ON_RECTANGLE_ON_SCREEN_REQUESTED = 2;
- private static final int MESSAGE_ON_USER_CONTEXT_CHANGED = 3;
- private static final int MESSAGE_ON_ROTATION_CHANGED = 4;
-
- private static final int DEFAULT_SCREEN_MAGNIFICATION_AUTO_UPDATE = 1;
-
- private static final int MY_PID = android.os.Process.myPid();
-
- private final Rect mTempRect = new Rect();
- private final Rect mTempRect1 = new Rect();
-
- private final Context mContext;
- private final WindowManagerInternal mWindowManager;
private final MagnificationController mMagnificationController;
- private final ScreenStateObserver mScreenStateObserver;
-
private final DetectingStateHandler mDetectingStateHandler;
- private final MagnifiedContentInteractonStateHandler mMagnifiedContentInteractonStateHandler;
+ private final MagnifiedContentInteractionStateHandler mMagnifiedContentInteractionStateHandler;
private final StateViewportDraggingHandler mStateViewportDraggingHandler;
- private final int mUserId;
-
- private final int mTapTimeSlop = ViewConfiguration.getJumpTapTimeout();
- private final int mMultiTapTimeSlop;
- private final int mTapDistanceSlop;
- private final int mMultiTapDistanceSlop;
-
private EventStreamTransformation mNext;
private int mCurrentState;
private int mPreviousState;
+
private boolean mTranslationEnabledBeforePan;
private PointerCoords[] mTempPointerCoords;
@@ -144,189 +107,44 @@
private long mDelegatingStateDownTime;
- private boolean mUpdateMagnificationSpecOnNextBoundsChange;
-
- private final Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message message) {
- switch (message.what) {
- case MESSAGE_ON_MAGNIFIED_BOUNDS_CHANGED: {
- Region bounds = (Region) message.obj;
- handleOnMagnifiedBoundsChanged(bounds);
- bounds.recycle();
- } break;
- case MESSAGE_ON_RECTANGLE_ON_SCREEN_REQUESTED: {
- SomeArgs args = (SomeArgs) message.obj;
- final int left = args.argi1;
- final int top = args.argi2;
- final int right = args.argi3;
- final int bottom = args.argi4;
- handleOnRectangleOnScreenRequested(left, top, right, bottom);
- args.recycle();
- } break;
- case MESSAGE_ON_USER_CONTEXT_CHANGED: {
- handleOnUserContextChanged();
- } break;
- case MESSAGE_ON_ROTATION_CHANGED: {
- final int rotation = message.arg1;
- handleOnRotationChanged(rotation);
- } break;
- }
- }
- };
-
- public ScreenMagnifier(Context context, int userId, int displayId,
- AccessibilityManagerService service) {
- mContext = context;
- mUserId = userId;
- mWindowManager = LocalServices.getService(WindowManagerInternal.class);
-
- mMultiTapTimeSlop = ViewConfiguration.getDoubleTapTimeout()
- + mContext.getResources().getInteger(
- com.android.internal.R.integer.config_screen_magnification_multi_tap_adjustment);
- mTapDistanceSlop = ViewConfiguration.get(context).getScaledTouchSlop();
- mMultiTapDistanceSlop = ViewConfiguration.get(context).getScaledDoubleTapSlop();
-
- mDetectingStateHandler = new DetectingStateHandler();
+ public MagnificationGestureHandler(Context context, AccessibilityManagerService ams) {
+ mMagnificationController = ams.getMagnificationController();
+ mDetectingStateHandler = new DetectingStateHandler(context);
mStateViewportDraggingHandler = new StateViewportDraggingHandler();
- mMagnifiedContentInteractonStateHandler = new MagnifiedContentInteractonStateHandler(
- context);
-
- mMagnificationController = service.getMagnificationController();
- mScreenStateObserver = new ScreenStateObserver(context, mMagnificationController);
-
- mWindowManager.setMagnificationCallbacks(this);
+ mMagnifiedContentInteractionStateHandler =
+ new MagnifiedContentInteractionStateHandler(context);
transitionToState(STATE_DETECTING);
}
@Override
- public void onMagnifedBoundsChanged(Region bounds) {
- Region newBounds = Region.obtain(bounds);
- mHandler.obtainMessage(MESSAGE_ON_MAGNIFIED_BOUNDS_CHANGED, newBounds).sendToTarget();
- if (MY_PID != Binder.getCallingPid()) {
- bounds.recycle();
- }
- }
-
- private void handleOnMagnifiedBoundsChanged(Region bounds) {
- // If there was a rotation we have to update the center of the magnified
- // region since the old offset X/Y may be out of its acceptable range for
- // the new display width and height.
- mMagnificationController.setMagnifiedRegion(
- bounds, mUpdateMagnificationSpecOnNextBoundsChange);
- mUpdateMagnificationSpecOnNextBoundsChange = false;
- }
-
- @Override
- public void onRectangleOnScreenRequested(int left, int top, int right, int bottom) {
- SomeArgs args = SomeArgs.obtain();
- args.argi1 = left;
- args.argi2 = top;
- args.argi3 = right;
- args.argi4 = bottom;
- mHandler.obtainMessage(MESSAGE_ON_RECTANGLE_ON_SCREEN_REQUESTED, args).sendToTarget();
- }
-
- private void handleOnRectangleOnScreenRequested(int left, int top, int right, int bottom) {
- Rect magnifiedFrame = mTempRect;
- mMagnificationController.getMagnifiedBounds(magnifiedFrame);
- if (!magnifiedFrame.intersects(left, top, right, bottom)) {
- return;
- }
- Rect magnifFrameInScreenCoords = mTempRect1;
- getMagnifiedFrameInContentCoords(magnifFrameInScreenCoords);
- final float scrollX;
- final float scrollY;
- if (right - left > magnifFrameInScreenCoords.width()) {
- final int direction = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault());
- if (direction == View.LAYOUT_DIRECTION_LTR) {
- scrollX = left - magnifFrameInScreenCoords.left;
- } else {
- scrollX = right - magnifFrameInScreenCoords.right;
- }
- } else if (left < magnifFrameInScreenCoords.left) {
- scrollX = left - magnifFrameInScreenCoords.left;
- } else if (right > magnifFrameInScreenCoords.right) {
- scrollX = right - magnifFrameInScreenCoords.right;
- } else {
- scrollX = 0;
- }
- if (bottom - top > magnifFrameInScreenCoords.height()) {
- scrollY = top - magnifFrameInScreenCoords.top;
- } else if (top < magnifFrameInScreenCoords.top) {
- scrollY = top - magnifFrameInScreenCoords.top;
- } else if (bottom > magnifFrameInScreenCoords.bottom) {
- scrollY = bottom - magnifFrameInScreenCoords.bottom;
- } else {
- scrollY = 0;
- }
- final float scale = mMagnificationController.getScale();
- mMagnificationController.offsetMagnifiedRegionCenter(scrollX * scale, scrollY * scale);
- }
-
- @Override
- public void onRotationChanged(int rotation) {
- mHandler.obtainMessage(MESSAGE_ON_ROTATION_CHANGED, rotation, 0).sendToTarget();
- }
-
- private void handleOnRotationChanged(int rotation) {
- resetMagnificationIfNeeded();
- if (mMagnificationController.isMagnifying()) {
- mUpdateMagnificationSpecOnNextBoundsChange = true;
- }
- }
-
- @Override
- public void onUserContextChanged() {
- mHandler.sendEmptyMessage(MESSAGE_ON_USER_CONTEXT_CHANGED);
- }
-
- private void handleOnUserContextChanged() {
- resetMagnificationIfNeeded();
- }
-
- private void getMagnifiedFrameInContentCoords(Rect rect) {
- final float scale = mMagnificationController.getSentScale();
- final float offsetX = mMagnificationController.getSentOffsetX();
- final float offsetY = mMagnificationController.getSentOffsetY();
- mMagnificationController.getMagnifiedBounds(rect);
- rect.offset((int) -offsetX, (int) -offsetY);
- rect.scale(1.0f / scale);
- }
-
- private void resetMagnificationIfNeeded() {
- if (mMagnificationController.isMagnifying()
- && isScreenMagnificationAutoUpdateEnabled(mContext)) {
- mMagnificationController.reset(true);
- }
- }
-
- @Override
- public void onMotionEvent(MotionEvent event, MotionEvent rawEvent,
- int policyFlags) {
+ public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) {
if (mNext != null) {
mNext.onMotionEvent(event, rawEvent, policyFlags);
}
return;
}
- mMagnifiedContentInteractonStateHandler.onMotionEvent(event);
+ mMagnifiedContentInteractionStateHandler.onMotionEvent(event, rawEvent, policyFlags);
switch (mCurrentState) {
case STATE_DELEGATING: {
handleMotionEventStateDelegating(event, rawEvent, policyFlags);
- } break;
+ }
+ break;
case STATE_DETECTING: {
mDetectingStateHandler.onMotionEvent(event, rawEvent, policyFlags);
- } break;
+ }
+ break;
case STATE_VIEWPORT_DRAGGING: {
- mStateViewportDraggingHandler.onMotionEvent(event, policyFlags);
- } break;
+ mStateViewportDraggingHandler.onMotionEvent(event, rawEvent, policyFlags);
+ }
+ break;
case STATE_MAGNIFIED_INTERACTION: {
// mMagnifiedContentInteractonStateHandler handles events only
// if this is the current state since it uses ScaleGestureDetecotr
// and a GestureDetector which need well formed event stream.
- } break;
+ }
+ break;
default: {
throw new IllegalStateException("Unknown state: " + mCurrentState);
}
@@ -336,7 +154,7 @@
@Override
public void onKeyEvent(KeyEvent event, int policyFlags) {
if (mNext != null) {
- mNext.onKeyEvent(event, policyFlags);
+ mNext.onKeyEvent(event, policyFlags);
}
}
@@ -366,15 +184,13 @@
@Override
public void onDestroy() {
clear();
- mScreenStateObserver.destroy();
- mWindowManager.setMagnificationCallbacks(null);
}
private void clear() {
mCurrentState = STATE_DETECTING;
mDetectingStateHandler.clear();
mStateViewportDraggingHandler.clear();
- mMagnifiedContentInteractonStateHandler.clear();
+ mMagnifiedContentInteractionStateHandler.clear();
}
private void handleMotionEventStateDelegating(MotionEvent event,
@@ -382,12 +198,14 @@
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
mDelegatingStateDownTime = event.getDownTime();
- } break;
+ }
+ break;
case MotionEvent.ACTION_UP: {
if (mDetectingStateHandler.mDelayedEventQueue == null) {
transitionToState(STATE_DETECTING);
}
- } break;
+ }
+ break;
}
if (mNext != null) {
// If the event is within the magnified portion of the screen we have
@@ -402,7 +220,8 @@
final float scaledOffsetY = mMagnificationController.getOffsetY();
final int pointerCount = event.getPointerCount();
PointerCoords[] coords = getTempPointerCoordsWithMinSize(pointerCount);
- PointerProperties[] properties = getTempPointerPropertiesWithMinSize(pointerCount);
+ PointerProperties[] properties = getTempPointerPropertiesWithMinSize(
+ pointerCount);
for (int i = 0; i < pointerCount; i++) {
event.getPointerCoords(i, coords[i]);
coords[i].x = (coords[i].x - scaledOffsetX) / scale;
@@ -441,12 +260,14 @@
}
private PointerProperties[] getTempPointerPropertiesWithMinSize(int size) {
- final int oldSize = (mTempPointerProperties != null) ? mTempPointerProperties.length : 0;
+ final int oldSize = (mTempPointerProperties != null) ? mTempPointerProperties.length
+ : 0;
if (oldSize < size) {
PointerProperties[] oldTempPointerProperties = mTempPointerProperties;
mTempPointerProperties = new PointerProperties[size];
if (oldTempPointerProperties != null) {
- System.arraycopy(oldTempPointerProperties, 0, mTempPointerProperties, 0, oldSize);
+ System.arraycopy(oldTempPointerProperties, 0, mTempPointerProperties, 0,
+ oldSize);
}
}
for (int i = oldSize; i < size; i++) {
@@ -460,16 +281,20 @@
switch (state) {
case STATE_DELEGATING: {
Slog.i(LOG_TAG, "mCurrentState: STATE_DELEGATING");
- } break;
+ }
+ break;
case STATE_DETECTING: {
Slog.i(LOG_TAG, "mCurrentState: STATE_DETECTING");
- } break;
+ }
+ break;
case STATE_VIEWPORT_DRAGGING: {
Slog.i(LOG_TAG, "mCurrentState: STATE_VIEWPORT_DRAGGING");
- } break;
+ }
+ break;
case STATE_MAGNIFIED_INTERACTION: {
Slog.i(LOG_TAG, "mCurrentState: STATE_MAGNIFIED_INTERACTION");
- } break;
+ }
+ break;
default: {
throw new IllegalArgumentException("Unknown state: " + state);
}
@@ -479,20 +304,30 @@
mCurrentState = state;
}
- private final class MagnifiedContentInteractonStateHandler
- extends SimpleOnGestureListener implements OnScaleGestureListener {
- private static final float MIN_SCALE = 1.3f;
- private static final float MAX_SCALE = 5.0f;
+ private interface MotionEventHandler {
+
+ void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags);
+
+ void clear();
+ }
+
+ /**
+ * This class determines if the user is performing a scale or pan gesture.
+ */
+ private final class MagnifiedContentInteractionStateHandler extends SimpleOnGestureListener
+ implements OnScaleGestureListener, MotionEventHandler {
private final ScaleGestureDetector mScaleGestureDetector;
+
private final GestureDetector mGestureDetector;
private final float mScalingThreshold;
private float mInitialScaleFactor = -1;
+
private boolean mScaling;
- public MagnifiedContentInteractonStateHandler(Context context) {
+ public MagnifiedContentInteractionStateHandler(Context context) {
final TypedValue scaleValue = new TypedValue();
context.getResources().getValue(
com.android.internal.R.dimen.config_screen_magnification_scaling_threshold,
@@ -503,7 +338,8 @@
mGestureDetector = new GestureDetector(context, this);
}
- public void onMotionEvent(MotionEvent event) {
+ @Override
+ public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
mScaleGestureDetector.onTouchEvent(event);
mGestureDetector.onTouchEvent(event);
if (mCurrentState != STATE_MAGNIFIED_INTERACTION) {
@@ -511,11 +347,7 @@
}
if (event.getActionMasked() == MotionEvent.ACTION_UP) {
clear();
- final float scale = Math.min(Math.max(mMagnificationController.getScale(),
- MIN_SCALE), MAX_SCALE);
- if (scale != getPersistedScale()) {
- persistScale(scale);
- }
+ mMagnificationController.persistScale();
if (mPreviousState == STATE_VIEWPORT_DRAGGING) {
transitionToState(STATE_VIEWPORT_DRAGGING);
} else {
@@ -552,14 +384,29 @@
}
return false;
}
- final float newScale = mMagnificationController.getScale()
- * detector.getScaleFactor();
- final float normalizedNewScale = Math.min(Math.max(newScale, MIN_SCALE), MAX_SCALE);
- if (DEBUG_SCALING) {
- Slog.i(LOG_TAG, "normalizedNewScale: " + normalizedNewScale);
+
+ final float initialScale = mMagnificationController.getScale();
+ final float targetScale = initialScale * detector.getScaleFactor();
+
+ // Don't allow a gesture to move the user further outside the
+ // desired bounds for gesture-controlled scaling.
+ final float scale;
+ if (targetScale > MAX_SCALE && targetScale > initialScale) {
+ // The target scale is too big and getting bigger.
+ scale = MAX_SCALE;
+ } else if (targetScale < MIN_SCALE && targetScale < initialScale) {
+ // The target scale is too small and getting smaller.
+ scale = MIN_SCALE;
+ } else {
+ // The target scale may be outside our bounds, but at least
+ // it's moving in the right direction. This avoids a "jump" if
+ // we're at odds with some other service's desired bounds.
+ scale = targetScale;
}
- mMagnificationController.setScale(normalizedNewScale, detector.getFocusX(),
- detector.getFocusY(), false);
+
+ final float pivotX = detector.getFocusX();
+ final float pivotY = detector.getFocusY();
+ mMagnificationController.setScale(scale, pivotX, pivotY, false);
return true;
}
@@ -573,16 +420,24 @@
clear();
}
- private void clear() {
+ @Override
+ public void clear() {
mInitialScaleFactor = -1;
mScaling = false;
}
}
- private final class StateViewportDraggingHandler {
+ /**
+ * This class handles motion events when the event dispatcher has
+ * determined that the user is performing a single-finger drag of the
+ * magnification viewport.
+ */
+ private final class StateViewportDraggingHandler implements MotionEventHandler {
+
private boolean mLastMoveOutsideMagnifiedRegion;
- private void onMotionEvent(MotionEvent event, int policyFlags) {
+ @Override
+ public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
final int action = event.getActionMasked();
switch (action) {
case MotionEvent.ACTION_DOWN: {
@@ -591,7 +446,8 @@
case MotionEvent.ACTION_POINTER_DOWN: {
clear();
transitionToState(STATE_MAGNIFIED_INTERACTION);
- } break;
+ }
+ break;
case MotionEvent.ACTION_MOVE: {
if (event.getPointerCount() != 1) {
throw new IllegalStateException("Should have one pointer down.");
@@ -601,35 +457,43 @@
if (mMagnificationController.magnifiedRegionContains(eventX, eventY)) {
if (mLastMoveOutsideMagnifiedRegion) {
mLastMoveOutsideMagnifiedRegion = false;
- mMagnificationController.setMagnifiedRegionCenter(eventX,
+ mMagnificationController.setCenter(eventX,
eventY, true);
} else {
- mMagnificationController.setMagnifiedRegionCenter(eventX,
+ mMagnificationController.setCenter(eventX,
eventY, false);
}
} else {
mLastMoveOutsideMagnifiedRegion = true;
}
- } break;
+ }
+ break;
case MotionEvent.ACTION_UP: {
if (!mTranslationEnabledBeforePan) {
mMagnificationController.reset(true);
}
clear();
transitionToState(STATE_DETECTING);
- } break;
+ }
+ break;
case MotionEvent.ACTION_POINTER_UP: {
- throw new IllegalArgumentException("Unexpected event type: ACTION_POINTER_UP");
+ throw new IllegalArgumentException(
+ "Unexpected event type: ACTION_POINTER_UP");
}
}
}
+ @Override
public void clear() {
mLastMoveOutsideMagnifiedRegion = false;
}
}
- private final class DetectingStateHandler {
+ /**
+ * This class handles motion events when the event dispatch has not yet
+ * determined what the user is doing. It watches for various tap events.
+ */
+ private final class DetectingStateHandler implements MotionEventHandler {
private static final int MESSAGE_ON_ACTION_TAP_AND_HOLD = 1;
@@ -637,12 +501,30 @@
private static final int ACTION_TAP_COUNT = 3;
+ private final int mTapTimeSlop = ViewConfiguration.getJumpTapTimeout();
+
+ private final int mMultiTapTimeSlop;
+
+ private final int mTapDistanceSlop;
+
+ private final int mMultiTapDistanceSlop;
+
private MotionEventInfo mDelayedEventQueue;
private MotionEvent mLastDownEvent;
+
private MotionEvent mLastTapUpEvent;
+
private int mTapCount;
+ public DetectingStateHandler(Context context) {
+ mMultiTapTimeSlop = ViewConfiguration.getDoubleTapTimeout()
+ + context.getResources().getInteger(
+ com.android.internal.R.integer.config_screen_magnification_multi_tap_adjustment);
+ mTapDistanceSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+ mMultiTapDistanceSlop = ViewConfiguration.get(context).getScaledDoubleTapSlop();
+ }
+
private final Handler mHandler = new Handler() {
@Override
public void handleMessage(Message message) {
@@ -652,12 +534,14 @@
MotionEvent event = (MotionEvent) message.obj;
final int policyFlags = message.arg1;
onActionTapAndHold(event, policyFlags);
- } break;
+ }
+ break;
case MESSAGE_TRANSITION_TO_DELEGATING_STATE: {
transitionToState(STATE_DELEGATING);
sendDelayedMotionEvents();
clear();
- } break;
+ }
+ break;
default: {
throw new IllegalArgumentException("Unknown message type: " + type);
}
@@ -665,6 +549,7 @@
}
};
+ @Override
public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
cacheDelayedMotionEvent(event, rawEvent, policyFlags);
final int action = event.getActionMasked();
@@ -678,7 +563,7 @@
}
if (mTapCount == ACTION_TAP_COUNT - 1 && mLastDownEvent != null
&& GestureUtils.isMultiTap(mLastDownEvent, event,
- mMultiTapTimeSlop, mMultiTapDistanceSlop, 0)) {
+ mMultiTapTimeSlop, mMultiTapDistanceSlop, 0)) {
Message message = mHandler.obtainMessage(MESSAGE_ON_ACTION_TAP_AND_HOLD,
policyFlags, 0, event);
mHandler.sendMessageDelayed(message,
@@ -690,7 +575,8 @@
}
clearLastDownEvent();
mLastDownEvent = MotionEvent.obtain(event);
- } break;
+ }
+ break;
case MotionEvent.ACTION_POINTER_DOWN: {
if (mMagnificationController.isMagnifying()) {
transitionToState(STATE_MAGNIFIED_INTERACTION);
@@ -698,7 +584,8 @@
} else {
transitionToDelegatingStateAndClear();
}
- } break;
+ }
+ break;
case MotionEvent.ACTION_MOVE: {
if (mLastDownEvent != null && mTapCount < ACTION_TAP_COUNT - 1) {
final double distance = GestureUtils.computeDistance(mLastDownEvent,
@@ -707,7 +594,8 @@
transitionToDelegatingStateAndClear();
}
}
- } break;
+ }
+ break;
case MotionEvent.ACTION_UP: {
if (mLastDownEvent == null) {
return;
@@ -715,8 +603,8 @@
mHandler.removeMessages(MESSAGE_ON_ACTION_TAP_AND_HOLD);
if (!mMagnificationController.magnifiedRegionContains(
event.getX(), event.getY())) {
- transitionToDelegatingStateAndClear();
- return;
+ transitionToDelegatingStateAndClear();
+ return;
}
if (!GestureUtils.isTap(mLastDownEvent, event, mTapTimeSlop,
mTapDistanceSlop, 0)) {
@@ -739,13 +627,16 @@
}
clearLastTapUpEvent();
mLastTapUpEvent = MotionEvent.obtain(event);
- } break;
+ }
+ break;
case MotionEvent.ACTION_POINTER_UP: {
/* do nothing */
- } break;
+ }
+ break;
}
}
+ @Override
public void clear() {
mHandler.removeMessages(MESSAGE_ON_ACTION_TAP_AND_HOLD);
mHandler.removeMessages(MESSAGE_TRANSITION_TO_DELEGATING_STATE);
@@ -792,7 +683,7 @@
while (mDelayedEventQueue != null) {
MotionEventInfo info = mDelayedEventQueue;
mDelayedEventQueue = info.mNext;
- ScreenMagnifier.this.onMotionEvent(info.mEvent, info.mRawEvent,
+ MagnificationGestureHandler.this.onMotionEvent(info.mEvent, info.mRawEvent,
info.mPolicyFlags);
info.recycle();
}
@@ -816,9 +707,11 @@
if (DEBUG_DETECTING) {
Slog.i(LOG_TAG, "onActionTap()");
}
+
if (!mMagnificationController.isMagnifying()) {
- mMagnificationController.setScaleAndMagnifiedRegionCenter(getPersistedScale(),
- up.getX(), up.getY(), true);
+ final float targetScale = mMagnificationController.getPersistedScale();
+ final float scale = MathUtils.constrain(targetScale, MIN_SCALE, MAX_SCALE);
+ mMagnificationController.setScaleAndCenter(scale, up.getX(), up.getY(), true);
} else {
mMagnificationController.reset(true);
}
@@ -828,50 +721,36 @@
if (DEBUG_DETECTING) {
Slog.i(LOG_TAG, "onActionTapAndHold()");
}
+
clear();
mTranslationEnabledBeforePan = mMagnificationController.isMagnifying();
- mMagnificationController.setScaleAndMagnifiedRegionCenter(getPersistedScale(),
- down.getX(), down.getY(), true);
+
+ final float targetScale = mMagnificationController.getPersistedScale();
+ final float scale = MathUtils.constrain(targetScale, MIN_SCALE, MAX_SCALE);
+ mMagnificationController.setScaleAndCenter(scale, down.getX(), down.getY(), true);
+
transitionToState(STATE_VIEWPORT_DRAGGING);
}
}
- private void persistScale(final float scale) {
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... params) {
- Settings.Secure.putFloatForUser(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, scale, mUserId);
- return null;
- }
- }.execute();
- }
-
- private float getPersistedScale() {
- return Settings.Secure.getFloatForUser(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
- DEFAULT_MAGNIFICATION_SCALE, mUserId);
- }
-
- private static boolean isScreenMagnificationAutoUpdateEnabled(Context context) {
- return (Settings.Secure.getInt(context.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE,
- DEFAULT_SCREEN_MAGNIFICATION_AUTO_UPDATE) == 1);
- }
-
private static final class MotionEventInfo {
private static final int MAX_POOL_SIZE = 10;
private static final Object sLock = new Object();
+
private static MotionEventInfo sPool;
+
private static int sPoolSize;
private MotionEventInfo mNext;
+
private boolean mInPool;
public MotionEvent mEvent;
+
public MotionEvent mRawEvent;
+
public int mPolicyFlags;
public static MotionEventInfo obtain(MotionEvent event, MotionEvent rawEvent,
@@ -922,47 +801,4 @@
mPolicyFlags = 0;
}
}
-
- private final class ScreenStateObserver extends BroadcastReceiver {
- private static final int MESSAGE_ON_SCREEN_STATE_CHANGE = 1;
-
- private final Context mContext;
- private final MagnificationController mMagnificationController;
-
- private final Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message message) {
- switch (message.what) {
- case MESSAGE_ON_SCREEN_STATE_CHANGE: {
- String action = (String) message.obj;
- handleOnScreenStateChange(action);
- } break;
- }
- }
- };
-
- public ScreenStateObserver(Context context,
- MagnificationController magnificationController) {
- mContext = context;
- mMagnificationController = magnificationController;
- mContext.registerReceiver(this, new IntentFilter(Intent.ACTION_SCREEN_OFF));
- }
-
- public void destroy() {
- mContext.unregisterReceiver(this);
- }
-
- @Override
- public void onReceive(Context context, Intent intent) {
- mHandler.obtainMessage(MESSAGE_ON_SCREEN_STATE_CHANGE,
- intent.getAction()).sendToTarget();
- }
-
- private void handleOnScreenStateChange(String action) {
- if (mMagnificationController.isMagnifying()
- && isScreenMagnificationAutoUpdateEnabled(mContext)) {
- mMagnificationController.reset(false);
- }
- }
- }
}
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index a5ddc12..f6af942 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -25,6 +25,7 @@
import android.app.IAlarmCompleteListener;
import android.app.IAlarmListener;
import android.app.IAlarmManager;
+import android.app.IUidObserver;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
@@ -41,6 +42,7 @@
import android.os.Message;
import android.os.PowerManager;
import android.os.Process;
+import android.os.RemoteException;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
@@ -115,6 +117,7 @@
final LocalLog mLog = new LocalLog(TAG);
AppOpsManager mAppOps;
+ DeviceIdleController.LocalService mLocalDeviceIdleController;
final Object mLock = new Object();
@@ -458,7 +461,7 @@
long newStart = 0; // recalculate endpoints as we go
long newEnd = Long.MAX_VALUE;
int newFlags = 0;
- for (int i = 0; i < alarms.size(); ) {
+ for (int i = alarms.size()-1; i >= 0; i--) {
Alarm alarm = alarms.get(i);
if (alarm.matches(packageName)) {
alarms.remove(i);
@@ -474,7 +477,42 @@
newEnd = alarm.maxWhenElapsed;
}
newFlags |= alarm.flags;
- i++;
+ }
+ }
+ if (didRemove) {
+ // commit the new batch bounds
+ start = newStart;
+ end = newEnd;
+ flags = newFlags;
+ }
+ return didRemove;
+ }
+
+ boolean removeForStopped(final int uid) {
+ boolean didRemove = false;
+ long newStart = 0; // recalculate endpoints as we go
+ long newEnd = Long.MAX_VALUE;
+ int newFlags = 0;
+ for (int i = alarms.size()-1; i >= 0; i--) {
+ Alarm alarm = alarms.get(i);
+ try {
+ if (alarm.uid == uid && ActivityManagerNative.getDefault().getAppStartMode(
+ uid, alarm.packageName) == ActivityManager.APP_START_MODE_DISABLED) {
+ alarms.remove(i);
+ didRemove = true;
+ if (alarm.alarmClock != null) {
+ mNextAlarmClockMayChange = true;
+ }
+ } else {
+ if (alarm.whenElapsed > newStart) {
+ newStart = alarm.whenElapsed;
+ }
+ if (alarm.maxWhenElapsed < newEnd) {
+ newEnd = alarm.maxWhenElapsed;
+ }
+ newFlags |= alarm.flags;
+ }
+ } catch (RemoteException e) {
}
}
if (didRemove) {
@@ -889,6 +927,13 @@
Slog.w(TAG, "Failed to open alarm driver. Falling back to a handler.");
}
+ try {
+ ActivityManagerNative.getDefault().registerUidObserver(new UidObserver(),
+ ActivityManager.UID_OBSERVER_IDLE);
+ } catch (RemoteException e) {
+ // ignored; both services live in system_server
+ }
+
publishBinderService(Context.ALARM_SERVICE, mService);
}
@@ -897,6 +942,8 @@
if (phase == PHASE_SYSTEM_SERVICES_READY) {
mConstants.start(getContext().getContentResolver());
mAppOps = (AppOpsManager) getContext().getSystemService(Context.APP_OPS_SERVICE);
+ mLocalDeviceIdleController
+ = LocalServices.getService(DeviceIdleController.LocalService.class);
}
}
@@ -1032,6 +1079,15 @@
Alarm a = new Alarm(type, when, whenElapsed, windowLength, maxWhen, interval,
operation, directReceiver, listenerTag, workSource, flags, alarmClock,
callingUid, callingPackage);
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(callingUid, callingPackage)
+ == ActivityManager.APP_START_MODE_DISABLED) {
+ Slog.w(TAG, "Not setting alarm from " + callingUid + ":" + a
+ + " -- package not allowed to start");
+ return;
+ }
+ } catch (RemoteException e) {
+ }
removeLocked(operation, directReceiver);
setImplLocked(a, false, doValidate);
}
@@ -1838,6 +1894,37 @@
}
}
+ void removeForStoppedLocked(int uid) {
+ boolean didRemove = false;
+ for (int i = mAlarmBatches.size() - 1; i >= 0; i--) {
+ Batch b = mAlarmBatches.get(i);
+ didRemove |= b.removeForStopped(uid);
+ if (b.size() == 0) {
+ mAlarmBatches.remove(i);
+ }
+ }
+ for (int i = mPendingWhileIdleAlarms.size() - 1; i >= 0; i--) {
+ final Alarm a = mPendingWhileIdleAlarms.get(i);
+ try {
+ if (a.uid == uid && ActivityManagerNative.getDefault().getAppStartMode(
+ uid, a.packageName) == ActivityManager.APP_START_MODE_DISABLED) {
+ // Don't set didRemove, since this doesn't impact the scheduled alarms.
+ mPendingWhileIdleAlarms.remove(i);
+ }
+ } catch (RemoteException e) {
+ }
+ }
+
+ if (didRemove) {
+ if (DEBUG_BATCH) {
+ Slog.v(TAG, "remove(package) changed bounds; rebatching");
+ }
+ rebatchAllAlarmsLocked(true);
+ rescheduleKernelAlarmsLocked();
+ updateNextAlarmClockLocked();
+ }
+ }
+
void removeUserLocked(int userHandle) {
boolean didRemove = false;
for (int i = mAlarmBatches.size() - 1; i >= 0; i--) {
@@ -2164,7 +2251,7 @@
public boolean matches(PendingIntent pi, IAlarmListener rec) {
return (operation != null)
? operation.equals(pi)
- : listener.asBinder().equals(rec.asBinder());
+ : rec != null && listener.asBinder().equals(rec.asBinder());
}
public boolean matches(String packageName) {
@@ -2468,10 +2555,9 @@
private class AlarmHandler extends Handler {
public static final int ALARM_EVENT = 1;
- public static final int MINUTE_CHANGE_EVENT = 2;
- public static final int DATE_CHANGE_EVENT = 3;
- public static final int SEND_NEXT_ALARM_CLOCK_CHANGED = 4;
- public static final int LISTENER_TIMEOUT = 5;
+ public static final int SEND_NEXT_ALARM_CLOCK_CHANGED = 2;
+ public static final int LISTENER_TIMEOUT = 3;
+ public static final int REPORT_ALARMS_ACTIVE = 4;
public AlarmHandler() {
}
@@ -2511,6 +2597,12 @@
mDeliveryTracker.alarmTimedOut((IBinder) msg.obj);
break;
+ case REPORT_ALARMS_ACTIVE:
+ if (mLocalDeviceIdleController != null) {
+ mLocalDeviceIdleController.setAlarmsActive(msg.arg1 != 0);
+ }
+ break;
+
default:
// nope, just ignore it
break;
@@ -2665,7 +2757,24 @@
}
}
}
-
+
+ final class UidObserver extends IUidObserver.Stub {
+ @Override public void onUidStateChanged(int uid, int procState) throws RemoteException {
+ }
+
+ @Override public void onUidGone(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidActive(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidIdle(int uid) throws RemoteException {
+ synchronized (mLock) {
+ removeForStoppedLocked(uid);
+ }
+ }
+ };
+
private final BroadcastStats getStatsLocked(PendingIntent pi) {
String pkg = pi.getCreatorPackage();
int uid = pi.getCreatorUid();
@@ -2740,6 +2849,7 @@
}
mBroadcastRefCount--;
if (mBroadcastRefCount == 0) {
+ mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 0).sendToTarget();
mWakeLock.release();
if (mInFlight.size() > 0) {
mLog.w("Finished all dispatches with " + mInFlight.size()
@@ -2873,6 +2983,7 @@
alarm.type, alarm.statsTag, (alarm.operation == null) ? alarm.uid : -1,
true);
mWakeLock.acquire();
+ mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 1).sendToTarget();
}
final InFlight inflight = new InFlight(AlarmManagerService.this,
alarm.operation, alarm.listener, alarm.workSource, alarm.uid,
diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java
index 96c1e2a..a5cef1a 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -47,14 +47,15 @@
import android.os.IBinder;
import android.os.Process;
import android.os.RemoteException;
+import android.os.ResultReceiver;
import android.os.ServiceManager;
+import android.os.ShellCommand;
import android.os.UserHandle;
import android.os.storage.MountServiceInternal;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.AtomicFile;
import android.util.Log;
-import android.util.Pair;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
@@ -557,12 +558,12 @@
ArraySet<String> reportedPackageNames = callbackSpecs.valueAt(i);
try {
if (reportedPackageNames == null) {
- callback.mCallback.opChanged(code, null);
+ callback.mCallback.opChanged(code, uid, null);
} else {
final int reportedPackageCount = reportedPackageNames.size();
for (int j = 0; j < reportedPackageCount; j++) {
String reportedPackageName = reportedPackageNames.valueAt(j);
- callback.mCallback.opChanged(code, reportedPackageName);
+ callback.mCallback.opChanged(code, uid, reportedPackageName);
}
}
} catch (RemoteException e) {
@@ -620,7 +621,7 @@
try {
for (int i = 0; i < repCbs.size(); i++) {
try {
- repCbs.get(i).mCallback.opChanged(code, packageName);
+ repCbs.get(i).mCallback.opChanged(code, uid, packageName);
} catch (RemoteException e) {
}
}
@@ -630,39 +631,51 @@
}
}
- private static HashMap<Callback, ArrayList<Pair<String, Integer>>> addCallbacks(
- HashMap<Callback, ArrayList<Pair<String, Integer>>> callbacks,
- String packageName, int op, ArrayList<Callback> cbs) {
+ private static HashMap<Callback, ArrayList<ChangeRec>> addCallbacks(
+ HashMap<Callback, ArrayList<ChangeRec>> callbacks,
+ int op, int uid, String packageName, ArrayList<Callback> cbs) {
if (cbs == null) {
return callbacks;
}
if (callbacks == null) {
- callbacks = new HashMap<Callback, ArrayList<Pair<String, Integer>>>();
+ callbacks = new HashMap<>();
}
boolean duplicate = false;
for (int i=0; i<cbs.size(); i++) {
Callback cb = cbs.get(i);
- ArrayList<Pair<String, Integer>> reports = callbacks.get(cb);
+ ArrayList<ChangeRec> reports = callbacks.get(cb);
if (reports == null) {
- reports = new ArrayList<Pair<String, Integer>>();
+ reports = new ArrayList<>();
callbacks.put(cb, reports);
} else {
final int reportCount = reports.size();
for (int j = 0; j < reportCount; j++) {
- Pair<String, Integer> report = reports.get(j);
- if (report.second == op && report.first.equals(packageName)) {
+ ChangeRec report = reports.get(j);
+ if (report.op == op && report.pkg.equals(packageName)) {
duplicate = true;
break;
}
}
}
if (!duplicate) {
- reports.add(new Pair<>(packageName, op));
+ reports.add(new ChangeRec(op, uid, packageName));
}
}
return callbacks;
}
+ static final class ChangeRec {
+ final int op;
+ final int uid;
+ final String pkg;
+
+ ChangeRec(int _op, int _uid, String _pkg) {
+ op = _op;
+ uid = _uid;
+ pkg = _pkg;
+ }
+ }
+
@Override
public void resetAllModes(int reqUserId, String reqPackageName) {
final int callingPid = Binder.getCallingPid();
@@ -682,7 +695,7 @@
}
}
- HashMap<Callback, ArrayList<Pair<String, Integer>>> callbacks = null;
+ HashMap<Callback, ArrayList<ChangeRec>> callbacks = null;
synchronized (this) {
boolean changed = false;
for (int i = mUidStates.size() - 1; i >= 0; i--) {
@@ -699,9 +712,9 @@
uidState.opModes = null;
}
for (String packageName : getPackagesForUid(uidState.uid)) {
- callbacks = addCallbacks(callbacks, packageName, code,
+ callbacks = addCallbacks(callbacks, code, uidState.uid, packageName,
mOpModeWatchers.get(code));
- callbacks = addCallbacks(callbacks, packageName, code,
+ callbacks = addCallbacks(callbacks, code, uidState.uid, packageName,
mPackageModeWatchers.get(packageName));
}
}
@@ -734,9 +747,9 @@
&& curOp.mode != AppOpsManager.opToDefaultMode(curOp.op)) {
curOp.mode = AppOpsManager.opToDefaultMode(curOp.op);
changed = true;
- callbacks = addCallbacks(callbacks, packageName, curOp.op,
+ callbacks = addCallbacks(callbacks, curOp.op, curOp.uid, packageName,
mOpModeWatchers.get(curOp.op));
- callbacks = addCallbacks(callbacks, packageName, curOp.op,
+ callbacks = addCallbacks(callbacks, curOp.op, curOp.uid, packageName,
mPackageModeWatchers.get(packageName));
if (curOp.time == 0 && curOp.rejectTime == 0) {
pkgOps.removeAt(j);
@@ -757,13 +770,13 @@
}
}
if (callbacks != null) {
- for (Map.Entry<Callback, ArrayList<Pair<String, Integer>>> ent : callbacks.entrySet()) {
+ for (Map.Entry<Callback, ArrayList<ChangeRec>> ent : callbacks.entrySet()) {
Callback cb = ent.getKey();
- ArrayList<Pair<String, Integer>> reports = ent.getValue();
+ ArrayList<ChangeRec> reports = ent.getValue();
for (int i=0; i<reports.size(); i++) {
- Pair<String, Integer> rep = reports.get(i);
+ ChangeRec rep = reports.get(i);
try {
- cb.mCallback.opChanged(rep.second, rep.first);
+ cb.mCallback.opChanged(rep.op, rep.uid, rep.pkg);
} catch (RemoteException e) {
}
}
@@ -1163,8 +1176,10 @@
if (pkgUid != uid) {
// Oops! The package name is not valid for the uid they are calling
// under. Abort.
+ RuntimeException ex = new RuntimeException("here");
+ ex.fillInStackTrace();
Slog.w(TAG, "Bad call: specified package " + packageName
- + " under uid " + uid + " but it is really " + pkgUid);
+ + " under uid " + uid + " but it is really " + pkgUid, ex);
return null;
}
} finally {
@@ -1541,15 +1556,300 @@
}
}
- private void dumpHelp(PrintWriter pw) {
- pw.println("AppOps service (appops) dump options:");
- pw.println(" [-h] [CMD]");
- pw.println(" -h: print this help text.");
- pw.println("Commands:");
+ static class Shell extends ShellCommand {
+ final IAppOpsService mInterface;
+ final AppOpsService mInternal;
+
+ int userId = UserHandle.USER_SYSTEM;
+ String packageName;
+ String opStr;
+ int op;
+ int packageUid;
+
+ Shell(IAppOpsService iface, AppOpsService internal) {
+ mInterface = iface;
+ mInternal = internal;
+ }
+
+ @Override
+ public int onCommand(String cmd) {
+ return onShellCommand(this, cmd);
+ }
+
+ @Override
+ public void onHelp() {
+ PrintWriter pw = getOutPrintWriter();
+ dumpCommandHelp(pw);
+ }
+
+ private int strOpToOp(String op, PrintWriter err) {
+ try {
+ return AppOpsManager.strOpToOp(op);
+ } catch (IllegalArgumentException e) {
+ }
+ try {
+ return Integer.parseInt(op);
+ } catch (NumberFormatException e) {
+ }
+ try {
+ return AppOpsManager.strDebugOpToOp(op);
+ } catch (IllegalArgumentException e) {
+ err.println("Error: " + e.getMessage());
+ return -1;
+ }
+ }
+
+ int parseUserPackageOp(boolean reqOp, PrintWriter err) throws RemoteException {
+ userId = UserHandle.USER_CURRENT;
+ packageName = null;
+ opStr = null;
+ for (String argument; (argument = getNextArg()) != null;) {
+ if ("--user".equals(argument)) {
+ userId = UserHandle.parseUserArg(getNextArgRequired());
+ } else {
+ if (packageName == null) {
+ packageName = argument;
+ } else if (opStr == null) {
+ opStr = argument;
+ break;
+ }
+ }
+ }
+ if (packageName == null) {
+ err.println("Error: Package name not specified.");
+ return -1;
+ } else if (opStr == null && reqOp) {
+ err.println("Error: Operation not specified.");
+ return -1;
+ }
+ if (opStr != null) {
+ op = strOpToOp(opStr, err);
+ if (op < 0) {
+ return -1;
+ }
+ } else {
+ op = AppOpsManager.OP_NONE;
+ }
+ if (userId == UserHandle.USER_CURRENT) {
+ userId = ActivityManager.getCurrentUser();
+ }
+ if ("root".equals(packageName)) {
+ packageUid = 0;
+ } else {
+ packageUid = AppGlobals.getPackageManager().getPackageUid(packageName, userId);
+ }
+ if (packageUid < 0) {
+ err.println("Error: No UID for " + packageName + " in user " + userId);
+ return -1;
+ }
+ return 0;
+ }
+ }
+
+ @Override public void onShellCommand(FileDescriptor in, FileDescriptor out,
+ FileDescriptor err, String[] args, ResultReceiver resultReceiver) {
+ (new Shell(this, this)).exec(this, in, out, err, args, resultReceiver);
+ }
+
+ static void dumpCommandHelp(PrintWriter pw) {
+ pw.println("AppOps service (appops) commands:");
+ pw.println(" help");
+ pw.println(" Print this help text.");
+ pw.println(" set [--user <USER_ID>] <PACKAGE> <OP> <MODE>");
+ pw.println(" Set the mode for a particular application and operation.");
+ pw.println(" get [--user <USER_ID>] <PACKAGE> [<OP>]");
+ pw.println(" Return the mode for a particular application and optional operation.");
+ pw.println(" reset [--user <USER_ID>] [<PACKAGE>]");
+ pw.println(" Reset the given application or all applications to default modes.");
pw.println(" write-settings");
pw.println(" Immediately write pending changes to storage.");
pw.println(" read-settings");
pw.println(" Read the last written settings, replacing current state in RAM.");
+ pw.println(" options:");
+ pw.println(" <PACKAGE> an Android package name.");
+ pw.println(" <OP> an AppOps operation.");
+ pw.println(" <MODE> one of allow, ignore, deny, or default");
+ pw.println(" <USER_ID> the user id under which the package is installed. If --user is not");
+ pw.println(" specified, the current user is assumed.");
+ }
+
+ static int onShellCommand(Shell shell, String cmd) {
+ if (cmd == null) {
+ return shell.handleDefaultCommands(cmd);
+ }
+ PrintWriter pw = shell.getOutPrintWriter();
+ PrintWriter err = shell.getErrPrintWriter();
+ try {
+ switch (cmd) {
+ case "set": {
+ int res = shell.parseUserPackageOp(true, err);
+ if (res < 0) {
+ return res;
+ }
+ String modeStr = shell.getNextArg();
+ if (modeStr == null) {
+ err.println("Error: Mode not specified.");
+ return -1;
+ }
+
+ final int mode;
+ switch (modeStr) {
+ case "allow":
+ mode = AppOpsManager.MODE_ALLOWED;
+ break;
+ case "deny":
+ mode = AppOpsManager.MODE_ERRORED;
+ break;
+ case "ignore":
+ mode = AppOpsManager.MODE_IGNORED;
+ break;
+ case "default":
+ mode = AppOpsManager.MODE_DEFAULT;
+ break;
+ default:
+ err.println("Error: Mode " + modeStr + " is not valid,");
+ return -1;
+ }
+
+ shell.mInterface.setMode(shell.op, shell.packageUid, shell.packageName, mode);
+ return 0;
+ }
+ case "get": {
+ int res = shell.parseUserPackageOp(false, err);
+ if (res < 0) {
+ return res;
+ }
+
+ List<AppOpsManager.PackageOps> ops = shell.mInterface.getOpsForPackage(
+ shell.packageUid, shell.packageName,
+ shell.op != AppOpsManager.OP_NONE ? new int[] {shell.op} : null);
+ if (ops == null || ops.size() <= 0) {
+ pw.println("No operations.");
+ return 0;
+ }
+ final long now = System.currentTimeMillis();
+ for (int i=0; i<ops.size(); i++) {
+ List<AppOpsManager.OpEntry> entries = ops.get(i).getOps();
+ for (int j=0; j<entries.size(); j++) {
+ AppOpsManager.OpEntry ent = entries.get(j);
+ pw.print(AppOpsManager.opToName(ent.getOp()));
+ pw.print(": ");
+ switch (ent.getMode()) {
+ case AppOpsManager.MODE_ALLOWED:
+ pw.print("allow");
+ break;
+ case AppOpsManager.MODE_IGNORED:
+ pw.print("ignore");
+ break;
+ case AppOpsManager.MODE_ERRORED:
+ pw.print("deny");
+ break;
+ case AppOpsManager.MODE_DEFAULT:
+ pw.print("default");
+ break;
+ default:
+ pw.print("mode=");
+ pw.print(ent.getMode());
+ break;
+ }
+ if (ent.getTime() != 0) {
+ pw.print("; time=");
+ TimeUtils.formatDuration(now - ent.getTime(), pw);
+ pw.print(" ago");
+ }
+ if (ent.getRejectTime() != 0) {
+ pw.print("; rejectTime=");
+ TimeUtils.formatDuration(now - ent.getRejectTime(), pw);
+ pw.print(" ago");
+ }
+ if (ent.getDuration() == -1) {
+ pw.print(" (running)");
+ } else if (ent.getDuration() != 0) {
+ pw.print("; duration=");
+ TimeUtils.formatDuration(ent.getDuration(), pw);
+ }
+ pw.println();
+ }
+ }
+ return 0;
+ }
+ case "reset": {
+ String packageName = null;
+ int userId = UserHandle.USER_CURRENT;
+ for (String argument; (argument = shell.getNextArg()) != null;) {
+ if ("--user".equals(argument)) {
+ String userStr = shell.getNextArgRequired();
+ userId = UserHandle.parseUserArg(userStr);
+ } else {
+ if (packageName == null) {
+ packageName = argument;
+ } else {
+ err.println("Error: Unsupported argument: " + argument);
+ return -1;
+ }
+ }
+ }
+
+ if (userId == UserHandle.USER_CURRENT) {
+ userId = ActivityManager.getCurrentUser();
+ }
+
+ shell.mInterface.resetAllModes(userId, packageName);
+ pw.print("Reset all modes for: ");
+ if (userId == UserHandle.USER_ALL) {
+ pw.print("all users");
+ } else {
+ pw.print("user "); pw.print(userId);
+ }
+ pw.print(", ");
+ if (packageName == null) {
+ pw.println("all packages");
+ } else {
+ pw.print("package "); pw.println(packageName);
+ }
+ return 0;
+ }
+ case "write-settings": {
+ shell.mInternal.mContext.enforcePermission(
+ android.Manifest.permission.UPDATE_APP_OPS_STATS,
+ Binder.getCallingPid(), Binder.getCallingUid(), null);
+ long token = Binder.clearCallingIdentity();
+ try {
+ synchronized (shell.mInternal) {
+ shell.mInternal.mHandler.removeCallbacks(shell.mInternal.mWriteRunner);
+ }
+ shell.mInternal.writeState();
+ pw.println("Current settings written.");
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ return 0;
+ }
+ case "read-settings": {
+ shell.mInternal.mContext.enforcePermission(
+ android.Manifest.permission.UPDATE_APP_OPS_STATS,
+ Binder.getCallingPid(), Binder.getCallingUid(), null);
+ long token = Binder.clearCallingIdentity();
+ try {
+ shell.mInternal.readState();
+ pw.println("Last settings read.");
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ return 0;
+ }
+ default:
+ return shell.handleDefaultCommands(cmd);
+ }
+ } catch (RemoteException e) {
+ pw.println("Remote exception: " + e);
+ }
+ return -1;
+ }
+
+ private void dumpHelp(PrintWriter pw) {
+ pw.println("AppOps service (appops) dump options:");
+ pw.println(" none");
}
@Override
@@ -1570,27 +1870,6 @@
return;
} else if ("-a".equals(arg)) {
// dump all data
- } else if ("write-settings".equals(arg)) {
- long token = Binder.clearCallingIdentity();
- try {
- synchronized (this) {
- mHandler.removeCallbacks(mWriteRunner);
- }
- writeState();
- pw.println("Current settings written.");
- } finally {
- Binder.restoreCallingIdentity(token);
- }
- return;
- } else if ("read-settings".equals(arg)) {
- long token = Binder.clearCallingIdentity();
- try {
- readState();
- pw.println("Last settings read.");
- } finally {
- Binder.restoreCallingIdentity(token);
- }
- return;
} else if (arg.length() > 0 && arg.charAt(0) == '-'){
pw.println("Unknown option: " + arg);
return;
diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index 927b995..f5ed83e 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -48,6 +48,7 @@
import android.os.Environment;
import android.os.FileUtils;
import android.os.Handler;
+import android.os.IBinder;
import android.os.IDeviceIdleController;
import android.os.Looper;
import android.os.Message;
@@ -106,6 +107,8 @@
private static final boolean COMPRESS_TIME = false;
+ private static final int EVENT_BUFFER_SIZE = 40;
+
private static final String ACTION_STEP_IDLE_STATE =
"com.android.server.device_idle.STEP_IDLE_STATE";
@@ -195,6 +198,14 @@
private long mNextIdlePendingDelay;
private long mNextIdleDelay;
private long mNextLightAlarmTime;
+ private long mCurIdleBudget;
+ private long mMaintenanceStartTime;
+
+ private int mActiveIdleOpCount;
+ private IBinder mDownloadServiceActive;
+ private boolean mSyncActive;
+ private boolean mJobsActive;
+ private boolean mAlarmsActive;
public final AtomicFile mConfigFile;
@@ -267,6 +278,25 @@
*/
private int[] mTempWhitelistAppIdArray = new int[0];
+ private static final int EVENT_NULL = 0;
+ private static final int EVENT_NORMAL = 1;
+ private static final int EVENT_LIGHT_IDLE = 2;
+ private static final int EVENT_LIGHT_MAINTENANCE = 3;
+ private static final int EVENT_FULL_IDLE = 4;
+ private static final int EVENT_FULL_MAINTENANCE = 5;
+
+ private int[] mEventCmds = new int[EVENT_BUFFER_SIZE];
+ private long[] mEventTimes = new long[EVENT_BUFFER_SIZE];
+
+ private void addEvent(int cmd) {
+ if (mEventCmds[0] != cmd) {
+ System.arraycopy(mEventCmds, 0, mEventCmds, 1, EVENT_BUFFER_SIZE - 1);
+ System.arraycopy(mEventTimes, 0, mEventTimes, 1, EVENT_BUFFER_SIZE - 1);
+ mEventCmds[0] = cmd;
+ mEventTimes[0] = SystemClock.elapsedRealtime();
+ }
+ }
+
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override public void onReceive(Context context, Intent intent) {
if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
@@ -282,16 +312,22 @@
}
} else if (ACTION_STEP_LIGHT_IDLE_STATE.equals(intent.getAction())) {
synchronized (DeviceIdleController.this) {
- stepLightIdleStateLocked();
+ stepLightIdleStateLocked("s:alarm");
}
} else if (ACTION_STEP_IDLE_STATE.equals(intent.getAction())) {
synchronized (DeviceIdleController.this) {
- stepIdleStateLocked();
+ stepIdleStateLocked("s:alarm");
}
}
}
};
+ private final BroadcastReceiver mIdleStartedDoneReceiver = new BroadcastReceiver() {
+ @Override public void onReceive(Context context, Intent intent) {
+ decActiveIdleOps();
+ }
+ };
+
private final DisplayManager.DisplayListener mDisplayListener
= new DisplayManager.DisplayListener() {
@Override public void onDisplayAdded(int displayId) {
@@ -411,7 +447,10 @@
private final class Constants extends ContentObserver {
// Key names stored in the settings value.
private static final String KEY_LIGHT_IDLE_TIMEOUT = "light_idle_to";
- private static final String KEY_LIGHT_IDLE_PENDING_TIMEOUT = "light_idle_pending_to";
+ private static final String KEY_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET
+ = "light_idle_maintenance_min_budget";
+ private static final String KEY_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET
+ = "light_idle_maintenance_max_budget";
private static final String KEY_INACTIVE_TIMEOUT = "inactive_to";
private static final String KEY_SENSING_TIMEOUT = "sensing_to";
private static final String KEY_LOCATING_TIMEOUT = "locating_to";
@@ -441,12 +480,24 @@
public long LIGHT_IDLE_TIMEOUT;
/**
- * This is the initial time, after light idle idle, that we will will sit in the
- * LIGHT_IDLE_MAINTENANCE period for the system to run normally before returning to idle.
+ * This is the minimum amount of time we want to make available for maintenance mode
+ * when lightly idling. That is, we will always have at least this amount of time
+ * available maintenance before timing out and cutting off maintenance mode.
* @see Settings.Global#DEVICE_IDLE_CONSTANTS
- * @see #KEY_LIGHT_IDLE_PENDING_TIMEOUT
+ * @see #KEY_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET
*/
- public long LIGHT_IDLE_PENDING_TIMEOUT;
+ public long LIGHT_IDLE_MAINTENANCE_MIN_BUDGET;
+
+ /**
+ * This is the maximum amount of time we want to make available for maintenance mode
+ * when lightly idling. That is, if the system isn't using up its minimum maintenance
+ * budget and this time is being added to the budget reserve, this is the maximum
+ * reserve size we will allow to grow and thus the maximum amount of time we will
+ * allow for the maintenance window.
+ * @see Settings.Global#DEVICE_IDLE_CONSTANTS
+ * @see #KEY_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET
+ */
+ public long LIGHT_IDLE_MAINTENANCE_MAX_BUDGET;
/**
* This is the time, after becoming inactive, at which we start looking at the
@@ -606,8 +657,12 @@
LIGHT_IDLE_TIMEOUT = mParser.getLong(KEY_LIGHT_IDLE_TIMEOUT,
!COMPRESS_TIME ? 15 * 60 * 1000L : 60 * 1000L);
- LIGHT_IDLE_PENDING_TIMEOUT = mParser.getLong(KEY_LIGHT_IDLE_PENDING_TIMEOUT,
+ LIGHT_IDLE_MAINTENANCE_MIN_BUDGET = mParser.getLong(
+ KEY_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET,
!COMPRESS_TIME ? 1 * 60 * 1000L : 15 * 1000L);
+ LIGHT_IDLE_MAINTENANCE_MAX_BUDGET = mParser.getLong(
+ KEY_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET,
+ !COMPRESS_TIME ? 5 * 60 * 1000L : 30 * 1000L);
INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT,
!COMPRESS_TIME ? 30 * 60 * 1000L : 3 * 60 * 1000L);
SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT,
@@ -649,8 +704,12 @@
TimeUtils.formatDuration(LIGHT_IDLE_TIMEOUT, pw);
pw.println();
- pw.print(" "); pw.print(KEY_LIGHT_IDLE_PENDING_TIMEOUT); pw.print("=");
- TimeUtils.formatDuration(LIGHT_IDLE_PENDING_TIMEOUT, pw);
+ pw.print(" "); pw.print(KEY_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET); pw.print("=");
+ TimeUtils.formatDuration(LIGHT_IDLE_MAINTENANCE_MIN_BUDGET, pw);
+ pw.println();
+
+ pw.print(" "); pw.print(KEY_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET); pw.print("=");
+ TimeUtils.formatDuration(LIGHT_IDLE_MAINTENANCE_MAX_BUDGET, pw);
pw.println();
pw.print(" "); pw.print(KEY_INACTIVE_TIMEOUT); pw.print("=");
@@ -733,7 +792,7 @@
// If we are currently sensing, it is time to move to locating.
synchronized (this) {
mNotMoving = true;
- stepIdleStateLocked();
+ stepIdleStateLocked("s:stationary");
}
} else if (mState == STATE_LOCATING) {
// If we are currently locating, note that we are not moving and step
@@ -741,7 +800,7 @@
synchronized (this) {
mNotMoving = true;
if (mLocated) {
- stepIdleStateLocked();
+ stepIdleStateLocked("s:stationary");
}
}
}
@@ -804,11 +863,18 @@
} catch (RemoteException e) {
}
if (fullChanged) {
- getContext().sendBroadcastAsUser(mIdleIntent, UserHandle.ALL);
+ incActiveIdleOps();
+ getContext().sendOrderedBroadcastAsUser(mIdleIntent, UserHandle.ALL,
+ null, mIdleStartedDoneReceiver, null, 0, null, null);
}
if (lightChanged) {
- getContext().sendBroadcastAsUser(mLightIdleIntent, UserHandle.ALL);
+ incActiveIdleOps();
+ getContext().sendOrderedBroadcastAsUser(mLightIdleIntent, UserHandle.ALL,
+ null, mIdleStartedDoneReceiver, null, 0, null, null);
}
+ // Always start with one active op for the message being sent here.
+ // Now we we done!
+ decActiveIdleOps();
EventLogTags.writeDeviceIdleOffComplete();
} break;
case MSG_REPORT_ACTIVE: {
@@ -913,11 +979,23 @@
}
@Override public void exitIdle(String reason) {
- getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,
+ getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER,
null);
exitIdleInternal(reason);
}
+ @Override public void downloadServiceActive(IBinder token) {
+ getContext().enforceCallingOrSelfPermission(
+ "android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS", null);
+ DeviceIdleController.this.downloadServiceActive(token);
+ }
+
+ @Override public void downloadServiceInactive() {
+ getContext().enforceCallingOrSelfPermission(
+ "android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS", null);
+ DeviceIdleController.this.downloadServiceInactive();
+ }
+
@Override protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
DeviceIdleController.this.dump(fd, pw, args);
}
@@ -937,6 +1015,19 @@
public void setNetworkPolicyTempWhitelistCallback(Runnable callback) {
setNetworkPolicyTempWhitelistCallbackInternal(callback);
}
+
+ public void setSyncActive(boolean active) {
+ DeviceIdleController.this.setSyncActive(active);
+ }
+
+ public void setJobsActive(boolean active) {
+ DeviceIdleController.this.setJobsActive(active);
+ }
+
+ // Up-call from alarm manager.
+ public void setAlarmsActive(boolean active) {
+ DeviceIdleController.this.setAlarmsActive(active);
+ }
}
public DeviceIdleController(Context context) {
@@ -1390,8 +1481,11 @@
mState = STATE_ACTIVE;
mLightState = LIGHT_STATE_ACTIVE;
mInactiveTimeout = mConstants.INACTIVE_TIMEOUT;
+ mCurIdleBudget = 0;
+ mMaintenanceStartTime = 0;
resetIdleManagementLocked();
resetLightIdleManagementLocked();
+ addEvent(EVENT_NORMAL);
}
}
@@ -1439,7 +1533,7 @@
}
}
- void stepLightIdleStateLocked() {
+ void stepLightIdleStateLocked(String reason) {
if (mLightState == LIGHT_STATE_OVERRIDE) {
// If we are already in full device idle mode, then
// there is nothing left to do for light mode.
@@ -1451,26 +1545,49 @@
switch (mLightState) {
case LIGHT_STATE_INACTIVE:
+ mCurIdleBudget = mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET;
+ mMaintenanceStartTime = 0;
case LIGHT_STATE_IDLE_MAINTENANCE:
+ if (mMaintenanceStartTime != 0) {
+ long duration = SystemClock.elapsedRealtime() - mMaintenanceStartTime;
+ if (duration < mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET) {
+ // We didn't use up all of our minimum budget; add this to the reserve.
+ mCurIdleBudget += (mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET-duration);
+ } else {
+ // We used more than our minimum budget; this comes out of the reserve.
+ mCurIdleBudget -= (duration-mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET);
+ }
+ }
+ mMaintenanceStartTime = 0;
scheduleLightAlarmLocked(mConstants.LIGHT_IDLE_TIMEOUT);
if (DEBUG) Slog.d(TAG, "Moved to LIGHT_STATE_IDLE.");
mLightState = LIGHT_STATE_IDLE;
- EventLogTags.writeDeviceIdleLight(mLightState, "step");
+ EventLogTags.writeDeviceIdleLight(mLightState, reason);
+ addEvent(EVENT_LIGHT_IDLE);
mHandler.sendEmptyMessage(MSG_REPORT_IDLE_ON_LIGHT);
break;
case LIGHT_STATE_IDLE:
// We have been idling long enough, now it is time to do some work.
- scheduleLightAlarmLocked(mConstants.LIGHT_IDLE_PENDING_TIMEOUT);
+ mActiveIdleOpCount = 1;
+ mMaintenanceStartTime = SystemClock.elapsedRealtime();
+ if (mCurIdleBudget < mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET) {
+ mCurIdleBudget = mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET;
+ } else if (mCurIdleBudget > mConstants.LIGHT_IDLE_MAINTENANCE_MAX_BUDGET) {
+ mCurIdleBudget = mConstants.LIGHT_IDLE_MAINTENANCE_MAX_BUDGET;
+ }
+ mMaintenanceStartTime = SystemClock.elapsedRealtime();
+ scheduleLightAlarmLocked(mCurIdleBudget);
if (DEBUG) Slog.d(TAG,
"Moved from LIGHT_STATE_IDLE to LIGHT_STATE_IDLE_MAINTENANCE.");
mLightState = LIGHT_STATE_IDLE_MAINTENANCE;
- EventLogTags.writeDeviceIdleLight(mLightState, "step");
+ EventLogTags.writeDeviceIdleLight(mLightState, reason);
+ addEvent(EVENT_LIGHT_MAINTENANCE);
mHandler.sendEmptyMessage(MSG_REPORT_IDLE_OFF);
break;
}
}
- void stepIdleStateLocked() {
+ void stepIdleStateLocked(String reason) {
if (DEBUG) Slog.d(TAG, "stepIdleStateLocked: mState=" + mState);
EventLogTags.writeDeviceIdleStep();
@@ -1494,12 +1611,12 @@
mNextIdleDelay = mConstants.IDLE_TIMEOUT;
mState = STATE_IDLE_PENDING;
if (DEBUG) Slog.d(TAG, "Moved from STATE_INACTIVE to STATE_IDLE_PENDING.");
- EventLogTags.writeDeviceIdle(mState, "step");
+ EventLogTags.writeDeviceIdle(mState, reason);
break;
case STATE_IDLE_PENDING:
mState = STATE_SENSING;
if (DEBUG) Slog.d(TAG, "Moved from STATE_IDLE_PENDING to STATE_SENSING.");
- EventLogTags.writeDeviceIdle(mState, "step");
+ EventLogTags.writeDeviceIdle(mState, reason);
scheduleAlarmLocked(mConstants.SENSING_TIMEOUT, false);
cancelLocatingLocked();
mAnyMotionDetector.checkForAnyMotion();
@@ -1511,7 +1628,7 @@
case STATE_SENSING:
mState = STATE_LOCATING;
if (DEBUG) Slog.d(TAG, "Moved from STATE_SENSING to STATE_LOCATING.");
- EventLogTags.writeDeviceIdle(mState, "step");
+ EventLogTags.writeDeviceIdle(mState, reason);
scheduleAlarmLocked(mConstants.LOCATING_TIMEOUT, false);
if (mLocationManager != null
&& mLocationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {
@@ -1553,23 +1670,103 @@
mLightState = LIGHT_STATE_OVERRIDE;
cancelLightAlarmLocked();
}
- EventLogTags.writeDeviceIdle(mState, "step");
+ EventLogTags.writeDeviceIdle(mState, reason);
+ addEvent(EVENT_FULL_IDLE);
mHandler.sendEmptyMessage(MSG_REPORT_IDLE_ON);
break;
case STATE_IDLE:
// We have been idling long enough, now it is time to do some work.
+ mActiveIdleOpCount = 1;
scheduleAlarmLocked(mNextIdlePendingDelay, false);
if (DEBUG) Slog.d(TAG, "Moved from STATE_IDLE to STATE_IDLE_MAINTENANCE. " +
"Next alarm in " + mNextIdlePendingDelay + " ms.");
mNextIdlePendingDelay = Math.min(mConstants.MAX_IDLE_PENDING_TIMEOUT,
(long)(mNextIdlePendingDelay * mConstants.IDLE_PENDING_FACTOR));
mState = STATE_IDLE_MAINTENANCE;
- EventLogTags.writeDeviceIdle(mState, "step");
+ EventLogTags.writeDeviceIdle(mState, reason);
+ addEvent(EVENT_FULL_MAINTENANCE);
mHandler.sendEmptyMessage(MSG_REPORT_IDLE_OFF);
break;
}
}
+ void incActiveIdleOps() {
+ synchronized (this) {
+ mActiveIdleOpCount++;
+ }
+ }
+
+ void decActiveIdleOps() {
+ synchronized (this) {
+ mActiveIdleOpCount--;
+ if (mActiveIdleOpCount <= 0) {
+ exitMaintenanceEarlyIfNeededLocked();
+ }
+ }
+ }
+
+ void downloadServiceActive(IBinder token) {
+ synchronized (this) {
+ mDownloadServiceActive = token;
+ try {
+ token.linkToDeath(new IBinder.DeathRecipient() {
+ @Override public void binderDied() {
+ downloadServiceInactive();
+ }
+ }, 0);
+ } catch (RemoteException e) {
+ mDownloadServiceActive = null;
+ }
+ }
+ }
+
+ void downloadServiceInactive() {
+ synchronized (this) {
+ mDownloadServiceActive = null;
+ exitMaintenanceEarlyIfNeededLocked();
+ }
+ }
+
+ void setSyncActive(boolean active) {
+ synchronized (this) {
+ mSyncActive = active;
+ if (!active) {
+ exitMaintenanceEarlyIfNeededLocked();
+ }
+ }
+ }
+
+ void setJobsActive(boolean active) {
+ synchronized (this) {
+ mJobsActive = active;
+ if (!active) {
+ exitMaintenanceEarlyIfNeededLocked();
+ }
+ }
+ }
+
+ void setAlarmsActive(boolean active) {
+ synchronized (this) {
+ mAlarmsActive = active;
+ if (!active) {
+ exitMaintenanceEarlyIfNeededLocked();
+ }
+ }
+ }
+
+ void exitMaintenanceEarlyIfNeededLocked() {
+ if (mState == STATE_IDLE_MAINTENANCE || mLightState == LIGHT_STATE_IDLE_MAINTENANCE) {
+ if (mActiveIdleOpCount <= 0 && mDownloadServiceActive == null
+ && !mSyncActive && !mJobsActive && !mAlarmsActive) {
+ if (mState == STATE_IDLE_MAINTENANCE) {
+ stepIdleStateLocked("s:early");
+ } else {
+ stepLightIdleStateLocked("s:early");
+ }
+ }
+ }
+ }
+
void motionLocked() {
if (DEBUG) Slog.d(TAG, "motionLocked()");
// The motion sensor will have been disabled at this point
@@ -1585,7 +1782,10 @@
scheduleReportActiveLocked(type, Process.myUid());
mState = STATE_ACTIVE;
mInactiveTimeout = timeout;
+ mCurIdleBudget = 0;
+ mMaintenanceStartTime = 0;
EventLogTags.writeDeviceIdle(mState, type);
+ addEvent(EVENT_NORMAL);
becomeInactive = true;
}
if (mLightState == LIGHT_STATE_OVERRIDE) {
@@ -1612,7 +1812,7 @@
}
mLocated = true;
if (mNotMoving) {
- stepIdleStateLocked();
+ stepIdleStateLocked("s:location");
}
}
@@ -1628,7 +1828,7 @@
}
mLocated = true;
if (mNotMoving) {
- stepIdleStateLocked();
+ stepIdleStateLocked("s:gps");
}
}
@@ -1892,6 +2092,8 @@
pw.println(" Print this help text.");
pw.println(" step");
pw.println(" Immediately step to next state, without waiting for alarm.");
+ pw.println(" light-step");
+ pw.println(" Immediately step to next light idle state, without waiting for alarm.");
pw.println(" force-idle");
pw.println(" Force directly into idle mode, regardless of other device state.");
pw.println(" Use \"step\" to get out.");
@@ -1933,7 +2135,7 @@
long token = Binder.clearCallingIdentity();
try {
exitForceIdleLocked();
- stepIdleStateLocked();
+ stepIdleStateLocked("s:shell");
pw.print("Stepped to: ");
pw.println(stateToString(mState));
} finally {
@@ -1947,7 +2149,7 @@
long token = Binder.clearCallingIdentity();
try {
exitForceIdleLocked();
- stepLightIdleStateLocked();
+ stepLightIdleStateLocked("s:shell");
pw.print("Stepped to: "); pw.println(lightStateToString(mLightState));
} finally {
Binder.restoreCallingIdentity(token);
@@ -1967,7 +2169,7 @@
becomeInactiveIfAppropriateLocked();
int curState = mState;
while (curState != STATE_IDLE) {
- stepIdleStateLocked();
+ stepIdleStateLocked("s:shell");
if (curState == mState) {
pw.print("Unable to go idle; stopped at ");
pw.println(stateToString(mState));
@@ -2138,6 +2340,31 @@
synchronized (this) {
mConstants.dump(pw);
+ if (mEventCmds[0] != EVENT_NULL) {
+ pw.println(" Idling history:");
+ long now = SystemClock.elapsedRealtime();
+ for (int i=EVENT_BUFFER_SIZE-1; i>=0; i--) {
+ int cmd = mEventCmds[i];
+ if (cmd == EVENT_NULL) {
+ continue;
+ }
+ String label;
+ switch (mEventCmds[i]) {
+ case EVENT_NORMAL: label = " normal"; break;
+ case EVENT_LIGHT_IDLE: label = " light-idle"; break;
+ case EVENT_LIGHT_MAINTENANCE: label = "light-maint"; break;
+ case EVENT_FULL_IDLE: label = " full-idle"; break;
+ case EVENT_FULL_MAINTENANCE: label = " full-maint"; break;
+ default: label = " ??"; break;
+ }
+ pw.print(" ");
+ pw.print(label);
+ pw.print(": ");
+ TimeUtils.formatDuration(mEventTimes[i], now, pw);;
+ pw.println();
+ }
+ }
+
int size = mPowerSaveWhitelistAppsExceptIdle.size();
if (size > 0) {
pw.println(" Whitelist (except idle) system apps:");
@@ -2226,6 +2453,9 @@
pw.println(lightStateToString(mLightState));
pw.print(" mInactiveTimeout="); TimeUtils.formatDuration(mInactiveTimeout, pw);
pw.println();
+ if (mActiveIdleOpCount != 0) {
+ pw.print(" mActiveIdleOpCount="); pw.println(mActiveIdleOpCount);
+ }
if (mNextAlarmTime != 0) {
pw.print(" mNextAlarmTime=");
TimeUtils.formatDuration(mNextAlarmTime, SystemClock.elapsedRealtime(), pw);
@@ -2246,6 +2476,28 @@
TimeUtils.formatDuration(mNextLightAlarmTime, SystemClock.elapsedRealtime(), pw);
pw.println();
}
+ if (mCurIdleBudget != 0) {
+ pw.print(" mCurIdleBudget=");
+ TimeUtils.formatDuration(mCurIdleBudget, pw);
+ pw.println();
+ }
+ if (mMaintenanceStartTime != 0) {
+ pw.print(" mMaintenanceStartTime=");
+ TimeUtils.formatDuration(mMaintenanceStartTime, SystemClock.elapsedRealtime(), pw);
+ pw.println();
+ }
+ if (mSyncActive) {
+ pw.print(" mSyncActive="); pw.println(mSyncActive);
+ }
+ if (mJobsActive) {
+ pw.print(" mJobsActive="); pw.println(mJobsActive);
+ }
+ if (mAlarmsActive) {
+ pw.print(" mAlarmsActive="); pw.println(mAlarmsActive);
+ }
+ if (mDownloadServiceActive != null) {
+ pw.print(" mDownloadServiceActive="); pw.println(mDownloadServiceActive);
+ }
}
}
}
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index ab1d775..42dd9a8 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -30,6 +30,7 @@
import com.android.internal.view.IInputMethodSession;
import com.android.internal.view.IInputSessionCallback;
import com.android.internal.view.InputBindResult;
+import com.android.internal.view.InputMethodClient;
import com.android.server.statusbar.StatusBarManagerService;
import org.xmlpull.v1.XmlPullParser;
@@ -69,6 +70,7 @@
import android.content.res.TypedArray;
import android.database.ContentObserver;
import android.graphics.drawable.Drawable;
+import android.hardware.input.InputManagerInternal;
import android.inputmethodservice.InputMethodService;
import android.net.Uri;
import android.os.Binder;
@@ -160,8 +162,8 @@
static final int MSG_START_INPUT = 2000;
static final int MSG_RESTART_INPUT = 2010;
- static final int MSG_UNBIND_METHOD = 3000;
- static final int MSG_BIND_METHOD = 3010;
+ static final int MSG_UNBIND_CLIENT = 3000;
+ static final int MSG_BIND_CLIENT = 3010;
static final int MSG_SET_ACTIVE = 3020;
static final int MSG_SET_INTERACTIVE = 3030;
static final int MSG_SET_USER_ACTION_NOTIFICATION_SEQUENCE_NUMBER = 3040;
@@ -308,11 +310,18 @@
ClientState mCurClient;
/**
- * The last window token that gained focus.
+ * The last window token that we confirmed to be focused. This is always updated upon reports
+ * from the input method client. If the window state is already changed before the report is
+ * handled, this field just keeps the last value.
*/
IBinder mCurFocusedWindow;
/**
+ * The client by which {@link #mCurFocusedWindow} was reported. Used only for debugging.
+ */
+ ClientState mCurFocusedWindowClient;
+
+ /**
* The input context last provided by the current client.
*/
IInputContext mCurInputContext;
@@ -935,7 +944,7 @@
|| (newLocale != null && !newLocale.equals(mLastSystemLocale))) {
if (!updateOnlyWhenLocaleChanged) {
hideCurrentInputLocked(0, null);
- unbindCurrentMethodLocked(true, false);
+ resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_RESET_IME);
}
if (DEBUG) {
Slog.i(TAG, "Locale has been changed to " + newLocale);
@@ -1195,6 +1204,12 @@
ClientState cs = mClients.remove(client.asBinder());
if (cs != null) {
clearClientSessionLocked(cs);
+ if (mCurClient == cs) {
+ mCurClient = null;
+ }
+ if (mCurFocusedWindowClient == cs) {
+ mCurFocusedWindowClient = null;
+ }
}
}
}
@@ -1208,9 +1223,10 @@
}
}
- void unbindCurrentClientLocked() {
+ void unbindCurrentClientLocked(
+ /* @InputMethodClient.UnbindReason */ final int unbindClientReason) {
if (mCurClient != null) {
- if (DEBUG) Slog.v(TAG, "unbindCurrentInputLocked: client = "
+ if (DEBUG) Slog.v(TAG, "unbindCurrentInputLocked: client="
+ mCurClient.client.asBinder());
if (mBoundToMethod) {
mBoundToMethod = false;
@@ -1222,8 +1238,8 @@
executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIO(
MSG_SET_ACTIVE, 0, mCurClient));
- executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIO(
- MSG_UNBIND_METHOD, mCurSeq, mCurClient.client));
+ executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIIO(
+ MSG_UNBIND_CLIENT, mCurSeq, unbindClientReason, mCurClient.client));
mCurClient.sessionRequested = false;
mCurClient = null;
@@ -1275,8 +1291,10 @@
mCurId, mCurSeq, mCurUserActionNotificationSequenceNumber);
}
- InputBindResult startInputLocked(IInputMethodClient client,
- IInputContext inputContext, EditorInfo attribute, int controlFlags) {
+ InputBindResult startInputLocked(
+ /* @InputMethodClient.StartInputReason */ final int startInputReason,
+ IInputMethodClient client, IInputContext inputContext, EditorInfo attribute,
+ int controlFlags) {
// If no method is currently selected, do nothing.
if (mCurMethodId == null) {
return mNoBinding;
@@ -1305,8 +1323,8 @@
return startInputUncheckedLocked(cs, inputContext, attribute, controlFlags);
}
- InputBindResult startInputUncheckedLocked(@NonNull ClientState cs,
- IInputContext inputContext, @NonNull EditorInfo attribute, int controlFlags) {
+ InputBindResult startInputUncheckedLocked(@NonNull ClientState cs, IInputContext inputContext,
+ @NonNull EditorInfo attribute, int controlFlags) {
// If no method is currently selected, do nothing.
if (mCurMethodId == null) {
return mNoBinding;
@@ -1324,8 +1342,8 @@
mCurClientInKeyguard = isKeyguardLocked();
// If the client is changing, we need to switch over to the new
// one.
- unbindCurrentClientLocked();
- if (DEBUG) Slog.v(TAG, "switching to client: client = "
+ unbindCurrentClientLocked(InputMethodClient.UNBIND_REASON_SWITCH_CLIENT);
+ if (DEBUG) Slog.v(TAG, "switching to client: client="
+ cs.client.asBinder() + " keyguard=" + mCurClientInKeyguard);
// If the screen is on, inform the new client it is active
@@ -1395,7 +1413,7 @@
throw new IllegalArgumentException("Unknown id: " + mCurMethodId);
}
- unbindCurrentMethodLocked(false, true);
+ unbindCurrentMethodLocked(true);
mCurIntent = new Intent(InputMethod.SERVICE_INTERFACE);
mCurIntent.setComponent(info.getComponent());
@@ -1427,15 +1445,26 @@
}
@Override
- public InputBindResult startInput(IInputMethodClient client,
- IInputContext inputContext, EditorInfo attribute, int controlFlags) {
+ public InputBindResult startInput(
+ /* @InputMethodClient.StartInputReason */ final int startInputReason,
+ IInputMethodClient client, IInputContext inputContext, EditorInfo attribute,
+ int controlFlags) {
if (!calledFromValidUser()) {
return null;
}
synchronized (mMethodMap) {
+ if (DEBUG) {
+ Slog.v(TAG, "startInput: reason="
+ + InputMethodClient.getStartInputReason(startInputReason)
+ + " client = " + client.asBinder()
+ + " inputContext=" + inputContext
+ + " attribute=" + attribute
+ + " controlFlags=#" + Integer.toHexString(controlFlags));
+ }
final long ident = Binder.clearCallingIdentity();
try {
- return startInputLocked(client, inputContext, attribute, controlFlags);
+ return startInputLocked(startInputReason, client, inputContext, attribute,
+ controlFlags);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -1453,7 +1482,7 @@
mCurMethod = IInputMethod.Stub.asInterface(service);
if (mCurToken == null) {
Slog.w(TAG, "Service connected without a token!");
- unbindCurrentMethodLocked(false, false);
+ unbindCurrentMethodLocked(false);
return;
}
if (DEBUG) Slog.v(TAG, "Initiating attach with token: " + mCurToken);
@@ -1479,7 +1508,7 @@
InputBindResult res = attachNewInputLocked(true);
if (res.method != null) {
executeOrSendMessage(mCurClient.client, mCaller.obtainMessageOO(
- MSG_BIND_METHOD, mCurClient.client, res));
+ MSG_BIND_CLIENT, mCurClient.client, res));
}
return;
}
@@ -1490,11 +1519,7 @@
channel.dispose();
}
- void unbindCurrentMethodLocked(boolean resetCurrentMethodAndClient, boolean savePosition) {
- if (resetCurrentMethodAndClient) {
- mCurMethodId = null;
- }
-
+ void unbindCurrentMethodLocked(boolean savePosition) {
if (mVisibleBound) {
mContext.unbindService(mVisibleConnection);
mVisibleBound = false;
@@ -1520,10 +1545,13 @@
mCurId = null;
clearCurMethodLocked();
+ }
- if (resetCurrentMethodAndClient) {
- unbindCurrentClientLocked();
- }
+ void resetCurrentMethodAndClient(
+ /* @InputMethodClient.UnbindReason */ final int unbindClientReason) {
+ mCurMethodId = null;
+ unbindCurrentMethodLocked(false);
+ unbindCurrentClientLocked(unbindClientReason);
}
void requestClientSessionLocked(ClientState cs) {
@@ -1590,8 +1618,9 @@
mShowRequested = mInputShown;
mInputShown = false;
if (mCurClient != null) {
- executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIO(
- MSG_UNBIND_METHOD, mCurSeq, mCurClient.client));
+ executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIIO(
+ MSG_UNBIND_CLIENT, InputMethodClient.UNBIND_REASON_DISCONNECT_IME,
+ mCurSeq, mCurClient.client));
}
}
}
@@ -1876,12 +1905,12 @@
setInputMethodLocked(id, mSettings.getSelectedInputMethodSubtypeId(id));
} catch (IllegalArgumentException e) {
Slog.w(TAG, "Unknown input method from prefs: " + id, e);
- unbindCurrentMethodLocked(true, false);
+ resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_SWITCH_IME_FAILED);
}
mShortcutInputMethodsAndSubtypes.clear();
} else {
// There is no longer an input method set, so stop any current one.
- unbindCurrentMethodLocked(true, false);
+ resetCurrentMethodAndClient(InputMethodClient.UNBIND_REASON_NO_IME);
}
// Here is not the perfect place to reset the switching controller. Ideally
// mSwitchingController and mSettings should be able to share the same state.
@@ -1902,6 +1931,16 @@
}
}
+ private void notifyInputMethodSubtypeChanged(final int userId,
+ @Nullable final InputMethodInfo inputMethodInfo,
+ @Nullable final InputMethodSubtype subtype) {
+ final InputManagerInternal inputManagerInternal =
+ LocalServices.getService(InputManagerInternal.class);
+ if (inputManagerInternal != null) {
+ inputManagerInternal.onInputMethodSubtypeChanged(userId, inputMethodInfo, subtype);
+ }
+ }
+
/* package */ void setInputMethodLocked(String id, int subtypeId) {
InputMethodInfo info = mMethodMap.get(id);
if (info == null) {
@@ -1944,8 +1983,10 @@
mCurMethod.changeInputMethodSubtype(newSubtype);
} catch (RemoteException e) {
Slog.w(TAG, "Failed to call changeInputMethodSubtype");
+ return;
}
}
+ notifyInputMethodSubtypeChanged(mSettings.getCurrentUserId(), info, newSubtype);
}
return;
}
@@ -1967,10 +2008,13 @@
intent.putExtra("input_method_id", id);
mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
}
- unbindCurrentClientLocked();
+ unbindCurrentClientLocked(InputMethodClient.UNBIND_REASON_SWITCH_IME);
} finally {
Binder.restoreCallingIdentity(ident);
}
+
+ notifyInputMethodSubtypeChanged(mSettings.getCurrentUserId(), info,
+ getCurrentInputMethodSubtypeLocked());
}
@Override
@@ -2136,17 +2180,21 @@
}
@Override
- public InputBindResult windowGainedFocus(IInputMethodClient client, IBinder windowToken,
- int controlFlags, int softInputMode, int windowFlags,
- EditorInfo attribute, IInputContext inputContext) {
+ public InputBindResult windowGainedFocus(
+ /* @InputMethodClient.StartInputReason */ final int startInputReason,
+ IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode,
+ int windowFlags, EditorInfo attribute, IInputContext inputContext) {
// Needs to check the validity before clearing calling identity
final boolean calledFromValidUser = calledFromValidUser();
-
InputBindResult res = null;
long ident = Binder.clearCallingIdentity();
try {
synchronized (mMethodMap) {
- if (DEBUG) Slog.v(TAG, "windowGainedFocus: " + client.asBinder()
+ if (DEBUG) Slog.v(TAG, "windowGainedFocus: reason="
+ + InputMethodClient.getStartInputReason(startInputReason)
+ + " client=" + client.asBinder()
+ + " inputContext=" + inputContext
+ + " attribute=" + attribute
+ " controlFlags=#" + Integer.toHexString(controlFlags)
+ " softInputMode=#" + Integer.toHexString(softInputMode)
+ " windowFlags=#" + Integer.toHexString(windowFlags));
@@ -2189,6 +2237,7 @@
return null;
}
mCurFocusedWindow = windowToken;
+ mCurFocusedWindowClient = cs;
// Should we auto-show the IME even if the caller has not
// specified what should be done with it?
@@ -2771,14 +2820,14 @@
// ---------------------------------------------------------
- case MSG_UNBIND_METHOD:
+ case MSG_UNBIND_CLIENT:
try {
- ((IInputMethodClient)msg.obj).onUnbindMethod(msg.arg1);
+ ((IInputMethodClient)msg.obj).onUnbindMethod(msg.arg1, msg.arg2);
} catch (RemoteException e) {
// There is nothing interesting about the last client dying.
}
return true;
- case MSG_BIND_METHOD: {
+ case MSG_BIND_CLIENT: {
args = (SomeArgs)msg.obj;
IInputMethodClient client = (IInputMethodClient)args.arg1;
InputBindResult res = (InputBindResult)args.arg2;
@@ -3700,6 +3749,7 @@
IInputMethod method;
ClientState client;
+ ClientState focusedWindowClient;
final Printer p = new PrintWriterPrinter(pw);
@@ -3724,6 +3774,8 @@
client = mCurClient;
p.println(" mCurClient=" + client + " mCurSeq=" + mCurSeq);
p.println(" mCurFocusedWindow=" + mCurFocusedWindow);
+ focusedWindowClient = mCurFocusedWindowClient;
+ p.println(" mCurFocusedWindowClient=" + focusedWindowClient);
p.println(" mCurId=" + mCurId + " mHaveConnect=" + mHaveConnection
+ " mBoundToMethod=" + mBoundToMethod);
p.println(" mCurToken=" + mCurToken);
@@ -3755,6 +3807,20 @@
p.println("No input method client.");
}
+ if (focusedWindowClient != null && client != focusedWindowClient) {
+ p.println(" ");
+ p.println("Warning: Current input method client doesn't match the last focused. "
+ + "window.");
+ p.println("Dumping input method client in the last focused window just in case.");
+ p.println(" ");
+ pw.flush();
+ try {
+ focusedWindowClient.client.asBinder().dump(fd, args);
+ } catch (RemoteException e) {
+ p.println("Input method client in focused window dead: " + e);
+ }
+ }
+
p.println(" ");
if (method != null) {
pw.flush();
diff --git a/services/core/java/com/android/server/IntentResolver.java b/services/core/java/com/android/server/IntentResolver.java
index 3359060..43d10c7 100644
--- a/services/core/java/com/android/server/IntentResolver.java
+++ b/services/core/java/com/android/server/IntentResolver.java
@@ -226,7 +226,7 @@
final int N = a.length;
boolean printedHeader = false;
F filter;
- if (collapseDuplicates) {
+ if (collapseDuplicates && !printFilter) {
found.clear();
for (int i=0; i<N && (filter=a[i]) != null; i++) {
if (packageName != null && !isPackageForFilter(packageName, filter)) {
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index da81528..d6c6f13 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -16,6 +16,8 @@
package com.android.server;
+import android.app.ActivityManagerNative;
+import android.app.AppGlobals;
import android.app.admin.DevicePolicyManager;
import android.app.backup.BackupManager;
import android.app.trust.IStrongAuthTracker;
@@ -388,6 +390,13 @@
}
}
+ private void unlockUser(int userId, byte[] token) {
+ try {
+ ActivityManagerNative.getDefault().unlockUser(userId, token);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
private byte[] getCurrentHandle(int userId) {
CredentialHash credential;
@@ -612,6 +621,7 @@
byte[] hash = credentialUtil.toHash(credential, userId);
if (Arrays.equals(hash, storedHash.hash)) {
unlockKeystore(credentialUtil.adjustForKeystore(credential), userId);
+ unlockUser(userId, null);
// migrate credential to GateKeeper
credentialUtil.setCredential(credential, null, userId);
if (!hasChallenge) {
@@ -664,6 +674,7 @@
if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {
// credential has matched
unlockKeystore(credential, userId);
+ unlockUser(userId, null);
if (shouldReEnroll) {
credentialUtil.setCredential(credential, credential, userId);
}
diff --git a/services/core/java/com/android/server/LockSettingsStorage.java b/services/core/java/com/android/server/LockSettingsStorage.java
index 6acec6b..eb49a78 100644
--- a/services/core/java/com/android/server/LockSettingsStorage.java
+++ b/services/core/java/com/android/server/LockSettingsStorage.java
@@ -389,7 +389,7 @@
private int getUserParentOrSelfId(int userId) {
// Device supports per user encryption, so lock is applied to the given user.
- if (mContext.getSystemService(StorageManager.class).isPerUserEncryptionEnabled()) {
+ if (StorageManager.isFileBasedEncryptionEnabled()) {
return userId;
}
// Device uses Block Based Encryption, and the parent user's lock is used for the whole
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 37dd884..bd43a71 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -56,6 +56,7 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
@@ -780,6 +781,7 @@
}
private void handleSystemReady() {
+ initIfReadyAndConnected();
resetIfReadyAndConnected();
// Start scheduling nominally-daily fstrim operations
@@ -827,6 +829,22 @@
mVolumes.put(internal.id, internal);
}
+ private void initIfReadyAndConnected() {
+ Slog.d(TAG, "Thinking about init, mSystemReady=" + mSystemReady
+ + ", mDaemonConnected=" + mDaemonConnected);
+ if (mSystemReady && mDaemonConnected && StorageManager.isFileBasedEncryptionEnabled()) {
+ final List<UserInfo> users = mContext.getSystemService(UserManager.class)
+ .getUsers();
+ for (UserInfo user : users) {
+ try {
+ mCryptConnector.execute("cryptfs", "lock_user_key", user.id);
+ } catch (NativeDaemonConnectorException e) {
+ Slog.w(TAG, "Failed to init vold", e);
+ }
+ }
+ }
+ }
+
private void resetIfReadyAndConnected() {
Slog.d(TAG, "Thinking about reset, mSystemReady=" + mSystemReady
+ ", mDaemonConnected=" + mDaemonConnected);
@@ -927,6 +945,7 @@
}
private void handleDaemonConnected() {
+ initIfReadyAndConnected();
resetIfReadyAndConnected();
/*
@@ -1903,16 +1922,18 @@
enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS);
waitForReady();
- synchronized (mLock) {
- if ((mask & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0) {
- mForceAdoptable = (flags & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0;
- }
- if ((mask & StorageManager.DEBUG_EMULATE_FBE) != 0) {
- // TODO: persist through vold and reboot
- }
+ if ((mask & StorageManager.DEBUG_EMULATE_FBE) != 0) {
+ final boolean emulateFbe = (flags & StorageManager.DEBUG_EMULATE_FBE) != 0;
+ SystemProperties.set(StorageManager.PROP_EMULATE_FBE, Boolean.toString(emulateFbe));
+ }
- writeSettingsLocked();
- mHandler.obtainMessage(H_RESET).sendToTarget();
+ if ((mask & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0) {
+ synchronized (mLock) {
+ mForceAdoptable = (flags & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0;
+
+ writeSettingsLocked();
+ mHandler.obtainMessage(H_RESET).sendToTarget();
+ }
}
}
@@ -2737,7 +2758,7 @@
@Override
public boolean isUserKeyUnlocked(int userId) {
- if (SystemProperties.getBoolean(StorageManager.PROP_HAS_FBE, false)) {
+ if (StorageManager.isFileBasedEncryptionEnabled()) {
synchronized (mLock) {
return ArrayUtils.contains(mUnlockedUsers, userId);
}
@@ -2760,11 +2781,9 @@
}
@Override
- public boolean isPerUserEncryptionEnabled() {
- // TODO: switch this over to a single property; currently using two to
- // handle the emulated case
- return "file".equals(SystemProperties.get("ro.crypto.type", "none"))
- || SystemProperties.getBoolean(StorageManager.PROP_HAS_FBE, false);
+ public ParcelFileDescriptor mountAppFuse(String name) throws RemoteException {
+ // TODO: Invoke vold to mount app fuse.
+ throw new UnsupportedOperationException();
}
@Override
diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java
index fc3a322..fcd56eb7 100644
--- a/services/core/java/com/android/server/TextServicesManagerService.java
+++ b/services/core/java/com/android/server/TextServicesManagerService.java
@@ -446,8 +446,7 @@
String candidateLocale = null;
if (hashCode == 0) {
// Spell checker language settings == "auto"
- final InputMethodManager imm =
- (InputMethodManager)mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+ final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
if (imm != null) {
final InputMethodSubtype currentInputMethodSubtype =
imm.getCurrentInputMethodSubtype();
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index c228422..2924cef 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -88,6 +88,7 @@
private SettingsObserver mSettingObserver;
native static boolean vibratorExists();
+ native static void vibratorInit();
native static void vibratorOn(long milliseconds);
native static void vibratorOff();
@@ -195,6 +196,7 @@
}
VibratorService(Context context) {
+ vibratorInit();
// Reset the hardware to a default state, in case this is a runtime
// restart instead of a fresh boot.
vibratorOff();
@@ -221,7 +223,7 @@
}
public void systemReady() {
- mIm = (InputManager)mContext.getSystemService(Context.INPUT_SERVICE);
+ mIm = mContext.getSystemService(InputManager.class);
mSettingObserver = new SettingsObserver(mH);
mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 9ac4ba3..93eaf0e 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -88,6 +88,7 @@
import java.io.File;
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.security.GeneralSecurityException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
@@ -114,6 +115,7 @@
public class AccountManagerService
extends IAccountManager.Stub
implements RegisteredServicesCacheListener<AuthenticatorDescription> {
+
private static final String TAG = "AccountManagerService";
private static final String DATABASE_NAME = "accounts.db";
@@ -2283,6 +2285,196 @@
}
}
+ @Override
+ public void startAddAccountSession(
+ final IAccountManagerResponse response,
+ final String accountType,
+ final String authTokenType,
+ final String[] requiredFeatures,
+ final boolean expectActivityLaunch,
+ final Bundle optionsIn) {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG,
+ "startAddAccountSession: accountType " + accountType
+ + ", response " + response
+ + ", authTokenType " + authTokenType
+ + ", requiredFeatures " + stringArrayToString(requiredFeatures)
+ + ", expectActivityLaunch " + expectActivityLaunch
+ + ", caller's uid " + Binder.getCallingUid()
+ + ", pid " + Binder.getCallingPid());
+ }
+ if (response == null) {
+ throw new IllegalArgumentException("response is null");
+ }
+ if (accountType == null) {
+ throw new IllegalArgumentException("accountType is null");
+ }
+
+ int userId = Binder.getCallingUserHandle().getIdentifier();
+ if (!canUserModifyAccounts(userId)) {
+ try {
+ response.onError(AccountManager.ERROR_CODE_USER_RESTRICTED,
+ "User is not allowed to add an account!");
+ } catch (RemoteException re) {
+ }
+ showCantAddAccount(AccountManager.ERROR_CODE_USER_RESTRICTED, userId);
+ return;
+ }
+ if (!canUserModifyAccountsForType(userId, accountType)) {
+ try {
+ response.onError(AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE,
+ "User cannot modify accounts of this type (policy).");
+ } catch (RemoteException re) {
+ }
+ showCantAddAccount(AccountManager.ERROR_CODE_MANAGEMENT_DISABLED_FOR_ACCOUNT_TYPE,
+ userId);
+ return;
+ }
+
+ final int pid = Binder.getCallingPid();
+ final int uid = Binder.getCallingUid();
+ final Bundle options = (optionsIn == null) ? new Bundle() : optionsIn;
+ options.putInt(AccountManager.KEY_CALLER_UID, uid);
+ options.putInt(AccountManager.KEY_CALLER_PID, pid);
+
+ int usrId = UserHandle.getCallingUserId();
+ long identityToken = clearCallingIdentity();
+ try {
+ UserAccounts accounts = getUserAccounts(usrId);
+ logRecordWithUid(accounts, DebugDbHelper.ACTION_CALLED_START_ACCOUNT_ADD,
+ TABLE_ACCOUNTS, uid);
+ new StartAccountSession(accounts, response, accountType, expectActivityLaunch,
+ null /* accountName */, false /* authDetailsRequired */,
+ true /* updateLastAuthenticationTime */) {
+ @Override
+ public void run() throws RemoteException {
+ mAuthenticator.startAddAccountSession(this, mAccountType, authTokenType,
+ requiredFeatures, options);
+ }
+
+ @Override
+ protected String toDebugString(long now) {
+ String requiredFeaturesStr = TextUtils.join(",", requiredFeatures);
+ return super.toDebugString(now) + ", startAddAccountSession" + ", accountType "
+ + accountType + ", requiredFeatures "
+ + (requiredFeatures != null ? requiredFeaturesStr : null);
+ }
+ }.bind();
+ } finally {
+ restoreCallingIdentity(identityToken);
+ }
+ }
+
+ /** Session that will encrypt the KEY_ACCOUNT_SESSION_BUNDLE in result. */
+ private abstract class StartAccountSession extends Session {
+
+ public StartAccountSession(UserAccounts accounts, IAccountManagerResponse response,
+ String accountType, boolean expectActivityLaunch, String accountName,
+ boolean authDetailsRequired, boolean updateLastAuthenticationTime) {
+ super(accounts, response, accountType, expectActivityLaunch,
+ true /* stripAuthTokenFromResult */, accountName, authDetailsRequired,
+ updateLastAuthenticationTime);
+ }
+
+ @Override
+ public void onResult(Bundle result) {
+ mNumResults++;
+ Intent intent = null;
+
+ if (result != null
+ && (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {
+ /*
+ * The Authenticator API allows third party authenticators to
+ * supply arbitrary intents to other apps that they can run,
+ * this can be very bad when those apps are in the system like
+ * the System Settings.
+ */
+ int authenticatorUid = Binder.getCallingUid();
+ long bid = Binder.clearCallingIdentity();
+ try {
+ PackageManager pm = mContext.getPackageManager();
+ ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mAccounts.userId);
+ int targetUid = resolveInfo.activityInfo.applicationInfo.uid;
+ if (PackageManager.SIGNATURE_MATCH != pm.checkSignatures(authenticatorUid,
+ targetUid)) {
+ throw new SecurityException("Activity to be started with KEY_INTENT must "
+ + "share Authenticator's signatures");
+ }
+ } finally {
+ Binder.restoreCallingIdentity(bid);
+ }
+ }
+
+ IAccountManagerResponse response;
+ if (mExpectActivityLaunch && result != null
+ && result.containsKey(AccountManager.KEY_INTENT)) {
+ response = mResponse;
+ } else {
+ response = getResponseAndClose();
+ }
+ if (response == null) {
+ return;
+ }
+ if (result == null) {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, getClass().getSimpleName() + " calling onError() on response "
+ + response);
+ }
+ sendErrorResponse(response, AccountManager.ERROR_CODE_INVALID_RESPONSE,
+ "null bundle returned");
+ return;
+ }
+
+ if ((result.getInt(AccountManager.KEY_ERROR_CODE, -1) > 0) && (intent == null)) {
+ // All AccountManager error codes are greater
+ // than 0
+ sendErrorResponse(response, result.getInt(AccountManager.KEY_ERROR_CODE),
+ result.getString(AccountManager.KEY_ERROR_MESSAGE));
+ return;
+ }
+
+ // Strip auth token from result.
+ result.remove(AccountManager.KEY_AUTHTOKEN);
+
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG,
+ getClass().getSimpleName() + " calling onResult() on response " + response);
+ }
+
+ // Get the session bundle created by authenticator. The
+ // bundle contains data necessary for finishing the session
+ // later. The session bundle will be encrypted here and
+ // decrypted later when trying to finish the session.
+ Bundle sessionBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+ if (sessionBundle != null) {
+ String accountType = sessionBundle.getString(AccountManager.KEY_ACCOUNT_TYPE);
+ if (TextUtils.isEmpty(accountType)
+ && !mAccountType.equalsIgnoreCase(mAccountType)) {
+ Log.w(TAG, "Account type in session bundle doesn't match request.");
+ }
+ // Add accountType info to session bundle. This will
+ // override any value set by authenticator.
+ sessionBundle.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccountType);
+
+ // Encrypt session bundle before returning to caller.
+ try {
+ CryptoHelper cryptoHelper = CryptoHelper.getInstance();
+ Bundle encryptedBundle = cryptoHelper.encryptBundle(sessionBundle);
+ result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, encryptedBundle);
+ } catch (GeneralSecurityException e) {
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.v(TAG, "Failed to encrypt session bundle!", e);
+ }
+ sendErrorResponse(response, AccountManager.ERROR_CODE_INVALID_RESPONSE,
+ "failed to encrypt session bundle");
+ return;
+ }
+ }
+
+ sendResponse(response, result);
+ }
+ }
+
private void showCantAddAccount(int errorCode, int userId) {
Intent cantAddAccount = new Intent(mContext, CantAddAccountActivity.class);
cantAddAccount.putExtra(CantAddAccountActivity.EXTRA_ERROR_CODE, errorCode);
@@ -2382,6 +2574,60 @@
}
@Override
+ public void startUpdateCredentialsSession(
+ IAccountManagerResponse response,
+ final Account account,
+ final String authTokenType,
+ final boolean expectActivityLaunch,
+ final Bundle loginOptions) {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG,
+ "startUpdateCredentialsSession: " + account + ", response " + response
+ + ", authTokenType " + authTokenType + ", expectActivityLaunch "
+ + expectActivityLaunch + ", caller's uid " + Binder.getCallingUid()
+ + ", pid " + Binder.getCallingPid());
+ }
+ if (response == null) {
+ throw new IllegalArgumentException("response is null");
+ }
+ if (account == null) {
+ throw new IllegalArgumentException("account is null");
+ }
+ int userId = UserHandle.getCallingUserId();
+ long identityToken = clearCallingIdentity();
+ try {
+ UserAccounts accounts = getUserAccounts(userId);
+ new StartAccountSession(
+ accounts,
+ response,
+ account.type,
+ expectActivityLaunch,
+ account.name,
+ false /* authDetailsRequired */,
+ true /* updateLastCredentialTime */) {
+ @Override
+ public void run() throws RemoteException {
+ mAuthenticator.startUpdateCredentialsSession(this, account, authTokenType,
+ loginOptions);
+ }
+
+ @Override
+ protected String toDebugString(long now) {
+ if (loginOptions != null)
+ loginOptions.keySet();
+ return super.toDebugString(now)
+ + ", startUpdateCredentialsSession"
+ + ", " + account
+ + ", authTokenType " + authTokenType
+ + ", loginOptions " + loginOptions;
+ }
+ }.bind();
+ } finally {
+ restoreCallingIdentity(identityToken);
+ }
+ }
+
+ @Override
public void editProperties(IAccountManagerResponse response, final String accountType,
final boolean expectActivityLaunch) {
final int callingUid = Binder.getCallingUid();
@@ -3336,6 +3582,11 @@
private static String ACTION_CALLED_ACCOUNT_ADD = "action_called_account_add";
private static String ACTION_CALLED_ACCOUNT_REMOVE = "action_called_account_remove";
+ // TODO: This action doesn't add account to accountdb. Account is only
+ // added in finishAddAccount or finishAddAccountAsUser which may be in
+ // a different user profile.
+ private static String ACTION_CALLED_START_ACCOUNT_ADD = "action_called_start_account_add";
+
private static SimpleDateFormat dateFromat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private static void createDebugTable(SQLiteDatabase db) {
@@ -4300,4 +4551,29 @@
return mContext;
}
}
+
+ private void sendResponse(IAccountManagerResponse response, Bundle result) {
+ try {
+ response.onResult(result);
+ } catch (RemoteException e) {
+ // if the caller is dead then there is no one to care about remote
+ // exceptions
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, "failure while notifying response", e);
+ }
+ }
+ }
+
+ private void sendErrorResponse(IAccountManagerResponse response, int errorCode,
+ String errorMessage) {
+ try {
+ response.onError(errorCode, errorMessage);
+ } catch (RemoteException e) {
+ // if the caller is dead then there is no one to care about remote
+ // exceptions
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, "failure while notifying response", e);
+ }
+ }
+ }
}
diff --git a/services/core/java/com/android/server/accounts/CryptoHelper.java b/services/core/java/com/android/server/accounts/CryptoHelper.java
new file mode 100644
index 0000000..2b59b74
--- /dev/null
+++ b/services/core/java/com/android/server/accounts/CryptoHelper.java
@@ -0,0 +1,140 @@
+package com.android.server.accounts;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.util.Log;
+
+import com.android.internal.util.Preconditions;
+
+import java.security.GeneralSecurityException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Arrays;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * A crypto helper for encrypting and decrypting bundle with in-memory symmetric
+ * key for {@link AccountManagerService}.
+ */
+/* default */ class CryptoHelper {
+ private static final String TAG = "Account";
+
+ private static final String KEY_CIPHER = "cipher";
+ private static final String KEY_MAC = "mac";
+ private static final String KEY_ALGORITHM = "AES";
+ private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";
+ private static final String MAC_ALGORITHM = "HMACSHA256";
+ private static final int IV_LENGTH = 16;
+
+ private static CryptoHelper sInstance;
+ // Keys used for encrypting and decrypting data returned in a Bundle.
+ private final SecretKeySpec mCipherKeySpec;
+ private final SecretKeySpec mMacKeySpec;
+ private final IvParameterSpec mIv;
+
+ /* default */ synchronized static CryptoHelper getInstance() throws NoSuchAlgorithmException {
+ if (sInstance == null) {
+ sInstance = new CryptoHelper();
+ }
+ return sInstance;
+ }
+
+ private CryptoHelper() throws NoSuchAlgorithmException {
+ KeyGenerator kgen = KeyGenerator.getInstance(KEY_ALGORITHM);
+ SecretKey skey = kgen.generateKey();
+ mCipherKeySpec = new SecretKeySpec(skey.getEncoded(), KEY_ALGORITHM);
+
+ kgen = KeyGenerator.getInstance(MAC_ALGORITHM);
+ skey = kgen.generateKey();
+ mMacKeySpec = new SecretKeySpec(skey.getEncoded(), MAC_ALGORITHM);
+
+ // Create random iv
+ byte[] iv = new byte[IV_LENGTH];
+ SecureRandom secureRandom = new SecureRandom();
+ secureRandom.nextBytes(iv);
+ mIv = new IvParameterSpec(iv);
+ }
+
+ @NonNull
+ /* default */ Bundle encryptBundle(@NonNull Bundle bundle) throws GeneralSecurityException {
+ Preconditions.checkNotNull(bundle, "Cannot encrypt null bundle.");
+ Parcel parcel = Parcel.obtain();
+ bundle.writeToParcel(parcel, 0);
+ byte[] bytes = parcel.marshall();
+ parcel.recycle();
+
+ Bundle encryptedBundle = new Bundle();
+
+ byte[] cipher = encrypt(bytes);
+ byte[] mac = createMac(cipher);
+
+ encryptedBundle.putByteArray(KEY_CIPHER, cipher);
+ encryptedBundle.putByteArray(KEY_MAC, mac);
+
+ return encryptedBundle;
+ }
+
+ @Nullable
+ /* default */ Bundle decryptBundle(@NonNull Bundle bundle) throws GeneralSecurityException {
+ Preconditions.checkNotNull(bundle, "Cannot decrypt null bundle.");
+ byte[] cipherArray = bundle.getByteArray(KEY_CIPHER);
+ byte[] macArray = bundle.getByteArray(KEY_MAC);
+
+ if (!verifyMac(cipherArray, macArray)) {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, "Escrow mac mismatched!");
+ }
+ return null;
+ }
+
+ Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+ cipher.init(Cipher.DECRYPT_MODE, mCipherKeySpec, mIv);
+ byte[] decryptedBytes = cipher.doFinal(cipherArray);
+
+ Parcel decryptedParcel = Parcel.obtain();
+ decryptedParcel.unmarshall(decryptedBytes, 0, decryptedBytes.length);
+ decryptedParcel.setDataPosition(0);
+ Bundle decryptedBundle = new Bundle();
+ decryptedBundle.readFromParcel(decryptedParcel);
+ decryptedParcel.recycle();
+ return decryptedBundle;
+ }
+
+ private boolean verifyMac(@Nullable byte[] cipherArray, @Nullable byte[] macArray)
+ throws GeneralSecurityException {
+
+ if (cipherArray == null || cipherArray.length == 0 || macArray == null
+ || macArray.length == 0) {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.v(TAG, "Cipher or MAC is empty!");
+ }
+ return false;
+ }
+ Mac mac = Mac.getInstance(MAC_ALGORITHM);
+ mac.init(mMacKeySpec);
+ mac.update(cipherArray);
+ return Arrays.equals(macArray, mac.doFinal());
+ }
+
+ @NonNull
+ private byte[] encrypt(@NonNull byte[] data) throws GeneralSecurityException {
+ Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+ cipher.init(Cipher.ENCRYPT_MODE, mCipherKeySpec, mIv);
+ return cipher.doFinal(data);
+ }
+
+ @NonNull
+ private byte[] createMac(@NonNull byte[] cipher) throws GeneralSecurityException {
+ Mac mac = Mac.getInstance(MAC_ALGORITHM);
+ mac.init(mMacKeySpec);
+ return mac.doFinal(cipher);
+ }
+}
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 30565c6..2742c65 100755
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -30,10 +30,14 @@
import android.app.ActivityThread;
import android.app.AppOpsManager;
+import android.content.IIntentSender;
+import android.content.IntentSender;
import android.os.Build;
+import android.os.Bundle;
import android.os.DeadObjectException;
import android.os.Handler;
import android.os.Looper;
+import android.os.RemoteCallback;
import android.os.SystemProperties;
import android.os.TransactionTooLargeException;
import android.util.ArrayMap;
@@ -168,13 +172,10 @@
*/
class ServiceMap extends Handler {
final int mUserId;
- final ArrayMap<ComponentName, ServiceRecord> mServicesByName
- = new ArrayMap<ComponentName, ServiceRecord>();
- final ArrayMap<Intent.FilterComparison, ServiceRecord> mServicesByIntent
- = new ArrayMap<Intent.FilterComparison, ServiceRecord>();
+ final ArrayMap<ComponentName, ServiceRecord> mServicesByName = new ArrayMap<>();
+ final ArrayMap<Intent.FilterComparison, ServiceRecord> mServicesByIntent = new ArrayMap<>();
- final ArrayList<ServiceRecord> mDelayedStartList
- = new ArrayList<ServiceRecord>();
+ final ArrayList<ServiceRecord> mDelayedStartList = new ArrayList<>();
/* XXX eventually I'd like to have this based on processes instead of services.
* That is, if we try to start two services in a row both running in the same
* process, this should be one entry in mStartingBackground for that one process
@@ -185,8 +186,7 @@
= new ArrayList<DelayingProcess>();
*/
- final ArrayList<ServiceRecord> mStartingBackground
- = new ArrayList<ServiceRecord>();
+ final ArrayList<ServiceRecord> mStartingBackground = new ArrayList<>();
static final int MSG_BG_START_TIMEOUT = 1;
@@ -304,7 +304,7 @@
}
ComponentName startServiceLocked(IApplicationThread caller, Intent service, String resolvedType,
- int callingPid, int callingUid, String callingPackage, int userId)
+ int callingPid, int callingUid, String callingPackage, final int userId)
throws TransactionTooLargeException {
if (DEBUG_DELAYED_STARTS) Slog.v(TAG_SERVICE, "startService: " + service
+ " type=" + resolvedType + " args=" + service.getExtras());
@@ -338,12 +338,24 @@
ServiceRecord r = res.record;
if (!mAm.mUserController.exists(r.userId)) {
- Slog.d(TAG, "Trying to start service with non-existent user! " + r.userId);
+ Slog.w(TAG, "Trying to start service with non-existent user! " + r.userId);
return null;
}
NeededUriGrants neededGrants = mAm.checkGrantUriPermissionFromIntentLocked(
callingUid, r.packageName, service, service.getFlags(), null, r.userId);
+
+ // If permissions need a review before any of the app components can run,
+ // we do not start the service and launch a review activity if the calling app
+ // is in the foreground passing it a pending intent to start the service when
+ // review is completed.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (!requestStartTargetPermissionsReviewIfNeededLocked(r, callingPackage,
+ callingUid, service, callerFg, userId)) {
+ return null;
+ }
+ }
+
if (unscheduleServiceRestartLocked(r, callingUid, false)) {
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "START SERVICE WHILE RESTART PENDING: " + r);
}
@@ -421,6 +433,50 @@
return startServiceInnerLocked(smap, service, r, callerFg, addToStarting);
}
+ private boolean requestStartTargetPermissionsReviewIfNeededLocked(ServiceRecord r,
+ String callingPackage, int callingUid, Intent service, boolean callerFg,
+ final int userId) {
+ if (mAm.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ r.packageName, r.userId)) {
+
+ // Show a permission review UI only for starting from a foreground app
+ if (!callerFg) {
+ Slog.w(TAG, "u" + r.userId + " Starting a service in package"
+ + r.packageName + " requires a permissions review");
+ return false;
+ }
+
+ IIntentSender target = mAm.getIntentSenderLocked(
+ ActivityManager.INTENT_SENDER_SERVICE, callingPackage,
+ callingUid, userId, null, null, 0, new Intent[]{service},
+ new String[]{service.resolveType(mAm.mContext.getContentResolver())},
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
+ | PendingIntent.FLAG_IMMUTABLE, null);
+
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, r.packageName);
+ intent.putExtra(Intent.EXTRA_INTENT, new IntentSender(target));
+
+ if (DEBUG_PERMISSIONS_REVIEW) {
+ Slog.i(TAG, "u" + r.userId + " Launching permission review for package "
+ + r.packageName);
+ }
+
+ mAm.mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mAm.mContext.startActivityAsUser(intent, new UserHandle(userId));
+ }
+ });
+
+ return false;
+ }
+
+ return true;
+ }
+
ComponentName startServiceInnerLocked(ServiceMap smap, Intent service, ServiceRecord r,
boolean callerFg, boolean addToStarting) throws TransactionTooLargeException {
ProcessStats.ServiceState stracker = r.getTracker();
@@ -431,7 +487,7 @@
synchronized (r.stats.getBatteryStats()) {
r.stats.startRunningLocked();
}
- String error = bringUpServiceLocked(r, service.getFlags(), callerFg, false);
+ String error = bringUpServiceLocked(r, service.getFlags(), callerFg, false, false);
if (error != null) {
return new ComponentName("!!", error);
}
@@ -510,6 +566,35 @@
return 0;
}
+ void stopInBackgroundLocked(int uid) {
+ // Stop all services associated with this uid due to it going to the background
+ // stopped state.
+ ServiceMap services = mServiceMap.get(UserHandle.getUserId(uid));
+ ArrayList<ServiceRecord> stopping = null;
+ if (services != null) {
+ for (int i=services.mServicesByName.size()-1; i>=0; i--) {
+ ServiceRecord service = services.mServicesByName.valueAt(i);
+ if (service.appInfo.uid == uid && service.startRequested) {
+ if (mAm.mAppOpsService.noteOperation(AppOpsManager.OP_RUN_IN_BACKGROUND,
+ uid, service.packageName) != AppOpsManager.MODE_ALLOWED) {
+ if (stopping == null) {
+ stopping = new ArrayList<>();
+ stopping.add(service);
+ }
+ }
+ }
+ }
+ if (stopping != null) {
+ for (int i=stopping.size()-1; i>=0; i--) {
+ ServiceRecord service = stopping.get(i);
+ service.delayed = false;
+ services.ensureNotStartingBackground(service);
+ stopServiceLocked(service);
+ }
+ }
+ }
+ }
+
IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) {
ServiceLookupResult r = retrieveServiceLocked(service, resolvedType, callingPackage,
Binder.getCallingPid(), Binder.getCallingUid(),
@@ -696,8 +781,8 @@
}
int bindServiceLocked(IApplicationThread caller, IBinder token, Intent service,
- String resolvedType, IServiceConnection connection, int flags,
- String callingPackage, int userId) throws TransactionTooLargeException {
+ String resolvedType, final IServiceConnection connection, int flags,
+ String callingPackage, final int userId) throws TransactionTooLargeException {
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "bindService: " + service
+ " type=" + resolvedType + " conn=" + connection.asBinder()
+ " flags=0x" + Integer.toHexString(flags));
@@ -758,6 +843,83 @@
}
ServiceRecord s = res.record;
+ boolean permissionsReviewRequired = false;
+
+ // If permissions need a review before any of the app components can run,
+ // we schedule binding to the service but do not start its process, then
+ // we launch a review activity to which is passed a callback to invoke
+ // when done to start the bound service's process to completing the binding.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (mAm.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ s.packageName, s.userId)) {
+
+ permissionsReviewRequired = true;
+
+ // Show a permission review UI only for binding from a foreground app
+ if (!callerFg) {
+ Slog.w(TAG, "u" + s.userId + " Binding to a service in package"
+ + s.packageName + " requires a permissions review");
+ return 0;
+ }
+
+ final ServiceRecord serviceRecord = s;
+ final Intent serviceIntent = service;
+
+ RemoteCallback callback = new RemoteCallback(
+ new RemoteCallback.OnResultListener() {
+ @Override
+ public void onResult(Bundle result) {
+ synchronized(mAm) {
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ if (!mPendingServices.contains(serviceRecord)) {
+ return;
+ }
+ // If there is still a pending record, then the service
+ // binding request is still valid, so hook them up. We
+ // proceed only if the caller cleared the review requirement
+ // otherwise we unbind because the user didn't approve.
+ if (!mAm.getPackageManagerInternalLocked()
+ .isPermissionsReviewRequired(
+ serviceRecord.packageName,
+ serviceRecord.userId)) {
+ try {
+ bringUpServiceLocked(serviceRecord,
+ serviceIntent.getFlags(),
+ callerFg, false, false);
+ } catch (RemoteException e) {
+ /* ignore - local call */
+ }
+ } else {
+ unbindServiceLocked(connection);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+ }
+ });
+
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, s.packageName);
+ intent.putExtra(Intent.EXTRA_REMOTE_CALLBACK, callback);
+
+ if (DEBUG_PERMISSIONS_REVIEW) {
+ Slog.i(TAG, "u" + s.userId + " Launching permission review for package "
+ + s.packageName);
+ }
+
+ mAm.mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mAm.mContext.startActivityAsUser(intent, new UserHandle(userId));
+ }
+ });
+ }
+ }
+
final long origId = Binder.clearCallingIdentity();
try {
@@ -815,7 +977,8 @@
if ((flags&Context.BIND_AUTO_CREATE) != 0) {
s.lastActivity = SystemClock.uptimeMillis();
- if (bringUpServiceLocked(s, service.getFlags(), callerFg, false) != null) {
+ if (bringUpServiceLocked(s, service.getFlags(), callerFg, false,
+ permissionsReviewRequired) != null) {
return 0;
}
}
@@ -865,6 +1028,10 @@
return 1;
}
+ private void foo() {
+
+ }
+
void publishServiceLocked(ServiceRecord r, Intent intent, IBinder service) {
final long origId = Binder.clearCallingIdentity();
try {
@@ -1069,6 +1236,22 @@
}
r = smap.mServicesByName.get(name);
if (r == null && createIfNeeded) {
+ final long token = Binder.clearCallingIdentity();
+ try {
+ // Before going further -- if this app is not allowed to run in the
+ // background, then at this point we aren't going to let it period.
+ if (!mAm.checkAllowBackgroundLocked(sInfo.applicationInfo.uid,
+ sInfo.packageName, callingPid)) {
+ Slog.w(TAG, "Background execution not allowed: service "
+ + r.intent + " to " + name.flattenToShortString()
+ + " from pid=" + callingPid + " uid=" + callingUid
+ + " pkg=" + callingPackage);
+ return null;
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+
Intent.FilterComparison filter
= new Intent.FilterComparison(service.cloneFilter());
ServiceRestarter res = new ServiceRestarter();
@@ -1325,7 +1508,7 @@
return;
}
try {
- bringUpServiceLocked(r, r.intent.getIntent().getFlags(), r.createdFromFg, true);
+ bringUpServiceLocked(r, r.intent.getIntent().getFlags(), r.createdFromFg, true, false);
} catch (TransactionTooLargeException e) {
// Ignore, it's been logged and nothing upstack cares.
}
@@ -1369,8 +1552,9 @@
}
}
- private final String bringUpServiceLocked(ServiceRecord r, int intentFlags, boolean execInFg,
- boolean whileRestarting) throws TransactionTooLargeException {
+ private String bringUpServiceLocked(ServiceRecord r, int intentFlags, boolean execInFg,
+ boolean whileRestarting, boolean permissionsReviewRequired)
+ throws TransactionTooLargeException {
//Slog.i(TAG, "Bring up service:");
//r.dump(" ");
@@ -1456,7 +1640,7 @@
// Not running -- get it started, and enqueue this service record
// to be executed when the app comes up.
- if (app == null) {
+ if (app == null && !permissionsReviewRequired) {
if ((app=mAm.startProcessLocked(procName, r.appInfo, true, intentFlags,
"service", r.name, false, isolated, false)) == null) {
String msg = "Unable to launch app "
@@ -1879,6 +2063,9 @@
}
}
+ // If unbound while waiting to start, remove the pending service
+ mPendingServices.remove(s);
+
if ((c.flags&Context.BIND_AUTO_CREATE) != 0) {
boolean hasAutoCreate = s.hasAutoCreateConnections();
if (!hasAutoCreate) {
@@ -2921,5 +3108,4 @@
}
}
}
-
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java b/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java
index 16c959f..4f0d4d9 100644
--- a/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java
+++ b/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java
@@ -88,6 +88,7 @@
static final boolean DEBUG_VISIBILITY = DEBUG_ALL || false;
static final boolean DEBUG_VISIBLE_BEHIND = DEBUG_ALL_ACTIVITIES || false;
static final boolean DEBUG_USAGE_STATS = DEBUG_ALL || false;
+ static final boolean DEBUG_PERMISSIONS_REVIEW = DEBUG_ALL || false;
static final String POSTFIX_ADD_REMOVE = (APPEND_CATEGORY_NAME) ? "_AddRemove" : "";
static final String POSTFIX_APP = (APPEND_CATEGORY_NAME) ? "_App" : "";
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index cde126a..ef623eb 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -19,12 +19,6 @@
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
import static android.Manifest.permission.START_TASKS_FROM_RECENTS;
-import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
-import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
-import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
-import static android.app.ActivityManager.StackId.HOME_STACK_ID;
-import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
-import static android.app.ActivityManager.RESIZE_MODE_PRESERVE_WINDOW;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static com.android.internal.util.XmlUtils.readBooleanAttribute;
import static com.android.internal.util.XmlUtils.readIntAttribute;
@@ -34,10 +28,6 @@
import static com.android.internal.util.XmlUtils.writeLongAttribute;
import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
import static com.android.server.am.ActivityManagerDebugConfig.*;
-import static com.android.server.am.ActivityStackSupervisor.FORCE_FOCUS;
-import static com.android.server.am.ActivityStackSupervisor.ON_TOP;
-import static com.android.server.am.ActivityStackSupervisor.RESTORE_FROM_RECENTS;
-import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;
import static com.android.server.am.TaskRecord.INVALID_TASK_ID;
import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_DONT_LOCK;
import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;
@@ -45,8 +35,10 @@
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.START_TAG;
+import com.google.android.collect.Lists;
+import com.google.android.collect.Maps;
+
import android.Manifest;
-import android.app.ActivityManager.StackId;
import android.app.AppOpsManager;
import android.app.ApplicationThreadNative;
import android.app.BroadcastOptions;
@@ -60,7 +52,7 @@
import android.app.usage.UsageEvents;
import android.app.usage.UsageStatsManagerInternal;
import android.appwidget.AppWidgetManager;
-import android.content.pm.AppsQueryHelper;
+import android.content.pm.PackageManagerInternal;
import android.content.pm.PermissionInfo;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -69,29 +61,30 @@
import android.os.BatteryStats;
import android.os.PersistableBundle;
import android.os.PowerManager;
-import android.os.ResultReceiver;
import android.os.Trace;
import android.os.TransactionTooLargeException;
import android.os.WorkSource;
import android.os.storage.IMountService;
import android.os.storage.MountServiceInternal;
import android.os.storage.StorageManager;
-import android.provider.Settings.Global;
import android.service.voice.IVoiceInteractionSession;
import android.service.voice.VoiceInteractionSession;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.DebugUtils;
+import android.util.SparseIntArray;
import android.view.Display;
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.AssistUtils;
import com.android.internal.app.DumpHeapActivity;
+import com.android.internal.app.IAppOpsCallback;
import com.android.internal.app.IAppOpsService;
import com.android.internal.app.IVoiceInteractor;
import com.android.internal.app.ProcessMap;
import com.android.internal.app.ProcessStats;
+import com.android.internal.app.SystemUserHomeActivity;
import com.android.internal.os.BackgroundThread;
import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.IResultReceiver;
@@ -109,31 +102,25 @@
import com.android.server.IntentResolver;
import com.android.server.LocalServices;
import com.android.server.ServiceThread;
-import com.android.server.SystemConfig;
import com.android.server.SystemService;
import com.android.server.SystemServiceManager;
import com.android.server.Watchdog;
import com.android.server.am.ActivityStack.ActivityState;
-import com.android.server.am.ActivityStackSupervisor.ActivityDisplay;
import com.android.server.firewall.IntentFirewall;
import com.android.server.pm.Installer;
-import com.android.server.pm.UserManagerService;
import com.android.server.statusbar.StatusBarManagerInternal;
import com.android.server.wm.AppTransition;
import com.android.server.wm.WindowManagerService;
-import com.google.android.collect.Lists;
-import com.google.android.collect.Maps;
-
-import libcore.io.IoUtils;
-import libcore.util.EmptyArray;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
+import android.Manifest;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningTaskInfo;
+import android.app.ActivityManager.StackId;
import android.app.ActivityManager.StackInfo;
import android.app.ActivityManager.TaskThumbnailInfo;
import android.app.ActivityManagerInternal;
@@ -143,24 +130,37 @@
import android.app.ActivityThread;
import android.app.AlertDialog;
import android.app.AppGlobals;
+import android.app.AppOpsManager;
import android.app.ApplicationErrorReport;
+import android.app.ApplicationThreadNative;
+import android.app.BroadcastOptions;
import android.app.Dialog;
+import android.app.IActivityContainer;
+import android.app.IActivityContainerCallback;
import android.app.IActivityController;
+import android.app.IAppTask;
import android.app.IApplicationThread;
import android.app.IInstrumentationWatcher;
import android.app.INotificationManager;
import android.app.IProcessObserver;
import android.app.IServiceConnection;
import android.app.IStopUserCallback;
-import android.app.IUidObserver;
+import android.app.ITaskStackListener;
import android.app.IUiAutomationConnection;
+import android.app.IUidObserver;
import android.app.IUserSwitchObserver;
import android.app.Instrumentation;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
-import android.app.backup.IBackupManager;
+import android.app.ProfilerInfo;
import android.app.admin.DevicePolicyManager;
+import android.app.assist.AssistContent;
+import android.app.assist.AssistStructure;
+import android.app.backup.IBackupManager;
+import android.app.usage.UsageEvents;
+import android.app.usage.UsageStatsManagerInternal;
+import android.appwidget.AppWidgetManager;
import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.ClipData;
@@ -184,18 +184,24 @@
import android.content.pm.InstrumentationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.ParceledListSlice;
-import android.content.pm.UserInfo;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ParceledListSlice;
import android.content.pm.PathPermission;
+import android.content.pm.PermissionInfo;
import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
+import android.content.pm.UserInfo;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Point;
+import android.graphics.Rect;
import android.net.Proxy;
import android.net.ProxyInfo;
import android.net.Uri;
+import android.os.BatteryStats;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
@@ -213,22 +219,37 @@
import android.os.Message;
import android.os.Parcel;
import android.os.ParcelFileDescriptor;
+import android.os.PersistableBundle;
+import android.os.PowerManager;
import android.os.PowerManagerInternal;
import android.os.Process;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
+import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.StrictMode;
import android.os.SystemClock;
import android.os.SystemProperties;
+import android.os.Trace;
+import android.os.TransactionTooLargeException;
import android.os.UpdateLock;
import android.os.UserHandle;
import android.os.UserManager;
+import android.os.WorkSource;
+import android.os.storage.IMountService;
+import android.os.storage.MountServiceInternal;
+import android.os.storage.StorageManager;
import android.provider.Settings;
+import android.service.voice.IVoiceInteractionSession;
+import android.service.voice.VoiceInteractionSession;
import android.text.format.DateUtils;
import android.text.format.Time;
+import android.util.ArrayMap;
+import android.util.ArraySet;
import android.util.AtomicFile;
+import android.util.DebugUtils;
import android.util.EventLog;
+import android.util.LocaleList;
import android.util.Log;
import android.util.Pair;
import android.util.PrintWriterPrinter;
@@ -236,13 +257,12 @@
import android.util.SparseArray;
import android.util.TimeUtils;
import android.util.Xml;
+import android.view.Display;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
-import dalvik.system.VMRuntime;
-
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
@@ -272,6 +292,100 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
+import dalvik.system.VMRuntime;
+import libcore.io.IoUtils;
+import libcore.util.EmptyArray;
+
+import static android.Manifest.permission.INTERACT_ACROSS_USERS;
+import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
+import static android.Manifest.permission.START_TASKS_FROM_RECENTS;
+import static android.app.ActivityManager.RESIZE_MODE_PRESERVE_WINDOW;
+import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
+import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
+import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
+import static android.app.ActivityManager.StackId.HOME_STACK_ID;
+import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
+import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.provider.Settings.Global.ALWAYS_FINISH_ACTIVITIES;
+import static android.provider.Settings.Global.DEBUG_APP;
+import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES;
+import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RTL;
+import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER;
+import static com.android.internal.util.XmlUtils.readBooleanAttribute;
+import static com.android.internal.util.XmlUtils.readIntAttribute;
+import static com.android.internal.util.XmlUtils.readLongAttribute;
+import static com.android.internal.util.XmlUtils.writeBooleanAttribute;
+import static com.android.internal.util.XmlUtils.writeIntAttribute;
+import static com.android.internal.util.XmlUtils.writeLongAttribute;
+import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKUP;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST_BACKGROUND;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BROADCAST_LIGHT;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CLEANUP;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CONFIGURATION;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_FOCUS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_IMMERSIVE;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKSCREEN;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LRU;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_MU;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_OOM_ADJ;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER_QUICK;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESSES;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESS_OBSERVERS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROVIDER;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PSS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_RECENTS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SERVICE;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_STACK;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SWITCH;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_UID_OBSERVERS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_URI_PERMISSION;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_USAGE_STATS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBILITY;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBLE_BEHIND;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BACKUP;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BROADCAST;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_CLEANUP;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_CONFIGURATION;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_FOCUS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_IMMERSIVE;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKSCREEN;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKTASK;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LRU;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_MU;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_OOM_ADJ;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_POWER;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROCESSES;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROCESS_OBSERVERS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROVIDER;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PSS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_RECENTS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_SERVICE;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_STACK;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_SWITCH;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_UID_OBSERVERS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_URI_PERMISSION;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_VISIBILITY;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_VISIBLE_BEHIND;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
+import static com.android.server.am.ActivityStackSupervisor.FORCE_FOCUS;
+import static com.android.server.am.ActivityStackSupervisor.ON_TOP;
+import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;
+import static com.android.server.am.ActivityStackSupervisor.RESTORE_FROM_RECENTS;
+import static com.android.server.am.TaskRecord.INVALID_TASK_ID;
+import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_DONT_LOCK;
+import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE_PRIV;
+import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_PINNABLE;
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+import static org.xmlpull.v1.XmlPullParser.START_TAG;
+
public final class ActivityManagerService extends ActivityManagerNative
implements Watchdog.Monitor, BatteryStatsImpl.BatteryCallback {
@@ -388,6 +502,10 @@
// Maximum number of users we allow to be running at a time.
static final int MAX_RUNNING_USERS = 3;
+ // This is the amount of time we allow an app to settle after it goes into the background,
+ // before we start restricting what it can do.
+ static final int BACKGROUND_SETTLE_TIME = 1*60*1000;
+
// How long to wait in getAssistContextExtras for the activity and foreground services
// to respond with the result.
static final int PENDING_ASSIST_EXTRAS_TIMEOUT = 500;
@@ -716,6 +834,12 @@
final SparseArray<UidRecord> mActiveUids = new SparseArray<>();
/**
+ * This is for verifying the UID report flow.
+ */
+ static final boolean VALIDATE_UID_STATES = true;
+ final SparseArray<UidRecord> mValidateUids = new SparseArray<>();
+
+ /**
* Packages that the user has asked to have run in screen size
* compatibility mode instead of filling the screen.
*/
@@ -1204,7 +1328,9 @@
String mOrigDebugApp = null;
boolean mOrigWaitForDebugger = false;
boolean mAlwaysFinishActivities = false;
- boolean mForceResizableActivites;
+ boolean mForceResizableActivities;
+ boolean mSupportsFreeformWindowManagement;
+ boolean mTakeFullscreenScreenshots;
IActivityController mController = null;
String mProfileApp = null;
ProcessRecord mProfileProc = null;
@@ -1310,29 +1436,29 @@
}
}
- static final int SHOW_ERROR_MSG = 1;
- static final int SHOW_NOT_RESPONDING_MSG = 2;
- static final int SHOW_FACTORY_ERROR_MSG = 3;
+ static final int SHOW_ERROR_UI_MSG = 1;
+ static final int SHOW_NOT_RESPONDING_UI_MSG = 2;
+ static final int SHOW_FACTORY_ERROR_UI_MSG = 3;
static final int UPDATE_CONFIGURATION_MSG = 4;
static final int GC_BACKGROUND_PROCESSES_MSG = 5;
- static final int WAIT_FOR_DEBUGGER_MSG = 6;
+ static final int WAIT_FOR_DEBUGGER_UI_MSG = 6;
static final int SERVICE_TIMEOUT_MSG = 12;
static final int UPDATE_TIME_ZONE = 13;
- static final int SHOW_UID_ERROR_MSG = 14;
- static final int SHOW_FINGERPRINT_ERROR_MSG = 15;
+ static final int SHOW_UID_ERROR_UI_MSG = 14;
+ static final int SHOW_FINGERPRINT_ERROR_UI_MSG = 15;
static final int PROC_START_TIMEOUT_MSG = 20;
static final int DO_PENDING_ACTIVITY_LAUNCHES_MSG = 21;
static final int KILL_APPLICATION_MSG = 22;
static final int FINALIZE_PENDING_INTENT_MSG = 23;
static final int POST_HEAVY_NOTIFICATION_MSG = 24;
static final int CANCEL_HEAVY_NOTIFICATION_MSG = 25;
- static final int SHOW_STRICT_MODE_VIOLATION_MSG = 26;
+ static final int SHOW_STRICT_MODE_VIOLATION_UI_MSG = 26;
static final int CHECK_EXCESSIVE_WAKE_LOCKS_MSG = 27;
static final int CLEAR_DNS_CACHE_MSG = 28;
static final int UPDATE_HTTP_PROXY_MSG = 29;
- static final int SHOW_COMPAT_MODE_DIALOG_MSG = 30;
- static final int DISPATCH_PROCESSES_CHANGED = 31;
- static final int DISPATCH_PROCESS_DIED = 32;
+ static final int SHOW_COMPAT_MODE_DIALOG_UI_MSG = 30;
+ static final int DISPATCH_PROCESSES_CHANGED_UI_MSG = 31;
+ static final int DISPATCH_PROCESS_DIED_UI_MSG = 32;
static final int REPORT_MEM_USAGE_MSG = 33;
static final int REPORT_USER_SWITCH_MSG = 34;
static final int CONTINUE_USER_SWITCH_MSG = 35;
@@ -1346,20 +1472,21 @@
static final int SYSTEM_USER_CURRENT_MSG = 43;
static final int ENTER_ANIMATION_COMPLETE_MSG = 44;
static final int FINISH_BOOTING_MSG = 45;
- static final int START_USER_SWITCH_MSG = 46;
+ static final int START_USER_SWITCH_UI_MSG = 46;
static final int SEND_LOCALE_TO_MOUNT_DAEMON_MSG = 47;
- static final int DISMISS_DIALOG_MSG = 48;
+ static final int DISMISS_DIALOG_UI_MSG = 48;
static final int NOTIFY_TASK_STACK_CHANGE_LISTENERS_MSG = 49;
static final int NOTIFY_CLEARTEXT_NETWORK_MSG = 50;
static final int POST_DUMP_HEAP_NOTIFICATION_MSG = 51;
static final int DELETE_DUMPHEAP_MSG = 52;
static final int FOREGROUND_PROFILE_CHANGED_MSG = 53;
- static final int DISPATCH_UIDS_CHANGED_MSG = 54;
+ static final int DISPATCH_UIDS_CHANGED_UI_MSG = 54;
static final int REPORT_TIME_TRACKER_MSG = 55;
static final int REPORT_USER_SWITCH_COMPLETE_MSG = 56;
static final int SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG = 57;
static final int APP_BOOST_DEACTIVATE_MSG = 58;
static final int CONTENT_PROVIDER_PUBLISH_TIMEOUT_MSG = 59;
+ static final int IDLE_UIDS_MSG = 60;
static final int FIRST_ACTIVITY_STACK_MSG = 100;
static final int FIRST_BROADCAST_QUEUE_MSG = 200;
@@ -1386,6 +1513,8 @@
final MainHandler mHandler;
final UiHandler mUiHandler;
+ PackageManagerInternal mPackageManagerInt;
+
final class UiHandler extends Handler {
public UiHandler() {
super(com.android.server.UiThread.get().getLooper(), null, true);
@@ -1394,7 +1523,7 @@
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
- case SHOW_ERROR_MSG: {
+ case SHOW_ERROR_UI_MSG: {
HashMap<String, Object> data = (HashMap<String, Object>) msg.obj;
boolean showBackground = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0;
@@ -1439,7 +1568,7 @@
ensureBootCompleted();
} break;
- case SHOW_NOT_RESPONDING_MSG: {
+ case SHOW_NOT_RESPONDING_UI_MSG: {
synchronized (ActivityManagerService.this) {
HashMap<String, Object> data = (HashMap<String, Object>) msg.obj;
ProcessRecord proc = (ProcessRecord)data.get("app");
@@ -1471,7 +1600,7 @@
ensureBootCompleted();
} break;
- case SHOW_STRICT_MODE_VIOLATION_MSG: {
+ case SHOW_STRICT_MODE_VIOLATION_UI_MSG: {
HashMap<String, Object> data = (HashMap<String, Object>) msg.obj;
synchronized (ActivityManagerService.this) {
ProcessRecord proc = (ProcessRecord) data.get("app");
@@ -1497,13 +1626,13 @@
}
ensureBootCompleted();
} break;
- case SHOW_FACTORY_ERROR_MSG: {
+ case SHOW_FACTORY_ERROR_UI_MSG: {
Dialog d = new FactoryErrorDialog(
mContext, msg.getData().getCharSequence("msg"));
d.show();
ensureBootCompleted();
} break;
- case WAIT_FOR_DEBUGGER_MSG: {
+ case WAIT_FOR_DEBUGGER_UI_MSG: {
synchronized (ActivityManagerService.this) {
ProcessRecord app = (ProcessRecord)msg.obj;
if (msg.arg1 != 0) {
@@ -1523,7 +1652,7 @@
}
}
} break;
- case SHOW_UID_ERROR_MSG: {
+ case SHOW_UID_ERROR_UI_MSG: {
if (mShowDialogs) {
AlertDialog d = new BaseErrorDialog(mContext);
d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
@@ -1531,11 +1660,11 @@
d.setTitle(mContext.getText(R.string.android_system_label));
d.setMessage(mContext.getText(R.string.system_error_wipe_data));
d.setButton(DialogInterface.BUTTON_POSITIVE, mContext.getText(R.string.ok),
- obtainMessage(DISMISS_DIALOG_MSG, d));
+ obtainMessage(DISMISS_DIALOG_UI_MSG, d));
d.show();
}
} break;
- case SHOW_FINGERPRINT_ERROR_MSG: {
+ case SHOW_FINGERPRINT_ERROR_UI_MSG: {
if (mShowDialogs) {
AlertDialog d = new BaseErrorDialog(mContext);
d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
@@ -1543,11 +1672,11 @@
d.setTitle(mContext.getText(R.string.android_system_label));
d.setMessage(mContext.getText(R.string.system_error_manufacturer));
d.setButton(DialogInterface.BUTTON_POSITIVE, mContext.getText(R.string.ok),
- obtainMessage(DISMISS_DIALOG_MSG, d));
+ obtainMessage(DISMISS_DIALOG_UI_MSG, d));
d.show();
}
} break;
- case SHOW_COMPAT_MODE_DIALOG_MSG: {
+ case SHOW_COMPAT_MODE_DIALOG_UI_MSG: {
synchronized (ActivityManagerService.this) {
ActivityRecord ar = (ActivityRecord) msg.obj;
if (mCompatModeDialog != null) {
@@ -1575,26 +1704,26 @@
}
break;
}
- case START_USER_SWITCH_MSG: {
- mUserController.showUserSwitchDialog(msg.arg1, (String) msg.obj);
+ case START_USER_SWITCH_UI_MSG: {
+ mUserController.showUserSwitchDialog((Pair<UserInfo, UserInfo>) msg.obj);
break;
}
- case DISMISS_DIALOG_MSG: {
+ case DISMISS_DIALOG_UI_MSG: {
final Dialog d = (Dialog) msg.obj;
d.dismiss();
break;
}
- case DISPATCH_PROCESSES_CHANGED: {
+ case DISPATCH_PROCESSES_CHANGED_UI_MSG: {
dispatchProcessesChanged();
break;
}
- case DISPATCH_PROCESS_DIED: {
+ case DISPATCH_PROCESS_DIED_UI_MSG: {
final int pid = msg.arg1;
final int uid = msg.arg2;
dispatchProcessDied(pid, uid);
break;
}
- case DISPATCH_UIDS_CHANGED_MSG: {
+ case DISPATCH_UIDS_CHANGED_UI_MSG: {
dispatchUidsChanged();
} break;
}
@@ -2046,7 +2175,7 @@
// it is finished we make sure it is reset to its default.
mUserIsMonkey = false;
} break;
- case APP_BOOST_DEACTIVATE_MSG : {
+ case APP_BOOST_DEACTIVATE_MSG: {
synchronized(ActivityManagerService.this) {
if (mIsBoosted) {
if (mBoostStartTime < (SystemClock.uptimeMillis() - APP_BOOST_TIMEOUT)) {
@@ -2060,6 +2189,9 @@
}
}
} break;
+ case IDLE_UIDS_MSG: {
+ idleUids();
+ } break;
}
}
};
@@ -2352,6 +2484,17 @@
mProcessStats = new ProcessStatsService(this, new File(systemDir, "procstats"));
mAppOpsService = new AppOpsService(new File(systemDir, "appops.xml"), mHandler);
+ mAppOpsService.startWatchingMode(AppOpsManager.OP_RUN_IN_BACKGROUND, null,
+ new IAppOpsCallback.Stub() {
+ @Override public void opChanged(int op, int uid, String packageName) {
+ if (op == AppOpsManager.OP_RUN_IN_BACKGROUND && packageName != null) {
+ if (mAppOpsService.checkOperation(op, uid, packageName)
+ != AppOpsManager.MODE_ALLOWED) {
+ runInBackgroundDisabled(uid);
+ }
+ }
+ }
+ });
mGrantFile = new AtomicFile(new File(systemDir, "urigrants.xml"));
@@ -2363,7 +2506,7 @@
mTrackingAssociations = "1".equals(SystemProperties.get("debug.track-associations"));
mConfiguration.setToDefaults();
- mConfiguration.setLocale(Locale.getDefault());
+ mConfiguration.setLocales(LocaleList.getDefault());
mConfigurationSeq = mConfiguration.seq = 1;
mProcessCpuTracker.init();
@@ -2628,57 +2771,60 @@
}
final void setFocusedActivityLocked(ActivityRecord r, String reason) {
- if (r != null && mFocusedActivity != r) {
- if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "setFocusedActivityLocked: r=" + r);
- ActivityRecord last = mFocusedActivity;
- mFocusedActivity = r;
- if (r.task.taskType != ActivityRecord.HOME_ACTIVITY_TYPE
- && r.task.taskType != ActivityRecord.RECENTS_ACTIVITY_TYPE) {
- if (mCurAppTimeTracker != r.appTimeTracker) {
- // We are switching app tracking. Complete the current one.
- if (mCurAppTimeTracker != null) {
- mCurAppTimeTracker.stop();
- mHandler.obtainMessage(REPORT_TIME_TRACKER_MSG,
- mCurAppTimeTracker).sendToTarget();
- mStackSupervisor.clearOtherAppTimeTrackers(r.appTimeTracker);
- mCurAppTimeTracker = null;
- }
- if (r.appTimeTracker != null) {
- mCurAppTimeTracker = r.appTimeTracker;
- startTimeTrackingFocusedActivityLocked();
- }
- } else {
+ if (r == null || mFocusedActivity == r) {
+ return;
+ }
+
+ if (DEBUG_FOCUS) Slog.d(TAG_FOCUS, "setFocusedActivityLocked: r=" + r);
+ final ActivityRecord last = mFocusedActivity;
+ mFocusedActivity = r;
+ if (r.task.isApplicationTask()) {
+ if (mCurAppTimeTracker != r.appTimeTracker) {
+ // We are switching app tracking. Complete the current one.
+ if (mCurAppTimeTracker != null) {
+ mCurAppTimeTracker.stop();
+ mHandler.obtainMessage(
+ REPORT_TIME_TRACKER_MSG, mCurAppTimeTracker).sendToTarget();
+ mStackSupervisor.clearOtherAppTimeTrackers(r.appTimeTracker);
+ mCurAppTimeTracker = null;
+ }
+ if (r.appTimeTracker != null) {
+ mCurAppTimeTracker = r.appTimeTracker;
startTimeTrackingFocusedActivityLocked();
}
} else {
- r.appTimeTracker = null;
+ startTimeTrackingFocusedActivityLocked();
}
- if (r.task != null && r.task.voiceInteractor != null) {
- startRunningVoiceLocked(r.task.voiceSession, r.info.applicationInfo.uid);
- } else {
- finishRunningVoiceLocked();
- if (last != null && last.task.voiceSession != null) {
- // We had been in a voice interaction session, but now focused has
- // move to something different. Just finish the session, we can't
- // return to it and retain the proper state and synchronization with
- // the voice interaction service.
- finishVoiceTask(last.task.voiceSession);
- }
- }
- if (mStackSupervisor.setFocusedStack(r, reason + " setFocusedActivity")) {
- mWindowManager.setFocusedApp(r.appToken, true);
- }
- applyUpdateLockStateLocked(r);
- if (mFocusedActivity.userId != mLastFocusedUserId) {
- mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG);
- mHandler.sendMessage(mHandler.obtainMessage(FOREGROUND_PROFILE_CHANGED_MSG,
- mFocusedActivity.userId, 0));
- mLastFocusedUserId = mFocusedActivity.userId;
+ } else {
+ r.appTimeTracker = null;
+ }
+ if (r.task.voiceInteractor != null) {
+ startRunningVoiceLocked(r.task.voiceSession, r.info.applicationInfo.uid);
+ } else {
+ finishRunningVoiceLocked();
+ if (last != null && last.task.voiceSession != null) {
+ // We had been in a voice interaction session, but now focused has
+ // move to something different. Just finish the session, we can't
+ // return to it and retain the proper state and synchronization with
+ // the voice interaction service.
+ finishVoiceTask(last.task.voiceSession);
}
}
- EventLog.writeEvent(EventLogTags.AM_FOCUSED_ACTIVITY,
+ if (mStackSupervisor.setFocusedStack(r, reason + " setFocusedActivity")) {
+ mWindowManager.setFocusedApp(r.appToken, true);
+ }
+ applyUpdateLockStateLocked(r);
+ if (mFocusedActivity.userId != mLastFocusedUserId) {
+ mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG);
+ mHandler.obtainMessage(
+ FOREGROUND_PROFILE_CHANGED_MSG, mFocusedActivity.userId, 0).sendToTarget();
+ mLastFocusedUserId = mFocusedActivity.userId;
+ }
+
+ EventLogTags.writeAmFocusedActivity(
mFocusedActivity == null ? -1 : mFocusedActivity.userId,
- mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName);
+ mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName,
+ reason);
}
final void clearFocusedActivity(ActivityRecord r) {
@@ -2694,7 +2840,7 @@
}
}
mFocusedActivity = null;
- EventLog.writeEvent(EventLogTags.AM_FOCUSED_ACTIVITY, -1, "NULL");
+ EventLogTags.writeAmFocusedActivity(-1, "NULL", "clearFocusedActivity");
}
}
@@ -2766,7 +2912,7 @@
final void showAskCompatModeDialogLocked(ActivityRecord r) {
Message msg = Message.obtain();
- msg.what = SHOW_COMPAT_MODE_DIALOG_MSG;
+ msg.what = SHOW_COMPAT_MODE_DIALOG_UI_MSG;
msg.obj = r.task.askedCompatMode ? null : r;
mUiHandler.sendMessage(msg);
}
@@ -3271,10 +3417,8 @@
try {
try {
- if (AppGlobals.getPackageManager().isPackageFrozen(app.info.packageName)) {
- // This is caught below as if we had failed to fork zygote
- throw new RuntimeException("Package " + app.info.packageName + " is frozen!");
- }
+ final int userId = UserHandle.getUserId(app.uid);
+ AppGlobals.getPackageManager().checkPackageStartable(app.info.packageName, userId);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
@@ -3337,15 +3481,6 @@
if ("1".equals(SystemProperties.get("debug.checkjni"))) {
debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;
}
- String jitDebugProperty = SystemProperties.get("debug.usejit");
- if ("true".equals(jitDebugProperty)) {
- debugFlags |= Zygote.DEBUG_ENABLE_JIT;
- } else if (!"false".equals(jitDebugProperty)) {
- // If we didn't force disable by setting false, defer to the dalvik vm options.
- if ("true".equals(SystemProperties.get("dalvik.vm.usejit"))) {
- debugFlags |= Zygote.DEBUG_ENABLE_JIT;
- }
- }
String genDebugInfoProperty = SystemProperties.get("debug.generate-debug-info");
if ("true".equals(genDebugInfoProperty)) {
debugFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;
@@ -3797,8 +3932,10 @@
for (int i=0; i<N; i++) {
final UidRecord.ChangeItem change = mPendingUidChanges.get(i);
mActiveUidChanges[i] = change;
- change.uidRecord.pendingChange = null;
- change.uidRecord = null;
+ if (change.uidRecord != null) {
+ change.uidRecord.pendingChange = null;
+ change.uidRecord = null;
+ }
}
mPendingUidChanges.clear();
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
@@ -3808,7 +3945,8 @@
if (mLocalPowerManager != null) {
for (int j=0; j<N; j++) {
UidRecord.ChangeItem item = mActiveUidChanges[j];
- if (item.gone) {
+ if (item.change == UidRecord.CHANGE_GONE
+ || item.change == UidRecord.CHANGE_GONE_IDLE) {
mLocalPowerManager.uidGone(item.uid);
} else {
mLocalPowerManager.updateUidProcState(item.uid, item.processState);
@@ -3820,19 +3958,66 @@
while (i > 0) {
i--;
final IUidObserver observer = mUidObservers.getBroadcastItem(i);
+ final int which = (Integer)mUidObservers.getBroadcastCookie(i);
if (observer != null) {
try {
for (int j=0; j<N; j++) {
UidRecord.ChangeItem item = mActiveUidChanges[j];
- if (item.gone) {
- if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
- "UID gone uid=" + item.uid);
- observer.onUidGone(item.uid);
+ final int change = item.change;
+ UidRecord validateUid = null;
+ if (VALIDATE_UID_STATES && i == 0) {
+ validateUid = mValidateUids.get(item.uid);
+ if (validateUid == null && change != UidRecord.CHANGE_GONE
+ && change != UidRecord.CHANGE_GONE_IDLE) {
+ validateUid = new UidRecord(item.uid);
+ mValidateUids.put(item.uid, validateUid);
+ }
+ }
+ if (change == UidRecord.CHANGE_IDLE
+ || change == UidRecord.CHANGE_GONE_IDLE) {
+ if ((which & ActivityManager.UID_OBSERVER_IDLE) != 0) {
+ if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
+ "UID idle uid=" + item.uid);
+ observer.onUidIdle(item.uid);
+ }
+ if (VALIDATE_UID_STATES && i == 0) {
+ if (validateUid != null) {
+ validateUid.idle = true;
+ }
+ }
+ } else if (change == UidRecord.CHANGE_ACTIVE) {
+ if ((which & ActivityManager.UID_OBSERVER_ACTIVE) != 0) {
+ if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
+ "UID active uid=" + item.uid);
+ observer.onUidActive(item.uid);
+ }
+ if (VALIDATE_UID_STATES && i == 0) {
+ validateUid.idle = false;
+ }
+ }
+ if (change == UidRecord.CHANGE_GONE
+ || change == UidRecord.CHANGE_GONE_IDLE) {
+ if ((which & ActivityManager.UID_OBSERVER_GONE) != 0) {
+ if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
+ "UID gone uid=" + item.uid);
+ observer.onUidGone(item.uid);
+ }
+ if (VALIDATE_UID_STATES && i == 0) {
+ if (validateUid != null) {
+ mValidateUids.remove(item.uid);
+ }
+ }
} else {
- if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
- "UID CHANGED uid=" + item.uid
- + ": " + item.processState);
- observer.onUidStateChanged(item.uid, item.processState);
+ if ((which & ActivityManager.UID_OBSERVER_PROCSTATE) != 0) {
+ if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
+ "UID CHANGED uid=" + item.uid
+ + ": " + item.processState);
+ observer.onUidStateChanged(item.uid, item.processState);
+ }
+ if (VALIDATE_UID_STATES && i == 0) {
+ validateUid.curProcState = validateUid.setProcState
+ = item.processState;
+ }
}
}
} catch (RemoteException e) {
@@ -4191,11 +4376,13 @@
if (launchStackId != INVALID_STACK_ID) {
if (launchStackId == DOCKED_STACK_ID && bOptions != null) {
ActivityOptions activityOptions = new ActivityOptions(bOptions);
- mWindowManager.setDockedStackCreateMode(activityOptions.getDockCreateMode());
+ mWindowManager.setDockedStackCreateState(activityOptions.getDockCreateMode(),
+ null /* initialBounds */);
}
if (task.stack.mStackId != launchStackId) {
mStackSupervisor.moveTaskToStackLocked(
- taskId, launchStackId, ON_TOP, FORCE_FOCUS, "startActivityFromRecents");
+ taskId, launchStackId, ON_TOP, FORCE_FOCUS, "startActivityFromRecents",
+ true /* animate */);
}
}
@@ -4271,8 +4458,10 @@
if (r == null) {
return;
}
- if (r.task != null && r.task.mResizeable) {
- // Fixed screen orientation isn't supported with resizeable activities.
+ TaskRecord task = r.task;
+ if (task != null && (!task.mFullscreen || !task.stack.mFullscreen)) {
+ // Fixed screen orientation isn't supported when activities aren't in full screen
+ // mode.
return;
}
final long origId = Binder.clearCallingIdentity();
@@ -5102,7 +5291,7 @@
// Bring up the infamous App Not Responding dialog
Message msg = Message.obtain();
HashMap<String, Object> map = new HashMap<String, Object>();
- msg.what = SHOW_NOT_RESPONDING_MSG;
+ msg.what = SHOW_NOT_RESPONDING_UI_MSG;
msg.obj = map;
msg.arg1 = aboveSystem ? 1 : 0;
map.put("app", app);
@@ -5200,6 +5389,11 @@
removeUriPermissionsForPackageLocked(packageName, userId, true);
}
+ // Remove all zen rules created by this package; revoke it's zen access.
+ INotificationManager inm = NotificationManager.getService();
+ inm.removeAutomaticZenRules(packageName);
+ inm.setNotificationPolicyAccessGranted(packageName, false);
+
Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED,
Uri.fromParts("package", packageName, null));
intent.putExtra(Intent.EXTRA_UID, pkgUid);
@@ -5881,8 +6075,10 @@
// No more processes using this uid, tell clients it is gone.
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
"No more processes in " + old.uidRecord);
- enqueueUidChangeLocked(old.uidRecord, true);
+ enqueueUidChangeLocked(old.uidRecord, -1, UidRecord.CHANGE_GONE);
mActiveUids.remove(uid);
+ mBatteryStatsService.noteUidProcessState(uid,
+ ActivityManager.PROCESS_STATE_NONEXISTENT);
}
old.uidRecord = null;
}
@@ -5907,7 +6103,8 @@
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
"Creating new process uid: " + uidRec);
mActiveUids.put(proc.uid, uidRec);
- enqueueUidChangeLocked(uidRec, false);
+ mBatteryStatsService.noteUidProcessState(uidRec.uid, uidRec.curProcState);
+ enqueueUidChangeLocked(uidRec, -1, UidRecord.CHANGE_ACTIVE);
}
proc.uidRecord = uidRec;
uidRec.numProcs++;
@@ -6715,9 +6912,11 @@
if (type == ActivityManager.INTENT_SENDER_ACTIVITY_RESULT) {
activity = ActivityRecord.isInStackLocked(token);
if (activity == null) {
+ Slog.w(TAG, "Failed createPendingResult: activity " + token + " not in any stack");
return null;
}
if (activity.finishing) {
+ Slog.w(TAG, "Failed createPendingResult: activity " + activity + " is finishing");
return null;
}
}
@@ -7018,22 +7217,40 @@
@Override
public void getProcessStatesFromPids(/*in*/ int[] pids, /*out*/ int[] states) {
- mActivityManagerService.getProcessStatesForPIDs(/*in*/ pids, /*out*/ states);
+ mActivityManagerService.getProcessStatesAndOomScoresForPIDs(
+ /*in*/ pids, /*out*/ states, null);
+ }
+
+ @Override
+ public void getProcessStatesAndOomScoresFromPids(
+ /*in*/ int[] pids, /*out*/ int[] states, /*out*/ int[] scores) {
+ mActivityManagerService.getProcessStatesAndOomScoresForPIDs(
+ /*in*/ pids, /*out*/ states, /*out*/ scores);
}
}
/**
* For each PID in the given input array, write the current process state
- * for that process into the output array, or -1 to indicate that no
- * process with the given PID exists.
+ * for that process into the states array, or -1 to indicate that no
+ * process with the given PID exists. If scores array is provided, write
+ * the oom score for the process into the scores array, with INVALID_ADJ
+ * indicating the PID doesn't exist.
*/
- public void getProcessStatesForPIDs(/*in*/ int[] pids, /*out*/ int[] states) {
+ public void getProcessStatesAndOomScoresForPIDs(
+ /*in*/ int[] pids, /*out*/ int[] states, /*out*/ int[] scores) {
+ if (scores != null) {
+ enforceCallingPermission(android.Manifest.permission.GET_PROCESS_STATE_AND_OOM_SCORE,
+ "getProcessStatesAndOomScoresForPIDs()");
+ }
+
if (pids == null) {
throw new NullPointerException("pids");
} else if (states == null) {
throw new NullPointerException("states");
} else if (pids.length != states.length) {
- throw new IllegalArgumentException("input and output arrays have different lengths!");
+ throw new IllegalArgumentException("pids and states arrays have different lengths!");
+ } else if (scores != null && pids.length != scores.length) {
+ throw new IllegalArgumentException("pids and scores arrays have different lengths!");
}
synchronized (mPidsSelfLocked) {
@@ -7041,6 +7258,9 @@
ProcessRecord pr = mPidsSelfLocked.get(pids[i]);
states[i] = (pr == null) ? ActivityManager.PROCESS_STATE_NONEXISTENT :
pr.curProcState;
+ if (scores != null) {
+ scores[i] = (pr == null) ? ProcessList.INVALID_ADJ : pr.curAdj;
+ }
}
}
}
@@ -7269,6 +7489,36 @@
return readMet && writeMet;
}
+ public int getAppStartMode(int uid, String packageName) {
+ synchronized (this) {
+ boolean bg = checkAllowBackgroundLocked(uid, packageName, -1);
+ return bg ? ActivityManager.APP_START_MODE_NORMAL
+ : ActivityManager.APP_START_MODE_DISABLED;
+ }
+ }
+
+ boolean checkAllowBackgroundLocked(int uid, String packageName, int callingPid) {
+ UidRecord uidRec = mActiveUids.get(uid);
+ if (uidRec == null || uidRec.idle) {
+ if (callingPid >= 0) {
+ ProcessRecord proc;
+ synchronized (mPidsSelfLocked) {
+ proc = mPidsSelfLocked.get(callingPid);
+ }
+ if (proc != null && proc.curProcState < ActivityManager.PROCESS_STATE_RECEIVER) {
+ // Whoever is instigating this is in the foreground, so we will allow it
+ // to go through.
+ return true;
+ }
+ }
+ if (mAppOpsService.noteOperation(AppOpsManager.OP_RUN_IN_BACKGROUND, uid, packageName)
+ != AppOpsManager.MODE_ALLOWED) {
+ return false;
+ }
+ }
+ return true;
+ }
+
private ProviderInfo getProviderInfoLocked(String authority, int userHandle) {
ProviderInfo pi = null;
ContentProviderRecord cpr = mProviderMap.getProviderByName(authority, userHandle);
@@ -8268,7 +8518,7 @@
if (app == null) return;
Message msg = Message.obtain();
- msg.what = WAIT_FOR_DEBUGGER_MSG;
+ msg.what = WAIT_FOR_DEBUGGER_UI_MSG;
msg.obj = app;
msg.arg1 = waiting ? 1 : 0;
mUiHandler.sendMessage(msg);
@@ -8649,6 +8899,7 @@
}
if (task.mResizeable != resizeable) {
task.mResizeable = resizeable;
+ mWindowManager.setTaskResizeable(taskId, resizeable);
mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
mStackSupervisor.resumeTopActivitiesLocked();
}
@@ -8667,6 +8918,16 @@
Slog.w(TAG, "resizeTask: taskId=" + taskId + " not found");
return;
}
+ int stackId = task.stack.mStackId;
+ // First, check if this is a non-resizeble task in docked stack or if the task size
+ // is affected by the docked stack changing size. If so, instead of resizing, we
+ // can only scroll the task. No need to update configuration.
+ if (bounds != null && !task.mResizeable
+ && mStackSupervisor.isStackDockedInEffect(stackId)) {
+ mWindowManager.scrollTask(task.taskId, bounds);
+ return;
+ }
+
// Place the task in the right stack if it isn't there already based on
// the requested bounds.
// The stack transition logic is:
@@ -8674,7 +8935,6 @@
// - a non-null bounds on a non-freeform (fullscreen OR docked) task moves
// that task to freeform
// - otherwise the task is not moved
- int stackId = task.stack.mStackId;
if (!StackId.isTaskResizeAllowed(stackId)) {
throw new IllegalArgumentException("resizeTask not allowed on task=" + task);
}
@@ -8732,12 +8992,19 @@
}
@Override
- public Bitmap getTaskDescriptionIcon(String filename) {
- if (!FileUtils.isValidExtFilename(filename)
- || !filename.contains(ActivityRecord.ACTIVITY_ICON_SUFFIX)) {
- throw new IllegalArgumentException("Bad filename: " + filename);
+ public Bitmap getTaskDescriptionIcon(String filePath, int userId) {
+ if (userId != UserHandle.getCallingUserId()) {
+ enforceCallingPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL,
+ "getTaskDescriptionIcon");
}
- return mTaskPersister.getTaskDescriptionIcon(filename);
+ final File passedIconFile = new File(filePath);
+ final File legitIconFile = new File(TaskPersister.getUserImagesDir(userId),
+ passedIconFile.getName());
+ if (!legitIconFile.getPath().equals(filePath)
+ || !filePath.contains(ActivityRecord.ACTIVITY_ICON_SUFFIX)) {
+ throw new IllegalArgumentException("Bad file path: " + filePath);
+ }
+ return mTaskPersister.getTaskDescriptionIcon(filePath);
}
@Override
@@ -9075,7 +9342,7 @@
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveActivityToStack: moving r=" + r
+ " to stackId=" + stackId);
mStackSupervisor.moveTaskToStackLocked(r.task.taskId, stackId, ON_TOP, !FORCE_FOCUS,
- "moveActivityToStack");
+ "moveActivityToStack", true /* animate */);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -9096,7 +9363,7 @@
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveTaskToStack: moving task=" + taskId
+ " to stackId=" + stackId + " toTop=" + toTop);
mStackSupervisor.moveTaskToStackLocked(taskId, stackId, toTop, !FORCE_FOCUS,
- "moveTaskToStack");
+ "moveTaskToStack", true /* animate */);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -9113,9 +9380,13 @@
* and
* {@link android.app.ActivityManager#DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT}
* @param toTop If the task and stack should be moved to the top.
+ * @param animate Whether we should play an animation for the moving the task
+ * @param initialBounds If the docked stack gets created, it will use these bounds for the
+ * docked stack. Pass {@code null} to use default bounds.
*/
@Override
- public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop) {
+ public void moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate,
+ Rect initialBounds) {
enforceCallingPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS,
"moveTaskToDockedStack()");
synchronized (this) {
@@ -9123,9 +9394,9 @@
try {
if (DEBUG_STACK) Slog.d(TAG_STACK, "moveTaskToDockedStack: moving task=" + taskId
+ " to createMode=" + createMode + " toTop=" + toTop);
- mWindowManager.setDockedStackCreateMode(createMode);
- mStackSupervisor.moveTaskToStackLocked(
- taskId, DOCKED_STACK_ID, toTop, !FORCE_FOCUS, "moveTaskToDockedStack");
+ mWindowManager.setDockedStackCreateState(createMode, initialBounds);
+ mStackSupervisor.moveTaskToStackLocked(taskId, DOCKED_STACK_ID, toTop, !FORCE_FOCUS,
+ "moveTaskToDockedStack", animate);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -9763,14 +10034,6 @@
}
if (cpr.proc != null) {
- if (false) {
- if (cpr.name.flattenToShortString().equals(
- "com.android.providers.calendar/.CalendarProvider2")) {
- Slog.v(TAG, "****************** KILLING "
- + cpr.name.flattenToShortString());
- Process.killProcess(cpr.proc.pid);
- }
- }
checkTime(startTime, "getContentProviderImpl: before updateOomAdj");
boolean success = updateOomAdjLocked(cpr.proc);
maybeUpdateProviderUsageStatsLocked(r, cpr.info.packageName, name);
@@ -9863,6 +10126,16 @@
final boolean firstClass = cpr == null;
if (firstClass) {
final long ident = Binder.clearCallingIdentity();
+
+ // If permissions need a review before any of the app components can run,
+ // we return no provider and launch a review activity if the calling app
+ // is in the foreground.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (!requestTargetProviderPermissionsReviewIfNeededLocked(cpi, r, userId)) {
+ return null;
+ }
+ }
+
try {
checkTime(startTime, "getContentProviderImpl: before getApplicationInfo");
ApplicationInfo ai =
@@ -10015,6 +10288,52 @@
return cpr != null ? cpr.newHolder(conn) : null;
}
+ private boolean requestTargetProviderPermissionsReviewIfNeededLocked(ProviderInfo cpi,
+ ProcessRecord r, final int userId) {
+ if (getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ cpi.packageName, r.userId)) {
+
+ final boolean callerForeground = r != null ? r.setSchedGroup
+ != Process.THREAD_GROUP_BG_NONINTERACTIVE : true;
+
+ // Show a permission review UI only for starting from a foreground app
+ if (!callerForeground) {
+ Slog.w(TAG, "u" + r.userId + " Instantiating a provider in package"
+ + cpi.packageName + " requires a permissions review");
+ return false;
+ }
+
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, cpi.packageName);
+
+ if (DEBUG_PERMISSIONS_REVIEW) {
+ Slog.i(TAG, "u" + r.userId + " Launching permission review "
+ + "for package " + cpi.packageName);
+ }
+
+ final UserHandle userHandle = new UserHandle(userId);
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mContext.startActivityAsUser(intent, userHandle);
+ }
+ });
+
+ return false;
+ }
+
+ return true;
+ }
+
+ PackageManagerInternal getPackageManagerInternalLocked() {
+ if (mPackageManagerInt == null) {
+ mPackageManagerInt = LocalServices.getService(PackageManagerInternal.class);
+ }
+ return mPackageManagerInt;
+ }
+
@Override
public final ContentProviderHolder getContentProvider(
IApplicationThread caller, String name, int userId, boolean stable) {
@@ -10718,7 +11037,7 @@
public void stopAppSwitches() {
if (checkCallingPermission(android.Manifest.permission.STOP_APP_SWITCHES)
!= PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires permission "
+ throw new SecurityException("viewquires permission "
+ android.Manifest.permission.STOP_APP_SWITCHES);
}
@@ -11213,11 +11532,12 @@
}
}
- public void registerUidObserver(IUidObserver observer) {
+ @Override
+ public void registerUidObserver(IUidObserver observer, int which) {
enforceCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER,
"registerUidObserver()");
synchronized (this) {
- mUidObservers.register(observer);
+ mUidObservers.register(observer, which);
}
}
@@ -11709,21 +12029,25 @@
private void retrieveSettings() {
final ContentResolver resolver = mContext.getContentResolver();
- String debugApp = Settings.Global.getString(resolver, Settings.Global.DEBUG_APP);
- boolean waitForDebugger = Settings.Global.getInt(
- resolver, Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0;
- boolean alwaysFinishActivities = Settings.Global.getInt(
- resolver, Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0;
- boolean forceRtl = Settings.Global.getInt(
- resolver, Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0;
- int defaultForceResizable = Build.IS_DEBUGGABLE ? 1 : 0;
- boolean forceResizable = Settings.Global.getInt(
- resolver, Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
- defaultForceResizable) != 0;
- // Transfer any global setting for forcing RTL layout, into a System Property
- SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");
+ final boolean freeformWindowManagement =
+ mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT);
- Configuration configuration = new Configuration();
+ final String debugApp = Settings.Global.getString(resolver, DEBUG_APP);
+ final String fsScreenshots = Settings.Secure.getString(resolver,
+ "overview_fullscreen_thumbnails");
+ final boolean waitForDebugger = Settings.Global.getInt(resolver, WAIT_FOR_DEBUGGER, 0) != 0;
+ final boolean alwaysFinishActivities =
+ Settings.Global.getInt(resolver, ALWAYS_FINISH_ACTIVITIES, 0) != 0;
+ final boolean takeFullscreenScreenshots = fsScreenshots != null &&
+ Integer.parseInt(fsScreenshots) != 0;
+ final boolean forceRtl = Settings.Global.getInt(resolver, DEVELOPMENT_FORCE_RTL, 0) != 0;
+ final int defaultForceResizable = Build.IS_DEBUGGABLE ? 1 : 0;
+ final boolean forceResizable = Settings.Global.getInt(
+ resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, defaultForceResizable) != 0;
+ // Transfer any global setting for forcing RTL layout, into a System Property
+ SystemProperties.set(DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0");
+
+ final Configuration configuration = new Configuration();
Settings.System.getConfiguration(resolver, configuration);
if (forceRtl) {
// This will take care of setting the correct layout direction flags
@@ -11734,7 +12058,9 @@
mDebugApp = mOrigDebugApp = debugApp;
mWaitForDebugger = mOrigWaitForDebugger = waitForDebugger;
mAlwaysFinishActivities = alwaysFinishActivities;
- mForceResizableActivites = forceResizable;
+ mForceResizableActivities = forceResizable;
+ mSupportsFreeformWindowManagement = freeformWindowManagement || forceResizable;
+ mTakeFullscreenScreenshots = takeFullscreenScreenshots;
// This happens before any activities are started, so we can
// change mConfiguration in-place.
updateConfigurationLocked(configuration, null, true);
@@ -12056,7 +12382,7 @@
mTopData = null;
mTopComponent = null;
Message msg = Message.obtain();
- msg.what = SHOW_FACTORY_ERROR_MSG;
+ msg.what = SHOW_FACTORY_ERROR_UI_MSG;
msg.getData().putCharSequence("msg", errorMsg);
mUiHandler.sendMessage(msg);
}
@@ -12102,24 +12428,33 @@
}
}
- enableSystemUserApps();
-
// Start up initial activity.
mBooting = true;
+ // Enable home activity for system user, so that the system can always boot
+ if (UserManager.isSplitSystemUser()) {
+ ComponentName cName = new ComponentName(mContext, SystemUserHomeActivity.class);
+ try {
+ AppGlobals.getPackageManager().setComponentEnabledSetting(cName,
+ PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0,
+ UserHandle.USER_SYSTEM);
+ } catch (RemoteException e) {
+ e.rethrowAsRuntimeException();
+ }
+ }
startHomeActivityLocked(currentUserId, "systemReady");
try {
if (AppGlobals.getPackageManager().hasSystemUidErrors()) {
Slog.e(TAG, "UIDs on the system are inconsistent, you need to wipe your"
+ " data partition or your device will be unstable.");
- mUiHandler.obtainMessage(SHOW_UID_ERROR_MSG).sendToTarget();
+ mUiHandler.obtainMessage(SHOW_UID_ERROR_UI_MSG).sendToTarget();
}
} catch (RemoteException e) {
}
if (!Build.isBuildConsistent()) {
Slog.e(TAG, "Build fingerprint is not consistent, warning user");
- mUiHandler.obtainMessage(SHOW_FINGERPRINT_ERROR_MSG).sendToTarget();
+ mUiHandler.obtainMessage(SHOW_FINGERPRINT_ERROR_UI_MSG).sendToTarget();
}
long ident = Binder.clearCallingIdentity();
@@ -12155,43 +12490,6 @@
}
}
- private void enableSystemUserApps() {
- // For system user, enable apps based on the following conditions:
- // - app is whitelisted; or has no launcher icons; or has INTERACT_ACROSS_USERS permission
- // - app is not in the blacklist
- if (UserManager.isSplitSystemUser()) {
- AppsQueryHelper queryHelper = new AppsQueryHelper(mContext);
- Set<String> enableApps = new HashSet<>();
- enableApps.addAll(queryHelper.queryApps(AppsQueryHelper.GET_NON_LAUNCHABLE_APPS
- | AppsQueryHelper.GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM
- | AppsQueryHelper.GET_DEFAULT_IMES,
- /* systemAppsOnly */ true, UserHandle.SYSTEM));
- ArraySet<String> wlApps = SystemConfig.getInstance().getSystemUserWhitelistedApps();
- enableApps.addAll(wlApps);
- ArraySet<String> blApps = SystemConfig.getInstance().getSystemUserBlacklistedApps();
- enableApps.removeAll(blApps);
-
- List<String> systemApps = queryHelper.queryApps(0, /* systemAppsOnly */ true,
- UserHandle.SYSTEM);
- final int systemAppsSize = systemApps.size();
- for (int i = 0; i < systemAppsSize; i++) {
- String pName = systemApps.get(i);
- boolean enable = enableApps.contains(pName);
- try {
- if (enable) {
- AppGlobals.getPackageManager().installExistingPackageAsUser(pName,
- UserHandle.USER_SYSTEM);
- } else {
- AppGlobals.getPackageManager().deletePackageAsUser(pName, null,
- UserHandle.USER_SYSTEM, PackageManager.DELETE_SYSTEM_APP);
- }
- } catch (RemoteException e) {
- Slog.e(TAG, "Error occured when processing package " + pName, e);
- }
- }
- }
- }
-
private boolean makeAppCrashingLocked(ProcessRecord app,
String shortMsg, String longMsg, String stackTrace) {
app.crashing = true;
@@ -12437,7 +12735,7 @@
final long origId = Binder.clearCallingIdentity();
Message msg = Message.obtain();
- msg.what = SHOW_STRICT_MODE_VIOLATION_MSG;
+ msg.what = SHOW_STRICT_MODE_VIOLATION_UI_MSG;
HashMap<String, Object> data = new HashMap<String, Object>();
data.put("result", result);
data.put("app", r);
@@ -12894,7 +13192,7 @@
}
Message msg = Message.obtain();
- msg.what = SHOW_ERROR_MSG;
+ msg.what = SHOW_ERROR_UI_MSG;
HashMap data = new HashMap();
data.put("result", result);
data.put("app", r);
@@ -13523,6 +13821,39 @@
}
}
+ boolean dumpUids(PrintWriter pw, String dumpPackage, SparseArray<UidRecord> uids,
+ String header, boolean needSep) {
+ boolean printed = false;
+ int whichAppId = -1;
+ if (dumpPackage != null) {
+ try {
+ ApplicationInfo info = mContext.getPackageManager().getApplicationInfo(
+ dumpPackage, 0);
+ whichAppId = UserHandle.getAppId(info.uid);
+ } catch (NameNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+ for (int i=0; i<uids.size(); i++) {
+ UidRecord uidRec = uids.valueAt(i);
+ if (dumpPackage != null && UserHandle.getAppId(uidRec.uid) != whichAppId) {
+ continue;
+ }
+ if (!printed) {
+ printed = true;
+ if (needSep) {
+ pw.println();
+ }
+ pw.print(" ");
+ pw.println(header);
+ needSep = true;
+ }
+ pw.print(" UID "); UserHandle.formatUid(pw, uidRec.uid);
+ pw.print(": "); pw.println(uidRec);
+ }
+ return printed;
+ }
+
void dumpProcessesLocked(FileDescriptor fd, PrintWriter pw, String[] args,
int opti, boolean dumpAll, String dumpPackage) {
boolean needSep = false;
@@ -13579,33 +13910,13 @@
}
if (mActiveUids.size() > 0) {
- boolean printed = false;
- int whichAppId = -1;
- if (dumpPackage != null) {
- try {
- ApplicationInfo info = mContext.getPackageManager().getApplicationInfo(
- dumpPackage, 0);
- whichAppId = UserHandle.getAppId(info.uid);
- } catch (NameNotFoundException e) {
- e.printStackTrace();
- }
+ if (dumpUids(pw, dumpPackage, mActiveUids, "UID states:", needSep)) {
+ printedAnything = needSep = true;
}
- for (int i=0; i<mActiveUids.size(); i++) {
- UidRecord uidRec = mActiveUids.valueAt(i);
- if (dumpPackage != null && UserHandle.getAppId(uidRec.uid) != whichAppId) {
- continue;
- }
- if (!printed) {
- printed = true;
- if (needSep) {
- pw.println();
- }
- pw.println(" UID states:");
- needSep = true;
- printedAnything = true;
- }
- pw.print(" UID "); UserHandle.formatUid(pw, uidRec.uid);
- pw.print(": "); pw.println(uidRec);
+ }
+ if (mValidateUids.size() > 0) {
+ if (dumpUids(pw, dumpPackage, mValidateUids, "UID validation:", needSep)) {
+ printedAnything = needSep = true;
}
}
@@ -14496,6 +14807,9 @@
if (object1.first.setAdj != object2.first.setAdj) {
return object1.first.setAdj > object2.first.setAdj ? -1 : 1;
}
+ if (object1.first.setProcState != object2.first.setProcState) {
+ return object1.first.setProcState > object2.first.setProcState ? -1 : 1;
+ }
if (object1.second.intValue() != object2.second.intValue()) {
return object1.second.intValue() > object2.second.intValue() ? -1 : 1;
}
@@ -15314,6 +15628,10 @@
pw.print(" Lost RAM: "); pw.println(stringifyKBSize(memInfo.getTotalSizeKb()
- totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
- memInfo.getKernelUsedSizeKb()));
+ } else {
+ pw.print("lostram,"); pw.println(memInfo.getTotalSizeKb()
+ - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
+ - memInfo.getKernelUsedSizeKb());
}
if (!brief) {
if (memInfo.getZramTotalSizeKb() != 0) {
@@ -15868,7 +16186,8 @@
mAvailProcessChanges.add(item);
}
}
- mUiHandler.obtainMessage(DISPATCH_PROCESS_DIED, app.pid, app.info.uid, null).sendToTarget();
+ mUiHandler.obtainMessage(DISPATCH_PROCESS_DIED_UI_MSG, app.pid, app.info.uid,
+ null).sendToTarget();
// If the caller is restarting this app, then leave it in its
// current lists and let the caller take care of it.
@@ -17567,6 +17886,9 @@
UserHandle.USER_NULL);
}
+ // To cache the list of supported system locales
+ private String[] mSupportedSystemLocales = null;
+
/**
* Do either or both things: (1) change the current configuration, and (2)
* make sure the given activity is running with the (now) current
@@ -17577,7 +17899,7 @@
* @param userId is only used when persistent parameter is set to true to persist configuration
* for that particular user
*/
- boolean updateConfigurationLocked(Configuration values,
+ private boolean updateConfigurationLocked(Configuration values,
ActivityRecord starting, boolean initLocale, boolean persistent, int userId) {
int changes = 0;
@@ -17590,11 +17912,14 @@
EventLog.writeEvent(EventLogTags.CONFIGURATION_CHANGED, changes);
- if (!initLocale && values.locale != null && values.userSetLocale) {
- final String languageTag = values.locale.toLanguageTag();
- SystemProperties.set("persist.sys.locale", languageTag);
+ if (!initLocale && !values.getLocales().isEmpty() && values.userSetLocale) {
+ if (mSupportedSystemLocales == null) {
+ mSupportedSystemLocales = Resources.getSystem().getAssets().getLocales();
+ }
+ final Locale locale = values.getLocales().getBestMatch(mSupportedSystemLocales);
+ SystemProperties.set("persist.sys.locale", locale.toLanguageTag());
mHandler.sendMessage(mHandler.obtainMessage(SEND_LOCALE_TO_MOUNT_DAEMON_MSG,
- values.locale));
+ locale));
}
mConfigurationSeq++;
@@ -17895,7 +18220,7 @@
app.systemNoUi = false;
- final int PROCESS_STATE_TOP = mTopProcessState;
+ final int PROCESS_STATE_CUR_TOP = mTopProcessState;
// Determine the importance of the process, starting with most
// important to least, and assign an appropriate OOM adjustment.
@@ -17910,7 +18235,7 @@
schedGroup = Process.THREAD_GROUP_DEFAULT;
app.adjType = "top-activity";
foregroundActivities = true;
- procState = PROCESS_STATE_TOP;
+ procState = PROCESS_STATE_CUR_TOP;
} else if (app.instrumentationClass != null) {
// Don't want to kill running instrumentation.
adj = ProcessList.FOREGROUND_APP_ADJ;
@@ -17964,8 +18289,8 @@
adj = ProcessList.VISIBLE_APP_ADJ;
app.adjType = "visible";
}
- if (procState > PROCESS_STATE_TOP) {
- procState = PROCESS_STATE_TOP;
+ if (procState > PROCESS_STATE_CUR_TOP) {
+ procState = PROCESS_STATE_CUR_TOP;
}
schedGroup = Process.THREAD_GROUP_DEFAULT;
app.cached = false;
@@ -17983,8 +18308,8 @@
adj = ProcessList.PERCEPTIBLE_APP_ADJ;
app.adjType = "pausing";
}
- if (procState > PROCESS_STATE_TOP) {
- procState = PROCESS_STATE_TOP;
+ if (procState > PROCESS_STATE_CUR_TOP) {
+ procState = PROCESS_STATE_CUR_TOP;
}
schedGroup = Process.THREAD_GROUP_DEFAULT;
app.cached = false;
@@ -18022,7 +18347,8 @@
}
}
- if (adj > ProcessList.PERCEPTIBLE_APP_ADJ) {
+ if (adj > ProcessList.PERCEPTIBLE_APP_ADJ
+ || procState > ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {
if (app.foregroundServices) {
// The user is aware of this app, so make it visible.
adj = ProcessList.PERCEPTIBLE_APP_ADJ;
@@ -18933,8 +19259,6 @@
}
}
}
- Process.setSwappiness(app.pid,
- app.curSchedGroup <= Process.THREAD_GROUP_BG_NONINTERACTIVE);
}
}
if (app.repForegroundActivities != app.foregroundActivities) {
@@ -19059,7 +19383,7 @@
if (mPendingProcessChanges.size() == 0) {
if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
"*** Enqueueing dispatch processes changed!");
- mUiHandler.obtainMessage(DISPATCH_PROCESSES_CHANGED).sendToTarget();
+ mUiHandler.obtainMessage(DISPATCH_PROCESSES_CHANGED_UI_MSG).sendToTarget();
}
mPendingProcessChanges.add(item);
}
@@ -19078,29 +19402,46 @@
return success;
}
- private final void enqueueUidChangeLocked(UidRecord uidRec, boolean gone) {
- if (uidRec.pendingChange == null) {
+ private final void enqueueUidChangeLocked(UidRecord uidRec, int uid, int change) {
+ final UidRecord.ChangeItem pendingChange;
+ if (uidRec == null || uidRec.pendingChange == null) {
if (mPendingUidChanges.size() == 0) {
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
"*** Enqueueing dispatch uid changed!");
- mUiHandler.obtainMessage(DISPATCH_UIDS_CHANGED_MSG).sendToTarget();
+ mUiHandler.obtainMessage(DISPATCH_UIDS_CHANGED_UI_MSG).sendToTarget();
}
final int NA = mAvailUidChanges.size();
if (NA > 0) {
- uidRec.pendingChange = mAvailUidChanges.remove(NA-1);
+ pendingChange = mAvailUidChanges.remove(NA-1);
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
- "Retrieving available item: " + uidRec.pendingChange);
+ "Retrieving available item: " + pendingChange);
} else {
- uidRec.pendingChange = new UidRecord.ChangeItem();
+ pendingChange = new UidRecord.ChangeItem();
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
- "Allocating new item: " + uidRec.pendingChange);
+ "Allocating new item: " + pendingChange);
}
- uidRec.pendingChange.uidRecord = uidRec;
- uidRec.pendingChange.uid = uidRec.uid;
- mPendingUidChanges.add(uidRec.pendingChange);
+ if (uidRec != null) {
+ uidRec.pendingChange = pendingChange;
+ if (change == UidRecord.CHANGE_GONE && !uidRec.idle) {
+ // If this uid is going away, and we haven't yet reported it is gone,
+ // then do so now.
+ change = UidRecord.CHANGE_GONE_IDLE;
+ }
+ } else if (uid < 0) {
+ throw new IllegalArgumentException("No UidRecord or uid");
+ }
+ pendingChange.uidRecord = uidRec;
+ pendingChange.uid = uidRec != null ? uidRec.uid : uid;
+ mPendingUidChanges.add(pendingChange);
+ } else {
+ pendingChange = uidRec.pendingChange;
+ if (change == UidRecord.CHANGE_GONE && pendingChange.change == UidRecord.CHANGE_IDLE) {
+ change = UidRecord.CHANGE_GONE_IDLE;
+ }
}
- uidRec.pendingChange.gone = gone;
- uidRec.pendingChange.processState = uidRec.setProcState;
+ pendingChange.change = change;
+ pendingChange.processState = uidRec != null
+ ? uidRec.setProcState : ActivityManager.PROCESS_STATE_NONEXISTENT;
}
private void maybeUpdateProviderUsageStatsLocked(ProcessRecord app, String providerPkgName,
@@ -19169,10 +19510,6 @@
if (proc.baseProcessTracker != null) {
proc.baseProcessTracker.setState(proc.repProcState, memFactor, now, proc.pkgList);
}
- if (proc.repProcState >= 0) {
- mBatteryStatsService.noteProcessState(proc.processName, proc.info.uid,
- proc.repProcState);
- }
}
}
@@ -19647,12 +19984,32 @@
// Update from any uid changes.
for (int i=mActiveUids.size()-1; i>=0; i--) {
final UidRecord uidRec = mActiveUids.valueAt(i);
+ int uidChange = UidRecord.CHANGE_PROCSTATE;
if (uidRec.setProcState != uidRec.curProcState) {
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
"Changes in " + uidRec + ": proc state from " + uidRec.setProcState
+ " to " + uidRec.curProcState);
+ if (ActivityManager.isProcStateBackground(uidRec.curProcState)) {
+ if (!ActivityManager.isProcStateBackground(uidRec.setProcState)) {
+ uidRec.lastBackgroundTime = nowElapsed;
+ if (!mHandler.hasMessages(IDLE_UIDS_MSG)) {
+ // Note: the background settle time is in elapsed realtime, while
+ // the handler time base is uptime. All this means is that we may
+ // stop background uids later than we had intended, but that only
+ // happens because the device was sleeping so we are okay anyway.
+ mHandler.sendEmptyMessageDelayed(IDLE_UIDS_MSG, BACKGROUND_SETTLE_TIME);
+ }
+ }
+ } else {
+ if (uidRec.idle) {
+ uidChange = UidRecord.CHANGE_ACTIVE;
+ uidRec.idle = false;
+ }
+ uidRec.lastBackgroundTime = 0;
+ }
uidRec.setProcState = uidRec.curProcState;
- enqueueUidChangeLocked(uidRec, false);
+ enqueueUidChangeLocked(uidRec, -1, uidChange);
+ mBatteryStatsService.noteUidProcessState(uidRec.uid, uidRec.curProcState);
}
}
@@ -19677,6 +20034,53 @@
}
}
+ final void idleUids() {
+ synchronized (this) {
+ final long nowElapsed = SystemClock.elapsedRealtime();
+ final long maxBgTime = nowElapsed - BACKGROUND_SETTLE_TIME;
+ long nextTime = 0;
+ for (int i=mActiveUids.size()-1; i>=0; i--) {
+ final UidRecord uidRec = mActiveUids.valueAt(i);
+ final long bgTime = uidRec.lastBackgroundTime;
+ if (bgTime > 0 && !uidRec.idle) {
+ if (bgTime <= maxBgTime) {
+ uidRec.idle = true;
+ doStopUidLocked(uidRec.uid, uidRec);
+ } else {
+ if (nextTime == 0 || nextTime > bgTime) {
+ nextTime = bgTime;
+ }
+ }
+ }
+ }
+ if (nextTime > 0) {
+ mHandler.removeMessages(IDLE_UIDS_MSG);
+ mHandler.sendEmptyMessageDelayed(IDLE_UIDS_MSG,
+ nextTime + BACKGROUND_SETTLE_TIME - nowElapsed);
+ }
+ }
+ }
+
+ final void runInBackgroundDisabled(int uid) {
+ synchronized (this) {
+ UidRecord uidRec = mActiveUids.get(uid);
+ if (uidRec != null) {
+ // This uid is actually running... should it be considered background now?
+ if (uidRec.idle) {
+ doStopUidLocked(uidRec.uid, uidRec);
+ }
+ } else {
+ // This uid isn't actually running... still send a report about it being "stopped".
+ doStopUidLocked(uid, null);
+ }
+ }
+ }
+
+ final void doStopUidLocked(int uid, final UidRecord uidRec) {
+ mServices.stopInBackgroundLocked(uid);
+ enqueueUidChangeLocked(uidRec, uid, UidRecord.CHANGE_IDLE);
+ }
+
final void trimApplications() {
synchronized (this) {
int i;
@@ -19996,24 +20400,32 @@
}
@Override
- public boolean switchUser(final int userId) {
- enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, userId);
- String userName;
+ public boolean unlockUser(int userId, byte[] token) {
+ return mUserController.unlockUser(userId, token);
+ }
+
+ @Override
+ public boolean switchUser(final int targetUserId) {
+ enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, targetUserId);
+ UserInfo currentUserInfo;
+ UserInfo targetUserInfo;
synchronized (this) {
- UserInfo userInfo = mUserController.getUserInfo(userId);
- if (userInfo == null) {
- Slog.w(TAG, "No user info for user #" + userId);
+ int currentUserId = mUserController.getCurrentUserIdLocked();
+ currentUserInfo = mUserController.getUserInfo(currentUserId);
+ targetUserInfo = mUserController.getUserInfo(targetUserId);
+ if (targetUserInfo == null) {
+ Slog.w(TAG, "No user info for user #" + targetUserId);
return false;
}
- if (userInfo.isManagedProfile()) {
- Slog.w(TAG, "Cannot switch to User #" + userId + ": not a full user");
+ if (targetUserInfo.isManagedProfile()) {
+ Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not a full user");
return false;
}
- userName = userInfo.name;
- mUserController.setTargetUserIdLocked(userId);
+ mUserController.setTargetUserIdLocked(targetUserId);
}
- mUiHandler.removeMessages(START_USER_SWITCH_MSG);
- mUiHandler.sendMessage(mUiHandler.obtainMessage(START_USER_SWITCH_MSG, userId, 0, userName));
+ Pair<UserInfo, UserInfo> userNames = new Pair<>(currentUserInfo, targetUserInfo);
+ mUiHandler.removeMessages(START_USER_SWITCH_UI_MSG);
+ mUiHandler.sendMessage(mUiHandler.obtainMessage(START_USER_SWITCH_UI_MSG, userNames));
return true;
}
@@ -20025,8 +20437,8 @@
}
@Override
- public int stopUser(final int userId, final IStopUserCallback callback) {
- return mUserController.stopUser(userId, callback);
+ public int stopUser(final int userId, boolean force, final IStopUserCallback callback) {
+ return mUserController.stopUser(userId, force, callback);
}
void onUserRemovedLocked(int userId) {
diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
index d1e7e85..13c1417 100644
--- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
@@ -73,7 +73,7 @@
String opt;
while ((opt = getNextOption()) != null) {
if (opt.equals("--user")) {
- userId = parseUserArg(getNextArgRequired());
+ userId = UserHandle.parseUserArg(getNextArgRequired());
} else {
pw.println("Error: Unknown option: " + opt);
return -1;
@@ -89,7 +89,7 @@
String opt;
while ((opt=getNextOption()) != null) {
if (opt.equals("--user")) {
- userId = parseUserArg(getNextArgRequired());
+ userId = UserHandle.parseUserArg(getNextArgRequired());
} else {
pw.println("Error: Unknown option: " + opt);
return -1;
@@ -141,22 +141,6 @@
return 0;
}
- int parseUserArg(String arg) {
- int userId;
- if ("all".equals(arg)) {
- userId = UserHandle.USER_ALL;
- } else if ("current".equals(arg) || "cur".equals(arg)) {
- userId = UserHandle.USER_CURRENT;
- } else {
- try {
- userId = Integer.parseInt(arg);
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException("Bad user number: " + arg);
- }
- }
- return userId;
- }
-
@Override
public void onHelp() {
PrintWriter pw = getOutPrintWriter();
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index aa04bd7..ea8a12f 100755
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -61,6 +61,7 @@
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
+import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
@@ -1212,8 +1213,10 @@
if (_taskDescription.getIconFilename() == null &&
(icon = _taskDescription.getIcon()) != null) {
final String iconFilename = createImageFilename(createTime, task.taskId);
- mStackSupervisor.mService.mTaskPersister.saveImage(icon, iconFilename);
- _taskDescription.setIconFilename(iconFilename);
+ final File iconFile = new File(TaskPersister.getUserImagesDir(userId), iconFilename);
+ final String iconFilePath = iconFile.getAbsolutePath();
+ mStackSupervisor.mService.mTaskPersister.saveImage(icon, iconFilePath);
+ _taskDescription.setIconFilename(iconFilePath);
}
taskDescription = _taskDescription;
}
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 853a55c..02a372a 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -836,8 +836,8 @@
}
}
- public final Bitmap screenshotActivities(ActivityRecord who) {
- if (DEBUG_SCREENSHOTS) Slog.d(TAG_SCREENSHOTS, "screenshotActivities: " + who);
+ public final Bitmap screenshotActivitiesLocked(ActivityRecord who) {
+ if (DEBUG_SCREENSHOTS) Slog.d(TAG_SCREENSHOTS, "screenshotActivitiesLocked: " + who);
if (who.noDisplay) {
if (DEBUG_SCREENSHOTS) Slog.d(TAG_SCREENSHOTS, "\tNo display");
return null;
@@ -852,10 +852,19 @@
int w = mService.mThumbnailWidth;
int h = mService.mThumbnailHeight;
+ float scale = 1f;
if (w > 0) {
if (DEBUG_SCREENSHOTS) Slog.d(TAG_SCREENSHOTS, "\tTaking screenshot");
+
+ // When this flag is set, we currently take the fullscreen screenshot of the activity
+ // but scaled to half the size. This gives us a "good-enough" fullscreen thumbnail to
+ // use within SystemUI while keeping memory usage low.
+ if (mService.mTakeFullscreenScreenshots) {
+ w = h = -1;
+ scale = 0.5f;
+ }
return mWindowManager.screenshotApplications(who.appToken, Display.DEFAULT_DISPLAY,
- w, h);
+ w, h, scale);
}
Slog.e(TAG, "Invalid thumbnail dimensions: " + w + "x" + h);
return null;
@@ -914,7 +923,7 @@
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
if (mService.mHasRecents
&& (next == null || next.noDisplay || next.task != prev.task || uiSleeping)) {
- prev.updateThumbnailLocked(screenshotActivities(prev), null);
+ prev.updateThumbnailLocked(screenshotActivitiesLocked(prev), null);
}
stopFullyDrawnTraceIfNeeded();
@@ -1338,7 +1347,12 @@
return topHomeActivity == null || !topHomeActivity.isHomeActivity();
}
- final int belowFocusedIndex = mStacks.indexOf(focusedStack) - 1;
+ // Find the first stack below focused stack that actually got something visible.
+ int belowFocusedIndex = mStacks.indexOf(focusedStack) - 1;
+ while (belowFocusedIndex >= 0 &&
+ mStacks.get(belowFocusedIndex).topRunningActivityLocked() == null) {
+ belowFocusedIndex--;
+ }
if ((focusedStackId == DOCKED_STACK_ID || focusedStackId == PINNED_STACK_ID)
&& stackIndex == belowFocusedIndex) {
// Stacks directly behind the docked or pinned stack are always visible.
@@ -1413,19 +1427,9 @@
if (top == null) {
return;
}
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "ensureActivitiesVisible behind " + top
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "ensureActivitiesVisible behind " + top
+ " configChanges=0x" + Integer.toHexString(configChanges));
-
- if (mTranslucentActivityWaiting != top) {
- mUndrawnActivitiesBelowTopTranslucent.clear();
- if (mTranslucentActivityWaiting != null) {
- // Call the callback with a timeout indication.
- notifyActivityDrawnLocked(null);
- mTranslucentActivityWaiting = null;
- }
- mHandler.removeMessages(TRANSLUCENT_TIMEOUT_MSG);
- }
+ checkTranslucentActivityWaiting(top);
// If the top activity is not fullscreen, then we need to
// make sure any activities under it are now visible.
@@ -1453,7 +1457,6 @@
if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
"Make visible? " + r + " finishing=" + r.finishing
+ " state=" + r.state);
-
// First: if this is not the current activity being started, make
// sure it matches the current configuration.
if (r != starting) {
@@ -1461,143 +1464,28 @@
}
if (r.app == null || r.app.thread == null) {
- // We need to make sure the app is running if it's the top, or it is
- // just made visible from invisible.
- // If the app is already visible, it must have died while it was visible.
- // In this case, we'll show the dead window but will not restart the app.
- // Otherwise we could end up thrashing.
- if (r == top || !r.visible) {
- // This activity needs to be visible, but isn't even running...
- // get it started and resume if no other stack in this stack is resumed.
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "Start and freeze screen for " + r);
- if (r != starting) {
- r.startFreezingScreenLocked(r.app, configChanges);
- }
- if (!r.visible || r.mLaunchTaskBehind) {
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "Starting and making visible: " + r);
- setVisible(r, true);
- }
- if (r != starting) {
- mStackSupervisor.startSpecificActivityLocked(
- r, noStackActivityResumed, false);
- if (activityNdx >= activities.size()) {
- // Record may be removed if its process needs to restart.
- activityNdx = activities.size() - 1;
- } else {
- noStackActivityResumed = false;
- }
+ if (makeVisibleAndRestartIfNeeded(starting, configChanges, top,
+ noStackActivityResumed, r)) {
+ if (activityNdx >= activities.size()) {
+ // Record may be removed if its process needs to restart.
+ activityNdx = activities.size() - 1;
+ } else {
+ noStackActivityResumed = false;
}
}
} else if (r.visible) {
- // If this activity is already visible, then there is nothing
- // else to do here.
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "Skipping: already visible at " + r);
- r.stopFreezingScreenLocked(false);
- try {
- if (r.returningOptions != null) {
- r.app.thread.scheduleOnNewActivityOptions(r.appToken,
- r.returningOptions);
- }
- } catch(RemoteException e) {
- }
- if (r.state == ActivityState.RESUMED) {
+ if (alreadyVisible(r)) {
noStackActivityResumed = false;
}
} else {
- // This activity is not currently visible, but is running.
- // Tell it to become visible.
- r.visible = true;
- if (r.state != ActivityState.RESUMED && r != starting) {
- // If this activity is paused, tell it
- // to now show its window.
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "Making visible and scheduling visibility: " + r);
- try {
- if (mTranslucentActivityWaiting != null) {
- r.updateOptionsLocked(r.returningOptions);
- mUndrawnActivitiesBelowTopTranslucent.add(r);
- }
- setVisible(r, true);
- r.sleeping = false;
- r.app.pendingUiClean = true;
- r.app.thread.scheduleWindowVisibility(r.appToken, true);
- r.stopFreezingScreenLocked(false);
- } catch (Exception e) {
- // Just skip on any failure; we'll make it
- // visible when it next restarts.
- Slog.w(TAG, "Exception thrown making visibile: "
- + r.intent.getComponent(), e);
- }
- }
+ becomeVisible(starting, r);
}
-
// Aggregate current change flags.
configChanges |= r.configChangeFlags;
-
- if (r.fullscreen) {
- // At this point, nothing else needs to be shown in this task.
- behindFullscreenActivity = true;
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Fullscreen: at " + r
- + " stackInvisible=" + stackInvisible
- + " behindFullscreenActivity=" + behindFullscreenActivity);
- } else if (!isHomeStack() && r.frontOfTask && task.isOverHomeStack()) {
- behindFullscreenActivity = true;
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Showing home: at " + r
- + " stackInvisible=" + stackInvisible
- + " behindFullscreenActivity=" + behindFullscreenActivity);
- }
+ behindFullscreenActivity = updateBehindFullscreen(stackInvisible,
+ behindFullscreenActivity, task, r);
} else {
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "Make invisible? " + r + " finishing=" + r.finishing
- + " state=" + r.state + " stackInvisible=" + stackInvisible
- + " behindFullscreenActivity=" + behindFullscreenActivity);
- // Now for any activities that aren't visible to the user, make
- // sure they no longer are keeping the screen frozen.
- if (r.visible) {
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Making invisible: " + r);
- try {
- setVisible(r, false);
- switch (r.state) {
- case STOPPING:
- case STOPPED:
- if (r.app != null && r.app.thread != null) {
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
- "Scheduling invisibility: " + r);
- r.app.thread.scheduleWindowVisibility(r.appToken, false);
- }
- break;
-
- case INITIALIZING:
- case RESUMED:
- case PAUSING:
- case PAUSED:
- // This case created for transitioning activities from
- // translucent to opaque {@link Activity#convertToOpaque}.
- if (getVisibleBehindActivity() == r) {
- releaseBackgroundResources(r);
- } else {
- if (!mStackSupervisor.mStoppingActivities.contains(r)) {
- mStackSupervisor.mStoppingActivities.add(r);
- }
- mStackSupervisor.scheduleIdleLocked();
- }
- break;
-
- default:
- break;
- }
- } catch (Exception e) {
- // Just skip on any failure; we'll make it
- // visible when it next restarts.
- Slog.w(TAG, "Exception thrown making hidden: "
- + r.intent.getComponent(), e);
- }
- } else {
- if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Already invisible: " + r);
- }
+ becomeInvisible(stackInvisible, behindFullscreenActivity, r);
}
}
if (mStackId == FREEFORM_WORKSPACE_STACK_ID) {
@@ -1615,6 +1503,147 @@
}
}
+ private void checkTranslucentActivityWaiting(ActivityRecord top) {
+ if (mTranslucentActivityWaiting != top) {
+ mUndrawnActivitiesBelowTopTranslucent.clear();
+ if (mTranslucentActivityWaiting != null) {
+ // Call the callback with a timeout indication.
+ notifyActivityDrawnLocked(null);
+ mTranslucentActivityWaiting = null;
+ }
+ mHandler.removeMessages(TRANSLUCENT_TIMEOUT_MSG);
+ }
+ }
+
+ private boolean makeVisibleAndRestartIfNeeded(ActivityRecord starting, int configChanges,
+ ActivityRecord top, boolean noStackActivityResumed, ActivityRecord r) {
+ // We need to make sure the app is running if it's the top, or it is just made visible from
+ // invisible. If the app is already visible, it must have died while it was visible. In this
+ // case, we'll show the dead window but will not restart the app. Otherwise we could end up
+ // thrashing.
+ if (r == top || !r.visible) {
+ // This activity needs to be visible, but isn't even running...
+ // get it started and resume if no other stack in this stack is resumed.
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Start and freeze screen for " + r);
+ if (r != starting) {
+ r.startFreezingScreenLocked(r.app, configChanges);
+ }
+ if (!r.visible || r.mLaunchTaskBehind) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Starting and making visible: " + r);
+ setVisible(r, true);
+ }
+ if (r != starting) {
+ mStackSupervisor.startSpecificActivityLocked(r, noStackActivityResumed, false);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void becomeInvisible(boolean stackInvisible, boolean behindFullscreenActivity,
+ ActivityRecord r) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Make invisible? " + r + " finishing="
+ + r.finishing + " state=" + r.state + " stackInvisible=" + stackInvisible
+ + " behindFullscreenActivity=" + behindFullscreenActivity);
+ if (!r.visible) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Already invisible: " + r);
+ return;
+ }
+ // Now for any activities that aren't visible to the user, make sure they no longer are
+ // keeping the screen frozen.
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Making invisible: " + r);
+ try {
+ setVisible(r, false);
+ switch (r.state) {
+ case STOPPING:
+ case STOPPED:
+ if (r.app != null && r.app.thread != null) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
+ "Scheduling invisibility: " + r);
+ r.app.thread.scheduleWindowVisibility(r.appToken, false);
+ }
+ break;
+
+ case INITIALIZING:
+ case RESUMED:
+ case PAUSING:
+ case PAUSED:
+ // This case created for transitioning activities from
+ // translucent to opaque {@link Activity#convertToOpaque}.
+ if (getVisibleBehindActivity() == r) {
+ releaseBackgroundResources(r);
+ } else {
+ if (!mStackSupervisor.mStoppingActivities.contains(r)) {
+ mStackSupervisor.mStoppingActivities.add(r);
+ }
+ mStackSupervisor.scheduleIdleLocked();
+ }
+ break;
+
+ default:
+ break;
+ }
+ } catch (Exception e) {
+ // Just skip on any failure; we'll make it visible when it next restarts.
+ Slog.w(TAG, "Exception thrown making hidden: " + r.intent.getComponent(), e);
+ }
+ }
+
+ private boolean updateBehindFullscreen(boolean stackInvisible, boolean behindFullscreenActivity,
+ TaskRecord task, ActivityRecord r) {
+ if (r.fullscreen) {
+ // At this point, nothing else needs to be shown in this task.
+ behindFullscreenActivity = true;
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Fullscreen: at " + r
+ + " stackInvisible=" + stackInvisible
+ + " behindFullscreenActivity=" + behindFullscreenActivity);
+ } else if (!isHomeStack() && r.frontOfTask && task.isOverHomeStack()) {
+ behindFullscreenActivity = true;
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Showing home: at " + r
+ + " stackInvisible=" + stackInvisible
+ + " behindFullscreenActivity=" + behindFullscreenActivity);
+ }
+ return behindFullscreenActivity;
+ }
+
+ private void becomeVisible(ActivityRecord starting, ActivityRecord r) {
+ // This activity is not currently visible, but is running. Tell it to become visible.
+ r.visible = true;
+ if (r.state != ActivityState.RESUMED && r != starting) {
+ // If this activity is paused, tell it to now show its window.
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
+ "Making visible and scheduling visibility: " + r);
+ try {
+ if (mTranslucentActivityWaiting != null) {
+ r.updateOptionsLocked(r.returningOptions);
+ mUndrawnActivitiesBelowTopTranslucent.add(r);
+ }
+ setVisible(r, true);
+ r.sleeping = false;
+ r.app.pendingUiClean = true;
+ r.app.thread.scheduleWindowVisibility(r.appToken, true);
+ r.stopFreezingScreenLocked(false);
+ } catch (Exception e) {
+ // Just skip on any failure; we'll make it
+ // visible when it next restarts.
+ Slog.w(TAG, "Exception thrown making visibile: " + r.intent.getComponent(), e);
+ }
+ }
+ }
+
+ private boolean alreadyVisible(ActivityRecord r) {
+ // If this activity is already visible, then there is nothing else to do here.
+ if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping: already visible at " + r);
+ r.stopFreezingScreenLocked(false);
+ try {
+ if (r.returningOptions != null) {
+ r.app.thread.scheduleOnNewActivityOptions(r.appToken, r.returningOptions);
+ }
+ } catch(RemoteException e) {
+ }
+ return r.state == ActivityState.RESUMED;
+ }
+
void convertActivityToTranslucent(ActivityRecord r) {
mTranslucentActivityWaiting = r;
mUndrawnActivitiesBelowTopTranslucent.clear();
@@ -2796,41 +2825,43 @@
}
private void adjustFocusedActivityLocked(ActivityRecord r, String reason) {
- if (mStackSupervisor.isFocusedStack(this) && mService.mFocusedActivity == r) {
- ActivityRecord next = topRunningActivityLocked();
- final String myReason = reason + " adjustFocus";
- if (next != r) {
- if (next != null && StackId.keepFocusInStackIfPossible(mStackId)) {
- // For freeform, docked, and pinned stacks we always keep the focus within the
- // stack as long as there is a running activity in the stack that we can adjust
- // focus to.
- mService.setFocusedActivityLocked(next, myReason);
- return;
- } else {
- final TaskRecord task = r.task;
- if (r.frontOfTask && task == topTask() && task.isOverHomeStack()) {
- // For non-fullscreen stack, we want to move the focus to the next visible
- // stack to prevent the home screen from moving to the top and obscuring
- // other visible stacks.
- if (!mFullscreen
- && adjustFocusToNextVisibleStackLocked(null, myReason)) {
- return;
- }
- // Move the home stack to the top if this stack is fullscreen or there is no
- // other visible stack.
- if (mStackSupervisor.moveHomeStackTaskToTop(
- task.getTaskToReturnTo(), myReason)) {
- // Activity focus was already adjusted. Nothing else to do...
- return;
- }
+ if (!mStackSupervisor.isFocusedStack(this) || mService.mFocusedActivity != r) {
+ return;
+ }
+
+ final ActivityRecord next = topRunningActivityLocked();
+ final String myReason = reason + " adjustFocus";
+ if (next != r) {
+ if (next != null && StackId.keepFocusInStackIfPossible(mStackId)) {
+ // For freeform, docked, and pinned stacks we always keep the focus within the
+ // stack as long as there is a running activity in the stack that we can adjust
+ // focus to.
+ mService.setFocusedActivityLocked(next, myReason);
+ return;
+ } else {
+ final TaskRecord task = r.task;
+ if (r.frontOfTask && task == topTask() && task.isOverHomeStack()) {
+ // For non-fullscreen stack, we want to move the focus to the next visible
+ // stack to prevent the home screen from moving to the top and obscuring
+ // other visible stacks.
+ if (!mFullscreen
+ && adjustFocusToNextVisibleStackLocked(null, myReason)) {
+ return;
+ }
+ // Move the home stack to the top if this stack is fullscreen or there is no
+ // other visible stack.
+ if (mStackSupervisor.moveHomeStackTaskToTop(
+ task.getTaskToReturnTo(), myReason)) {
+ // Activity focus was already adjusted. Nothing else to do...
+ return;
}
}
}
+ }
- final ActivityRecord top = mStackSupervisor.topRunningActivityLocked();
- if (top != null) {
- mService.setFocusedActivityLocked(top, myReason);
- }
+ final ActivityRecord top = mStackSupervisor.topRunningActivityLocked();
+ if (top != null) {
+ mService.setFocusedActivityLocked(top, myReason);
}
}
@@ -4667,6 +4698,7 @@
(r.info.flags & ActivityInfo.FLAG_SHOW_FOR_ALL_USERS) != 0, r.userId,
r.info.configChanges, task.voiceSession != null, r.mLaunchTaskBehind,
bounds, task.mOverrideConfig, !r.isHomeActivity());
+ mWindowManager.setTaskResizeable(task.taskId, task.mResizeable);
r.taskConfigOverride = task.mOverrideConfig;
}
@@ -4720,6 +4752,7 @@
task.updateOverrideConfiguration(bounds);
mWindowManager.setAppTask(
r.appToken, task.taskId, task.getLaunchBounds(), task.mOverrideConfig);
+ mWindowManager.setTaskResizeable(task.taskId, task.mResizeable);
r.taskConfigOverride = task.mOverrideConfig;
}
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 4fc8454..e9e02c1 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -34,6 +34,7 @@
import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
import static com.android.server.am.ActivityManagerDebugConfig.*;
import static com.android.server.am.ActivityManagerService.FIRST_SUPERVISOR_STACK_MSG;
import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE;
@@ -75,6 +76,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.pm.PackageManagerInternal;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Configuration;
@@ -87,6 +89,7 @@
import android.hardware.input.InputManagerInternal;
import android.net.Uri;
import android.os.Binder;
+import android.os.Build;
import android.os.Bundle;
import android.os.Debug;
import android.os.Handler;
@@ -99,7 +102,6 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
-import android.os.SystemProperties;
import android.os.Trace;
import android.os.TransactionTooLargeException;
import android.os.UserHandle;
@@ -121,10 +123,13 @@
import android.view.DisplayInfo;
import android.view.InputEvent;
import android.view.Surface;
+import android.widget.Toast;
+
import com.android.internal.app.HeavyWeightSwitcherActivity;
import com.android.internal.app.IVoiceInteractor;
import com.android.internal.content.ReferrerIntent;
import com.android.internal.os.TransferPipe;
+import com.android.internal.R;
import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils;
@@ -132,7 +137,6 @@
import com.android.server.am.ActivityStack.ActivityState;
import com.android.server.wm.WindowManagerService;
-
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.PrintWriter;
@@ -1666,9 +1670,7 @@
UserInfo user = getUserInfo(userId);
// TODO: Timeout for work challenge
- if (user.isManagedProfile()
- && mService.mContext.getSystemService(StorageManager.class)
- .isPerUserEncryptionEnabled()) {
+ if (user.isManagedProfile() && StorageManager.isFileBasedEncryptionEnabled()) {
KeyguardManager km = (KeyguardManager) mService.mContext
.getSystemService(Context.KEYGUARD_SERVICE);
@@ -1707,6 +1709,46 @@
return ActivityManager.START_SUCCESS;
}
+ // If permissions need a review before any of the app components can run, we
+ // launch the review activity and pass a pending intent to start the activity
+ // we are to launching now after the review is completed.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED && aInfo != null) {
+ if (mService.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ aInfo.packageName, userId)) {
+ IIntentSender target = mService.getIntentSenderLocked(
+ ActivityManager.INTENT_SENDER_ACTIVITY, callingPackage,
+ callingUid, userId, null, null, 0, new Intent[]{intent},
+ new String[]{resolvedType}, PendingIntent.FLAG_CANCEL_CURRENT
+ | PendingIntent.FLAG_ONE_SHOT, null);
+
+ Intent newIntent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);
+ newIntent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ newIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, aInfo.packageName);
+ newIntent.putExtra(Intent.EXTRA_INTENT, new IntentSender(target));
+ if (resultRecord != null) {
+ newIntent.putExtra(Intent.EXTRA_RESULT_NEEDED, true);
+ }
+ newIntent.setFlags(intent.getFlags());
+ intent = newIntent;
+
+ resolvedType = null;
+ callingUid = realCallingUid;
+ callingPid = realCallingPid;
+
+ aInfo = resolveActivity(intent, null, PackageManager.MATCH_DEFAULT_ONLY
+ | ActivityManagerService.STOCK_PM_FLAGS, null, userId);
+
+ if (DEBUG_PERMISSIONS_REVIEW) {
+ Slog.i(TAG, "START u" + userId + " {" + intent.toShortString(true, true,
+ true, false) + "} from uid " + callingUid + " on display "
+ + (container == null ? (mFocusedStack == null ?
+ Display.DEFAULT_DISPLAY : mFocusedStack.mDisplayId) :
+ (container.mActivityDisplay == null ? Display.DEFAULT_DISPLAY :
+ container.mActivityDisplay.mDisplayId)));
+ }
+ }
+ }
+
ActivityRecord r = new ActivityRecord(mService, callerApp, callingUid, callingPackage,
intent, resolvedType, aInfo, mService.mConfiguration, resultRecord, resultWho,
requestCode, componentSpecified, voiceSession != null, this, container, options);
@@ -1926,9 +1968,9 @@
boolean overrideBounds = false;
Rect newBounds = null;
if (options != null && (r.info.resizeable || (inTask != null && inTask.mResizeable))) {
- if (options.hasBounds()) {
+ if (canUseActivityOptionsLaunchBounds(options)) {
overrideBounds = true;
- newBounds = options.getBounds();
+ newBounds = options.getLaunchBounds();
}
}
@@ -2591,6 +2633,11 @@
mService.setFocusedActivityLocked(r, "startedActivity");
}
updateUserStackLocked(r.userId, targetStack);
+
+ if (!r.task.mResizeable && isStackDockedInEffect(targetStack.mStackId)) {
+ showNonResizeableDockToast(r.task.taskId);
+ }
+
return ActivityManager.START_SUCCESS;
}
@@ -2930,8 +2977,8 @@
}
if (task.mResizeable && options != null) {
- if (options.hasBounds()) {
- Rect bounds = options.getBounds();
+ if (canUseActivityOptionsLaunchBounds(options)) {
+ Rect bounds = options.getLaunchBounds();
task.updateOverrideConfiguration(bounds);
final int stackId = task.getLaunchStackId();
if (stackId != task.stack.mStackId) {
@@ -2955,6 +3002,12 @@
"findTaskToMoveToFront: moved to front of stack=" + task.stack);
}
+ private boolean canUseActivityOptionsLaunchBounds(ActivityOptions options) {
+ // We use the launch bounds in the activity options is the device supports freeform
+ // window management.
+ return options.hasLaunchBounds() && mService.mSupportsFreeformWindowManagement;
+ }
+
ActivityStack getStack(int stackId) {
return getStack(stackId, !CREATE_IF_NEEDED, !ON_TOP);
}
@@ -3008,6 +3061,15 @@
return null;
}
+ /**
+ * Returns if a stack should be treated as if it's docked. Returns true if the stack is
+ * the docked stack itself, or if it's side-by-side to the docked stack.
+ */
+ boolean isStackDockedInEffect(int stackId) {
+ return stackId == DOCKED_STACK_ID ||
+ (StackId.isResizeableByDockedStack(stackId) && getStack(DOCKED_STACK_ID) != null);
+ }
+
ActivityContainer createVirtualActivityContainer(ActivityRecord parentActivity,
IActivityContainerCallback callback) {
ActivityContainer activityContainer =
@@ -3097,7 +3159,8 @@
final int count = tasks.size();
for (int i = 0; i < count; i++) {
moveTaskToStackLocked(tasks.get(i).taskId,
- FULLSCREEN_WORKSPACE_STACK_ID, ON_TOP, FORCE_FOCUS, "resizeStack");
+ FULLSCREEN_WORKSPACE_STACK_ID, ON_TOP, FORCE_FOCUS, "resizeStack",
+ false /* animate */);
}
// stack shouldn't contain anymore activities, so nothing to resume.
@@ -3333,13 +3396,19 @@
}
void moveTaskToStackLocked(int taskId, int stackId, boolean toTop, boolean forceFocus,
- String reason) {
+ String reason, boolean animate) {
final TaskRecord task = anyTaskForIdLocked(taskId);
if (task == null) {
Slog.w(TAG, "moveTaskToStack: no task for id=" + taskId);
return;
}
+ if (task.stack != null && task.stack.mStackId == stackId) {
+ // You are already in the right stack silly...
+ Slog.i(TAG, "moveTaskToStack: taskId=" + taskId + " already in stackId=" + stackId);
+ return;
+ }
+
final ActivityRecord topActivity = task.getTopActivity();
if (StackId.preserveWindowOnTaskMove(stackId) && topActivity != null) {
// We are about to relaunch the activity because its configuration changed due to
@@ -3348,29 +3417,34 @@
// preserve the old window until the new one is drawn. This prevents having a gap
// between the removal and addition, in which no window is visible. We also want the
// entrance of the new window to be properly animated.
- mWindowManager.setReplacingWindow(topActivity.appToken, true /* animate */);
+ mWindowManager.setReplacingWindow(topActivity.appToken, animate);
}
- final ActivityStack stack =
- moveTaskToStackUncheckedLocked(task, stackId, toTop, forceFocus,
- "moveTaskToStack:" + reason);
+ final ActivityStack stack = moveTaskToStackUncheckedLocked(
+ task, stackId, toTop, forceFocus, "moveTaskToStack:" + reason);
+
+ if (!animate) {
+ stack.mNoAnimActivities.add(topActivity);
+ }
// Make sure the task has the appropriate bounds/size for the stack it is in.
if (stackId == FULLSCREEN_WORKSPACE_STACK_ID && task.mBounds != null) {
- resizeTaskLocked(task, stack.mBounds,
- RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS);
+ resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS);
} else if (stackId == FREEFORM_WORKSPACE_STACK_ID
&& task.mBounds == null && task.mLastNonFullscreenBounds != null) {
resizeTaskLocked(task, task.mLastNonFullscreenBounds,
RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS);
} else if (stackId == DOCKED_STACK_ID || stackId == PINNED_STACK_ID) {
- resizeTaskLocked(task, stack.mBounds,
- RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS);
+ resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS);
}
// The task might have already been running and its visibility needs to be synchronized with
// the visibility of the stack / windows.
ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
resumeTopActivitiesLocked();
+
+ if (!task.mResizeable && isStackDockedInEffect(stackId)) {
+ showNonResizeableDockToast(taskId);
+ }
}
boolean moveTopStackActivityToPinnedStackLocked(int stackId, Rect bounds) {
@@ -3399,13 +3473,13 @@
// There is only one activity in the task. So, we can just move the task over to the
// pinned stack without re-parenting the activity in a different task.
moveTaskToStackLocked(task.taskId, PINNED_STACK_ID, ON_TOP, FORCE_FOCUS,
- "moveTopActivityToPinnedStack");
+ "moveTopActivityToPinnedStack", true /* animate */);
} else {
final ActivityStack pinnedStack = getStack(PINNED_STACK_ID, CREATE_IF_NEEDED, ON_TOP);
pinnedStack.moveActivityToStack(r);
}
- resizeStackLocked(PINNED_STACK_ID, bounds, PRESERVE_WINDOWS, true);
+ resizeStackLocked(PINNED_STACK_ID, bounds, !PRESERVE_WINDOWS, true);
// The task might have already been running and its visibility needs to be synchronized with
// the visibility of the stack / windows.
@@ -3684,7 +3758,7 @@
void handleLaunchTaskBehindCompleteLocked(ActivityRecord r) {
r.mLaunchTaskBehind = false;
final TaskRecord task = r.task;
- task.setLastThumbnailLocked(task.stack.screenshotActivities(r));
+ task.setLastThumbnailLocked(task.stack.screenshotActivitiesLocked(r));
mRecentTasks.addLocked(task);
mService.notifyTaskStackChangedLocked();
mWindowManager.setAppVisibility(r.appToken, false);
@@ -4303,6 +4377,10 @@
}
}
+ private void showNonResizeableDockToast(int taskId) {
+ mWindowManager.scheduleShowNonResizeableDockToast(taskId);
+ }
+
void showLockTaskToast() {
mLockTaskNotify.showToast(mLockTaskModeState);
}
@@ -4615,6 +4693,7 @@
}
}
} break;
+
}
}
}
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index c7228ce..f64b803 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -272,18 +272,18 @@
}
}
- void noteProcessState(String name, int uid, int state) {
- synchronized (mStats) {
- mStats.noteProcessStateLocked(name, uid, state);
- }
- }
-
void noteProcessFinish(String name, int uid) {
synchronized (mStats) {
mStats.noteProcessFinishLocked(name, uid);
}
}
+ void noteUidProcessState(int uid, int state) {
+ synchronized (mStats) {
+ mStats.noteUidProcessStateLocked(uid, state);
+ }
+ }
+
// Public interface...
public byte[] getStatistics() {
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index d317791..b160981 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -27,12 +27,16 @@
import android.app.AppGlobals;
import android.app.AppOpsManager;
import android.app.BroadcastOptions;
+import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.IIntentReceiver;
+import android.content.IIntentSender;
import android.content.Intent;
+import android.content.IntentSender;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -46,6 +50,7 @@
import android.util.Slog;
import android.util.TimeUtils;
import com.android.server.DeviceIdleController;
+import com.android.server.LocalServices;
import static com.android.server.am.ActivityManagerDebugConfig.*;
@@ -181,7 +186,7 @@
} break;
}
}
- };
+ }
private final class AppNotResponding implements Runnable {
private final ProcessRecord mApp;
@@ -556,6 +561,17 @@
+ " (uid " + r.callingUid + ")");
skip = true;
}
+ if (!skip) {
+ if (!mService.checkAllowBackgroundLocked(filter.receiverList.uid, filter.packageName,
+ -1)) {
+ Slog.w(TAG, "Background execution not allowed: receiving "
+ + r.intent
+ + " to " + filter.receiverList.app
+ + " (pid=" + filter.receiverList.pid
+ + ", uid=" + filter.receiverList.uid + ")");
+ skip = true;
+ }
+ }
if (!mService.mIntentFirewall.checkBroadcast(r.intent, r.callingUid,
r.callingPid, r.resolvedType, filter.receiverList.uid)) {
@@ -569,6 +585,17 @@
}
if (!skip) {
+ // If permissions need a review before any of the app components can run, we drop
+ // the broadcast and if the calling app is in the foreground and the broadcast is
+ // explicit we launch the review UI passing it a pending intent to send the skipped
+ // broadcast.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ if (!requestStartTargetPermissionsReviewIfNeededLocked(r, filter.packageName,
+ filter.owningUserId)) {
+ return;
+ }
+ }
+
// If this is not being sent as an ordered broadcast, then we
// don't want to touch the fields that keep track of the current
// state of ordered broadcasts.
@@ -611,6 +638,54 @@
}
}
+ private boolean requestStartTargetPermissionsReviewIfNeededLocked(
+ BroadcastRecord receiverRecord, String receivingPackageName,
+ final int receivingUserId) {
+ if (!mService.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ receivingPackageName, receivingUserId)) {
+ return true;
+ }
+
+ final boolean callerForeground = receiverRecord.callerApp != null
+ ? receiverRecord.callerApp.setSchedGroup != Process.THREAD_GROUP_BG_NONINTERACTIVE
+ : true;
+
+ // Show a permission review UI only for explicit broadcast from a foreground app
+ if (callerForeground && receiverRecord.intent.getComponent() != null) {
+ IIntentSender target = mService.getIntentSenderLocked(
+ ActivityManager.INTENT_SENDER_BROADCAST, receiverRecord.callerPackage,
+ receiverRecord.callingUid, receiverRecord.userId, null, null, 0,
+ new Intent[]{receiverRecord.intent},
+ new String[]{receiverRecord.intent.resolveType(mService.mContext
+ .getContentResolver())},
+ PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT
+ | PendingIntent.FLAG_IMMUTABLE, null);
+
+ final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, receivingPackageName);
+ intent.putExtra(Intent.EXTRA_INTENT, new IntentSender(target));
+
+ if (DEBUG_PERMISSIONS_REVIEW) {
+ Slog.i(TAG, "u" + receivingUserId + " Launching permission review for package "
+ + receivingPackageName);
+ }
+
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mService.mContext.startActivityAsUser(intent, new UserHandle(receivingUserId));
+ }
+ });
+ } else {
+ Slog.w(TAG, "u" + receivingUserId + " Receiving a broadcast in package"
+ + receivingPackageName + " requires a permissions review");
+ }
+
+ return false;
+ }
+
final void scheduleTempWhitelistLocked(int uid, long duration, BroadcastRecord r) {
if (duration > Integer.MAX_VALUE) {
duration = Integer.MAX_VALUE;
@@ -938,6 +1013,15 @@
skip = true;
}
if (!skip) {
+ if (!mService.checkAllowBackgroundLocked(info.activityInfo.applicationInfo.uid,
+ info.activityInfo.packageName, -1)) {
+ Slog.w(TAG, "Background execution not allowed: receiving "
+ + r.intent + " to "
+ + component.flattenToShortString());
+ skip = true;
+ }
+ }
+ if (!skip) {
skip = !mService.mIntentFirewall.checkBroadcast(r.intent, r.callingUid,
r.callingPid, r.resolvedType, info.activityInfo.applicationInfo.uid);
}
@@ -987,6 +1071,18 @@
}
}
+ // If permissions need a review before any of the app components can run, we drop
+ // the broadcast and if the calling app is in the foreground and the broadcast is
+ // explicit we launch the review UI passing it a pending intent to send the skipped
+ // broadcast.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED && !skip) {
+ if (!requestStartTargetPermissionsReviewIfNeededLocked(r,
+ info.activityInfo.packageName, UserHandle.getUserId(
+ info.activityInfo.applicationInfo.uid))) {
+ skip = true;
+ }
+ }
+
if (skip) {
if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST,
"Skipping delivery of ordered [" + mQueueName + "] "
diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags
index 78b5f33..0397553 100644
--- a/services/core/java/com/android/server/am/EventLogTags.logtags
+++ b/services/core/java/com/android/server/am/EventLogTags.logtags
@@ -91,7 +91,7 @@
30042 am_activity_fully_drawn_time (User|1|5),(Token|1|5),(Component Name|3),(time|2|3)
# Activity focused
-30043 am_focused_activity (User|1|5),(Component Name|3)
+30043 am_focused_activity (User|1|5),(Component Name|3),(Reason|3)
# Stack focus
30044 am_focused_stack (User|1|5),(Focused Stack Id|1|5),(Last Focused Stack Id|1|5),(Reason|3)
diff --git a/services/core/java/com/android/server/am/TaskPersister.java b/services/core/java/com/android/server/am/TaskPersister.java
index 150baf0..9a00075 100644
--- a/services/core/java/com/android/server/am/TaskPersister.java
+++ b/services/core/java/com/android/server/am/TaskPersister.java
@@ -16,10 +16,11 @@
package com.android.server.am;
-import android.content.pm.IPackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Debug;
+import android.os.Environment;
+import android.os.FileUtils;
import android.os.SystemClock;
import android.util.ArraySet;
import android.util.AtomicFile;
@@ -27,7 +28,6 @@
import android.util.Xml;
import android.os.Process;
-import com.android.internal.util.ArrayUtils;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.XmlUtils;
@@ -44,6 +44,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.List;
import libcore.io.IoUtils;
@@ -54,8 +55,10 @@
/** When not flushing don't write out files faster than this */
private static final long INTER_WRITE_DELAY_MS = 500;
- /** When not flushing delay this long before writing the first file out. This gives the next
- * task being launched a chance to load its resources without this occupying IO bandwidth. */
+ /**
+ * When not flushing delay this long before writing the first file out. This gives the next task
+ * being launched a chance to load its resources without this occupying IO bandwidth.
+ */
private static final long PRE_TASK_DELAY_MS = 3000;
/** The maximum number of entries to keep in the queue before draining it automatically. */
@@ -72,24 +75,23 @@
private static final String TAG_TASK = "task";
- static File sImagesDir;
- static File sTasksDir;
-
private final ActivityManagerService mService;
private final ActivityStackSupervisor mStackSupervisor;
private final RecentTasks mRecentTasks;
- /** Value determines write delay mode as follows:
- * < 0 We are Flushing. No delays between writes until the image queue is drained and all
- * tasks needing persisting are written to disk. There is no delay between writes.
- * == 0 We are Idle. Next writes will be delayed by #PRE_TASK_DELAY_MS.
- * > 0 We are Actively writing. Next write will be at this time. Subsequent writes will be
- * delayed by #INTER_WRITE_DELAY_MS. */
+ /**
+ * Value determines write delay mode as follows: < 0 We are Flushing. No delays between writes
+ * until the image queue is drained and all tasks needing persisting are written to disk. There
+ * is no delay between writes. == 0 We are Idle. Next writes will be delayed by
+ * #PRE_TASK_DELAY_MS. > 0 We are Actively writing. Next write will be at this time. Subsequent
+ * writes will be delayed by #INTER_WRITE_DELAY_MS.
+ */
private long mNextWriteTime = 0;
private final LazyTaskWriterThread mLazyTaskWriterThread;
private static class WriteQueueItem {}
+
private static class TaskWriteQueueItem extends WriteQueueItem {
final TaskRecord mTask;
@@ -97,12 +99,13 @@
mTask = task;
}
}
+
private static class ImageWriteQueueItem extends WriteQueueItem {
- final String mFilename;
+ final String mFilePath;
Bitmap mImage;
- ImageWriteQueueItem(String filename, Bitmap image) {
- mFilename = filename;
+ ImageWriteQueueItem(String filePath, Bitmap image) {
+ mFilePath = filePath;
mImage = image;
}
}
@@ -111,19 +114,18 @@
TaskPersister(File systemDir, ActivityStackSupervisor stackSupervisor,
RecentTasks recentTasks) {
- sTasksDir = new File(systemDir, TASKS_DIRNAME);
- if (!sTasksDir.exists()) {
- if (DEBUG) Slog.d(TAG, "Creating tasks directory " + sTasksDir);
- if (!sTasksDir.mkdir()) {
- Slog.e(TAG, "Failure creating tasks directory " + sTasksDir);
+
+ final File legacyImagesDir = new File(systemDir, IMAGES_DIRNAME);
+ if (legacyImagesDir.exists()) {
+ if (!FileUtils.deleteContents(legacyImagesDir) || !legacyImagesDir.delete()) {
+ Slog.i(TAG, "Failure deleting legacy images directory: " + legacyImagesDir);
}
}
- sImagesDir = new File(systemDir, IMAGES_DIRNAME);
- if (!sImagesDir.exists()) {
- if (DEBUG) Slog.d(TAG, "Creating images directory " + sTasksDir);
- if (!sImagesDir.mkdir()) {
- Slog.e(TAG, "Failure creating images directory " + sImagesDir);
+ final File legacyTasksDir = new File(systemDir, TASKS_DIRNAME);
+ if (legacyTasksDir.exists()) {
+ if (!FileUtils.deleteContents(legacyTasksDir) || !legacyTasksDir.delete()) {
+ Slog.i(TAG, "Failure deleting legacy tasks directory: " + legacyTasksDir);
}
}
@@ -144,8 +146,8 @@
for (int queueNdx = mWriteQueue.size() - 1; queueNdx >= 0; --queueNdx) {
final WriteQueueItem item = mWriteQueue.get(queueNdx);
if (item instanceof ImageWriteQueueItem &&
- ((ImageWriteQueueItem) item).mFilename.startsWith(taskString)) {
- if (DEBUG) Slog.d(TAG, "Removing " + ((ImageWriteQueueItem) item).mFilename +
+ ((ImageWriteQueueItem) item).mFilePath.startsWith(taskString)) {
+ if (DEBUG) Slog.d(TAG, "Removing " + ((ImageWriteQueueItem) item).mFilePath +
" from write queue");
mWriteQueue.remove(queueNdx);
}
@@ -213,14 +215,14 @@
}
}
- void saveImage(Bitmap image, String filename) {
+ void saveImage(Bitmap image, String filePath) {
synchronized (this) {
int queueNdx;
for (queueNdx = mWriteQueue.size() - 1; queueNdx >= 0; --queueNdx) {
final WriteQueueItem item = mWriteQueue.get(queueNdx);
if (item instanceof ImageWriteQueueItem) {
ImageWriteQueueItem imageWriteQueueItem = (ImageWriteQueueItem) item;
- if (imageWriteQueueItem.mFilename.equals(filename)) {
+ if (imageWriteQueueItem.mFilePath.equals(filePath)) {
// replace the Bitmap with the new one.
imageWriteQueueItem.mImage = image;
break;
@@ -228,14 +230,14 @@
}
}
if (queueNdx < 0) {
- mWriteQueue.add(new ImageWriteQueueItem(filename, image));
+ mWriteQueue.add(new ImageWriteQueueItem(filePath, image));
}
if (mWriteQueue.size() > MAX_WRITE_QUEUE_LENGTH) {
mNextWriteTime = FLUSH_QUEUE;
} else if (mNextWriteTime == 0) {
mNextWriteTime = SystemClock.uptimeMillis() + PRE_TASK_DELAY_MS;
}
- if (DEBUG) Slog.d(TAG, "saveImage: filename=" + filename + " now=" +
+ if (DEBUG) Slog.d(TAG, "saveImage: filePath=" + filePath + " now=" +
SystemClock.uptimeMillis() + " mNextWriteTime=" +
mNextWriteTime + " Callers=" + Debug.getCallers(4));
notifyAll();
@@ -244,22 +246,22 @@
yieldIfQueueTooDeep();
}
- Bitmap getTaskDescriptionIcon(String filename) {
+ Bitmap getTaskDescriptionIcon(String filePath) {
// See if it is in the write queue
- final Bitmap icon = getImageFromWriteQueue(filename);
+ final Bitmap icon = getImageFromWriteQueue(filePath);
if (icon != null) {
return icon;
}
- return restoreImage(filename);
+ return restoreImage(filePath);
}
- Bitmap getImageFromWriteQueue(String filename) {
+ Bitmap getImageFromWriteQueue(String filePath) {
synchronized (this) {
for (int queueNdx = mWriteQueue.size() - 1; queueNdx >= 0; --queueNdx) {
final WriteQueueItem item = mWriteQueue.get(queueNdx);
if (item instanceof ImageWriteQueueItem) {
ImageWriteQueueItem imageWriteQueueItem = (ImageWriteQueueItem) item;
- if (imageWriteQueueItem.mFilename.equals(filename)) {
+ if (imageWriteQueueItem.mFilePath.equals(filePath)) {
return imageWriteQueueItem.mImage;
}
}
@@ -275,7 +277,7 @@
xmlSerializer.setOutput(stringWriter);
if (DEBUG) xmlSerializer.setFeature(
- "http://xmlpull.org/v1/doc/features.html#indent-output", true);
+ "http://xmlpull.org/v1/doc/features.html#indent-output", true);
// save task
xmlSerializer.startDocument(null, true);
@@ -321,19 +323,22 @@
return null;
}
- ArrayList<TaskRecord> restoreTasksLocked(final int [] validUserIds) {
- final ArrayList<TaskRecord> tasks = new ArrayList<TaskRecord>();
+ private List<TaskRecord> restoreTasksForUserLocked(final int userId) {
+ final List<TaskRecord> tasks = new ArrayList<TaskRecord>();
ArraySet<Integer> recoveredTaskIds = new ArraySet<Integer>();
- File[] recentFiles = sTasksDir.listFiles();
+ File userTasksDir = getUserTasksDir(userId);
+
+ File[] recentFiles = userTasksDir.listFiles();
if (recentFiles == null) {
- Slog.e(TAG, "Unable to list files from " + sTasksDir);
+ Slog.e(TAG, "restoreTasksForUser: Unable to list files from " + userTasksDir);
return tasks;
}
for (int taskNdx = 0; taskNdx < recentFiles.length; ++taskNdx) {
File taskFile = recentFiles[taskNdx];
- if (DEBUG) Slog.d(TAG, "restoreTasksLocked: taskFile=" + taskFile.getName());
+ if (DEBUG) Slog.d(TAG, "restoreTasksForUser: userId=" + userId
+ + ", taskFile=" + taskFile.getName());
BufferedReader reader = null;
boolean deleteFile = false;
try {
@@ -348,30 +353,29 @@
if (event == XmlPullParser.START_TAG) {
if (DEBUG) Slog.d(TAG, "restoreTasksLocked: START_TAG name=" + name);
if (TAG_TASK.equals(name)) {
- final TaskRecord task =
- TaskRecord.restoreFromXml(in, mStackSupervisor);
- if (DEBUG) Slog.d(TAG, "restoreTasksLocked: restored task=" +
- task);
+ final TaskRecord task = TaskRecord.restoreFromXml(in, mStackSupervisor);
+ if (DEBUG) Slog.d(TAG, "restoreTasksLocked: restored task="
+ + task);
if (task != null) {
// XXX Don't add to write queue... there is no reason to write
// out the stuff we just read, if we don't write it we will
// read the same thing again.
- //mWriteQueue.add(new TaskWriteQueueItem(task));
+ // mWriteQueue.add(new TaskWriteQueueItem(task));
final int taskId = task.taskId;
mStackSupervisor.setNextTaskId(taskId);
// Check if it's a valid user id. Don't add tasks for removed users.
- if (ArrayUtils.contains(validUserIds, task.userId)) {
+ if (userId == task.userId) {
task.isPersistable = true;
tasks.add(task);
recoveredTaskIds.add(taskId);
}
} else {
- Slog.e(TAG, "Unable to restore taskFile=" + taskFile + ": " +
- fileToString(taskFile));
+ Slog.e(TAG, "restoreTasksForUser: Unable to restore taskFile="
+ + taskFile + ": " + fileToString(taskFile));
}
} else {
- Slog.wtf(TAG, "restoreTasksLocked Unknown xml event=" + event +
- " name=" + name);
+ Slog.wtf(TAG, "restoreTasksForUser: Unknown xml event=" + event
+ + " name=" + name);
}
}
XmlUtils.skipCurrentTag(in);
@@ -390,10 +394,19 @@
}
if (!DEBUG) {
- removeObsoleteFiles(recoveredTaskIds);
+ removeObsoleteFiles(recoveredTaskIds, userTasksDir.listFiles());
+ }
+ return tasks;
+ }
+
+ ArrayList<TaskRecord> restoreTasksLocked(final int[] validUserIds) {
+ final ArrayList<TaskRecord> tasks = new ArrayList<TaskRecord>();
+
+ for (int userId : validUserIds) {
+ tasks.addAll(restoreTasksForUserLocked(userId));
}
- // Fixup task affiliation from taskIds
+ // Fix up task affiliation from taskIds
for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) {
final TaskRecord task = tasks.get(taskNdx);
task.setPrevAffiliate(taskIdToTask(task.mPrevAffiliateTaskId, tasks));
@@ -420,7 +433,7 @@
}
private static void removeObsoleteFiles(ArraySet<Integer> persistentTaskIds, File[] files) {
- if (DEBUG) Slog.d(TAG, "removeObsoleteFile: persistentTaskIds=" + persistentTaskIds +
+ if (DEBUG) Slog.d(TAG, "removeObsoleteFiles: persistentTaskIds=" + persistentTaskIds +
" files=" + files);
if (files == null) {
Slog.e(TAG, "File error accessing recents directory (too many files open?).");
@@ -434,14 +447,14 @@
final int taskId;
try {
taskId = Integer.valueOf(filename.substring(0, taskIdEnd));
- if (DEBUG) Slog.d(TAG, "removeObsoleteFile: Found taskId=" + taskId);
+ if (DEBUG) Slog.d(TAG, "removeObsoleteFiles: Found taskId=" + taskId);
} catch (Exception e) {
- Slog.wtf(TAG, "removeObsoleteFile: Can't parse file=" + file.getName());
+ Slog.wtf(TAG, "removeObsoleteFiles: Can't parse file=" + file.getName());
file.delete();
continue;
}
if (!persistentTaskIds.contains(taskId)) {
- if (DEBUG) Slog.d(TAG, "removeObsoleteFile: deleting file=" + file.getName());
+ if (DEBUG) Slog.d(TAG, "removeObsoleteFiles: deleting file=" + file.getName());
file.delete();
}
}
@@ -449,13 +462,39 @@
}
private void removeObsoleteFiles(ArraySet<Integer> persistentTaskIds) {
- removeObsoleteFiles(persistentTaskIds, sTasksDir.listFiles());
- removeObsoleteFiles(persistentTaskIds, sImagesDir.listFiles());
+ for (int userId : mService.getRunningUserIds()) {
+ removeObsoleteFiles(persistentTaskIds, getUserImagesDir(userId).listFiles());
+ removeObsoleteFiles(persistentTaskIds, getUserTasksDir(userId).listFiles());
+ }
}
static Bitmap restoreImage(String filename) {
if (DEBUG) Slog.d(TAG, "restoreImage: restoring " + filename);
- return BitmapFactory.decodeFile(sImagesDir + File.separator + filename);
+ return BitmapFactory.decodeFile(filename);
+ }
+
+ static File getUserTasksDir(int userId) {
+ File userTasksDir = new File(Environment.getUserSystemDirectory(userId), TASKS_DIRNAME);
+
+ if (!userTasksDir.exists()) {
+ if (!userTasksDir.mkdir()) {
+ Slog.e(TAG, "Failure creating tasks directory for user " + userId + ": "
+ + userTasksDir);
+ }
+ }
+ return userTasksDir;
+ }
+
+ static File getUserImagesDir(int userId) {
+ File userImagesDir = new File(Environment.getUserSystemDirectory(userId), IMAGES_DIRNAME);
+
+ if (!userImagesDir.exists()) {
+ if (!userImagesDir.mkdir()) {
+ Slog.e(TAG, "Failure creating images directory for user " + userId + ": "
+ + userImagesDir);
+ }
+ }
+ return userImagesDir;
}
private class LazyTaskWriterThread extends Thread {
@@ -508,7 +547,6 @@
INTER_WRITE_DELAY_MS + " msec. (" + mNextWriteTime + ")");
}
-
while (mWriteQueue.isEmpty()) {
if (mNextWriteTime != 0) {
mNextWriteTime = 0; // idle.
@@ -542,15 +580,15 @@
if (item instanceof ImageWriteQueueItem) {
ImageWriteQueueItem imageWriteQueueItem = (ImageWriteQueueItem) item;
- final String filename = imageWriteQueueItem.mFilename;
+ final String filePath = imageWriteQueueItem.mFilePath;
final Bitmap bitmap = imageWriteQueueItem.mImage;
- if (DEBUG) Slog.d(TAG, "writing bitmap: filename=" + filename);
+ if (DEBUG) Slog.d(TAG, "writing bitmap: filename=" + filePath);
FileOutputStream imageFile = null;
try {
- imageFile = new FileOutputStream(new File(sImagesDir, filename));
+ imageFile = new FileOutputStream(new File(filePath));
bitmap.compress(Bitmap.CompressFormat.PNG, 100, imageFile);
} catch (Exception e) {
- Slog.e(TAG, "saveImage: unable to save " + filename, e);
+ Slog.e(TAG, "saveImage: unable to save " + filePath, e);
} finally {
IoUtils.closeQuietly(imageFile);
}
@@ -575,18 +613,21 @@
FileOutputStream file = null;
AtomicFile atomicFile = null;
try {
- atomicFile = new AtomicFile(new File(sTasksDir, String.valueOf(
- task.taskId) + RECENTS_FILENAME + TASK_EXTENSION));
+ atomicFile = new AtomicFile(new File(
+ getUserTasksDir(task.userId),
+ String.valueOf(task.taskId) + RECENTS_FILENAME
+ + TASK_EXTENSION));
file = atomicFile.startWrite();
file.write(stringWriter.toString().getBytes());
file.write('\n');
atomicFile.finishWrite(file);
+
} catch (IOException e) {
if (file != null) {
atomicFile.failWrite(file);
}
- Slog.e(TAG, "Unable to open " + atomicFile + " for persisting. " +
- e);
+ Slog.e(TAG,
+ "Unable to open " + atomicFile + " for persisting. " + e);
}
}
}
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index b214080..1e529dab 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -27,15 +27,23 @@
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_NEVER;
import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRIVILEGED;
-import static com.android.server.am.ActivityManagerDebugConfig.*;
-import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ADD_REMOVE;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_RECENTS;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_ADD_REMOVE;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKTASK;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_RECENTS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_TASKS;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.am.ActivityRecord.APPLICATION_ACTIVITY_TYPE;
+import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE;
import static com.android.server.am.ActivityRecord.RECENTS_ACTIVITY_TYPE;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManager.StackId;
-import android.app.ActivityManager.TaskThumbnail;
import android.app.ActivityManager.TaskDescription;
import android.app.ActivityManager.TaskThumbnail;
import android.app.ActivityManager.TaskThumbnailInfo;
@@ -58,8 +66,10 @@
import android.service.voice.IVoiceInteractionSession;
import android.util.DisplayMetrics;
import android.util.Slog;
+
import com.android.internal.app.IVoiceInteractor;
import com.android.internal.util.XmlUtils;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -237,7 +247,8 @@
mService = service;
mFilename = String.valueOf(_taskId) + TASK_THUMBNAIL_SUFFIX +
TaskPersister.IMAGE_EXTENSION;
- mLastThumbnailFile = new File(TaskPersister.sImagesDir, mFilename);
+ userId = UserHandle.getUserId(info.applicationInfo.uid);
+ mLastThumbnailFile = new File(TaskPersister.getUserImagesDir(userId), mFilename);
mLastThumbnailInfo = new TaskThumbnailInfo();
taskId = _taskId;
mAffiliatedTaskId = _taskId;
@@ -256,7 +267,8 @@
mService = service;
mFilename = String.valueOf(_taskId) + TASK_THUMBNAIL_SUFFIX +
TaskPersister.IMAGE_EXTENSION;
- mLastThumbnailFile = new File(TaskPersister.sImagesDir, mFilename);
+ userId = UserHandle.getUserId(info.applicationInfo.uid);
+ mLastThumbnailFile = new File(TaskPersister.getUserImagesDir(userId), mFilename);
mLastThumbnailInfo = thumbnailInfo;
taskId = _taskId;
mAffiliatedTaskId = _taskId;
@@ -276,7 +288,6 @@
taskType = APPLICATION_ACTIVITY_TYPE;
mTaskToReturnTo = HOME_ACTIVITY_TYPE;
- userId = UserHandle.getUserId(info.applicationInfo.uid);
lastTaskDescription = _taskDescription;
mMinimalSize = info != null && info.layout != null ? info.layout.minimalSize : -1;
}
@@ -294,7 +305,7 @@
mService = service;
mFilename = String.valueOf(_taskId) + TASK_THUMBNAIL_SUFFIX +
TaskPersister.IMAGE_EXTENSION;
- mLastThumbnailFile = new File(TaskPersister.sImagesDir, mFilename);
+ mLastThumbnailFile = new File(TaskPersister.getUserImagesDir(_userId), mFilename);
mLastThumbnailInfo = lastThumbnailInfo;
taskId = _taskId;
intent = _intent;
@@ -326,7 +337,7 @@
mNextAffiliateTaskId = nextTaskId;
mCallingUid = callingUid;
mCallingPackage = callingPackage;
- mResizeable = resizeable || mService.mForceResizableActivites;
+ mResizeable = resizeable || mService.mForceResizableActivities;
mPrivileged = privileged;
ActivityInfo info = (mActivities.size() > 0) ? mActivities.get(0).info : null;
mMinimalSize = info != null && info.layout != null ? info.layout.minimalSize : -1;
@@ -428,7 +439,7 @@
} else {
autoRemoveRecents = false;
}
- mResizeable = info.resizeable || mService.mForceResizableActivites;
+ mResizeable = info.resizeable || mService.mForceResizableActivities;
mLockTaskMode = info.lockTaskLaunchMode;
mPrivileged = (info.applicationInfo.privateFlags & PRIVATE_FLAG_PRIVILEGED) != 0;
setLockTaskAuth();
@@ -537,7 +548,7 @@
mLastThumbnailFile.delete();
}
} else {
- mService.mTaskPersister.saveImage(thumbnail, mFilename);
+ mService.mTaskPersister.saveImage(thumbnail, mLastThumbnailFile.getAbsolutePath());
}
return true;
}
@@ -549,7 +560,8 @@
thumbs.thumbnailInfo = mLastThumbnailInfo;
thumbs.thumbnailFileDescriptor = null;
if (mLastThumbnail == null) {
- thumbs.mainThumbnail = mService.mTaskPersister.getImageFromWriteQueue(mFilename);
+ thumbs.mainThumbnail = mService.mTaskPersister.getImageFromWriteQueue(
+ mLastThumbnailFile.getAbsolutePath());
}
// Only load the thumbnail file if we don't have a thumbnail
if (thumbs.mainThumbnail == null && mLastThumbnailFile.exists()) {
@@ -682,7 +694,7 @@
// Only set this based on the first activity
if (mActivities.isEmpty()) {
taskType = r.mActivityType;
- if (taskType == HOME_ACTIVITY_TYPE && mService.mForceResizableActivites) {
+ if (taskType == HOME_ACTIVITY_TYPE && mService.mForceResizableActivities) {
mResizeable = r.info.resizeable;
}
isPersistable = r.isPersistable();
@@ -822,7 +834,7 @@
if (stack != null) {
final ActivityRecord resumedActivity = stack.mResumedActivity;
if (resumedActivity != null && resumedActivity.task == this) {
- final Bitmap thumbnail = stack.screenshotActivities(resumedActivity);
+ final Bitmap thumbnail = stack.screenshotActivitiesLocked(resumedActivity);
setLastThumbnailLocked(thumbnail);
}
}
@@ -1259,13 +1271,17 @@
mBounds = null;
mOverrideConfig = Configuration.EMPTY;
} else {
- mBounds = new Rect(bounds);
+ if (mBounds == null) {
+ mBounds = new Rect(bounds);
+ } else {
+ mBounds.set(bounds);
+ }
if (stack == null || StackId.persistTaskBounds(stack.mStackId)) {
mLastNonFullscreenBounds = mBounds;
}
final Configuration serviceConfig = mService.mConfiguration;
- mOverrideConfig = new Configuration(serviceConfig);
+ mOverrideConfig = new Configuration(Configuration.EMPTY);
// TODO(multidisplay): Update Dp to that of display stack is on.
final float density = serviceConfig.densityDpi * DisplayMetrics.DENSITY_DEFAULT_SCALE;
mOverrideConfig.screenWidthDp =
diff --git a/services/core/java/com/android/server/am/UidRecord.java b/services/core/java/com/android/server/am/UidRecord.java
index b4efbf0..d24c3a5 100644
--- a/services/core/java/com/android/server/am/UidRecord.java
+++ b/services/core/java/com/android/server/am/UidRecord.java
@@ -17,7 +17,9 @@
package com.android.server.am;
import android.app.ActivityManager;
+import android.os.SystemClock;
import android.os.UserHandle;
+import android.util.TimeUtils;
/**
* Overall information about a uid that has actively running processes.
@@ -26,12 +28,20 @@
final int uid;
int curProcState;
int setProcState = ActivityManager.PROCESS_STATE_NONEXISTENT;
+ long lastBackgroundTime;
+ boolean idle;
int numProcs;
+ static final int CHANGE_PROCSTATE = 0;
+ static final int CHANGE_GONE = 1;
+ static final int CHANGE_GONE_IDLE = 2;
+ static final int CHANGE_IDLE = 3;
+ static final int CHANGE_ACTIVE = 4;
+
static final class ChangeItem {
UidRecord uidRecord;
int uid;
- boolean gone;
+ int change;
int processState;
}
@@ -54,9 +64,16 @@
UserHandle.formatUid(sb, uid);
sb.append(' ');
sb.append(ProcessList.makeProcStateString(curProcState));
- sb.append(" / ");
+ if (lastBackgroundTime > 0) {
+ sb.append(" bg:");
+ TimeUtils.formatDuration(SystemClock.elapsedRealtime()-lastBackgroundTime, sb);
+ }
+ if (idle) {
+ sb.append(" idle");
+ }
+ sb.append(" procs:");
sb.append(numProcs);
- sb.append(" procs}");
+ sb.append("}");
return sb.toString();
}
}
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index d6fced6..3e0ae17 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -18,6 +18,8 @@
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
+import static android.app.ActivityManager.USER_OP_ERROR_IS_SYSTEM;
+import static android.app.ActivityManager.USER_OP_ERROR_RELATED_USERS_CANNOT_STOP;
import static android.app.ActivityManager.USER_OP_IS_CURRENT;
import static android.app.ActivityManager.USER_OP_SUCCESS;
import static android.os.Process.SYSTEM_UID;
@@ -34,6 +36,7 @@
import static com.android.server.am.ActivityManagerService.SYSTEM_USER_START_MSG;
import static com.android.server.am.ActivityManagerService.USER_SWITCH_TIMEOUT_MSG;
+import android.annotation.NonNull;
import android.app.ActivityManager;
import android.app.AppOpsManager;
import android.app.Dialog;
@@ -56,16 +59,18 @@
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.IMountService;
import android.os.storage.StorageManager;
+import android.util.IntArray;
+import android.util.Pair;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
import com.android.internal.R;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.ArrayUtils;
import com.android.server.pm.UserManagerService;
@@ -76,6 +81,8 @@
import java.util.List;
import java.util.Set;
+import libcore.util.EmptyArray;
+
/**
* Helper class for {@link ActivityManagerService} responsible for multi-user functionality.
*/
@@ -99,7 +106,9 @@
/**
* Which users have been started, so are allowed to run code.
*/
+ @GuardedBy("mService")
private final SparseArray<UserState> mStartedUsers = new SparseArray<>();
+
/**
* LRU list of history of current users. Most recently current is at the end.
*/
@@ -148,39 +157,44 @@
finishUserBoot(uss);
startProfilesLocked();
+ stopRunningUsersLocked(MAX_RUNNING_USERS);
+ }
+ }
- int num = mUserLru.size();
- int i = 0;
- while (num > MAX_RUNNING_USERS && i < mUserLru.size()) {
- Integer oldUserId = mUserLru.get(i);
- UserState oldUss = mStartedUsers.get(oldUserId);
- if (oldUss == null) {
- // Shouldn't happen, but be sane if it does.
- mUserLru.remove(i);
- num--;
- continue;
- }
- if (oldUss.mState == UserState.STATE_STOPPING
- || oldUss.mState == UserState.STATE_SHUTDOWN) {
- // This user is already stopping, doesn't count.
- num--;
- i++;
- continue;
- }
- if (oldUserId == UserHandle.USER_SYSTEM || oldUserId == mCurrentUserId) {
- // Owner/System user and current user can't be stopped. We count it as running
- // when it is not a pure system user.
- if (UserInfo.isSystemOnly(oldUserId)) {
- num--;
- }
- i++;
- continue;
- }
- // This is a user to be stopped.
- stopUserLocked(oldUserId, null);
+ void stopRunningUsersLocked(int maxRunningUsers) {
+ int num = mUserLru.size();
+ int i = 0;
+ while (num > maxRunningUsers && i < mUserLru.size()) {
+ Integer oldUserId = mUserLru.get(i);
+ UserState oldUss = mStartedUsers.get(oldUserId);
+ if (oldUss == null) {
+ // Shouldn't happen, but be sane if it does.
+ mUserLru.remove(i);
+ num--;
+ continue;
+ }
+ if (oldUss.mState == UserState.STATE_STOPPING
+ || oldUss.mState == UserState.STATE_SHUTDOWN) {
+ // This user is already stopping, doesn't count.
num--;
i++;
+ continue;
}
+ if (oldUserId == UserHandle.USER_SYSTEM || oldUserId == mCurrentUserId) {
+ // Owner/System user and current user can't be stopped. We count it as running
+ // when it is not a pure system user.
+ if (UserInfo.isSystemOnly(oldUserId)) {
+ num--;
+ }
+ i++;
+ continue;
+ }
+ // This is a user to be stopped.
+ if (stopUsersLocked(oldUserId, false, null) != USER_OP_SUCCESS) {
+ num--;
+ }
+ num--;
+ i++;
}
}
@@ -201,7 +215,7 @@
}
}
- int stopUser(final int userId, final IStopUserCallback callback) {
+ int stopUser(final int userId, final boolean force, final IStopUserCallback callback) {
if (mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
!= PackageManager.PERMISSION_GRANTED) {
String msg = "Permission Denial: switchUser() from pid="
@@ -217,16 +231,44 @@
mService.enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES,
userId);
synchronized (mService) {
- return stopUserLocked(userId, callback);
+ return stopUsersLocked(userId, force, callback);
}
}
- private int stopUserLocked(final int userId, final IStopUserCallback callback) {
- if (DEBUG_MU) Slog.i(TAG, "stopUserLocked userId=" + userId);
- if (mCurrentUserId == userId && mTargetUserId == UserHandle.USER_NULL) {
+ /**
+ * Stops the user along with its related users. The method calls
+ * {@link #getUsersToStopLocked(int)} to determine the list of users that should be stopped.
+ */
+ private int stopUsersLocked(final int userId, boolean force, final IStopUserCallback callback) {
+ if (userId == UserHandle.USER_SYSTEM) {
+ return USER_OP_ERROR_IS_SYSTEM;
+ }
+ if (isCurrentUserLocked(userId)) {
return USER_OP_IS_CURRENT;
}
+ int[] usersToStop = getUsersToStopLocked(userId);
+ // If one of related users is system or current, no related users should be stopped
+ for (int i = 0; i < usersToStop.length; i++) {
+ int relatedUserId = usersToStop[i];
+ if ((UserHandle.USER_SYSTEM == relatedUserId) || isCurrentUserLocked(relatedUserId)) {
+ if (DEBUG_MU) Slog.i(TAG, "stopUsersLocked cannot stop related user "
+ + relatedUserId);
+ // We still need to stop the requested user if it's a force stop.
+ if (force) {
+ stopSingleUserLocked(userId, callback);
+ }
+ return USER_OP_ERROR_RELATED_USERS_CANNOT_STOP;
+ }
+ }
+ if (DEBUG_MU) Slog.i(TAG, "stopUsersLocked usersToStop=" + Arrays.toString(usersToStop));
+ for (int userIdToStop : usersToStop) {
+ stopSingleUserLocked(userIdToStop, userIdToStop == userId ? callback : null);
+ }
+ return USER_OP_SUCCESS;
+ }
+ private void stopSingleUserLocked(final int userId, final IStopUserCallback callback) {
+ if (DEBUG_MU) Slog.i(TAG, "stopSingleUserLocked userId=" + userId);
final UserState uss = mStartedUsers.get(userId);
if (uss == null) {
// User is not started, nothing to do... but we do need to
@@ -242,7 +284,7 @@
}
});
}
- return USER_OP_SUCCESS;
+ return;
}
if (callback != null) {
@@ -303,8 +345,6 @@
Binder.restoreCallingIdentity(ident);
}
}
-
- return USER_OP_SUCCESS;
}
void finishUserStop(UserState uss) {
@@ -346,6 +386,36 @@
}
}
+ /**
+ * Determines the list of users that should be stopped together with the specified
+ * {@code userId}. The returned list includes {@code userId}.
+ */
+ private @NonNull int[] getUsersToStopLocked(int userId) {
+ int startedUsersSize = mStartedUsers.size();
+ IntArray userIds = new IntArray();
+ userIds.add(userId);
+ synchronized (mUserProfileGroupIdsSelfLocked) {
+ int userGroupId = mUserProfileGroupIdsSelfLocked.get(userId,
+ UserInfo.NO_PROFILE_GROUP_ID);
+ for (int i = 0; i < startedUsersSize; i++) {
+ UserState uss = mStartedUsers.valueAt(i);
+ int startedUserId = uss.mHandle.getIdentifier();
+ // Skip unrelated users (profileGroupId mismatch)
+ int startedUserGroupId = mUserProfileGroupIdsSelfLocked.get(startedUserId,
+ UserInfo.NO_PROFILE_GROUP_ID);
+ boolean sameGroup = (userGroupId != UserInfo.NO_PROFILE_GROUP_ID)
+ && (userGroupId == startedUserGroupId);
+ // userId has already been added
+ boolean sameUserId = startedUserId == userId;
+ if (!sameGroup || sameUserId) {
+ continue;
+ }
+ userIds.add(startedUserId);
+ }
+ }
+ return userIds.toArray();
+ }
+
private void forceStopUserLocked(int userId, String reason) {
mService.forceStopPackageLocked(null, -1, false, false, true, false, false,
userId, reason);
@@ -358,7 +428,6 @@
null, false, false, MY_PID, SYSTEM_UID, UserHandle.USER_ALL);
}
-
/**
* Stops the guest user if it has gone to the background.
*/
@@ -376,7 +445,7 @@
UserInfo userInfo = getUserInfo(oldUserId);
if (userInfo.isGuest()) {
// This is a user to be stopped.
- stopUserLocked(oldUserId, null);
+ stopUsersLocked(oldUserId, true, null);
break;
}
}
@@ -415,7 +484,7 @@
private void updateUserUnlockedState(UserState uss) {
final IMountService mountService = IMountService.Stub
- .asInterface(ServiceManager.getService(Context.STORAGE_SERVICE));
+ .asInterface(ServiceManager.getService("mount"));
if (mountService != null) {
try {
uss.unlocked = mountService.isUserKeyUnlocked(uss.mHandle.getIdentifier());
@@ -424,7 +493,7 @@
}
} else {
// System isn't fully booted yet, so guess based on property
- uss.unlocked = !SystemProperties.getBoolean(StorageManager.PROP_HAS_FBE, false);
+ uss.unlocked = !StorageManager.isFileBasedEncryptionEnabled();
}
}
@@ -472,7 +541,7 @@
// If the user we are switching to is not currently started, then
// we need to start it now.
if (mStartedUsers.get(userId) == null) {
- mStartedUsers.put(userId, new UserState(new UserHandle(userId)));
+ mStartedUsers.put(userId, new UserState(UserHandle.of(userId)));
updateStartedUserArrayLocked();
needStart = true;
}
@@ -519,6 +588,9 @@
}
if (uss.mState == UserState.STATE_BOOTING) {
+ // Let user manager propagate user restrictions to other services.
+ getUserManager().onBeforeStartUser(userId);
+
// Booting up a new user, need to tell system services about it.
// Note that this is on the same handler as scheduling of broadcasts,
// which is important because it needs to go first.
@@ -606,10 +678,61 @@
return result;
}
- void showUserSwitchDialog(int userId, String userName) {
+ boolean unlockUser(final int userId, byte[] token) {
+ if (mService.checkCallingPermission(INTERACT_ACROSS_USERS_FULL)
+ != PackageManager.PERMISSION_GRANTED) {
+ String msg = "Permission Denial: unlockUser() from pid="
+ + Binder.getCallingPid()
+ + ", uid=" + Binder.getCallingUid()
+ + " requires " + INTERACT_ACROSS_USERS_FULL;
+ Slog.w(TAG, msg);
+ throw new SecurityException(msg);
+ }
+
+ final long binderToken = Binder.clearCallingIdentity();
+ try {
+ return unlockUserCleared(userId, token);
+ } finally {
+ Binder.restoreCallingIdentity(binderToken);
+ }
+ }
+
+ boolean unlockUserCleared(final int userId, byte[] token) {
+ synchronized (mService) {
+ final UserState uss = mStartedUsers.get(userId);
+ if (uss.unlocked) {
+ // Bail early when already unlocked
+ return true;
+ }
+ }
+
+ final UserInfo userInfo = getUserInfo(userId);
+ final IMountService mountService = IMountService.Stub
+ .asInterface(ServiceManager.getService("mount"));
+ try {
+ mountService.unlockUserKey(userId, userInfo.serialNumber, token);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to unlock: " + e.getMessage());
+ return false;
+ }
+
+ synchronized (mService) {
+ final UserState uss = mStartedUsers.get(userId);
+ updateUserUnlockedState(uss);
+ }
+
+ final Intent intent = new Intent(Intent.ACTION_USER_UNLOCKED);
+ intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND);
+ mService.broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,
+ AppOpsManager.OP_NONE, null, false, false, MY_PID, SYSTEM_UID, userId);
+
+ return true;
+ }
+
+ void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) {
// The dialog will show and then initiate the user switch by calling startUserInForeground
- Dialog d = new UserSwitchingDialog(mService, mService.mContext, userId, userName,
- true /* above system */);
+ Dialog d = new UserSwitchingDialog(mService, mService.mContext, fromToUserPair.first,
+ fromToUserPair.second, true /* above system */);
d.show();
}
@@ -637,9 +760,27 @@
mUserSwitchObservers.finishBroadcast();
}
+ private void stopBackgroundUsersIfEnforced(int oldUserId) {
+ // Never stop system user
+ if (oldUserId == UserHandle.USER_SYSTEM) {
+ return;
+ }
+ // For now, only check for user restriction. Additional checks can be added here
+ boolean disallowRunInBg = hasUserRestriction(UserManager.DISALLOW_RUN_IN_BACKGROUND,
+ oldUserId);
+ if (!disallowRunInBg) {
+ return;
+ }
+ synchronized (mService) {
+ if (DEBUG_MU) Slog.i(TAG, "stopBackgroundUsersIfEnforced stopping " + oldUserId
+ + " and related users");
+ stopUsersLocked(oldUserId, false, null);
+ }
+ }
+
void timeoutUserSwitch(UserState uss, int oldUserId, int newUserId) {
synchronized (mService) {
- Slog.w(TAG, "User switch timeout: from " + oldUserId + " to " + newUserId);
+ Slog.wtf(TAG, "User switch timeout: from " + oldUserId + " to " + newUserId);
sendContinueUserSwitchLocked(uss, oldUserId, newUserId);
}
}
@@ -689,7 +830,7 @@
}
void continueUserSwitch(UserState uss, int oldUserId, int newUserId) {
- completeSwitchAndInitialize(uss, newUserId, false, true);
+ completeSwitchAndInitialize(uss, oldUserId, newUserId, false, true);
}
void onUserInitialized(UserState uss, boolean foreground, int oldUserId, int newUserId) {
@@ -698,10 +839,10 @@
moveUserToForegroundLocked(uss, oldUserId, newUserId);
}
}
- completeSwitchAndInitialize(uss, newUserId, true, false);
+ completeSwitchAndInitialize(uss, oldUserId, newUserId, true, false);
}
- void completeSwitchAndInitialize(UserState uss, int newUserId,
+ void completeSwitchAndInitialize(UserState uss, int oldUserId, int newUserId,
boolean clearInitializing, boolean clearSwitching) {
boolean unfrozen = false;
synchronized (mService) {
@@ -723,6 +864,7 @@
newUserId, 0));
}
stopGuestUserIfBackground();
+ stopBackgroundUsersIfEnforced(oldUserId);
}
void moveUserToForegroundLocked(UserState uss, int oldUserId, int newUserId) {
@@ -975,12 +1117,11 @@
if ((flags & ActivityManager.FLAG_OR_STOPPED) != 0) {
return true;
}
- if ((flags & ActivityManager.FLAG_WITH_AMNESIA) != 0) {
- // If user is currently locked, we fall through to default "running"
- // behavior below
- if (state.unlocked) {
- return false;
- }
+ if ((flags & ActivityManager.FLAG_AND_LOCKED) != 0 && state.unlocked) {
+ return false;
+ }
+ if ((flags & ActivityManager.FLAG_AND_UNLOCKED) != 0 && !state.unlocked) {
+ return false;
}
return state.mState != UserState.STATE_STOPPING
&& state.mState != UserState.STATE_SHUTDOWN;
@@ -1016,6 +1157,10 @@
return mCurrentUserId;
}
+ private boolean isCurrentUserLocked(int userId) {
+ return mCurrentUserId == userId || mTargetUserId == userId;
+ }
+
int setTargetUserIdLocked(int targetUserId) {
return mTargetUserId = targetUserId;
}
diff --git a/services/core/java/com/android/server/am/UserSwitchingDialog.java b/services/core/java/com/android/server/am/UserSwitchingDialog.java
index 28b4096..10e88e6 100644
--- a/services/core/java/com/android/server/am/UserSwitchingDialog.java
+++ b/services/core/java/com/android/server/am/UserSwitchingDialog.java
@@ -18,9 +18,12 @@
import android.app.AlertDialog;
import android.content.Context;
+import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.os.Handler;
import android.os.Message;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewTreeObserver;
@@ -49,20 +52,26 @@
@GuardedBy("this")
private boolean mStartedUser;
- public UserSwitchingDialog(ActivityManagerService service, Context context,
- int userId, String userName, boolean aboveSystem) {
+ public UserSwitchingDialog(ActivityManagerService service, Context context, UserInfo oldUser,
+ UserInfo newUser, boolean aboveSystem) {
super(context);
mService = service;
- mUserId = userId;
+ mUserId = newUser.id;
// Set up the dialog contents
setCancelable(false);
Resources res = getContext().getResources();
// Custom view due to alignment and font size requirements
View view = LayoutInflater.from(getContext()).inflate(R.layout.user_switching_dialog, null);
- ((TextView) view.findViewById(R.id.message)).setText(
- res.getString(com.android.internal.R.string.user_switching_message, userName));
+
+ String viewMessage;
+ if (UserManager.isSplitSystemUser() && newUser.id == UserHandle.USER_SYSTEM) {
+ viewMessage = res.getString(R.string.user_logging_out_message, oldUser.name);
+ } else {
+ viewMessage = res.getString(R.string.user_switching_message, newUser.name);
+ }
+ ((TextView) view.findViewById(R.id.message)).setText(viewMessage);
setView(view);
if (aboveSystem) {
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index fe9fe50..4f2f486 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -62,7 +62,6 @@
import android.media.IAudioFocusDispatcher;
import android.media.IAudioRoutesObserver;
import android.media.IAudioService;
-import android.media.IRemoteControlDisplay;
import android.media.IRingtonePlayer;
import android.media.IVolumeController;
import android.media.MediaPlayer;
@@ -667,8 +666,7 @@
mSettingsObserver = new SettingsObserver();
createStreamStates();
- mMediaFocusControl = new MediaFocusControl(mAudioHandler.getLooper(),
- mContext, mVolumeController, this);
+ mMediaFocusControl = new MediaFocusControl(mContext);
readAndSetLowRamDevice();
@@ -5151,12 +5149,12 @@
UserInfo userInfo = UserManagerService.getInstance().getUserInfo(userId);
killBackgroundUserProcessesWithRecordAudioPermission(userInfo);
}
- UserManagerService.getInstance().setSystemControlledUserRestriction(
+ UserManagerService.getInstance().setUserRestriction(
UserManager.DISALLOW_RECORD_AUDIO, true, userId);
} else if (action.equals(Intent.ACTION_USER_FOREGROUND)) {
// Enable audio recording for foreground user/profile
int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
- UserManagerService.getInstance().setSystemControlledUserRestriction(
+ UserManagerService.getInstance().setUserRestriction(
UserManager.DISALLOW_RECORD_AUDIO, false, userId);
}
}
@@ -5235,36 +5233,6 @@
}
}
- //==========================================================================================
- // RemoteControlDisplay / RemoteControlClient / Remote info
- //==========================================================================================
- public boolean registerRemoteController(IRemoteControlDisplay rcd, int w, int h,
- ComponentName listenerComp) {
- return mMediaFocusControl.registerRemoteController(rcd, w, h, listenerComp);
- }
-
- public boolean registerRemoteControlDisplay(IRemoteControlDisplay rcd, int w, int h) {
- return mMediaFocusControl.registerRemoteControlDisplay(rcd, w, h);
- }
-
- public void unregisterRemoteControlDisplay(IRemoteControlDisplay rcd) {
- mMediaFocusControl.unregisterRemoteControlDisplay(rcd);
- }
-
- public void remoteControlDisplayUsesBitmapSize(IRemoteControlDisplay rcd, int w, int h) {
- mMediaFocusControl.remoteControlDisplayUsesBitmapSize(rcd, w, h);
- }
-
- public void remoteControlDisplayWantsPlaybackPositionSync(IRemoteControlDisplay rcd,
- boolean wantsSync) {
- mMediaFocusControl.remoteControlDisplayWantsPlaybackPositionSync(rcd, wantsSync);
- }
-
- @Override
- public void setRemoteStreamVolume(int index) {
- enforceVolumeController("set the remote stream volume");
- mMediaFocusControl.setRemoteStreamVolume(index);
- }
//==========================================================================================
// Audio Focus
diff --git a/services/core/java/com/android/server/audio/MediaFocusControl.java b/services/core/java/com/android/server/audio/MediaFocusControl.java
index f72b598..278d70b 100644
--- a/services/core/java/com/android/server/audio/MediaFocusControl.java
+++ b/services/core/java/com/android/server/audio/MediaFocusControl.java
@@ -16,52 +16,18 @@
package com.android.server.audio;
-import android.app.Activity;
-import android.app.ActivityManager;
import android.app.AppOpsManager;
-import android.app.KeyguardManager;
-import android.app.PendingIntent;
-import android.app.PendingIntent.CanceledException;
-import android.app.PendingIntent.OnFinished;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.ContentObserver;
import android.media.AudioAttributes;
import android.media.AudioFocusInfo;
import android.media.AudioManager;
import android.media.AudioSystem;
import android.media.IAudioFocusDispatcher;
-import android.media.IRemoteControlClient;
-import android.media.IRemoteControlDisplay;
-import android.media.IRemoteVolumeObserver;
-import android.media.RemoteControlClient;
import android.media.audiopolicy.IAudioPolicyCallback;
-import android.net.Uri;
import android.os.Binder;
-import android.os.Bundle;
-import android.os.Handler;
import android.os.IBinder;
-import android.os.IDeviceIdleController;
-import android.os.Looper;
-import android.os.Message;
-import android.os.PowerManager;
import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.speech.RecognizerIntent;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
import android.util.Log;
-import android.util.Slog;
-import android.view.KeyEvent;
-
-import com.android.server.audio.PlayerRecord.RemotePlaybackState;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -74,329 +40,22 @@
* @hide
*
*/
-public class MediaFocusControl implements OnFinished {
+public class MediaFocusControl {
private static final String TAG = "MediaFocusControl";
- /** Debug remote control client/display feature */
- protected static final boolean DEBUG_RC = false;
- /** Debug volumes */
- protected static final boolean DEBUG_VOL = false;
-
- /** Used to alter media button redirection when the phone is ringing. */
- private boolean mIsRinging = false;
-
- private final PowerManager.WakeLock mMediaEventWakeLock;
- private final MediaEventHandler mEventHandler;
private final Context mContext;
- private final ContentResolver mContentResolver;
- private final AudioService.VolumeController mVolumeController;
private final AppOpsManager mAppOps;
- private final KeyguardManager mKeyguardManager;
- private final AudioService mAudioService;
- private final NotificationListenerObserver mNotifListenerObserver;
- protected MediaFocusControl(Looper looper, Context cntxt,
- AudioService.VolumeController volumeCtrl, AudioService as) {
- mEventHandler = new MediaEventHandler(looper);
+ protected MediaFocusControl(Context cntxt) {
mContext = cntxt;
- mContentResolver = mContext.getContentResolver();
- mVolumeController = volumeCtrl;
- mAudioService = as;
-
- PowerManager pm = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
- mMediaEventWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "handleMediaEvent");
- int maxMusicLevel = as.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
- mMainRemote = new RemotePlaybackState(-1, maxMusicLevel, maxMusicLevel);
-
- // Register for phone state monitoring
- TelephonyManager tmgr = (TelephonyManager)
- mContext.getSystemService(Context.TELEPHONY_SERVICE);
- tmgr.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-
mAppOps = (AppOpsManager)mContext.getSystemService(Context.APP_OPS_SERVICE);
- mKeyguardManager =
- (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
- mNotifListenerObserver = new NotificationListenerObserver();
-
- mHasRemotePlayback = false;
- mMainRemoteIsActive = false;
-
- PlayerRecord.setMediaFocusControl(this);
-
- postReevaluateRemote();
}
protected void dump(PrintWriter pw) {
pw.println("\nMediaFocusControl dump time: "
+ DateFormat.getTimeInstance().format(new Date()));
dumpFocusStack(pw);
- dumpRCStack(pw);
- dumpRCCStack(pw);
- dumpRCDList(pw);
- }
-
- //==========================================================================================
- // Management of RemoteControlDisplay registration permissions
- //==========================================================================================
- private final static Uri ENABLED_NOTIFICATION_LISTENERS_URI =
- Settings.Secure.getUriFor(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);
-
- private class NotificationListenerObserver extends ContentObserver {
-
- NotificationListenerObserver() {
- super(mEventHandler);
- mContentResolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.ENABLED_NOTIFICATION_LISTENERS), false, this);
- }
-
- @Override
- public void onChange(boolean selfChange, Uri uri) {
- if (!ENABLED_NOTIFICATION_LISTENERS_URI.equals(uri) || selfChange) {
- return;
- }
- if (DEBUG_RC) { Log.d(TAG, "NotificationListenerObserver.onChange()"); }
- postReevaluateRemoteControlDisplays();
- }
- }
-
- private final static int RCD_REG_FAILURE = 0;
- private final static int RCD_REG_SUCCESS_PERMISSION = 1;
- private final static int RCD_REG_SUCCESS_ENABLED_NOTIF = 2;
-
- /**
- * Checks a caller's authorization to register an IRemoteControlDisplay.
- * Authorization is granted if one of the following is true:
- * <ul>
- * <li>the caller has android.Manifest.permission.MEDIA_CONTENT_CONTROL permission</li>
- * <li>the caller's listener is one of the enabled notification listeners</li>
- * </ul>
- * @return RCD_REG_FAILURE if it's not safe to proceed with the IRemoteControlDisplay
- * registration.
- */
- private int checkRcdRegistrationAuthorization(ComponentName listenerComp) {
- // MEDIA_CONTENT_CONTROL permission check
- if (PackageManager.PERMISSION_GRANTED == mContext.checkCallingOrSelfPermission(
- android.Manifest.permission.MEDIA_CONTENT_CONTROL)) {
- if (DEBUG_RC) { Log.d(TAG, "ok to register Rcd: has MEDIA_CONTENT_CONTROL permission");}
- return RCD_REG_SUCCESS_PERMISSION;
- }
-
- // ENABLED_NOTIFICATION_LISTENERS settings check
- if (listenerComp != null) {
- // this call is coming from an app, can't use its identity to read secure settings
- final long ident = Binder.clearCallingIdentity();
- try {
- final int currentUser = ActivityManager.getCurrentUser();
- final String enabledNotifListeners = Settings.Secure.getStringForUser(
- mContext.getContentResolver(),
- Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
- currentUser);
- if (enabledNotifListeners != null) {
- final String[] components = enabledNotifListeners.split(":");
- for (int i=0; i<components.length; i++) {
- final ComponentName component =
- ComponentName.unflattenFromString(components[i]);
- if (component != null) {
- if (listenerComp.equals(component)) {
- if (DEBUG_RC) { Log.d(TAG, "ok to register RCC: " + component +
- " is authorized notification listener"); }
- return RCD_REG_SUCCESS_ENABLED_NOTIF;
- }
- }
- }
- }
- if (DEBUG_RC) { Log.d(TAG, "not ok to register RCD, " + listenerComp +
- " is not in list of ENABLED_NOTIFICATION_LISTENERS"); }
- } finally {
- Binder.restoreCallingIdentity(ident);
- }
- }
-
- return RCD_REG_FAILURE;
- }
-
- protected boolean registerRemoteController(IRemoteControlDisplay rcd, int w, int h,
- ComponentName listenerComp) {
- int reg = checkRcdRegistrationAuthorization(listenerComp);
- if (reg != RCD_REG_FAILURE) {
- registerRemoteControlDisplay_int(rcd, w, h, listenerComp);
- return true;
- } else {
- Slog.w(TAG, "Access denied to process: " + Binder.getCallingPid() +
- ", must have permission " + android.Manifest.permission.MEDIA_CONTENT_CONTROL +
- " or be an enabled NotificationListenerService for registerRemoteController");
- return false;
- }
- }
-
- protected boolean registerRemoteControlDisplay(IRemoteControlDisplay rcd, int w, int h) {
- int reg = checkRcdRegistrationAuthorization(null);
- if (reg != RCD_REG_FAILURE) {
- registerRemoteControlDisplay_int(rcd, w, h, null);
- return true;
- } else {
- Slog.w(TAG, "Access denied to process: " + Binder.getCallingPid() +
- ", must have permission " + android.Manifest.permission.MEDIA_CONTENT_CONTROL +
- " to register IRemoteControlDisplay");
- return false;
- }
- }
-
- private void postReevaluateRemoteControlDisplays() {
- sendMsg(mEventHandler, MSG_REEVALUATE_RCD, SENDMSG_QUEUE, 0, 0, null, 0);
- }
-
- private void onReevaluateRemoteControlDisplays() {
- if (DEBUG_RC) { Log.d(TAG, "onReevaluateRemoteControlDisplays()"); }
- // read which components are enabled notification listeners
- final int currentUser = ActivityManager.getCurrentUser();
- final String enabledNotifListeners = Settings.Secure.getStringForUser(
- mContext.getContentResolver(),
- Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
- currentUser);
- if (DEBUG_RC) { Log.d(TAG, " > enabled list: " + enabledNotifListeners); }
- synchronized(mAudioFocusLock) {
- synchronized(mPRStack) {
- // check whether the "enable" status of each RCD with a notification listener
- // has changed
- final String[] enabledComponents;
- if (enabledNotifListeners == null) {
- enabledComponents = null;
- } else {
- enabledComponents = enabledNotifListeners.split(":");
- }
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di =
- displayIterator.next();
- if (di.mClientNotifListComp != null) {
- boolean wasEnabled = di.mEnabled;
- di.mEnabled = isComponentInStringArray(di.mClientNotifListComp,
- enabledComponents);
- if (wasEnabled != di.mEnabled){
- try {
- // tell the RCD whether it's enabled
- di.mRcDisplay.setEnabled(di.mEnabled);
- // tell the RCCs about the change for this RCD
- enableRemoteControlDisplayForClient_syncRcStack(
- di.mRcDisplay, di.mEnabled);
- // when enabling, refresh the information on the display
- if (di.mEnabled) {
- sendMsg(mEventHandler, MSG_RCDISPLAY_INIT_INFO, SENDMSG_QUEUE,
- di.mArtworkExpectedWidth /*arg1*/,
- di.mArtworkExpectedHeight/*arg2*/,
- di.mRcDisplay /*obj*/, 0/*delay*/);
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Error en/disabling RCD: ", e);
- }
- }
- }
- }
- }
- }
- }
-
- /**
- * @param comp a non-null ComponentName
- * @param enabledArray may be null
- * @return
- */
- private boolean isComponentInStringArray(ComponentName comp, String[] enabledArray) {
- if (enabledArray == null || enabledArray.length == 0) {
- if (DEBUG_RC) { Log.d(TAG, " > " + comp + " is NOT enabled"); }
- return false;
- }
- final String compString = comp.flattenToString();
- for (int i=0; i<enabledArray.length; i++) {
- if (compString.equals(enabledArray[i])) {
- if (DEBUG_RC) { Log.d(TAG, " > " + compString + " is enabled"); }
- return true;
- }
- }
- if (DEBUG_RC) { Log.d(TAG, " > " + compString + " is NOT enabled"); }
- return false;
- }
-
- //==========================================================================================
- // Internal event handling
- //==========================================================================================
-
- // event handler messages
- private static final int MSG_RCDISPLAY_CLEAR = 1;
- private static final int MSG_RCDISPLAY_UPDATE = 2;
- private static final int MSG_REEVALUATE_REMOTE = 3;
- private static final int MSG_RCC_NEW_PLAYBACK_INFO = 4;
- private static final int MSG_RCC_NEW_VOLUME_OBS = 5;
- private static final int MSG_RCC_NEW_PLAYBACK_STATE = 6;
- private static final int MSG_RCC_SEEK_REQUEST = 7;
- private static final int MSG_RCC_UPDATE_METADATA = 8;
- private static final int MSG_RCDISPLAY_INIT_INFO = 9;
- private static final int MSG_REEVALUATE_RCD = 10;
- private static final int MSG_UNREGISTER_MEDIABUTTONINTENT = 11;
-
- // sendMsg() flags
- /** If the msg is already queued, replace it with this one. */
- private static final int SENDMSG_REPLACE = 0;
- /** If the msg is already queued, ignore this one and leave the old. */
- private static final int SENDMSG_NOOP = 1;
- /** If the msg is already queued, queue this one and leave the old. */
- private static final int SENDMSG_QUEUE = 2;
-
- private static void sendMsg(Handler handler, int msg,
- int existingMsgPolicy, int arg1, int arg2, Object obj, int delay) {
-
- if (existingMsgPolicy == SENDMSG_REPLACE) {
- handler.removeMessages(msg);
- } else if (existingMsgPolicy == SENDMSG_NOOP && handler.hasMessages(msg)) {
- return;
- }
-
- handler.sendMessageDelayed(handler.obtainMessage(msg, arg1, arg2, obj), delay);
- }
-
- private class MediaEventHandler extends Handler {
- MediaEventHandler(Looper looper) {
- super(looper);
- }
-
- @Override
- public void handleMessage(Message msg) {
- switch(msg.what) {
- case MSG_RCDISPLAY_CLEAR:
- onRcDisplayClear();
- break;
-
- case MSG_RCDISPLAY_UPDATE:
- // msg.obj is guaranteed to be non null
- onRcDisplayUpdate( (PlayerRecord) msg.obj, msg.arg1);
- break;
-
- case MSG_REEVALUATE_REMOTE:
- onReevaluateRemote();
- break;
-
- case MSG_RCC_NEW_VOLUME_OBS:
- onRegisterVolumeObserverForRcc(msg.arg1 /* rccId */,
- (IRemoteVolumeObserver)msg.obj /* rvo */);
- break;
-
- case MSG_RCDISPLAY_INIT_INFO:
- // msg.obj is guaranteed to be non null
- onRcDisplayInitInfo((IRemoteControlDisplay)msg.obj /*newRcd*/,
- msg.arg1/*w*/, msg.arg2/*h*/);
- break;
-
- case MSG_REEVALUATE_RCD:
- onReevaluateRemoteControlDisplays();
- break;
-
- case MSG_UNREGISTER_MEDIABUTTONINTENT:
- unregisterMediaButtonIntent( (PendingIntent) msg.obj );
- break;
- }
- }
}
@@ -406,25 +65,6 @@
private final static Object mAudioFocusLock = new Object();
- private final static Object mRingingLock = new Object();
-
- private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
- @Override
- public void onCallStateChanged(int state, String incomingNumber) {
- if (state == TelephonyManager.CALL_STATE_RINGING) {
- //Log.v(TAG, " CALL_STATE_RINGING");
- synchronized(mRingingLock) {
- mIsRinging = true;
- }
- } else if ((state == TelephonyManager.CALL_STATE_OFFHOOK)
- || (state == TelephonyManager.CALL_STATE_IDLE)) {
- synchronized(mRingingLock) {
- mIsRinging = false;
- }
- }
- }
- };
-
/**
* Discard the current audio focus owner.
* Notify top of audio focus stack that it lost focus (regardless of possibility to reassign
@@ -747,8 +387,11 @@
/** @see AudioManager#requestAudioFocus(AudioManager.OnAudioFocusChangeListener, int, int, int) */
protected int requestAudioFocus(AudioAttributes aa, int focusChangeHint, IBinder cb,
IAudioFocusDispatcher fd, String clientId, String callingPackageName, int flags) {
- Log.i(TAG, " AudioFocus requestAudioFocus() from " + clientId + " req=" + focusChangeHint +
- "flags=0x" + Integer.toHexString(flags));
+ Log.i(TAG, " AudioFocus requestAudioFocus() from uid/pid " + Binder.getCallingUid()
+ + "/" + Binder.getCallingPid()
+ + " clientId=" + clientId
+ + " req=" + focusChangeHint
+ + " flags=0x" + Integer.toHexString(flags));
// we need a valid binder callback for clients
if (!cb.pingBinder()) {
Log.e(TAG, " AudioFocus DOA client for requestAudioFocus(), aborting.");
@@ -841,7 +484,9 @@
* */
protected int abandonAudioFocus(IAudioFocusDispatcher fl, String clientId, AudioAttributes aa) {
// AudioAttributes are currently ignored, to be used for zones
- Log.i(TAG, " AudioFocus abandonAudioFocus() from " + clientId);
+ Log.i(TAG, " AudioFocus abandonAudioFocus() from uid/pid " + Binder.getCallingUid()
+ + "/" + Binder.getCallingPid()
+ + " clientId=" + clientId);
try {
// this will take care of notifying the new focus owner if needed
synchronized(mAudioFocusLock) {
@@ -865,1374 +510,4 @@
}
}
-
- //==========================================================================================
- // RemoteControl
- //==========================================================================================
- /**
- * No-op if the key code for keyEvent is not a valid media key
- * (see {@link #isValidMediaKeyEvent(KeyEvent)})
- * @param keyEvent the key event to send
- */
- protected void dispatchMediaKeyEvent(KeyEvent keyEvent) {
- filterMediaKeyEvent(keyEvent, false /*needWakeLock*/);
- }
-
- /**
- * No-op if the key code for keyEvent is not a valid media key
- * (see {@link #isValidMediaKeyEvent(KeyEvent)})
- * @param keyEvent the key event to send
- */
- protected void dispatchMediaKeyEventUnderWakelock(KeyEvent keyEvent) {
- filterMediaKeyEvent(keyEvent, true /*needWakeLock*/);
- }
-
- private void filterMediaKeyEvent(KeyEvent keyEvent, boolean needWakeLock) {
- // sanity check on the incoming key event
- if (!isValidMediaKeyEvent(keyEvent)) {
- Log.e(TAG, "not dispatching invalid media key event " + keyEvent);
- return;
- }
- // event filtering for telephony
- synchronized(mRingingLock) {
- synchronized(mPRStack) {
- if ((mMediaReceiverForCalls != null) &&
- (mIsRinging || (mAudioService.getMode() == AudioSystem.MODE_IN_CALL))) {
- dispatchMediaKeyEventForCalls(keyEvent, needWakeLock);
- return;
- }
- }
- }
- // event filtering based on voice-based interactions
- if (isValidVoiceInputKeyCode(keyEvent.getKeyCode())) {
- filterVoiceInputKeyEvent(keyEvent, needWakeLock);
- } else {
- dispatchMediaKeyEvent(keyEvent, needWakeLock);
- }
- }
-
- /**
- * Handles the dispatching of the media button events to the telephony package.
- * Precondition: mMediaReceiverForCalls != null
- * @param keyEvent a non-null KeyEvent whose key code is one of the supported media buttons
- * @param needWakeLock true if a PARTIAL_WAKE_LOCK needs to be held while this key event
- * is dispatched.
- */
- private void dispatchMediaKeyEventForCalls(KeyEvent keyEvent, boolean needWakeLock) {
- Intent keyIntent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
- keyIntent.putExtra(Intent.EXTRA_KEY_EVENT, keyEvent);
- keyIntent.setPackage(mMediaReceiverForCalls.getPackageName());
- if (needWakeLock) {
- mMediaEventWakeLock.acquire();
- keyIntent.putExtra(EXTRA_WAKELOCK_ACQUIRED, WAKELOCK_RELEASE_ON_FINISHED);
- }
- final long ident = Binder.clearCallingIdentity();
- try {
- mContext.sendOrderedBroadcastAsUser(keyIntent, UserHandle.ALL,
- null, mKeyEventDone, mEventHandler, Activity.RESULT_OK, null, null);
- } finally {
- Binder.restoreCallingIdentity(ident);
- }
- }
-
- /**
- * Handles the dispatching of the media button events to one of the registered listeners,
- * or if there was none, broadcast an ACTION_MEDIA_BUTTON intent to the rest of the system.
- * @param keyEvent a non-null KeyEvent whose key code is one of the supported media buttons
- * @param needWakeLock true if a PARTIAL_WAKE_LOCK needs to be held while this key event
- * is dispatched.
- */
- private void dispatchMediaKeyEvent(KeyEvent keyEvent, boolean needWakeLock) {
- if (needWakeLock) {
- mMediaEventWakeLock.acquire();
- }
- Intent keyIntent = new Intent(Intent.ACTION_MEDIA_BUTTON, null);
- keyIntent.putExtra(Intent.EXTRA_KEY_EVENT, keyEvent);
- synchronized(mPRStack) {
- if (!mPRStack.empty()) {
- // send the intent that was registered by the client
- try {
- mPRStack.peek().getMediaButtonIntent().send(mContext,
- needWakeLock ? WAKELOCK_RELEASE_ON_FINISHED : 0 /*code*/,
- keyIntent, this, mEventHandler);
- } catch (CanceledException e) {
- Log.e(TAG, "Error sending pending intent " + mPRStack.peek());
- e.printStackTrace();
- }
- } else {
- // legacy behavior when nobody registered their media button event receiver
- // through AudioManager
- if (needWakeLock) {
- keyIntent.putExtra(EXTRA_WAKELOCK_ACQUIRED, WAKELOCK_RELEASE_ON_FINISHED);
- }
- final long ident = Binder.clearCallingIdentity();
- try {
- mContext.sendOrderedBroadcastAsUser(keyIntent, UserHandle.ALL,
- null, mKeyEventDone,
- mEventHandler, Activity.RESULT_OK, null, null);
- } finally {
- Binder.restoreCallingIdentity(ident);
- }
- }
- }
- }
-
- /**
- * The different actions performed in response to a voice button key event.
- */
- private final static int VOICEBUTTON_ACTION_DISCARD_CURRENT_KEY_PRESS = 1;
- private final static int VOICEBUTTON_ACTION_START_VOICE_INPUT = 2;
- private final static int VOICEBUTTON_ACTION_SIMULATE_KEY_PRESS = 3;
-
- private final Object mVoiceEventLock = new Object();
- private boolean mVoiceButtonDown;
- private boolean mVoiceButtonHandled;
-
- /**
- * Filter key events that may be used for voice-based interactions
- * @param keyEvent a non-null KeyEvent whose key code is that of one of the supported
- * media buttons that can be used to trigger voice-based interactions.
- * @param needWakeLock true if a PARTIAL_WAKE_LOCK needs to be held while this key event
- * is dispatched.
- */
- private void filterVoiceInputKeyEvent(KeyEvent keyEvent, boolean needWakeLock) {
- if (DEBUG_RC) {
- Log.v(TAG, "voice input key event: " + keyEvent + ", needWakeLock=" + needWakeLock);
- }
-
- int voiceButtonAction = VOICEBUTTON_ACTION_DISCARD_CURRENT_KEY_PRESS;
- int keyAction = keyEvent.getAction();
- synchronized (mVoiceEventLock) {
- if (keyAction == KeyEvent.ACTION_DOWN) {
- if (keyEvent.getRepeatCount() == 0) {
- // initial down
- mVoiceButtonDown = true;
- mVoiceButtonHandled = false;
- } else if (mVoiceButtonDown && !mVoiceButtonHandled
- && (keyEvent.getFlags() & KeyEvent.FLAG_LONG_PRESS) != 0) {
- // long-press, start voice-based interactions
- mVoiceButtonHandled = true;
- voiceButtonAction = VOICEBUTTON_ACTION_START_VOICE_INPUT;
- }
- } else if (keyAction == KeyEvent.ACTION_UP) {
- if (mVoiceButtonDown) {
- // voice button up
- mVoiceButtonDown = false;
- if (!mVoiceButtonHandled && !keyEvent.isCanceled()) {
- voiceButtonAction = VOICEBUTTON_ACTION_SIMULATE_KEY_PRESS;
- }
- }
- }
- }//synchronized (mVoiceEventLock)
-
- // take action after media button event filtering for voice-based interactions
- switch (voiceButtonAction) {
- case VOICEBUTTON_ACTION_DISCARD_CURRENT_KEY_PRESS:
- if (DEBUG_RC) Log.v(TAG, " ignore key event");
- break;
- case VOICEBUTTON_ACTION_START_VOICE_INPUT:
- if (DEBUG_RC) Log.v(TAG, " start voice-based interactions");
- // then start the voice-based interactions
- startVoiceBasedInteractions(needWakeLock);
- break;
- case VOICEBUTTON_ACTION_SIMULATE_KEY_PRESS:
- if (DEBUG_RC) Log.v(TAG, " send simulated key event, wakelock=" + needWakeLock);
- sendSimulatedMediaButtonEvent(keyEvent, needWakeLock);
- break;
- }
- }
-
- private void sendSimulatedMediaButtonEvent(KeyEvent originalKeyEvent, boolean needWakeLock) {
- // send DOWN event
- KeyEvent keyEvent = KeyEvent.changeAction(originalKeyEvent, KeyEvent.ACTION_DOWN);
- dispatchMediaKeyEvent(keyEvent, needWakeLock);
- // send UP event
- keyEvent = KeyEvent.changeAction(originalKeyEvent, KeyEvent.ACTION_UP);
- dispatchMediaKeyEvent(keyEvent, needWakeLock);
-
- }
-
- private static boolean isValidMediaKeyEvent(KeyEvent keyEvent) {
- if (keyEvent == null) {
- return false;
- }
- return KeyEvent.isMediaKey(keyEvent.getKeyCode());
- }
-
- /**
- * Checks whether the given key code is one that can trigger the launch of voice-based
- * interactions.
- * @param keyCode the key code associated with the key event
- * @return true if the key is one of the supported voice-based interaction triggers
- */
- private static boolean isValidVoiceInputKeyCode(int keyCode) {
- if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK) {
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * Tell the system to start voice-based interactions / voice commands
- */
- private void startVoiceBasedInteractions(boolean needWakeLock) {
- Intent voiceIntent = null;
- // select which type of search to launch:
- // - screen on and device unlocked: action is ACTION_WEB_SEARCH
- // - device locked or screen off: action is ACTION_VOICE_SEARCH_HANDS_FREE
- // with EXTRA_SECURE set to true if the device is securely locked
- PowerManager pm = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
- boolean isLocked = mKeyguardManager != null && mKeyguardManager.isKeyguardLocked();
- if (!isLocked && pm.isScreenOn()) {
- voiceIntent = new Intent(android.speech.RecognizerIntent.ACTION_WEB_SEARCH);
- Log.i(TAG, "voice-based interactions: about to use ACTION_WEB_SEARCH");
- } else {
- IDeviceIdleController dic = IDeviceIdleController.Stub.asInterface(
- ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));
- if (dic != null) {
- try {
- dic.exitIdle("voice-search");
- } catch (RemoteException e) {
- }
- }
- voiceIntent = new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE);
- voiceIntent.putExtra(RecognizerIntent.EXTRA_SECURE,
- isLocked && mKeyguardManager.isKeyguardSecure());
- Log.i(TAG, "voice-based interactions: about to use ACTION_VOICE_SEARCH_HANDS_FREE");
- }
- // start the search activity
- if (needWakeLock) {
- mMediaEventWakeLock.acquire();
- }
- final long identity = Binder.clearCallingIdentity();
- try {
- if (voiceIntent != null) {
- voiceIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- mContext.startActivityAsUser(voiceIntent, UserHandle.CURRENT);
- }
- } catch (ActivityNotFoundException e) {
- Log.w(TAG, "No activity for search: " + e);
- } finally {
- Binder.restoreCallingIdentity(identity);
- if (needWakeLock) {
- mMediaEventWakeLock.release();
- }
- }
- }
-
- private static final int WAKELOCK_RELEASE_ON_FINISHED = 1980; //magic number
-
- // only set when wakelock was acquired, no need to check value when received
- private static final String EXTRA_WAKELOCK_ACQUIRED =
- "android.media.AudioService.WAKELOCK_ACQUIRED";
-
- public void onSendFinished(PendingIntent pendingIntent, Intent intent,
- int resultCode, String resultData, Bundle resultExtras) {
- if (resultCode == WAKELOCK_RELEASE_ON_FINISHED) {
- mMediaEventWakeLock.release();
- }
- }
-
- BroadcastReceiver mKeyEventDone = new BroadcastReceiver() {
- public void onReceive(Context context, Intent intent) {
- if (intent == null) {
- return;
- }
- Bundle extras = intent.getExtras();
- if (extras == null) {
- return;
- }
- if (extras.containsKey(EXTRA_WAKELOCK_ACQUIRED)) {
- mMediaEventWakeLock.release();
- }
- }
- };
-
- /**
- * Synchronization on mCurrentRcLock always inside a block synchronized on mPRStack
- */
- private final Object mCurrentRcLock = new Object();
- /**
- * The one remote control client which will receive a request for display information.
- * This object may be null.
- * Access protected by mCurrentRcLock.
- */
- private IRemoteControlClient mCurrentRcClient = null;
- /**
- * The PendingIntent associated with mCurrentRcClient. Its value is irrelevant
- * if mCurrentRcClient is null
- */
- private PendingIntent mCurrentRcClientIntent = null;
-
- private final static int RC_INFO_NONE = 0;
- private final static int RC_INFO_ALL =
- RemoteControlClient.FLAG_INFORMATION_REQUEST_ALBUM_ART |
- RemoteControlClient.FLAG_INFORMATION_REQUEST_KEY_MEDIA |
- RemoteControlClient.FLAG_INFORMATION_REQUEST_METADATA |
- RemoteControlClient.FLAG_INFORMATION_REQUEST_PLAYSTATE;
-
- /**
- * A monotonically increasing generation counter for mCurrentRcClient.
- * Only accessed with a lock on mCurrentRcLock.
- * No value wrap-around issues as we only act on equal values.
- */
- private int mCurrentRcClientGen = 0;
-
-
- /**
- * Internal cache for the playback information of the RemoteControlClient whose volume gets to
- * be controlled by the volume keys ("main"), so we don't have to iterate over the RC stack
- * every time we need this info.
- */
- private RemotePlaybackState mMainRemote;
- /**
- * Indicates whether the "main" RemoteControlClient is considered active.
- * Use synchronized on mMainRemote.
- */
- private boolean mMainRemoteIsActive;
- /**
- * Indicates whether there is remote playback going on. True even if there is no "active"
- * remote playback (mMainRemoteIsActive is false), but a RemoteControlClient has declared it
- * handles remote playback.
- * Use synchronized on mMainRemote.
- */
- private boolean mHasRemotePlayback;
-
- /**
- * The stack of remote control event receivers.
- * All read and write operations on mPRStack are synchronized.
- */
- private final Stack<PlayerRecord> mPRStack = new Stack<PlayerRecord>();
-
- /**
- * The component the telephony package can register so telephony calls have priority to
- * handle media button events
- */
- private ComponentName mMediaReceiverForCalls = null;
-
- /**
- * Helper function:
- * Display in the log the current entries in the remote control focus stack
- */
- private void dumpRCStack(PrintWriter pw) {
- pw.println("\nRemote Control stack entries (last is top of stack):");
- synchronized(mPRStack) {
- Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- stackIterator.next().dump(pw, true);
- }
- }
- }
-
- /**
- * Helper function:
- * Display in the log the current entries in the remote control stack, focusing
- * on RemoteControlClient data
- */
- private void dumpRCCStack(PrintWriter pw) {
- pw.println("\nRemote Control Client stack entries (last is top of stack):");
- synchronized(mPRStack) {
- Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- stackIterator.next().dump(pw, false);
- }
- synchronized(mCurrentRcLock) {
- pw.println("\nCurrent remote control generation ID = " + mCurrentRcClientGen);
- }
- }
- synchronized (mMainRemote) {
- pw.println("\nRemote Volume State:");
- pw.println(" has remote: " + mHasRemotePlayback);
- pw.println(" is remote active: " + mMainRemoteIsActive);
- pw.println(" rccId: " + mMainRemote.mRccId);
- pw.println(" volume handling: "
- + ((mMainRemote.mVolumeHandling == RemoteControlClient.PLAYBACK_VOLUME_FIXED) ?
- "PLAYBACK_VOLUME_FIXED(0)" : "PLAYBACK_VOLUME_VARIABLE(1)"));
- pw.println(" volume: " + mMainRemote.mVolume);
- pw.println(" volume steps: " + mMainRemote.mVolumeMax);
- }
- }
-
- /**
- * Helper function:
- * Display in the log the current entries in the list of remote control displays
- */
- private void dumpRCDList(PrintWriter pw) {
- pw.println("\nRemote Control Display list entries:");
- synchronized(mPRStack) {
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di = displayIterator.next();
- pw.println(" IRCD: " + di.mRcDisplay +
- " -- w:" + di.mArtworkExpectedWidth +
- " -- h:" + di.mArtworkExpectedHeight +
- " -- wantsPosSync:" + di.mWantsPositionSync +
- " -- " + (di.mEnabled ? "enabled" : "disabled"));
- }
- }
- }
-
- /**
- * Helper function:
- * Push the new media button receiver "near" the top of the PlayerRecord stack.
- * "Near the top" is defined as:
- * - at the top if the current PlayerRecord at the top is not playing
- * - below the entries at the top of the stack that correspond to the playing PlayerRecord
- * otherwise
- * Called synchronized on mPRStack
- * precondition: mediaIntent != null
- * @return true if the top of mPRStack was changed, false otherwise
- */
- private boolean pushMediaButtonReceiver_syncPrs(PendingIntent mediaIntent,
- ComponentName target, IBinder token) {
- if (mPRStack.empty()) {
- mPRStack.push(new PlayerRecord(mediaIntent, target, token));
- return true;
- } else if (mPRStack.peek().hasMatchingMediaButtonIntent(mediaIntent)) {
- // already at top of stack
- return false;
- }
- if (mAppOps.noteOp(AppOpsManager.OP_TAKE_MEDIA_BUTTONS, Binder.getCallingUid(),
- mediaIntent.getCreatorPackage()) != AppOpsManager.MODE_ALLOWED) {
- return false;
- }
- PlayerRecord oldTopPrse = mPRStack.lastElement(); // top of the stack before any changes
- boolean topChanged = false;
- PlayerRecord prse = null;
- int lastPlayingIndex = mPRStack.size();
- int inStackIndex = -1;
- try {
- // go through the stack from the top to figure out who's playing, and the position
- // of this media button receiver (note that it may not be in the stack)
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- prse = mPRStack.elementAt(index);
- if (prse.isPlaybackActive()) {
- lastPlayingIndex = index;
- }
- if (prse.hasMatchingMediaButtonIntent(mediaIntent)) {
- inStackIndex = index;
- }
- }
-
- if (inStackIndex == -1) {
- // is not in stack
- prse = new PlayerRecord(mediaIntent, target, token);
- // it's new so it's not playing (no RemoteControlClient to give a playstate),
- // therefore it goes after the ones with active playback
- mPRStack.add(lastPlayingIndex, prse);
- } else {
- // is in the stack
- if (mPRStack.size() > 1) { // no need to remove and add if stack contains only 1
- prse = mPRStack.elementAt(inStackIndex);
- // remove it from its old location in the stack
- mPRStack.removeElementAt(inStackIndex);
- if (prse.isPlaybackActive()) {
- // and put it at the top
- mPRStack.push(prse);
- } else {
- // and put it after the ones with active playback
- if (inStackIndex > lastPlayingIndex) {
- mPRStack.add(lastPlayingIndex, prse);
- } else {
- mPRStack.add(lastPlayingIndex - 1, prse);
- }
- }
- }
- }
-
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification or bad index
- Log.e(TAG, "Wrong index (inStack=" + inStackIndex + " lastPlaying=" + lastPlayingIndex
- + " size=" + mPRStack.size()
- + " accessing media button stack", e);
- }
-
- return (topChanged);
- }
-
- /**
- * Helper function:
- * Remove the remote control receiver from the RC focus stack.
- * Called synchronized on mPRStack
- * precondition: pi != null
- */
- private void removeMediaButtonReceiver_syncPrs(PendingIntent pi) {
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- if (prse.hasMatchingMediaButtonIntent(pi)) {
- prse.destroy();
- // ok to remove element while traversing the stack since we're leaving the loop
- mPRStack.removeElementAt(index);
- break;
- }
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing media button stack, lock error? ", e);
- }
- }
-
- /**
- * Helper function:
- * Called synchronized on mPRStack
- */
- private boolean isCurrentRcController(PendingIntent pi) {
- if (!mPRStack.empty() && mPRStack.peek().hasMatchingMediaButtonIntent(pi)) {
- return true;
- }
- return false;
- }
-
- //==========================================================================================
- // Remote control display / client
- //==========================================================================================
- /**
- * Update the remote control displays with the new "focused" client generation
- */
- private void setNewRcClientOnDisplays_syncRcsCurrc(int newClientGeneration,
- PendingIntent newMediaIntent, boolean clearing) {
- synchronized(mPRStack) {
- if (mRcDisplays.size() > 0) {
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di = displayIterator.next();
- try {
- di.mRcDisplay.setCurrentClientId(
- newClientGeneration, newMediaIntent, clearing);
- } catch (RemoteException e) {
- Log.e(TAG, "Dead display in setNewRcClientOnDisplays_syncRcsCurrc()",e);
- di.release();
- displayIterator.remove();
- }
- }
- }
- }
- }
-
- /**
- * Update the remote control clients with the new "focused" client generation
- */
- private void setNewRcClientGenerationOnClients_syncRcsCurrc(int newClientGeneration) {
- // (using an iterator on the stack so we can safely remove an entry if needed,
- // traversal order doesn't matter here as we update all entries)
- Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- PlayerRecord se = stackIterator.next();
- if ((se != null) && (se.getRcc() != null)) {
- try {
- se.getRcc().setCurrentClientGenerationId(newClientGeneration);
- } catch (RemoteException e) {
- Log.w(TAG, "Dead client in setNewRcClientGenerationOnClients_syncRcsCurrc()",e);
- stackIterator.remove();
- se.unlinkToRcClientDeath();
- }
- }
- }
- }
-
- /**
- * Update the displays and clients with the new "focused" client generation and name
- * @param newClientGeneration the new generation value matching a client update
- * @param newMediaIntent the media button event receiver associated with the client.
- * May be null, which implies there is no registered media button event receiver.
- * @param clearing true if the new client generation value maps to a remote control update
- * where the display should be cleared.
- */
- private void setNewRcClient_syncRcsCurrc(int newClientGeneration,
- PendingIntent newMediaIntent, boolean clearing) {
- // send the new valid client generation ID to all displays
- setNewRcClientOnDisplays_syncRcsCurrc(newClientGeneration, newMediaIntent, clearing);
- // send the new valid client generation ID to all clients
- setNewRcClientGenerationOnClients_syncRcsCurrc(newClientGeneration);
- }
-
- /**
- * Called when processing MSG_RCDISPLAY_CLEAR event
- */
- private void onRcDisplayClear() {
- if (DEBUG_RC) Log.i(TAG, "Clear remote control display");
-
- synchronized(mPRStack) {
- synchronized(mCurrentRcLock) {
- mCurrentRcClientGen++;
- // synchronously update the displays and clients with the new client generation
- setNewRcClient_syncRcsCurrc(mCurrentRcClientGen,
- null /*newMediaIntent*/, true /*clearing*/);
- }
- }
- }
-
- /**
- * Called when processing MSG_RCDISPLAY_UPDATE event
- */
- private void onRcDisplayUpdate(PlayerRecord prse, int flags /* USED ?*/) {
- synchronized(mPRStack) {
- synchronized(mCurrentRcLock) {
- if ((mCurrentRcClient != null) && (mCurrentRcClient.equals(prse.getRcc()))) {
- if (DEBUG_RC) Log.i(TAG, "Display/update remote control ");
-
- mCurrentRcClientGen++;
- // synchronously update the displays and clients with
- // the new client generation
- setNewRcClient_syncRcsCurrc(mCurrentRcClientGen,
- prse.getMediaButtonIntent() /*newMediaIntent*/,
- false /*clearing*/);
-
- // tell the current client that it needs to send info
- try {
- //TODO change name to informationRequestForAllDisplays()
- mCurrentRcClient.onInformationRequested(mCurrentRcClientGen, flags);
- } catch (RemoteException e) {
- Log.e(TAG, "Current valid remote client is dead: "+e);
- mCurrentRcClient = null;
- }
- } else {
- // the remote control display owner has changed between the
- // the message to update the display was sent, and the time it
- // gets to be processed (now)
- }
- }
- }
- }
-
- /**
- * Called when processing MSG_RCDISPLAY_INIT_INFO event
- * Causes the current RemoteControlClient to send its info (metadata, playstate...) to
- * a single RemoteControlDisplay, NOT all of them, as with MSG_RCDISPLAY_UPDATE.
- */
- private void onRcDisplayInitInfo(IRemoteControlDisplay newRcd, int w, int h) {
- synchronized(mPRStack) {
- synchronized(mCurrentRcLock) {
- if (mCurrentRcClient != null) {
- if (DEBUG_RC) { Log.i(TAG, "Init RCD with current info"); }
- try {
- // synchronously update the new RCD with the current client generation
- // and matching PendingIntent
- newRcd.setCurrentClientId(mCurrentRcClientGen, mCurrentRcClientIntent,
- false);
-
- // tell the current RCC that it needs to send info, but only to the new RCD
- try {
- mCurrentRcClient.informationRequestForDisplay(newRcd, w, h);
- } catch (RemoteException e) {
- Log.e(TAG, "Current valid remote client is dead: ", e);
- mCurrentRcClient = null;
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Dead display in onRcDisplayInitInfo()", e);
- }
- }
- }
- }
- }
-
- /**
- * Helper function:
- * Called synchronized on mPRStack
- */
- private void clearRemoteControlDisplay_syncPrs() {
- synchronized(mCurrentRcLock) {
- mCurrentRcClient = null;
- }
- // will cause onRcDisplayClear() to be called in AudioService's handler thread
- mEventHandler.sendMessage( mEventHandler.obtainMessage(MSG_RCDISPLAY_CLEAR) );
- }
-
- /**
- * Helper function for code readability: only to be called from
- * checkUpdateRemoteControlDisplay_syncPrs() which checks the preconditions for
- * this method.
- * Preconditions:
- * - called synchronized on mPRStack
- * - mPRStack.isEmpty() is false
- */
- private void updateRemoteControlDisplay_syncPrs(int infoChangedFlags) {
- PlayerRecord prse = mPRStack.peek();
- int infoFlagsAboutToBeUsed = infoChangedFlags;
- // this is where we enforce opt-in for information display on the remote controls
- // with the new AudioManager.registerRemoteControlClient() API
- if (prse.getRcc() == null) {
- //Log.w(TAG, "Can't update remote control display with null remote control client");
- clearRemoteControlDisplay_syncPrs();
- return;
- }
- synchronized(mCurrentRcLock) {
- if (!prse.getRcc().equals(mCurrentRcClient)) {
- // new RC client, assume every type of information shall be queried
- infoFlagsAboutToBeUsed = RC_INFO_ALL;
- }
- mCurrentRcClient = prse.getRcc();
- mCurrentRcClientIntent = prse.getMediaButtonIntent();
- }
- // will cause onRcDisplayUpdate() to be called in AudioService's handler thread
- mEventHandler.sendMessage( mEventHandler.obtainMessage(MSG_RCDISPLAY_UPDATE,
- infoFlagsAboutToBeUsed /* arg1 */, 0, prse /* obj, != null */) );
- }
-
- /**
- * Helper function:
- * Called synchronized on mPRStack
- * Check whether the remote control display should be updated, triggers the update if required
- * @param infoChangedFlags the flags corresponding to the remote control client information
- * that has changed, if applicable (checking for the update conditions might trigger a
- * clear, rather than an update event).
- */
- private void checkUpdateRemoteControlDisplay_syncPrs(int infoChangedFlags) {
- // determine whether the remote control display should be refreshed
- // if the player record stack is empty, there is nothing to display, so clear the RC display
- if (mPRStack.isEmpty()) {
- clearRemoteControlDisplay_syncPrs();
- return;
- }
-
- // this is where more rules for refresh go
-
- // refresh conditions were verified: update the remote controls
- // ok to call: synchronized on mPRStack, mPRStack is not empty
- updateRemoteControlDisplay_syncPrs(infoChangedFlags);
- }
-
- /**
- * see AudioManager.registerMediaButtonIntent(PendingIntent pi, ComponentName c)
- * precondition: mediaIntent != null
- */
- protected void registerMediaButtonIntent(PendingIntent mediaIntent, ComponentName eventReceiver,
- IBinder token) {
- Log.i(TAG, " Remote Control registerMediaButtonIntent() for " + mediaIntent);
-
- synchronized(mPRStack) {
- if (pushMediaButtonReceiver_syncPrs(mediaIntent, eventReceiver, token)) {
- // new RC client, assume every type of information shall be queried
- checkUpdateRemoteControlDisplay_syncPrs(RC_INFO_ALL);
- }
- }
- }
-
- /**
- * see AudioManager.unregisterMediaButtonIntent(PendingIntent mediaIntent)
- * precondition: mediaIntent != null, eventReceiver != null
- */
- protected void unregisterMediaButtonIntent(PendingIntent mediaIntent)
- {
- Log.i(TAG, " Remote Control unregisterMediaButtonIntent() for " + mediaIntent);
-
- synchronized(mPRStack) {
- boolean topOfStackWillChange = isCurrentRcController(mediaIntent);
- removeMediaButtonReceiver_syncPrs(mediaIntent);
- if (topOfStackWillChange) {
- // current RC client will change, assume every type of info needs to be queried
- checkUpdateRemoteControlDisplay_syncPrs(RC_INFO_ALL);
- }
- }
- }
-
- protected void unregisterMediaButtonIntentAsync(final PendingIntent mediaIntent) {
- mEventHandler.sendMessage(
- mEventHandler.obtainMessage(MSG_UNREGISTER_MEDIABUTTONINTENT, 0, 0,
- mediaIntent));
- }
-
- /**
- * see AudioManager.registerMediaButtonEventReceiverForCalls(ComponentName c)
- * precondition: c != null
- */
- protected void registerMediaButtonEventReceiverForCalls(ComponentName c) {
- if (mContext.checkCallingPermission("android.permission.MODIFY_PHONE_STATE")
- != PackageManager.PERMISSION_GRANTED) {
- Log.e(TAG, "Invalid permissions to register media button receiver for calls");
- return;
- }
- synchronized(mPRStack) {
- mMediaReceiverForCalls = c;
- }
- }
-
- /**
- * see AudioManager.unregisterMediaButtonEventReceiverForCalls()
- */
- protected void unregisterMediaButtonEventReceiverForCalls() {
- if (mContext.checkCallingPermission("android.permission.MODIFY_PHONE_STATE")
- != PackageManager.PERMISSION_GRANTED) {
- Log.e(TAG, "Invalid permissions to unregister media button receiver for calls");
- return;
- }
- synchronized(mPRStack) {
- mMediaReceiverForCalls = null;
- }
- }
-
- /**
- * see AudioManager.registerRemoteControlClient(ComponentName eventReceiver, ...)
- * @return the unique ID of the PlayerRecord associated with the RemoteControlClient
- * Note: using this method with rcClient == null is a way to "disable" the IRemoteControlClient
- * without modifying the RC stack, but while still causing the display to refresh (will
- * become blank as a result of this)
- */
- protected int registerRemoteControlClient(PendingIntent mediaIntent,
- IRemoteControlClient rcClient, String callingPackageName) {
- if (DEBUG_RC) Log.i(TAG, "Register remote control client rcClient="+rcClient);
- int rccId = RemoteControlClient.RCSE_ID_UNREGISTERED;
- synchronized(mPRStack) {
- // store the new display information
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- if(prse.hasMatchingMediaButtonIntent(mediaIntent)) {
- prse.resetControllerInfoForRcc(rcClient, callingPackageName,
- Binder.getCallingUid());
-
- if (rcClient == null) {
- break;
- }
-
- rccId = prse.getRccId();
-
- // there is a new (non-null) client:
- // give the new client the displays (if any)
- if (mRcDisplays.size() > 0) {
- plugRemoteControlDisplaysIntoClient_syncPrs(prse.getRcc());
- }
- break;
- }
- }//for
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing RC stack, lock error? ", e);
- }
-
- // if the eventReceiver is at the top of the stack
- // then check for potential refresh of the remote controls
- if (isCurrentRcController(mediaIntent)) {
- checkUpdateRemoteControlDisplay_syncPrs(RC_INFO_ALL);
- }
- }//synchronized(mPRStack)
- return rccId;
- }
-
- /**
- * see AudioManager.unregisterRemoteControlClient(PendingIntent pi, ...)
- * rcClient is guaranteed non-null
- */
- protected void unregisterRemoteControlClient(PendingIntent mediaIntent,
- IRemoteControlClient rcClient) {
- if (DEBUG_RC) Log.i(TAG, "Unregister remote control client rcClient="+rcClient);
- synchronized(mPRStack) {
- boolean topRccChange = false;
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- if ((prse.hasMatchingMediaButtonIntent(mediaIntent))
- && rcClient.equals(prse.getRcc())) {
- // we found the IRemoteControlClient to unregister
- prse.resetControllerInfoForNoRcc();
- topRccChange = (index == mPRStack.size()-1);
- // there can only be one matching RCC in the RC stack, we're done
- break;
- }
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing RC stack, lock error? ", e);
- }
- if (topRccChange) {
- // no more RCC for the RCD, check for potential refresh of the remote controls
- checkUpdateRemoteControlDisplay_syncPrs(RC_INFO_ALL);
- }
- }
- }
-
-
- /**
- * A class to encapsulate all the information about a remote control display.
- * After instanciation, init() must always be called before the object is added in the list
- * of displays.
- * Before being removed from the list of displays, release() must always be called (otherwise
- * it will leak death handlers).
- */
- private class DisplayInfoForServer implements IBinder.DeathRecipient {
- /** may never be null */
- private final IRemoteControlDisplay mRcDisplay;
- private final IBinder mRcDisplayBinder;
- private int mArtworkExpectedWidth = -1;
- private int mArtworkExpectedHeight = -1;
- private boolean mWantsPositionSync = false;
- private ComponentName mClientNotifListComp;
- private boolean mEnabled = true;
-
- public DisplayInfoForServer(IRemoteControlDisplay rcd, int w, int h) {
- if (DEBUG_RC) Log.i(TAG, "new DisplayInfoForServer for " + rcd + " w=" + w + " h=" + h);
- mRcDisplay = rcd;
- mRcDisplayBinder = rcd.asBinder();
- mArtworkExpectedWidth = w;
- mArtworkExpectedHeight = h;
- }
-
- public boolean init() {
- try {
- mRcDisplayBinder.linkToDeath(this, 0);
- } catch (RemoteException e) {
- // remote control display is DOA, disqualify it
- Log.w(TAG, "registerRemoteControlDisplay() has a dead client " + mRcDisplayBinder);
- return false;
- }
- return true;
- }
-
- public void release() {
- try {
- mRcDisplayBinder.unlinkToDeath(this, 0);
- } catch (java.util.NoSuchElementException e) {
- // not much we can do here, the display should have been unregistered anyway
- Log.e(TAG, "Error in DisplaInfoForServer.relase()", e);
- }
- }
-
- public void binderDied() {
- synchronized(mPRStack) {
- Log.w(TAG, "RemoteControl: display " + mRcDisplay + " died");
- // remove the display from the list
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di = displayIterator.next();
- if (di.mRcDisplay == mRcDisplay) {
- if (DEBUG_RC) Log.w(TAG, " RCD removed from list");
- displayIterator.remove();
- return;
- }
- }
- }
- }
- }
-
- /**
- * The remote control displays.
- * Access synchronized on mPRStack
- */
- private ArrayList<DisplayInfoForServer> mRcDisplays = new ArrayList<DisplayInfoForServer>(1);
-
- /**
- * Plug each registered display into the specified client
- * @param rcc, guaranteed non null
- */
- private void plugRemoteControlDisplaysIntoClient_syncPrs(IRemoteControlClient rcc) {
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di = displayIterator.next();
- try {
- rcc.plugRemoteControlDisplay(di.mRcDisplay, di.mArtworkExpectedWidth,
- di.mArtworkExpectedHeight);
- if (di.mWantsPositionSync) {
- rcc.setWantsSyncForDisplay(di.mRcDisplay, true);
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Error connecting RCD to RCC in RCC registration",e);
- }
- }
- }
-
- private void enableRemoteControlDisplayForClient_syncRcStack(IRemoteControlDisplay rcd,
- boolean enabled) {
- // let all the remote control clients know whether the given display is enabled
- // (so the remote control stack traversal order doesn't matter).
- final Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- PlayerRecord prse = stackIterator.next();
- if(prse.getRcc() != null) {
- try {
- prse.getRcc().enableRemoteControlDisplay(rcd, enabled);
- } catch (RemoteException e) {
- Log.e(TAG, "Error connecting RCD to client: ", e);
- }
- }
- }
- }
-
- /**
- * Is the remote control display interface already registered
- * @param rcd
- * @return true if the IRemoteControlDisplay is already in the list of displays
- */
- private boolean rcDisplayIsPluggedIn_syncRcStack(IRemoteControlDisplay rcd) {
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di = displayIterator.next();
- if (di.mRcDisplay.asBinder().equals(rcd.asBinder())) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Register an IRemoteControlDisplay.
- * Notify all IRemoteControlClient of the new display and cause the RemoteControlClient
- * at the top of the stack to update the new display with its information.
- * @see android.media.IAudioService#registerRemoteControlDisplay(android.media.IRemoteControlDisplay, int, int)
- * @param rcd the IRemoteControlDisplay to register. No effect if null.
- * @param w the maximum width of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- * @param h the maximum height of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- * @param listenerComp the component for the listener interface, may be null if it's not needed
- * to verify it belongs to one of the enabled notification listeners
- */
- private void registerRemoteControlDisplay_int(IRemoteControlDisplay rcd, int w, int h,
- ComponentName listenerComp) {
- if (DEBUG_RC) Log.d(TAG, ">>> registerRemoteControlDisplay("+rcd+")");
- synchronized(mAudioFocusLock) {
- synchronized(mPRStack) {
- if ((rcd == null) || rcDisplayIsPluggedIn_syncRcStack(rcd)) {
- return;
- }
- DisplayInfoForServer di = new DisplayInfoForServer(rcd, w, h);
- di.mEnabled = true;
- di.mClientNotifListComp = listenerComp;
- if (!di.init()) {
- if (DEBUG_RC) Log.e(TAG, " error registering RCD");
- return;
- }
- // add RCD to list of displays
- mRcDisplays.add(di);
-
- // let all the remote control clients know there is a new display (so the remote
- // control stack traversal order doesn't matter).
- Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- PlayerRecord prse = stackIterator.next();
- if(prse.getRcc() != null) {
- try {
- prse.getRcc().plugRemoteControlDisplay(rcd, w, h);
- } catch (RemoteException e) {
- Log.e(TAG, "Error connecting RCD to client: ", e);
- }
- }
- }
-
- // we have a new display, of which all the clients are now aware: have it be
- // initialized wih the current gen ID and the current client info, do not
- // reset the information for the other (existing) displays
- sendMsg(mEventHandler, MSG_RCDISPLAY_INIT_INFO, SENDMSG_QUEUE,
- w /*arg1*/, h /*arg2*/,
- rcd /*obj*/, 0/*delay*/);
- }
- }
- }
-
- /**
- * Unregister an IRemoteControlDisplay.
- * No effect if the IRemoteControlDisplay hasn't been successfully registered.
- * @see android.media.IAudioService#unregisterRemoteControlDisplay(android.media.IRemoteControlDisplay)
- * @param rcd the IRemoteControlDisplay to unregister. No effect if null.
- */
- protected void unregisterRemoteControlDisplay(IRemoteControlDisplay rcd) {
- if (DEBUG_RC) Log.d(TAG, "<<< unregisterRemoteControlDisplay("+rcd+")");
- synchronized(mPRStack) {
- if (rcd == null) {
- return;
- }
-
- boolean displayWasPluggedIn = false;
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext() && !displayWasPluggedIn) {
- final DisplayInfoForServer di = displayIterator.next();
- if (di.mRcDisplay.asBinder().equals(rcd.asBinder())) {
- displayWasPluggedIn = true;
- di.release();
- displayIterator.remove();
- }
- }
-
- if (displayWasPluggedIn) {
- // disconnect this remote control display from all the clients, so the remote
- // control stack traversal order doesn't matter
- final Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- final PlayerRecord prse = stackIterator.next();
- if(prse.getRcc() != null) {
- try {
- prse.getRcc().unplugRemoteControlDisplay(rcd);
- } catch (RemoteException e) {
- Log.e(TAG, "Error disconnecting remote control display to client: ", e);
- }
- }
- }
- } else {
- if (DEBUG_RC) Log.w(TAG, " trying to unregister unregistered RCD");
- }
- }
- }
-
- /**
- * Update the size of the artwork used by an IRemoteControlDisplay.
- * @see android.media.IAudioService#remoteControlDisplayUsesBitmapSize(android.media.IRemoteControlDisplay, int, int)
- * @param rcd the IRemoteControlDisplay with the new artwork size requirement
- * @param w the maximum width of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- * @param h the maximum height of the expected bitmap. Negative or zero values indicate this
- * display doesn't need to receive artwork.
- */
- protected void remoteControlDisplayUsesBitmapSize(IRemoteControlDisplay rcd, int w, int h) {
- synchronized(mPRStack) {
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- boolean artworkSizeUpdate = false;
- while (displayIterator.hasNext() && !artworkSizeUpdate) {
- final DisplayInfoForServer di = displayIterator.next();
- if (di.mRcDisplay.asBinder().equals(rcd.asBinder())) {
- if ((di.mArtworkExpectedWidth != w) || (di.mArtworkExpectedHeight != h)) {
- di.mArtworkExpectedWidth = w;
- di.mArtworkExpectedHeight = h;
- artworkSizeUpdate = true;
- }
- }
- }
- if (artworkSizeUpdate) {
- // RCD is currently plugged in and its artwork size has changed, notify all RCCs,
- // stack traversal order doesn't matter
- final Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while(stackIterator.hasNext()) {
- final PlayerRecord prse = stackIterator.next();
- if(prse.getRcc() != null) {
- try {
- prse.getRcc().setBitmapSizeForDisplay(rcd, w, h);
- } catch (RemoteException e) {
- Log.e(TAG, "Error setting bitmap size for RCD on RCC: ", e);
- }
- }
- }
- }
- }
- }
-
- /**
- * Controls whether a remote control display needs periodic checks of the RemoteControlClient
- * playback position to verify that the estimated position has not drifted from the actual
- * position. By default the check is not performed.
- * The IRemoteControlDisplay must have been previously registered for this to have any effect.
- * @param rcd the IRemoteControlDisplay for which the anti-drift mechanism will be enabled
- * or disabled. Not null.
- * @param wantsSync if true, RemoteControlClient instances which expose their playback position
- * to the framework will regularly compare the estimated playback position with the actual
- * position, and will update the IRemoteControlDisplay implementation whenever a drift is
- * detected.
- */
- protected void remoteControlDisplayWantsPlaybackPositionSync(IRemoteControlDisplay rcd,
- boolean wantsSync) {
- synchronized(mPRStack) {
- boolean rcdRegistered = false;
- // store the information about this display
- // (display stack traversal order doesn't matter).
- final Iterator<DisplayInfoForServer> displayIterator = mRcDisplays.iterator();
- while (displayIterator.hasNext()) {
- final DisplayInfoForServer di = displayIterator.next();
- if (di.mRcDisplay.asBinder().equals(rcd.asBinder())) {
- di.mWantsPositionSync = wantsSync;
- rcdRegistered = true;
- break;
- }
- }
- if (!rcdRegistered) {
- return;
- }
- // notify all current RemoteControlClients
- // (stack traversal order doesn't matter as we notify all RCCs)
- final Iterator<PlayerRecord> stackIterator = mPRStack.iterator();
- while (stackIterator.hasNext()) {
- final PlayerRecord prse = stackIterator.next();
- if (prse.getRcc() != null) {
- try {
- prse.getRcc().setWantsSyncForDisplay(rcd, wantsSync);
- } catch (RemoteException e) {
- Log.e(TAG, "Error setting position sync flag for RCD on RCC: ", e);
- }
- }
- }
- }
- }
-
- // handler for MSG_RCC_NEW_VOLUME_OBS
- private void onRegisterVolumeObserverForRcc(int rccId, IRemoteVolumeObserver rvo) {
- synchronized(mPRStack) {
- // The stack traversal order doesn't matter because there is only one stack entry
- // with this RCC ID, but the matching ID is more likely at the top of the stack, so
- // start iterating from the top.
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- if (prse.getRccId() == rccId) {
- prse.mRemoteVolumeObs = rvo;
- break;
- }
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing media button stack, lock error? ", e);
- }
- }
- }
-
- /**
- * Checks if a remote client is active on the supplied stream type. Update the remote stream
- * volume state if found and playing
- * @param streamType
- * @return false if no remote playing is currently playing
- */
- protected boolean checkUpdateRemoteStateIfActive(int streamType) {
- synchronized(mPRStack) {
- // iterating from top of stack as active playback is more likely on entries at the top
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- if ((prse.mPlaybackType == RemoteControlClient.PLAYBACK_TYPE_REMOTE)
- && isPlaystateActive(prse.mPlaybackState.mState)
- && (prse.mPlaybackStream == streamType)) {
- if (DEBUG_RC) Log.d(TAG, "remote playback active on stream " + streamType
- + ", vol =" + prse.mPlaybackVolume);
- synchronized (mMainRemote) {
- mMainRemote.mRccId = prse.getRccId();
- mMainRemote.mVolume = prse.mPlaybackVolume;
- mMainRemote.mVolumeMax = prse.mPlaybackVolumeMax;
- mMainRemote.mVolumeHandling = prse.mPlaybackVolumeHandling;
- mMainRemoteIsActive = true;
- }
- return true;
- }
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing RC stack, lock error? ", e);
- }
- }
- synchronized (mMainRemote) {
- mMainRemoteIsActive = false;
- }
- return false;
- }
-
- /**
- * Returns true if the given playback state is considered "active", i.e. it describes a state
- * where playback is happening, or about to
- * @param playState the playback state to evaluate
- * @return true if active, false otherwise (inactive or unknown)
- */
- protected static boolean isPlaystateActive(int playState) {
- switch (playState) {
- case RemoteControlClient.PLAYSTATE_PLAYING:
- case RemoteControlClient.PLAYSTATE_BUFFERING:
- case RemoteControlClient.PLAYSTATE_FAST_FORWARDING:
- case RemoteControlClient.PLAYSTATE_REWINDING:
- case RemoteControlClient.PLAYSTATE_SKIPPING_BACKWARDS:
- case RemoteControlClient.PLAYSTATE_SKIPPING_FORWARDS:
- return true;
- default:
- return false;
- }
- }
-
- private void sendVolumeUpdateToRemote(int rccId, int direction) {
- if (DEBUG_VOL) { Log.d(TAG, "sendVolumeUpdateToRemote(rccId="+rccId+" , dir="+direction); }
- if (direction == 0) {
- // only handling discrete events
- return;
- }
- IRemoteVolumeObserver rvo = null;
- synchronized (mPRStack) {
- // The stack traversal order doesn't matter because there is only one stack entry
- // with this RCC ID, but the matching ID is more likely at the top of the stack, so
- // start iterating from the top.
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- //FIXME OPTIMIZE store this info in mMainRemote so we don't have to iterate?
- if (prse.getRccId() == rccId) {
- rvo = prse.mRemoteVolumeObs;
- break;
- }
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing media button stack, lock error? ", e);
- }
- }
- if (rvo != null) {
- try {
- rvo.dispatchRemoteVolumeUpdate(direction, -1);
- } catch (RemoteException e) {
- Log.e(TAG, "Error dispatching relative volume update", e);
- }
- }
- }
-
- protected int getRemoteStreamMaxVolume() {
- synchronized (mMainRemote) {
- if (mMainRemote.mRccId == RemoteControlClient.RCSE_ID_UNREGISTERED) {
- return 0;
- }
- return mMainRemote.mVolumeMax;
- }
- }
-
- protected int getRemoteStreamVolume() {
- synchronized (mMainRemote) {
- if (mMainRemote.mRccId == RemoteControlClient.RCSE_ID_UNREGISTERED) {
- return 0;
- }
- return mMainRemote.mVolume;
- }
- }
-
- protected void setRemoteStreamVolume(int vol) {
- if (DEBUG_VOL) { Log.d(TAG, "setRemoteStreamVolume(vol="+vol+")"); }
- int rccId = RemoteControlClient.RCSE_ID_UNREGISTERED;
- synchronized (mMainRemote) {
- if (mMainRemote.mRccId == RemoteControlClient.RCSE_ID_UNREGISTERED) {
- return;
- }
- rccId = mMainRemote.mRccId;
- }
- IRemoteVolumeObserver rvo = null;
- synchronized (mPRStack) {
- // The stack traversal order doesn't matter because there is only one stack entry
- // with this RCC ID, but the matching ID is more likely at the top of the stack, so
- // start iterating from the top.
- try {
- for (int index = mPRStack.size()-1; index >= 0; index--) {
- final PlayerRecord prse = mPRStack.elementAt(index);
- //FIXME OPTIMIZE store this info in mMainRemote so we don't have to iterate?
- if (prse.getRccId() == rccId) {
- rvo = prse.mRemoteVolumeObs;
- break;
- }
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- // not expected to happen, indicates improper concurrent modification
- Log.e(TAG, "Wrong index accessing media button stack, lock error? ", e);
- }
- }
- if (rvo != null) {
- try {
- rvo.dispatchRemoteVolumeUpdate(0, vol);
- } catch (RemoteException e) {
- Log.e(TAG, "Error dispatching absolute volume update", e);
- }
- }
- }
-
- /**
- * Call to make AudioService reevaluate whether it's in a mode where remote players should
- * have their volume controlled. In this implementation this is only to reset whether
- * VolumePanel should display remote volumes
- */
- protected void postReevaluateRemote() {
- sendMsg(mEventHandler, MSG_REEVALUATE_REMOTE, SENDMSG_QUEUE, 0, 0, null, 0);
- }
-
- private void onReevaluateRemote() {
- // TODO This was used to notify VolumePanel if there was remote playback
- // in the stack. This is now in MediaSessionService. More code should be
- // removed.
- }
-
}
diff --git a/services/core/java/com/android/server/audio/PlayerRecord.java b/services/core/java/com/android/server/audio/PlayerRecord.java
deleted file mode 100644
index e98f12e..0000000
--- a/services/core/java/com/android/server/audio/PlayerRecord.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2014 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.server.audio;
-
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.media.AudioManager;
-import android.media.IRemoteControlClient;
-import android.media.IRemoteVolumeObserver;
-import android.media.RemoteControlClient;
-import android.os.IBinder;
-import android.os.IBinder.DeathRecipient;
-import android.os.RemoteException;
-import android.util.Log;
-
-import java.io.PrintWriter;
-
-/**
- * @hide
- * Class to handle all the information about a media player, encapsulating information
- * about its use RemoteControlClient, playback type and volume... The lifecycle of each
- * instance is managed by android.media.MediaFocusControl, from its addition to the player stack
- * stack to its release.
- */
-class PlayerRecord implements DeathRecipient {
-
- // on purpose not using this classe's name, as it will only be used from MediaFocusControl
- private static final String TAG = "MediaFocusControl";
- private static final boolean DEBUG = false;
-
- /**
- * A global counter for RemoteControlClient identifiers
- */
- private static int sLastRccId = 0;
-
- public static MediaFocusControl sController;
-
- /**
- * The target for the ACTION_MEDIA_BUTTON events.
- * Always non null. //FIXME verify
- */
- final private PendingIntent mMediaIntent;
- /**
- * The registered media button event receiver.
- */
- final private ComponentName mReceiverComponent;
-
- private int mRccId = -1;
-
- /**
- * A non-null token implies this record tracks a "live" player whose death is being monitored.
- */
- private IBinder mToken;
- private String mCallingPackageName;
- private int mCallingUid;
- /**
- * Provides access to the information to display on the remote control.
- * May be null (when a media button event receiver is registered,
- * but no remote control client has been registered) */
- private IRemoteControlClient mRcClient;
- private RcClientDeathHandler mRcClientDeathHandler;
- /**
- * Information only used for non-local playback
- */
- //FIXME private?
- public int mPlaybackType;
- public int mPlaybackVolume;
- public int mPlaybackVolumeMax;
- public int mPlaybackVolumeHandling;
- public int mPlaybackStream;
- public RccPlaybackState mPlaybackState;
- public IRemoteVolumeObserver mRemoteVolumeObs;
-
-
- protected static class RccPlaybackState {
- public int mState;
- public long mPositionMs;
- public float mSpeed;
-
- public RccPlaybackState(int state, long positionMs, float speed) {
- mState = state;
- mPositionMs = positionMs;
- mSpeed = speed;
- }
-
- public void reset() {
- mState = RemoteControlClient.PLAYSTATE_STOPPED;
- mPositionMs = RemoteControlClient.PLAYBACK_POSITION_INVALID;
- mSpeed = RemoteControlClient.PLAYBACK_SPEED_1X;
- }
-
- @Override
- public String toString() {
- return stateToString() + ", " + posToString() + ", " + mSpeed + "X";
- }
-
- private String posToString() {
- if (mPositionMs == RemoteControlClient.PLAYBACK_POSITION_INVALID) {
- return "PLAYBACK_POSITION_INVALID";
- } else if (mPositionMs == RemoteControlClient.PLAYBACK_POSITION_ALWAYS_UNKNOWN) {
- return "PLAYBACK_POSITION_ALWAYS_UNKNOWN";
- } else {
- return (String.valueOf(mPositionMs) + "ms");
- }
- }
-
- private String stateToString() {
- switch (mState) {
- case RemoteControlClient.PLAYSTATE_NONE:
- return "PLAYSTATE_NONE";
- case RemoteControlClient.PLAYSTATE_STOPPED:
- return "PLAYSTATE_STOPPED";
- case RemoteControlClient.PLAYSTATE_PAUSED:
- return "PLAYSTATE_PAUSED";
- case RemoteControlClient.PLAYSTATE_PLAYING:
- return "PLAYSTATE_PLAYING";
- case RemoteControlClient.PLAYSTATE_FAST_FORWARDING:
- return "PLAYSTATE_FAST_FORWARDING";
- case RemoteControlClient.PLAYSTATE_REWINDING:
- return "PLAYSTATE_REWINDING";
- case RemoteControlClient.PLAYSTATE_SKIPPING_FORWARDS:
- return "PLAYSTATE_SKIPPING_FORWARDS";
- case RemoteControlClient.PLAYSTATE_SKIPPING_BACKWARDS:
- return "PLAYSTATE_SKIPPING_BACKWARDS";
- case RemoteControlClient.PLAYSTATE_BUFFERING:
- return "PLAYSTATE_BUFFERING";
- case RemoteControlClient.PLAYSTATE_ERROR:
- return "PLAYSTATE_ERROR";
- default:
- return "[invalid playstate]";
- }
- }
- }
-
-
- /**
- * Inner class to monitor remote control client deaths, and remove the client for the
- * remote control stack if necessary.
- */
- private class RcClientDeathHandler implements IBinder.DeathRecipient {
- final private IBinder mCb; // To be notified of client's death
- //FIXME needed?
- final private PendingIntent mMediaIntent;
-
- RcClientDeathHandler(IBinder cb, PendingIntent pi) {
- mCb = cb;
- mMediaIntent = pi;
- }
-
- public void binderDied() {
- Log.w(TAG, " RemoteControlClient died");
- // remote control client died, make sure the displays don't use it anymore
- // by setting its remote control client to null
- sController.registerRemoteControlClient(mMediaIntent, null/*rcClient*/, null/*ignored*/);
- // the dead client was maybe handling remote playback, the controller should reevaluate
- sController.postReevaluateRemote();
- }
-
- public IBinder getBinder() {
- return mCb;
- }
- }
-
-
- protected static class RemotePlaybackState {
- int mRccId;
- int mVolume;
- int mVolumeMax;
- int mVolumeHandling;
-
- protected RemotePlaybackState(int id, int vol, int volMax) {
- mRccId = id;
- mVolume = vol;
- mVolumeMax = volMax;
- mVolumeHandling = RemoteControlClient.DEFAULT_PLAYBACK_VOLUME_HANDLING;
- }
- }
-
-
- void dump(PrintWriter pw, boolean registrationInfo) {
- if (registrationInfo) {
- pw.println(" pi: " + mMediaIntent +
- " -- pack: " + mCallingPackageName +
- " -- ercvr: " + mReceiverComponent +
- " -- client: " + mRcClient +
- " -- uid: " + mCallingUid +
- " -- type: " + mPlaybackType +
- " state: " + mPlaybackState);
- } else {
- // emphasis on state
- pw.println(" uid: " + mCallingUid +
- " -- id: " + mRccId +
- " -- type: " + mPlaybackType +
- " -- state: " + mPlaybackState +
- " -- vol handling: " + mPlaybackVolumeHandling +
- " -- vol: " + mPlaybackVolume +
- " -- volMax: " + mPlaybackVolumeMax +
- " -- volObs: " + mRemoteVolumeObs);
- }
- }
-
-
- static protected void setMediaFocusControl(MediaFocusControl mfc) {
- sController = mfc;
- }
-
- /** precondition: mediaIntent != null */
- protected PlayerRecord(PendingIntent mediaIntent, ComponentName eventReceiver, IBinder token)
- {
- mMediaIntent = mediaIntent;
- mReceiverComponent = eventReceiver;
- mToken = token;
- mCallingUid = -1;
- mRcClient = null;
- mRccId = ++sLastRccId;
- mPlaybackState = new RccPlaybackState(
- RemoteControlClient.PLAYSTATE_STOPPED,
- RemoteControlClient.PLAYBACK_POSITION_INVALID,
- RemoteControlClient.PLAYBACK_SPEED_1X);
-
- resetPlaybackInfo();
- if (mToken != null) {
- try {
- mToken.linkToDeath(this, 0);
- } catch (RemoteException e) {
- sController.unregisterMediaButtonIntentAsync(mMediaIntent);
- }
- }
- }
-
- //---------------------------------------------
- // Accessors
- protected int getRccId() {
- return mRccId;
- }
-
- protected IRemoteControlClient getRcc() {
- return mRcClient;
- }
-
- protected ComponentName getMediaButtonReceiver() {
- return mReceiverComponent;
- }
-
- protected PendingIntent getMediaButtonIntent() {
- return mMediaIntent;
- }
-
- protected boolean hasMatchingMediaButtonIntent(PendingIntent pi) {
- if (mToken != null) {
- return mMediaIntent.equals(pi);
- } else {
- if (mReceiverComponent != null) {
- return mReceiverComponent.equals(pi.getIntent().getComponent());
- } else {
- return false;
- }
- }
- }
-
- protected boolean isPlaybackActive() {
- return MediaFocusControl.isPlaystateActive(mPlaybackState.mState);
- }
-
- //---------------------------------------------
- // Modify the records stored in the instance
- protected void resetControllerInfoForRcc(IRemoteControlClient rcClient,
- String callingPackageName, int uid) {
- // already had a remote control client?
- if (mRcClientDeathHandler != null) {
- // stop monitoring the old client's death
- unlinkToRcClientDeath();
- }
- // save the new remote control client
- mRcClient = rcClient;
- mCallingPackageName = callingPackageName;
- mCallingUid = uid;
- if (rcClient == null) {
- // here mcse.mRcClientDeathHandler is null;
- resetPlaybackInfo();
- } else {
- IBinder b = mRcClient.asBinder();
- RcClientDeathHandler rcdh =
- new RcClientDeathHandler(b, mMediaIntent);
- try {
- b.linkToDeath(rcdh, 0);
- } catch (RemoteException e) {
- // remote control client is DOA, disqualify it
- Log.w(TAG, "registerRemoteControlClient() has a dead client " + b);
- mRcClient = null;
- }
- mRcClientDeathHandler = rcdh;
- }
- }
-
- protected void resetControllerInfoForNoRcc() {
- // stop monitoring the RCC death
- unlinkToRcClientDeath();
- // reset the RCC-related fields
- mRcClient = null;
- mCallingPackageName = null;
- }
-
- public void resetPlaybackInfo() {
- mPlaybackType = RemoteControlClient.PLAYBACK_TYPE_LOCAL;
- mPlaybackVolume = RemoteControlClient.DEFAULT_PLAYBACK_VOLUME;
- mPlaybackVolumeMax = RemoteControlClient.DEFAULT_PLAYBACK_VOLUME;
- mPlaybackVolumeHandling = RemoteControlClient.DEFAULT_PLAYBACK_VOLUME_HANDLING;
- mPlaybackStream = AudioManager.STREAM_MUSIC;
- mPlaybackState.reset();
- mRemoteVolumeObs = null;
- }
-
- //---------------------------------------------
- public void unlinkToRcClientDeath() {
- if ((mRcClientDeathHandler != null) && (mRcClientDeathHandler.mCb != null)) {
- try {
- mRcClientDeathHandler.mCb.unlinkToDeath(mRcClientDeathHandler, 0);
- mRcClientDeathHandler = null;
- } catch (java.util.NoSuchElementException e) {
- // not much we can do here
- Log.e(TAG, "Error in unlinkToRcClientDeath()", e);
- }
- }
- }
-
- // FIXME rename to "release"? (as in FocusRequester class)
- public void destroy() {
- unlinkToRcClientDeath();
- if (mToken != null) {
- mToken.unlinkToDeath(this, 0);
- mToken = null;
- }
- }
-
- @Override
- public void binderDied() {
- sController.unregisterMediaButtonIntentAsync(mMediaIntent);
- }
-
- @Override
- protected void finalize() throws Throwable {
- destroy(); // unlink exception handled inside method
- super.finalize();
- }
-}
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 6687412..3b43633 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -33,7 +33,9 @@
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.Network;
+import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
+import android.net.NetworkRequest;
import android.net.NetworkUtils;
import android.net.RouteInfo;
import android.os.Binder;
@@ -213,6 +215,7 @@
checkDunRequired();
}
+ @Override
public void interfaceStatusChanged(String iface, boolean up) {
if (VDBG) Log.d(TAG, "interfaceStatusChanged " + iface + ", " + up);
boolean found = false;
@@ -248,6 +251,7 @@
}
}
+ @Override
public void interfaceLinkStateChanged(String iface, boolean up) {
if (VDBG) Log.d(TAG, "interfaceLinkStateChanged " + iface + ", " + up);
interfaceStatusChanged(iface, up);
@@ -280,6 +284,7 @@
}
}
+ @Override
public void interfaceAdded(String iface) {
if (VDBG) Log.d(TAG, "interfaceAdded " + iface);
boolean found = false;
@@ -311,6 +316,7 @@
}
}
+ @Override
public void interfaceRemoved(String iface) {
if (VDBG) Log.d(TAG, "interfaceRemoved " + iface);
synchronized (mPublicSync) {
@@ -638,7 +644,7 @@
return values;
}
- public void checkDunRequired() {
+ private void checkDunRequired() {
int secureSetting = 2;
TelephonyManager tm = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
if (tm != null) {
@@ -1135,10 +1141,8 @@
static final int CMD_TETHER_MODE_UNREQUESTED = 2;
// upstream connection change - do the right thing
static final int CMD_UPSTREAM_CHANGED = 3;
- // we received notice that the cellular DUN connection is up
- static final int CMD_CELL_CONNECTION_RENEW = 4;
// we don't have a valid upstream conn, check again after a delay
- static final int CMD_RETRY_UPSTREAM = 5;
+ static final int CMD_RETRY_UPSTREAM = 4;
// This indicates what a timeout event relates to. A state that
// sends itself a delayed timeout event and handles incoming timeout events
@@ -1157,13 +1161,12 @@
private ArrayList<TetherInterfaceSM> mNotifyList;
- private int mCurrentConnectionSequence;
private int mMobileApnReserved = ConnectivityManager.TYPE_NONE;
+ private ConnectivityManager.NetworkCallback mMobileUpstreamCallback;
private String mUpstreamIfaceName = null;
private static final int UPSTREAM_SETTLE_TIME_MS = 10000;
- private static final int CELL_CONNECTION_RENEW_MS = 40000;
TetherMasterSM(String name, Looper looper) {
super(name, looper);
@@ -1190,58 +1193,69 @@
}
class TetherMasterUtilState extends State {
- protected final static boolean TRY_TO_SETUP_MOBILE_CONNECTION = true;
protected final static boolean WAIT_FOR_NETWORK_TO_SETTLE = false;
@Override
public boolean processMessage(Message m) {
return false;
}
- protected String enableString(int apnType) {
- switch (apnType) {
- case ConnectivityManager.TYPE_MOBILE_DUN:
- return Phone.FEATURE_ENABLE_DUN_ALWAYS;
- case ConnectivityManager.TYPE_MOBILE:
- case ConnectivityManager.TYPE_MOBILE_HIPRI:
- return Phone.FEATURE_ENABLE_HIPRI;
- }
- return null;
- }
+
protected boolean turnOnUpstreamMobileConnection(int apnType) {
- boolean retValue = true;
- if (apnType == ConnectivityManager.TYPE_NONE) return false;
- if (apnType != mMobileApnReserved) turnOffUpstreamMobileConnection();
- int result = PhoneConstants.APN_REQUEST_FAILED;
- String enableString = enableString(apnType);
- if (enableString == null) return false;
- result = getConnectivityManager().startUsingNetworkFeature(
- ConnectivityManager.TYPE_MOBILE, enableString);
- switch (result) {
- case PhoneConstants.APN_ALREADY_ACTIVE:
- case PhoneConstants.APN_REQUEST_STARTED:
- mMobileApnReserved = apnType;
- Message m = obtainMessage(CMD_CELL_CONNECTION_RENEW);
- m.arg1 = ++mCurrentConnectionSequence;
- sendMessageDelayed(m, CELL_CONNECTION_RENEW_MS);
- break;
- case PhoneConstants.APN_REQUEST_FAILED:
- default:
- retValue = false;
- break;
+ if (apnType == ConnectivityManager.TYPE_NONE) { return false; }
+
+ if (apnType != mMobileApnReserved) {
+ // Unregister any previous mobile upstream callback because
+ // this request, if any, will be different.
+ turnOffUpstreamMobileConnection();
}
- return retValue;
- }
- protected boolean turnOffUpstreamMobileConnection() {
- // ignore pending renewal requests
- ++mCurrentConnectionSequence;
- if (mMobileApnReserved != ConnectivityManager.TYPE_NONE) {
- getConnectivityManager().stopUsingNetworkFeature(
- ConnectivityManager.TYPE_MOBILE, enableString(mMobileApnReserved));
- mMobileApnReserved = ConnectivityManager.TYPE_NONE;
+ if (mMobileUpstreamCallback != null) {
+ // Looks like we already filed a request for this apnType.
+ return true;
}
+
+ switch (apnType) {
+ case ConnectivityManager.TYPE_MOBILE_DUN:
+ case ConnectivityManager.TYPE_MOBILE:
+ case ConnectivityManager.TYPE_MOBILE_HIPRI:
+ mMobileApnReserved = apnType;
+ break;
+ default:
+ return false;
+ }
+
+ NetworkRequest.Builder builder = new NetworkRequest.Builder()
+ .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
+ if (apnType == ConnectivityManager.TYPE_MOBILE_DUN) {
+ builder.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN)
+ .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
+ } else {
+ builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+ }
+ NetworkRequest mobileUpstreamRequest = builder.build();
+ // Other mechanisms notice network and interface changes and act upon them.
+ // TODO, imminently: replace with a proper NetworkCallback-based scheme.
+ //
+ // TODO: Change the timeout from 0 (no onUnavailable callback) to use some
+ // moderate callback time (once timeout callbacks are implemented). This might
+ // be useful for updating some UI. Additionally, we should definitely log a
+ // message to aid in any subsequent debugging.
+ mMobileUpstreamCallback = new ConnectivityManager.NetworkCallback();
+ if (DBG) Log.d(TAG, "requesting mobile upstream network: " + mobileUpstreamRequest);
+ getConnectivityManager().requestNetwork(
+ mobileUpstreamRequest, mMobileUpstreamCallback, 0, apnType);
+
return true;
}
+
+ protected void turnOffUpstreamMobileConnection() {
+ if (mMobileUpstreamCallback != null) {
+ getConnectivityManager().unregisterNetworkCallback(mMobileUpstreamCallback);
+ mMobileUpstreamCallback = null;
+ }
+ mMobileApnReserved = ConnectivityManager.TYPE_NONE;
+ }
+
protected boolean turnOnMasterTetherSettings() {
try {
mNMService.setIpForwardingEnabled(true);
@@ -1304,35 +1318,39 @@
}
if (DBG) {
- Log.d(TAG, "chooseUpstreamType(" + tryCell + "), preferredApn ="
- + mPreferredUpstreamMobileApn + ", got type=" + upType);
+ Log.d(TAG, "chooseUpstreamType(" + tryCell + "),"
+ + " preferredApn="
+ + ConnectivityManager.getNetworkTypeName(mPreferredUpstreamMobileApn)
+ + ", got type="
+ + ConnectivityManager.getNetworkTypeName(upType));
}
- // if we're on DUN, put our own grab on it
- if (upType == ConnectivityManager.TYPE_MOBILE_DUN ||
- upType == ConnectivityManager.TYPE_MOBILE_HIPRI) {
- turnOnUpstreamMobileConnection(upType);
- } else if (upType != ConnectivityManager.TYPE_NONE) {
- /* If we've found an active upstream connection that's not DUN/HIPRI
- * we should stop any outstanding DUN/HIPRI start requests.
- *
- * If we found NONE we don't want to do this as we want any previous
- * requests to keep trying to bring up something we can use.
- */
- turnOffUpstreamMobileConnection();
+ switch (upType) {
+ case ConnectivityManager.TYPE_MOBILE_DUN:
+ case ConnectivityManager.TYPE_MOBILE_HIPRI:
+ // If we're on DUN, put our own grab on it.
+ turnOnUpstreamMobileConnection(upType);
+ break;
+ case ConnectivityManager.TYPE_NONE:
+ if (tryCell &&
+ turnOnUpstreamMobileConnection(mPreferredUpstreamMobileApn)) {
+ // We think mobile should be coming up; don't set a retry.
+ } else {
+ sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS);
+ }
+ break;
+ default:
+ /* If we've found an active upstream connection that's not DUN/HIPRI
+ * we should stop any outstanding DUN/HIPRI start requests.
+ *
+ * If we found NONE we don't want to do this as we want any previous
+ * requests to keep trying to bring up something we can use.
+ */
+ turnOffUpstreamMobileConnection();
+ break;
}
- if (upType == ConnectivityManager.TYPE_NONE) {
- boolean tryAgainLater = true;
- if ((tryCell == TRY_TO_SETUP_MOBILE_CONNECTION) &&
- (turnOnUpstreamMobileConnection(mPreferredUpstreamMobileApn) == true)) {
- // we think mobile should be coming up - don't set a retry
- tryAgainLater = false;
- }
- if (tryAgainLater) {
- sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS);
- }
- } else {
+ if (upType != ConnectivityManager.TYPE_NONE) {
LinkProperties linkProperties =
getConnectivityManager().getLinkProperties(upType);
if (linkProperties != null) {
@@ -1579,17 +1597,6 @@
chooseUpstreamType(mTryCell);
mTryCell = !mTryCell;
break;
- case CMD_CELL_CONNECTION_RENEW:
- // make sure we're still using a requested connection - may have found
- // wifi or something since then.
- if (mCurrentConnectionSequence == message.arg1) {
- if (VDBG) {
- Log.d(TAG, "renewing mobile connection - requeuing for another " +
- CELL_CONNECTION_RENEW_MS + "ms");
- }
- turnOnUpstreamMobileConnection(mMobileApnReserved);
- }
- break;
case CMD_RETRY_UPSTREAM:
chooseUpstreamType(mTryCell);
mTryCell = !mTryCell;
diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java
index b766894..75a74c0 100644
--- a/services/core/java/com/android/server/content/ContentService.java
+++ b/services/core/java/com/android/server/content/ContentService.java
@@ -466,7 +466,7 @@
if (cname == null) {
info = new SyncStorageEngine.EndPoint(account, authority, userId);
} else {
- info = new SyncStorageEngine.EndPoint(cname, userId);
+ info = new SyncStorageEngine.EndPoint(cname, userId, -1);
}
syncManager.clearScheduledSyncOperations(info);
syncManager.cancelActiveSync(info, null /* all syncs for this adapter */);
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index 82e0eaf..4f53882 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -21,8 +21,10 @@
import android.accounts.AccountManager;
import android.annotation.Nullable;
import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
import android.app.AlarmManager;
import android.app.AppGlobals;
+import android.app.IUidObserver;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -79,11 +81,14 @@
import android.util.Log;
import android.util.Pair;
+import android.util.Slog;
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.IBatteryStats;
import com.android.internal.os.BackgroundThread;
import com.android.internal.util.IndentingPrintWriter;
+import com.android.server.DeviceIdleController;
+import com.android.server.LocalServices;
import com.android.server.accounts.AccountManagerService;
import com.android.server.content.SyncStorageEngine.AuthorityInfo;
import com.android.server.content.SyncStorageEngine.EndPoint;
@@ -207,6 +212,7 @@
volatile private boolean mDataConnectionIsConnected = false;
volatile private boolean mStorageIsLow = false;
volatile private boolean mDeviceIsIdle = false;
+ volatile private boolean mReportedSyncActive = false;
private final NotificationManager mNotificationMgr;
private AlarmManager mAlarmService = null;
@@ -234,7 +240,7 @@
private final AppIdleMonitor mAppIdleMonitor;
- private BroadcastReceiver mStorageIntentReceiver =
+ private final BroadcastReceiver mStorageIntentReceiver =
new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -257,7 +263,7 @@
}
};
- private BroadcastReceiver mDeviceIdleReceiver = new BroadcastReceiver() {
+ private final BroadcastReceiver mDeviceIdleReceiver = new BroadcastReceiver() {
@Override public void onReceive(Context context, Intent intent) {
boolean idle = mPowerManager.isDeviceIdleMode()
|| mPowerManager.isLightDeviceIdleMode();
@@ -267,12 +273,18 @@
SyncStorageEngine.EndPoint.USER_ALL_PROVIDER_ALL_ACCOUNTS_ALL,
null /* any sync */);
} else {
+ if (mLocalDeviceIdleController != null) {
+ if (!mReportedSyncActive) {
+ mReportedSyncActive = true;
+ mLocalDeviceIdleController.setSyncActive(true);
+ }
+ }
sendCheckAlarmsMessage();
}
}
};
- private BroadcastReceiver mBootCompletedReceiver = new BroadcastReceiver() {
+ private final BroadcastReceiver mBootCompletedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
mBootCompleted = true;
@@ -280,7 +292,7 @@
}
};
- private BroadcastReceiver mAccountsUpdatedReceiver = new BroadcastReceiver() {
+ private final BroadcastReceiver mAccountsUpdatedReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
updateRunningAccounts();
@@ -291,7 +303,23 @@
}
};
+ private final IUidObserver mUidObserver = new IUidObserver.Stub() {
+ @Override public void onUidStateChanged(int uid, int procState) throws RemoteException {
+ }
+
+ @Override public void onUidGone(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidActive(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidIdle(int uid) throws RemoteException {
+ cancelSyncsForUid(uid);
+ }
+ };
+
private final PowerManager mPowerManager;
+ DeviceIdleController.LocalService mLocalDeviceIdleController;
// Use this as a random offset to seed all periodic syncs.
private int mSyncRandomOffsetMillis;
@@ -494,6 +522,13 @@
mContext.registerReceiverAsUser(
mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null);
+ try {
+ ActivityManagerNative.getDefault().registerUidObserver(mUidObserver,
+ ActivityManager.UID_OBSERVER_IDLE);
+ } catch (RemoteException e) {
+ // ignored; both services live in system_server
+ }
+
if (!factoryTest) {
mNotificationMgr = (NotificationManager)
context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -651,6 +686,26 @@
Log.d(TAG, "one off sync for: " + cname + " " + extras.toString());
}
+ final android.content.pm.ServiceInfo sinfo;
+ try {
+ sinfo = mContext.getPackageManager().getServiceInfo(cname, userId);
+ } catch (PackageManager.NameNotFoundException e) {
+ Slog.w(TAG, "Not scheduling sync " + cname
+ + " -- can't find service for user " + userId);
+ return;
+ }
+ final int sUid = sinfo.applicationInfo.uid;
+
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(sUid, cname.getPackageName())
+ == ActivityManager.APP_START_MODE_DISABLED) {
+ Slog.w(TAG, "Not scheduling sync " + sUid + ":" + cname
+ + " -- package not allowed to start");
+ return;
+ }
+ } catch (RemoteException e) {
+ }
+
Boolean expedited = extras.getBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, false);
if (expedited) {
runtimeMillis = -1; // this means schedule at the front of the queue
@@ -678,7 +733,7 @@
}
return;
}
- SyncStorageEngine.EndPoint info = new SyncStorageEngine.EndPoint(cname, userId);
+ SyncStorageEngine.EndPoint info = new SyncStorageEngine.EndPoint(cname, userId, sUid);
Pair<Long, Long> backoff = mSyncStorageEngine.getBackoff(info);
long delayUntil = mSyncStorageEngine.getDelayUntilTime(info);
final long backoffTime = backoff != null ? backoff.first : 0;
@@ -692,7 +747,7 @@
+ ", extras " + extras);
}
scheduleSyncOperation(
- new SyncOperation(cname, userId, uid, source, extras,
+ new SyncOperation(cname, userId, sUid, cname.getPackageName(), uid, source, extras,
runtimeMillis /* runtime */,
beforeRunTimeMillis /* flextime */,
backoffTime,
@@ -827,6 +882,18 @@
if (syncAdapterInfo == null) {
continue;
}
+ final int owningUid = syncAdapterInfo.uid;
+ final String owningPackage = syncAdapterInfo.componentName.getPackageName();
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(owningUid,
+ owningPackage) == ActivityManager.APP_START_MODE_DISABLED) {
+ Slog.w(TAG, "Not scheduling job " + syncAdapterInfo.uid + ":"
+ + syncAdapterInfo.componentName
+ + " -- package not allowed to start");
+ return;
+ }
+ } catch (RemoteException e) {
+ }
final boolean allowParallelSyncs = syncAdapterInfo.type.allowParallelSyncs();
final boolean isAlwaysSyncable = syncAdapterInfo.type.isAlwaysSyncable();
if (isSyncable < 0 && isAlwaysSyncable) {
@@ -876,7 +943,8 @@
+ ", extras " + newExtras);
}
scheduleSyncOperation(
- new SyncOperation(account.account, account.userId, reason, source,
+ new SyncOperation(account.account, account.userId,
+ owningUid, owningPackage, reason, source,
authority, newExtras, 0 /* immediate */, 0 /* No flex time*/,
backoffTime, delayUntil, allowParallelSyncs));
}
@@ -892,7 +960,8 @@
+ ", extras " + extras);
}
scheduleSyncOperation(
- new SyncOperation(account.account, account.userId, reason, source,
+ new SyncOperation(account.account, account.userId,
+ owningUid, owningPackage, reason, source,
authority, extras, runtimeMillis, beforeRuntimeMillis,
backoffTime, delayUntil, allowParallelSyncs));
}
@@ -1299,6 +1368,14 @@
}
}
+ void cancelSyncsForUid(int uid) {
+ synchronized (mSyncQueue) {
+ if (mSyncQueue.removeUidIfNeededLocked(uid)) {
+ sendCheckAlarmsMessage();
+ }
+ }
+ }
+
/**
* @hide
*/
@@ -1470,6 +1547,7 @@
}
pw.print("memory low: "); pw.println(mStorageIsLow);
pw.print("device idle: "); pw.println(mDeviceIsIdle);
+ pw.print("reported active: "); pw.println(mReportedSyncActive);
final AccountAndUser[] accounts = AccountManagerService.getSingleton().getAllAccounts();
@@ -2155,8 +2233,8 @@
/**
* Stash any messages that come to the handler before boot is complete or before the device
* is properly provisioned (i.e. out of set-up wizard).
- * {@link #onBootCompleted()} and {@link #onDeviceProvisioned(boolean)} both need to come
- * in before we start syncing.
+ * {@link #onBootCompleted()} and {@link SyncHandler#onDeviceProvisioned} both
+ * need to come in before we start syncing.
* @param msg Message to dispatch at a later point.
* @return true if a message was enqueued, false otherwise. This is to avoid losing the
* message if we manage to acquire the lock but by the time we do boot has completed.
@@ -2492,6 +2570,8 @@
}
scheduleSyncOperation(
new SyncOperation(target.account, target.userId,
+ syncAdapterInfo.uid,
+ syncAdapterInfo.componentName.getPackageName(),
SyncOperation.REASON_PERIODIC,
SyncStorageEngine.SOURCE_PERIODIC,
target.provider, extras,
@@ -2502,6 +2582,7 @@
} else if (target.target_service) {
scheduleSyncOperation(
new SyncOperation(target.service, target.userId,
+ target.serviceUid, target.service.getPackageName(),
SyncOperation.REASON_PERIODIC,
SyncStorageEngine.SOURCE_PERIODIC,
extras,
@@ -2544,6 +2625,7 @@
if (isLoggable) {
Log.v(TAG, "maybeStartNextSync: no data connection, skipping");
}
+ setSyncActive(false);
return Long.MAX_VALUE;
}
@@ -2551,6 +2633,7 @@
if (isLoggable) {
Log.v(TAG, "maybeStartNextSync: memory low, skipping");
}
+ setSyncActive(false);
return Long.MAX_VALUE;
}
@@ -2558,6 +2641,7 @@
if (isLoggable) {
Log.v(TAG, "maybeStartNextSync: device idle, skipping");
}
+ setSyncActive(false);
return Long.MAX_VALUE;
}
@@ -2567,6 +2651,7 @@
if (isLoggable) {
Log.v(TAG, "maybeStartNextSync: accounts not known, skipping");
}
+ setSyncActive(false);
return Long.MAX_VALUE;
}
@@ -2772,9 +2857,25 @@
dispatchSyncOperation(candidate);
}
+ setSyncActive(mActiveSyncContexts.size() > 0);
+
return nextReadyToRunTime;
}
+ void setSyncActive(boolean active) {
+ if (mLocalDeviceIdleController == null) {
+ mLocalDeviceIdleController
+ = LocalServices.getService(DeviceIdleController.LocalService.class);
+ }
+ if (mLocalDeviceIdleController != null) {
+ if (mReportedSyncActive != active) {
+ mReportedSyncActive = active;
+ mLocalDeviceIdleController.setSyncActive(active);
+ }
+ }
+
+ }
+
private boolean isSyncNotUsingNetworkH(ActiveSyncContext activeSyncContext) {
final long bytesTransferredCurrent =
getTotalBytesTransferredByUid(activeSyncContext.mSyncAdapterUid);
@@ -3114,6 +3215,7 @@
if (syncResult != null && syncResult.fullSyncRequested) {
scheduleSyncOperation(
new SyncOperation(info.account, info.userId,
+ syncOperation.owningUid, syncOperation.owningPackage,
syncOperation.reason,
syncOperation.syncSource, info.provider, new Bundle(),
0 /* delay */, 0 /* flex */,
@@ -3124,6 +3226,7 @@
if (syncResult != null && syncResult.fullSyncRequested) {
scheduleSyncOperation(
new SyncOperation(info.service, info.userId,
+ syncOperation.owningUid, syncOperation.owningPackage,
syncOperation.reason,
syncOperation.syncSource, new Bundle(),
0 /* delay */, 0 /* flex */,
diff --git a/services/core/java/com/android/server/content/SyncOperation.java b/services/core/java/com/android/server/content/SyncOperation.java
index 10efe81..ab777ae 100644
--- a/services/core/java/com/android/server/content/SyncOperation.java
+++ b/services/core/java/com/android/server/content/SyncOperation.java
@@ -22,6 +22,7 @@
import android.content.ContentResolver;
import android.os.Bundle;
import android.os.SystemClock;
+import android.os.UserHandle;
import android.util.Log;
/**
@@ -62,6 +63,8 @@
/** Identifying info for the target for this operation. */
public final SyncStorageEngine.EndPoint target;
+ public final int owningUid;
+ public final String owningPackage;
/** Why this sync was kicked off. {@link #REASON_NAMES} */
public final int reason;
/** Where this sync was initiated. */
@@ -93,25 +96,28 @@
/** Whether this sync op was recently skipped due to the app being idle */
public boolean appIdle;
- public SyncOperation(Account account, int userId, int reason, int source, String provider,
- Bundle extras, long runTimeFromNow, long flexTime, long backoff,
- long delayUntil, boolean allowParallelSyncs) {
- this(new SyncStorageEngine.EndPoint(account, provider, userId),
+ public SyncOperation(Account account, int userId, int owningUid, String owningPackage,
+ int reason, int source, String provider, Bundle extras, long runTimeFromNow,
+ long flexTime, long backoff, long delayUntil, boolean allowParallelSyncs) {
+ this(new SyncStorageEngine.EndPoint(account, provider, userId), owningUid, owningPackage,
reason, source, extras, runTimeFromNow, flexTime, backoff, delayUntil,
allowParallelSyncs);
}
- public SyncOperation(ComponentName service, int userId, int reason, int source,
- Bundle extras, long runTimeFromNow, long flexTime, long backoff,
+ public SyncOperation(ComponentName service, int userId, int owningUid, String owningPackage,
+ int reason, int source, Bundle extras, long runTimeFromNow, long flexTime, long backoff,
long delayUntil) {
- this(new SyncStorageEngine.EndPoint(service, userId), reason, source, extras,
- runTimeFromNow, flexTime, backoff, delayUntil, true /* allowParallelSyncs */);
+ this(new SyncStorageEngine.EndPoint(service, userId, owningUid), owningUid, owningPackage,
+ reason, source, extras, runTimeFromNow, flexTime, backoff, delayUntil,
+ true /* allowParallelSyncs */);
}
- private SyncOperation(SyncStorageEngine.EndPoint info, int reason, int source, Bundle extras,
- long runTimeFromNow, long flexTime, long backoff, long delayUntil,
- boolean allowParallelSyncs) {
+ private SyncOperation(SyncStorageEngine.EndPoint info, int owningUid, String owningPackage,
+ int reason, int source, Bundle extras, long runTimeFromNow, long flexTime,
+ long backoff, long delayUntil, boolean allowParallelSyncs) {
this.target = info;
+ this.owningUid = owningUid;
+ this.owningPackage = owningPackage;
this.reason = reason;
this.syncSource = source;
this.extras = new Bundle(extras);
@@ -142,7 +148,8 @@
/** Used to reschedule a sync at a new point in time. */
public SyncOperation(SyncOperation other, long newRunTimeFromNow) {
- this(other.target, other.reason, other.syncSource, new Bundle(other.extras),
+ this(other.target, other.owningUid, other.owningPackage, other.reason, other.syncSource,
+ new Bundle(other.extras),
newRunTimeFromNow,
0L /* In back-off so no flex */,
other.backoff,
@@ -228,6 +235,13 @@
}
sb.append(", reason: ");
sb.append(reasonToString(pm, reason));
+ if (!useOneLine) {
+ sb.append("\n ");
+ sb.append("owningUid=");
+ UserHandle.formatUid(sb, owningUid);
+ sb.append(" owningPackage=");
+ sb.append(owningPackage);
+ }
if (!useOneLine && !extras.keySet().isEmpty()) {
sb.append("\n ");
extrasToStringBuilder(extras, sb);
diff --git a/services/core/java/com/android/server/content/SyncQueue.java b/services/core/java/com/android/server/content/SyncQueue.java
index 587de1c..b15d0d8 100644
--- a/services/core/java/com/android/server/content/SyncQueue.java
+++ b/services/core/java/com/android/server/content/SyncQueue.java
@@ -16,16 +16,20 @@
package com.android.server.content;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
import android.content.pm.PackageManager;
import android.content.SyncAdapterType;
import android.content.SyncAdaptersCache;
import android.content.pm.RegisteredServicesCache.ServiceInfo;
import android.os.Bundle;
+import android.os.RemoteException;
import android.os.SystemClock;
import android.text.format.DateUtils;
import android.util.Log;
import android.util.Pair;
+import android.util.Slog;
import com.google.android.collect.Maps;
import java.util.ArrayList;
@@ -74,8 +78,9 @@
continue;
}
operationToAdd = new SyncOperation(
- info.account, info.userId, op.reason, op.syncSource, info.provider,
- op.extras,
+ info.account, info.userId, syncAdapterInfo.uid,
+ syncAdapterInfo.componentName.getPackageName(), op.reason,
+ op.syncSource, info.provider, op.extras,
op.expedited ? -1 : 0 /* delay */,
0 /* flex */,
backoff != null ? backoff.first : 0L,
@@ -84,16 +89,24 @@
operationToAdd.pendingOperation = op;
add(operationToAdd, op);
} else if (info.target_service) {
+ android.content.pm.ServiceInfo sinfo;
try {
- mPackageManager.getServiceInfo(info.service, 0);
+ sinfo = mPackageManager.getServiceInfo(info.service, info.userId);
} catch (PackageManager.NameNotFoundException e) {
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.w(TAG, "Missing sync service for authority " + op.target);
}
continue;
}
+ if (sinfo == null) {
+ if (Log.isLoggable(TAG, Log.VERBOSE)) {
+ Log.w(TAG, "Missing sync service for authority " + op.target);
+ }
+ continue;
+ }
operationToAdd = new SyncOperation(
- info.service, info.userId, op.reason, op.syncSource,
+ info.service, info.userId, sinfo.applicationInfo.uid,
+ info.service.getPackageName(), op.reason, op.syncSource,
op.extras,
op.expedited ? -1 : 0 /* delay */,
0 /* flex */,
@@ -161,9 +174,38 @@
opsToRemove.add(op);
}
}
- for (SyncOperation op : opsToRemove) {
- remove(op);
+ for (SyncOperation op : opsToRemove) {
+ remove(op);
+ }
+ }
+
+ public boolean removeUidIfNeededLocked(int uid) {
+ ArrayList<SyncOperation> opsToRemove = null;
+ for (SyncOperation op : mOperationsMap.values()) {
+ if (op.owningUid != uid) {
+ continue;
}
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(op.owningUid,
+ op.owningPackage) == ActivityManager.APP_START_MODE_DISABLED) {
+ Slog.w(TAG, "Removing sync " + op.owningUid + ":" + op
+ + " -- package not allowed to start");
+ continue;
+ }
+ } catch (RemoteException e) {
+ }
+ if (opsToRemove == null) {
+ opsToRemove = new ArrayList<SyncOperation>();
+ }
+ opsToRemove.add(op);
+ }
+ if (opsToRemove == null) {
+ return false;
+ }
+ for (SyncOperation op : opsToRemove) {
+ remove(op);
+ }
+ return true;
}
/**
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index cca0c16..8266c08 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -27,6 +27,7 @@
import android.content.SyncInfo;
import android.content.SyncRequest;
import android.content.SyncStatusInfo;
+import android.content.pm.PackageManager;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
@@ -42,6 +43,7 @@
import android.util.AtomicFile;
import android.util.Log;
import android.util.Pair;
+import android.util.Slog;
import android.util.SparseArray;
import android.util.ArrayMap;
import android.util.Xml;
@@ -227,14 +229,16 @@
public final static EndPoint USER_ALL_PROVIDER_ALL_ACCOUNTS_ALL =
new EndPoint(null, null, UserHandle.USER_ALL);
final ComponentName service;
+ final int serviceUid; // -1 for "any"
final Account account;
final int userId;
final String provider;
final boolean target_service;
final boolean target_provider;
- public EndPoint(ComponentName service, int userId) {
+ public EndPoint(ComponentName service, int userId, int uid) {
this.service = service;
+ this.serviceUid = uid;
this.userId = userId;
this.account = null;
this.provider = null;
@@ -247,6 +251,7 @@
this.provider = provider;
this.userId = userId;
this.service = null;
+ this.serviceUid = -1;
this.target_service = false;
this.target_provider = true;
}
@@ -264,6 +269,11 @@
return false;
}
if (target_service && spec.target_service) {
+ if (serviceUid != spec.serviceUid
+ && serviceUid >= 0
+ && spec.serviceUid >= 0) {
+ return false;
+ }
return service.equals(spec.service);
} else if (target_provider && spec.target_provider) {
boolean accountsMatch;
@@ -290,8 +300,9 @@
.append("/")
.append(provider == null ? "ALL PDRS" : provider);
} else if (target_service) {
- sb.append(service.getPackageName() + "/")
- .append(service.getClassName());
+ service.appendShortString(sb);
+ sb.append(":");
+ UserHandle.formatUid(sb,serviceUid);
} else {
sb.append("invalid target");
}
@@ -737,7 +748,7 @@
synchronized (mAuthorities) {
if (cname != null) {
AuthorityInfo authority = getAuthorityLocked(
- new EndPoint(cname, userId),
+ new EndPoint(cname, userId, -1),
"get service active");
if (authority == null) {
return false;
@@ -749,7 +760,7 @@
}
public void setIsTargetServiceActive(ComponentName cname, int userId, boolean active) {
- setSyncableStateForEndPoint(new EndPoint(cname, userId), active ?
+ setSyncableStateForEndPoint(new EndPoint(cname, userId, -1), active ?
AuthorityInfo.SYNCABLE : AuthorityInfo.NOT_SYNCABLE);
}
@@ -2064,18 +2075,30 @@
new Account(accountName, accountType),
authorityName, userId);
} else {
- info = new EndPoint(
- new ComponentName(packageName, className),
- userId);
+ final ComponentName cname = new ComponentName(packageName, className);
+ android.content.pm.ServiceInfo sinfo = null;
+ try {
+ sinfo = mContext.getPackageManager().getServiceInfo(cname, userId);
+ } catch (PackageManager.NameNotFoundException e) {
+ Slog.w(TAG, "Not restoring sync " + cname
+ + " -- can't find service for user " + userId);
+ }
+ if (sinfo != null) {
+ info = new EndPoint(cname, userId, sinfo.applicationInfo.uid);
+ } else {
+ info = null;
+ }
}
- authority = getOrCreateAuthorityLocked(info, id, false);
- // If the version is 0 then we are upgrading from a file format that did not
- // know about periodic syncs. In that case don't clear the list since we
- // want the default, which is a daily periodic sync.
- // Otherwise clear out this default list since we will populate it later with
- // the periodic sync descriptions that are read from the configuration file.
- if (version > 0) {
- authority.periodicSyncs.clear();
+ if (info != null) {
+ authority = getOrCreateAuthorityLocked(info, id, false);
+ // If the version is 0 then we are upgrading from a file format that did not
+ // know about periodic syncs. In that case don't clear the list since we
+ // want the default, which is a daily periodic sync.
+ // Otherwise clear out this default list since we will populate it later with
+ // the periodic sync descriptions that are read from the configuration file.
+ if (version > 0) {
+ authority.periodicSyncs.clear();
+ }
}
}
if (authority != null) {
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index ec7c1c4..103ed0a 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -1139,6 +1139,12 @@
public void onUserSwitching(int newUserId, IRemoteCallback reply) {
mHandler.obtainMessage(MSG_USER_SWITCHING, newUserId, 0 /* unused */)
.sendToTarget();
+ if (reply != null) {
+ try {
+ reply.sendResult(null);
+ } catch (RemoteException e) {
+ }
+ }
}
@Override
public void onUserSwitchComplete(int newUserId) throws RemoteException {
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
index 2eca42b..adc1cd7 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
@@ -448,4 +448,20 @@
static boolean isSupportedKeycode(int androidKeycode) {
return HdmiCecKeycode.androidKeyToCecKey(androidKeycode) != null;
}
+
+ /**
+ * Returns CEC keycode to control audio mute status.
+ *
+ * @param muting {@code true} if audio is being muted
+ */
+ public static int getMuteKey(boolean muting) {
+ // CEC_KEYCODE_MUTE_FUNCTION, CEC_KEYCODE_RESTORE_VOLUME_FUNCTION are deterministic
+ // commands that ensures the status changes to what we want, while CEC_KEYCODE_MUTE
+ // simply toggles the status.
+ // The former is a better choice in this regard, but there are compatibility issues
+ // observed - many audio receivers don't recognize the commands. We fall back on
+ // CEC_KEYCODE_MUTE for now.
+ // return muting ? CEC_KEYCODE_MUTE_FUNCTION : CEC_KEYCODE_RESTORE_VOLUME_FUNCTION;
+ return CEC_KEYCODE_MUTE;
+ }
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index cd8484f..e63a143 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1099,8 +1099,7 @@
// Remove existing volume action.
removeAction(VolumeControlAction.class);
sendUserControlPressedAndReleased(getAvrDeviceInfo().getLogicalAddress(),
- mute ? HdmiCecKeycode.CEC_KEYCODE_MUTE_FUNCTION :
- HdmiCecKeycode.CEC_KEYCODE_RESTORE_VOLUME_FUNCTION);
+ HdmiCecKeycode.getMuteKey(mute));
}
@Override
diff --git a/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java b/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java
index dba3591..2ae5c97 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java
@@ -68,10 +68,8 @@
// the audio amplifier is unknown.
tv().setAudioStatus(false, Constants.UNKNOWN_VOLUME);
- int uiCommand = tv().isSystemAudioActivated()
- ? HdmiCecKeycode.CEC_KEYCODE_RESTORE_VOLUME_FUNCTION // SystemAudioMode: ON
- : HdmiCecKeycode.CEC_KEYCODE_MUTE_FUNCTION; // SystemAudioMode: OFF
- sendUserControlPressedAndReleased(mAvrAddress, uiCommand);
+ sendUserControlPressedAndReleased(mAvrAddress,
+ HdmiCecKeycode.getMuteKey(!tv().isSystemAudioActivated()));
// Still return SUCCESS to callback.
finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 81ae8ac..ae8fca8 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -16,6 +16,7 @@
package com.android.server.input;
+import android.annotation.Nullable;
import android.view.Display;
import com.android.internal.os.SomeArgs;
import com.android.internal.R;
@@ -83,6 +84,9 @@
import android.view.Surface;
import android.view.ViewConfiguration;
import android.view.WindowManagerPolicy;
+import android.view.inputmethod.InputMethod;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodSubtype;
import android.widget.Toast;
import java.io.File;
@@ -116,6 +120,7 @@
private static final int MSG_UPDATE_KEYBOARD_LAYOUTS = 4;
private static final int MSG_RELOAD_DEVICE_ALIASES = 5;
private static final int MSG_DELIVER_TABLET_MODE_CHANGED = 6;
+ private static final int MSG_INPUT_METHOD_SUBTYPE_CHANGED = 7;
// Pointer to native input manager service object.
private final long mPtr;
@@ -1206,6 +1211,15 @@
}
}
+ // Must be called on handler.
+ private void handleSwitchInputMethodSubtype(int userId,
+ @Nullable InputMethodInfo inputMethodInfo, @Nullable InputMethodSubtype subtype) {
+ if (DEBUG) {
+ Slog.i(TAG, "InputMethodSubtype changed: userId=" + userId
+ + " ime=" + inputMethodInfo + " subtype=" + subtype);
+ }
+ }
+
public void switchKeyboardLayout(int deviceId, int direction) {
mHandler.obtainMessage(MSG_SWITCH_KEYBOARD_LAYOUT, deviceId, direction).sendToTarget();
}
@@ -1757,12 +1771,22 @@
case MSG_RELOAD_DEVICE_ALIASES:
reloadDeviceAliases();
break;
- case MSG_DELIVER_TABLET_MODE_CHANGED:
+ case MSG_DELIVER_TABLET_MODE_CHANGED: {
SomeArgs args = (SomeArgs) msg.obj;
long whenNanos = (args.argi1 & 0xFFFFFFFFl) | ((long) args.argi2 << 32);
boolean inTabletMode = (boolean) args.arg1;
deliverTabletModeChanged(whenNanos, inTabletMode);
break;
+ }
+ case MSG_INPUT_METHOD_SUBTYPE_CHANGED: {
+ final int userId = msg.arg1;
+ final SomeArgs args = (SomeArgs) msg.obj;
+ final InputMethodInfo inputMethodInfo = (InputMethodInfo) args.arg1;
+ final InputMethodSubtype subtype = (InputMethodSubtype) args.arg2;
+ args.recycle();
+ handleSwitchInputMethodSubtype(userId, inputMethodInfo, subtype);
+ break;
+ }
}
}
}
@@ -1920,5 +1944,15 @@
public void setInteractive(boolean interactive) {
nativeSetInteractive(mPtr, interactive);
}
+
+ @Override
+ public void onInputMethodSubtypeChanged(int userId,
+ @Nullable InputMethodInfo inputMethodInfo, @Nullable InputMethodSubtype subtype) {
+ final SomeArgs someArgs = SomeArgs.obtain();
+ someArgs.arg1 = inputMethodInfo;
+ someArgs.arg2 = subtype;
+ mHandler.obtainMessage(MSG_INPUT_METHOD_SUBTYPE_CHANGED, userId, 0, someArgs)
+ .sendToTarget();
+ }
}
}
diff --git a/services/core/java/com/android/server/input/InputWindowHandle.java b/services/core/java/com/android/server/input/InputWindowHandle.java
index 207c05d..eb3581a 100644
--- a/services/core/java/com/android/server/input/InputWindowHandle.java
+++ b/services/core/java/com/android/server/input/InputWindowHandle.java
@@ -106,6 +106,7 @@
.append(", frame=[").append(frameLeft).append(",").append(frameTop).append(",")
.append(frameRight).append(",").append(frameBottom).append("]")
.append(", touchableRegion=").append(touchableRegion)
+ .append(", visible=").append(visible)
.toString();
}
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index 2b535b9..4d7df9c 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -23,7 +23,9 @@
import java.util.List;
import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
import android.app.AppGlobals;
+import android.app.IUidObserver;
import android.app.job.JobInfo;
import android.app.job.JobScheduler;
import android.app.job.JobService;
@@ -51,6 +53,8 @@
import android.util.SparseArray;
import com.android.internal.app.IBatteryStats;
+import com.android.server.DeviceIdleController;
+import com.android.server.LocalServices;
import com.android.server.job.controllers.AppIdleController;
import com.android.server.job.controllers.BatteryController;
import com.android.server.job.controllers.ConnectivityController;
@@ -83,6 +87,7 @@
static final int MSG_JOB_EXPIRED = 0;
static final int MSG_CHECK_JOB = 1;
+ static final int MSG_STOP_JOB = 2;
// Policy constants
/**
@@ -127,6 +132,7 @@
IBatteryStats mBatteryStats;
PowerManager mPowerManager;
+ DeviceIdleController.LocalService mLocalDeviceIdleController;
/**
* Set to true once we are allowed to run third party apps.
@@ -139,6 +145,11 @@
boolean mDeviceIdleMode;
/**
+ * What we last reported to DeviceIdleController about wheter we are active.
+ */
+ boolean mReportedActive;
+
+ /**
* Cleans up outstanding jobs when a package is removed. Even if it's being replaced later we
* still clean up. On reinstall the package will have a new uid.
*/
@@ -154,7 +165,7 @@
if (DEBUG) {
Slog.d(TAG, "Removing jobs for uid: " + uidRemoved);
}
- cancelJobsForUid(uidRemoved);
+ cancelJobsForUid(uidRemoved, true);
}
} else if (Intent.ACTION_USER_REMOVED.equals(intent.getAction())) {
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
@@ -172,6 +183,21 @@
}
};
+ final private IUidObserver mUidObserver = new IUidObserver.Stub() {
+ @Override public void onUidStateChanged(int uid, int procState) throws RemoteException {
+ }
+
+ @Override public void onUidGone(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidActive(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidIdle(int uid) throws RemoteException {
+ cancelJobsForUid(uid, false);
+ }
+ };
+
@Override
public void onStartUser(int userHandle) {
mStartedUsers.add(userHandle);
@@ -194,6 +220,15 @@
public int schedule(JobInfo job, int uId) {
JobStatus jobStatus = new JobStatus(job, uId);
cancelJob(uId, job.getId());
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(uId,
+ job.getService().getPackageName()) == ActivityManager.APP_START_MODE_DISABLED) {
+ Slog.w(TAG, "Not scheduling job " + uId + ":" + job.toString()
+ + " -- package not allowed to start");
+ return JobScheduler.RESULT_FAILURE;
+ }
+ } catch (RemoteException e) {
+ }
startTrackingJob(jobStatus);
mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
return JobScheduler.RESULT_SUCCESS;
@@ -229,14 +264,26 @@
* This will remove the job from the master list, and cancel the job if it was staged for
* execution or being executed.
* @param uid Uid to check against for removal of a job.
+ * @param forceAll If true, all jobs for the uid will be canceled; if false, only those
+ * whose apps are stopped.
*/
- public void cancelJobsForUid(int uid) {
+ public void cancelJobsForUid(int uid, boolean forceAll) {
List<JobStatus> jobsForUid;
synchronized (mJobs) {
jobsForUid = mJobs.getJobsByUid(uid);
}
for (int i=0; i<jobsForUid.size(); i++) {
JobStatus toRemove = jobsForUid.get(i);
+ if (!forceAll) {
+ String packageName = toRemove.getServiceComponent().getPackageName();
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(uid, packageName)
+ != ActivityManager.APP_START_MODE_DISABLED) {
+ continue;
+ }
+ } catch (RemoteException e) {
+ }
+ }
cancelJobImpl(toRemove);
}
}
@@ -268,6 +315,7 @@
mPendingJobs.remove(cancelled);
// Cancel if running.
stopJobOnServiceContextLocked(cancelled);
+ reportActive();
}
}
@@ -299,12 +347,39 @@
}
} else {
// When coming out of idle, allow thing to start back up.
+ if (rocking) {
+ if (mLocalDeviceIdleController != null) {
+ if (!mReportedActive) {
+ mReportedActive = true;
+ mLocalDeviceIdleController.setJobsActive(true);
+ }
+ }
+ }
mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
}
}
}
}
+ void reportActive() {
+ boolean active = false;
+ if (mPendingJobs.size() <= 0) {
+ for (int i=0; i<mActiveServices.size(); i++) {
+ JobServiceContext jsc = mActiveServices.get(i);
+ if (!jsc.isAvailable()) {
+ active = true;
+ break;
+ }
+ }
+ }
+ if (mLocalDeviceIdleController != null) {
+ if (mReportedActive != active) {
+ mReportedActive = active;
+ mLocalDeviceIdleController.setJobsActive(active);
+ }
+ }
+ }
+
/**
* Initializes the system service.
* <p>
@@ -348,12 +423,20 @@
getContext().registerReceiverAsUser(
mBroadcastReceiver, UserHandle.ALL, userFilter, null, null);
mPowerManager = (PowerManager)getContext().getSystemService(Context.POWER_SERVICE);
+ try {
+ ActivityManagerNative.getDefault().registerUidObserver(mUidObserver,
+ ActivityManager.UID_OBSERVER_IDLE);
+ } catch (RemoteException e) {
+ // ignored; both services live in system_server
+ }
} else if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {
synchronized (mJobs) {
// Let's go!
mReadyToRock = true;
mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService(
BatteryStats.SERVICE_NAME));
+ mLocalDeviceIdleController
+ = LocalServices.getService(DeviceIdleController.LocalService.class);
// Create the "runners".
for (int i = 0; i < MAX_JOB_CONTEXTS_COUNT; i++) {
mActiveServices.add(
@@ -597,6 +680,9 @@
maybeQueueReadyJobsForExecutionLockedH();
}
break;
+ case MSG_STOP_JOB:
+ cancelJobImpl((JobStatus)message.obj);
+ break;
}
maybeRunPendingJobsH();
// Don't remove JOB_EXPIRED in case one came along while processing the queue.
@@ -623,6 +709,7 @@
stopJobOnServiceContextLocked(job);
}
}
+ reportActive();
if (DEBUG) {
final int queuedJobs = mPendingJobs.size();
if (queuedJobs == 0) {
@@ -647,11 +734,22 @@
int idleCount = 0;
int backoffCount = 0;
int connectivityCount = 0;
- List<JobStatus> runnableJobs = new ArrayList<JobStatus>();
+ List<JobStatus> runnableJobs = null;
ArraySet<JobStatus> jobs = mJobs.getJobs();
for (int i=0; i<jobs.size(); i++) {
JobStatus job = jobs.valueAt(i);
if (isReadyToBeExecutedLocked(job)) {
+ try {
+ if (ActivityManagerNative.getDefault().getAppStartMode(job.getUid(),
+ job.getJob().getService().getPackageName())
+ == ActivityManager.APP_START_MODE_DISABLED) {
+ Slog.w(TAG, "Aborting job " + job.getUid() + ":"
+ + job.getJob().toString() + " -- package not allowed to start");
+ mHandler.obtainMessage(MSG_STOP_JOB, job).sendToTarget();
+ continue;
+ }
+ } catch (RemoteException e) {
+ }
if (job.getNumFailures() > 0) {
backoffCount++;
}
@@ -664,6 +762,9 @@
if (job.hasChargingConstraint()) {
chargingCount++;
}
+ if (runnableJobs == null) {
+ runnableJobs = new ArrayList<>();
+ }
runnableJobs.add(job);
} else if (isReadyToBeCancelledLocked(job)) {
stopJobOnServiceContextLocked(job);
@@ -673,7 +774,7 @@
idleCount >= MIN_IDLE_COUNT ||
connectivityCount >= MIN_CONNECTIVITY_COUNT ||
chargingCount >= MIN_CHARGING_COUNT ||
- runnableJobs.size() >= MIN_READY_JOBS_COUNT) {
+ (runnableJobs != null && runnableJobs.size() >= MIN_READY_JOBS_COUNT)) {
if (DEBUG) {
Slog.d(TAG, "maybeQueueReadyJobsForExecutionLockedH: Running jobs.");
}
@@ -685,6 +786,7 @@
Slog.d(TAG, "maybeQueueReadyJobsForExecutionLockedH: Not running anything.");
}
}
+ reportActive();
if (DEBUG) {
Slog.d(TAG, "idle=" + idleCount + " connectivity=" +
connectivityCount + " charging=" + chargingCount + " tot=" +
@@ -766,6 +868,7 @@
it.remove();
}
}
+ reportActive();
}
}
}
@@ -867,7 +970,7 @@
long ident = Binder.clearCallingIdentity();
try {
- JobSchedulerService.this.cancelJobsForUid(uid);
+ JobSchedulerService.this.cancelJobsForUid(uid, true);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -948,6 +1051,7 @@
pw.println();
pw.print("mReadyToRock="); pw.println(mReadyToRock);
pw.print("mDeviceIdleMode="); pw.println(mDeviceIdleMode);
+ pw.print("mReportedActive="); pw.println(mReportedActive);
}
pw.println();
}
diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index f92f631..246da2e 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -63,7 +63,7 @@
*/
public class MediaSessionRecord implements IBinder.DeathRecipient {
private static final String TAG = "MediaSessionRecord";
- private static final boolean DEBUG = false;
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
/**
* The length of time a session will still be considered active after
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 7028fa6..d5c3113 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -287,6 +287,9 @@
* 6. We need to tell the session to do any final cleanup (onDestroy)
*/
private void destroySessionLocked(MediaSessionRecord session) {
+ if (DEBUG) {
+ Log.d(TAG, "Destroying session : " + session.toString());
+ }
int userId = session.getUserId();
UserRecord user = mUserRecords.get(userId);
if (user != null) {
@@ -948,8 +951,8 @@
// Launch the last PendingIntent we had with priority
int userId = ActivityManager.getCurrentUser();
UserRecord user = mUserRecords.get(userId);
- if (user.mLastMediaButtonReceiver != null
- || user.mRestoredMediaButtonReceiver != null) {
+ if (user != null && (user.mLastMediaButtonReceiver != null
+ || user.mRestoredMediaButtonReceiver != null)) {
if (DEBUG) {
Log.d(TAG, "Sending media key to last known PendingIntent "
+ user.mLastMediaButtonReceiver + " or restored Intent "
diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java
index 611718e..61c320b 100644
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -16,13 +16,17 @@
package com.android.server.media;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
import android.media.session.MediaController.PlaybackInfo;
import android.media.session.PlaybackState;
import android.media.session.MediaSession;
+import android.os.RemoteException;
import android.os.UserHandle;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.List;
/**
* Keeps track of media sessions and their priority for notifications, media
@@ -61,6 +65,36 @@
private ArrayList<MediaSessionRecord> mCachedTransportControlList;
/**
+ * Checks if a media session is created from the most recent app.
+ *
+ * @param record A media session record to be examined.
+ * @return true if the media session's package name equals to the most recent app, false
+ * otherwise.
+ */
+ private static boolean isFromMostRecentApp(MediaSessionRecord record) {
+ if (ActivityManager.getCurrentUser() != record.getUserId()) {
+ return false;
+ }
+ try {
+ List<ActivityManager.RecentTaskInfo> tasks =
+ ActivityManagerNative.getDefault().getRecentTasks(1,
+ ActivityManager.RECENT_IGNORE_HOME_STACK_TASKS |
+ ActivityManager.RECENT_IGNORE_UNAVAILABLE |
+ ActivityManager.RECENT_INCLUDE_PROFILES |
+ ActivityManager.RECENT_WITH_EXCLUDED, record.getUserId());
+ if (tasks != null && !tasks.isEmpty()) {
+ ActivityManager.RecentTaskInfo recentTask = tasks.get(0);
+ if (recentTask.baseIntent != null)
+ return recentTask.baseIntent.getComponent().getPackageName()
+ .equals(record.getPackageName());
+ }
+ } catch (RemoteException e) {
+ return false;
+ }
+ return false;
+ }
+
+ /**
* Add a record to the priority tracker.
*
* @param record The record to add.
@@ -68,7 +102,9 @@
public void addSession(MediaSessionRecord record) {
mSessions.add(record);
clearCache();
- mLastInterestingRecord = record;
+ if (isFromMostRecentApp(record)) {
+ mLastInterestingRecord = record;
+ }
}
/**
diff --git a/services/core/java/com/android/server/net/LockdownVpnTracker.java b/services/core/java/com/android/server/net/LockdownVpnTracker.java
index 9db6a06..5b1cedc 100644
--- a/services/core/java/com/android/server/net/LockdownVpnTracker.java
+++ b/services/core/java/com/android/server/net/LockdownVpnTracker.java
@@ -239,9 +239,7 @@
throw new RuntimeException("Problem setting firewall rules", e);
}
- synchronized (mStateLock) {
- handleStateChangedLocked();
- }
+ handleStateChangedLocked();
}
public void shutdown() {
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 41aea04..2ac0ba6 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -459,7 +459,8 @@
updateScreenOn();
try {
- mActivityManager.registerUidObserver(mUidObserver);
+ mActivityManager.registerUidObserver(mUidObserver,
+ ActivityManager.UID_OBSERVER_PROCSTATE|ActivityManager.UID_OBSERVER_GONE);
mNetworkManager.registerObserver(mAlertObserver);
} catch (RemoteException e) {
// ignored; both services live in system_server
@@ -541,6 +542,12 @@
removeUidStateLocked(uid);
}
}
+
+ @Override public void onUidActive(int uid) throws RemoteException {
+ }
+
+ @Override public void onUidIdle(int uid) throws RemoteException {
+ }
};
final private BroadcastReceiver mPowerSaveWhitelistReceiver = new BroadcastReceiver() {
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index b84811f..e0b7370 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -17,6 +17,8 @@
package com.android.server.notification;
import static android.service.notification.NotificationListenerService.HINT_HOST_DISABLE_EFFECTS;
+import static android.service.notification.NotificationListenerService.SUPPRESSED_EFFECT_LIGHTS;
+import static android.service.notification.NotificationListenerService.SUPPRESSED_EFFECT_PEEK;
import static android.service.notification.NotificationListenerService.TRIM_FULL;
import static android.service.notification.NotificationListenerService.TRIM_LIGHT;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
@@ -78,7 +80,6 @@
import android.os.Vibrator;
import android.provider.Settings;
import android.service.notification.Condition;
-import android.service.notification.IConditionListener;
import android.service.notification.IConditionProvider;
import android.service.notification.INotificationListener;
import android.service.notification.IStatusBarNotificationHolder;
@@ -1210,42 +1211,36 @@
}
@Override
- public void setPackagePriority(String pkg, int uid, int priority) {
+ public ParceledListSlice<Notification.Topic> getTopics(String pkg, int uid) {
checkCallerIsSystem();
- mRankingHelper.setPackagePriority(pkg, uid, priority);
+ return new ParceledListSlice<Notification.Topic>(mRankingHelper.getTopics(pkg, uid));
+ }
+
+ @Override
+ public void setTopicPriority(String pkg, int uid, Notification.Topic topic, int priority) {
+ checkCallerIsSystem();
+ mRankingHelper.setTopicPriority(pkg, uid, topic, priority);
savePolicyFile();
}
@Override
- public int getPackagePriority(String pkg, int uid) {
+ public int getTopicPriority(String pkg, int uid, Notification.Topic topic) {
checkCallerIsSystem();
- return mRankingHelper.getPackagePriority(pkg, uid);
+ return mRankingHelper.getTopicPriority(pkg, uid, topic);
}
@Override
- public void setPackagePeekable(String pkg, int uid, boolean peekable) {
+ public void setTopicVisibilityOverride(String pkg, int uid, Notification.Topic topic,
+ int visibility) {
checkCallerIsSystem();
-
- mRankingHelper.setPackagePeekable(pkg, uid, peekable);
- }
-
- @Override
- public boolean getPackagePeekable(String pkg, int uid) {
- checkCallerIsSystem();
- return mRankingHelper.getPackagePeekable(pkg, uid);
- }
-
- @Override
- public void setPackageVisibilityOverride(String pkg, int uid, int visibility) {
- checkCallerIsSystem();
- mRankingHelper.setPackageVisibilityOverride(pkg, uid, visibility);
+ mRankingHelper.setTopicVisibilityOverride(pkg, uid, topic, visibility);
savePolicyFile();
}
@Override
- public int getPackageVisibilityOverride(String pkg, int uid) {
+ public int getTopicVisibilityOverride(String pkg, int uid, Notification.Topic topic) {
checkCallerIsSystem();
- return mRankingHelper.getPackageVisibilityOverride(pkg, uid);
+ return mRankingHelper.getTopicVisibilityOverride(pkg, uid, topic);
}
/**
@@ -1291,10 +1286,11 @@
Binder.getCallingUid(), incomingUserId, true, false,
"getAppActiveNotifications", pkg);
- final int N = mNotificationList.size();
- final ArrayList<StatusBarNotification> list = new ArrayList<StatusBarNotification>(N);
+ final ArrayList<StatusBarNotification> list
+ = new ArrayList<StatusBarNotification>(mNotificationList.size());
synchronized (mNotificationList) {
+ final int N = mNotificationList.size();
for (int i = 0; i < N; i++) {
final StatusBarNotification sbn = mNotificationList.get(i).sbn;
if (sbn.getPackageName().equals(pkg) && sbn.getUserId() == userId) {
@@ -1638,6 +1634,14 @@
}
@Override
+ public boolean removeAutomaticZenRules(String packageName) throws RemoteException {
+ Preconditions.checkNotNull(packageName, "Package name is null");
+ enforceSystemOrSystemUI("removeAutomaticZenRules");
+
+ return mZenModeHelper.removeAutomaticZenRules(packageName, "removeAutomaticZenRules");
+ }
+
+ @Override
public void setInterruptionFilter(String pkg, int filter) throws RemoteException {
enforcePolicyAccess(pkg, "setInterruptionFilter");
final int zen = NotificationManager.zenModeFromInterruptionFilter(filter, -1);
@@ -2156,14 +2160,6 @@
notification.priority = Notification.PRIORITY_HIGH;
}
}
- // force no heads up per package config
- if (!mRankingHelper.getPackagePeekable(pkg, callingUid)) {
- if (notification.extras == null) {
- notification.extras = new Bundle();
- }
- notification.extras.putInt(Notification.EXTRA_AS_HEADS_UP,
- Notification.HEADS_UP_NEVER);
- }
// 1. initial score: buckets of 10, around the app [-20..20]
final int score = notification.priority * NOTIFICATION_PRIORITY_MULTIPLIER;
@@ -2511,7 +2507,9 @@
// light
// release the light
boolean wasShowLights = mLights.remove(record.getKey());
- if ((notification.flags & Notification.FLAG_SHOW_LIGHTS) != 0 && aboveThreshold) {
+ if ((notification.flags & Notification.FLAG_SHOW_LIGHTS) != 0 && aboveThreshold
+ && ((record.getSuppressedVisualEffects()
+ & NotificationListenerService.SUPPRESSED_EFFECT_LIGHTS) == 0)) {
mLights.add(record.getKey());
updateLightsLocked();
if (mUseAttentionLight) {
@@ -2701,6 +2699,11 @@
// let zen mode evaluate this record
private void applyZenModeLocked(NotificationRecord record) {
record.setIntercepted(mZenModeHelper.shouldIntercept(record));
+ if (record.isIntercepted()) {
+ int suppressed = (mZenModeHelper.shouldSuppressLight() ? SUPPRESSED_EFFECT_LIGHTS : 0)
+ | (mZenModeHelper.shouldSuppressPeek() ? SUPPRESSED_EFFECT_PEEK : 0);
+ record.setSuppressedVisualEffects(suppressed);
+ }
}
// lock on mNotificationList
@@ -3234,6 +3237,7 @@
ArrayList<String> keys = new ArrayList<String>(N);
ArrayList<String> interceptedKeys = new ArrayList<String>(N);
Bundle visibilityOverrides = new Bundle();
+ Bundle suppressedVisualEffects = new Bundle();
for (int i = 0; i < N; i++) {
NotificationRecord record = mNotificationList.get(i);
if (!isVisibleToListener(record.sbn, info)) {
@@ -3242,7 +3246,10 @@
keys.add(record.sbn.getKey());
if (record.isIntercepted()) {
interceptedKeys.add(record.sbn.getKey());
+
}
+ suppressedVisualEffects.putInt(
+ record.sbn.getKey(), record.getSuppressedVisualEffects());
if (record.getPackageVisibilityOverride()
!= NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE) {
visibilityOverrides.putInt(record.sbn.getKey(),
@@ -3264,7 +3271,7 @@
String[] keysAr = keys.toArray(new String[keys.size()]);
String[] interceptedKeysAr = interceptedKeys.toArray(new String[interceptedKeys.size()]);
return new NotificationRankingUpdate(keysAr, interceptedKeysAr, visibilityOverrides,
- speedBumpIndex);
+ speedBumpIndex, suppressedVisualEffects);
}
private boolean isVisibleToListener(StatusBarNotification sbn, ManagedServiceInfo listener) {
diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java
index f37702c..2a7568d 100644
--- a/services/core/java/com/android/server/notification/NotificationRecord.java
+++ b/services/core/java/com/android/server/notification/NotificationRecord.java
@@ -83,6 +83,8 @@
private String mGlobalSortKey;
private int mPackageVisibility;
+ private int mSuppressedVisualEffects = 0;
+
@VisibleForTesting
public NotificationRecord(StatusBarNotification sbn, int score)
{
@@ -199,6 +201,7 @@
pw.println(prefix + " mCreationTimeMs=" + mCreationTimeMs);
pw.println(prefix + " mVisibleSinceMs=" + mVisibleSinceMs);
pw.println(prefix + " mUpdateTimeMs=" + mUpdateTimeMs);
+ pw.println(prefix + " mSuppressedVisualEffects= " + mSuppressedVisualEffects);
}
@@ -274,6 +277,14 @@
return mIntercept;
}
+ public void setSuppressedVisualEffects(int effects) {
+ mSuppressedVisualEffects = effects;
+ }
+
+ public int getSuppressedVisualEffects() {
+ return mSuppressedVisualEffects;
+ }
+
public boolean isCategory(String category) {
return Objects.equals(getNotification().category, category);
}
diff --git a/services/core/java/com/android/server/notification/RankingConfig.java b/services/core/java/com/android/server/notification/RankingConfig.java
index 803db10..7ee29e4 100644
--- a/services/core/java/com/android/server/notification/RankingConfig.java
+++ b/services/core/java/com/android/server/notification/RankingConfig.java
@@ -15,16 +15,20 @@
*/
package com.android.server.notification;
+import android.app.Notification;
+
+import java.util.List;
+
public interface RankingConfig {
- int getPackagePriority(String packageName, int uid);
- void setPackagePriority(String packageName, int uid, int priority);
+ List<Notification.Topic> getTopics(String packageName, int uid);
- boolean getPackagePeekable(String packageName, int uid);
+ int getTopicPriority(String packageName, int uid, Notification.Topic topic);
- void setPackagePeekable(String packageName, int uid, boolean peekable);
+ void setTopicPriority(String packageName, int uid, Notification.Topic topic, int priority);
- int getPackageVisibilityOverride(String packageName, int uid);
+ int getTopicVisibilityOverride(String packageName, int uid, Notification.Topic topic);
- void setPackageVisibilityOverride(String packageName, int uid, int visibility);
+ void setTopicVisibilityOverride(String packageName, int uid, Notification.Topic topic,
+ int visibility);
}
diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java
index 66381f5..543cd89 100644
--- a/services/core/java/com/android/server/notification/RankingHelper.java
+++ b/services/core/java/com/android/server/notification/RankingHelper.java
@@ -27,6 +27,8 @@
import android.util.ArrayMap;
import android.util.Slog;
+import com.android.internal.R;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
@@ -35,6 +37,8 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
public class RankingHelper implements RankingConfig {
@@ -45,15 +49,16 @@
private static final String TAG_RANKING = "ranking";
private static final String TAG_PACKAGE = "package";
private static final String ATT_VERSION = "version";
+ private static final String TAG_TOPIC = "topic";
private static final String ATT_NAME = "name";
private static final String ATT_UID = "uid";
private static final String ATT_PRIORITY = "priority";
- private static final String ATT_PEEKABLE = "peekable";
private static final String ATT_VISIBILITY = "visibility";
+ private static final String ATT_TOPIC_ID = "id";
+ private static final String ATT_TOPIC_LABEL = "label";
private static final int DEFAULT_PRIORITY = Notification.PRIORITY_DEFAULT;
- private static final boolean DEFAULT_PEEKABLE = true;
private static final int DEFAULT_VISIBILITY =
NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE;
@@ -141,7 +146,6 @@
if (TAG_PACKAGE.equals(tag)) {
int uid = safeInt(parser, ATT_UID, Record.UNKNOWN_UID);
int priority = safeInt(parser, ATT_PRIORITY, DEFAULT_PRIORITY);
- boolean peekable = safeBool(parser, ATT_PEEKABLE, DEFAULT_PEEKABLE);
int vis = safeInt(parser, ATT_VISIBILITY, DEFAULT_VISIBILITY);
String name = parser.getAttributeValue(null, ATT_NAME);
@@ -164,15 +168,14 @@
} else {
r = getOrCreateRecord(name, uid);
}
- if (priority != DEFAULT_PRIORITY) {
- r.priority = priority;
- }
- if (peekable != DEFAULT_PEEKABLE) {
- r.peekable = peekable;
- }
- if (vis != DEFAULT_VISIBILITY) {
- r.visibility = vis;
- }
+
+ // Migrate package level settings to the default topic.
+ // Might be overwritten by parseTopics.
+ Topic defaultTopic = r.topics.get(Notification.TOPIC_DEFAULT);
+ defaultTopic.priority = priority;
+ defaultTopic.visibility = vis;
+
+ parseTopics(r, parser);
}
}
}
@@ -180,6 +183,38 @@
throw new IllegalStateException("Failed to reach END_DOCUMENT");
}
+ public void parseTopics(Record r, XmlPullParser parser)
+ throws XmlPullParserException, IOException {
+ final int innerDepth = parser.getDepth();
+ int type;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && (type != XmlPullParser.END_TAG || parser.getDepth() > innerDepth)) {
+ if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
+ continue;
+ }
+
+ String tagName = parser.getName();
+ if (TAG_TOPIC.equals(tagName)) {
+ int priority = safeInt(parser, ATT_PRIORITY, DEFAULT_PRIORITY);
+ int vis = safeInt(parser, ATT_VISIBILITY, DEFAULT_VISIBILITY);
+ String id = parser.getAttributeValue(null, ATT_TOPIC_ID);
+ CharSequence label = parser.getAttributeValue(null, ATT_TOPIC_LABEL);
+
+ if (!TextUtils.isEmpty(id)) {
+ Topic topic = new Topic(new Notification.Topic(id, label));
+
+ if (priority != DEFAULT_PRIORITY) {
+ topic.priority = priority;
+ }
+ if (vis != DEFAULT_VISIBILITY) {
+ topic.visibility = vis;
+ }
+ r.topics.put(id, topic);
+ }
+ }
+ }
+ }
+
private static String recordKey(String pkg, int uid) {
return pkg + "|" + uid;
}
@@ -191,22 +226,12 @@
r = new Record();
r.pkg = pkg;
r.uid = uid;
+ r.topics.put(Notification.TOPIC_DEFAULT, new Topic(createDefaultTopic()));
mRecords.put(key, r);
}
return r;
}
- private void removeDefaultRecords() {
- final int N = mRecords.size();
- for (int i = N - 1; i >= 0; i--) {
- final Record r = mRecords.valueAt(i);
- if (r.priority == DEFAULT_PRIORITY && r.peekable == DEFAULT_PEEKABLE
- && r.visibility == DEFAULT_VISIBILITY) {
- mRecords.remove(i);
- }
- }
- }
-
public void writeXml(XmlSerializer out, boolean forBackup) throws IOException {
out.startTag(null, TAG_RANKING);
out.attribute(null, ATT_VERSION, Integer.toString(XML_VERSION));
@@ -220,23 +245,32 @@
}
out.startTag(null, TAG_PACKAGE);
out.attribute(null, ATT_NAME, r.pkg);
- if (r.priority != DEFAULT_PRIORITY) {
- out.attribute(null, ATT_PRIORITY, Integer.toString(r.priority));
- }
- if (r.peekable != DEFAULT_PEEKABLE) {
- out.attribute(null, ATT_PEEKABLE, Boolean.toString(r.peekable));
- }
- if (r.visibility != DEFAULT_VISIBILITY) {
- out.attribute(null, ATT_VISIBILITY, Integer.toString(r.visibility));
- }
+
if (!forBackup) {
out.attribute(null, ATT_UID, Integer.toString(r.uid));
}
+
+ writeTopicsXml(out, r);
out.endTag(null, TAG_PACKAGE);
}
out.endTag(null, TAG_RANKING);
}
+ public void writeTopicsXml(XmlSerializer out, Record r) throws IOException {
+ for (Topic t : r.topics.values()) {
+ out.startTag(null, TAG_TOPIC);
+ out.attribute(null, ATT_TOPIC_ID, t.topic.getId());
+ out.attribute(null, ATT_TOPIC_LABEL, t.topic.getLabel().toString());
+ if (t.priority != DEFAULT_PRIORITY) {
+ out.attribute(null, ATT_PRIORITY, Integer.toString(t.priority));
+ }
+ if (t.visibility != DEFAULT_VISIBILITY) {
+ out.attribute(null, ATT_VISIBILITY, Integer.toString(t.visibility));
+ }
+ out.endTag(null, TAG_TOPIC);
+ }
+ }
+
private void updateConfig() {
final int N = mSignalExtractors.length;
for (int i = 0; i < N; i++) {
@@ -332,51 +366,60 @@
}
@Override
- public int getPackagePriority(String packageName, int uid) {
- final Record r = mRecords.get(recordKey(packageName, uid));
- return r != null ? r.priority : DEFAULT_PRIORITY;
+ public List<Notification.Topic> getTopics(String packageName, int uid) {
+ final Record r = getOrCreateRecord(packageName, uid);
+ List<Notification.Topic> topics = new ArrayList<>();
+ for (Topic t : r.topics.values()) {
+ topics.add(t.topic);
+ }
+ return topics;
}
@Override
- public void setPackagePriority(String packageName, int uid, int priority) {
- if (priority == getPackagePriority(packageName, uid)) {
- return;
- }
- getOrCreateRecord(packageName, uid).priority = priority;
- removeDefaultRecords();
+ public int getTopicPriority(String packageName, int uid, Notification.Topic topic) {
+ final Record r = getOrCreateRecord(packageName, uid);
+ return getOrCreateTopic(r, topic).priority;
+ }
+
+ @Override
+ public void setTopicPriority(String packageName, int uid, Notification.Topic topic,
+ int priority) {
+ final Record r = getOrCreateRecord(packageName, uid);
+ getOrCreateTopic(r, topic).priority = priority;
updateConfig();
}
@Override
- public boolean getPackagePeekable(String packageName, int uid) {
- final Record r = mRecords.get(recordKey(packageName, uid));
- return r != null ? r.peekable : DEFAULT_PEEKABLE;
+ public int getTopicVisibilityOverride(String packageName, int uid, Notification.Topic topic) {
+ final Record r = getOrCreateRecord(packageName, uid);
+ return getOrCreateTopic(r, topic).visibility;
}
@Override
- public void setPackagePeekable(String packageName, int uid, boolean peekable) {
- if (peekable == getPackagePeekable(packageName, uid)) {
- return;
- }
- getOrCreateRecord(packageName, uid).peekable = peekable;
- removeDefaultRecords();
+ public void setTopicVisibilityOverride(String pkgName, int uid, Notification.Topic topic,
+ int visibility) {
+ final Record r = getOrCreateRecord(pkgName, uid);
+ getOrCreateTopic(r, topic).visibility = visibility;
updateConfig();
}
- @Override
- public int getPackageVisibilityOverride(String packageName, int uid) {
- final Record r = mRecords.get(recordKey(packageName, uid));
- return r != null ? r.visibility : DEFAULT_VISIBILITY;
+ private Topic getOrCreateTopic(Record r, Notification.Topic topic) {
+ if (topic == null) {
+ topic = createDefaultTopic();
+ }
+ Topic t = r.topics.get(topic.getId());
+ if (t != null) {
+ return t;
+ } else {
+ t = new Topic(topic);
+ r.topics.put(topic.getId(), t);
+ return t;
+ }
}
- @Override
- public void setPackageVisibilityOverride(String packageName, int uid, int visibility) {
- if (visibility == getPackageVisibilityOverride(packageName, uid)) {
- return;
- }
- getOrCreateRecord(packageName, uid).visibility = visibility;
- removeDefaultRecords();
- updateConfig();
+ private Notification.Topic createDefaultTopic() {
+ return new Notification.Topic(Notification.TOPIC_DEFAULT,
+ mContext.getString(R.string.default_notification_topic_label));
}
public void dump(PrintWriter pw, String prefix, NotificationManagerService.DumpFilter filter) {
@@ -411,19 +454,22 @@
pw.print(" (");
pw.print(r.uid == Record.UNKNOWN_UID ? "UNKNOWN_UID" : Integer.toString(r.uid));
pw.print(')');
- if (r.priority != DEFAULT_PRIORITY) {
- pw.print(" priority=");
- pw.print(Notification.priorityToString(r.priority));
- }
- if (r.peekable != DEFAULT_PEEKABLE) {
- pw.print(" peekable=");
- pw.print(r.peekable);
- }
- if (r.visibility != DEFAULT_VISIBILITY) {
- pw.print(" visibility=");
- pw.print(Notification.visibilityToString(r.visibility));
- }
pw.println();
+ for (Topic t : r.topics.values()) {
+ pw.print(prefix);
+ pw.print(" ");
+ pw.print(" ");
+ pw.print(t.topic.getId());
+ if (t.priority != DEFAULT_PRIORITY) {
+ pw.print(" priority=");
+ pw.print(Notification.priorityToString(t.priority));
+ }
+ if (t.visibility != DEFAULT_VISIBILITY) {
+ pw.print(" visibility=");
+ pw.print(Notification.visibilityToString(t.visibility));
+ }
+ pw.println();
+ }
}
}
}
@@ -459,9 +505,16 @@
String pkg;
int uid = UNKNOWN_UID;
- int priority = DEFAULT_PRIORITY;
- boolean peekable = DEFAULT_PEEKABLE;
- int visibility = DEFAULT_VISIBILITY;
- }
+ Map<String, Topic> topics = new ArrayMap<>();
+ }
+ private static class Topic {
+ Notification.Topic topic;
+ int priority = DEFAULT_PRIORITY;
+ int visibility = DEFAULT_VISIBILITY;
+
+ public Topic(Notification.Topic topic) {
+ this.topic = topic;
+ }
+ }
}
diff --git a/services/core/java/com/android/server/notification/PackagePriorityExtractor.java b/services/core/java/com/android/server/notification/TopicPriorityExtractor.java
similarity index 79%
rename from services/core/java/com/android/server/notification/PackagePriorityExtractor.java
rename to services/core/java/com/android/server/notification/TopicPriorityExtractor.java
index 6beed9c..5bf989ae 100644
--- a/services/core/java/com/android/server/notification/PackagePriorityExtractor.java
+++ b/services/core/java/com/android/server/notification/TopicPriorityExtractor.java
@@ -18,8 +18,11 @@
import android.content.Context;
import android.util.Slog;
-public class PackagePriorityExtractor implements NotificationSignalExtractor {
- private static final String TAG = "ImportantPackageExtractor";
+/**
+ * Determines if the given notification can bypass Do Not Disturb.
+ */
+public class TopicPriorityExtractor implements NotificationSignalExtractor {
+ private static final String TAG = "ImportantTopicExtractor";
private static final boolean DBG = false;
private RankingConfig mConfig;
@@ -39,8 +42,8 @@
return null;
}
- final int packagePriority = mConfig.getPackagePriority(
- record.sbn.getPackageName(), record.sbn.getUid());
+ final int packagePriority = mConfig.getTopicPriority(record.sbn.getPackageName(),
+ record.sbn.getUid(), record.sbn.getNotification().getTopic());
record.setPackagePriority(packagePriority);
return null;
diff --git a/services/core/java/com/android/server/notification/PackageVisibilityExtractor.java b/services/core/java/com/android/server/notification/TopicVisibilityExtractor.java
similarity index 80%
rename from services/core/java/com/android/server/notification/PackageVisibilityExtractor.java
rename to services/core/java/com/android/server/notification/TopicVisibilityExtractor.java
index af99db7..e053382 100644
--- a/services/core/java/com/android/server/notification/PackageVisibilityExtractor.java
+++ b/services/core/java/com/android/server/notification/TopicVisibilityExtractor.java
@@ -18,8 +18,11 @@
import android.content.Context;
import android.util.Slog;
-public class PackageVisibilityExtractor implements NotificationSignalExtractor {
- private static final String TAG = "PackageVisibilityExtractor";
+/**
+ * Determines if the given notification can display sensitive content on the lockscreen.
+ */
+public class TopicVisibilityExtractor implements NotificationSignalExtractor {
+ private static final String TAG = "TopicVisibilityExtractor";
private static final boolean DBG = false;
private RankingConfig mConfig;
@@ -39,8 +42,9 @@
return null;
}
- final int packageVisibility = mConfig.getPackageVisibilityOverride(
- record.sbn.getPackageName(), record.sbn.getUid());
+ final int packageVisibility = mConfig.getTopicVisibilityOverride(
+ record.sbn.getPackageName(), record.sbn.getUid(),
+ record.sbn.getNotification().getTopic());
record.setPackageVisibilityOverride(packageVisibility);
return null;
diff --git a/services/core/java/com/android/server/notification/ValidateNotificationPeople.java b/services/core/java/com/android/server/notification/ValidateNotificationPeople.java
index 0420269..c9e1315 100644
--- a/services/core/java/com/android/server/notification/ValidateNotificationPeople.java
+++ b/services/core/java/com/android/server/notification/ValidateNotificationPeople.java
@@ -41,6 +41,9 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import android.os.SystemClock;
+import com.android.internal.logging.MetricsLogger;
+
/**
* This {@link NotificationSignalExtractor} attempts to validate
* people references. Also elevates the priority of real people.
@@ -218,6 +221,7 @@
private PeopleRankingReconsideration validatePeople(Context context, String key, Bundle extras,
float[] affinityOut) {
+ long start = SystemClock.elapsedRealtime();
float affinity = NONE;
if (extras == null) {
return null;
@@ -251,6 +255,9 @@
// record the best available data, so far:
affinityOut[0] = affinity;
+ MetricsLogger.histogram(mBaseContext, "validate_people_cache_latency",
+ (int) (SystemClock.elapsedRealtime() - start));
+
if (pendingLookups.isEmpty()) {
if (VERBOSE) Slog.i(TAG, "final affinity: " + affinity);
return null;
@@ -430,6 +437,7 @@
@Override
public void work() {
+ long start = SystemClock.elapsedRealtime();
if (VERBOSE) Slog.i(TAG, "Executing: validation for: " + mKey);
long timeStartMs = System.currentTimeMillis();
for (final String handle: mPendingLookups) {
@@ -468,6 +476,9 @@
mUsageStats.registerPeopleAffinity(mRecord, mContactAffinity > NONE,
mContactAffinity == STARRED_CONTACT, false /* cached */);
}
+
+ MetricsLogger.histogram(mBaseContext, "validate_people_lookup_latency",
+ (int) (SystemClock.elapsedRealtime() - start));
}
@Override
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index a1f8c41..3c891df 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -41,6 +41,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.os.Process;
import android.os.SystemClock;
import android.os.UserHandle;
import android.provider.Settings.Global;
@@ -138,6 +139,18 @@
}
}
+ public boolean shouldSuppressLight() {
+ synchronized (mConfig) {
+ return !mConfig.allowLights;
+ }
+ }
+
+ public boolean shouldSuppressPeek() {
+ synchronized (mConfig) {
+ return !mConfig.allowPeek;
+ }
+ }
+
public void addCallback(Callback callback) {
mCallbacks.add(callback);
}
@@ -262,7 +275,7 @@
newConfig = mConfig.copy();
}
final String ruleId = automaticZenRule.getId();
- ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
+ ZenModeConfig.ZenRule rule;
if (ruleId == null) {
throw new IllegalArgumentException("Rule doesn't exist");
} else {
@@ -295,13 +308,32 @@
return setConfig(newConfig, reason, true);
}
+ public boolean removeAutomaticZenRules(String packageName, String reason) {
+ ZenModeConfig newConfig;
+ synchronized (mConfig) {
+ if (mConfig == null) return false;
+ newConfig = mConfig.copy();
+ }
+ for (int i = newConfig.automaticRules.size() - 1; i >= 0; i--) {
+ ZenRule rule = newConfig.automaticRules.get(newConfig.automaticRules.keyAt(i));
+ if (rule.component.getPackageName().equals(packageName)
+ && canManageAutomaticZenRule(rule)) {
+ newConfig.automaticRules.removeAt(i);
+ }
+ }
+ return setConfig(newConfig, reason, true);
+ }
+
public boolean canManageAutomaticZenRule(ZenRule rule) {
- if (mContext.checkCallingPermission(android.Manifest.permission.MANAGE_NOTIFICATIONS)
+ final int callingUid = Binder.getCallingUid();
+ if (callingUid == 0 || callingUid == Process.SYSTEM_UID) {
+ return true;
+ } else if (mContext.checkCallingPermission(android.Manifest.permission.MANAGE_NOTIFICATIONS)
== PackageManager.PERMISSION_GRANTED) {
return true;
} else {
- String[] packages = mContext.getPackageManager().getPackagesForUid(
- Binder.getCallingUid());
+ String[] packages =
+ mContext.getPackageManager().getPackagesForUid(Binder.getCallingUid());
if (packages != null) {
final int packageCount = packages.length;
for (int i = 0; i < packageCount; i++) {
@@ -394,11 +426,11 @@
return;
}
pw.printf("allow(calls=%s,callsFrom=%s,repeatCallers=%s,messages=%s,messagesFrom=%s,"
- + "events=%s,reminders=%s)\n",
+ + "events=%s,reminders=%s,lights=%s,peek=%s)\n",
config.allowCalls, ZenModeConfig.sourceToString(config.allowCallsFrom),
config.allowRepeatCallers, config.allowMessages,
ZenModeConfig.sourceToString(config.allowMessagesFrom),
- config.allowEvents, config.allowReminders);
+ config.allowEvents, config.allowReminders, config.allowLights, config.allowPeek);
pw.print(prefix); pw.print(" manualRule="); pw.println(config.manualRule);
if (config.automaticRules.isEmpty()) return;
final int N = config.automaticRules.size();
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index e4dbf65..073b4f03 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -57,6 +57,8 @@
private static final String TAG = "DefaultPermGrantPolicy"; // must be <= 23 chars
private static final boolean DEBUG = false;
+ private static final int DEFAULT_FLAGS = PackageManager.GET_ENCRYPTION_UNAWARE_COMPONENTS;
+
private static final String AUDIO_MIME_TYPE = "audio/mpeg";
private static final Set<String> PHONE_PERMISSIONS = new ArraySet<>();
@@ -696,7 +698,7 @@
private PackageParser.Package getDefaultSystemHandlerActivityPackageLPr(
Intent intent, int userId) {
ResolveInfo handler = mService.resolveIntent(intent,
- intent.resolveType(mService.mContext.getContentResolver()), 0, userId);
+ intent.resolveType(mService.mContext.getContentResolver()), DEFAULT_FLAGS, userId);
if (handler == null || handler.activityInfo == null) {
return null;
}
@@ -711,7 +713,7 @@
private PackageParser.Package getDefaultSystemHandlerServicePackageLPr(
Intent intent, int userId) {
List<ResolveInfo> handlers = mService.queryIntentServices(intent,
- intent.resolveType(mService.mContext.getContentResolver()), 0, userId);
+ intent.resolveType(mService.mContext.getContentResolver()), DEFAULT_FLAGS, userId);
if (handlers == null) {
return null;
}
@@ -738,7 +740,8 @@
homeIntent.setPackage(syncAdapterPackageName);
ResolveInfo homeActivity = mService.resolveIntent(homeIntent,
- homeIntent.resolveType(mService.mContext.getContentResolver()), 0, userId);
+ homeIntent.resolveType(mService.mContext.getContentResolver()), DEFAULT_FLAGS,
+ userId);
if (homeActivity != null) {
continue;
}
@@ -754,7 +757,7 @@
private PackageParser.Package getDefaultProviderAuthorityPackageLPr(
String authority, int userId) {
- ProviderInfo provider = mService.resolveContentProvider(authority, 0, userId);
+ ProviderInfo provider = mService.resolveContentProvider(authority, DEFAULT_FLAGS, userId);
if (provider != null) {
return getSystemPackageLPr(provider.packageName);
}
@@ -871,7 +874,7 @@
return false;
}
PackageSetting sysPkg = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName);
- if (sysPkg != null) {
+ if (sysPkg != null && sysPkg.pkg != null) {
if ((sysPkg.pkg.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) == 0) {
return false;
}
diff --git a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java
new file mode 100644
index 0000000..628ad0e
--- /dev/null
+++ b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2015 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.server.pm;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.IRemoteCallback;
+import android.os.RemoteException;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.util.TimedRemoteCaller;
+
+import com.android.internal.app.EphemeralResolverService;
+import com.android.internal.app.EphemeralResolveInfo;
+import com.android.internal.app.IEphemeralResolver;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Represents a remote ephemeral resolver. It is responsible for binding to the remote
+ * service and handling all interactions in a timely manner.
+ * @hide
+ */
+final class EphemeralResolverConnection {
+ // This is running in a critical section and the timeout must be sufficiently low
+ private static final long BIND_SERVICE_TIMEOUT_MS =
+ ("eng".equals(Build.TYPE)) ? 300 : 200;
+
+ private final Object mLock = new Object();
+ private final GetEphemeralResolveInfoCaller mGetEphemeralResolveInfoCaller =
+ new GetEphemeralResolveInfoCaller();
+ private final ServiceConnection mServiceConnection = new MyServiceConnection();
+ private final Context mContext;
+ /** Intent used to bind to the service */
+ private final Intent mIntent;
+
+ private IEphemeralResolver mRemoteInstance;
+
+ public EphemeralResolverConnection(Context context, ComponentName componentName) {
+ mContext = context;
+ mIntent = new Intent().setComponent(componentName);
+ }
+
+ public final List<EphemeralResolveInfo> getEphemeralResolveInfoList(int hashPrefix) {
+ throwIfCalledOnMainThread();
+ try {
+ return mGetEphemeralResolveInfoCaller.getEphemeralResolveInfoList(
+ getRemoteInstanceLazy(), hashPrefix);
+ } catch (RemoteException re) {
+ } catch (TimeoutException te) {
+ } finally {
+ synchronized (mLock) {
+ mLock.notifyAll();
+ }
+ }
+ return null;
+ }
+
+ public void dump(FileDescriptor fd, PrintWriter pw, String prefix) {
+ synchronized (mLock) {
+ pw.append(prefix).append("bound=")
+ .append((mRemoteInstance != null) ? "true" : "false").println();
+
+ pw.flush();
+
+ try {
+ getRemoteInstanceLazy().asBinder().dump(fd, new String[] { prefix });
+ } catch (TimeoutException te) {
+ /* ignore */
+ } catch (RemoteException re) {
+ /* ignore */
+ }
+ }
+ }
+
+ private IEphemeralResolver getRemoteInstanceLazy() throws TimeoutException {
+ synchronized (mLock) {
+ if (mRemoteInstance != null) {
+ return mRemoteInstance;
+ }
+ bindLocked();
+ return mRemoteInstance;
+ }
+ }
+
+ private void bindLocked() throws TimeoutException {
+ if (mRemoteInstance != null) {
+ return;
+ }
+
+ mContext.bindServiceAsUser(mIntent, mServiceConnection,
+ Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, UserHandle.SYSTEM);
+
+ final long startMillis = SystemClock.uptimeMillis();
+ while (true) {
+ if (mRemoteInstance != null) {
+ break;
+ }
+ final long elapsedMillis = SystemClock.uptimeMillis() - startMillis;
+ final long remainingMillis = BIND_SERVICE_TIMEOUT_MS - elapsedMillis;
+ if (remainingMillis <= 0) {
+ throw new TimeoutException("Didn't bind to resolver in time.");
+ }
+ try {
+ mLock.wait(remainingMillis);
+ } catch (InterruptedException ie) {
+ /* ignore */
+ }
+ }
+
+ mLock.notifyAll();
+ }
+
+ private void throwIfCalledOnMainThread() {
+ if (Thread.currentThread() == mContext.getMainLooper().getThread()) {
+ throw new RuntimeException("Cannot invoke on the main thread");
+ }
+ }
+
+ private final class MyServiceConnection implements ServiceConnection {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ synchronized (mLock) {
+ mRemoteInstance = IEphemeralResolver.Stub.asInterface(service);
+ mLock.notifyAll();
+ }
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ synchronized (mLock) {
+ mRemoteInstance = null;
+ }
+ }
+ }
+
+ private static final class GetEphemeralResolveInfoCaller
+ extends TimedRemoteCaller<List<EphemeralResolveInfo>> {
+ private final IRemoteCallback mCallback;
+
+ public GetEphemeralResolveInfoCaller() {
+ super(TimedRemoteCaller.DEFAULT_CALL_TIMEOUT_MILLIS);
+ mCallback = new IRemoteCallback.Stub() {
+ @Override
+ public void sendResult(Bundle data) throws RemoteException {
+ final ArrayList<EphemeralResolveInfo> resolveList =
+ data.getParcelableArrayList(
+ EphemeralResolverService.EXTRA_RESOLVE_INFO);
+ int sequence =
+ data.getInt(EphemeralResolverService.EXTRA_SEQUENCE, -1);
+ onRemoteMethodResult(resolveList, sequence);
+ }
+ };
+ }
+
+ public List<EphemeralResolveInfo> getEphemeralResolveInfoList(
+ IEphemeralResolver target, int hashPrefix)
+ throws RemoteException, TimeoutException {
+ final int sequence = onBeforeRemoteCall();
+ target.getEphemeralResolveInfoList(mCallback, hashPrefix, sequence);
+ return getResultTimed(sequence);
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 4582828..0796811 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -26,6 +26,7 @@
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.PackageInfo;
+import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.graphics.Rect;
@@ -187,11 +188,11 @@
}
@Override
- public List<ResolveInfo> getLauncherActivities(String packageName, UserHandle user)
+ public ParceledListSlice<ResolveInfo> getLauncherActivities(String packageName, UserHandle user)
throws RemoteException {
ensureInUserProfiles(user, "Cannot retrieve activities for unrelated profile " + user);
if (!isUserEnabled(user)) {
- return new ArrayList<ResolveInfo>();
+ return null;
}
final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
@@ -201,7 +202,7 @@
try {
List<ResolveInfo> apps = mPm.queryIntentActivitiesAsUser(mainIntent, 0 /* flags */,
user.getIdentifier());
- return apps;
+ return new ParceledListSlice<>(apps);
} finally {
Binder.restoreCallingIdentity(ident);
}
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index cf09b84..5d1906c 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -866,10 +866,11 @@
mAppOps.checkPackage(callingUid, callerPackageName);
}
- // Check whether the caller is device owner
+ // Check whether the caller is device owner, in which case we do it silently.
DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
Context.DEVICE_POLICY_SERVICE);
- boolean isDeviceOwner = (dpm != null) && dpm.isDeviceOwnerApp(callerPackageName);
+ boolean isDeviceOwner = (dpm != null) && dpm.isDeviceOwnerAppOnCallingUser(
+ callerPackageName);
final PackageDeleteObserverAdapter adapter = new PackageDeleteObserverAdapter(mContext,
statusReceiver, packageName, isDeviceOwner, userId);
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index b0e43a5..fa0aa37 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -228,7 +228,8 @@
final boolean isInstallerRoot = (installerUid == Process.ROOT_UID);
final boolean forcePermissionPrompt =
(params.installFlags & PackageManager.INSTALL_FORCE_PERMISSION_PROMPT) != 0;
- mIsInstallerDeviceOwner = (dpm != null) && dpm.isDeviceOwnerApp(installerPackageName);
+ mIsInstallerDeviceOwner = (dpm != null) && dpm.isDeviceOwnerAppOnCallingUser(
+ installerPackageName);
if ((isPermissionGranted
|| isInstallerRoot
|| mIsInstallerDeviceOwner)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index bb805c1..0fde27f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -26,6 +26,7 @@
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;
+import static android.content.pm.PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;
import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE;
import static android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED;
import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED;
@@ -105,6 +106,7 @@
import android.content.ServiceConnection;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
+import android.content.pm.AppsQueryHelper;
import android.content.pm.FeatureInfo;
import android.content.pm.IOnPermissionsChangeListener;
import android.content.pm.IPackageDataObserver;
@@ -208,6 +210,7 @@
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.app.EphemeralResolveInfo;
import com.android.internal.app.IMediaContainerService;
import com.android.internal.app.ResolverActivity;
import com.android.internal.content.NativeLibraryHelper;
@@ -251,6 +254,7 @@
import java.io.InputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
import java.security.cert.CertificateEncodingException;
@@ -300,6 +304,7 @@
private static final boolean DEBUG_VERIFY = false;
private static final boolean DEBUG_DEXOPT = false;
private static final boolean DEBUG_ABI_SELECTION = false;
+ private static final boolean DEBUG_EPHEMERAL = false;
static final boolean CLEAR_RUNTIME_PERMISSIONS_ON_UPGRADE = false;
@@ -396,14 +401,11 @@
/** Permission grant: grant the permission as an install permission. */
private static final int GRANT_INSTALL = 2;
- /** Permission grant: grant the permission as an install permission for a legacy app. */
- private static final int GRANT_INSTALL_LEGACY = 3;
-
/** Permission grant: grant the permission as a runtime one. */
- private static final int GRANT_RUNTIME = 4;
+ private static final int GRANT_RUNTIME = 3;
/** Permission grant: grant as runtime a permission that was granted as an install time one. */
- private static final int GRANT_UPGRADE = 5;
+ private static final int GRANT_UPGRADE = 4;
/** Canonical intent used to identify what counts as a "web browser" app */
private static final Intent sBrowserIntent;
@@ -597,12 +599,25 @@
private final ComponentName mIntentFilterVerifierComponent;
private int mIntentFilterVerificationToken = 0;
+ /** Component that knows whether or not an ephemeral application exists */
+ final ComponentName mEphemeralResolverComponent;
+ /** The service connection to the ephemeral resolver */
+ final EphemeralResolverConnection mEphemeralResolverConnection;
+
+ /** Component used to install ephemeral applications */
+ final ComponentName mEphemeralInstallerComponent;
+ final ActivityInfo mEphemeralInstallerActivity = new ActivityInfo();
+ final ResolveInfo mEphemeralInstallerInfo = new ResolveInfo();
+
final SparseArray<IntentFilterVerificationState> mIntentFilterVerificationStates
= new SparseArray<IntentFilterVerificationState>();
final DefaultPermissionGrantPolicy mDefaultPermissionPolicy =
new DefaultPermissionGrantPolicy(this);
+ // List of packages names to keep cached, even if they are uninstalled for all users
+ private List<String> mKeepUninstalledPackages;
+
private static class IFVerificationParams {
PackageParser.Package pkg;
boolean replacing;
@@ -1374,7 +1389,9 @@
// Now that we successfully installed the package, grant runtime
// permissions if requested before broadcasting the install.
if ((args.installFlags
- & PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0) {
+ & PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0
+ && res.pkg.applicationInfo.targetSdkVersion
+ >= Build.VERSION_CODES.M) {
grantRequestedRuntimePermissions(res.pkg, args.user.getIdentifier(),
args.installGrantPermissions);
}
@@ -1413,18 +1430,18 @@
}
}
sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED,
- packageName, extras, null, null, firstUsers);
+ packageName, extras, 0, null, null, firstUsers);
final boolean update = res.removedInfo.removedPackage != null;
if (update) {
extras.putBoolean(Intent.EXTRA_REPLACING, true);
}
sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED,
- packageName, extras, null, null, updateUsers);
+ packageName, extras, 0, null, null, updateUsers);
if (update) {
sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED,
- packageName, extras, null, null, updateUsers);
+ packageName, extras, 0, null, null, updateUsers);
sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED,
- null, null, packageName, null, updateUsers);
+ null, null, 0, packageName, null, updateUsers);
// treat asec-hosted packages like removable media on upgrade
if (res.pkg.isForwardLocked() || isExternal(res.pkg)) {
@@ -1810,10 +1827,48 @@
boolean factoryTest, boolean onlyCore) {
PackageManagerService m = new PackageManagerService(context, installer,
factoryTest, onlyCore);
+ m.enableSystemUserApps();
ServiceManager.addService("package", m);
return m;
}
+ private void enableSystemUserApps() {
+ if (!UserManager.isSplitSystemUser()) {
+ return;
+ }
+ // For system user, enable apps based on the following conditions:
+ // - app is whitelisted or belong to one of these groups:
+ // -- system app which has no launcher icons
+ // -- system app which has INTERACT_ACROSS_USERS permission
+ // -- system IME app
+ // - app is not in the blacklist
+ AppsQueryHelper queryHelper = new AppsQueryHelper(this);
+ Set<String> enableApps = new ArraySet<>();
+ enableApps.addAll(queryHelper.queryApps(AppsQueryHelper.GET_NON_LAUNCHABLE_APPS
+ | AppsQueryHelper.GET_APPS_WITH_INTERACT_ACROSS_USERS_PERM
+ | AppsQueryHelper.GET_IMES, /* systemAppsOnly */ true, UserHandle.SYSTEM));
+ ArraySet<String> wlApps = SystemConfig.getInstance().getSystemUserWhitelistedApps();
+ enableApps.addAll(wlApps);
+ ArraySet<String> blApps = SystemConfig.getInstance().getSystemUserBlacklistedApps();
+ enableApps.removeAll(blApps);
+
+ List<String> systemApps = queryHelper.queryApps(0, /* systemAppsOnly */ true,
+ UserHandle.SYSTEM);
+ final int systemAppsSize = systemApps.size();
+ synchronized (mPackages) {
+ for (int i = 0; i < systemAppsSize; i++) {
+ String pName = systemApps.get(i);
+ PackageSetting pkgSetting = mSettings.mPackages.get(pName);
+ // Should not happen, but we shouldn't be failing if it does
+ if (pkgSetting == null) {
+ continue;
+ }
+ boolean installed = enableApps.contains(pName);
+ pkgSetting.setInstalled(installed, UserHandle.USER_SYSTEM);
+ }
+ }
+ }
+
static String[] splitString(String str, char sep) {
int count = 1;
int i = 0;
@@ -1917,8 +1972,7 @@
mUserAppDataDir = new File(dataDir, "user");
mDrmAppPrivateInstallDir = new File(dataDir, "app-private");
- sUserManager = new UserManagerService(context, this,
- mInstallLock, mPackages);
+ sUserManager = new UserManagerService(context, this, mPackages);
// Propagate permission configuration in to package manager.
ArrayMap<String, SystemConfig.PermissionEntry> permConfig
@@ -2306,6 +2360,33 @@
mIntentFilterVerifier = new IntentVerifierProxy(mContext,
mIntentFilterVerifierComponent);
+ final ComponentName ephemeralResolverComponent = getEphemeralResolverLPr();
+ final ComponentName ephemeralInstallerComponent = getEphemeralInstallerLPr();
+ // both the installer and resolver must be present to enable ephemeral
+ if (ephemeralInstallerComponent != null && ephemeralResolverComponent != null) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.i(TAG, "Ephemeral activated; resolver: " + ephemeralResolverComponent
+ + " installer:" + ephemeralInstallerComponent);
+ }
+ mEphemeralResolverComponent = ephemeralResolverComponent;
+ mEphemeralInstallerComponent = ephemeralInstallerComponent;
+ setUpEphemeralInstallerActivityLP(mEphemeralInstallerComponent);
+ mEphemeralResolverConnection =
+ new EphemeralResolverConnection(mContext, mEphemeralResolverComponent);
+ } else {
+ if (DEBUG_EPHEMERAL) {
+ final String missingComponent =
+ (ephemeralResolverComponent == null)
+ ? (ephemeralInstallerComponent == null)
+ ? "resolver and installer"
+ : "resolver"
+ : "installer";
+ Slog.i(TAG, "Ephemeral deactivated; missing " + missingComponent);
+ }
+ mEphemeralResolverComponent = null;
+ mEphemeralInstallerComponent = null;
+ mEphemeralResolverConnection = null;
+ }
} // synchronized (mPackages)
} // synchronized (mInstallLock)
@@ -2444,6 +2525,89 @@
return verifierComponentName;
}
+ private ComponentName getEphemeralResolverLPr() {
+ final String[] packageArray =
+ mContext.getResources().getStringArray(R.array.config_ephemeralResolverPackage);
+ if (packageArray.length == 0) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.d(TAG, "Ephemeral resolver NOT found; empty package list");
+ }
+ return null;
+ }
+
+ Intent resolverIntent = new Intent(Intent.ACTION_RESOLVE_EPHEMERAL_PACKAGE);
+ final List<ResolveInfo> resolvers = queryIntentServices(resolverIntent,
+ null /*resolvedType*/, 0 /*flags*/, UserHandle.USER_SYSTEM);
+
+ final int N = resolvers.size();
+ if (N == 0) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.d(TAG, "Ephemeral resolver NOT found; no matching intent filters");
+ }
+ return null;
+ }
+
+ final Set<String> possiblePackages = new ArraySet<>(Arrays.asList(packageArray));
+ for (int i = 0; i < N; i++) {
+ final ResolveInfo info = resolvers.get(i);
+
+ if (info.serviceInfo == null) {
+ continue;
+ }
+
+ final String packageName = info.serviceInfo.packageName;
+ if (!possiblePackages.contains(packageName)) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.d(TAG, "Ephemeral resolver not in allowed package list;"
+ + " pkg: " + packageName + ", info:" + info);
+ }
+ continue;
+ }
+
+ if (DEBUG_EPHEMERAL) {
+ Slog.v(TAG, "Ephemeral resolver found;"
+ + " pkg: " + packageName + ", info:" + info);
+ }
+ return new ComponentName(packageName, info.serviceInfo.name);
+ }
+ if (DEBUG_EPHEMERAL) {
+ Slog.v(TAG, "Ephemeral resolver NOT found");
+ }
+ return null;
+ }
+
+ private ComponentName getEphemeralInstallerLPr() {
+ Intent installerIntent = new Intent(Intent.ACTION_INSTALL_EPHEMERAL_PACKAGE);
+ installerIntent.addCategory(Intent.CATEGORY_DEFAULT);
+ installerIntent.setDataAndType(Uri.fromFile(new File("foo.apk")), PACKAGE_MIME_TYPE);
+ final List<ResolveInfo> installers = queryIntentActivities(installerIntent,
+ PACKAGE_MIME_TYPE, 0 /*flags*/, 0 /*userId*/);
+
+ ComponentName ephemeralInstaller = null;
+
+ final int N = installers.size();
+ for (int i = 0; i < N; i++) {
+ final ResolveInfo info = installers.get(i);
+ final String packageName = info.activityInfo.packageName;
+
+ if (!info.activityInfo.applicationInfo.isSystemApp()) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.d(TAG, "Ephemeral installer is not system app;"
+ + " pkg: " + packageName + ", info:" + info);
+ }
+ continue;
+ }
+
+ if (ephemeralInstaller != null) {
+ throw new RuntimeException("There must only be one ephemeral installer");
+ }
+
+ ephemeralInstaller = new ComponentName(packageName, info.activityInfo.name);
+ }
+
+ return ephemeralInstaller;
+ }
+
private void primeDomainVerificationsLPw(int userId) {
if (DEBUG_DOMAIN_VERIFICATION) {
Slog.d(TAG, "Priming domain verifications in user " + userId);
@@ -2634,15 +2798,24 @@
}
@Override
- public boolean isPackageFrozen(String packageName) {
+ public void checkPackageStartable(String packageName, int userId) {
+ final boolean userKeyUnlocked = isUserKeyUnlocked(userId);
+
synchronized (mPackages) {
final PackageSetting ps = mSettings.mPackages.get(packageName);
- if (ps != null) {
- return ps.frozen;
+ if (ps == null) {
+ throw new SecurityException("Package " + packageName + " was not found!");
+ }
+
+ if (ps.frozen) {
+ throw new SecurityException("Package " + packageName + " is currently frozen!");
+ }
+
+ if (!userKeyUnlocked && !(ps.pkg.applicationInfo.isEncryptionAware()
+ || ps.pkg.applicationInfo.isPartiallyEncryptionAware())) {
+ throw new SecurityException("Package " + packageName + " is not encryption aware!");
}
}
- Slog.w(TAG, "Package " + packageName + " is missing; assuming frozen");
- return true;
}
@Override
@@ -2977,28 +3150,36 @@
}
/**
- * Augment the given flags depending on current user running state. This is
- * purposefully done before acquiring {@link #mPackages} lock.
+ * Return if the user key is currently unlocked.
*/
- private int augmentFlagsForUser(int flags, int userId) {
- if (SystemProperties.getBoolean(StorageManager.PROP_HAS_FBE, false)) {
+ private boolean isUserKeyUnlocked(int userId) {
+ if (StorageManager.isFileBasedEncryptionEnabled()) {
final IMountService mount = IMountService.Stub
- .asInterface(ServiceManager.getService(Context.STORAGE_SERVICE));
+ .asInterface(ServiceManager.getService("mount"));
if (mount == null) {
- // We must be early in boot, so the best we can do is assume the
- // user is fully running.
- return flags;
+ Slog.w(TAG, "Early during boot, assuming locked");
+ return false;
}
final long token = Binder.clearCallingIdentity();
try {
- if (!mount.isUserKeyUnlocked(userId)) {
- flags |= PackageManager.FLAG_USER_RUNNING_WITH_AMNESIA;
- }
+ return mount.isUserKeyUnlocked(userId);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
} finally {
Binder.restoreCallingIdentity(token);
}
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * Augment the given flags depending on current user running state. This is
+ * purposefully done before acquiring {@link #mPackages} lock.
+ */
+ private int augmentFlagsForUser(int flags, int userId) {
+ if (!isUserKeyUnlocked(userId)) {
+ flags |= PackageManager.MATCH_ENCRYPTION_AWARE_ONLY;
}
return flags;
}
@@ -3505,6 +3686,16 @@
enforceDeclaredAsUsedAndRuntimeOrDevelopmentPermission(pkg, bp);
+ // If a permission review is required for legacy apps we represent
+ // their permissions as always granted runtime ones since we need
+ // to keep the review required permission flag per user while an
+ // install permission's state is shared across all users.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED
+ && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
+ && bp.isRuntime()) {
+ return;
+ }
+
uid = UserHandle.getUid(userId, pkg.applicationInfo.uid);
sb = (SettingBase) pkg.mExtras;
if (sb == null) {
@@ -3529,6 +3720,11 @@
return;
}
+ if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
+ Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
+ return;
+ }
+
final int result = permissionsState.grantRuntimePermission(bp, userId);
switch (result) {
case PermissionsState.PERMISSION_OPERATION_FAILURE: {
@@ -3600,6 +3796,16 @@
enforceDeclaredAsUsedAndRuntimeOrDevelopmentPermission(pkg, bp);
+ // If a permission review is required for legacy apps we represent
+ // their permissions as always granted runtime ones since we need
+ // to keep the review required permission flag per user while an
+ // install permission's state is shared across all users.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED
+ && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
+ && bp.isRuntime()) {
+ return;
+ }
+
SettingBase sb = (SettingBase) pkg.mExtras;
if (sb == null) {
throw new IllegalArgumentException("Unknown package: " + packageName);
@@ -3718,6 +3924,7 @@
flagValues &= ~PackageManager.FLAG_PERMISSION_SYSTEM_FIXED;
flagMask &= ~PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
flagValues &= ~PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
+ flagValues &= ~PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;
}
synchronized (mPackages) {
@@ -4225,8 +4432,97 @@
false, false, false, userId);
}
+ private boolean isEphemeralAvailable(Intent intent, String resolvedType, int userId) {
+ MessageDigest digest = null;
+ try {
+ digest = MessageDigest.getInstance(EphemeralResolveInfo.SHA_ALGORITHM);
+ } catch (NoSuchAlgorithmException e) {
+ // If we can't create a digest, ignore ephemeral apps.
+ return false;
+ }
+
+ final byte[] hostBytes = intent.getData().getHost().getBytes();
+ final byte[] digestBytes = digest.digest(hostBytes);
+ int shaPrefix =
+ digestBytes[0] << 24
+ | digestBytes[1] << 16
+ | digestBytes[2] << 8
+ | digestBytes[3] << 0;
+ final List<EphemeralResolveInfo> ephemeralResolveInfoList =
+ mEphemeralResolverConnection.getEphemeralResolveInfoList(shaPrefix);
+ if (ephemeralResolveInfoList == null || ephemeralResolveInfoList.size() == 0) {
+ // No hash prefix match; there are no ephemeral apps for this domain.
+ return false;
+ }
+ for (int i = ephemeralResolveInfoList.size() - 1; i >= 0; --i) {
+ EphemeralResolveInfo ephemeralApplication = ephemeralResolveInfoList.get(i);
+ if (!Arrays.equals(digestBytes, ephemeralApplication.getDigestBytes())) {
+ continue;
+ }
+ final List<IntentFilter> filters = ephemeralApplication.getFilters();
+ // No filters; this should never happen.
+ if (filters.isEmpty()) {
+ continue;
+ }
+ // We have a domain match; resolve the filters to see if anything matches.
+ final EphemeralIntentResolver ephemeralResolver = new EphemeralIntentResolver();
+ for (int j = filters.size() - 1; j >= 0; --j) {
+ ephemeralResolver.addFilter(filters.get(j));
+ }
+ List<ResolveInfo> ephemeralResolveList = ephemeralResolver.queryIntent(
+ intent, resolvedType, false /*defaultOnly*/, userId);
+ return !ephemeralResolveList.isEmpty();
+ }
+ // Hash or filter mis-match; no ephemeral apps for this domain.
+ return false;
+ }
+
private ResolveInfo chooseBestActivity(Intent intent, String resolvedType,
int flags, List<ResolveInfo> query, int userId) {
+ final boolean isWebUri = hasWebURI(intent);
+ // Check whether or not an ephemeral app exists to handle the URI.
+ if (isWebUri && mEphemeralResolverConnection != null) {
+ // Deny ephemeral apps if the user choose _ALWAYS or _ALWAYS_ASK for intent resolution.
+ boolean hasAlwaysHandler = false;
+ synchronized (mPackages) {
+ final int count = query.size();
+ for (int n=0; n<count; n++) {
+ ResolveInfo info = query.get(n);
+ String packageName = info.activityInfo.packageName;
+ PackageSetting ps = mSettings.mPackages.get(packageName);
+ if (ps != null) {
+ // Try to get the status from User settings first
+ long packedStatus = getDomainVerificationStatusLPr(ps, userId);
+ int status = (int) (packedStatus >> 32);
+ if (status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS
+ || status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK) {
+ hasAlwaysHandler = true;
+ break;
+ }
+ }
+ }
+ }
+
+ // Only consider installing an ephemeral app if there isn't already a verified handler.
+ // We've determined that there's an ephemeral app available for the URI, ignore any
+ // ResolveInfo's and just return the ephemeral installer
+ if (!hasAlwaysHandler && isEphemeralAvailable(intent, resolvedType, userId)) {
+ if (DEBUG_EPHEMERAL) {
+ Slog.v(TAG, "Resolving to the ephemeral installer");
+ }
+ // ditch the result and return a ResolveInfo to launch the ephemeral installer
+ ResolveInfo ri = new ResolveInfo(mEphemeralInstallerInfo);
+ ri.activityInfo = new ActivityInfo(ri.activityInfo);
+ // make a deep copy of the applicationInfo
+ ri.activityInfo.applicationInfo = new ApplicationInfo(
+ ri.activityInfo.applicationInfo);
+ if (userId != 0) {
+ ri.activityInfo.applicationInfo.uid = UserHandle.getUid(userId,
+ UserHandle.getAppId(ri.activityInfo.applicationInfo.uid));
+ }
+ return ri;
+ }
+ }
if (query != null) {
final int N = query.size();
if (N == 1) {
@@ -6257,22 +6553,25 @@
return true;
}
- private int createDataDirsLI(String volumeUuid, String packageName, int uid, String seinfo) {
- int[] users = sUserManager.getUserIds();
+ private void createDataDirsLI(String volumeUuid, String packageName, int uid, String seinfo)
+ throws PackageManagerException {
int res = mInstaller.install(volumeUuid, packageName, uid, uid, seinfo);
- if (res < 0) {
- return res;
+ if (res != 0) {
+ throw new PackageManagerException(INSTALL_FAILED_INSUFFICIENT_STORAGE,
+ "Failed to install " + packageName + ": " + res);
}
+
+ final int[] users = sUserManager.getUserIds();
for (int user : users) {
if (user != 0) {
res = mInstaller.createUserData(volumeUuid, packageName,
UserHandle.getUid(user, uid), user, seinfo);
- if (res < 0) {
- return res;
+ if (res != 0) {
+ throw new PackageManagerException(INSTALL_FAILED_INSUFFICIENT_STORAGE,
+ "Failed to createUserData " + packageName + ": " + res);
}
}
}
- return res;
}
private int removeDataDirsLI(String volumeUuid, String packageName) {
@@ -6842,18 +7141,6 @@
+ pkg.applicationInfo.uid + "; old data erased";
reportSettingsProblem(Log.WARN, msg);
recovered = true;
-
- // And now re-install the app.
- ret = createDataDirsLI(pkg.volumeUuid, pkgName, pkg.applicationInfo.uid,
- pkg.applicationInfo.seinfo);
- if (ret == -1) {
- // Ack should not happen!
- msg = prefix + pkg.packageName
- + " could not have data directory re-created after delete.";
- reportSettingsProblem(Log.WARN, msg);
- throw new PackageManagerException(
- INSTALL_FAILED_INSUFFICIENT_STORAGE, msg);
- }
}
if (!recovered) {
mHasSystemUidErrors = true;
@@ -6886,6 +7173,10 @@
}
}
+ // Ensure that directories are prepared
+ createDataDirsLI(pkg.volumeUuid, pkgName, pkg.applicationInfo.uid,
+ pkg.applicationInfo.seinfo);
+
if (mShouldRestoreconData) {
Slog.i(TAG, "SELinux relabeling of " + pkg.packageName + " issued.");
mInstaller.restoreconData(pkg.volumeUuid, pkg.packageName,
@@ -6896,14 +7187,8 @@
if ((parseFlags & PackageParser.PARSE_CHATTY) != 0)
Log.v(TAG, "Want this data dir: " + dataPath);
}
- //invoke installer to do the actual installation
- int ret = createDataDirsLI(pkg.volumeUuid, pkgName, pkg.applicationInfo.uid,
+ createDataDirsLI(pkg.volumeUuid, pkgName, pkg.applicationInfo.uid,
pkg.applicationInfo.seinfo);
- if (ret < 0) {
- // Error from installer
- throw new PackageManagerException(INSTALL_FAILED_INSUFFICIENT_STORAGE,
- "Unable to create data dirs [errorCode=" + ret + "]");
- }
}
// Get all of our default paths setup
@@ -7735,6 +8020,30 @@
}
}
+ private void setUpEphemeralInstallerActivityLP(ComponentName installerComponent) {
+ final PackageParser.Package pkg = mPackages.get(installerComponent.getPackageName());
+
+ // Set up information for ephemeral installer activity
+ mEphemeralInstallerActivity.applicationInfo = pkg.applicationInfo;
+ mEphemeralInstallerActivity.name = mEphemeralInstallerComponent.getClassName();
+ mEphemeralInstallerActivity.packageName = pkg.applicationInfo.packageName;
+ mEphemeralInstallerActivity.processName = pkg.applicationInfo.packageName;
+ mEphemeralInstallerActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE;
+ mEphemeralInstallerActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS |
+ ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS;
+ mEphemeralInstallerActivity.theme = 0;
+ mEphemeralInstallerActivity.exported = true;
+ mEphemeralInstallerActivity.enabled = true;
+ mEphemeralInstallerInfo.activityInfo = mEphemeralInstallerActivity;
+ mEphemeralInstallerInfo.priority = 0;
+ mEphemeralInstallerInfo.preferredOrder = 0;
+ mEphemeralInstallerInfo.match = 0;
+
+ if (DEBUG_EPHEMERAL) {
+ Slog.d(TAG, "Set ephemeral installer activity: " + mEphemeralInstallerComponent);
+ }
+ }
+
private static String calculateBundledApkRoot(final String codePathString) {
final File codePath = new File(codePathString);
final File codeRoot;
@@ -8351,6 +8660,8 @@
}
final int level = bp.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;
+ final boolean appSupportsRuntimePermissions = pkg.applicationInfo.targetSdkVersion
+ >= Build.VERSION_CODES.M;
switch (level) {
case PermissionInfo.PROTECTION_NORMAL: {
// For all apps normal permissions are install time ones.
@@ -8358,9 +8669,13 @@
} break;
case PermissionInfo.PROTECTION_DANGEROUS: {
- if (pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+ // If a permission review is required for legacy apps we represent
+ // their permissions as always granted runtime ones since we need
+ // to keep the review required permission flag per user while an
+ // install permission's state is shared across all users.
+ if (!appSupportsRuntimePermissions && !Build.PERMISSIONS_REVIEW_REQUIRED) {
// For legacy apps dangerous permissions are install time ones.
- grant = GRANT_INSTALL_LEGACY;
+ grant = GRANT_INSTALL;
} else if (origPermissions.hasInstallPermission(bp.name)) {
// For legacy apps that became modern, install becomes runtime.
grant = GRANT_UPGRADE;
@@ -8407,7 +8722,7 @@
switch (grant) {
case GRANT_INSTALL: {
// Revoke this as runtime permission to handle the case of
- // a runtime permission being downgraded to an install one.
+ // a runtime permission being downgraded to an install one. Also in permission review mode we keep dangerous permissions for legacy apps
for (int userId : UserManagerService.getInstance().getUserIds()) {
if (origPermissions.getRuntimePermissionState(
bp.name, userId) != null) {
@@ -8427,20 +8742,12 @@
}
} break;
- case GRANT_INSTALL_LEGACY: {
- // Grant an install permission.
- if (permissionsState.grantInstallPermission(bp) !=
- PermissionsState.PERMISSION_OPERATION_FAILURE) {
- changedInstallPermission = true;
- }
- } break;
-
case GRANT_RUNTIME: {
// Grant previously granted runtime permissions.
for (int userId : UserManagerService.getInstance().getUserIds()) {
PermissionState permissionState = origPermissions
.getRuntimePermissionState(bp.name, userId);
- final int flags = permissionState != null
+ int flags = permissionState != null
? permissionState.getFlags() : 0;
if (origPermissions.hasRuntimePermission(bp.name, userId)) {
if (permissionsState.grantRuntimePermission(bp, userId) ==
@@ -8449,6 +8756,27 @@
changedRuntimePermissionUserIds = ArrayUtils.appendInt(
changedRuntimePermissionUserIds, userId);
}
+ // If the app supports runtime permissions no need for a review.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED
+ && appSupportsRuntimePermissions
+ && (flags & PackageManager
+ .FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {
+ flags &= ~PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;
+ // Since we changed the flags, we have to write.
+ changedRuntimePermissionUserIds = ArrayUtils.appendInt(
+ changedRuntimePermissionUserIds, userId);
+ }
+ } else if (Build.PERMISSIONS_REVIEW_REQUIRED
+ && !appSupportsRuntimePermissions) {
+ // For legacy apps that need a permission review, every new
+ // runtime permission is granted but it is pending a review.
+ if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {
+ permissionsState.grantRuntimePermission(bp, userId);
+ flags |= FLAG_PERMISSION_REVIEW_REQUIRED;
+ // We changed the permission and flags, hence have to write.
+ changedRuntimePermissionUserIds = ArrayUtils.appendInt(
+ changedRuntimePermissionUserIds, userId);
+ }
}
// Propagate the permission flags.
permissionsState.updatePermissionFlags(bp, userId, flags, flags);
@@ -9291,7 +9619,28 @@
private final ArrayMap<ComponentName, PackageParser.Provider> mProviders
= new ArrayMap<ComponentName, PackageParser.Provider>();
private int mFlags;
- };
+ }
+
+ private static final class EphemeralIntentResolver
+ extends IntentResolver<IntentFilter, ResolveInfo> {
+ @Override
+ protected IntentFilter[] newArray(int size) {
+ return new IntentFilter[size];
+ }
+
+ @Override
+ protected boolean isPackageForFilter(String packageName, IntentFilter info) {
+ return true;
+ }
+
+ @Override
+ protected ResolveInfo newResult(IntentFilter info, int match, int userId) {
+ if (!sUserManager.exists(userId)) return null;
+ final ResolveInfo res = new ResolveInfo();
+ res.filter = info;
+ return res;
+ }
+ }
private static final Comparator<ResolveInfo> mResolvePrioritySorter =
new Comparator<ResolveInfo>() {
@@ -9332,8 +9681,8 @@
}
};
- final void sendPackageBroadcast(final String action, final String pkg,
- final Bundle extras, final String targetPkg, final IIntentReceiver finishedReceiver,
+ final void sendPackageBroadcast(final String action, final String pkg, final Bundle extras,
+ final int flags, final String targetPkg, final IIntentReceiver finishedReceiver,
final int[] userIds) {
mHandler.post(new Runnable() {
@Override
@@ -9363,7 +9712,7 @@
intent.putExtra(Intent.EXTRA_UID, uid);
}
intent.putExtra(Intent.EXTRA_USER_HANDLE, id);
- intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+ intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT | flags);
if (DEBUG_BROADCASTS) {
RuntimeException here = new RuntimeException("here");
here.fillInStackTrace();
@@ -9555,7 +9904,7 @@
extras.putInt(Intent.EXTRA_UID, UserHandle.getUid(userId, pkgSetting.appId));
sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED,
- packageName, extras, null, null, new int[] {userId});
+ packageName, extras, 0, null, null, new int[] {userId});
try {
IActivityManager am = ActivityManagerNative.getDefault();
final boolean isSystem =
@@ -11279,7 +11628,7 @@
}
int copyApk(IMediaContainerService imcs, boolean temp) throws RemoteException {
- if (origin.staged) {
+ if (origin.staged && origin.cid != null) {
if (DEBUG_INSTALL) Slog.d(TAG, origin.cid + " already staged; skipping copy");
cid = origin.cid;
setMountPath(PackageHelper.getSdDir(cid));
@@ -12723,7 +13072,7 @@
final boolean deleteAllUsers = (flags & PackageManager.DELETE_ALL_USERS) != 0;
final int[] users = deleteAllUsers ? sUserManager.getUserIds() : new int[]{ userId };
if (UserHandle.getUserId(uid) != userId || (deleteAllUsers && users.length > 1)) {
- mContext.enforceCallingPermission(
+ mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.INTERACT_ACROSS_USERS_FULL,
"deletePackage for user " + userId);
}
@@ -12770,7 +13119,8 @@
ServiceManager.getService(Context.DEVICE_POLICY_SERVICE));
try {
if (dpm != null) {
- final ComponentName deviceOwnerComponentName = dpm.getDeviceOwner();
+ final ComponentName deviceOwnerComponentName = dpm.getDeviceOwnerComponent(
+ /* callingUserOnly =*/ false);
final String deviceOwnerPackageName = deviceOwnerComponentName == null ? null
: deviceOwnerComponentName.getPackageName();
// Does the package contains the device owner?
@@ -12798,6 +13148,10 @@
return false;
}
+ private boolean shouldKeepUninstalledPackageLPr(String packageName) {
+ return mKeepUninstalledPackages != null && mKeepUninstalledPackages.contains(packageName);
+ }
+
/**
* This method is an internal method that could be get invoked either
* to delete an installed package or to clean up a failed installation.
@@ -12865,11 +13219,11 @@
extras.putBoolean(Intent.EXTRA_REPLACING, true);
sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,
- extras, null, null, null);
+ extras, 0, null, null, null);
sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, packageName,
- extras, null, null, null);
+ extras, 0, null, null, null);
sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED, null,
- null, packageName, null, null);
+ null, 0, packageName, null, null);
}
}
// Force a gc here.
@@ -12904,14 +13258,14 @@
extras.putBoolean(Intent.EXTRA_REMOVED_FOR_ALL_USERS, removedForAllUsers);
if (removedPackage != null) {
sendPackageBroadcast(Intent.ACTION_PACKAGE_REMOVED, removedPackage,
- extras, null, null, removedUsers);
+ extras, 0, null, null, removedUsers);
if (fullRemove && !replacing) {
sendPackageBroadcast(Intent.ACTION_PACKAGE_FULLY_REMOVED, removedPackage,
- extras, null, null, removedUsers);
+ extras, 0, null, null, removedUsers);
}
}
if (removedAppId >= 0) {
- sendPackageBroadcast(Intent.ACTION_UID_REMOVED, null, extras, null, null,
+ sendPackageBroadcast(Intent.ACTION_UID_REMOVED, null, extras, 0, null, null,
removedUsers);
}
}
@@ -13220,7 +13574,9 @@
false, // blockUninstall
ps.readUserState(userId).domainVerificationStatus, 0);
if (!isSystemApp(ps)) {
- if (ps.isAnyInstalled(sUserManager.getUserIds())) {
+ // Do not uninstall the APK if an app should be cached
+ boolean keepUninstalledPackage = shouldKeepUninstalledPackageLPr(packageName);
+ if (ps.isAnyInstalled(sUserManager.getUserIds()) || keepUninstalledPackage) {
// Other user still have this package installed, so all
// we need to do is clear this user's data and save that
// it is uninstalled.
@@ -13482,9 +13838,11 @@
return;
}
- final int userSettableFlags = FLAG_PERMISSION_USER_SET
+ // These are flags that can change base on user actions.
+ final int userSettableMask = FLAG_PERMISSION_USER_SET
| FLAG_PERMISSION_USER_FIXED
- | FLAG_PERMISSION_REVOKE_ON_UPGRADE;
+ | FLAG_PERMISSION_REVOKE_ON_UPGRADE
+ | FLAG_PERMISSION_REVIEW_REQUIRED;
final int policyOrSystemFlags = FLAG_PERMISSION_SYSTEM_FIXED
| FLAG_PERMISSION_POLICY_FIXED;
@@ -13525,7 +13883,14 @@
// Always clear the user settable flags.
final boolean hasInstallState = permissionsState.getInstallPermissionState(
bp.name) != null;
- if (permissionsState.updatePermissionFlags(bp, userId, userSettableFlags, 0)) {
+ // If permission review is enabled and this is a legacy app, mark the
+ // permission as requiring a review as this is the initial state.
+ int flags = 0;
+ if (Build.PERMISSIONS_REVIEW_REQUIRED
+ && ps.pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) {
+ flags |= FLAG_PERMISSION_REVIEW_REQUIRED;
+ }
+ if (permissionsState.updatePermissionFlags(bp, userId, userSettableMask, flags)) {
if (hasInstallState) {
writeInstallPermissions = true;
} else {
@@ -13549,7 +13914,9 @@
!= PERMISSION_OPERATION_FAILURE) {
writeRuntimePermissions = true;
}
- } else {
+ // If permission review is enabled the permissions for a legacy apps
+ // are represented as constantly granted runtime ones, so don't revoke.
+ } else if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {
// Otherwise, reset the permission.
final int revokeResult = permissionsState.revokeRuntimePermission(bp, userId);
switch (revokeResult) {
@@ -14611,7 +14978,12 @@
extras.putStringArray(Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST, nameList);
extras.putBoolean(Intent.EXTRA_DONT_KILL_APP, killFlag);
extras.putInt(Intent.EXTRA_UID, packageUid);
- sendPackageBroadcast(Intent.ACTION_PACKAGE_CHANGED, packageName, extras, null, null,
+ // If this is not reporting a change of the overall package, then only send it
+ // to registered receivers. We don't want to launch a swath of apps for every
+ // little component state change.
+ final int flags = !componentNames.contains(packageName)
+ ? Intent.FLAG_RECEIVER_REGISTERED_ONLY : 0;
+ sendPackageBroadcast(Intent.ACTION_PACKAGE_CHANGED, packageName, extras, flags, null, null,
new int[] {UserHandle.getUserId(packageUid)});
}
@@ -14799,20 +15171,23 @@
static class DumpState {
public static final int DUMP_LIBS = 1 << 0;
public static final int DUMP_FEATURES = 1 << 1;
- public static final int DUMP_RESOLVERS = 1 << 2;
- public static final int DUMP_PERMISSIONS = 1 << 3;
- public static final int DUMP_PACKAGES = 1 << 4;
- public static final int DUMP_SHARED_USERS = 1 << 5;
- public static final int DUMP_MESSAGES = 1 << 6;
- public static final int DUMP_PROVIDERS = 1 << 7;
- public static final int DUMP_VERIFIERS = 1 << 8;
- public static final int DUMP_PREFERRED = 1 << 9;
- public static final int DUMP_PREFERRED_XML = 1 << 10;
- public static final int DUMP_KEYSETS = 1 << 11;
- public static final int DUMP_VERSION = 1 << 12;
- public static final int DUMP_INSTALLS = 1 << 13;
- public static final int DUMP_INTENT_FILTER_VERIFIERS = 1 << 14;
- public static final int DUMP_DOMAIN_PREFERRED = 1 << 15;
+ public static final int DUMP_ACTIVITY_RESOLVERS = 1 << 2;
+ public static final int DUMP_SERVICE_RESOLVERS = 1 << 3;
+ public static final int DUMP_RECEIVER_RESOLVERS = 1 << 4;
+ public static final int DUMP_CONTENT_RESOLVERS = 1 << 5;
+ public static final int DUMP_PERMISSIONS = 1 << 6;
+ public static final int DUMP_PACKAGES = 1 << 7;
+ public static final int DUMP_SHARED_USERS = 1 << 8;
+ public static final int DUMP_MESSAGES = 1 << 9;
+ public static final int DUMP_PROVIDERS = 1 << 10;
+ public static final int DUMP_VERIFIERS = 1 << 11;
+ public static final int DUMP_PREFERRED = 1 << 12;
+ public static final int DUMP_PREFERRED_XML = 1 << 13;
+ public static final int DUMP_KEYSETS = 1 << 14;
+ public static final int DUMP_VERSION = 1 << 15;
+ public static final int DUMP_INSTALLS = 1 << 16;
+ public static final int DUMP_INTENT_FILTER_VERIFIERS = 1 << 17;
+ public static final int DUMP_DOMAIN_PREFERRED = 1 << 18;
public static final int OPTION_SHOW_FILTERS = 1 << 0;
@@ -14911,9 +15286,9 @@
pw.println(" -h: print this help");
pw.println(" cmd may be one of:");
pw.println(" l[ibraries]: list known shared libraries");
- pw.println(" f[ibraries]: list device features");
+ pw.println(" f[eatures]: list device features");
pw.println(" k[eysets]: print known keysets");
- pw.println(" r[esolvers]: dump intent resolvers");
+ pw.println(" r[esolvers] [activity|service|receiver|content]: dump intent resolvers");
pw.println(" perm[issions]: dump permissions");
pw.println(" permission [name ...]: dump declaration and use of given permission");
pw.println(" pref[erred]: print preferred package settings");
@@ -14980,7 +15355,29 @@
} else if ("f".equals(cmd) || "features".equals(cmd)) {
dumpState.setDump(DumpState.DUMP_FEATURES);
} else if ("r".equals(cmd) || "resolvers".equals(cmd)) {
- dumpState.setDump(DumpState.DUMP_RESOLVERS);
+ if (opti >= args.length) {
+ dumpState.setDump(DumpState.DUMP_ACTIVITY_RESOLVERS
+ | DumpState.DUMP_SERVICE_RESOLVERS
+ | DumpState.DUMP_RECEIVER_RESOLVERS
+ | DumpState.DUMP_CONTENT_RESOLVERS);
+ } else {
+ while (opti < args.length) {
+ String name = args[opti];
+ if ("a".equals(name) || "activity".equals(name)) {
+ dumpState.setDump(DumpState.DUMP_ACTIVITY_RESOLVERS);
+ } else if ("s".equals(name) || "service".equals(name)) {
+ dumpState.setDump(DumpState.DUMP_SERVICE_RESOLVERS);
+ } else if ("r".equals(name) || "receiver".equals(name)) {
+ dumpState.setDump(DumpState.DUMP_RECEIVER_RESOLVERS);
+ } else if ("c".equals(name) || "content".equals(name)) {
+ dumpState.setDump(DumpState.DUMP_CONTENT_RESOLVERS);
+ } else {
+ pw.println("Error: unknown resolver table type: " + name);
+ return;
+ }
+ opti++;
+ }
+ }
} else if ("perm".equals(cmd) || "permissions".equals(cmd)) {
dumpState.setDump(DumpState.DUMP_PERMISSIONS);
} else if ("permission".equals(cmd)) {
@@ -15147,22 +15544,28 @@
}
}
- if (!checkin && dumpState.isDumping(DumpState.DUMP_RESOLVERS)) {
+ if (!checkin && dumpState.isDumping(DumpState.DUMP_ACTIVITY_RESOLVERS)) {
if (mActivities.dump(pw, dumpState.getTitlePrinted() ? "\nActivity Resolver Table:"
: "Activity Resolver Table:", " ", packageName,
dumpState.isOptionEnabled(DumpState.OPTION_SHOW_FILTERS), true)) {
dumpState.setTitlePrinted(true);
}
+ }
+ if (!checkin && dumpState.isDumping(DumpState.DUMP_RECEIVER_RESOLVERS)) {
if (mReceivers.dump(pw, dumpState.getTitlePrinted() ? "\nReceiver Resolver Table:"
: "Receiver Resolver Table:", " ", packageName,
dumpState.isOptionEnabled(DumpState.OPTION_SHOW_FILTERS), true)) {
dumpState.setTitlePrinted(true);
}
+ }
+ if (!checkin && dumpState.isDumping(DumpState.DUMP_SERVICE_RESOLVERS)) {
if (mServices.dump(pw, dumpState.getTitlePrinted() ? "\nService Resolver Table:"
: "Service Resolver Table:", " ", packageName,
dumpState.isOptionEnabled(DumpState.OPTION_SHOW_FILTERS), true)) {
dumpState.setTitlePrinted(true);
}
+ }
+ if (!checkin && dumpState.isDumping(DumpState.DUMP_CONTENT_RESOLVERS)) {
if (mProviders.dump(pw, dumpState.getTitlePrinted() ? "\nProvider Resolver Table:"
: "Provider Resolver Table:", " ", packageName,
dumpState.isOptionEnabled(DumpState.OPTION_SHOW_FILTERS), true)) {
@@ -15609,7 +16012,7 @@
}
String action = mediaStatus ? Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE
: Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE;
- sendPackageBroadcast(action, null, extras, null, finishedReceiver, null);
+ sendPackageBroadcast(action, null, extras, 0, null, finishedReceiver, null);
}
}
@@ -16314,23 +16717,26 @@
}
/** Called by UserManagerService */
- void cleanUpUserLILPw(UserManagerService userManager, int userHandle) {
- mDirtyUsers.remove(userHandle);
- mSettings.removeUserLPw(userHandle);
- mPendingBroadcasts.remove(userHandle);
- if (mInstaller != null) {
- // Technically, we shouldn't be doing this with the package lock
- // held. However, this is very rare, and there is already so much
- // other disk I/O going on, that we'll let it slide for now.
- final StorageManager storage = mContext.getSystemService(StorageManager.class);
- for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
- final String volumeUuid = vol.getFsUuid();
- if (DEBUG_INSTALL) Slog.d(TAG, "Removing user data on volume " + volumeUuid);
- mInstaller.removeUserDataDirs(volumeUuid, userHandle);
+ void cleanUpUser(UserManagerService userManager, int userHandle) {
+ synchronized (mPackages) {
+ mDirtyUsers.remove(userHandle);
+ mUserNeedsBadging.delete(userHandle);
+ mSettings.removeUserLPw(userHandle);
+ mPendingBroadcasts.remove(userHandle);
+ }
+ synchronized (mInstallLock) {
+ if (mInstaller != null) {
+ final StorageManager storage = mContext.getSystemService(StorageManager.class);
+ for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
+ final String volumeUuid = vol.getFsUuid();
+ if (DEBUG_INSTALL) Slog.d(TAG, "Removing user data on volume " + volumeUuid);
+ mInstaller.removeUserDataDirs(volumeUuid, userHandle);
+ }
+ }
+ synchronized (mPackages) {
+ removeUnusedPackagesLILPw(userManager, userHandle);
}
}
- mUserNeedsBadging.delete(userHandle);
- removeUnusedPackagesLILPw(userManager, userHandle);
}
/**
@@ -16355,15 +16761,21 @@
if (DEBUG_CLEAN_APKS) {
Slog.i(TAG, "Checking package " + packageName);
}
- boolean keep = false;
- for (int i = 0; i < users.length; i++) {
- if (users[i] != userHandle && ps.getInstalled(users[i])) {
- keep = true;
- if (DEBUG_CLEAN_APKS) {
- Slog.i(TAG, " Keeping package " + packageName + " for user "
- + users[i]);
+ boolean keep = shouldKeepUninstalledPackageLPr(packageName);
+ if (keep) {
+ if (DEBUG_CLEAN_APKS) {
+ Slog.i(TAG, " Keeping package " + packageName + " - requested by DO");
+ }
+ } else {
+ for (int i = 0; i < users.length; i++) {
+ if (users[i] != userHandle && ps.getInstalled(users[i])) {
+ keep = true;
+ if (DEBUG_CLEAN_APKS) {
+ Slog.i(TAG, " Keeping package " + packageName + " for user "
+ + users[i]);
+ }
+ break;
}
- break;
}
}
if (!keep) {
@@ -16380,17 +16792,32 @@
}
/** Called by UserManagerService */
- void createNewUserLILPw(int userHandle) {
+ void createNewUser(int userHandle) {
if (mInstaller != null) {
- mInstaller.createUserConfig(userHandle);
- mSettings.createNewUserLILPw(this, mInstaller, userHandle);
- applyFactoryDefaultBrowserLPw(userHandle);
- primeDomainVerificationsLPw(userHandle);
+ synchronized (mInstallLock) {
+ synchronized (mPackages) {
+ mInstaller.createUserConfig(userHandle);
+ mSettings.createNewUserLILPw(this, mInstaller, userHandle);
+ }
+ }
+ synchronized (mPackages) {
+ applyFactoryDefaultBrowserLPw(userHandle);
+ primeDomainVerificationsLPw(userHandle);
+ }
}
}
void newUserCreated(final int userHandle) {
mDefaultPermissionPolicy.grantDefaultPermissions(userHandle);
+ // If permission review for legacy apps is required, we represent
+ // dagerous permissions for such apps as always granted runtime
+ // permissions to keep per user flag state whether review is needed.
+ // Hence, if a new user is added we have to propagate dangerous
+ // permission grants for these legacy apps.
+ if (Build.PERMISSIONS_REVIEW_REQUIRED) {
+ updatePermissionsLPw(null, null, UPDATE_PERMISSIONS_ALL
+ | UPDATE_PERMISSIONS_REPLACE_ALL);
+ }
}
@Override
@@ -16559,6 +16986,23 @@
}
}
+ private void deletePackageIfUnusedLPr(final String packageName) {
+ PackageSetting ps = mSettings.mPackages.get(packageName);
+ if (ps == null) {
+ return;
+ }
+ if (!ps.isAnyInstalled(sUserManager.getUserIds())) {
+ // TODO Implement atomic delete if package is unused
+ // It is currently possible that the package will be deleted even if it is installed
+ // after this method returns.
+ mHandler.post(new Runnable() {
+ public void run() {
+ deletePackageX(packageName, 0, PackageManager.DELETE_ALL_USERS);
+ }
+ });
+ }
+ }
+
/**
* Check and throw if the given before/after packages would be considered a
* downgrade.
@@ -16789,6 +17233,7 @@
packageName, userId);
}
}
+
@Override
public void grantDefaultPermissionsToDefaultSimCallManager(String packageName, int userId) {
synchronized (mPackages) {
@@ -16796,6 +17241,58 @@
packageName, userId);
}
}
+
+ @Override
+ public void setKeepUninstalledPackages(final List<String> packageList) {
+ Preconditions.checkNotNull(packageList);
+ List<String> removedFromList = null;
+ synchronized (mPackages) {
+ if (mKeepUninstalledPackages != null) {
+ final int packagesCount = mKeepUninstalledPackages.size();
+ for (int i = 0; i < packagesCount; i++) {
+ String oldPackage = mKeepUninstalledPackages.get(i);
+ if (packageList != null && packageList.contains(oldPackage)) {
+ continue;
+ }
+ if (removedFromList == null) {
+ removedFromList = new ArrayList<>();
+ }
+ removedFromList.add(oldPackage);
+ }
+ }
+ mKeepUninstalledPackages = new ArrayList<>(packageList);
+ if (removedFromList != null) {
+ final int removedCount = removedFromList.size();
+ for (int i = 0; i < removedCount; i++) {
+ deletePackageIfUnusedLPr(removedFromList.get(i));
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean isPermissionsReviewRequired(String packageName, int userId) {
+ synchronized (mPackages) {
+ // If we do not support permission review, done.
+ if (!Build.PERMISSIONS_REVIEW_REQUIRED) {
+ return false;
+ }
+
+ PackageSetting packageSetting = mSettings.mPackages.get(packageName);
+ if (packageSetting == null) {
+ return false;
+ }
+
+ // Permission review applies only to apps not supporting the new permission model.
+ if (packageSetting.pkg.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.M) {
+ return false;
+ }
+
+ // Legacy apps have the permission and get user consent on launch.
+ PermissionsState permissionsState = packageSetting.getPermissionsState();
+ return permissionsState.isPermissionReviewRequired(userId);
+ }
+ }
}
@Override
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index d7176fd..dbb5818 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -35,6 +35,7 @@
import android.content.pm.PermissionInfo;
import android.content.pm.PackageInstaller.SessionInfo;
import android.content.pm.PackageInstaller.SessionParams;
+import android.content.pm.ResolveInfo;
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.net.Uri;
@@ -46,6 +47,7 @@
import android.os.UserHandle;
import android.text.TextUtils;
+import android.util.PrintWriterPrinter;
import com.android.internal.util.SizedInputStream;
import libcore.io.IoUtils;
@@ -56,6 +58,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -68,6 +71,7 @@
final IPackageManager mInterface;
final private WeakHashMap<String, Resources> mResourceCache =
new WeakHashMap<String, Resources>();
+ int mTargetUser;
PackageManagerShellCommand(PackageManagerService service) {
mInterface = service;
@@ -97,6 +101,12 @@
return runList();
case "uninstall":
return runUninstall();
+ case "query-intent-activities":
+ return runQueryIntentActivities();
+ case "query-intent-services":
+ return runQueryIntentServices();
+ case "query-intent-receivers":
+ return runQueryIntentReceivers();
default:
return handleDefaultCommands(cmd);
}
@@ -340,7 +350,7 @@
listThirdParty = true;
break;
case "--user":
- userId = Integer.parseInt(getNextArg());
+ userId = UserHandle.parseUserArg(getNextArgRequired());
break;
default:
pw.println("Error: Unknown option: " + opt);
@@ -487,7 +497,7 @@
flags |= PackageManager.DELETE_KEEP_DATA;
break;
case "--user":
- userId = Integer.parseInt(getNextArg());
+ userId = UserHandle.parseUserArg(getNextArgRequired());
break;
default:
pw.println("Error: Unknown option: " + opt);
@@ -538,6 +548,104 @@
}
}
+ private Intent parseIntentAndUser() throws URISyntaxException {
+ mTargetUser = UserHandle.USER_CURRENT;
+ Intent intent = Intent.parseCommandArgs(this, new Intent.CommandOptionHandler() {
+ @Override
+ public boolean handleOption(String opt, ShellCommand cmd) {
+ if ("--user".equals(opt)) {
+ mTargetUser = UserHandle.parseUserArg(cmd.getNextArgRequired());
+ return true;
+ }
+ return false;
+ }
+ });
+ mTargetUser = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
+ Binder.getCallingUid(), mTargetUser, false, false, null, null);
+ return intent;
+ }
+
+ private int runQueryIntentActivities() {
+ Intent intent;
+ try {
+ intent = parseIntentAndUser();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ try {
+ List<ResolveInfo> result = mInterface.queryIntentActivities(intent, null, 0,
+ mTargetUser);
+ PrintWriter pw = getOutPrintWriter();
+ if (result == null || result.size() <= 0) {
+ pw.println("No activities found");
+ } else {
+ pw.print(result.size()); pw.println(" activities found:");
+ PrintWriterPrinter pr = new PrintWriterPrinter(pw);
+ for (int i=0; i<result.size(); i++) {
+ pw.print(" Activity #"); pw.print(i); pw.println(":");
+ result.get(i).dump(pr, " ");
+ }
+ }
+ } catch (RemoteException e) {
+ throw new RuntimeException("Failed calling service", e);
+ }
+ return 0;
+ }
+
+ private int runQueryIntentServices() {
+ Intent intent;
+ try {
+ intent = parseIntentAndUser();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ try {
+ List<ResolveInfo> result = mInterface.queryIntentServices(intent, null, 0,
+ mTargetUser);
+ PrintWriter pw = getOutPrintWriter();
+ if (result == null || result.size() <= 0) {
+ pw.println("No services found");
+ } else {
+ pw.print(result.size()); pw.println(" services found:");
+ PrintWriterPrinter pr = new PrintWriterPrinter(pw);
+ for (int i=0; i<result.size(); i++) {
+ pw.print(" Service #"); pw.print(i); pw.println(":");
+ result.get(i).dump(pr, " ");
+ }
+ }
+ } catch (RemoteException e) {
+ throw new RuntimeException("Failed calling service", e);
+ }
+ return 0;
+ }
+
+ private int runQueryIntentReceivers() {
+ Intent intent;
+ try {
+ intent = parseIntentAndUser();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ try {
+ List<ResolveInfo> result = mInterface.queryIntentReceivers(intent, null, 0,
+ mTargetUser);
+ PrintWriter pw = getOutPrintWriter();
+ if (result == null || result.size() <= 0) {
+ pw.println("No receivers found");
+ } else {
+ pw.print(result.size()); pw.println(" receivers found:");
+ PrintWriterPrinter pr = new PrintWriterPrinter(pw);
+ for (int i=0; i<result.size(); i++) {
+ pw.print(" Receiver #"); pw.print(i); pw.println(":");
+ result.get(i).dump(pr, " ");
+ }
+ }
+ } catch (RemoteException e) {
+ throw new RuntimeException("Failed calling service", e);
+ }
+ return 0;
+ }
+
private static class InstallParams {
SessionParams sessionParams;
String installerPackageName;
@@ -598,7 +706,7 @@
sessionParams.abiOverride = checkAbiArgument(getNextArg());
break;
case "--user":
- params.userId = Integer.parseInt(getNextArg());
+ params.userId = UserHandle.parseUserArg(getNextArgRequired());
break;
case "--install-location":
sessionParams.installLocation = Integer.parseInt(getNextArg());
@@ -892,7 +1000,7 @@
pw.println(" the text in FILTER.");
pw.println(" Options:");
pw.println(" -f: see their associated file");
- pw.println(" -d: filter to only show disbled packages");
+ pw.println(" -d: filter to only show disabled packages");
pw.println(" -e: filter to only show enabled packages");
pw.println(" -s: filter to only show system packages");
pw.println(" -3: filter to only show third party packages");
@@ -908,7 +1016,14 @@
pw.println(" -s: short summary");
pw.println(" -d: only list dangerous permissions");
pw.println(" -u: list only the permissions users will see");
- pw.println("");
+ pw.println(" query-intent-activities [--user USER_ID] INTENT");
+ pw.println(" Prints all activities that can handle the given Intent.");
+ pw.println(" query-intent-services [--user USER_ID] INTENT");
+ pw.println(" Prints all services that can handle the given Intent.");
+ pw.println(" query-intent-receivers [--user USER_ID] INTENT");
+ pw.println(" Prints all broadcast receivers that can handle the given Intent.");
+ pw.println();
+ Intent.printIntentArgsHelp(pw , "");
}
private static class LocalIntentReceiver {
@@ -940,4 +1055,3 @@
}
}
}
-
diff --git a/services/core/java/com/android/server/pm/PermissionsState.java b/services/core/java/com/android/server/pm/PermissionsState.java
index 57ef284..007b738 100644
--- a/services/core/java/com/android/server/pm/PermissionsState.java
+++ b/services/core/java/com/android/server/pm/PermissionsState.java
@@ -16,11 +16,13 @@
package com.android.server.pm;
+import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.SparseArray;
+import android.util.SparseBooleanArray;
import com.android.internal.util.ArrayUtils;
import java.util.ArrayList;
@@ -64,6 +66,8 @@
private int[] mGlobalGids = NO_GIDS;
+ private SparseBooleanArray mPermissionReviewRequired;
+
public PermissionsState() {
/* do nothing */
}
@@ -116,6 +120,28 @@
mGlobalGids = Arrays.copyOf(other.mGlobalGids,
other.mGlobalGids.length);
}
+
+ if (mPermissionReviewRequired != null) {
+ if (other.mPermissionReviewRequired == null) {
+ mPermissionReviewRequired = null;
+ } else {
+ mPermissionReviewRequired.clear();
+ }
+ }
+ if (other.mPermissionReviewRequired != null) {
+ if (mPermissionReviewRequired == null) {
+ mPermissionReviewRequired = new SparseBooleanArray();
+ }
+ final int userCount = other.mPermissionReviewRequired.size();
+ for (int i = 0; i < userCount; i++) {
+ final boolean reviewRequired = other.mPermissionReviewRequired.valueAt(i);
+ mPermissionReviewRequired.put(i, reviewRequired);
+ }
+ }
+ }
+
+ public boolean isPermissionReviewRequired(int userId) {
+ return mPermissionReviewRequired != null && mPermissionReviewRequired.get(userId);
}
/**
@@ -357,7 +383,28 @@
permissionData = ensurePermissionData(permission);
}
- return permissionData.updateFlags(userId, flagMask, flagValues);
+ final int oldFlags = permissionData.getFlags(userId);
+
+ final boolean updated = permissionData.updateFlags(userId, flagMask, flagValues);
+ if (updated) {
+ final int newFlags = permissionData.getFlags(userId);
+ if ((oldFlags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) == 0
+ && (newFlags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {
+ if (mPermissionReviewRequired == null) {
+ mPermissionReviewRequired = new SparseBooleanArray();
+ }
+ mPermissionReviewRequired.put(userId, true);
+ } else if ((oldFlags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0
+ && (newFlags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {
+ if (mPermissionReviewRequired != null) {
+ mPermissionReviewRequired.delete(userId);
+ if (mPermissionReviewRequired.size() <= 0) {
+ mPermissionReviewRequired = null;
+ }
+ }
+ }
+ }
+ return updated;
}
public boolean updatePermissionFlagsForAllPermissions(
@@ -430,6 +477,7 @@
public void reset() {
mGlobalGids = NO_GIDS;
mPermissions = null;
+ mPermissionReviewRequired = null;
}
private PermissionState getPermissionState(String name, int userId) {
diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
index 5d8b1d2..903d12b 100644
--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
@@ -103,6 +103,9 @@
// Append privapp to existing seinfo label
private static final String PRIVILEGED_APP_STR = ":privapp";
+ // Append autoplay to existing seinfo label
+ private static final String AUTOPLAY_APP_STR = ":autoplayapp";
+
/**
* Load the mac_permissions.xml file containing all seinfo assignments used to
* label apps. The loaded mac_permissions.xml file is determined by the
@@ -316,6 +319,9 @@
}
}
+ if (pkg.applicationInfo.isAutoPlayApp())
+ pkg.applicationInfo.seinfo += AUTOPLAY_APP_STR;
+
if (pkg.applicationInfo.isPrivilegedApp())
pkg.applicationInfo.seinfo += PRIVILEGED_APP_STR;
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index de14739..99aa30b 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -3802,8 +3802,7 @@
if ((flags & PackageManager.GET_ENCRYPTION_UNAWARE_COMPONENTS) != 0) {
return true;
}
- if ((flags & PackageManager.FLAG_USER_RUNNING_WITH_AMNESIA) != 0) {
- // When running with amnesia, we can only run encryption-aware apps
+ if ((flags & PackageManager.MATCH_ENCRYPTION_AWARE_ONLY) != 0) {
return componentInfo.encryptionAware;
}
return true;
@@ -3861,7 +3860,7 @@
if (pkgSetting.getNotLaunched(userId)) {
if (pkgSetting.installerPackageName != null) {
yucky.sendPackageBroadcast(Intent.ACTION_PACKAGE_FIRST_LAUNCH,
- pkgSetting.name, null,
+ pkgSetting.name, null, 0,
pkgSetting.installerPackageName, null, new int[] {userId});
}
pkgSetting.setNotLaunched(false, userId);
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 3a1d2de..b31d731 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -24,8 +24,6 @@
import android.app.ActivityManagerNative;
import android.app.IActivityManager;
import android.app.IStopUserCallback;
-import android.app.admin.DevicePolicyManager;
-import android.app.admin.DevicePolicyManagerInternal;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -36,6 +34,7 @@
import android.graphics.Bitmap;
import android.os.Binder;
import android.os.Bundle;
+import android.os.Debug;
import android.os.Environment;
import android.os.FileUtils;
import android.os.Handler;
@@ -48,7 +47,6 @@
import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.ShellCommand;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.UserManagerInternal;
@@ -97,15 +95,15 @@
*
* Method naming convention:
* <ul>
- * <li> Methods suffixed with "LILP" should be called within {@link #mInstallLock} and
- * {@link #mPackagesLock} locks obtained in the respective order.
+ * <li> Methods suffixed with "LP" should be called within the {@link #mPackagesLock} lock.
* <li> Methods suffixed with "LR" should be called within the {@link #mRestrictionsLock} lock.
* <li> Methods suffixed with "LU" should be called within the {@link #mUsersLock} lock.
* </ul>
*/
public class UserManagerService extends IUserManager.Stub {
private static final String LOG_TAG = "UserManagerService";
- private static final boolean DBG = false; // DO NOT SUBMIT WITH TRUE
+ static final boolean DBG = false; // DO NOT SUBMIT WITH TRUE
+ private static final boolean DBG_WITH_STACKTRACE = false; // DO NOT SUBMIT WITH TRUE
private static final String TAG_NAME = "name";
private static final String ATTR_FLAGS = "flags";
@@ -124,6 +122,7 @@
private static final String TAG_USERS = "users";
private static final String TAG_USER = "user";
private static final String TAG_RESTRICTIONS = "restrictions";
+ private static final String TAG_DEVICE_POLICY_RESTRICTIONS = "device_policy_restrictions";
private static final String TAG_ENTRY = "entry";
private static final String TAG_VALUE = "value";
private static final String ATTR_KEY = "key";
@@ -164,7 +163,6 @@
private final Context mContext;
private final PackageManagerService mPm;
- private final Object mInstallLock;
private final Object mPackagesLock;
// Short-term lock for internal state, when interaction/sync with PM is not required
private final Object mUsersLock = new Object();
@@ -208,13 +206,29 @@
private final SparseArray<Bundle> mCachedEffectiveUserRestrictions = new SparseArray<>();
/**
- * User restrictions that have already been applied in {@link #applyUserRestrictionsLR}. We
- * use it to detect restrictions that have changed since the last
- * {@link #applyUserRestrictionsLR} call.
+ * User restrictions that have already been applied in
+ * {@link #updateUserRestrictionsInternalLR(Bundle, int)}. We use it to detect restrictions
+ * that have changed since the last
+ * {@link #updateUserRestrictionsInternalLR(Bundle, int)} call.
*/
@GuardedBy("mRestrictionsLock")
private final SparseArray<Bundle> mAppliedUserRestrictions = new SparseArray<>();
+ /**
+ * User restrictions set by {@link com.android.server.devicepolicy.DevicePolicyManagerService}
+ * that should be applied to all users, including guests.
+ */
+ @GuardedBy("mRestrictionsLock")
+ private Bundle mDevicePolicyGlobalUserRestrictions;
+
+ /**
+ * User restrictions set by {@link com.android.server.devicepolicy.DevicePolicyManagerService}
+ * for each user.
+ */
+ @GuardedBy("mRestrictionsLock")
+ private final SparseArray<Bundle> mDevicePolicyLocalUserRestrictions = new SparseArray<>();
+
+ @GuardedBy("mGuestRestrictions")
private final Bundle mGuestRestrictions = new Bundle();
/**
@@ -226,6 +240,7 @@
@GuardedBy("mUsersLock")
private int[] mUserIds;
+ @GuardedBy("mPackagesLock")
private int mNextSerialNumber;
private int mUserVersion = 0;
@@ -233,6 +248,12 @@
private final LocalService mLocalService;
+ @GuardedBy("mUsersLock")
+ private boolean mIsDeviceManaged;
+
+ @GuardedBy("mUsersLock")
+ private final SparseBooleanArray mIsUserManaged = new SparseBooleanArray();
+
@GuardedBy("mUserRestrictionsListeners")
private final ArrayList<UserRestrictionsListener> mUserRestrictionsListeners =
new ArrayList<>();
@@ -245,11 +266,9 @@
}
}
- /**
- * Available for testing purposes.
- */
- UserManagerService(File dataDir, File baseUserPath) {
- this(null, null, new Object(), new Object(), dataDir, baseUserPath);
+ @VisibleForTesting
+ UserManagerService(File dataDir) {
+ this(null, null, new Object(), dataDir);
}
/**
@@ -257,78 +276,61 @@
* associated with the package manager, and the given lock is the
* package manager's own lock.
*/
- UserManagerService(Context context, PackageManagerService pm,
- Object installLock, Object packagesLock) {
- this(context, pm, installLock, packagesLock,
- Environment.getDataDirectory(),
- new File(Environment.getDataDirectory(), "user"));
+ UserManagerService(Context context, PackageManagerService pm, Object packagesLock) {
+ this(context, pm, packagesLock, Environment.getDataDirectory());
}
- /**
- * Available for testing purposes.
- */
private UserManagerService(Context context, PackageManagerService pm,
- Object installLock, Object packagesLock,
- File dataDir, File baseUserPath) {
+ Object packagesLock, File dataDir) {
mContext = context;
mPm = pm;
- mInstallLock = installLock;
mPackagesLock = packagesLock;
mHandler = new MainHandler();
- synchronized (mInstallLock) {
- synchronized (mPackagesLock) {
- mUsersDir = new File(dataDir, USER_INFO_DIR);
- mUsersDir.mkdirs();
- // Make zeroth user directory, for services to migrate their files to that location
- File userZeroDir = new File(mUsersDir, String.valueOf(UserHandle.USER_SYSTEM));
- userZeroDir.mkdirs();
- FileUtils.setPermissions(mUsersDir.toString(),
- FileUtils.S_IRWXU|FileUtils.S_IRWXG
- |FileUtils.S_IROTH|FileUtils.S_IXOTH,
- -1, -1);
- mUserListFile = new File(mUsersDir, USER_LIST_FILENAME);
- initDefaultGuestRestrictions();
- readUserListLILP();
- sInstance = this;
- }
+ synchronized (mPackagesLock) {
+ mUsersDir = new File(dataDir, USER_INFO_DIR);
+ mUsersDir.mkdirs();
+ // Make zeroth user directory, for services to migrate their files to that location
+ File userZeroDir = new File(mUsersDir, String.valueOf(UserHandle.USER_SYSTEM));
+ userZeroDir.mkdirs();
+ FileUtils.setPermissions(mUsersDir.toString(),
+ FileUtils.S_IRWXU | FileUtils.S_IRWXG | FileUtils.S_IROTH | FileUtils.S_IXOTH,
+ -1, -1);
+ mUserListFile = new File(mUsersDir, USER_LIST_FILENAME);
+ initDefaultGuestRestrictions();
+ readUserListLP();
+ sInstance = this;
}
mLocalService = new LocalService();
LocalServices.addService(UserManagerInternal.class, mLocalService);
}
void systemReady() {
- synchronized (mInstallLock) {
- synchronized (mPackagesLock) {
- synchronized (mUsersLock) {
- // Prune out any partially created/partially removed users.
- ArrayList<UserInfo> partials = new ArrayList<UserInfo>();
- final int userSize = mUsers.size();
- for (int i = 0; i < userSize; i++) {
- UserInfo ui = mUsers.valueAt(i);
- if ((ui.partial || ui.guestToRemove) && i != 0) {
- partials.add(ui);
- }
- }
- final int partialsSize = partials.size();
- for (int i = 0; i < partialsSize; i++) {
- UserInfo ui = partials.get(i);
- Slog.w(LOG_TAG, "Removing partially created user " + ui.id
- + " (name=" + ui.name + ")");
- removeUserStateLILP(ui.id);
- }
+ // Prune out any partially created/partially removed users.
+ ArrayList<UserInfo> partials = new ArrayList<>();
+ synchronized (mUsersLock) {
+ final int userSize = mUsers.size();
+ for (int i = 0; i < userSize; i++) {
+ UserInfo ui = mUsers.valueAt(i);
+ if ((ui.partial || ui.guestToRemove) && i != 0) {
+ partials.add(ui);
}
}
}
+ final int partialsSize = partials.size();
+ for (int i = 0; i < partialsSize; i++) {
+ UserInfo ui = partials.get(i);
+ Slog.w(LOG_TAG, "Removing partially created user " + ui.id
+ + " (name=" + ui.name + ")");
+ removeUserState(ui.id);
+ }
+
onUserForeground(UserHandle.USER_SYSTEM);
+
mAppOpsService = IAppOpsService.Stub.asInterface(
ServiceManager.getService(Context.APP_OPS_SERVICE));
- for (int i = 0; i < mUserIds.length; ++i) {
- final int userId = mUserIds[i];
- try {
- mAppOpsService.setUserRestrictions(getEffectiveUserRestrictions(userId), userId);
- } catch (RemoteException e) {
- Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions");
- }
+
+ synchronized (mRestrictionsLock) {
+ applyUserRestrictionsLR(UserHandle.USER_SYSTEM);
}
}
@@ -339,7 +341,7 @@
final int userSize = mUsers.size();
for (int i = 0; i < userSize; i++) {
UserInfo ui = mUsers.valueAt(i);
- if (ui.isPrimary()) {
+ if (ui.isPrimary() && !mRemovingUserIds.get(ui.id)) {
return ui;
}
}
@@ -409,7 +411,7 @@
@Override
public int getCredentialOwnerProfile(int userHandle) {
checkManageUsersPermission("get the credential owner");
- if (!mContext.getSystemService(StorageManager.class).isPerUserEncryptionEnabled()) {
+ if (!StorageManager.isFileBasedEncryptionEnabled()) {
synchronized (mUsersLock) {
UserInfo profileParent = getProfileParentLU(userHandle);
if (profileParent != null) {
@@ -513,11 +515,9 @@
if (!userInfo.isAdmin()) {
return false;
}
+ // restricted profile can be created if there is no DO set and the admin user has no PO;
+ return !mIsDeviceManaged && !mIsUserManaged.get(userId);
}
- DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
- Context.DEVICE_POLICY_SERVICE);
- // restricted profile can be created if there is no DO set and the admin user has no PO
- return dpm.getDeviceOwner() == null && dpm.getProfileOwnerAsUser(userId) == null;
}
/*
@@ -627,17 +627,22 @@
public void makeInitialized(int userId) {
checkManageUsersPermission("makeInitialized");
- synchronized (mPackagesLock) {
- UserInfo info = getUserInfoNoChecks(userId);
+ boolean scheduleWriteUser = false;
+ UserInfo info;
+ synchronized (mUsersLock) {
+ info = mUsers.get(userId);
if (info == null || info.partial) {
Slog.w(LOG_TAG, "makeInitialized: unknown user #" + userId);
- // TODO Check if we should return here instead of a null check below
+ return;
}
- if (info != null && (info.flags&UserInfo.FLAG_INITIALIZED) == 0) {
+ if ((info.flags & UserInfo.FLAG_INITIALIZED) == 0) {
info.flags |= UserInfo.FLAG_INITIALIZED;
- scheduleWriteUser(info);
+ scheduleWriteUser = true;
}
}
+ if (scheduleWriteUser) {
+ scheduleWriteUser(info);
+ }
}
/**
@@ -645,17 +650,19 @@
* restrictions.
*/
private void initDefaultGuestRestrictions() {
- if (mGuestRestrictions.isEmpty()) {
- mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true);
- mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);
+ synchronized (mGuestRestrictions) {
+ if (mGuestRestrictions.isEmpty()) {
+ mGuestRestrictions.putBoolean(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true);
+ mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true);
+ mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);
+ }
}
}
@Override
public Bundle getDefaultGuestRestrictions() {
checkManageUsersPermission("getDefaultGuestRestrictions");
- // TODO Switch to mGuestRestrictions for locking
- synchronized (mPackagesLock) {
+ synchronized (mGuestRestrictions) {
return new Bundle(mGuestRestrictions);
}
}
@@ -663,28 +670,81 @@
@Override
public void setDefaultGuestRestrictions(Bundle restrictions) {
checkManageUsersPermission("setDefaultGuestRestrictions");
- synchronized (mInstallLock) {
- synchronized (mPackagesLock) {
- mGuestRestrictions.clear();
- mGuestRestrictions.putAll(restrictions);
- writeUserListLILP();
+ synchronized (mGuestRestrictions) {
+ mGuestRestrictions.clear();
+ mGuestRestrictions.putAll(restrictions);
+ }
+ synchronized (mPackagesLock) {
+ writeUserListLP();
+ }
+ }
+
+ /**
+ * See {@link UserManagerInternal#setDevicePolicyUserRestrictions(int, Bundle, Bundle)}
+ */
+ void setDevicePolicyUserRestrictions(int userId, @NonNull Bundle local,
+ @Nullable Bundle global) {
+ Preconditions.checkNotNull(local);
+ boolean globalChanged = false;
+ boolean localChanged;
+ synchronized (mRestrictionsLock) {
+ if (global != null) {
+ // Update global.
+ globalChanged = !UserRestrictionsUtils.areEqual(
+ mDevicePolicyGlobalUserRestrictions, global);
+ if (globalChanged) {
+ mDevicePolicyGlobalUserRestrictions = global;
+ }
+ }
+ {
+ // Update local.
+ final Bundle prev = mDevicePolicyLocalUserRestrictions.get(userId);
+ localChanged = !UserRestrictionsUtils.areEqual(prev, local);
+ if (localChanged) {
+ mDevicePolicyLocalUserRestrictions.put(userId, local);
+ }
+ }
+ }
+ if (DBG) {
+ Log.d(LOG_TAG, "setDevicePolicyUserRestrictions: userId=" + userId
+ + " global=" + global + (globalChanged ? " (changed)" : "")
+ + " local=" + local + (localChanged ? " (changed)" : "")
+ );
+ }
+ // Don't call them within the mRestrictionsLock.
+ synchronized (mPackagesLock) {
+ if (globalChanged) {
+ writeUserListLP();
+ }
+ if (localChanged) {
+ writeUserLP(getUserInfoNoChecks(userId));
+ }
+ }
+
+ synchronized (mRestrictionsLock) {
+ if (globalChanged) {
+ applyUserRestrictionsForAllUsersLR();
+ } else if (localChanged) {
+ applyUserRestrictionsLR(userId);
}
}
}
@GuardedBy("mRestrictionsLock")
private Bundle computeEffectiveUserRestrictionsLR(int userId) {
- final DevicePolicyManagerInternal dpmi =
- LocalServices.getService(DevicePolicyManagerInternal.class);
- final Bundle systemRestrictions = mBaseUserRestrictions.get(userId);
+ final Bundle baseRestrictions =
+ UserRestrictionsUtils.nonNull(mBaseUserRestrictions.get(userId));
+ final Bundle global = mDevicePolicyGlobalUserRestrictions;
+ final Bundle local = mDevicePolicyLocalUserRestrictions.get(userId);
- final Bundle effective;
- if (dpmi == null) {
- // TODO Make sure it's because DPMS is disabled and not because we called it too early.
- effective = systemRestrictions;
- } else {
- effective = dpmi.getComposedUserRestrictions(userId, systemRestrictions);
+ if (UserRestrictionsUtils.isEmpty(global) && UserRestrictionsUtils.isEmpty(local)) {
+ // Common case first.
+ return baseRestrictions;
}
+ final Bundle effective = UserRestrictionsUtils.clone(baseRestrictions);
+ UserRestrictionsUtils.merge(effective, global);
+ UserRestrictionsUtils.merge(effective, local);
+
return effective;
}
@@ -720,30 +780,17 @@
*/
@Override
public Bundle getUserRestrictions(int userId) {
- Bundle restrictions = getEffectiveUserRestrictions(userId);
- return restrictions != null ? new Bundle(restrictions) : new Bundle();
+ return UserRestrictionsUtils.clone(getEffectiveUserRestrictions(userId));
}
@Override
public void setUserRestriction(String key, boolean value, int userId) {
checkManageUsersPermission("setUserRestriction");
- if (!UserRestrictionsUtils.SYSTEM_CONTROLLED_USER_RESTRICTIONS.contains(key)) {
- setUserRestrictionNoCheck(key, value, userId);
- }
- }
-
- @Override
- public void setSystemControlledUserRestriction(String key, boolean value, int userId) {
- checkSystemOrRoot("setSystemControlledUserRestriction");
- setUserRestrictionNoCheck(key, value, userId);
- }
-
- private void setUserRestrictionNoCheck(String key, boolean value, int userId) {
synchronized (mRestrictionsLock) {
// Note we can't modify Bundles stored in mBaseUserRestrictions directly, so create
// a copy.
- final Bundle newRestrictions = new Bundle();
- UserRestrictionsUtils.merge(newRestrictions, mBaseUserRestrictions.get(userId));
+ final Bundle newRestrictions = UserRestrictionsUtils.clone(
+ mBaseUserRestrictions.get(userId));
newRestrictions.putBoolean(key, value);
updateUserRestrictionsInternalLR(newRestrictions, userId);
@@ -751,75 +798,70 @@
}
/**
- * Optionally updating user restrictions, calculate the effective user restrictions by
- * consulting {@link com.android.server.devicepolicy.DevicePolicyManagerService} and also
- * apply it to {@link com.android.server.AppOpsService}.
- * TODO applyUserRestrictionsLocked() should also apply to system settings.
+ * Optionally updating user restrictions, calculate the effective user restrictions and also
+ * propagate to other services and system settings.
*
- * @param newRestrictions User restrictions to set. If null, only the effective restrictions
- * will be updated. Note don't pass an existing Bundle in {@link #mBaseUserRestrictions}
- * or {@link #mCachedEffectiveUserRestrictions}; that'll most likely cause a sub
+ * @param newRestrictions User restrictions to set.
+ * If null, will not update user restrictions and only does the propagation.
* @param userId target user ID.
*/
@GuardedBy("mRestrictionsLock")
private void updateUserRestrictionsInternalLR(
@Nullable Bundle newRestrictions, int userId) {
- if (DBG) {
- Log.d(LOG_TAG, "updateUserRestrictionsInternalLocked userId=" + userId
- + " bundle=" + newRestrictions);
- }
- // Update system restrictions.
+
+ final Bundle prevAppliedRestrictions = UserRestrictionsUtils.nonNull(
+ mAppliedUserRestrictions.get(userId));
+
+ // Update base restrictions.
if (newRestrictions != null) {
// If newRestrictions == the current one, it's probably a bug.
- Preconditions.checkState(mBaseUserRestrictions.get(userId) != newRestrictions);
+ final Bundle prevBaseRestrictions = mBaseUserRestrictions.get(userId);
+
+ Preconditions.checkState(prevBaseRestrictions != newRestrictions);
Preconditions.checkState(mCachedEffectiveUserRestrictions.get(userId)
!= newRestrictions);
- mBaseUserRestrictions.put(userId, newRestrictions);
- scheduleWriteUser(mUsers.get(userId));
+
+ if (!UserRestrictionsUtils.areEqual(prevBaseRestrictions, newRestrictions)) {
+ mBaseUserRestrictions.put(userId, newRestrictions);
+ scheduleWriteUser(getUserInfoNoChecks(userId));
+ }
}
final Bundle effective = computeEffectiveUserRestrictionsLR(userId);
mCachedEffectiveUserRestrictions.put(userId, effective);
- applyUserRestrictionsLR(userId, effective);
- }
-
- @GuardedBy("mRestrictionsLock")
- private void applyUserRestrictionsLR(int userId, Bundle newRestrictions) {
- if (newRestrictions == null) {
- newRestrictions = Bundle.EMPTY;
- }
-
- Bundle prevRestrictions = mAppliedUserRestrictions.get(userId);
- if (prevRestrictions == null) {
- prevRestrictions = Bundle.EMPTY;
- }
-
+ // Apply the new restrictions.
if (DBG) {
- Log.d(LOG_TAG, "applyUserRestrictionsRL userId=" + userId
- + " new=" + newRestrictions + " prev=" + prevRestrictions);
+ debug("Applying user restrictions: userId=" + userId
+ + " new=" + effective + " prev=" + prevAppliedRestrictions);
}
- final long token = Binder.clearCallingIdentity();
- try {
- mAppOpsService.setUserRestrictions(newRestrictions, userId);
- } catch (RemoteException e) {
- Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions");
- } finally {
- Binder.restoreCallingIdentity(token);
+ if (mAppOpsService != null) { // We skip it until system-ready.
+ final long token = Binder.clearCallingIdentity();
+ try {
+ mAppOpsService.setUserRestrictions(effective, userId);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions");
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
}
- UserRestrictionsUtils.applyUserRestrictionsLR(
- mContext, userId, newRestrictions, prevRestrictions);
+ propagateUserRestrictionsLR(userId, effective, prevAppliedRestrictions);
- notifyUserRestrictionsListeners(userId, newRestrictions, prevRestrictions);
-
- mAppliedUserRestrictions.put(userId, new Bundle(newRestrictions));
+ mAppliedUserRestrictions.put(userId, new Bundle(effective));
}
- private void notifyUserRestrictionsListeners(final int userId,
+ private void propagateUserRestrictionsLR(final int userId,
Bundle newRestrictions, Bundle prevRestrictions) {
+ // Note this method doesn't touch any state, meaning it doesn't require mRestrictionsLock
+ // actually, but we still need some kind of synchronization otherwise we might end up
+ // calling listeners out-of-order, thus "LR".
+
+ if (UserRestrictionsUtils.areEqual(newRestrictions, prevRestrictions)) {
+ return;
+ }
final Bundle newRestrictionsFinal = new Bundle(newRestrictions);
final Bundle prevRestrictionsFinal = new Bundle(prevRestrictions);
@@ -827,6 +869,9 @@
mHandler.post(new Runnable() {
@Override
public void run() {
+ UserRestrictionsUtils.applyUserRestrictions(
+ mContext, userId, newRestrictionsFinal, prevRestrictionsFinal);
+
final UserRestrictionsListener[] listeners;
synchronized (mUserRestrictionsListeners) {
listeners = new UserRestrictionsListener[mUserRestrictionsListeners.size()];
@@ -840,13 +885,17 @@
});
}
- @GuardedBy("mRestrictionsLock")
- private void updateEffectiveUserRestrictionsLR(int userId) {
+ // Package private for the inner class.
+ void applyUserRestrictionsLR(int userId) {
updateUserRestrictionsInternalLR(null, userId);
}
@GuardedBy("mRestrictionsLock")
- private void updateEffectiveUserRestrictionsForAllUsersLR() {
+ // Package private for the inner class.
+ void applyUserRestrictionsForAllUsersLR() {
+ if (DBG) {
+ debug("applyUserRestrictionsForAllUsersLR");
+ }
// First, invalidate all cached values.
mCachedEffectiveUserRestrictions.clear();
@@ -867,10 +916,9 @@
// It's okay if a new user has started after the getRunningUserIds() call,
// because we'll do the same thing (re-calculate the restrictions and apply)
// when we start a user.
- // TODO: "Apply restrictions upon user start hasn't been implemented. Implement it.
synchronized (mRestrictionsLock) {
for (int i = 0; i < runningUsers.length; i++) {
- updateUserRestrictionsInternalLR(null, runningUsers[i]);
+ applyUserRestrictionsLR(runningUsers[i]);
}
}
}
@@ -996,9 +1044,9 @@
}
}
- private void readUserListLILP() {
+ private void readUserListLP() {
if (!mUserListFile.exists()) {
- fallbackToSingleUserLILP();
+ fallbackToSingleUserLP();
return;
}
FileInputStream fis = null;
@@ -1015,7 +1063,7 @@
if (type != XmlPullParser.START_TAG) {
Slog.e(LOG_TAG, "Unable to read user list");
- fallbackToSingleUserLILP();
+ fallbackToSingleUserLP();
return;
}
@@ -1031,12 +1079,14 @@
}
}
+ final Bundle newDevicePolicyGlobalUserRestrictions = new Bundle();
+
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
if (type == XmlPullParser.START_TAG) {
final String name = parser.getName();
if (name.equals(TAG_USER)) {
String id = parser.getAttributeValue(null, ATTR_ID);
- UserInfo user = readUserLILP(Integer.parseInt(id));
+ UserInfo user = readUserLP(Integer.parseInt(id));
if (user != null) {
synchronized (mUsersLock) {
@@ -1051,8 +1101,14 @@
&& type != XmlPullParser.END_TAG) {
if (type == XmlPullParser.START_TAG) {
if (parser.getName().equals(TAG_RESTRICTIONS)) {
- UserRestrictionsUtils
- .readRestrictions(parser, mGuestRestrictions);
+ synchronized (mGuestRestrictions) {
+ UserRestrictionsUtils
+ .readRestrictions(parser, mGuestRestrictions);
+ }
+ } else if (parser.getName().equals(TAG_DEVICE_POLICY_RESTRICTIONS)
+ ) {
+ UserRestrictionsUtils.readRestrictions(parser,
+ newDevicePolicyGlobalUserRestrictions);
}
break;
}
@@ -1060,26 +1116,23 @@
}
}
}
- updateUserIds();
- upgradeIfNecessaryLILP();
- } catch (IOException ioe) {
- fallbackToSingleUserLILP();
- } catch (XmlPullParserException pe) {
- fallbackToSingleUserLILP();
- } finally {
- if (fis != null) {
- try {
- fis.close();
- } catch (IOException e) {
- }
+ synchronized (mRestrictionsLock) {
+ mDevicePolicyGlobalUserRestrictions = newDevicePolicyGlobalUserRestrictions;
}
+ updateUserIds();
+ upgradeIfNecessaryLP();
+ } catch (IOException | XmlPullParserException e) {
+ fallbackToSingleUserLP();
+ } finally {
+ IoUtils.closeQuietly(fis);
}
}
/**
* Upgrade steps between versions, either for fixing bugs or changing the data format.
*/
- private void upgradeIfNecessaryLILP() {
+ private void upgradeIfNecessaryLP() {
+ final int originalVersion = mUserVersion;
int userVersion = mUserVersion;
if (userVersion < 1) {
// Assign a proper name for the owner, if not initialized correctly before
@@ -1132,11 +1185,14 @@
+ USER_VERSION);
} else {
mUserVersion = userVersion;
- writeUserListLILP();
+
+ if (originalVersion < mUserVersion) {
+ writeUserListLP();
+ }
}
}
- private void fallbackToSingleUserLILP() {
+ private void fallbackToSingleUserLP() {
int flags = UserInfo.FLAG_INITIALIZED;
// In split system user mode, the admin and primary flags are assigned to the first human
// user.
@@ -1161,11 +1217,14 @@
updateUserIds();
initDefaultGuestRestrictions();
- writeUserListLILP();
+ writeUserListLP();
writeUserLP(system);
}
private void scheduleWriteUser(UserInfo userInfo) {
+ if (DBG) {
+ debug("scheduleWriteUser");
+ }
// No need to wrap it within a lock -- worst case, we'll just post the same message
// twice.
if (!mHandler.hasMessages(WRITE_USER_MSG, userInfo)) {
@@ -1182,6 +1241,9 @@
* </user>
*/
private void writeUserLP(UserInfo userInfo) {
+ if (DBG) {
+ debug("writeUserLP " + userInfo);
+ }
FileOutputStream fos = null;
AtomicFile userFile = new AtomicFile(new File(mUsersDir, userInfo.id + XML_SUFFIX));
try {
@@ -1221,13 +1283,12 @@
serializer.startTag(null, TAG_NAME);
serializer.text(userInfo.name);
serializer.endTag(null, TAG_NAME);
- Bundle restrictions;
synchronized (mRestrictionsLock) {
- restrictions = mBaseUserRestrictions.get(userInfo.id);
- }
- if (restrictions != null) {
- UserRestrictionsUtils
- .writeRestrictions(serializer, restrictions, TAG_RESTRICTIONS);
+ UserRestrictionsUtils.writeRestrictions(serializer,
+ mBaseUserRestrictions.get(userInfo.id), TAG_RESTRICTIONS);
+ UserRestrictionsUtils.writeRestrictions(serializer,
+ mDevicePolicyLocalUserRestrictions.get(userInfo.id),
+ TAG_DEVICE_POLICY_RESTRICTIONS);
}
serializer.endTag(null, TAG_USER);
@@ -1247,8 +1308,10 @@
* <user id="2"></user>
* </users>
*/
- private void writeUserListLILP() {
- // TODO Investigate removing a dependency on mInstallLock
+ private void writeUserListLP() {
+ if (DBG) {
+ debug("writeUserList");
+ }
FileOutputStream fos = null;
AtomicFile userListFile = new AtomicFile(mUserListFile);
try {
@@ -1266,9 +1329,15 @@
serializer.attribute(null, ATTR_USER_VERSION, Integer.toString(mUserVersion));
serializer.startTag(null, TAG_GUEST_RESTRICTIONS);
- UserRestrictionsUtils
- .writeRestrictions(serializer, mGuestRestrictions, TAG_RESTRICTIONS);
+ synchronized (mGuestRestrictions) {
+ UserRestrictionsUtils
+ .writeRestrictions(serializer, mGuestRestrictions, TAG_RESTRICTIONS);
+ }
serializer.endTag(null, TAG_GUEST_RESTRICTIONS);
+ synchronized (mRestrictionsLock) {
+ UserRestrictionsUtils.writeRestrictions(serializer,
+ mDevicePolicyGlobalUserRestrictions, TAG_DEVICE_POLICY_RESTRICTIONS);
+ }
int[] userIdsToWrite;
synchronized (mUsersLock) {
userIdsToWrite = new int[mUsers.size()];
@@ -1293,7 +1362,7 @@
}
}
- private UserInfo readUserLILP(int id) {
+ private UserInfo readUserLP(int id) {
int flags = 0;
int serialNumber = id;
String name = null;
@@ -1304,7 +1373,8 @@
int restrictedProfileParentId = UserInfo.NO_PROFILE_GROUP_ID;
boolean partial = false;
boolean guestToRemove = false;
- Bundle restrictions = new Bundle();
+ Bundle baseRestrictions = new Bundle();
+ Bundle localRestrictions = new Bundle();
FileInputStream fis = null;
try {
@@ -1361,7 +1431,9 @@
name = parser.getText();
}
} else if (TAG_RESTRICTIONS.equals(tag)) {
- UserRestrictionsUtils.readRestrictions(parser, restrictions);
+ UserRestrictionsUtils.readRestrictions(parser, baseRestrictions);
+ } else if (TAG_DEVICE_POLICY_RESTRICTIONS.equals(tag)) {
+ UserRestrictionsUtils.readRestrictions(parser, localRestrictions);
}
}
}
@@ -1375,7 +1447,8 @@
userInfo.profileGroupId = profileGroupId;
userInfo.restrictedProfileParentId = restrictedProfileParentId;
synchronized (mRestrictionsLock) {
- mBaseUserRestrictions.append(id, restrictions);
+ mBaseUserRestrictions.put(id, baseRestrictions);
+ mDevicePolicyLocalUserRestrictions.put(id, localRestrictions);
}
return userInfo;
@@ -1468,8 +1541,7 @@
}
private UserInfo createUserInternal(String name, int flags, int parentId) {
- if (getUserRestrictions(UserHandle.getCallingUserId()).getBoolean(
- UserManager.DISALLOW_ADD_USER, false)) {
+ if (hasUserRestriction(UserManager.DISALLOW_ADD_USER, UserHandle.getCallingUserId())) {
Log.w(LOG_TAG, "Cannot add user. DISALLOW_ADD_USER is enabled.");
return null;
}
@@ -1480,120 +1552,118 @@
final boolean isManagedProfile = (flags & UserInfo.FLAG_MANAGED_PROFILE) != 0;
final boolean isRestricted = (flags & UserInfo.FLAG_RESTRICTED) != 0;
final long ident = Binder.clearCallingIdentity();
- UserInfo userInfo = null;
+ UserInfo userInfo;
final int userId;
try {
- synchronized (mInstallLock) {
- synchronized (mPackagesLock) {
- UserInfo parent = null;
- if (parentId != UserHandle.USER_NULL) {
- synchronized (mUsersLock) {
- parent = getUserInfoLU(parentId);
- }
- if (parent == null) return null;
+ synchronized (mPackagesLock) {
+ UserInfo parent = null;
+ if (parentId != UserHandle.USER_NULL) {
+ synchronized (mUsersLock) {
+ parent = getUserInfoLU(parentId);
}
- if (isManagedProfile && !canAddMoreManagedProfiles(parentId, false)) {
- Log.e(LOG_TAG, "Cannot add more managed profiles for user " + parentId);
+ if (parent == null) return null;
+ }
+ if (isManagedProfile && !canAddMoreManagedProfiles(parentId, false)) {
+ Log.e(LOG_TAG, "Cannot add more managed profiles for user " + parentId);
+ return null;
+ }
+ if (!isGuest && !isManagedProfile && isUserLimitReached()) {
+ // If we're not adding a guest user or a managed profile and the limit has
+ // been reached, cannot add a user.
+ return null;
+ }
+ // If we're adding a guest and there already exists one, bail.
+ if (isGuest && findCurrentGuestUser() != null) {
+ return null;
+ }
+ // In legacy mode, restricted profile's parent can only be the owner user
+ if (isRestricted && !UserManager.isSplitSystemUser()
+ && (parentId != UserHandle.USER_SYSTEM)) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be owner");
+ return null;
+ }
+ if (isRestricted && UserManager.isSplitSystemUser()) {
+ if (parent == null) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be "
+ + "specified");
return null;
}
- if (!isGuest && !isManagedProfile && isUserLimitReached()) {
- // If we're not adding a guest user or a managed profile and the limit has
- // been reached, cannot add a user.
+ if (!parent.canHaveProfile()) {
+ Log.w(LOG_TAG, "Cannot add restricted profile - profiles cannot be "
+ + "created for the specified parent user id " + parentId);
return null;
}
- // If we're adding a guest and there already exists one, bail.
- if (isGuest && findCurrentGuestUser() != null) {
- return null;
- }
- // In legacy mode, restricted profile's parent can only be the owner user
- if (isRestricted && !UserManager.isSplitSystemUser()
- && (parentId != UserHandle.USER_SYSTEM)) {
- Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be owner");
- return null;
- }
- if (isRestricted && UserManager.isSplitSystemUser()) {
- if (parent == null) {
- Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be "
- + "specified");
- return null;
- }
- if (!parent.canHaveProfile()) {
- Log.w(LOG_TAG, "Cannot add restricted profile - profiles cannot be "
- + "created for the specified parent user id " + parentId);
- return null;
- }
- }
- // In split system user mode, we assign the first human user the primary flag.
- // And if there is no device owner, we also assign the admin flag to primary
- // user.
- if (UserManager.isSplitSystemUser()
- && !isGuest && !isManagedProfile && getPrimaryUser() == null) {
- flags |= UserInfo.FLAG_PRIMARY;
- DevicePolicyManager devicePolicyManager = (DevicePolicyManager)
- mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
- if (devicePolicyManager == null
- || devicePolicyManager.getDeviceOwner() == null) {
+ }
+ // In split system user mode, we assign the first human user the primary flag.
+ // And if there is no device owner, we also assign the admin flag to primary user.
+ if (UserManager.isSplitSystemUser()
+ && !isGuest && !isManagedProfile && getPrimaryUser() == null) {
+ flags |= UserInfo.FLAG_PRIMARY;
+ synchronized (mUsersLock) {
+ if (!mIsDeviceManaged) {
flags |= UserInfo.FLAG_ADMIN;
}
}
- userId = getNextAvailableId();
- userInfo = new UserInfo(userId, name, null, flags);
- userInfo.serialNumber = mNextSerialNumber++;
- long now = System.currentTimeMillis();
- userInfo.creationTime = (now > EPOCH_PLUS_30_YEARS) ? now : 0;
- userInfo.partial = true;
- Environment.getUserSystemDirectory(userInfo.id).mkdirs();
+ }
+ userId = getNextAvailableId();
+ userInfo = new UserInfo(userId, name, null, flags);
+ userInfo.serialNumber = mNextSerialNumber++;
+ long now = System.currentTimeMillis();
+ userInfo.creationTime = (now > EPOCH_PLUS_30_YEARS) ? now : 0;
+ userInfo.partial = true;
+ Environment.getUserSystemDirectory(userInfo.id).mkdirs();
+ synchronized (mUsersLock) {
mUsers.put(userId, userInfo);
- writeUserListLILP();
- if (parent != null) {
- if (isManagedProfile) {
- if (parent.profileGroupId == UserInfo.NO_PROFILE_GROUP_ID) {
- parent.profileGroupId = parent.id;
- scheduleWriteUser(parent);
- }
- userInfo.profileGroupId = parent.profileGroupId;
- } else if (isRestricted) {
- if (!parent.canHaveProfile()) {
- Log.w(LOG_TAG, "Cannot add restricted profile - parent user must be owner");
- }
- if (parent.restrictedProfileParentId == UserInfo.NO_PROFILE_GROUP_ID) {
- parent.restrictedProfileParentId = parent.id;
- scheduleWriteUser(parent);
- }
- userInfo.restrictedProfileParentId = parent.restrictedProfileParentId;
+ }
+ writeUserListLP();
+ if (parent != null) {
+ if (isManagedProfile) {
+ if (parent.profileGroupId == UserInfo.NO_PROFILE_GROUP_ID) {
+ parent.profileGroupId = parent.id;
+ writeUserLP(parent);
}
- }
-
- final StorageManager storage = mContext.getSystemService(StorageManager.class);
- storage.createUserKey(userId, userInfo.serialNumber);
- for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
- final String volumeUuid = vol.getFsUuid();
- try {
- final File userDir = Environment.getDataUserDirectory(volumeUuid,
- userId);
- storage.prepareUserStorage(volumeUuid, userId, userInfo.serialNumber);
- enforceSerialNumber(userDir, userInfo.serialNumber);
- } catch (IOException e) {
- Log.wtf(LOG_TAG, "Failed to create user directory on " + volumeUuid, e);
+ userInfo.profileGroupId = parent.profileGroupId;
+ } else if (isRestricted) {
+ if (parent.restrictedProfileParentId == UserInfo.NO_PROFILE_GROUP_ID) {
+ parent.restrictedProfileParentId = parent.id;
+ writeUserLP(parent);
}
- }
- mPm.createNewUserLILPw(userId);
- userInfo.partial = false;
- scheduleWriteUser(userInfo);
- updateUserIds();
- Bundle restrictions = new Bundle();
- synchronized (mRestrictionsLock) {
- mBaseUserRestrictions.append(userId, restrictions);
+ userInfo.restrictedProfileParentId = parent.restrictedProfileParentId;
}
}
}
- mPm.newUserCreated(userId);
- if (userInfo != null) {
- Intent addedIntent = new Intent(Intent.ACTION_USER_ADDED);
- addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userInfo.id);
- mContext.sendBroadcastAsUser(addedIntent, UserHandle.ALL,
- android.Manifest.permission.MANAGE_USERS);
+ final StorageManager storage = mContext.getSystemService(StorageManager.class);
+ storage.createUserKey(userId, userInfo.serialNumber);
+ for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
+ final String volumeUuid = vol.getFsUuid();
+ try {
+ final File userDir = Environment.getDataUserDirectory(volumeUuid, userId);
+ storage.prepareUserStorage(volumeUuid, userId, userInfo.serialNumber);
+ enforceSerialNumber(userDir, userInfo.serialNumber);
+ } catch (IOException e) {
+ Log.wtf(LOG_TAG, "Failed to create user directory on " + volumeUuid, e);
+ }
}
+ mPm.createNewUser(userId);
+ userInfo.partial = false;
+ synchronized (mPackagesLock) {
+ writeUserLP(userInfo);
+ }
+ updateUserIds();
+ Bundle restrictions = new Bundle();
+ if (isGuest) {
+ synchronized (mGuestRestrictions) {
+ restrictions.putAll(mGuestRestrictions);
+ }
+ }
+ synchronized (mRestrictionsLock) {
+ mBaseUserRestrictions.append(userId, restrictions);
+ }
+ mPm.newUserCreated(userId);
+ Intent addedIntent = new Intent(Intent.ACTION_USER_ADDED);
+ addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
+ mContext.sendBroadcastAsUser(addedIntent, UserHandle.ALL,
+ android.Manifest.permission.MANAGE_USERS);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -1739,8 +1809,8 @@
if (DBG) Slog.i(LOG_TAG, "Stopping user " + userHandle);
int res;
try {
- res = ActivityManagerNative.getDefault().stopUser(userHandle,
- new IStopUserCallback.Stub() {
+ res = ActivityManagerNative.getDefault().stopUser(userHandle, /* force= */ true,
+ new IStopUserCallback.Stub() {
@Override
public void userStopped(int userId) {
finishRemoveUser(userId);
@@ -1782,11 +1852,7 @@
// Clean up any ActivityManager state
LocalServices.getService(ActivityManagerInternal.class)
.onUserRemoved(userHandle);
- synchronized (mInstallLock) {
- synchronized (mPackagesLock) {
- removeUserStateLILP(userHandle);
- }
- }
+ removeUserState(userHandle);
}
}.start();
}
@@ -1798,20 +1864,29 @@
}
}
- private void removeUserStateLILP(final int userHandle) {
+ private void removeUserState(final int userHandle) {
mContext.getSystemService(StorageManager.class).destroyUserKey(userHandle);
// Cleanup package manager settings
- mPm.cleanUpUserLILPw(this, userHandle);
+ mPm.cleanUpUser(this, userHandle);
// Remove this user from the list
synchronized (mUsersLock) {
mUsers.remove(userHandle);
+ mIsUserManaged.delete(userHandle);
+ }
+ synchronized (mRestrictionsLock) {
+ mBaseUserRestrictions.remove(userHandle);
+ mAppliedUserRestrictions.remove(userHandle);
+ mCachedEffectiveUserRestrictions.remove(userHandle);
+ mDevicePolicyLocalUserRestrictions.remove(userHandle);
}
// Remove user file
AtomicFile userFile = new AtomicFile(new File(mUsersDir, userHandle + XML_SUFFIX));
userFile.delete();
// Update the user list
- writeUserListLILP();
+ synchronized (mPackagesLock) {
+ writeUserListLP();
+ }
updateUserIds();
removeDirectoryRecursive(Environment.getUserSystemDirectory(userHandle));
}
@@ -2142,21 +2217,28 @@
}
/**
+ * Called right before a user starts. This will not be called for the system user.
+ */
+ public void onBeforeStartUser(int userId) {
+ synchronized (mRestrictionsLock) {
+ applyUserRestrictionsLR(userId);
+ }
+ }
+
+ /**
* Make a note of the last started time of a user and do some cleanup.
* @param userId the user that was just foregrounded
*/
public void onUserForeground(int userId) {
- synchronized (mPackagesLock) {
- UserInfo user = getUserInfoNoChecks(userId);
- long now = System.currentTimeMillis();
- if (user == null || user.partial) {
- Slog.w(LOG_TAG, "userForeground: unknown user #" + userId);
- return;
- }
- if (now > EPOCH_PLUS_30_YEARS) {
- user.lastLoggedInTime = now;
- scheduleWriteUser(user);
- }
+ UserInfo user = getUserInfoNoChecks(userId);
+ if (user == null || user.partial) {
+ Slog.w(LOG_TAG, "userForeground: unknown user #" + userId);
+ return;
+ }
+ long now = System.currentTimeMillis();
+ if (now > EPOCH_PLUS_30_YEARS) {
+ user.lastLoggedInTime = now;
+ scheduleWriteUser(user);
}
}
@@ -2164,7 +2246,6 @@
* Returns the next available user id, filling in any holes in the ids.
* TODO: May not be a good idea to recycle ids, in case it results in confusion
* for data and battery stats collection, or unexpected cross-talk.
- * @return
*/
private int getNextAvailableId() {
synchronized (mUsersLock) {
@@ -2309,9 +2390,10 @@
if (user == null) {
continue;
}
+ final int userId = user.id;
pw.print(" "); pw.print(user);
pw.print(" serialNo="); pw.print(user.serialNumber);
- if (mRemovingUserIds.get(mUsers.keyAt(i))) {
+ if (mRemovingUserIds.get(userId)) {
pw.print(" <removing> ");
}
if (user.partial) {
@@ -2336,19 +2418,36 @@
sb.append(" ago");
pw.println(sb);
}
+ pw.print(" Has profile owner: ");
+ pw.println(mIsUserManaged.get(userId));
pw.println(" Restrictions:");
synchronized (mRestrictionsLock) {
UserRestrictionsUtils.dumpRestrictions(
pw, " ", mBaseUserRestrictions.get(user.id));
+ pw.println(" Device policy local restrictions:");
+ UserRestrictionsUtils.dumpRestrictions(
+ pw, " ", mDevicePolicyLocalUserRestrictions.get(user.id));
pw.println(" Effective restrictions:");
UserRestrictionsUtils.dumpRestrictions(
pw, " ", mCachedEffectiveUserRestrictions.get(user.id));
}
+ pw.println();
}
}
+ pw.println(" Device policy global restrictions:");
+ synchronized (mRestrictionsLock) {
+ UserRestrictionsUtils
+ .dumpRestrictions(pw, " ", mDevicePolicyGlobalUserRestrictions);
+ }
pw.println();
- pw.println("Guest restrictions:");
- UserRestrictionsUtils.dumpRestrictions(pw, " ", mGuestRestrictions);
+ pw.println(" Guest restrictions:");
+ synchronized (mGuestRestrictions) {
+ UserRestrictionsUtils.dumpRestrictions(pw, " ", mGuestRestrictions);
+ }
+ synchronized (mUsersLock) {
+ pw.println();
+ pw.println(" Device managed: " + mIsDeviceManaged);
+ }
}
}
@@ -2379,22 +2478,11 @@
}
private class LocalService extends UserManagerInternal {
-
@Override
- public Object getUserRestrictionsLock() {
- return mRestrictionsLock;
- }
-
- @Override
- @GuardedBy("mRestrictionsLock")
- public void updateEffectiveUserRestrictionsLR(int userId) {
- UserManagerService.this.updateEffectiveUserRestrictionsLR(userId);
- }
-
- @Override
- @GuardedBy("mRestrictionsLock")
- public void updateEffectiveUserRestrictionsForAllUsersLR() {
- UserManagerService.this.updateEffectiveUserRestrictionsForAllUsersLR();
+ public void setDevicePolicyUserRestrictions(int userId, @NonNull Bundle localRestrictions,
+ @Nullable Bundle globalRestrictions) {
+ UserManagerService.this.setDevicePolicyUserRestrictions(userId, localRestrictions,
+ globalRestrictions);
}
@Override
@@ -2440,6 +2528,20 @@
mUserRestrictionsListeners.remove(listener);
}
}
+
+ @Override
+ public void setDeviceManaged(boolean isManaged) {
+ synchronized (mUsersLock) {
+ mIsDeviceManaged = isManaged;
+ }
+ }
+
+ @Override
+ public void setUserManaged(int userId, boolean isManaged) {
+ synchronized (mUsersLock) {
+ mIsUserManaged.put(userId, isManaged);
+ }
+ }
}
private class Shell extends ShellCommand {
@@ -2459,4 +2561,9 @@
pw.println(" Prints all users on the system.");
}
}
+
+ private static void debug(String message) {
+ Log.d(LOG_TAG, message +
+ (DBG_WITH_STACKTRACE ? " called at\n" + Debug.getCallers(10, " ") : ""));
+ }
}
diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
index 56e8b3e..816903e 100644
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -18,14 +18,22 @@
import com.google.android.collect.Sets;
+import com.android.internal.util.Preconditions;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
+import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
+import android.util.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlSerializer;
@@ -45,7 +53,7 @@
private UserRestrictionsUtils() {
}
- public static final String[] USER_RESTRICTIONS = {
+ public static final Set<String> USER_RESTRICTIONS = Sets.newArraySet(
UserManager.DISALLOW_CONFIG_WIFI,
UserManager.DISALLOW_MODIFY_ACCOUNTS,
UserManager.DISALLOW_INSTALL_APPS,
@@ -79,28 +87,71 @@
UserManager.DISALLOW_SAFE_BOOT,
UserManager.ALLOW_PARENT_PROFILE_APP_LINKING,
UserManager.DISALLOW_RECORD_AUDIO,
- };
-
- /**
- * Set of user restrictions, which can only be enforced by the system.
- */
- public static final Set<String> SYSTEM_CONTROLLED_USER_RESTRICTIONS = Sets.newArraySet(
- UserManager.DISALLOW_RECORD_AUDIO);
+ UserManager.DISALLOW_CAMERA,
+ UserManager.DISALLOW_RUN_IN_BACKGROUND
+ );
/**
* Set of user restriction which we don't want to persist.
*/
- public static final Set<String> NON_PERSIST_USER_RESTRICTIONS = Sets.newArraySet(
- UserManager.DISALLOW_RECORD_AUDIO);
+ private static final Set<String> NON_PERSIST_USER_RESTRICTIONS = Sets.newArraySet(
+ UserManager.DISALLOW_RECORD_AUDIO
+ );
- public static void writeRestrictions(XmlSerializer serializer, Bundle restrictions,
- String tag) throws IOException {
+ /**
+ * User restrictions that can not be set by profile owners.
+ */
+ private static final Set<String> DEVICE_OWNER_ONLY_RESTRICTIONS = Sets.newArraySet(
+ UserManager.DISALLOW_USB_FILE_TRANSFER,
+ UserManager.DISALLOW_CONFIG_TETHERING,
+ UserManager.DISALLOW_NETWORK_RESET,
+ UserManager.DISALLOW_FACTORY_RESET,
+ UserManager.DISALLOW_ADD_USER,
+ UserManager.DISALLOW_CONFIG_CELL_BROADCASTS,
+ UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
+ UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA,
+ UserManager.DISALLOW_SMS,
+ UserManager.DISALLOW_FUN,
+ UserManager.DISALLOW_SAFE_BOOT,
+ UserManager.DISALLOW_CREATE_WINDOWS
+ );
+
+ /**
+ * User restrictions that can't be changed by device owner or profile owner.
+ */
+ private static final Set<String> IMMUTABLE_BY_OWNERS = Sets.newArraySet(
+ UserManager.DISALLOW_RECORD_AUDIO,
+ UserManager.DISALLOW_WALLPAPER
+ );
+
+ /**
+ * Special user restrictions that can be applied to a user as well as to all users globally,
+ * depending on callers. When device owner sets them, they'll be applied to all users.
+ */
+ private static final Set<String> GLOBAL_RESTRICTIONS = Sets.newArraySet(
+ UserManager.DISALLOW_ADJUST_VOLUME,
+ UserManager.DISALLOW_RUN_IN_BACKGROUND,
+ UserManager.DISALLOW_UNMUTE_MICROPHONE
+ );
+
+ public static void writeRestrictions(@NonNull XmlSerializer serializer,
+ @Nullable Bundle restrictions, @NonNull String tag) throws IOException {
+ if (restrictions == null) {
+ return;
+ }
+
serializer.startTag(null, tag);
- for (String key : USER_RESTRICTIONS) {
- if (restrictions.getBoolean(key)
- && !NON_PERSIST_USER_RESTRICTIONS.contains(key)) {
- serializer.attribute(null, key, "true");
+ for (String key : restrictions.keySet()) {
+ if (NON_PERSIST_USER_RESTRICTIONS.contains(key)) {
+ continue; // Don't persist.
}
+ if (USER_RESTRICTIONS.contains(key)) {
+ if (restrictions.getBoolean(key)) {
+ serializer.attribute(null, key, "true");
+ }
+ continue;
+ }
+ Log.w(TAG, "Unknown user restriction detected: " + key);
}
serializer.endTag(null, tag);
}
@@ -115,7 +166,31 @@
}
}
- public static void merge(Bundle dest, Bundle in) {
+ /**
+ * @return {@code in} itself when it's not null, or an empty bundle (which can writable).
+ */
+ public static Bundle nonNull(@Nullable Bundle in) {
+ return in != null ? in : new Bundle();
+ }
+
+ public static boolean isEmpty(@Nullable Bundle in) {
+ return (in == null) || (in.size() == 0);
+ }
+
+ /**
+ * Creates a copy of the {@code in} Bundle. If {@code in} is null, it'll return an empty
+ * bundle.
+ *
+ * <p>The resulting {@link Bundle} is always writable. (i.e. it won't return
+ * {@link Bundle#EMPTY})
+ */
+ public static @NonNull Bundle clone(@Nullable Bundle in) {
+ return (in != null) ? new Bundle(in) : new Bundle();
+ }
+
+ public static void merge(@NonNull Bundle dest, @Nullable Bundle in) {
+ Preconditions.checkNotNull(dest);
+ Preconditions.checkArgument(dest != in);
if (in == null) {
return;
}
@@ -127,21 +202,82 @@
}
/**
+ * @return true if a restriction is settable by device owner.
+ */
+ public static boolean canDeviceOwnerChange(String restriction) {
+ return !IMMUTABLE_BY_OWNERS.contains(restriction);
+ }
+
+ /**
+ * @return true if a restriction is settable by profile owner.
+ */
+ public static boolean canProfileOwnerChange(String restriction) {
+ return !(IMMUTABLE_BY_OWNERS.contains(restriction)
+ || DEVICE_OWNER_ONLY_RESTRICTIONS.contains(restriction));
+ }
+
+ /**
+ * Takes restrictions that can be set by device owner, and sort them into what should be applied
+ * globally and what should be applied only on the current user.
+ */
+ public static void sortToGlobalAndLocal(@Nullable Bundle in, @NonNull Bundle global,
+ @NonNull Bundle local) {
+ if (in == null || in.size() == 0) {
+ return;
+ }
+ for (String key : in.keySet()) {
+ if (!in.getBoolean(key)) {
+ continue;
+ }
+ if (DEVICE_OWNER_ONLY_RESTRICTIONS.contains(key) || GLOBAL_RESTRICTIONS.contains(key)) {
+ global.putBoolean(key, true);
+ } else {
+ local.putBoolean(key, true);
+ }
+ }
+ }
+
+ /**
+ * @return true if two Bundles contain the same user restriction.
+ * A null bundle and an empty bundle are considered to be equal.
+ */
+ public static boolean areEqual(@Nullable Bundle a, @Nullable Bundle b) {
+ if (a == b) {
+ return true;
+ }
+ if (isEmpty(a)) {
+ return isEmpty(b);
+ }
+ if (isEmpty(b)) {
+ return false;
+ }
+ for (String key : a.keySet()) {
+ if (a.getBoolean(key) != b.getBoolean(key)) {
+ return false;
+ }
+ }
+ for (String key : b.keySet()) {
+ if (a.getBoolean(key) != b.getBoolean(key)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
* Takes a new use restriction set and the previous set, and apply the restrictions that have
* changed.
*
- * <p>Note this method is called by {@link UserManagerService} while holding
- * {@code mRestrictionLock}. Be aware when calling into other services, which could cause
- * a deadlock.
+ * <p>Note this method is called by {@link UserManagerService} without holding any locks.
*/
- public static void applyUserRestrictionsLR(Context context, int userId,
+ public static void applyUserRestrictions(Context context, int userId,
Bundle newRestrictions, Bundle prevRestrictions) {
for (String key : USER_RESTRICTIONS) {
final boolean newValue = newRestrictions.getBoolean(key);
final boolean prevValue = prevRestrictions.getBoolean(key);
if (newValue != prevValue) {
- applyUserRestrictionLR(context, userId, key, newValue);
+ applyUserRestriction(context, userId, key, newValue);
}
}
}
@@ -149,12 +285,16 @@
/**
* Apply each user restriction.
*
- * <p>Note this method is called by {@link UserManagerService} while holding
- * {@code mRestrictionLock}. Be aware when calling into other services, which could cause
- * a deadlock.
+ * <p>See also {@link
+ * com.android.providers.settings.SettingsProvider#isGlobalOrSecureSettingRestrictedForUser},
+ * which should be in sync with this method.
*/
- private static void applyUserRestrictionLR(Context context, int userId, String key,
+ private static void applyUserRestriction(Context context, int userId, String key,
boolean newValue) {
+ if (UserManagerService.DBG) {
+ Log.d(TAG, "Applying user restriction: userId=" + userId
+ + " key=" + key + " value=" + newValue);
+ }
// When certain restrictions are cleared, we don't update the system settings,
// because these settings are changeable on the Settings UI and we don't know the original
// value -- for example LOCATION_MODE might have been off already when the restriction was
@@ -169,7 +309,7 @@
case UserManager.DISALLOW_CONFIG_WIFI:
if (newValue) {
android.provider.Settings.Secure.putIntForUser(cr,
- android.provider.Settings.Secure
+ android.provider.Settings.Global
.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0, userId);
}
break;
@@ -179,9 +319,6 @@
android.provider.Settings.Secure.LOCATION_MODE,
android.provider.Settings.Secure.LOCATION_MODE_OFF,
userId);
- android.provider.Settings.Secure.putStringForUser(cr,
- android.provider.Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "",
- userId);
}
// Send out notifications as some clients may want to reread the
// value which actually changed due to a restriction having been
@@ -227,6 +364,17 @@
userId);
}
break;
+ case UserManager.DISALLOW_RUN_IN_BACKGROUND:
+ if (newValue) {
+ int currentUser = ActivityManager.getCurrentUser();
+ if (currentUser != userId && userId != UserHandle.USER_SYSTEM) {
+ try {
+ ActivityManagerNative.getDefault().stopUser(userId, false, null);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+ }
}
} finally {
Binder.restoreCallingIdentity(id);
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 121ef21..639753a 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2533,7 +2533,7 @@
}
}
} else if (win.getAttrs().type == TYPE_DOCK_DIVIDER) {
- if (transit == TRANSIT_ENTER) {
+ if (transit == TRANSIT_ENTER || transit == TRANSIT_SHOW) {
return R.anim.fade_in;
} else if (transit == TRANSIT_EXIT) {
return R.anim.fade_out;
@@ -5318,11 +5318,9 @@
}
private boolean shouldDispatchInputWhenNonInteractive() {
- if (mDisplay == null || mDisplay.getState() == Display.STATE_OFF) {
- return false;
- }
- // Send events to keyguard while the screen is on and it's showing.
- if (isKeyguardShowingAndNotOccluded()) {
+ // Send events to keyguard while the screen is on.
+ if (isKeyguardShowingAndNotOccluded() && mDisplay != null
+ && mDisplay.getState() != Display.STATE_OFF) {
return true;
}
diff --git a/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java b/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java
index 8fc979c..cc25c8c 100644
--- a/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java
+++ b/services/core/java/com/android/server/updates/ConfigUpdateInstallReceiver.java
@@ -17,6 +17,7 @@
package com.android.server.updates;
import com.android.server.EventLogTags;
+import com.android.internal.util.HexDump;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -155,7 +156,7 @@
try {
MessageDigest dgst = MessageDigest.getInstance("SHA512");
byte[] fingerprint = dgst.digest(content);
- return IntegralToString.bytesToHexString(fingerprint, false);
+ return HexDump.toHexString(fingerprint, false);
} catch (NoSuchAlgorithmException e) {
throw new AssertionError(e);
}
diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index d713751..c246609 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -409,6 +409,7 @@
private final Region mMagnifiedBounds = new Region();
private final Region mOldMagnifiedBounds = new Region();
+ private final Region mOldAvailableBounds = new Region();
private final Path mCircularPath;
@@ -537,29 +538,39 @@
screenWidth - mDrawBorderInset, screenHeight - mDrawBorderInset,
Region.Op.INTERSECT);
- if (!mOldMagnifiedBounds.equals(magnifiedBounds)) {
- Region bounds = Region.obtain();
- bounds.set(magnifiedBounds);
- mHandler.obtainMessage(MyHandler.MESSAGE_NOTIFY_MAGNIFIED_BOUNDS_CHANGED,
- bounds).sendToTarget();
+ final boolean magnifiedChanged = !mOldMagnifiedBounds.equals(magnifiedBounds);
+ final boolean availableChanged = !mOldAvailableBounds.equals(availableBounds);
+ if (magnifiedChanged || availableChanged) {
+ if (magnifiedChanged) {
+ mWindow.setBounds(magnifiedBounds);
+ Rect dirtyRect = mTempRect1;
+ if (mFullRedrawNeeded) {
+ mFullRedrawNeeded = false;
+ dirtyRect.set(mDrawBorderInset, mDrawBorderInset,
+ screenWidth - mDrawBorderInset,
+ screenHeight - mDrawBorderInset);
+ mWindow.invalidate(dirtyRect);
+ } else {
+ Region dirtyRegion = mTempRegion3;
+ dirtyRegion.set(magnifiedBounds);
+ dirtyRegion.op(mOldMagnifiedBounds, Region.Op.UNION);
+ dirtyRegion.op(nonMagnifiedBounds, Region.Op.INTERSECT);
+ dirtyRegion.getBounds(dirtyRect);
+ mWindow.invalidate(dirtyRect);
+ }
- mWindow.setBounds(magnifiedBounds);
- Rect dirtyRect = mTempRect1;
- if (mFullRedrawNeeded) {
- mFullRedrawNeeded = false;
- dirtyRect.set(mDrawBorderInset, mDrawBorderInset,
- screenWidth - mDrawBorderInset, screenHeight - mDrawBorderInset);
- mWindow.invalidate(dirtyRect);
- } else {
- Region dirtyRegion = mTempRegion3;
- dirtyRegion.set(magnifiedBounds);
- dirtyRegion.op(mOldMagnifiedBounds, Region.Op.UNION);
- dirtyRegion.op(nonMagnifiedBounds, Region.Op.INTERSECT);
- dirtyRegion.getBounds(dirtyRect);
- mWindow.invalidate(dirtyRect);
+ mOldMagnifiedBounds.set(magnifiedBounds);
}
- mOldMagnifiedBounds.set(magnifiedBounds);
+ if (availableChanged) {
+ mOldAvailableBounds.set(availableBounds);
+ }
+
+ final SomeArgs args = SomeArgs.obtain();
+ args.arg1 = Region.obtain(magnifiedBounds);
+ args.arg2 = Region.obtain(availableBounds);
+ mHandler.obtainMessage(
+ MyHandler.MESSAGE_NOTIFY_MAGNIFIED_BOUNDS_CHANGED, args).sendToTarget();
}
}
@@ -867,9 +878,12 @@
public void handleMessage(Message message) {
switch (message.what) {
case MESSAGE_NOTIFY_MAGNIFIED_BOUNDS_CHANGED: {
- Region bounds = (Region) message.obj;
- mCallbacks.onMagnifedBoundsChanged(bounds);
- bounds.recycle();
+ final SomeArgs args = (SomeArgs) message.obj;
+ final Region magnifiedBounds = (Region) args.arg1;
+ final Region availableBounds = (Region) args.arg2;
+ mCallbacks.onMagnifiedBoundsChanged(magnifiedBounds, availableBounds);
+ magnifiedBounds.recycle();
+ availableBounds.recycle();
} break;
case MESSAGE_NOTIFY_RECTANGLE_ON_SCREEN_REQUESTED: {
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 89f5658..d394125 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -139,7 +139,7 @@
private static final long APP_TRANSITION_TIMEOUT_MS = 5000;
private final Context mContext;
- private final Handler mH;
+ private final WindowManagerService mService;
private int mNextAppTransition = TRANSIT_UNSET;
@@ -208,15 +208,10 @@
private final ArrayList<AppTransitionListener> mListeners = new ArrayList<>();
private final ExecutorService mDefaultExecutor = Executors.newSingleThreadExecutor();
- private final Object mServiceLock;
- private final WindowSurfacePlacer mWindowSurfacePlacer;
- AppTransition(Context context, Handler h, Object serviceLock,
- WindowSurfacePlacer windowSurfacePlacer) {
+ AppTransition(Context context, WindowManagerService service) {
mContext = context;
- mH = h;
- mServiceLock = serviceLock;
- mWindowSurfacePlacer = windowSurfacePlacer;
+ mService = service;
mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
com.android.internal.R.interpolator.linear_out_slow_in);
mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
@@ -344,6 +339,9 @@
mNextAppTransitionType = NEXT_TRANSIT_TYPE_NONE;
mNextAppTransitionPackage = null;
mNextAppTransitionAnimationsSpecs.clear();
+ mNextAppTransitionAnimationsSpecsFuture = null;
+ mDefaultNextAppTransitionAnimationSpec = null;
+ mAnimationFinishedCallback = null;
}
void freeze() {
@@ -971,7 +969,7 @@
@Override
public void onAnimationEnd(Animation animation) {
- mH.obtainMessage(H.DO_ANIMATION_CALLBACK, callback).sendToTarget();
+ mService.mH.obtainMessage(H.DO_ANIMATION_CALLBACK, callback).sendToTarget();
}
@Override
@@ -1326,22 +1324,16 @@
void postAnimationCallback() {
if (mNextAppTransitionCallback != null) {
- mH.sendMessage(mH.obtainMessage(H.DO_ANIMATION_CALLBACK, mNextAppTransitionCallback));
+ mService.mH.sendMessage(mService.mH.obtainMessage(H.DO_ANIMATION_CALLBACK,
+ mNextAppTransitionCallback));
mNextAppTransitionCallback = null;
}
}
- private void clearAppTransitionState() {
- mNextAppTransitionPackage = null;
- mNextAppTransitionAnimationsSpecs.clear();
- mDefaultNextAppTransitionAnimationSpec = null;
- mAnimationFinishedCallback = null;
- }
-
void overridePendingAppTransition(String packageName, int enterAnim, int exitAnim,
IRemoteCallback startedCallback) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = NEXT_TRANSIT_TYPE_CUSTOM;
mNextAppTransitionPackage = packageName;
mNextAppTransitionEnter = enterAnim;
@@ -1356,7 +1348,7 @@
void overridePendingAppTransitionScaleUp(int startX, int startY, int startWidth,
int startHeight) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = NEXT_TRANSIT_TYPE_SCALE_UP;
putDefaultNextAppTransitionCoordinates(startX, startY, startX + startWidth,
startY + startHeight, null);
@@ -1367,7 +1359,7 @@
void overridePendingAppTransitionClipReveal(int startX, int startY,
int startWidth, int startHeight) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = NEXT_TRANSIT_TYPE_CLIP_REVEAL;
putDefaultNextAppTransitionCoordinates(startX, startY, startWidth, startHeight, null);
postAnimationCallback();
@@ -1377,7 +1369,7 @@
void overridePendingAppTransitionThumb(Bitmap srcThumb, int startX, int startY,
IRemoteCallback startedCallback, boolean scaleUp) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = scaleUp ? NEXT_TRANSIT_TYPE_THUMBNAIL_SCALE_UP
: NEXT_TRANSIT_TYPE_THUMBNAIL_SCALE_DOWN;
mNextAppTransitionScaleUp = scaleUp;
@@ -1392,7 +1384,7 @@
void overridePendingAppTransitionAspectScaledThumb(Bitmap srcThumb, int startX, int startY,
int targetWidth, int targetHeight, IRemoteCallback startedCallback, boolean scaleUp) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = scaleUp ? NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_UP
: NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_DOWN;
mNextAppTransitionScaleUp = scaleUp;
@@ -1409,7 +1401,7 @@
IRemoteCallback onAnimationStartedCallback, IRemoteCallback onAnimationFinishedCallback,
boolean scaleUp) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = scaleUp ? NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_UP
: NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_DOWN;
mNextAppTransitionScaleUp = scaleUp;
@@ -1423,7 +1415,7 @@
// to be set.
Rect rect = spec.rect;
putDefaultNextAppTransitionCoordinates(rect.left, rect.top,
- rect.width(), rect.height(), null);
+ rect.width(), rect.height(), spec.bitmap);
}
}
}
@@ -1440,7 +1432,7 @@
IAppTransitionAnimationSpecsFuture specsFuture, IRemoteCallback callback,
boolean scaleUp) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = scaleUp ? NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_UP
: NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_DOWN;
mNextAppTransitionAnimationsSpecsFuture = specsFuture;
@@ -1451,7 +1443,7 @@
void overrideInPlaceAppTransition(String packageName, int anim) {
if (isTransitionSet()) {
- clearAppTransitionState();
+ clear();
mNextAppTransitionType = NEXT_TRANSIT_TYPE_CUSTOM_IN_PLACE;
mNextAppTransitionPackage = packageName;
mNextAppTransitionInPlace = anim;
@@ -1478,14 +1470,17 @@
} catch (RemoteException e) {
Slog.w(TAG, "Failed to fetch app transition specs: " + e);
}
- synchronized (mServiceLock) {
+ synchronized (mService.mWindowMap) {
mNextAppTransitionAnimationsSpecsPending = false;
overridePendingAppTransitionMultiThumb(specs,
mNextAppTransitionFutureCallback, null /* finishedCallback */,
mNextAppTransitionScaleUp);
mNextAppTransitionFutureCallback = null;
- mWindowSurfacePlacer.requestTraversal();
+ if (specs != null) {
+ mService.prolongAnimationsFromSpecs(specs, mNextAppTransitionScaleUp);
+ }
}
+ mService.requestTraversal();
}
});
}
@@ -1672,8 +1667,8 @@
}
boolean prepared = prepare();
if (isTransitionSet()) {
- mH.removeMessages(H.APP_TRANSITION_TIMEOUT);
- mH.sendEmptyMessageDelayed(H.APP_TRANSITION_TIMEOUT, APP_TRANSITION_TIMEOUT_MS);
+ mService.mH.removeMessages(H.APP_TRANSITION_TIMEOUT);
+ mService.mH.sendEmptyMessageDelayed(H.APP_TRANSITION_TIMEOUT, APP_TRANSITION_TIMEOUT_MS);
}
return prepared;
}
diff --git a/services/core/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java
index 2905269..4861acc 100644
--- a/services/core/java/com/android/server/wm/AppWindowAnimator.java
+++ b/services/core/java/com/android/server/wm/AppWindowAnimator.java
@@ -37,6 +37,10 @@
public class AppWindowAnimator {
static final String TAG = "AppWindowAnimator";
+ private static final int PROLONG_ANIMATION_DISABLED = 0;
+ static final int PROLONG_ANIMATION_AT_END = 1;
+ static final int PROLONG_ANIMATION_AT_START = 2;
+
final AppWindowToken mAppToken;
final WindowManagerService mService;
final WindowAnimator mAnimator;
@@ -85,7 +89,7 @@
// If true when the animation hits the last frame, it will keep running on that last frame.
// This is used to synchronize animation with Recents and we wait for Recents to tell us to
// finish or for a new animation be set as fail-safe mechanism.
- private boolean mProlongAnimation;
+ private int mProlongAnimation;
// Whether the prolong animation can be removed when animation is set. The purpose of this is
// that if recents doesn't tell us to remove the prolonged animation, we will get rid of it
// when new animation is set.
@@ -105,7 +109,7 @@
public AppWindowAnimator(final AppWindowToken atoken) {
mAppToken = atoken;
mService = atoken.service;
- mAnimator = atoken.mAnimator;
+ mAnimator = mService.mAnimator;
}
public void setAnimation(Animation anim, int width, int height, boolean skipFirstFrame) {
@@ -142,7 +146,7 @@
anim.setBackgroundColor(0);
}
if (mClearProlongedAnimation) {
- mProlongAnimation = false;
+ mProlongAnimation = PROLONG_ANIMATION_DISABLED;
} else {
mClearProlongedAnimation = true;
}
@@ -224,7 +228,8 @@
private void stepThumbnailAnimation(long currentTime) {
thumbnailTransformation.clear();
- thumbnailAnimation.getTransformation(currentTime, thumbnailTransformation);
+ final long animationFrameTime = getAnimationFrameTime(thumbnailAnimation, currentTime);
+ thumbnailAnimation.getTransformation(animationFrameTime, thumbnailTransformation);
thumbnailTransformation.getMatrix().preTranslate(thumbnailX, thumbnailY);
ScreenRotationAnimation screenRotationAnimation =
@@ -261,12 +266,26 @@
tmpFloats[Matrix.MSKEW_X], tmpFloats[Matrix.MSCALE_Y]);
}
+ /**
+ * Sometimes we need to synchronize the first frame of animation with some external event, e.g.
+ * Recents hiding some of its content. To achieve this, we prolong the start of the animaiton
+ * and keep producing the first frame of the animation.
+ */
+ private long getAnimationFrameTime(Animation animation, long currentTime) {
+ if (mProlongAnimation == PROLONG_ANIMATION_AT_START) {
+ animation.setStartTime(currentTime);
+ return currentTime + 1;
+ }
+ return currentTime;
+ }
+
private boolean stepAnimation(long currentTime) {
if (animation == null) {
return false;
}
transformation.clear();
- boolean hasMoreFrames = animation.getTransformation(currentTime, transformation);
+ final long animationFrameTime = getAnimationFrameTime(animation, currentTime);
+ boolean hasMoreFrames = animation.getTransformation(animationFrameTime, transformation);
if (!hasMoreFrames) {
if (deferThumbnailDestruction && !deferFinalFrameCleanup) {
// We are deferring the thumbnail destruction, so extend the animation for one more
@@ -278,14 +297,14 @@
"Stepped animation in " + mAppToken + ": more=" + hasMoreFrames +
", xform=" + transformation + ", mProlongAnimation=" + mProlongAnimation);
deferFinalFrameCleanup = false;
- if (mProlongAnimation) {
+ if (mProlongAnimation == PROLONG_ANIMATION_AT_END) {
hasMoreFrames = true;
} else {
animation = null;
+ clearThumbnail();
+ if (DEBUG_ANIM) Slog.v(TAG, "Finished animation in " + mAppToken + " @ "
+ + currentTime);
}
- clearThumbnail();
- if (DEBUG_ANIM) Slog.v(TAG,
- "Finished animation in " + mAppToken + " @ " + currentTime);
}
}
hasTransformation = hasMoreFrames;
@@ -434,13 +453,13 @@
}
}
- void startProlongAnimation() {
- mProlongAnimation = true;
+ void startProlongAnimation(int prolongType) {
+ mProlongAnimation = prolongType;
mClearProlongedAnimation = false;
}
void endProlongedAnimation() {
- mProlongAnimation = false;
+ mProlongAnimation = PROLONG_ANIMATION_DISABLED;
}
// This is an animation that does nothing: it just immediately finishes
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 425ff9b..3d00e02 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -24,6 +24,7 @@
import com.android.server.input.InputApplicationHandle;
import com.android.server.wm.WindowManagerService.H;
+import android.annotation.NonNull;
import android.content.pm.ActivityInfo;
import android.os.Message;
import android.os.RemoteException;
@@ -49,9 +50,7 @@
// All of the windows and child windows that are included in this
// application token. Note this list is NOT sorted!
final WindowList allAppWindows = new WindowList();
- final AppWindowAnimator mAppAnimator;
-
- final WindowAnimator mAnimator;
+ @NonNull final AppWindowAnimator mAppAnimator;
final boolean voiceInteraction;
@@ -145,7 +144,6 @@
appToken = _token;
voiceInteraction = _voiceInteraction;
mInputApplicationHandle = new InputApplicationHandle(this);
- mAnimator = service.mAnimator;
mAppAnimator = new AppWindowAnimator(this);
}
@@ -259,7 +257,7 @@
if (win.mAttrs.type == WindowManager.LayoutParams.TYPE_BASE_APPLICATION
|| win.mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING) {
// In cases where there are multiple windows, we prefer the non-exiting window. This
- // happens for example when when replacing windows during an activity relaunch. When
+ // happens for example when replacing windows during an activity relaunch. When
// constructing the animation, we want the new window, not the exiting one.
if (win.mExiting) {
candidate = win;
@@ -271,6 +269,10 @@
return candidate;
}
+ boolean stackCanReceiveKeys() {
+ return (windows.size() > 0) ? windows.get(windows.size() - 1).stackCanReceiveKeys() : false;
+ }
+
boolean isVisible() {
final int N = allAppWindows.size();
for (int i=0; i<N; i++) {
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index e264c43..4bbf586 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -22,7 +22,6 @@
import static com.android.server.wm.WindowManagerService.DEBUG_VISIBILITY;
import static com.android.server.wm.WindowManagerService.TAG;
import static com.android.server.wm.WindowState.RESIZE_HANDLE_WIDTH_IN_DP;
-import static com.android.server.wm.WindowState.BOUNDS_FOR_TOUCH;
import android.app.ActivityManager.StackId;
import android.graphics.Rect;
@@ -55,17 +54,6 @@
* from mDisplayWindows; */
private final WindowList mWindows = new WindowList();
- // This protects the following display size properties, so that
- // getDisplaySize() doesn't need to acquire the global lock. This is
- // needed because the window manager sometimes needs to use ActivityThread
- // while it has its global state locked (for example to load animation
- // resources), but the ActivityThread also needs get the current display
- // size sometimes when it has its package lock held.
- //
- // These will only be modified with both mWindowMap and mDisplaySizeLock
- // held (in that order) so the window manager doesn't need to acquire this
- // lock when needing these values in its normal operation.
- final Object mDisplaySizeLock = new Object();
int mInitialDisplayWidth = 0;
int mInitialDisplayHeight = 0;
int mInitialDisplayDensity = 0;
@@ -102,9 +90,13 @@
/** Detect user tapping outside of current focused stack bounds .*/
Region mTouchExcludeRegion = new Region();
+ /** Detect user tapping in a non-resizeable task in docked or fullscreen stack .*/
+ Region mNonResizeableRegion = new Region();
+
/** Save allocating when calculating rects */
- private Rect mTmpRect = new Rect();
- private Rect mTmpRect2 = new Rect();
+ private final Rect mTmpRect = new Rect();
+ private final Rect mTmpRect2 = new Rect();
+ private final Region mTmpRegion = new Region();
/** For gathering Task objects in order. */
final ArrayList<Task> mTmpTaskHistory = new ArrayList<Task>();
@@ -202,18 +194,16 @@
}
void initializeDisplayBaseInfo() {
- synchronized(mDisplaySizeLock) {
- // Bootstrap the default logical display from the display manager.
- final DisplayInfo newDisplayInfo =
- mService.mDisplayManagerInternal.getDisplayInfo(mDisplayId);
- if (newDisplayInfo != null) {
- mDisplayInfo.copyFrom(newDisplayInfo);
- }
- mBaseDisplayWidth = mInitialDisplayWidth = mDisplayInfo.logicalWidth;
- mBaseDisplayHeight = mInitialDisplayHeight = mDisplayInfo.logicalHeight;
- mBaseDisplayDensity = mInitialDisplayDensity = mDisplayInfo.logicalDensityDpi;
- mBaseDisplayRect.set(0, 0, mBaseDisplayWidth, mBaseDisplayHeight);
+ // Bootstrap the default logical display from the display manager.
+ final DisplayInfo newDisplayInfo =
+ mService.mDisplayManagerInternal.getDisplayInfo(mDisplayId);
+ if (newDisplayInfo != null) {
+ mDisplayInfo.copyFrom(newDisplayInfo);
}
+ mBaseDisplayWidth = mInitialDisplayWidth = mDisplayInfo.logicalWidth;
+ mBaseDisplayHeight = mInitialDisplayHeight = mDisplayInfo.logicalHeight;
+ mBaseDisplayDensity = mInitialDisplayDensity = mDisplayInfo.logicalDensityDpi;
+ mBaseDisplayRect.set(0, 0, mBaseDisplayWidth, mBaseDisplayHeight);
}
void getLogicalDisplayRect(Rect out) {
@@ -288,7 +278,12 @@
int taskIdFromPoint(int x, int y) {
for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
- final ArrayList<Task> tasks = mStacks.get(stackNdx).getTasks();
+ TaskStack stack = mStacks.get(stackNdx);
+ stack.getBounds(mTmpRect);
+ if (!mTmpRect.contains(x, y)) {
+ continue;
+ }
+ final ArrayList<Task> tasks = stack.getTasks();
for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) {
final Task task = tasks.get(taskNdx);
final WindowState win = task.getTopVisibleAppMainWindow();
@@ -353,6 +348,7 @@
mTouchExcludeRegion.set(mBaseDisplayRect);
final int delta = mService.dipToPixel(RESIZE_HANDLE_WIDTH_IN_DP, mDisplayMetrics);
boolean addBackFocusedTask = false;
+ mNonResizeableRegion.setEmpty();
for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
TaskStack stack = mStacks.get(stackNdx);
final ArrayList<Task> tasks = stack.getTasks();
@@ -395,6 +391,11 @@
}
mTouchExcludeRegion.op(mTmpRect, Region.Op.DIFFERENCE);
}
+ if (task.isDockedInEffect() && !task.isResizeable()) {
+ stack.getBounds(mTmpRect);
+ mNonResizeableRegion.op(mTmpRect, Region.Op.UNION);
+ break;
+ }
}
}
// If we removed the focused task above, add it back and only leave its
@@ -403,8 +404,16 @@
if (addBackFocusedTask) {
mTouchExcludeRegion.op(mTmpRect2, Region.Op.UNION);
}
+ final WindowState inputMethod = mService.mInputMethodWindow;
+ if (inputMethod != null && inputMethod.isVisibleLw()) {
+ // If the input method is visible and the user is typing, we don't want these touch
+ // events to be intercepted and used to change focus. This would likely cause a
+ // disappearance of the input method.
+ inputMethod.getTouchableRegion(mTmpRegion);
+ mTouchExcludeRegion.op(mTmpRegion, Region.Op.UNION);
+ }
if (mTapDetector != null) {
- mTapDetector.setTouchExcludeRegion(mTouchExcludeRegion);
+ mTapDetector.setTouchExcludeRegion(mTouchExcludeRegion, mNonResizeableRegion);
}
}
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index 6b62467..df8d5d6 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -18,7 +18,11 @@
import android.content.Context;
import android.graphics.Rect;
+import android.os.RemoteException;
import android.util.Slog;
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+import android.view.IDockDividerVisibilityListener;
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.view.WindowManager.DOCKED_BOTTOM;
@@ -40,6 +44,8 @@
private WindowState mWindow;
private final Rect mTmpRect = new Rect();
private final Rect mLastRect = new Rect();
+ private IDockDividerVisibilityListener mListener;
+ private boolean mLastVisibility = false;
DockedStackDividerController(Context context, DisplayContent displayContent) {
mDisplayContent = displayContent;
@@ -67,12 +73,21 @@
}
void reevaluateVisibility() {
- if (mWindow == null) return;
+ if (mWindow == null) {
+ return;
+ }
TaskStack stack = mDisplayContent.mService.mStackIdToStack.get(DOCKED_STACK_ID);
- if (stack != null && stack.isVisibleLocked()) {
- mWindow.showLw(true /* doAnimation */);
- } else {
- mWindow.hideLw(true /* doAnimation */);
+ final boolean visible = stack != null && stack.isVisibleLocked();
+ if (mLastVisibility == visible) {
+ return;
+ }
+ mLastVisibility = visible;
+ if (mListener != null) {
+ try {
+ mListener.onDockDividerVisibilityChanged(visible);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "visibility call failed: " + e);
+ }
}
}
@@ -110,4 +125,11 @@
}
mLastRect.set(frame);
}
+
+ public void registerDockDividerVisibilityListener(IDockDividerVisibilityListener listener) {
+ if (mListener != null && listener != null) {
+ throw new IllegalStateException("Dock divider visibility listener already set!");
+ }
+ mListener = listener;
+ }
}
diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java
index 2be7ab8..0ef0e58 100644
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -16,7 +16,15 @@
package com.android.server.wm;
-import static com.android.server.wm.WindowState.BOUNDS_FOR_TOUCH;
+import android.graphics.Matrix;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.Interpolator;
+import android.view.animation.ScaleAnimation;
+import android.view.animation.Transformation;
+import android.view.animation.TranslateAnimation;
import com.android.server.input.InputApplicationHandle;
import com.android.server.input.InputWindowHandle;
import com.android.server.wm.WindowManagerService.DragInputEventReceiver;
@@ -46,6 +54,8 @@
* Drag/drop state
*/
class DragState {
+ private static final long ANIMATION_DURATION_MS = 500;
+
final WindowManagerService mService;
IBinder mToken;
SurfaceControl mSurfaceControl;
@@ -56,6 +66,8 @@
ClipData mData;
ClipDescription mDataDescription;
boolean mDragResult;
+ float mOriginalAlpha;
+ float mOriginalX, mOriginalY;
float mCurrentX, mCurrentY;
float mThumbOffsetX, mThumbOffsetY;
InputChannel mServerChannel, mClientChannel;
@@ -70,6 +82,10 @@
private final Region mTmpRegion = new Region();
private final Rect mTmpRect = new Rect();
+ private Animation mAnimation;
+ final Transformation mTransformation = new Transformation();
+ private final Interpolator mCubicEaseOutInterpolator = new DecelerateInterpolator(1.5f);
+
DragState(WindowManagerService service, IBinder token, SurfaceControl surface,
int flags, IBinder localWin) {
mService = service;
@@ -185,6 +201,9 @@
/* call out to each visible window/session informing it about the drag
*/
void broadcastDragStartedLw(final float touchX, final float touchY) {
+ mOriginalX = mCurrentX = touchX;
+ mOriginalY = mCurrentY = touchY;
+
// Cache a base-class instance of the clip metadata so that parceling
// works correctly in calling out to the apps.
mDataDescription = (mData != null) ? mData.getDescription() : null;
@@ -263,7 +282,7 @@
}
}
- void broadcastDragEndedLw() {
+ private void broadcastDragEndedLw() {
final int myPid = Process.myPid();
if (WindowManagerService.DEBUG_DRAG) {
@@ -295,19 +314,45 @@
}
void endDragLw() {
- mService.mDragState.broadcastDragEndedLw();
+ if (mAnimation != null) {
+ return;
+ }
+ if (!mDragResult) {
+ mAnimation = createReturnAnimationLocked();
+ mService.scheduleAnimationLocked();
+ return; // Will call cleanUpDragLw when the animation is done.
+ }
+ cleanUpDragLw();
+ }
+
+ void cancelDragLw() {
+ if (mAnimation != null) {
+ return;
+ }
+ mAnimation = createCancelAnimationLocked();
+ mService.scheduleAnimationLocked();
+ }
+
+ private void cleanUpDragLw() {
+ broadcastDragEndedLw();
// stop intercepting input
- mService.mDragState.unregister();
+ unregister();
// free our resources and drop all the object references
- mService.mDragState.reset();
+ reset();
mService.mDragState = null;
mService.mInputMonitor.updateInputWindowsLw(true /*force*/);
}
void notifyMoveLw(float x, float y) {
+ if (mAnimation != null) {
+ return;
+ }
+ mCurrentX = x;
+ mCurrentY = y;
+
final int myPid = Process.myPid();
// Move the surface to the given touch
@@ -379,6 +424,12 @@
// result from the recipient.
boolean notifyDropLw(WindowState touchedWin, DropPermissionHolder dropPermissionHolder,
float x, float y) {
+ if (mAnimation != null) {
+ return false;
+ }
+ mCurrentX = x;
+ mCurrentY = y;
+
if (touchedWin == null) {
// "drop" outside a valid window -- no recipient to apply a
// timeout to, and we can send the drag-ended message immediately.
@@ -470,4 +521,49 @@
return DragEvent.obtain(action, winX, winY, localState, description, data,
dropPermissionHolder, result);
}
+
+ boolean stepAnimationLocked(long currentTimeMs) {
+ if (mAnimation == null) {
+ return false;
+ }
+
+ mTransformation.clear();
+ if (!mAnimation.getTransformation(currentTimeMs, mTransformation)) {
+ cleanUpDragLw();
+ return false;
+ }
+
+ mTransformation.getMatrix().postTranslate(
+ mCurrentX - mThumbOffsetX, mCurrentY - mThumbOffsetY);
+ final float tmpFloats[] = mService.mTmpFloats;
+ mTransformation.getMatrix().getValues(tmpFloats);
+ mSurfaceControl.setPosition(tmpFloats[Matrix.MTRANS_X], tmpFloats[Matrix.MTRANS_Y]);
+ mSurfaceControl.setAlpha(mTransformation.getAlpha());
+ mSurfaceControl.setMatrix(tmpFloats[Matrix.MSCALE_X], tmpFloats[Matrix.MSKEW_Y],
+ tmpFloats[Matrix.MSKEW_X], tmpFloats[Matrix.MSCALE_Y]);
+ return true;
+ }
+
+ private Animation createReturnAnimationLocked() {
+ final AnimationSet set = new AnimationSet(false);
+ set.addAnimation(new TranslateAnimation(
+ 0, mOriginalX - mCurrentX, 0, mOriginalY - mCurrentY));
+ set.addAnimation(new AlphaAnimation(mOriginalAlpha, mOriginalAlpha / 2));
+ set.setDuration(ANIMATION_DURATION_MS);
+ set.setInterpolator(mCubicEaseOutInterpolator);
+ set.initialize(0, 0, 0, 0);
+ set.start(); // Will start on the first call to getTransformation.
+ return set;
+ }
+
+ private Animation createCancelAnimationLocked() {
+ final AnimationSet set = new AnimationSet(false);
+ set.addAnimation(new ScaleAnimation(1, 0, 1, 0, mThumbOffsetX, mThumbOffsetY));
+ set.addAnimation(new AlphaAnimation(mOriginalAlpha, 0));
+ set.setDuration(ANIMATION_DURATION_MS);
+ set.setInterpolator(mCubicEaseOutInterpolator);
+ set.initialize(0, 0, 0, 0);
+ set.start(); // Will start on the first call to getTransformation.
+ return set;
+ }
}
\ No newline at end of file
diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 3c3123f..5511136 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -171,10 +171,10 @@
private void addInputWindowHandleLw(final InputWindowHandle inputWindowHandle,
final WindowState child, int flags, final int type, final boolean isVisible,
- final boolean hasFocus, final boolean hasWallpaper, DisplayContent displayContent) {
+ final boolean hasFocus, final boolean hasWallpaper) {
// Add a window to our list of input windows.
inputWindowHandle.name = child.toString();
- flags = child.getTouchableRegion(inputWindowHandle.touchableRegion, flags, this);
+ flags = child.getTouchableRegion(inputWindowHandle.touchableRegion, flags);
inputWindowHandle.layoutParamsFlags = flags;
inputWindowHandle.layoutParamsType = type;
inputWindowHandle.dispatchingTimeoutNanos = child.getInputDispatchingTimeoutNanos();
@@ -194,6 +194,14 @@
inputWindowHandle.frameRight = frame.right;
inputWindowHandle.frameBottom = frame.bottom;
+ if (child.isDockedInEffect()) {
+ // Adjust to account for non-resizeable tasks that's scrolled
+ inputWindowHandle.frameLeft += child.mXOffset;
+ inputWindowHandle.frameTop += child.mYOffset;
+ inputWindowHandle.frameRight += child.mXOffset;
+ inputWindowHandle.frameBottom += child.mYOffset;
+ }
+
if (child.mGlobalScale != 1) {
// If we are scaling the window, input coordinates need
// to be inversely scaled to map from what is on screen
@@ -204,7 +212,8 @@
}
if (DEBUG_INPUT) {
- Slog.d(WindowManagerService.TAG, "addInputWindowHandle: " + inputWindowHandle);
+ Slog.d(WindowManagerService.TAG, "addInputWindowHandle: "
+ + child + ", " + inputWindowHandle);
}
addInputWindowHandleLw(inputWindowHandle);
}
@@ -308,8 +317,8 @@
mService.mDragState.sendDragStartedIfNeededLw(child);
}
- addInputWindowHandleLw(inputWindowHandle, child, flags, type, isVisible, hasFocus,
- hasWallpaper, displayContent);
+ addInputWindowHandleLw(
+ inputWindowHandle, child, flags, type, isVisible, hasFocus, hasWallpaper);
}
}
diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 1caeca0..6e2e830 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -325,8 +325,6 @@
}
mService.mDragState.mData = data;
- mService.mDragState.mCurrentX = touchX;
- mService.mDragState.mCurrentY = touchY;
mService.mDragState.broadcastDragStartedLw(touchX, touchY);
// remember the thumb offsets for later
@@ -401,6 +399,34 @@
}
}
+ public void cancelDragAndDrop(IBinder dragToken) {
+ if (WindowManagerService.DEBUG_DRAG) {
+ Slog.d(WindowManagerService.TAG, "cancelDragAndDrop");
+ }
+
+ synchronized (mService.mWindowMap) {
+ long ident = Binder.clearCallingIdentity();
+ try {
+ if (mService.mDragState == null) {
+ Slog.w(WindowManagerService.TAG, "cancelDragAndDrop() without prepareDrag()");
+ throw new IllegalStateException("cancelDragAndDrop() without prepareDrag()");
+ }
+
+ if (mService.mDragState.mToken != dragToken) {
+ Slog.w(WindowManagerService.TAG,
+ "cancelDragAndDrop() does not match prepareDrag()");
+ throw new IllegalStateException(
+ "cancelDragAndDrop() does not match prepareDrag()");
+ }
+
+ mService.mDragState.mDragResult = false;
+ mService.mDragState.cancelDragLw();
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+ }
+
public void dragRecipientEntered(IWindow window) {
if (WindowManagerService.DEBUG_DRAG) {
Slog.d(WindowManagerService.TAG, "Drag into new candidate view @ " + window.asBinder());
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 46cd7cd..22f1d63 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -20,11 +20,17 @@
import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
import static android.app.ActivityManager.StackId.HOME_STACK_ID;
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
+import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.app.ActivityManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION;
import static com.android.server.wm.WindowManagerService.TAG;
import static com.android.server.wm.WindowManagerService.DEBUG_RESIZE;
import static com.android.server.wm.WindowManagerService.DEBUG_STACK;
import static com.android.server.wm.WindowManagerService.H.RESIZE_TASK;
+import static com.android.server.wm.WindowManagerService.H.SHOW_NON_RESIZEABLE_DOCK_TOAST;
+import static android.view.WindowManager.DOCKED_INVALID;
+import static android.view.WindowManager.DOCKED_LEFT;
+import static android.view.WindowManager.DOCKED_RIGHT;
+import static android.view.WindowManager.DOCKED_TOP;
import android.app.ActivityManager.StackId;
import android.content.res.Configuration;
@@ -72,6 +78,14 @@
// For handling display rotations.
private Rect mTmpRect2 = new Rect();
+ // Whether the task is resizeable
+ private boolean mResizeable;
+
+ // Whether we need to show toast about the app being non-resizeable when it becomes visible.
+ // This flag is set when a non-resizeable task is docked (or side-by-side). It's cleared
+ // after we show the toast.
+ private boolean mShowNonResizeableDockToast;
+
// Whether the task is currently being drag-resized
private boolean mDragResizing;
@@ -88,6 +102,41 @@
return mStack.getDisplayContent();
}
+ void setShowNonResizeableDockToast() {
+ mShowNonResizeableDockToast = true;
+ }
+
+ void scheduleShowNonResizeableDockToastIfNeeded() {
+ if (!mShowNonResizeableDockToast) {
+ return;
+ }
+ final DisplayContent displayContent = mStack.getDisplayContent();
+ // If docked stack is not yet visible, we don't want to show the toast yet,
+ // since we need the visible rect of the docked task to position the toast.
+ if (displayContent == null || displayContent.getDockedStackLocked() == null) {
+ return;
+ }
+
+ mShowNonResizeableDockToast = false;
+
+ final int dockSide = mStack.getDockSide();
+ int xOffset = 0;
+ int yOffset = 0;
+ if (dockSide != DOCKED_INVALID) {
+ mStack.getBounds(mTmpRect);
+ displayContent.getLogicalDisplayRect(mTmpRect2);
+
+ if (dockSide == DOCKED_LEFT || dockSide == DOCKED_RIGHT) {
+ xOffset = mTmpRect.centerX() - mTmpRect2.centerX();
+ } else if (dockSide == DOCKED_TOP) {
+ // We don't adjust for DOCKED_BOTTOM case since it's already at the bottom.
+ yOffset = mTmpRect2.bottom - mTmpRect.bottom;
+ }
+ mService.mH.obtainMessage(
+ SHOW_NON_RESIZEABLE_DOCK_TOAST, xOffset, yOffset).sendToTarget();
+ }
+ }
+
void addAppToken(int addPos, AppWindowToken wtoken) {
final int lastPos = mAppTokens.size();
if (addPos >= lastPos) {
@@ -190,14 +239,6 @@
bounds = mTmpRect;
mFullscreen = true;
} else {
- if ((mStack.mStackId != FREEFORM_WORKSPACE_STACK_ID
- && mStack.mStackId != PINNED_STACK_ID) || bounds.isEmpty()) {
- // ensure bounds are entirely within the display rect
- if (!bounds.intersect(mTmpRect)) {
- // Can't set bounds outside the containing display...Sorry!
- return BOUNDS_CHANGE_NONE;
- }
- }
mFullscreen = mTmpRect.equals(bounds);
}
}
@@ -227,6 +268,14 @@
return boundsChange;
}
+ void setResizeable(boolean resizeable) {
+ mResizeable = resizeable;
+ }
+
+ boolean isResizeable() {
+ return mResizeable;
+ }
+
boolean resizeLocked(Rect bounds, Configuration configuration, boolean forced) {
int boundsChanged = setBounds(bounds, configuration);
if (forced) {
@@ -241,6 +290,45 @@
return true;
}
+ boolean scrollLocked(Rect bounds) {
+ // shift the task bound if it doesn't fully cover the stack area
+ mStack.getDimBounds(mTmpRect);
+ if (mService.mCurConfiguration.orientation == ORIENTATION_LANDSCAPE) {
+ if (bounds.left > mTmpRect.left) {
+ bounds.left = mTmpRect.left;
+ bounds.right = mTmpRect.left + mBounds.width();
+ } else if (bounds.right < mTmpRect.right) {
+ bounds.left = mTmpRect.right - mBounds.width();
+ bounds.right = mTmpRect.right;
+ }
+ } else {
+ if (bounds.top > mTmpRect.top) {
+ bounds.top = mTmpRect.top;
+ bounds.bottom = mTmpRect.top + mBounds.height();
+ } else if (bounds.bottom < mTmpRect.bottom) {
+ bounds.top = mTmpRect.bottom - mBounds.height();
+ bounds.bottom = mTmpRect.bottom;
+ }
+ }
+
+ if (bounds.equals(mBounds)) {
+ return false;
+ }
+ // Normal setBounds() does not allow non-null bounds for fullscreen apps.
+ // We only change bounds for the scrolling case without change it size,
+ // on resizing path we should still want the validation.
+ mBounds.set(bounds);
+ for (int activityNdx = mAppTokens.size() - 1; activityNdx >= 0; --activityNdx) {
+ final ArrayList<WindowState> windows = mAppTokens.get(activityNdx).allAppWindows;
+ for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
+ final WindowState win = windows.get(winNdx);
+ win.mXOffset = bounds.left;
+ win.mYOffset = bounds.top;
+ }
+ }
+ return true;
+ }
+
/** Return true if the current bound can get outputted to the rest of the system as-is. */
private boolean useCurrentBounds() {
final DisplayContent displayContent = mStack.getDisplayContent();
@@ -418,6 +506,19 @@
return mStack != null && mStack.mStackId == DOCKED_STACK_ID;
}
+ boolean isResizeableByDockedStack() {
+ return mStack != null && getDisplayContent().getDockedStackLocked() != null &&
+ StackId.isTaskResizeableByDockedStack(mStack.mStackId);
+ }
+
+ /**
+ * Whether the task should be treated as if it's docked. Returns true if the task
+ * is currently in docked workspace, or it's side-by-side to a docked task.
+ */
+ boolean isDockedInEffect() {
+ return inDockedWorkspace() || isResizeableByDockedStack();
+ }
+
WindowState getTopVisibleAppMainWindow() {
final AppWindowToken token = getTopVisibleAppToken();
return token != null ? token.findMainWindow() : null;
@@ -461,8 +562,10 @@
}
public void printTo(String prefix, PrintWriter pw) {
- pw.print(prefix); pw.print("taskId="); pw.print(mTaskId);
- pw.print(prefix); pw.print("appTokens="); pw.print(mAppTokens);
- pw.print(prefix); pw.print("mdr="); pw.println(mDeferRemoval);
+ pw.print(prefix); pw.print("taskId="); pw.println(mTaskId);
+ pw.print(prefix + prefix); pw.print("mFullscreen="); pw.println(mFullscreen);
+ pw.print(prefix + prefix); pw.print("mBounds="); pw.println(mBounds.toShortString());
+ pw.print(prefix + prefix); pw.print("mdr="); pw.println(mDeferRemoval);
+ pw.print(prefix + prefix); pw.print("appTokens="); pw.println(mAppTokens);
}
}
diff --git a/services/core/java/com/android/server/wm/TaskPositioner.java b/services/core/java/com/android/server/wm/TaskPositioner.java
index f5e4e3b..32c3205 100644
--- a/services/core/java/com/android/server/wm/TaskPositioner.java
+++ b/services/core/java/com/android/server/wm/TaskPositioner.java
@@ -196,7 +196,8 @@
? DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT
: DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT;
mService.mActivityManager.moveTaskToDockedStack(
- mTask.mTaskId, createMode, true /*toTop*/);
+ mTask.mTaskId, createMode, true /*toTop*/, true /* animate */,
+ null /* initialBounds */);
}
} catch(RemoteException e) {}
@@ -336,12 +337,20 @@
mStartDragX = startX;
mStartDragY = startY;
- // Use the dim bounds, not the original task bounds. The cursor
- // movement should be calculated relative to the visible bounds.
- // Also, use the dim bounds of the task which accounts for
- // multiple app windows. Don't use any bounds from win itself as it
- // may not be the same size as the task.
- mTask.getDimBounds(mTmpRect);
+ if (mTask.isDockedInEffect()) {
+ // If this is a docked task or if task size is affected by docked stack changing size,
+ // we can only be here if the task is not resizeable and we're handling a two-finger
+ // scrolling. Use the original task bounds to position the task, the dim bounds
+ // is cropped and doesn't move.
+ mTask.getBounds(mTmpRect);
+ } else {
+ // Use the dim bounds, not the original task bounds. The cursor
+ // movement should be calculated relative to the visible bounds.
+ // Also, use the dim bounds of the task which accounts for
+ // multiple app windows. Don't use any bounds from win itself as it
+ // may not be the same size as the task.
+ mTask.getDimBounds(mTmpRect);
+ }
if (resize) {
if (startX < mTmpRect.left) {
@@ -370,7 +379,7 @@
/** Returns true if the move operation should be ended. */
private boolean notifyMoveLocked(float x, float y) {
if (DEBUG_TASK_POSITIONING) {
- Slog.d(TAG, "notifyMoveLw: {" + x + "," + y + "}");
+ Slog.d(TAG, "notifyMoveLocked: {" + x + "," + y + "}");
}
if (mCtrlType != CTRL_NONE) {
@@ -400,15 +409,45 @@
// This is a moving operation.
mTask.mStack.getDimBounds(mTmpRect);
- mTmpRect.inset(mMinVisibleWidth, mMinVisibleHeight);
- if (!mTmpRect.contains((int) x, (int) y)) {
- // We end the moving operation if position is outside the stack bounds.
- return true;
+
+ // If this is a non-resizeable task put into side-by-side mode, we are
+ // handling a two-finger scrolling action. No need to shrink the bounds.
+ if (!mTask.isDockedInEffect()) {
+ mTmpRect.inset(mMinVisibleWidth, mMinVisibleHeight);
}
+
+ boolean dragEnded = false;
+ final int nX = (int) x;
+ final int nY = (int) y;
+ if (!mTmpRect.contains(nX, nY)) {
+ // We end the moving operation if position is outside the stack bounds.
+ // In this case we need to clamp the position to stack bounds and calculate
+ // the final window drag bounds.
+ x = Math.min(Math.max(x, mTmpRect.left), mTmpRect.right);
+ y = Math.min(Math.max(y, mTmpRect.top), mTmpRect.bottom);
+ dragEnded = true;
+ }
+
+ updateWindowDragBounds(nX, nY);
+ updateDimLayerVisibility(nX);
+ return dragEnded;
+ }
+
+ private void updateWindowDragBounds(int x, int y) {
mWindowDragBounds.set(mWindowOriginalBounds);
- mWindowDragBounds.offset(Math.round(x - mStartDragX), Math.round(y - mStartDragY));
- updateDimLayerVisibility((int) x);
- return false;
+ if (mTask.isDockedInEffect()) {
+ // Offset the bounds without clamp, the bounds will be shifted later
+ // by window manager before applying the scrolling.
+ if (mService.mCurConfiguration.orientation == ORIENTATION_LANDSCAPE) {
+ mWindowDragBounds.offset(Math.round(x - mStartDragX), 0);
+ } else {
+ mWindowDragBounds.offset(0, Math.round(y - mStartDragY));
+ }
+ } else {
+ mWindowDragBounds.offset(Math.round(x - mStartDragX), Math.round(y - mStartDragY));
+ }
+ if (DEBUG_TASK_POSITIONING) Slog.d(TAG,
+ "updateWindowDragBounds: " + mWindowDragBounds);
}
private void updateDimLayerVisibility(int x) {
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 8085f13..611ad40 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -125,7 +125,18 @@
Configuration config = configs.get(task.mTaskId);
if (config != null) {
Rect bounds = taskBounds.get(task.mTaskId);
- task.setBounds(bounds, config);
+ if (!task.isResizeable() && task.isDockedInEffect()) {
+ // This is a non-resizeable task that's docked (or side-by-side to the docked
+ // stack). It might have been scrolled previously, and after the stack resizing,
+ // it might no longer fully cover the stack area.
+ // Save the old bounds and re-apply the scroll. This adjusts the bounds to
+ // fit the new stack bounds.
+ task.getBounds(mTmpRect);
+ task.setBounds(bounds, config);
+ task.scrollLocked(mTmpRect);
+ } else {
+ task.setBounds(bounds, config);
+ }
} else {
Slog.wtf(TAG, "No config for task: " + task + ", is there a mismatch with AM?");
}
@@ -143,11 +154,6 @@
bounds = mTmpRect;
mFullscreen = true;
} else {
- // ensure bounds are entirely within the display rect
- if (!bounds.intersect(mTmpRect)) {
- // Can't set bounds outside the containing display.. Sorry!
- return false;
- }
mFullscreen = mTmpRect.equals(bounds);
}
}
@@ -387,7 +393,7 @@
if (dockedStack != null) {
dockedStack.getRawBounds(mTmpRect2);
}
- final boolean dockedOnTopOrLeft = WindowManagerService.sDockedStackCreateMode
+ final boolean dockedOnTopOrLeft = mService.mDockedStackCreateMode
== DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
getStackDockedModeBounds(mTmpRect, bounds, mStackId, mTmpRect2,
mDisplayContent.mDividerControllerLocked.getContentWidth(),
@@ -451,7 +457,7 @@
* close to the side of the dock.
* @param dockOnTopOrLeft If the docked stack is on the top or left side of the screen.
*/
- private static void getStackDockedModeBounds(
+ private void getStackDockedModeBounds(
Rect displayRect, Rect outBounds, int stackId, Rect dockedBounds, int dockDividerWidth,
boolean dockOnTopOrLeft) {
final boolean dockedStack = stackId == DOCKED_STACK_ID;
@@ -459,6 +465,10 @@
outBounds.set(displayRect);
if (dockedStack) {
+ if (mService.mDockedStackCreateBounds != null) {
+ outBounds.set(mService.mDockedStackCreateBounds);
+ return;
+ }
// The initial bounds of the docked stack when it is created half the screen space and
// its bounds can be adjusted after that. The bounds of all other stacks are adjusted
// to occupy whatever screen space the docked stack isn't occupying.
@@ -505,7 +515,7 @@
final Rect bounds = new Rect();
mDisplayContent.getLogicalDisplayRect(bounds);
if (!fullscreen) {
- final boolean dockedOnTopOrLeft = WindowManagerService.sDockedStackCreateMode
+ final boolean dockedOnTopOrLeft = mService.mDockedStackCreateMode
== DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
getStackDockedModeBounds(bounds, bounds, FULLSCREEN_WORKSPACE_STACK_ID, dockedBounds,
mDisplayContent.mDividerControllerLocked.getContentWidth(), dockedOnTopOrLeft);
@@ -515,10 +525,11 @@
for (int i = 0; i < count; i++) {
final TaskStack otherStack = mService.mStackIdToStack.valueAt(i);
final int otherStackId = otherStack.mStackId;
- if (StackId.isResizeableByDockedStack(otherStackId)) {
+ if (StackId.isResizeableByDockedStack(otherStackId)
+ && !otherStack.mBounds.equals(bounds)) {
mService.mH.sendMessage(
mService.mH.obtainMessage(RESIZE_STACK, otherStackId,
- 1 /*allowResizeInDockedMode*/, bounds));
+ 1 /*allowResizeInDockedMode*/, fullscreen ? null : bounds));
}
}
}
@@ -591,6 +602,8 @@
public void dump(String prefix, PrintWriter pw) {
pw.print(prefix); pw.print("mStackId="); pw.println(mStackId);
pw.print(prefix); pw.print("mDeferDetach="); pw.println(mDeferDetach);
+ pw.print(prefix); pw.print("mFullscreen="); pw.println(mFullscreen);
+ pw.print(prefix); pw.print("mBounds="); pw.println(mBounds.toShortString());
for (int taskNdx = 0; taskNdx < mTasks.size(); ++taskNdx) {
pw.print(prefix);
mTasks.get(taskNdx).printTo(prefix + " ", pw);
@@ -647,10 +660,11 @@
}
/**
- * For docked workspace provides information which side of the screen was the dock anchored.
+ * For docked workspace (or workspace that's side-by-side to the docked), provides
+ * information which side of the screen was the dock anchored.
*/
int getDockSide() {
- if (mStackId != DOCKED_STACK_ID) {
+ if (mStackId != DOCKED_STACK_ID && !StackId.isResizeableByDockedStack(mStackId)) {
return DOCKED_INVALID;
}
if (mDisplayContent == null) {
@@ -688,26 +702,4 @@
}
return false;
}
-
- /**
- * Returns true if this stack has a window that is fully visible, doesn't perform an entry
- * animation and is just positioned where it's supposed to be.
- */
- boolean hasWindowWithFinalVisibility() {
- for (int i = mTasks.size() - 1; i >= 0; i--) {
- Task task = mTasks.get(i);
- for (int j = task.mAppTokens.size() - 1; j >= 0; j--) {
- final AppWindowToken token = task.mAppTokens.get(j);
- if (token.mAppAnimator.animating || token.mWillReplaceWindow) {
- continue;
- }
- WindowState win = token.findMainWindow();
- if (win != null && !win.mWinAnimator.mEnterAnimationPending
- && !win.mWinAnimator.mEnteringAnimation) {
- return true;
- }
- }
- }
- return false;
- }
}
diff --git a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
index f5b83bb..2f890be 100644
--- a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
@@ -19,7 +19,7 @@
import android.graphics.Rect;
import android.graphics.Region;
import android.view.DisplayInfo;
-import android.view.InputDevice;
+import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.WindowManagerPolicy.PointerEventListener;
@@ -44,6 +44,10 @@
private final WindowManagerService mService;
private final DisplayContent mDisplayContent;
private final Rect mTmpRect = new Rect();
+ private final Region mNonResizeableRegion = new Region();
+ private boolean mTwoFingerScrolling;
+ private boolean mInGestureDetection;
+ private GestureDetector mGestureDetector;
private int mPointerIconShape = STYLE_NOT_SPECIFIED;
public TaskTapPointerEventListener(WindowManagerService service,
@@ -54,8 +58,18 @@
mMotionSlop = (int)(info.logicalDensityDpi * TAP_MOTION_SLOP_INCHES);
}
+ // initialize the object, note this must be done outside WindowManagerService
+ // ctor, otherwise it may cause recursion as some code in GestureDetector ctor
+ // depends on WMS being already created.
+ void init() {
+ mGestureDetector = new GestureDetector(
+ mService.mContext, new TwoFingerScrollListener(), mService.mH);
+ }
+
@Override
public void onPointerEvent(MotionEvent motionEvent) {
+ doGestureDetection(motionEvent);
+
final int action = motionEvent.getAction();
switch (action & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: {
@@ -84,6 +98,9 @@
mPointerId = -1;
}
}
+ if (motionEvent.getPointerCount() != 2) {
+ stopTwoFingerScroll();
+ }
break;
}
@@ -143,14 +160,72 @@
}
mPointerId = -1;
}
+ stopTwoFingerScroll();
break;
}
}
}
- void setTouchExcludeRegion(Region newRegion) {
+ private void doGestureDetection(MotionEvent motionEvent) {
+ if (mGestureDetector == null || mNonResizeableRegion.isEmpty()) {
+ return;
+ }
+ final int action = motionEvent.getAction() & MotionEvent.ACTION_MASK;
+ final int x = (int) motionEvent.getX();
+ final int y = (int) motionEvent.getY();
+ final boolean isTouchInside = mNonResizeableRegion.contains(x, y);
+ if (mInGestureDetection || action == MotionEvent.ACTION_DOWN && isTouchInside) {
+ // If we receive the following actions, or the pointer goes out of the area
+ // we're interested in, stop detecting and cancel the current detection.
+ mInGestureDetection = isTouchInside
+ && action != MotionEvent.ACTION_UP
+ && action != MotionEvent.ACTION_POINTER_UP
+ && action != MotionEvent.ACTION_CANCEL;
+ if (mInGestureDetection) {
+ mGestureDetector.onTouchEvent(motionEvent);
+ } else {
+ MotionEvent cancelEvent = motionEvent.copy();
+ cancelEvent.cancel();
+ mGestureDetector.onTouchEvent(cancelEvent);
+ stopTwoFingerScroll();
+ }
+ }
+ }
+
+ private void onTwoFingerScroll(MotionEvent e) {
+ final int x = (int)e.getX(0);
+ final int y = (int)e.getY(0);
+ if (!mTwoFingerScrolling) {
+ mTwoFingerScrolling = true;
+ mService.mH.obtainMessage(
+ H.TWO_FINGER_SCROLL_START, x, y, mDisplayContent).sendToTarget();
+ }
+ }
+
+ private void stopTwoFingerScroll() {
+ if (mTwoFingerScrolling) {
+ mTwoFingerScrolling = false;
+ mService.mH.obtainMessage(H.FINISH_TASK_POSITIONING).sendToTarget();
+ }
+ }
+
+ private final class TwoFingerScrollListener extends GestureDetector.SimpleOnGestureListener {
+ @Override
+ public boolean onScroll(MotionEvent e1, MotionEvent e2,
+ float distanceX, float distanceY) {
+ if (e2.getPointerCount() == 2) {
+ onTwoFingerScroll(e2);
+ return true;
+ }
+ stopTwoFingerScroll();
+ return false;
+ }
+ }
+
+ void setTouchExcludeRegion(Region newRegion, Region nonResizeableRegion) {
synchronized (this) {
mTouchExcludeRegion.set(newRegion);
+ mNonResizeableRegion.set(nonResizeableRegion);
}
}
}
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 38bd71d..f20c4e5 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -67,7 +67,7 @@
private final WindowSurfacePlacer mWindowPlacerLocked;
/** Is any window animating? */
- boolean mAnimating;
+ private boolean mAnimating;
/** Is any app window animating? */
boolean mAppWindowAnimating;
@@ -168,7 +168,8 @@
appAnimator.wasAnimating = appAnimator.animating;
if (appAnimator.stepAnimationLocked(mCurrentTime, displayId)) {
appAnimator.animating = true;
- mAnimating = mAppWindowAnimating = true;
+ setAnimating(true);
+ mAppWindowAnimating = true;
} else if (appAnimator.wasAnimating) {
// stopped animating, do one more pass through the layout
setAppLayoutChanges(appAnimator,
@@ -186,7 +187,8 @@
final AppWindowAnimator appAnimator = exitingAppTokens.get(i).mAppAnimator;
appAnimator.wasAnimating = appAnimator.animating;
if (appAnimator.stepAnimationLocked(mCurrentTime, displayId)) {
- mAnimating = mAppWindowAnimating = true;
+ setAnimating(true);
+ mAppWindowAnimating = true;
} else if (appAnimator.wasAnimating) {
// stopped animating, do one more pass through the layout
setAppLayoutChanges(appAnimator,
@@ -218,8 +220,8 @@
if (appShowWhenLocked != null) {
allowWhenLocked |= appShowWhenLocked == win.mAppToken
- // Show all SHOW_WHEN_LOCKED windows while they're animating
- || (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 && win.isAnimatingLw()
+ // Show all SHOW_WHEN_LOCKED windows if some apps are shown over lockscreen
+ || (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0
// Show error dialogs over apps that dismiss keyguard.
|| (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0;
}
@@ -282,7 +284,7 @@
final boolean wasAnimating = winAnimator.mWasAnimating;
final boolean nowAnimating = winAnimator.stepAnimationLocked(mCurrentTime);
winAnimator.mWasAnimating = nowAnimating;
- mAnimating |= nowAnimating;
+ orAnimating(nowAnimating);
if (DEBUG_WALLPAPER) {
Slog.v(TAG, win + ": wasAnimating=" + wasAnimating +
@@ -546,7 +548,7 @@
}
}
}
- mAnimating = true;
+ setAnimating(true);
}
// If this window's app token is running a detached wallpaper
@@ -617,7 +619,7 @@
// We can now show all of the drawn windows!
if (!mService.mOpeningApps.contains(wtoken)) {
- mAnimating |= appAnimator.showAllWindowsLocked();
+ orAnimating(appAnimator.showAllWindowsLocked());
}
}
}
@@ -636,7 +638,7 @@
mCurrentTime = frameTimeNs / TimeUtils.NANOS_PER_MS;
mBulkUpdateParams = SET_ORIENTATION_CHANGE_COMPLETE;
boolean wasAnimating = mAnimating;
- mAnimating = false;
+ setAnimating(false);
mAppWindowAnimating = false;
if (DEBUG_WINDOW_TRACE) {
Slog.i(TAG, "!!! animate: entry time=" + mCurrentTime);
@@ -657,7 +659,7 @@
displayAnimator.mScreenRotationAnimation;
if (screenRotationAnimation != null && screenRotationAnimation.isAnimating()) {
if (screenRotationAnimation.stepAnimationLocked(mCurrentTime)) {
- mAnimating = true;
+ setAnimating(true);
} else {
mBulkUpdateParams |= SET_UPDATE_ROTATION;
screenRotationAnimation.kill();
@@ -697,7 +699,7 @@
screenRotationAnimation.updateSurfacesInTransaction();
}
- mAnimating |= mService.getDisplayContentLocked(displayId).animateDimLayers();
+ orAnimating(mService.getDisplayContentLocked(displayId).animateDimLayers());
//TODO (multidisplay): Magnification is supported only for the default display.
if (mService.mAccessibilityController != null
@@ -706,6 +708,10 @@
}
}
+ if (mService.mDragState != null) {
+ mAnimating |= mService.mDragState.stepAnimationLocked(mCurrentTime);
+ }
+
if (mAnimating) {
mService.scheduleAnimationLocked();
}
@@ -920,4 +926,16 @@
private class DisplayContentsAnimator {
ScreenRotationAnimation mScreenRotationAnimation = null;
}
+
+ boolean isAnimating() {
+ return mAnimating;
+ }
+
+ void setAnimating(boolean animating) {
+ mAnimating = animating;
+ }
+
+ void orAnimating(boolean animating) {
+ mAnimating |= animating;
+ }
}
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index a22f821..1bb5ad0 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -50,10 +50,13 @@
import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED;
import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
-import static com.android.server.wm.WindowState.BOUNDS_FOR_TOUCH;
+import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_END;
+import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_START;
import android.Manifest;
import android.animation.ValueAnimator;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.ActivityManagerNative;
import android.app.AppOpsManager;
import android.app.IActivityManager;
@@ -118,6 +121,7 @@
import android.view.Gravity;
import android.view.IApplicationToken;
import android.view.IAppTransitionAnimationSpecsFuture;
+import android.view.IDockDividerVisibilityListener;
import android.view.IInputFilter;
import android.view.IOnKeyguardExitResult;
import android.view.IRotationWatcher;
@@ -146,8 +150,10 @@
import android.view.WindowManagerPolicy;
import android.view.WindowManagerPolicy.PointerEventListener;
import android.view.animation.Animation;
+import android.widget.Toast;
import com.android.internal.app.IAssistScreenshotReceiver;
+import com.android.internal.R;
import com.android.internal.util.FastPrintWriter;
import com.android.internal.view.IInputContext;
import com.android.internal.view.IInputMethodClient;
@@ -306,6 +312,8 @@
// trying to apply a new one.
private static final boolean ALWAYS_KEEP_CURRENT = true;
+ private static final float DRAG_SHADOW_ALPHA_TRANSPARENT = .7071f;
+
final private KeyguardDisableHandler mKeyguardDisableHandler;
final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@@ -477,7 +485,8 @@
private boolean mKeyguardWaitingForActivityDrawn;
- static int sDockedStackCreateMode = DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
+ int mDockedStackCreateMode = DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
+ Rect mDockedStackCreateBounds;
private final SparseIntArray mTmpTaskIds = new SparseIntArray();
@@ -750,9 +759,6 @@
private boolean completeDropLw(float x, float y) {
WindowState dropTargetWin = mDragState.getDropTargetWinLw(x, y);
- mDragState.mCurrentX = x;
- mDragState.mCurrentY = y;
-
DropPermissionHolder dropPermissionHolder = null;
if (dropTargetWin != null &&
(mDragState.mFlags & View.DRAG_FLAG_GLOBAL) != 0 &&
@@ -910,7 +916,7 @@
PowerManager.PARTIAL_WAKE_LOCK, "SCREEN_FROZEN");
mScreenFrozenLock.setReferenceCounted(false);
- mAppTransition = new AppTransition(context, mH, mWindowMap, mWindowPlacerLocked);
+ mAppTransition = new AppTransition(context, this);
mAppTransition.registerListenerLocked(mActivityManagerAppTransitionNotifier);
mActivityManager = ActivityManagerNative.getDefault();
@@ -2522,10 +2528,12 @@
+ "attached to a parent win=" + win);
}
- win.mFrame.left = left;
- win.mFrame.top = top;
- win.mFrame.right = right;
- win.mFrame.bottom = bottom;
+ win.mAttrs.x = left;
+ win.mAttrs.y = top;
+ win.mAttrs.width = right - left;
+ win.mAttrs.height = bottom - top;
+
+ win.setWindowScale(win.mRequestedWidth, win.mRequestedHeight);
win.mWinAnimator.computeShownFrameLocked();
@@ -2686,8 +2694,7 @@
// need to see about starting one.
final boolean notExitingOrAnimating =
!win.mExiting && !win.isAnimatingWithSavedSurface();
- result |= notExitingOrAnimating
- ? RELAYOUT_RES_SURFACE_CHANGED : 0;
+ result |= notExitingOrAnimating ? RELAYOUT_RES_SURFACE_CHANGED : 0;
if (notExitingOrAnimating) {
focusMayChange = tryStartingAnimation(win, winAnimator, isDefaultDisplay,
focusMayChange);
@@ -2737,6 +2744,10 @@
if (win.mAppToken != null) {
win.mAppToken.updateReportedVisibilityLocked();
}
+ if (winAnimator.mReportSurfaceResized) {
+ winAnimator.mReportSurfaceResized = false;
+ result |= WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED;
+ }
outFrame.set(win.mCompatFrame);
outOverscanInsets.set(win.mOverscanInsets);
outContentInsets.set(win.mContentInsets);
@@ -2856,7 +2867,11 @@
// notifying the client to render to with an offset from the surface's top-left.
if (win.isDragResizeChanged()) {
win.setDragResizing();
- if (win.mHasSurface) {
+ // We can only change top level windows to the full-screen surface when
+ // resizing (as we only have one full-screen surface). So there is no need
+ // to preserve and destroy windows which are attached to another, they
+ // will keep their surface and its size may change over time.
+ if (win.mHasSurface && win.mAttachedWindow == null) {
winAnimator.preserveSurfaceLocked();
result |= WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME;
}
@@ -2941,7 +2956,7 @@
final Rect frame = new Rect(0, 0, width, height);
final Rect insets = new Rect();
Rect surfaceInsets = null;
- final boolean fullscreen = win != null && win.isFullscreen(width, height);
+ final boolean fullscreen = win != null && win.isFrameFullscreen(displayInfo);
final boolean freeform = win != null && win.inFreeformWorkspace();
final boolean docked = win != null && win.inDockedWorkspace();
if (win != null) {
@@ -3064,7 +3079,7 @@
// TODO:
}
- boolean checkCallingPermission(String permission, String func) {
+ private boolean checkCallingPermission(String permission, String func) {
// Quick check: if the calling permission is me, it's all okay.
if (Binder.getCallingPid() == Process.myPid()) {
return true;
@@ -3564,7 +3579,7 @@
}
}
- void setFocusTaskRegion() {
+ void setFocusTaskRegionLocked() {
if (mFocusedApp != null) {
final Task task = mFocusedApp.mTask;
final DisplayContent displayContent = task.getDisplayContent();
@@ -3599,7 +3614,7 @@
if (changed) {
mFocusedApp = newFocus;
mInputMonitor.setFocusedAppLw(newFocus);
- setFocusTaskRegion();
+ setFocusTaskRegionLocked();
}
if (moveFocusNow && changed) {
@@ -3689,22 +3704,26 @@
synchronized (mWindowMap) {
mAppTransition.overridePendingAppTransitionMultiThumb(specs, onAnimationStartedCallback,
onAnimationFinishedCallback, scaleUp);
- if (!scaleUp) {
- // This is used by freeform to recents windows transition. We need to synchronize
- // the animation with the appearance of the content of recents, so we will make
- // animation stay on the last frame a little longer.
- mTmpTaskIds.clear();
- for (int i = specs.length - 1; i >= 0; i--) {
- mTmpTaskIds.put(specs[i].taskId, 0);
- }
- for (final WindowState win : mWindowMap.values()) {
- final Task task = win.getTask();
- if (task != null && mTmpTaskIds.get(task.mTaskId, -1) != -1) {
- final AppWindowToken appToken = win.mAppToken;
- if (appToken != null && appToken.mAppAnimator != null) {
- appToken.mAppAnimator.startProlongAnimation();
- }
- }
+ prolongAnimationsFromSpecs(specs, scaleUp);
+
+ }
+ }
+
+ void prolongAnimationsFromSpecs(@NonNull AppTransitionAnimationSpec[] specs, boolean scaleUp) {
+ // This is used by freeform <-> recents windows transition. We need to synchronize
+ // the animation with the appearance of the content of recents, so we will make
+ // animation stay on the first or last frame a little longer.
+ mTmpTaskIds.clear();
+ for (int i = specs.length - 1; i >= 0; i--) {
+ mTmpTaskIds.put(specs[i].taskId, 0);
+ }
+ for (final WindowState win : mWindowMap.values()) {
+ final Task task = win.getTask();
+ if (task != null && mTmpTaskIds.get(task.mTaskId, -1) != -1) {
+ final AppWindowToken appToken = win.mAppToken;
+ if (appToken != null && appToken.mAppAnimator != null) {
+ appToken.mAppAnimator.startProlongAnimation(scaleUp ?
+ PROLONG_ANIMATION_AT_START : PROLONG_ANIMATION_AT_END);
}
}
}
@@ -4617,9 +4636,10 @@
return (stack != null && stack.isVisibleLocked());
}
- public void setDockedStackCreateMode(int mode) {
+ public void setDockedStackCreateState(int mode, Rect bounds) {
synchronized (mWindowMap) {
- sDockedStackCreateMode = mode;
+ mDockedStackCreateMode = mode;
+ mDockedStackCreateBounds = bounds;
}
}
@@ -4771,6 +4791,17 @@
}
}
+ public void scheduleShowNonResizeableDockToast(int taskId) {
+ synchronized (mWindowMap) {
+ Task task = mTaskIdToTask.get(taskId);
+ if (task == null) {
+ if (DEBUG_STACK) Slog.i(TAG, "scheduleShowToast: could not find taskId=" + taskId);
+ return;
+ }
+ task.setShowNonResizeableDockToast();
+ }
+ }
+
public void getStackBounds(int stackId, Rect bounds) {
synchronized (mWindowMap) {
final TaskStack stack = mStackIdToStack.get(stackId);
@@ -4852,6 +4883,21 @@
}
}
+ public void scrollTask(int taskId, Rect bounds) {
+ synchronized (mWindowMap) {
+ Task task = mTaskIdToTask.get(taskId);
+ if (task == null) {
+ throw new IllegalArgumentException("scrollTask: taskId " + taskId
+ + " not found.");
+ }
+
+ if (task.scrollLocked(bounds)) {
+ task.getDisplayContent().layoutNeeded = true;
+ mInputMonitor.setUpdateInputWindowsNeededLw();
+ mWindowPlacerLocked.performSurfacePlacement();
+ }
+ }
+ }
/**
* Starts deferring layout passes. Useful when doing multiple changes but to optimize
* performance, only one layout pass should be done. This can be called multiple times, and
@@ -5703,7 +5749,7 @@
@Override
public void run() {
Bitmap bm = screenshotApplicationsInner(null, Display.DEFAULT_DISPLAY, -1, -1,
- true);
+ true, 1f);
try {
receiver.send(bm);
} catch (RemoteException e) {
@@ -5722,18 +5768,20 @@
* @param displayId the Display to take a screenshot of.
* @param width the width of the target bitmap
* @param height the height of the target bitmap
+ * @param frameScale the scale to apply to the frame, only used when width = -1 and height = -1
*/
@Override
- public Bitmap screenshotApplications(IBinder appToken, int displayId, int width, int height) {
+ public Bitmap screenshotApplications(IBinder appToken, int displayId, int width, int height,
+ float frameScale) {
if (!checkCallingPermission(Manifest.permission.READ_FRAME_BUFFER,
"screenshotApplications()")) {
throw new SecurityException("Requires READ_FRAME_BUFFER permission");
}
- return screenshotApplicationsInner(appToken, displayId, width, height, false);
+ return screenshotApplicationsInner(appToken, displayId, width, height, false, frameScale);
}
Bitmap screenshotApplicationsInner(IBinder appToken, int displayId, int width, int height,
- boolean includeFullDisplay) {
+ boolean includeFullDisplay, float frameScale) {
final DisplayContent displayContent;
synchronized(mWindowMap) {
displayContent = getDisplayContentLocked(displayId);
@@ -5862,7 +5910,7 @@
screenshotReady = true;
}
- if (ws.isFullscreen(dw, dh) && ws.isOpaqueDrawn()){
+ if (ws.isObscuringFullscreen(displayInfo)){
break;
}
}
@@ -5913,10 +5961,10 @@
}
if (width < 0) {
- width = frame.width();
+ width = (int) (frame.width() * frameScale);
}
if (height < 0) {
- height = frame.height();
+ height = (int) (frame.height() * frameScale);
}
// Tell surface flinger what part of the image to crop. Take the top
@@ -6904,27 +6952,25 @@
final int appWidth = mPolicy.getNonDecorDisplayWidth(dw, dh, mRotation);
final int appHeight = mPolicy.getNonDecorDisplayHeight(dw, dh, mRotation);
final DisplayInfo displayInfo = displayContent.getDisplayInfo();
- synchronized(displayContent.mDisplaySizeLock) {
- displayInfo.rotation = mRotation;
- displayInfo.logicalWidth = dw;
- displayInfo.logicalHeight = dh;
- displayInfo.logicalDensityDpi = displayContent.mBaseDisplayDensity;
- displayInfo.appWidth = appWidth;
- displayInfo.appHeight = appHeight;
- displayInfo.getLogicalMetrics(mRealDisplayMetrics,
- CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);
- displayInfo.getAppMetrics(mDisplayMetrics);
- if (displayContent.mDisplayScalingDisabled) {
- displayInfo.flags |= Display.FLAG_SCALING_DISABLED;
- } else {
- displayInfo.flags &= ~Display.FLAG_SCALING_DISABLED;
- }
-
- mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(
- displayContent.getDisplayId(), displayInfo);
-
- displayContent.mBaseDisplayRect.set(0, 0, dw, dh);
+ displayInfo.rotation = mRotation;
+ displayInfo.logicalWidth = dw;
+ displayInfo.logicalHeight = dh;
+ displayInfo.logicalDensityDpi = displayContent.mBaseDisplayDensity;
+ displayInfo.appWidth = appWidth;
+ displayInfo.appHeight = appHeight;
+ displayInfo.getLogicalMetrics(mRealDisplayMetrics,
+ CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);
+ displayInfo.getAppMetrics(mDisplayMetrics);
+ if (displayContent.mDisplayScalingDisabled) {
+ displayInfo.flags |= Display.FLAG_SCALING_DISABLED;
+ } else {
+ displayInfo.flags &= ~Display.FLAG_SCALING_DISABLED;
}
+
+ mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(
+ displayContent.getDisplayId(), displayInfo);
+
+ displayContent.mBaseDisplayRect.set(0, 0, dw, dh);
if (false) {
Slog.i(TAG, "Set app display size: " + appWidth + " x " + appHeight);
}
@@ -7068,6 +7114,26 @@
return true;
}
+ private void startScrollingTask(DisplayContent displayContent, int startX, int startY) {
+ if (DEBUG_TASK_POSITIONING) Slog.d(TAG,
+ "startScrollingTask: " + "{" + startX + ", " + startY + "}");
+
+ Task task = null;
+ synchronized (mWindowMap) {
+ int taskId = displayContent.taskIdFromPoint(startX, startY);
+ if (taskId >= 0) {
+ task = mTaskIdToTask.get(taskId);
+ }
+ if (task == null || !task.isDockedInEffect() || !startPositioningLocked(
+ task.getTopVisibleAppMainWindow(), false /*resize*/, startX, startY)) {
+ return;
+ }
+ }
+ try {
+ mActivityManager.setFocusedTask(task.mTaskId);
+ } catch(RemoteException e) {}
+ }
+
private void startResizingTask(DisplayContent displayContent, int startX, int startY) {
Task task = null;
synchronized (mWindowMap) {
@@ -7084,11 +7150,10 @@
private boolean startPositioningLocked(
WindowState win, boolean resize, float startX, float startY) {
- if (WindowManagerService.DEBUG_TASK_POSITIONING) {
- Slog.d(TAG, "startPositioningLocked: win=" + win +
- ", resize=" + resize + ", {" + startX + ", " + startY + "}");
- }
- if (win == null || win.getAppToken() == null || !win.inFreeformWorkspace()) {
+ if (DEBUG_TASK_POSITIONING) Slog.d(TAG, "startPositioningLocked: "
+ + "win=" + win + ", resize=" + resize + ", {" + startX + ", " + startY + "}");
+
+ if (win == null || win.getAppToken() == null) {
Slog.w(TAG, "startPositioningLocked: Bad window " + win);
return false;
}
@@ -7122,7 +7187,7 @@
}
private void finishPositioning() {
- if (WindowManagerService.DEBUG_TASK_POSITIONING) {
+ if (DEBUG_TASK_POSITIONING) {
Slog.d(TAG, "finishPositioning");
}
synchronized (mWindowMap) {
@@ -7162,9 +7227,11 @@
SurfaceControl surface = new SurfaceControl(session, "drag surface",
width, height, PixelFormat.TRANSLUCENT, SurfaceControl.HIDDEN);
surface.setLayerStack(display.getLayerStack());
+ float alpha = 1;
if ((flags & View.DRAG_FLAG_OPAQUE) == 0) {
- surface.setAlpha(.7071f);
+ alpha = DRAG_SHADOW_ALPHA_TRANSPARENT;
}
+ surface.setAlpha(alpha);
if (SHOW_TRANSACTIONS) Slog.i(TAG, " DRAG "
+ surface + ": CREATE");
@@ -7174,6 +7241,7 @@
mDragState = new DragState(this, token, surface, flags, winBinder);
mDragState.mPid = callerPid;
mDragState.mUid = callerUid;
+ mDragState.mOriginalAlpha = alpha;
token = mDragState.mToken = new Binder();
// 5 second timeout for this window to actually begin the drag
@@ -7332,6 +7400,7 @@
if (displayContent != null) {
mAnimator.addDisplayLocked(displayId);
displayContent.initializeDisplayBaseInfo();
+ displayContent.mTapDetector.init();
}
}
}
@@ -7397,6 +7466,9 @@
public static final int RESIZE_STACK = 43;
public static final int RESIZE_TASK = 44;
+ public static final int TWO_FINGER_SCROLL_START = 45;
+ public static final int SHOW_NON_RESIZEABLE_DOCK_TOAST = 46;
+
/**
* Used to denote that an integer field in a message will not be used.
*/
@@ -7683,7 +7755,7 @@
synchronized (mWindowMap) {
// Since we're holding both mWindowMap and mAnimator we don't need to
// hold mAnimator.mLayoutToAnim.
- if (mAnimator.mAnimating || mAnimationScheduled) {
+ if (mAnimator.isAnimating() || mAnimationScheduled) {
// If we are animating, don't do the gc now but
// delay a bit so we don't interrupt the animation.
sendEmptyMessageDelayed(H.FORCE_GC, 2000);
@@ -7863,6 +7935,11 @@
}
break;
+ case TWO_FINGER_SCROLL_START: {
+ startScrollingTask((DisplayContent)msg.obj, msg.arg1, msg.arg2);
+ }
+ break;
+
case TAP_DOWN_OUTSIDE_TASK: {
startResizingTask((DisplayContent)msg.obj, msg.arg1, msg.arg2);
}
@@ -7963,6 +8040,17 @@
}
}
break;
+ case SHOW_NON_RESIZEABLE_DOCK_TOAST: {
+ final Toast toast = Toast.makeText(mContext,
+ mContext.getString(R.string.dock_non_resizeble_text),
+ Toast.LENGTH_LONG);
+ final int gravity = toast.getGravity();
+ final int xOffset = toast.getXOffset() + msg.arg1;
+ final int yOffset = toast.getYOffset() + msg.arg2;
+ toast.setGravity(gravity, xOffset, yOffset);
+ toast.show();
+ }
+ break;
}
if (DEBUG_WINDOW_TRACE) {
Slog.v(TAG, "handleMessage: exit");
@@ -8056,10 +8144,8 @@
synchronized (mWindowMap) {
final DisplayContent displayContent = getDisplayContentLocked(displayId);
if (displayContent != null && displayContent.hasAccess(Binder.getCallingUid())) {
- synchronized(displayContent.mDisplaySizeLock) {
- size.x = displayContent.mInitialDisplayWidth;
- size.y = displayContent.mInitialDisplayHeight;
- }
+ size.x = displayContent.mInitialDisplayWidth;
+ size.y = displayContent.mInitialDisplayHeight;
}
}
}
@@ -8069,10 +8155,8 @@
synchronized (mWindowMap) {
final DisplayContent displayContent = getDisplayContentLocked(displayId);
if (displayContent != null && displayContent.hasAccess(Binder.getCallingUid())) {
- synchronized(displayContent.mDisplaySizeLock) {
- size.x = displayContent.mBaseDisplayWidth;
- size.y = displayContent.mBaseDisplayHeight;
- }
+ size.x = displayContent.mBaseDisplayWidth;
+ size.y = displayContent.mBaseDisplayHeight;
}
}
}
@@ -8141,13 +8225,9 @@
}
}
- private void setForcedDisplayScalingModeLocked(DisplayContent displayContent,
- int mode) {
+ private void setForcedDisplayScalingModeLocked(DisplayContent displayContent, int mode) {
Slog.i(TAG, "Using display scaling mode: " + (mode == 0 ? "auto" : "off"));
-
- synchronized(displayContent.mDisplaySizeLock) {
- displayContent.mDisplayScalingDisabled = (mode != 0);
- }
+ displayContent.mDisplayScalingDisabled = (mode != 0);
reconfigureDisplayLocked(displayContent);
}
@@ -8165,13 +8245,11 @@
try {
width = Integer.parseInt(sizeStr.substring(0, pos));
height = Integer.parseInt(sizeStr.substring(pos+1));
- synchronized(displayContent.mDisplaySizeLock) {
- if (displayContent.mBaseDisplayWidth != width
- || displayContent.mBaseDisplayHeight != height) {
- Slog.i(TAG, "FORCED DISPLAY SIZE: " + width + "x" + height);
- displayContent.mBaseDisplayWidth = width;
- displayContent.mBaseDisplayHeight = height;
- }
+ if (displayContent.mBaseDisplayWidth != width
+ || displayContent.mBaseDisplayHeight != height) {
+ Slog.i(TAG, "FORCED DISPLAY SIZE: " + width + "x" + height);
+ displayContent.mBaseDisplayWidth = width;
+ displayContent.mBaseDisplayHeight = height;
}
} catch (NumberFormatException ex) {
}
@@ -8188,11 +8266,9 @@
int density;
try {
density = Integer.parseInt(densityStr);
- synchronized(displayContent.mDisplaySizeLock) {
- if (displayContent.mBaseDisplayDensity != density) {
- Slog.i(TAG, "FORCED DISPLAY DENSITY: " + density);
- displayContent.mBaseDisplayDensity = density;
- }
+ if (displayContent.mBaseDisplayDensity != density) {
+ Slog.i(TAG, "FORCED DISPLAY DENSITY: " + density);
+ displayContent.mBaseDisplayDensity = density;
}
} catch (NumberFormatException ex) {
}
@@ -8202,21 +8278,16 @@
int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DISPLAY_SCALING_FORCE, 0);
if (mode != 0) {
- synchronized(displayContent.mDisplaySizeLock) {
- Slog.i(TAG, "FORCED DISPLAY SCALING DISABLED");
- displayContent.mDisplayScalingDisabled = true;
- }
+ Slog.i(TAG, "FORCED DISPLAY SCALING DISABLED");
+ displayContent.mDisplayScalingDisabled = true;
}
}
// displayContent must not be null
private void setForcedDisplaySizeLocked(DisplayContent displayContent, int width, int height) {
Slog.i(TAG, "Using new display size: " + width + "x" + height);
-
- synchronized(displayContent.mDisplaySizeLock) {
- displayContent.mBaseDisplayWidth = width;
- displayContent.mBaseDisplayHeight = height;
- }
+ displayContent.mBaseDisplayWidth = width;
+ displayContent.mBaseDisplayHeight = height;
reconfigureDisplayLocked(displayContent);
}
@@ -8252,9 +8323,7 @@
synchronized (mWindowMap) {
final DisplayContent displayContent = getDisplayContentLocked(displayId);
if (displayContent != null && displayContent.hasAccess(Binder.getCallingUid())) {
- synchronized(displayContent.mDisplaySizeLock) {
- return displayContent.mInitialDisplayDensity;
- }
+ return displayContent.mInitialDisplayDensity;
}
}
return -1;
@@ -8265,9 +8334,7 @@
synchronized (mWindowMap) {
final DisplayContent displayContent = getDisplayContentLocked(displayId);
if (displayContent != null && displayContent.hasAccess(Binder.getCallingUid())) {
- synchronized(displayContent.mDisplaySizeLock) {
- return displayContent.mBaseDisplayDensity;
- }
+ return displayContent.mBaseDisplayDensity;
}
}
return -1;
@@ -8302,10 +8369,7 @@
// displayContent must not be null
private void setForcedDisplayDensityLocked(DisplayContent displayContent, int density) {
Slog.i(TAG, "Using new display density: " + density);
-
- synchronized(displayContent.mDisplaySizeLock) {
- displayContent.mBaseDisplayDensity = density;
- }
+ displayContent.mBaseDisplayDensity = density;
reconfigureDisplayLocked(displayContent);
}
@@ -8396,12 +8460,10 @@
private void setOverscanLocked(DisplayContent displayContent,
int left, int top, int right, int bottom) {
final DisplayInfo displayInfo = displayContent.getDisplayInfo();
- synchronized (displayContent.mDisplaySizeLock) {
- displayInfo.overscanLeft = left;
- displayInfo.overscanTop = top;
- displayInfo.overscanRight = right;
- displayInfo.overscanBottom = bottom;
- }
+ displayInfo.overscanLeft = left;
+ displayInfo.overscanTop = top;
+ displayInfo.overscanRight = right;
+ displayInfo.overscanBottom = bottom;
mDisplaySettings.setOverscanLocked(displayInfo.uniqueId, displayInfo.name, left, top,
right, bottom);
@@ -8580,8 +8642,8 @@
} else if (wtoken != null) {
winAnimator.mAnimLayer =
w.mLayer + wtoken.mAppAnimator.animLayerAdjustment;
- if (wtoken.mWillReplaceWindow && wtoken.mAnimateReplacingWindow &&
- wtoken.mReplacingWindow != w) {
+ if (wtoken.mWillReplaceWindow && wtoken.mReplacingWindow != w
+ && wtoken.mAnimateReplacingWindow) {
// We know that we will be animating a relaunching window in the near future,
// which will receive a z-order increase. We want the replaced window to
// immediately receive the same treatment, e.g. to be above the dock divider.
@@ -9069,8 +9131,9 @@
if (wtoken == token) {
break;
}
- if (mFocusedApp == token) {
- // Whoops, we are below the focused app... no focus for you!
+ if (mFocusedApp == token && token.stackCanReceiveKeys()) {
+ // Whoops, we are below the focused app whose stack can receive keys...
+ // No focus for you!!!
if (localLOGV || DEBUG_FOCUS_LIGHT) Slog.v(TAG,
"findFocusedWindow: Reached focused app=" + mFocusedApp);
return null;
@@ -9988,14 +10051,11 @@
DisplayInfo displayInfo = displayContent.getDisplayInfo();
final Rect rect = new Rect();
mDisplaySettings.getOverscanLocked(displayInfo.name, displayInfo.uniqueId, rect);
- synchronized (displayContent.mDisplaySizeLock) {
- displayInfo.overscanLeft = rect.left;
- displayInfo.overscanTop = rect.top;
- displayInfo.overscanRight = rect.right;
- displayInfo.overscanBottom = rect.bottom;
- mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(
- displayId, displayInfo);
- }
+ displayInfo.overscanLeft = rect.left;
+ displayInfo.overscanTop = rect.top;
+ displayInfo.overscanRight = rect.right;
+ displayInfo.overscanBottom = rect.bottom;
+ mDisplayManagerInternal.setDisplayInfoOverrideFromWindowManager(displayId, displayInfo);
configureDisplayPolicyLocked(displayContent);
// TODO: Create an input channel for each display with touch capability.
@@ -10121,7 +10181,6 @@
* Hint to a token that its activity will relaunch, which will trigger removal and addition of
* a window.
* @param token Application token for which the activity will be relaunched.
- * @param animate Whether to animate the addition of the new window.
*/
public void setReplacingWindow(IBinder token, boolean animate) {
synchronized (mWindowMap) {
@@ -10135,6 +10194,15 @@
appWindowToken.mWillReplaceWindow = true;
appWindowToken.mHasReplacedWindow = false;
appWindowToken.mAnimateReplacingWindow = animate;
+
+ if (animate) {
+ // Set-up dummy animation so we can start treating windows associated with this
+ // token like they are in transition before the new app window is ready for us to
+ // run the real transition animation.
+ if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
+ "setReplacingWindow() Setting dummy animation on: " + appWindowToken);
+ appWindowToken.mAppAnimator.setDummyAnimation();
+ }
}
}
@@ -10154,14 +10222,46 @@
}
}
- boolean isDockedStackResizingLocked() {
- return getDefaultDisplayContentLocked().getDockedDividerController().isResizing();
+ public void setTaskResizeable(int taskId, boolean resizeable) {
+ synchronized (mWindowMap) {
+ Task task = mTaskIdToTask.get(taskId);
+ if (task != null) {
+ task.setResizeable(resizeable);
+ }
+ }
}
static int dipToPixel(int dip, DisplayMetrics displayMetrics) {
return (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dip, displayMetrics);
}
+ void scheduleSurfaceDestroy(WindowState win) {
+ mDestroySurface.add(win);
+ }
+
+ @Override
+ public void registerDockDividerVisibilityListener(IDockDividerVisibilityListener listener) {
+ if (!checkCallingPermission(android.Manifest.permission.REGISTER_WINDOW_MANAGER_LISTENERS,
+ "registerDockDividerVisibilityListener()")) {
+ return;
+ }
+ // TODO(multi-display): The listener is registered on the default display only.
+ final DockedStackDividerController controller =
+ getDefaultDisplayContentLocked().getDockedDividerController();
+ controller.registerDockDividerVisibilityListener(listener);
+ try {
+ listener.asBinder().linkToDeath(new IBinder.DeathRecipient() {
+ @Override
+ public void binderDied() {
+ getDefaultDisplayContentLocked().getDockedDividerController()
+ .registerDockDividerVisibilityListener(null);
+ }
+ }, 0);
+ } catch (RemoteException e) {
+ controller.registerDockDividerVisibilityListener(null);
+ }
+ }
+
private final class LocalService extends WindowManagerInternal {
@Override
public void requestTraversalFromDisplayManager() {
@@ -10203,7 +10303,7 @@
}
@Override
- public void setMagnificationCallbacks(MagnificationCallbacks callbacks) {
+ public void setMagnificationCallbacks(@Nullable MagnificationCallbacks callbacks) {
synchronized (mWindowMap) {
if (mAccessibilityController == null) {
mAccessibilityController = new AccessibilityController(
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 673c21f..cfa2bb3 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -16,11 +16,58 @@
package com.android.server.wm;
+import com.android.server.input.InputWindowHandle;
+
+import android.app.ActivityManager;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Matrix;
+import android.graphics.PixelFormat;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
+import android.os.SystemClock;
+import android.os.Trace;
+import android.os.UserHandle;
+import android.os.WorkSource;
+import android.util.DisplayMetrics;
+import android.util.Slog;
+import android.util.TimeUtils;
+import android.view.Display;
+import android.view.DisplayInfo;
+import android.view.Gravity;
+import android.view.IApplicationToken;
+import android.view.IWindow;
+import android.view.IWindowFocusObserver;
+import android.view.IWindowId;
+import android.view.InputChannel;
+import android.view.InputEvent;
+import android.view.InputEventReceiver;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.view.WindowManagerPolicy;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+
+import static android.app.ActivityManager.StackId;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
+import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT;
+import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME;
+import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION;
+import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_VISIBLE;
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;
import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;
import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
import static android.view.WindowManager.LayoutParams.FLAG_SCALED;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
import static android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
@@ -36,8 +83,6 @@
import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
import static com.android.server.wm.WindowManagerService.DEBUG_ADD_REMOVE;
-import static com.android.server.wm.WindowManagerService.DEBUG_ANIM;
-import static com.android.server.wm.WindowManagerService.DEBUG_APP_TRANSITIONS;
import static com.android.server.wm.WindowManagerService.DEBUG_CONFIGURATION;
import static com.android.server.wm.WindowManagerService.DEBUG_FOCUS_LIGHT;
import static com.android.server.wm.WindowManagerService.DEBUG_LAYOUT;
@@ -46,47 +91,6 @@
import static com.android.server.wm.WindowManagerService.DEBUG_RESIZE;
import static com.android.server.wm.WindowManagerService.DEBUG_VISIBILITY;
-import android.app.ActivityManager;
-import android.app.AppOpsManager;
-import android.graphics.Point;
-import android.os.PowerManager;
-import android.os.RemoteCallbackList;
-import android.os.SystemClock;
-import android.os.Trace;
-import android.os.WorkSource;
-import android.util.DisplayMetrics;
-import android.util.TimeUtils;
-import android.view.Display;
-import android.view.IWindowFocusObserver;
-import android.view.IWindowId;
-
-import com.android.server.input.InputWindowHandle;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Matrix;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.util.Slog;
-import android.view.DisplayInfo;
-import android.view.Gravity;
-import android.view.IApplicationToken;
-import android.view.IWindow;
-import android.view.InputChannel;
-import android.view.InputEvent;
-import android.view.InputEventReceiver;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.WindowManager;
-import android.view.WindowManagerPolicy;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-
class WindowList extends ArrayList<WindowState> {
}
@@ -106,8 +110,6 @@
// to capture touch events in that area.
static final int RESIZE_HANDLE_WIDTH_IN_DP = 30;
- static final boolean BOUNDS_FOR_TOUCH = true;
-
static final int DRAG_RESIZE_MODE_FREEFORM = 0;
static final int DRAG_RESIZE_MODE_DOCKED_DIVIDER = 1;
@@ -729,7 +731,7 @@
mVisibleFrame.set(mContentFrame);
mStableFrame.set(mContentFrame);
} else if (mAttrs.type == TYPE_DOCK_DIVIDER) {
- if (isVisibleLw()) {
+ if (isVisibleLw() || mWinAnimator.isAnimating()) {
// We don't adjust the dock divider frame for reasons other than performance. The
// real reason is that if it gets adjusted before it is shown for the first time,
// it would get size (0, 0). This causes a problem when we finally show the dock
@@ -1249,9 +1251,20 @@
&& (mAttachedWindow == null || !mAttachedWindow.hasMoved());
}
- boolean isFullscreen(int screenWidth, int screenHeight) {
- return mFrame.left <= 0 && mFrame.top <= 0 &&
- mFrame.right >= screenWidth && mFrame.bottom >= screenHeight;
+ boolean isObscuringFullscreen(final DisplayInfo displayInfo) {
+ Task task = getTask();
+ if (task != null && task.mStack != null && !task.mStack.isFullscreen()) {
+ return false;
+ }
+ if (!isOpaqueDrawn() || !isFrameFullscreen(displayInfo)) {
+ return false;
+ }
+ return true;
+ }
+
+ boolean isFrameFullscreen(final DisplayInfo displayInfo) {
+ return mFrame.left <= 0 && mFrame.top <= 0
+ && mFrame.right >= displayInfo.appWidth && mFrame.bottom >= displayInfo.appHeight;
}
boolean isConfigChanged() {
@@ -1408,15 +1421,20 @@
}
boolean inDockedWorkspace() {
- return mAppToken != null && mAppToken.mTask != null && mAppToken.mTask.inDockedWorkspace();
+ Task task = getTask();
+ return task != null && task.inDockedWorkspace();
}
- int getTouchableRegion(Region region, int flags, InputMonitor inputMonitor) {
- final boolean modal = (flags & (WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
- | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)) == 0;
+ boolean isDockedInEffect() {
+ Task task = getTask();
+ return task != null && task.isDockedInEffect();
+ }
+
+ int getTouchableRegion(Region region, int flags) {
+ final boolean modal = (flags & (FLAG_NOT_TOUCH_MODAL | FLAG_NOT_FOCUSABLE)) == 0;
if (modal && mAppToken != null) {
// Limit the outer touch to the activity stack region.
- flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
+ flags |= FLAG_NOT_TOUCH_MODAL;
// If this is a modal window we need to dismiss it if it's not full screen and the
// touch happens outside of the frame that displays the content. This means we
// need to intercept touches outside of that window. The dim layer user
@@ -1437,6 +1455,7 @@
mTmpRect.inset(-delta, -delta);
}
region.set(mTmpRect);
+ cropRegionToStackBoundsIfNeeded(region);
} else {
// Not modal or full screen modal
getTouchableRegion(region);
@@ -1546,13 +1565,17 @@
}
}
- /**
- * @return true if this window desires key events.
- */
- public final boolean canReceiveKeys() {
+ /** @return true if this window desires key events. */
+ boolean canReceiveKeys() {
return isVisibleOrAdding()
&& (mViewVisibility == View.VISIBLE)
- && ((mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0);
+ && ((mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0)
+ && stackCanReceiveKeys();
+ }
+
+ boolean stackCanReceiveKeys() {
+ final TaskStack stack = getStack();
+ return stack != null && StackId.canReceiveKeys(stack.mStackId);
}
@Override
@@ -1772,26 +1795,41 @@
frame.right - inset.right, frame.bottom - inset.bottom);
}
- public void getTouchableRegion(Region outRegion) {
+ void getTouchableRegion(Region outRegion) {
final Rect frame = mFrame;
switch (mTouchableInsets) {
default:
- case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME:
+ case TOUCHABLE_INSETS_FRAME:
outRegion.set(frame);
break;
- case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT:
+ case TOUCHABLE_INSETS_CONTENT:
applyInsets(outRegion, frame, mGivenContentInsets);
break;
- case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_VISIBLE:
+ case TOUCHABLE_INSETS_VISIBLE:
applyInsets(outRegion, frame, mGivenVisibleInsets);
break;
- case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION: {
+ case TOUCHABLE_INSETS_REGION: {
final Region givenTouchableRegion = mGivenTouchableRegion;
outRegion.set(givenTouchableRegion);
outRegion.translate(frame.left, frame.top);
break;
}
}
+ cropRegionToStackBoundsIfNeeded(outRegion);
+ }
+
+ void cropRegionToStackBoundsIfNeeded(Region region) {
+ if (mAppToken == null || !mAppToken.mCropWindowsToStack) {
+ return;
+ }
+
+ final TaskStack stack = getStack();
+ if (stack == null) {
+ return;
+ }
+
+ stack.getDimBounds(mTmpRect);
+ region.op(mTmpRect, Region.Op.INTERSECT);
}
WindowList getWindowList() {
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index decfb34..132b1b6 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -44,7 +44,6 @@
import android.os.Debug;
import android.os.RemoteException;
import android.util.Slog;
-import android.view.Display;
import android.view.DisplayInfo;
import android.view.MagnificationSpec;
import android.view.Surface.OutOfResourcesException;
@@ -99,6 +98,11 @@
* we must tell them application to resize (and thus redraw itself).
*/
boolean mSurfaceResized;
+ /**
+ * Whether we should inform the client on next relayoutWindow that
+ * the surface has been resized since last time.
+ */
+ boolean mReportSurfaceResized;
WindowSurfaceController mSurfaceController;
private WindowSurfaceController mPendingDestroySurface;
@@ -119,16 +123,12 @@
Rect mLastClipRect = new Rect();
Rect mTmpStackBounds = new Rect();
- // Used to save animation distances between the time they are calculated and when they are
- // used.
- int mAnimDw;
- int mAnimDh;
+ // Used to save animation distances between the time they are calculated and when they are used.
+ private int mAnimDx;
+ private int mAnimDy;
/** Is the next animation to be started a window move animation? */
- boolean mAnimateMove = false;
-
- /** Are we currently running a window move animation? */
- boolean mAnimatingMove = false;
+ private boolean mAnimateMove = false;
float mDsDx=1, mDtDx=0, mDsDy=0, mDtDy=1;
float mLastDsDx=1, mLastDtDx=0, mLastDsDy=0, mLastDtDy=1;
@@ -193,8 +193,8 @@
final DisplayContent displayContent = win.getDisplayContent();
if (displayContent != null) {
final DisplayInfo displayInfo = displayContent.getDisplayInfo();
- mAnimDw = displayInfo.appWidth;
- mAnimDh = displayInfo.appHeight;
+ mAnimDx = displayInfo.appWidth;
+ mAnimDy = displayInfo.appHeight;
} else {
Slog.w(TAG, "WindowStateAnimator ctor: Display has been removed");
// This is checked on return and dealt with.
@@ -294,19 +294,19 @@
TAG, "Starting animation in " + this +
" @ " + currentTime + ": ww=" + mWin.mFrame.width() +
" wh=" + mWin.mFrame.height() +
- " dw=" + mAnimDw + " dh=" + mAnimDh +
+ " dx=" + mAnimDx + " dy=" + mAnimDy +
" scale=" + mService.getWindowAnimationScaleLocked());
final DisplayInfo displayInfo = displayContent.getDisplayInfo();
if (mAnimateMove) {
mAnimateMove = false;
mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(),
- mAnimDw, mAnimDh);
+ mAnimDx, mAnimDy);
} else {
mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(),
displayInfo.appWidth, displayInfo.appHeight);
}
- mAnimDw = displayInfo.appWidth;
- mAnimDh = displayInfo.appHeight;
+ mAnimDx = displayInfo.appWidth;
+ mAnimDy = displayInfo.appHeight;
mAnimation.setStartTime(mAnimationStartTime != -1
? mAnimationStartTime
: currentTime);
@@ -363,7 +363,6 @@
mAnimating = false;
mKeyguardGoingAwayAnimation = false;
- mAnimatingMove = false;
mLocalAnimating = false;
if (mAnimation != null) {
mAnimation.cancel();
@@ -496,7 +495,7 @@
}
if (mDrawState == DRAW_PENDING) {
if (DEBUG_SURFACE_TRACE || DEBUG_ANIM || SHOW_TRANSACTIONS || DEBUG_ORIENTATION)
- Slog.v(TAG, "finishDrawingLocked: mDrawState=COMMIT_DRAW_PENDING " + this + " in "
+ Slog.v(TAG, "finishDrawingLocked: mDrawState=COMMIT_DRAW_PENDING " + mWin + " in "
+ mSurfaceController);
if (DEBUG_STARTING_WINDOW && startingWindow) {
Slog.v(TAG, "Draw state now committed in " + mWin);
@@ -528,7 +527,7 @@
mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {
result = performShowLocked();
}
- if (mDestroyPreservedSurfaceUponRedraw && result) {
+ if (mDestroyPreservedSurfaceUponRedraw) {
mService.mDestroyPreservedSurface.add(mWin);
}
return result;
@@ -736,7 +735,12 @@
if (mSurfaceController != null) {
int i = mWin.mChildWindows.size();
- while (i > 0) {
+ // When destroying a surface we want to make sure child windows
+ // are hidden. If we are preserving the surface until redraw though
+ // we intend to swap it out with another surface for resizing. In this case
+ // the window always remains visible to the user and the child windows
+ // should likewise remain visable.
+ while (!mDestroyPreservedSurfaceUponRedraw && i > 0) {
i--;
WindowState c = mWin.mChildWindows.get(i);
c.mAttachedHidden = true;
@@ -768,7 +772,14 @@
mPendingDestroySurface = mSurfaceController;
}
} else {
- WindowManagerService.logSurface(mWin, "DESTROY", null);
+ if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
+ RuntimeException e = null;
+ if (!WindowManagerService.HIDE_STACK_CRAWLS) {
+ e = new RuntimeException();
+ e.fillInStackTrace();
+ }
+ WindowManagerService.logSurface(mWin, "DESTROY", null);
+ }
destroySurface();
}
// Don't hide wallpaper if we're deferring the surface destroy
@@ -1084,7 +1095,7 @@
} else if (w.mDecorFrame.isEmpty()) {
// Windows without policy decor aren't cropped.
w.mSystemDecorRect.set(0, 0, w.mCompatFrame.width(), w.mCompatFrame.height());
- } else if (w.mAttrs.type == LayoutParams.TYPE_WALLPAPER && mAnimator.mAnimating) {
+ } else if (w.mAttrs.type == LayoutParams.TYPE_WALLPAPER && mAnimator.isAnimating()) {
// If we're animating, the wallpaper crop should only be updated at the end of the
// animation.
mTmpClipRect.set(w.mSystemDecorRect);
@@ -1095,7 +1106,7 @@
applyDecorRect(w.mDecorFrame);
}
- final boolean fullscreen = w.isFullscreen(displayInfo.appWidth, displayInfo.appHeight);
+ final boolean fullscreen = w.isFrameFullscreen(displayInfo);
final boolean isFreeformResizing =
w.isDragResizing() && w.getResizeMode() == DRAG_RESIZE_MODE_FREEFORM;
final Rect clipRect = mTmpClipRect;
@@ -1124,12 +1135,8 @@
// The clip rect was generated assuming (0,0) as the window origin,
// so we need to translate to match the actual surface coordinates.
clipRect.offset(attrs.surfaceInsets.left, attrs.surfaceInsets.top);
- // We don't want to clip to stack bounds windows that are currently doing entrance
- // animation for docked window, otherwise the animating window will be suddenly cut off.
- if (!(mAnimator.mAnimating && w.inDockedWorkspace())) {
- adjustCropToStackBounds(w, clipRect, isFreeformResizing);
- }
+ adjustCropToStackBounds(w, clipRect, isFreeformResizing);
w.transformFromScreenToSurfaceSpace(clipRect);
@@ -1142,31 +1149,40 @@
private void adjustCropToStackBounds(WindowState w, Rect clipRect, boolean isFreeformResizing) {
final AppWindowToken appToken = w.mAppToken;
final Task task = w.getTask();
- // We don't apply the the stack bounds to the window that is being replaced, because it was
- // living in a different stack. If we suddenly crop it to the new stack bounds, it might
- // get cut off. We don't want it to happen, so we let it ignore the stack bounds until it
- // gets removed. The window that will replace it will abide them.
- if (task != null && appToken.mCropWindowsToStack && !appToken.mWillReplaceWindow) {
- TaskStack stack = task.mStack;
- stack.getDimBounds(mTmpStackBounds);
- // When we resize we use the big surface approach, which means we can't trust the
- // window frame bounds anymore. Instead, the window will be placed at 0, 0, but to avoid
- // hardcoding it, we use surface coordinates.
- final int frameX = isFreeformResizing ? (int) mSurfaceController.getX() :
- w.mFrame.left + mWin.mXOffset - w.getAttrs().surfaceInsets.left;
- final int frameY = isFreeformResizing ? (int) mSurfaceController.getY() :
- w.mFrame.top + mWin.mYOffset - w.getAttrs().surfaceInsets.top;
- // We need to do some acrobatics with surface position, because their clip region is
- // relative to the inside of the surface, but the stack bounds aren't.
- clipRect.left = Math.max(0,
- Math.max(mTmpStackBounds.left, frameX + clipRect.left) - frameX);
- clipRect.top = Math.max(0,
- Math.max(mTmpStackBounds.top, frameY + clipRect.top) - frameY);
- clipRect.right = Math.max(0,
- Math.min(mTmpStackBounds.right, frameX + clipRect.right) - frameX);
- clipRect.bottom = Math.max(0,
- Math.min(mTmpStackBounds.bottom, frameY + clipRect.bottom) - frameY);
+ if (task == null || !appToken.mCropWindowsToStack) {
+ return;
}
+
+ // We don't apply the stack bounds crop if:
+ // 1. The window is currently animating docked mode, otherwise the animating window will be
+ // suddenly cut off.
+ // 2. The window that is being replaced during animation, because it was living in a
+ // different stack. If we suddenly crop it to the new stack bounds, it might get cut off.
+ // We don't want it to happen, so we let it ignore the stack bounds until it gets removed.
+ // The window that will replace it will abide them.
+ if (isAnimating() && (appToken.mWillReplaceWindow || w.inDockedWorkspace())) {
+ return;
+ }
+
+ final TaskStack stack = task.mStack;
+ stack.getDimBounds(mTmpStackBounds);
+ // When we resize we use the big surface approach, which means we can't trust the
+ // window frame bounds anymore. Instead, the window will be placed at 0, 0, but to avoid
+ // hardcoding it, we use surface coordinates.
+ final int frameX = isFreeformResizing ? (int) mSurfaceController.getX() :
+ w.mFrame.left + mWin.mXOffset - w.getAttrs().surfaceInsets.left;
+ final int frameY = isFreeformResizing ? (int) mSurfaceController.getY() :
+ w.mFrame.top + mWin.mYOffset - w.getAttrs().surfaceInsets.top;
+ // We need to do some acrobatics with surface position, because their clip region is
+ // relative to the inside of the surface, but the stack bounds aren't.
+ clipRect.left = Math.max(0,
+ Math.max(mTmpStackBounds.left, frameX + clipRect.left) - frameX);
+ clipRect.top = Math.max(0,
+ Math.max(mTmpStackBounds.top, frameY + clipRect.top) - frameY);
+ clipRect.right = Math.max(0,
+ Math.min(mTmpStackBounds.right, frameX + clipRect.right) - frameX);
+ clipRect.bottom = Math.max(0,
+ Math.min(mTmpStackBounds.bottom, frameY + clipRect.bottom) - frameY);
}
void setSurfaceBoundariesLocked(final boolean recoveringMemory) {
@@ -1183,6 +1199,7 @@
recoveringMemory);
if (mSurfaceResized) {
+ mReportSurfaceResized = true;
mAnimator.setPendingLayoutChanges(w.getDisplayId(),
WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER);
w.applyDimLayerIfNeeded();
@@ -1411,7 +1428,7 @@
// Force the show in the next prepareSurfaceLocked() call.
mLastAlpha = -1;
if (DEBUG_SURFACE_TRACE || DEBUG_ANIM)
- Slog.v(TAG, "performShowLocked: mDrawState=HAS_DRAWN in " + this);
+ Slog.v(TAG, "performShowLocked: mDrawState=HAS_DRAWN in " + mWin);
mDrawState = HAS_DRAWN;
mService.scheduleAnimationLocked();
@@ -1457,6 +1474,11 @@
}
mWin.mAppToken.updateReportedVisibilityLocked();
}
+
+ final Task task = mWin.getTask();
+ if (task != null) {
+ task.scheduleShowNonResizeableDockToastIfNeeded();
+ }
return true;
}
return false;
@@ -1595,7 +1617,7 @@
fadeOut.setDuration(fadeDuration);
fadeOut.setStartOffset(elapsed);
newAnimation.addAnimation(fadeOut);
- newAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(), mAnimDw, mAnimDh);
+ newAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(), mAnimDx, mAnimDy);
mAnimation = newAnimation;
}
@@ -1669,4 +1691,13 @@
mSurfaceController.destroyInTransaction();
mSurfaceController = null;
}
+
+ void setMoveAnimation(int left, int top) {
+ final Animation a = AnimationUtils.loadAnimation(mContext,
+ com.android.internal.R.anim.window_move_from_decor);
+ setAnimation(a);
+ mAnimDx = mWin.mLastFrame.left - left;
+ mAnimDy = mWin.mLastFrame.top - top;
+ mAnimateMove = true;
+ }
}
diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
index 3b57634..2149019 100644
--- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
+++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java
@@ -17,7 +17,6 @@
import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
import static com.android.server.wm.WindowManagerService.DEBUG;
import static com.android.server.wm.WindowManagerService.DEBUG_ADD_REMOVE;
-import static com.android.server.wm.WindowManagerService.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerService.DEBUG_APP_TRANSITIONS;
import static com.android.server.wm.WindowManagerService.DEBUG_LAYOUT;
import static com.android.server.wm.WindowManagerService.DEBUG_LAYOUT_REPEATS;
@@ -57,7 +56,6 @@
import android.view.View;
import android.view.WindowManager;
import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -534,7 +532,7 @@
if (updateInputWindowsNeeded) {
mService.mInputMonitor.updateInputWindowsLw(false /*force*/);
}
- mService.setFocusTaskRegion();
+ mService.setFocusTaskRegionLocked();
// Check to see if we are now in a state where the screen should
// be enabled, because the window obscured flags have changed.
@@ -542,11 +540,8 @@
mService.scheduleAnimationLocked();
- if (DEBUG_WINDOW_TRACE) {
- Slog.e(TAG,
- "performSurfacePlacementInner exit: animating="
- + mService.mAnimator.mAnimating);
- }
+ if (DEBUG_WINDOW_TRACE) Slog.e(TAG,
+ "performSurfacePlacementInner exit: animating=" + mService.mAnimator.isAnimating());
}
private void applySurfaceChangesTransaction(boolean recoveringMemory, int numDisplays,
@@ -666,7 +661,7 @@
// Update effect.
w.mObscured = mObscured;
if (!mObscured) {
- handleNotObscuredLocked(w, innerDw, innerDh);
+ handleNotObscuredLocked(w, displayInfo);
}
w.applyDimLayerIfNeeded();
@@ -682,20 +677,17 @@
final WindowStateAnimator winAnimator = w.mWinAnimator;
// If the window has moved due to its containing content frame changing, then
- // notify the listeners and optionally animate it.
+ // notify the listeners and optionally animate it. Simply checking a change of
+ // position is not enough, because being move due to dock divider is not a trigger
+ // for animation.
if (w.hasMoved()) {
// Frame has moved, containing content frame has also moved, and we're not
// currently animating... let's do something.
final int left = w.mFrame.left;
final int top = w.mFrame.top;
- if ((w.mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0) {
- Animation a = AnimationUtils.loadAnimation(mService.mContext,
- com.android.internal.R.anim.window_move_from_decor);
- winAnimator.setAnimation(a);
- winAnimator.mAnimDw = w.mLastFrame.left - left;
- winAnimator.mAnimDh = w.mLastFrame.top - top;
- winAnimator.mAnimateMove = true;
- winAnimator.mAnimatingMove = true;
+ if ((w.mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0
+ && !w.isDragResizing()) {
+ winAnimator.setMoveAnimation(left, top);
}
//TODO (multidisplay): Accessibility supported only for the default display.
@@ -1184,7 +1176,7 @@
">>> OPEN TRANSACTION handleAppTransitionReadyLocked()");
SurfaceControl.openTransaction();
try {
- mService.mAnimator.mAnimating |= appAnimator.showAllWindowsLocked();
+ mService.mAnimator.orAnimating(appAnimator.showAllWindowsLocked());
} finally {
SurfaceControl.closeTransaction();
if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,
@@ -1340,16 +1332,14 @@
/**
* @param w WindowState this method is applied to.
- * @param innerDw Width of app window.
- * @param innerDh Height of app window.
+ * @param dispInfo info of the display that the window's obscuring state is checked against.
*/
- private void handleNotObscuredLocked(final WindowState w, final int innerDw, final int innerDh) {
+ private void handleNotObscuredLocked(final WindowState w, final DisplayInfo dispInfo) {
final WindowManager.LayoutParams attrs = w.mAttrs;
final int attrFlags = attrs.flags;
final boolean canBeSeen = w.isDisplayedLw();
- final boolean opaqueDrawn = canBeSeen && w.isOpaqueDrawn();
- if (opaqueDrawn && w.isFullscreen(innerDw, innerDh)) {
+ if (canBeSeen && w.isObscuringFullscreen(dispInfo)) {
// This window completely covers everything behind it,
// so we want to leave all of them as undimmed (for
// performance reasons).
@@ -1467,7 +1457,7 @@
appAnimator.mAllAppWinAnimators.add(wtoken.allAppWindows.get(j).mWinAnimator);
}
mService.mAnimator.mAppWindowAnimating |= appAnimator.isAnimating();
- mService.mAnimator.mAnimating |= appAnimator.showAllWindowsLocked();
+ mService.mAnimator.orAnimating(appAnimator.showAllWindowsLocked());
}
}
}
diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp
index 64278ed..03fbd19 100644
--- a/services/core/jni/com_android_server_VibratorService.cpp
+++ b/services/core/jni/com_android_server_VibratorService.cpp
@@ -22,32 +22,69 @@
#include <utils/misc.h>
#include <utils/Log.h>
-#include <hardware_legacy/vibrator.h>
+#include <hardware/vibrator.h>
#include <stdio.h>
namespace android
{
+static hw_module_t *gVibraModule = NULL;
+static vibrator_device_t *gVibraDevice = NULL;
+
+static void vibratorInit(JNIEnv /* env */, jobject /* clazz */)
+{
+ if (gVibraModule != NULL) {
+ return;
+ }
+
+ int err = hw_get_module(VIBRATOR_HARDWARE_MODULE_ID, (hw_module_t const**)&gVibraModule);
+
+ if (err) {
+ ALOGE("Couldn't load %s module (%s)", VIBRATOR_HARDWARE_MODULE_ID, strerror(-err));
+ } else {
+ if (gVibraModule) {
+ vibrator_open(gVibraModule, &gVibraDevice);
+ }
+ }
+}
+
static jboolean vibratorExists(JNIEnv* /* env */, jobject /* clazz */)
{
- return vibrator_exists() > 0 ? JNI_TRUE : JNI_FALSE;
+ if (gVibraModule && gVibraDevice) {
+ return JNI_TRUE;
+ } else {
+ return JNI_FALSE;
+ }
}
static void vibratorOn(JNIEnv* /* env */, jobject /* clazz */, jlong timeout_ms)
{
- // ALOGI("vibratorOn\n");
- vibrator_on(timeout_ms);
+ if (gVibraDevice) {
+ int err = gVibraDevice->vibrator_on(gVibraDevice, timeout_ms);
+ if (err != 0) {
+ ALOGE("The hw module failed in vibrator_on: %s", strerror(-err));
+ }
+ } else {
+ ALOGW("Tried to vibrate but there is no vibrator device.");
+ }
}
static void vibratorOff(JNIEnv* /* env */, jobject /* clazz */)
{
- // ALOGI("vibratorOff\n");
- vibrator_off();
+ if (gVibraDevice) {
+ int err = gVibraDevice->vibrator_off(gVibraDevice);
+ if (err != 0) {
+ ALOGE("The hw module failed in vibrator_off(): %s", strerror(-err));
+ }
+ } else {
+ ALOGW("Tried to stop vibrating but there is no vibrator device.");
+ }
}
static const JNINativeMethod method_table[] = {
{ "vibratorExists", "()Z", (void*)vibratorExists },
+ { "vibratorInit", "()V", (void*)vibratorInit },
{ "vibratorOn", "(J)V", (void*)vibratorOn },
{ "vibratorOff", "()V", (void*)vibratorOff }
};
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index be190cb..b5654ee 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -152,18 +152,23 @@
getInputWindowHandleObjLocalRef(env);
}
-static void loadSystemIconAsSprite(JNIEnv* env, jobject contextObj, int32_t style,
- SpriteIcon* outSpriteIcon) {
- PointerIcon pointerIcon;
+static void loadSystemIconAsSpriteWithPointerIcon(JNIEnv* env, jobject contextObj, int32_t style,
+ PointerIcon* outPointerIcon, SpriteIcon* outSpriteIcon) {
status_t status = android_view_PointerIcon_loadSystemIcon(env,
- contextObj, style, &pointerIcon);
+ contextObj, style, outPointerIcon);
if (!status) {
- pointerIcon.bitmap.copyTo(&outSpriteIcon->bitmap, kN32_SkColorType);
- outSpriteIcon->hotSpotX = pointerIcon.hotSpotX;
- outSpriteIcon->hotSpotY = pointerIcon.hotSpotY;
+ outPointerIcon->bitmap.copyTo(&outSpriteIcon->bitmap, kN32_SkColorType);
+ outSpriteIcon->hotSpotX = outPointerIcon->hotSpotX;
+ outSpriteIcon->hotSpotY = outPointerIcon->hotSpotY;
}
}
+static void loadSystemIconAsSprite(JNIEnv* env, jobject contextObj, int32_t style,
+ SpriteIcon* outSpriteIcon) {
+ PointerIcon pointerIcon;
+ loadSystemIconAsSpriteWithPointerIcon(env, contextObj, style, &pointerIcon, outSpriteIcon);
+}
+
enum {
WM_ACTION_PASS_TO_USER = 1,
};
@@ -238,7 +243,8 @@
/* --- PointerControllerPolicyInterface implementation --- */
virtual void loadPointerResources(PointerResources* outResources);
- virtual void loadAdditionalMouseResources(std::map<int32_t, SpriteIcon>* outResources);
+ virtual void loadAdditionalMouseResources(std::map<int32_t, SpriteIcon>* outResources,
+ std::map<int32_t, PointerAnimation>* outAnimationResources);
virtual int32_t getDefaultPointerIconId();
private:
@@ -1041,14 +1047,31 @@
&outResources->spotAnchor);
}
-void NativeInputManager::loadAdditionalMouseResources(std::map<int32_t, SpriteIcon>* outResources) {
+void NativeInputManager::loadAdditionalMouseResources(std::map<int32_t, SpriteIcon>* outResources,
+ std::map<int32_t, PointerAnimation>* outAnimationResources) {
JNIEnv* env = jniEnv();
for (int iconId = POINTER_ICON_STYLE_CONTEXT_MENU; iconId <= POINTER_ICON_STYLE_GRABBING;
++iconId) {
- loadSystemIconAsSprite(env, mContextObj, iconId, &((*outResources)[iconId]));
+ PointerIcon pointerIcon;
+ loadSystemIconAsSpriteWithPointerIcon(
+ env, mContextObj, iconId, &pointerIcon, &((*outResources)[iconId]));
+ if (!pointerIcon.bitmapFrames.empty()) {
+ PointerAnimation& animationData = (*outAnimationResources)[iconId];
+ size_t numFrames = pointerIcon.bitmapFrames.size() + 1;
+ animationData.durationPerFrame =
+ milliseconds_to_nanoseconds(pointerIcon.durationPerFrame);
+ animationData.animationFrames.reserve(numFrames);
+ animationData.animationFrames.push_back(SpriteIcon(
+ pointerIcon.bitmap, pointerIcon.hotSpotX, pointerIcon.hotSpotY));
+ for (size_t i = 0; i < numFrames - 1; ++i) {
+ animationData.animationFrames.push_back(SpriteIcon(
+ pointerIcon.bitmapFrames[i], pointerIcon.hotSpotX, pointerIcon.hotSpotY));
+ }
+ }
}
- loadSystemIconAsSprite(env, mContextObj, POINTER_ICON_STYLE_NULL, &((*outResources)[POINTER_ICON_STYLE_NULL]));
+ loadSystemIconAsSprite(env, mContextObj, POINTER_ICON_STYLE_NULL,
+ &((*outResources)[POINTER_ICON_STYLE_NULL]));
}
int32_t NativeInputManager::getDefaultPointerIconId() {
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index c611503..dbfd80d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -60,6 +60,7 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PackageManagerInternal;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo;
@@ -70,8 +71,11 @@
import android.net.ConnectivityManager;
import android.net.ProxyInfo;
import android.net.Uri;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
import android.os.AsyncTask;
import android.os.Binder;
+import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.FileUtils;
@@ -201,31 +205,6 @@
private static final int STATUS_BAR_DISABLE2_MASK =
StatusBarManager.DISABLE2_QUICK_SETTINGS;
- private static final Set<String> DEVICE_OWNER_USER_RESTRICTIONS;
- static {
- DEVICE_OWNER_USER_RESTRICTIONS = new ArraySet<>();
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_USB_FILE_TRANSFER);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CONFIG_TETHERING);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_NETWORK_RESET);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FACTORY_RESET);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_ADD_USER);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SMS);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FUN);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SAFE_BOOT);
- DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CREATE_WINDOWS);
- }
-
- // The following user restrictions cannot be changed by any active admin, including device
- // owner and profile owner.
- private static final Set<String> IMMUTABLE_USER_RESTRICTIONS;
- static {
- IMMUTABLE_USER_RESTRICTIONS = new ArraySet<>();
- IMMUTABLE_USER_RESTRICTIONS.add(UserManager.DISALLOW_WALLPAPER);
- }
-
private static final Set<String> SECURE_SETTINGS_WHITELIST;
private static final Set<String> SECURE_SETTINGS_DEVICEOWNER_WHITELIST;
private static final Set<String> GLOBAL_SETTINGS_WHITELIST;
@@ -306,6 +285,11 @@
public void onBootPhase(int phase) {
mService.systemReady(phase);
}
+
+ @Override
+ public void onStartUser(int userHandle) {
+ mService.onStartUser(userHandle);
+ }
}
public static class DevicePolicyData {
@@ -436,7 +420,7 @@
"cross-profile-widget-providers";
private static final String TAG_PROVIDER = "provider";
private static final String TAG_PACKAGE_LIST_ITEM = "item";
-
+ private static final String TAG_KEEP_UNINSTALLED_PACKAGES = "keep-uninstalled-packages";
private static final String TAG_USER_RESTRICTIONS = "user-restrictions";
final DeviceAdminInfo info;
@@ -509,6 +493,9 @@
// allowed.
List<String> permittedInputMethods;
+ // List of package names to keep cached.
+ List<String> keepUninstalledPackages;
+
// TODO: review implementation decisions with frameworks team
boolean specifiesGlobalProxy = false;
String globalProxySpec = null;
@@ -694,6 +681,7 @@
writePackageListToXml(out, TAG_PERMITTED_ACCESSIBILITY_SERVICES,
permittedAccessiblityServices);
writePackageListToXml(out, TAG_PERMITTED_IMES, permittedInputMethods);
+ writePackageListToXml(out, TAG_KEEP_UNINSTALLED_PACKAGES, keepUninstalledPackages);
if (hasUserRestrictions()) {
UserRestrictionsUtils.writeRestrictions(
out, userRestrictions, TAG_USER_RESTRICTIONS);
@@ -807,6 +795,8 @@
permittedAccessiblityServices = readPackageList(parser, tag);
} else if (TAG_PERMITTED_IMES.equals(tag)) {
permittedInputMethods = readPackageList(parser, tag);
+ } else if (TAG_KEEP_UNINSTALLED_PACKAGES.equals(tag)) {
+ keepUninstalledPackages = readPackageList(parser, tag);
} else if (TAG_USER_RESTRICTIONS.equals(tag)) {
UserRestrictionsUtils.readRestrictions(parser, ensureUserRestrictions());
} else {
@@ -1001,20 +991,23 @@
pw.println(disabledKeyguardFeatures);
pw.print(prefix); pw.print("crossProfileWidgetProviders=");
pw.println(crossProfileWidgetProviders);
- if (!(permittedAccessiblityServices == null)) {
+ if (permittedAccessiblityServices != null) {
pw.print(prefix); pw.print("permittedAccessibilityServices=");
- pw.println(permittedAccessiblityServices.toString());
+ pw.println(permittedAccessiblityServices);
}
- if (!(permittedInputMethods == null)) {
+ if (permittedInputMethods != null) {
pw.print(prefix); pw.print("permittedInputMethods=");
- pw.println(permittedInputMethods.toString());
+ pw.println(permittedInputMethods);
+ }
+ if (keepUninstalledPackages != null) {
+ pw.print(prefix); pw.print("keepUninstalledPackages=");
+ pw.println(keepUninstalledPackages);
}
pw.print(prefix); pw.println("userRestrictions:");
UserRestrictionsUtils.dumpRestrictions(pw, prefix + " ", userRestrictions);
}
}
- // DO NOT call it while taking the "this" lock, which could cause a dead lock.
private void handlePackagesChanged(String packageName, int userHandle) {
boolean removed = false;
if (VERBOSE_LOG) Slog.d(LOG_TAG, "Handling package changes for user " + userHandle);
@@ -1060,11 +1053,8 @@
}
}
if (removed) {
- synchronized (mUserManagerInternal.getUserRestrictionsLock()) {
- synchronized (DevicePolicyManagerService.this) {
- mUserManagerInternal.updateEffectiveUserRestrictionsLR(userHandle);
- }
- }
+ // The removed admin might have disabled camera, so update user restrictions.
+ pushUserRestrictions(userHandle);
}
}
@@ -1081,7 +1071,7 @@
}
Owners newOwners() {
- return new Owners(mContext);
+ return new Owners(mContext, getUserManager(), getUserManagerInternal());
}
UserManager getUserManager() {
@@ -1092,6 +1082,10 @@
return LocalServices.getService(UserManagerInternal.class);
}
+ PackageManagerInternal getPackageManagerInternal() {
+ return LocalServices.getService(PackageManagerInternal.class);
+ }
+
NotificationManager getNotificationManager() {
return mContext.getSystemService(NotificationManager.class);
}
@@ -1130,6 +1124,10 @@
return Looper.myLooper();
}
+ WifiManager getWifiManager() {
+ return mContext.getSystemService(WifiManager.class);
+ }
+
long binderClearCallingIdentity() {
return Binder.clearCallingIdentity();
}
@@ -1350,8 +1348,6 @@
// TODO PO may not have a class name either due to b/17652534. Address that too.
updateDeviceOwnerLocked();
-
- // TODO Notify UM to update restrictions (?)
}
}
@@ -1397,11 +1393,14 @@
}
migrated = true;
- // Migrate user 0 restrictions to DO, except for "system" restrictions.
+ // Migrate user 0 restrictions to DO.
final ActiveAdmin deviceOwnerAdmin = getDeviceOwnerAdminLocked();
migrateUserRestrictionsForUser(UserHandle.SYSTEM, deviceOwnerAdmin,
- /* exceptionList =*/ UserRestrictionsUtils.SYSTEM_CONTROLLED_USER_RESTRICTIONS);
+ /* exceptionList =*/ null);
+
+ // Push DO user restrictions to user manager.
+ pushUserRestrictions(UserHandle.USER_SYSTEM);
mOwners.setDeviceOwnerUserRestrictionsMigrated();
}
@@ -1410,7 +1409,6 @@
final Set<String> normalExceptionList = Sets.newArraySet(
UserManager.DISALLOW_OUTGOING_CALLS,
UserManager.DISALLOW_SMS);
- normalExceptionList.addAll(UserRestrictionsUtils.SYSTEM_CONTROLLED_USER_RESTRICTIONS);
final Set<String> managedExceptionList = new ArraySet<>(normalExceptionList.size() + 1);
managedExceptionList.addAll(normalExceptionList);
@@ -1432,6 +1430,13 @@
migrateUserRestrictionsForUser(ui.getUserHandle(), profileOwnerAdmin,
exceptionList);
+
+ // Note if a secondary user has no PO but has a DA that disables camera, we
+ // don't get here and won't push the camera user restriction to UserManager
+ // here. That's okay because we'll push user restrictions anyway when a user
+ // starts. But we still do it because we want to let user manager persist
+ // upon migration.
+ pushUserRestrictions(userId);
}
mOwners.setProfileOwnerUserRestrictionsMigrated(userId);
@@ -1447,15 +1452,15 @@
final Bundle origRestrictions = mUserManagerInternal.getBaseUserRestrictions(
user.getIdentifier());
- final Bundle newSystemRestrictions = new Bundle();
+ final Bundle newBaseRestrictions = new Bundle();
final Bundle newOwnerRestrictions = new Bundle();
for (String key : origRestrictions.keySet()) {
if (!origRestrictions.getBoolean(key)) {
continue;
}
- if (exceptionList.contains(key)) {
- newSystemRestrictions.putBoolean(key, true);
+ if (exceptionList!= null && exceptionList.contains(key)) {
+ newBaseRestrictions.putBoolean(key, true);
} else {
newOwnerRestrictions.putBoolean(key, true);
}
@@ -1463,11 +1468,11 @@
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "origRestrictions=" + origRestrictions);
- Log.v(LOG_TAG, "newSystemRestrictions=" + newSystemRestrictions);
+ Log.v(LOG_TAG, "newBaseRestrictions=" + newBaseRestrictions);
Log.v(LOG_TAG, "newOwnerRestrictions=" + newOwnerRestrictions);
}
mUserManagerInternal.setBaseUserRestrictionsByDpmsForMigration(user.getIdentifier(),
- newSystemRestrictions);
+ newBaseRestrictions);
if (admin != null) {
admin.ensureUserRestrictions().clear();
@@ -1709,18 +1714,16 @@
updateMaximumTimeToLockLocked(policy);
policy.mRemovingAdmins.remove(adminReceiver);
}
- synchronized (mUserManagerInternal.getUserRestrictionsLock()) {
- synchronized (DevicePolicyManagerService.this) {
- mUserManagerInternal.updateEffectiveUserRestrictionsLR(
- userHandle);
- }
- }
+ // The removed admin might have disabled camera, so update user
+ // restrictions.
+ pushUserRestrictions(userHandle);
}
});
}
}
- public DeviceAdminInfo findAdmin(ComponentName adminName, int userHandle) {
+ public DeviceAdminInfo findAdmin(ComponentName adminName, int userHandle,
+ boolean throwForMissiongPermission) {
if (!mHasFeature) {
return null;
}
@@ -1735,8 +1738,20 @@
throw new IllegalArgumentException("Unknown admin: " + adminName);
}
+ final ResolveInfo ri = infos.get(0);
+
+ if (!permission.BIND_DEVICE_ADMIN.equals(ri.activityInfo.permission)) {
+ final String message = "DeviceAdminReceiver " + adminName + " must be protected with"
+ + permission.BIND_DEVICE_ADMIN;
+ Slog.w(LOG_TAG, message);
+ if (throwForMissiongPermission &&
+ ri.activityInfo.applicationInfo.targetSdkVersion > Build.VERSION_CODES.M) {
+ throw new IllegalArgumentException(message);
+ }
+ }
+
try {
- return new DeviceAdminInfo(mContext, infos.get(0));
+ return new DeviceAdminInfo(mContext, ri);
} catch (XmlPullParserException e) {
Slog.w(LOG_TAG, "Bad device admin requested for user=" + userHandle + ": " + adminName,
e);
@@ -1927,7 +1942,8 @@
String name = parser.getAttributeValue(null, "name");
try {
DeviceAdminInfo dai = findAdmin(
- ComponentName.unflattenFromString(name), userHandle);
+ ComponentName.unflattenFromString(name), userHandle,
+ /* throwForMissionPermission= */ false);
if (VERBOSE_LOG
&& (UserHandle.getUserId(dai.getActivityInfo().applicationInfo.uid)
!= userHandle)) {
@@ -2050,9 +2066,12 @@
private void updateDeviceOwnerLocked() {
long ident = mInjector.binderClearCallingIdentity();
try {
- if (getDeviceOwner() != null) {
+ // TODO This is to prevent DO from getting "clear data"ed, but it should also check the
+ // user id and also protect all other DAs too.
+ final ComponentName deviceOwnerComponent = mOwners.getDeviceOwnerComponent();
+ if (deviceOwnerComponent != null) {
mInjector.getIActivityManager()
- .updateDeviceOwner(getDeviceOwner().getPackageName());
+ .updateDeviceOwner(deviceOwnerComponent.getPackageName());
}
} catch (RemoteException e) {
// Not gonna happen.
@@ -2113,40 +2132,52 @@
getUserData(UserHandle.USER_SYSTEM);
loadOwners();
cleanUpOldUsers();
+
+ onStartUser(UserHandle.USER_SYSTEM);
+
// Register an observer for watching for user setup complete.
new SetupContentObserver(mHandler).register(mContext.getContentResolver());
// Initialize the user setup state, to handle the upgrade case.
updateUserSetupComplete();
- // Update the screen capture disabled cache in the window manager
- List<UserInfo> users = mUserManager.getUsers(true);
- final int N = users.size();
- for (int i = 0; i < N; i++) {
- int userHandle = users.get(i).id;
- updateScreenCaptureDisabledInWindowManager(userHandle,
- getScreenCaptureDisabled(null, userHandle));
+ List<String> packageList;
+ synchronized (this) {
+ packageList = getKeepUninstalledPackagesLocked();
+ }
+ if (packageList != null) {
+ mInjector.getPackageManagerInternal().setKeepUninstalledPackages(packageList);
}
}
private void ensureDeviceOwnerUserStarted() {
- if (mOwners.hasDeviceOwner()) {
- final int userId = mOwners.getDeviceOwnerUserId();
- if (VERBOSE_LOG) {
- Log.v(LOG_TAG, "Starting non-system DO user: " + userId);
+ final int userId;
+ synchronized (this) {
+ if (!mOwners.hasDeviceOwner()) {
+ return;
}
- if (userId != UserHandle.USER_SYSTEM) {
- try {
- mInjector.getIActivityManager().startUserInBackground(userId);
+ userId = mOwners.getDeviceOwnerUserId();
+ }
+ if (VERBOSE_LOG) {
+ Log.v(LOG_TAG, "Starting non-system DO user: " + userId);
+ }
+ if (userId != UserHandle.USER_SYSTEM) {
+ try {
+ mInjector.getIActivityManager().startUserInBackground(userId);
- // STOPSHIP Prevent the DO user from being killed.
+ // STOPSHIP Prevent the DO user from being killed.
- } catch (RemoteException e) {
- Slog.w(LOG_TAG, "Exception starting user", e);
- }
+ } catch (RemoteException e) {
+ Slog.w(LOG_TAG, "Exception starting user", e);
}
}
}
+ private void onStartUser(int userId) {
+ updateScreenCaptureDisabledInWindowManager(userId,
+ getScreenCaptureDisabled(null, userId));
+ pushUserRestrictions(userId);
+ }
+
private void cleanUpOldUsers() {
// This is needed in case the broadcast {@link Intent.ACTION_USER_REMOVED} was not handled
// before reboot
@@ -2245,6 +2276,7 @@
// Build and show a warning notification
int smallIconId;
String contentText;
+ // TODO Why does it use the DO name? The cert APIs are all for PO. b/25772443
final String ownerName = getDeviceOwnerName();
if (isManagedProfile(userHandle.getIdentifier())) {
contentText = mContext.getString(R.string.ssl_ca_cert_noti_by_administrator);
@@ -2306,7 +2338,8 @@
enforceCrossUserPermission(userHandle);
DevicePolicyData policy = getUserData(userHandle);
- DeviceAdminInfo info = findAdmin(adminReceiver, userHandle);
+ DeviceAdminInfo info = findAdmin(adminReceiver, userHandle,
+ /* throwForMissionPermission= */ true);
if (info == null) {
throw new IllegalArgumentException("Bad admin: " + adminReceiver);
}
@@ -2436,6 +2469,8 @@
// Active device/profile owners must remain active admins.
if (isDeviceOwner(adminReceiver, userHandle)
|| isProfileOwner(adminReceiver, userHandle)) {
+ Slog.e(LOG_TAG, "Device/profile owner cannot be removed: component=" +
+ adminReceiver);
return;
}
mContext.enforceCallingOrSelfPermission(
@@ -3184,7 +3219,8 @@
if (!mHasFeature) {
return false;
}
- final int userHandle = UserHandle.getCallingUserId();
+ final int callingUid = mInjector.binderGetCallingUid();
+ final int userHandle = mInjector.userHandleGetCallingUserId();
long ident = mInjector.binderClearCallingIdentity();
try {
@@ -3200,10 +3236,16 @@
int quality;
synchronized (this) {
- // This api can only be called by an active device admin,
- // so try to retrieve it to check that the caller is one.
- final ActiveAdmin admin = getActiveAdminForCallerLocked(null,
- DeviceAdminInfo.USES_POLICY_RESET_PASSWORD);
+ // If caller has PO (or DO), it can clear the password, so see if that's the case
+ // first.
+ ActiveAdmin admin = getActiveAdminWithPolicyForUidLocked(
+ null, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER, callingUid);
+ if (admin == null) {
+ // Otherwise, make sure the caller has any active admin with the right policy.
+ admin = getActiveAdminForCallerLocked(null,
+ DeviceAdminInfo.USES_POLICY_RESET_PASSWORD);
+ }
+
final ComponentName adminComponent = admin.info.getComponent();
// As of N, only profile owners and device owners can reset the password.
@@ -3316,7 +3358,6 @@
}
}
- int callingUid = mInjector.binderGetCallingUid();
DevicePolicyData policy = getUserData(userHandle);
if (policy.mPasswordOwner >= 0 && policy.mPasswordOwner != callingUid) {
Slog.w(LOG_TAG, "resetPassword: already set by another uid and not entered by user");
@@ -3814,10 +3855,7 @@
synchronized (this) {
ActiveAdmin admin = getActiveAdminUncheckedLocked(comp, userHandle);
if (admin == null) {
- try {
- result.sendResult(null);
- } catch (RemoteException e) {
- }
+ result.sendResult(null);
return;
}
Intent intent = new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED);
@@ -3827,10 +3865,7 @@
null, new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- try {
- result.sendResult(getResultExtras(false));
- } catch (RemoteException e) {
- }
+ result.sendResult(getResultExtras(false));
}
}, null, Activity.RESULT_OK, null, null);
}
@@ -3844,45 +3879,37 @@
}
enforceCrossUserPermission(userHandle);
// Managed Profile password can only be changed when per user encryption is present.
- if (!mContext.getSystemService(StorageManager.class).isPerUserEncryptionEnabled()) {
+ if (!StorageManager.isFileBasedEncryptionEnabled()) {
enforceNotManagedProfile(userHandle, "set the active password");
}
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.BIND_DEVICE_ADMIN, null);
- DevicePolicyData p = getUserData(userHandle);
-
validateQualityConstant(quality);
- synchronized (this) {
- if (p.mActivePasswordQuality != quality || p.mActivePasswordLength != length
- || p.mFailedPasswordAttempts != 0 || p.mActivePasswordLetters != letters
- || p.mActivePasswordUpperCase != uppercase
- || p.mActivePasswordLowerCase != lowercase
- || p.mActivePasswordNumeric != numbers
- || p.mActivePasswordSymbols != symbols
- || p.mActivePasswordNonLetter != nonletter) {
- long ident = mInjector.binderClearCallingIdentity();
- try {
- p.mActivePasswordQuality = quality;
- p.mActivePasswordLength = length;
- p.mActivePasswordLetters = letters;
- p.mActivePasswordLowerCase = lowercase;
- p.mActivePasswordUpperCase = uppercase;
- p.mActivePasswordNumeric = numbers;
- p.mActivePasswordSymbols = symbols;
- p.mActivePasswordNonLetter = nonletter;
- p.mFailedPasswordAttempts = 0;
- saveSettingsLocked(userHandle);
- updatePasswordExpirationsLocked(userHandle);
- setExpirationAlarmCheckLocked(mContext, p);
- sendAdminCommandToSelfAndProfilesLocked(
- DeviceAdminReceiver.ACTION_PASSWORD_CHANGED,
- DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, userHandle);
- } finally {
- mInjector.binderRestoreCallingIdentity(ident);
- }
+ DevicePolicyData policy = getUserData(userHandle);
+
+ long ident = mInjector.binderClearCallingIdentity();
+ try {
+ synchronized (this) {
+ policy.mActivePasswordQuality = quality;
+ policy.mActivePasswordLength = length;
+ policy.mActivePasswordLetters = letters;
+ policy.mActivePasswordLowerCase = lowercase;
+ policy.mActivePasswordUpperCase = uppercase;
+ policy.mActivePasswordNumeric = numbers;
+ policy.mActivePasswordSymbols = symbols;
+ policy.mActivePasswordNonLetter = nonletter;
+ policy.mFailedPasswordAttempts = 0;
+ saveSettingsLocked(userHandle);
+ updatePasswordExpirationsLocked(userHandle);
+ setExpirationAlarmCheckLocked(mContext, policy);
+ sendAdminCommandToSelfAndProfilesLocked(
+ DeviceAdminReceiver.ACTION_PASSWORD_CHANGED,
+ DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD, userHandle);
}
+ } finally {
+ mInjector.binderRestoreCallingIdentity(ident);
}
}
@@ -4299,15 +4326,18 @@
}
}
- private void updateScreenCaptureDisabledInWindowManager(int userHandle, boolean disabled) {
- long ident = mInjector.binderClearCallingIdentity();
- try {
- mInjector.getIWindowManager().setScreenCaptureDisabled(userHandle, disabled);
- } catch (RemoteException e) {
- Log.w(LOG_TAG, "Unable to notify WindowManager.", e);
- } finally {
- mInjector.binderRestoreCallingIdentity(ident);
- }
+ private void updateScreenCaptureDisabledInWindowManager(final int userHandle,
+ final boolean disabled) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ mInjector.getIWindowManager().setScreenCaptureDisabled(userHandle, disabled);
+ } catch (RemoteException e) {
+ Log.w(LOG_TAG, "Unable to notify WindowManager.", e);
+ }
+ }
+ });
}
/**
@@ -4373,15 +4403,7 @@
}
}
// Tell the user manager that the restrictions have changed.
- synchronized (mUserManagerInternal.getUserRestrictionsLock()) {
- synchronized (this) {
- if (isDeviceOwner(who, userHandle)) {
- mUserManagerInternal.updateEffectiveUserRestrictionsForAllUsersLR();
- } else {
- mUserManagerInternal.updateEffectiveUserRestrictionsLR(userHandle);
- }
- }
- }
+ pushUserRestrictions(userHandle);
}
/**
@@ -4390,6 +4412,11 @@
*/
@Override
public boolean getCameraDisabled(ComponentName who, int userHandle) {
+ return getCameraDisabled(who, userHandle, /* mergeDeviceOwnerRestriction= */ true);
+ }
+
+ private boolean getCameraDisabled(ComponentName who, int userHandle,
+ boolean mergeDeviceOwnerRestriction) {
if (!mHasFeature) {
return false;
}
@@ -4399,9 +4426,11 @@
return (admin != null) ? admin.disableCamera : false;
}
// First, see if DO has set it. If so, it's device-wide.
- final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked();
- if (deviceOwner != null && deviceOwner.disableCamera) {
- return true;
+ if (mergeDeviceOwnerRestriction) {
+ final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked();
+ if (deviceOwner != null && deviceOwner.disableCamera) {
+ return true;
+ }
}
// Then check each device admin on the user.
@@ -4499,6 +4528,42 @@
}
@Override
+ public void setKeepUninstalledPackages(ComponentName who, List<String> packageList) {
+ if (!mHasFeature) {
+ return;
+ }
+ Preconditions.checkNotNull(who, "ComponentName is null");
+ Preconditions.checkNotNull(packageList, "packageList is null");
+ final int userHandle = UserHandle.getCallingUserId();
+ synchronized (this) {
+ ActiveAdmin admin = getActiveAdminForCallerLocked(who,
+ DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ admin.keepUninstalledPackages = packageList;
+ saveSettingsLocked(userHandle);
+ mInjector.getPackageManagerInternal().setKeepUninstalledPackages(packageList);
+ }
+ }
+
+ @Override
+ public List<String> getKeepUninstalledPackages(ComponentName who) {
+ Preconditions.checkNotNull(who, "ComponentName is null");
+ if (!mHasFeature) {
+ return null;
+ }
+ // TODO In split system user mode, allow apps on user 0 to query the list
+ synchronized (this) {
+ // Check if this is the device owner who is calling
+ getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ return getKeepUninstalledPackagesLocked();
+ }
+ }
+
+ private List<String> getKeepUninstalledPackagesLocked() {
+ ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked();
+ return (deviceOwner != null) ? deviceOwner.keepUninstalledPackages : null;
+ }
+
+ @Override
public boolean setDeviceOwner(ComponentName admin, String ownerName, int userId) {
if (!mHasFeature) {
return false;
@@ -4509,7 +4574,7 @@
+ " for device owner");
}
synchronized (this) {
- enforceCanSetDeviceOwner(userId);
+ enforceCanSetDeviceOwnerLocked(userId);
// Shutting down backup manager service permanently.
long ident = mInjector.binderClearCallingIdentity();
@@ -4551,22 +4616,46 @@
}
@Override
- public ComponentName getDeviceOwner() {
+ public ComponentName getDeviceOwnerComponent(boolean callingUserOnly) {
if (!mHasFeature) {
return null;
}
+ if (!callingUserOnly) {
+ enforceManageUsers();
+ }
synchronized (this) {
+ if (!mOwners.hasDeviceOwner()) {
+ return null;
+ }
+ if (callingUserOnly && mInjector.userHandleGetCallingUserId() !=
+ mOwners.getDeviceOwnerUserId()) {
+ return null;
+ }
return mOwners.getDeviceOwnerComponent();
}
}
@Override
+ public int getDeviceOwnerUserId() {
+ if (!mHasFeature) {
+ return UserHandle.USER_NULL;
+ }
+ enforceManageUsers();
+ synchronized (this) {
+ return mOwners.hasDeviceOwner() ? mOwners.getDeviceOwnerUserId() : UserHandle.USER_NULL;
+ }
+ }
+
+ /**
+ * Returns the "name" of the device owner. It'll work for non-DO users too, but requires
+ * MANAGE_USERS.
+ */
+ @Override
public String getDeviceOwnerName() {
if (!mHasFeature) {
return null;
}
- // TODO: Do we really need it? getDeviceOwner() doesn't require it.
- mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null);
+ enforceManageUsers();
synchronized (this) {
if (!mOwners.hasDeviceOwner()) {
return null;
@@ -4581,7 +4670,7 @@
// Returns the active device owner or null if there is no device owner.
@VisibleForTesting
ActiveAdmin getDeviceOwnerAdminLocked() {
- ComponentName component = getDeviceOwner();
+ ComponentName component = mOwners.getDeviceOwnerComponent();
if (component == null) {
return null;
}
@@ -4594,6 +4683,7 @@
return admin;
}
}
+ Slog.wtf(LOG_TAG, "Active admin for device owner not found. component=" + component);
return null;
}
@@ -4609,11 +4699,20 @@
} catch (NameNotFoundException e) {
throw new SecurityException(e);
}
- if (!mOwners.hasDeviceOwner() || !getDeviceOwner().getPackageName().equals(packageName)
- || (mOwners.getDeviceOwnerUserId() != UserHandle.getUserId(callingUid))) {
- throw new SecurityException("clearDeviceOwner can only be called by the device owner");
- }
synchronized (this) {
+ if (!mOwners.hasDeviceOwner()
+ || !mOwners.getDeviceOwnerComponent().getPackageName().equals(packageName)
+ || (mOwners.getDeviceOwnerUserId() != UserHandle.getUserId(callingUid))) {
+ throw new SecurityException(
+ "clearDeviceOwner can only be called by the device owner");
+ }
+
+ final ActiveAdmin admin = getDeviceOwnerAdminLocked();
+ if (admin != null) {
+ admin.disableCamera = false;
+ admin.userRestrictions = null;
+ }
+
clearUserPoliciesLocked(new UserHandle(UserHandle.USER_SYSTEM));
mOwners.clearDeviceOwner();
@@ -4642,7 +4741,7 @@
+ " not installed for userId:" + userHandle);
}
synchronized (this) {
- enforceCanSetProfileOwner(userHandle);
+ enforceCanSetProfileOwnerLocked(userHandle);
mOwners.setProfileOwner(who, ownerName, userHandle);
mOwners.writeProfileOwner(userHandle);
return true;
@@ -4659,6 +4758,7 @@
final ActiveAdmin admin =
getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
synchronized (this) {
+ admin.disableCamera = false;
admin.userRestrictions = null;
clearUserPoliciesLocked(callingUser);
final int userId = callingUser.getIdentifier();
@@ -4705,9 +4805,7 @@
mIPackageManager.updatePermissionFlagsForAllApps(
PackageManager.FLAG_PERMISSION_POLICY_FIXED,
0 /* flagValues */, userHandle.getIdentifier());
- synchronized (mUserManagerInternal.getUserRestrictionsLock()) {
- mUserManagerInternal.updateEffectiveUserRestrictionsLR(userHandle.getIdentifier());
- }
+ pushUserRestrictions(userHandle.getIdentifier());
} catch (RemoteException re) {
} finally {
mInjector.binderRestoreCallingIdentity(ident);
@@ -4803,7 +4901,7 @@
if (!mHasFeature) {
return null;
}
- mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null);
+ enforceManageUsers();
ComponentName profileOwner = getProfileOwner(userHandle);
if (profileOwner == null) {
return null;
@@ -4845,7 +4943,7 @@
* - SYSTEM_UID
* - adb if there are not accounts.
*/
- private void enforceCanSetProfileOwner(int userHandle) {
+ private void enforceCanSetProfileOwnerLocked(int userHandle) {
UserInfo info = mUserManager.getUserInfo(userHandle);
if (info == null) {
// User doesn't exist.
@@ -4887,7 +4985,7 @@
* The device owner can only be set before the setup phase of the primary user has completed,
* except for adb if no accounts or additional users are present on the device.
*/
- private void enforceCanSetDeviceOwner(int userId) {
+ private void enforceCanSetDeviceOwnerLocked(int userId) {
if (mOwners.hasDeviceOwner()) {
throw new IllegalStateException("Trying to set the device owner, but device owner "
+ "is already set.");
@@ -4933,13 +5031,20 @@
}
}
+ private void enforceManageUsers() {
+ final int callingUid = mInjector.binderGetCallingUid();
+ if (!(UserHandle.isSameApp(callingUid, Process.SYSTEM_UID) || callingUid == 0)) {
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null);
+ }
+ }
+
private void enforceCrossUserPermission(int userHandle) {
if (userHandle < 0) {
throw new IllegalArgumentException("Invalid userId " + userHandle);
}
final int callingUid = mInjector.binderGetCallingUid();
if (userHandle == UserHandle.getUserId(callingUid)) return;
- if (callingUid != Process.SYSTEM_UID && callingUid != 0) {
+ if (!(UserHandle.isSameApp(callingUid, Process.SYSTEM_UID) || callingUid == 0)) {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, "Must be system or have"
+ " INTERACT_ACROSS_USERS_FULL permission");
@@ -4996,31 +5101,30 @@
return;
}
- final Printer p = new PrintWriterPrinter(pw);
-
synchronized (this) {
- p.println("Current Device Policy Manager state:");
+ pw.println("Current Device Policy Manager state:");
mOwners.dump(" ", pw);
int userCount = mUserData.size();
for (int u = 0; u < userCount; u++) {
DevicePolicyData policy = getUserData(mUserData.keyAt(u));
- p.println(" Enabled Device Admins (User " + policy.mUserHandle + "):");
+ pw.println();
+ pw.println(" Enabled Device Admins (User " + policy.mUserHandle + "):");
final int N = policy.mAdminList.size();
for (int i=0; i<N; i++) {
ActiveAdmin ap = policy.mAdminList.get(i);
if (ap != null) {
- pw.print(" "); pw.print(ap.info.getComponent().flattenToShortString());
+ pw.print(" "); pw.print(ap.info.getComponent().flattenToShortString());
pw.println(":");
- ap.dump(" ", pw);
+ ap.dump(" ", pw);
}
}
if (!policy.mRemovingAdmins.isEmpty()) {
- p.println(" Removing Device Admins (User " + policy.mUserHandle + "): "
+ pw.println(" Removing Device Admins (User " + policy.mUserHandle + "): "
+ policy.mRemovingAdmins);
}
pw.println(" ");
- pw.print(" mPasswordOwner="); pw.println(policy.mPasswordOwner);
+ pw.print(" mPasswordOwner="); pw.println(policy.mPasswordOwner);
}
}
}
@@ -5449,8 +5553,8 @@
// InputMethodManager fetches input methods for current user.
// So this can only be set when calling user is the current user
// or parent is current user in case of managed profiles.
- InputMethodManager inputMethodManager = (InputMethodManager) mContext
- .getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager inputMethodManager =
+ mContext.getSystemService(InputMethodManager.class);
List<InputMethodInfo> enabledImes = inputMethodManager.getEnabledInputMethodList();
if (enabledImes != null) {
@@ -5528,8 +5632,8 @@
// If we have a permitted list add all system input methods.
if (result != null) {
- InputMethodManager inputMethodManager = (InputMethodManager) mContext
- .getSystemService(Context.INPUT_METHOD_SERVICE);
+ InputMethodManager inputMethodManager =
+ mContext.getSystemService(InputMethodManager.class);
List<InputMethodInfo> imes = inputMethodManager.getInputMethodList();
long id = mInjector.binderClearCallingIdentity();
try {
@@ -5658,56 +5762,83 @@
}
}
- // DO NOT call it while taking the "this" lock, which could cause a dead lock.
@Override
public void setUserRestriction(ComponentName who, String key, boolean enabledFromThisOwner) {
Preconditions.checkNotNull(who, "ComponentName is null");
final int userHandle = mInjector.userHandleGetCallingUserId();
- synchronized (mUserManagerInternal.getUserRestrictionsLock()) {
- synchronized (this) {
- ActiveAdmin activeAdmin =
- getActiveAdminForCallerLocked(who,
- DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
- final boolean isDeviceOwner = isDeviceOwner(who, userHandle);
- if (!isDeviceOwner && DEVICE_OWNER_USER_RESTRICTIONS.contains(key)) {
- throw new SecurityException(
- "Profile owners cannot set user restriction " + key);
+ synchronized (this) {
+ ActiveAdmin activeAdmin =
+ getActiveAdminForCallerLocked(who,
+ DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ final boolean isDeviceOwner = isDeviceOwner(who, userHandle);
+ if (isDeviceOwner) {
+ if (!UserRestrictionsUtils.canDeviceOwnerChange(key)) {
+ throw new SecurityException("Device owner cannot set user restriction " + key);
}
- if (IMMUTABLE_USER_RESTRICTIONS.contains(key)) {
- throw new SecurityException("User restriction " + key + " cannot be changed");
+ } else { // profile owner
+ if (!UserRestrictionsUtils.canProfileOwnerChange(key)) {
+ throw new SecurityException("Profile owner cannot set user restriction " + key);
}
-
- final long id = mInjector.binderClearCallingIdentity();
- try {
- // Save the restriction to ActiveAdmin.
- // TODO When DO sets a restriction, it'll always be treated as device-wide.
- // If there'll be a policy that can be set by both, we'll need scoping support,
- // and need to have another Bundle in DO active admin to hold restrictions as
- // PO.
- activeAdmin.ensureUserRestrictions().putBoolean(key, enabledFromThisOwner);
- saveSettingsLocked(userHandle);
-
- // Tell UserManager the new value.
- if (isDeviceOwner) {
- mUserManagerInternal.updateEffectiveUserRestrictionsForAllUsersLR();
- } else {
- mUserManagerInternal.updateEffectiveUserRestrictionsLR(userHandle);
- }
- } finally {
- mInjector.binderRestoreCallingIdentity(id);
- }
-
- sendChangedNotification(userHandle);
}
+
+ // Save the restriction to ActiveAdmin.
+ activeAdmin.ensureUserRestrictions().putBoolean(key, enabledFromThisOwner);
+ saveSettingsLocked(userHandle);
+
+ pushUserRestrictions(userHandle);
+
+ sendChangedNotification(userHandle);
+ }
+ }
+
+ private void pushUserRestrictions(int userId) {
+ synchronized (this) {
+ final Bundle global;
+ final Bundle local = new Bundle();
+ if (mOwners.isDeviceOwnerUserId(userId)) {
+ global = new Bundle();
+
+ final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked();
+ if (deviceOwner == null) {
+ return; // Shouldn't happen.
+ }
+
+ UserRestrictionsUtils.sortToGlobalAndLocal(deviceOwner.userRestrictions,
+ global, local);
+ // DO can disable camera globally.
+ if (deviceOwner.disableCamera) {
+ global.putBoolean(UserManager.DISALLOW_CAMERA, true);
+ }
+ } else {
+ global = null;
+
+ ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userId);
+ if (profileOwner != null) {
+ UserRestrictionsUtils.merge(local, profileOwner.userRestrictions);
+ }
+ }
+ // Also merge in *local* camera restriction.
+ if (getCameraDisabled(/* who= */ null,
+ userId, /* mergeDeviceOwnerRestriction= */ false)) {
+ local.putBoolean(UserManager.DISALLOW_CAMERA, true);
+ }
+ mUserManagerInternal.setDevicePolicyUserRestrictions(userId, local, global);
}
}
@Override
- public Bundle getUserRestrictions(ComponentName who) {
+ public Bundle getUserRestrictions(ComponentName who, int userHandle) {
Preconditions.checkNotNull(who, "ComponentName is null");
+ enforceCrossUserPermission(userHandle);
synchronized (this) {
- final ActiveAdmin activeAdmin =
- getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ ActiveAdmin activeAdmin = getActiveAdminUncheckedLocked(who, userHandle);
+ if (activeAdmin == null) {
+ throw new SecurityException("No active admin: " + activeAdmin);
+ }
+ if (activeAdmin.getUid() != mInjector.binderGetCallingUid()) {
+ mContext.enforceCallingOrSelfPermission(
+ android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS, null);
+ }
return activeAdmin.userRestrictions;
}
}
@@ -5990,9 +6121,9 @@
@Override
public void startManagedQuickContact(String actualLookupKey, long actualContactId,
- Intent originalIntent) {
+ long actualDirectoryId, Intent originalIntent) {
final Intent intent = QuickContact.rebuildManagedQuickContactsIntent(
- actualLookupKey, actualContactId, originalIntent);
+ actualLookupKey, actualContactId, actualDirectoryId, originalIntent);
final int callingUserId = UserHandle.getCallingUserId();
final long ident = mInjector.binderClearCallingIdentity();
@@ -6440,37 +6571,6 @@
}
}
- @Override
- public Bundle getComposedUserRestrictions(int userId, Bundle inBundle) {
- synchronized (DevicePolicyManagerService.this) {
- final ActiveAdmin deviceOwner = getDeviceOwnerAdminLocked();
- final ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userId);
-
- final Bundle deviceOwnerRestrictions =
- deviceOwner == null ? null : deviceOwner.userRestrictions;
- final Bundle profileOwnerRestrictions =
- profileOwner == null ? null : profileOwner.userRestrictions;
- final boolean cameraDisabled = getCameraDisabled(null, userId);
-
- if (deviceOwnerRestrictions == null && profileOwnerRestrictions == null
- && !cameraDisabled) {
- // No restrictions to merge.
- return inBundle;
- }
-
- final Bundle composed = new Bundle(inBundle);
- UserRestrictionsUtils.merge(composed, deviceOwnerRestrictions);
- UserRestrictionsUtils.merge(composed, profileOwnerRestrictions);
-
- // Also merge in the camera restriction.
- if (cameraDisabled) {
- composed.putBoolean(UserManager.DISALLOW_CAMERA, true);
- }
-
- return composed;
- }
- }
-
private void notifyCrossProfileProvidersChanged(int userId, List<String> packages) {
final List<OnCrossProfileWidgetProvidersChangeListener> listeners;
synchronized (DevicePolicyManagerService.this) {
@@ -6570,8 +6670,9 @@
updateReceivedTime);
synchronized (this) {
- final String deviceOwnerPackage = getDeviceOwner() == null ? null :
- getDeviceOwner().getPackageName();
+ final String deviceOwnerPackage =
+ mOwners.hasDeviceOwner() ? mOwners.getDeviceOwnerComponent().getPackageName()
+ : null;
if (deviceOwnerPackage == null) {
return;
}
@@ -6706,16 +6807,31 @@
@Override
public boolean isProvisioningAllowed(String action) {
- if (mOwners.hasDeviceOwner()) {
- return false;
- }
final int callingUserId = mInjector.userHandleGetCallingUserId();
if (DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE.equals(action)) {
- try {
- if (!mIPackageManager.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS)) {
- return false;
+ if (!hasFeatureManagedUsers()) {
+ return false;
+ }
+ synchronized (this) {
+ if (mOwners.hasDeviceOwner()) {
+ if (!mInjector.userManagerIsSplitSystemUser()) {
+ // Only split-system-user systems support managed-profiles in combination with
+ // device-owner.
+ return false;
+ }
+ if (mOwners.getDeviceOwnerUserId() != UserHandle.USER_SYSTEM) {
+ // Only system device-owner supports managed-profiles. Non-system device-owner
+ // doesn't.
+ return false;
+ }
+ if (callingUserId == UserHandle.USER_SYSTEM) {
+ // Managed-profiles cannot be setup on the system user, only regular users.
+ return false;
+ }
}
- } catch (RemoteException e) {
+ }
+ if (getProfileOwner(callingUserId) != null) {
+ // Managed user cannot have a managed profile.
return false;
}
final long ident = mInjector.binderClearCallingIdentity();
@@ -6730,16 +6846,23 @@
} else if (DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE.equals(action)) {
return isDeviceOwnerProvisioningAllowed(callingUserId);
} else if (DevicePolicyManager.ACTION_PROVISION_MANAGED_USER.equals(action)) {
- if (!UserManager.isSplitSystemUser()) {
+ if (!hasFeatureManagedUsers()) {
+ return false;
+ }
+ if (!mInjector.userManagerIsSplitSystemUser()) {
// ACTION_PROVISION_MANAGED_USER only supported on split-user systems.
return false;
}
+ if (callingUserId == UserHandle.USER_SYSTEM) {
+ // System user cannot be a managed user.
+ return false;
+ }
if (hasUserSetupCompleted(callingUserId)) {
return false;
}
return true;
} else if (DevicePolicyManager.ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE.equals(action)) {
- if (!UserManager.isSplitSystemUser()) {
+ if (!mInjector.userManagerIsSplitSystemUser()) {
// ACTION_PROVISION_MANAGED_SHAREABLE_DEVICE only supported on split-user systems.
return false;
}
@@ -6749,6 +6872,11 @@
}
private boolean isDeviceOwnerProvisioningAllowed(int callingUserId) {
+ synchronized (this) {
+ if (mOwners.hasDeviceOwner()) {
+ return false;
+ }
+ }
if (getProfileOwner(callingUserId) != null) {
return false;
}
@@ -6762,6 +6890,33 @@
return true;
}
+ private boolean hasFeatureManagedUsers() {
+ try {
+ return mIPackageManager.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS);
+ } catch (RemoteException e) {
+ return false;
+ }
+ }
+
+ @Override
+ public String getWifiMacAddress() {
+ // Make sure caller has DO.
+ synchronized (this) {
+ getActiveAdminForCallerLocked(null, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ }
+
+ final long ident = mInjector.binderClearCallingIdentity();
+ try {
+ final WifiInfo wifiInfo = mInjector.getWifiManager().getConnectionInfo();
+ if (wifiInfo == null) {
+ return null;
+ }
+ return wifiInfo.hasRealMacAddress() ? wifiInfo.getMacAddress() : null;
+ } finally {
+ mInjector.binderRestoreCallingIdentity(ident);
+ }
+ }
+
/**
* Returns the target sdk version number that the given packageName was built for
* in the given user.
@@ -6772,4 +6927,30 @@
final int targetSdkVersion = ai == null ? 0 : ai.targetSdkVersion;
return targetSdkVersion;
}
+
+ @Override
+ public boolean isManagedProfile(ComponentName admin) {
+ synchronized (this) {
+ getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
+ }
+ final int callingUserId = mInjector.userHandleGetCallingUserId();
+ final UserInfo user;
+ long ident = mInjector.binderClearCallingIdentity();
+ try {
+ user = mUserManager.getUserInfo(callingUserId);
+ } finally {
+ mInjector.binderRestoreCallingIdentity(ident);
+ }
+ return user != null && user.isManagedProfile();
+ }
+
+ @Override
+ public boolean isSystemOnlyUser(ComponentName admin) {
+ synchronized (this) {
+ getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
+ }
+ final int callingUserId = mInjector.userHandleGetCallingUserId();
+ return UserManager.isSplitSystemUser() && callingUserId == UserHandle.USER_SYSTEM;
+ }
+
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
index ded4422..f7de0b3 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
@@ -23,6 +23,7 @@
import android.os.Environment;
import android.os.UserHandle;
import android.os.UserManager;
+import android.os.UserManagerInternal;
import android.util.ArrayMap;
import android.util.AtomicFile;
import android.util.Log;
@@ -50,6 +51,9 @@
/**
* Stores and restores state for the Device and Profile owners. By definition there can be
* only one device owner, but there may be a profile owner for each user.
+ *
+ * <p>This class is not thread safe. (i.e. access to this class must always be synchronized
+ * in the caller side.)
*/
class Owners {
private static final String TAG = "DevicePolicyManagerService";
@@ -78,8 +82,8 @@
private static final String TAG_SYSTEM_UPDATE_POLICY = "system-update-policy";
- private final Context mContext;
private final UserManager mUserManager;
+ private final UserManagerInternal mUserManagerInternal;
// Internal state for the device owner package.
private OwnerInfo mDeviceOwner;
@@ -92,44 +96,48 @@
// Local system update policy controllable by device owner.
private SystemUpdatePolicy mSystemUpdatePolicy;
- public Owners(Context context) {
- mContext = context;
- mUserManager = context.getSystemService(UserManager.class);
+ public Owners(Context context, UserManager userManager,
+ UserManagerInternal userManagerInternal) {
+ mUserManager = userManager;
+ mUserManagerInternal = userManagerInternal;
}
/**
* Load configuration from the disk.
*/
void load() {
- synchronized (this) {
- // First, try to read from the legacy file.
- final File legacy = getLegacyConfigFileWithTestOverride();
+ // First, try to read from the legacy file.
+ final File legacy = getLegacyConfigFileWithTestOverride();
- if (readLegacyOwnerFile(legacy)) {
- if (DEBUG) {
- Log.d(TAG, "Legacy config file found.");
- }
+ final List<UserInfo> users = mUserManager.getUsers();
- // Legacy file exists, write to new files and remove the legacy one.
- writeDeviceOwner();
- for (int userId : getProfileOwnerKeys()) {
- writeProfileOwner(userId);
- }
- if (DEBUG) {
- Log.d(TAG, "Deleting legacy config file");
- }
- if (!legacy.delete()) {
- Slog.e(TAG, "Failed to remove the legacy setting file");
- }
- } else {
- // No legacy file, read from the new format files.
- new DeviceOwnerReadWriter().readFromFileLocked();
-
- final List<UserInfo> users = mUserManager.getUsers();
- for (UserInfo ui : users) {
- new ProfileOwnerReadWriter(ui.id).readFromFileLocked();
- }
+ if (readLegacyOwnerFile(legacy)) {
+ if (DEBUG) {
+ Log.d(TAG, "Legacy config file found.");
}
+
+ // Legacy file exists, write to new files and remove the legacy one.
+ writeDeviceOwner();
+ for (int userId : getProfileOwnerKeys()) {
+ writeProfileOwner(userId);
+ }
+ if (DEBUG) {
+ Log.d(TAG, "Deleting legacy config file");
+ }
+ if (!legacy.delete()) {
+ Slog.e(TAG, "Failed to remove the legacy setting file");
+ }
+ } else {
+ // No legacy file, read from the new format files.
+ new DeviceOwnerReadWriter().readFromFileLocked();
+
+ for (UserInfo ui : users) {
+ new ProfileOwnerReadWriter(ui.id).readFromFileLocked();
+ }
+ }
+ mUserManagerInternal.setDeviceManaged(hasDeviceOwner());
+ for (UserInfo ui : users) {
+ mUserManagerInternal.setUserManaged(ui.id, hasProfileOwner(ui.id));
}
if (hasDeviceOwner() && hasProfileOwner(getDeviceOwnerUserId())) {
Slog.w(TAG, String.format("User %d has both DO and PO, which is not supported",
@@ -169,21 +177,27 @@
boolean userRestrictionsMigrated) {
mDeviceOwner = new OwnerInfo(ownerName, admin, userRestrictionsMigrated);
mDeviceOwnerUserId = userId;
+
+ mUserManagerInternal.setDeviceManaged(true);
}
void clearDeviceOwner() {
mDeviceOwner = null;
mDeviceOwnerUserId = UserHandle.USER_NULL;
+
+ mUserManagerInternal.setDeviceManaged(false);
}
void setProfileOwner(ComponentName admin, String ownerName, int userId) {
// For a newly set PO, there's no need for migration.
mProfileOwners.put(userId, new OwnerInfo(ownerName, admin,
/* userRestrictionsMigrated =*/ true));
+ mUserManagerInternal.setUserManaged(userId, true);
}
void removeProfileOwner(int userId) {
mProfileOwners.remove(userId);
+ mUserManagerInternal.setUserManaged(userId, false);
}
ComponentName getProfileOwnerComponent(int userId) {
@@ -221,6 +235,10 @@
return mDeviceOwner != null;
}
+ boolean isDeviceOwnerUserId(int userId) {
+ return mDeviceOwner != null && mDeviceOwnerUserId == userId;
+ }
+
boolean hasProfileOwner(int userId) {
return getProfileOwnerComponent(userId) != null;
}
@@ -625,20 +643,30 @@
}
public void dump(String prefix, PrintWriter pw) {
+ boolean needBlank = false;
if (mDeviceOwner != null) {
pw.println(prefix + "Device Owner: ");
mDeviceOwner.dump(prefix + " ", pw);
pw.println(prefix + " User ID: " + mDeviceOwnerUserId);
- pw.println();
+ needBlank = true;
}
if (mSystemUpdatePolicy != null) {
+ if (needBlank) {
+ needBlank = false;
+ pw.println();
+ }
pw.println(prefix + "System Update Policy: " + mSystemUpdatePolicy);
- pw.println();
+ needBlank = true;
}
if (mProfileOwners != null) {
for (Map.Entry<Integer, OwnerInfo> entry : mProfileOwners.entrySet()) {
+ if (needBlank) {
+ needBlank = false;
+ pw.println();
+ }
pw.println(prefix + "Profile Owner (User " + entry.getKey() + "): ");
entry.getValue().dump(prefix + " ", pw);
+ needBlank = true;
}
}
}
diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index c9efc69..e7e99c4 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -22,8 +22,6 @@
import com.android.internal.util.StateMachine;
import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -145,10 +143,10 @@
// State variables.
private final StateMachine mController;
- private final PendingIntent mKickIntent;
- private final PendingIntent mTimeoutIntent;
- private final PendingIntent mRenewIntent;
- private final PendingIntent mOneshotTimeoutIntent;
+ private final AlarmListener mKickAlarm;
+ private final AlarmListener mTimeoutAlarm;
+ private final AlarmListener mRenewAlarm;
+ private final AlarmListener mOneshotTimeoutAlarm;
private final String mIfaceName;
private boolean mRegisteredForPreDhcpNotification;
@@ -206,16 +204,15 @@
mRandom = new Random();
// Used to schedule packet retransmissions.
- mKickIntent = createStateMachineCommandIntent("KICK", CMD_KICK);
+ mKickAlarm = new AlarmListener("KICK", CMD_KICK);
// Used to time out PacketRetransmittingStates.
- mTimeoutIntent = createStateMachineCommandIntent("TIMEOUT", CMD_TIMEOUT);
+ mTimeoutAlarm = new AlarmListener("TIMEOUT", CMD_TIMEOUT);
// Used to schedule DHCP renews.
- mRenewIntent = createStateMachineCommandIntent("RENEW", DhcpStateMachine.CMD_RENEW_DHCP);
+ mRenewAlarm = new AlarmListener("RENEW", DhcpStateMachine.CMD_RENEW_DHCP);
// Used to tell the caller when its request (CMD_START_DHCP or CMD_RENEW_DHCP) timed out.
// TODO: when the legacy DHCP client is gone, make the client fully asynchronous and
// remove this.
- mOneshotTimeoutIntent = createStateMachineCommandIntent("ONESHOT_TIMEOUT",
- CMD_ONESHOT_TIMEOUT);
+ mOneshotTimeoutAlarm = new AlarmListener("ONESHOT_TIMEOUT", CMD_ONESHOT_TIMEOUT);
}
@Override
@@ -231,39 +228,29 @@
}
/**
- * Constructs a PendingIntent that sends the specified command to the state machine. This is
- * implemented by creating an Intent with the specified parameters, and creating and registering
- * a BroadcastReceiver for it. The broadcast must be sent by a process that holds the
- * {@code CONNECTIVITY_INTERNAL} permission.
- *
- * @param cmdName the name of the command. The intent's action will be
- * {@code android.net.dhcp.DhcpClient.<mIfaceName>.<cmdName>}
- * @param cmd the command to send to the state machine when the PendingIntent is triggered.
- * @return the PendingIntent
+ * An AlarmListener that sends the specified command to the state machine.
*/
- private PendingIntent createStateMachineCommandIntent(final String cmdName, final int cmd) {
- String action = DhcpClient.class.getName() + "." + mIfaceName + "." + cmdName;
+ private class AlarmListener implements AlarmManager.OnAlarmListener {
+ private final int cmd;
+ private final String name;
- Intent intent = new Intent(action, null).addFlags(
- Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT |
- Intent.FLAG_RECEIVER_FOREGROUND);
- // TODO: The intent's package covers the whole of the system server, so it's pretty generic.
- // Consider adding some sort of token as well.
- intent.setPackage(mContext.getPackageName());
- PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, cmd, intent, 0);
+ public AlarmListener(final String cmdName, final int cmd) {
+ this.cmd = cmd;
+ this.name = DhcpClient.class.getSimpleName() + "." + mIfaceName + "." + cmdName;
+ }
- mContext.registerReceiver(
- new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- sendMessage(cmd);
- }
- },
- new IntentFilter(action),
- android.Manifest.permission.CONNECTIVITY_INTERNAL,
- null);
+ public void set(long alarmTime) {
+ mAlarmManager.setExact(
+ AlarmManager.ELAPSED_REALTIME_WAKEUP, alarmTime, name, this, getHandler());
+ }
- return pendingIntent;
+ public void cancel() {
+ mAlarmManager.cancel(this);
+ }
+
+ public void onAlarm() {
+ sendMessage(cmd);
+ }
}
private boolean initInterface() {
@@ -425,11 +412,11 @@
}
private void scheduleRenew() {
- mAlarmManager.cancel(mRenewIntent);
+ mAlarmManager.cancel(mRenewAlarm);
if (mDhcpLeaseExpiry != 0) {
long now = SystemClock.elapsedRealtime();
long alarmTime = (now + mDhcpLeaseExpiry) / 2;
- mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, alarmTime, mRenewIntent);
+ mRenewAlarm.set(alarmTime);
Log.d(TAG, "Scheduling renewal in " + ((alarmTime - now) / 1000) + "s");
} else {
Log.d(TAG, "Infinite lease, no renewal needed");
@@ -561,12 +548,7 @@
// one state, so we can just use the state timeout.
private void scheduleOneshotTimeout() {
final long alarmTime = SystemClock.elapsedRealtime() + DHCP_TIMEOUT_MS;
- mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, alarmTime,
- mOneshotTimeoutIntent);
- }
-
- private void cancelOneshotTimeout() {
- mAlarmManager.cancel(mOneshotTimeoutIntent);
+ mOneshotTimeoutAlarm.set(alarmTime);
}
class StoppedState extends LoggingState {
@@ -618,7 +600,7 @@
@Override
public void exit() {
- cancelOneshotTimeout();
+ mOneshotTimeoutAlarm.cancel();
if (mReceiveThread != null) {
mReceiveThread.halt(); // Also closes sockets.
mReceiveThread = null;
@@ -709,8 +691,8 @@
}
public void exit() {
- mAlarmManager.cancel(mKickIntent);
- mAlarmManager.cancel(mTimeoutIntent);
+ mKickAlarm.cancel();
+ mTimeoutAlarm.cancel();
}
abstract protected boolean sendPacket();
@@ -731,8 +713,8 @@
long now = SystemClock.elapsedRealtime();
long timeout = jitterTimer(mTimer);
long alarmTime = now + timeout;
- mAlarmManager.cancel(mKickIntent);
- mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, alarmTime, mKickIntent);
+ mKickAlarm.cancel();
+ mKickAlarm.set(alarmTime);
mTimer *= 2;
if (mTimer > MAX_TIMEOUT_MS) {
mTimer = MAX_TIMEOUT_MS;
@@ -742,8 +724,7 @@
protected void maybeInitTimeout() {
if (mTimeout > 0) {
long alarmTime = SystemClock.elapsedRealtime() + mTimeout;
- mAlarmManager.setExact(
- AlarmManager.ELAPSED_REALTIME_WAKEUP, alarmTime, mTimeoutIntent);
+ mTimeoutAlarm.set(alarmTime);
}
}
}
@@ -843,7 +824,7 @@
@Override
public void enter() {
super.enter();
- cancelOneshotTimeout();
+ mOneshotTimeoutAlarm.cancel();
notifySuccess();
// TODO: DhcpStateMachine only supports renewing at 50% of the lease time, and does not
// support rebinding. Once the legacy DHCP client is gone, fix this.
diff --git a/services/net/java/android/net/dhcp/DhcpPacket.java b/services/net/java/android/net/dhcp/DhcpPacket.java
index 8927bfa..6a255e5 100644
--- a/services/net/java/android/net/dhcp/DhcpPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpPacket.java
@@ -291,6 +291,11 @@
*/
abstract void finishPacket(ByteBuffer buffer);
+ // Set in unit tests, to ensure that the test does not break when run on different devices and
+ // on different releases.
+ static String testOverrideVendorId = null;
+ static String testOverrideHostname = null;
+
protected DhcpPacket(int transId, short secs, Inet4Address clientIp, Inet4Address yourIp,
Inet4Address nextIp, Inet4Address relayIp,
byte[] clientMac, boolean broadcast) {
@@ -593,6 +598,16 @@
buf.put((byte) 0xFF);
}
+ private String getVendorId() {
+ if (testOverrideVendorId != null) return testOverrideVendorId;
+ return "android-dhcp-" + Build.VERSION.RELEASE;
+ }
+
+ private String getHostname() {
+ if (testOverrideHostname != null) return testOverrideHostname;
+ return SystemProperties.get("net.hostname");
+ }
+
/**
* Adds common client TLVs.
*
@@ -601,8 +616,8 @@
*/
protected void addCommonClientTlvs(ByteBuffer buf) {
addTlv(buf, DHCP_MAX_MESSAGE_SIZE, (short) MAX_LENGTH);
- addTlv(buf, DHCP_VENDOR_CLASS_ID, "android-dhcp-" + Build.VERSION.RELEASE);
- addTlv(buf, DHCP_HOST_NAME, SystemProperties.get("net.hostname"));
+ addTlv(buf, DHCP_VENDOR_CLASS_ID, getVendorId());
+ addTlv(buf, DHCP_HOST_NAME, getHostname());
}
/**
diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java
index 92bd81f..0a8c014 100644
--- a/services/print/java/com/android/server/print/PrintManagerService.java
+++ b/services/print/java/com/android/server/print/PrintManagerService.java
@@ -228,6 +228,11 @@
return null;
}
userState = getOrCreateUserStateLocked(resolvedUserId);
+
+ // The user state might be updated via the same observer-set as the caller of this
+ // interface. If the caller is called back first the user state is not yet updated
+ // and the user gets and inconsistent view. Hence force an update.
+ userState.updateIfNeededLocked();
}
final long identity = Binder.clearCallingIdentity();
try {
diff --git a/services/print/java/com/android/server/print/RemotePrintService.java b/services/print/java/com/android/server/print/RemotePrintService.java
index 0ab1657..77a47f8 100644
--- a/services/print/java/com/android/server/print/RemotePrintService.java
+++ b/services/print/java/com/android/server/print/RemotePrintService.java
@@ -16,6 +16,9 @@
package com.android.server.print;
+import android.annotation.FloatRange;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -757,6 +760,33 @@
}
@Override
+ public void setProgress(@NonNull PrintJobId printJobId,
+ @FloatRange(from=0.0, to=1.0) float progress) {
+ RemotePrintService service = mWeakService.get();
+ if (service != null) {
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ service.mSpooler.setProgress(printJobId, progress);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+ }
+
+ @Override
+ public void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) {
+ RemotePrintService service = mWeakService.get();
+ if (service != null) {
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ service.mSpooler.setStatus(printJobId, status);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+ }
+
+ @Override
@SuppressWarnings({"rawtypes", "unchecked"})
public void onPrintersAdded(ParceledListSlice printers) {
RemotePrintService service = mWeakService.get();
diff --git a/services/print/java/com/android/server/print/RemotePrintSpooler.java b/services/print/java/com/android/server/print/RemotePrintSpooler.java
index e5370f4..c506b6f 100644
--- a/services/print/java/com/android/server/print/RemotePrintSpooler.java
+++ b/services/print/java/com/android/server/print/RemotePrintSpooler.java
@@ -16,6 +16,9 @@
package com.android.server.print;
+import android.annotation.FloatRange;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -229,6 +232,61 @@
return false;
}
+ /**
+ * Set progress of a print job.
+ *
+ * @param printJobId The print job to update
+ * @param progress The new progress
+ */
+ public final void setProgress(@NonNull PrintJobId printJobId,
+ @FloatRange(from=0.0, to=1.0) float progress) {
+ throwIfCalledOnMainThread();
+ synchronized (mLock) {
+ throwIfDestroyedLocked();
+ mCanUnbind = false;
+ }
+ try {
+ getRemoteInstanceLazy().setProgress(printJobId, progress);
+ } catch (RemoteException|TimeoutException re) {
+ Slog.e(LOG_TAG, "Error setting progress.", re);
+ } finally {
+ if (DEBUG) {
+ Slog.i(LOG_TAG, "[user: " + mUserHandle.getIdentifier() + "] setProgress()");
+ }
+ synchronized (mLock) {
+ mCanUnbind = true;
+ mLock.notifyAll();
+ }
+ }
+ }
+
+ /**
+ * Set status of a print job.
+ *
+ * @param printJobId The print job to update
+ * @param status The new status
+ */
+ public final void setStatus(@NonNull PrintJobId printJobId, @Nullable CharSequence status) {
+ throwIfCalledOnMainThread();
+ synchronized (mLock) {
+ throwIfDestroyedLocked();
+ mCanUnbind = false;
+ }
+ try {
+ getRemoteInstanceLazy().setStatus(printJobId, status);
+ } catch (RemoteException|TimeoutException re) {
+ Slog.e(LOG_TAG, "Error setting status.", re);
+ } finally {
+ if (DEBUG) {
+ Slog.i(LOG_TAG, "[user: " + mUserHandle.getIdentifier() + "] setStatus()");
+ }
+ synchronized (mLock) {
+ mCanUnbind = true;
+ mLock.notifyAll();
+ }
+ }
+ }
+
public final boolean setPrintJobTag(PrintJobId printJobId, String tag) {
throwIfCalledOnMainThread();
synchronized (mLock) {
diff --git a/services/print/java/com/android/server/print/UserState.java b/services/print/java/com/android/server/print/UserState.java
index f37bb9eb..6a50a6e 100644
--- a/services/print/java/com/android/server/print/UserState.java
+++ b/services/print/java/com/android/server/print/UserState.java
@@ -343,9 +343,7 @@
public void createPrinterDiscoverySession(IPrinterDiscoveryObserver observer) {
synchronized (mLock) {
throwIfDestroyedLocked();
- if (mActiveServices.isEmpty()) {
- return;
- }
+
if (mPrinterDiscoverySession == null) {
// If we do not have a session, tell all service to create one.
mPrinterDiscoverySession = new PrinterDiscoverySessionMediator(mContext) {
diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml
index c147bcc..eed326e 100644
--- a/services/tests/servicestests/AndroidManifest.xml
+++ b/services/tests/servicestests/AndroidManifest.xml
@@ -94,6 +94,14 @@
</intent-filter>
</receiver>
+ <receiver android:name="com.android.server.devicepolicy.DummyDeviceAdmins$AdminNoPerm">
+ <meta-data android:name="android.app.device_admin"
+ android:resource="@xml/device_admin_sample" />
+ <intent-filter>
+ <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+ </intent-filter>
+ </receiver>
+
</application>
<instrumentation
diff --git a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java b/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
index 7e60bf1..2a967e6 100644
--- a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
+++ b/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
import libcore.util.HexEncoding;
+import java.util.Arrays;
import static android.net.dhcp.DhcpPacket.*;
@@ -47,6 +48,11 @@
return (Inet4Address) NetworkUtils.numericToInetAddress(addrString);
}
+ public void setUp() {
+ DhcpPacket.testOverrideVendorId = "android-dhcp-???";
+ DhcpPacket.testOverrideHostname = "android-01234567890abcde";
+ }
+
class TestDhcpPacket extends DhcpPacket {
private byte mType;
// TODO: Make this a map of option numbers to bytes instead.
@@ -584,4 +590,93 @@
assertDhcpResults("192.168.189.49/24", "192.168.189.1", "8.8.8.8,8.8.4.4",
null, "192.171.189.2", null, 28800, false, dhcpResults);
}
+
+ @SmallTest
+ public void testDiscoverPacket() throws Exception {
+ short secs = 7;
+ int transactionId = 0xdeadbeef;
+ byte[] hwaddr = {
+ (byte) 0xda, (byte) 0x01, (byte) 0x19, (byte) 0x5b, (byte) 0xb1, (byte) 0x7a
+ };
+ byte[] params = new byte[] {
+ DHCP_SUBNET_MASK,
+ DHCP_ROUTER,
+ DHCP_DNS_SERVER,
+ DHCP_DOMAIN_NAME,
+ DHCP_MTU,
+ DHCP_LEASE_TIME,
+ };
+
+ ByteBuffer packet = DhcpPacket.buildDiscoverPacket(
+ DhcpPacket.ENCAP_L2, transactionId, secs, hwaddr,
+ false /* do unicast */, params);
+
+ byte[] headers = new byte[] {
+ // Ethernet header.
+ (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+ (byte) 0xda, (byte) 0x01, (byte) 0x19, (byte) 0x5b, (byte) 0xb1, (byte) 0x7a,
+ (byte) 0x08, (byte) 0x00,
+ // IP header.
+ (byte) 0x45, (byte) 0x10, (byte) 0x01, (byte) 0x52,
+ (byte) 0x00, (byte) 0x00, (byte) 0x40, (byte) 0x00,
+ (byte) 0x40, (byte) 0x11, (byte) 0x39, (byte) 0x8c,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
+ // UDP header.
+ (byte) 0x00, (byte) 0x44, (byte) 0x00, (byte) 0x43,
+ (byte) 0x01, (byte) 0x3e, (byte) 0xd8, (byte) 0xa4,
+ // BOOTP.
+ (byte) 0x01, (byte) 0x01, (byte) 0x06, (byte) 0x00,
+ (byte) 0xde, (byte) 0xad, (byte) 0xbe, (byte) 0xef,
+ (byte) 0x00, (byte) 0x07, (byte) 0x00, (byte) 0x00,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+ (byte) 0xda, (byte) 0x01, (byte) 0x19, (byte) 0x5b,
+ (byte) 0xb1, (byte) 0x7a
+ };
+ byte[] options = new byte[] {
+ // Magic cookie 0x63825363.
+ (byte) 0x63, (byte) 0x82, (byte) 0x53, (byte) 0x63,
+ // Message type DISCOVER.
+ (byte) 0x35, (byte) 0x01, (byte) 0x01,
+ // Client identifier Ethernet, da:01:19:5b:b1:7a.
+ (byte) 0x3d, (byte) 0x07,
+ (byte) 0x01,
+ (byte) 0xda, (byte) 0x01, (byte) 0x19, (byte) 0x5b, (byte) 0xb1, (byte) 0x7a,
+ // Max message size 1500.
+ (byte) 0x39, (byte) 0x02, (byte) 0x05, (byte) 0xdc,
+ // Version "android-dhcp-???".
+ (byte) 0x3c, (byte) 0x10,
+ 'a', 'n', 'd', 'r', 'o', 'i', 'd', '-', 'd', 'h', 'c', 'p', '-', '?', '?', '?',
+ // Hostname "android-01234567890abcde"
+ (byte) 0x0c, (byte) 0x18,
+ 'a', 'n', 'd', 'r', 'o', 'i', 'd', '-',
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'a', 'b', 'c', 'd', 'e',
+ // Requested parameter list.
+ (byte) 0x37, (byte) 0x06,
+ DHCP_SUBNET_MASK,
+ DHCP_ROUTER,
+ DHCP_DNS_SERVER,
+ DHCP_DOMAIN_NAME,
+ DHCP_MTU,
+ DHCP_LEASE_TIME,
+ // End options.
+ (byte) 0xff,
+ // Our packets are always of even length. TODO: find out why and possibly fix it.
+ (byte) 0x00
+ };
+ byte[] expected = new byte[DhcpPacket.MIN_PACKET_LENGTH_L2 + options.length];
+ assertTrue((expected.length & 1) == 0);
+ System.arraycopy(headers, 0, expected, 0, headers.length);
+ System.arraycopy(options, 0, expected, DhcpPacket.MIN_PACKET_LENGTH_L2, options.length);
+
+ byte[] actual = new byte[packet.limit()];
+ packet.get(actual);
+ String msg =
+ "Expected:\n " + Arrays.toString(expected) +
+ "\nActual:\n " + Arrays.toString(actual);
+ assertTrue(msg, Arrays.equals(expected, actual));
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
index 97e16da..27deb72 100644
--- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
@@ -591,6 +591,12 @@
public void setUp() throws Exception {
super.setUp();
+ // InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.
+ // http://b/25897652 .
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
+
mServiceContext = new MockContext(getContext());
mService = new WrappedConnectivityService(mServiceContext,
mock(INetworkManagementService.class),
diff --git a/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java b/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java
index b0296a0..c174a92 100644
--- a/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java
+++ b/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java
@@ -61,7 +61,7 @@
b2.putBoolean("b2", true);
SyncOperation op1 = new SyncOperation(account1, 0,
- 1,
+ 1, "foo", 0,
SyncOperation.REASON_PERIODIC,
"authority1",
b1,
@@ -73,7 +73,7 @@
// Same as op1 but different time infos
SyncOperation op2 = new SyncOperation(account1, 0,
- 1,
+ 1, "foo", 0,
SyncOperation.REASON_PERIODIC,
"authority1",
b1,
@@ -85,7 +85,7 @@
// Same as op1 but different authority
SyncOperation op3 = new SyncOperation(account1, 0,
- 1,
+ 1, "foo", 0,
SyncOperation.REASON_PERIODIC,
"authority2",
b1,
@@ -97,7 +97,7 @@
// Same as op1 but different account
SyncOperation op4 = new SyncOperation(account2, 0,
- 1,
+ 1, "foo", 0,
SyncOperation.REASON_PERIODIC,
"authority1",
b1,
@@ -109,7 +109,7 @@
// Same as op1 but different bundle
SyncOperation op5 = new SyncOperation(account1, 0,
- 1,
+ 1, "foo", 0,
SyncOperation.REASON_PERIODIC,
"authority1",
b2,
@@ -131,21 +131,21 @@
long soonFlex = 50;
long after = 1500;
long afterFlex = 100;
- SyncOperation op1 = new SyncOperation(mDummy, 0, 0, SyncOperation.REASON_PERIODIC,
+ SyncOperation op1 = new SyncOperation(mDummy, 0, 0, "foo", 0, SyncOperation.REASON_PERIODIC,
"authority1", mEmpty, soon, soonFlex, mUnimportantLong, mUnimportantLong, true);
// Interval disjoint from and after op1.
- SyncOperation op2 = new SyncOperation(mDummy, 0, 0, SyncOperation.REASON_PERIODIC,
+ SyncOperation op2 = new SyncOperation(mDummy, 0, 0, "foo", 0, SyncOperation.REASON_PERIODIC,
"authority1", mEmpty, after, afterFlex, mUnimportantLong, mUnimportantLong, true);
// Interval equivalent to op1, but expedited.
Bundle b2 = new Bundle();
b2.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
- SyncOperation op3 = new SyncOperation(mDummy, 0, 0, 0,
+ SyncOperation op3 = new SyncOperation(mDummy, 0, 0, "foo", 0, 0,
"authority1", b2, -1, soonFlex, mUnimportantLong, mUnimportantLong, true);
// Interval overlaps but not equivalent to op1.
- SyncOperation op4 = new SyncOperation(mDummy, 0, 0, SyncOperation.REASON_PERIODIC,
+ SyncOperation op4 = new SyncOperation(mDummy, 0, 0, "foo", 0, SyncOperation.REASON_PERIODIC,
"authority1", mEmpty, soon + 100, soonFlex + 100, mUnimportantLong, mUnimportantLong, true);
assertTrue(op1.compareTo(op2) == -1);
@@ -165,7 +165,8 @@
Bundle withExpedited = new Bundle();
withExpedited.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
- SyncOperation op = new SyncOperation(mDummy, 0, 0, SyncOperation.REASON_USER_START,
+ SyncOperation op = new SyncOperation(mDummy, 0, 0, "foo", 0,
+ SyncOperation.REASON_USER_START,
mAuthority, withExpedited, fiveSecondsFromNow, twoSecondsFlex,
eightSeconds /* backoff */, fourSeconds /* delayUntil */, true);
// Create another sync op to be rerun in 5 minutes.
diff --git a/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java b/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java
index ae1967e..b22eb53 100644
--- a/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java
+++ b/services/tests/servicestests/src/com/android/server/content/SyncStorageEngineTest.java
@@ -41,8 +41,6 @@
import java.io.FileOutputStream;
import java.util.List;
-import com.android.server.content.SyncStorageEngine.EndPoint;
-
public class SyncStorageEngineTest extends AndroidTestCase {
protected Account account1;
@@ -96,7 +94,7 @@
SyncStorageEngine engine = SyncStorageEngine.newTestInstance(
new TestContext(mockResolver, getContext()));
long time0 = 1000;
- SyncOperation op = new SyncOperation(account, 0,
+ SyncOperation op = new SyncOperation(account, 0, 0, "foo",
SyncOperation.REASON_PERIODIC,
SyncStorageEngine.SOURCE_LOCAL,
authority,
@@ -112,7 +110,7 @@
@MediumTest
public void testAppendPending() throws Exception {
SyncOperation sop = new SyncOperation(account1,
- DEFAULT_USER,
+ DEFAULT_USER, 0, "foo",
SyncOperation.REASON_PERIODIC,
SyncStorageEngine.SOURCE_LOCAL, authority1, Bundle.EMPTY,
0 /* runtime */, 0 /* flex */, 0 /* backoff */, 0 /* delayuntil */,
@@ -140,19 +138,19 @@
*/
public void testWritePendingOperationsLocked() throws Exception {
SyncOperation sop = new SyncOperation(account1,
- DEFAULT_USER,
+ DEFAULT_USER, 0, "foo",
SyncOperation.REASON_IS_SYNCABLE,
SyncStorageEngine.SOURCE_LOCAL, authority1, Bundle.EMPTY,
1000L /* runtime */, 57L /* flex */, 0 /* backoff */, 0 /* delayuntil */,
true /* expedited */);
SyncOperation sop1 = new SyncOperation(account2,
- DEFAULT_USER,
+ DEFAULT_USER, 0, "foo",
SyncOperation.REASON_PERIODIC,
SyncStorageEngine.SOURCE_LOCAL, authority1, defaultBundle,
0 /* runtime */, 0 /* flex */, 20L /* backoff */, 100L /* delayuntil */,
false /* expedited */);
SyncOperation deleted = new SyncOperation(account2,
- DEFAULT_USER,
+ DEFAULT_USER, 0, "foo",
SyncOperation.REASON_SYNC_AUTO,
SyncStorageEngine.SOURCE_LOCAL, authority1, Bundle.EMPTY,
0 /* runtime */, 0 /* flex */, 20L /* backoff */, 100L /* delayuntil */,
@@ -456,14 +454,14 @@
// Test service component read
List<PeriodicSync> syncs = engine.getPeriodicSyncs(
- new SyncStorageEngine.EndPoint(syncService1, 0));
+ new SyncStorageEngine.EndPoint(syncService1, 0, 0));
assertEquals(1, syncs.size());
assertEquals(true, engine.getIsTargetServiceActive(syncService1, 0));
}
@SmallTest
public void testComponentSettings() throws Exception {
- EndPoint target1 = new EndPoint(syncService1, 0);
+ EndPoint target1 = new EndPoint(syncService1, 0, 0);
engine.updateOrAddPeriodicSync(target1, dayPoll, dayFuzz, Bundle.EMPTY);
engine.setIsTargetServiceActive(target1.service, 0, true);
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java
index dfa9f8f..f32f209 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java
@@ -145,16 +145,13 @@
// Check the new base restrictions.
DpmTestUtils.assertRestrictions(
- DpmTestUtils.newRestrictions(
- UserManager.DISALLOW_RECORD_AUDIO
- ),
+ DpmTestUtils.newRestrictions(),
newBaseRestrictions.get(UserHandle.USER_SYSTEM));
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
UserManager.DISALLOW_SMS,
- UserManager.DISALLOW_OUTGOING_CALLS,
- UserManager.DISALLOW_RECORD_AUDIO
+ UserManager.DISALLOW_OUTGOING_CALLS
),
newBaseRestrictions.get(10));
@@ -162,28 +159,30 @@
DpmTestUtils.newRestrictions(
UserManager.DISALLOW_SMS,
UserManager.DISALLOW_OUTGOING_CALLS,
- UserManager.DISALLOW_WALLPAPER,
- UserManager.DISALLOW_RECORD_AUDIO
+ UserManager.DISALLOW_WALLPAPER
),
newBaseRestrictions.get(11));
// Check the new owner restrictions.
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
- UserManager.DISALLOW_ADD_USER
+ UserManager.DISALLOW_ADD_USER,
+ UserManager.DISALLOW_RECORD_AUDIO
),
dpms.getDeviceOwnerAdminLocked().ensureUserRestrictions());
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
UserManager.DISALLOW_REMOVE_USER,
- UserManager.DISALLOW_WALLPAPER
+ UserManager.DISALLOW_WALLPAPER,
+ UserManager.DISALLOW_RECORD_AUDIO
),
dpms.getProfileOwnerAdminLocked(10).ensureUserRestrictions());
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
- UserManager.DISALLOW_REMOVE_USER
+ UserManager.DISALLOW_REMOVE_USER,
+ UserManager.DISALLOW_RECORD_AUDIO
),
dpms.getProfileOwnerAdminLocked(11).ensureUserRestrictions());
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
index 2c01b8a..435b602 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
@@ -20,8 +20,8 @@
import android.app.IActivityManager;
import android.app.NotificationManager;
import android.app.backup.IBackupManager;
-import android.content.Context;
import android.content.pm.IPackageManager;
+import android.content.pm.PackageManagerInternal;
import android.media.IAudioService;
import android.os.Looper;
import android.os.PowerManagerInternal;
@@ -52,7 +52,7 @@
private final File mProfileOwnerBase;
public OwnersTestable(DpmMockContext context) {
- super(context);
+ super(context, context.userManager, context.userManagerInternal);
mLegacyFile = new File(context.dataDir, LEGACY_FILE);
mDeviceOwnerFile = new File(context.dataDir, DEVICE_OWNER_FILE);
mProfileOwnerBase = new File(context.dataDir, PROFILE_OWNER_FILE_BASE);
@@ -113,6 +113,11 @@
}
@Override
+ PackageManagerInternal getPackageManagerInternal() {
+ return context.packageManagerInternal;
+ }
+
+ @Override
PowerManagerInternal getPowerManagerInternal() {
return context.powerManagerInternal;
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index 36980e3..565ef4b 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@ -25,20 +25,22 @@
import android.app.admin.DevicePolicyManagerInternal;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
+import android.net.wifi.WifiInfo;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
import android.os.Bundle;
-import android.content.pm.PackageInfo;
+import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
+import android.test.MoreAsserts;
import android.util.Pair;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -50,6 +52,7 @@
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -59,9 +62,9 @@
*
m FrameworksServicesTests &&
adb install \
- -r out/target/product/hammerhead/data/app/FrameworksServicesTests/FrameworksServicesTests.apk &&
+ -r out/target/product/hammerhead/data/app/FrameworksServicesTests/FrameworksServicesTests.apk &&
adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest \
- -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
+ -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
(mmma frameworks/base/services/tests/servicestests/ for non-ninja build)
*/
@@ -84,6 +87,7 @@
setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_UID);
setUpPackageManagerForAdmin(admin2, DpmMockContext.CALLER_UID);
setUpPackageManagerForAdmin(admin3, DpmMockContext.CALLER_UID);
+ setUpPackageManagerForAdmin(adminNoPerm, DpmMockContext.CALLER_UID);
setUpUserManager();
}
@@ -337,6 +341,33 @@
/**
* Test for:
+ * {@link DevicePolicyManager#setActiveAdmin} when the admin isn't protected with
+ * BIND_DEVICE_ADMIN.
+ */
+ public void testSetActiveAdmin_permissionCheck() throws Exception {
+ // 1. Make sure the caller has proper permissions.
+ mContext.callerPermissions.add(android.Manifest.permission.MANAGE_DEVICE_ADMINS);
+
+ try {
+ dpm.setActiveAdmin(adminNoPerm, /* replace =*/ false);
+ fail();
+ } catch (IllegalArgumentException expected) {
+ assertTrue(expected.getMessage().contains(permission.BIND_DEVICE_ADMIN));
+ }
+ assertFalse(dpm.isAdminActive(adminNoPerm));
+
+ // Change the target API level to MNC. Now it can be set as DA.
+ setUpPackageManagerForAdmin(adminNoPerm, DpmMockContext.CALLER_UID, null,
+ VERSION_CODES.M);
+ dpm.setActiveAdmin(adminNoPerm, /* replace =*/ false);
+ assertTrue(dpm.isAdminActive(adminNoPerm));
+
+ // TODO Test the "load from the file" case where DA will still be loaded even without
+ // BIND_DEVICE_ADMIN and target API is N.
+ }
+
+ /**
+ * Test for:
* {@link DevicePolicyManager#removeActiveAdmin}
*/
public void testRemoveActiveAdmin_SecurityException() {
@@ -461,6 +492,7 @@
*/
public void testSetDeviceOwner() throws Exception {
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
@@ -470,12 +502,29 @@
// Make sure admin1 is installed on system user.
setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID);
+ // Check various get APIs.
+ checkGetDeviceOwnerInfoApi(dpm, /* hasDeviceOwner =*/ false);
+
// DO needs to be an DA.
dpm.setActiveAdmin(admin1, /* replace =*/ false);
// Fire!
assertTrue(dpm.setDeviceOwner(admin1, "owner-name"));
+ // getDeviceOwnerComponent should return the admin1 component.
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnCallingUser());
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
+
+ // Check various get APIs.
+ checkGetDeviceOwnerInfoApi(dpm, /* hasDeviceOwner =*/ true);
+
+ // getDeviceOwnerComponent should *NOT* return the admin1 component for other users.
+ mContext.binder.callingUid = DpmMockContext.CALLER_UID;
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
+
+ mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
+
// Verify internal calls.
verify(mContext.iactivityManager, times(1)).updateDeviceOwner(
eq(admin1.getPackageName()));
@@ -488,7 +537,7 @@
MockUtils.checkIntentAction(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED),
MockUtils.checkUserHandle(UserHandle.USER_SYSTEM));
- assertEquals(admin1.getPackageName(), dpm.getDeviceOwner());
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
// Try to set a profile owner on the same user, which should fail.
setUpPackageManagerForAdmin(admin2, DpmMockContext.CALLER_SYSTEM_USER_UID);
@@ -505,11 +554,163 @@
// DPMS.getApplicationLabel() because Context.createPackageContextAsUser() is not mockable.
}
+ private void checkGetDeviceOwnerInfoApi(DevicePolicyManager dpm, boolean hasDeviceOwner) {
+ final int origCallingUser = mContext.binder.callingUid;
+ final List origPermissions = new ArrayList(mContext.callerPermissions);
+ mContext.callerPermissions.clear();
+
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
+
+ mContext.binder.callingUid = Process.SYSTEM_UID;
+
+ // TODO Test getDeviceOwnerName() too. To do so, we need to change
+ // DPMS.getApplicationLabel() because Context.createPackageContextAsUser() is not mockable.
+ if (hasDeviceOwner) {
+ assertTrue(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertTrue(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ assertTrue(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_SYSTEM, dpm.getDeviceOwnerUserId());
+ } else {
+ assertFalse(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertFalse(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ assertFalse(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_NULL, dpm.getDeviceOwnerUserId());
+ }
+
+ mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
+ if (hasDeviceOwner) {
+ assertTrue(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertTrue(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ assertTrue(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_SYSTEM, dpm.getDeviceOwnerUserId());
+ } else {
+ assertFalse(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertFalse(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ assertFalse(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_NULL, dpm.getDeviceOwnerUserId());
+ }
+
+ mContext.binder.callingUid = DpmMockContext.CALLER_UID;
+ // Still with MANAGE_USERS.
+ assertFalse(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertFalse(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ if (hasDeviceOwner) {
+ assertTrue(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_SYSTEM, dpm.getDeviceOwnerUserId());
+ } else {
+ assertFalse(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_NULL, dpm.getDeviceOwnerUserId());
+ }
+
+ mContext.binder.callingUid = Process.SYSTEM_UID;
+ mContext.callerPermissions.remove(permission.MANAGE_USERS);
+ // System can still call "OnAnyUser" without MANAGE_USERS.
+ if (hasDeviceOwner) {
+ assertTrue(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertTrue(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ assertTrue(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_SYSTEM, dpm.getDeviceOwnerUserId());
+ } else {
+ assertFalse(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertFalse(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ assertFalse(dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnAnyUser());
+ assertEquals(UserHandle.USER_NULL, dpm.getDeviceOwnerUserId());
+ }
+
+ mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
+ // Still no MANAGE_USERS.
+ if (hasDeviceOwner) {
+ assertTrue(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertTrue(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnCallingUser());
+ } else {
+ assertFalse(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertFalse(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+ }
+
+ try {
+ dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName());
+ fail();
+ } catch (SecurityException expected) {
+ }
+ try {
+ dpm.getDeviceOwnerComponentOnAnyUser();
+ fail();
+ } catch (SecurityException expected) {
+ }
+ try {
+ dpm.getDeviceOwnerUserId();
+ fail();
+ } catch (SecurityException expected) {
+ }
+ try {
+ dpm.getDeviceOwnerNameOnAnyUser();
+ fail();
+ } catch (SecurityException expected) {
+ }
+
+ mContext.binder.callingUid = DpmMockContext.CALLER_UID;
+ // Still no MANAGE_USERS.
+ assertFalse(dpm.isDeviceOwnerApp(admin1.getPackageName()));
+ assertFalse(dpm.isDeviceOwnerAppOnCallingUser(admin1.getPackageName()));
+ assertEquals(null, dpm.getDeviceOwnerComponentOnCallingUser());
+
+ try {
+ dpm.isDeviceOwnerAppOnAnyUser(admin1.getPackageName());
+ fail();
+ } catch (SecurityException expected) {
+ }
+ try {
+ dpm.getDeviceOwnerComponentOnAnyUser();
+ fail();
+ } catch (SecurityException expected) {
+ }
+ try {
+ dpm.getDeviceOwnerUserId();
+ fail();
+ } catch (SecurityException expected) {
+ }
+ try {
+ dpm.getDeviceOwnerNameOnAnyUser();
+ fail();
+ } catch (SecurityException expected) {
+ }
+
+ // Restore.
+ mContext.binder.callingUid = origCallingUser;
+ mContext.callerPermissions.addAll(origPermissions);
+ }
+
+
/**
* Test for: {@link DevicePolicyManager#setDeviceOwner} Package doesn't exist.
*/
public void testSetDeviceOwner_noSuchPackage() {
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
@@ -531,6 +732,7 @@
public void testClearDeviceOwner() throws Exception {
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
@@ -550,7 +752,7 @@
verify(mContext.iactivityManager, times(1)).updateDeviceOwner(
eq(admin1.getPackageName()));
- assertEquals(admin1.getPackageName(), dpm.getDeviceOwner());
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
// Set up other mocks.
when(mContext.userManager.getUserRestrictions()).thenReturn(new Bundle());
@@ -562,13 +764,14 @@
dpm.clearDeviceOwnerApp(admin1.getPackageName());
// Now DO shouldn't be set.
- assertNull(dpm.getDeviceOwner());
+ assertNull(dpm.getDeviceOwnerComponentOnAnyUser());
// TODO Check other calls.
}
public void testClearDeviceOwner_fromDifferentUser() throws Exception {
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
@@ -588,7 +791,7 @@
verify(mContext.iactivityManager, times(1)).updateDeviceOwner(
eq(admin1.getPackageName()));
- assertEquals(admin1.getPackageName(), dpm.getDeviceOwner());
+ assertEquals(admin1, dpm.getDeviceOwnerComponentOnAnyUser());
// Now call clear from the secondary user, which should throw.
mContext.binder.callingUid = DpmMockContext.CALLER_UID;
@@ -604,8 +807,8 @@
assertEquals("clearDeviceOwner can only be called by the device owner", e.getMessage());
}
- // Now DO shouldn't be set.
- assertNotNull(dpm.getDeviceOwner());
+ // DO shouldn't be removed.
+ assertTrue(dpm.isDeviceManaged());
}
public void testSetProfileOwner() throws Exception {
@@ -642,6 +845,7 @@
mMockContext.addUser(ANOTHER_USER_ID, 0); // Add one more user.
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
@@ -670,8 +874,7 @@
mContext.setUserRunning(DpmMockContext.CALLER_USER_HANDLE, true);
assertTrue(dpm.setDeviceOwner(admin2, "owner-name", DpmMockContext.CALLER_USER_HANDLE));
- // Make sure it's set.
- assertEquals(admin2, dpm.getDeviceOwnerComponent());
+ assertEquals(admin2, dpms.getDeviceOwnerComponent(/* callingUserOnly =*/ false));
// Then check getDeviceOwnerAdminLocked().
assertEquals(admin2, dpms.getDeviceOwnerAdminLocked().info.getComponent());
@@ -695,7 +898,7 @@
dpms.mOwners.writeDeviceOwner();
// Make sure the DO component name doesn't have a class name.
- assertEquals("", dpms.getDeviceOwner().getClassName());
+ assertEquals("", dpms.getDeviceOwnerComponent(/* callingUserOnly =*/ false).getClassName());
// Then create a new DPMS to have it load the settings from files.
when(mContext.userManager.getUserRestrictions(any(UserHandle.class)))
@@ -705,7 +908,7 @@
// Now the DO component name is a full name.
// *BUT* because both admin1 and admin2 belong to the same package, we think admin1 is the
// DO.
- assertEquals(admin1, dpms.getDeviceOwner());
+ assertEquals(admin1, dpms.getDeviceOwnerComponent(/* callingUserOnly =*/ false));
}
public void testSetGetApplicationRestriction() {
@@ -743,6 +946,7 @@
public void testSetUserRestriction_asDo() throws Exception {
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
+ mContext.callerPermissions.add(permission.MANAGE_USERS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
@@ -768,21 +972,42 @@
dpm.getUserRestrictions(admin1)
);
- dpm.addUserRestriction(admin1, UserManager.DISALLOW_SMS);
+ reset(mContext.userManagerInternal);
+
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_ADD_USER);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_ADD_USER)
+ );
+ reset(mContext.userManagerInternal);
+
dpm.addUserRestriction(admin1, UserManager.DISALLOW_OUTGOING_CALLS);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_OUTGOING_CALLS),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_ADD_USER)
+ );
+ reset(mContext.userManagerInternal);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
- UserManager.DISALLOW_SMS, UserManager.DISALLOW_OUTGOING_CALLS),
+ UserManager.DISALLOW_ADD_USER, UserManager.DISALLOW_OUTGOING_CALLS),
dpms.getDeviceOwnerAdminLocked().ensureUserRestrictions()
);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
- UserManager.DISALLOW_SMS, UserManager.DISALLOW_OUTGOING_CALLS),
+ UserManager.DISALLOW_ADD_USER, UserManager.DISALLOW_OUTGOING_CALLS),
dpm.getUserRestrictions(admin1)
);
- dpm.clearUserRestriction(admin1, UserManager.DISALLOW_SMS);
+ dpm.clearUserRestriction(admin1, UserManager.DISALLOW_ADD_USER);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_OUTGOING_CALLS),
+ MockUtils.checkUserRestrictions()
+ );
+ reset(mContext.userManagerInternal);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(UserManager.DISALLOW_OUTGOING_CALLS),
@@ -794,6 +1019,12 @@
);
dpm.clearUserRestriction(admin1, UserManager.DISALLOW_OUTGOING_CALLS);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(),
+ MockUtils.checkUserRestrictions()
+ );
+ reset(mContext.userManagerInternal);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(),
@@ -804,7 +1035,68 @@
dpm.getUserRestrictions(admin1)
);
- // TODO Check inner calls.
+ // DISALLOW_ADJUST_VOLUME and DISALLOW_UNMUTE_MICROPHONE are PO restrictions, but when
+ // DO sets them, the scope is global.
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_ADJUST_VOLUME);
+ reset(mContext.userManagerInternal);
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_UNMUTE_MICROPHONE);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_ADJUST_VOLUME,
+ UserManager.DISALLOW_UNMUTE_MICROPHONE)
+ );
+ reset(mContext.userManagerInternal);
+
+ dpm.clearUserRestriction(admin1, UserManager.DISALLOW_ADJUST_VOLUME);
+ dpm.clearUserRestriction(admin1, UserManager.DISALLOW_UNMUTE_MICROPHONE);
+
+
+ // More tests.
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_ADD_USER);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_ADD_USER)
+ );
+ reset(mContext.userManagerInternal);
+
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_FUN);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ MockUtils.checkUserRestrictions(),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_FUN,
+ UserManager.DISALLOW_ADD_USER)
+ );
+ reset(mContext.userManagerInternal);
+
+ dpm.setCameraDisabled(admin1, true);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ // DISALLOW_CAMERA will be applied to both local and global.
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_CAMERA),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_FUN,
+ UserManager.DISALLOW_CAMERA, UserManager.DISALLOW_ADD_USER)
+ );
+ reset(mContext.userManagerInternal);
+
+ // Set up another DA and let it disable camera. Now DISALLOW_CAMERA will only be applied
+ // locally.
+ dpm.setCameraDisabled(admin1, false);
+ reset(mContext.userManagerInternal);
+
+ setUpPackageManagerForAdmin(admin2, DpmMockContext.CALLER_SYSTEM_USER_UID);
+ dpm.setActiveAdmin(admin2, /* replace =*/ false, UserHandle.USER_SYSTEM);
+ dpm.setCameraDisabled(admin2, true);
+
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(UserHandle.USER_SYSTEM),
+ // DISALLOW_CAMERA will be applied to both local and global.
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_CAMERA),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_FUN,
+ UserManager.DISALLOW_ADD_USER)
+ );
+ reset(mContext.userManagerInternal);
// TODO Make sure restrictions are written to the file.
}
@@ -818,7 +1110,21 @@
);
dpm.addUserRestriction(admin1, UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(DpmMockContext.CALLER_USER_HANDLE),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES),
+ isNull(Bundle.class)
+ );
+ reset(mContext.userManagerInternal);
+
dpm.addUserRestriction(admin1, UserManager.DISALLOW_OUTGOING_CALLS);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(DpmMockContext.CALLER_USER_HANDLE),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
+ UserManager.DISALLOW_OUTGOING_CALLS),
+ isNull(Bundle.class)
+ );
+ reset(mContext.userManagerInternal);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
@@ -837,7 +1143,12 @@
);
dpm.clearUserRestriction(admin1, UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
-
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(DpmMockContext.CALLER_USER_HANDLE),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_OUTGOING_CALLS),
+ isNull(Bundle.class)
+ );
+ reset(mContext.userManagerInternal);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(
@@ -854,6 +1165,12 @@
);
dpm.clearUserRestriction(admin1, UserManager.DISALLOW_OUTGOING_CALLS);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(DpmMockContext.CALLER_USER_HANDLE),
+ MockUtils.checkUserRestrictions(),
+ isNull(Bundle.class)
+ );
+ reset(mContext.userManagerInternal);
DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions(),
@@ -865,69 +1182,89 @@
dpm.getUserRestrictions(admin1)
);
- // TODO Check inner calls.
+ // DISALLOW_ADJUST_VOLUME and DISALLOW_UNMUTE_MICROPHONE can be set by PO too, even
+ // though when DO sets them they'll be applied globally.
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_ADJUST_VOLUME);
+ reset(mContext.userManagerInternal);
+ dpm.addUserRestriction(admin1, UserManager.DISALLOW_UNMUTE_MICROPHONE);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(DpmMockContext.CALLER_USER_HANDLE),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_ADJUST_VOLUME,
+ UserManager.DISALLOW_UNMUTE_MICROPHONE),
+ isNull(Bundle.class)
+ );
+ reset(mContext.userManagerInternal);
+
+ dpm.setCameraDisabled(admin1, true);
+ verify(mContext.userManagerInternal).setDevicePolicyUserRestrictions(
+ eq(DpmMockContext.CALLER_USER_HANDLE),
+ MockUtils.checkUserRestrictions(UserManager.DISALLOW_CAMERA,
+ UserManager.DISALLOW_ADJUST_VOLUME,
+ UserManager.DISALLOW_UNMUTE_MICROPHONE),
+ isNull(Bundle.class)
+ );
+ reset(mContext.userManagerInternal);
+
// TODO Make sure restrictions are written to the file.
}
- public void testGetComposedUserRestrictions_noDoNoPo() throws Exception {
- final Bundle in = DpmTestUtils.newRestrictions(UserManager.DISALLOW_OUTGOING_CALLS);
-
- Bundle actual = dpms.mLocalService.getComposedUserRestrictions(
- UserHandle.USER_SYSTEM, in);
- assertTrue(in == actual);
-
- actual = dpms.mLocalService.getComposedUserRestrictions(
- DpmMockContext.CALLER_USER_HANDLE, in);
- assertTrue(in == actual);
- }
-
- public void testGetComposedUserRestrictions() throws Exception {
+ public void testGetMacAddress() throws Exception {
mContext.callerPermissions.add(permission.MANAGE_DEVICE_ADMINS);
mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS_FULL);
- // First, set DO.
-
- // Call from a process on the system user.
+ // In this test, change the caller user to "system".
mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
// Make sure admin1 is installed on system user.
setUpPackageManagerForAdmin(admin1, DpmMockContext.CALLER_SYSTEM_USER_UID);
- // Call.
- dpm.setActiveAdmin(admin1, /* replace =*/ false, UserHandle.USER_SYSTEM);
- assertTrue(dpm.setDeviceOwner(admin1, "owner-name",
- UserHandle.USER_SYSTEM));
+ // Test 1. Caller doesn't have DO or DA.
+ try {
+ dpm.getWifiMacAddress();
+ fail();
+ } catch (SecurityException e) {
+ MoreAsserts.assertContainsRegex("No active admin owned", e.getMessage());
+ }
- dpm.addUserRestriction(admin1, "rest1");
- dpm.addUserRestriction(admin1, "rest2");
+ // DO needs to be an DA.
+ dpm.setActiveAdmin(admin1, /* replace =*/ false);
+ assertTrue(dpm.isAdminActive(admin1));
- // Set PO on CALLER_USER_HANDLE.
- mContext.binder.callingUid = DpmMockContext.CALLER_UID;
+ // Test 2. Caller has DA, but not DO.
+ try {
+ dpm.getWifiMacAddress();
+ fail();
+ } catch (SecurityException e) {
+ MoreAsserts.assertContainsRegex("No active admin owned", e.getMessage());
+ }
- setAsProfileOwner(admin2);
+ // Test 3. Caller has PO, but not DO.
+ assertTrue(dpm.setProfileOwner(admin1, null, UserHandle.USER_SYSTEM));
+ try {
+ dpm.getWifiMacAddress();
+ fail();
+ } catch (SecurityException e) {
+ MoreAsserts.assertContainsRegex("No active admin owned", e.getMessage());
+ }
- dpm.addUserRestriction(admin2, "restA");
- dpm.addUserRestriction(admin2, "restB");
+ // Remove PO.
+ dpm.clearProfileOwner(admin1);
- final Bundle in = DpmTestUtils.newRestrictions("abc");
+ // Test 4, Caller is DO now.
+ assertTrue(dpm.setDeviceOwner(admin1, null, UserHandle.USER_SYSTEM));
- Bundle actual = dpms.mLocalService.getComposedUserRestrictions(
- UserHandle.USER_SYSTEM, in);
- DpmTestUtils.assertRestrictions(
- DpmTestUtils.newRestrictions("abc", "rest1", "rest2"),
- actual);
+ // 4-1. But no WifiInfo.
+ assertNull(dpm.getWifiMacAddress());
- actual = dpms.mLocalService.getComposedUserRestrictions(
- DpmMockContext.CALLER_USER_HANDLE, in);
- DpmTestUtils.assertRestrictions(
- DpmTestUtils.newRestrictions("abc", "rest1", "rest2", "restA", "restB"),
- actual);
+ // 4-2. Returns WifiInfo, but with the default MAC.
+ when(mContext.wifiManager.getConnectionInfo()).thenReturn(new WifiInfo());
+ assertNull(dpm.getWifiMacAddress());
- actual = dpms.mLocalService.getComposedUserRestrictions(
- DpmMockContext.CALLER_USER_HANDLE + 1, in);
- DpmTestUtils.assertRestrictions(
- DpmTestUtils.newRestrictions("abc", "rest1", "rest2"),
- actual);
+ // 4-3. With a real MAC address.
+ final WifiInfo wi = new WifiInfo();
+ wi.setMacAddress("11:22:33:44:55:66");
+ when(mContext.wifiManager.getConnectionInfo()).thenReturn(wi);
+ assertEquals("11:22:33:44:55:66", dpm.getWifiMacAddress());
}
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
index cc337b0..66d701d 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
@@ -28,8 +28,10 @@
import android.content.IntentFilter;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
+import android.content.pm.PackageManagerInternal;
import android.content.pm.UserInfo;
import android.media.IAudioService;
+import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.PowerManager.WakeLock;
@@ -205,6 +207,7 @@
public final SystemPropertiesForMock systemProperties;
public final UserManager userManager;
public final UserManagerInternal userManagerInternal;
+ public final PackageManagerInternal packageManagerInternal;
public final UserManagerForMock userManagerForMock;
public final PowerManagerForMock powerManager;
public final PowerManagerInternal powerManagerInternal;
@@ -215,6 +218,7 @@
public final IBackupManager ibackupManager;
public final IAudioService iaudioService;
public final LockPatternUtils lockPatternUtils;
+ public final WifiManager wifiManager;
public final SettingsForMock settings;
public final MockContentResolver contentResolver;
@@ -237,6 +241,7 @@
userManager = mock(UserManager.class);
userManagerInternal = mock(UserManagerInternal.class);
userManagerForMock = mock(UserManagerForMock.class);
+ packageManagerInternal = mock(PackageManagerInternal.class);
powerManager = mock(PowerManagerForMock.class);
powerManagerInternal = mock(PowerManagerInternal.class);
notificationManager = mock(NotificationManager.class);
@@ -246,6 +251,7 @@
ibackupManager = mock(IBackupManager.class);
iaudioService = mock(IAudioService.class);
lockPatternUtils = mock(LockPatternUtils.class);
+ wifiManager = mock(WifiManager.class);
settings = mock(SettingsForMock.class);
// Package manager is huge, so we use a partial mock instead.
@@ -260,9 +266,6 @@
// System user is always running.
setUserRunning(UserHandle.USER_SYSTEM, true);
-
- // This method must return an object.
- when(userManagerInternal.getUserRestrictionsLock()).thenReturn(new Object());
}
public File addUser(int userId, int flags) {
@@ -303,6 +306,8 @@
return userManager;
case Context.POWER_SERVICE:
return powerManager;
+ case Context.WIFI_SERVICE:
+ return wifiManager;
}
throw new UnsupportedOperationException();
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java
index e11f3fb..5b33e4d 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java
@@ -43,6 +43,7 @@
public ComponentName admin1;
public ComponentName admin2;
public ComponentName admin3;
+ public ComponentName adminNoPerm;
@Override
protected void setUp() throws Exception {
@@ -56,6 +57,7 @@
admin1 = new ComponentName(mRealTestContext, DummyDeviceAdmins.Admin1.class);
admin2 = new ComponentName(mRealTestContext, DummyDeviceAdmins.Admin2.class);
admin3 = new ComponentName(mRealTestContext, DummyDeviceAdmins.Admin3.class);
+ adminNoPerm = new ComponentName(mRealTestContext, DummyDeviceAdmins.AdminNoPerm.class);
}
@Override
@@ -67,11 +69,36 @@
protected void setUpPackageManagerForAdmin(ComponentName admin, int packageUid)
throws Exception {
setUpPackageManagerForAdmin(admin, packageUid,
- PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED);
+ /* enabledSetting =*/ null, /* appTargetSdk = */ null);
}
protected void setUpPackageManagerForAdmin(ComponentName admin, int packageUid,
int enabledSetting) throws Exception {
+ setUpPackageManagerForAdmin(admin, packageUid, enabledSetting, /* appTargetSdk = */ null);
+ }
+
+ protected void setUpPackageManagerForAdmin(ComponentName admin, int packageUid,
+ Integer enabledSetting, Integer appTargetSdk) throws Exception {
+
+ // Set up getApplicationInfo().
+
+ final ApplicationInfo ai = DpmTestUtils.cloneParcelable(
+ mRealTestContext.getPackageManager().getApplicationInfo(
+ admin.getPackageName(),
+ PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS));
+
+ ai.enabledSetting = enabledSetting == null
+ ? PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
+ : enabledSetting;
+ if (appTargetSdk != null) {
+ ai.targetSdkVersion = appTargetSdk;
+ }
+ ai.uid = packageUid;
+
+ doReturn(ai).when(mMockContext.ipackageManager).getApplicationInfo(
+ eq(admin.getPackageName()),
+ eq(PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS),
+ eq(UserHandle.getUserId(packageUid)));
// Set up queryBroadcastReceivers().
@@ -88,7 +115,7 @@
realResolveInfo.set(0, DpmTestUtils.cloneParcelable(realResolveInfo.get(0)));
// We need to rewrite the UID in the activity info.
- realResolveInfo.get(0).activityInfo.applicationInfo.uid = packageUid;
+ realResolveInfo.get(0).activityInfo.applicationInfo = ai;
doReturn(realResolveInfo).when(mMockContext.packageManager).queryBroadcastReceivers(
MockUtils.checkIntentComponent(admin),
@@ -96,21 +123,6 @@
| PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS),
eq(UserHandle.getUserId(packageUid)));
- // Set up getApplicationInfo().
-
- final ApplicationInfo ai = DpmTestUtils.cloneParcelable(
- mRealTestContext.getPackageManager().getApplicationInfo(
- admin.getPackageName(),
- PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS));
-
- ai.enabledSetting = enabledSetting;
- ai.uid = packageUid;
-
- doReturn(ai).when(mMockContext.ipackageManager).getApplicationInfo(
- eq(admin.getPackageName()),
- eq(PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS),
- eq(UserHandle.getUserId(packageUid)));
-
// Set up getPackageInfo().
final PackageInfo pi = DpmTestUtils.cloneParcelable(
@@ -118,7 +130,7 @@
admin.getPackageName(), 0));
assertTrue(pi.applicationInfo.flags != 0);
- pi.applicationInfo.uid = packageUid;
+ pi.applicationInfo = ai;
doReturn(pi).when(mMockContext.ipackageManager).getPackageInfo(
eq(admin.getPackageName()),
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DummyDeviceAdmins.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DummyDeviceAdmins.java
index 08293a2..a0f4d97 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DummyDeviceAdmins.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DummyDeviceAdmins.java
@@ -24,4 +24,6 @@
}
public static class Admin3 extends DeviceAdminReceiver {
}
+ public static class AdminNoPerm extends DeviceAdminReceiver {
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java b/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java
index 5008fbf..58db192 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java
@@ -17,8 +17,12 @@
import com.google.common.base.Objects;
+import com.android.internal.util.Preconditions;
+import com.android.server.pm.UserRestrictionsUtils;
+
import android.content.ComponentName;
import android.content.Intent;
+import android.os.Bundle;
import android.os.UserHandle;
import org.hamcrest.BaseMatcher;
@@ -77,4 +81,37 @@
};
return Mockito.argThat(m);
}
+
+ public static Bundle checkUserRestrictions(String... keys) {
+ final Bundle expected = DpmTestUtils.newRestrictions(Preconditions.checkNotNull(keys));
+ final Matcher<Bundle> m = new BaseMatcher<Bundle>() {
+ @Override
+ public boolean matches(Object item) {
+ if (item == null) return false;
+ return UserRestrictionsUtils.areEqual((Bundle) item, expected);
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("User restrictions=" + getRestrictionsAsString(expected));
+ }
+ };
+ return Mockito.argThat(m);
+ }
+
+ private static String getRestrictionsAsString(Bundle b) {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("[");
+
+ if (b != null) {
+ String sep = "";
+ for (String key : b.keySet()) {
+ sb.append(sep);
+ sep = ",";
+ sb.append(key);
+ }
+ }
+ sb.append("]");
+ return sb.toString();
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java
index 4e11762..423c4d5 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java
@@ -19,21 +19,7 @@
import com.android.server.devicepolicy.DevicePolicyManagerServiceTestable.OwnersTestable;
import android.content.ComponentName;
-import android.content.pm.UserInfo;
import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.Log;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-
-import static org.mockito.Mockito.when;
/**
* Tests for the DeviceOwner object that saves & loads device and policy owner information.
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index 66c7dbb..b4bca3e 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -31,7 +31,8 @@
/** Test {@link UserManager} functionality. */
public class UserManagerTest extends AndroidTestCase {
-
+ private static final int REMOVE_CHECK_INTERVAL = 500;
+ private static final int REMOVE_TIMEOUT = 60 * 1000;
private UserManager mUserManager = null;
private final Object mUserLock = new Object();
private List<Integer> usersToRemove;
@@ -227,10 +228,16 @@
private void removeUser(int userId) {
synchronized (mUserLock) {
mUserManager.removeUser(userId);
+ long time = System.currentTimeMillis();
while (mUserManager.getUserInfo(userId) != null) {
try {
- mUserLock.wait(500);
+ mUserLock.wait(REMOVE_CHECK_INTERVAL);
} catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ return;
+ }
+ if (System.currentTimeMillis() - time > REMOVE_TIMEOUT) {
+ fail("Timeout waiting for removeUser. userId = " + userId);
}
}
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java b/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java
new file mode 100644
index 0000000..5542a4f
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2015 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.server.pm;
+
+import com.android.server.devicepolicy.DpmTestUtils;
+
+import android.os.Bundle;
+import android.os.UserManager;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+
+/**
+ * Tests for {@link com.android.server.pm.UserRestrictionsUtils}.
+ *
+ * <p>Run with:<pre>
+ m FrameworksServicesTests &&
+ adb install \
+ -r out/target/product/hammerhead/data/app/FrameworksServicesTests/FrameworksServicesTests.apk &&
+ adb shell am instrument -e class com.android.server.pm.UserRestrictionsUtilsTest \
+ -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
+ * </pre>
+ */
+public class UserRestrictionsUtilsTest extends AndroidTestCase {
+ public void testNonNull() {
+ Bundle out = UserRestrictionsUtils.nonNull(null);
+ assertNotNull(out);
+ out.putBoolean("a", true); // Should not be Bundle.EMPTY.
+
+ Bundle in = new Bundle();
+ assertSame(in, UserRestrictionsUtils.nonNull(in));
+ }
+
+ public void testIsEmpty() {
+ assertTrue(UserRestrictionsUtils.isEmpty(null));
+ assertTrue(UserRestrictionsUtils.isEmpty(new Bundle()));
+ assertFalse(UserRestrictionsUtils.isEmpty(DpmTestUtils.newRestrictions("a")));
+ }
+
+ public void testClone() {
+ Bundle in = new Bundle();
+ Bundle out = UserRestrictionsUtils.clone(in);
+ assertNotSame(in, out);
+ DpmTestUtils.assertRestrictions(out, new Bundle());
+
+ out = UserRestrictionsUtils.clone(null);
+ assertNotNull(out);
+ out.putBoolean("a", true); // Should not be Bundle.EMPTY.
+ }
+
+ public void testMerge() {
+ Bundle a = DpmTestUtils.newRestrictions("a", "d");
+ Bundle b = DpmTestUtils.newRestrictions("b", "d", "e");
+
+ UserRestrictionsUtils.merge(a, b);
+
+ DpmTestUtils.assertRestrictions(DpmTestUtils.newRestrictions("a", "b", "d", "e"), a);
+
+ UserRestrictionsUtils.merge(a, null);
+
+ DpmTestUtils.assertRestrictions(DpmTestUtils.newRestrictions("a", "b", "d", "e"), a);
+
+ try {
+ UserRestrictionsUtils.merge(a, a);
+ fail();
+ } catch (IllegalArgumentException expected) {
+ }
+ }
+
+ public void testCanDeviceOwnerChange() {
+ assertFalse(UserRestrictionsUtils.canDeviceOwnerChange(UserManager.DISALLOW_RECORD_AUDIO));
+ assertFalse(UserRestrictionsUtils.canDeviceOwnerChange(UserManager.DISALLOW_WALLPAPER));
+ assertTrue(UserRestrictionsUtils.canDeviceOwnerChange(UserManager.DISALLOW_ADD_USER));
+ }
+
+ public void testCanProfileOwnerChange() {
+ assertFalse(UserRestrictionsUtils.canProfileOwnerChange(UserManager.DISALLOW_RECORD_AUDIO));
+ assertFalse(UserRestrictionsUtils.canProfileOwnerChange(UserManager.DISALLOW_WALLPAPER));
+ assertFalse(UserRestrictionsUtils.canProfileOwnerChange(UserManager.DISALLOW_ADD_USER));
+ assertTrue(UserRestrictionsUtils.canProfileOwnerChange(UserManager.DISALLOW_ADJUST_VOLUME));
+ }
+
+ public void testSortToGlobalAndLocal() {
+ final Bundle local = new Bundle();
+ final Bundle global = new Bundle();
+
+ UserRestrictionsUtils.sortToGlobalAndLocal(null, global, local);
+ assertEquals(0, global.size());
+ assertEquals(0, local.size());
+
+ UserRestrictionsUtils.sortToGlobalAndLocal(Bundle.EMPTY, global, local);
+ assertEquals(0, global.size());
+ assertEquals(0, local.size());
+
+ UserRestrictionsUtils.sortToGlobalAndLocal(DpmTestUtils.newRestrictions(
+ UserManager.DISALLOW_ADJUST_VOLUME,
+ UserManager.DISALLOW_UNMUTE_MICROPHONE,
+ UserManager.DISALLOW_USB_FILE_TRANSFER,
+ UserManager.DISALLOW_CONFIG_TETHERING,
+ UserManager.DISALLOW_OUTGOING_BEAM,
+ UserManager.DISALLOW_APPS_CONTROL
+ ), global, local);
+
+
+ DpmTestUtils.assertRestrictions(DpmTestUtils.newRestrictions(
+ // These can be set by PO too, but when DO sets them, they're global.
+ UserManager.DISALLOW_ADJUST_VOLUME,
+ UserManager.DISALLOW_UNMUTE_MICROPHONE,
+
+ // These can only be set by DO.
+ UserManager.DISALLOW_USB_FILE_TRANSFER,
+ UserManager.DISALLOW_CONFIG_TETHERING
+ ), global);
+
+ DpmTestUtils.assertRestrictions(DpmTestUtils.newRestrictions(
+ // They can be set by both DO/PO.
+ UserManager.DISALLOW_OUTGOING_BEAM,
+ UserManager.DISALLOW_APPS_CONTROL
+ ), local);
+ }
+
+ public void testAreEqual() {
+ assertTrue(UserRestrictionsUtils.areEqual(
+ null,
+ null));
+
+ assertTrue(UserRestrictionsUtils.areEqual(
+ null,
+ Bundle.EMPTY));
+
+ assertTrue(UserRestrictionsUtils.areEqual(
+ Bundle.EMPTY,
+ null));
+
+ assertTrue(UserRestrictionsUtils.areEqual(
+ Bundle.EMPTY,
+ Bundle.EMPTY));
+
+ assertTrue(UserRestrictionsUtils.areEqual(
+ new Bundle(),
+ Bundle.EMPTY));
+
+ assertFalse(UserRestrictionsUtils.areEqual(
+ null,
+ DpmTestUtils.newRestrictions("a")));
+
+ assertFalse(UserRestrictionsUtils.areEqual(
+ DpmTestUtils.newRestrictions("a"),
+ null));
+
+ assertTrue(UserRestrictionsUtils.areEqual(
+ DpmTestUtils.newRestrictions("a"),
+ DpmTestUtils.newRestrictions("a")));
+
+ assertFalse(UserRestrictionsUtils.areEqual(
+ DpmTestUtils.newRestrictions("a"),
+ DpmTestUtils.newRestrictions("a", "b")));
+
+ assertFalse(UserRestrictionsUtils.areEqual(
+ DpmTestUtils.newRestrictions("a", "b"),
+ DpmTestUtils.newRestrictions("a")));
+
+ assertFalse(UserRestrictionsUtils.areEqual(
+ DpmTestUtils.newRestrictions("b", "a"),
+ DpmTestUtils.newRestrictions("a", "a")));
+
+ // Make sure false restrictions are handled correctly.
+ final Bundle a = DpmTestUtils.newRestrictions("a");
+ a.putBoolean("b", true);
+
+ final Bundle b = DpmTestUtils.newRestrictions("a");
+ b.putBoolean("b", false);
+
+ assertFalse(UserRestrictionsUtils.areEqual(a, b));
+ assertFalse(UserRestrictionsUtils.areEqual(b, a));
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java b/services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java
index b6742a1..d798518 100644
--- a/services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java
+++ b/services/tests/servicestests/src/com/android/server/updates/CertPinInstallReceiverTest.java
@@ -16,6 +16,8 @@
package com.android.server.updates;
+import com.android.internal.util.HexDump;
+
import android.content.Context;
import android.content.Intent;
import android.test.AndroidTestCase;
@@ -128,7 +130,7 @@
MessageDigest dgst = MessageDigest.getInstance("SHA512");
byte[] encoded = content.getBytes();
byte[] fingerprint = dgst.digest(encoded);
- return IntegralToString.bytesToHexString(fingerprint, false);
+ return HexDump.toHexString(fingerprint, false);
}
private static String getHashOfCurrentContent() throws Exception {
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index e0f95cf..c734fab 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -772,7 +772,8 @@
}
private void updateUsbNotification() {
- if (mNotificationManager == null || !mUseUsbNotification) return;
+ if (mNotificationManager == null || !mUseUsbNotification
+ || ("0".equals(SystemProperties.get("persist.charging.notify")))) return;
int id = 0;
Resources r = mContext.getResources();
if (mConnected || mHostConnected) {
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index f396c2d..8fee91f 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -362,7 +362,6 @@
}
} catch (PackageManager.NameNotFoundException e) {
Slog.w(TAG, "Failure looking up interaction service " + comp);
- } catch (RemoteException e) {
}
}
}
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
index 30296e1..109d214 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
@@ -116,7 +116,7 @@
VoiceInteractionServiceInfo info;
try {
info = new VoiceInteractionServiceInfo(context.getPackageManager(), service, mUser);
- } catch (RemoteException|PackageManager.NameNotFoundException e) {
+ } catch (PackageManager.NameNotFoundException e) {
Slog.w(TAG, "Voice interaction service not found: " + service, e);
mInfo = null;
mSessionComponentName = null;
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 4115756..17bd08c 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -1805,6 +1805,13 @@
public void onReject(String replyMessage) {}
/**
+ * Notifies the Connection of a request to silence the ringer.
+ *
+ * @hide
+ */
+ public void onSilence() {}
+
+ /**
* Notifies this Connection whether the user wishes to proceed with the post-dial DTMF codes.
*/
public void onPostDialContinue(boolean proceed) {}
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 6223495..b4a7ce0 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -102,6 +102,7 @@
private static final int MSG_MERGE_CONFERENCE = 18;
private static final int MSG_SWAP_CONFERENCE = 19;
private static final int MSG_REJECT_WITH_MESSAGE = 20;
+ private static final int MSG_SILENCE = 21;
private static Connection sNullConnection;
@@ -177,6 +178,11 @@
}
@Override
+ public void silence(String callId) {
+ mHandler.obtainMessage(MSG_SILENCE, callId).sendToTarget();
+ }
+
+ @Override
public void disconnect(String callId) {
mHandler.obtainMessage(MSG_DISCONNECT, callId).sendToTarget();
}
@@ -319,6 +325,9 @@
case MSG_DISCONNECT:
disconnect((String) msg.obj);
break;
+ case MSG_SILENCE:
+ silence((String) msg.obj);
+ break;
case MSG_HOLD:
hold((String) msg.obj);
break;
@@ -708,6 +717,11 @@
findConnectionForAction(callId, "reject").onReject(rejectWithMessage);
}
+ private void silence(String callId) {
+ Log.d(this, "silence %s", callId);
+ findConnectionForAction(callId, "silence").onSilence();
+ }
+
private void disconnect(String callId) {
Log.d(this, "disconnect %s", callId);
if (mConnectionById.containsKey(callId)) {
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 8b347cc..b5b4e5f 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1051,7 +1051,9 @@
* If there is a ringing incoming call, this method accepts the call on behalf of the user.
* TODO: L-release - need to convert all invocation of ITelecmmService#answerRingingCall to use
* this method (clockwork & gearhead).
- *
+ * If the incoming call is a video call, the call will be answered with the same video state as
+ * the incoming call requests. This means, for example, that an incoming call requesting
+ * {@link VideoProfile#STATE_BIDIRECTIONAL} will be answered, accepting that state.
* @hide
*/
@SystemApi
@@ -1066,6 +1068,24 @@
}
/**
+ * If there is a ringing incoming call, this method accepts the call on behalf of the user,
+ * with the specified video state.
+ *
+ * @param videoState The desired video state to answer the call with.
+ * @hide
+ */
+ @SystemApi
+ public void acceptRingingCall(int videoState) {
+ try {
+ if (isServiceConnected()) {
+ getTelecomService().acceptRingingCallWithVideoState(videoState);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error calling ITelecomService#acceptRingingCallWithVideoState", e);
+ }
+ }
+
+ /**
* Silences the ringer if a ringing call exists.
*
* Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE}
diff --git a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
index dd253cf..8a54add 100644
--- a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
+++ b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl
@@ -54,6 +54,8 @@
void disconnect(String callId);
+ void silence(String callId);
+
void hold(String callId);
void unhold(String callId);
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index 2e07759..856e210 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -178,6 +178,11 @@
void acceptRingingCall();
/**
+ * @see TelecomServiceImpl#acceptRingingCallWithVideoState(int)
+ */
+ void acceptRingingCallWithVideoState(int videoState);
+
+ /**
* @see TelecomServiceImpl#cancelMissedCallsNotification
*/
void cancelMissedCallsNotification(String callingPackage);
diff --git a/telephony/java/android/telephony/CellLocation.java b/telephony/java/android/telephony/CellLocation.java
index f9a222f..5bcaa6e 100644
--- a/telephony/java/android/telephony/CellLocation.java
+++ b/telephony/java/android/telephony/CellLocation.java
@@ -81,6 +81,12 @@
public abstract boolean isEmpty();
/**
+ * Invalidate this object. The location area code and the cell id are set to -1.
+ * @hide
+ */
+ public abstract void setStateInvalid();
+
+ /**
* Return a new CellLocation object representing an unknown
* location, or null for unknown/none phone radio types.
*
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 32b7383..36407e1 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -75,7 +75,7 @@
/**
* Indicates the caller wants the default phone id.
- * Used in SubscriptionController and PhoneBase but do we really need it???
+ * Used in SubscriptionController and Phone but do we really need it???
* @hide
*/
public static final int DEFAULT_PHONE_INDEX = Integer.MAX_VALUE;
diff --git a/telephony/java/android/telephony/cdma/CdmaCellLocation.java b/telephony/java/android/telephony/cdma/CdmaCellLocation.java
index 6cfae6a..7c10569 100644
--- a/telephony/java/android/telephony/cdma/CdmaCellLocation.java
+++ b/telephony/java/android/telephony/cdma/CdmaCellLocation.java
@@ -123,6 +123,7 @@
/**
* Invalidate this object. The cell location data is set to invalid values.
*/
+ @Override
public void setStateInvalid() {
this.mBaseStationId = -1;
this.mBaseStationLatitude = INVALID_LAT_LONG;
@@ -134,7 +135,7 @@
/**
* Set the cell location data.
*/
- public void setCellLocationData(int baseStationId, int baseStationLatitude,
+ public void setCellLocationData(int baseStationId, int baseStationLatitude,
int baseStationLongitude) {
// The following values have to be written in the correct sequence
this.mBaseStationId = baseStationId;
diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java
index a3889b2..1717802 100644
--- a/telephony/java/android/telephony/gsm/GsmCellLocation.java
+++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java
@@ -72,6 +72,7 @@
/**
* Invalidate this object. The location area code and the cell id are set to -1.
*/
+ @Override
public void setStateInvalid() {
mLac = -1;
mCid = -1;
diff --git a/telephony/java/com/android/internal/telephony/GsmAlphabet.java b/telephony/java/com/android/internal/telephony/GsmAlphabet.java
index ef39a6c..4785169 100644
--- a/telephony/java/com/android/internal/telephony/GsmAlphabet.java
+++ b/telephony/java/com/android/internal/telephony/GsmAlphabet.java
@@ -1012,7 +1012,7 @@
*
* @param tables the new list of enabled single shift tables
*/
- static synchronized void setEnabledSingleShiftTables(int[] tables) {
+ public static synchronized void setEnabledSingleShiftTables(int[] tables) {
sEnabledSingleShiftTables = tables;
sDisableCountryEncodingCheck = true;
@@ -1030,7 +1030,7 @@
*
* @param tables the new list of enabled locking shift tables
*/
- static synchronized void setEnabledLockingShiftTables(int[] tables) {
+ public static synchronized void setEnabledLockingShiftTables(int[] tables) {
sEnabledLockingShiftTables = tables;
sDisableCountryEncodingCheck = true;
}
@@ -1042,7 +1042,7 @@
*
* @return the list of enabled single shift tables
*/
- static synchronized int[] getEnabledSingleShiftTables() {
+ public static synchronized int[] getEnabledSingleShiftTables() {
return sEnabledSingleShiftTables;
}
@@ -1053,7 +1053,7 @@
*
* @return the list of enabled locking shift tables
*/
- static synchronized int[] getEnabledLockingShiftTables() {
+ public static synchronized int[] getEnabledLockingShiftTables() {
return sEnabledLockingShiftTables;
}
diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java
index 572cc6f..a183de5 100644
--- a/telephony/java/com/android/internal/telephony/PhoneConstants.java
+++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java
@@ -59,6 +59,9 @@
public static final int PHONE_TYPE_SIP = RILConstants.SIP_PHONE;
public static final int PHONE_TYPE_THIRD_PARTY = RILConstants.THIRD_PARTY_PHONE;
public static final int PHONE_TYPE_IMS = RILConstants.IMS_PHONE;
+ // Currently this is used only to differentiate CDMA and CDMALTE Phone in GsmCdma* files. For
+ // anything outside of that, a cdma + lte phone is still CDMA_PHONE
+ public static final int PHONE_TYPE_CDMA_LTE = RILConstants.CDMA_LTE_PHONE;
// Modes for LTE_ON_CDMA
public static final int LTE_ON_CDMA_UNKNOWN = RILConstants.LTE_ON_CDMA_UNKNOWN;
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 7088be8..3c4c04b 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -118,6 +118,7 @@
int SIP_PHONE = 3;
int THIRD_PARTY_PHONE = 4;
int IMS_PHONE = 5;
+ int CDMA_LTE_PHONE = 6;
int LTE_ON_CDMA_UNKNOWN = -1;
int LTE_ON_CDMA_FALSE = 0;
diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index b12795c..68bde35 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -20,7 +20,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := core-libart core-junit framework
+LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit framework
LOCAL_STATIC_JAVA_LIBRARIES := junit-runner
LOCAL_MODULE:= android.test.runner
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 4821678..c967c2b 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -147,6 +147,11 @@
}
@Override
+ public SharedPreferences getSharedPreferences(File file, int mode) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public FileInputStream openFileInput(String name) throws FileNotFoundException {
throw new UnsupportedOperationException();
}
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java
index 7628c5c..63fa3f9 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java
@@ -25,7 +25,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.DisplayListCanvas;
-import android.view.HardwareRenderer;
+import android.view.ThreadedRenderer;
import android.view.RenderNode;
import android.view.ThreadedRenderer;
import android.view.View;
@@ -120,7 +120,7 @@
if (view == null) {
view.postDelayed(mSetup, 50);
}
- HardwareRenderer renderer = view.getHardwareRenderer();
+ ThreadedRenderer renderer = view.getHardwareRenderer();
if (renderer == null || view.getWidth() == 0) {
view.postDelayed(mSetup, 50);
}
diff --git a/tests/NetworkSecurityConfigTest/res/xml/override_dedup.xml b/tests/NetworkSecurityConfigTest/res/xml/override_dedup.xml
new file mode 100644
index 0000000..5ba5675
--- /dev/null
+++ b/tests/NetworkSecurityConfigTest/res/xml/override_dedup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+ <!-- Entry with a bad pin. Connections to this will only succeed if overridePins is set. -->
+ <domain-config>
+ <domain>android.com</domain>
+ <pin-set>
+ <pin digest="SHA-256">aaaaaaaaIAq2Y49orFOOQKurWxmmSFZhBCoQYcRhJ3Y=</pin>
+ </pin-set>
+ <trust-anchors>
+ <certificates src="system" overridePins="false" />
+ </trust-anchors>
+ </domain-config>
+ <!-- override that contains all of the system CA store. This should completely override the
+ anchors in the domain config-above with ones that have overridePins set. -->
+ <debug-overrides>
+ <trust-anchors>
+ <certificates src="system" />
+ </trust-anchors>
+ </debug-overrides>
+</network-security-config>
diff --git a/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java b/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java
index 92eadc0..69b2a9d 100644
--- a/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java
+++ b/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java
@@ -19,15 +19,29 @@
import java.util.Set;
import java.security.cert.X509Certificate;
+import com.android.org.conscrypt.TrustedCertificateIndex;
+
/** @hide */
public class TestCertificateSource implements CertificateSource {
private final Set<X509Certificate> mCertificates;
+ private final TrustedCertificateIndex mIndex = new TrustedCertificateIndex();
public TestCertificateSource(Set<X509Certificate> certificates) {
mCertificates = certificates;
+ for (X509Certificate cert : certificates) {
+ mIndex.index(cert);
+ }
}
public Set<X509Certificate> getCertificates() {
return mCertificates;
}
+
+ public X509Certificate findBySubjectAndPublicKey(X509Certificate cert) {
+ java.security.cert.TrustAnchor anchor = mIndex.findBySubjectAndPublicKey(cert);
+ if (anchor == null) {
+ return null;
+ }
+ return anchor.getTrustedCert();
+ }
}
diff --git a/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java b/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java
index c6f3680..998bb68 100644
--- a/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java
+++ b/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java
@@ -402,4 +402,22 @@
context.init(null, tms, null);
TestUtils.assertConnectionSucceeds(context, "android.com" , 443);
}
+
+ public void testDebugDedup() throws Exception {
+ XmlConfigSource source = new XmlConfigSource(getContext(), R.xml.override_dedup, true);
+ ApplicationConfig appConfig = new ApplicationConfig(source);
+ assertTrue(appConfig.hasPerDomainConfigs());
+ // Check android.com.
+ NetworkSecurityConfig config = appConfig.getConfigForHostname("android.com");
+ PinSet pinSet = config.getPins();
+ assertFalse(pinSet.pins.isEmpty());
+ // Check that all TrustAnchors come from the override pins debug source.
+ for (TrustAnchor anchor : config.getTrustAnchors()) {
+ assertTrue(anchor.overridesPins);
+ }
+ // Try connections.
+ SSLContext context = TestUtils.getSSLContext(source);
+ TestUtils.assertConnectionSucceeds(context, "android.com", 443);
+ TestUtils.assertUrlConnectionSucceeds(context, "android.com", 443);
+ }
}
diff --git a/tests/RenderScriptTests/Fountain/Android.mk b/tests/RenderScriptTests/Fountain/Android.mk
deleted file mode 100644
index 0517aef..0000000
--- a/tests/RenderScriptTests/Fountain/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2008 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-
-LOCAL_SDK_VERSION := 17
-
-LOCAL_PACKAGE_NAME := RsFountain
-
-include $(BUILD_PACKAGE)
diff --git a/tests/RenderScriptTests/Fountain/AndroidManifest.xml b/tests/RenderScriptTests/Fountain/AndroidManifest.xml
deleted file mode 100644
index d19b8c3..0000000
--- a/tests/RenderScriptTests/Fountain/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.rs.fountain">
- <uses-sdk android:minSdkVersion="14" />
- <application
- android:label="RsFountain"
- android:hardwareAccelerated="true"
- android:icon="@drawable/test_pattern">
- <activity android:name="Fountain">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/tests/RenderScriptTests/Fountain/_index.html b/tests/RenderScriptTests/Fountain/_index.html
deleted file mode 100644
index 223242f..0000000
--- a/tests/RenderScriptTests/Fountain/_index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>An example that renders many dots on the screen that follow a user's touch. The dots fall
-to the bottom of the screen when the user releases the finger.</p>
-
-
-
diff --git a/tests/RenderScriptTests/Fountain/res/drawable/test_pattern.png b/tests/RenderScriptTests/Fountain/res/drawable/test_pattern.png
deleted file mode 100644
index e7d1455..0000000
--- a/tests/RenderScriptTests/Fountain/res/drawable/test_pattern.png
+++ /dev/null
Binary files differ
diff --git a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/Fountain.java b/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/Fountain.java
deleted file mode 100644
index 311455a..0000000
--- a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/Fountain.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2008 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.rs.fountain;
-
-import android.renderscript.RSSurfaceView;
-import android.renderscript.RenderScript;
-
-import android.app.Activity;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.provider.Settings.System;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.ListView;
-
-import java.lang.Runtime;
-
-public class Fountain extends Activity {
- //EventListener mListener = new EventListener();
-
- private static final String LOG_TAG = "libRS_jni";
- private static final boolean DEBUG = false;
- private static final boolean LOG_ENABLED = false;
-
- private FountainView mView;
-
- // get the current looper (from your Activity UI thread for instance
-
-
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- // Create our Preview view and set it as the content of our
- // Activity
- mView = new FountainView(this);
- setContentView(mView);
- }
-
- @Override
- protected void onResume() {
- Log.e("rs", "onResume");
-
- // Ideally a game should implement onResume() and onPause()
- // to take appropriate action when the activity looses focus
- super.onResume();
- mView.resume();
- }
-
- @Override
- protected void onPause() {
- Log.e("rs", "onPause");
-
- // Ideally a game should implement onResume() and onPause()
- // to take appropriate action when the activity looses focus
- super.onPause();
- mView.pause();
-
-
-
- //Runtime.getRuntime().exit(0);
- }
-
-
- static void log(String message) {
- if (LOG_ENABLED) {
- Log.v(LOG_TAG, message);
- }
- }
-
-
-}
-
diff --git a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainRS.java b/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainRS.java
deleted file mode 100644
index 646c807..0000000
--- a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainRS.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2008 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.rs.fountain;
-
-import android.content.res.Resources;
-import android.renderscript.*;
-import android.util.Log;
-
-
-public class FountainRS {
- public static final int PART_COUNT = 50000;
-
- public FountainRS() {
- }
-
- private Resources mRes;
- private RenderScriptGL mRS;
- private ScriptC_fountain mScript;
- public void init(RenderScriptGL rs, Resources res) {
- mRS = rs;
- mRes = res;
-
- ProgramFragmentFixedFunction.Builder pfb = new ProgramFragmentFixedFunction.Builder(rs);
- pfb.setVaryingColor(true);
- rs.bindProgramFragment(pfb.create());
-
- ScriptField_Point points = new ScriptField_Point(mRS, PART_COUNT);//
- // Allocation.USAGE_GRAPHICS_VERTEX);
-
- Mesh.AllocationBuilder smb = new Mesh.AllocationBuilder(mRS);
- smb.addVertexAllocation(points.getAllocation());
- smb.addIndexSetType(Mesh.Primitive.POINT);
- Mesh sm = smb.create();
-
- mScript = new ScriptC_fountain(mRS, mRes, R.raw.fountain);
- mScript.set_partMesh(sm);
- mScript.bind_point(points);
- mRS.bindRootScript(mScript);
- }
-
- boolean holdingColor[] = new boolean[10];
- public void newTouchPosition(float x, float y, float pressure, int id) {
- if (id >= holdingColor.length) {
- return;
- }
- int rate = (int)(pressure * pressure * 500.f);
- if (rate > 500) {
- rate = 500;
- }
- if (rate > 0) {
- mScript.invoke_addParticles(rate, x, y, id, !holdingColor[id]);
- holdingColor[id] = true;
- } else {
- holdingColor[id] = false;
- }
-
- }
-}
diff --git a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java b/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java
deleted file mode 100644
index 98cec55..0000000
--- a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/FountainView.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2008 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.rs.fountain;
-
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.concurrent.Semaphore;
-
-import android.renderscript.RSSurfaceView;
-import android.renderscript.RenderScript;
-import android.renderscript.RenderScriptGL;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-public class FountainView extends RSSurfaceView {
-
- public FountainView(Context context) {
- super(context);
- //setFocusable(true);
- }
-
- private RenderScriptGL mRS;
- private FountainRS mRender;
-
- public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
- super.surfaceChanged(holder, format, w, h);
- if (mRS == null) {
- RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
- mRS = createRenderScriptGL(sc);
- mRS.setSurface(holder, w, h);
- mRender = new FountainRS();
- mRender.init(mRS, getResources());
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- if (mRS != null) {
- mRS = null;
- destroyRenderScriptGL();
- }
- }
-
-
- @Override
- public boolean onTouchEvent(MotionEvent ev)
- {
- int act = ev.getActionMasked();
- if (act == ev.ACTION_UP) {
- mRender.newTouchPosition(0, 0, 0, ev.getPointerId(0));
- return false;
- } else if (act == MotionEvent.ACTION_POINTER_UP) {
- // only one pointer going up, we can get the index like this
- int pointerIndex = ev.getActionIndex();
- int pointerId = ev.getPointerId(pointerIndex);
- mRender.newTouchPosition(0, 0, 0, pointerId);
- }
- int count = ev.getHistorySize();
- int pcount = ev.getPointerCount();
-
- for (int p=0; p < pcount; p++) {
- int id = ev.getPointerId(p);
- mRender.newTouchPosition(ev.getX(p),
- ev.getY(p),
- ev.getPressure(p),
- id);
-
- for (int i=0; i < count; i++) {
- mRender.newTouchPosition(ev.getHistoricalX(p, i),
- ev.getHistoricalY(p, i),
- ev.getHistoricalPressure(p, i),
- id);
- }
- }
- return true;
- }
-}
-
-
diff --git a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/fountain.rs b/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/fountain.rs
deleted file mode 100644
index 151b689..0000000
--- a/tests/RenderScriptTests/Fountain/src/com/example/android/rs/fountain/fountain.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Fountain test script
-#pragma version(1)
-#pragma rs_fp_relaxed
-
-#pragma rs java_package_name(com.example.android.rs.fountain)
-
-#pragma stateFragment(parent)
-
-#include "rs_graphics.rsh"
-
-static int newPart = 0;
-rs_mesh partMesh;
-
-typedef struct __attribute__((packed, aligned(4))) Point {
- float2 delta;
- float2 position;
- uchar4 color;
-} Point_t;
-Point_t *point;
-
-int root() {
- float dt = min(rsGetDt(), 0.1f);
- rsgClearColor(0.f, 0.f, 0.f, 1.f);
- const float height = rsgGetHeight();
- const int size = rsAllocationGetDimX(rsGetAllocation(point));
- float dy2 = dt * (10.f);
- Point_t * p = point;
- for (int ct=0; ct < size; ct++) {
- p->delta.y += dy2;
- p->position += p->delta;
- if ((p->position.y > height) && (p->delta.y > 0)) {
- p->delta.y *= -0.3f;
- }
- p++;
- }
-
- rsgDrawMesh(partMesh);
- return 1;
-}
-
-static float4 partColor[10];
-void addParticles(int rate, float x, float y, int index, bool newColor)
-{
- if (newColor) {
- partColor[index].x = rsRand(0.5f, 1.0f);
- partColor[index].y = rsRand(1.0f);
- partColor[index].z = rsRand(1.0f);
- }
- float rMax = ((float)rate) * 0.02f;
- int size = rsAllocationGetDimX(rsGetAllocation(point));
- uchar4 c = rsPackColorTo8888(partColor[index]);
-
- Point_t * np = &point[newPart];
- float2 p = {x, y};
- while (rate--) {
- float angle = rsRand(3.14f * 2.f);
- float len = rsRand(rMax);
- np->delta.x = len * sin(angle);
- np->delta.y = len * cos(angle);
- np->position = p;
- np->color = c;
- newPart++;
- np++;
- if (newPart >= size) {
- newPart = 0;
- np = &point[newPart];
- }
- }
-}
-
diff --git a/tests/RenderScriptTests/FountainFbo/Android.mk b/tests/RenderScriptTests/FountainFbo/Android.mk
deleted file mode 100644
index c0f3323..0000000
--- a/tests/RenderScriptTests/FountainFbo/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2008 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-
-# TODO: build fails with this set
-# LOCAL_SDK_VERSION := current
-
-LOCAL_PACKAGE_NAME := RsFountainFbo
-LOCAL_SDK_VERSION := 14
-
-include $(BUILD_PACKAGE)
diff --git a/tests/RenderScriptTests/FountainFbo/AndroidManifest.xml b/tests/RenderScriptTests/FountainFbo/AndroidManifest.xml
deleted file mode 100644
index 082744b..0000000
--- a/tests/RenderScriptTests/FountainFbo/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.rs.fountainfbo">
- <uses-sdk android:minSdkVersion="14" />
- <application
- android:label="RsFountainFbo"
- android:hardwareAccelerated="true"
- android:icon="@drawable/test_pattern">
- <activity android:name="FountainFbo">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/tests/RenderScriptTests/FountainFbo/_index.html b/tests/RenderScriptTests/FountainFbo/_index.html
deleted file mode 100644
index 5508657..0000000
--- a/tests/RenderScriptTests/FountainFbo/_index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>An example that renders many dots on the screen that follow a user's touch. The dots fall
-to the bottom of the screen when no touch is detected. This example modifies
-the <a href="../Fountain/index.html">Fountain</a> sample to include rendering to a
-a framebuffer object as well as the default framebuffer.</p>
-
-
-
diff --git a/tests/RenderScriptTests/FountainFbo/res/drawable/test_pattern.png b/tests/RenderScriptTests/FountainFbo/res/drawable/test_pattern.png
deleted file mode 100644
index e7d1455..0000000
--- a/tests/RenderScriptTests/FountainFbo/res/drawable/test_pattern.png
+++ /dev/null
Binary files differ
diff --git a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFbo.java b/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFbo.java
deleted file mode 100644
index d8ba30f..0000000
--- a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFbo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2008 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.rs.fountainfbo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-
-public class FountainFbo extends Activity {
- private static final String LOG_TAG = "libRS_jni";
- private static final boolean DEBUG = false;
- private static final boolean LOG_ENABLED = false;
-
- private FountainFboView mView;
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- /* Create our Preview view and set it as the content of our Activity */
- mView = new FountainFboView(this);
- setContentView(mView);
- }
-
- @Override
- protected void onResume() {
- Log.e("rs", "onResume");
-
- /* Ideally a game should implement onResume() and onPause()
- to take appropriate action when the activity loses focus */
- super.onResume();
- mView.resume();
- }
-
- @Override
- protected void onPause() {
- Log.e("rs", "onPause");
-
- /* Ideally a game should implement onResume() and onPause()
- to take appropriate action when the activity loses focus */
- super.onPause();
- mView.pause();
- }
-
- static void log(String message) {
- if (LOG_ENABLED) {
- Log.v(LOG_TAG, message);
- }
- }
-}
-
diff --git a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFboRS.java b/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFboRS.java
deleted file mode 100644
index 3bf3ff1..0000000
--- a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFboRS.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2008 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.rs.fountainfbo;
-
-import android.content.res.Resources;
-import android.renderscript.Allocation;
-import android.renderscript.Element;
-import android.renderscript.Mesh;
-import android.renderscript.ProgramFragment;
-import android.renderscript.ProgramFragmentFixedFunction;
-import android.renderscript.RenderScriptGL;
-import android.renderscript.Type;
-
-public class FountainFboRS {
- public static final int PART_COUNT = 50000;
-
- public FountainFboRS() {
- }
-
- private Resources mRes;
- private RenderScriptGL mRS;
- private ScriptC_fountainfbo mScript;
- private Allocation mColorBuffer;
- private ProgramFragment mProgramFragment;
- private ProgramFragment mTextureProgramFragment;
- public void init(RenderScriptGL rs, Resources res) {
- mRS = rs;
- mRes = res;
-
- ScriptField_Point points = new ScriptField_Point(mRS, PART_COUNT);
-
- Mesh.AllocationBuilder smb = new Mesh.AllocationBuilder(mRS);
- smb.addVertexAllocation(points.getAllocation());
- smb.addIndexSetType(Mesh.Primitive.POINT);
- Mesh sm = smb.create();
-
- mScript = new ScriptC_fountainfbo(mRS, mRes, R.raw.fountainfbo);
- mScript.set_partMesh(sm);
- mScript.bind_point(points);
-
- ProgramFragmentFixedFunction.Builder pfb = new ProgramFragmentFixedFunction.Builder(rs);
- pfb.setVaryingColor(true);
- mProgramFragment = pfb.create();
- mScript.set_gProgramFragment(mProgramFragment);
-
- /* Second fragment shader to use a texture (framebuffer object) to draw with */
- pfb.setTexture(ProgramFragmentFixedFunction.Builder.EnvMode.REPLACE,
- ProgramFragmentFixedFunction.Builder.Format.RGBA, 0);
-
- /* Set the fragment shader in the Renderscript runtime */
- mTextureProgramFragment = pfb.create();
- mScript.set_gTextureProgramFragment(mTextureProgramFragment);
-
- /* Create the allocation for the color buffer */
- Type.Builder colorBuilder = new Type.Builder(mRS, Element.RGBA_8888(mRS));
- colorBuilder.setX(256).setY(256);
- mColorBuffer = Allocation.createTyped(mRS, colorBuilder.create(),
- Allocation.USAGE_GRAPHICS_TEXTURE |
- Allocation.USAGE_GRAPHICS_RENDER_TARGET);
-
- /* Set the allocation in the Renderscript runtime */
- mScript.set_gColorBuffer(mColorBuffer);
-
- mRS.bindRootScript(mScript);
- }
-
- boolean holdingColor[] = new boolean[10];
- public void newTouchPosition(float x, float y, float pressure, int id) {
- if (id >= holdingColor.length) {
- return;
- }
- int rate = (int)(pressure * pressure * 500.f);
- if (rate > 500) {
- rate = 500;
- }
- if (rate > 0) {
- mScript.invoke_addParticles(rate, x, y, id, !holdingColor[id]);
- holdingColor[id] = true;
- } else {
- holdingColor[id] = false;
- }
-
- }
-}
-
diff --git a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFboView.java b/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFboView.java
deleted file mode 100644
index 8636717..0000000
--- a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/FountainFboView.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2008 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.rs.fountainfbo;
-
-
-import android.renderscript.RSSurfaceView;
-import android.renderscript.RenderScriptGL;
-import android.content.Context;
-import android.view.SurfaceHolder;
-import android.view.MotionEvent;
-
-public class FountainFboView extends RSSurfaceView {
-
- public FountainFboView(Context context) {
- super(context);
- }
-
- private RenderScriptGL mRS;
- private FountainFboRS mRender;
-
- public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
- super.surfaceChanged(holder, format, w, h);
- if (mRS == null) {
- RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
- mRS = createRenderScriptGL(sc);
- mRS.setSurface(holder, w, h);
- mRender = new FountainFboRS();
- mRender.init(mRS, getResources());
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- android.util.Log.e("rs", "onDetachedFromWindow");
- if (mRS != null) {
- mRS = null;
- destroyRenderScriptGL();
- }
- }
-
-
- @Override
- public boolean onTouchEvent(MotionEvent ev)
- {
- int act = ev.getActionMasked();
- if (act == ev.ACTION_UP) {
- mRender.newTouchPosition(0, 0, 0, ev.getPointerId(0));
- return false;
- } else if (act == MotionEvent.ACTION_POINTER_UP) {
- // only one pointer going up, we can get the index like this
- int pointerIndex = ev.getActionIndex();
- int pointerId = ev.getPointerId(pointerIndex);
- mRender.newTouchPosition(0, 0, 0, pointerId);
- }
- int count = ev.getHistorySize();
- int pcount = ev.getPointerCount();
-
- for (int p=0; p < pcount; p++) {
- int id = ev.getPointerId(p);
- mRender.newTouchPosition(ev.getX(p),
- ev.getY(p),
- ev.getPressure(p),
- id);
-
- for (int i=0; i < count; i++) {
- mRender.newTouchPosition(ev.getHistoricalX(p, i),
- ev.getHistoricalY(p, i),
- ev.getHistoricalPressure(p, i),
- id);
- }
- }
- return true;
- }
-}
-
-
diff --git a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/fountainfbo.rs b/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/fountainfbo.rs
deleted file mode 100644
index 763f6ba..0000000
--- a/tests/RenderScriptTests/FountainFbo/src/com/example/android/rs/fountainfbo/fountainfbo.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Fountain test script
-#pragma version(1)
-
-#pragma rs java_package_name(com.example.android.rs.fountainfbo)
-
-#pragma stateFragment(parent)
-
-#include "rs_graphics.rsh"
-
-static int newPart = 0;
-rs_mesh partMesh;
-rs_program_vertex gProgramVertex;
-
-//allocation for color buffer
-rs_allocation gColorBuffer;
-//fragment shader for rendering without a texture (used for rendering to framebuffer object)
-rs_program_fragment gProgramFragment;
-//fragment shader for rendering with a texture (used for rendering to default framebuffer)
-rs_program_fragment gTextureProgramFragment;
-
-typedef struct __attribute__((packed, aligned(4))) Point {
- float2 delta;
- float2 position;
- uchar4 color;
-} Point_t;
-Point_t *point;
-
-int root() {
- float dt = min(rsGetDt(), 0.1f);
- rsgClearColor(0.f, 0.f, 0.f, 1.f);
- const float height = rsgGetHeight();
- const int size = rsAllocationGetDimX(rsGetAllocation(point));
- float dy2 = dt * (10.f);
- Point_t * p = point;
- for (int ct=0; ct < size; ct++) {
- p->delta.y += dy2;
- p->position += p->delta;
- if ((p->position.y > height) && (p->delta.y > 0)) {
- p->delta.y *= -0.3f;
- }
- p++;
- }
- //Tell Renderscript runtime to render to the frame buffer object
- rsgBindColorTarget(gColorBuffer, 0);
-
- //Begin rendering on a white background
- rsgClearColor(1.f, 1.f, 1.f, 1.f);
- rsgDrawMesh(partMesh);
-
- //When done, tell Renderscript runtime to stop rendering to framebuffer object
- rsgClearAllRenderTargets();
-
- //Bind a new fragment shader that declares the framebuffer object to be used as a texture
- rsgBindProgramFragment(gTextureProgramFragment);
-
- //Bind the framebuffer object to the fragment shader at slot 0 as a texture
- rsgBindTexture(gTextureProgramFragment, 0, gColorBuffer);
-
- //Draw a quad using the framebuffer object as the texture
- float startX = 10, startY = 10;
- float s = 256;
- rsgDrawQuadTexCoords(startX, startY, 0, 0, 1,
- startX, startY + s, 0, 0, 0,
- startX + s, startY + s, 0, 1, 0,
- startX + s, startY, 0, 1, 1);
-
- //Rebind the original fragment shader to render as normal
- rsgBindProgramFragment(gProgramFragment);
-
- //Render the main scene
- rsgDrawMesh(partMesh);
-
- return 1;
-}
-
-static float4 partColor[10];
-void addParticles(int rate, float x, float y, int index, bool newColor)
-{
- if (newColor) {
- partColor[index].x = rsRand(0.5f, 1.0f);
- partColor[index].y = rsRand(1.0f);
- partColor[index].z = rsRand(1.0f);
- }
- float rMax = ((float)rate) * 0.02f;
- int size = rsAllocationGetDimX(rsGetAllocation(point));
- uchar4 c = rsPackColorTo8888(partColor[index]);
-
- Point_t * np = &point[newPart];
- float2 p = {x, y};
- while (rate--) {
- float angle = rsRand(3.14f * 2.f);
- float len = rsRand(rMax);
- np->delta.x = len * sin(angle);
- np->delta.y = len * cos(angle);
- np->position = p;
- np->color = c;
- newPart++;
- np++;
- if (newPart >= size) {
- newPart = 0;
- np = &point[newPart];
- }
- }
-}
-
-
diff --git a/tests/RenderScriptTests/Fountain_v11/Android.mk b/tests/RenderScriptTests/Fountain_v11/Android.mk
deleted file mode 100644
index ac2690c..0000000
--- a/tests/RenderScriptTests/Fountain_v11/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2008 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-#LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript
-
-LOCAL_PACKAGE_NAME := Fountain_v11
-LOCAL_SDK_VERSION := 11
-
-include $(BUILD_PACKAGE)
diff --git a/tests/RenderScriptTests/Fountain_v11/AndroidManifest.xml b/tests/RenderScriptTests/Fountain_v11/AndroidManifest.xml
deleted file mode 100644
index fcb4faf..0000000
--- a/tests/RenderScriptTests/Fountain_v11/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.fountain_v11">
- <uses-sdk android:minSdkVersion="11" />
- <application
- android:label="Fountain_v11"
- android:icon="@drawable/test_pattern">
- <activity android:name="Fountain_v11">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
diff --git a/tests/RenderScriptTests/Fountain_v11/_index.html b/tests/RenderScriptTests/Fountain_v11/_index.html
deleted file mode 100644
index 223242f..0000000
--- a/tests/RenderScriptTests/Fountain_v11/_index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>An example that renders many dots on the screen that follow a user's touch. The dots fall
-to the bottom of the screen when the user releases the finger.</p>
-
-
-
diff --git a/tests/RenderScriptTests/Fountain_v11/res/drawable/test_pattern.png b/tests/RenderScriptTests/Fountain_v11/res/drawable/test_pattern.png
deleted file mode 100644
index e7d1455..0000000
--- a/tests/RenderScriptTests/Fountain_v11/res/drawable/test_pattern.png
+++ /dev/null
Binary files differ
diff --git a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainRS.java b/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainRS.java
deleted file mode 100644
index e858100..0000000
--- a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainRS.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2008 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.fountain_v11;
-
-import android.content.res.Resources;
-import android.renderscript.*;
-import android.util.Log;
-
-
-public class FountainRS {
- public static final int PART_COUNT = 50000;
-
- public FountainRS() {
- }
-
- private Resources mRes;
- private RenderScriptGL mRS;
- private ScriptC_fountain mScript;
- public void init(RenderScriptGL rs, Resources res, int width, int height) {
- mRS = rs;
- mRes = res;
-
- ProgramFragmentFixedFunction.Builder pfb = new ProgramFragmentFixedFunction.Builder(rs);
- pfb.setVaryingColor(true);
- rs.bindProgramFragment(pfb.create());
-
- ScriptField_Point points = new ScriptField_Point(mRS, PART_COUNT);//
- // Allocation.USAGE_GRAPHICS_VERTEX);
-
- Mesh.AllocationBuilder smb = new Mesh.AllocationBuilder(mRS);
- smb.addVertexAllocation(points.getAllocation());
- smb.addIndexSetType(Mesh.Primitive.POINT);
- Mesh sm = smb.create();
-
- mScript = new ScriptC_fountain(mRS, mRes, R.raw.fountain);
- mScript.set_partMesh(sm);
- mScript.bind_point(points);
- mRS.bindRootScript(mScript);
- }
-
- boolean holdingColor[] = new boolean[10];
- public void newTouchPosition(float x, float y, float pressure, int id) {
- if (id >= holdingColor.length) {
- return;
- }
- int rate = (int)(pressure * pressure * 500.f);
- if (rate > 500) {
- rate = 500;
- }
- if (rate > 0) {
- mScript.invoke_addParticles(rate, x, y, id, !holdingColor[id]);
- holdingColor[id] = true;
- } else {
- holdingColor[id] = false;
- }
-
- }
-}
diff --git a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainView.java b/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainView.java
deleted file mode 100644
index e82376c..0000000
--- a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainView.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2008 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.fountain_v11;
-
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.concurrent.Semaphore;
-
-import android.renderscript.RSSurfaceView;
-import android.renderscript.RenderScript;
-import android.renderscript.RenderScriptGL;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-public class FountainView extends RSSurfaceView {
-
- public FountainView(Context context) {
- super(context);
- //setFocusable(true);
- }
-
- private RenderScriptGL mRS;
- private FountainRS mRender;
-
- public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
- super.surfaceChanged(holder, format, w, h);
- if (mRS == null) {
- RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
- mRS = createRenderScriptGL(sc);
- mRS.setSurface(holder, w, h);
- mRender = new FountainRS();
- mRender.init(mRS, getResources(), w, h);
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- if (mRS != null) {
- mRS = null;
- destroyRenderScriptGL();
- }
- }
-
-
- @Override
- public boolean onTouchEvent(MotionEvent ev)
- {
- int act = ev.getActionMasked();
- if (act == ev.ACTION_UP) {
- mRender.newTouchPosition(0, 0, 0, ev.getPointerId(0));
- return false;
- } else if (act == MotionEvent.ACTION_POINTER_UP) {
- // only one pointer going up, we can get the index like this
- int pointerIndex = ev.getActionIndex();
- int pointerId = ev.getPointerId(pointerIndex);
- mRender.newTouchPosition(0, 0, 0, pointerId);
- }
- int count = ev.getHistorySize();
- int pcount = ev.getPointerCount();
-
- for (int p=0; p < pcount; p++) {
- int id = ev.getPointerId(p);
- mRender.newTouchPosition(ev.getX(p),
- ev.getY(p),
- ev.getPressure(p),
- id);
-
- for (int i=0; i < count; i++) {
- mRender.newTouchPosition(ev.getHistoricalX(p, i),
- ev.getHistoricalY(p, i),
- ev.getHistoricalPressure(p, i),
- id);
- }
- }
- return true;
- }
-}
-
-
diff --git a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/Fountain_v11.java b/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/Fountain_v11.java
deleted file mode 100644
index 2c07b27..0000000
--- a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/Fountain_v11.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2008 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.fountain_v11;
-
-import android.renderscript.RSSurfaceView;
-import android.renderscript.RenderScript;
-
-import android.app.Activity;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.provider.Settings.System;
-import android.util.Config;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.ListView;
-
-import java.lang.Runtime;
-
-public class Fountain_v11 extends Activity {
- //EventListener mListener = new EventListener();
-
- private static final String LOG_TAG = "libRS_jni";
- private static final boolean DEBUG = false;
- private static final boolean LOG_ENABLED = DEBUG ? Config.LOGD : Config.LOGV;
-
- private FountainView mView;
-
- // get the current looper (from your Activity UI thread for instance
-
-
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- // Create our Preview view and set it as the content of our
- // Activity
- mView = new FountainView(this);
- setContentView(mView);
- }
-
- @Override
- protected void onResume() {
- Log.e("rs", "onResume");
-
- // Ideally a game should implement onResume() and onPause()
- // to take appropriate action when the activity looses focus
- super.onResume();
- mView.resume();
- }
-
- @Override
- protected void onPause() {
- Log.e("rs", "onPause");
-
- // Ideally a game should implement onResume() and onPause()
- // to take appropriate action when the activity looses focus
- super.onPause();
- mView.pause();
-
-
-
- //Runtime.getRuntime().exit(0);
- }
-
-
- static void log(String message) {
- if (LOG_ENABLED) {
- Log.v(LOG_TAG, message);
- }
- }
-
-
-}
-
diff --git a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/fountain.rs b/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/fountain.rs
deleted file mode 100644
index 3b6c89a..0000000
--- a/tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/fountain.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Fountain test script
-#pragma version(1)
-
-#pragma rs java_package_name(com.android.fountain_v11)
-
-#pragma stateFragment(parent)
-
-#include "rs_graphics.rsh"
-
-static int newPart = 0;
-rs_mesh partMesh;
-
-typedef struct __attribute__((packed, aligned(4))) Point {
- float2 delta;
- float2 position;
- uchar4 color;
-} Point_t;
-Point_t *point;
-
-int root() {
- float dt = min(rsGetDt(), 0.1f);
- rsgClearColor(0.f, 0.f, 0.f, 1.f);
- const float height = rsgGetHeight();
- const int size = rsAllocationGetDimX(rsGetAllocation(point));
- float dy2 = dt * (10.f);
- Point_t * p = point;
- for (int ct=0; ct < size; ct++) {
- p->delta.y += dy2;
- p->position += p->delta;
- if ((p->position.y > height) && (p->delta.y > 0)) {
- p->delta.y *= -0.3f;
- }
- p++;
- }
-
- rsgDrawMesh(partMesh);
- return 1;
-}
-
-static float4 partColor[10];
-void addParticles(int rate, float x, float y, int index, bool newColor)
-{
- if (newColor) {
- partColor[index].x = rsRand(0.5f, 1.0f);
- partColor[index].y = rsRand(1.0f);
- partColor[index].z = rsRand(1.0f);
- }
- float rMax = ((float)rate) * 0.02f;
- int size = rsAllocationGetDimX(rsGetAllocation(point));
- uchar4 c = rsPackColorTo8888(partColor[index]);
-
- Point_t * np = &point[newPart];
- float2 p = {x, y};
- while (rate--) {
- float angle = rsRand(3.14f * 2.f);
- float len = rsRand(rMax);
- np->delta.x = len * sin(angle);
- np->delta.y = len * cos(angle);
- np->position = p;
- np->color = c;
- newPart++;
- np++;
- if (newPart >= size) {
- newPart = 0;
- np = &point[newPart];
- }
- }
-}
-
diff --git a/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java b/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java
index fc5426c..ee4c834 100644
--- a/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java
+++ b/tests/RenderThreadTest/src/com/example/renderthread/MainActivity.java
@@ -6,7 +6,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
-import android.view.HardwareRenderer;
import android.view.RenderNodeAnimator;
import android.view.View;
import android.widget.AdapterView;
diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
index 67b9d77..8eb30d2 100644
--- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
+++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
@@ -160,6 +160,36 @@
}
},
+ new Test("with topic Hello") {
+ public void run() {
+ Notification n = new Notification.Builder(NotificationTestList.this)
+ .setSmallIcon(R.drawable.icon1)
+ .setWhen(mActivityCreateTime)
+ .setContentTitle("hihi")
+ .setContentText("This is a notification!!!")
+ .setContentIntent(makeIntent2())
+ .setTopic(new Notification.Topic("hello", "Hello"))
+ .build();
+
+ mNM.notify(999, n);
+ }
+ },
+
+ new Test("with topic GoodBye") {
+ public void run() {
+ Notification n = new Notification.Builder(NotificationTestList.this)
+ .setSmallIcon(R.drawable.icon1)
+ .setWhen(mActivityCreateTime)
+ .setContentTitle("byebye")
+ .setContentText("This is a notification!!!")
+ .setContentIntent(makeIntent2())
+ .setTopic(new Notification.Topic("bye", "Goodbye"))
+ .build();
+
+ mNM.notify(9999, n);
+ }
+ },
+
new Test("Whens") {
public void run()
{
diff --git a/tools/aapt/Package.cpp b/tools/aapt/Package.cpp
index cb244ec..641c34b 100644
--- a/tools/aapt/Package.cpp
+++ b/tools/aapt/Package.cpp
@@ -33,7 +33,7 @@
".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet",
".rtttl", ".imy", ".xmf", ".mp4", ".m4a",
".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2",
- ".amr", ".awb", ".wma", ".wmv"
+ ".amr", ".awb", ".wma", ".wmv", ".webm"
};
/* fwd decls, so I can write this downward */
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index e22e76d..fb0fe38 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -1537,12 +1537,20 @@
std::queue<CompileResourceWorkItem>& workQueue = table.getWorkQueue();
while (!workQueue.empty()) {
CompileResourceWorkItem& workItem = workQueue.front();
- err = compileXmlFile(bundle, assets, workItem.resourceName, workItem.file, &table, xmlFlags);
+ int xmlCompilationFlags = xmlFlags | XML_COMPILE_PARSE_VALUES
+ | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS;
+ if (!workItem.needsCompiling) {
+ xmlCompilationFlags &= ~XML_COMPILE_ASSIGN_ATTRIBUTE_IDS;
+ xmlCompilationFlags &= ~XML_COMPILE_PARSE_VALUES;
+ }
+ err = compileXmlFile(bundle, assets, workItem.resourceName, workItem.xmlRoot,
+ workItem.file, &table, xmlCompilationFlags);
+
if (err == NO_ERROR) {
assets->addResource(workItem.resPath.getPathLeaf(),
- workItem.resPath,
- workItem.file,
- workItem.file->getResourceType());
+ workItem.resPath,
+ workItem.file,
+ workItem.file->getResourceType());
} else {
hasErrors = true;
}
@@ -1737,9 +1745,7 @@
manifestFile->getGroupEntry(),
manifestFile->getResourceType());
err = compileXmlFile(bundle, assets, String16(), manifestFile,
- outManifestFile, &table,
- XML_COMPILE_ASSIGN_ATTRIBUTE_IDS
- | XML_COMPILE_STRIP_WHITESPACE | XML_COMPILE_STRIP_RAW_VALUES);
+ outManifestFile, &table, XML_COMPILE_STANDARD_RESOURCE & ~XML_COMPILE_STRIP_COMMENTS);
if (err < NO_ERROR) {
return err;
}
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index d5a09d8..0e470d9 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -88,8 +88,11 @@
root->setUTF8(true);
}
- bool hasErrors = false;
+ if (table->processBundleFormat(bundle, resourceName, target, root) != NO_ERROR) {
+ return UNKNOWN_ERROR;
+ }
+ bool hasErrors = false;
if ((options&XML_COMPILE_ASSIGN_ATTRIBUTE_IDS) != 0) {
status_t err = root->assignResourceIds(assets, table);
if (err != NO_ERROR) {
@@ -97,9 +100,11 @@
}
}
- status_t err = root->parseValues(assets, table);
- if (err != NO_ERROR) {
- hasErrors = true;
+ if ((options&XML_COMPILE_PARSE_VALUES) != 0) {
+ status_t err = root->parseValues(assets, table);
+ if (err != NO_ERROR) {
+ hasErrors = true;
+ }
}
if (hasErrors) {
@@ -114,7 +119,7 @@
printf("Input XML Resource:\n");
root->print();
}
- err = root->flatten(target,
+ status_t err = root->flatten(target,
(options&XML_COMPILE_STRIP_COMMENTS) != 0,
(options&XML_COMPILE_STRIP_RAW_VALUES) != 0);
if (err != NO_ERROR) {
@@ -4755,9 +4760,9 @@
newConfig.sdkVersion = sdkVersionToGenerate;
sp<AaptFile> newFile = new AaptFile(target->getSourceFile(),
AaptGroupEntry(newConfig), target->getResourceType());
- String8 resPath = String8::format("res/%s/%s",
+ String8 resPath = String8::format("res/%s/%s.xml",
newFile->getGroupEntry().toDirName(target->getResourceType()).string(),
- target->getSourceFile().getPathLeaf().string());
+ String8(resourceName).string());
resPath.convertToResPath();
// Add a resource table entry.
@@ -4784,9 +4789,11 @@
item.resourceName = resourceName;
item.resPath = resPath;
item.file = newFile;
+ item.xmlRoot = newRoot;
+ item.needsCompiling = false; // This step occurs after we parse/assign, so we don't need
+ // to do it again.
mWorkQueue.push(item);
}
-
return NO_ERROR;
}
@@ -4825,3 +4832,226 @@
}
}
}
+
+static String16 buildNamespace(const String16& package) {
+ return String16("http://schemas.android.com/apk/res/") + package;
+}
+
+static sp<XMLNode> findOnlyChildElement(const sp<XMLNode>& parent) {
+ const Vector<sp<XMLNode> >& children = parent->getChildren();
+ sp<XMLNode> onlyChild;
+ for (size_t i = 0; i < children.size(); i++) {
+ if (children[i]->getType() != XMLNode::TYPE_CDATA) {
+ if (onlyChild != NULL) {
+ return NULL;
+ }
+ onlyChild = children[i];
+ }
+ }
+ return onlyChild;
+}
+
+/**
+ * Detects use of the `bundle' format and extracts nested resources into their own top level
+ * resources. The bundle format looks like this:
+ *
+ * <!-- res/drawable/bundle.xml -->
+ * <animated-vector xmlns:aapt="http://schemas.android.com/aapt">
+ * <aapt:attr name="android:drawable">
+ * <vector android:width="60dp"
+ * android:height="60dp">
+ * <path android:name="v"
+ * android:fillColor="#000000"
+ * android:pathData="M300,70 l 0,-70 70,..." />
+ * </vector>
+ * </aapt:attr>
+ * </animated-vector>
+ *
+ * When AAPT sees the <aapt:attr> tag, it will extract its single element and its children
+ * into a new high-level resource, assigning it a name and ID. Then value of the `name`
+ * attribute must be a resource attribute. That resource attribute is inserted into the parent
+ * with the reference to the extracted resource as the value.
+ *
+ * <!-- res/drawable/bundle.xml -->
+ * <animated-vector android:drawable="@drawable/bundle_1.xml">
+ * </animated-vector>
+ *
+ * <!-- res/drawable/bundle_1.xml -->
+ * <vector android:width="60dp"
+ * android:height="60dp">
+ * <path android:name="v"
+ * android:fillColor="#000000"
+ * android:pathData="M300,70 l 0,-70 70,..." />
+ * </vector>
+ */
+status_t ResourceTable::processBundleFormat(const Bundle* bundle,
+ const String16& resourceName,
+ const sp<AaptFile>& target,
+ const sp<XMLNode>& root) {
+ Vector<sp<XMLNode> > namespaces;
+ if (root->getType() == XMLNode::TYPE_NAMESPACE) {
+ namespaces.push(root);
+ }
+ return processBundleFormatImpl(bundle, resourceName, target, root, &namespaces);
+}
+
+status_t ResourceTable::processBundleFormatImpl(const Bundle* bundle,
+ const String16& resourceName,
+ const sp<AaptFile>& target,
+ const sp<XMLNode>& parent,
+ Vector<sp<XMLNode> >* namespaces) {
+ const String16 kAaptNamespaceUri16("http://schemas.android.com/aapt");
+ const String16 kName16("name");
+ const String16 kAttr16("attr");
+ const String16 kAssetPackage16(mAssets->getPackage());
+
+ Vector<sp<XMLNode> >& children = parent->getChildren();
+ for (size_t i = 0; i < children.size(); i++) {
+ const sp<XMLNode>& child = children[i];
+
+ if (child->getType() == XMLNode::TYPE_CDATA) {
+ continue;
+ } else if (child->getType() == XMLNode::TYPE_NAMESPACE) {
+ namespaces->push(child);
+ }
+
+ if (child->getElementNamespace() != kAaptNamespaceUri16 ||
+ child->getElementName() != kAttr16) {
+ status_t result = processBundleFormatImpl(bundle, resourceName, target, child,
+ namespaces);
+ if (result != NO_ERROR) {
+ return result;
+ }
+
+ if (child->getType() == XMLNode::TYPE_NAMESPACE) {
+ namespaces->pop();
+ }
+ continue;
+ }
+
+ // This is the <aapt:attr> tag. Look for the 'name' attribute.
+ SourcePos source(child->getFilename(), child->getStartLineNumber());
+
+ sp<XMLNode> nestedRoot = findOnlyChildElement(child);
+ if (nestedRoot == NULL) {
+ source.error("<%s:%s> must have exactly one child element",
+ String8(child->getElementNamespace()).string(),
+ String8(child->getElementName()).string());
+ return UNKNOWN_ERROR;
+ }
+
+ // Find the special attribute 'parent-attr'. This attribute's value contains
+ // the resource attribute for which this element should be assigned in the parent.
+ const XMLNode::attribute_entry* attr = child->getAttribute(String16(), kName16);
+ if (attr == NULL) {
+ source.error("inline resource definition must specify an attribute via 'name'");
+ return UNKNOWN_ERROR;
+ }
+
+ // Parse the attribute name.
+ const char* errorMsg = NULL;
+ String16 attrPackage, attrType, attrName;
+ bool result = ResTable::expandResourceRef(attr->string.string(),
+ attr->string.size(),
+ &attrPackage, &attrType, &attrName,
+ &kAttr16, &kAssetPackage16,
+ &errorMsg, NULL);
+ if (!result) {
+ source.error("invalid attribute name for 'name': %s", errorMsg);
+ return UNKNOWN_ERROR;
+ }
+
+ if (attrType != kAttr16) {
+ // The value of the 'name' attribute must be an attribute reference.
+ source.error("value of 'name' must be an attribute reference.");
+ return UNKNOWN_ERROR;
+ }
+
+ // Generate a name for this nested resource and try to add it to the table.
+ // We do this in a loop because the name may be taken, in which case we will
+ // increment a suffix until we succeed.
+ String8 nestedResourceName;
+ String8 nestedResourcePath;
+ int suffix = 1;
+ while (true) {
+ // This child element will be extracted into its own resource file.
+ // Generate a name and path for it from its parent.
+ nestedResourceName = String8::format("%s_%d",
+ String8(resourceName).string(), suffix++);
+ nestedResourcePath = String8::format("res/%s/%s.xml",
+ target->getGroupEntry().toDirName(target->getResourceType())
+ .string(),
+ nestedResourceName.string());
+
+ // Lookup or create the entry for this name.
+ sp<Entry> entry = getEntry(kAssetPackage16,
+ String16(target->getResourceType()),
+ String16(nestedResourceName),
+ source,
+ false,
+ &target->getGroupEntry().toParams(),
+ true);
+ if (entry == NULL) {
+ return UNKNOWN_ERROR;
+ }
+
+ if (entry->getType() == Entry::TYPE_UNKNOWN) {
+ // The value for this resource has never been set,
+ // meaning we're good!
+ entry->setItem(source, String16(nestedResourcePath));
+ break;
+ }
+
+ // We failed (name already exists), so try with a different name
+ // (increment the suffix).
+ }
+
+ if (bundle->getVerbose()) {
+ source.printf("generating nested resource %s:%s/%s",
+ mAssets->getPackage().string(), target->getResourceType().string(),
+ nestedResourceName.string());
+ }
+
+ // Build the attribute reference and assign it to the parent.
+ String16 nestedResourceRef = String16(String8::format("@%s:%s/%s",
+ mAssets->getPackage().string(), target->getResourceType().string(),
+ nestedResourceName.string()));
+
+ String16 attrNs = buildNamespace(attrPackage);
+ if (parent->getAttribute(attrNs, attrName) != NULL) {
+ SourcePos(parent->getFilename(), parent->getStartLineNumber())
+ .error("parent of nested resource already defines attribute '%s:%s'",
+ String8(attrPackage).string(), String8(attrName).string());
+ return UNKNOWN_ERROR;
+ }
+
+ // Add the reference to the inline resource.
+ parent->addAttribute(attrNs, attrName, nestedResourceRef);
+
+ // Remove the <aapt:attr> child element from here.
+ children.removeAt(i);
+ i--;
+
+ // Append all namespace declarations that we've seen on this branch in the XML tree
+ // to this resource.
+ // We do this because the order of namespace declarations and prefix usage is determined
+ // by the developer and we do not want to override any decisions. Be conservative.
+ for (size_t nsIndex = namespaces->size(); nsIndex > 0; nsIndex--) {
+ const sp<XMLNode>& ns = namespaces->itemAt(nsIndex - 1);
+ sp<XMLNode> newNs = XMLNode::newNamespace(ns->getFilename(), ns->getNamespacePrefix(),
+ ns->getNamespaceUri());
+ newNs->addChild(nestedRoot);
+ nestedRoot = newNs;
+ }
+
+ // Schedule compilation of the nested resource.
+ CompileResourceWorkItem workItem;
+ workItem.resPath = nestedResourcePath;
+ workItem.resourceName = String16(nestedResourceName);
+ workItem.xmlRoot = nestedRoot;
+ workItem.file = new AaptFile(target->getSourceFile(), target->getGroupEntry(),
+ target->getResourceType());
+ mWorkQueue.push(workItem);
+ }
+ return NO_ERROR;
+}
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h
index c4bdf09..4b7b3cd 100644
--- a/tools/aapt/ResourceTable.h
+++ b/tools/aapt/ResourceTable.h
@@ -23,13 +23,14 @@
enum {
XML_COMPILE_STRIP_COMMENTS = 1<<0,
XML_COMPILE_ASSIGN_ATTRIBUTE_IDS = 1<<1,
- XML_COMPILE_COMPACT_WHITESPACE = 1<<2,
- XML_COMPILE_STRIP_WHITESPACE = 1<<3,
- XML_COMPILE_STRIP_RAW_VALUES = 1<<4,
- XML_COMPILE_UTF8 = 1<<5,
+ XML_COMPILE_PARSE_VALUES = 1 << 2,
+ XML_COMPILE_COMPACT_WHITESPACE = 1<<3,
+ XML_COMPILE_STRIP_WHITESPACE = 1<<4,
+ XML_COMPILE_STRIP_RAW_VALUES = 1<<5,
+ XML_COMPILE_UTF8 = 1<<6,
XML_COMPILE_STANDARD_RESOURCE =
- XML_COMPILE_STRIP_COMMENTS | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS
+ XML_COMPILE_STRIP_COMMENTS | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS | XML_COMPILE_PARSE_VALUES
| XML_COMPILE_STRIP_WHITESPACE | XML_COMPILE_STRIP_RAW_VALUES
};
@@ -83,6 +84,8 @@
String16 resourceName;
String8 resPath;
sp<AaptFile> file;
+ sp<XMLNode> xmlRoot;
+ bool needsCompiling = true;
};
class ResourceTable : public ResTable::Accessor
@@ -206,6 +209,12 @@
const sp<AaptFile>& file,
const sp<XMLNode>& root);
+ status_t processBundleFormat(const Bundle* bundle,
+ const String16& resourceName,
+ const sp<AaptFile>& file,
+ const sp<XMLNode>& parent);
+
+
sp<AaptFile> flatten(Bundle* bundle, const sp<const ResourceFilter>& filter,
const bool isBase);
@@ -586,6 +595,11 @@
Res_value* outValue);
int getPublicAttributeSdkLevel(uint32_t attrId) const;
+ status_t processBundleFormatImpl(const Bundle* bundle,
+ const String16& resourceName,
+ const sp<AaptFile>& file,
+ const sp<XMLNode>& parent,
+ Vector<sp<XMLNode> >* namespaces);
String16 mAssetsPackage;
PackageType mPackageType;
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index dc08eb8..5b215da 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -693,6 +693,12 @@
return mChildren;
}
+
+Vector<sp<XMLNode> >& XMLNode::getChildren()
+{
+ return mChildren;
+}
+
const String8& XMLNode::getFilename() const
{
return mFilename;
@@ -717,6 +723,18 @@
return NULL;
}
+bool XMLNode::removeAttribute(const String16& ns, const String16& name)
+{
+ for (size_t i = 0; i < mAttributes.size(); i++) {
+ const attribute_entry& ae(mAttributes.itemAt(i));
+ if (ae.ns == ns && ae.name == name) {
+ removeAttribute(i);
+ return true;
+ }
+ }
+ return false;
+}
+
XMLNode::attribute_entry* XMLNode::editAttribute(const String16& ns,
const String16& name)
{
diff --git a/tools/aapt/XMLNode.h b/tools/aapt/XMLNode.h
index b9e5cd5..749bf9f 100644
--- a/tools/aapt/XMLNode.h
+++ b/tools/aapt/XMLNode.h
@@ -55,7 +55,7 @@
sp<XMLNode> newCData(const String8& filename) {
return new XMLNode(filename);
}
-
+
enum type {
TYPE_NAMESPACE,
TYPE_ELEMENT,
@@ -70,6 +70,7 @@
const String16& getElementNamespace() const;
const String16& getElementName() const;
const Vector<sp<XMLNode> >& getChildren() const;
+ Vector<sp<XMLNode> >& getChildren();
const String8& getFilename() const;
@@ -97,6 +98,7 @@
const Vector<attribute_entry>& getAttributes() const;
const attribute_entry* getAttribute(const String16& ns, const String16& name) const;
+ bool removeAttribute(const String16& ns, const String16& name);
attribute_entry* editAttribute(const String16& ns, const String16& name);
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index ec29c38..d8e0aac 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -58,8 +58,9 @@
ResourceValues.cpp \
SdkConstants.cpp \
StringPool.cpp \
- XmlDom.cpp \
- XmlPullParser.cpp
+ xml/XmlDom.cpp \
+ xml/XmlPullParser.cpp \
+ xml/XmlUtil.cpp
testSources := \
compile/IdAssigner_test.cpp \
@@ -90,8 +91,9 @@
ResourceUtils_test.cpp \
StringPool_test.cpp \
ValueVisitor_test.cpp \
- XmlDom_test.cpp \
- XmlPullParser_test.cpp
+ xml/XmlDom_test.cpp \
+ xml/XmlPullParser_test.cpp \
+ xml/XmlUtil_test.cpp
toolSources := \
compile/Compile.cpp \
diff --git a/tools/aapt2/Diagnostics.h b/tools/aapt2/Diagnostics.h
index 7ea26b3..ab4d284 100644
--- a/tools/aapt2/Diagnostics.h
+++ b/tools/aapt2/Diagnostics.h
@@ -18,7 +18,6 @@
#define AAPT_DIAGNOSTICS_H
#include "Source.h"
-
#include "util/StringPiece.h"
#include "util/Util.h"
diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index f2a1878..c2ddb5c 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -19,9 +19,8 @@
#include "ResourceUtils.h"
#include "ResourceValues.h"
#include "ValueVisitor.h"
-#include "XmlPullParser.h"
-
#include "util/Util.h"
+#include "xml/XmlPullParser.h"
#include <sstream>
@@ -29,26 +28,6 @@
constexpr const char16_t* sXliffNamespaceUri = u"urn:oasis:names:tc:xliff:document:1.2";
-static Maybe<StringPiece16> findAttribute(XmlPullParser* parser, const StringPiece16& name) {
- auto iter = parser->findAttribute(u"", name);
- if (iter != parser->endAttributes()) {
- return StringPiece16(util::trimWhitespace(iter->value));
- }
- return {};
-}
-
-static Maybe<StringPiece16> findNonEmptyAttribute(XmlPullParser* parser,
- const StringPiece16& name) {
- auto iter = parser->findAttribute(u"", name);
- if (iter != parser->endAttributes()) {
- StringPiece16 trimmed = util::trimWhitespace(iter->value);
- if (!trimmed.empty()) {
- return trimmed;
- }
- }
- return {};
-}
-
/**
* Returns true if the element is <skip> or <eat-comment> and can be safely ignored.
*/
@@ -65,7 +44,7 @@
/**
* Build a string from XML that converts nested elements into Span objects.
*/
-bool ResourceParser::flattenXmlSubtree(XmlPullParser* parser, std::u16string* outRawString,
+bool ResourceParser::flattenXmlSubtree(xml::XmlPullParser* parser, std::u16string* outRawString,
StyleString* outStyleString) {
std::vector<Span> spanStack;
@@ -74,9 +53,9 @@
outStyleString->spans.clear();
util::StringBuilder builder;
size_t depth = 1;
- while (XmlPullParser::isGoodEvent(parser->next())) {
- const XmlPullParser::Event event = parser->getEvent();
- if (event == XmlPullParser::Event::kEndElement) {
+ while (xml::XmlPullParser::isGoodEvent(parser->next())) {
+ const xml::XmlPullParser::Event event = parser->getEvent();
+ if (event == xml::XmlPullParser::Event::kEndElement) {
if (!parser->getElementNamespace().empty()) {
// We already warned and skipped the start element, so just skip here too
continue;
@@ -91,11 +70,11 @@
outStyleString->spans.push_back(spanStack.back());
spanStack.pop_back();
- } else if (event == XmlPullParser::Event::kText) {
+ } else if (event == xml::XmlPullParser::Event::kText) {
outRawString->append(parser->getText());
builder.append(parser->getText());
- } else if (event == XmlPullParser::Event::kStartElement) {
+ } else if (event == xml::XmlPullParser::Event::kStartElement) {
if (!parser->getElementNamespace().empty()) {
if (parser->getElementNamespace() != sXliffNamespaceUri) {
// Only warn if this isn't an xliff namespace.
@@ -128,7 +107,7 @@
spanStack.push_back(Span{ spanName, static_cast<uint32_t>(builder.str().size()) });
}
- } else if (event == XmlPullParser::Event::kComment) {
+ } else if (event == xml::XmlPullParser::Event::kComment) {
// Skip
} else {
assert(false);
@@ -140,11 +119,11 @@
return !error;
}
-bool ResourceParser::parse(XmlPullParser* parser) {
+bool ResourceParser::parse(xml::XmlPullParser* parser) {
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Skip comments and text.
continue;
}
@@ -159,7 +138,7 @@
break;
};
- if (parser->getEvent() == XmlPullParser::Event::kBadDocument) {
+ if (parser->getEvent() == xml::XmlPullParser::Event::kBadDocument) {
mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
<< "xml parser error: " << parser->getLastError());
return false;
@@ -167,10 +146,11 @@
return !error;
}
-static bool shouldStripResource(XmlPullParser* parser, const Maybe<std::u16string> productToMatch) {
- assert(parser->getEvent() == XmlPullParser::Event::kStartElement);
+static bool shouldStripResource(const xml::XmlPullParser* parser,
+ const Maybe<std::u16string> productToMatch) {
+ assert(parser->getEvent() == xml::XmlPullParser::Event::kStartElement);
- if (Maybe<StringPiece16> maybeProduct = findNonEmptyAttribute(parser, u"product")) {
+ if (Maybe<StringPiece16> maybeProduct = xml::findNonEmptyAttribute(parser, u"product")) {
if (!productToMatch) {
if (maybeProduct.value() != u"default" && maybeProduct.value() != u"phone") {
// We didn't specify a product and this is not a default product, so skip.
@@ -229,20 +209,20 @@
return !error;
}
-bool ResourceParser::parseResources(XmlPullParser* parser) {
+bool ResourceParser::parseResources(xml::XmlPullParser* parser) {
std::set<ResourceName> strippedResources;
bool error = false;
std::u16string comment;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- const XmlPullParser::Event event = parser->getEvent();
- if (event == XmlPullParser::Event::kComment) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ const xml::XmlPullParser::Event event = parser->getEvent();
+ if (event == xml::XmlPullParser::Event::kComment) {
comment = parser->getComment();
continue;
}
- if (event == XmlPullParser::Event::kText) {
+ if (event == xml::XmlPullParser::Event::kText) {
if (!util::trimWhitespace(parser->getText()).empty()) {
mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
<< "plain text not allowed here");
@@ -251,7 +231,7 @@
continue;
}
- assert(event == XmlPullParser::Event::kStartElement);
+ assert(event == xml::XmlPullParser::Event::kStartElement);
if (!parser->getElementNamespace().empty()) {
// Skip unknown namespace.
@@ -266,7 +246,7 @@
if (elementName == u"item") {
// Items simply have their type encoded in the type attribute.
- if (Maybe<StringPiece16> maybeType = findNonEmptyAttribute(parser, u"type")) {
+ if (Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type")) {
elementName = maybeType.value().toString();
} else {
mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
@@ -280,7 +260,7 @@
parsedResource.source = mSource.withLine(parser->getLineNumber());
parsedResource.comment = std::move(comment);
- if (Maybe<StringPiece16> maybeName = findNonEmptyAttribute(parser, u"name")) {
+ if (Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name")) {
parsedResource.name.entry = maybeName.value().toString();
} else if (elementName != u"public-group") {
@@ -403,7 +383,7 @@
* an Item. If allowRawValue is false, nullptr is returned in this
* case.
*/
-std::unique_ptr<Item> ResourceParser::parseXml(XmlPullParser* parser, const uint32_t typeMask,
+std::unique_ptr<Item> ResourceParser::parseXml(xml::XmlPullParser* parser, const uint32_t typeMask,
const bool allowRawValue) {
const size_t beginXmlLine = parser->getLineNumber();
@@ -432,10 +412,7 @@
if (processedItem) {
// Fix up the reference.
if (Reference* ref = valueCast<Reference>(processedItem.get())) {
- if (Maybe<ResourceName> transformedName =
- parser->transformPackage(ref->name.value(), u"")) {
- ref->name = std::move(transformedName);
- }
+ transformReferenceFromNamespace(parser, u"", ref);
}
return processedItem;
}
@@ -456,11 +433,11 @@
return {};
}
-bool ResourceParser::parseString(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parseString(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
bool formatted = true;
- if (Maybe<StringPiece16> formattedAttr = findAttribute(parser, u"formatted")) {
+ if (Maybe<StringPiece16> formattedAttr = xml::findAttribute(parser, u"formatted")) {
if (!ResourceUtils::tryParseBool(formattedAttr.value(), &formatted)) {
mDiag->error(DiagMessage(source) << "invalid value for 'formatted'. Must be a boolean");
return false;
@@ -468,7 +445,7 @@
}
bool translateable = mOptions.translatable;
- if (Maybe<StringPiece16> translateableAttr = findAttribute(parser, u"translatable")) {
+ if (Maybe<StringPiece16> translateableAttr = xml::findAttribute(parser, u"translatable")) {
if (!ResourceUtils::tryParseBool(translateableAttr.value(), &translateable)) {
mDiag->error(DiagMessage(source)
<< "invalid value for 'translatable'. Must be a boolean");
@@ -495,7 +472,7 @@
return true;
}
-bool ResourceParser::parseColor(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parseColor(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
outResource->value = parseXml(parser, android::ResTable_map::TYPE_COLOR, kNoRawString);
@@ -506,7 +483,7 @@
return true;
}
-bool ResourceParser::parsePrimitive(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parsePrimitive(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
uint32_t typeMask = 0;
@@ -540,10 +517,10 @@
return true;
}
-bool ResourceParser::parsePublic(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parsePublic(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeType = findNonEmptyAttribute(parser, u"type");
+ Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type");
if (!maybeType) {
mDiag->error(DiagMessage(source) << "<public> must have a 'type' attribute");
return false;
@@ -558,7 +535,7 @@
outResource->name.type = *parsedType;
- if (Maybe<StringPiece16> maybeId = findNonEmptyAttribute(parser, u"id")) {
+ if (Maybe<StringPiece16> maybeId = xml::findNonEmptyAttribute(parser, u"id")) {
android::Res_value val;
bool result = android::ResTable::stringToInt(maybeId.value().data(),
maybeId.value().size(), &val);
@@ -580,10 +557,10 @@
return true;
}
-bool ResourceParser::parsePublicGroup(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parsePublicGroup(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeType = findNonEmptyAttribute(parser, u"type");
+ Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type");
if (!maybeType) {
mDiag->error(DiagMessage(source) << "<public-group> must have a 'type' attribute");
return false;
@@ -596,7 +573,7 @@
return false;
}
- Maybe<StringPiece16> maybeId = findNonEmptyAttribute(parser, u"first-id");
+ Maybe<StringPiece16> maybeId = xml::findNonEmptyAttribute(parser, u"first-id");
if (!maybeId) {
mDiag->error(DiagMessage(source) << "<public-group> must have a 'first-id' attribute");
return false;
@@ -615,11 +592,11 @@
std::u16string comment;
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() == XmlPullParser::Event::kComment) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() == xml::XmlPullParser::Event::kComment) {
comment = util::trimWhitespace(parser->getComment()).toString();
continue;
- } else if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ } else if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Skip text.
continue;
}
@@ -628,20 +605,20 @@
const std::u16string& elementNamespace = parser->getElementNamespace();
const std::u16string& elementName = parser->getElementName();
if (elementNamespace.empty() && elementName == u"public") {
- Maybe<StringPiece16> maybeName = findNonEmptyAttribute(parser, u"name");
+ Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
if (!maybeName) {
mDiag->error(DiagMessage(itemSource) << "<public> must have a 'name' attribute");
error = true;
continue;
}
- if (findNonEmptyAttribute(parser, u"id")) {
+ if (xml::findNonEmptyAttribute(parser, u"id")) {
mDiag->error(DiagMessage(itemSource) << "'id' is ignored within <public-group>");
error = true;
continue;
}
- if (findNonEmptyAttribute(parser, u"type")) {
+ if (xml::findNonEmptyAttribute(parser, u"type")) {
mDiag->error(DiagMessage(itemSource) << "'type' is ignored within <public-group>");
error = true;
continue;
@@ -666,10 +643,10 @@
return !error;
}
-bool ResourceParser::parseSymbol(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parseSymbol(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeType = findNonEmptyAttribute(parser, u"type");
+ Maybe<StringPiece16> maybeType = xml::findNonEmptyAttribute(parser, u"type");
if (!maybeType) {
mDiag->error(DiagMessage(source) << "<" << parser->getElementName() << "> must have a "
"'type' attribute");
@@ -715,17 +692,16 @@
return mask;
}
-
-
-bool ResourceParser::parseAttr(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parseAttr(xml::XmlPullParser* parser, ParsedResource* outResource) {
outResource->source = mSource.withLine(parser->getLineNumber());
return parseAttrImpl(parser, outResource, false);
}
-bool ResourceParser::parseAttrImpl(XmlPullParser* parser, ParsedResource* outResource, bool weak) {
+bool ResourceParser::parseAttrImpl(xml::XmlPullParser* parser, ParsedResource* outResource,
+ bool weak) {
uint32_t typeMask = 0;
- Maybe<StringPiece16> maybeFormat = findAttribute(parser, u"format");
+ Maybe<StringPiece16> maybeFormat = xml::findAttribute(parser, u"format");
if (maybeFormat) {
typeMask = parseFormatAttribute(maybeFormat.value());
if (typeMask == 0) {
@@ -735,28 +711,62 @@
}
}
- // If this is a declaration, the package name may be in the name. Separate these out.
- // Eg. <attr name="android:text" />
- // No format attribute is allowed.
- if (weak && !maybeFormat) {
- StringPiece16 package, type, name;
- ResourceUtils::extractResourceName(outResource->name.entry, &package, &type, &name);
- if (type.empty() && !package.empty()) {
- outResource->name.package = package.toString();
- outResource->name.entry = name.toString();
+ Maybe<int32_t> maybeMin, maybeMax;
+
+ if (Maybe<StringPiece16> maybeMinStr = xml::findAttribute(parser, u"min")) {
+ StringPiece16 minStr = util::trimWhitespace(maybeMinStr.value());
+ if (!minStr.empty()) {
+ android::Res_value value;
+ if (android::ResTable::stringToInt(minStr.data(), minStr.size(), &value)) {
+ maybeMin = static_cast<int32_t>(value.data);
+ }
+ }
+
+ if (!maybeMin) {
+ mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
+ << "invalid 'min' value '" << minStr << "'");
+ return false;
}
}
- std::vector<Attribute::Symbol> items;
+ if (Maybe<StringPiece16> maybeMaxStr = xml::findAttribute(parser, u"max")) {
+ StringPiece16 maxStr = util::trimWhitespace(maybeMaxStr.value());
+ if (!maxStr.empty()) {
+ android::Res_value value;
+ if (android::ResTable::stringToInt(maxStr.data(), maxStr.size(), &value)) {
+ maybeMax = static_cast<int32_t>(value.data);
+ }
+ }
+
+ if (!maybeMax) {
+ mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
+ << "invalid 'max' value '" << maxStr << "'");
+ return false;
+ }
+ }
+
+ if ((maybeMin || maybeMax) && (typeMask & android::ResTable_map::TYPE_INTEGER) == 0) {
+ mDiag->error(DiagMessage(mSource.withLine(parser->getLineNumber()))
+ << "'min' and 'max' can only be used when format='integer'");
+ return false;
+ }
+
+ struct SymbolComparator {
+ bool operator()(const Attribute::Symbol& a, const Attribute::Symbol& b) {
+ return a.symbol.name.value() < b.symbol.name.value();
+ }
+ };
+
+ std::set<Attribute::Symbol, SymbolComparator> items;
std::u16string comment;
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() == XmlPullParser::Event::kComment) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() == xml::XmlPullParser::Event::kComment) {
comment = util::trimWhitespace(parser->getComment()).toString();
continue;
- } else if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ } else if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Skip text.
continue;
}
@@ -785,15 +795,27 @@
}
if (Maybe<Attribute::Symbol> s = parseEnumOrFlagItem(parser, elementName)) {
+ Attribute::Symbol& symbol = s.value();
ParsedResource childResource;
- childResource.name = s.value().symbol.name.value();
+ childResource.name = symbol.symbol.name.value();
childResource.source = itemSource;
childResource.value = util::make_unique<Id>();
outResource->childResources.push_back(std::move(childResource));
- s.value().symbol.setComment(std::move(comment));
- s.value().symbol.setSource(itemSource);
- items.push_back(std::move(s.value()));
+ symbol.symbol.setComment(std::move(comment));
+ symbol.symbol.setSource(itemSource);
+
+ auto insertResult = items.insert(std::move(symbol));
+ if (!insertResult.second) {
+ const Attribute::Symbol& existingSymbol = *insertResult.first;
+ mDiag->error(DiagMessage(itemSource)
+ << "duplicate symbol '" << existingSymbol.symbol.name.value().entry
+ << "'");
+
+ mDiag->note(DiagMessage(existingSymbol.symbol.getSource())
+ << "first defined here");
+ error = true;
+ }
} else {
error = true;
}
@@ -810,23 +832,30 @@
}
std::unique_ptr<Attribute> attr = util::make_unique<Attribute>(weak);
- attr->symbols.swap(items);
+ attr->symbols = std::vector<Attribute::Symbol>(items.begin(), items.end());
attr->typeMask = typeMask ? typeMask : uint32_t(android::ResTable_map::TYPE_ANY);
+ if (maybeMin) {
+ attr->minInt = maybeMin.value();
+ }
+
+ if (maybeMax) {
+ attr->maxInt = maybeMax.value();
+ }
outResource->value = std::move(attr);
return true;
}
-Maybe<Attribute::Symbol> ResourceParser::parseEnumOrFlagItem(XmlPullParser* parser,
+Maybe<Attribute::Symbol> ResourceParser::parseEnumOrFlagItem(xml::XmlPullParser* parser,
const StringPiece16& tag) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeName = findNonEmptyAttribute(parser, u"name");
+ Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
if (!maybeName) {
mDiag->error(DiagMessage(source) << "no attribute 'name' found for tag <" << tag << ">");
return {};
}
- Maybe<StringPiece16> maybeValue = findNonEmptyAttribute(parser, u"value");
+ Maybe<StringPiece16> maybeValue = xml::findNonEmptyAttribute(parser, u"value");
if (!maybeValue) {
mDiag->error(DiagMessage(source) << "no attribute 'value' found for tag <" << tag << ">");
return {};
@@ -845,12 +874,19 @@
val.data };
}
-static Maybe<ResourceName> parseXmlAttributeName(StringPiece16 str) {
+static Maybe<Reference> parseXmlAttributeName(StringPiece16 str) {
str = util::trimWhitespace(str);
- const char16_t* const start = str.data();
+ const char16_t* start = str.data();
const char16_t* const end = start + str.size();
const char16_t* p = start;
+ Reference ref;
+ if (p != end && *p == u'*') {
+ ref.privateReference = true;
+ start++;
+ p++;
+ }
+
StringPiece16 package;
StringPiece16 name;
while (p != end) {
@@ -862,28 +898,28 @@
p++;
}
- return ResourceName(package.toString(), ResourceType::kAttr,
+ ref.name = ResourceName(package.toString(), ResourceType::kAttr,
name.empty() ? str.toString() : name.toString());
+ return Maybe<Reference>(std::move(ref));
}
-bool ResourceParser::parseStyleItem(XmlPullParser* parser, Style* style) {
+bool ResourceParser::parseStyleItem(xml::XmlPullParser* parser, Style* style) {
const Source source = mSource.withLine(parser->getLineNumber());
- Maybe<StringPiece16> maybeName = findNonEmptyAttribute(parser, u"name");
+ Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
if (!maybeName) {
mDiag->error(DiagMessage(source) << "<item> must have a 'name' attribute");
return false;
}
- Maybe<ResourceName> maybeKey = parseXmlAttributeName(maybeName.value());
+ Maybe<Reference> maybeKey = parseXmlAttributeName(maybeName.value());
if (!maybeKey) {
mDiag->error(DiagMessage(source) << "invalid attribute name '" << maybeName.value() << "'");
return false;
}
- if (Maybe<ResourceName> transformedName = parser->transformPackage(maybeKey.value(), u"")) {
- maybeKey = std::move(transformedName);
- }
+ transformReferenceFromNamespace(parser, u"", &maybeKey.value());
+ maybeKey.value().setSource(source);
std::unique_ptr<Item> value = parseXml(parser, 0, kAllowRawString);
if (!value) {
@@ -891,15 +927,15 @@
return false;
}
- style->entries.push_back(Style::Entry{ Reference(maybeKey.value()), std::move(value) });
+ style->entries.push_back(Style::Entry{ std::move(maybeKey.value()), std::move(value) });
return true;
}
-bool ResourceParser::parseStyle(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parseStyle(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
std::unique_ptr<Style> style = util::make_unique<Style>();
- Maybe<StringPiece16> maybeParent = findAttribute(parser, u"parent");
+ Maybe<StringPiece16> maybeParent = xml::findAttribute(parser, u"parent");
if (maybeParent) {
// If the parent is empty, we don't have a parent, but we also don't infer either.
if (!maybeParent.value().empty()) {
@@ -910,10 +946,9 @@
return false;
}
- if (Maybe<ResourceName> transformedName =
- parser->transformPackage(style->parent.value().name.value(), u"")) {
- style->parent.value().name = std::move(transformedName);
- }
+ // Transform the namespace prefix to the actual package name, and mark the reference as
+ // private if appropriate.
+ transformReferenceFromNamespace(parser, u"", &style->parent.value());
}
} else {
@@ -922,15 +957,15 @@
size_t pos = styleName.find_last_of(u'.');
if (pos != std::string::npos) {
style->parentInferred = true;
- style->parent = Reference(
- ResourceName({}, ResourceType::kStyle, styleName.substr(0, pos)));
+ style->parent = Reference(ResourceName({}, ResourceType::kStyle,
+ styleName.substr(0, pos)));
}
}
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Skip text and comments.
continue;
}
@@ -955,15 +990,15 @@
return true;
}
-bool ResourceParser::parseArray(XmlPullParser* parser, ParsedResource* outResource,
+bool ResourceParser::parseArray(xml::XmlPullParser* parser, ParsedResource* outResource,
uint32_t typeMask) {
const Source source = mSource.withLine(parser->getLineNumber());
std::unique_ptr<Array> array = util::make_unique<Array>();
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Skip text and comments.
continue;
}
@@ -996,14 +1031,14 @@
return true;
}
-bool ResourceParser::parsePlural(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parsePlural(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
std::unique_ptr<Plural> plural = util::make_unique<Plural>();
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Skip text and comments.
continue;
}
@@ -1012,16 +1047,15 @@
const std::u16string& elementNamespace = parser->getElementNamespace();
const std::u16string& elementName = parser->getElementName();
if (elementNamespace.empty() && elementName == u"item") {
- const auto endAttrIter = parser->endAttributes();
- auto attrIter = parser->findAttribute(u"", u"quantity");
- if (attrIter == endAttrIter || attrIter->value.empty()) {
+ Maybe<StringPiece16> maybeQuantity = xml::findNonEmptyAttribute(parser, u"quantity");
+ if (!maybeQuantity) {
mDiag->error(DiagMessage(itemSource) << "<item> in <plurals> requires attribute "
<< "'quantity'");
error = true;
continue;
}
- StringPiece16 trimmedQuantity = util::trimWhitespace(attrIter->value);
+ StringPiece16 trimmedQuantity = util::trimWhitespace(maybeQuantity.value());
size_t index = 0;
if (trimmedQuantity == u"zero") {
index = Plural::Zero;
@@ -1071,7 +1105,7 @@
return true;
}
-bool ResourceParser::parseDeclareStyleable(XmlPullParser* parser, ParsedResource* outResource) {
+bool ResourceParser::parseDeclareStyleable(xml::XmlPullParser* parser, ParsedResource* outResource) {
const Source source = mSource.withLine(parser->getLineNumber());
std::unique_ptr<Styleable> styleable = util::make_unique<Styleable>();
@@ -1081,11 +1115,11 @@
std::u16string comment;
bool error = false;
const size_t depth = parser->getDepth();
- while (XmlPullParser::nextChildNode(parser, depth)) {
- if (parser->getEvent() == XmlPullParser::Event::kComment) {
+ while (xml::XmlPullParser::nextChildNode(parser, depth)) {
+ if (parser->getEvent() == xml::XmlPullParser::Event::kComment) {
comment = util::trimWhitespace(parser->getComment()).toString();
continue;
- } else if (parser->getEvent() != XmlPullParser::Event::kStartElement) {
+ } else if (parser->getEvent() != xml::XmlPullParser::Event::kStartElement) {
// Ignore text.
continue;
}
@@ -1094,17 +1128,29 @@
const std::u16string& elementNamespace = parser->getElementNamespace();
const std::u16string& elementName = parser->getElementName();
if (elementNamespace.empty() && elementName == u"attr") {
- const auto endAttrIter = parser->endAttributes();
- auto attrIter = parser->findAttribute(u"", u"name");
- if (attrIter == endAttrIter || attrIter->value.empty()) {
+ Maybe<StringPiece16> maybeName = xml::findNonEmptyAttribute(parser, u"name");
+ if (!maybeName) {
mDiag->error(DiagMessage(itemSource) << "<attr> tag must have a 'name' attribute");
error = true;
continue;
}
+ // If this is a declaration, the package name may be in the name. Separate these out.
+ // Eg. <attr name="android:text" />
+ Maybe<Reference> maybeRef = parseXmlAttributeName(maybeName.value());
+ if (!maybeRef) {
+ mDiag->error(DiagMessage(itemSource) << "<attr> tag has invalid name '"
+ << maybeName.value() << "'");
+ error = true;
+ continue;
+ }
+
+ Reference& childRef = maybeRef.value();
+ xml::transformReferenceFromNamespace(parser, u"", &childRef);
+
// Create the ParsedResource that will add the attribute to the table.
ParsedResource childResource;
- childResource.name = ResourceName({}, ResourceType::kAttr, attrIter->value);
+ childResource.name = childRef.name.value();
childResource.source = itemSource;
childResource.comment = std::move(comment);
@@ -1114,7 +1160,6 @@
}
// Create the reference to this attribute.
- Reference childRef(childResource.name);
childRef.setComment(childResource.comment);
childRef.setSource(itemSource);
styleable->entries.push_back(std::move(childRef));
diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h
index 18101ee..1150758 100644
--- a/tools/aapt2/ResourceParser.h
+++ b/tools/aapt2/ResourceParser.h
@@ -22,10 +22,9 @@
#include "ResourceTable.h"
#include "ResourceValues.h"
#include "StringPool.h"
-#include "XmlPullParser.h"
-
#include "util/Maybe.h"
#include "util/StringPiece.h"
+#include "xml/XmlPullParser.h"
#include <memory>
@@ -57,7 +56,7 @@
ResourceParser(const ResourceParser&) = delete; // No copy.
- bool parse(XmlPullParser* parser);
+ bool parse(xml::XmlPullParser* parser);
private:
/*
@@ -66,7 +65,7 @@
* contains the escaped and whitespace trimmed text, while `outRawString`
* contains the unescaped text. Returns true on success.
*/
- bool flattenXmlSubtree(XmlPullParser* parser, std::u16string* outRawString,
+ bool flattenXmlSubtree(xml::XmlPullParser* parser, std::u16string* outRawString,
StyleString* outStyleString);
/*
@@ -75,24 +74,25 @@
* If `allowRawValue` is true and the subtree can not be parsed as a regular Item, then a
* RawString is returned. Otherwise this returns false;
*/
- std::unique_ptr<Item> parseXml(XmlPullParser* parser, const uint32_t typeMask,
+ std::unique_ptr<Item> parseXml(xml::XmlPullParser* parser, const uint32_t typeMask,
const bool allowRawValue);
- bool parseResources(XmlPullParser* parser);
- bool parseString(XmlPullParser* parser, ParsedResource* outResource);
- bool parseColor(XmlPullParser* parser, ParsedResource* outResource);
- bool parsePrimitive(XmlPullParser* parser, ParsedResource* outResource);
- bool parsePublic(XmlPullParser* parser, ParsedResource* outResource);
- bool parsePublicGroup(XmlPullParser* parser, ParsedResource* outResource);
- bool parseSymbol(XmlPullParser* parser, ParsedResource* outResource);
- bool parseAttr(XmlPullParser* parser, ParsedResource* outResource);
- bool parseAttrImpl(XmlPullParser* parser, ParsedResource* outResource, bool weak);
- Maybe<Attribute::Symbol> parseEnumOrFlagItem(XmlPullParser* parser, const StringPiece16& tag);
- bool parseStyle(XmlPullParser* parser, ParsedResource* outResource);
- bool parseStyleItem(XmlPullParser* parser, Style* style);
- bool parseDeclareStyleable(XmlPullParser* parser, ParsedResource* outResource);
- bool parseArray(XmlPullParser* parser, ParsedResource* outResource, uint32_t typeMask);
- bool parsePlural(XmlPullParser* parser, ParsedResource* outResource);
+ bool parseResources(xml::XmlPullParser* parser);
+ bool parseString(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parseColor(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parsePrimitive(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parsePublic(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parsePublicGroup(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parseSymbol(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parseAttr(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parseAttrImpl(xml::XmlPullParser* parser, ParsedResource* outResource, bool weak);
+ Maybe<Attribute::Symbol> parseEnumOrFlagItem(xml::XmlPullParser* parser,
+ const StringPiece16& tag);
+ bool parseStyle(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parseStyleItem(xml::XmlPullParser* parser, Style* style);
+ bool parseDeclareStyleable(xml::XmlPullParser* parser, ParsedResource* outResource);
+ bool parseArray(xml::XmlPullParser* parser, ParsedResource* outResource, uint32_t typeMask);
+ bool parsePlural(xml::XmlPullParser* parser, ParsedResource* outResource);
IDiagnostics* mDiag;
ResourceTable* mTable;
diff --git a/tools/aapt2/ResourceParser_test.cpp b/tools/aapt2/ResourceParser_test.cpp
index b59eb95..6e0812b 100644
--- a/tools/aapt2/ResourceParser_test.cpp
+++ b/tools/aapt2/ResourceParser_test.cpp
@@ -18,9 +18,8 @@
#include "ResourceTable.h"
#include "ResourceUtils.h"
#include "ResourceValues.h"
-#include "XmlPullParser.h"
-
#include "test/Context.h"
+#include "xml/XmlPullParser.h"
#include <gtest/gtest.h>
#include <sstream>
@@ -36,7 +35,7 @@
input << "<attr name=\"foo\"/>" << std::endl;
ResourceTable table;
ResourceParser parser(context->getDiagnostics(), &table, Source{ "test" }, {});
- XmlPullParser xmlParser(input);
+ xml::XmlPullParser xmlParser(input);
ASSERT_FALSE(parser.parse(&xmlParser));
}
@@ -56,7 +55,7 @@
parserOptions.product = product;
ResourceParser parser(mContext->getDiagnostics(), &mTable, Source{ "test" }, {},
parserOptions);
- XmlPullParser xmlParser(input);
+ xml::XmlPullParser xmlParser(input);
if (parser.parse(&xmlParser)) {
return ::testing::AssertionSuccess();
}
@@ -139,6 +138,22 @@
EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_ANY), attr->typeMask);
}
+TEST_F(ResourceParserTest, ParseAttrWithMinMax) {
+ std::string input = "<attr name=\"foo\" min=\"10\" max=\"23\" format=\"integer\"/>";
+ ASSERT_TRUE(testParse(input));
+
+ Attribute* attr = test::getValue<Attribute>(&mTable, u"@attr/foo");
+ ASSERT_NE(nullptr, attr);
+ EXPECT_EQ(uint32_t(android::ResTable_map::TYPE_INTEGER), attr->typeMask);
+ EXPECT_EQ(10, attr->minInt);
+ EXPECT_EQ(23, attr->maxInt);
+}
+
+TEST_F(ResourceParserTest, FailParseAttrWithMinMaxButNotInteger) {
+ std::string input = "<attr name=\"foo\" min=\"10\" max=\"23\" format=\"string\"/>";
+ ASSERT_FALSE(testParse(input));
+}
+
TEST_F(ResourceParserTest, ParseUseAndDeclOfAttr) {
std::string input = "<declare-styleable name=\"Styleable\">\n"
" <attr name=\"foo\" />\n"
@@ -360,6 +375,25 @@
EXPECT_EQ(test::parseNameOrDie(u"@attr/bat"), styleable->entries[1].name.value());
}
+TEST_F(ResourceParserTest, ParsePrivateAttributesDeclareStyleable) {
+ std::string input = "<declare-styleable name=\"foo\" xmlns:privAndroid=\"http://schemas.android.com/apk/prv/res/android\">\n"
+ " <attr name=\"*android:bar\" />\n"
+ " <attr name=\"privAndroid:bat\" />\n"
+ "</declare-styleable>";
+ ASSERT_TRUE(testParse(input));
+ Styleable* styleable = test::getValue<Styleable>(&mTable, u"@styleable/foo");
+ ASSERT_NE(nullptr, styleable);
+ ASSERT_EQ(2u, styleable->entries.size());
+
+ EXPECT_TRUE(styleable->entries[0].privateReference);
+ AAPT_ASSERT_TRUE(styleable->entries[0].name);
+ EXPECT_EQ(std::u16string(u"android"), styleable->entries[0].name.value().package);
+
+ EXPECT_TRUE(styleable->entries[1].privateReference);
+ AAPT_ASSERT_TRUE(styleable->entries[1].name);
+ EXPECT_EQ(std::u16string(u"android"), styleable->entries[1].name.value().package);
+}
+
TEST_F(ResourceParserTest, ParseArray) {
std::string input = "<array name=\"foo\">\n"
" <item>@string/ref</item>\n"
diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp
index d3c3c10..ffe6595 100644
--- a/tools/aapt2/ResourceUtils.cpp
+++ b/tools/aapt2/ResourceUtils.cpp
@@ -15,6 +15,7 @@
*/
#include "ResourceUtils.h"
+#include "flatten/ResourceTypeExtensions.h"
#include "util/Util.h"
#include <androidfw/ResourceTypes.h>
@@ -23,22 +24,64 @@
namespace aapt {
namespace ResourceUtils {
-void extractResourceName(const StringPiece16& str, StringPiece16* outPackage,
+bool extractResourceName(const StringPiece16& str, StringPiece16* outPackage,
StringPiece16* outType, StringPiece16* outEntry) {
+ bool hasPackageSeparator = false;
+ bool hasTypeSeparator = false;
const char16_t* start = str.data();
const char16_t* end = start + str.size();
const char16_t* current = start;
while (current != end) {
if (outType->size() == 0 && *current == u'/') {
+ hasTypeSeparator = true;
outType->assign(start, current - start);
start = current + 1;
} else if (outPackage->size() == 0 && *current == u':') {
+ hasPackageSeparator = true;
outPackage->assign(start, current - start);
start = current + 1;
}
current++;
}
outEntry->assign(start, end - start);
+
+ return !(hasPackageSeparator && outPackage->empty()) && !(hasTypeSeparator && outType->empty());
+}
+
+bool parseResourceName(const StringPiece16& str, ResourceNameRef* outRef, bool* outPrivate) {
+ size_t offset = 0;
+ bool priv = false;
+ if (str.data()[0] == u'*') {
+ priv = true;
+ offset = 1;
+ }
+
+ StringPiece16 package;
+ StringPiece16 type;
+ StringPiece16 entry;
+ if (!extractResourceName(str.substr(offset, str.size() - offset), &package, &type, &entry)) {
+ return false;
+ }
+
+ const ResourceType* parsedType = parseResourceType(type);
+ if (!parsedType) {
+ return false;
+ }
+
+ if (entry.empty()) {
+ return false;
+ }
+
+ if (outRef) {
+ outRef->package = package;
+ outRef->type = *parsedType;
+ outRef->entry = entry;
+ }
+
+ if (outPrivate) {
+ *outPrivate = priv;
+ }
+ return true;
}
bool tryParseReference(const StringPiece16& str, ResourceNameRef* outRef, bool* outCreate,
@@ -55,33 +98,30 @@
if (trimmedStr.data()[1] == u'+') {
create = true;
offset += 1;
- } else if (trimmedStr.data()[1] == u'*') {
- priv = true;
- offset += 1;
}
- StringPiece16 package;
- StringPiece16 type;
- StringPiece16 entry;
- extractResourceName(trimmedStr.substr(offset, trimmedStr.size() - offset), &package, &type,
- &entry);
- const ResourceType* parsedType = parseResourceType(type);
- if (!parsedType) {
+ ResourceNameRef name;
+ if (!parseResourceName(trimmedStr.substr(offset, trimmedStr.size() - offset),
+ &name, &priv)) {
return false;
}
- if (create && *parsedType != ResourceType::kId) {
+ if (create && priv) {
return false;
}
- if (outRef != nullptr) {
- outRef->package = package;
- outRef->type = *parsedType;
- outRef->entry = entry;
+ if (create && name.type != ResourceType::kId) {
+ return false;
}
+
+ if (outRef) {
+ *outRef = name;
+ }
+
if (outCreate) {
*outCreate = create;
}
+
if (outPrivate) {
*outPrivate = priv;
}
@@ -104,20 +144,33 @@
StringPiece16 package;
StringPiece16 type;
StringPiece16 entry;
- extractResourceName(trimmedStr.substr(1, trimmedStr.size() - 1), &package, &type, &entry);
+ if (!extractResourceName(trimmedStr.substr(1, trimmedStr.size() - 1),
+ &package, &type, &entry)) {
+ return false;
+ }
if (!type.empty() && type != u"attr") {
return false;
}
- outRef->package = package;
- outRef->type = ResourceType::kAttr;
- outRef->entry = entry;
+ if (entry.empty()) {
+ return false;
+ }
+
+ if (outRef) {
+ outRef->package = package;
+ outRef->type = ResourceType::kAttr;
+ outRef->entry = entry;
+ }
return true;
}
return false;
}
+bool isAttributeReference(const StringPiece16& str) {
+ return tryParseAttributeReference(str, nullptr);
+}
+
/*
* Style parent's are a bit different. We accept the following formats:
*
diff --git a/tools/aapt2/ResourceUtils.h b/tools/aapt2/ResourceUtils.h
index 851edc8..f93a4c7 100644
--- a/tools/aapt2/ResourceUtils.h
+++ b/tools/aapt2/ResourceUtils.h
@@ -34,10 +34,18 @@
*
* where the package can be empty. Validation must be performed on each
* individual extracted piece to verify that the pieces are valid.
+ * Returns false if there was no package but a ':' was present.
*/
-void extractResourceName(const StringPiece16& str, StringPiece16* outPackage,
+bool extractResourceName(const StringPiece16& str, StringPiece16* outPackage,
StringPiece16* outType, StringPiece16* outEntry);
+/**
+ * Returns true if the string was parsed as a resource name ([*][package:]type/name), with
+ * `outResource` set to the parsed resource name and `outPrivate` set to true if a '*' prefix
+ * was present.
+ */
+bool parseResourceName(const StringPiece16& str, ResourceNameRef* outResource, bool* outPrivate);
+
/*
* Returns true if the string was parsed as a reference (@[+][package:]type/name), with
* `outReference` set to the parsed reference.
@@ -54,12 +62,17 @@
bool isReference(const StringPiece16& str);
/*
- * Returns true if the string was parsed as an attribute reference (?[package:]type/name),
+ * Returns true if the string was parsed as an attribute reference (?[package:][type/]name),
* with `outReference` set to the parsed reference.
*/
bool tryParseAttributeReference(const StringPiece16& str, ResourceNameRef* outReference);
/**
+ * Returns true if the string is in the form of an attribute reference(?[package:][type/]name).
+ */
+bool isAttributeReference(const StringPiece16& str);
+
+/**
* Returns true if the value is a boolean, putting the result in `outValue`.
*/
bool tryParseBool(const StringPiece16& str, bool* outValue);
diff --git a/tools/aapt2/ResourceUtils_test.cpp b/tools/aapt2/ResourceUtils_test.cpp
index 7de8f41..4bbfc32 100644
--- a/tools/aapt2/ResourceUtils_test.cpp
+++ b/tools/aapt2/ResourceUtils_test.cpp
@@ -16,15 +16,30 @@
#include "Resource.h"
#include "ResourceUtils.h"
-
#include "test/Common.h"
#include <gtest/gtest.h>
namespace aapt {
+TEST(ResourceUtilsTest, ParseResourceName) {
+ ResourceNameRef actual;
+ bool actualPriv = false;
+ EXPECT_TRUE(ResourceUtils::parseResourceName(u"android:color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef(u"android", ResourceType::kColor, u"foo"), actual);
+ EXPECT_FALSE(actualPriv);
+
+ EXPECT_TRUE(ResourceUtils::parseResourceName(u"color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef({}, ResourceType::kColor, u"foo"), actual);
+ EXPECT_FALSE(actualPriv);
+
+ EXPECT_TRUE(ResourceUtils::parseResourceName(u"*android:color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef(u"android", ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(actualPriv);
+}
+
TEST(ResourceUtilsTest, ParseReferenceWithNoPackage) {
- ResourceNameRef expected = { {}, ResourceType::kColor, u"foo" };
+ ResourceNameRef expected({}, ResourceType::kColor, u"foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
@@ -35,7 +50,7 @@
}
TEST(ResourceUtilsTest, ParseReferenceWithPackage) {
- ResourceNameRef expected = { u"android", ResourceType::kColor, u"foo" };
+ ResourceNameRef expected(u"android", ResourceType::kColor, u"foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
@@ -47,7 +62,7 @@
}
TEST(ResourceUtilsTest, ParseReferenceWithSurroundingWhitespace) {
- ResourceNameRef expected = { u"android", ResourceType::kColor, u"foo" };
+ ResourceNameRef expected(u"android", ResourceType::kColor, u"foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
@@ -59,7 +74,7 @@
}
TEST(ResourceUtilsTest, ParseAutoCreateIdReference) {
- ResourceNameRef expected = { u"android", ResourceType::kId, u"foo" };
+ ResourceNameRef expected(u"android", ResourceType::kId, u"foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
@@ -71,7 +86,7 @@
}
TEST(ResourceUtilsTest, ParsePrivateReference) {
- ResourceNameRef expected = { u"android", ResourceType::kId, u"foo" };
+ ResourceNameRef expected(u"android", ResourceType::kId, u"foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
@@ -90,9 +105,29 @@
&privateRef));
}
+TEST(ResourceUtilsTest, ParseAttributeReferences) {
+ EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android:foo"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?attr/foo"));
+ EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android:attr/foo"));
+}
+
+TEST(ResourceUtilsTest, FailParseIncompleteReference) {
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?style/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:style/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:attr/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:attr/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:attr/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:/foo"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?attr/"));
+ EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?/foo"));
+}
+
TEST(ResourceUtilsTest, ParseStyleParentReference) {
- const ResourceName kAndroidStyleFooName = { u"android", ResourceType::kStyle, u"foo" };
- const ResourceName kStyleFooName = { {}, ResourceType::kStyle, u"foo" };
+ const ResourceName kAndroidStyleFooName(u"android", ResourceType::kStyle, u"foo");
+ const ResourceName kStyleFooName({}, ResourceType::kStyle, u"foo");
std::string errStr;
Maybe<Reference> ref = ResourceUtils::parseStyleParentReference(u"@android:style/foo", &errStr);
diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp
index 8acff0d..04c375f 100644
--- a/tools/aapt2/ResourceValues.cpp
+++ b/tools/aapt2/ResourceValues.cpp
@@ -15,9 +15,9 @@
*/
#include "Resource.h"
+#include "ResourceUtils.h"
#include "ResourceValues.h"
#include "ValueVisitor.h"
-
#include "util/Util.h"
#include "flatten/ResourceTypeExtensions.h"
@@ -71,27 +71,23 @@
}
bool Reference::flatten(android::Res_value* outValue) const {
- outValue->dataType = (referenceType == Reference::Type::kResource)
- ? android::Res_value::TYPE_REFERENCE
- : android::Res_value::TYPE_ATTRIBUTE;
+ outValue->dataType = (referenceType == Reference::Type::kResource) ?
+ android::Res_value::TYPE_REFERENCE : android::Res_value::TYPE_ATTRIBUTE;
outValue->data = util::hostToDevice32(id ? id.value().id : 0);
return true;
}
Reference* Reference::clone(StringPool* /*newPool*/) const {
- Reference* ref = new Reference();
- ref->mComment = mComment;
- ref->mSource = mSource;
- ref->referenceType = referenceType;
- ref->name = name;
- ref->id = id;
- return ref;
+ return new Reference(*this);
}
void Reference::print(std::ostream* out) const {
*out << "(reference) ";
if (referenceType == Reference::Type::kResource) {
*out << "@";
+ if (privateReference) {
+ *out << "*";
+ }
} else {
*out << "?";
}
@@ -116,10 +112,7 @@
}
Id* Id::clone(StringPool* /*newPool*/) const {
- Id* id = new Id();
- id->mComment = mComment;
- id->mSource = mSource;
- return id;
+ return new Id(*this);
}
void Id::print(std::ostream* out) const {
@@ -214,10 +207,7 @@
}
BinaryPrimitive* BinaryPrimitive::clone(StringPool* /*newPool*/) const {
- BinaryPrimitive* bp = new BinaryPrimitive(value);
- bp->mComment = mComment;
- bp->mSource = mSource;
- return bp;
+ return new BinaryPrimitive(*this);
}
void BinaryPrimitive::print(std::ostream* out) const {
@@ -226,7 +216,7 @@
*out << "(null)";
break;
case android::Res_value::TYPE_INT_DEC:
- *out << "(integer) " << value.data;
+ *out << "(integer) " << static_cast<int32_t>(value.data);
break;
case android::Res_value::TYPE_INT_HEX:
*out << "(integer) " << std::hex << value.data << std::dec;
@@ -247,7 +237,10 @@
}
}
-Attribute::Attribute(bool w, uint32_t t) : weak(w), typeMask(t) {
+Attribute::Attribute(bool w, uint32_t t) :
+ weak(w), typeMask(t),
+ minInt(std::numeric_limits<int32_t>::min()),
+ maxInt(std::numeric_limits<int32_t>::max()) {
}
bool Attribute::isWeak() const {
@@ -255,12 +248,7 @@
}
Attribute* Attribute::clone(StringPool* /*newPool*/) const {
- Attribute* attr = new Attribute(weak);
- attr->mComment = mComment;
- attr->mSource = mSource;
- attr->typeMask = typeMask;
- std::copy(symbols.begin(), symbols.end(), std::back_inserter(attr->symbols));
- return attr;
+ return new Attribute(*this);
}
void Attribute::printMask(std::ostream* out) const {
@@ -376,6 +364,81 @@
}
}
+static void buildAttributeMismatchMessage(DiagMessage* msg, const Attribute* attr,
+ const Item* value) {
+ *msg << "expected";
+ if (attr->typeMask & android::ResTable_map::TYPE_BOOLEAN) {
+ *msg << " boolean";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_COLOR) {
+ *msg << " color";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_DIMENSION) {
+ *msg << " dimension";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_ENUM) {
+ *msg << " enum";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_FLAGS) {
+ *msg << " flags";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_FLOAT) {
+ *msg << " float";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_FRACTION) {
+ *msg << " fraction";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_INTEGER) {
+ *msg << " integer";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_REFERENCE) {
+ *msg << " reference";
+ }
+
+ if (attr->typeMask & android::ResTable_map::TYPE_STRING) {
+ *msg << " string";
+ }
+
+ *msg << " but got " << *value;
+}
+
+bool Attribute::matches(const Item* item, DiagMessage* outMsg) const {
+ android::Res_value val = {};
+ item->flatten(&val);
+
+ // Always allow references.
+ const uint32_t mask = typeMask | android::ResTable_map::TYPE_REFERENCE;
+ if (!(mask & ResourceUtils::androidTypeToAttributeTypeMask(val.dataType))) {
+ if (outMsg) {
+ buildAttributeMismatchMessage(outMsg, this, item);
+ }
+ return false;
+
+ } else if (ResourceUtils::androidTypeToAttributeTypeMask(val.dataType) &
+ android::ResTable_map::TYPE_INTEGER) {
+ if (static_cast<int32_t>(util::deviceToHost32(val.data)) < minInt) {
+ if (outMsg) {
+ *outMsg << *item << " is less than minimum integer " << minInt;
+ }
+ return false;
+ } else if (static_cast<int32_t>(util::deviceToHost32(val.data)) > maxInt) {
+ if (outMsg) {
+ *outMsg << *item << " is greater than maximum integer " << maxInt;
+ }
+ return false;
+ }
+ }
+ return true;
+}
+
Style* Style::clone(StringPool* newPool) const {
Style* style = new Style();
style->parent = parent;
@@ -450,11 +513,7 @@
}
Styleable* Styleable::clone(StringPool* /*newPool*/) const {
- Styleable* styleable = new Styleable();
- styleable->mComment = mComment;
- styleable->mSource = mSource;
- std::copy(entries.begin(), entries.end(), std::back_inserter(styleable->entries));
- return styleable;
+ return new Styleable(*this);
}
void Styleable::print(std::ostream* out) const {
diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h
index 7ae346a..a038282 100644
--- a/tools/aapt2/ResourceValues.h
+++ b/tools/aapt2/ResourceValues.h
@@ -17,9 +17,10 @@
#ifndef AAPT_RESOURCE_VALUES_H
#define AAPT_RESOURCE_VALUES_H
-#include "util/Maybe.h"
+#include "Diagnostics.h"
#include "Resource.h"
#include "StringPool.h"
+#include "util/Maybe.h"
#include <array>
#include <androidfw/ResourceTypes.h>
@@ -233,8 +234,8 @@
bool weak;
uint32_t typeMask;
- uint32_t minInt;
- uint32_t maxInt;
+ int32_t minInt;
+ int32_t maxInt;
std::vector<Symbol> symbols;
Attribute(bool w, uint32_t t = 0u);
@@ -243,6 +244,7 @@
Attribute* clone(StringPool* newPool) const override;
void printMask(std::ostream* out) const;
void print(std::ostream* out) const override;
+ bool matches(const Item* item, DiagMessage* outMsg) const;
};
struct Style : public BaseValue<Style> {
diff --git a/tools/aapt2/Source.h b/tools/aapt2/Source.h
index 8af203c..319528e 100644
--- a/tools/aapt2/Source.h
+++ b/tools/aapt2/Source.h
@@ -58,6 +58,10 @@
return out;
}
+inline bool operator==(const Source& lhs, const Source& rhs) {
+ return lhs.path == rhs.path && lhs.line == rhs.line;
+}
+
inline bool operator<(const Source& lhs, const Source& rhs) {
int cmp = lhs.path.compare(rhs.path);
if (cmp < 0) return true;
diff --git a/tools/aapt2/compile/Compile.cpp b/tools/aapt2/compile/Compile.cpp
index 39088bc..90e35d5 100644
--- a/tools/aapt2/compile/Compile.cpp
+++ b/tools/aapt2/compile/Compile.cpp
@@ -19,19 +19,20 @@
#include "Flags.h"
#include "ResourceParser.h"
#include "ResourceTable.h"
-#include "XmlDom.h"
-#include "XmlPullParser.h"
-
#include "compile/IdAssigner.h"
#include "compile/Png.h"
#include "compile/XmlIdCollector.h"
+#include "flatten/Archive.h"
#include "flatten/FileExportWriter.h"
#include "flatten/TableFlattener.h"
#include "flatten/XmlFlattener.h"
#include "util/Files.h"
#include "util/Maybe.h"
#include "util/Util.h"
+#include "xml/XmlDom.h"
+#include "xml/XmlPullParser.h"
+#include <dirent.h>
#include <fstream>
#include <string>
@@ -91,7 +92,7 @@
}
return ResourcePathData{
- Source{ path },
+ Source(path),
util::utf8ToUtf16(dirStr),
util::utf8ToUtf16(name),
extension.toString(),
@@ -102,25 +103,79 @@
struct CompileOptions {
std::string outputPath;
+ Maybe<std::string> resDir;
Maybe<std::u16string> product;
bool verbose = false;
};
-static std::string buildIntermediateFilename(const std::string outDir,
- const ResourcePathData& data) {
+static std::string buildIntermediateFilename(const ResourcePathData& data) {
std::stringstream name;
name << data.resourceDir;
if (!data.configStr.empty()) {
name << "-" << data.configStr;
}
name << "_" << data.name << "." << data.extension << ".flat";
- std::string outPath = outDir;
- file::appendPath(&outPath, name.str());
- return outPath;
+ return name.str();
+}
+
+static bool isHidden(const StringPiece& filename) {
+ return util::stringStartsWith<char>(filename, ".");
+}
+
+/**
+ * Walks the res directory structure, looking for resource files.
+ */
+static bool loadInputFilesFromDir(IAaptContext* context, const CompileOptions& options,
+ std::vector<ResourcePathData>* outPathData) {
+ const std::string& rootDir = options.resDir.value();
+ std::unique_ptr<DIR, decltype(closedir)*> d(opendir(rootDir.data()), closedir);
+ if (!d) {
+ context->getDiagnostics()->error(DiagMessage() << strerror(errno));
+ return false;
+ }
+
+ while (struct dirent* entry = readdir(d.get())) {
+ if (isHidden(entry->d_name)) {
+ continue;
+ }
+
+ std::string prefixPath = rootDir;
+ file::appendPath(&prefixPath, entry->d_name);
+
+ if (file::getFileType(prefixPath) != file::FileType::kDirectory) {
+ continue;
+ }
+
+ std::unique_ptr<DIR, decltype(closedir)*> subDir(opendir(prefixPath.data()), closedir);
+ if (!subDir) {
+ context->getDiagnostics()->error(DiagMessage() << strerror(errno));
+ return false;
+ }
+
+ while (struct dirent* leafEntry = readdir(subDir.get())) {
+ if (isHidden(leafEntry->d_name)) {
+ continue;
+ }
+
+ std::string fullPath = prefixPath;
+ file::appendPath(&fullPath, leafEntry->d_name);
+
+ std::string errStr;
+ Maybe<ResourcePathData> pathData = extractResourcePathData(fullPath, &errStr);
+ if (!pathData) {
+ context->getDiagnostics()->error(DiagMessage() << errStr);
+ return false;
+ }
+
+ outPathData->push_back(std::move(pathData.value()));
+ }
+ }
+ return true;
}
static bool compileTable(IAaptContext* context, const CompileOptions& options,
- const ResourcePathData& pathData, const std::string& outputPath) {
+ const ResourcePathData& pathData, IArchiveWriter* writer,
+ const std::string& outputPath) {
ResourceTable table;
{
std::ifstream fin(pathData.source.path, std::ifstream::binary);
@@ -131,7 +186,7 @@
// Parse the values file from XML.
- XmlPullParser xmlParser(fin);
+ xml::XmlPullParser xmlParser(fin);
ResourceParserOptions parserOptions;
parserOptions.product = options.product;
@@ -151,6 +206,7 @@
// Ensure we have the compilation package at least.
table.createPackage(context->getCompilationPackage());
+ // Assign an ID to any package that has resources.
for (auto& pkg : table.packages) {
if (!pkg->id) {
// If no package ID was set while parsing (public identifiers), auto assign an ID.
@@ -173,25 +229,26 @@
return false;
}
- // Build the output filename.
- std::ofstream fout(outputPath, std::ofstream::binary);
- if (!fout) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
+ if (!writer->startEntry(outputPath, 0)) {
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to open");
return false;
}
- // Write it to disk.
- if (!util::writeAll(fout, buffer)) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
- return false;
+ if (writer->writeEntry(buffer)) {
+ if (writer->finishEntry()) {
+ return true;
+ }
}
- return true;
+
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to write");
+ return false;
}
static bool compileXml(IAaptContext* context, const CompileOptions& options,
- const ResourcePathData& pathData, const std::string& outputPath) {
+ const ResourcePathData& pathData, IArchiveWriter* writer,
+ const std::string& outputPath) {
- std::unique_ptr<XmlResource> xmlRes;
+ std::unique_ptr<xml::XmlResource> xmlRes;
{
std::ifstream fin(pathData.source.path, std::ifstream::binary);
@@ -215,7 +272,7 @@
return false;
}
- xmlRes->file.name = ResourceName{ {}, *parseResourceType(pathData.resourceDir), pathData.name };
+ xmlRes->file.name = ResourceName({}, *parseResourceType(pathData.resourceDir), pathData.name);
xmlRes->file.config = pathData.config;
xmlRes->file.source = pathData.source;
@@ -231,25 +288,27 @@
fileExportWriter.finish();
- std::ofstream fout(outputPath, std::ofstream::binary);
- if (!fout) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
+ if (!writer->startEntry(outputPath, 0)) {
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to open");
return false;
}
- // Write it to disk.
- if (!util::writeAll(fout, buffer)) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
- return false;
+ if (writer->writeEntry(buffer)) {
+ if (writer->finishEntry()) {
+ return true;
+ }
}
- return true;
+
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to write");
+ return false;
}
static bool compilePng(IAaptContext* context, const CompileOptions& options,
- const ResourcePathData& pathData, const std::string& outputPath) {
+ const ResourcePathData& pathData, IArchiveWriter* writer,
+ const std::string& outputPath) {
BigBuffer buffer(4096);
ResourceFile resFile;
- resFile.name = ResourceName{ {}, *parseResourceType(pathData.resourceDir), pathData.name };
+ resFile.name = ResourceName({}, *parseResourceType(pathData.resourceDir), pathData.name);
resFile.config = pathData.config;
resFile.source = pathData.source;
@@ -270,24 +329,27 @@
fileExportWriter.finish();
- std::ofstream fout(outputPath, std::ofstream::binary);
- if (!fout) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
+ if (!writer->startEntry(outputPath, 0)) {
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to open");
return false;
}
- if (!util::writeAll(fout, buffer)) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
- return false;
+ if (writer->writeEntry(buffer)) {
+ if (writer->finishEntry()) {
+ return true;
+ }
}
- return true;
+
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to write");
+ return false;
}
static bool compileFile(IAaptContext* context, const CompileOptions& options,
- const ResourcePathData& pathData, const std::string& outputPath) {
+ const ResourcePathData& pathData, IArchiveWriter* writer,
+ const std::string& outputPath) {
BigBuffer buffer(256);
ResourceFile resFile;
- resFile.name = ResourceName{ {}, *parseResourceType(pathData.resourceDir), pathData.name };
+ resFile.name = ResourceName({}, *parseResourceType(pathData.resourceDir), pathData.name);
resFile.config = pathData.config;
resFile.source = pathData.source;
@@ -300,9 +362,8 @@
return false;
}
- std::ofstream fout(outputPath, std::ofstream::binary);
- if (!fout) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
+ if (!writer->startEntry(outputPath, 0)) {
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to open");
return false;
}
@@ -310,16 +371,17 @@
// the buffer the entire file.
fileExportWriter.getChunkHeader()->size =
util::hostToDevice32(buffer.size() + f.value().getDataLength());
- if (!util::writeAll(fout, buffer)) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
- return false;
+
+ if (writer->writeEntry(buffer)) {
+ if (writer->writeEntry(f.value().getDataPtr(), f.value().getDataLength())) {
+ if (writer->finishEntry()) {
+ return true;
+ }
+ }
}
- if (!fout.write((const char*) f.value().getDataPtr(), f.value().getDataLength())) {
- context->getDiagnostics()->error(DiagMessage(Source{ outputPath }) << strerror(errno));
- return false;
- }
- return true;
+ context->getDiagnostics()->error(DiagMessage(outputPath) << "failed to write");
+ return false;
}
class CompileContext : public IAaptContext {
@@ -360,6 +422,7 @@
Flags flags = Flags()
.requiredFlag("-o", "Output path", &options.outputPath)
.optionalFlag("--product", "Product type to compile", &product)
+ .optionalFlag("--dir", "Directory to scan for resources", &options.resDir)
.optionalSwitch("-v", "Enables verbose logging", &options.verbose);
if (!flags.parse("aapt2 compile", args, &std::cerr)) {
return 1;
@@ -370,19 +433,42 @@
}
CompileContext context;
+ std::unique_ptr<IArchiveWriter> archiveWriter;
std::vector<ResourcePathData> inputData;
- inputData.reserve(flags.getArgs().size());
-
- // Collect data from the path for each input file.
- for (const std::string& arg : flags.getArgs()) {
- std::string errorStr;
- if (Maybe<ResourcePathData> pathData = extractResourcePathData(arg, &errorStr)) {
- inputData.push_back(std::move(pathData.value()));
- } else {
- context.getDiagnostics()->error(DiagMessage() << errorStr << " (" << arg << ")");
+ if (options.resDir) {
+ if (!flags.getArgs().empty()) {
+ // Can't have both files and a resource directory.
+ context.getDiagnostics()->error(DiagMessage() << "files given but --dir specified");
+ flags.usage("aapt2 compile", &std::cerr);
return 1;
}
+
+ if (!loadInputFilesFromDir(&context, options, &inputData)) {
+ return 1;
+ }
+
+ archiveWriter = createZipFileArchiveWriter(context.getDiagnostics(), options.outputPath);
+
+ } else {
+ inputData.reserve(flags.getArgs().size());
+
+ // Collect data from the path for each input file.
+ for (const std::string& arg : flags.getArgs()) {
+ std::string errorStr;
+ if (Maybe<ResourcePathData> pathData = extractResourcePathData(arg, &errorStr)) {
+ inputData.push_back(std::move(pathData.value()));
+ } else {
+ context.getDiagnostics()->error(DiagMessage() << errorStr << " (" << arg << ")");
+ return 1;
+ }
+ }
+
+ archiveWriter = createDirectoryArchiveWriter(context.getDiagnostics(), options.outputPath);
+ }
+
+ if (!archiveWriter) {
+ return false;
}
bool error = false;
@@ -395,32 +481,34 @@
// Overwrite the extension.
pathData.extension = "arsc";
- const std::string outputFilename = buildIntermediateFilename(
- options.outputPath, pathData);
- if (!compileTable(&context, options, pathData, outputFilename)) {
+ const std::string outputFilename = buildIntermediateFilename(pathData);
+ if (!compileTable(&context, options, pathData, archiveWriter.get(), outputFilename)) {
error = true;
}
} else {
- const std::string outputFilename = buildIntermediateFilename(options.outputPath,
- pathData);
+ const std::string outputFilename = buildIntermediateFilename(pathData);
if (const ResourceType* type = parseResourceType(pathData.resourceDir)) {
if (*type != ResourceType::kRaw) {
if (pathData.extension == "xml") {
- if (!compileXml(&context, options, pathData, outputFilename)) {
+ if (!compileXml(&context, options, pathData, archiveWriter.get(),
+ outputFilename)) {
error = true;
}
} else if (pathData.extension == "png" || pathData.extension == "9.png") {
- if (!compilePng(&context, options, pathData, outputFilename)) {
+ if (!compilePng(&context, options, pathData, archiveWriter.get(),
+ outputFilename)) {
error = true;
}
} else {
- if (!compileFile(&context, options, pathData, outputFilename)) {
+ if (!compileFile(&context, options, pathData, archiveWriter.get(),
+ outputFilename)) {
error = true;
}
}
} else {
- if (!compileFile(&context, options, pathData, outputFilename)) {
+ if (!compileFile(&context, options, pathData, archiveWriter.get(),
+ outputFilename)) {
error = true;
}
}
diff --git a/tools/aapt2/compile/XmlIdCollector.cpp b/tools/aapt2/compile/XmlIdCollector.cpp
index dfdf710..f40689e 100644
--- a/tools/aapt2/compile/XmlIdCollector.cpp
+++ b/tools/aapt2/compile/XmlIdCollector.cpp
@@ -16,9 +16,8 @@
#include "ResourceUtils.h"
#include "ResourceValues.h"
-#include "XmlDom.h"
-
#include "compile/XmlIdCollector.h"
+#include "xml/XmlDom.h"
#include <algorithm>
#include <vector>
@@ -61,7 +60,7 @@
} // namespace
-bool XmlIdCollector::consume(IAaptContext* context, XmlResource* xmlRes) {
+bool XmlIdCollector::consume(IAaptContext* context, xml::XmlResource* xmlRes) {
xmlRes->file.exportedSymbols.clear();
IdCollector collector(&xmlRes->file.exportedSymbols);
xmlRes->root->accept(&collector);
diff --git a/tools/aapt2/compile/XmlIdCollector.h b/tools/aapt2/compile/XmlIdCollector.h
index 96a58f2..1b14944 100644
--- a/tools/aapt2/compile/XmlIdCollector.h
+++ b/tools/aapt2/compile/XmlIdCollector.h
@@ -18,11 +18,12 @@
#define AAPT_XMLIDCOLLECTOR_H
#include "process/IResourceTableConsumer.h"
+#include "xml/XmlDom.h"
namespace aapt {
struct XmlIdCollector : public IXmlResourceConsumer {
- bool consume(IAaptContext* context, XmlResource* xmlRes) override;
+ bool consume(IAaptContext* context, xml::XmlResource* xmlRes) override;
};
} // namespace aapt
diff --git a/tools/aapt2/compile/XmlIdCollector_test.cpp b/tools/aapt2/compile/XmlIdCollector_test.cpp
index c703f451..45b7af2 100644
--- a/tools/aapt2/compile/XmlIdCollector_test.cpp
+++ b/tools/aapt2/compile/XmlIdCollector_test.cpp
@@ -26,7 +26,7 @@
TEST(XmlIdCollectorTest, CollectsIds) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom(R"EOF(
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/foo"
text="@+id/bar">
@@ -50,7 +50,7 @@
TEST(XmlIdCollectorTest, DontCollectNonIds) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
- std::unique_ptr<XmlResource> doc = test::buildXmlDom("<View foo=\"@+string/foo\"/>");
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom("<View foo=\"@+string/foo\"/>");
XmlIdCollector collector;
ASSERT_TRUE(collector.consume(context.get(), doc.get()));
diff --git a/tools/aapt2/flatten/Archive.cpp b/tools/aapt2/flatten/Archive.cpp
index 6db13b8..3a244c0 100644
--- a/tools/aapt2/flatten/Archive.cpp
+++ b/tools/aapt2/flatten/Archive.cpp
@@ -18,7 +18,7 @@
#include "util/Files.h"
#include "util/StringPiece.h"
-#include <fstream>
+#include <cstdio>
#include <memory>
#include <string>
#include <vector>
@@ -30,70 +30,85 @@
struct DirectoryWriter : public IArchiveWriter {
std::string mOutDir;
- std::vector<std::unique_ptr<ArchiveEntry>> mEntries;
+ std::unique_ptr<FILE, decltype(fclose)*> mFile = { nullptr, fclose };
- explicit DirectoryWriter(const StringPiece& outDir) : mOutDir(outDir.toString()) {
+ bool open(IDiagnostics* diag, const StringPiece& outDir) {
+ mOutDir = outDir.toString();
+ file::FileType type = file::getFileType(mOutDir);
+ if (type == file::FileType::kNonexistant) {
+ diag->error(DiagMessage() << "directory " << mOutDir << " does not exist");
+ return false;
+ } else if (type != file::FileType::kDirectory) {
+ diag->error(DiagMessage() << mOutDir << " is not a directory");
+ return false;
+ }
+ return true;
}
- ArchiveEntry* writeEntry(const StringPiece& path, uint32_t flags,
- const BigBuffer& buffer) override {
+ bool startEntry(const StringPiece& path, uint32_t flags) override {
+ if (mFile) {
+ return false;
+ }
+
std::string fullPath = mOutDir;
file::appendPath(&fullPath, path);
file::mkdirs(file::getStem(fullPath));
- std::ofstream fout(fullPath, std::ofstream::binary);
- if (!fout) {
- return nullptr;
+ mFile = { fopen(fullPath.data(), "wb"), fclose };
+ if (!mFile) {
+ return false;
}
-
- if (!util::writeAll(fout, buffer)) {
- return nullptr;
- }
-
- mEntries.push_back(util::make_unique<ArchiveEntry>(fullPath, flags, buffer.size()));
- return mEntries.back().get();
+ return true;
}
- ArchiveEntry* writeEntry(const StringPiece& path, uint32_t flags, android::FileMap* fileMap,
- size_t offset, size_t len) override {
- std::string fullPath = mOutDir;
- file::appendPath(&fullPath, path);
- file::mkdirs(file::getStem(fullPath));
-
- std::ofstream fout(fullPath, std::ofstream::binary);
- if (!fout) {
- return nullptr;
+ bool writeEntry(const BigBuffer& buffer) override {
+ if (!mFile) {
+ return false;
}
- if (!fout.write((const char*) fileMap->getDataPtr() + offset, len)) {
- return nullptr;
+ for (const BigBuffer::Block& b : buffer) {
+ if (fwrite(b.buffer.get(), 1, b.size, mFile.get()) != b.size) {
+ mFile.reset(nullptr);
+ return false;
+ }
}
-
- mEntries.push_back(util::make_unique<ArchiveEntry>(fullPath, flags, len));
- return mEntries.back().get();
+ return true;
}
- virtual ~DirectoryWriter() {
+ bool writeEntry(const void* data, size_t len) override {
+ if (fwrite(data, 1, len, mFile.get()) != len) {
+ mFile.reset(nullptr);
+ return false;
+ }
+ return true;
+ }
+ bool finishEntry() override {
+ if (!mFile) {
+ return false;
+ }
+ mFile.reset(nullptr);
+ return true;
}
};
struct ZipFileWriter : public IArchiveWriter {
- FILE* mFile;
+ std::unique_ptr<FILE, decltype(fclose)*> mFile = { nullptr, fclose };
std::unique_ptr<ZipWriter> mWriter;
- std::vector<std::unique_ptr<ArchiveEntry>> mEntries;
- explicit ZipFileWriter(const StringPiece& path) {
- mFile = fopen(path.data(), "w+b");
- if (mFile) {
- mWriter = util::make_unique<ZipWriter>(mFile);
+ bool open(IDiagnostics* diag, const StringPiece& path) {
+ mFile = { fopen(path.data(), "w+b"), fclose };
+ if (!mFile) {
+ diag->error(DiagMessage() << "failed to open " << path << ": " << strerror(errno));
+ return false;
}
+ mWriter = util::make_unique<ZipWriter>(mFile.get());
+ return true;
}
- ArchiveEntry* writeEntry(const StringPiece& path, uint32_t flags,
- const BigBuffer& buffer) override {
+ bool startEntry(const StringPiece& path, uint32_t flags) override {
if (!mWriter) {
- return nullptr;
+ return false;
}
size_t zipFlags = 0;
@@ -107,75 +122,63 @@
int32_t result = mWriter->StartEntry(path.data(), zipFlags);
if (result != 0) {
- return nullptr;
+ return false;
}
+ return true;
+ }
+ bool writeEntry(const void* data, size_t len) override {
+ int32_t result = mWriter->WriteBytes(data, len);
+ if (result != 0) {
+ return false;
+ }
+ return true;
+ }
+
+ bool writeEntry(const BigBuffer& buffer) override {
for (const BigBuffer::Block& b : buffer) {
- result = mWriter->WriteBytes(reinterpret_cast<const uint8_t*>(b.buffer.get()), b.size);
+ int32_t result = mWriter->WriteBytes(b.buffer.get(), b.size);
if (result != 0) {
- return nullptr;
+ return false;
}
}
-
- result = mWriter->FinishEntry();
- if (result != 0) {
- return nullptr;
- }
-
- mEntries.push_back(util::make_unique<ArchiveEntry>(path.toString(), flags, buffer.size()));
- return mEntries.back().get();
+ return true;
}
- ArchiveEntry* writeEntry(const StringPiece& path, uint32_t flags, android::FileMap* fileMap,
- size_t offset, size_t len) override {
- if (!mWriter) {
- return nullptr;
- }
-
- size_t zipFlags = 0;
- if (flags & ArchiveEntry::kCompress) {
- zipFlags |= ZipWriter::kCompress;
- }
-
- if (flags & ArchiveEntry::kAlign) {
- zipFlags |= ZipWriter::kAlign32;
- }
-
- int32_t result = mWriter->StartEntry(path.data(), zipFlags);
+ bool finishEntry() override {
+ int32_t result = mWriter->FinishEntry();
if (result != 0) {
- return nullptr;
+ return false;
}
-
- result = mWriter->WriteBytes((const char*) fileMap->getDataPtr() + offset, len);
- if (result != 0) {
- return nullptr;
- }
-
- result = mWriter->FinishEntry();
- if (result != 0) {
- return nullptr;
- }
-
- mEntries.push_back(util::make_unique<ArchiveEntry>(path.toString(), flags, len));
- return mEntries.back().get();
+ return true;
}
virtual ~ZipFileWriter() {
if (mWriter) {
mWriter->Finish();
- fclose(mFile);
}
}
};
} // namespace
-std::unique_ptr<IArchiveWriter> createDirectoryArchiveWriter(const StringPiece& path) {
- return util::make_unique<DirectoryWriter>(path);
+std::unique_ptr<IArchiveWriter> createDirectoryArchiveWriter(IDiagnostics* diag,
+ const StringPiece& path) {
+
+ std::unique_ptr<DirectoryWriter> writer = util::make_unique<DirectoryWriter>();
+ if (!writer->open(diag, path)) {
+ return {};
+ }
+ return std::move(writer);
}
-std::unique_ptr<IArchiveWriter> createZipFileArchiveWriter(const StringPiece& path) {
- return util::make_unique<ZipFileWriter>(path);
+std::unique_ptr<IArchiveWriter> createZipFileArchiveWriter(IDiagnostics* diag,
+ const StringPiece& path) {
+ std::unique_ptr<ZipFileWriter> writer = util::make_unique<ZipFileWriter>();
+ if (!writer->open(diag, path)) {
+ return {};
+ }
+ return std::move(writer);
}
} // namespace aapt
diff --git a/tools/aapt2/flatten/Archive.h b/tools/aapt2/flatten/Archive.h
index c4ddeb3..6da1d2a 100644
--- a/tools/aapt2/flatten/Archive.h
+++ b/tools/aapt2/flatten/Archive.h
@@ -17,6 +17,7 @@
#ifndef AAPT_FLATTEN_ARCHIVE_H
#define AAPT_FLATTEN_ARCHIVE_H
+#include "Diagnostics.h"
#include "util/BigBuffer.h"
#include "util/Files.h"
#include "util/StringPiece.h"
@@ -42,15 +43,17 @@
struct IArchiveWriter {
virtual ~IArchiveWriter() = default;
- virtual ArchiveEntry* writeEntry(const StringPiece& path, uint32_t flags,
- const BigBuffer& buffer) = 0;
- virtual ArchiveEntry* writeEntry(const StringPiece& path, uint32_t flags,
- android::FileMap* fileMap, size_t offset, size_t len) = 0;
+ virtual bool startEntry(const StringPiece& path, uint32_t flags) = 0;
+ virtual bool writeEntry(const BigBuffer& buffer) = 0;
+ virtual bool writeEntry(const void* data, size_t len) = 0;
+ virtual bool finishEntry() = 0;
};
-std::unique_ptr<IArchiveWriter> createDirectoryArchiveWriter(const StringPiece& path);
+std::unique_ptr<IArchiveWriter> createDirectoryArchiveWriter(IDiagnostics* diag,
+ const StringPiece& path);
-std::unique_ptr<IArchiveWriter> createZipFileArchiveWriter(const StringPiece& path);
+std::unique_ptr<IArchiveWriter> createZipFileArchiveWriter(IDiagnostics* diag,
+ const StringPiece& path);
} // namespace aapt
diff --git a/tools/aapt2/flatten/ResourceTypeExtensions.h b/tools/aapt2/flatten/ResourceTypeExtensions.h
index c1ff556..02bff2c 100644
--- a/tools/aapt2/flatten/ResourceTypeExtensions.h
+++ b/tools/aapt2/flatten/ResourceTypeExtensions.h
@@ -62,7 +62,29 @@
* A raw string value that hasn't had its escape sequences
* processed nor whitespace removed.
*/
- TYPE_RAW_STRING = 0xfe
+ TYPE_RAW_STRING = 0xfe,
+ };
+};
+
+/**
+ * New types for a ResTable_map.
+ */
+struct ExtendedResTableMapTypes {
+ enum {
+ /**
+ * Type that contains the source path of the next item in the map.
+ */
+ ATTR_SOURCE_PATH = Res_MAKEINTERNAL(0xffff),
+
+ /**
+ * Type that contains the source line of the next item in the map.
+ */
+ ATTR_SOURCE_LINE = Res_MAKEINTERNAL(0xfffe),
+
+ /**
+ * Type that contains the comment of the next item in the map.
+ */
+ ATTR_COMMENT = Res_MAKEINTERNAL(0xfffd)
};
};
diff --git a/tools/aapt2/flatten/TableFlattener.cpp b/tools/aapt2/flatten/TableFlattener.cpp
index 6b90fb2..f42e6b7 100644
--- a/tools/aapt2/flatten/TableFlattener.cpp
+++ b/tools/aapt2/flatten/TableFlattener.cpp
@@ -78,10 +78,18 @@
explicit SymbolWriter(StringPool* pool) : mPool(pool) {
}
- void addSymbol(const ResourceNameRef& name, size_t offset) {
- symbols.push_back(Entry{ mPool->makeRef(name.package.toString() + u":" +
- toString(name.type).toString() + u"/" +
- name.entry.toString()), offset });
+ void addSymbol(const Reference& ref, size_t offset) {
+ const ResourceName& name = ref.name.value();
+ std::u16string fullName;
+ if (ref.privateReference) {
+ fullName += u"*";
+ }
+
+ if (!name.package.empty()) {
+ fullName += name.package + u":";
+ }
+ fullName += toString(name.type).toString() + u"/" + name.entry;
+ symbols.push_back(Entry{ mPool->makeRef(fullName), offset });
}
void shiftAllOffsets(size_t offset) {
@@ -100,20 +108,27 @@
SymbolWriter* mSymbols;
FlatEntry* mEntry;
BigBuffer* mBuffer;
+ StringPool* mSourcePool;
+ StringPool* mCommentPool;
+ bool mUseExtendedChunks;
+
size_t mEntryCount = 0;
Maybe<uint32_t> mParentIdent;
Maybe<ResourceNameRef> mParentName;
- MapFlattenVisitor(SymbolWriter* symbols, FlatEntry* entry, BigBuffer* buffer) :
- mSymbols(symbols), mEntry(entry), mBuffer(buffer) {
+ MapFlattenVisitor(SymbolWriter* symbols, FlatEntry* entry, BigBuffer* buffer,
+ StringPool* sourcePool, StringPool* commentPool,
+ bool useExtendedChunks) :
+ mSymbols(symbols), mEntry(entry), mBuffer(buffer), mSourcePool(sourcePool),
+ mCommentPool(commentPool), mUseExtendedChunks(useExtendedChunks) {
}
void flattenKey(Reference* key, ResTable_map* outEntry) {
- if (!key->id) {
+ if (!key->id || (key->privateReference && mUseExtendedChunks)) {
assert(key->name && "reference must have a name");
outEntry->name.ident = util::hostToDevice32(0);
- mSymbols->addSymbol(key->name.value(), (mBuffer->size() - sizeof(ResTable_map)) +
+ mSymbols->addSymbol(*key, (mBuffer->size() - sizeof(ResTable_map)) +
offsetof(ResTable_map, name));
} else {
outEntry->name.ident = util::hostToDevice32(key->id.value().id);
@@ -121,16 +136,21 @@
}
void flattenValue(Item* value, ResTable_map* outEntry) {
+ bool privateRef = false;
if (Reference* ref = valueCast<Reference>(value)) {
- if (!ref->id) {
+ privateRef = ref->privateReference && mUseExtendedChunks;
+ if (!ref->id || privateRef) {
assert(ref->name && "reference must have a name");
- mSymbols->addSymbol(ref->name.value(), (mBuffer->size() - sizeof(ResTable_map)) +
+ mSymbols->addSymbol(*ref, (mBuffer->size() - sizeof(ResTable_map)) +
offsetof(ResTable_map, value) + offsetof(Res_value, data));
}
}
bool result = value->flatten(&outEntry->value);
+ if (privateRef) {
+ outEntry->value.data = 0;
+ }
assert(result && "flatten failed");
}
@@ -142,6 +162,32 @@
mEntryCount++;
}
+ void flattenMetaData(Value* value) {
+ if (!mUseExtendedChunks) {
+ return;
+ }
+
+ Reference key(ResourceId{ ExtendedResTableMapTypes::ATTR_SOURCE_PATH });
+ StringPool::Ref sourcePathRef = mSourcePool->makeRef(
+ util::utf8ToUtf16(value->getSource().path));
+ BinaryPrimitive val(Res_value::TYPE_INT_DEC,
+ static_cast<uint32_t>(sourcePathRef.getIndex()));
+ flattenEntry(&key, &val);
+
+ if (value->getSource().line) {
+ key.id = ResourceId(ExtendedResTableMapTypes::ATTR_SOURCE_LINE);
+ val.value.data = static_cast<uint32_t>(value->getSource().line.value());
+ flattenEntry(&key, &val);
+ }
+
+ if (!value->getComment().empty()) {
+ key.id = ResourceId(ExtendedResTableMapTypes::ATTR_COMMENT);
+ StringPool::Ref commentRef = mCommentPool->makeRef(value->getComment());
+ val.value.data = static_cast<uint32_t>(commentRef.getIndex());
+ flattenEntry(&key, &val);
+ }
+ }
+
void visit(Attribute* attr) override {
{
Reference key(ResourceId{ ResTable_map::ATTR_TYPE });
@@ -149,6 +195,18 @@
flattenEntry(&key, &val);
}
+ if (attr->minInt != std::numeric_limits<int32_t>::min()) {
+ Reference key(ResourceId{ ResTable_map::ATTR_MIN });
+ BinaryPrimitive val(Res_value::TYPE_INT_DEC, static_cast<uint32_t>(attr->minInt));
+ flattenEntry(&key, &val);
+ }
+
+ if (attr->maxInt != std::numeric_limits<int32_t>::max()) {
+ Reference key(ResourceId{ ResTable_map::ATTR_MAX });
+ BinaryPrimitive val(Res_value::TYPE_INT_DEC, static_cast<uint32_t>(attr->maxInt));
+ flattenEntry(&key, &val);
+ }
+
for (Attribute::Symbol& s : attr->symbols) {
BinaryPrimitive val(Res_value::TYPE_INT_DEC, s.value);
flattenEntry(&s.symbol, &val);
@@ -169,7 +227,8 @@
void visit(Style* style) override {
if (style->parent) {
- if (!style->parent.value().id) {
+ bool privateRef = style->parent.value().privateReference && mUseExtendedChunks;
+ if (!style->parent.value().id || privateRef) {
assert(style->parent.value().name && "reference must have a name");
mParentName = style->parent.value().name;
} else {
@@ -182,6 +241,7 @@
for (Style::Entry& entry : style->entries) {
flattenEntry(&entry.key, entry.value.get());
+ flattenMetaData(&entry.key);
}
}
@@ -189,6 +249,7 @@
for (auto& attrRef : styleable->entries) {
BinaryPrimitive val(Res_value{});
flattenEntry(&attrRef, &val);
+ flattenMetaData(&attrRef);
}
}
@@ -198,6 +259,7 @@
flattenValue(item.get(), outEntry);
outEntry->value.size = util::hostToDevice16(sizeof(outEntry->value));
mEntryCount++;
+ flattenMetaData(item.get());
}
}
@@ -241,6 +303,7 @@
Reference key(q);
flattenEntry(&key, plural->values[i].get());
+ flattenMetaData(plural->values[i].get());
}
}
};
@@ -339,21 +402,29 @@
bool flattenValue(FlatEntry* entry, BigBuffer* buffer) {
if (Item* item = valueCast<Item>(entry->value)) {
writeEntry<ResTable_entry, true>(entry, buffer);
+ bool privateRef = false;
if (Reference* ref = valueCast<Reference>(entry->value)) {
- if (!ref->id) {
+ // If there is no ID or the reference is private and we allow extended chunks,
+ // write out a 0 and mark the symbol table with the name of the reference.
+ privateRef = (ref->privateReference && mOptions.useExtendedChunks);
+ if (!ref->id || privateRef) {
assert(ref->name && "reference must have at least a name");
- mSymbols->addSymbol(ref->name.value(),
- buffer->size() + offsetof(Res_value, data));
+ mSymbols->addSymbol(*ref, buffer->size() + offsetof(Res_value, data));
}
}
Res_value* outValue = buffer->nextBlock<Res_value>();
bool result = item->flatten(outValue);
assert(result && "flatten failed");
+ if (privateRef) {
+ // Force the value of 0 so we look up the symbol at unflatten time.
+ outValue->data = 0;
+ }
outValue->size = util::hostToDevice16(sizeof(*outValue));
} else {
const size_t beforeEntry = buffer->size();
ResTable_entry_ext* outEntry = writeEntry<ResTable_entry_ext, false>(entry, buffer);
- MapFlattenVisitor visitor(mSymbols, entry, buffer);
+ MapFlattenVisitor visitor(mSymbols, entry, buffer, mSourcePool, mSourcePool,
+ mOptions.useExtendedChunks);
entry->value->accept(&visitor);
outEntry->count = util::hostToDevice32(visitor.mEntryCount);
if (visitor.mParentName) {
diff --git a/tools/aapt2/flatten/TableFlattener_test.cpp b/tools/aapt2/flatten/TableFlattener_test.cpp
index 68a1f47..7030603 100644
--- a/tools/aapt2/flatten/TableFlattener_test.cpp
+++ b/tools/aapt2/flatten/TableFlattener_test.cpp
@@ -15,11 +15,11 @@
*/
#include "flatten/TableFlattener.h"
+#include "test/Builders.h"
+#include "test/Context.h"
#include "unflatten/BinaryResourceParser.h"
#include "util/Util.h"
-#include "test/Builders.h"
-#include "test/Context.h"
#include <gtest/gtest.h>
@@ -262,4 +262,55 @@
EXPECT_EQ(ref->name.value(), test::parseNameOrDie(u"@com.app.test:color/green"));
}
+TEST_F(TableFlattenerTest, FlattenMinMaxAttributes) {
+ Attribute attr(false);
+ attr.typeMask = android::ResTable_map::TYPE_INTEGER;
+ attr.minInt = 10;
+ attr.maxInt = 23;
+ std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
+ .setPackageId(u"android", 0x01)
+ .addValue(u"@android:attr/foo", ResourceId(0x01010000),
+ util::make_unique<Attribute>(attr))
+ .build();
+
+ ResourceTable result;
+ ASSERT_TRUE(flatten(table.get(), &result));
+
+ Attribute* actualAttr = test::getValue<Attribute>(&result, u"@android:attr/foo");
+ ASSERT_NE(nullptr, actualAttr);
+ EXPECT_EQ(attr.isWeak(), actualAttr->isWeak());
+ EXPECT_EQ(attr.typeMask, actualAttr->typeMask);
+ EXPECT_EQ(attr.minInt, actualAttr->minInt);
+ EXPECT_EQ(attr.maxInt, actualAttr->maxInt);
+}
+
+TEST_F(TableFlattenerTest, FlattenSourceAndCommentsForChildrenOfCompoundValues) {
+ Style style;
+ Reference key(test::parseNameOrDie(u"@android:attr/foo"));
+ key.id = ResourceId(0x01010000);
+ key.setSource(Source("test").withLine(2));
+ key.setComment(StringPiece16(u"comment"));
+ style.entries.push_back(Style::Entry{ key, util::make_unique<Id>() });
+
+ test::ResourceTableBuilder builder = test::ResourceTableBuilder();
+ std::unique_ptr<ResourceTable> table = builder
+ .setPackageId(u"android", 0x01)
+ .addValue(u"@android:attr/foo", ResourceId(0x01010000),
+ test::AttributeBuilder().build())
+ .addValue(u"@android:style/foo", ResourceId(0x01020000),
+ std::unique_ptr<Style>(style.clone(builder.getStringPool())))
+ .build();
+
+ ResourceTable result;
+ ASSERT_TRUE(flatten(table.get(), &result));
+
+ Style* actualStyle = test::getValue<Style>(&result, u"@android:style/foo");
+ ASSERT_NE(nullptr, actualStyle);
+ ASSERT_EQ(1u, actualStyle->entries.size());
+
+ Reference* actualKey = &actualStyle->entries[0].key;
+ EXPECT_EQ(key.getSource(), actualKey->getSource());
+ EXPECT_EQ(key.getComment(), actualKey->getComment());
+}
+
} // namespace aapt
diff --git a/tools/aapt2/flatten/XmlFlattener.cpp b/tools/aapt2/flatten/XmlFlattener.cpp
index 4efb08b..8219462 100644
--- a/tools/aapt2/flatten/XmlFlattener.cpp
+++ b/tools/aapt2/flatten/XmlFlattener.cpp
@@ -15,15 +15,14 @@
*/
#include "SdkConstants.h"
-#include "XmlDom.h"
-
#include "flatten/ChunkWriter.h"
#include "flatten/ResourceTypeExtensions.h"
#include "flatten/XmlFlattener.h"
+#include "xml/XmlDom.h"
#include <androidfw/ResourceTypes.h>
-#include <vector>
#include <utils/misc.h>
+#include <vector>
using namespace android;
@@ -306,7 +305,7 @@
return true;
}
-bool XmlFlattener::consume(IAaptContext* context, XmlResource* resource) {
+bool XmlFlattener::consume(IAaptContext* context, xml::XmlResource* resource) {
if (!resource->root) {
return false;
}
diff --git a/tools/aapt2/flatten/XmlFlattener.h b/tools/aapt2/flatten/XmlFlattener.h
index b1fb3a7..a688ac9 100644
--- a/tools/aapt2/flatten/XmlFlattener.h
+++ b/tools/aapt2/flatten/XmlFlattener.h
@@ -17,16 +17,12 @@
#ifndef AAPT_FLATTEN_XMLFLATTENER_H
#define AAPT_FLATTEN_XMLFLATTENER_H
-#include "util/BigBuffer.h"
-
#include "process/IResourceTableConsumer.h"
+#include "util/BigBuffer.h"
+#include "xml/XmlDom.h"
namespace aapt {
-namespace xml {
-struct Node;
-}
-
struct XmlFlattenerOptions {
/**
* Keep attribute raw string values along with typed values.
@@ -45,7 +41,7 @@
mBuffer(buffer), mOptions(options) {
}
- bool consume(IAaptContext* context, XmlResource* resource) override;
+ bool consume(IAaptContext* context, xml::XmlResource* resource) override;
private:
BigBuffer* mBuffer;
diff --git a/tools/aapt2/flatten/XmlFlattener_test.cpp b/tools/aapt2/flatten/XmlFlattener_test.cpp
index 318bcdd..8648879 100644
--- a/tools/aapt2/flatten/XmlFlattener_test.cpp
+++ b/tools/aapt2/flatten/XmlFlattener_test.cpp
@@ -16,11 +16,10 @@
#include "flatten/XmlFlattener.h"
#include "link/Linkers.h"
-#include "util/BigBuffer.h"
-#include "util/Util.h"
-
#include "test/Builders.h"
#include "test/Context.h"
+#include "util/BigBuffer.h"
+#include "util/Util.h"
#include <androidfw/ResourceTypes.h>
#include <gtest/gtest.h>
@@ -45,7 +44,7 @@
.build();
}
- ::testing::AssertionResult flatten(XmlResource* doc, android::ResXMLTree* outTree,
+ ::testing::AssertionResult flatten(xml::XmlResource* doc, android::ResXMLTree* outTree,
XmlFlattenerOptions options = {}) {
BigBuffer buffer(1024);
XmlFlattener flattener(&buffer, options);
@@ -65,7 +64,7 @@
};
TEST_F(XmlFlattenerTest, FlattenXmlWithNoCompiledAttributes) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom(R"EOF(
<View xmlns:test="http://com.test"
attr="hey">
<Layout test:hello="hi" />
@@ -144,7 +143,7 @@
}
TEST_F(XmlFlattenerTest, FlattenCompiledXmlAndStripSdk21) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom(R"EOF(
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingStart="1dp"
android:colorAccent="#ffffff"/>)EOF");
@@ -169,7 +168,7 @@
}
TEST_F(XmlFlattenerTest, AssignSpecialAttributeIndices) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom(R"EOF(
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@id/id"
class="str"
@@ -192,7 +191,7 @@
* namespace.
*/
TEST_F(XmlFlattenerTest, NoNamespaceIsNotTheSameAsEmptyNamespace) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom("<View package=\"android\"/>");
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom("<View package=\"android\"/>");
android::ResXMLTree tree;
ASSERT_TRUE(flatten(doc.get(), &tree));
diff --git a/tools/aapt2/io/Data.h b/tools/aapt2/io/Data.h
new file mode 100644
index 0000000..9081c55
--- /dev/null
+++ b/tools/aapt2/io/Data.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef AAPT_IO_DATA_H
+#define AAPT_IO_DATA_H
+
+#include <utils/FileMap.h>
+
+#include <memory>
+
+namespace aapt {
+namespace io {
+
+/**
+ * Interface for a block of contiguous memory. An instance of this interface owns the data.
+ */
+class IData {
+public:
+ virtual ~IData() = default;
+
+ virtual const void* data() const = 0;
+ virtual size_t size() const = 0;
+};
+
+/**
+ * Implementation of IData that exposes a memory mapped file. The mmapped file is owned by this
+ * object.
+ */
+class MmappedData : public IData {
+public:
+ explicit MmappedData(android::FileMap&& map) : mMap(std::forward<android::FileMap>(map)) {
+ }
+
+ const void* data() const override {
+ return mMap.getDataPtr();
+ }
+
+ size_t size() const override {
+ return mMap.getDataLength();
+ }
+
+private:
+ android::FileMap mMap;
+};
+
+/**
+ * Implementation of IData that exposes a block of memory that was malloc'ed (new'ed). The
+ * memory is owned by this object.
+ */
+class MallocData : public IData {
+public:
+ MallocData(std::unique_ptr<const uint8_t[]> data, size_t size) :
+ mData(std::move(data)), mSize(size) {
+ }
+
+ const void* data() const override {
+ return mData.get();
+ }
+
+ size_t size() const override {
+ return mSize;
+ }
+
+private:
+ std::unique_ptr<const uint8_t[]> mData;
+ size_t mSize;
+};
+
+} // namespace io
+} // namespace aapt
+
+#endif /* AAPT_IO_DATA_H */
diff --git a/tools/aapt2/io/File.h b/tools/aapt2/io/File.h
new file mode 100644
index 0000000..9fca398
--- /dev/null
+++ b/tools/aapt2/io/File.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef AAPT_IO_FILE_H
+#define AAPT_IO_FILE_H
+
+#include "Source.h"
+#include "io/Data.h"
+
+#include <memory>
+#include <vector>
+
+namespace aapt {
+namespace io {
+
+/**
+ * Interface for a file, which could be a real file on the file system, or a file inside
+ * a ZIP archive.
+ */
+class IFile {
+public:
+ virtual ~IFile() = default;
+
+ /**
+ * Open the file and return it as a block of contiguous memory. How this occurs is
+ * implementation dependent. For example, if this is a file on the file system, it may
+ * simply mmap the contents. If this file represents a compressed file in a ZIP archive,
+ * it may need to inflate it to memory, incurring a copy.
+ *
+ * Returns nullptr on failure.
+ */
+ virtual std::unique_ptr<IData> openAsData() = 0;
+
+ /**
+ * Returns the source of this file. This is for presentation to the user and may not be a
+ * valid file system path (for example, it may contain a '@' sign to separate the files within
+ * a ZIP archive from the path to the containing ZIP archive.
+ */
+ virtual const Source& getSource() const = 0;
+};
+
+/**
+ * Interface for a collection of files, all of which share a common source. That source may
+ * simply be the filesystem, or a ZIP archive.
+ */
+class IFileCollection {
+public:
+ virtual ~IFileCollection() = default;
+
+ using const_iterator = std::vector<std::unique_ptr<IFile>>::const_iterator;
+
+ virtual const_iterator begin() const = 0;
+ virtual const_iterator end() const = 0;
+};
+
+} // namespace io
+} // namespace aapt
+
+#endif /* AAPT_IO_FILE_H */
diff --git a/tools/aapt2/io/FileSystem.h b/tools/aapt2/io/FileSystem.h
new file mode 100644
index 0000000..5dbefcc
--- /dev/null
+++ b/tools/aapt2/io/FileSystem.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef AAPT_IO_FILESYSTEM_H
+#define AAPT_IO_FILESYSTEM_H
+
+#include "io/File.h"
+#include "util/Files.h"
+
+namespace aapt {
+namespace io {
+
+/**
+ * A regular file from the file system. Uses mmap to open the data.
+ */
+class RegularFile : public IFile {
+public:
+ RegularFile(const Source& source) : mSource(source) {
+ }
+
+ std::unique_ptr<IData> openAsData() override {
+ android::FileMap map;
+ if (Maybe<android::FileMap> map = file::mmapPath(mSource.path, nullptr)) {
+ return util::make_unique<MmappedData>(std::move(map.value()));
+ }
+ return {};
+ }
+
+ const Source& getSource() const override {
+ return mSource;
+ }
+
+private:
+ Source mSource;
+};
+
+/**
+ * An IFileCollection representing the file system.
+ */
+class FileCollection : public IFileCollection {
+public:
+ /**
+ * Adds a file located at path. Returns the IFile representation of that file.
+ */
+ IFile* insertFile(const StringPiece& path) {
+ mFiles.push_back(util::make_unique<RegularFile>(Source(path)));
+ return mFiles.back().get();
+ }
+
+ const_iterator begin() const override {
+ return mFiles.begin();
+ }
+
+ const_iterator end() const override {
+ return mFiles.end();
+ }
+
+private:
+ std::vector<std::unique_ptr<IFile>> mFiles;
+};
+
+} // namespace io
+} // namespace aapt
+
+#endif // AAPT_IO_FILESYSTEM_H
diff --git a/tools/aapt2/io/ZipArchive.h b/tools/aapt2/io/ZipArchive.h
new file mode 100644
index 0000000..98afc49
--- /dev/null
+++ b/tools/aapt2/io/ZipArchive.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef AAPT_IO_ZIPARCHIVE_H
+#define AAPT_IO_ZIPARCHIVE_H
+
+#include "io/File.h"
+#include "util/StringPiece.h"
+
+#include <utils/FileMap.h>
+#include <ziparchive/zip_archive.h>
+
+namespace aapt {
+namespace io {
+
+/**
+ * An IFile representing a file within a ZIP archive. If the file is compressed, it is uncompressed
+ * and copied into memory when opened. Otherwise it is mmapped from the ZIP archive.
+ */
+class ZipFile : public IFile {
+public:
+ ZipFile(ZipArchiveHandle handle, const ZipEntry& entry, const Source& source) :
+ mZipHandle(handle), mZipEntry(entry), mSource(source) {
+ }
+
+ std::unique_ptr<IData> openAsData() override {
+ if (mZipEntry.method == kCompressStored) {
+ int fd = GetFileDescriptor(mZipHandle);
+
+ android::FileMap fileMap;
+ bool result = fileMap.create(nullptr, fd, mZipEntry.offset,
+ mZipEntry.uncompressed_length, true);
+ if (!result) {
+ return {};
+ }
+ return util::make_unique<MmappedData>(std::move(fileMap));
+
+ } else {
+ std::unique_ptr<uint8_t[]> data = std::unique_ptr<uint8_t[]>(
+ new uint8_t[mZipEntry.uncompressed_length]);
+ int32_t result = ExtractToMemory(mZipHandle, &mZipEntry, data.get(),
+ static_cast<uint32_t>(mZipEntry.uncompressed_length));
+ if (result != 0) {
+ return {};
+ }
+ return util::make_unique<MallocData>(std::move(data), mZipEntry.uncompressed_length);
+ }
+ }
+
+ const Source& getSource() const override {
+ return mSource;
+ }
+
+private:
+ ZipArchiveHandle mZipHandle;
+ ZipEntry mZipEntry;
+ Source mSource;
+};
+
+/**
+ * An IFileCollection that represents a ZIP archive and the entries within it.
+ */
+class ZipFileCollection : public IFileCollection {
+public:
+ static std::unique_ptr<ZipFileCollection> create(const StringPiece& path,
+ std::string* outError) {
+ std::unique_ptr<ZipFileCollection> collection = std::unique_ptr<ZipFileCollection>(
+ new ZipFileCollection());
+
+ int32_t result = OpenArchive(path.data(), &collection->mHandle);
+ if (result != 0) {
+ if (outError) *outError = ErrorCodeString(result);
+ return {};
+ }
+
+ ZipString suffix(".flat");
+ void* cookie = nullptr;
+ result = StartIteration(collection->mHandle, &cookie, nullptr, &suffix);
+ if (result != 0) {
+ if (outError) *outError = ErrorCodeString(result);
+ return {};
+ }
+
+ using IterationEnder = std::unique_ptr<void, decltype(EndIteration)*>;
+ IterationEnder iterationEnder(cookie, EndIteration);
+
+ ZipString zipEntryName;
+ ZipEntry zipData;
+ while ((result = Next(cookie, &zipData, &zipEntryName)) == 0) {
+ std::string nestedPath = path.toString();
+ nestedPath += "@" + std::string(reinterpret_cast<const char*>(zipEntryName.name),
+ zipEntryName.name_length);
+ collection->mFiles.push_back(util::make_unique<ZipFile>(collection->mHandle,
+ zipData,
+ Source(nestedPath)));
+ }
+
+ if (result != -1) {
+ if (outError) *outError = ErrorCodeString(result);
+ return {};
+ }
+ return collection;
+ }
+
+ const_iterator begin() const override {
+ return mFiles.begin();
+ }
+
+ const_iterator end() const override {
+ return mFiles.end();
+ }
+
+ ~ZipFileCollection() override {
+ if (mHandle) {
+ CloseArchive(mHandle);
+ }
+ }
+
+private:
+ ZipFileCollection() : mHandle(nullptr) {
+ }
+
+ ZipArchiveHandle mHandle;
+ std::vector<std::unique_ptr<IFile>> mFiles;
+};
+
+} // namespace io
+} // namespace aapt
+
+#endif /* AAPT_IO_ZIPARCHIVE_H */
diff --git a/tools/aapt2/java/AnnotationProcessor_test.cpp b/tools/aapt2/java/AnnotationProcessor_test.cpp
index d5a2b38..da96b84 100644
--- a/tools/aapt2/java/AnnotationProcessor_test.cpp
+++ b/tools/aapt2/java/AnnotationProcessor_test.cpp
@@ -17,12 +17,10 @@
#include "ResourceParser.h"
#include "ResourceTable.h"
#include "ResourceValues.h"
-#include "XmlPullParser.h"
-
#include "java/AnnotationProcessor.h"
-
#include "test/Builders.h"
#include "test/Context.h"
+#include "xml/XmlPullParser.h"
#include <gtest/gtest.h>
@@ -42,7 +40,7 @@
options);
std::stringstream in;
in << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" << str;
- XmlPullParser xmlParser(in);
+ xml::XmlPullParser xmlParser(in);
if (parser.parse(&xmlParser)) {
return ::testing::AssertionSuccess();
}
diff --git a/tools/aapt2/java/ClassDefinitionWriter.h b/tools/aapt2/java/ClassDefinitionWriter.h
index b8886f9..04e1274 100644
--- a/tools/aapt2/java/ClassDefinitionWriter.h
+++ b/tools/aapt2/java/ClassDefinitionWriter.h
@@ -17,6 +17,7 @@
#ifndef AAPT_JAVA_CLASSDEFINITION_H
#define AAPT_JAVA_CLASSDEFINITION_H
+#include "Resource.h"
#include "java/AnnotationProcessor.h"
#include "util/StringPiece.h"
#include "util/Util.h"
diff --git a/tools/aapt2/java/ManifestClassGenerator.cpp b/tools/aapt2/java/ManifestClassGenerator.cpp
index d963d89..a9b4c14 100644
--- a/tools/aapt2/java/ManifestClassGenerator.cpp
+++ b/tools/aapt2/java/ManifestClassGenerator.cpp
@@ -15,12 +15,11 @@
*/
#include "Source.h"
-#include "XmlDom.h"
-
#include "java/AnnotationProcessor.h"
#include "java/ClassDefinitionWriter.h"
#include "java/ManifestClassGenerator.h"
#include "util/Maybe.h"
+#include "xml/XmlDom.h"
#include <algorithm>
@@ -80,7 +79,7 @@
}
bool ManifestClassGenerator::generate(IDiagnostics* diag, const StringPiece16& package,
- XmlResource* res, std::ostream* out) {
+ xml::XmlResource* res, std::ostream* out) {
xml::Element* el = xml::findRootElement(res->root.get());
if (!el) {
return false;
diff --git a/tools/aapt2/java/ManifestClassGenerator.h b/tools/aapt2/java/ManifestClassGenerator.h
index 0f0998f..226ed23 100644
--- a/tools/aapt2/java/ManifestClassGenerator.h
+++ b/tools/aapt2/java/ManifestClassGenerator.h
@@ -18,15 +18,15 @@
#define AAPT_JAVA_MANIFESTCLASSGENERATOR_H
#include "Diagnostics.h"
-#include "process/IResourceTableConsumer.h"
#include "util/StringPiece.h"
+#include "xml/XmlDom.h"
#include <iostream>
namespace aapt {
struct ManifestClassGenerator {
- bool generate(IDiagnostics* diag, const StringPiece16& package, XmlResource* res,
+ bool generate(IDiagnostics* diag, const StringPiece16& package, xml::XmlResource* res,
std::ostream* out);
};
diff --git a/tools/aapt2/java/ManifestClassGenerator_test.cpp b/tools/aapt2/java/ManifestClassGenerator_test.cpp
index 4081287..fc57ae6f 100644
--- a/tools/aapt2/java/ManifestClassGenerator_test.cpp
+++ b/tools/aapt2/java/ManifestClassGenerator_test.cpp
@@ -15,7 +15,6 @@
*/
#include "java/ManifestClassGenerator.h"
-
#include "test/Builders.h"
#include "test/Context.h"
@@ -25,7 +24,7 @@
TEST(ManifestClassGeneratorTest, NameIsProperlyGeneratedFromSymbol) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
- std::unique_ptr<XmlResource> manifest = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> manifest = test::buildXmlDom(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<permission android:name="android.permission.ACCESS_INTERNET" />
<permission android:name="android.DO_DANGEROUS_THINGS" />
@@ -75,7 +74,7 @@
TEST(ManifestClassGeneratorTest, CommentsAndAnnotationsArePresent) {
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
- std::unique_ptr<XmlResource> manifest = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> manifest = test::buildXmlDom(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Required to access the internet.
Added in API 1. -->
diff --git a/tools/aapt2/java/ProguardRules.cpp b/tools/aapt2/java/ProguardRules.cpp
index 4431477..c096854 100644
--- a/tools/aapt2/java/ProguardRules.cpp
+++ b/tools/aapt2/java/ProguardRules.cpp
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-#include "XmlDom.h"
-
#include "java/ProguardRules.h"
#include "util/Util.h"
+#include "xml/XmlDom.h"
#include <memory>
#include <string>
@@ -40,11 +39,11 @@
virtual void visit(xml::Element* node) override {
if (!node->namespaceUri.empty()) {
- Maybe<std::u16string> maybePackage = util::extractPackageFromNamespace(
+ Maybe<xml::ExtractedPackage> maybePackage = xml::extractPackageFromNamespace(
node->namespaceUri);
if (maybePackage) {
// This is a custom view, let's figure out the class name from this.
- std::u16string package = maybePackage.value() + u"." + node->name;
+ std::u16string package = maybePackage.value().package + u"." + node->name;
if (util::isJavaClassName(package)) {
addClass(node->lineNumber, package);
}
@@ -185,7 +184,8 @@
std::u16string mPackage;
};
-bool collectProguardRulesForManifest(const Source& source, XmlResource* res, KeepSet* keepSet) {
+bool collectProguardRulesForManifest(const Source& source, xml::XmlResource* res,
+ KeepSet* keepSet) {
ManifestVisitor visitor(source, keepSet);
if (res->root) {
res->root->accept(&visitor);
@@ -194,7 +194,7 @@
return false;
}
-bool collectProguardRules(const Source& source, XmlResource* res, KeepSet* keepSet) {
+bool collectProguardRules(const Source& source, xml::XmlResource* res, KeepSet* keepSet) {
if (!res->root) {
return false;
}
diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h
index be61eb9..aafffd3 100644
--- a/tools/aapt2/java/ProguardRules.h
+++ b/tools/aapt2/java/ProguardRules.h
@@ -19,8 +19,7 @@
#include "Resource.h"
#include "Source.h"
-
-#include "process/IResourceTableConsumer.h"
+#include "xml/XmlDom.h"
#include <map>
#include <ostream>
@@ -47,8 +46,8 @@
std::map<std::u16string, std::set<Source>> mKeepMethodSet;
};
-bool collectProguardRulesForManifest(const Source& source, XmlResource* res, KeepSet* keepSet);
-bool collectProguardRules(const Source& source, XmlResource* res, KeepSet* keepSet);
+bool collectProguardRulesForManifest(const Source& source, xml::XmlResource* res, KeepSet* keepSet);
+bool collectProguardRules(const Source& source, xml::XmlResource* res, KeepSet* keepSet);
bool writeKeepSet(std::ostream* out, const KeepSet& keepSet);
diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/link/Link.cpp
index 93f2dc6f..33d9272 100644
--- a/tools/aapt2/link/Link.cpp
+++ b/tools/aapt2/link/Link.cpp
@@ -18,16 +18,17 @@
#include "Debug.h"
#include "Flags.h"
#include "NameMangler.h"
-#include "XmlDom.h"
-
#include "compile/IdAssigner.h"
#include "flatten/Archive.h"
#include "flatten/TableFlattener.h"
#include "flatten/XmlFlattener.h"
+#include "io/FileSystem.h"
+#include "io/ZipArchive.h"
#include "java/JavaClassGenerator.h"
#include "java/ManifestClassGenerator.h"
#include "java/ProguardRules.h"
#include "link/Linkers.h"
+#include "link/ReferenceLinker.h"
#include "link/ManifestFixer.h"
#include "link/TableMerger.h"
#include "process/IResourceTableConsumer.h"
@@ -36,10 +37,10 @@
#include "unflatten/FileExportHeaderReader.h"
#include "util/Files.h"
#include "util/StringPiece.h"
+#include "xml/XmlDom.h"
#include <fstream>
#include <sys/stat.h>
-#include <utils/FileMap.h>
#include <vector>
namespace aapt {
@@ -50,7 +51,7 @@
std::vector<std::string> includePaths;
std::vector<std::string> overlayFiles;
Maybe<std::string> generateJavaClassPath;
- std::vector<std::string> extraJavaPackages;
+ std::set<std::string> extraJavaPackages;
Maybe<std::string> generateProguardRulesPath;
bool noAutoVersion = false;
bool staticLib = false;
@@ -92,7 +93,15 @@
class LinkCommand {
public:
LinkCommand(const LinkOptions& options) :
- mOptions(options), mContext(), mFinalTable() {
+ mOptions(options), mContext(), mFinalTable(), mFileCollection(nullptr) {
+ std::unique_ptr<io::FileCollection> fileCollection =
+ util::make_unique<io::FileCollection>();
+
+ // Get a pointer to the FileCollection for convenience, but it will be owned by the vector.
+ mFileCollection = fileCollection.get();
+
+ // Move it to the collection.
+ mCollections.push_back(std::move(fileCollection));
}
std::string buildResourceFileName(const ResourceFile& resFile) {
@@ -136,20 +145,9 @@
return builder.build();
}
- /**
- * Loads the resource table (not inside an apk) at the given path.
- */
- std::unique_ptr<ResourceTable> loadTable(const std::string& input) {
- std::string errorStr;
- Maybe<android::FileMap> map = file::mmapPath(input, &errorStr);
- if (!map) {
- mContext.getDiagnostics()->error(DiagMessage(input) << errorStr);
- return {};
- }
-
+ std::unique_ptr<ResourceTable> loadTable(const Source& source, const void* data, size_t len) {
std::unique_ptr<ResourceTable> table = util::make_unique<ResourceTable>();
- BinaryResourceParser parser(&mContext, table.get(), Source(input),
- map.value().getDataPtr(), map.value().getDataLength());
+ BinaryResourceParser parser(&mContext, table.get(), source, data, len);
if (!parser.parse()) {
return {};
}
@@ -159,93 +157,82 @@
/**
* Inflates an XML file from the source path.
*/
- std::unique_ptr<XmlResource> loadXml(const std::string& path) {
+ static std::unique_ptr<xml::XmlResource> loadXml(const std::string& path, IDiagnostics* diag) {
std::ifstream fin(path, std::ifstream::binary);
if (!fin) {
- mContext.getDiagnostics()->error(DiagMessage(path) << strerror(errno));
+ diag->error(DiagMessage(path) << strerror(errno));
return {};
}
- return xml::inflate(&fin, mContext.getDiagnostics(), Source(path));
+ return xml::inflate(&fin, diag, Source(path));
}
- /**
- * Inflates a binary XML file from the source path.
- */
- std::unique_ptr<XmlResource> loadBinaryXmlSkipFileExport(const std::string& path) {
- // Read header for symbol info and export info.
+ static std::unique_ptr<xml::XmlResource> loadBinaryXmlSkipFileExport(
+ const Source& source,
+ const void* data, size_t len,
+ IDiagnostics* diag) {
std::string errorStr;
- Maybe<android::FileMap> maybeF = file::mmapPath(path, &errorStr);
- if (!maybeF) {
- mContext.getDiagnostics()->error(DiagMessage(path) << errorStr);
- return {};
- }
-
- ssize_t offset = getWrappedDataOffset(maybeF.value().getDataPtr(),
- maybeF.value().getDataLength(), &errorStr);
+ ssize_t offset = getWrappedDataOffset(data, len, &errorStr);
if (offset < 0) {
- mContext.getDiagnostics()->error(DiagMessage(path) << errorStr);
+ diag->error(DiagMessage(source) << errorStr);
return {};
}
- std::unique_ptr<XmlResource> xmlRes = xml::inflate(
- (const uint8_t*) maybeF.value().getDataPtr() + (size_t) offset,
- maybeF.value().getDataLength() - offset,
- mContext.getDiagnostics(), Source(path));
+ std::unique_ptr<xml::XmlResource> xmlRes = xml::inflate(
+ reinterpret_cast<const uint8_t*>(data) + static_cast<size_t>(offset),
+ len - static_cast<size_t>(offset),
+ diag,
+ source);
if (!xmlRes) {
return {};
}
return xmlRes;
}
- Maybe<ResourceFile> loadFileExportHeader(const std::string& path) {
- // Read header for symbol info and export info.
+ static std::unique_ptr<ResourceFile> loadFileExportHeader(const Source& source,
+ const void* data, size_t len,
+ IDiagnostics* diag) {
+ std::unique_ptr<ResourceFile> resFile = util::make_unique<ResourceFile>();
std::string errorStr;
- Maybe<android::FileMap> maybeF = file::mmapPath(path, &errorStr);
- if (!maybeF) {
- mContext.getDiagnostics()->error(DiagMessage(path) << errorStr);
- return {};
- }
-
- ResourceFile resFile;
- ssize_t offset = unwrapFileExportHeader(maybeF.value().getDataPtr(),
- maybeF.value().getDataLength(),
- &resFile, &errorStr);
+ ssize_t offset = unwrapFileExportHeader(data, len, resFile.get(), &errorStr);
if (offset < 0) {
- mContext.getDiagnostics()->error(DiagMessage(path) << errorStr);
+ diag->error(DiagMessage(source) << errorStr);
return {};
}
- return std::move(resFile);
+ return resFile;
}
- bool copyFileToArchive(const std::string& path, const std::string& outPath, uint32_t flags,
+ bool copyFileToArchive(io::IFile* file, const std::string& outPath, uint32_t flags,
IArchiveWriter* writer) {
+ std::unique_ptr<io::IData> data = file->openAsData();
+ if (!data) {
+ mContext.getDiagnostics()->error(DiagMessage(file->getSource())
+ << "failed to open file");
+ return false;
+ }
+
std::string errorStr;
- Maybe<android::FileMap> maybeF = file::mmapPath(path, &errorStr);
- if (!maybeF) {
- mContext.getDiagnostics()->error(DiagMessage(path) << errorStr);
- return false;
- }
-
- ssize_t offset = getWrappedDataOffset(maybeF.value().getDataPtr(),
- maybeF.value().getDataLength(),
- &errorStr);
+ ssize_t offset = getWrappedDataOffset(data->data(), data->size(), &errorStr);
if (offset < 0) {
- mContext.getDiagnostics()->error(DiagMessage(path) << errorStr);
+ mContext.getDiagnostics()->error(DiagMessage(file->getSource()) << errorStr);
return false;
}
- ArchiveEntry* entry = writer->writeEntry(outPath, flags, &maybeF.value(),
- offset, maybeF.value().getDataLength() - offset);
- if (!entry) {
- mContext.getDiagnostics()->error(
- DiagMessage(mOptions.outputPath) << "failed to write file " << outPath);
- return false;
+ if (writer->startEntry(outPath, flags)) {
+ if (writer->writeEntry(reinterpret_cast<const uint8_t*>(data->data()) + offset,
+ data->size() - static_cast<size_t>(offset))) {
+ if (writer->finishEntry()) {
+ return true;
+ }
+ }
}
- return true;
+
+ mContext.getDiagnostics()->error(
+ DiagMessage(mOptions.outputPath) << "failed to write file " << outPath);
+ return false;
}
- Maybe<AppInfo> extractAppInfoFromManifest(XmlResource* xmlRes) {
+ Maybe<AppInfo> extractAppInfoFromManifest(xml::XmlResource* xmlRes) {
// Make sure the first element is <manifest> with package attribute.
if (xml::Element* manifestEl = xml::findRootElement(xmlRes->root.get())) {
if (manifestEl->namespaceUri.empty() && manifestEl->name == u"manifest") {
@@ -285,9 +272,9 @@
std::unique_ptr<IArchiveWriter> makeArchiveWriter() {
if (mOptions.outputToDirectory) {
- return createDirectoryArchiveWriter(mOptions.outputPath);
+ return createDirectoryArchiveWriter(mContext.getDiagnostics(), mOptions.outputPath);
} else {
- return createZipFileArchiveWriter(mOptions.outputPath);
+ return createZipFileArchiveWriter(mContext.getDiagnostics(), mOptions.outputPath);
}
}
@@ -300,16 +287,20 @@
return false;
}
- ArchiveEntry* entry = writer->writeEntry("resources.arsc", ArchiveEntry::kAlign, buffer);
- if (!entry) {
- mContext.getDiagnostics()->error(
- DiagMessage() << "failed to write resources.arsc to archive");
- return false;
+ if (writer->startEntry("resources.arsc", ArchiveEntry::kAlign)) {
+ if (writer->writeEntry(buffer)) {
+ if (writer->finishEntry()) {
+ return true;
+ }
+ }
}
- return true;
+
+ mContext.getDiagnostics()->error(
+ DiagMessage() << "failed to write resources.arsc to archive");
+ return false;
}
- bool flattenXml(XmlResource* xmlRes, const StringPiece& path, Maybe<size_t> maxSdkLevel,
+ bool flattenXml(xml::XmlResource* xmlRes, const StringPiece& path, Maybe<size_t> maxSdkLevel,
IArchiveWriter* writer) {
BigBuffer buffer(1024);
XmlFlattenerOptions options = {};
@@ -320,13 +311,17 @@
return false;
}
- ArchiveEntry* entry = writer->writeEntry(path, ArchiveEntry::kCompress, buffer);
- if (!entry) {
- mContext.getDiagnostics()->error(
- DiagMessage() << "failed to write " << path << " to archive");
- return false;
+
+ if (writer->startEntry(path, ArchiveEntry::kCompress)) {
+ if (writer->writeEntry(buffer)) {
+ if (writer->finishEntry()) {
+ return true;
+ }
+ }
}
- return true;
+ mContext.getDiagnostics()->error(
+ DiagMessage() << "failed to write " << path << " to archive");
+ return false;
}
bool writeJavaFile(ResourceTable* table, const StringPiece16& packageNameToGenerate,
@@ -354,7 +349,7 @@
return true;
}
- bool writeManifestJavaFile(XmlResource* manifestXml) {
+ bool writeManifestJavaFile(xml::XmlResource* manifestXml) {
if (!mOptions.generateJavaClassPath) {
return true;
}
@@ -412,34 +407,44 @@
return true;
}
- bool mergeResourceTable(const std::string& input, bool override) {
+ bool mergeResourceTable(io::IFile* file, bool override) {
if (mOptions.verbose) {
- mContext.getDiagnostics()->note(DiagMessage() << "linking " << input);
+ mContext.getDiagnostics()->note(DiagMessage() << "linking " << file->getSource());
}
- std::unique_ptr<ResourceTable> table = loadTable(input);
+ std::unique_ptr<io::IData> data = file->openAsData();
+ if (!data) {
+ mContext.getDiagnostics()->error(DiagMessage(file->getSource())
+ << "failed to open file");
+ return false;
+ }
+
+ std::unique_ptr<ResourceTable> table = loadTable(file->getSource(), data->data(),
+ data->size());
if (!table) {
return false;
}
- if (!mTableMerger->merge(Source(input), table.get(), override)) {
+ if (!mTableMerger->merge(file->getSource(), table.get(), override)) {
return false;
}
return true;
}
- bool mergeCompiledFile(const std::string& input, ResourceFile&& file, bool override) {
- if (file.name.package.empty()) {
- file.name.package = mContext.getCompilationPackage().toString();
+ bool mergeCompiledFile(io::IFile* file, std::unique_ptr<ResourceFile> fileDesc, bool override) {
+ // Apply the package name used for this compilation phase if none was specified.
+ if (fileDesc->name.package.empty()) {
+ fileDesc->name.package = mContext.getCompilationPackage().toString();
}
- ResourceNameRef resName = file.name;
-
- Maybe<ResourceName> mangledName = mContext.getNameMangler()->mangleName(file.name);
+ // Mangle the name if necessary.
+ ResourceNameRef resName = fileDesc->name;
+ Maybe<ResourceName> mangledName = mContext.getNameMangler()->mangleName(fileDesc->name);
if (mangledName) {
resName = mangledName.value();
}
+ // If we are overriding resources, we supply a custom resolver function.
std::function<int(Value*,Value*)> resolver;
if (override) {
resolver = [](Value* a, Value* b) -> int {
@@ -456,14 +461,14 @@
}
// Add this file to the table.
- if (!mFinalTable.addFileReference(resName, file.config, file.source,
- util::utf8ToUtf16(buildResourceFileName(file)),
+ if (!mFinalTable.addFileReference(resName, fileDesc->config, fileDesc->source,
+ util::utf8ToUtf16(buildResourceFileName(*fileDesc)),
resolver, mContext.getDiagnostics())) {
return false;
}
// Add the exports of this file to the table.
- for (SourcedResourceName& exportedSymbol : file.exportedSymbols) {
+ for (SourcedResourceName& exportedSymbol : fileDesc->exportedSymbols) {
if (exportedSymbol.name.package.empty()) {
exportedSymbol.name.package = mContext.getCompilationPackage().toString();
}
@@ -477,32 +482,78 @@
}
std::unique_ptr<Id> id = util::make_unique<Id>();
- id->setSource(file.source.withLine(exportedSymbol.line));
+ id->setSource(fileDesc->source.withLine(exportedSymbol.line));
bool result = mFinalTable.addResourceAllowMangled(resName, {}, std::move(id),
- mContext.getDiagnostics());
+ mContext.getDiagnostics());
if (!result) {
return false;
}
}
- mFilesToProcess[resName.toResourceName()] = FileToProcess{ Source(input), std::move(file) };
+ // Now add this file for later processing. Once the table is assigned IDs, we can compile
+ // this file.
+ mFilesToProcess.insert(FileToProcess{ std::move(fileDesc), file });
return true;
}
- bool processFile(const std::string& input, bool override) {
- if (util::stringEndsWith<char>(input, ".apk")) {
- return mergeStaticLibrary(input);
- } else if (util::stringEndsWith<char>(input, ".arsc.flat")) {
- return mergeResourceTable(input, override);
- } else if (Maybe<ResourceFile> maybeF = loadFileExportHeader(input)) {
- return mergeCompiledFile(input, std::move(maybeF.value()), override);
+ /**
+ * Creates an io::IFileCollection from the ZIP archive and processes the files within.
+ */
+ bool mergeArchive(const std::string& input, bool override) {
+ std::string errorStr;
+ std::unique_ptr<io::ZipFileCollection> collection = io::ZipFileCollection::create(
+ input, &errorStr);
+ if (!collection) {
+ mContext.getDiagnostics()->error(DiagMessage(input) << errorStr);
+ return false;
+ }
+
+ bool error = false;
+ for (const std::unique_ptr<io::IFile>& file : *collection) {
+ if (!processFile(file.get(), override)) {
+ error = true;
+ }
+ }
+
+ // Make sure to move the collection into the set of IFileCollections.
+ mCollections.push_back(std::move(collection));
+ return !error;
+ }
+
+ bool processFile(const std::string& path, bool override) {
+ if (util::stringEndsWith<char>(path, ".flata")) {
+ return mergeArchive(path, override);
+ }
+
+ io::IFile* file = mFileCollection->insertFile(path);
+ return processFile(file, override);
+ }
+
+ bool processFile(io::IFile* file, bool override) {
+ const Source& src = file->getSource();
+ if (util::stringEndsWith<char>(src.path, ".arsc.flat")) {
+ return mergeResourceTable(file, override);
+ } else {
+ // Try opening the file and looking for an Export header.
+ std::unique_ptr<io::IData> data = file->openAsData();
+ if (!data) {
+ mContext.getDiagnostics()->error(DiagMessage(src) << "failed to open");
+ return false;
+ }
+
+ std::unique_ptr<ResourceFile> resourceFile = loadFileExportHeader(
+ src, data->data(), data->size(), mContext.getDiagnostics());
+ if (resourceFile) {
+ return mergeCompiledFile(file, std::move(resourceFile), override);
+ }
}
return false;
}
int run(const std::vector<std::string>& inputFiles) {
// Load the AndroidManifest.xml
- std::unique_ptr<XmlResource> manifestXml = loadXml(mOptions.manifestPath);
+ std::unique_ptr<xml::XmlResource> manifestXml = loadXml(mOptions.manifestPath,
+ mContext.getDiagnostics());
if (!manifestXml) {
return 1;
}
@@ -545,25 +596,21 @@
<< "with package ID " << std::hex << (int) mContext.mPackageId);
}
- bool error = false;
for (const std::string& input : inputFiles) {
if (!processFile(input, false)) {
- error = true;
+ mContext.getDiagnostics()->error(DiagMessage() << "failed parsing input");
+ return 1;
}
}
for (const std::string& input : mOptions.overlayFiles) {
if (!processFile(input, true)) {
- error = true;
+ mContext.getDiagnostics()->error(DiagMessage() << "failed parsing overlays");
+ return 1;
}
}
- if (error) {
- mContext.getDiagnostics()->error(DiagMessage() << "failed parsing input");
- return 1;
- }
-
if (!verifyNoExternalPackages()) {
return 1;
}
@@ -608,6 +655,7 @@
return 1;
}
+ bool error = false;
{
ManifestFixerOptions manifestFixerOptions;
manifestFixerOptions.minSdkVersionDefault = mOptions.minSdkVersionDefault;
@@ -617,6 +665,11 @@
error = true;
}
+ // AndroidManifest.xml has no resource name, but the CallSite is built from the name
+ // (aka, which package the AndroidManifest.xml is coming from).
+ // So we give it a package name so it can see local resources.
+ manifestXml->file.name.package = mContext.getCompilationPackage().toString();
+
XmlReferenceLinker manifestLinker;
if (manifestLinker.consume(&mContext, manifestXml.get())) {
if (!proguard::collectProguardRulesForManifest(Source(mOptions.manifestPath),
@@ -640,20 +693,36 @@
}
}
- for (auto& pair : mFilesToProcess) {
- FileToProcess& file = pair.second;
- if (file.file.name.type != ResourceType::kRaw &&
- util::stringEndsWith<char>(file.source.path, ".xml.flat")) {
+ if (error) {
+ mContext.getDiagnostics()->error(DiagMessage() << "failed processing manifest");
+ return 1;
+ }
+
+ for (const FileToProcess& file : mFilesToProcess) {
+ const StringPiece path = file.file->getSource().path;
+
+ if (file.fileExport->name.type != ResourceType::kRaw &&
+ util::stringEndsWith<char>(path, ".xml.flat")) {
if (mOptions.verbose) {
- mContext.getDiagnostics()->note(DiagMessage() << "linking " << file.source.path);
+ mContext.getDiagnostics()->note(DiagMessage() << "linking " << path);
}
- std::unique_ptr<XmlResource> xmlRes = loadBinaryXmlSkipFileExport(file.source.path);
+ std::unique_ptr<io::IData> data = file.file->openAsData();
+ if (!data) {
+ mContext.getDiagnostics()->error(DiagMessage(file.file->getSource())
+ << "failed to open file");
+ return 1;
+ }
+
+ std::unique_ptr<xml::XmlResource> xmlRes = loadBinaryXmlSkipFileExport(
+ file.file->getSource(), data->data(), data->size(),
+ mContext.getDiagnostics());
if (!xmlRes) {
return 1;
}
- xmlRes->file = std::move(file.file);
+ // Move the file description over.
+ xmlRes->file = std::move(*file.fileExport);
XmlReferenceLinker xmlLinker;
if (xmlLinker.consume(&mContext, xmlRes.get())) {
@@ -681,12 +750,13 @@
xmlRes->file.config,
sdkLevel)) {
xmlRes->file.config.sdkVersion = sdkLevel;
- if (!mFinalTable.addFileReference(xmlRes->file.name,
- xmlRes->file.config,
- xmlRes->file.source,
- util::utf8ToUtf16(
- buildResourceFileName(xmlRes->file)),
- mContext.getDiagnostics())) {
+ bool added = mFinalTable.addFileReference(
+ xmlRes->file.name,
+ xmlRes->file.config,
+ xmlRes->file.source,
+ util::utf8ToUtf16(buildResourceFileName(xmlRes->file)),
+ mContext.getDiagnostics());
+ if (!added) {
error = true;
continue;
}
@@ -704,11 +774,10 @@
}
} else {
if (mOptions.verbose) {
- mContext.getDiagnostics()->note(DiagMessage() << "copying "
- << file.source.path);
+ mContext.getDiagnostics()->note(DiagMessage() << "copying " << path);
}
- if (!copyFileToArchive(file.source.path, buildResourceFileName(file.file), 0,
+ if (!copyFileToArchive(file.file, buildResourceFileName(*file.fileExport), 0,
archiveWriter.get())) {
error = true;
}
@@ -760,7 +829,7 @@
return 1;
}
- for (std::string& extraPackage : mOptions.extraJavaPackages) {
+ for (const std::string& extraPackage : mOptions.extraJavaPackages) {
if (!writeJavaFile(&mFinalTable, actualPackage, util::utf8ToUtf16(extraPackage),
options)) {
return 1;
@@ -794,17 +863,29 @@
ResourceTable mFinalTable;
std::unique_ptr<TableMerger> mTableMerger;
+ io::FileCollection* mFileCollection;
+ std::vector<std::unique_ptr<io::IFileCollection>> mCollections;
+
struct FileToProcess {
- Source source;
- ResourceFile file;
+ std::unique_ptr<ResourceFile> fileExport;
+ io::IFile* file;
};
- std::map<ResourceName, FileToProcess> mFilesToProcess;
+
+ struct FileToProcessComparator {
+ bool operator()(const FileToProcess& a, const FileToProcess& b) {
+ return std::tie(a.fileExport->name, a.fileExport->config) <
+ std::tie(b.fileExport->name, b.fileExport->config);
+ }
+ };
+
+ std::set<FileToProcess, FileToProcessComparator> mFilesToProcess;
};
int link(const std::vector<StringPiece>& args) {
LinkOptions options;
Maybe<std::string> privateSymbolsPackage;
Maybe<std::string> minSdkVersion, targetSdkVersion;
+ std::vector<std::string> extraJavaPackages;
Flags flags = Flags()
.requiredFlag("-o", "Output path", &options.outputPath)
.requiredFlag("--manifest", "Path to the Android manifest to build",
@@ -833,7 +914,7 @@
"If not specified, public and private symbols will use the application's "
"package name", &privateSymbolsPackage)
.optionalFlagList("--extra-packages", "Generate the same R.java but with different "
- "package names", &options.extraJavaPackages)
+ "package names", &extraJavaPackages)
.optionalSwitch("-v", "Enables verbose logging", &options.verbose);
if (!flags.parse("aapt2 link", args, &std::cerr)) {
@@ -852,6 +933,14 @@
options.targetSdkVersionDefault = util::utf8ToUtf16(targetSdkVersion.value());
}
+ // Populate the set of extra packages for which to generate R.java.
+ for (std::string& extraPackage : extraJavaPackages) {
+ // A given package can actually be a colon separated list of packages.
+ for (StringPiece package : util::split(extraPackage, ':')) {
+ options.extraJavaPackages.insert(package.toString());
+ }
+ }
+
LinkCommand cmd(options);
return cmd.run(flags.getArgs());
}
diff --git a/tools/aapt2/link/Linkers.h b/tools/aapt2/link/Linkers.h
index 7b3fc35..4d3a483 100644
--- a/tools/aapt2/link/Linkers.h
+++ b/tools/aapt2/link/Linkers.h
@@ -17,7 +17,9 @@
#ifndef AAPT_LINKER_LINKERS_H
#define AAPT_LINKER_LINKERS_H
+#include "Resource.h"
#include "process/IResourceTableConsumer.h"
+#include "xml/XmlDom.h"
#include <set>
@@ -28,6 +30,14 @@
struct ConfigDescription;
/**
+ * Defines the location in which a value exists. This determines visibility of other
+ * package's private symbols.
+ */
+struct CallSite {
+ ResourceNameRef resource;
+};
+
+/**
* Determines whether a versioned resource should be created. If a versioned resource already
* exists, it takes precedence.
*/
@@ -39,7 +49,7 @@
};
struct XmlAutoVersioner : public IXmlResourceConsumer {
- bool consume(IAaptContext* context, XmlResource* resource) override;
+ bool consume(IAaptContext* context, xml::XmlResource* resource) override;
};
/**
@@ -69,15 +79,6 @@
};
/**
- * Resolves all references to resources in the ResourceTable and assigns them IDs.
- * The ResourceTable must already have IDs assigned to each resource.
- * Once the ResourceTable is processed by this linker, it is ready to be flattened.
- */
-struct ReferenceLinker : public IResourceTableConsumer {
- bool consume(IAaptContext* context, ResourceTable* table) override;
-};
-
-/**
* Resolves attributes in the XmlResource and compiles string values to resource values.
* Once an XmlResource is processed by this linker, it is ready to be flattened.
*/
@@ -86,7 +87,7 @@
std::set<int> mSdkLevelsFound;
public:
- bool consume(IAaptContext* context, XmlResource* resource) override;
+ bool consume(IAaptContext* context, xml::XmlResource* resource) override;
/**
* Once the XmlResource has been consumed, this returns the various SDK levels in which
diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 52d9426..2034c57 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -15,10 +15,9 @@
*/
#include "ResourceUtils.h"
-#include "XmlDom.h"
-
#include "link/ManifestFixer.h"
#include "util/Util.h"
+#include "xml/XmlDom.h"
namespace aapt {
@@ -63,7 +62,7 @@
return true;
}
-bool ManifestFixer::consume(IAaptContext* context, XmlResource* doc) {
+bool ManifestFixer::consume(IAaptContext* context, xml::XmlResource* doc) {
xml::Element* root = xml::findRootElement(doc->root.get());
if (!root || !root->namespaceUri.empty() || root->name != u"manifest") {
context->getDiagnostics()->error(DiagMessage(doc->file.source)
diff --git a/tools/aapt2/link/ManifestFixer.h b/tools/aapt2/link/ManifestFixer.h
index 16e161d..a77e6d5 100644
--- a/tools/aapt2/link/ManifestFixer.h
+++ b/tools/aapt2/link/ManifestFixer.h
@@ -18,6 +18,10 @@
#define AAPT_LINK_MANIFESTFIXER_H
#include "process/IResourceTableConsumer.h"
+#include "util/Maybe.h"
+#include "xml/XmlDom.h"
+
+#include <string>
namespace aapt {
@@ -36,7 +40,7 @@
ManifestFixer(const ManifestFixerOptions& options) : mOptions(options) {
}
- bool consume(IAaptContext* context, XmlResource* doc) override;
+ bool consume(IAaptContext* context, xml::XmlResource* doc) override;
};
} // namespace aapt
diff --git a/tools/aapt2/link/ManifestFixer_test.cpp b/tools/aapt2/link/ManifestFixer_test.cpp
index 5c5d8af..f6bf895 100644
--- a/tools/aapt2/link/ManifestFixer_test.cpp
+++ b/tools/aapt2/link/ManifestFixer_test.cpp
@@ -15,7 +15,6 @@
*/
#include "link/ManifestFixer.h"
-
#include "test/Builders.h"
#include "test/Context.h"
@@ -51,13 +50,13 @@
.build();
}
- std::unique_ptr<XmlResource> verify(const StringPiece& str) {
+ std::unique_ptr<xml::XmlResource> verify(const StringPiece& str) {
return verifyWithOptions(str, {});
}
- std::unique_ptr<XmlResource> verifyWithOptions(const StringPiece& str,
- const ManifestFixerOptions& options) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(str);
+ std::unique_ptr<xml::XmlResource> verifyWithOptions(const StringPiece& str,
+ const ManifestFixerOptions& options) {
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDom(str);
ManifestFixer fixer(options);
if (fixer.consume(mContext.get(), doc.get())) {
return doc;
@@ -88,7 +87,7 @@
TEST_F(ManifestFixerTest, UseDefaultSdkVersionsIfNonePresent) {
ManifestFixerOptions options = { std::u16string(u"8"), std::u16string(u"22") };
- std::unique_ptr<XmlResource> doc = verifyWithOptions(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = verifyWithOptions(R"EOF(
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android">
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="21" />
diff --git a/tools/aapt2/link/PrivateAttributeMover.cpp b/tools/aapt2/link/PrivateAttributeMover.cpp
index 5a2f5f0..3c8af4f 100644
--- a/tools/aapt2/link/PrivateAttributeMover.cpp
+++ b/tools/aapt2/link/PrivateAttributeMover.cpp
@@ -15,7 +15,6 @@
*/
#include "ResourceTable.h"
-
#include "link/Linkers.h"
#include <algorithm>
diff --git a/tools/aapt2/link/ReferenceLinker.cpp b/tools/aapt2/link/ReferenceLinker.cpp
index 8c924b5..2743539 100644
--- a/tools/aapt2/link/ReferenceLinker.cpp
+++ b/tools/aapt2/link/ReferenceLinker.cpp
@@ -14,17 +14,18 @@
* limitations under the License.
*/
+#include "ReferenceLinker.h"
+
#include "Diagnostics.h"
#include "ResourceTable.h"
#include "ResourceUtils.h"
#include "ResourceValues.h"
-#include "util/Util.h"
#include "ValueVisitor.h"
-
#include "link/Linkers.h"
-#include "link/ReferenceLinkerVisitor.h"
#include "process/IResourceTableConsumer.h"
#include "process/SymbolTable.h"
+#include "util/Util.h"
+#include "xml/XmlUtil.h"
#include <androidfw/ResourceTypes.h>
#include <cassert>
@@ -41,52 +42,15 @@
*
* NOTE: All of the entries in the ResourceTable must be assigned IDs.
*/
-class StyleAndReferenceLinkerVisitor : public ValueVisitor {
+class ReferenceLinkerVisitor : public ValueVisitor {
private:
- ReferenceLinkerVisitor mReferenceVisitor;
IAaptContext* mContext;
ISymbolTable* mSymbols;
- IPackageDeclStack* mPackageDecls;
+ xml::IPackageDeclStack* mPackageDecls;
StringPool* mStringPool;
+ CallSite* mCallSite;
bool mError = false;
- const ISymbolTable::Symbol* findAttributeSymbol(Reference* reference) {
- assert(reference);
- assert(reference->name || reference->id);
-
- if (reference->name) {
- // Transform the package name if it is an alias.
- Maybe<ResourceName> realName = mPackageDecls->transformPackage(
- reference->name.value(), mContext->getCompilationPackage());
-
- // Mangle the reference name if it should be mangled.
- Maybe<ResourceName> mangledName = mContext->getNameMangler()->mangleName(
- realName ? realName.value() : reference->name.value());
-
- const ISymbolTable::Symbol* s = nullptr;
- if (mangledName) {
- s = mSymbols->findByName(mangledName.value());
- } else if (realName) {
- s = mSymbols->findByName(realName.value());
- } else {
- s = mSymbols->findByName(reference->name.value());
- }
-
- if (s && s->attribute) {
- return s;
- }
- }
-
- if (reference->id) {
- if (const ISymbolTable::Symbol* s = mSymbols->findById(reference->id.value())) {
- if (s->attribute) {
- return s;
- }
- }
- }
- return nullptr;
- }
-
/**
* Transform a RawString value into a more specific, appropriate value, based on the
* Attribute. If a non RawString value is passed in, this is an identity transform.
@@ -94,8 +58,8 @@
std::unique_ptr<Item> parseValueWithAttribute(std::unique_ptr<Item> value,
const Attribute* attr) {
if (RawString* rawString = valueCast<RawString>(value.get())) {
- std::unique_ptr<Item> transformed = ResourceUtils::parseItemForAttribute(
- *rawString->value, attr);
+ std::unique_ptr<Item> transformed =
+ ResourceUtils::parseItemForAttribute(*rawString->value, attr);
// If we could not parse as any specific type, try a basic STRING.
if (!transformed && (attr->typeMask & android::ResTable_map::TYPE_STRING)) {
@@ -114,63 +78,19 @@
return value;
}
- void buildAttributeMismatchMessage(DiagMessage* msg, const Attribute* attr,
- const Item* value) {
- *msg << "expected";
- if (attr->typeMask & android::ResTable_map::TYPE_BOOLEAN) {
- *msg << " boolean";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_COLOR) {
- *msg << " color";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_DIMENSION) {
- *msg << " dimension";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_ENUM) {
- *msg << " enum";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_FLAGS) {
- *msg << " flags";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_FLOAT) {
- *msg << " float";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_FRACTION) {
- *msg << " fraction";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_INTEGER) {
- *msg << " integer";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_REFERENCE) {
- *msg << " reference";
- }
-
- if (attr->typeMask & android::ResTable_map::TYPE_STRING) {
- *msg << " string";
- }
-
- *msg << " but got " << *value;
- }
-
public:
using ValueVisitor::visit;
- StyleAndReferenceLinkerVisitor(IAaptContext* context, ISymbolTable* symbols,
- StringPool* stringPool, IPackageDeclStack* decl) :
- mReferenceVisitor(context, symbols, decl), mContext(context), mSymbols(symbols),
- mPackageDecls(decl), mStringPool(stringPool) {
+ ReferenceLinkerVisitor(IAaptContext* context, ISymbolTable* symbols, StringPool* stringPool,
+ xml::IPackageDeclStack* decl,CallSite* callSite) :
+ mContext(context), mSymbols(symbols), mPackageDecls(decl), mStringPool(stringPool),
+ mCallSite(callSite) {
}
- void visit(Reference* reference) override {
- mReferenceVisitor.visit(reference);
+ void visit(Reference* ref) override {
+ if (!ReferenceLinker::linkReference(ref, mContext, mSymbols, mPackageDecls, mCallSite)) {
+ mError = true;
+ }
}
/**
@@ -184,58 +104,190 @@
}
for (Style::Entry& entry : style->entries) {
- if (const ISymbolTable::Symbol* s = findAttributeSymbol(&entry.key)) {
+ std::string errStr;
+
+ // Transform the attribute reference so that it is using the fully qualified package
+ // name. This will also mark the reference as being able to see private resources if
+ // there was a '*' in the reference or if the package came from the private namespace.
+ Reference transformedReference = entry.key;
+ transformReferenceFromNamespace(mPackageDecls, mContext->getCompilationPackage(),
+ &transformedReference);
+
+ // Find the attribute in the symbol table and check if it is visible from this callsite.
+ const ISymbolTable::Symbol* symbol = ReferenceLinker::resolveAttributeCheckVisibility(
+ transformedReference, mContext->getNameMangler(), mSymbols, mCallSite, &errStr);
+ if (symbol) {
// Assign our style key the correct ID.
- entry.key.id = s->id;
+ entry.key.id = symbol->id;
// Try to convert the value to a more specific, typed value based on the
// attribute it is set to.
- entry.value = parseValueWithAttribute(std::move(entry.value), s->attribute.get());
+ entry.value = parseValueWithAttribute(std::move(entry.value),
+ symbol->attribute.get());
// Link/resolve the final value (mostly if it's a reference).
entry.value->accept(this);
// Now verify that the type of this item is compatible with the attribute it
- // is defined for.
- android::Res_value val = {};
- entry.value->flatten(&val);
-
- // Always allow references.
- const uint32_t typeMask = s->attribute->typeMask |
- android::ResTable_map::TYPE_REFERENCE;
-
- if (!(typeMask & ResourceUtils::androidTypeToAttributeTypeMask(val.dataType))) {
+ // is defined for. We pass `nullptr` as the DiagMessage so that this check is
+ // fast and we avoid creating a DiagMessage when the match is successful.
+ if (!symbol->attribute->matches(entry.value.get(), nullptr)) {
// The actual type of this item is incompatible with the attribute.
- DiagMessage msg(style->getSource());
- buildAttributeMismatchMessage(&msg, s->attribute.get(), entry.value.get());
+ DiagMessage msg(entry.key.getSource());
+
+ // Call the matches method again, this time with a DiagMessage so we fill
+ // in the actual error message.
+ symbol->attribute->matches(entry.value.get(), &msg);
mContext->getDiagnostics()->error(msg);
mError = true;
}
+
} else {
- DiagMessage msg(style->getSource());
+ DiagMessage msg(entry.key.getSource());
msg << "style attribute '";
- if (entry.key.name) {
- msg << entry.key.name.value().package << ":" << entry.key.name.value().entry;
- } else {
- msg << entry.key.id.value();
- }
- msg << "' not found";
+ ReferenceLinker::writeResourceName(&msg, entry.key, transformedReference);
+ msg << "' " << errStr;
mContext->getDiagnostics()->error(msg);
mError = true;
}
}
}
- inline bool hasError() {
- return mError || mReferenceVisitor.hasError();
+ bool hasError() {
+ return mError;
}
};
-struct EmptyDeclStack : public IPackageDeclStack {
- Maybe<ResourceName> transformPackage(const ResourceName& name,
- const StringPiece16& localPackage) const override {
- if (name.package.empty()) {
- return ResourceName{ localPackage.toString(), name.type, name.entry };
+} // namespace
+
+/**
+ * The symbol is visible if it is public, or if the reference to it is requesting private access
+ * or if the callsite comes from the same package.
+ */
+bool ReferenceLinker::isSymbolVisible(const ISymbolTable::Symbol& symbol, const Reference& ref,
+ const CallSite& callSite) {
+ if (!symbol.isPublic && !ref.privateReference) {
+ if (ref.name) {
+ return callSite.resource.package == ref.name.value().package;
+ } else if (ref.id) {
+ return ref.id.value().packageId() == symbol.id.packageId();
+ } else {
+ return false;
+ }
+ }
+ return true;
+}
+
+const ISymbolTable::Symbol* ReferenceLinker::resolveSymbol(const Reference& reference,
+ NameMangler* mangler,
+ ISymbolTable* symbols) {
+ if (reference.name) {
+ Maybe<ResourceName> mangled = mangler->mangleName(reference.name.value());
+ return symbols->findByName(mangled ? mangled.value() : reference.name.value());
+ } else if (reference.id) {
+ return symbols->findById(reference.id.value());
+ } else {
+ return nullptr;
+ }
+}
+
+const ISymbolTable::Symbol* ReferenceLinker::resolveSymbolCheckVisibility(
+ const Reference& reference, NameMangler* nameMangler, ISymbolTable* symbols,
+ CallSite* callSite, std::string* outError) {
+ const ISymbolTable::Symbol* symbol = resolveSymbol(reference, nameMangler, symbols);
+ if (!symbol) {
+ if (outError) *outError = "not found";
+ return nullptr;
+ }
+
+ if (!isSymbolVisible(*symbol, reference, *callSite)) {
+ if (outError) *outError = "is private";
+ return nullptr;
+ }
+ return symbol;
+}
+
+const ISymbolTable::Symbol* ReferenceLinker::resolveAttributeCheckVisibility(
+ const Reference& reference, NameMangler* nameMangler, ISymbolTable* symbols,
+ CallSite* callSite, std::string* outError) {
+ const ISymbolTable::Symbol* symbol = resolveSymbolCheckVisibility(reference, nameMangler,
+ symbols, callSite,
+ outError);
+ if (!symbol) {
+ return nullptr;
+ }
+
+ if (!symbol->attribute) {
+ if (outError) *outError = "is not an attribute";
+ return nullptr;
+ }
+ return symbol;
+}
+
+Maybe<xml::AaptAttribute> ReferenceLinker::compileXmlAttribute(const Reference& reference,
+ NameMangler* nameMangler,
+ ISymbolTable* symbols,
+ CallSite* callSite,
+ std::string* outError) {
+ const ISymbolTable::Symbol* symbol = resolveSymbol(reference, nameMangler, symbols);
+ if (!symbol) {
+ return {};
+ }
+
+ if (!symbol->attribute) {
+ if (outError) *outError = "is not an attribute";
+ return {};
+ }
+ return xml::AaptAttribute{ symbol->id, *symbol->attribute };
+}
+
+void ReferenceLinker::writeResourceName(DiagMessage* outMsg, const Reference& orig,
+ const Reference& transformed) {
+ assert(outMsg);
+
+ if (orig.name) {
+ *outMsg << orig.name.value();
+ if (transformed.name.value() != orig.name.value()) {
+ *outMsg << " (aka " << transformed.name.value() << ")";
+ }
+ } else {
+ *outMsg << orig.id.value();
+ }
+}
+
+bool ReferenceLinker::linkReference(Reference* reference, IAaptContext* context,
+ ISymbolTable* symbols, xml::IPackageDeclStack* decls,
+ CallSite* callSite) {
+ assert(reference);
+ assert(reference->name || reference->id);
+
+ Reference transformedReference = *reference;
+ transformReferenceFromNamespace(decls, context->getCompilationPackage(),
+ &transformedReference);
+
+ std::string errStr;
+ const ISymbolTable::Symbol* s = resolveSymbolCheckVisibility(
+ transformedReference, context->getNameMangler(), symbols, callSite, &errStr);
+ if (s) {
+ reference->id = s->id;
+ return true;
+ }
+
+ DiagMessage errorMsg(reference->getSource());
+ errorMsg << "resource ";
+ writeResourceName(&errorMsg, *reference, transformedReference);
+ errorMsg << " " << errStr;
+ context->getDiagnostics()->error(errorMsg);
+ return false;
+}
+
+namespace {
+
+struct EmptyDeclStack : public xml::IPackageDeclStack {
+ Maybe<xml::ExtractedPackage> transformPackageAlias(
+ const StringPiece16& alias, const StringPiece16& localPackage) const override {
+ if (alias.empty()) {
+ return xml::ExtractedPackage{ localPackage.toString(), true /* private */ };
}
return {};
}
@@ -259,14 +311,16 @@
error = true;
}
+ CallSite callSite = { ResourceNameRef(package->name, type->type, entry->name) };
+ ReferenceLinkerVisitor visitor(context, context->getExternalSymbols(),
+ &table->stringPool, &declStack, &callSite);
+
for (auto& configValue : entry->values) {
- StyleAndReferenceLinkerVisitor visitor(context,
- context->getExternalSymbols(),
- &table->stringPool, &declStack);
configValue.value->accept(&visitor);
- if (visitor.hasError()) {
- error = true;
- }
+ }
+
+ if (visitor.hasError()) {
+ error = true;
}
}
}
diff --git a/tools/aapt2/link/ReferenceLinker.h b/tools/aapt2/link/ReferenceLinker.h
new file mode 100644
index 0000000..a0eb00c
--- /dev/null
+++ b/tools/aapt2/link/ReferenceLinker.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef AAPT_LINKER_REFERENCELINKER_H
+#define AAPT_LINKER_REFERENCELINKER_H
+
+#include "Resource.h"
+#include "ResourceValues.h"
+#include "ValueVisitor.h"
+#include "link/Linkers.h"
+#include "process/IResourceTableConsumer.h"
+#include "process/SymbolTable.h"
+#include "xml/XmlDom.h"
+
+#include <cassert>
+
+namespace aapt {
+
+/**
+ * Resolves all references to resources in the ResourceTable and assigns them IDs.
+ * The ResourceTable must already have IDs assigned to each resource.
+ * Once the ResourceTable is processed by this linker, it is ready to be flattened.
+ */
+struct ReferenceLinker : public IResourceTableConsumer {
+ /**
+ * Returns true if the symbol is visible by the reference and from the callsite.
+ */
+ static bool isSymbolVisible(const ISymbolTable::Symbol& symbol, const Reference& ref,
+ const CallSite& callSite);
+
+ /**
+ * Performs name mangling and looks up the resource in the symbol table. Returns nullptr
+ * if the symbol was not found.
+ */
+ static const ISymbolTable::Symbol* resolveSymbol(const Reference& reference,
+ NameMangler* mangler, ISymbolTable* symbols);
+
+ /**
+ * Performs name mangling and looks up the resource in the symbol table. If the symbol is
+ * not visible by the reference at the callsite, nullptr is returned. outError holds
+ * the error message.
+ */
+ static const ISymbolTable::Symbol* resolveSymbolCheckVisibility(const Reference& reference,
+ NameMangler* nameMangler,
+ ISymbolTable* symbols,
+ CallSite* callSite,
+ std::string* outError);
+
+ /**
+ * Same as resolveSymbolCheckVisibility(), but also makes sure the symbol is an attribute.
+ * That is, the return value will have a non-null value for ISymbolTable::Symbol::attribute.
+ */
+ static const ISymbolTable::Symbol* resolveAttributeCheckVisibility(const Reference& reference,
+ NameMangler* nameMangler,
+ ISymbolTable* symbols,
+ CallSite* callSite,
+ std::string* outError);
+
+ /**
+ * Resolves the attribute reference and returns an xml::AaptAttribute if successful.
+ * If resolution fails, outError holds the error message.
+ */
+ static Maybe<xml::AaptAttribute> compileXmlAttribute(const Reference& reference,
+ NameMangler* nameMangler,
+ ISymbolTable* symbols,
+ CallSite* callSite,
+ std::string* outError);
+
+ /**
+ * Writes the resource name to the DiagMessage, using the "orig_name (aka <transformed_name>)"
+ * syntax.
+ */
+ static void writeResourceName(DiagMessage* outMsg, const Reference& orig,
+ const Reference& transformed);
+
+ /**
+ * Transforms the package name of the reference to the fully qualified package name using
+ * the xml::IPackageDeclStack, then mangles and looks up the symbol. If the symbol is visible
+ * to the reference at the callsite, the reference is updated with an ID.
+ * Returns false on failure, and an error message is logged to the IDiagnostics in the context.
+ */
+ static bool linkReference(Reference* reference, IAaptContext* context, ISymbolTable* symbols,
+ xml::IPackageDeclStack* decls, CallSite* callSite);
+
+ /**
+ * Links all references in the ResourceTable.
+ */
+ bool consume(IAaptContext* context, ResourceTable* table) override;
+};
+
+} // namespace aapt
+
+#endif /* AAPT_LINKER_REFERENCELINKER_H */
diff --git a/tools/aapt2/link/ReferenceLinkerVisitor.h b/tools/aapt2/link/ReferenceLinkerVisitor.h
deleted file mode 100644
index c70531b..0000000
--- a/tools/aapt2/link/ReferenceLinkerVisitor.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-
-#ifndef AAPT_LINKER_REFERENCELINKERVISITOR_H
-#define AAPT_LINKER_REFERENCELINKERVISITOR_H
-
-#include "Resource.h"
-#include "ResourceValues.h"
-#include "ValueVisitor.h"
-
-#include "process/IResourceTableConsumer.h"
-#include "process/SymbolTable.h"
-
-#include <cassert>
-
-namespace aapt {
-
-/**
- * The ReferenceLinkerVisitor will follow all references and make sure they point
- * to resources that actually exist in the given ISymbolTable.
- * Once the target resource has been found, the ID of the resource will be assigned
- * to the reference object.
- */
-class ReferenceLinkerVisitor : public ValueVisitor {
- using ValueVisitor::visit;
-private:
- IAaptContext* mContext;
- ISymbolTable* mSymbols;
- IPackageDeclStack* mPackageDecls;
- bool mError = false;
-
-public:
- ReferenceLinkerVisitor(IAaptContext* context, ISymbolTable* symbols, IPackageDeclStack* decls) :
- mContext(context), mSymbols(symbols), mPackageDecls(decls) {
- }
-
- /**
- * Lookup a reference and ensure it exists, either in our local table, or as an external
- * symbol. Once found, assign the ID of the target resource to this reference object.
- */
- void visit(Reference* reference) override {
- assert(reference);
- assert(reference->name || reference->id);
-
- // We prefer to lookup by name if the name is set. Otherwise it could be
- // an out-of-date ID.
- if (reference->name) {
- // Transform the package name if it is an alias.
- Maybe<ResourceName> realName = mPackageDecls->transformPackage(
- reference->name.value(), mContext->getCompilationPackage());
-
- // Mangle the reference name if it should be mangled.
- Maybe<ResourceName> mangledName = mContext->getNameMangler()->mangleName(
- realName ? realName.value() : reference->name.value());
-
- const ISymbolTable::Symbol* s = nullptr;
- if (mangledName) {
- s = mSymbols->findByName(mangledName.value());
- } else if (realName) {
- s = mSymbols->findByName(realName.value());
- } else {
- s = mSymbols->findByName(reference->name.value());
- }
-
- if (s) {
- reference->id = s->id;
- return;
- }
-
- DiagMessage errorMsg;
- errorMsg << "reference to " << reference->name.value();
- if (realName) {
- errorMsg << " (aka " << realName.value() << ")";
- }
- errorMsg << " was not found";
- mContext->getDiagnostics()->error(errorMsg);
- mError = true;
- return;
- }
-
- if (!mSymbols->findById(reference->id.value())) {
- mContext->getDiagnostics()->error(DiagMessage()
- << "reference to " << reference->id.value()
- << " was not found");
- mError = true;
- }
- }
-
- inline bool hasError() {
- return mError;
- }
-};
-
-} // namespace aapt
-
-#endif /* AAPT_LINKER_REFERENCELINKERVISITOR_H */
diff --git a/tools/aapt2/link/ReferenceLinker_test.cpp b/tools/aapt2/link/ReferenceLinker_test.cpp
index 5e7641a..8d324fe 100644
--- a/tools/aapt2/link/ReferenceLinker_test.cpp
+++ b/tools/aapt2/link/ReferenceLinker_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "link/Linkers.h"
+#include "link/ReferenceLinker.h"
#include "process/SymbolTable.h"
#include "test/Builders.h"
@@ -44,7 +44,7 @@
.setSymbolTable(JoinedSymbolTableBuilder()
.addSymbolTable(util::make_unique<SymbolTableWrapper>(table.get()))
.addSymbolTable(test::StaticSymbolTableBuilder()
- .addSymbol(u"@android:string/ok", ResourceId(0x01040034))
+ .addPublicSymbol(u"@android:string/ok", ResourceId(0x01040034))
.build())
.build())
.build();
@@ -92,12 +92,12 @@
.setPackageId(0x7f)
.setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
.setSymbolTable(test::StaticSymbolTableBuilder()
- .addSymbol(u"@android:style/Theme.Material", ResourceId(0x01060000))
- .addSymbol(u"@android:attr/foo", ResourceId(0x01010001),
+ .addPublicSymbol(u"@android:style/Theme.Material", ResourceId(0x01060000))
+ .addPublicSymbol(u"@android:attr/foo", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR)
.build())
- .addSymbol(u"@android:attr/bar", ResourceId(0x01010002),
+ .addPublicSymbol(u"@android:attr/bar", ResourceId(0x01010002),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_FLAGS)
.addItem(u"one", 0x01)
@@ -132,7 +132,7 @@
.setPackageId(0x7f)
.setNameManglerPolicy(NameManglerPolicy{ u"com.app.test", { u"com.android.support" } })
.setSymbolTable(test::StaticSymbolTableBuilder()
- .addSymbol(u"@com.app.test:attr/com.android.support$foo",
+ .addPublicSymbol(u"@com.app.test:attr/com.android.support$foo",
ResourceId(0x7f010000), test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
.build())
@@ -156,4 +156,78 @@
EXPECT_EQ(style->entries.front().key.id.value(), ResourceId(0x7f010000));
}
+TEST(ReferenceLinkerTest, FailToLinkPrivateSymbols) {
+ std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
+ .setPackageId(u"com.app.test", 0x7f)
+ .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
+ u"@android:string/hidden")
+ .build();
+
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder()
+ .setCompilationPackage(u"com.app.test")
+ .setPackageId(0x7f)
+ .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setSymbolTable(JoinedSymbolTableBuilder()
+ .addSymbolTable(util::make_unique<SymbolTableWrapper>(table.get()))
+ .addSymbolTable(test::StaticSymbolTableBuilder()
+ .addSymbol(u"@android:string/hidden", ResourceId(0x01040034))
+ .build())
+ .build())
+ .build();
+
+ ReferenceLinker linker;
+ ASSERT_FALSE(linker.consume(context.get(), table.get()));
+}
+
+TEST(ReferenceLinkerTest, FailToLinkPrivateMangledSymbols) {
+ std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
+ .setPackageId(u"com.app.test", 0x7f)
+ .addReference(u"@com.app.test:string/foo", ResourceId(0x7f020000),
+ u"@com.app.lib:string/hidden")
+ .build();
+
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder()
+ .setCompilationPackage(u"com.app.test")
+ .setPackageId(0x7f)
+ .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test", { u"com.app.lib" } })
+ .setSymbolTable(JoinedSymbolTableBuilder()
+ .addSymbolTable(util::make_unique<SymbolTableWrapper>(table.get()))
+ .addSymbolTable(test::StaticSymbolTableBuilder()
+ .addSymbol(u"@com.app.test:string/com.app.lib$hidden",
+ ResourceId(0x7f040034))
+ .build())
+ .build())
+ .build();
+
+ ReferenceLinker linker;
+ ASSERT_FALSE(linker.consume(context.get(), table.get()));
+}
+
+TEST(ReferenceLinkerTest, FailToLinkPrivateStyleAttributes) {
+ std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
+ .setPackageId(u"com.app.test", 0x7f)
+ .addValue(u"@com.app.test:style/Theme", test::StyleBuilder()
+ .addItem(u"@android:attr/hidden", ResourceUtils::tryParseColor(u"#ff00ff"))
+ .build())
+ .build();
+
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder()
+ .setCompilationPackage(u"com.app.test")
+ .setPackageId(0x7f)
+ .setNameManglerPolicy(NameManglerPolicy{ u"com.app.test" })
+ .setSymbolTable(JoinedSymbolTableBuilder()
+ .addSymbolTable(util::make_unique<SymbolTableWrapper>(table.get()))
+ .addSymbolTable(test::StaticSymbolTableBuilder()
+ .addSymbol(u"@android:attr/hidden", ResourceId(0x01010001),
+ test::AttributeBuilder()
+ .setTypeMask(android::ResTable_map::TYPE_COLOR)
+ .build())
+ .build())
+ .build())
+ .build();
+
+ ReferenceLinker linker;
+ ASSERT_FALSE(linker.consume(context.get(), table.get()));
+}
+
} // namespace aapt
diff --git a/tools/aapt2/link/XmlReferenceLinker.cpp b/tools/aapt2/link/XmlReferenceLinker.cpp
index 147b9bf..a26d763 100644
--- a/tools/aapt2/link/XmlReferenceLinker.cpp
+++ b/tools/aapt2/link/XmlReferenceLinker.cpp
@@ -17,49 +17,91 @@
#include "Diagnostics.h"
#include "ResourceUtils.h"
#include "SdkConstants.h"
-#include "XmlDom.h"
-
#include "link/Linkers.h"
-#include "link/ReferenceLinkerVisitor.h"
+#include "link/ReferenceLinker.h"
#include "process/IResourceTableConsumer.h"
#include "process/SymbolTable.h"
#include "util/Util.h"
+#include "xml/XmlDom.h"
namespace aapt {
namespace {
-class XmlReferenceLinkerVisitor : public xml::PackageAwareVisitor {
+/**
+ * Visits all references (including parents of styles, references in styles, arrays, etc) and
+ * links their symbolic name to their Resource ID, performing mangling and package aliasing
+ * as needed.
+ */
+class ReferenceVisitor : public ValueVisitor {
private:
IAaptContext* mContext;
ISymbolTable* mSymbols;
+ xml::IPackageDeclStack* mDecls;
+ CallSite* mCallSite;
+ bool mError;
+
+public:
+ using ValueVisitor::visit;
+
+ ReferenceVisitor(IAaptContext* context, ISymbolTable* symbols, xml::IPackageDeclStack* decls,
+ CallSite* callSite) :
+ mContext(context), mSymbols(symbols), mDecls(decls), mCallSite(callSite),
+ mError(false) {
+ }
+
+ void visit(Reference* ref) override {
+ if (!ReferenceLinker::linkReference(ref, mContext, mSymbols, mDecls, mCallSite)) {
+ mError = true;
+ }
+ }
+
+ bool hasError() const {
+ return mError;
+ }
+};
+
+/**
+ * Visits each xml Element and compiles the attributes within.
+ */
+class XmlVisitor : public xml::PackageAwareVisitor {
+private:
+ IAaptContext* mContext;
+ ISymbolTable* mSymbols;
+ Source mSource;
std::set<int>* mSdkLevelsFound;
- ReferenceLinkerVisitor mReferenceLinkerVisitor;
+ CallSite* mCallSite;
+ ReferenceVisitor mReferenceVisitor;
bool mError = false;
public:
using xml::PackageAwareVisitor::visit;
- XmlReferenceLinkerVisitor(IAaptContext* context, ISymbolTable* symbols,
- std::set<int>* sdkLevelsFound) :
- mContext(context), mSymbols(symbols), mSdkLevelsFound(sdkLevelsFound),
- mReferenceLinkerVisitor(context, symbols, this) {
+ XmlVisitor(IAaptContext* context, ISymbolTable* symbols, const Source& source,
+ std::set<int>* sdkLevelsFound, CallSite* callSite) :
+ mContext(context), mSymbols(symbols), mSource(source), mSdkLevelsFound(sdkLevelsFound),
+ mCallSite(callSite), mReferenceVisitor(context, symbols, this, callSite) {
}
void visit(xml::Element* el) override {
+ const Source source = mSource.withLine(el->lineNumber);
for (xml::Attribute& attr : el->attributes) {
- Maybe<std::u16string> maybePackage =
- util::extractPackageFromNamespace(attr.namespaceUri);
+ Maybe<xml::ExtractedPackage> maybePackage =
+ xml::extractPackageFromNamespace(attr.namespaceUri);
if (maybePackage) {
// There is a valid package name for this attribute. We will look this up.
- StringPiece16 package = maybePackage.value();
+ StringPiece16 package = maybePackage.value().package;
if (package.empty()) {
// Empty package means the 'current' or 'local' package.
package = mContext->getCompilationPackage();
}
- attr.compiledAttribute = compileAttribute(
- ResourceName{ package.toString(), ResourceType::kAttr, attr.name });
+ Reference attrRef(ResourceNameRef(package, ResourceType::kAttr, attr.name));
+ attrRef.privateReference = maybePackage.value().privateNamespace;
+
+ std::string errStr;
+ attr.compiledAttribute = ReferenceLinker::compileXmlAttribute(
+ attrRef, mContext->getNameMangler(), mSymbols, mCallSite, &errStr);
// Convert the string value into a compiled Value if this is a valid attribute.
if (attr.compiledAttribute) {
@@ -76,15 +118,16 @@
!(attribute->typeMask & android::ResTable_map::TYPE_STRING)) {
// We won't be able to encode this as a string.
mContext->getDiagnostics()->error(
- DiagMessage() << "'" << attr.value << "' "
- << "is incompatible with attribute "
- << package << ":" << attr.name << " " << *attribute);
+ DiagMessage(source) << "'" << attr.value << "' "
+ << "is incompatible with attribute "
+ << package << ":" << attr.name << " "
+ << *attribute);
mError = true;
}
} else {
- mContext->getDiagnostics()->error(
- DiagMessage() << "attribute '" << package << ":" << attr.name
- << "' was not found");
+ mContext->getDiagnostics()->error(DiagMessage(source)
+ << "attribute '" << package << ":"
+ << attr.name << "' " << errStr);
mError = true;
}
@@ -95,7 +138,8 @@
if (attr.compiledValue) {
// With a compiledValue, we must resolve the reference and assign it an ID.
- attr.compiledValue->accept(&mReferenceLinkerVisitor);
+ attr.compiledValue->setSource(source);
+ attr.compiledValue->accept(&mReferenceVisitor);
}
}
@@ -103,27 +147,18 @@
xml::PackageAwareVisitor::visit(el);
}
- Maybe<xml::AaptAttribute> compileAttribute(const ResourceName& name) {
- Maybe<ResourceName> mangledName = mContext->getNameMangler()->mangleName(name);
- if (const ISymbolTable::Symbol* symbol = mSymbols->findByName(
- mangledName ? mangledName.value() : name)) {
- if (symbol->attribute) {
- return xml::AaptAttribute{ symbol->id, *symbol->attribute };
- }
- }
- return {};
- }
-
- inline bool hasError() {
- return mError || mReferenceLinkerVisitor.hasError();
+ bool hasError() {
+ return mError || mReferenceVisitor.hasError();
}
};
} // namespace
-bool XmlReferenceLinker::consume(IAaptContext* context, XmlResource* resource) {
+bool XmlReferenceLinker::consume(IAaptContext* context, xml::XmlResource* resource) {
mSdkLevelsFound.clear();
- XmlReferenceLinkerVisitor visitor(context, context->getExternalSymbols(), &mSdkLevelsFound);
+ CallSite callSite = { resource->file.name };
+ XmlVisitor visitor(context, context->getExternalSymbols(), resource->file.source,
+ &mSdkLevelsFound, &callSite);
if (resource->root) {
resource->root->accept(&visitor);
return !visitor.hasError();
diff --git a/tools/aapt2/link/XmlReferenceLinker_test.cpp b/tools/aapt2/link/XmlReferenceLinker_test.cpp
index 7f91ec3..3bfaf91 100644
--- a/tools/aapt2/link/XmlReferenceLinker_test.cpp
+++ b/tools/aapt2/link/XmlReferenceLinker_test.cpp
@@ -31,37 +31,40 @@
.setNameManglerPolicy(
NameManglerPolicy{ u"com.app.test", { u"com.android.support" } })
.setSymbolTable(test::StaticSymbolTableBuilder()
- .addSymbol(u"@android:attr/layout_width", ResourceId(0x01010000),
+ .addPublicSymbol(u"@android:attr/layout_width", ResourceId(0x01010000),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_ENUM |
android::ResTable_map::TYPE_DIMENSION)
.addItem(u"match_parent", 0xffffffff)
.build())
- .addSymbol(u"@android:attr/background", ResourceId(0x01010001),
+ .addPublicSymbol(u"@android:attr/background", ResourceId(0x01010001),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
- .addSymbol(u"@android:attr/attr", ResourceId(0x01010002),
+ .addPublicSymbol(u"@android:attr/attr", ResourceId(0x01010002),
test::AttributeBuilder().build())
- .addSymbol(u"@android:attr/text", ResourceId(0x01010003),
+ .addPublicSymbol(u"@android:attr/text", ResourceId(0x01010003),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_STRING)
.build())
// Add one real symbol that was introduces in v21
- .addSymbol(u"@android:attr/colorAccent", ResourceId(0x01010435),
+ .addPublicSymbol(u"@android:attr/colorAccent", ResourceId(0x01010435),
test::AttributeBuilder().build())
- .addSymbol(u"@android:id/id", ResourceId(0x01030000))
+ // Private symbol.
+ .addSymbol(u"@android:color/hidden", ResourceId(0x01020001))
+
+ .addPublicSymbol(u"@android:id/id", ResourceId(0x01030000))
.addSymbol(u"@com.app.test:id/id", ResourceId(0x7f030000))
.addSymbol(u"@com.app.test:color/green", ResourceId(0x7f020000))
.addSymbol(u"@com.app.test:color/red", ResourceId(0x7f020001))
.addSymbol(u"@com.app.test:attr/colorAccent", ResourceId(0x7f010000),
test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
- .addSymbol(u"@com.app.test:attr/com.android.support$colorAccent",
+ .addPublicSymbol(u"@com.app.test:attr/com.android.support$colorAccent",
ResourceId(0x7f010001), test::AttributeBuilder()
.setTypeMask(android::ResTable_map::TYPE_COLOR).build())
- .addSymbol(u"@com.app.test:attr/attr", ResourceId(0x7f010002),
+ .addPublicSymbol(u"@com.app.test:attr/attr", ResourceId(0x7f010002),
test::AttributeBuilder().build())
.build())
.build();
@@ -71,23 +74,8 @@
std::unique_ptr<IAaptContext> mContext;
};
-static xml::Element* getRootElement(XmlResource* doc) {
- xml::Node* node = doc->root.get();
- while (xml::nodeCast<xml::Namespace>(node)) {
- if (node->children.empty()) {
- return nullptr;
- }
- node = node->children.front().get();
- }
-
- if (xml::Element* el = xml::nodeCast<xml::Element>(node)) {
- return el;
- }
- return nullptr;
-}
-
TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@color/green"
@@ -97,7 +85,7 @@
XmlReferenceLinker linker;
ASSERT_TRUE(linker.consume(mContext.get(), doc.get()));
- xml::Element* viewEl = getRootElement(doc.get());
+ xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
xml::Attribute* xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res/android",
@@ -132,8 +120,26 @@
ASSERT_EQ(xmlAttr->compiledValue, nullptr);
}
+TEST_F(XmlReferenceLinkerTest, PrivateSymbolsAreNotLinked) {
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
+ <View xmlns:android="http://schemas.android.com/apk/res/android"
+ android:colorAccent="@android:color/hidden" />)EOF");
+
+ XmlReferenceLinker linker;
+ ASSERT_FALSE(linker.consume(mContext.get(), doc.get()));
+}
+
+TEST_F(XmlReferenceLinkerTest, PrivateSymbolsAreLinkedWhenReferenceHasStarPrefix) {
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
+ <View xmlns:android="http://schemas.android.com/apk/res/android"
+ android:colorAccent="@*android:color/hidden" />)EOF");
+
+ XmlReferenceLinker linker;
+ ASSERT_TRUE(linker.consume(mContext.get(), doc.get()));
+}
+
TEST_F(XmlReferenceLinkerTest, SdkLevelsAreRecorded) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:colorAccent="#ffffff" />)EOF");
@@ -143,14 +149,14 @@
}
TEST_F(XmlReferenceLinkerTest, LinkMangledAttributes) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
<View xmlns:support="http://schemas.android.com/apk/res/com.android.support"
support:colorAccent="#ff0000" />)EOF");
XmlReferenceLinker linker;
ASSERT_TRUE(linker.consume(mContext.get(), doc.get()));
- xml::Element* viewEl = getRootElement(doc.get());
+ xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
xml::Attribute* xmlAttr = viewEl->findAttribute(
@@ -162,14 +168,14 @@
}
TEST_F(XmlReferenceLinkerTest, LinkAutoResReference) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
<View xmlns:app="http://schemas.android.com/apk/res-auto"
app:colorAccent="@app:color/red" />)EOF");
XmlReferenceLinker linker;
ASSERT_TRUE(linker.consume(mContext.get(), doc.get()));
- xml::Element* viewEl = getRootElement(doc.get());
+ xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
xml::Attribute* xmlAttr = viewEl->findAttribute(u"http://schemas.android.com/apk/res-auto",
@@ -185,7 +191,7 @@
}
TEST_F(XmlReferenceLinkerTest, LinkViewWithShadowedPackageAlias) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
<View xmlns:app="http://schemas.android.com/apk/res/android"
app:attr="@app:id/id">
<View xmlns:app="http://schemas.android.com/apk/res/com.app.test"
@@ -195,7 +201,7 @@
XmlReferenceLinker linker;
ASSERT_TRUE(linker.consume(mContext.get(), doc.get()));
- xml::Element* viewEl = getRootElement(doc.get());
+ xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
// All attributes and references in this element should be referring to "android" (0x01).
@@ -225,14 +231,14 @@
}
TEST_F(XmlReferenceLinkerTest, LinkViewWithLocalPackageAndAliasOfTheSameName) {
- std::unique_ptr<XmlResource> doc = test::buildXmlDom(R"EOF(
+ std::unique_ptr<xml::XmlResource> doc = test::buildXmlDomForPackageName(mContext.get(), R"EOF(
<View xmlns:android="http://schemas.android.com/apk/res/com.app.test"
android:attr="@id/id"/>)EOF");
XmlReferenceLinker linker;
ASSERT_TRUE(linker.consume(mContext.get(), doc.get()));
- xml::Element* viewEl = getRootElement(doc.get());
+ xml::Element* viewEl = xml::findRootElement(doc.get());
ASSERT_NE(viewEl, nullptr);
// All attributes and references in this element should be referring to "com.app.test" (0x7f).
diff --git a/tools/aapt2/process/IResourceTableConsumer.h b/tools/aapt2/process/IResourceTableConsumer.h
index 24ad05d..a2528d2 100644
--- a/tools/aapt2/process/IResourceTableConsumer.h
+++ b/tools/aapt2/process/IResourceTableConsumer.h
@@ -49,25 +49,13 @@
};
namespace xml {
-struct Node;
+struct XmlResource;
}
-struct XmlResource {
- ResourceFile file;
- std::unique_ptr<xml::Node> root;
-};
-
struct IXmlResourceConsumer {
virtual ~IXmlResourceConsumer() = default;
- virtual bool consume(IAaptContext* context, XmlResource* resource) = 0;
-};
-
-struct IPackageDeclStack {
- virtual ~IPackageDeclStack() = default;
-
- virtual Maybe<ResourceName> transformPackage(const ResourceName& name,
- const StringPiece16& localPackage) const = 0;
+ virtual bool consume(IAaptContext* context, xml::XmlResource* resource) = 0;
};
} // namespace aapt
diff --git a/tools/aapt2/process/SymbolTable.cpp b/tools/aapt2/process/SymbolTable.cpp
index 9a8b263..6ad2f9c 100644
--- a/tools/aapt2/process/SymbolTable.cpp
+++ b/tools/aapt2/process/SymbolTable.cpp
@@ -51,6 +51,7 @@
std::shared_ptr<Symbol> symbol = std::make_shared<Symbol>();
symbol->id = ResourceId(sr.package->id.value(), sr.type->id.value(), sr.entry->id.value());
+ symbol->isPublic = (sr.entry->symbolStatus.state == SymbolState::kPublic);
if (name.type == ResourceType::kAttr || name.type == ResourceType::kAttrPrivate) {
const ConfigDescription kDefaultConfig;
@@ -60,7 +61,7 @@
if (iter != sr.entry->values.end() && iter->config == kDefaultConfig) {
// This resource has an Attribute.
if (Attribute* attr = valueCast<Attribute>(iter->value.get())) {
- symbol->attribute = std::unique_ptr<Attribute>(attr->clone(nullptr));
+ symbol->attribute = util::make_unique<Attribute>(*attr);
} else {
return {};
}
@@ -76,17 +77,8 @@
return symbol.get();
}
-
-static std::shared_ptr<ISymbolTable::Symbol> lookupIdInTable(const android::ResTable& table,
- ResourceId id) {
- android::Res_value val = {};
- ssize_t block = table.getResource(id.id, &val, true);
- if (block >= 0) {
- std::shared_ptr<ISymbolTable::Symbol> s = std::make_shared<ISymbolTable::Symbol>();
- s->id = id;
- return s;
- }
-
+static std::shared_ptr<ISymbolTable::Symbol> lookupAttributeInTable(const android::ResTable& table,
+ ResourceId id) {
// Try as a bag.
const android::ResTable::bag_entry* entry;
ssize_t count = table.lockBag(id.id, &entry);
@@ -110,29 +102,40 @@
if (s->attribute) {
for (size_t i = 0; i < (size_t) count; i++) {
- if (!Res_INTERNALID(entry[i].map.name.ident)) {
- android::ResTable::resource_name entryName;
- if (!table.getResourceName(entry[i].map.name.ident, false, &entryName)) {
- table.unlockBag(entry);
- return nullptr;
+ const android::ResTable_map& mapEntry = entry[i].map;
+ if (Res_INTERNALID(mapEntry.name.ident)) {
+ switch (mapEntry.name.ident) {
+ case android::ResTable_map::ATTR_MIN:
+ s->attribute->minInt = static_cast<int32_t>(mapEntry.value.data);
+ break;
+ case android::ResTable_map::ATTR_MAX:
+ s->attribute->maxInt = static_cast<int32_t>(mapEntry.value.data);
+ break;
}
-
- const ResourceType* parsedType = parseResourceType(
- StringPiece16(entryName.type, entryName.typeLen));
- if (!parsedType) {
- table.unlockBag(entry);
- return nullptr;
- }
-
- Attribute::Symbol symbol;
- symbol.symbol.name = ResourceNameRef(
- StringPiece16(entryName.package, entryName.packageLen),
- *parsedType,
- StringPiece16(entryName.name, entryName.nameLen)).toResourceName();
- symbol.symbol.id = ResourceId(entry[i].map.name.ident);
- symbol.value = entry[i].map.value.data;
- s->attribute->symbols.push_back(std::move(symbol));
+ continue;
}
+
+ android::ResTable::resource_name entryName;
+ if (!table.getResourceName(mapEntry.name.ident, false, &entryName)) {
+ table.unlockBag(entry);
+ return nullptr;
+ }
+
+ const ResourceType* parsedType = parseResourceType(
+ StringPiece16(entryName.type, entryName.typeLen));
+ if (!parsedType) {
+ table.unlockBag(entry);
+ return nullptr;
+ }
+
+ Attribute::Symbol symbol;
+ symbol.symbol.name = ResourceName(
+ StringPiece16(entryName.package, entryName.packageLen),
+ *parsedType,
+ StringPiece16(entryName.name, entryName.nameLen));
+ symbol.symbol.id = ResourceId(mapEntry.name.ident);
+ symbol.value = mapEntry.value.data;
+ s->attribute->symbols.push_back(std::move(symbol));
}
}
table.unlockBag(entry);
@@ -148,15 +151,25 @@
for (const auto& asset : mAssets) {
const android::ResTable& table = asset->getResources(false);
StringPiece16 typeStr = toString(name.type);
+ uint32_t typeSpecFlags = 0;
ResourceId resId = table.identifierForName(name.entry.data(), name.entry.size(),
typeStr.data(), typeStr.size(),
- name.package.data(), name.package.size());
+ name.package.data(), name.package.size(),
+ &typeSpecFlags);
if (!resId.isValid()) {
continue;
}
- std::shared_ptr<Symbol> s = lookupIdInTable(table, resId);
+ std::shared_ptr<Symbol> s;
+ if (name.type == ResourceType::kAttr) {
+ s = lookupAttributeInTable(table, resId);
+ } else {
+ s = std::make_shared<Symbol>();
+ s->id = resId;
+ }
+
if (s) {
+ s->isPublic = (typeSpecFlags & android::ResTable_typeSpec::SPEC_PUBLIC) != 0;
mCache.put(name, s);
return s.get();
}
@@ -164,6 +177,44 @@
return nullptr;
}
+static Maybe<ResourceName> getResourceName(const android::ResTable& table, ResourceId id) {
+ android::ResTable::resource_name resName;
+ if (!table.getResourceName(id.id, true, &resName)) {
+ return {};
+ }
+
+ ResourceName name;
+ if (resName.package) {
+ name.package = StringPiece16(resName.package, resName.packageLen).toString();
+ }
+
+ const ResourceType* type;
+ if (resName.type) {
+ type = parseResourceType(StringPiece16(resName.type, resName.typeLen));
+
+ } else if (resName.type8) {
+ type = parseResourceType(util::utf8ToUtf16(StringPiece(resName.type8, resName.typeLen)));
+ } else {
+ return {};
+ }
+
+ if (!type) {
+ return {};
+ }
+
+ name.type = *type;
+
+ if (resName.name) {
+ name.entry = StringPiece16(resName.name, resName.nameLen).toString();
+ } else if (resName.name8) {
+ name.entry = util::utf8ToUtf16(StringPiece(resName.name8, resName.nameLen));
+ } else {
+ return {};
+ }
+
+ return name;
+}
+
const ISymbolTable::Symbol* AssetManagerSymbolTableBuilder::AssetManagerSymbolTable::findById(
ResourceId id) {
if (const std::shared_ptr<Symbol>& s = mIdCache.get(id)) {
@@ -173,8 +224,24 @@
for (const auto& asset : mAssets) {
const android::ResTable& table = asset->getResources(false);
- std::shared_ptr<Symbol> s = lookupIdInTable(table, id);
+ Maybe<ResourceName> maybeName = getResourceName(table, id);
+ if (!maybeName) {
+ continue;
+ }
+
+ uint32_t typeSpecFlags = 0;
+ table.getResourceFlags(id.id, &typeSpecFlags);
+
+ std::shared_ptr<Symbol> s;
+ if (maybeName.value().type == ResourceType::kAttr) {
+ s = lookupAttributeInTable(table, id);
+ } else {
+ s = std::make_shared<Symbol>();
+ s->id = id;
+ }
+
if (s) {
+ s->isPublic = (typeSpecFlags & android::ResTable_typeSpec::SPEC_PUBLIC) != 0;
mIdCache.put(id, s);
return s.get();
}
diff --git a/tools/aapt2/test/Builders.h b/tools/aapt2/test/Builders.h
index 89cd972..f8e3d03 100644
--- a/tools/aapt2/test/Builders.h
+++ b/tools/aapt2/test/Builders.h
@@ -19,10 +19,9 @@
#include "ResourceTable.h"
#include "ResourceValues.h"
-#include "XmlDom.h"
-#include "util/Util.h"
-
#include "test/Common.h"
+#include "util/Util.h"
+#include "xml/XmlDom.h"
#include <memory>
@@ -37,6 +36,10 @@
public:
ResourceTableBuilder() = default;
+ StringPool* getStringPool() {
+ return &mTable->stringPool;
+ }
+
ResourceTableBuilder& setPackageId(const StringPiece16& packageName, uint8_t id) {
ResourceTablePackage* package = mTable->createPackage(packageName, id);
assert(package);
@@ -212,15 +215,22 @@
}
};
-inline std::unique_ptr<XmlResource> buildXmlDom(const StringPiece& str) {
+inline std::unique_ptr<xml::XmlResource> buildXmlDom(const StringPiece& str) {
std::stringstream in;
in << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" << str;
StdErrDiagnostics diag;
- std::unique_ptr<XmlResource> doc = xml::inflate(&in, &diag, {});
+ std::unique_ptr<xml::XmlResource> doc = xml::inflate(&in, &diag, {});
assert(doc);
return doc;
}
+inline std::unique_ptr<xml::XmlResource> buildXmlDomForPackageName(IAaptContext* context,
+ const StringPiece& str) {
+ std::unique_ptr<xml::XmlResource> doc = buildXmlDom(str);
+ doc->file.name.package = context->getCompilationPackage().toString();
+ return doc;
+}
+
} // namespace test
} // namespace aapt
diff --git a/tools/aapt2/test/Context.h b/tools/aapt2/test/Context.h
index 4fa4918..555a539 100644
--- a/tools/aapt2/test/Context.h
+++ b/tools/aapt2/test/Context.h
@@ -135,8 +135,19 @@
std::unique_ptr<SymbolTable> mSymbolTable = util::make_unique<SymbolTable>();
public:
+ StaticSymbolTableBuilder& addPublicSymbol(const StringPiece16& name, ResourceId id,
+ std::unique_ptr<Attribute> attr = {}) {
+ std::unique_ptr<ISymbolTable::Symbol> symbol = util::make_unique<ISymbolTable::Symbol>(
+ id, std::move(attr));
+ symbol->isPublic = true;
+ mSymbolTable->mNameMap[parseNameOrDie(name)] = symbol.get();
+ mSymbolTable->mIdMap[id] = symbol.get();
+ mSymbolTable->mSymbols.push_back(std::move(symbol));
+ return *this;
+ }
+
StaticSymbolTableBuilder& addSymbol(const StringPiece16& name, ResourceId id,
- std::unique_ptr<Attribute> attr = {}) {
+ std::unique_ptr<Attribute> attr = {}) {
std::unique_ptr<ISymbolTable::Symbol> symbol = util::make_unique<ISymbolTable::Symbol>(
id, std::move(attr));
mSymbolTable->mNameMap[parseNameOrDie(name)] = symbol.get();
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp
index 0d17e84..5cc7aa7 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.cpp
+++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp
@@ -97,19 +97,19 @@
return !error;
}
-bool BinaryResourceParser::getSymbol(const void* data, ResourceNameRef* outSymbol) {
+Maybe<Reference> BinaryResourceParser::getSymbol(const void* data) {
if (!mSymbolEntries || mSymbolEntryCount == 0) {
- return false;
+ return {};
}
if ((uintptr_t) data < (uintptr_t) mData) {
- return false;
+ return {};
}
// We only support 32 bit offsets right now.
const uintptr_t offset = (uintptr_t) data - (uintptr_t) mData;
if (offset > std::numeric_limits<uint32_t>::max()) {
- return false;
+ return {};
}
for (size_t i = 0; i < mSymbolEntryCount; i++) {
@@ -118,24 +118,23 @@
const StringPiece16 str = util::getString(
mSymbolPool, util::deviceToHost32(mSymbolEntries[i].name.index));
- StringPiece16 typeStr;
- ResourceUtils::extractResourceName(str, &outSymbol->package, &typeStr,
- &outSymbol->entry);
- const ResourceType* type = parseResourceType(typeStr);
- if (!type) {
- return false;
+ ResourceNameRef nameRef;
+ bool privateRef = false;
+ if (!ResourceUtils::parseResourceName(str, &nameRef, &privateRef)) {
+ return {};
}
- outSymbol->type = *type;
-
// Since we scan the symbol table in order, we can start looking for the
// next symbol from this point.
mSymbolEntryCount -= i + 1;
mSymbolEntries += i + 1;
- return true;
+
+ Reference ref(nameRef);
+ ref.privateReference = privateRef;
+ return Maybe<Reference>(std::move(ref));
}
}
- return false;
+ return {};
}
/**
@@ -304,6 +303,11 @@
return false;
}
+ // There can be multiple packages in a table, so
+ // clear the type and key pool in case they were set from a previous package.
+ mTypePool.uninit();
+ mKeyPool.uninit();
+
ResChunkPullParser parser(getChunkData(&packageHeader->header),
getChunkDataLen(&packageHeader->header));
while (ResChunkPullParser::isGoodEvent(parser.next())) {
@@ -561,15 +565,20 @@
resourceValue = parseValue(name, config, value, entry->flags);
}
- assert(resourceValue && "failed to interpret valid resource");
+ if (!resourceValue) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "failed to parse value for resource " << name
+ << " (" << resId << ") with configuration '"
+ << config << "'");
+ return false;
+ }
Source source = mSource;
if (sourceBlock) {
- size_t len;
- const char* str = mSourcePool.string8At(util::deviceToHost32(sourceBlock->path.index),
- &len);
- if (str) {
- source.path.assign(str, len);
+ StringPiece path = util::getString8(mSourcePool,
+ util::deviceToHost32(sourceBlock->path.index));
+ if (!path.empty()) {
+ source.path = path.toString();
}
source.line = util::deviceToHost32(sourceBlock->line);
}
@@ -652,7 +661,7 @@
if (value->dataType == Res_value::TYPE_REFERENCE ||
value->dataType == Res_value::TYPE_ATTRIBUTE) {
const Reference::Type type = (value->dataType == Res_value::TYPE_REFERENCE) ?
- Reference::Type::kResource : Reference::Type::kAttribute;
+ Reference::Type::kResource : Reference::Type::kAttribute;
if (data != 0) {
// This is a normal reference.
@@ -660,9 +669,9 @@
}
// This reference has an invalid ID. Check if it is an unresolved symbol.
- ResourceNameRef symbol;
- if (getSymbol(&value->data, &symbol)) {
- return util::make_unique<Reference>(symbol, type);
+ if (Maybe<Reference> ref = getSymbol(&value->data)) {
+ ref.value().referenceType = type;
+ return util::make_unique<Reference>(std::move(ref.value()));
}
// This is not an unresolved symbol, so it must be the magic @null reference.
@@ -710,26 +719,38 @@
if (util::deviceToHost32(map->parent.ident) == 0) {
// The parent is either not set or it is an unresolved symbol.
// Check to see if it is a symbol.
- ResourceNameRef symbol;
- if (getSymbol(&map->parent.ident, &symbol)) {
- style->parent = Reference(symbol.toResourceName());
- }
+ style->parent = getSymbol(&map->parent.ident);
+
} else {
// The parent is a regular reference to a resource.
style->parent = Reference(util::deviceToHost32(map->parent.ident));
}
for (const ResTable_map& mapEntry : map) {
+ if (Res_INTERNALID(util::deviceToHost32(mapEntry.name.ident))) {
+ if (style->entries.empty()) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "out-of-sequence meta data in style");
+ return {};
+ }
+ collectMetaData(mapEntry, &style->entries.back().key);
+ continue;
+ }
+
style->entries.emplace_back();
Style::Entry& styleEntry = style->entries.back();
if (util::deviceToHost32(mapEntry.name.ident) == 0) {
// The map entry's key (attribute) is not set. This must be
// a symbol reference, so resolve it.
- ResourceNameRef symbol;
- bool result = getSymbol(&mapEntry.name.ident, &symbol);
- assert(result);
- styleEntry.key.name = symbol.toResourceName();
+ Maybe<Reference> symbol = getSymbol(&mapEntry.name.ident);
+ if (!symbol) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "unresolved style attribute");
+ return {};
+ }
+ styleEntry.key = std::move(symbol.value());
+
} else {
// The map entry's key (attribute) is a regular reference.
styleEntry.key.id = ResourceId(util::deviceToHost32(mapEntry.name.ident));
@@ -737,7 +758,9 @@
// Parse the attribute's value.
styleEntry.value = parseValue(name, config, &mapEntry.value, 0);
- assert(styleEntry.value);
+ if (!styleEntry.value) {
+ return {};
+ }
}
return style;
}
@@ -757,21 +780,33 @@
attr->typeMask = util::deviceToHost32(typeMaskIter->value.data);
}
- if (attr->typeMask & (ResTable_map::TYPE_ENUM | ResTable_map::TYPE_FLAGS)) {
- for (const ResTable_map& mapEntry : map) {
- if (Res_INTERNALID(util::deviceToHost32(mapEntry.name.ident))) {
- continue;
+ for (const ResTable_map& mapEntry : map) {
+ if (Res_INTERNALID(util::deviceToHost32(mapEntry.name.ident))) {
+ switch (util::deviceToHost32(mapEntry.name.ident)) {
+ case ResTable_map::ATTR_MIN:
+ attr->minInt = static_cast<int32_t>(mapEntry.value.data);
+ break;
+ case ResTable_map::ATTR_MAX:
+ attr->maxInt = static_cast<int32_t>(mapEntry.value.data);
+ break;
}
+ continue;
+ }
+ if (attr->typeMask & (ResTable_map::TYPE_ENUM | ResTable_map::TYPE_FLAGS)) {
Attribute::Symbol symbol;
symbol.value = util::deviceToHost32(mapEntry.value.data);
if (util::deviceToHost32(mapEntry.name.ident) == 0) {
// The map entry's key (id) is not set. This must be
// a symbol reference, so resolve it.
- ResourceNameRef symbolName;
- bool result = getSymbol(&mapEntry.name.ident, &symbolName);
- assert(result);
- symbol.symbol.name = symbolName.toResourceName();
+ Maybe<Reference> ref = getSymbol(&mapEntry.name.ident);
+ if (!ref) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "unresolved attribute symbol");
+ return {};
+ }
+ symbol.symbol = std::move(ref.value());
+
} else {
// The map entry's key (id) is a regular reference.
symbol.symbol.id = ResourceId(util::deviceToHost32(mapEntry.name.ident));
@@ -781,15 +816,57 @@
}
}
- // TODO(adamlesinski): Find min, max, i80n, etc attributes.
+ // TODO(adamlesinski): Find i80n, attributes.
return attr;
}
+static bool isMetaDataEntry(const ResTable_map& mapEntry) {
+ switch (util::deviceToHost32(mapEntry.name.ident)) {
+ case ExtendedResTableMapTypes::ATTR_SOURCE_PATH:
+ case ExtendedResTableMapTypes::ATTR_SOURCE_LINE:
+ case ExtendedResTableMapTypes::ATTR_COMMENT:
+ return true;
+ }
+ return false;
+}
+
+bool BinaryResourceParser::collectMetaData(const ResTable_map& mapEntry, Value* value) {
+ switch (util::deviceToHost32(mapEntry.name.ident)) {
+ case ExtendedResTableMapTypes::ATTR_SOURCE_PATH:
+ value->setSource(Source(util::getString8(mSourcePool,
+ util::deviceToHost32(mapEntry.value.data))));
+ return true;
+ break;
+
+ case ExtendedResTableMapTypes::ATTR_SOURCE_LINE:
+ value->setSource(value->getSource().withLine(util::deviceToHost32(mapEntry.value.data)));
+ return true;
+ break;
+
+ case ExtendedResTableMapTypes::ATTR_COMMENT:
+ value->setComment(util::getString(mSourcePool, util::deviceToHost32(mapEntry.value.data)));
+ return true;
+ break;
+ }
+ return false;
+}
+
std::unique_ptr<Array> BinaryResourceParser::parseArray(const ResourceNameRef& name,
const ConfigDescription& config,
const ResTable_map_entry* map) {
std::unique_ptr<Array> array = util::make_unique<Array>();
+ Source source;
for (const ResTable_map& mapEntry : map) {
+ if (isMetaDataEntry(mapEntry)) {
+ if (array->items.empty()) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "out-of-sequence meta data in array");
+ return {};
+ }
+ collectMetaData(mapEntry, array->items.back().get());
+ continue;
+ }
+
array->items.push_back(parseValue(name, config, &mapEntry.value, 0));
}
return array;
@@ -800,13 +877,27 @@
const ResTable_map_entry* map) {
std::unique_ptr<Styleable> styleable = util::make_unique<Styleable>();
for (const ResTable_map& mapEntry : map) {
+ if (isMetaDataEntry(mapEntry)) {
+ if (styleable->entries.empty()) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "out-of-sequence meta data in styleable");
+ return {};
+ }
+ collectMetaData(mapEntry, &styleable->entries.back());
+ continue;
+ }
+
if (util::deviceToHost32(mapEntry.name.ident) == 0) {
// The map entry's key (attribute) is not set. This must be
// a symbol reference, so resolve it.
- ResourceNameRef symbol;
- bool result = getSymbol(&mapEntry.name.ident, &symbol);
- assert(result);
- styleable->entries.emplace_back(symbol);
+ Maybe<Reference> ref = getSymbol(&mapEntry.name.ident);
+ if (!ref) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "unresolved styleable symbol");
+ return {};
+ }
+ styleable->entries.emplace_back(std::move(ref.value()));
+
} else {
// The map entry's key (attribute) is a regular reference.
styleable->entries.emplace_back(util::deviceToHost32(mapEntry.name.ident));
@@ -819,26 +910,42 @@
const ConfigDescription& config,
const ResTable_map_entry* map) {
std::unique_ptr<Plural> plural = util::make_unique<Plural>();
+ Item* lastEntry = nullptr;
for (const ResTable_map& mapEntry : map) {
+ if (isMetaDataEntry(mapEntry)) {
+ if (!lastEntry) {
+ mContext->getDiagnostics()->error(DiagMessage(mSource)
+ << "out-of-sequence meta data in plural");
+ return {};
+ }
+ collectMetaData(mapEntry, lastEntry);
+ continue;
+ }
+
std::unique_ptr<Item> item = parseValue(name, config, &mapEntry.value, 0);
+ if (!item) {
+ return {};
+ }
+
+ lastEntry = item.get();
switch (util::deviceToHost32(mapEntry.name.ident)) {
- case android::ResTable_map::ATTR_ZERO:
+ case ResTable_map::ATTR_ZERO:
plural->values[Plural::Zero] = std::move(item);
break;
- case android::ResTable_map::ATTR_ONE:
+ case ResTable_map::ATTR_ONE:
plural->values[Plural::One] = std::move(item);
break;
- case android::ResTable_map::ATTR_TWO:
+ case ResTable_map::ATTR_TWO:
plural->values[Plural::Two] = std::move(item);
break;
- case android::ResTable_map::ATTR_FEW:
+ case ResTable_map::ATTR_FEW:
plural->values[Plural::Few] = std::move(item);
break;
- case android::ResTable_map::ATTR_MANY:
+ case ResTable_map::ATTR_MANY:
plural->values[Plural::Many] = std::move(item);
break;
- case android::ResTable_map::ATTR_OTHER:
+ case ResTable_map::ATTR_OTHER:
plural->values[Plural::Other] = std::move(item);
break;
}
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.h b/tools/aapt2/unflatten/BinaryResourceParser.h
index 02c4081..0745a59 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.h
+++ b/tools/aapt2/unflatten/BinaryResourceParser.h
@@ -57,7 +57,7 @@
private:
// Helper method to retrieve the symbol name for a given table offset specified
// as a pointer.
- bool getSymbol(const void* data, ResourceNameRef* outSymbol);
+ Maybe<Reference> getSymbol(const void* data);
bool parseTable(const android::ResChunk_header* chunk);
bool parseSymbolTable(const android::ResChunk_header* chunk);
@@ -91,6 +91,13 @@
const ConfigDescription& config,
const android::ResTable_map_entry* map);
+ /**
+ * If the mapEntry is a special type that denotes meta data (source, comment), then it is
+ * read and added to the Value.
+ * Returns true if the mapEntry was meta data.
+ */
+ bool collectMetaData(const android::ResTable_map& mapEntry, Value* value);
+
IAaptContext* mContext;
ResourceTable* mTable;
diff --git a/tools/aapt2/util/Maybe.h b/tools/aapt2/util/Maybe.h
index 1f7d5ce..aa409ea 100644
--- a/tools/aapt2/util/Maybe.h
+++ b/tools/aapt2/util/Maybe.h
@@ -275,6 +275,29 @@
return Maybe<T>();
}
+/**
+ * Define the == operator between Maybe<T> and Maybe<U> if the operator T == U is defined.
+ * Otherwise this won't be defined and the compiler will yell at the callsite instead of inside
+ * Maybe.h.
+ */
+template <typename T, typename U>
+auto operator==(const Maybe<T>& a, const Maybe<U>& b)
+-> decltype(std::declval<T> == std::declval<U>) {
+ if (a && b) {
+ return a.value() == b.value();
+ }
+ return false;
+}
+
+/**
+ * Same as operator== but negated.
+ */
+template <typename T, typename U>
+auto operator!=(const Maybe<T>& a, const Maybe<U>& b)
+-> decltype(std::declval<T> == std::declval<U>) {
+ return !(a == b);
+}
+
} // namespace aapt
#endif // AAPT_MAYBE_H
diff --git a/tools/aapt2/util/Maybe_test.cpp b/tools/aapt2/util/Maybe_test.cpp
index d2c33ca..9cca40e 100644
--- a/tools/aapt2/util/Maybe_test.cpp
+++ b/tools/aapt2/util/Maybe_test.cpp
@@ -119,4 +119,14 @@
}
}
+TEST(MaybeTest, Equality) {
+ Maybe<int> a = 1;
+ Maybe<int> b = 1;
+ Maybe<int> c;
+
+ EXPECT_EQ(a, b);
+ EXPECT_EQ(b, a);
+ EXPECT_NE(a, c);
+}
+
} // namespace aapt
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp
index 59b8385..9ecc974 100644
--- a/tools/aapt2/util/Util.cpp
+++ b/tools/aapt2/util/Util.cpp
@@ -28,9 +28,6 @@
namespace aapt {
namespace util {
-constexpr const char16_t* kSchemaAuto = u"http://schemas.android.com/apk/res-auto";
-constexpr const char16_t* kSchemaPrefix = u"http://schemas.android.com/apk/res/";
-
static std::vector<std::string> splitAndTransform(const StringPiece& str, char sep,
const std::function<char(char)>& f) {
std::vector<std::string> parts;
@@ -467,18 +464,6 @@
return data;
}
-Maybe<std::u16string> extractPackageFromNamespace(const std::u16string& namespaceUri) {
- if (stringStartsWith<char16_t>(namespaceUri, kSchemaPrefix)) {
- StringPiece16 schemaPrefix = kSchemaPrefix;
- StringPiece16 package = namespaceUri;
- return package.substr(schemaPrefix.size(), package.size() - schemaPrefix.size())
- .toString();
- } else if (namespaceUri == kSchemaAuto) {
- return std::u16string();
- }
- return {};
-}
-
bool extractResFilePathParts(const StringPiece16& path, StringPiece16* outPrefix,
StringPiece16* outEntry, StringPiece16* outSuffix) {
if (!stringStartsWith<char16_t>(path, u"res/")) {
diff --git a/tools/aapt2/util/Util.h b/tools/aapt2/util/Util.h
index 80552a5..0dacbd7 100644
--- a/tools/aapt2/util/Util.h
+++ b/tools/aapt2/util/Util.h
@@ -158,6 +158,15 @@
return StringPiece16();
}
+inline StringPiece getString8(const android::ResStringPool& pool, size_t idx) {
+ size_t len;
+ const char* str = pool.string8At(idx, &len);
+ if (str != nullptr) {
+ return StringPiece(str, len);
+ }
+ return StringPiece();
+}
+
/**
* Checks that the Java string format contains no non-positional arguments (arguments without
* explicitly specifying an index) when there are more than one argument. This is an error
@@ -229,11 +238,12 @@
private:
friend class Tokenizer<Char>;
- iterator(BasicStringPiece<Char> s, Char sep, BasicStringPiece<Char> tok);
+ iterator(BasicStringPiece<Char> s, Char sep, BasicStringPiece<Char> tok, bool end);
- BasicStringPiece<Char> str;
- Char separator;
- BasicStringPiece<Char> token;
+ BasicStringPiece<Char> mStr;
+ Char mSeparator;
+ BasicStringPiece<Char> mToken;
+ bool mEnd;
};
Tokenizer(BasicStringPiece<Char> str, Char sep);
@@ -252,36 +262,38 @@
template <typename Char>
typename Tokenizer<Char>::iterator& Tokenizer<Char>::iterator::operator++() {
- const Char* start = token.end();
- const Char* end = str.end();
+ const Char* start = mToken.end();
+ const Char* end = mStr.end();
if (start == end) {
- token.assign(token.end(), 0);
+ mEnd = true;
+ mToken.assign(mToken.end(), 0);
return *this;
}
start += 1;
const Char* current = start;
while (current != end) {
- if (*current == separator) {
- token.assign(start, current - start);
+ if (*current == mSeparator) {
+ mToken.assign(start, current - start);
return *this;
}
++current;
}
- token.assign(start, end - start);
+ mToken.assign(start, end - start);
return *this;
}
template <typename Char>
inline BasicStringPiece<Char> Tokenizer<Char>::iterator::operator*() {
- return token;
+ return mToken;
}
template <typename Char>
inline bool Tokenizer<Char>::iterator::operator==(const iterator& rhs) const {
// We check equality here a bit differently.
// We need to know that the addresses are the same.
- return token.begin() == rhs.token.begin() && token.end() == rhs.token.end();
+ return mToken.begin() == rhs.mToken.begin() && mToken.end() == rhs.mToken.end() &&
+ mEnd == rhs.mEnd;
}
template <typename Char>
@@ -291,8 +303,8 @@
template <typename Char>
inline Tokenizer<Char>::iterator::iterator(BasicStringPiece<Char> s, Char sep,
- BasicStringPiece<Char> tok) :
- str(s), separator(sep), token(tok) {
+ BasicStringPiece<Char> tok, bool end) :
+ mStr(s), mSeparator(sep), mToken(tok), mEnd(end) {
}
template <typename Char>
@@ -307,8 +319,8 @@
template <typename Char>
inline Tokenizer<Char>::Tokenizer(BasicStringPiece<Char> str, Char sep) :
- mBegin(++iterator(str, sep, BasicStringPiece<Char>(str.begin() - 1, 0))),
- mEnd(str, sep, BasicStringPiece<Char>(str.end(), 0)) {
+ mBegin(++iterator(str, sep, BasicStringPiece<Char>(str.begin() - 1, 0), false)),
+ mEnd(str, sep, BasicStringPiece<Char>(str.end(), 0), true) {
}
inline uint16_t hostToDevice16(uint16_t value) {
@@ -328,15 +340,6 @@
}
/**
- * Returns a package name if the namespace URI is of the form:
- * http://schemas.android.com/apk/res/<package>
- *
- * Special case: if namespaceUri is http://schemas.android.com/apk/res-auto,
- * returns an empty package name.
- */
-Maybe<std::u16string> extractPackageFromNamespace(const std::u16string& namespaceUri);
-
-/**
* Given a path like: res/xml-sw600dp/foo.xml
*
* Extracts "res/xml-sw600dp/" into outPrefix.
diff --git a/tools/aapt2/util/Util_test.cpp b/tools/aapt2/util/Util_test.cpp
index 9db9fb7..9208e07 100644
--- a/tools/aapt2/util/Util_test.cpp
+++ b/tools/aapt2/util/Util_test.cpp
@@ -101,6 +101,15 @@
ASSERT_EQ(tokenizer.end(), iter);
}
+TEST(UtilTest, TokenizeEmptyString) {
+ auto tokenizer = util::tokenize(StringPiece16(u""), u'|');
+ auto iter = tokenizer.begin();
+ ASSERT_NE(tokenizer.end(), iter);
+ ASSERT_EQ(StringPiece16(), *iter);
+ ++iter;
+ ASSERT_EQ(tokenizer.end(), iter);
+}
+
TEST(UtilTest, TokenizeAtEnd) {
auto tokenizer = util::tokenize(StringPiece16(u"one."), u'.');
auto iter = tokenizer.begin();
diff --git a/tools/aapt2/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp
similarity index 91%
rename from tools/aapt2/XmlDom.cpp
rename to tools/aapt2/xml/XmlDom.cpp
index b769c76..d27b62fd 100644
--- a/tools/aapt2/XmlDom.cpp
+++ b/tools/aapt2/xml/XmlDom.cpp
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-#include "util/Util.h"
#include "XmlDom.h"
#include "XmlPullParser.h"
+#include "util/Util.h"
#include <cassert>
+#include <expat.h>
#include <memory>
#include <stack>
#include <string>
@@ -317,6 +318,10 @@
return util::make_unique<XmlResource>(ResourceFile{}, std::move(root));
}
+Element* findRootElement(XmlResource* doc) {
+ return findRootElement(doc->root.get());
+}
+
Element* findRootElement(Node* node) {
if (!node) {
return nullptr;
@@ -397,5 +402,39 @@
return elements;
}
+void PackageAwareVisitor::visit(Namespace* ns) {
+ bool added = false;
+ if (Maybe<ExtractedPackage> maybePackage = extractPackageFromNamespace(ns->namespaceUri)) {
+ ExtractedPackage& package = maybePackage.value();
+ mPackageDecls.push_back(PackageDecl{ ns->namespacePrefix, std::move(package) });
+ added = true;
+ }
+
+ Visitor::visit(ns);
+
+ if (added) {
+ mPackageDecls.pop_back();
+ }
+}
+
+Maybe<ExtractedPackage> PackageAwareVisitor::transformPackageAlias(
+ const StringPiece16& alias, const StringPiece16& localPackage) const {
+ if (alias.empty()) {
+ return ExtractedPackage{ localPackage.toString(), false /* private */ };
+ }
+
+ const auto rend = mPackageDecls.rend();
+ for (auto iter = mPackageDecls.rbegin(); iter != rend; ++iter) {
+ if (alias == iter->prefix) {
+ if (iter->package.package.empty()) {
+ return ExtractedPackage{ localPackage.toString(),
+ iter->package.privateNamespace };
+ }
+ return iter->package;
+ }
+ }
+ return {};
+}
+
} // namespace xml
} // namespace aapt
diff --git a/tools/aapt2/XmlDom.h b/tools/aapt2/xml/XmlDom.h
similarity index 76%
rename from tools/aapt2/XmlDom.h
rename to tools/aapt2/xml/XmlDom.h
index 9a46bcb..033b0a4 100644
--- a/tools/aapt2/XmlDom.h
+++ b/tools/aapt2/xml/XmlDom.h
@@ -22,11 +22,9 @@
#include "ResourceValues.h"
#include "util/StringPiece.h"
#include "util/Util.h"
-
-#include "process/IResourceTableConsumer.h"
+#include "xml/XmlUtil.h"
#include <istream>
-#include <expat.h>
#include <memory>
#include <string>
#include <vector>
@@ -34,21 +32,9 @@
namespace aapt {
namespace xml {
-constexpr const char16_t* kSchemaAndroid = u"http://schemas.android.com/apk/res/android";
-
struct RawVisitor;
/**
- * The type of node. Can be used to downcast to the concrete XML node
- * class.
- */
-enum class NodeType {
- kNamespace,
- kElement,
- kText,
-};
-
-/**
* Base class for all XML nodes.
*/
struct Node {
@@ -58,9 +44,10 @@
std::u16string comment;
std::vector<std::unique_ptr<Node>> children;
+ virtual ~Node() = default;
+
void addChild(std::unique_ptr<Node> child);
virtual void accept(RawVisitor* visitor) = 0;
- virtual ~Node() {}
};
/**
@@ -122,6 +109,14 @@
};
/**
+ * An XML resource with a source, name, and XML tree.
+ */
+struct XmlResource {
+ ResourceFile file;
+ std::unique_ptr<xml::Node> root;
+};
+
+/**
* Inflates an XML DOM from a text stream, logging errors to the logger.
* Returns the root node on success, or nullptr on failure.
*/
@@ -134,6 +129,7 @@
std::unique_ptr<XmlResource> inflate(const void* data, size_t dataLen, IDiagnostics* diag,
const Source& source);
+Element* findRootElement(XmlResource* doc);
Element* findRootElement(Node* node);
/**
@@ -180,7 +176,7 @@
private:
struct PackageDecl {
std::u16string prefix;
- std::u16string package;
+ ExtractedPackage package;
};
std::vector<PackageDecl> mPackageDecls;
@@ -188,41 +184,9 @@
public:
using Visitor::visit;
- void visit(Namespace* ns) override {
- bool added = false;
- {
- Maybe<std::u16string> package = util::extractPackageFromNamespace(ns->namespaceUri);
- if (package) {
- mPackageDecls.push_back(PackageDecl{ ns->namespacePrefix, package.value() });
- added = true;
- }
- }
-
- Visitor::visit(ns);
-
- if (added) {
- mPackageDecls.pop_back();
- }
- }
-
- Maybe<ResourceName> transformPackage(const ResourceName& name,
- const StringPiece16& localPackage) const override {
- if (name.package.empty()) {
- return ResourceName{ localPackage.toString(), name.type, name.entry };
- }
-
- const auto rend = mPackageDecls.rend();
- for (auto iter = mPackageDecls.rbegin(); iter != rend; ++iter) {
- if (name.package == iter->prefix) {
- if (iter->package.empty()) {
- return ResourceName{ localPackage.toString(), name.type, name.entry };
- } else {
- return ResourceName{ iter->package, name.type, name.entry };
- }
- }
- }
- return {};
- }
+ void visit(Namespace* ns) override;
+ Maybe<ExtractedPackage> transformPackageAlias(
+ const StringPiece16& alias, const StringPiece16& localPackage) const override;
};
// Implementations
diff --git a/tools/aapt2/XmlDom_test.cpp b/tools/aapt2/xml/XmlDom_test.cpp
similarity index 93%
rename from tools/aapt2/XmlDom_test.cpp
rename to tools/aapt2/xml/XmlDom_test.cpp
index a1b9ed0..431ee2c 100644
--- a/tools/aapt2/XmlDom_test.cpp
+++ b/tools/aapt2/xml/XmlDom_test.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "XmlDom.h"
+#include "xml/XmlDom.h"
#include <gtest/gtest.h>
#include <sstream>
@@ -38,7 +38,7 @@
const Source source = { "test.xml" };
StdErrDiagnostics diag;
- std::unique_ptr<XmlResource> doc = xml::inflate(&in, &diag, source);
+ std::unique_ptr<xml::XmlResource> doc = xml::inflate(&in, &diag, source);
ASSERT_NE(doc, nullptr);
xml::Namespace* ns = xml::nodeCast<xml::Namespace>(doc->root.get());
diff --git a/tools/aapt2/XmlPullParser.cpp b/tools/aapt2/xml/XmlPullParser.cpp
similarity index 85%
rename from tools/aapt2/XmlPullParser.cpp
rename to tools/aapt2/xml/XmlPullParser.cpp
index cff935c..323ec05 100644
--- a/tools/aapt2/XmlPullParser.cpp
+++ b/tools/aapt2/xml/XmlPullParser.cpp
@@ -16,12 +16,14 @@
#include "util/Maybe.h"
#include "util/Util.h"
-#include "XmlPullParser.h"
+#include "xml/XmlPullParser.h"
+#include "xml/XmlUtil.h"
#include <iostream>
#include <string>
namespace aapt {
+namespace xml {
constexpr char kXmlNamespaceSep = 1;
@@ -72,14 +74,14 @@
// Record namespace prefixes and package names so that we can do our own
// handling of references that use namespace aliases.
if (event == Event::kStartNamespace || event == Event::kEndNamespace) {
- Maybe<std::u16string> result = util::extractPackageFromNamespace(getNamespaceUri());
+ Maybe<ExtractedPackage> result = extractPackageFromNamespace(getNamespaceUri());
if (event == Event::kStartNamespace) {
if (result) {
- mPackageAliases.emplace_back(getNamespacePrefix(), result.value());
+ mPackageAliases.emplace_back(
+ PackageDecl{ getNamespacePrefix(), std::move(result.value()) });
}
} else {
if (result) {
- assert(mPackageAliases.back().second == result.value());
mPackageAliases.pop_back();
}
}
@@ -131,20 +133,20 @@
return mEventQueue.front().data2;
}
-Maybe<ResourceName> XmlPullParser::transformPackage(
- const ResourceName& name, const StringPiece16& localPackage) const {
- if (name.package.empty()) {
- return ResourceName{ localPackage.toString(), name.type, name.entry };
+Maybe<ExtractedPackage> XmlPullParser::transformPackageAlias(
+ const StringPiece16& alias, const StringPiece16& localPackage) const {
+ if (alias.empty()) {
+ return ExtractedPackage{ localPackage.toString(), false /* private */ };
}
const auto endIter = mPackageAliases.rend();
for (auto iter = mPackageAliases.rbegin(); iter != endIter; ++iter) {
- if (name.package == iter->first) {
- if (iter->second.empty()) {
- return ResourceName{ localPackage.toString(), name.type, name.entry };
- } else {
- return ResourceName{ iter->second, name.type, name.entry };
+ if (alias == iter->prefix) {
+ if (iter->package.package.empty()) {
+ return ExtractedPackage{ localPackage.toString(),
+ iter->package.privateNamespace };
}
+ return iter->package;
}
}
return {};
@@ -283,4 +285,24 @@
});
}
+Maybe<StringPiece16> findAttribute(const XmlPullParser* parser, const StringPiece16& name) {
+ auto iter = parser->findAttribute(u"", name);
+ if (iter != parser->endAttributes()) {
+ return StringPiece16(util::trimWhitespace(iter->value));
+ }
+ return {};
+}
+
+Maybe<StringPiece16> findNonEmptyAttribute(const XmlPullParser* parser, const StringPiece16& name) {
+ auto iter = parser->findAttribute(u"", name);
+ if (iter != parser->endAttributes()) {
+ StringPiece16 trimmed = util::trimWhitespace(iter->value);
+ if (!trimmed.empty()) {
+ return trimmed;
+ }
+ }
+ return {};
+}
+
+} // namespace xml
} // namespace aapt
diff --git a/tools/aapt2/XmlPullParser.h b/tools/aapt2/xml/XmlPullParser.h
similarity index 91%
rename from tools/aapt2/XmlPullParser.h
rename to tools/aapt2/xml/XmlPullParser.h
index a0ce21d..7e7070e 100644
--- a/tools/aapt2/XmlPullParser.h
+++ b/tools/aapt2/xml/XmlPullParser.h
@@ -17,11 +17,11 @@
#ifndef AAPT_XML_PULL_PARSER_H
#define AAPT_XML_PULL_PARSER_H
-#include "util/Maybe.h"
#include "Resource.h"
-#include "util/StringPiece.h"
-
#include "process/IResourceTableConsumer.h"
+#include "util/Maybe.h"
+#include "util/StringPiece.h"
+#include "xml/XmlUtil.h"
#include <algorithm>
#include <expat.h>
@@ -33,6 +33,7 @@
#include <vector>
namespace aapt {
+namespace xml {
class XmlPullParser : public IPackageDeclStack {
public:
@@ -60,7 +61,7 @@
static bool isGoodEvent(Event event);
XmlPullParser(std::istream& in);
- virtual ~XmlPullParser();
+ ~XmlPullParser();
/**
* Returns the current event that is being processed.
@@ -95,6 +96,13 @@
const std::u16string& getNamespacePrefix() const;
const std::u16string& getNamespaceUri() const;
+ //
+ // These are available for StartElement and EndElement.
+ //
+
+ const std::u16string& getElementNamespace() const;
+ const std::u16string& getElementName() const;
+
/*
* Uses the current stack of namespaces to resolve the package. Eg:
* xmlns:app = "http://schemas.android.com/apk/res/com.android.app"
@@ -106,17 +114,8 @@
* If xmlns:app="http://schemas.android.com/apk/res-auto", then
* 'package' will be set to 'defaultPackage'.
*/
- //
-
- //
- // These are available for StartElement and EndElement.
- //
-
- const std::u16string& getElementNamespace() const;
- const std::u16string& getElementName() const;
-
- Maybe<ResourceName> transformPackage(const ResourceName& name,
- const StringPiece16& localPackage) const override;
+ Maybe<ExtractedPackage> transformPackageAlias(
+ const StringPiece16& alias, const StringPiece16& localPackage) const override;
//
// Remaining methods are for retrieving information about attributes
@@ -169,9 +168,25 @@
const std::u16string mEmpty;
size_t mDepth;
std::stack<std::u16string> mNamespaceUris;
- std::vector<std::pair<std::u16string, std::u16string>> mPackageAliases;
+
+ struct PackageDecl {
+ std::u16string prefix;
+ ExtractedPackage package;
+ };
+ std::vector<PackageDecl> mPackageAliases;
};
+/**
+ * Finds the attribute in the current element within the global namespace.
+ */
+Maybe<StringPiece16> findAttribute(const XmlPullParser* parser, const StringPiece16& name);
+
+/**
+ * Finds the attribute in the current element within the global namespace. The attribute's value
+ * must not be the empty string.
+ */
+Maybe<StringPiece16> findNonEmptyAttribute(const XmlPullParser* parser, const StringPiece16& name);
+
//
// Implementation
//
@@ -277,6 +292,7 @@
return endIter;
}
+} // namespace xml
} // namespace aapt
#endif // AAPT_XML_PULL_PARSER_H
diff --git a/tools/aapt2/XmlPullParser_test.cpp b/tools/aapt2/xml/XmlPullParser_test.cpp
similarity index 63%
rename from tools/aapt2/XmlPullParser_test.cpp
rename to tools/aapt2/xml/XmlPullParser_test.cpp
index 1c99a43..8fa2c6d 100644
--- a/tools/aapt2/XmlPullParser_test.cpp
+++ b/tools/aapt2/xml/XmlPullParser_test.cpp
@@ -15,7 +15,7 @@
*/
#include "util/StringPiece.h"
-#include "XmlPullParser.h"
+#include "xml/XmlPullParser.h"
#include <gtest/gtest.h>
#include <sstream>
@@ -26,30 +26,30 @@
std::stringstream str;
str << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
"<a><b><c xmlns:a=\"http://schema.org\"><d/></c><e/></b></a>";
- XmlPullParser parser(str);
+ xml::XmlPullParser parser(str);
const size_t depthOuter = parser.getDepth();
- ASSERT_TRUE(XmlPullParser::nextChildNode(&parser, depthOuter));
+ ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthOuter));
- EXPECT_EQ(XmlPullParser::Event::kStartElement, parser.getEvent());
+ EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
EXPECT_EQ(StringPiece16(u"a"), StringPiece16(parser.getElementName()));
const size_t depthA = parser.getDepth();
- ASSERT_TRUE(XmlPullParser::nextChildNode(&parser, depthA));
- EXPECT_EQ(XmlPullParser::Event::kStartElement, parser.getEvent());
+ ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthA));
+ EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
EXPECT_EQ(StringPiece16(u"b"), StringPiece16(parser.getElementName()));
const size_t depthB = parser.getDepth();
- ASSERT_TRUE(XmlPullParser::nextChildNode(&parser, depthB));
- EXPECT_EQ(XmlPullParser::Event::kStartElement, parser.getEvent());
+ ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthB));
+ EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
EXPECT_EQ(StringPiece16(u"c"), StringPiece16(parser.getElementName()));
- ASSERT_TRUE(XmlPullParser::nextChildNode(&parser, depthB));
- EXPECT_EQ(XmlPullParser::Event::kStartElement, parser.getEvent());
+ ASSERT_TRUE(xml::XmlPullParser::nextChildNode(&parser, depthB));
+ EXPECT_EQ(xml::XmlPullParser::Event::kStartElement, parser.getEvent());
EXPECT_EQ(StringPiece16(u"e"), StringPiece16(parser.getElementName()));
- ASSERT_FALSE(XmlPullParser::nextChildNode(&parser, depthOuter));
- EXPECT_EQ(XmlPullParser::Event::kEndDocument, parser.getEvent());
+ ASSERT_FALSE(xml::XmlPullParser::nextChildNode(&parser, depthOuter));
+ EXPECT_EQ(xml::XmlPullParser::Event::kEndDocument, parser.getEvent());
}
} // namespace aapt
diff --git a/tools/aapt2/xml/XmlUtil.cpp b/tools/aapt2/xml/XmlUtil.cpp
new file mode 100644
index 0000000..ab9f544
--- /dev/null
+++ b/tools/aapt2/xml/XmlUtil.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "util/Maybe.h"
+#include "util/Util.h"
+#include "xml/XmlUtil.h"
+
+#include <string>
+
+namespace aapt {
+namespace xml {
+
+Maybe<ExtractedPackage> extractPackageFromNamespace(const std::u16string& namespaceUri) {
+ if (util::stringStartsWith<char16_t>(namespaceUri, kSchemaPublicPrefix)) {
+ StringPiece16 schemaPrefix = kSchemaPublicPrefix;
+ StringPiece16 package = namespaceUri;
+ package = package.substr(schemaPrefix.size(), package.size() - schemaPrefix.size());
+ if (package.empty()) {
+ return {};
+ }
+ return ExtractedPackage{ package.toString(), false /* isPrivate */ };
+
+ } else if (util::stringStartsWith<char16_t>(namespaceUri, kSchemaPrivatePrefix)) {
+ StringPiece16 schemaPrefix = kSchemaPrivatePrefix;
+ StringPiece16 package = namespaceUri;
+ package = package.substr(schemaPrefix.size(), package.size() - schemaPrefix.size());
+ if (package.empty()) {
+ return {};
+ }
+ return ExtractedPackage{ package.toString(), true /* isPrivate */ };
+
+ } else if (namespaceUri == kSchemaAuto) {
+ return ExtractedPackage{ std::u16string(), true /* isPrivate */ };
+ }
+ return {};
+}
+
+void transformReferenceFromNamespace(IPackageDeclStack* declStack,
+ const StringPiece16& localPackage, Reference* inRef) {
+ if (inRef->name) {
+ if (Maybe<ExtractedPackage> transformedPackage =
+ declStack->transformPackageAlias(inRef->name.value().package, localPackage)) {
+ ExtractedPackage& extractedPackage = transformedPackage.value();
+ inRef->name.value().package = std::move(extractedPackage.package);
+
+ // If the reference was already private (with a * prefix) and the namespace is public,
+ // we keep the reference private.
+ inRef->privateReference |= extractedPackage.privateNamespace;
+ }
+ }
+}
+
+} // namespace xml
+} // namespace aapt
diff --git a/tools/aapt2/xml/XmlUtil.h b/tools/aapt2/xml/XmlUtil.h
new file mode 100644
index 0000000..98e5520
--- /dev/null
+++ b/tools/aapt2/xml/XmlUtil.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef AAPT_XML_XMLUTIL_H
+#define AAPT_XML_XMLUTIL_H
+
+#include "ResourceValues.h"
+#include "util/Maybe.h"
+
+#include <string>
+
+namespace aapt {
+namespace xml {
+
+constexpr const char16_t* kSchemaAuto = u"http://schemas.android.com/apk/res-auto";
+constexpr const char16_t* kSchemaPublicPrefix = u"http://schemas.android.com/apk/res/";
+constexpr const char16_t* kSchemaPrivatePrefix = u"http://schemas.android.com/apk/prv/res/";
+constexpr const char16_t* kSchemaAndroid = u"http://schemas.android.com/apk/res/android";
+
+/**
+ * Result of extracting a package name from a namespace URI declaration.
+ */
+struct ExtractedPackage {
+ /**
+ * The name of the package. This can be the empty string, which means that the package
+ * should be assumed to be the package being compiled.
+ */
+ std::u16string package;
+
+ /**
+ * True if the package's private namespace was declared. This means that private resources
+ * are made visible.
+ */
+ bool privateNamespace;
+};
+
+/**
+ * Returns an ExtractedPackage struct if the namespace URI is of the form:
+ * http://schemas.android.com/apk/res/<package> or
+ * http://schemas.android.com/apk/prv/res/<package>
+ *
+ * Special case: if namespaceUri is http://schemas.android.com/apk/res-auto,
+ * returns an empty package name.
+ */
+Maybe<ExtractedPackage> extractPackageFromNamespace(const std::u16string& namespaceUri);
+
+/**
+ * Interface representing a stack of XML namespace declarations. When looking up the package
+ * for a namespace prefix, the stack is checked from top to bottom.
+ */
+struct IPackageDeclStack {
+ virtual ~IPackageDeclStack() = default;
+
+ /**
+ * Returns an ExtractedPackage struct if the alias given corresponds with a package declaration.
+ */
+ virtual Maybe<ExtractedPackage> transformPackageAlias(
+ const StringPiece16& alias, const StringPiece16& localPackage) const = 0;
+};
+
+/**
+ * Helper function for transforming the original Reference inRef to a fully qualified reference
+ * via the IPackageDeclStack. This will also mark the Reference as private if the namespace of
+ * the package declaration was private.
+ */
+void transformReferenceFromNamespace(IPackageDeclStack* declStack,
+ const StringPiece16& localPackage, Reference* inRef);
+
+} // namespace xml
+} // namespace aapt
+
+#endif /* AAPT_XML_XMLUTIL_H */
diff --git a/tools/aapt2/xml/XmlUtil_test.cpp b/tools/aapt2/xml/XmlUtil_test.cpp
new file mode 100644
index 0000000..7796b3e
--- /dev/null
+++ b/tools/aapt2/xml/XmlUtil_test.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "test/Common.h"
+#include "xml/XmlUtil.h"
+
+#include <gtest/gtest.h>
+
+namespace aapt {
+
+TEST(XmlUtilTest, ExtractPackageFromNamespace) {
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"com.android"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"http://schemas.android.com/apk"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res/"));
+ AAPT_ASSERT_FALSE(xml::extractPackageFromNamespace(
+ u"http://schemas.android.com/apk/prv/res/"));
+
+ Maybe<xml::ExtractedPackage> p =
+ xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res/a");
+ AAPT_ASSERT_TRUE(p);
+ EXPECT_EQ(std::u16string(u"a"), p.value().package);
+ EXPECT_EQ(false, p.value().privateNamespace);
+
+ p = xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/prv/res/android");
+ AAPT_ASSERT_TRUE(p);
+ EXPECT_EQ(std::u16string(u"android"), p.value().package);
+ EXPECT_EQ(true, p.value().privateNamespace);
+
+ p = xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/prv/res/com.test");
+ AAPT_ASSERT_TRUE(p);
+ EXPECT_EQ(std::u16string(u"com.test"), p.value().package);
+ EXPECT_EQ(true, p.value().privateNamespace);
+
+ p = xml::extractPackageFromNamespace(u"http://schemas.android.com/apk/res-auto");
+ AAPT_ASSERT_TRUE(p);
+ EXPECT_EQ(std::u16string(), p.value().package);
+ EXPECT_EQ(true, p.value().privateNamespace);
+}
+
+} // namespace aapt
diff --git a/tools/layoutlib/.idea/encodings.xml b/tools/layoutlib/.idea/encodings.xml
index e206d70..f758959 100644
--- a/tools/layoutlib/.idea/encodings.xml
+++ b/tools/layoutlib/.idea/encodings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+ <file url="PROJECT" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk
index 61ddb04..53bfc15 100644
--- a/tools/layoutlib/Android.mk
+++ b/tools/layoutlib/Android.mk
@@ -30,6 +30,9 @@
built_framework_dep := $(call java-lib-deps,framework)
built_framework_classes := $(call java-lib-files,framework)
+built_oj_dep := $(call java-lib-deps,core-oj)
+built_oj_classes := $(call java-lib-files,core-oj)
+
built_core_dep := $(call java-lib-deps,core-libart)
built_core_classes := $(call java-lib-files,core-libart)
@@ -56,7 +59,8 @@
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
-$(LOCAL_BUILT_MODULE): $(built_core_dep) \
+$(LOCAL_BUILT_MODULE): $(built_oj_dep) \
+ $(built_core_dep) \
$(built_framework_dep) \
$(built_ext_dep) \
$(built_ext_data) \
@@ -69,6 +73,7 @@
$(hide) ls -l $(built_framework_classes)
$(hide) java -ea -jar $(built_layoutlib_create_jar) \
$@ \
+ $(built_oj_classes) \
$(built_core_classes) \
$(built_framework_classes) \
$(built_ext_classes) \
diff --git a/tools/layoutlib/bridge/src/android/animation/FakeAnimator.java b/tools/layoutlib/bridge/src/android/animation/FakeAnimator.java
deleted file mode 100644
index 78aedc5..0000000
--- a/tools/layoutlib/bridge/src/android/animation/FakeAnimator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2014 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.animation;
-
-/**
- * A fake implementation of Animator which doesn't do anything.
- */
-public class FakeAnimator extends Animator {
- @Override
- public long getStartDelay() {
- return 0;
- }
-
- @Override
- public void setStartDelay(long startDelay) {
-
- }
-
- @Override
- public Animator setDuration(long duration) {
- return this;
- }
-
- @Override
- public long getDuration() {
- return 0;
- }
-
- @Override
- public void setInterpolator(TimeInterpolator value) {
-
- }
-
- @Override
- public boolean isRunning() {
- return false;
- }
-}
diff --git a/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java b/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java
index 4603b63..54021c9 100644
--- a/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java
@@ -16,9 +16,16 @@
package android.animation;
+import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Delegate implementing the native methods of android.animation.PropertyValuesHolder
*
@@ -29,81 +36,161 @@
* around to map int to instance of the delegate.
*
* The main goal of this class' methods are to provide a native way to access setters and getters
- * on some object. In this case we want to default to using Java reflection instead so the native
- * methods do nothing.
+ * on some object. We override these methods to use reflection since the original reflection
+ * implementation of the PropertyValuesHolder won't be able to access protected methods.
*
*/
-/*package*/ class PropertyValuesHolder_Delegate {
+/*package*/
+@SuppressWarnings("unused")
+class PropertyValuesHolder_Delegate {
+ // This code is copied from android.animation.PropertyValuesHolder and must be kept in sync
+ // We try several different types when searching for appropriate setter/getter functions.
+ // The caller may have supplied values in a type that does not match the setter/getter
+ // functions (such as the integers 0 and 1 to represent floating point values for alpha).
+ // Also, the use of generics in constructors means that we end up with the Object versions
+ // of primitive types (Float vs. float). But most likely, the setter/getter functions
+ // will take primitive types instead.
+ // So we supply an ordered array of other types to try before giving up.
+ private static Class[] FLOAT_VARIANTS = {float.class, Float.class, double.class, int.class,
+ Double.class, Integer.class};
+ private static Class[] INTEGER_VARIANTS = {int.class, Integer.class, float.class, double.class,
+ Float.class, Double.class};
+
+ private static final Object sMethodIndexLock = new Object();
+ private static final Map<Long, Method> ID_TO_METHOD = new HashMap<Long, Method>();
+ private static final Map<String, Long> METHOD_NAME_TO_ID = new HashMap<String, Long>();
+ private static long sNextId = 1;
+
+ private static long registerMethod(Class<?> targetClass, String methodName, Class[] types,
+ int nArgs) {
+ // Encode the number of arguments in the method name
+ String methodIndexName = String.format("%1$s#%2$d", methodName, nArgs);
+ synchronized (sMethodIndexLock) {
+ Long methodId = METHOD_NAME_TO_ID.get(methodIndexName);
+
+ if (methodId != null) {
+ // The method was already registered
+ return methodId;
+ }
+
+ Class[] args = new Class[nArgs];
+ Method method = null;
+ for (Class typeVariant : types) {
+ for (int i = 0; i < nArgs; i++) {
+ args[i] = typeVariant;
+ }
+ try {
+ method = targetClass.getDeclaredMethod(methodName, args);
+ } catch (NoSuchMethodException ignore) {
+ }
+ }
+
+ if (method != null) {
+ methodId = sNextId++;
+ ID_TO_METHOD.put(methodId, method);
+ METHOD_NAME_TO_ID.put(methodIndexName, methodId);
+
+ return methodId;
+ }
+ }
+
+ // Method not found
+ return 0;
+ }
+
+ private static void callMethod(Object target, long methodID, Object... args) {
+ Method method = ID_TO_METHOD.get(methodID);
+ assert method != null;
+
+ try {
+ method.setAccessible(true);
+ method.invoke(target, args);
+ } catch (IllegalAccessException e) {
+ Bridge.getLog().error(null, "Unable to update property during animation", e, null);
+ } catch (InvocationTargetException e) {
+ Bridge.getLog().error(null, "Unable to update property during animation", e, null);
+ }
+ }
@LayoutlibDelegate
/*package*/ static long nGetIntMethod(Class<?> targetClass, String methodName) {
- // return 0 to force PropertyValuesHolder to use Java reflection.
- return 0;
+ return nGetMultipleIntMethod(targetClass, methodName, 1);
}
@LayoutlibDelegate
/*package*/ static long nGetFloatMethod(Class<?> targetClass, String methodName) {
- // return 0 to force PropertyValuesHolder to use Java reflection.
- return 0;
+ return nGetMultipleFloatMethod(targetClass, methodName, 1);
}
@LayoutlibDelegate
/*package*/ static long nGetMultipleIntMethod(Class<?> targetClass, String methodName,
int numParams) {
- // TODO: return the right thing.
- return 0;
+ return registerMethod(targetClass, methodName, INTEGER_VARIANTS, numParams);
}
@LayoutlibDelegate
/*package*/ static long nGetMultipleFloatMethod(Class<?> targetClass, String methodName,
int numParams) {
- // TODO: return the right thing.
- return 0;
+ return registerMethod(targetClass, methodName, FLOAT_VARIANTS, numParams);
}
@LayoutlibDelegate
/*package*/ static void nCallIntMethod(Object target, long methodID, int arg) {
- // do nothing
+ callMethod(target, methodID, arg);
}
@LayoutlibDelegate
/*package*/ static void nCallFloatMethod(Object target, long methodID, float arg) {
- // do nothing
+ callMethod(target, methodID, arg);
}
@LayoutlibDelegate
/*package*/ static void nCallTwoIntMethod(Object target, long methodID, int arg1,
int arg2) {
- // do nothing
+ callMethod(target, methodID, arg1, arg2);
}
@LayoutlibDelegate
/*package*/ static void nCallFourIntMethod(Object target, long methodID, int arg1,
int arg2, int arg3, int arg4) {
- // do nothing
+ callMethod(target, methodID, arg1, arg2, arg3, arg4);
}
@LayoutlibDelegate
/*package*/ static void nCallMultipleIntMethod(Object target, long methodID,
int[] args) {
- // do nothing
+ assert args != null;
+
+ // Box parameters
+ Object[] params = new Object[args.length];
+ for (int i = 0; i < args.length; i++) {
+ params[i] = args;
+ }
+ callMethod(target, methodID, params);
}
@LayoutlibDelegate
/*package*/ static void nCallTwoFloatMethod(Object target, long methodID, float arg1,
float arg2) {
- // do nothing
+ callMethod(target, methodID, arg1, arg2);
}
@LayoutlibDelegate
/*package*/ static void nCallFourFloatMethod(Object target, long methodID, float arg1,
float arg2, float arg3, float arg4) {
- // do nothing
+ callMethod(target, methodID, arg1, arg2, arg3, arg4);
}
@LayoutlibDelegate
/*package*/ static void nCallMultipleFloatMethod(Object target, long methodID,
float[] args) {
- // do nothing
+ assert args != null;
+
+ // Box parameters
+ Object[] params = new Object[args.length];
+ for (int i = 0; i < args.length; i++) {
+ params[i] = args;
+ }
+ callMethod(target, methodID, params);
}
}
diff --git a/tools/layoutlib/bridge/src/android/graphics/PathMeasure_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/PathMeasure_Delegate.java
index dd2978f..3c71233 100644
--- a/tools/layoutlib/bridge/src/android/graphics/PathMeasure_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/PathMeasure_Delegate.java
@@ -44,7 +44,7 @@
// ---- delegate data ----
// This governs how accurate the approximation of the Path is.
- private static final float PRECISION = 0.002f;
+ private static final float PRECISION = 0.0002f;
/**
* Array containing the path points components. There are three components for each point:
diff --git a/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java b/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
index 5f0d98b..9677aaf 100644
--- a/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/os/SystemClock_Delegate.java
@@ -18,6 +18,7 @@
import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
+import com.android.tools.layoutlib.java.System_Delegate;
/**
* Delegate implementing the native methods of android.os.SystemClock
@@ -30,9 +31,6 @@
*
*/
public class SystemClock_Delegate {
- private static long sBootTime = System.currentTimeMillis();
- private static long sBootTimeNano = System.nanoTime();
-
/**
* Returns milliseconds since boot, not counting time spent in deep sleep.
* <b>Note:</b> This value may get reset occasionally (before it would
@@ -42,7 +40,7 @@
*/
@LayoutlibDelegate
/*package*/ static long uptimeMillis() {
- return System.currentTimeMillis() - sBootTime;
+ return System_Delegate.currentTimeMillis() - System_Delegate.bootTimeMillis();
}
/**
@@ -52,7 +50,7 @@
*/
@LayoutlibDelegate
/*package*/ static long elapsedRealtime() {
- return System.currentTimeMillis() - sBootTime;
+ return System_Delegate.currentTimeMillis() - System_Delegate.bootTimeMillis();
}
/**
@@ -62,7 +60,7 @@
*/
@LayoutlibDelegate
/*package*/ static long elapsedRealtimeNanos() {
- return System.nanoTime() - sBootTimeNano;
+ return System_Delegate.nanoTime() - System_Delegate.bootTime();
}
/**
@@ -72,7 +70,7 @@
*/
@LayoutlibDelegate
/*package*/ static long currentThreadTimeMillis() {
- return System.currentTimeMillis();
+ return System_Delegate.currentTimeMillis();
}
/**
@@ -84,7 +82,7 @@
*/
@LayoutlibDelegate
/*package*/ static long currentThreadTimeMicro() {
- return System.currentTimeMillis() * 1000;
+ return System_Delegate.currentTimeMillis() * 1000;
}
/**
diff --git a/tools/layoutlib/bridge/src/android/view/Choreographer_Delegate.java b/tools/layoutlib/bridge/src/android/view/Choreographer_Delegate.java
index f75ee50..01af669 100644
--- a/tools/layoutlib/bridge/src/android/view/Choreographer_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/view/Choreographer_Delegate.java
@@ -17,6 +17,8 @@
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
+import java.util.concurrent.atomic.AtomicReference;
+
/**
* Delegate used to provide new implementation of a select few methods of {@link Choreographer}
*
@@ -25,9 +27,41 @@
*
*/
public class Choreographer_Delegate {
+ static final AtomicReference<Choreographer> mInstance = new AtomicReference<Choreographer>();
+
+ @LayoutlibDelegate
+ public static Choreographer getInstance() {
+ if (mInstance.get() == null) {
+ mInstance.compareAndSet(null, Choreographer.getInstance_Original());
+ }
+
+ return mInstance.get();
+ }
@LayoutlibDelegate
public static float getRefreshRate() {
return 60.f;
}
+
+ @LayoutlibDelegate
+ static void scheduleVsyncLocked(Choreographer thisChoreographer) {
+ // do nothing
+ }
+
+ public static void doFrame(long frameTimeNanos) {
+ Choreographer thisChoreographer = Choreographer.getInstance();
+
+ thisChoreographer.mLastFrameTimeNanos = frameTimeNanos;
+
+ thisChoreographer.mFrameInfo.markInputHandlingStart();
+ thisChoreographer.doCallbacks(Choreographer.CALLBACK_INPUT, frameTimeNanos);
+
+ thisChoreographer.mFrameInfo.markAnimationsStart();
+ thisChoreographer.doCallbacks(Choreographer.CALLBACK_ANIMATION, frameTimeNanos);
+
+ thisChoreographer.mFrameInfo.markPerformTraversalsStart();
+ thisChoreographer.doCallbacks(Choreographer.CALLBACK_TRAVERSAL, frameTimeNanos);
+
+ thisChoreographer.doCallbacks(Choreographer.CALLBACK_COMMIT, frameTimeNanos);
+ }
}
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 3c260a8..eea254b 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -298,7 +298,7 @@
@Override
public Bitmap screenshotApplications(IBinder appToken, int displayId, int maxWidth,
- int maxHeight) throws RemoteException {
+ int maxHeight, float frameScale) throws RemoteException {
// TODO Auto-generated method stub
return null;
}
@@ -541,4 +541,8 @@
@Override
public void endProlongedAnimations() {
}
+
+ @Override
+ public void registerDockDividerVisibilityListener(IDockDividerVisibilityListener listener) {
+ }
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
index 48ca7d8..683c4aa 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
@@ -183,7 +183,7 @@
*/
private static LayoutLog sCurrentLog = sDefaultLog;
- private static final int LAST_SUPPORTED_FEATURE = Features.RECYCLER_VIEW_ADAPTER;
+ private static final int LAST_SUPPORTED_FEATURE = Features.CHOREOGRAPHER;
@Override
public int getApiLevel() {
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
index feb2590..2ac212c 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
@@ -23,6 +23,7 @@
import com.android.ide.common.rendering.api.Result;
import com.android.ide.common.rendering.api.ViewInfo;
import com.android.layoutlib.bridge.impl.RenderSessionImpl;
+import com.android.tools.layoutlib.java.System_Delegate;
import android.view.View;
import android.view.ViewGroup;
@@ -191,6 +192,21 @@
}
@Override
+ public void setSystemTimeNanos(long nanos) {
+ System_Delegate.setNanosTime(nanos);
+ }
+
+ @Override
+ public void setSystemBootTimeNanos(long nanos) {
+ System_Delegate.setBootTimeNanos(nanos);
+ }
+
+ @Override
+ public void setElapsedFrameTimeNanos(long nanos) {
+ mSession.setElapsedFrameTimeNanos(nanos);
+ }
+
+ @Override
public void dispose() {
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index 0fcfa78..ff15f3b 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1438,6 +1438,14 @@
}
@Override
+ public SharedPreferences getSharedPreferences(File arg0, int arg1) {
+ if (mSharedPreferences == null) {
+ mSharedPreferences = new BridgeSharedPreferences();
+ }
+ return mSharedPreferences;
+ }
+
+ @Override
public Drawable getWallpaper() {
// pass
return null;
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java
index 8899e53..01c3c50 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java
@@ -184,8 +184,10 @@
}
@Override
- public InputBindResult startInput(IInputMethodClient client, IInputContext inputContext,
- EditorInfo attribute, int controlFlags) throws RemoteException {
+ public InputBindResult startInput(
+ /* @InputMethodClient.StartInputReason */ int startInputReason,
+ IInputMethodClient client, IInputContext inputContext, EditorInfo attribute,
+ int controlFlags) throws RemoteException {
// TODO Auto-generated method stub
return null;
}
@@ -226,9 +228,11 @@
}
@Override
- public InputBindResult windowGainedFocus(IInputMethodClient client, IBinder windowToken,
- int controlFlags, int softInputMode, int windowFlags, EditorInfo attribute,
- IInputContext inputContext) throws RemoteException {
+ public InputBindResult windowGainedFocus(
+ /* @InputMethodClient.StartInputReason */ int startInputReason,
+ IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode,
+ int windowFlags, EditorInfo attribute, IInputContext inputContext)
+ throws RemoteException {
// TODO Auto-generated method stub
return null;
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
index 1ec0547..5c73fb6a 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
@@ -167,6 +167,11 @@
}
@Override
+ public void cancelDragAndDrop(IBinder dragToken) throws RemoteException {
+ // pass for now
+ }
+
+ @Override
public void dragRecipientEntered(IWindow window) throws RemoteException {
// pass for now
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java
index 868c6d3..cdcf0ea 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java
@@ -16,10 +16,13 @@
package com.android.layoutlib.bridge.bars;
+import com.android.ide.common.rendering.api.LayoutLog;
+import com.android.ide.common.rendering.api.LayoutlibCallback;
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
import com.android.ide.common.rendering.api.StyleResourceValue;
+import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper;
import com.android.resources.ResourceType;
@@ -45,6 +48,8 @@
private Object mWindowDecorActionBar;
private static final String WINDOW_ACTION_BAR_CLASS = "android.support.v7.internal.app.WindowDecorActionBar";
+ // This is used on v23.1.1 and later.
+ private static final String WINDOW_ACTION_BAR_CLASS_NEW = "android.support.v7.app.WindowDecorActionBar";
private Class<?> mWindowActionBarClass;
/**
@@ -70,14 +75,25 @@
try {
Class[] constructorParams = {View.class};
Object[] constructorArgs = {getDecorContent()};
- mWindowDecorActionBar = params.getLayoutlibCallback().loadView(WINDOW_ACTION_BAR_CLASS,
- constructorParams, constructorArgs);
+ LayoutlibCallback callback = params.getLayoutlibCallback();
+ // Check if the old action bar class is present.
+ String actionBarClass = WINDOW_ACTION_BAR_CLASS;
+ try {
+ callback.findClass(actionBarClass);
+ } catch (ClassNotFoundException expected) {
+ // Failed to find the old class, use the newer one.
+ actionBarClass = WINDOW_ACTION_BAR_CLASS_NEW;
+ }
+
+ mWindowDecorActionBar = callback.loadView(actionBarClass,
+ constructorParams, constructorArgs);
mWindowActionBarClass = mWindowDecorActionBar == null ? null :
mWindowDecorActionBar.getClass();
setupActionBar();
} catch (Exception e) {
- e.printStackTrace();
+ Bridge.getLog().warning(LayoutLog.TAG_BROKEN,
+ "Failed to load AppCompat ActionBar with unknown error.", e);
}
}
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
index 42e55e2..a6e5fb8 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
@@ -33,7 +33,6 @@
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
-import android.annotation.Nullable;
import android.content.res.ColorStateList;
import android.graphics.Bitmap;
import android.graphics.Bitmap_Delegate;
@@ -228,18 +227,16 @@
* Find the background color for this bar from the theme attributes. Only relevant to StatusBar
* and NavigationBar.
* <p/>
- * Returns null if not found.
+ * Returns 0 if not found.
*
* @param colorAttrName the attribute name for the background color
* @param translucentAttrName the attribute name for the translucency property of the bar.
*
* @throws NumberFormatException if color resolved to an invalid string.
*/
- @Nullable
- protected Integer getBarColor(@NonNull String colorAttrName,
- @NonNull String translucentAttrName) {
+ protected int getBarColor(@NonNull String colorAttrName, @NonNull String translucentAttrName) {
if (!Config.isGreaterOrEqual(mSimulatedPlatformVersion, LOLLIPOP)) {
- return null;
+ return 0;
}
RenderResources renderResources = getContext().getRenderResources();
// First check if the bar is translucent.
@@ -254,11 +251,10 @@
if (transparent) {
return getColor(renderResources, colorAttrName);
}
- return null;
+ return 0;
}
- @Nullable
- private static Integer getColor(RenderResources renderResources, String attr) {
+ private static int getColor(RenderResources renderResources, String attr) {
// From ?attr/foo to @color/bar. This is most likely an ItemResourceValue.
ResourceValue resource = renderResources.findItemInTheme(attr, true);
// Form @color/bar to the #AARRGGBB
@@ -279,7 +275,7 @@
}
}
}
- return null;
+ return 0;
}
private ResourceValue getResourceValue(String reference) {
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/NavigationBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/NavigationBar.java
index d50ce23..9c89bfe 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/NavigationBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/NavigationBar.java
@@ -65,8 +65,8 @@
super(context, orientation, getShortestWidth(context)>= 600 ? LAYOUT_600DP_XML : LAYOUT_XML,
"navigation_bar.xml", simulatedPlatformVersion);
- Integer color = getBarColor(ATTR_COLOR, ATTR_TRANSLUCENT);
- setBackgroundColor(color == null ? 0xFF000000 : color);
+ int color = getBarColor(ATTR_COLOR, ATTR_TRANSLUCENT);
+ setBackgroundColor(color == 0 ? 0xFF000000 : color);
// Cannot access the inside items through id because no R.id values have been
// created for them.
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
index 95a5a58..2dc7c65 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
@@ -71,9 +71,8 @@
// FIXME: use FILL_H?
setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT);
- Integer color = getBarColor(ATTR_COLOR, ATTR_TRANSLUCENT);
- setBackgroundColor(
- color == null ? Config.getStatusBarColor(simulatedPlatformVersion) : color);
+ int color = getBarColor(ATTR_COLOR, ATTR_TRANSLUCENT);
+ setBackgroundColor(color == 0 ? Config.getStatusBarColor(simulatedPlatformVersion) : color);
// Cannot access the inside items through id because no R.id values have been
// created for them.
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 2a4f583..ec50cfe 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -46,6 +46,7 @@
import com.android.layoutlib.bridge.impl.binding.FakeAdapter;
import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
import com.android.resources.ResourceType;
+import com.android.tools.layoutlib.java.System_Delegate;
import com.android.util.Pair;
import android.animation.AnimationThread;
@@ -62,6 +63,7 @@
import android.preference.Preference_Delegate;
import android.view.AttachInfo_Accessor;
import android.view.BridgeInflater;
+import android.view.Choreographer_Delegate;
import android.view.IWindowManager;
import android.view.IWindowManagerImpl;
import android.view.Surface;
@@ -120,6 +122,10 @@
private int mMeasuredScreenWidth = -1;
private int mMeasuredScreenHeight = -1;
private boolean mIsAlphaChannelImage;
+ /** If >= 0, a frame will be executed */
+ private long mElapsedFrameTimeNanos = -1;
+ /** True if one frame has been already executed to start the animations */
+ private boolean mFirstFrameExecuted = false;
// information being returned through the API
private BufferedImage mImage;
@@ -252,6 +258,14 @@
}
/**
+ * Sets the time for which the next frame will be selected. The time is the elapsed time from
+ * the current system nanos time. You
+ */
+ public void setElapsedFrameTimeNanos(long nanos) {
+ mElapsedFrameTimeNanos = nanos;
+ }
+
+ /**
* Renders the scene.
* <p>
* {@link #acquire(long)} must have been called before this.
@@ -421,12 +435,23 @@
gc.setComposite(AlphaComposite.Src);
gc.setColor(new Color(0x00000000, true));
- gc.fillRect(0, 0, mMeasuredScreenWidth, mMeasuredScreenHeight);
+ gc.fillRect(0, 0,
+ mMeasuredScreenWidth, mMeasuredScreenHeight);
// done
gc.dispose();
}
+ if (mElapsedFrameTimeNanos >= 0) {
+ long initialTime = System_Delegate.nanoTime();
+ if (!mFirstFrameExecuted) {
+ // The first frame will initialize the animations
+ Choreographer_Delegate.doFrame(initialTime);
+ mFirstFrameExecuted = true;
+ }
+ // Second frame will move the animations
+ Choreographer_Delegate.doFrame(initialTime + mElapsedFrameTimeNanos);
+ }
mViewRoot.draw(mCanvas);
}
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png
new file mode 100644
index 0000000..9f26627
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png
new file mode 100644
index 0000000..89009be
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/animated_vector_1.png
Binary files differ
diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/indeterminate_progressbar.xml b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/indeterminate_progressbar.xml
new file mode 100644
index 0000000..70d7396
--- /dev/null
+++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/indeterminate_progressbar.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:padding="16dp"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <ProgressBar
+ android:layout_height="fill_parent"
+ android:layout_width="fill_parent" />
+
+</LinearLayout>
+
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index 9ebeebd..2dca07c 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -48,6 +48,8 @@
import java.net.URL;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
import static org.junit.Assert.fail;
@@ -348,16 +350,46 @@
renderAndVerify(params, "expand_horz_layout.png");
}
+ /** Test expand_layout.xml */
+ @Test
+ public void testVectorAnimation() throws ClassNotFoundException {
+ // Create the layout pull parser.
+ LayoutPullParser parser = new LayoutPullParser(APP_TEST_RES + "/layout/" +
+ "indeterminate_progressbar.xml");
+ // Create LayoutLibCallback.
+ LayoutLibTestCallback layoutLibCallback = new LayoutLibTestCallback(getLogger());
+ layoutLibCallback.initResources();
+
+ SessionParams params = getSessionParams(parser, ConfigGenerator.NEXUS_5,
+ layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false,
+ RenderingMode.V_SCROLL, 22);
+
+ renderAndVerify(params, "animated_vector.png", TimeUnit.SECONDS.toNanos(2));
+
+ parser = new LayoutPullParser(APP_TEST_RES + "/layout/" +
+ "indeterminate_progressbar.xml");
+ params = getSessionParams(parser, ConfigGenerator.NEXUS_5,
+ layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false,
+ RenderingMode.V_SCROLL, 22);
+ renderAndVerify(params, "animated_vector_1.png", TimeUnit.SECONDS.toNanos(3));
+ }
+
/**
* Create a new rendering session and test that rendering given layout on nexus 5
* doesn't throw any exceptions and matches the provided image.
+ * <p/>If frameTimeNanos is >= 0 a frame will be executed during the rendering. The time
+ * indicates how far in the future is.
*/
- private void renderAndVerify(SessionParams params, String goldenFileName)
+ private void renderAndVerify(SessionParams params, String goldenFileName, long frameTimeNanos)
throws ClassNotFoundException {
// TODO: Set up action bar handler properly to test menu rendering.
// Create session params.
RenderSession session = sBridge.createSession(params);
+ if (frameTimeNanos != -1) {
+ session.setElapsedFrameTimeNanos(frameTimeNanos);
+ }
+
if (!session.getResult().isSuccess()) {
getLogger().error(session.getResult().getException(),
session.getResult().getErrorMessage());
@@ -380,6 +412,15 @@
* Create a new rendering session and test that rendering given layout on nexus 5
* doesn't throw any exceptions and matches the provided image.
*/
+ private void renderAndVerify(SessionParams params, String goldenFileName)
+ throws ClassNotFoundException {
+ renderAndVerify(params, goldenFileName, -1);
+ }
+
+ /**
+ * Create a new rendering session and test that rendering given layout on nexus 5
+ * doesn't throw any exceptions and matches the provided image.
+ */
private void renderAndVerify(String layoutFileName, String goldenFileName)
throws ClassNotFoundException {
// Create the layout pull parser.
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
index f6c2626..8f0ad01 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
@@ -77,6 +77,8 @@
/** Methods to inject. FQCN of class in which method should be injected => runnable that does
* the injection. */
private final Map<String, ICreateInfo.InjectMethodRunnable> mInjectedMethodsMap;
+ /** A map { FQCN => set { field names } } which should be promoted to public visibility */
+ private final Map<String, Set<String>> mPromotedFields;
/**
* Creates a new generator that can generate the output JAR with the stubbed classes.
@@ -109,20 +111,8 @@
// Create the map/set of methods to change to delegates
mDelegateMethods = new HashMap<String, Set<String>>();
- for (String signature : createInfo.getDelegateMethods()) {
- int pos = signature.indexOf('#');
- if (pos <= 0 || pos >= signature.length() - 1) {
- continue;
- }
- String className = binaryToInternalClassName(signature.substring(0, pos));
- String methodName = signature.substring(pos + 1);
- Set<String> methods = mDelegateMethods.get(className);
- if (methods == null) {
- methods = new HashSet<String>();
- mDelegateMethods.put(className, methods);
- }
- methods.add(methodName);
- }
+ addToMap(createInfo.getDelegateMethods(), mDelegateMethods);
+
for (String className : createInfo.getDelegateClassNatives()) {
className = binaryToInternalClassName(className);
Set<String> methods = mDelegateMethods.get(className);
@@ -187,10 +177,34 @@
returnTypes.add(binaryToInternalClassName(className));
}
+ mPromotedFields = new HashMap<String, Set<String>>();
+ addToMap(createInfo.getPromotedFields(), mPromotedFields);
+
mInjectedMethodsMap = createInfo.getInjectedMethodsMap();
}
/**
+ * For each value in the array, split the value on '#' and add the parts to the map as key
+ * and value.
+ */
+ private void addToMap(String[] entries, Map<String, Set<String>> map) {
+ for (String entry : entries) {
+ int pos = entry.indexOf('#');
+ if (pos <= 0 || pos >= entry.length() - 1) {
+ return;
+ }
+ String className = binaryToInternalClassName(entry.substring(0, pos));
+ String methodOrFieldName = entry.substring(pos + 1);
+ Set<String> set = map.get(className);
+ if (set == null) {
+ set = new HashSet<String>();
+ map.put(className, set);
+ }
+ set.add(methodOrFieldName);
+ }
+ }
+
+ /**
* Returns the list of classes that have not been renamed yet.
* <p/>
* The names are "internal class names" rather than FQCN, i.e. they use "/" instead "."
@@ -380,6 +394,10 @@
}
}
+ Set<String> promoteFields = mPromotedFields.get(className);
+ if (promoteFields != null && !promoteFields.isEmpty()) {
+ cv = new PromoteFieldClassAdapter(cv, promoteFields);
+ }
cr.accept(cv, 0);
return cw.toByteArray();
}
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
index e480ead..b571c5a 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@ -120,6 +120,11 @@
}
@Override
+ public String[] getPromotedFields() {
+ return PROMOTED_FIELDS;
+ }
+
+ @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return INJECTED_METHODS;
}
@@ -169,7 +174,9 @@
"android.text.format.DateFormat#is24HourFormat",
"android.text.Hyphenator#getSystemHyphenatorLocation",
"android.util.Xml#newPullParser",
+ "android.view.Choreographer#getInstance",
"android.view.Choreographer#getRefreshRate",
+ "android.view.Choreographer#scheduleVsyncLocked",
"android.view.Display#updateDisplayInfoLocked",
"android.view.Display#getWindowManager",
"android.view.LayoutInflater#rInflate",
@@ -290,6 +297,10 @@
"org.kxml2.io.KXmlParser"
};
+ private final static String[] PROMOTED_FIELDS = new String[] {
+ "android.view.Choreographer#mLastFrameTimeNanos"
+ };
+
/**
* List of classes for which the methods returning them should be deleted.
* The array contains a list of null terminated section starting with the name of the class
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
index ae4a57d..7ef7566 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
@@ -17,6 +17,7 @@
package com.android.tools.layoutlib.create;
import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
@@ -40,6 +41,7 @@
private final String mClassName;
private final Set<String> mDelegateMethods;
private final Log mLog;
+ private boolean mIsStaticInnerClass;
/**
* Creates a new {@link DelegateClassAdapter} that can transform some methods
@@ -62,16 +64,30 @@
mLog = log;
mClassName = className;
mDelegateMethods = delegateMethods;
+ // If this is an inner class, by default, we assume it's static. If it's not we will detect
+ // by looking at the fields (see visitField)
+ mIsStaticInnerClass = className.contains("$");
}
//----------------------------------
// Methods from the ClassAdapter
@Override
+ public FieldVisitor visitField(int access, String name, String desc, String signature,
+ Object value) {
+ if (mIsStaticInnerClass && "this$0".equals(name)) {
+ // Having a "this$0" field, proves that this class is not a static inner class.
+ mIsStaticInnerClass = false;
+ }
+
+ return super.visitField(access, name, desc, signature, value);
+ }
+
+ @Override
public MethodVisitor visitMethod(int access, String name, String desc,
String signature, String[] exceptions) {
- boolean isStatic = (access & Opcodes.ACC_STATIC) != 0;
+ boolean isStaticMethod = (access & Opcodes.ACC_STATIC) != 0;
boolean isNative = (access & Opcodes.ACC_NATIVE) != 0;
boolean useDelegate = (isNative && mDelegateMethods.contains(ALL_NATIVES)) ||
@@ -96,7 +112,8 @@
MethodVisitor mwDelegate = super.visitMethod(access, name, desc, signature, exceptions);
DelegateMethodAdapter a = new DelegateMethodAdapter(
- mLog, null, mwDelegate, mClassName, name, desc, isStatic);
+ mLog, null, mwDelegate, mClassName, name, desc, isStaticMethod,
+ mIsStaticInnerClass);
// A native has no code to visit, so we need to generate it directly.
a.generateDelegateCode();
@@ -120,6 +137,7 @@
desc, signature, exceptions);
return new DelegateMethodAdapter(
- mLog, mwOriginal, mwDelegate, mClassName, name, desc, isStatic);
+ mLog, mwOriginal, mwDelegate, mClassName, name, desc, isStaticMethod,
+ mIsStaticInnerClass);
}
}
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
index 12690db..cca9e57 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
@@ -85,6 +85,8 @@
private String mDesc;
/** True if the original method is static. */
private final boolean mIsStatic;
+ /** True if the method is contained in a static inner class */
+ private final boolean mIsStaticInnerClass;
/** The internal class name (e.g. <code>com/android/SomeClass$InnerClass</code>.) */
private final String mClassName;
/** The method name. */
@@ -120,7 +122,8 @@
String className,
String methodName,
String desc,
- boolean isStatic) {
+ boolean isStatic,
+ boolean isStaticClass) {
super(Opcodes.ASM4);
mLog = log;
mOrgWriter = mvOriginal;
@@ -129,6 +132,7 @@
mMethodName = methodName;
mDesc = desc;
mIsStatic = isStatic;
+ mIsStaticInnerClass = isStaticClass;
}
/**
@@ -206,7 +210,7 @@
// by the 'this' of any outer class, if any.
if (!mIsStatic) {
- if (outerType != null) {
+ if (outerType != null && !mIsStaticInnerClass) {
// The first-level inner class has a package-protected member called 'this$0'
// that points to the outer class.
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
index 54b1fe6..6c62423 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java
@@ -78,6 +78,13 @@
Set<String> getExcludedClasses();
/**
+ * Returns a list of fields which should be promoted to public visibility. The array values
+ * are in the form of the binary FQCN of the class containing the field and the field name
+ * separated by a '#'.
+ */
+ String[] getPromotedFields();
+
+ /**
* Returns a map from binary FQCN className to {@link InjectMethodRunnable} which will be
* called to inject methods into a class.
* Can be empty but must not be null.
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java
new file mode 100644
index 0000000..e4b70da
--- /dev/null
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015 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.tools.layoutlib.create;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+
+import java.util.Set;
+
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ASM4;
+
+/**
+ * Promotes given fields to public visibility.
+ */
+public class PromoteFieldClassAdapter extends ClassVisitor {
+
+ private final Set<String> mFieldNames;
+ private static final int ACC_NOT_PUBLIC = ~(ACC_PRIVATE | ACC_PROTECTED);
+
+ public PromoteFieldClassAdapter(ClassVisitor cv, Set<String> fieldNames) {
+ super(ASM4, cv);
+ mFieldNames = fieldNames;
+ }
+
+ @Override
+ public FieldVisitor visitField(int access, String name, String desc, String signature,
+ Object value) {
+ if (mFieldNames.contains(name)) {
+ if ((access & ACC_PUBLIC) == 0) {
+ access = (access & ACC_NOT_PUBLIC) | ACC_PUBLIC;
+ }
+ }
+ return super.visitField(access, name, desc, signature, value);
+ }
+}
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ReplaceMethodCallsAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ReplaceMethodCallsAdapter.java
index 0b85c48..5e47261 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ReplaceMethodCallsAdapter.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ReplaceMethodCallsAdapter.java
@@ -134,7 +134,33 @@
}
});
- // Case 5: java.util.LinkedHashMap.eldest()
+ // Case 5: java.lang.System time calls
+ METHOD_REPLACERS.add(new MethodReplacer() {
+ @Override
+ public boolean isNeeded(String owner, String name, String desc, String sourceClass) {
+ return JAVA_LANG_SYSTEM.equals(owner) && name.equals("nanoTime");
+ }
+
+ @Override
+ public void replace(MethodInformation mi) {
+ mi.name = "nanoTime";
+ mi.owner = Type.getInternalName(System_Delegate.class);
+ }
+ });
+ METHOD_REPLACERS.add(new MethodReplacer() {
+ @Override
+ public boolean isNeeded(String owner, String name, String desc, String sourceClass) {
+ return JAVA_LANG_SYSTEM.equals(owner) && name.equals("currentTimeMillis");
+ }
+
+ @Override
+ public void replace(MethodInformation mi) {
+ mi.name = "currentTimeMillis";
+ mi.owner = Type.getInternalName(System_Delegate.class);
+ }
+ });
+
+ // Case 6: java.util.LinkedHashMap.eldest()
METHOD_REPLACERS.add(new MethodReplacer() {
private final String VOID_TO_MAP_ENTRY =
@@ -157,7 +183,7 @@
}
});
- // Case 6: android.content.Context.getClassLoader() in LayoutInflater
+ // Case 7: android.content.Context.getClassLoader() in LayoutInflater
METHOD_REPLACERS.add(new MethodReplacer() {
// When LayoutInflater asks for a class loader, we must return the class loader that
// cannot return app's custom views/classes. This is so that in case of any failure
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/java/System_Delegate.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/java/System_Delegate.java
index 613c8d9..be93744 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/java/System_Delegate.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/java/System_Delegate.java
@@ -18,12 +18,22 @@
import com.android.tools.layoutlib.create.ReplaceMethodCallsAdapter;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Provides dummy implementation of methods that don't exist on the host VM.
+ * This also providers a time control that allows to set a specific system time.
*
* @see ReplaceMethodCallsAdapter
*/
+@SuppressWarnings("unused")
public class System_Delegate {
+ // Current system time
+ private static AtomicLong mNanosTime = new AtomicLong(System.nanoTime());
+ // Time that the system booted up in nanos
+ private static AtomicLong mBootNanosTime = new AtomicLong(System.nanoTime());
+
public static void log(String message) {
// ignore.
}
@@ -31,4 +41,28 @@
public static void log(String message, Throwable th) {
// ignore.
}
+
+ public static void setNanosTime(long nanos) {
+ mNanosTime.set(nanos);
+ }
+
+ public static void setBootTimeNanos(long nanos) {
+ mBootNanosTime.set(nanos);
+ }
+
+ public static long nanoTime() {
+ return mNanosTime.get();
+ }
+
+ public static long currentTimeMillis() {
+ return TimeUnit.NANOSECONDS.toMillis(mNanosTime.get());
+ }
+
+ public static long bootTime() {
+ return mBootNanosTime.get();
+ }
+
+ public static long bootTimeMillis() {
+ return TimeUnit.NANOSECONDS.toMillis(mBootNanosTime.get());
+ }
}
diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
index 2c21470..8a2235b 100644
--- a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
+++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java
@@ -138,6 +138,11 @@
}
@Override
+ public String[] getPromotedFields() {
+ return new String[0];
+ }
+
+ @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return new HashMap<String, InjectMethodRunnable>(0);
}
@@ -213,6 +218,11 @@
}
@Override
+ public String[] getPromotedFields() {
+ return new String[0];
+ }
+
+ @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return new HashMap<String, InjectMethodRunnable>(0);
}
@@ -296,6 +306,11 @@
}
@Override
+ public String[] getPromotedFields() {
+ return new String[0];
+ }
+
+ @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
return new HashMap<String, InjectMethodRunnable>(0);
}
@@ -374,6 +389,11 @@
}
@Override
+ public String[] getPromotedFields() {
+ return new String[0];
+ }
+
+ @Override
public Map<String, InjectMethodRunnable> getInjectedMethodsMap() {
HashMap<String, InjectMethodRunnable> map =
new HashMap<String, InjectMethodRunnable>(1);
diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java
index 648cea43..e37a09b 100644
--- a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java
+++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java
@@ -27,6 +27,7 @@
import com.android.tools.layoutlib.create.dataclass.ClassWithNative;
import com.android.tools.layoutlib.create.dataclass.OuterClass;
import com.android.tools.layoutlib.create.dataclass.OuterClass.InnerClass;
+import com.android.tools.layoutlib.create.dataclass.OuterClass.StaticInnerClass;
import org.junit.Before;
import org.junit.Test;
@@ -56,6 +57,8 @@
private static final String OUTER_CLASS_NAME = OuterClass.class.getCanonicalName();
private static final String INNER_CLASS_NAME = OuterClass.class.getCanonicalName() + "$" +
InnerClass.class.getSimpleName();
+ private static final String STATIC_INNER_CLASS_NAME =
+ OuterClass.class.getCanonicalName() + "$" + StaticInnerClass.class.getSimpleName();
@Before
public void setUp() throws Exception {
@@ -294,6 +297,61 @@
}
}
+ @Test
+ public void testDelegateStaticInner() throws Throwable {
+ // We'll delegate the "get" method of both the inner and outer class.
+ HashSet<String> delegateMethods = new HashSet<String>();
+ delegateMethods.add("get");
+
+ // Generate the delegate for the outer class.
+ ClassWriter cwOuter = new ClassWriter(0 /*flags*/);
+ String outerClassName = OUTER_CLASS_NAME.replace('.', '/');
+ DelegateClassAdapter cvOuter = new DelegateClassAdapter(
+ mLog, cwOuter, outerClassName, delegateMethods);
+ ClassReader cr = new ClassReader(OUTER_CLASS_NAME);
+ cr.accept(cvOuter, 0 /* flags */);
+
+ // Generate the delegate for the static inner class.
+ ClassWriter cwInner = new ClassWriter(0 /*flags*/);
+ String innerClassName = STATIC_INNER_CLASS_NAME.replace('.', '/');
+ DelegateClassAdapter cvInner = new DelegateClassAdapter(
+ mLog, cwInner, innerClassName, delegateMethods);
+ cr = new ClassReader(STATIC_INNER_CLASS_NAME);
+ cr.accept(cvInner, 0 /* flags */);
+
+ // Load the generated classes in a different class loader and try them
+ ClassLoader2 cl2 = null;
+ try {
+ cl2 = new ClassLoader2() {
+ @Override
+ public void testModifiedInstance() throws Exception {
+
+ // Check the outer class
+ Class<?> outerClazz2 = loadClass(OUTER_CLASS_NAME);
+ Object o2 = outerClazz2.newInstance();
+ assertNotNull(o2);
+
+ // Check the inner class. Since it's not a static inner class, we need
+ // to use the hidden constructor that takes the outer class as first parameter.
+ Class<?> innerClazz2 = loadClass(STATIC_INNER_CLASS_NAME);
+ Constructor<?> innerCons = innerClazz2.getConstructor();
+ Object i2 = innerCons.newInstance();
+ assertNotNull(i2);
+
+ // The original StaticInner.get returns 100+10+20,
+ // but the delegate makes it return 6+10+20
+ assertEquals(6+10+20, callGet(i2, 10, 20));
+ assertEquals(100+10+20, callGet_Original(i2, 10, 20));
+ }
+ };
+ cl2.add(OUTER_CLASS_NAME, cwOuter.toByteArray());
+ cl2.add(STATIC_INNER_CLASS_NAME, cwInner.toByteArray());
+ cl2.testModifiedInstance();
+ } catch (Throwable t) {
+ throw dumpGeneratedClass(t, cl2);
+ }
+ }
+
//-------
/**
diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass.java
index f083e76..6dfb816 100644
--- a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass.java
+++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass.java
@@ -45,6 +45,16 @@
}
}
+ public static class StaticInnerClass {
+ public StaticInnerClass() {
+ }
+
+ // StaticInnerClass.get returns 100 + a + b
+ public int get(int a, long b) {
+ return 100 + a + (int) b;
+ }
+ }
+
@SuppressWarnings("unused")
private String privateMethod() {
return "outerPrivateMethod";
diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass_StaticInnerClass_Delegate.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass_StaticInnerClass_Delegate.java
new file mode 100644
index 0000000..a29439e
--- /dev/null
+++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/OuterClass_StaticInnerClass_Delegate.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 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.tools.layoutlib.create.dataclass;
+
+import com.android.tools.layoutlib.create.DelegateClassAdapterTest;
+import com.android.tools.layoutlib.create.dataclass.OuterClass.StaticInnerClass;
+
+/**
+ * Used by {@link DelegateClassAdapterTest}.
+ */
+public class OuterClass_StaticInnerClass_Delegate {
+ // The delegate override of Inner.get return 6 + a + b
+ public static int get(StaticInnerClass inner, int a, long b) {
+ return 6 + a + (int) b;
+ }
+}
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index e611ea4..6e42391 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -737,7 +737,9 @@
public String toString() {
StringBuffer sb = new StringBuffer();
for (String key : mFields.keySet()) {
- sb.append(key).append(" ").append(mFields.get(key)).append("\n");
+ // Don't display password in toString().
+ String value = (key == PASSWORD_KEY) ? "<removed>" : mFields.get(key);
+ sb.append(key).append(" ").append(value).append("\n");
}
return sb.toString();
}
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index e25b38c..9f8af6e 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -424,6 +424,15 @@
return mMacAddress;
}
+ /**
+ * @return true if {@link #getMacAddress()} has a real MAC address.
+ *
+ * @hide
+ */
+ public boolean hasRealMacAddress() {
+ return mMacAddress != null && !DEFAULT_MAC_ADDRESS.equals(mMacAddress);
+ }
+
/** {@hide} */
public void setMeteredHint(boolean meteredHint) {
mMeteredHint = meteredHint;
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index bd030e8..b054f7c 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -665,7 +665,7 @@
* </ul>
* @return a list of network configurations in the form of a list
* of {@link WifiConfiguration} objects. Upon failure to fetch or
- * when when Wi-Fi is turned off, it can be null.
+ * when Wi-Fi is turned off, it can be null.
*/
public List<WifiConfiguration> getConfiguredNetworks() {
try {
diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java
index c26ca6e..5534cad 100644
--- a/wifi/java/android/net/wifi/WifiScanner.java
+++ b/wifi/java/android/net/wifi/WifiScanner.java
@@ -168,6 +168,22 @@
* to wake up at fixed interval
*/
public int maxScansToCache;
+ /**
+ * if maxPeriodInMs is non zero or different than period, then this bucket is
+ * an exponential backoff bucket and the scan period will grow exponentially
+ * as per formula: actual_period(N) = period ^ (N/(step_count+1))
+ * to a maximum period of max_period.
+ */
+ public int maxPeriodInMs;
+ /**
+ * for exponential back off bucket: multiplier: new_period=old_period*exponent
+ */
+ public int exponent;
+ /**
+ * for exponential back off bucket, number of scans performed at a given
+ * period and until the exponent is applied
+ */
+ public int stepCount;
/** Implement the Parcelable interface {@hide} */
public int describeContents() {
@@ -181,6 +197,9 @@
dest.writeInt(reportEvents);
dest.writeInt(numBssidsPerScan);
dest.writeInt(maxScansToCache);
+ dest.writeInt(maxPeriodInMs);
+ dest.writeInt(exponent);
+ dest.writeInt(stepCount);
if (channels != null) {
dest.writeInt(channels.length);
@@ -206,6 +225,9 @@
settings.reportEvents = in.readInt();
settings.numBssidsPerScan = in.readInt();
settings.maxScansToCache = in.readInt();
+ settings.maxPeriodInMs = in.readInt();
+ settings.exponent = in.readInt();
+ settings.stepCount = in.readInt();
int num_channels = in.readInt();
settings.channels = new ChannelSpec[num_channels];
for (int i = 0; i < num_channels; i++) {
